date:20170111

[Libreoffice-commits] core.git: bin/gbuild-to-ide

2017-01-11 Thread Edmund Wong

 bin/gbuild-to-ide |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a6931e8d00a77e6db9390aeee9a8b0b533986220
Author: Edmund Wong 
Date:   Wed Dec 14 13:06:05 2016 +0800

No need for a separate variable. Just get the value directly from the 
dictionary.

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

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index d4eb5e9..6fdcb3f 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -775,7 +775,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 
 def __init__(self, gbuildparser, ide):
 IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
-self.toolset = self.retrieve_toolset(ide)
+self.toolset = self.retrieve_toolset()
 self.solution_directory = './'
 self.configurations = {
 'Build': {
@@ -795,9 +795,8 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 }
 }
 
-def retrieve_toolset(self, ide):
-ide_toolset_map = {'vs2013': 'v120', 'vs2015': 'v140'}
-return ide_toolset_map[ide]
+def retrieve_toolset(self):
+return {'vs2013': 'v120', 'vs2015': 'v140'}.get(self.ide, None)
 
 def module_make_command(self, targets):
 return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" 
%(makecmd)s -rsC %(location)s ' + targets + '"'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Kohei Yoshida

 package/inc/ZipFile.hxx   |6 +++---
 package/source/zipapi/ZipFile.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 14e65f7d2d6f48cf2012305cbda40d24f4f88c78
Author: Kohei Yoshida 
Date:   Wed Jan 11 21:54:34 2017 -0500

These SAL_CALL can go as well...

Change-Id: I79aa4374126faaf9f782fb7ff0c12c171e7041b1

diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 962733c..eac5f0b 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -142,19 +142,19 @@ public:
 const css::uno::Sequence< sal_Int8 > &aReadBuffer,
 const ::rtl::Reference < EncryptionData > &rData );
 
-css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(
+css::uno::Reference< css::io::XInputStream > getInputStream(
 ZipEntry& rEntry,
 const ::rtl::Reference < EncryptionData > &rData,
 bool bDecrypt,
 const rtl::Reference& aMutexHolder );
 
-css::uno::Reference< css::io::XInputStream > SAL_CALL getDataStream(
+css::uno::Reference< css::io::XInputStream > getDataStream(
 ZipEntry& rEntry,
 const ::rtl::Reference < EncryptionData > &rData,
 bool bDecrypt,
 const rtl::Reference& aMutexHolder );
 
-css::uno::Reference< css::io::XInputStream > SAL_CALL getWrappedRawStream(
+css::uno::Reference< css::io::XInputStream > getWrappedRawStream(
 ZipEntry& rEntry,
 const ::rtl::Reference < EncryptionData > &rData,
 const OUString& aMediaType,
diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 6b397c6..e27b911 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -522,7 +522,7 @@ std::unique_ptr ZipFile::entries()
 return o3tl::make_unique(aEntries);
 }
 
-uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& 
rEntry,
+uno::Reference< XInputStream > ZipFile::getInputStream( ZipEntry& rEntry,
 const ::rtl::Reference< EncryptionData > &rData,
 bool bIsEncrypted,
 const rtl::Reference& aMutexHolder )
@@ -549,7 +549,7 @@ uno::Reference< XInputStream > SAL_CALL 
ZipFile::getInputStream( ZipEntry& rEntr
 bIsEncrypted );
 }
 
-uno::Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& 
rEntry,
+uno::Reference< XInputStream > ZipFile::getDataStream( ZipEntry& rEntry,
 const ::rtl::Reference< EncryptionData > &rData,
 bool bIsEncrypted,
 const rtl::Reference& aMutexHolder )
@@ -585,7 +585,7 @@ uno::Reference< XInputStream > SAL_CALL 
ZipFile::getDataStream( ZipEntry& rEntry
 bIsEncrypted );
 }
 
-uno::Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry,
+uno::Reference< XInputStream > ZipFile::getRawData( ZipEntry& rEntry,
 const ::rtl::Reference< EncryptionData >& rData,
 bool bIsEncrypted,
 const rtl::Reference& aMutexHolder )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Kohei Yoshida

 package/inc/ZipFile.hxx  |1 -
 package/inc/ZipPackage.hxx   |3 ++-
 package/source/zipapi/ZipFile.cxx|4 +---
 package/source/zippackage/ZipPackage.cxx |   12 +---
 4 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit f7c9ecaac9017e94e1dbcd5295b4d6fa3a33948f
Author: Kohei Yoshida 
Date:   Wed Jan 11 19:39:25 2017 -0500

Use std::unique_ptr for the ZipFile instance.

Change-Id: Ifac7a9e29c8cf0afcf44a82db608ba3c48499ca1

diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 2856e42..6a3ac01 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class ZipOutputStream;
 class ZipPackageFolder;
@@ -97,7 +98,7 @@ protected:
 css::uno::Reference < css::io::XSeekable > m_xContentSeek;
 const css::uno::Reference < css::uno::XComponentContext > m_xContext;
 
-ZipFile  *m_pZipFile;
+std::unique_ptr m_pZipFile;
 
 bool isLocalFile() const;
 
diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 026e1ed..cb2e618 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -69,7 +69,6 @@
 #include "com/sun/star/io/XAsyncOutputMonitor.hpp"
 
 #include 
-#include 
 #include 
 
 #include 
@@ -80,6 +79,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace std;
 using namespace osl;
@@ -156,14 +156,12 @@ ZipPackage::ZipPackage ( const uno::Reference < 
XComponentContext > &xContext )
 , m_bAllowRemoveOnInsert( true )
 , m_eMode ( e_IMode_None )
 , m_xContext( xContext )
-, m_pZipFile( nullptr )
 {
 m_xRootFolder = new ZipPackageFolder( m_xContext, m_nFormat, 
m_bAllowRemoveOnInsert );
 }
 
 ZipPackage::~ZipPackage()
 {
-delete m_pZipFile;
 }
 
 bool ZipPackage::isLocalFile() const
@@ -734,7 +732,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< 
Any >& aArguments )
 OUString message;
 try
 {
-m_pZipFile = new ZipFile ( m_xContentStream, m_xContext, true, 
m_bForceRecovery );
+m_pZipFile = o3tl::make_unique(m_xContentStream, 
m_xContext, true, m_bForceRecovery);
 getZipFileContents();
 }
 catch ( IOException & e )
@@ -749,14 +747,14 @@ void SAL_CALL ZipPackage::initialize( const 
uno::Sequence< Any >& aArguments )
 }
 catch ( Exception & )
 {
-if( m_pZipFile ) { delete m_pZipFile; m_pZipFile = nullptr; }
+m_pZipFile.reset();
 throw;
 }
 
 if ( bBadZipFile )
 {
 // clean up the memory, and tell the UCB about the error
-if( m_pZipFile ) { delete m_pZipFile; m_pZipFile = nullptr; }
+m_pZipFile.reset();
 
 throw css::packages::zip::ZipIOException (
 THROW_WHERE "Bad Zip File, " + message,
@@ -1104,7 +1102,7 @@ void ZipPackage::ConnectTo( const uno::Reference< 
io::XInputStream >& xInStream
 if ( m_pZipFile )
 m_pZipFile->setInputStream( m_xContentStream );
 else
-m_pZipFile = new ZipFile ( m_xContentStream, m_xContext, false );
+m_pZipFile = o3tl::make_unique(m_xContentStream, m_xContext, 
false);
 }
 
 namespace
commit e5dc4ab7a023b003d312ea6f12e647353335
Author: Kohei Yoshida 
Date:   Wed Jan 11 17:08:50 2017 -0500

Not worth having this as a separate data member.

It is the same as the input stream instance, and it is only used in
one call site.

Change-Id: If52209420462aec7ec3dbc180e05f09603acaea1

diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index bac0168..962733c 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -61,7 +61,6 @@ class ZipFile
 ByteGrabber aGrabber;
 ZipUtils::Inflater aInflater;
 css::uno::Reference < css::io::XInputStream > xStream;
-css::uno::Reference < css::io::XSeekable > xSeek;
 const css::uno::Reference < css::uno::XComponentContext > m_xContext;
 
 bool bRecoveryMode;
diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 49264b0..6b397c6 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -72,7 +72,6 @@ ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, 
const uno::Reference
 : aGrabber(xInput)
 , aInflater( true )
 , xStream(xInput)
-, xSeek(xInput, UNO_QUERY)
 , m_xContext ( rxContext )
 , bRecoveryMode( false )
 {
@@ -90,7 +89,6 @@ ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, 
const uno::Reference
 : aGrabber(xInput)
 , aInflater( true )
 , xStream(xInput)
-, xSeek(xInput, UNO_QUERY)
 , m_xContext ( rxContext )
 , bRecoveryMode( bForceRecovery )
 {
@@ -118,7 +116,6 @@ void ZipFile::setInputStream ( const uno::Reference < 
XInputStream

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

2017-01-11 Thread Christian Lohmaier

Tag 'libreoffice-5.2.5.1' created by Christian Lohmaier 
 at 2017-01-12 00:54 +

Tag libreoffice-5.2.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYdtPVAAoJEPQ0oe+v7q6jXGEP/jTciNr2I38ygAFtKAYCpW9R
n2hUnJ0uUwjwRHCvJY/9/5oqBhjYFZyse2c2hwqPGR3uw3jTjrPAqe4oduWJ+/i9
lNXmOWRpLMrbZ5s58AO8Cvmxyik95ZWwSc/Wkk/4L8txZUKyDDQYwF2bTAP6O54u
EvipjYDdoQ63dAGBkMujNOdw7jeAWQSIVHcu/9UqFT568WyMdOChax9muFsGUITH
EyXB42vRIO5xh4EDI27thleW69I0aw5W2tOUH5Dc9qG5BQ1bS5XVWwdGIUUoBQcQ
eRzEirAWNidDOoyhSNa8dO9PgyfKtk/E3qYRcp7o12M3r9K4yS++7iouvZcM1gfk
sTJvuypj1i7aRmvMvSXXn1di8tdIjdY0USr84JUoyV+St9YYJKucYPqRy2NUPIxn
lcTNIvxulbE5Bj4yHNMIwifhL3Ru81gTpfndIC/T/Jjc7ldRfRurejNQtF13+3hw
NHokGkYD8cyWnBxxMhpnEutQup4WcoBcJIw9uPDm7gXSwkeW/g6AFjxmUA8Hi5OZ
nvTkXA6kbxtYz5m8BNpeKxhqniLgo92h01GsDgNOu0y0R/OEML6kZ/Kdyt4wIo/9
uWMkDhWvKDJ9IQR8nXIJD7a4IGERBYDB4YCbi5TsjdaxLSITyM7oCKtwXVpu0bwy
L6cHxMhF49ToqKW8AhbN
=ub9x
-END PGP SIGNATURE-

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

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

2017-01-11 Thread Christian Lohmaier

Tag 'libreoffice-5.2.5.1' created by Christian Lohmaier 
 at 2017-01-12 00:54 +

Tag libreoffice-5.2.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYdtPPAAoJEPQ0oe+v7q6j714QAIkPbob6VoTMeFF3/t1aAvmh
uTM4jJciSU0YRZqfutMm4yny0pTbN4EtU7PRKiQNSC0zlTZJhX9TMdsFXwG3Plpg
WhTFVk3lZXPqbrqHv94DDNCKU9CK40s6hjgMZgBuO2l2gdS5r98dy/PFLacCxDX3
7gUTKBKq/96TPp6XlWX3/nMbOVCs70SGQje0Jfdtcc6iVCxL+muQszvvZup0gHqX
VlSKpWOLWZGn8tiXZnpWGSHo9JpZLhV48O6L48wCtkz6+uIN+rIQ9oSZ+wAk/qMM
A0KRy17H+hA2BKEsCk+7P4z/Z1QbTSTQ7FZnLbcuYigZEGEURZFQ/eZP20LSqeFR
udxGl6pQjbAYmX2U3VrBS06d030FpZHOTLiZa+UBUAoc4pDx8UobTyP+V4vrvbxp
hFOrWnhq/WTtB8Ku5dN7GX8EX1maWKwSMlmiFVKH3P9V7zBW7fO3IfK8dN8UBDzI
2/4bUVN53Np9B3wmxIgs4tDsI4lelggWKJWz2FIuWyAhZK8iSlAm7vmXHOePPdtk
BhatDL6S+C/7rqlJ5eCFzSRUrsVMVxyxURElPPwdrxZmMZGt8pUXXBRI4oVCOnA1
pgIMy8kOQVR6dzcEjx9Z9W4hHwVjfbfHpsd/OhXD5vet5UdBT7iy+LY7CsSyHhwG
PiDBWam7brlBW50xMDu1
=bzB/
-END PGP SIGNATURE-

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

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

2017-01-11 Thread Christian Lohmaier

Tag 'libreoffice-5.2.5.1' created by Christian Lohmaier 
 at 2017-01-12 00:54 +

Tag libreoffice-5.2.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYdtPcAAoJEPQ0oe+v7q6jIt0P/iFfeBJQsXxLvHVhQyGvkCHw
3ohLouSdnqSMZdh4SQgIe+HZ+Y9mghQNqhRL80eH4s5EhHHVBbnEDb3PB/hGZxo8
OT67EGfgsucmn6yDjKF8VFtmKyhe4vH6rGJKIht86dXJW1Wht2cCN/o8CUwnHiw+
RG+573penu6ssTbUuNvVn0JO3/36lNjzrXBh70u4lVPeCiEgQM+5JPQF3KY3hLA6
hLM0sQ5HyLUKkIbF0YjnxdomyU/5nJg02eB9EAcRqcgvwuYeQ/po6gpNBr0sKTRN
Y7uLygg95oGeK+LM/Y+MDhwrygqn7P/HxVykoaBKtF6yiClluMdUtHavbXp2imjl
OmQwL1jiSrSRG5+UKvWsrTlfw+guxFpDfQMoPN4AE661O1k9l41Qr53wsYiR6C+z
s4wUpLwDqVNu0gTVc9DdUrEOKuLu7u82jqF8vpkUE1+M8JgKRIOBbr1Ip+ZqPh8n
LCE33Xp2z+gJEmCihiopsAj1It8Hj2wiUqmZR6Ms4nMGKVuljyKNkhkgBJYIiFfD
j3NpeDmAb6mS8g/Gaj7m0YK4FsL6Rxk5bWQ/3VouTPOS98j5SaAY4vGqB23XdrmA
7wqoVvxTKOvi/LYcxLZExhXokJaaAPv3ihr931X0fH1GxI/maemUo3ndX9FCjGrN
7KrqP7n4EJORbX6GVI85
=iK0J
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-5' - configure.ac

2017-01-11 Thread Christian Lohmaier

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

New commits:
commit 73b6483123d3137665813b5b6e03fa7693c942c3
Author: Christian Lohmaier 
Date:   Thu Jan 12 01:55:18 2017 +0100

bump product version to 5.2.5.1.0+

Change-Id: Idb43b0caf384217c43a3ccad3b20c58f4177b00f

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

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

2017-01-11 Thread Christian Lohmaier

Tag 'libreoffice-5.2.5.1' created by Christian Lohmaier 
 at 2017-01-12 00:54 +

Tag libreoffice-5.2.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYdtPZAAoJEPQ0oe+v7q6jCYUP/jTL83rlWNuxVAnecOh13kS2
Oo9Ct4c8UOjxfNw6yCUfZofrg0qqyLqRR6wDrem0zJFfNgrw+GNmOXjvdxqBWQVu
pePPL+Hve060xusFae/NB1KCCg4Q4uAScYkUvgifYVPtsLb+ycYLy8nzjABnLVGB
16oXFJJYMKi7FIysvmGmnd0IpQvaUKwaBqPWKMVr4BDm9bWTNbrmkPD9x3CZn98u
snHgSRdOfB31c3KyhKC7HXQDZ810RmuE5N/MPBSMwZqeGq1vqmZSQb736foM3lNh
ZsF9kiPCd5YfVnlaqmHJ0yIVPSLaCk3MzqSwiIVUr2UdOviLq51umw5crFTOx3mY
i2VU089OxIITQ2fxKt1mGpi4FW97/SeqO5rkp6SWjmYzSITmGf8FpbwR46XS9CHm
khnPdj3TVcu1wGAzDQmFZNPJ9y2LVpwLHRVVOxygMfxHBIQPNnN8O7rEf3VjfqW9
C7bI0tUwWU/JlR/hgQT6SSy96tj+/4HGKbw0L4jpgmnBgDJhIkzattCHNq6wL0f2
CC0LrCMy6zSXqG7CbU8hSD5pSFrYyUnwHUQIDiPvoAYd2bhPl1zqy0uBeUJDzrla
u8j+IjXIlUbUPK5jYU27udl78LFka19ylyDM90ZqdGGTVZM4rfVQp7ldEo0s+Y78
ItS9fm/mYhaO2uwLDnv7
=hAAQ
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - configure.ac

2017-01-11 Thread Christian Lohmaier

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

New commits:
commit b5b8fa0f1d01de4577193acc41f0df71021d
Author: Christian Lohmaier 
Date:   Thu Jan 12 01:52:06 2017 +0100

bump product version to 5.2.6.0.0+

Change-Id: I5486ee53c9e87c62bb312caf8b5a8340dfa94e11

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

[Libreoffice-commits] core.git: Changes to 'libreoffice-5-2-5'

2017-01-11 Thread Christian Lohmaier

New branch 'libreoffice-5-2-5' available with the following commits:
commit 710c06144b911d34dc52818f3117606f3c3bee63
Author: Christian Lohmaier 
Date:   Thu Jan 12 01:49:39 2017 +0100

Branch libreoffice-5-2-5

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

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

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

Change-Id: Ic9645219a607c0a669b14d77b72a5d741b4eb8e8

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-5-2-5'

2017-01-11 Thread Christian Lohmaier

New branch 'libreoffice-5-2-5' available with the following commits:
commit 938af4497a92a4d55b2cca34b520db27675cc362
Author: Christian Lohmaier 
Date:   Thu Jan 12 01:49:11 2017 +0100

Branch libreoffice-5-2-5

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

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

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

Change-Id: I5c46ef825038374fb39f77c573998ed6c9dd01a5

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-2-5'

2017-01-11 Thread Christian Lohmaier

New branch 'libreoffice-5-2-5' available with the following commits:
commit cfbbb4dd65b07901d8c7c49161d4d907fc8c4aea
Author: Christian Lohmaier 
Date:   Thu Jan 12 01:49:11 2017 +0100

Branch libreoffice-5-2-5

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

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

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

Change-Id: I5b12d95816bf3fd77a6f86d171e31f3d5994f6fd

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-2-5'

2017-01-11 Thread Christian Lohmaier

New branch 'libreoffice-5-2-5' available with the following commits:
commit 01da5b657197d34fb518566fe0d48c42614cfc94
Author: Christian Lohmaier 
Date:   Thu Jan 12 01:49:11 2017 +0100

Branch libreoffice-5-2-5

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

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

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

Change-Id: I65b0ec54b64e7f01112de60638a303c6610e4fa9

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

2017-01-11 Thread Michael Stahl

 sd/source/ui/view/Outliner.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5f081ce502e5528049fc76657d623afcee24
Author: Michael Stahl 
Date:   Wed Jan 11 17:17:27 2017 +0100

tdf#105182 sd: avoid iterating too far in SdOutliner::Initialize()

Considering the valid indexes are extended by "-1" for backwards
iterators and "size()" for forward iterators, it's obvious that a
not-yet-at-the-end-in-the-other-direction iterator can be incremented
once, but not necessarily twice.

Why this code even wants to increment it twice isn't obvious to me.

Change-Id: I578c8c6202049ebe6dbed41b8276a6bfa0566bbc
(cherry picked from commit aa1ee198b5b55d0a92418eb3294c93553e8513dd)
Reviewed-on: https://gerrit.libreoffice.org/32975
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f4d6839..42d4a20 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -580,7 +580,10 @@ void Outliner::Initialize (bool bDirectionIsForward)
 // The iterator has pointed to the object one ahead/before the 
current
 // one.  Now move it to the one before/ahead the current one.
 ++maObjectIterator;
-++maObjectIterator;
+if (maObjectIterator != 
sd::outliner::OutlinerContainer(this).end())
+{
+++maObjectIterator;
+}
 }
 
 mbMatchMayExist = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Tor Lillqvist

 solenv/bin/macosx-codesign-app-bundle |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a6216119be2c32e9031c6bb9b7dfa07f0468d813
Author: Tor Lillqvist 
Date:   Thu Jan 12 01:40:37 2017 +0200

Always exit with error if codesign fails

That sanity check was added in
615fae2f67028f3c5c51c70c77dbaa9b9f3856d6 but we lost it at some stage.

The codesigning script has a very confusing history, in part caused by
its use for two purposes, when building for the Mac App Store and when
building for a TDF style distribution on a dmg disk image. Those who
work with the former and those who work with the latter haven't
necessarily checked that it doesn't break for the other case. Sorry.

Change-Id: I79011302f60b1f6551328c8b80e00f5d3698504c

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index c48f60e..c2a6db3f 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -55,7 +55,7 @@ done
 find "$APP_BUNDLE/Contents/MacOS" -type f |
 while read file; do
 id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
-codesign --force --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id 
--sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file"
+codesign --force --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id 
--sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file" || exit 1
 done
 
 # Sign included bundles. First .app ones (i.e. the Python.app inside
@@ -67,7 +67,7 @@ while read app; do
 fn=${fn%.*}
 # Assume the app has a XML (and not binary) Info.plist
 id=`grep -A 1 'CFBundleIdentifier' $app/Contents/Info.plist | 
tail -1 | sed -e 's,.*,,' -e 's,.*,,'`
-codesign --verbose --identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" 
$entitlements "$app"
+codesign --verbose --identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" 
$entitlements "$app" || exit 1
 done
 
 # Then .framework ones. Again, be generic just for kicks.
@@ -80,7 +80,7 @@ while read framework; do
 if test ! -L "$version" -a -d "$version"; then
# Assume the framework has a XML (and not binary) Info.plist
id=`grep -A 1 'CFBundleIdentifier' 
$version/Resources/Info.plist | tail -1 | sed -e 's,.*,,' -e 
's,.*,,'`
-codesign --verbose --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$version"
+codesign --verbose --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$version" || exit 1
 fi
 done
 done
@@ -89,7 +89,7 @@ done
 
 find "$APP_BUNDLE" -name '*.mdimporter' -type d |
 while read bundle; do
-codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$bundle"
+codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$bundle" || exit 1
 done
 
 # Sign the app bundle as a whole which means (re-)signing the
@@ -106,6 +106,6 @@ done
 
 id=`echo ${PRODUCTNAME} | tr ' ' '-'`
 
-codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}" --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE"
+codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}" --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE" || exit 1
 
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Tor Lillqvist

 solenv/bin/macosx-codesign-app-bundle |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 3e7e4df5a47b8d94ab86a8d6d0df38b1f282f980
Author: Tor Lillqvist 
Date:   Thu Jan 12 01:33:05 2017 +0200

CodesignRules.plist was removed in 615fae2f67028f3c5c51c70c77dbaa9b9f3856d6

Change-Id: Ibde5189ecf09ec8dfaf3223683c5480974084865

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index e7942eb..c48f60e 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -28,10 +28,7 @@ if test -n "$ENABLE_MACOSX_SANDBOX"; then
 # through that. I think.
 other_files=''
 else
-# In a non-sandboxed build (distributed outside the App Store)
-# we traditionally have use --resource-rules. Let's not touch that?
-resource_rules="--resource-rules 
$SRCDIR/setup_native/source/mac/CodesignRules.plist"
-# And there we then want to sign data files, too, hmm.
+# We then want to sign data files, too, hmm.
 other_files="\
  -or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
  -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name 
'LICENSE.html' \
@@ -109,6 +106,6 @@ done
 
 id=`echo ${PRODUCTNAME} | tr ' ' '-'`
 
-codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}" 
$resource_rules --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements 
"$APP_BUNDLE"
+codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}" --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE"
 
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Jochen Nitschke

 sc/source/filter/oox/querytablebuffer.cxx |8 
 sc/source/filter/oox/worksheethelper.cxx  |   15 +++
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 88f561204d7cee25633df8117cc8d7e1ebd8e9ad
Author: Jochen Nitschke 
Date:   Wed Jan 11 14:30:11 2017 +0100

tdf#48140 replace CellAddress in xlsx import (3)

Change-Id: Ie56cea7fdee7ff6c9e72880e56f9e31ce5f7e03b
Reviewed-on: https://gerrit.libreoffice.org/32970
Reviewed-by: Jochen Nitschke 
Tested-by: Jochen Nitschke 

diff --git a/sc/source/filter/oox/querytablebuffer.cxx 
b/sc/source/filter/oox/querytablebuffer.cxx
index d561493..aa973a7 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -99,7 +99,7 @@ OUString lclBuildWebQueryTables( const 
WebPrModel::TablesVector& rTables )
 }
 
 Reference< XAreaLink > lclFindAreaLink(
-const Reference< XAreaLinks >& rxAreaLinks, const CellAddress& 
rDestPos,
+const Reference< XAreaLinks >& rxAreaLinks, const ScAddress& rDestPos,
 const OUString& rFileUrl, const OUString& rTables, const OUString& 
rFilterName, const OUString& rFilterOptions )
 {
 try
@@ -112,7 +112,7 @@ Reference< XAreaLink > lclFindAreaLink(
 PropertySet aPropSet( xAreaLink );
 CellRangeAddress aDestArea = xAreaLink->getDestArea();
 OUString aString;
-if( (rDestPos.Sheet == aDestArea.Sheet) && (rDestPos.Column == 
aDestArea.StartColumn) && (rDestPos.Row == aDestArea.StartRow) &&
+if( (rDestPos.Tab() == aDestArea.Sheet) && (rDestPos.Col() == 
aDestArea.StartColumn) && (rDestPos.Row() == aDestArea.StartRow) &&
 (rTables == xAreaLink->getSourceArea()) &&
 aPropSet.getProperty( aString, PROP_Url ) && (rFileUrl == 
aString) &&
 aPropSet.getProperty( aString, PROP_Filter ) && 
(rFilterName == aString) &&
@@ -233,13 +233,13 @@ void QueryTable::finalizeImport()
 OSL_ENSURE( bIsRange, "QueryTable::finalizeImport - 
defined name does not contain valid cell range" );
 if( bIsRange && getAddressConverter().checkCellRange( 
aDestRange, false, true ) )
 {
-CellAddress aDestPos( aDestRange.aStart.Tab(), 
aDestRange.aStart.Col(), aDestRange.aStart.Row() );
 // find tables mode: entire document, all tables, or 
specific tables
 OUString aTables = pWebPr->mbHtmlTables ? 
lclBuildWebQueryTables( pWebPr->maTables ) : "HTML_all";
 if( !aTables.isEmpty() ) try
 {
 PropertySet aDocProps( getDocument() );
 Reference< XAreaLinks > xAreaLinks( 
aDocProps.getAnyProperty( PROP_AreaLinks ), UNO_QUERY_THROW );
+CellAddress aDestPos( aDestRange.aStart.Tab(), 
aDestRange.aStart.Col(), aDestRange.aStart.Row() );
 OUString aFilterName = "calc_HTML_WebQuery";
 OUString aFilterOptions;
 xAreaLinks->insertAtPosition( aDestPos, aFileUrl, 
aTables, aFilterName, aFilterOptions );
@@ -247,7 +247,7 @@ void QueryTable::finalizeImport()
 sal_Int32 nRefreshPeriod = 
xConnection->getModel().mnInterval * 60;
 if( nRefreshPeriod > 0 )
 {
-PropertySet aPropSet( lclFindAreaLink( 
xAreaLinks, aDestPos, aFileUrl, aTables, aFilterName, aFilterOptions ) );
+PropertySet aPropSet( lclFindAreaLink( 
xAreaLinks, aDestRange.aStart, aFileUrl, aTables, aFilterName, aFilterOptions ) 
);
 aPropSet.setProperty( PROP_RefreshPeriod, 
nRefreshPeriod );
 }
 }
diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index f739be3..d3a2811 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -337,7 +337,7 @@ private:
 /** Generates the final URL for the passed hyperlink. */
 OUStringgetHyperlinkUrl( const HyperlinkModel& rHyperlink ) 
const;
 /** Inserts a hyperlinks into the specified cell. */
-void insertHyperlink( const CellAddress& rAddress, const OUString& rUrl );
+void insertHyperlink( const ScAddress& rAddress, const OUString& rUrl );
 
 /** Inserts all imported data validations into their cell ranges. */
 voidfinalizeValidationRanges() const;
@@ -961,8 +961,8 @@ void WorksheetGlobals::finalizeHyperlinkRanges()
 OUString aUrl = getHyperlinkUrl( *aIt );
 // try to insert URL into each cell of the range
 if( !aUrl.isEmpty() )
-for( CellAddress aAddress( getSheetIndex(), 
aIt->maRange.aStart.Col(), aIt

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

2017-01-11 Thread Jochen Nitschke

 sc/source/filter/inc/drawingfragment.hxx |2 +-
 sc/source/filter/oox/commentsbuffer.cxx  |2 +-
 sc/source/filter/oox/drawingfragment.cxx |   11 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 34006130756be2cec73a623cf65b3e71493276a1
Author: Jochen Nitschke 
Date:   Wed Jan 11 14:22:24 2017 +0100

tdf#48140 replace CellAddress in xlsx import (2)

Change-Id: I14bf283fe8a795944a08a4cde2fff3d670f6e3ed
Reviewed-on: https://gerrit.libreoffice.org/32969
Reviewed-by: Jochen Nitschke 
Tested-by: Jochen Nitschke 

diff --git a/sc/source/filter/inc/drawingfragment.hxx 
b/sc/source/filter/inc/drawingfragment.hxx
index e9a29d2..d4000e8 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -144,7 +144,7 @@ public:
 explicitVmlDrawing( const WorksheetHelper& rHelper );
 
 /** Returns the drawing shape for a cell note at the specified position. */
-const ::oox::vml::ShapeBase* getNoteShape( const css::table::CellAddress& 
rPos ) const;
+const ::oox::vml::ShapeBase* getNoteShape( const ScAddress& rPos ) const;
 
 /** Filters cell note shapes. */
 virtual boolisShapeSupported( const ::oox::vml::ShapeBase& rShape 
) const override;
diff --git a/sc/source/filter/oox/commentsbuffer.cxx 
b/sc/source/filter/oox/commentsbuffer.cxx
index d164f54..568d380 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -162,7 +162,7 @@ void Comment::finalizeImport()
 }
 
 // convert shape formatting and visibility
-if( const ::oox::vml::ShapeBase* pNoteShape = 
getVmlDrawing().getNoteShape( aNotePos ) )
+if( const ::oox::vml::ShapeBase* pNoteShape = 
getVmlDrawing().getNoteShape( maModel.maRange.aStart ) )
 {
 // position and formatting
 pNoteShape->convertFormatting( xAnnoShape );
diff --git a/sc/source/filter/oox/drawingfragment.cxx 
b/sc/source/filter/oox/drawingfragment.cxx
index 7c22093..67b2427 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::oox::core;
@@ -313,7 +312,7 @@ namespace {
 class VmlFindNoteFunc
 {
 public:
-explicitVmlFindNoteFunc( const CellAddress& rPos );
+explicitVmlFindNoteFunc( const ScAddress& rPos );
 booloperator()( const ::oox::vml::ShapeBase& rShape ) 
const;
 
 private:
@@ -321,9 +320,9 @@ private:
 sal_Int32   mnRow;
 };
 
-VmlFindNoteFunc::VmlFindNoteFunc( const CellAddress& rPos ) :
-mnCol( rPos.Column ),
-mnRow( rPos.Row )
+VmlFindNoteFunc::VmlFindNoteFunc( const ScAddress& rPos ) :
+mnCol( rPos.Col() ),
+mnRow( rPos.Row() )
 {
 }
 
@@ -409,7 +408,7 @@ VmlDrawing::VmlDrawing( const WorksheetHelper& rHelper ) :
 maListBoxFont.monSize = 160;
 }
 
-const ::oox::vml::ShapeBase* VmlDrawing::getNoteShape( const CellAddress& rPos 
) const
+const ::oox::vml::ShapeBase* VmlDrawing::getNoteShape( const ScAddress& rPos ) 
const
 {
 return getShapes().findShape( VmlFindNoteFunc( rPos ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - i18npool/source

2017-01-11 Thread Eike Rathke

 i18npool/source/localedata/data/de_CH.xml |   17 -
 i18npool/source/localedata/data/de_LI.xml |   17 -
 i18npool/source/localedata/data/fr_CH.xml |   17 -
 i18npool/source/localedata/data/it_CH.xml |   17 -
 4 files changed, 48 insertions(+), 20 deletions(-)

New commits:
commit 771fad2dfe556a5c47ccd5e987fc304350600557
Author: Eike Rathke 
Date:   Wed Jan 11 13:43:50 2017 +0100

Resolves: tdf#105209 CHF currency symbol is CHF instead of SFr.

Change-Id: Ic216c7b901bf6da779e161f35e5143739267b066
(cherry picked from commit 28a0737f8c21e5c9f789af328348e51b6044c28c)
Reviewed-on: https://gerrit.libreoffice.org/32966
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/de_CH.xml 
b/i18npool/source/localedata/data/de_CH.xml
index 7e6eb88..5b2ac1f 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -87,22 +87,22 @@
   0.00%
 
 
-  [$SFr.-807] #'##0;[$SFr.-807] -#'##0
+  [$CHF-807] #'##0;[$CHF-807] -#'##0
 
 
-  [$SFr.-807] #'##0.00;[$SFr.-807] -#'##0.00
+  [$CHF-807] #'##0.00;[$CHF-807] -#'##0.00
 
 
-  [$SFr.-807] #'##0;[RED][$SFr.-807] -#'##0
+  [$CHF-807] #'##0;[RED][$CHF-807] -#'##0
 
 
-  [$SFr.-807] #'##0.00;[RED][$SFr.-807] -#'##0.00
+  [$CHF-807] #'##0.00;[RED][$CHF-807] -#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$SFr.-807] #'##0.--;[RED][$SFr.-807] -#'##0.--
+  [$CHF-807] #'##0.--;[RED][$CHF-807] -#'##0.--
 
 
   T.MM.JJ
@@ -203,6 +203,13 @@
   
 
   CHF
+  CHF
+  CHF
+  Schweizer Franken
+  2
+
+
+  CHF
   SFr.
   CHF
   Schweizer Franken
diff --git a/i18npool/source/localedata/data/de_LI.xml 
b/i18npool/source/localedata/data/de_LI.xml
index 7247669..d368c05 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -87,22 +87,22 @@
   0.00%
 
 
-  [$SFr.-1407] #'##0;[$SFr.-1407]-#'##0
+  [$CHF-1407] #'##0;[$CHF-1407]-#'##0
 
 
-  [$SFr.-1407] #'##0.00;[$SFr.-1407]-#'##0.00
+  [$CHF-1407] #'##0.00;[$CHF-1407]-#'##0.00
 
 
-  [$SFr.-1407] #'##0;[ROT][$SFr.-1407]-#'##0
+  [$CHF-1407] #'##0;[ROT][$CHF-1407]-#'##0
 
 
-  [$SFr.-1407] #'##0.00;[ROT][$SFr.-1407]-#'##0.00
+  [$CHF-1407] #'##0.00;[ROT][$CHF-1407]-#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$SFr.-1407] #'##0.--;[ROT][$SFr.-1407]-#'##0.--
+  [$CHF-1407] #'##0.--;[ROT][$CHF-1407]-#'##0.--
 
 
   TT.MM.JJ
@@ -203,6 +203,13 @@
   
 
   CHF
+  CHF
+  CHF
+  Schweizer Franken
+  2
+
+
+  CHF
   SFr.
   CHF
   Schweizer Franken
diff --git a/i18npool/source/localedata/data/fr_CH.xml 
b/i18npool/source/localedata/data/fr_CH.xml
index 907d517..a2a51fc 100644
--- a/i18npool/source/localedata/data/fr_CH.xml
+++ b/i18npool/source/localedata/data/fr_CH.xml
@@ -88,22 +88,22 @@
   0.00%
 
 
-  [$sFr.-100C] #'##0;[$sFr.-100C] -#'##0
+  [$CHF-100C] #'##0;[$CHF-100C] -#'##0
 
 
-  [$sFr.-100C] #'##0.00;[$sFr.-100C] -#'##0.00
+  [$CHF-100C] #'##0.00;[$CHF-100C] -#'##0.00
 
 
-  [$sFr.-100C] #'##0;[RED][$sFr.-100C] -#'##0
+  [$CHF-100C] #'##0;[RED][$CHF-100C] -#'##0
 
 
-  [$sFr.-100C] #'##0.00;[RED][$sFr.-100C] 
-#'##0.00
+  [$CHF-100C] #'##0.00;[RED][$CHF-100C] -#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$sFr.-100C] #'##0.--;[RED][$sFr.-100C] 
-#'##0.--
+  [$CHF-100C] #'##0.--;[RED][$CHF-100C] -#'##0.--
 
 
   J.MM.AA
@@ -204,6 +204,13 @@
   
 
   CHF
+  CHF
+  CHF
+  franc suisse
+  2
+
+
+  CHF
   sFr.
   CHF
   franc suisse
diff --git a/i18npool/source/localedata/data/it_CH.xml 
b/i18npool/source/localedata/data/it_CH.xml
index a71019c..1514c67 100644
--- a/i18npool/source/localedata/data/it_CH.xml
+++ b/i18npool/source/localedata/data/it_CH.xml
@@ -87,22 +87,22 @@
   0.00%
 
 
-  [$SFr.-810] #'##0;[$SFr.-810] -#'##0
+  [$CHF-810] #'##0;[$CHF-810] -#'##0
 
 
-  [$SFr.-810] #'##0.00;[$SFr.-810] -#'##0.00
+  [$CHF-810] #'##0.00;[$CHF-810] -#'##0.00
 
 
-  [$SFr.-810] #'##0;[RED][$SFr.-810] -#'##0
+  [$CHF-810] #'##0;[RED][$CHF-810] -#'##0
 
 
-  [$SFr.-810] #'##0.00;[RED][$SFr.-810] -#'##0.00
+  [$CHF-810] #'##0.00;[RED][$CHF-810] -#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$SFr.-810] #'##0.--;[RED][$SFr.-810] -#'##0.--
+  [$CHF-810] #'##0.--;[RED][$CHF-810] -#'##0.--
 
 
   G.MM.AA
@@ -203,6 +203,13 @@
   
 
   CHF
+  CHF
+  CHF
+  Franco Svizzero
+  2
+
+
+  CHF
   SFr.
   CHF
   Franco Svizzero
_

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

2017-01-11 Thread Jan-Marek Glogowski

 sw/inc/IDocumentFieldsAccess.hxx |2 +
 sw/source/core/doc/DocumentFieldsManager.cxx |   33 +++
 sw/source/core/inc/DocumentFieldsManager.hxx |1 
 sw/source/uibase/dbui/dbmgr.cxx  |   45 +++
 4 files changed, 68 insertions(+), 13 deletions(-)

New commits:
commit bbb2a2bac5486b9a9b9d7061f058defc11fc447f
Author: Jan-Marek Glogowski 
Date:   Thu Sep 1 20:35:51 2016 +0200

tdf#101841 MM correctly account record selections

Don't reset the pParam->xResultSet for selections when querying
the result count. This actually resets the selection.

 * MM just increment after a successful next record

This correctly counts the record id from 1, while using 0
for the first item in the selection array.

(cherry picked from commit 178a23a827f16e046e5d5efb2aa2aa3fc990452a)

 * MM account next record fields for progress dialog

When calculating the maximum document count, we were not accounting
"next record" fields in the document, like in labels etc.

Also any selection of records was ignored.

Fixes accounting part of tdf#101841.

(cherry picked from commit 260cd3aeea2d02507dd131ee2028c4f48f7562f8)

Change-Id: I458e9e2e1af122f8324bcd873fd35ffcf89d62d3
Reviewed-on: https://gerrit.libreoffice.org/32184
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index f9b116b..6280e9a 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -130,6 +130,8 @@ namespace com { namespace sun { namespace star { namespace 
uno { class Any; } }
 
 virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) = 
0;
 
+virtual sal_Int32 GetRecordsPerDocument() const = 0;
+
 protected:
 virtual ~IDocumentFieldsAccess() {};
  };
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx 
b/sw/source/core/doc/DocumentFieldsManager.cxx
index 8c63866..f99ad75 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -913,7 +913,6 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* 
pUpdateField, bool bUp
 SwSection* pSect = const_cast((*it)->GetSection());
 if( pSect )
 {
-
 SwSbxValue aValue = aCalc.Calculate(
 pSect->GetCondition() );
 if(!aValue.IsVoidValue())
@@ -1186,6 +1185,38 @@ void DocumentFieldsManager::UpdateUsrFields()
 }
 }
 
+sal_Int32 DocumentFieldsManager::GetRecordsPerDocument() const
+{
+sal_Int32 nRecords = 1;
+
+mpUpdateFields->MakeFieldList( m_rDoc, true, GETFLD_ALL );
+if( mpUpdateFields->GetSortLst()->empty() )
+return nRecords;
+
+for( SetGetExpFields::const_iterator it = 
mpUpdateFields->GetSortLst()->begin();
+it != mpUpdateFields->GetSortLst()->end(); ++it )
+{
+const SwTextField *pTextField = (*it)->GetTextField();
+if( !pTextField )
+continue;
+
+const SwFormatField &pFormatField = pTextField->GetFormatField();
+const SwField* pField = pFormatField.GetField();
+
+switch( pField->GetTyp()->Which() )
+{
+case RES_DBNEXTSETFLD:
+case RES_DBNUMSETFLD:
+nRecords++;
+break;
+default:
+break;
+}
+}
+
+return nRecords;
+}
+
 void DocumentFieldsManager::UpdatePageFields( SfxPoolItem* pMsgHint )
 {
 for( SwFieldTypes::size_type i = 0; i < INIT_FLDTYPES; ++i )
diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx 
b/sw/source/core/inc/DocumentFieldsManager.hxx
index a5facc6..fc6f9af 100644
--- a/sw/source/core/inc/DocumentFieldsManager.hxx
+++ b/sw/source/core/inc/DocumentFieldsManager.hxx
@@ -60,6 +60,7 @@ public:
 virtual bool IsNewFieldLst() const override;
 virtual void SetNewFieldLst( bool bFlag) override;
 virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) 
override;
+virtual sal_Int32 GetRecordsPerDocument() const override;
 
 //Non Interface methods
 
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index fe9e87f..c5b5123 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -177,10 +177,14 @@ static SfxObjectShell* lcl_CreateWorkingDocument(
 SwDBManager** const pDBManager,
 SwView** const pView, SwWrtShell** const pWrtShell, SwDoc** const pDoc );
 
-static bool lcl_getCountFromResultSet( sal_Int32& rCount, const 
uno::Reference& xResultSet )
+static bool lcl_getCountFromResultSet( sal_Int32& rCount, const SwDSParam* 
pParam )
 {
-uno::Reference xPrSet(xResultSet, uno::UNO_QUERY);
-if(xPrSet.is())
+rCount = pParam->aSelection.getLength();
+if ( rCount > 0 )
+return true;
+
+uno::Reference xPrSet(pParam->xResultSet, 
uno::UNO_QUERY);
+if ( xP

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

2017-01-11 Thread Eike Rathke

 sc/inc/formulacell.hxx  |9 +++-
 sc/source/core/data/column.cxx  |2 -
 sc/source/core/data/formulacell.cxx |   40 
 sc/source/core/tool/refdata.cxx |4 +++
 4 files changed, 45 insertions(+), 10 deletions(-)

New commits:
commit 33c1491acb3fd6b87ac16d80ed728f423762e867
Author: Eike Rathke 
Date:   Mon Jan 9 19:47:06 2017 +0100

Resolves: tdf#104711 adjust range reference constructed of named anchors

A constructed range reference of named anchors (i.e. extended during
expression compilation) forms a range listened at that needs to be
adjusted if the cell is shifted and one or both anchor parts are
individually named relative references.

Currently the resulting range (ScComplexRefData aka DoubleRef) does not
know to distinguish between whether its anchors are the result of a
literal range in a named expression or the result of individually named
anchors, so such RelName DoubleRef needs to be adjusted unconditionally
when shifting or moving the formula cell.

Change-Id: I75e2cc79ac60116671acce7641567337d5f5f7ed
(cherry picked from commit 439b2a134218b93e6ca9fa23005b89c19498f586)
Reviewed-on: https://gerrit.libreoffice.org/32924
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index faebe08..c31c1a1 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -241,7 +241,14 @@ public:
It is similar to HasOneReference(), but more general.
  */
 bool HasRefListExpressibleAsOneReference(ScRange& rRange) const;
-boolHasRelNameReference() const;
+
+enum class RelNameRef
+{
+NONE,   ///< no relative reference from named expression
+SINGLE, ///< only single cell relative reference
+DOUBLE  ///< at least one range relative reference from named 
expression
+};
+RelNameRef  HasRelNameReference() const;
 
 bool UpdateReference(
 const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr, 
const ScAddress* pUndoCellPos = nullptr );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ed04ccd..b707963 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2825,7 +2825,7 @@ struct SetDirtyIfPostponedHandler
 {
 void operator() (size_t /*nRow*/, ScFormulaCell* pCell)
 {
-if (pCell->IsPostponedDirty() || pCell->HasRelNameReference())
+if (pCell->IsPostponedDirty() || (pCell->HasRelNameReference() != 
ScFormulaCell::RelNameRef::NONE))
 pCell->SetDirty();
 }
 };
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 64a0bb4..a9cfdec 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2842,18 +2842,34 @@ 
ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const
 return false;
 }
 
-bool ScFormulaCell::HasRelNameReference() const
+ScFormulaCell::RelNameRef ScFormulaCell::HasRelNameReference() const
 {
+RelNameRef eRelNameRef = RelNameRef::NONE;
 pCode->Reset();
 formula::FormulaToken* t;
 while ( ( t = pCode->GetNextReferenceRPN() ) != nullptr )
 {
-if ( t->GetSingleRef()->IsRelName() ||
-(t->GetType() == formula::svDoubleRef &&
-t->GetDoubleRef()->Ref2.IsRelName()) )
-return true;
+switch (t->GetType())
+{
+case formula::svSingleRef:
+if (t->GetSingleRef()->IsRelName() && eRelNameRef == 
RelNameRef::NONE)
+eRelNameRef = RelNameRef::SINGLE;
+break;
+case formula::svDoubleRef:
+if (t->GetDoubleRef()->Ref1.IsRelName() || 
t->GetDoubleRef()->Ref2.IsRelName())
+// May originate from individual cell names, in which case
+// it needs recompilation.
+return RelNameRef::DOUBLE;
+/* TODO: have an extra flag at ScComplexRefData if range was
+ * extended? or too cumbersome? might narrow recompilation to
+ * only needed cases.
+ * */
+break;
+default:
+;   // nothing
+}
 }
-return false;
+return eRelNameRef;
 }
 
 bool ScFormulaCell::UpdatePosOnShift( const sc::RefUpdateContext& rCxt )
@@ -3058,7 +3074,13 @@ bool ScFormulaCell::UpdateReferenceOnShift(
 bInDeleteUndo = (pChangeTrack && pChangeTrack->IsInDeleteUndo());
 
 // RelNameRefs are always moved
-bool bHasRelName = HasRelNameReference();
+bool bHasRelName = false;
+if (!bRecompile)
+{
+RelNameRef eRelNameRef = HasRelNameReference();
+bHasRelName = (eRelNameRef != RelNameRef::NONE);
+bRecompile = (eRelNameRef == RelNameRef::DOUBLE);
+}

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - translations

2017-01-11 Thread Christian Lohmaier

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

New commits:
commit b7cd7c8d80a81e50cdf28cd3ee2d3a2349ab1a7e
Author: Christian Lohmaier 
Date:   Wed Jan 11 18:13:43 2017 +0100

Updated core
Project: translations  82afb6e52e019d26c110a745d68d5b882bb4bbe5

another update for translations for 5.2.5 rc1

Change-Id: If7935fd0b029bbb8444e11f9ab5e04e3ac1167a5

diff --git a/translations b/translations
index c9a77fe6..82afb6e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c9a77fe62307ba509ff3b66d8ad06c1385d17a11
+Subproject commit 82afb6e52e019d26c110a745d68d5b882bb4bbe5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-2' - source/cy source/es source/fi source/fr source/pt-BR source/uk source/vec source/zh-TW

2017-01-11 Thread Christian Lohmaier

 source/cy/cui/source/dialogs.po  |   14 +-
 source/cy/cui/uiconfig/ui.po |6 
 source/cy/scp2/source/ooo.po |   10 -
 source/es/helpcontent2/source/text/shared/01.po  |8 -
 source/es/helpcontent2/source/text/shared/02.po  |8 -
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po|   18 +-
 source/es/sc/source/ui/src.po|6 
 source/es/sc/uiconfig/scalc/ui.po|8 -
 source/es/scp2/source/ooo.po |   10 -
 source/es/sd/source/core.po  |   10 -
 source/es/sd/source/ui/app.po|8 -
 source/es/vcl/source/src.po  |8 -
 source/fi/scp2/source/ooo.po |   12 -
 source/fr/scp2/source/ooo.po |   12 -
 source/pt-BR/scp2/source/ooo.po  |   10 -
 source/uk/scp2/source/ooo.po |   12 -
 source/vec/cui/uiconfig/ui.po|8 -
 source/vec/filter/uiconfig/ui.po |8 -
 source/zh-TW/basctl/uiconfig/basicide/ui.po  |   13 +-
 source/zh-TW/cui/source/options.po   |   10 -
 source/zh-TW/cui/uiconfig/ui.po  |   14 +-
 source/zh-TW/officecfg/registry/data/org/openoffice/Office/UI.po |   64 
+-
 source/zh-TW/sc/uiconfig/scalc/ui.po |   10 -
 source/zh-TW/scp2/source/accessories.po  |   15 +-
 source/zh-TW/sd/uiconfig/simpress/ui.po  |6 
 source/zh-TW/svl/source/misc.po  |   11 -
 source/zh-TW/svx/source/dialog.po|   10 -
 source/zh-TW/svx/source/gallery2.po  |8 -
 source/zh-TW/svx/source/svdraw.po|   44 +++---
 source/zh-TW/svx/source/toolbars.po  |   21 +--
 source/zh-TW/svx/uiconfig/ui.po  |   14 +-
 source/zh-TW/sw/uiconfig/swriter/ui.po   |   14 +-
 32 files changed, 217 insertions(+), 213 deletions(-)

New commits:
commit 82afb6e52e019d26c110a745d68d5b882bb4bbe5
Author: Christian Lohmaier 
Date:   Wed Jan 11 18:13:43 2017 +0100

another update for translations for 5.2.5 rc1

Change-Id: If7935fd0b029bbb8444e11f9ab5e04e3ac1167a5

diff --git a/source/cy/cui/source/dialogs.po b/source/cy/cui/source/dialogs.po
index 48b90e9..5d1927a 100644
--- a/source/cy/cui/source/dialogs.po
+++ b/source/cy/cui/source/dialogs.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2016-05-07 21:35+0200\n"
-"PO-Revision-Date: 2016-05-10 16:03+\n"
+"PO-Revision-Date: 2017-01-11 13:37+\n"
 "Last-Translator: Rhoslyn Prys \n"
 "Language-Team: LANGUAGE \n"
 "Language: cy\n"
@@ -13,8 +13,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.7\n"
-"X-POOTLE-MTIME: 1462896239.00\n"
+"X-Generator: Pootle 2.8\n"
+"X-POOTLE-MTIME: 1484141876.00\n"
 
 #: cuires.src
 msgctxt ""
@@ -327,7 +327,7 @@ msgctxt ""
 "RID_SVXSTR_HYPDLG_MACROACT2\n"
 "string.text"
 msgid "Trigger hyperlink"
-msgstr "Cychwyn hyperddolen"
+msgstr "Cychwyn dolen"
 
 #: hyperdlg.src
 msgctxt ""
@@ -359,7 +359,7 @@ msgctxt ""
 "RID_SVXSTR_HYPERDLG_HLINETTP_HELP\n"
 "string.text"
 msgid "This is where you create a hyperlink to a Web page or FTP server 
connection."
-msgstr "Dyma lle rydych yn creu cyswllt i dudalen Gwe neu gysylltiad gweinydd 
FTP."
+msgstr "Dyma lle rydych yn creu dolen tudalen Gwe neu gysylltiad gweinydd FTP."
 
 #: hyperdlg.src
 msgctxt ""
@@ -375,7 +375,7 @@ msgctxt ""
 "RID_SVXSTR_HYPERDLG_HLMAILTP_HELP\n"
 "string.text"
 msgid "This is where you create a hyperlink to an e-mail address."
-msgstr "Dyma lle rydych yn creu hypergyswllt i gyfeiriad e-bost."
+msgstr "Dyma lle rydych yn creu dolen i gyfeiriad e-bost."
 
 #: hyperdlg.src
 msgctxt ""
@@ -391,7 +391,7 @@ msgctxt ""
 "RID_SVXSTR_HYPERDLG_HLDOCTP_HELP\n"
 "string.text"
 msgid "This is where you create a hyperlink to an existing document or a 
target within a document."
-msgstr "Dyma lle rydych yn creu cyswllt Ã¢ dogfen benodol neu darged o fewn 
dogfen."
+msgstr "Dyma lle rydych yn creu dolen i ddogfen benodol neu darged o fewn 
dogfen."
 
 #: hyperdlg.src
 msgctxt ""
diff --git a/source/cy/cui/uiconfig/ui.po b/source/cy/cui/uiconfig/ui.po
index aa0a413..05a2829 100644
--- a/source/cy/cu

[Libreoffice-commits] online.git: 3 commits - common/Protocol.cpp common/Protocol.hpp kit/Kit.cpp loleaflet/src test/TileQueueTests.cpp test/WhiteBoxTests.cpp wsd/protocol.txt wsd/TileDesc.hpp

2017-01-11 Thread Tor Lillqvist

 common/Protocol.cpp |   36 +++
 common/Protocol.hpp |8 +
 kit/Kit.cpp |   39 ++--
 loleaflet/src/core/Socket.js|3 
 loleaflet/src/layer/tile/TileLayer.js   |3 
 loleaflet/src/layer/tile/WriterTileLayer.js |   14 ++
 test/TileQueueTests.cpp |   28 ++---
 test/WhiteBoxTests.cpp  |   10 --
 wsd/TileDesc.hpp|  135 +---
 wsd/protocol.txt|   24 ++--
 10 files changed, 221 insertions(+), 79 deletions(-)

New commits:
commit bc19f90dd48a1792fca9d5b7bbf13b8f1b35134b
Author: Tor Lillqvist 
Date:   Wed Jan 4 14:36:13 2017 +0200

Don't send a tile that hasn't changed even if client asks for it

The server tells the client the hash of each tile it sends (calculated
from the contents of the tile, not its PNG encoding). When the client
asks for a tile to be refreshed, it tells the server what the hash of
the existing tile is. If the server notices that the tile contents
hasn't actually changed, it doesn't PNG encode it and doesn't send it
to the client.

The intent is that this will reduce load on the server and also avoid
unnecessary tile traffic.

Change-Id: Ia06ca68655ea984ed4319f24f4470afda322eccf

diff --git a/common/Protocol.cpp b/common/Protocol.cpp
index ad02f0f..f2e6fc3 100644
--- a/common/Protocol.cpp
+++ b/common/Protocol.cpp
@@ -58,6 +58,20 @@ namespace LOOLProtocol
 return true;
 }
 
+bool stringToUInt64(const std::string& input, uint64_t& value)
+{
+try
+{
+value = std::stoull(input);
+}
+catch (std::invalid_argument&)
+{
+return false;
+}
+
+return true;
+}
+
 bool getTokenInteger(const std::string& token, const std::string& name, 
int& value)
 {
 size_t nextIdx;
@@ -80,6 +94,28 @@ namespace LOOLProtocol
 return true;
 }
 
+bool getTokenUInt64(const std::string& token, const std::string& name, 
uint64_t& value)
+{
+size_t nextIdx;
+try
+{
+if (token.size() < name.size() + 2 ||
+token.substr(0, name.size()) != name ||
+token[name.size()] != '=' ||
+(value = std::stoull(token.substr(name.size() + 1), &nextIdx), 
false) ||
+nextIdx != token.size() - name.size() - 1)
+{
+return false;
+}
+}
+catch (std::invalid_argument&)
+{
+return false;
+}
+
+return true;
+}
+
 bool getTokenString(const std::string& token, const std::string& name, 
std::string& value)
 {
 try
diff --git a/common/Protocol.hpp b/common/Protocol.hpp
index 0a0a0fe..0e544b0 100644
--- a/common/Protocol.hpp
+++ b/common/Protocol.hpp
@@ -10,6 +10,7 @@
 #ifndef INCLUDED_LOOLPROTOCOL_HPP
 #define INCLUDED_LOOLPROTOCOL_HPP
 
+#include 
 #include 
 #include 
 #include 
@@ -41,6 +42,8 @@ namespace LOOLProtocol
 std::tuple ParseVersion(const std::string& version);
 
 bool stringToInteger(const std::string& input, int& value);
+bool stringToUInt64(const std::string& input, uint64_t& value);
+
 inline
 bool parseNameValuePair(const std::string& token, std::string& name, 
std::string& value, const char delim = '=')
 {
@@ -63,6 +66,7 @@ namespace LOOLProtocol
 }
 
 bool getTokenInteger(const std::string& token, const std::string& name, 
int& value);
+bool getTokenUInt64(const std::string& token, const std::string& name, 
uint64_t& value);
 bool getTokenString(const std::string& token, const std::string& name, 
std::string& value);
 bool getTokenKeyword(const std::string& token, const std::string& name, 
const std::map& map, int& value);
 
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index db96997..c2e2281 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -380,9 +380,9 @@ public:
 }
 
 bool encodeBufferToPNG(unsigned char* pixmap, int width, int height,
-   std::vector& output, LibreOfficeKitTileMode 
mode)
+   std::vector& output, LibreOfficeKitTileMode 
mode,
+   uint64_t hash)
 {
-const uint64_t hash = Png::hashBuffer(pixmap, width, height);
 if (cacheTest(hash, output))
 {
 return true;
@@ -395,10 +395,9 @@ public:
 bool encodeSubBufferToPNG(unsigned char* pixmap, size_t startX, size_t 
startY,
   int width, int height,
   int bufferWidth, int bufferHeight,
-  std::vector& output, 
LibreOfficeKitTileMode mode)
+  std::vector& output, 
LibreOfficeKitTileMode mode,
+  uint64_t hash)
 {
-const uint64_t hash = Png::hashSu

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sd/source

2017-01-11 Thread Michael Stahl

 sd/source/ui/view/Outliner.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit dd133c29b3731c93c8cc0b96ea0632d8998ae594
Author: Michael Stahl 
Date:   Wed Jan 11 17:17:27 2017 +0100

tdf#105182 sd: avoid iterating too far in SdOutliner::Initialize()

Considering the valid indexes are extended by "-1" for backwards
iterators and "size()" for forward iterators, it's obvious that a
not-yet-at-the-end-in-the-other-direction iterator can be incremented
once, but not necessarily twice.

Why this code even wants to increment it twice isn't obvious to me.

Change-Id: I578c8c6202049ebe6dbed41b8276a6bfa0566bbc
(cherry picked from commit aa1ee198b5b55d0a92418eb3294c93553e8513dd)
Reviewed-on: https://gerrit.libreoffice.org/32973
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 959cfa4..396e0ef 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -583,7 +583,10 @@ void SdOutliner::Initialize (bool bDirectionIsForward)
 // The iterator has pointed to the object one ahead/before the 
current
 // one.  Now move it to the one before/ahead the current one.
 ++maObjectIterator;
-++maObjectIterator;
+if (maObjectIterator != 
sd::outliner::OutlinerContainer(this).end())
+{
+++maObjectIterator;
+}
 }
 
 mbMatchMayExist = 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-3' - sd/source

2017-01-11 Thread Stephan Bergmann

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 192ea4c3a85dd5cb8ffa6dab38b8764fee73d223
Author: Stephan Bergmann 
Date:   Tue Jan 10 15:31:53 2017 +0100

tdf#105199: Keep URL intact

Change-Id: I85681fcc81246414332f88dc46ce4a4b60896c97
(cherry picked from commit 6a68e364faa0d384f1e3bf397f5decaadecf9b3b)
Conflicts:
sd/source/ui/dlg/PhotoAlbumDialog.cxx
Reviewed-on: https://gerrit.libreoffice.org/32930
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 54c6be1..7a285f9 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void)
 // Store full path, show filename only. Use INetURLObject to 
display spaces in filename correctly
 INetURLObject aUrl = INetURLObject(aFilesArr[i]);
 sal_Int16 nPos = pImagesLst->InsertEntry( 
aUrl.GetLastName(INetURLObject::DECODE_WITH_CHARSET) );
-pImagesLst->SetEntryData(nPos, new 
OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET)));
+pImagesLst->SetEntryData(nPos, new 
OUString(aUrl.GetMainURL(INetURLObject::NO_DECODE)));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Marco Cecchetti

Tag 'cp-5.1-17' created by Andras Timar  at 
2017-01-11 20:08 +

cp-5.1-17

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

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

2017-01-11 Thread Miklos Vajna

Tag 'cp-5.1-17' created by Andras Timar  at 
2017-01-11 20:08 +

cp-5.1-17

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

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

2017-01-11 Thread Andras Timar

Tag 'cp-5.1-17' created by Andras Timar  at 
2017-01-11 20:08 +

cp-5.1-17

Changes since cp-5.1-15:
Andras Timar (1):
  tdf#97349: typo fixes in control words

---
 fr_FR/hyph_fr.dic |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread jan Iversen

Tag 'cp-5.1-17' created by Andras Timar  at 
2017-01-11 20:08 +

cp-5.1-17

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

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

2017-01-11 Thread Michael Stahl

 framework/source/services/desktop.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7d0e3b32de2d1cad01ef973b03eaa27fff766f6e
Author: Michael Stahl 
Date:   Wed Jan 11 20:35:15 2017 +0100

framework: call disposing from disposing, not notifyTermination

Don't rely on current implementation details of TerminateListener.

Change-Id: I7977c73669f0ab5afac1c93be620e7aeebfe68a2

diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 22a8360..434435d 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1121,11 +1121,11 @@ void SAL_CALL Desktop::disposing()
 m_xStarBasicQuitGuard.clear();
 m_xSWThreadManager.clear();
 
-// we need a copy because the notifyTermination might call the 
removeEventListener method
+// we need a copy because the disposing might call the removeEventListener 
method
 std::vector< css::uno::Reference > 
xComponentDllListeners = m_xComponentDllListeners;
 for (auto& xListener: xComponentDllListeners)
 {
-xListener->notifyTermination(aEvent);
+xListener->disposing(aEvent);
 }
 xComponentDllListeners.clear();
 m_xComponentDllListeners.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - basctl/source framework/inc framework/source include/comphelper sw/source

2017-01-11 Thread Markus Mohrhard

 basctl/source/basicide/iderdll.cxx  |2 -
 framework/inc/services/desktop.hxx  |2 +
 framework/source/services/desktop.cxx   |   29 
 include/comphelper/unique_disposing_ptr.hxx |   40 +++-
 sw/source/uibase/app/swdll.cxx  |2 -
 5 files changed, 66 insertions(+), 9 deletions(-)

New commits:
commit 2f0020ba056e2b523c487dc42b40f0e4b9f9a9b0
Author: Markus Mohrhard 
Date:   Mon Jan 9 05:58:00 2017 +0100

tdf#104830, need an own termination listener for lib objects

The destruction of the SwDLL object happens already through the normal
termination listener but the other termination listeners might still
depend on it. Also the outstanding events might need the SwDLL instance
to be still around.

This makes the destruction of the instance explicit and at a time when
it should be safe. We should use the same code for calc, impress, math
and base as well.

Change-Id: I50b8f30426f5a4a54e362e748fe962839abca73e
Reviewed-on: https://gerrit.libreoffice.org/32856
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit ad915fafd54f9115faea7147f82d80a942af2d68)
Reviewed-on: https://gerrit.libreoffice.org/32928
Reviewed-by: Michael Meeks 
Reviewed-by: Michael Stahl 

diff --git a/basctl/source/basicide/iderdll.cxx 
b/basctl/source/basicide/iderdll.cxx
index 19d5961..d155780 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -63,7 +63,7 @@ public:
 class DllInstance : public 
comphelper::unique_disposing_solar_mutex_reset_ptr
 {
 public:
-DllInstance() : 
comphelper::unique_disposing_solar_mutex_reset_ptr(Reference(
 frame::Desktop::create(comphelper::getProcessComponentContext()), 
UNO_QUERY_THROW), new Dll)
+DllInstance() : 
comphelper::unique_disposing_solar_mutex_reset_ptr(Reference(
 frame::Desktop::create(comphelper::getProcessComponentContext()), 
UNO_QUERY_THROW), new Dll, true)
 { }
 };
 
diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index e8fd001..bd766e8 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -454,6 +454,8 @@ class Desktop : private cppu::BaseMutex,
 
 css::uno::Reference< css::frame::XUntitledNumbers > 
m_xTitleNumberGenerator;
 
+std::vector> 
m_xComponentDllListeners;
+
 };  //  class Desktop
 
 }   //  namespace framework
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 3e5f3a0..18eecb3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -335,6 +335,14 @@ sal_Bool SAL_CALL Desktop::terminate()
 if ( xPipeTerminator.is() )
 xPipeTerminator->notifyTermination( aEvent );
 
+// we need a copy here as the notifyTermination call might cause a 
removeTerminateListener call
+std::vector< css::uno::Reference > 
xComponentDllListeners = m_xComponentDllListeners;
+for (auto& xListener : xComponentDllListeners)
+{
+xListener->notifyTermination(aEvent);
+}
+m_xComponentDllListeners.clear();
+
 // Must be really the last listener to be called.
 // Because it shutdown the whole process asynchronous !
 if ( xSfxTerminator.is() )
@@ -407,6 +415,11 @@ void SAL_CALL Desktop::addTerminateListener( const 
css::uno::Reference< css::fra
 m_xSWThreadManager = xListener;
 return;
 }
+else if ( sImplementationName == 
"com.sun.star.comp.ComponentDLLListener" )
+{
+m_xComponentDllListeners.push_back(xListener);
+return;
+}
 }
 
 // No lock required ... container is threadsafe by itself.
@@ -448,6 +461,13 @@ void SAL_CALL Desktop::removeTerminateListener( const 
css::uno::Reference< css::
 m_xSWThreadManager.clear();
 return;
 }
+else if (sImplementationName == 
"com.sun.star.comp.ComponentDLLListener")
+{
+m_xComponentDllListeners.erase(
+std::remove(m_xComponentDllListeners.begin(), 
m_xComponentDllListeners.end(), xListener),
+m_xComponentDllListeners.end());
+return;
+}
 }
 
 // No lock required ... container is threadsafe by itself.
@@ -1076,6 +1096,15 @@ void SAL_CALL Desktop::disposing()
 m_xPipeTerminator.clear();
 m_xQuickLauncher.clear();
 m_xSWThreadManager.clear();
+
+// we need a copy because the notifyTermination might call the 
removeEventListener method
+std::vector< css::uno::Reference > 
xComponentDllListeners = m_xComponentDllListeners;
+for (auto& xListener: xComponentDllListeners)
+{
+xListener->notifyTermination(aEvent);
+}
+xComponentDllListeners.clear();
+m_xComponentDllListeners.

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

2017-01-11 Thread Tor Lillqvist

 configure.ac |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9334de4f6ddc3e7d60f727aa845c7aa7db3fe019
Author: Tor Lillqvist 
Date:   Wed Jan 11 19:51:59 2017 +0200

Don't suggest any "devel packages" on macOS

Installing random 3rd-party "devel packages" is exactly what we don't
want people to do when building on macOS. And anyway, there is no
reason to believe this particular check will ever fail (there even is
a comment that says "MacOS X has system MIT Kerberos 5 since 10.4"),
unless something is very wrong.

Change-Id: Ic880e59358c7c510de9db29e66dfeee7f4e85b4d

diff --git a/configure.ac b/configure.ac
index dce6892..24cb7a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8540,12 +8540,14 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
 if test "$with_krb5" != "no"; then
 WITH_KRB5=TRUE
 save_LIBS=$LIBS
+# Not sure whether it makes any sense here to search multiple 
potential libraries; it is not likely
+# that the libraries where these functions are located on 
macOS will change, is it?
 AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 
'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5, try installing libcom_err devel package])])
+[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5])])
 KRB5_LIBS=$LIBS
 LIBS=$save_LIBS
 AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes 
-lasn1 -lroken'], [],
-[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5, try installing krb5 devel package])])
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
 KRB5_LIBS="$KRB5_LIBS $LIBS"
 LIBS=$save_LIBS
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Tamás Bunth

 connectivity/source/drivers/firebird/Blob.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 38ce989b4f9d2aead097e5a2e95b819def7e2624
Author: TamÃ¡s Bunth 
Date:   Tue Jan 10 15:16:08 2017 +0100

XBlob::getBytes expects 1-indexed position

There was also a wrong relation. Now blob resets its position.

Change-Id: I41caf7cdfa261cafa5b9e66c9523c7f15225bfd8
Reviewed-on: https://gerrit.libreoffice.org/32937
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/Blob.cxx 
b/connectivity/source/drivers/firebird/Blob.cxx
index 7a7481b..2c6b952 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -149,19 +149,20 @@ uno::Sequence< sal_Int8 > SAL_CALL  
Blob::getBytes(sal_Int64 nPosition,
 checkDisposed(Blob_BASE::rBHelper.bDisposed);
 ensureBlobIsOpened();
 
-if (nPosition > m_nBlobLength)
+if (nPosition > m_nBlobLength || nPosition < 1)
 throw lang::IllegalArgumentException("nPosition out of range", *this, 
0);
 // We only have to read as many bytes as are available, i.e. 
nPosition+nBytes
 // can legally be greater than the total length, hence we don't bother to 
check.
 
-if (nPosition > m_nBlobPosition)
+if (nPosition -1 < m_nBlobPosition)
 {
 // Resets to the beginning (we can't seek these blobs)
 closeBlob();
 ensureBlobIsOpened();
 }
 
-skipBytes(nPosition - m_nBlobPosition);
+// nPosition is indexed from 1.
+skipBytes(nPosition - m_nBlobPosition -1 );
 
 // Don't bother preallocating: readBytes does the appropriate calculations
 // and reallocates for us.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Caolán McNamara

 vcl/source/control/edit.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 018beb38848fbd93889f29969f7ca5c68d0ac546
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 11 15:45:18 2017 +

don't position cursor inside a utf-16 sequence

seen examining rhbz#1409011

insert three 0x2F940 in insert special character

click on end and press backspace and text was mangled
clise inside the 3 glyph sequence and press delete/backspace and more 
mangling

Change-Id: I5898e9272e7a90e8b9dabb0be65f493df7dcbaf9

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 5edefc3..e2e17d4 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1217,7 +1217,7 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) 
const
 
 GetCaretPositions( aText, pDX, 0, aText.getLength() );
 long nX = rWindowPos.X() - mnXOffset - ImplGetExtraXOffset();
-for( sal_Int32 i = 0; i < aText.getLength(); i++ )
+for (sal_Int32 i = 0; i < aText.getLength(); aText.iterateCodePoints(&i))
 {
 if( (pDX[2*i] >= nX && pDX[2*i+1] <= nX) ||
 (pDX[2*i+1] >= nX && pDX[2*i] <= nX))
@@ -1226,12 +1226,12 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos 
) const
 if( pDX[2*i] < pDX[2*i+1] )
 {
 if( nX > (pDX[2*i]+pDX[2*i+1])/2 )
-nIndex++;
+aText.iterateCodePoints(&nIndex);
 }
 else
 {
 if( nX < (pDX[2*i]+pDX[2*i+1])/2 )
-nIndex++;
+aText.iterateCodePoints(&nIndex);
 }
 break;
 }
@@ -1239,8 +1239,11 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos 
) const
 if( nIndex == EDIT_NOLIMIT )
 {
 nIndex = 0;
+sal_Int32 nFinalIndex = 0;
 long nDiff = std::abs( pDX[0]-nX );
-for( sal_Int32 i = 1; i < aText.getLength(); i++ )
+sal_Int32 i = 0;
+aText.iterateCodePoints(&i);//skip the first character
+while (i < aText.getLength())
 {
 long nNewDiff = std::abs( pDX[2*i]-nX );
 
@@ -1249,8 +1252,12 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos 
) const
 nIndex = i;
 nDiff = nNewDiff;
 }
+
+nFinalIndex = i;
+
+aText.iterateCodePoints(&i);
 }
-if( nIndex == aText.getLength()-1 && std::abs( pDX[2*nIndex+1] - nX ) 
< nDiff )
+if (nIndex == nFinalIndex && std::abs( pDX[2*nIndex+1] - nX ) < nDiff)
 nIndex = EDIT_NOLIMIT;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - writerperfect/Library_wpftqahelper.mk writerperfect/qa writerperfect/source

2017-01-11 Thread David Tardon

 writerperfect/Library_wpftqahelper.mk |1 
 writerperfect/qa/unit/WpftFilterTestBase.cxx  |   12 
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx |   54 +-
 3 files changed, 40 insertions(+), 27 deletions(-)

New commits:
commit d9d14d0a4c4470de19b81d0df64e8635bb720560
Author: David Tardon 
Date:   Wed Jan 11 17:27:42 2017 +0100

astyle

Change-Id: Iee24a1b7bc4ada389dfa5f0f39c9d06938ed1481

diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx 
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index cff8a02..1c80fa7 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -133,39 +133,39 @@ public:
 }
 /** return a new stream for a ole zone */
 librevenge::RVNGInputStream *getSubStreamByName(const char *name) override
-{
-if (m_nameToPathMap.find(name)== m_nameToPathMap.end() || 
!m_xContent.is()) return nullptr;
-
-try
 {
-const uno::Reference 
xResultSet=getResultSet(m_xContent);
-if (xResultSet.is() && xResultSet->first())
+if (m_nameToPathMap.find(name)== m_nameToPathMap.end() || 
!m_xContent.is()) return nullptr;
+
+try
 {
-const uno::Reference 
xContentAccess(xResultSet, uno::UNO_QUERY_THROW);
-const uno::Reference xRow(xResultSet, 
uno::UNO_QUERY_THROW);
-OUString lPath=m_nameToPathMap.find(name)->second;
-do
+const uno::Reference 
xResultSet=getResultSet(m_xContent);
+if (xResultSet.is() && xResultSet->first())
 {
-const rtl::OUString aTitle(xRow->getString(1));
-if (aTitle != lPath) continue;
-
-const uno::Reference 
xSubContent(xContentAccess->queryContent());
-ucbhelper::Content aSubContent(xSubContent, 
uno::Reference(), 
comphelper::getProcessComponentContext());
-uno::Reference xInputStream = 
aSubContent.openStream();
-if (xInputStream.is())
-return new writerperfect::WPXSvInputStream(xInputStream);
-break;
+const uno::Reference 
xContentAccess(xResultSet, uno::UNO_QUERY_THROW);
+const uno::Reference xRow(xResultSet, 
uno::UNO_QUERY_THROW);
+OUString lPath=m_nameToPathMap.find(name)->second;
+do
+{
+const rtl::OUString aTitle(xRow->getString(1));
+if (aTitle != lPath) continue;
+
+const uno::Reference 
xSubContent(xContentAccess->queryContent());
+ucbhelper::Content aSubContent(xSubContent, 
uno::Reference(), 
comphelper::getProcessComponentContext());
+uno::Reference xInputStream = 
aSubContent.openStream();
+if (xInputStream.is())
+return new 
writerperfect::WPXSvInputStream(xInputStream);
+break;
+}
+while (xResultSet->next());
 }
-while (xResultSet->next());
 }
-}
-catch (...)
-{
-SAL_WARN("writerperfect", "ignoring Exception in 
MSWorksCalcImportFilterInternal::FolderStream::getSubStreamByName");
-}
+catch (...)
+{
+SAL_WARN("writerperfect", "ignoring Exception in 
MSWorksCalcImportFilterInternal::FolderStream::getSubStreamByName");
+}
 
-return nullptr;
-}
+return nullptr;
+}
 /** return a new stream for a ole zone */
 librevenge::RVNGInputStream *getSubStreamById(unsigned id) override
 {
commit c2447d0b6aeffe0c76a549467036df573642a303
Author: David Tardon 
Date:   Wed Jan 11 17:24:59 2017 +0100

honor lib version in import tests again

Change-Id: Idf99aab4bc136ac4a8a07945001e4f34a34a0e17

diff --git a/writerperfect/Library_wpftqahelper.mk 
b/writerperfect/Library_wpftqahelper.mk
index 86aa03a..59f4d05 100644
--- a/writerperfect/Library_wpftqahelper.mk
+++ b/writerperfect/Library_wpftqahelper.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,wpftqahelper,\
 cppu \
 sal \
 test \
+tl \
 ucbhelper \
 unotest \
 ))
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx 
b/writerperfect/qa/unit/WpftFilterTestBase.cxx
index a024334..dbb1ba2 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.cxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx
@@ -11,6 +11,8 @@
 
 #include 
 
+#include 
+
 #include "WpftLoader.hxx"
 
 namespace uno = com::sun::star::uno;
@@ -31,6 +33,16 @@ WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString 
&rFactoryURL)
 bool WpftFilterTestBase::load(const OUString &, const OUString &rURL, const 
OUString &,
   SfxFilterFlags, SotClipboardFormatId, unsigned 
int)
 {
+
+if (m_pOptionalMap)
+{
+// first check if this test file is supported by the used v

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

2017-01-11 Thread Michael Stahl

 sd/source/ui/view/Outliner.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit aa1ee198b5b55d0a92418eb3294c93553e8513dd
Author: Michael Stahl 
Date:   Wed Jan 11 17:17:27 2017 +0100

tdf#105182 sd: avoid iterating too far in SdOutliner::Initialize()

Considering the valid indexes are extended by "-1" for backwards
iterators and "size()" for forward iterators, it's obvious that a
not-yet-at-the-end-in-the-other-direction iterator can be incremented
once, but not necessarily twice.

Why this code even wants to increment it twice isn't obvious to me.

Change-Id: I578c8c6202049ebe6dbed41b8276a6bfa0566bbc

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 959cfa4..396e0ef 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -583,7 +583,10 @@ void SdOutliner::Initialize (bool bDirectionIsForward)
 // The iterator has pointed to the object one ahead/before the 
current
 // one.  Now move it to the one before/ahead the current one.
 ++maObjectIterator;
-++maObjectIterator;
+if (maObjectIterator != 
sd::outliner::OutlinerContainer(this).end())
+{
+++maObjectIterator;
+}
 }
 
 mbMatchMayExist = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to retrieve a backtrace when there's no stack (case tdf#105182)

2017-01-11 Thread Michael Stahl

On 08/01/17 23:12, julien2412 wrote:
> Hello,
> 
> I wanted to give a try to tdf#105182 but the popup error seems to prevent
> from having a stacktrace.
> Is it possible to disable manually this popup mechanism?

the problem is that C++ exceptions don't capture a backtrace of the
throwing location, so you need to set a breakpoint on throwing like
"catch throw", and click through loads of unrelated exceptions before
you get to the interesting one...

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

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

2017-01-11 Thread Caolán McNamara

 include/svtools/grfmgr.hxx|1 
 svtools/source/graphic/grfmgr.cxx |   53 +++---
 2 files changed, 21 insertions(+), 33 deletions(-)

New commits:
commit 4ff1b3589076f66c3d783c3ea6c5f1fd9b9337ed
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 11 09:32:20 2017 +

fold ImplConstruct into ctors and reduce to necessary

ImplConstruct sets mnAnimationLoopCount, but is always followed by
ImplAssignGraphicData which overwrites it so we can omit that

ImplConstruct sets mnDataChangeTimeStamp, but is always
followed by ImplAssignGraphicData which always calls
ImplAfterDataChange which overwrites it so we can omit that

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

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index ac8bdea..abd8b29 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -199,7 +199,6 @@ private:
 boolmbIsInSwapOut   : 1;
 boolmbAlpha : 1;
 
-voidSVT_DLLPRIVATE ImplConstruct();
 voidSVT_DLLPRIVATE ImplAssignGraphicData();
 static void SVT_DLLPRIVATE ImplEnsureGraphicManager();
 voidSVT_DLLPRIVATE ImplAutoSwapIn();
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index a42ab8f..ffaa93a 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -70,48 +70,49 @@ void GraphicObject::ImplAfterDataChange()
 mpGlobalMgr->ImplCheckSizeOfSwappedInGraphics(this);
 }
 
-GraphicObject::GraphicObject() :
-maLink  (),
-maUserData  ()
+GraphicObject::GraphicObject()
+: mbAutoSwapped(false)
+, mbIsInSwapIn(false)
+, mbIsInSwapOut(false)
 {
 ImplEnsureGraphicManager();
-ImplConstruct();
 ImplAssignGraphicData();
 mpGlobalMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
 }
 
-GraphicObject::GraphicObject( const Graphic& rGraphic ) :
-maGraphic   ( rGraphic ),
-maLink  (),
-maUserData  ()
+GraphicObject::GraphicObject(const Graphic& rGraphic)
+: maGraphic(rGraphic)
+, mbAutoSwapped(false)
+, mbIsInSwapIn(false)
+, mbIsInSwapOut(false)
 {
 ImplEnsureGraphicManager();
-ImplConstruct();
 ImplAssignGraphicData();
 mpGlobalMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
 }
 
-GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) :
-maGraphic   ( rGraphicObj.GetGraphic() ),
-maAttr  ( rGraphicObj.maAttr ),
-maLink  ( rGraphicObj.maLink ),
-maUserData  ( rGraphicObj.maUserData )
+GraphicObject::GraphicObject(const GraphicObject& rGraphicObj)
+: maGraphic(rGraphicObj.GetGraphic())
+, maAttr(rGraphicObj.maAttr)
+, maLink(rGraphicObj.maLink)
+, maUserData(rGraphicObj.maUserData)
+, mbAutoSwapped(false)
+, mbIsInSwapIn(false)
+, mbIsInSwapOut(false)
 {
-ImplConstruct();
 ImplAssignGraphicData();
 mpGlobalMgr->ImplRegisterObj(*this, maGraphic, nullptr, &rGraphicObj);
 if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() )
 SetSwapState();
 }
 
-GraphicObject::GraphicObject( const OString& rUniqueID ) :
-maLink  (),
-maUserData  ()
+GraphicObject::GraphicObject(const OString& rUniqueID)
+: mbAutoSwapped(false)
+, mbIsInSwapIn(false)
+, mbIsInSwapOut(false)
 {
 ImplEnsureGraphicManager();
 
-ImplConstruct();
-
 // assign default properties
 ImplAssignGraphicData();
 
@@ -132,18 +133,6 @@ GraphicObject::~GraphicObject()
 }
 }
 
-void GraphicObject::ImplConstruct()
-{
-maSwapStreamHdl = Link();
-mnAnimationLoopCount = 0;
-mbAutoSwapped = false;
-mbIsInSwapIn = false;
-mbIsInSwapOut = false;
-
-// Init with a unique, increasing ID
-mnDataChangeTimeStamp = aIncrementingTimeOfLastDataChange++;
-}
-
 void GraphicObject::ImplAssignGraphicData()
 {
 maPrefSize = maGraphic.GetPrefSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - readlicense_oo/license

2017-01-11 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 3230 ++--
 1 file changed, 1671 insertions(+), 1559 deletions(-)

New commits:
commit 3defbf74b7fee3e3f9bada7e2721bf97405ac264
Author: Christian Lohmaier 
Date:   Wed Jan 11 17:11:21 2017 +0100

update credits

Change-Id: I7e32a57cf6941d36e0bbcfb447065c4b0d56f8c3
(cherry picked from commit 05d509482cedb7d7c4697a76e80352e430fd8c7e)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e1ae0ca..62d2e65 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.3.3$Linux_X86_64
 
LibreOffice_project/d54a8868f08a7b39642414cf2c8ef2f228f780cf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.4.2$Linux_X86_64
 
LibreOffice_project/3d5603e1122f0f102b62521720ab13a38a4e0eb02012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   660
+   554
501
41197
21645
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 660
+ 554
  41697
- 22303
+ 22197
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   6186426
+   6304616
false
false
false
@@ -314,19 +314,19 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -401,13 +401,13 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -1039,7 +1039,7 @@

   
  Credits
-1225 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-12-07 18:32:23.
+1241 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-01-11 15:58:32.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1066,10 +1066,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 20605Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 20896Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 13081Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 13336Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1077,35 +1077,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7618Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7687Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6467Joined: 2011-12-12
+   *Noel GrandinCommits: 
6469Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 6078Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6118Joined: 
2010-07-29
   
   
-   Michael 
StahlCommits: 5704Joined: 
2008-06-16
+   Michael 
StahlCommits: 5751Joined: 
2008-06-16

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - readlicense_oo/license

2017-01-11 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 3230 ++--
 1 file changed, 1671 insertions(+), 1559 deletions(-)

New commits:
commit 881959fa2c293ec469fe7691df35155ec3323779
Author: Christian Lohmaier 
Date:   Wed Jan 11 17:11:21 2017 +0100

update credits

Change-Id: I7e32a57cf6941d36e0bbcfb447065c4b0d56f8c3
(cherry picked from commit 05d509482cedb7d7c4697a76e80352e430fd8c7e)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e1ae0ca..62d2e65 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.3.3$Linux_X86_64
 
LibreOffice_project/d54a8868f08a7b39642414cf2c8ef2f228f780cf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.4.2$Linux_X86_64
 
LibreOffice_project/3d5603e1122f0f102b62521720ab13a38a4e0eb02012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   660
+   554
501
41197
21645
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 660
+ 554
  41697
- 22303
+ 22197
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   6186426
+   6304616
false
false
false
@@ -314,19 +314,19 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -401,13 +401,13 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -1039,7 +1039,7 @@

   
  Credits
-1225 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-12-07 18:32:23.
+1241 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-01-11 15:58:32.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1066,10 +1066,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 20605Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 20896Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 13081Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 13336Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1077,35 +1077,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7618Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7687Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6467Joined: 2011-12-12
+   *Noel GrandinCommits: 
6469Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 6078Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6118Joined: 
2010-07-29
   
   
-   Michael 
StahlCommits: 5704Joined: 
2008-06-16
+   Michael 
StahlCommits: 5751Joined: 
2008-06-16

[Libreoffice-commits] core.git: readlicense_oo/license

2017-01-11 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 3230 ++--
 1 file changed, 1671 insertions(+), 1559 deletions(-)

New commits:
commit 05d509482cedb7d7c4697a76e80352e430fd8c7e
Author: Christian Lohmaier 
Date:   Wed Jan 11 17:11:21 2017 +0100

update credits

Change-Id: I7e32a57cf6941d36e0bbcfb447065c4b0d56f8c3

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e1ae0ca..62d2e65 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.3.3$Linux_X86_64
 
LibreOffice_project/d54a8868f08a7b39642414cf2c8ef2f228f780cf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.4.2$Linux_X86_64
 
LibreOffice_project/3d5603e1122f0f102b62521720ab13a38a4e0eb02012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   660
+   554
501
41197
21645
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 660
+ 554
  41697
- 22303
+ 22197
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   6186426
+   6304616
false
false
false
@@ -314,19 +314,19 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -401,13 +401,13 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -1039,7 +1039,7 @@

   
  Credits
-1225 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-12-07 18:32:23.
+1241 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-01-11 15:58:32.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1066,10 +1066,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 20605Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 20896Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 13081Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 13336Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1077,35 +1077,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7618Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7687Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6467Joined: 2011-12-12
+   *Noel GrandinCommits: 
6469Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 6078Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6118Joined: 
2010-07-29
   
   
-   Michael 
StahlCommits: 5704Joined: 
2008-06-16
+   Michael 
StahlCommits: 5751Joined: 
2008-06-16
   
  
  
   
-   Kohei 
YoshidaCommits: 5450Joined: 
2009-06-19
+   Kohei

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sc/qa sc/source

2017-01-11 Thread Marco Cecchetti

 sc/qa/unit/tiledrendering/tiledrendering.cxx |  133 +++
 sc/source/ui/view/tabvwshb.cxx   |   28 +
 2 files changed, 161 insertions(+)

New commits:
commit ee821f3cc68838910e1a06b6141c2580152640d3
Author: Marco Cecchetti 
Date:   Fri Jan 6 18:35:08 2017 +0100

LOK: Calc: limiting undo and add support for repair mode

During collaborative editing changes can be undone regardless of who
made them. This patch avoids this possibility and introduce support
for repair mode, for cases where undo/redo of others' changes is
intentional.

Change-Id: I69fd435e96c4c675ffd1df81e936b5eae109daa0

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 74a08a3..8ea7364 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -69,6 +69,8 @@ public:
 void testHideColRow();
 void testInvalidateOnCopyPasteCells();
 void testInvalidateOnInserRowCol();
+void testUndoLimiting();
+void testUndoRepairDispatch();
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
 CPPUNIT_TEST(testRowColumnSelections);
@@ -89,6 +91,8 @@ public:
 CPPUNIT_TEST(testHideColRow);
 CPPUNIT_TEST(testInvalidateOnCopyPasteCells);
 CPPUNIT_TEST(testInvalidateOnInserRowCol);
+CPPUNIT_TEST(testUndoLimiting);
+CPPUNIT_TEST(testUndoRepairDispatch);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1006,6 +1010,135 @@ void ScTiledRenderingTest::testInvalidateOnInserRowCol()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void ScTiledRenderingTest::testUndoLimiting()
+{
+comphelper::LibreOfficeKit::setActive();
+
+ScModelObj* pModelObj = createDoc("small.ods");
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+SfxUndoManager* pUndoManager = pDoc->GetUndoManager();
+CPPUNIT_ASSERT(pUndoManager);
+
+// view #1
+ViewCallback aView1;
+int nView1 = SfxLokHelper::getView();
+
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
 &aView1);
+
+// view #2
+SfxLokHelper::createView();
+ViewCallback aView2;
+int nView2 = SfxLokHelper::getView();
+
pModelObj->initializeForTiledRendering(uno::Sequence());
+
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
 &aView2);
+
+// text edit a cell in view #1
+SfxLokHelper::setView(nView1);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+
+// check that undo action count in not 0
+CPPUNIT_ASSERT(pUndoManager->GetUndoActionCount() == 1);
+
+// try to execute undo in view #2
+SfxLokHelper::setView(nView2);
+comphelper::dispatchCommand(".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+// check that undo has not been executed on view #2
+CPPUNIT_ASSERT(pUndoManager->GetUndoActionCount() == 1);
+
+// try to execute undo in view #1
+SfxLokHelper::setView(nView1);
+comphelper::dispatchCommand(".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+// check that undo has been executed on view #1
+CPPUNIT_ASSERT(pUndoManager->GetUndoActionCount() == 0);
+
+// check that redo action count in not 0
+CPPUNIT_ASSERT(pUndoManager->GetRedoActionCount() == 1);
+
+// try to execute redo in view #2
+SfxLokHelper::setView(nView2);
+comphelper::dispatchCommand(".uno:Redo", {});
+Scheduler::ProcessEventsToIdle();
+// check that redo has not been executed on view #2
+CPPUNIT_ASSERT(pUndoManager->GetRedoActionCount() == 1);
+
+// try to execute redo in view #1
+SfxLokHelper::setView(nView1);
+comphelper::dispatchCommand(".uno:Redo", {});
+Scheduler::ProcessEventsToIdle();
+// check that redo has been executed on view #1
+CPPUNIT_ASSERT(pUndoManager->GetRedoActionCount() == 0);
+
+mxComponent->dispose();
+mxComponent.clear();
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
+void ScTiledRenderingTest::testUndoRepairDispatch()
+{
+comphelper::LibreOfficeKit::setActive();
+
+ScModelObj* pModelObj = createDoc("small.ods");
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+SfxUndoManager* pUndoManager = pDoc->GetUndoManager();
+CPPUNIT_ASSERT(pUndoManager);
+
+// view #1
+ViewCallback aView1;
+int nView1 = SfxLokHelper::getView();
+
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
 &aView1);
+
+// view #2
+SfxLokHelper::createView();
+ViewCallback aView2;
+int nView2 = SfxLokHelper::getView();
+
pModelObj->initializeForTile

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

2017-01-11 Thread Stephan Bergmann

 compilerplugins/clang/stringconstant.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit b820de995da0d9966ef29532eeb069a6592a4a13
Author: Stephan Bergmann 
Date:   Wed Jan 11 16:57:21 2017 +0100

Remove leftover code

Change-Id: I3f6e9ec0343074b506cb07b1ad5c9b3e1ef20b5e

diff --git a/compilerplugins/clang/stringconstant.cxx 
b/compilerplugins/clang/stringconstant.cxx
index cab25bb..34a5421 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -731,11 +731,6 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
 return true;
 }
 }
-if ((dc.Function("append").Class("OStringBuffer").Namespace("rtl")
- .GlobalNamespace())
-&& fdecl->getNumParams() == 2)
-{
-}
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: codemaker/source compilerplugins/clang sal/qa sdext/source sw/source

2017-01-11 Thread Stephan Bergmann

 codemaker/source/codemaker/global.cxx   |2 
 compilerplugins/clang/stringconstant.cxx|  142 +---
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx |4 
 sal/qa/rtl/strings/test_oustring_convert.cxx|   24 +-
 sal/qa/rtl/strings/test_oustring_endswith.cxx   |5 
 sdext/source/pdfimport/pdfparse/pdfentries.cxx  |2 
 sw/source/filter/html/css1atr.cxx   |4 
 7 files changed, 139 insertions(+), 44 deletions(-)

New commits:
commit 584262fed1368dba382d88dfd25fe35ac7d4b349
Author: Stephan Bergmann 
Date:   Wed Jan 11 16:39:20 2017 +0100

loplugin:stringconstant: handle OStringBuffer::append

Change-Id: I283da52c0ee2b63c19e31e9a61ab24997c037a6a

diff --git a/codemaker/source/codemaker/global.cxx 
b/codemaker/source/codemaker/global.cxx
index c3dc266..1772309 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -99,7 +99,7 @@ OString createFileNameFromType( const OString& destination,
 fileNameBuf.append(destination.getStr(), destination.getLength());
 
 if (bWithSeparator)
-fileNameBuf.append("/", 1);
+fileNameBuf.append("/");
 
 fileNameBuf.append(type.getStr(), type.getLength());
 fileNameBuf.append(postfix.getStr(), postfix.getLength());
diff --git a/compilerplugins/clang/stringconstant.cxx 
b/compilerplugins/clang/stringconstant.cxx
index 259cee7..cab25bb 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -106,7 +106,7 @@ private:
 std::string describeChangeKind(ChangeKind kind);
 
 bool isStringConstant(
-Expr const * expr, unsigned * size, bool * nonAscii,
+Expr const * expr, unsigned * size, bool * nonArray, bool * nonAscii,
 bool * embeddedNuls, bool * terminatingNul);
 
 bool isZero(Expr const * expr);
@@ -477,11 +477,13 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) 
{
 && fdecl->getNumParams() == 1)
 {
 unsigned n;
+bool nonArray;
 bool non;
 bool emb;
 bool trm;
 if (!isStringConstant(
-expr->getArg(0)->IgnoreParenImpCasts(), &n, &non, &emb, &trm))
+expr->getArg(0)->IgnoreParenImpCasts(), &n, &nonArray, &non,
+&emb, &trm))
 {
 return true;
 }
@@ -516,12 +518,13 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) 
{
 {
 for (unsigned i = 0; i != 2; ++i) {
 unsigned n;
+bool nonArray;
 bool non;
 bool emb;
 bool trm;
 if (!isStringConstant(
-expr->getArg(i)->IgnoreParenImpCasts(), &n, &non, &emb,
-&trm))
+expr->getArg(i)->IgnoreParenImpCasts(), &n, &nonArray, 
&non,
+&emb, &trm))
 {
 continue;
 }
@@ -560,12 +563,13 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) 
{
 {
 for (unsigned i = 0; i != 2; ++i) {
 unsigned n;
+bool nonArray;
 bool non;
 bool emb;
 bool trm;
 if (!isStringConstant(
-expr->getArg(i)->IgnoreParenImpCasts(), &n, &non, &emb,
-&trm))
+expr->getArg(i)->IgnoreParenImpCasts(), &n, &nonArray, 
&non,
+&emb, &trm))
 {
 continue;
 }
@@ -603,11 +607,13 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) 
{
 && fdecl->getNumParams() == 1)
 {
 unsigned n;
+bool nonArray;
 bool non;
 bool emb;
 bool trm;
 if (!isStringConstant(
-expr->getArg(1)->IgnoreParenImpCasts(), &n, &non, &emb, &trm))
+expr->getArg(1)->IgnoreParenImpCasts(), &n, &nonArray, &non,
+&emb, &trm))
 {
 return true;
 }
@@ -658,6 +664,78 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
 TreatEmpty::Error);
 return true;
 }
+if (dc.Function("append").Class("OStringBuffer").Namespace("rtl")
+.GlobalNamespace())
+{
+switch (fdecl->getNumParams()) {
+case 1:
+{
+// char const * const s = "foo"; b.append(s) ->
+// char const s[] = "foo"; b.append(s):
+unsigned n;
+bool nonArray;
+bool non;
+bool emb;
+bool trm;
+if (!isStringConstant(
+expr->getArg(0)->IgnoreParenImpCasts(), &n, &nonArray,
+&non, &emb, &trm))
+{
+return true;
+}
+if (non || emb) {
+return true;
+}
+

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

2017-01-11 Thread Jochen Nitschke

 sc/source/filter/inc/addressconverter.hxx |   12 
 sc/source/filter/inc/worksheethelper.hxx  |3 ---
 sc/source/filter/oox/addressconverter.cxx |8 
 sc/source/filter/oox/commentsbuffer.cxx   |6 +++---
 sc/source/filter/oox/worksheethelper.cxx  |   23 ++-
 5 files changed, 5 insertions(+), 47 deletions(-)

New commits:
commit e316c4f2a40a4a562028f0a66c40321ffdf87378
Author: Jochen Nitschke 
Date:   Wed Jan 11 14:08:37 2017 +0100

tdf#48140 replace CellAddress in xlsx import (1)

Change-Id: I14bd0d9d55a03f4cd33aaf131e66f859569f5b18
Reviewed-on: https://gerrit.libreoffice.org/32968
Reviewed-by: Jochen Nitschke 
Tested-by: Jochen Nitschke 

diff --git a/sc/source/filter/inc/addressconverter.hxx 
b/sc/source/filter/inc/addressconverter.hxx
index 8dbd932..e8ed5c5 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_ADDRESSCONVERTER_HXX
 
 #include 
-#include 
 #include 
 #include "workbookhelper.hxx"
 
@@ -247,17 +246,6 @@ public:
 @return  true = Passed address is valid (no index overflow).
  */
 boolcheckCellAddress(
-const css::table::CellAddress& rAddress,
-bool bTrackOverflow );
-
-/** Checks the passed cell address if it fits into the spreadsheet limits.
-
-@param rAddress  The cell address to be checked.
-@param bTrackOverflow  true = Update the internal overflow flags, if
-the address is outside of the supported sheet limits.
-@return  true = Passed address is valid (no index overflow).
- */
-boolcheckCellAddress(
 const ScAddress& rAddress,
 bool bTrackOverflow );
 
diff --git a/sc/source/filter/inc/worksheethelper.hxx 
b/sc/source/filter/inc/worksheethelper.hxx
index a571a89..bc5e9dd 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -194,9 +194,6 @@ public:
 
 /** Returns the XCell interface for the passed cell address. */
 css::uno::Reference< css::table::XCell >
-getCell( const css::table::CellAddress& rAddress ) 
const;
-
-css::uno::Reference< css::table::XCell >
 getCell( const ScAddress& rAddress ) const;
 /** Returns the XCellRange interface for the passed cell range address. */
 css::uno::Reference< css::table::XCellRange >
diff --git a/sc/source/filter/oox/addressconverter.cxx 
b/sc/source/filter/oox/addressconverter.cxx
index a8452cc..a36a4e8 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -262,14 +262,6 @@ bool AddressConverter::checkTab( sal_Int16 nSheet, bool 
bTrackOverflow )
 return bValid;
 }
 
-bool AddressConverter::checkCellAddress( const CellAddress& rAddress, bool 
bTrackOverflow )
-{
-return
-checkTab( rAddress.Sheet, bTrackOverflow ) &&
-checkCol( rAddress.Column, bTrackOverflow ) &&
-checkRow( rAddress.Row, bTrackOverflow );
-}
-
 bool AddressConverter::checkCellAddress( const ScAddress& rAddress, bool 
bTrackOverflow )
 {
 return
diff --git a/sc/source/filter/oox/commentsbuffer.cxx 
b/sc/source/filter/oox/commentsbuffer.cxx
index d9f22f4..d164f54 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -133,16 +133,16 @@ void Comment::finalizeImport()
 // BIFF12 stores cell range instead of cell address, use first cell of 
this range
 OSL_ENSURE( maModel.maRange.aStart == maModel.maRange.aEnd,
 "Comment::finalizeImport - comment anchor should be a single cell" );
-CellAddress aNotePos( maModel.maRange.aStart.Tab(), 
maModel.maRange.aStart.Col(), maModel.maRange.aStart.Row() );
-if( getAddressConverter().checkCellAddress( aNotePos, true ) && 
maModel.mxText.get() ) try
+if( getAddressConverter().checkCellAddress( maModel.maRange.aStart, true ) 
&& maModel.mxText.get() ) try
 {
+CellAddress aNotePos( maModel.maRange.aStart.Tab(), 
maModel.maRange.aStart.Col(), maModel.maRange.aStart.Row() );
 Reference< XSheetAnnotationsSupplier > xAnnosSupp( getSheet(), 
UNO_QUERY_THROW );
 Reference< XSheetAnnotations > xAnnos( xAnnosSupp->getAnnotations(), 
UNO_SET_THROW );
 // non-empty string required by note implementation (real text will be 
added below)
 xAnnos->insertNew( aNotePos, OUString( ' ' ) );
 
 // receive created note from cell (insertNew does not return the note)
-Reference< XSheetAnnotationAnchor > xAnnoAnchor( getCell( aNotePos ), 
UNO_QUERY_THROW );
+Reference< XSheetAnnotationAnchor > xAnnoAnchor( getCell( 
maModel.maRange.aStart ), UNO_QUERY_THROW );
 Reference< XSheetAnnotation > xAnno( xAnnoAnchor->getAnnotation(), 
UNO_SET_THROW

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - extras/source

2017-01-11 Thread Christian Lohmaier

 extras/source/autocorr/lang/pl/DocumentList.xml|   24 ++---
 extras/source/autocorr/lang/sk/DocumentList.xml|   12 ++
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |4 +++
 3 files changed, 28 insertions(+), 12 deletions(-)

New commits:
commit a48cdc80c7431da36649860dd3a03bba9e759790
Author: Christian Lohmaier 
Date:   Wed Jan 11 16:20:44 2017 +0100

update emoji autocorrect files from po-files

Change-Id: I846126090a6bdf0c158eb6d23707d1244c30e41e

diff --git a/extras/source/autocorr/lang/pl/DocumentList.xml 
b/extras/source/autocorr/lang/pl/DocumentList.xml
index eec4e84..d83e322 100644
--- a/extras/source/autocorr/lang/pl/DocumentList.xml
+++ b/extras/source/autocorr/lang/pl/DocumentList.xml
@@ -489,50 +489,50 @@
   
   
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
+  
+  
   
+  
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/sk/DocumentList.xml 
b/extras/source/autocorr/lang/sk/DocumentList.xml
index ab6de53..143f568 100644
--- a/extras/source/autocorr/lang/sk/DocumentList.xml
+++ b/extras/source/autocorr/lang/sk/DocumentList.xml
@@ -177,35 +177,47 @@
   
   
   
+  
+  
   
+  
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/zh-CN/DocumentList.xml 
b/extras/source/autocorr/lang/zh-CN/DocumentList.xml
index 68e47c0..8db5298 100644
--- a/extras/source/autocorr/lang/zh-CN/DocumentList.xml
+++ b/extras/source/autocorr/lang/zh-CN/DocumentList.xml
@@ -815,7 +815,9 @@
   
   
   
+  
   
+  
   
   
   
@@ -860,9 +862,11 @@
   
   
   
+  
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - kit/ChildSession.cpp kit/ChildSession.hpp

2017-01-11 Thread Tomaž Vajngerl

 kit/ChildSession.cpp |  105 +++
 kit/ChildSession.hpp |   42 +++-
 2 files changed, 104 insertions(+), 43 deletions(-)

New commits:
commit 55769ae3eb7de33cc6afea4683e5b3f24c665278
Author: TomaÅ¾ Vajngerl 
Date:   Mon Jan 2 14:21:49 2017 +0100

Update cursor positions on active user - record events per view

When the user becomes inactive, we have to record events, that are
important to restore the user's document viewport when he becomes
active again.
We currently don't discriminate view events so events with different
view ID are considered as the same event and thus get overwritten.
The effect of this is that only the last cursor or selection of a
different view (different user working on a document) is updated
when the user becomes active again.
With this we discriminate view events and record them per view ID.
When the user becomes active again, we replay them for all views.

Change-Id: I0c6b9209f4d592d88fb23227c4de41084b8cd736
Reviewed-on: https://gerrit.libreoffice.org/32646
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 3022344..13b32cd 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -115,20 +115,32 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 sendTextFrame("setpart: part=" + std::to_string(curPart));
 }
 
-//TODO: Is the order of these important?
-for (const auto& pair : _lastDocEvents)
+for (const auto& viewPair : _stateRecorder._recordedViewEvents)
 {
-const auto typeName = 
LOKitHelper::kitCallbackTypeToString(pair.first);
-LOG_TRC("Replaying missed event: " << typeName << ": " << 
pair.second);
-loKitCallback(pair.first, pair.second);
+for (const auto& eventPair : viewPair.second)
+{
+const RecordedEvent& event = eventPair.second;
+LOG_TRC("Replaying missed view event: " <<  viewPair.first 
<< " " << LOKitHelper::kitCallbackTypeToString(event._type)
+<< ": " << 
event._payload);
+loKitCallback(event._type, event._payload);
+}
+}
+
+for (const auto& eventPair : _stateRecorder._recordedEvents)
+{
+const RecordedEvent& event = eventPair.second;
+LOG_TRC("Replaying missed event: " << 
LOKitHelper::kitCallbackTypeToString(event._type) << ": " << event._payload);
+loKitCallback(event._type, event._payload);
 }
 
-for (const auto& pair : _lastDocStates)
+for (const auto& pair : _stateRecorder._recordedStates)
 {
-LOG_TRC("Replaying missed state-change: STATE_CHANGED: " << 
pair.second);
+LOG_TRC("Replaying missed state-change: " << pair.second);
 loKitCallback(LOK_CALLBACK_STATE_CHANGED, pair.second);
 }
 
+_stateRecorder.clear();
+
 LOG_TRC("Finished replaying messages.");
 }
 
@@ -969,6 +981,50 @@ bool ChildSession::setPage(const char* /*buffer*/, int 
/*length*/, StringTokeniz
 return true;
 }
 
+/* If the user is inactive we have to remember important events so that when
+ * the user becomes active again, we can replay the events.
+ */
+void ChildSession::rememberEventsForInactiveUser(const int nType, const 
std::string& rPayload)
+{
+if (nType == LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR ||
+nType == LOK_CALLBACK_CURSOR_VISIBLE ||
+nType == LOK_CALLBACK_TEXT_SELECTION ||
+nType == LOK_CALLBACK_TEXT_SELECTION_START ||
+nType == LOK_CALLBACK_TEXT_SELECTION_END ||
+nType == LOK_CALLBACK_CELL_FORMULA ||
+nType == LOK_CALLBACK_CELL_CURSOR ||
+nType == LOK_CALLBACK_GRAPHIC_SELECTION ||
+nType == LOK_CALLBACK_DOCUMENT_SIZE_CHANGED)
+{
+auto lock(getLock());
+_stateRecorder.recordEvent(nType, rPayload);
+}
+else if (nType == LOK_CALLBACK_INVALIDATE_VIEW_CURSOR ||
+nType == LOK_CALLBACK_TEXT_VIEW_SELECTION ||
+nType == LOK_CALLBACK_CELL_VIEW_CURSOR ||
+nType == LOK_CALLBACK_GRAPHIC_VIEW_SELECTION ||
+nType == LOK_CALLBACK_VIEW_CURSOR_VISIBLE ||
+nType == LOK_CALLBACK_VIEW_LOCK)
+{
+auto lock(getLock());
+Poco::JSON::Parser parser;
+
+auto root = parser.parse(rPayload).extract();
+int viewId = root->getValue("viewId");
+_stateRecorder.recordViewEvent(viewId, nType, rPayload);
+}
+else if (nType == LOK_CALLBACK_STATE_CHANGED)
+{
+std::string name;
+std::string value;
+if (LOOLProtocol::parseNameValuePair(rPayload, name, value, '='))
+{
+auto lock(getLock());
+_stateRecorder.recordState(name, value);
+}
+}

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - extras/source

2017-01-11 Thread Christian Lohmaier

 extras/source/autocorr/lang/ca/DocumentList.xml |2 -
 extras/source/autocorr/lang/fi/DocumentList.xml |   12 
 extras/source/autocorr/lang/hr/DocumentList.xml |1 
 extras/source/autocorr/lang/pl/DocumentList.xml |   24 
 extras/source/autocorr/lang/pt/DocumentList.xml |   34 
 extras/source/autocorr/lang/ro/DocumentList.xml |   12 
 extras/source/autocorr/lang/sk/DocumentList.xml |2 -
 extras/source/autocorr/lang/tr/DocumentList.xml |   12 
 8 files changed, 85 insertions(+), 14 deletions(-)

New commits:
commit 4638408f8940a8197471e44a47d75450b3bd4174
Author: Christian Lohmaier 
Date:   Wed Jan 11 15:58:32 2017 +0100

update emoji autocorrect files from po-files

(cherry picked from commit b365d56ed9862de518f91b34633faadce0cb0962)

Change-Id: Ifc78ba8ae27544e8588c18cd5ba962a9fdeb1497

diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index 5b3f48a..6225ff6 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -1388,7 +1388,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/fi/DocumentList.xml 
b/extras/source/autocorr/lang/fi/DocumentList.xml
index bf87c3d..d994c16 100644
--- a/extras/source/autocorr/lang/fi/DocumentList.xml
+++ b/extras/source/autocorr/lang/fi/DocumentList.xml
@@ -19,46 +19,58 @@
   
   
   
+  
   
+  
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/hr/DocumentList.xml 
b/extras/source/autocorr/lang/hr/DocumentList.xml
index 279a56c..9f0164f 100644
--- a/extras/source/autocorr/lang/hr/DocumentList.xml
+++ b/extras/source/autocorr/lang/hr/DocumentList.xml
@@ -1,5 +1,6 @@
 
 http://openoffice.org/2001/block-list";>
+
   
   
   
diff --git a/extras/source/autocorr/lang/pl/DocumentList.xml 
b/extras/source/autocorr/lang/pl/DocumentList.xml
index d35c0e2..eec4e84 100644
--- a/extras/source/autocorr/lang/pl/DocumentList.xml
+++ b/extras/source/autocorr/lang/pl/DocumentList.xml
@@ -489,6 +489,18 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -777,29 +789,17 @@
   
   
   
-  
-  
   
-  
   
-  
   
   
-  
   
-  
   
-  
   
-  
   
-  
   
-  
   
-  
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml 
b/extras/source/autocorr/lang/pt/DocumentList.xml
index 29a26b8..c06b9dd 100644
--- a/extras/source/autocorr/lang/pt/DocumentList.xml
+++ b/extras/source/autocorr/lang/pt/DocumentList.xml
@@ -2096,6 +2096,40 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/ro/DocumentList.xml 
b/extras/source/autocorr/lang/ro/DocumentList.xml
index bbb5433..a7b6d46 100644
--- a/extras/source/autocorr/lang/ro/DocumentList.xml
+++ b/extras/source/autocorr/lang/ro/DocumentList.xml
@@ -88,34 +88,46 @@
   
   
   
+  
+  
   
+  
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
+  
   
   
+  
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/sk/DocumentList.xml 
b/extras/source/autocorr/lang/sk/DocumentList.xml
index 143f568..5b691ad 100644
--- a/extras/source/autocorr/lang/sk/DocumentList.xml
+++ b/extras/source/autocorr/lang/sk/DocumentList.xml
@@ -397,7 +397,6 @@
   
   
   
-  
   
   
   
@@ -1214,6 +1213,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index 15208b6..48689e2 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -97,35 +97,47 @@
   
   
   
+  
+  
   
+  
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Christian Lohmaier

 extras/source/autocorr/lang/ca/DocumentList.xml|2 
 extras/source/autocorr/lang/fi/DocumentList.xml|   12 
 extras/source/autocorr/lang/hr/DocumentList.xml|  696 ++---
 extras/source/autocorr/lang/ja/DocumentList.xml|   12 
 extras/source/autocorr/lang/pl/DocumentList.xml|   24 
 extras/source/autocorr/lang/pt/DocumentList.xml|   68 +-
 extras/source/autocorr/lang/ro/DocumentList.xml|   12 
 extras/source/autocorr/lang/sk/DocumentList.xml|2 
 extras/source/autocorr/lang/sv/DocumentList.xml|   12 
 extras/source/autocorr/lang/tr/DocumentList.xml|   12 
 extras/source/autocorr/lang/zh-TW/DocumentList.xml |2 
 11 files changed, 463 insertions(+), 391 deletions(-)

New commits:
commit b365d56ed9862de518f91b34633faadce0cb0962
Author: Christian Lohmaier 
Date:   Wed Jan 11 15:58:32 2017 +0100

update emoji autocorrect files from po-files

Change-Id: Ifc78ba8ae27544e8588c18cd5ba962a9fdeb1497

diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index 5b3f48a..6225ff6 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -1388,7 +1388,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/fi/DocumentList.xml 
b/extras/source/autocorr/lang/fi/DocumentList.xml
index bf87c3d..d994c16 100644
--- a/extras/source/autocorr/lang/fi/DocumentList.xml
+++ b/extras/source/autocorr/lang/fi/DocumentList.xml
@@ -19,46 +19,58 @@
   
   
   
+  
   
+  
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/hr/DocumentList.xml 
b/extras/source/autocorr/lang/hr/DocumentList.xml
index ceea635..86d9986 100644
--- a/extras/source/autocorr/lang/hr/DocumentList.xml
+++ b/extras/source/autocorr/lang/hr/DocumentList.xml
@@ -1,209 +1,127 @@
 ï»¿
 http://openoffice.org/2001/block-list";>
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
   
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
   
+  
+  
   
   
   
-  
-  
-  
-  
+  
+  
+  
   
   
+  
+  
+  
+  
+  
   
   
   
+  
+  
+  
   
+  
+  
+  
   
   
+  
+  
+  
   
+  
+  
+  
   
   
+  
+  
+  
   
+  
+  
+  
   
+  
+  
+  
   
+  
+  
+  
   
   
   
+  
   
   
   
   
   
-  
   
+  
   
   
   
-  
   
   
-  
+  
   
+  
   
   
   
   
+  
   
   
-  
   
   
   
   
   
   
-  
+  
+  
   
+  
   
   
   
   
+  
+  
   
   
   
+  
   
   
   
   
   
-  
   
-  
   
+  
   
   
   
@@ -216,14 +134,38 @@
   
   
   
-  
   
+  
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
-  
   
+  
   
   
   
@@ -241,17 +183,27 @@
   
   
   
+  
+  
   
+  
   
+  
+  
+  
   
   
+  
+  
   
   
   
-  
   
   
+  
   
+  
+  
   
   
   
@@ -262,31 +214,25 @@
   
   
   
+  
   
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
+  
+  
   
   
+  
   
   
   
-  
   
   
-  
+  
   
+  
   
   
   
@@ -296,8 +242,8 @@
   
   
   
-  
   
+  
   
   
   
@@ -305,26 +251,34 @@
   
   
   
-  
   
+  
   
   
   
-  
+  
+  
+  
   
   
+  
+  
   
   
   
   
-  
   
+  
   
   
+  
   
   
   
   
+  
+  
+  
   
   
   
@@ -335,153 +289,174 @@
   
   
   
-  
   
+  
+  
+  
   
   
+  
+  
   
   
   
-  
   
+  
   
   
-  
+  
   
   
   
-  
+  
   
   
-  
   
+  
   
   
-  
   
   
-  
+  
   
   
-  
+  
   
+  
   
   
   
+  
+  
   
   
   
-  
+  
+  
+  
   
+  
   
+  
+  
+  
   
   
-  
   
   
   
-  
   
+  
   
-  
-  
   
+  
+  
+  
+  
+  
   
   
   
   
   
   
-  
   
   
   
   
+  
   
   
   
   
   
   
-  
   
+  
   
   
   
-  
   
   
+  
   
-  
   
   
-  
   
+  
   
   
   
   
+  
+  
+  
+  
   
   
   
   
-  
   
   
   
-  
+  
   
+  
+  
   
   
   
-  
   
+  
   
   
   
-  
   
+  
   
-  
   
+  
   
   
   
   
-  
   
+  
   
   
   
   
+  
+  
+  
   
   
   
   
   
-  
   
-  
+  
   
   
-  
+  
   
+  
   
   
   
   
   
-  
   
+  
   
   
-  
   
   
   
   
   
   
+  
   
   
   
@@ -490,9 +465,9 @@
   
   
   
-  
-  
   
+  
+  
   
   
   
@@ -500,16 +475,16 @@
   
   
   
-  
   
+  
   
   
   
   
   
   
-  
   
+  
   
   
   
@@ -517,22 +492,22 @@
   
   
   
-  
   
-  
+  
   
   
+  
   
   
   
   
-  
   
-  
+  
   
   
-  
+  
   
+  
   
   
   
@@ -540,69 +51

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

2017-01-11 Thread Kohei Yoshida

 package/inc/ZipFile.hxx  |4 +++-
 package/source/zipapi/ZipFile.cxx|5 +++--
 package/source/zippackage/ZipPackage.cxx |2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 52b8739f5b2108c3c1ba116ed3ec79847add5396
Author: Kohei Yoshida 
Date:   Tue Jan 10 22:09:49 2017 -0500

Let's return std::unique_ptr<...> directly.

It's only used at one call site, which already uses
std::unique_ptr.

Change-Id: I5ff528ebc560bb6eb8783d20002cea40a451761e
Reviewed-on: https://gerrit.libreoffice.org/32946
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index bfc056f..bac0168 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -33,6 +33,8 @@
 
 #include 
 
+#include 
+
 namespace com { namespace sun { namespace star {
 namespace uno { class XComponentContext; }
 namespace ucb  { class XProgressHandler; }
@@ -159,7 +161,7 @@ public:
 const OUString& aMediaType,
 const rtl::Reference& aMutexHolder );
 
-ZipEnumeration* entries();
+std::unique_ptr entries();
 };
 
 #endif
diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 943fde1..49264b0 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -518,9 +519,9 @@ uno::Reference< XInputStream > 
ZipFile::createUnbufferedStream(
 return new XUnbufferedStream ( m_xContext, aMutexHolder, rEntry, xStream, 
rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode );
 }
 
-ZipEnumeration* ZipFile::entries()
+std::unique_ptr ZipFile::entries()
 {
-return new ZipEnumeration ( aEntries );
+return o3tl::make_unique(aEntries);
 }
 
 uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& 
rEntry,
diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 8fc9a95..026e1ed 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -486,7 +486,7 @@ void ZipPackage::parseContentType()
 
 void ZipPackage::getZipFileContents()
 {
-std::unique_ptr < ZipEnumeration > xEnum(m_pZipFile->entries());
+std::unique_ptr xEnum = m_pZipFile->entries();
 ZipPackageStream *pPkgStream;
 ZipPackageFolder *pPkgFolder, *pCurrent;
 OUString sTemp, sDirName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/dist

2017-01-11 Thread Pranav Kant

 loleaflet/dist/toolbar/toolbar.js |   30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 3233ccee4c24b2c0e2ec3216d346cb00ecb91fda
Author: Pranav Kant 
Date:   Wed Jan 11 20:14:26 2017 +0530

loleaflet: Mobilify the statusbar

Reduce userlist text to now only show the number of users in
mobile mode instead of 'x users' string. Drop the 'Document
saved' string notification.

Change-Id: Ife20a5fcea01301601912c734dae6c3d6504c4f5

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 7d3ee72..7065ebe 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -36,12 +36,14 @@ var statusbarMobileItems = [
'cancelsearch',
'left',
'right',
-   'modifiedstatuslabel',
-   'modifiedstatuslabelbreak',
+   'userlist',
+   'userlistbreak',
'prev',
'next'
 ];
 
+var nUsers, oneUser, noUser;
+
 function _mobilify() {
var toolbarUp = w2ui['toolbar-up'];
var toolbarUpMore = w2ui['toolbar-up-more'];
@@ -66,6 +68,11 @@ function _mobilify() {
statusbar.hide(id);
}
}
+
+   nUsers = '%n';
+   oneUser = '1';
+   noUser = '0';
+   updateUserListCount();
 }
 
 function _unmobilify() {
@@ -92,6 +99,11 @@ function _unmobilify() {
statusbar.show(id);
}
}
+
+   nUsers = _('%n users');
+   oneUser = _('1 user');
+   noUser = _('0 user');
+   updateUserListCount();
 }
 
 function resizeToolbar() {
@@ -664,7 +676,7 @@ $(function () {
{type: 'html',id: 'modifiedstatuslabel', html: 
''},
{type: 'break', id: 'modifiedstatuslabelbreak'},
{type: 'drop', id: 'userlist', text: _('No users'), 
html: '' },
-   {type: 'break'},
+   {type: 'break', id: 'userlistbreak'},
{type: 'button',  id: 'prev', img: 'prev', hint: 
_('Previous page')},
{type: 'button',  id: 'next', img: 'next', hint: 
_('Next page')},
{type: 'break', id: 'prevnextbreak'},
@@ -1503,16 +1515,16 @@ function getUserItem(viewId, userName, color) {
 
return html;
 }
-var nUsers = _('%n users');
+
 function updateUserListCount() {
var userlistItem = w2ui['toolbar-down'].get('userlist');
var count = $(userlistItem.html).find('#userlist_table tbody 
tr').length;
if (count > 1) {
userlistItem.text = nUsers.replace('%n', count);
} else if (count === 1) {
-   userlistItem.text = _('1 user');
+   userlistItem.text = oneUser;
} else {
-   userlistItem.text = _('No users');
+   userlistItem.text = noUser;
}
 
var zoomlevel = $('#zoomlevel').html();
commit 11ed5228062c5025bbe6ad15eb34d5d53e7f6ee5
Author: Pranav Kant 
Date:   Wed Jan 11 18:34:46 2017 +0530

loleaflet: Mobilify for less than 768, not less than equal

Change-Id: I3c499e847674e57ba33859459ace794ff1b97c57

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 6835cc1..7d3ee72 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -4,6 +4,8 @@
 
 /* global $ map closebutton w2ui w2utils vex _ */
 
+var mobileWidth = 768;
+
 function onDelete(e) {
if (e !== false) {
map.deletePage();
@@ -97,7 +99,7 @@ function resizeToolbar() {
var toolbarUp = w2ui['toolbar-up'];
var toolbarUpMore = w2ui['toolbar-up-more'];
 
-   if ($(window).width() <= 768) {
+   if ($(window).width() < mobileWidth) {
_mobilify();
} else {
_unmobilify();
@@ -116,7 +118,7 @@ function resizeToolbar() {
// move items from toolbar-up -> toolbar-up-more
while ($('#toolbar-up')[0].scrollWidth > Math.max($(window).width(), 
parseInt($('body').css('min-width' {
var itemId = toolbarUp.items[toolbarUp.items.length - 4].id;
-   if ($(window).width() > 768 && itemId === 'resizebreak') {
+   if ($(window).width() >= mobileWidth && itemId === 
'resizebreak') {
return;
}
item = toolbarUp.get(itemId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Kohei Yoshida

 package/inc/ZipFile.hxx   |   49 ++
 package/source/zipapi/ZipFile.cxx |   21 +---
 2 files changed, 15 insertions(+), 55 deletions(-)

New commits:
commit a544fd5fa233135f150b44c843a14be461952ecd
Author: Kohei Yoshida 
Date:   Tue Jan 10 22:05:13 2017 -0500

Remove unnecessary UNO-ness from ZipFile class.

This class is only used inside package module, and totally private
to the module.

Change-Id: Ib00e7066c22a74c0b16c8d6ecf72b99ac42682dd
Reviewed-on: https://gerrit.libreoffice.org/32945
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index c32d582..bfc056f 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -53,7 +53,6 @@ class ZipEnumeration;
 
 class ZipFile
 {
-protected:
 ::osl::Mutexm_aMutex;
 
 EntryHash   aEntries;
@@ -82,20 +81,21 @@ protected:
 
 void getSizeAndCRC( sal_Int64 nOffset, sal_Int64 nCompressedSize, 
sal_Int64 *nSize, sal_Int32 *nCRC );
 
+bool readLOC( ZipEntry &rEntry );
+sal_Int32 readCEN();
+sal_Int32 findEND();
+void recover();
+
 public:
 
 ZipFile( css::uno::Reference < css::io::XInputStream > &xInput,
  const css::uno::Reference < css::uno::XComponentContext > 
&rxContext,
- bool bInitialise
- )
-throw(css::io::IOException, css::packages::zip::ZipException, 
css::uno::RuntimeException);
+ bool bInitialise );
 
 ZipFile( css::uno::Reference < css::io::XInputStream > &xInput,
  const css::uno::Reference < css::uno::XComponentContext > 
&rxContext,
  bool bInitialise,
- bool bForceRecover
- )
-throw(css::io::IOException, css::packages::zip::ZipException, 
css::uno::RuntimeException);
+ bool bForceRecover );
 
 ~ZipFile();
 
@@ -106,8 +106,7 @@ public:
 ZipEntry& rEntry,
 const ::rtl::Reference < EncryptionData > &rData,
 bool bDecrypt,
-const rtl::Reference& aMutexHolder )
-throw(css::io::IOException, css::packages::zip::ZipException, 
css::uno::RuntimeException);
+const rtl::Reference& aMutexHolder );
 
 static css::uno::Reference< css::xml::crypto::XDigestContext > 
StaticGetDigestContextForChecksum(
 const css::uno::Reference< css::uno::XComponentContext >& 
xArgContext,
@@ -135,10 +134,7 @@ public:
 static css::uno::Reference< css::io::XInputStream > 
StaticGetDataFromRawStream(
 const css::uno::Reference< css::uno::XComponentContext >& 
rxContext,
 const css::uno::Reference< css::io::XInputStream >& xStream,
-const ::rtl::Reference < EncryptionData > &rData )
-throw ( css::packages::WrongPasswordException,
-css::packages::zip::ZipIOException,
-css::uno::RuntimeException );
+const ::rtl::Reference < EncryptionData > &rData );
 
 static bool StaticHasValidPassword (
 const css::uno::Reference< css::uno::XComponentContext >& 
rxContext,
@@ -149,40 +145,21 @@ public:
 ZipEntry& rEntry,
 const ::rtl::Reference < EncryptionData > &rData,
 bool bDecrypt,
-const rtl::Reference& aMutexHolder )
-throw(css::io::IOException, css::packages::zip::ZipException, 
css::uno::RuntimeException);
+const rtl::Reference& aMutexHolder );
 
 css::uno::Reference< css::io::XInputStream > SAL_CALL getDataStream(
 ZipEntry& rEntry,
 const ::rtl::Reference < EncryptionData > &rData,
 bool bDecrypt,
-const rtl::Reference& aMutexHolder )
-throw ( css::packages::WrongPasswordException,
-css::io::IOException,
-css::packages::zip::ZipException,
-css::uno::RuntimeException );
+const rtl::Reference& aMutexHolder );
 
 css::uno::Reference< css::io::XInputStream > SAL_CALL getWrappedRawStream(
 ZipEntry& rEntry,
 const ::rtl::Reference < EncryptionData > &rData,
 const OUString& aMediaType,
-const rtl::Reference& aMutexHolder )
-throw ( css::packages::NoEncryptionException,
-css::io::IOException,
-css::packages::zip::ZipException,
-css::uno::RuntimeException );
-
-ZipEnumeration * SAL_CALL entries(  );
-protected:
-boolreadLOC ( ZipEntry &rEntry)
-throw(css::io::IOException, css::packages::zip::ZipException, 
css::uno::RuntimeException);
-sal_Int32   readCEN()
-throw(css::io::IOException, css::packages::zip::ZipException, 
css::uno::RuntimeException);
-sal_Int32   findEND()
-throw(css::io::IOException, css::packages::zip::ZipException, 
css::uno::RuntimeException);
-voidrecover()
-throw(css::io::IOException, css::

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

2017-01-11 Thread Takeshi Abe

 starmath/inc/ElementsDockingWindow.hxx |1 -
 starmath/inc/document.hxx  |1 -
 starmath/inc/view.hxx  |1 -
 starmath/source/accessibility.hxx  |5 -
 starmath/source/eqnolefilehdr.hxx  |3 ---
 5 files changed, 11 deletions(-)

New commits:
commit be7d0697b0e2d55ce01dcd4abec5d106115d8920
Author: Takeshi Abe 
Date:   Wed Jan 11 21:10:33 2017 +0900

starmath: Kill unused forward declaration

Change-Id: I03f76aada322a7222795795d32553ae2425092c3
Reviewed-on: https://gerrit.libreoffice.org/32962
Reviewed-by: Takeshi Abe 
Tested-by: Takeshi Abe 

diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
index 50b1648..2b5c8b0 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -29,7 +29,6 @@
 
 class SmDocShell;
 class SmNode;
-class ElementSelectorUIObject;
 
 class SmElement
 {
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index cb189af..756fc0f 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -41,7 +41,6 @@
 #include "smmod.hxx"
 #include "smdllapi.hxx"
 
-class SmNode;
 class SfxPrinter;
 class Printer;
 class SmCursor;
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 76ea809..cec85a1 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -36,7 +36,6 @@
 #include "edit.hxx"
 #include "node.hxx"
 
-class DataChangedEvent;
 class SmDocShell;
 class SmViewShell;
 class SmPrintUIOptions;
diff --git a/starmath/source/accessibility.hxx 
b/starmath/source/accessibility.hxx
index 657838f..5e1cb6f 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -43,11 +43,6 @@ class SmGraphicWindow;
 class SmEditWindow;
 class SmDocShell;
 
-namespace com { namespace sun { namespace star { namespace accessibility {
-struct AccessibleEventObject;
-
-
-
 // classes and helper-classes used for accessibility in the graphic-window
 
 
diff --git a/starmath/source/eqnolefilehdr.hxx 
b/starmath/source/eqnolefilehdr.hxx
index 2841a2c..5c294fc 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -23,9 +23,6 @@
 #include 
 #include 
 
-class SotStorageStream;
-class SotStorage;
-
 #define EQNOLEFILEHDR_SIZE 28
 
 class EQNOLEFILEHDR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Andras Timar

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

New commits:
commit a98c5fbc9fdde5e5c489ca8b50d47598246a011a
Author: Andras Timar 
Date:   Wed Jan 11 14:57:55 2017 +0100

Bump version to 5.1-17

Change-Id: I075ff1fb7fe5cbcc2e3b02f2602c5c6a0c6f8fa7

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - discovery.xml

2017-01-11 Thread Andras Timar

 discovery.xml |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f148397d8e72a86bfa0b36410e88c3b4cabe8dc2
Author: Andras Timar 
Date:   Sat Jan 7 21:26:00 2017 +0100

add text/rtf and text/plain as supported MIME types

Change-Id: Ic46e8ccaeecc24ef2c6b6fce6b342c976c3ddc60
Reviewed-on: https://gerrit.libreoffice.org/32823
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/discovery.xml b/discovery.xml
index 0edd631..c8b87c5 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -254,6 +254,12 @@
 
 
 
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Noel Grandin

 lotuswordpro/source/filter/lwpbreaksoverride.cxx  |7 --
 lotuswordpro/source/filter/lwpbreaksoverride.hxx  |2 
 lotuswordpro/source/filter/lwpcelllayout.cxx  |4 -
 lotuswordpro/source/filter/lwpcharacterstyle.cxx  |   26 +-
 lotuswordpro/source/filter/lwpcontent.cxx |2 
 lotuswordpro/source/filter/lwpdivinfo.cxx |   26 +-
 lotuswordpro/source/filter/lwpdivopts.cxx |4 -
 lotuswordpro/source/filter/lwpdlvlist.cxx |6 +-
 lotuswordpro/source/filter/lwpdoc.cxx |   34 ++---
 lotuswordpro/source/filter/lwpdocdata.cxx |   46 +-
 lotuswordpro/source/filter/lwpfootnote.cxx|   18 +++
 lotuswordpro/source/filter/lwpframelayout.cxx |   10 +--
 lotuswordpro/source/filter/lwpframelayout.hxx |4 -
 lotuswordpro/source/filter/lwpfrib.cxx|3 -
 lotuswordpro/source/filter/lwpfrib.hxx|4 -
 lotuswordpro/source/filter/lwpholder.cxx  |8 +--
 lotuswordpro/source/filter/lwplayout.cxx  |9 +--
 lotuswordpro/source/filter/lwplayout.hxx  |2 
 lotuswordpro/source/filter/lwplaypiece.cxx|   30 +--
 lotuswordpro/source/filter/lwpmarker.cxx  |   24 -
 lotuswordpro/source/filter/lwpnotes.cxx   |6 +-
 lotuswordpro/source/filter/lwpnumericfmt.hxx  |2 
 lotuswordpro/source/filter/lwpobj.cxx |9 +--
 lotuswordpro/source/filter/lwpobj.hxx |2 
 lotuswordpro/source/filter/lwpoleobject.cxx   |8 +--
 lotuswordpro/source/filter/lwppagehint.cxx|   12 ++--
 lotuswordpro/source/filter/lwppagelayout.cxx  |4 -
 lotuswordpro/source/filter/lwppara.cxx|   14 ++---
 lotuswordpro/source/filter/lwpparaproperty.cxx|1 
 lotuswordpro/source/filter/lwpparaproperty.hxx|4 -
 lotuswordpro/source/filter/lwpparastyle.cxx   |   34 ++---
 lotuswordpro/source/filter/lwppiece.hxx   |2 
 lotuswordpro/source/filter/lwpproplist.cxx|4 -
 lotuswordpro/source/filter/lwprowlayout.cxx   |4 -
 lotuswordpro/source/filter/lwpsection.cxx |   18 +++
 lotuswordpro/source/filter/lwpsilverbullet.cxx|5 -
 lotuswordpro/source/filter/lwpsilverbullet.hxx|2 
 lotuswordpro/source/filter/lwpstory.cxx   |5 -
 lotuswordpro/source/filter/lwpstory.hxx   |4 -
 lotuswordpro/source/filter/lwptable.cxx   |   10 +--
 lotuswordpro/source/filter/lwptablelayout.cxx |4 -
 lotuswordpro/source/filter/lwptabrack.cxx |4 -
 lotuswordpro/source/filter/lwptblcell.cxx |   26 +-
 lotuswordpro/source/filter/lwptblformula.cxx  |6 +-
 lotuswordpro/source/filter/lwptoc.cxx |   16 +++---
 lotuswordpro/source/filter/lwpverdocument.cxx |4 -
 lotuswordpro/source/filter/lwpvpointer.cxx|2 
 lotuswordpro/source/filter/tocread.cxx|   10 +--
 lotuswordpro/source/filter/tocread.hxx|5 -
 lotuswordpro/source/filter/xfilter/xfcell.cxx |5 -
 lotuswordpro/source/filter/xfilter/xfcell.hxx |5 +
 lotuswordpro/source/filter/xfilter/xfcellstyle.cxx|4 -
 lotuswordpro/source/filter/xfilter/xfcellstyle.hxx|4 +
 lotuswordpro/source/filter/xfilter/xfsaxstream.cxx|5 -
 lotuswordpro/source/filter/xfilter/xfsaxstream.hxx|3 -
 lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx |4 -
 lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx |3 -
 lotuswordpro/source/filter/xfilter/xftablestyle.cxx   |5 -
 lotuswordpro/source/filter/xfilter/xftablestyle.hxx   |3 -
 59 files changed, 260 insertions(+), 277 deletions(-)

New commits:
commit 549efd7f82d9da621294d496e43420c95e9bf500
Author: Noel Grandin 
Date:   Wed Jan 11 12:51:11 2017 +0200

new loplugin: useuniqueptr: lotuswordpro

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

diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.cxx 
b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
index 69514f9..9d59252 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.cxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
@@ -65,21 +65,18 @@
 #include "lwpatomholder.hxx"
 
 LwpBreaksOverride::LwpBreaksOverride()
+: m_pNextStyle( new LwpAtomHolder )
 {
-m_pNextStyle = new LwpAtomHolder();
 }
 
 LwpBreaksOverride::LwpBreaksOverride(LwpBreaksOverride const& rOther)
 : LwpOverride(rOther)
-, m_pNextStyle(nullptr)
+, m_pNextStyle(::clone(rOther.m_pNextStyle.get()))
 {
-std::unique_ptr pNextStyle(::clone(rOther.m_pNextStyle));
-m_pNextStyle = pNe

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/uiconfig odk/docs odk/examples odk/index.html odk/index_online.html setup_native/source sfx2/uiconfig

2017-01-11 Thread Adolfo Jayme Barrientos

 cui/uiconfig/ui/aboutdialog.ui|2 
 odk/docs/install.html |2 
 odk/docs/tools.html   |2 
 odk/examples/DevelopersGuide/examples.html|2 
 odk/examples/examples.html|2 
 odk/index.html|2 
 odk/index_online.html |2 
 setup_native/source/packinfo/packinfo_brand.txt   |   16 +-
 setup_native/source/packinfo/packinfo_extensions.txt  |   10 -
 setup_native/source/packinfo/packinfo_office.txt  |  118 +-
 setup_native/source/packinfo/packinfo_office_help.txt |2 
 setup_native/source/packinfo/packinfo_office_lang.txt |   20 +--
 setup_native/source/packinfo/packinfo_sdkoo.txt   |2 
 setup_native/source/packinfo/packinfo_ure.txt |4 
 sfx2/uiconfig/ui/licensedialog.ui |2 
 15 files changed, 94 insertions(+), 94 deletions(-)

New commits:
commit 54c50a1f65dd379bc38ee81574af39d711853591
Author: Adolfo Jayme Barrientos 
Date:   Sun Jan 1 17:39:23 2017 -0600

Bump copyright year to 2017

Change-Id: I26ddcdd7bb9616c0599eec9101603d4be1ea4147
(cherry picked from commit e5da108ef01872f460c176b6a9173e346e1d59a4)
Reviewed-on: https://gerrit.libreoffice.org/32597
Reviewed-by: Christian Lohmaier 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index d313cac..d55acee 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -197,7 +197,7 @@
 12
 12
 True
-Copyright Â© 
2000â2016 LibreOffice contributors.
+Copyright Â© 
2000â2017 LibreOffice contributors.
 center
 True
   
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 8ad0e6b..fad79c0 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -507,7 +507,7 @@
 
 
   
-Copyright Â© 2000, 2016 LibreOffice contributors. All rights
+Copyright Â© 2000â2017 LibreOffice contributors. All rights
   reserved.
   LibreOffice was created by The Document Foundation, based on
   Apache OpenOffice, which is Copyright 2011 The Apache Software
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index b39e124..b0b3379 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -911,7 +911,7 @@ types the specified types depend on.
 
 
 
-Copyright Â© 2000, 2016 LibreOffice contributors. 
All rights reserved.
+Copyright Â© 2000â2017 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 
2011,
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index dd8a9e2..b9aeb71 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -2856,7 +2856,7 @@ for the Office application.
 
 
 
-Copyright Â© 2000, 2016 LibreOffice contributors. 
All rights reserved.
+Copyright Â© 2000â2017 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 2011
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index 885c386..ddcbb4d 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -810,7 +810,7 @@
 
 
 
-Copyright Â© 2000, 2016 LibreOffice contributors. 
All rights reserved.
+Copyright Â© 2000â2017 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 2011
diff --git a/odk/index.html b/odk/index.html
index 9ca03f0..24b4fbd 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -189,7 +189,7 @@
 
 
 
-Copyright © 2000, 2016 LibreOffice 
contributors. All rights reserved.
+Copyright © 2000â2017 LibreOffice 
contributors. All rights reserved.

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

2017-01-11 Thread Eike Rathke

 i18npool/source/localedata/data/de_CH.xml |   17 -
 i18npool/source/localedata/data/de_LI.xml |   17 -
 i18npool/source/localedata/data/fr_CH.xml |   17 -
 i18npool/source/localedata/data/it_CH.xml |   17 -
 4 files changed, 48 insertions(+), 20 deletions(-)

New commits:
commit 28a0737f8c21e5c9f789af328348e51b6044c28c
Author: Eike Rathke 
Date:   Wed Jan 11 13:43:50 2017 +0100

Resolves: tdf#105209 CHF currency symbol is CHF instead of SFr.

Change-Id: Ic216c7b901bf6da779e161f35e5143739267b066

diff --git a/i18npool/source/localedata/data/de_CH.xml 
b/i18npool/source/localedata/data/de_CH.xml
index 7e6eb88..5b2ac1f 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -87,22 +87,22 @@
   0.00%
 
 
-  [$SFr.-807] #'##0;[$SFr.-807] -#'##0
+  [$CHF-807] #'##0;[$CHF-807] -#'##0
 
 
-  [$SFr.-807] #'##0.00;[$SFr.-807] -#'##0.00
+  [$CHF-807] #'##0.00;[$CHF-807] -#'##0.00
 
 
-  [$SFr.-807] #'##0;[RED][$SFr.-807] -#'##0
+  [$CHF-807] #'##0;[RED][$CHF-807] -#'##0
 
 
-  [$SFr.-807] #'##0.00;[RED][$SFr.-807] -#'##0.00
+  [$CHF-807] #'##0.00;[RED][$CHF-807] -#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$SFr.-807] #'##0.--;[RED][$SFr.-807] -#'##0.--
+  [$CHF-807] #'##0.--;[RED][$CHF-807] -#'##0.--
 
 
   T.MM.JJ
@@ -203,6 +203,13 @@
   
 
   CHF
+  CHF
+  CHF
+  Schweizer Franken
+  2
+
+
+  CHF
   SFr.
   CHF
   Schweizer Franken
diff --git a/i18npool/source/localedata/data/de_LI.xml 
b/i18npool/source/localedata/data/de_LI.xml
index 7247669..d368c05 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -87,22 +87,22 @@
   0.00%
 
 
-  [$SFr.-1407] #'##0;[$SFr.-1407]-#'##0
+  [$CHF-1407] #'##0;[$CHF-1407]-#'##0
 
 
-  [$SFr.-1407] #'##0.00;[$SFr.-1407]-#'##0.00
+  [$CHF-1407] #'##0.00;[$CHF-1407]-#'##0.00
 
 
-  [$SFr.-1407] #'##0;[ROT][$SFr.-1407]-#'##0
+  [$CHF-1407] #'##0;[ROT][$CHF-1407]-#'##0
 
 
-  [$SFr.-1407] #'##0.00;[ROT][$SFr.-1407]-#'##0.00
+  [$CHF-1407] #'##0.00;[ROT][$CHF-1407]-#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$SFr.-1407] #'##0.--;[ROT][$SFr.-1407]-#'##0.--
+  [$CHF-1407] #'##0.--;[ROT][$CHF-1407]-#'##0.--
 
 
   TT.MM.JJ
@@ -203,6 +203,13 @@
   
 
   CHF
+  CHF
+  CHF
+  Schweizer Franken
+  2
+
+
+  CHF
   SFr.
   CHF
   Schweizer Franken
diff --git a/i18npool/source/localedata/data/fr_CH.xml 
b/i18npool/source/localedata/data/fr_CH.xml
index 907d517..a2a51fc 100644
--- a/i18npool/source/localedata/data/fr_CH.xml
+++ b/i18npool/source/localedata/data/fr_CH.xml
@@ -88,22 +88,22 @@
   0.00%
 
 
-  [$sFr.-100C] #'##0;[$sFr.-100C] -#'##0
+  [$CHF-100C] #'##0;[$CHF-100C] -#'##0
 
 
-  [$sFr.-100C] #'##0.00;[$sFr.-100C] -#'##0.00
+  [$CHF-100C] #'##0.00;[$CHF-100C] -#'##0.00
 
 
-  [$sFr.-100C] #'##0;[RED][$sFr.-100C] -#'##0
+  [$CHF-100C] #'##0;[RED][$CHF-100C] -#'##0
 
 
-  [$sFr.-100C] #'##0.00;[RED][$sFr.-100C] 
-#'##0.00
+  [$CHF-100C] #'##0.00;[RED][$CHF-100C] -#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$sFr.-100C] #'##0.--;[RED][$sFr.-100C] 
-#'##0.--
+  [$CHF-100C] #'##0.--;[RED][$CHF-100C] -#'##0.--
 
 
   J.MM.AA
@@ -204,6 +204,13 @@
   
 
   CHF
+  CHF
+  CHF
+  franc suisse
+  2
+
+
+  CHF
   sFr.
   CHF
   franc suisse
diff --git a/i18npool/source/localedata/data/it_CH.xml 
b/i18npool/source/localedata/data/it_CH.xml
index a71019c..1514c67 100644
--- a/i18npool/source/localedata/data/it_CH.xml
+++ b/i18npool/source/localedata/data/it_CH.xml
@@ -87,22 +87,22 @@
   0.00%
 
 
-  [$SFr.-810] #'##0;[$SFr.-810] -#'##0
+  [$CHF-810] #'##0;[$CHF-810] -#'##0
 
 
-  [$SFr.-810] #'##0.00;[$SFr.-810] -#'##0.00
+  [$CHF-810] #'##0.00;[$CHF-810] -#'##0.00
 
 
-  [$SFr.-810] #'##0;[RED][$SFr.-810] -#'##0
+  [$CHF-810] #'##0;[RED][$CHF-810] -#'##0
 
 
-  [$SFr.-810] #'##0.00;[RED][$SFr.-810] -#'##0.00
+  [$CHF-810] #'##0.00;[RED][$CHF-810] -#'##0.00
 
 
   #'##0.00 CCC
 
 
-  [$SFr.-810] #'##0.--;[RED][$SFr.-810] -#'##0.--
+  [$CHF-810] #'##0.--;[RED][$CHF-810] -#'##0.--
 
 
   G.MM.AA
@@ -203,6 +203,13 @@
   
 
   CHF
+  CHF
+  CHF
+  Franco Svizzero
+  2
+
+
+  CHF
   SFr.
   CHF
   Franco Svizzero
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 13 commits - canvas/source compilerplugins/clang connectivity/source dtrans/source embeddedobj/source embedserv/source extensions/source fpicker/source hwpfilter/source

2017-01-11 Thread Stephan Bergmann

 canvas/source/directx/dx_canvas.cxx
   |4 -
 canvas/source/directx/dx_spritecanvas.cxx  
   |2 
 compilerplugins/clang/externvar.cxx
   |   12 
 connectivity/source/drivers/ado/Awrapado.cxx   
   |8 ---
 dtrans/source/win32/dnd/globals.hxx
   |9 +++
 dtrans/source/win32/dnd/source.cxx 
   |2 
 dtrans/source/win32/dnd/target.cxx 
   |1 
 embeddedobj/source/msole/olecomponent.cxx  
   |2 
 embedserv/source/embed/servprov.cxx
   |2 
 embedserv/source/embed/tracker.cxx 
   |   10 +--
 extensions/source/activex/so_activex.cxx   
   |   26 +-
 extensions/source/ole/oledll.cxx   
   |2 
 fpicker/source/win32/folderpicker/MtaFop.cxx   
   |4 -
 fpicker/source/win32/misc/resourceprovider.cxx 
   |2 
 hwpfilter/source/fontmap.cxx   
   |2 
 hwpfilter/source/grammar.h 
   |2 
 hwpfilter/source/lexer.cxx 
   |3 -
 sal/osl/w32/dllentry.c 
   |3 -
 sal/osl/w32/file_url.cxx   
   |3 -
 sal/osl/w32/file_url.h 
   |3 +
 sal/osl/w32/path_helper.cxx
   |8 +--
 sal/osl/w32/process.cxx
   |2 
 sal/osl/w32/procimpl.cxx   
   |4 -
 sal/osl/w32/socket.cxx 
   |2 
 sal/osl/w32/thread.h   
   |2 
 
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
 |   12 ++--
 shell/inc/shlxthdl.hxx 
   |2 
 shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
   |4 -
 shell/source/win32/shlxthandler/shlxthdl.cxx   
   |   24 -
 shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
   |2 
 shell/source/win32/simplemail/senddoc.cxx  
   |2 
 winaccessibility/source/UAccCOM/MAccessible.cxx
   |4 -
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx  
   |2 
 33 files changed, 89 insertions(+), 83 deletions(-)

New commits:
commit 33c81a4580230cc64667d98cacda8c484248a781
Author: Stephan Bergmann 
Date:   Wed Jan 11 13:42:18 2017 +0100

loplugin:externvar (clang-cl)

Change-Id: I6f4c294cb15a4426545d05be7b0a7f26f580563c

diff --git 
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 599cebf..39f52f7 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -64,7 +64,7 @@ struct CertErrorToString{
 char const * name;
 };
 
-CertErrorToString arErrStrings[] =
+CertErrorToString const arErrStrings[] =
 {
 { 0x, "CERT_TRUST_NO_ERROR"},
 { 0x0001, "CERT_TRUST_IS_NOT_TIME_VALID"},
commit db5cfb790f38b9cfbff67d49ec4f7104634f8628
Author: Stephan Bergmann 
Date:   Wed Jan 11 13:42:10 2017 +0100

loplugin:externvar (clang-cl)

Change-Id: I0f967f75dc41b3dc65790cf97bdac992033d1c92

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index b832c53..f08cd83 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -88,7 +88,7 @@ enum XInterfaceIndex {
 
 // IA2 states mapping, and name
 // maintenance the consistency, change one array, change the three all
-long IA2_STATES[] =
+long const IA2_STATES[] =
 {
 IA2_STATE_ACTIVE,   // =0x1;
 IA2_STATE_ARMED,// =0x2;
@@ -114,7 +114,7 @@ long IA2_STATES[] =
 <=== map ===>
 
 */
-short UNO_STATES[] =
+short const UNO_STATES[] =
 {
 ACTIVE, // = (sal_Int16)1;
 ARMED,  // = (sal_Int16)2;
commit 556f1eab63555019865803c055454b7b69c2d75b
Autho

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/uiconfig

2017-01-11 Thread Abhilash Singh

 sw/uiconfig/swriter/ui/fldfuncpage.ui |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit ba688ee930bb9a910962e14493fb77edcca15d80
Author: Abhilash Singh 
Date:   Tue Jan 10 12:53:48 2017 +0530

tdf#104807 Placeholder field doesn't resize

Change-Id: I55f1ff2be091ea5e8475e22abdf62aa5c0c435be
Reviewed-on: https://gerrit.libreoffice.org/32921
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit acc939f6cb832bac281274210e3737c1ba06216c)
Reviewed-on: https://gerrit.libreoffice.org/32965
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui 
b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 9b04e7f..6c76662 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -151,6 +151,7 @@
 True
 False
 12
+True
 
   
 _Macro...
@@ -172,6 +173,7 @@
 True
 False
 6
+True
 
   
 True
@@ -193,6 +195,7 @@
 True
 True
 â¢
+True
   
   
 0
@@ -214,6 +217,7 @@
 True
 False
 6
+True
 
   
 True
@@ -236,6 +240,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -257,6 +262,7 @@
 True
 False
 6
+True
 
   
 True
@@ -279,6 +285,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -322,6 +329,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -348,6 +356,7 @@
 True
 False
 6
+True
 
   
 True
@@ -370,6 +379,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -525,6 +535,7 @@
 True
 â¢
 True
+True
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 57 commits - accessibility/source cui/source desktop/source dictionaries download.lst editeng/source filter/Library_pdffilter.mk f

2017-01-11 Thread Katarina Behrens

Rebased ref, commits from common ancestor:
commit eff1c5c35210865206ac7e827e86af037e479396
Author: Katarina Behrens 
Date:   Wed Apr 6 23:06:37 2016 +0200

PDF export of cell formulas now configurable in UI

Of course, only in Calc. I had to make filter/pdf depend
on svxcore (because of ColorListBox) but little harm done,
other filters in this dir depend on it already too

Conflicts:
filter/source/pdf/impdialog.cxx
filter/source/pdf/impdialog.hxx
filter/uiconfig/ui/pdfgeneralpage.ui

Change-Id: Id5bf99fdc738aea073bf5315e37ed5002ab0f926

diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index 6de7d34..a3151ee 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_custom_headers,pdffilter,\
 
 $(eval $(call gb_Library_use_libraries,pdffilter,\
svt \
+   svxcore \
sfx \
tk \
vcl \
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 432f9e5..82005e8 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -25,7 +25,12 @@
 #include 
 #include 
 #include 
+#include 
 #include "sfx2/passwd.hxx"
+#include 
+#include 
+#include 
+#include 
 #include "svtools/miscopt.hxx"
 
 #include "comphelper/storagehelper.hxx"
@@ -70,6 +75,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mnGeneralPageId(0),
 mbIsPresentation( false ),
 mbIsWriter( false ),
+mbIsSpreadsheet( false ),
 
 mbSelectionPresent( false ),
 mbUseCTLFont( false ),
@@ -79,6 +85,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mnMaxImageResolution( 300 ),
 mbUseTaggedPDF( false ),
 mbExportNotes( true ),
+mbExportFormulaAnnotation( false ),
 mbViewPDF( false ),
 mbExportNotesPages( false ),
 mbExportOnlyNotesPages( false ),
@@ -92,6 +99,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mbExportBookmarks( true ),
 mbExportHiddenSlides ( false),
 mnOpenBookmarkLevels( -1 ),
+mnAnnotColor( -1 ),
 
 mbHideViewerToolbar( false ),
 mbHideViewerMenubar( false ),
@@ -172,6 +180,8 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mbIsPresentation = true;
 if ( xInfo->supportsService( 
"com.sun.star.text.GenericTextDocument" ) )
 mbIsWriter = true;
+if ( xInfo->supportsService( 
"com.sun.star.sheet.SpreadsheetDocument" ) )
+mbIsSpreadsheet = true;
 }
 }
 catch(const RuntimeException &)
@@ -194,6 +204,8 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mbExportOnlyNotesPages = maConfigItem.ReadBool( 
"ExportOnlyNotesPages", false );
 }
 mbExportNotes = maConfigItem.ReadBool( "ExportNotes", false );
+mbExportFormulaAnnotation = maConfigItem.ReadBool( 
"ExportFormulaAsAnnotation", false );
+mnAnnotColor = maConfigItem.ReadInt32( "FormulaAnnotationHighlightColor", 
-1 );
 mbViewPDF = maConfigItem.ReadBool( "ViewPDFAfterExport", false );
 
 mbExportBookmarks = maConfigItem.ReadBool( "ExportBookmarks", true );
@@ -404,6 +416,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
 maConfigItem.WriteBool( "ExportOnlyNotesPages", mbExportOnlyNotesPages 
);
 }
 maConfigItem.WriteBool( "ExportNotes", mbExportNotes );
+maConfigItem.WriteBool( "ExportFormulaAsAnnotation", 
mbExportFormulaAnnotation );
 maConfigItem.WriteBool( "ViewPDFAfterExport", mbViewPDF );
 
 maConfigItem.WriteBool( "ExportBookmarks", mbExportBookmarks );
@@ -436,6 +449,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
 maConfigItem.WriteInt32( "PageLayout", mnPageLayout );
 maConfigItem.WriteBool( "FirstPageOnLeft", mbFirstPageLeft );
 maConfigItem.WriteInt32( "OpenBookmarkLevels", mnOpenBookmarkLevels );
+maConfigItem.WriteInt32( "FormulaAnnotationHighlightColor", mnAnnotColor );
 
 maConfigItem.WriteBool( "ExportLinksRelativeFsys", 
mbExportRelativeFsysLinks );
 maConfigItem.WriteInt32("PDFViewSelection", mnViewPDFMode );
@@ -524,6 +538,8 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* 
pParent, const SfxItemSe
 , mbExportFormFieldsUserSelection(false)
 , mbIsPresentation(false)
 , mbIsWriter(false)
+, mbIsSpreadsheet(false)
+
 , mpaParent(nullptr)
 {
 get(mpRbAll, "all");
@@ -552,6 +568,11 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* 
pParent, const SfxItemSe
 get(mpCbExportNotes, "comments");
 get(mpCbExportNotesPages, "notes");
 get(mpCbExportOnlyNotesPages, "onlynotes");
+get(mpFormulaFrame, "formulaframe");
+get(mpCbExportFormulaAnnotations, "formulas");
+get(mpFtAnnotColor, "annotation_label");
+get(mpLbAnnotColor, "annotation_color"

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-1' - 39 commits - canvas/source configure.ac dictionaries download.lst drawinglayer/source editeng/source filter/Library_pdffilter.mk f

2017-01-11 Thread Thorsten Behrens

Rebased ref, commits from common ancestor:
commit 0cad1748e5f84a9b1da184b511f05941223dcddd
Author: Thorsten Behrens 
Date:   Fri Jan 6 02:47:23 2017 +0100

libpng: update to release 1.6.28

(cherry picked from commit 11913e7f3d9ee9e90e6131f67584bb60f67aa577)

Change-Id: Ie22e5eb6656ef1d2e7903011ea72a1aa26d4da7c
Reviewed-on: https://gerrit.libreoffice.org/32768
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/32769
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index f9b1771..9d3ba21 100755
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-export PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9
-export PNG_TARBALL := libpng-1.6.24.tar.gz
+export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
+export PNG_TARBALL := libpng-1.6.28.tar.gz
 export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12
 export POPPLER_TARBALL := poppler-0.26.4.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
commit 4ed5dd57678735329b9198efac97a4ba798817f3
Author: Katarina Behrens 
Date:   Wed Apr 6 23:06:37 2016 +0200

PDF export of cell formulas now configurable in UI

Of course, only in Calc. I had to make filter/pdf depend
on svxcore (because of ColorListBox) but little harm done,
other filters in this dir depend on it already too

Conflicts:
filter/source/pdf/impdialog.cxx
filter/uiconfig/ui/pdfgeneralpage.ui

Change-Id: Id5bf99fdc738aea073bf5315e37ed5002ab0f926

diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index 6de7d34..a3151ee 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_custom_headers,pdffilter,\
 
 $(eval $(call gb_Library_use_libraries,pdffilter,\
svt \
+   svxcore \
sfx \
tk \
vcl \
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index f1c86a8..9a4a622 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -25,7 +25,12 @@
 #include 
 #include 
 #include 
+#include 
 #include "sfx2/passwd.hxx"
+#include 
+#include 
+#include 
+#include 
 #include "svtools/miscopt.hxx"
 
 #include "comphelper/storagehelper.hxx"
@@ -73,6 +78,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mnGeneralPageId(0),
 mbIsPresentation( false ),
 mbIsWriter( false ),
+mbIsSpreadsheet( false ),
 
 mbSelectionPresent( false ),
 mbUseCTLFont( false ),
@@ -82,6 +88,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mnMaxImageResolution( 300 ),
 mbUseTaggedPDF( false ),
 mbExportNotes( true ),
+mbExportFormulaAnnotation( false ),
 mbViewPDF( false ),
 mbExportNotesPages( false ),
 mbUseTransitionEffects( false ),
@@ -94,6 +101,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mbExportBookmarks( true ),
 mbExportHiddenSlides ( false),
 mnOpenBookmarkLevels( -1 ),
+mnAnnotColor( -1 ),
 
 mbHideViewerToolbar( false ),
 mbHideViewerMenubar( false ),
@@ -175,6 +183,8 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 mbIsPresentation = true;
 if ( xInfo->supportsService( 
"com.sun.star.text.GenericTextDocument" ) )
 mbIsWriter = true;
+if ( xInfo->supportsService( 
"com.sun.star.sheet.SpreadsheetDocument" ) )
+mbIsSpreadsheet = true;
 }
 }
 catch(const RuntimeException &)
@@ -194,6 +204,8 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 if ( mbIsPresentation )
 mbExportNotesPages = maConfigItem.ReadBool( "ExportNotesPages", false 
);
 mbExportNotes = maConfigItem.ReadBool( "ExportNotes", false );
+mbExportFormulaAnnotation = maConfigItem.ReadBool( 
"ExportFormulaAsAnnotation", false );
+mnAnnotColor = maConfigItem.ReadInt32( "FormulaAnnotationHighlightColor", 
-1 );
 mbViewPDF = maConfigItem.ReadBool( "ViewPDFAfterExport", false );
 
 mbExportBookmarks = maConfigItem.ReadBool( "ExportBookmarks", true );
@@ -396,6 +408,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
 if ( mbIsPresentation )
 maConfigItem.WriteBool( "ExportNotesPages", mbExportNotesPages );
 maConfigItem.WriteBool( "ExportNotes", mbExportNotes );
+maConfigItem.WriteBool( "ExportFormulaAsAnnotation", 
mbExportFormulaAnnotation );
 maConfigItem.WriteBool( "ViewPDFAfterExport", mbViewPDF );
 
 maConf

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

2017-01-11 Thread Abhilash Singh

 sw/uiconfig/swriter/ui/fldfuncpage.ui |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit acc939f6cb832bac281274210e3737c1ba06216c
Author: Abhilash Singh 
Date:   Tue Jan 10 12:53:48 2017 +0530

tdf#104807 Placeholder field doesn't resize

Change-Id: I55f1ff2be091ea5e8475e22abdf62aa5c0c435be
Reviewed-on: https://gerrit.libreoffice.org/32921
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui 
b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 9b04e7f..6c76662 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -151,6 +151,7 @@
 True
 False
 12
+True
 
   
 _Macro...
@@ -172,6 +173,7 @@
 True
 False
 6
+True
 
   
 True
@@ -193,6 +195,7 @@
 True
 True
 â¢
+True
   
   
 0
@@ -214,6 +217,7 @@
 True
 False
 6
+True
 
   
 True
@@ -236,6 +240,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -257,6 +262,7 @@
 True
 False
 6
+True
 
   
 True
@@ -279,6 +285,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -322,6 +329,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -348,6 +356,7 @@
 True
 False
 6
+True
 
   
 True
@@ -370,6 +379,7 @@
 True
 â¢
 True
+True
   
   
 0
@@ -525,6 +535,7 @@
 True
 â¢
 True
+True
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: News on Xcode IDE, libre office now loads as 1 project, with modules etc.

2017-01-11 Thread Alexander Thurgood

Le 06/01/2017 à 11:39, Alexander Thurgood a écrit :

Well, just to report back, it would appear that, after a fresh make
clean pull and rebuild, xcode_ide-integration now has built a
libreoffice.xcodeproj folder.

Thanks for all the work you've put in ! Off to test, now.


Alex


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

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - download.lst

2017-01-11 Thread Thorsten Behrens

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 881ba232d152611c000896a0c47aa48ccefb4e0e
Author: Thorsten Behrens 
Date:   Fri Jan 6 02:47:23 2017 +0100

libpng: update to release 1.6.28

(cherry picked from commit 11913e7f3d9ee9e90e6131f67584bb60f67aa577)

Change-Id: Ie22e5eb6656ef1d2e7903011ea72a1aa26d4da7c
Reviewed-on: https://gerrit.libreoffice.org/32768
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/32769
Reviewed-by: Andras Timar 
(cherry picked from commit a50837e5be1c95bfaceedfafad6ecedcc874340b)

diff --git a/download.lst b/download.lst
index 711b67f..5c545b7 100644
--- a/download.lst
+++ b/download.lst
@@ -123,8 +123,8 @@ export ORCUS_TARBALL := 
7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-export PNG_MD5SUM := 046cb01d627917c492bb65d9399e14f8
-export PNG_TARBALL := libpng-1.5.27.tar.gz
+export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
+export PNG_TARBALL := libpng-1.6.28.tar.gz
 export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12
 export POPPLER_TARBALL := poppler-0.26.4.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - common/Png.hpp common/Protocol.hpp kit/Kit.cpp

2017-01-11 Thread Tor Lillqvist

 common/Png.hpp  |3 ---
 common/Protocol.hpp |4 ++--
 kit/Kit.cpp |8 
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 7d7e5a4bfe821597d3749492705cece5f72a8ab5
Author: Tor Lillqvist 
Date:   Wed Jan 11 14:02:34 2017 +0200

Remove assert as this function can also be called with a non-empty output 
vector

Change-Id: Idff29a5bd298ada7b6d8fe3e76fd2e25d8f25c79

diff --git a/common/Png.hpp b/common/Png.hpp
index ab6a795..b3c0863 100644
--- a/common/Png.hpp
+++ b/common/Png.hpp
@@ -127,9 +127,6 @@ bool encodeSubBufferToPNG(unsigned char* pixmap, size_t 
startX, size_t startY,
 return false;
 }
 
-// This function seems to be always called with an empty _output_ vector. 
Make sure we can rely on that.
-assert(output.size() == 0);
-
 png_set_IHDR(png_ptr, info_ptr, width, height, 8, 
PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, 
PNG_FILTER_TYPE_DEFAULT);
 
 png_set_write_fn(png_ptr, &output, user_write_fn, user_flush_fn);
commit 2eb40ab43cfd52d2d4d486c4e17cc2af9e856a77
Author: Tor Lillqvist 
Date:   Mon Jan 9 10:55:28 2017 +0200

Drop an unneeded (and defaulted) parameter

Change-Id: I788080db53507604accd97dacc2d74e614b80641

diff --git a/common/Protocol.hpp b/common/Protocol.hpp
index fa7ba7a..f9ccd6a 100644
--- a/common/Protocol.hpp
+++ b/common/Protocol.hpp
@@ -56,10 +56,10 @@ namespace LOOLProtocol
 }
 
 inline
-bool parseNameIntegerPair(const std::string& token, std::string& name, 
int& value, const char delim = '=')
+bool parseNameIntegerPair(const std::string& token, std::string& name, 
int& value)
 {
 std::string strValue;
-return parseNameValuePair(token, name, strValue, delim) && 
stringToInteger(strValue, value);
+return parseNameValuePair(token, name, strValue, '=') && 
stringToInteger(strValue, value);
 }
 
 bool getTokenInteger(const std::string& token, const std::string& name, 
int& value);
commit 3f7cca78ebc4097117f0bbcc4a2ea2db56b11671
Author: Tor Lillqvist 
Date:   Fri Jan 6 11:15:13 2017 +0200

Indentation fixes

Change-Id: I72010aeff7fb65f9dc18613d0cfc53b5154e07c1

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index cd15e77..db96997 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -548,7 +548,7 @@ public:
 {
 LOG_INF("setDocumentPassword: passwordProtected=" << 
_isDocPasswordProtected <<
 " passwordProvided=" << _haveDocPassword <<
-" password='" << _docPassword <<  "'");
+" password='" << _docPassword << "'");
 
 Util::assertIsLocked(_documentMutex);
 
@@ -702,13 +702,13 @@ public:
 for (Util::Rectangle& tileRect : tileRecs)
 {
 const size_t positionX = (tileRect.getLeft() - 
renderArea.getLeft()) / tileCombined.getTileWidth();
-const size_t positionY = (tileRect.getTop() - renderArea.getTop()) 
 / tileCombined.getTileHeight();
+const size_t positionY = (tileRect.getTop() - renderArea.getTop()) 
/ tileCombined.getTileHeight();
 
 const auto oldSize = output.size();
 const auto pixelWidth = tileCombined.getWidth();
 const auto pixelHeight = tileCombined.getHeight();
 if (!_pngCache.encodeSubBufferToPNG(pixmap.data(), positionX * 
pixelWidth, positionY * pixelHeight,
-   pixelWidth, pixelHeight, 
pixmapWidth, pixmapHeight, output, mode))
+pixelWidth, pixelHeight, 
pixmapWidth, pixmapHeight, output, mode))
 {
 //FIXME: Return error.
 //sendTextFrame("error: cmd=tile kind=failure");
@@ -1102,7 +1102,7 @@ private:
 LOG_DBG("Calling lokit::documentLoad(" << uri << ").");
 Timestamp timestamp;
 _loKitDocument.reset(_loKit->documentLoad(uri.c_str()));
-LOG_DBG("Returned lokit::documentLoad(" << uri << ") in " << 
(timestamp.elapsed()  / 1000.) << "ms.");
+LOG_DBG("Returned lokit::documentLoad(" << uri << ") in " << 
(timestamp.elapsed() / 1000.) << "ms.");
 
 if (!_loKitDocument || !_loKitDocument->get())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-0' - download.lst

2017-01-11 Thread Thorsten Behrens

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a50837e5be1c95bfaceedfafad6ecedcc874340b
Author: Thorsten Behrens 
Date:   Fri Jan 6 02:47:23 2017 +0100

libpng: update to release 1.6.28

(cherry picked from commit 11913e7f3d9ee9e90e6131f67584bb60f67aa577)

Change-Id: Ie22e5eb6656ef1d2e7903011ea72a1aa26d4da7c
Reviewed-on: https://gerrit.libreoffice.org/32768
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/32769
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 711b67f..5c545b7 100644
--- a/download.lst
+++ b/download.lst
@@ -123,8 +123,8 @@ export ORCUS_TARBALL := 
7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-export PNG_MD5SUM := 046cb01d627917c492bb65d9399e14f8
-export PNG_TARBALL := libpng-1.5.27.tar.gz
+export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
+export PNG_TARBALL := libpng-1.6.28.tar.gz
 export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12
 export POPPLER_TARBALL := poppler-0.26.4.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Justin Luth

 sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx   |   15 +++
 sc/source/filter/inc/scenariobuffer.hxx  |3 ++-
 sc/source/filter/oox/scenariobuffer.cxx  |   23 +++
 4 files changed, 24 insertions(+), 17 deletions(-)

New commits:
commit 9fdb840b23889e2554740abcb99c71b566dbafc6
Author: Justin Luth 
Date:   Mon Dec 26 14:59:21 2016 +0300

tdf#97598 xlsx import: do not apply any scenarios

Excel does not automatically apply scenarios, so neither should LO.

Scenarios appear to first be supported in 2009 and this section that
applies the "mnShown" scenario comes from
> commit 0851da4d8a0a557f1e9a31af652a530c615c2989
> CWS-TOOLING: integrate CWS dr68

mnShown should only mean the last scenario that was shown, so
mark it as active, but don't apply it.
In Excel, mnCurrent tracks and auto-selects a scenario in the dialog box,
so that is irrelevant to us.

Change-Id: I6b4a9b14733d6ab6dc2283a569f0e2484f81c24f
Reviewed-on: https://gerrit.libreoffice.org/32432
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit dfc6f4c1be58b088dd099f6f8bb6103bf962e144)
Reviewed-on: https://gerrit.libreoffice.org/32941
Reviewed-by: Justin Luth 

diff --git a/sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx 
b/sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx
new file mode 100755
index 000..ba3f43f
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 3b5efca..8873513 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -239,6 +239,7 @@ public:
 
 void testTdf100458();
 void testTdf100709XLSX();
+void testTdf97598XLSX();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -355,6 +356,7 @@ public:
 
 CPPUNIT_TEST(testTdf100458);
 CPPUNIT_TEST(testTdf100709XLSX);
+CPPUNIT_TEST(testTdf97598XLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -3849,6 +3851,19 @@ void ScFiltersTest::testTdf100709XLSX()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testTdf97598XLSX()
+{
+ScDocShellRef xDocSh = loadDoc("tdf97598_scenarios.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf97598_secenarios.xlsx", 
xDocSh.Is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+OUString aStr = rDoc.GetString(0, 0, 0); // A1
+CPPUNIT_ASSERT_EQUAL(OUString("Cell A1"), aStr);
+
+xDocSh->DoClose();
+}
+
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
diff --git a/sc/source/filter/inc/scenariobuffer.hxx 
b/sc/source/filter/inc/scenariobuffer.hxx
index cfe18f7..ddfbee5 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -44,6 +44,7 @@ struct ScenarioModel
 OUString maUser; /// Name of user created the scenario.
 boolmbLocked;   /// True = input cell values 
locked.
 boolmbHidden;   /// True = scenario is hidden.
+boolmbActive;
 
 explicitScenarioModel();
 };
@@ -51,7 +52,7 @@ struct ScenarioModel
 class Scenario : public WorkbookHelper
 {
 public:
-explicitScenario( const WorkbookHelper& rHelper, sal_Int16 
nSheet );
+explicitScenario( const WorkbookHelper& rHelper, sal_Int16 
nSheet, bool bIsActive );
 
 /** Imports a scenario definition from a scenario element. */
 voidimportScenario( const AttributeList& rAttribs );
diff --git a/sc/source/filter/oox/scenariobuffer.cxx 
b/sc/source/filter/oox/scenariobuffer.cxx
index 0060adf..1ae9bec 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -50,14 +50,16 @@ ScenarioCellModel::ScenarioCellModel() :
 
 ScenarioModel::ScenarioModel() :
 mbLocked( false ),
-mbHidden( false )
+mbHidden( false ),
+mbActive( false )
 {
 }
 
-Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet ) :
+Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet, bool 
bIsActive ) :
 WorkbookHelper( rHelper ),
 mnSheet( nSheet )
 {
+maModel.mbActive = bIsActive;
 }
 
 void Scenario::importScenario( const AttributeList& rAttribs )
@@ -138,7 +140,7 @@ void Scenario::finalizeImport()
 
 // scenario properties
 PropertySet aPropSet( xScenarios->getByName( aScenName ) );
-aPropSet.setProperty( PROP_IsActive, false );
+aPropSet.setProperty( PROP_IsActive, maModel.mbActive );
 aPropSet.setProperty( PROP_CopyBack, false );
 aPropSet.setProperty( PROP_CopyStyles, false );
 aPropSet.setProperty( PROP_CopyFormulas, false );
@@ -178,7 +180,8 @@ void SheetScenarios::importScenarios( SequenceInputStream& 
rStrm )

[Libreoffice-commits] online.git: 15 commits - loleaflet/build loleaflet/dist loleaflet/main.css loleaflet/src

2017-01-11 Thread Pranav Kant

 loleaflet/build/build.js  |2 
 loleaflet/dist/loleaflet.css  |   35 +--
 loleaflet/dist/loleaflet.html |   31 ++
 loleaflet/dist/menubar.css|  216 +++
 loleaflet/dist/partsPreviewControl.css|   15 -
 loleaflet/dist/sm-simple.css  |  287 --
 loleaflet/dist/spreadsheet.css|   10 
 loleaflet/dist/toolbar.css|   25 --
 loleaflet/dist/toolbar/toolbar.js |  117 ++
 loleaflet/main.css|4 
 loleaflet/src/control/Control.Menubar.js  |   26 ++
 loleaflet/src/control/Control.PartsPreview.js |9 
 loleaflet/src/control/Permission.js   |4 
 loleaflet/src/core/Browser.js |2 
 14 files changed, 422 insertions(+), 361 deletions(-)

New commits:
commit d6af42eae02a04b89dd052ae6df977f59809e729
Author: Pranav Kant 
Date:   Wed Jan 11 13:55:53 2017 +0530

loleaflet: Remove items from statusbar in mobile mode

Change-Id: I8dbc356a2968764c72edf401d33399c92f9f73e4

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 5d93fc0..6835cc1 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -27,9 +27,23 @@ var toolbarUpMobileItems = [
'close'
 ];
 
+var statusbarMobileItems = [
+   'search',
+   'searchprev',
+   'searchnext',
+   'cancelsearch',
+   'left',
+   'right',
+   'modifiedstatuslabel',
+   'modifiedstatuslabelbreak',
+   'prev',
+   'next'
+];
+
 function _mobilify() {
var toolbarUp = w2ui['toolbar-up'];
var toolbarUpMore = w2ui['toolbar-up-more'];
+   var statusbar = w2ui['toolbar-down'];
 
for (var itemIdx in toolbarUp.items) {
var id = toolbarUp.items[itemIdx].id;
@@ -43,11 +57,19 @@ function _mobilify() {
toolbarUpMore.hide(id);
}
}
+
+   for (itemIdx in statusbar.items) {
+   id = statusbar.items[itemIdx].id;
+   if (statusbarMobileItems.indexOf(id) === -1 && 
!statusbar.get(id).hidden) {
+   statusbar.hide(id);
+   }
+   }
 }
 
 function _unmobilify() {
var toolbarUp = w2ui['toolbar-up'];
var toolbarUpMore = w2ui['toolbar-up-more'];
+   var statusbar = w2ui['toolbar-down'];
 
for (var itemIdx in toolbarUp.items) {
var id = toolbarUp.items[itemIdx].id;
@@ -61,6 +83,13 @@ function _unmobilify() {
toolbarUpMore.show(id);
}
}
+
+   for (itemIdx in statusbar.items) {
+   id = statusbar.items[itemIdx].id;
+   if (statusbarMobileItems.indexOf(id) === -1 && 
statusbar.get(id).hidden) {
+   statusbar.show(id);
+   }
+   }
 }
 
 function resizeToolbar() {
@@ -631,7 +660,7 @@ $(function () {
{type: 'html',  id: 'left'},
{type: 'html',  id: 'right'},
{type: 'html',id: 'modifiedstatuslabel', html: 
''},
-   {type: 'break'},
+   {type: 'break', id: 'modifiedstatuslabelbreak'},
{type: 'drop', id: 'userlist', text: _('No users'), 
html: '' },
{type: 'break'},
{type: 'button',  id: 'prev', img: 'prev', hint: 
_('Previous page')},
commit aa7ef0337cb5df4f080bfc21c8e54573a22d872d
Author: Pranav Kant 
Date:   Wed Jan 11 12:52:39 2017 +0530

Fix specificity and hide slide sorter for smaller screen width

Using !important always is not a good idea. You can't override an
!important with another !important and we have started to face
such situations now where we want to adjust element's alignment
based on media-screen width. Instead lets fix the specificity to
make this work.

.parts-preview-document or .spreadsheet-document would be
0-0-1-0. Use #document-container.parts-preview-document to
increase its specificity to 0-1-1-0 so that we can do without the
!important flag and use !important flag for media-screen blocks.

Change-Id: I1d15df492cdc7cd1cd09c3b43c8ea84295a07205

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index e6ca00d..c8c5889 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -29,6 +29,18 @@ body {
 bottom: 66px;
 max-width: 214px;
 border-top: 1px solid #b6b6b6;
+display: block;
+}
+
+@media (max-width: 768px) {
+/* Show slidesorter beyond 768px only */
+#presentation-controls-wrapper {
+   display: none;
+}
+
+#document-container.parts-preview-document {
+   left: 0px !important;
+}
 }
 
 .loleaflet-font {
diff --git a/loleaflet/dist/partsPreviewControl.css 
b/loleaflet/dist/partsPrevie

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/unx

2017-01-11 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2514abf43f85aae48d2d26da7a1871383841cca
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 11 10:14:31 2017 +

Resolves: rhbz#1408500 gtk3 toolbar borders too distinct vs native gtk3 ones

Change-Id: I7ce284d3e6f999e2ac08326dc40b060bf70d7d4b
(cherry picked from commit 5088b2066651ed133dcfd93388f7ac7187844d33)
Reviewed-on: https://gerrit.libreoffice.org/32954
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 8b654d9..945e68b 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2921,6 +2921,7 @@ void GtkData::initNWF()
 ImplSVData* pSVData = ImplGetSVData();
 pSVData->maNWFData.mbFlatMenu = true;
 pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+pSVData->maNWFData.mbDockingAreaAvoidTBFrames = true;
 pSVData->maNWFData.mbCanDrawWidgetAnySize = true;
 pSVData->maNWFData.mbDDListBoxNoTextArea = true;
 pSVData->maNWFData.mbNoFocusRects = 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-2' - vcl/unx

2017-01-11 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4590b0a2a5b75fc4fd6c8fb7fea6d40c4bab664c
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 11 10:14:31 2017 +

Resolves: rhbz#1408500 gtk3 toolbar borders too distinct vs native gtk3 ones

Change-Id: I7ce284d3e6f999e2ac08326dc40b060bf70d7d4b
(cherry picked from commit 5088b2066651ed133dcfd93388f7ac7187844d33)
Reviewed-on: https://gerrit.libreoffice.org/32955
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index cdf4f08..8deb58b 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2908,6 +2908,7 @@ void GtkData::initNWF()
 ImplSVData* pSVData = ImplGetSVData();
 pSVData->maNWFData.mbFlatMenu = true;
 pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+pSVData->maNWFData.mbDockingAreaAvoidTBFrames = true;
 pSVData->maNWFData.mbCanDrawWidgetAnySize = true;
 pSVData->maNWFData.mbDDListBoxNoTextArea = true;
 pSVData->maNWFData.mbNoFocusRects = 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-2' - sd/source

2017-01-11 Thread Stephan Bergmann

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96e0beb0ef99a0840ecf434c3d726eebaa3c745e
Author: Stephan Bergmann 
Date:   Tue Jan 10 15:31:53 2017 +0100

tdf#105199: Keep URL intact

(cherry picked from commit 6a68e364faa0d384f1e3bf397f5decaadecf9b3b)
Conflicts:
sd/source/ui/dlg/PhotoAlbumDialog.cxx

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

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 04a7b80..3f4f932 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -507,7 +507,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, 
void)
 // Store full path, show filename only. Use INetURLObject to 
display spaces in filename correctly
 INetURLObject aUrl = INetURLObject(aFilesArr[i]);
 sal_Int16 nPos = pImagesLst->InsertEntry( 
aUrl.GetLastName(INetURLObject::DECODE_WITH_CHARSET) );
-pImagesLst->SetEntryData(nPos, new 
OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET)));
+pImagesLst->SetEntryData(nPos, new 
OUString(aUrl.GetMainURL(INetURLObject::NO_DECODE)));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - dbaccess/source

2017-01-11 Thread Caolán McNamara

 dbaccess/source/ui/misc/TokenWriter.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 88035917f52d7c372dc757ecd44978cce2681291
Author: CaolÃ¡n McNamara 
Date:   Tue Jan 10 14:40:07 2017 +

Resolves: rhbz#1409634 crash on close storing clipboard of database table

Change-Id: I8e692314b4ef278f7881780d51bcecb60ca80c3f
(cherry picked from commit 6c2725038b627535ba97ead89dadb96e0ff69c3c)
Reviewed-on: https://gerrit.libreoffice.org/32929
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx 
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 98a3312..cac82ba 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -934,8 +934,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, 
sal_Int32 nWidthPixel, sal
 aStrTD = aStrTD + "=";
 aStrTD = aStrTD + pChar;
 
-Reference< css::util::XNumberFormatsSupplier >  xSupplier = 
m_xFormatter->getNumberFormatsSupplier();
-SvNumberFormatsSupplierObj* pSupplierImpl = 
SvNumberFormatsSupplierObj::getImplementation( xSupplier );
+SvNumberFormatsSupplierObj* pSupplierImpl = m_xFormatter.is() ? 
SvNumberFormatsSupplierObj::getImplementation(m_xFormatter->getNumberFormatsSupplier())
 : nullptr;
 SvNumberFormatter* pFormatter = pSupplierImpl ? 
pSupplierImpl->GetNumberFormatter() : nullptr;
 if(pFormatter)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Michael Stahl

 sw/source/core/undo/rolbck.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit eeb0b8c5fcfcc24b05b773e921b04f3325991247
Author: Michael Stahl 
Date:   Tue Jan 10 23:25:47 2017 +0100

tdf#105077 sw: fix wrong assert corner-case in SwRegHistory::InsertItems

There is a tricky corner-case when an item set is inserted that
contains items that are all identical to what's in the node's item set.

In this case a SwHistorySetText will be created for an overwritten hint,
but no new AUTOFMT hint will be inserted so there is no
SwHistoryResetText.

So it looks like AUTOFMT can't be checked at all here.

(regression from b44e70e3d17c79eaf78f9bfe8bd0275d7ed9325f)

Change-Id: I83a241588cef6a9ec074d4f0e39322987394ca86
(cherry picked from commit db4badfc971b9cc60809c3408f579bae04a77c34)
Reviewed-on: https://gerrit.libreoffice.org/32942
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index a8cafba..3e55338 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -1317,8 +1317,10 @@ bool SwRegHistory::InsertItems( const SfxItemSet& rSet,
 (isCHRATR(nWhich) || RES_TXTATR_UNKNOWN_CONTAINER == nWhich)
 ? RES_TXTATR_AUTOFMT
 : static_cast(nWhich));
-if (RES_TXTATR_AUTOFMT == nExpected && 0 == nStart && 
pTextNode->Len() == nEnd)
+if (RES_TXTATR_AUTOFMT == nExpected)
 continue; // special case, may get set on text node itself
+  // tdf#105077 even worse, node's set could cause
+  // nothing at all to be inserted
 assert(std::find_if(
 m_pHistory->m_SwpHstry.begin(), m_pHistory->m_SwpHstry.end(),
 [nExpected](SwHistoryHint *const pHint) -> bool {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread pv2k

 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/sfxhelp.cxx   |   23 +++---
 sfx2/uiconfig/ui/helpmanual.ui |   65 +
 3 files changed, 84 insertions(+), 5 deletions(-)

New commits:
commit 6a41cef3f9972a88de378a1117697199dbf1d436
Author: pv2k 
Date:   Mon Nov 28 21:48:43 2016 +0530

tdf#103391: ask user whether to open online help

opens a dialog box from which user can choose to take online help or cancel 
it

Change-Id: I8c1278aab88d55901a65c38b15fcc8519360dc59
Reviewed-on: https://gerrit.libreoffice.org/31385
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 3d182da..e057deb 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/helpcontrol \
sfx2/uiconfig/ui/helpcontentpage \
sfx2/uiconfig/ui/helpindexpage \
+   sfx2/uiconfig/ui/helpmanual \
sfx2/uiconfig/ui/helpsearchpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6586e79..80117d0 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -611,12 +611,25 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 
 if ( !impl_hasHelpInstalled() )
 {
-if ( impl_showOnlineHelp( aHelpURL ) )
-return true;
+ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),"onlinehelpmanual","sfx/ui/helpmanual.ui");
+short OnlineHelpBox = aQueryBox->Execute();
+
+if(OnlineHelpBox == RET_OK)
+{
+if ( impl_showOnlineHelp( aHelpURL ) )
+return true;
+else
+{
+ScopedVclPtrInstance< NoHelpErrorBox > aErrBox(const_cast< 
vcl::Window* >( pWindow ));
+aErrBox->Execute();
+return false;
+}
+}
+else
+{
+return false;
+}
 
-ScopedVclPtrInstance< NoHelpErrorBox > aErrBox(const_cast< 
vcl::Window* >( pWindow ));
-aErrBox->Execute();
-return false;
 }
 
 Reference < XDesktop2 > xDesktop = Desktop::create( 
::comphelper::getProcessComponentContext() );
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
new file mode 100644
index 000..ac6ab51
--- /dev/null
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -0,0 +1,65 @@
+
+
+
+  
+  
+False
+False
+dialog
+True
+question
+ %PRODUCTNAME  built-in help is 
not installed
+
+  
+False
+vertical
+2
+
+  
+False
+True
+end
+
+  
+Read Help 
Online
+True
+True
+False
+True
+  
+  
+True
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+True
+True
+  
+  
+True
+True
+1
+  
+
+  
+  
+False
+False
+0
+  
+
+  
+
+
+  website
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: how to operate gb_macro(solenv/gbuild)

2017-01-11 Thread jan iversen



On 11 Jan 2017, at 11:49, jaeseok  wrote:

> I want to create a new kind of functionality. 
If you want to create new functionality you either need to write an extension 
or start building LibreOffice using the wiki link I gave you.

> first, I misunderstood how gb_macro works. so this question title is how to
> operate gb_macro(solenv/gbuild).
Read the gmake manual if you want to understand how the macros work.

the macros themself are called from .mk files in each module or from another 
macro.

> second, other code exist that core_resource.src convert to foren-US.res. so
> I addtional question.
search using opengrok as suggested earlier.
 
But as it was said earlier, start coding and concentrate later on the res file.

rgds
jan i


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

Re: how to operate gb_macro(solenv/gbuild)

2017-01-11 Thread Tor Lillqvist

> I know that .res files are created when LO is built. so I wonder the
> location that generating source code.

The .res files are generated by the 'rsc' program. Its source code is
in the 'rsc' subdirectory. See rsc/README for a little bit of
documentation.

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

Re: how to operate gb_macro(solenv/gbuild)

2017-01-11 Thread jaeseok

> I want to create a function that automatically completes the screen 
it is wrong sentence. 

I want to create a new kind of functionality. 

And like your mention, not hexadecimal but binary. I was writing wrong.
And also not managing but generation and using.

I know that .res files are created when LO is built. so I wonder the
location that generating source code. In formula/AllLangResTarget_for.mk,
they only decide referencing source and generation path along the language.
And decide folder name. Is it wrong? 

So I think two things.
first, I misunderstood how gb_macro works. so this question title is how to
operate gb_macro(solenv/gbuild).
second, other code exist that core_resource.src convert to foren-US.res. so
I addtional question.



--
View this message in context: 
http://nabble.documentfoundation.org/how-to-operate-gb-macro-solenv-gbuild-tp4204905p4204939.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to retrieve a backtrace when there's no stack (case tdf#105182)

2017-01-11 Thread Lionel Elie Mamane

On Sun, Jan 08, 2017 at 03:12:44PM -0700, julien2412 wrote:

> I wanted to give a try to tdf#105182 but the popup error seems to prevent
> from having a stacktrace.
> Is it possible to disable manually this popup mechanism?
> Indeed, in the quoted bugtracker, we know there's something with a vector
> but don't know which file or which method.

Not sure, but maybe starting a debug build with
--norestore
will help. It suppresses the dialog for an unhandled signal, maybe
also for an uncaught exception. Note that even the without-dialog
abort might come too late (it first winds up the stack until it
notices it is not caught), then you still have to apply the method
described by Eike.

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

[Libreoffice-commits] core.git: 12 commits - compilerplugins/clang connectivity/source dbaccess/source forms/source linguistic/source sal/qa sc/qa sc/source sdext/source sd/source sw/source vcl/source

2017-01-11 Thread Stephan Bergmann

 compilerplugins/clang/conststringvar.cxx|   17 +
 compilerplugins/clang/stringconstant.cxx|   65 +-
 connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx |8 
 dbaccess/source/ui/dlg/dbadmin.cxx  |2 
 forms/source/xforms/propertysetbase.hxx |2 
 linguistic/source/dicimp.cxx|2 
 sal/qa/OStringBuffer/rtl_String_Const.h |   98 
+-
 sal/qa/rtl/process/rtl_Process_Const.h  |8 
 sc/qa/unit/helper/shared_test_impl.hxx  |4 
 sc/source/filter/xml/xmldrani.cxx   |4 
 sd/source/ui/remotecontrol/BluetoothServer.cxx  |2 
 sdext/source/pdfimport/test/tests.cxx   |2 
 sw/source/filter/html/css1atr.cxx   |4 
 vcl/source/app/svdata.cxx   |4 
 xmloff/source/chart/ColorPropertySet.cxx|6 
 xmloff/source/draw/animationimport.cxx  |2 
 xmloff/source/meta/xmlmetae.cxx |   22 +-
 17 files changed, 154 insertions(+), 98 deletions(-)

New commits:
commit 618785dfd28a6cf8f075371afd451b6440718e07
Author: Stephan Bergmann 
Date:   Wed Jan 11 11:27:40 2017 +0100

Some loplugin:conststringvar/stringconstant improvements

Change-Id: I73f694e6dedb84b3fb3b63ffb9dcda2481bc403c

diff --git a/compilerplugins/clang/conststringvar.cxx 
b/compilerplugins/clang/conststringvar.cxx
index a6d348a..f113416 100644
--- a/compilerplugins/clang/conststringvar.cxx
+++ b/compilerplugins/clang/conststringvar.cxx
@@ -65,8 +65,23 @@ public:
 }
 
 bool TraverseImplicitCastExpr(ImplicitCastExpr * expr) {
+bool match;
+switch (expr->getCastKind()) {
+case CK_NoOp:
+// OString CharPtrDetector ctor:
+match = bool(
+loplugin::TypeCheck(expr->getType()).Const().Pointer().Const()
+.Char());
+break;
+case CK_LValueToRValue:
+match = true;
+break;
+default:
+match = false;
+break;
+}
 bool pushed = false;
-if (expr->getCastKind() == CK_LValueToRValue) {
+if (match) {
 if (auto dr = dyn_cast(
 expr->getSubExpr()->IgnoreParenImpCasts()))
 {
diff --git a/compilerplugins/clang/stringconstant.cxx 
b/compilerplugins/clang/stringconstant.cxx
index d8f04a6..259cee7 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -671,6 +671,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr 
const * expr) {
 {
 ChangeKind kind;
 PassThrough pass;
+bool simplify;
 switch (expr->getConstructor()->getNumParams()) {
 case 1:
 if (!loplugin::TypeCheck(
@@ -681,6 +682,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr 
const * expr) {
 }
 kind = ChangeKind::SingleChar;
 pass = PassThrough::NonEmptyConstantString;
+simplify = false;
 break;
 case 2:
 {
@@ -691,6 +693,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr 
const * expr) {
 {
 kind = ChangeKind::OUStringLiteral1;
 pass = PassThrough::NonEmptyConstantString;
+simplify = false;
 } else {
 unsigned n;
 bool non;
@@ -732,9 +735,52 @@ bool 
StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
 pass = n == 0
 ? PassThrough::EmptyConstantString
 : PassThrough::NonEmptyConstantString;
+simplify = false;
 }
 break;
 }
+case 4:
+{
+unsigned n;
+bool non;
+bool emb;
+bool trm;
+if (!isStringConstant(
+expr->getArg(0)->IgnoreParenImpCasts(), &n, &non, &emb,
+&trm))
+{
+return true;
+}
+APSInt res;
+if (!expr->getArg(1)->EvaluateAsInt(
+res, compiler.getASTContext())
+|| res != n)
+{
+return true;
+}
+if (!expr->getArg(2)->EvaluateAsInt(
+res, compiler.getASTContext())
+|| res != 11) // RTL_TEXTENCODING_ASCII_US
+{
+return true;
+}
+if (!expr->getArg(3)->EvaluateAsIn

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - 2 commits - bridges/source sal/osl

2017-01-11 Thread Samuel Mehrbrodt

Rebased ref, commits from common ancestor:
commit 07a6c16a19551ddc057a30c647fc29dcce48a567
Author: Samuel Mehrbrodt 
Date:   Wed Dec 21 21:16:49 2016 +0100

bridges win32/64: Log uno method calls

Change-Id: Ib18aea5e6ecf54dfabe9f417d5b288625dab0fb7

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 58e4d64..e2f5976 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -241,6 +241,13 @@ static typelib_TypeClass __cdecl cpp_mediate(
 pThis);
 
 typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
+
+SAL_INFO( "bridges.win32", "cpp_vtable_call: pCallStack=[" <<
+std::hex << pCallStack[0] << "," << pCallStack[1] << "," << 
pCallStack[2] << ",...]" <<
+", pThis=" << pThis << ", pCppI=" << pCppI <<
+std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
+SAL_INFO( "bridges.win32", "name=" << pTypeDescr->aBase.pTypeName );
+
 if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
 {
 SAL_WARN(
@@ -261,6 +268,8 @@ static typelib_TypeClass __cdecl cpp_mediate(
 
 TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 
+SAL_INFO( "bridges.win32", "Calling " << aMemberDescr.get()->pTypeName );
+
 typelib_TypeClass eRet = typelib_TypeClass_VOID;
 switch (aMemberDescr.get()->eTypeClass)
 {
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 4f1905c..14776e7 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -240,6 +240,12 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 
 typelib_InterfaceTypeDescription * pTD = pCppI->getTypeDescr();
 
+SAL_INFO( "bridges.win64", "cpp_vtable_call: pCallStack=[" <<
+std::hex << pStack[0] << "," << pStack[1] << "," << pStack[2] << 
",...]" <<
+", pThis=" << pThis << ", pCppI=" << pCppI <<
+std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
+SAL_INFO( "bridges.win64", "name=" << pTD->aBase.pTypeName );
+
 if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
 {
 SAL_WARN(
@@ -260,6 +266,8 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 
 TypeDescription aMemberDescr( pTD->ppAllMembers[nMemberPos] );
 
+SAL_INFO( "bridges.win64", "Calling " << aMemberDescr.get()->pTypeName );
+
 typelib_TypeClass eRet;
 switch ( aMemberDescr.get()->eTypeClass )
 {
commit e06a339e37929af1132cd454e2fbd412ad55c3a5
Author: Samuel Mehrbrodt 
Date:   Wed Dec 21 21:15:49 2016 +0100

Allow to set log level/path in file

Expects a file logging.txt in the program/ directory
with the keys LogFilePath and LogLevel, e.g.:

LogFilePath=C:\\log.txt
LogLevel=info

Change-Id: I35c730469e4079139da908aa287b989dc98e0f9d

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 9a8663c..326d44e 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -22,6 +22,7 @@
 #include 
 
 #include "osl/thread.hxx"
+#include "osl/process.h"
 #include "rtl/string.h"
 #include "sal/detail/log.h"
 #include "sal/log.hxx"
@@ -81,7 +82,7 @@ char const * toString(sal_detail_LogLevel level) {
 // the process is running":
 #if defined ANDROID
 
-char const * getEnvironmentVariable() {
+char const * getLogLevel() {
 return std::getenv("SAL_LOG");
 }
 
@@ -99,14 +100,62 @@ char const * getEnvironmentVariable_(const char* env) {
 return p2;
 }
 
-char const * getEnvironmentVariable() {
+bool getValueFromLoggingIniFile(const char* key, char* value) {
+OUString programDirectoryURL;
+OUString programDirectoryPath;
+osl_getProcessWorkingDir(&(programDirectoryURL.pData));
+osl_getSystemPathFromFileURL(programDirectoryURL.pData, 
&programDirectoryPath.pData);
+OUString aLogFile(programDirectoryPath + "/" + "logging.ini");
+std::ifstream logFileStream(OUStringToOString( aLogFile, 
RTL_TEXTENCODING_ASCII_US).getStr());
+if (!logFileStream.good())
+return false;
+
+std::size_t n;
+std::string aKey;
+std::string aValue;
+std::string sWantedKey(key);
+std::string sLine;
+while (std::getline(logFileStream, sLine)) {
+if (sLine.find('#') == 0)
+continue;
+if ( ( n = sLine.find('=') ) != std::string::npos) {
+aKey = sLine.substr(0, n);
+if (aKey != sWantedKey)
+continue;
+aValue = sLine.substr(n+1, sLine.length());
+sprintf(value, "%s", aValue.c_str());
+return true;
+}
+}
+return false;
+}
+
+char const * getLogLevel() {
+// First check the environment variable, then the setting in logging.ini
 static char c

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

2017-01-11 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5088b2066651ed133dcfd93388f7ac7187844d33
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 11 10:14:31 2017 +

Resolves: rhbz#1408500 gtk3 toolbar borders too distinct vs native gtk3 ones

Change-Id: I7ce284d3e6f999e2ac08326dc40b060bf70d7d4b

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 98c385f..48edf22 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2927,6 +2927,7 @@ void GtkData::initNWF()
 ImplSVData* pSVData = ImplGetSVData();
 pSVData->maNWFData.mbFlatMenu = true;
 pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+pSVData->maNWFData.mbDockingAreaAvoidTBFrames = true;
 pSVData->maNWFData.mbCanDrawWidgetAnySize = true;
 pSVData->maNWFData.mbDDListBoxNoTextArea = true;
 pSVData->maNWFData.mbNoFocusRects = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Maxim Monastirsky

 svx/source/tbxctrls/tbcontrl.cxx |   37 +++--
 1 file changed, 23 insertions(+), 14 deletions(-)

New commits:
commit e1f5db9579602dd02a80c1d1ea1d078606542f16
Author: Maxim Monastirsky 
Date:   Wed Jan 11 00:56:22 2017 +0200

SvxFontNameBox_Impl was not disposed

This is visible after toolbar customization, when the old
font box stays visible. Turns out that currently the toolbox
controller is supposed to own the item window, not the toolbox.

Regression of:

commit 970a66f8c919ea0524f216f40d21b3e2a8c88ccc
Author: Maxim Monastirsky 
Date:   Sun Oct 16 01:27:10 2016 +0300

Use UNO registration for font name toolbox control

Change-Id: I29a1f06d97c9a981507ff62889e2d7fc6ac9d688
Reviewed-on: https://gerrit.libreoffice.org/32943
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index cf449f9..13db72d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2683,10 +2683,16 @@ public:
 // XToolbarController
 virtual css::uno::Reference< css::awt::XWindow > SAL_CALL 
createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) 
throw ( css::uno::RuntimeException, std::exception ) override;
 
+// XComponent
+virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, 
std::exception ) override;
+
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() throw ( 
css::uno::RuntimeException, std::exception ) override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 
throw ( css::uno::RuntimeException, std::exception ) override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
throw ( css::uno::RuntimeException, std::exception ) override;
+
+private:
+VclPtr m_pBox;
 };
 
 SvxFontNameToolBoxControl::SvxFontNameToolBoxControl()
@@ -2702,25 +2708,21 @@ void SvxFontNameToolBoxControl::statusChanged( const 
css::frame::FeatureStateEve
 if ( !getToolboxId( nId, &pToolBox ) )
 return;
 
-SvxFontNameBox_Impl* pBox = 
static_cast(pToolBox->GetItemWindow( nId ));
-
-DBG_ASSERT( pBox, "Control not found!" );
-
 if ( !rEvent.IsEnabled )
 {
-pBox->Disable();
-pBox->Update( nullptr );
+m_pBox->Disable();
+m_pBox->Update( nullptr );
 }
 else
 {
-pBox->Enable();
+m_pBox->Enable();
 
 css::awt::FontDescriptor aFontDesc;
 if ( rEvent.State >>= aFontDesc )
-pBox->Update( &aFontDesc );
+m_pBox->Update( &aFontDesc );
 else
-pBox->SetText( "" );
-pBox->SaveValue();
+m_pBox->SetText( "" );
+m_pBox->SaveValue();
 }
 
 pToolBox->EnableItem( nId, rEvent.IsEnabled );
@@ -2730,10 +2732,17 @@ css::uno::Reference< css::awt::XWindow > 
SvxFontNameToolBoxControl::createItemWi
 throw ( css::uno::RuntimeException, std::exception )
 {
 SolarMutexGuard aGuard;
-VclPtrInstance pBox( VCLUnoHelper::GetWindow( rParent 
),
-  Reference< XDispatchProvider >( 
m_xFrame->getController(), UNO_QUERY ),
-  m_xFrame,0);
-return VCLUnoHelper::GetInterface( pBox );
+m_pBox = VclPtr::Create( VCLUnoHelper::GetWindow( 
rParent ),
+  Reference< XDispatchProvider 
>( m_xFrame->getController(), UNO_QUERY ),
+  m_xFrame, 0);
+return VCLUnoHelper::GetInterface( m_pBox );
+}
+
+void SvxFontNameToolBoxControl::dispose()
+throw ( css::uno::RuntimeException, std::exception )
+{
+m_pBox.disposeAndClear();
+ToolboxController::dispose();
 }
 
 OUString SvxFontNameToolBoxControl::getImplementationName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: how to operate gb_macro(solenv/gbuild)

2017-01-11 Thread Tor Lillqvist

> I want to create a function that automatically completes the screen

what is "the screen" ?

> if there
> is the same letter as the data of the data pool stored in advance while
> inputting characters on the screen.

Anyway, this sounds like you want to add some actual new kind of
functionality to LibreOffice.

> In this case, we want to keep the data
> storage method in hexadecimal format when managing the file containing the
> data.

You seem to have become completely confused and obsessed by this
"hexadecimal" idea. Probably you are misunderstanding something.
Resource files are binary, there is nothing "hexadecimal" with them.
(Except that, of course, any file can be displayed as hexadecimal,
because any 8-bit byte can be displayed as two hexadecimal numbers.)
Or are you just saying "hexadecimal" when you simply mean "binary"
(not text)?

> I saw that the formula module was managing the data in hexadecimal
> (foren.res),

No. Nothing is "managing data" in .res files. .res files are created
when LibreOffice is built, and then only read at run-time. I wouldn't
call that "managing data".

Just forget the hexadecimal aspect and resource files for now, and
work on adding the actual functionality you want, in the C++ source
code. Translating any new strings to Korean (and other languages) will
come later.

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

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - sal/osl

2017-01-11 Thread Samuel Mehrbrodt

 sal/osl/all/log.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e4574e682bcc4a304aa0cfe83291450ee2cfc9e6
Author: Samuel Mehrbrodt 
Date:   Wed Jan 11 10:37:25 2017 +0100

Fix includes

Change-Id: I9a1cbef223e59c403a5f2445444957db1d3d3cd9

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 91ca512..326d44e 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -22,8 +22,8 @@
 #include 
 
 #include "osl/thread.hxx"
+#include "osl/process.h"
 #include "rtl/string.h"
-#include 
 #include "sal/detail/log.h"
 #include "sal/log.hxx"
 #include "sal/types.h"
@@ -150,7 +150,6 @@ char const * getLogFile() {
 if (logFile != nullptr)
 return logFile;
 
-
 static char logFilePath[1024];
 if (getValueFromLoggingIniFile("LogFilePath", logFilePath)) {
 return logFilePath;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: how to operate gb_macro(solenv/gbuild)

2017-01-11 Thread Jan Iversen


> What I ultimately want to do is work on a personal project. I do not have
> enough skills yet, but I want to be a developer of Libre Office later on.
> 
> I want to create a function that automatically completes the screen if there
> is the same letter as the data of the data pool stored in advance while
> inputting characters on the screen. In this case, we want to keep the data
> storage method in hexadecimal format when managing the file containing the
> data.
Well text is hexadecimal if you prefer to read it that way :-)

Using hexadecimal to really store text, and not only as display formats, 
basically doubles the string size, that sounds a bit strange to me.


> I saw that the formula module was managing the data in hexadecimal
> (foren.res), and I was tracking the process to refer to it. So I wanted to
> know everything related to foren.res being created and used.
For sure it is not the text the user inputs, nor is it the texts used in calc.

You need to write an extension, and work through the UNO API, that is basically 
the way to interact with LO. If you want to write a general program that 
completes screen in any program, then I can only wish you good luck, we 
concentrate on people who contribute to LibreOffice on this list.

rgds
jan I.


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

Re: how to operate gb_macro(solenv/gbuild)

2017-01-11 Thread jaeseok

What I ultimately want to do is work on a personal project. I do not have
enough skills yet, but I want to be a developer of Libre Office later on.

I want to create a function that automatically completes the screen if there
is the same letter as the data of the data pool stored in advance while
inputting characters on the screen. In this case, we want to keep the data
storage method in hexadecimal format when managing the file containing the
data.

I saw that the formula module was managing the data in hexadecimal
(foren.res), and I was tracking the process to refer to it. So I wanted to
know everything related to foren.res being created and used.

Because using the translation, it may be a bit awkward

rgds



--
View this message in context: 
http://nabble.documentfoundation.org/how-to-operate-gb-macro-solenv-gbuild-tp4204905p4204932.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-01-11 Thread Caolán McNamara

 svx/source/unodraw/unoshape.cxx |   32 +++-
 1 file changed, 7 insertions(+), 25 deletions(-)

New commits:
commit ef0323b0fa935e445ac9c809117812ed88ba59de
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 11 09:08:50 2017 +

using the other ctor can shrink this code

Change-Id: Ied607a78c9aaec3cb0ee9dc0e2938c69a62d031e

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 02f067c..29cd95c 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1437,11 +1437,8 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 
nWID, const OUString& rName,
 return false;
 
 const XBitmapEntry* pEntry = pBitmapList->GetBitmap(nPos);
-XFillBitmapItem aBmpItem;
-aBmpItem.SetWhich( XATTR_FILLBITMAP );
-aBmpItem.SetName( rName );
-aBmpItem.SetGraphicObject(pEntry->GetGraphicObject());
-rSet.Put( aBmpItem );
+XFillBitmapItem aBmpItem(rName, pEntry->GetGraphicObject());
+rSet.Put(aBmpItem);
 break;
 }
 case XATTR_FILLGRADIENT:
@@ -1456,10 +1453,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 
nWID, const OUString& rName,
 return false;
 
 const XGradientEntry* pEntry = pGradientList->GetGradient(nPos);
-XFillGradientItem aGrdItem;
-aGrdItem.SetWhich( XATTR_FILLGRADIENT );
-aGrdItem.SetName( rName );
-aGrdItem.SetGradientValue( pEntry->GetGradient() );
+XFillGradientItem aGrdItem(rName, pEntry->GetGradient());
 rSet.Put( aGrdItem );
 break;
 }
@@ -1475,10 +1469,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 
nWID, const OUString& rName,
 return false;
 
 const XHatchEntry* pEntry = pHatchList->GetHatch( nPos );
-XFillHatchItem aHatchItem;
-aHatchItem.SetWhich( XATTR_FILLHATCH );
-aHatchItem.SetName( rName );
-aHatchItem.SetHatchValue( pEntry->GetHatch() );
+XFillHatchItem aHatchItem(rName, pEntry->GetHatch());
 rSet.Put( aHatchItem );
 break;
 }
@@ -1497,18 +1488,12 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 
nWID, const OUString& rName,
 const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
 if( XATTR_LINEEND == nWID )
 {
-XLineEndItem aLEItem;
-aLEItem.SetWhich( XATTR_LINEEND );
-aLEItem.SetName( rName );
-aLEItem.SetLineEndValue( pEntry->GetLineEnd() );
+XLineEndItem aLEItem(rName, pEntry->GetLineEnd());
 rSet.Put( aLEItem );
 }
 else
 {
-XLineStartItem aLSItem;
-aLSItem.SetWhich( XATTR_LINESTART );
-aLSItem.SetName( rName );
-aLSItem.SetLineStartValue( pEntry->GetLineEnd() );
+XLineStartItem aLSItem(rName, pEntry->GetLineEnd());
 rSet.Put( aLSItem );
 }
 
@@ -1526,10 +1511,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 
nWID, const OUString& rName,
 return false;
 
 const XDashEntry* pEntry = pDashList->GetDash(nPos);
-XLineDashItem aDashItem;
-aDashItem.SetWhich( XATTR_LINEDASH );
-aDashItem.SetName( rName );
-aDashItem.SetDashValue( pEntry->GetDash() );
+XLineDashItem aDashItem(rName, pEntry->GetDash());
 rSet.Put( aDashItem );
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Caolán McNamara

 include/svx/xbitmap.hxx |7 +++---
 svx/source/xoutdev/xattrbmp.cxx |   44 
 2 files changed, 4 insertions(+), 47 deletions(-)

New commits:
commit f4785d5754c687212650f3e4980a3f3435257f14
Author: CaolÃ¡n McNamara 
Date:   Tue Jan 10 21:13:08 2017 +

make XOBitmap uncopyable

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

diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 32a8e9f..0a2128e 100644
--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -39,13 +39,14 @@ private:
 
 const GraphicObject& GetGraphicObject() const;
 
+XOBitmap(const XOBitmap& rXBmp) = delete;
+XOBitmap& operator=(const XOBitmap& rXOBitmap) = delete;
+
+
 public:
 XOBitmap( const Bitmap& rBitmap );
-XOBitmap( const XOBitmap& rXBmp );
 ~XOBitmap();
 
-XOBitmap& operator=( const XOBitmap& rXOBitmap );
-
 void Bitmap2Array();
 void Array2Bitmap();
 
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 93abb7e..343c0f8 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -52,55 +52,11 @@ XOBitmap::XOBitmap( const Bitmap& rBmp ) :
 {
 }
 
-XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
-pPixelArray ( nullptr )
-{
-eType = rXBmp.eType;
-aGraphicObject = rXBmp.aGraphicObject;
-aArraySize = rXBmp.aArraySize;
-aPixelColor = rXBmp.aPixelColor;
-aBckgrColor = rXBmp.aBckgrColor;
-bGraphicDirty = rXBmp.bGraphicDirty;
-
-if( rXBmp.pPixelArray )
-{
-if( eType == XBitmapType::N8x8 )
-{
-pPixelArray = new sal_uInt16[ 64 ];
-
-for( sal_uInt16 i = 0; i < 64; i++ )
-*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
-}
-}
-}
-
 XOBitmap::~XOBitmap()
 {
 delete [] pPixelArray;
 }
 
-XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
-{
-eType = rXBmp.eType;
-aGraphicObject = rXBmp.aGraphicObject;
-aArraySize = rXBmp.aArraySize;
-aPixelColor = rXBmp.aPixelColor;
-aBckgrColor = rXBmp.aBckgrColor;
-bGraphicDirty = rXBmp.bGraphicDirty;
-
-if( rXBmp.pPixelArray )
-{
-if( eType == XBitmapType::N8x8 )
-{
-pPixelArray = new sal_uInt16[ 64 ];
-
-for( sal_uInt16 i = 0; i < 64; i++ )
-*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
-}
-}
-return *this;
-}
-
 Bitmap XOBitmap::GetBitmap() const
 {
 return GetGraphicObject().GetGraphic().GetBitmap();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-11 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/statistical/fods/small.fods   | 6432 +++
 sc/qa/unit/data/functions/statistical/fods/standardize.fods | 5740 ++
 sc/qa/unit/data/functions/statistical/fods/stdev.fods   | 6725 +++
 sc/qa/unit/data/functions/statistical/fods/stdev.p.fods | 6734 +++
 sc/qa/unit/data/functions/statistical/fods/stdev.s.fods | 6734 +++
 sc/qa/unit/data/functions/statistical/fods/stdeva.fods  | 6748 
 sc/qa/unit/data/functions/statistical/fods/stdevp.fods  | 6704 +++
 7 files changed, 45817 insertions(+)

New commits:
commit c0f7a344b51e8a55c2bcfb6825192cf51735c1c8
Author: ZdenÄk Crhonek 
Date:   Mon Jan 9 17:36:01 2017 +0100

add SMALL,STANDARDIZE,STDEV,STDEVA,STDEV.P,STDEV.S,STDEVP test case

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/small.fods 
b/sc/qa/unit/data/functions/statistical/fods/small.fods
new file mode 100644
index 000..ba203bf
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/small.fods
@@ -0,0 +1,6432 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2017-01-09T17:34:08.068526905P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/63ddc8dc4ae1f3c3ee2f860c34886688b0ed2d57
+ 
+  
+   0
+   0
+   82301
+   56504
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   4
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004

Re: Bootstrap exception while using sdk on Linux.

2017-01-11 Thread Rodnyansky Pavel

Problem solved, thank you all for your replies. I got missing strings because
i  used headers, generated on windows under Linux platform, apparently it
doesn't work that way. After i started getting error messages i quickly
figured out the solution. I launched Qt from the same shell as
setenvsdk_unix script and it works just fine. Sorry for inconvenience.



--
View this message in context: 
http://nabble.documentfoundation.org/Bootstrap-exception-while-using-sdk-on-Linux-tp4203562p4204920.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-01-11 Thread Noel Grandin

 include/svl/rngitem.hxx  |   20 --
 svl/source/items/rngitem.cxx |   85 ---
 2 files changed, 105 deletions(-)

New commits:
commit feade09e18ad496159615167ddb57a4dd0abab35
Author: Noel Grandin 
Date:   Wed Jan 11 10:10:09 2017 +0200

SfxUShortRangesItem is unused

Change-Id: I6f88f37eca2bdd6b40c8713f1b2e35ad0be94ab0

diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index a776ce3..aa39e27 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -47,26 +47,6 @@ public:
 };
 
 
-class SVL_DLLPUBLIC SfxUShortRangesItem : public SfxPoolItem
-{
-private:
-sal_uInt16* _pRanges;
-
-public:
-SfxUShortRangesItem( sal_uInt16 nWID, SvStream 
&rStream );
-SfxUShortRangesItem( const 
SfxUShortRangesItem& rItem );
-virtual ~SfxUShortRangesItem() override;
-virtual booloperator==( const SfxPoolItem& ) const 
override;
-virtual bool GetPresentation( SfxItemPresentation ePres,
-  MapUnit eCoreMetric,
-  MapUnit ePresMetric,
-  OUString &rText,
-  const IntlWrapper * = nullptr ) const 
override;
-virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
-virtual SfxPoolItem*Create( SvStream &, sal_uInt16 nVersion ) 
const override;
-virtual SvStream&   Store( SvStream &, sal_uInt16 nItemVersion ) 
const override;
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 2aa9e60..be60ce3 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -23,13 +23,6 @@
 #include 
 #include 
 
-static inline sal_uInt16 Count_Impl(const sal_uInt16 * pRanges)
-{
-sal_uInt16 nCount = 0;
-for (; *pRanges; pRanges += 2) nCount += 2;
-return nCount;
-}
-
 
 SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ):
 SfxPoolItem( which ),
@@ -91,82 +84,4 @@ SvStream& SfxRangeItem::Store(SvStream &rStream, sal_uInt16) 
const
 return rStream;
 }
 
-SfxUShortRangesItem::SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream )
-:   SfxPoolItem( nWID )
-{
-sal_uInt16 nCount(0);
-rStream.ReadUInt16(nCount);
-const size_t nMaxEntries = rStream.remainingSize() / sizeof(sal_uInt16);
-if (nCount > nMaxEntries)
-{
-nCount = nMaxEntries;
-SAL_WARN("svl.items", "SfxUShortRangesItem: truncated Stream");
-}
-_pRanges = new sal_uInt16[nCount + 1];
-for ( sal_uInt16 n = 0; n < nCount; ++n )
-rStream.ReadUInt16( _pRanges[n] );
-_pRanges[nCount] = 0;
-}
-
-SfxUShortRangesItem::SfxUShortRangesItem( const SfxUShortRangesItem& rItem )
-:   SfxPoolItem( rItem )
-{
-sal_uInt16 nCount = Count_Impl(rItem._pRanges) + 1;
-_pRanges = new sal_uInt16[nCount];
-memcpy( _pRanges, rItem._pRanges, sizeof(sal_uInt16) * nCount );
-}
-
-SfxUShortRangesItem::~SfxUShortRangesItem()
-{
-delete _pRanges;
-}
-
-
-bool SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const
-{
-const SfxUShortRangesItem &rOther = static_cast(rItem);
-if ( !_pRanges && !rOther._pRanges )
-return true;
-if ( _pRanges || rOther._pRanges )
-return false;
-
-sal_uInt16 n;
-for ( n = 0; _pRanges[n] && rOther._pRanges[n]; ++n )
-if ( _pRanges[n] != rOther._pRanges[n] )
-return false;
-
-return !_pRanges[n] && !rOther._pRanges[n];
-}
-
-bool SfxUShortRangesItem::GetPresentation( SfxItemPresentation /*ePres*/,
-MapUnit /*eCoreMetric*/,
-MapUnit /*ePresMetric*/,
-OUString & /*rText*/,
-const IntlWrapper * ) const
-{
-// not implemented
-return false;
-}
-
-SfxPoolItem* SfxUShortRangesItem::Clone( SfxItemPool * ) const
-{
-return new SfxUShortRangesItem( *this );
-}
-
-
-SfxPoolItem* SfxUShortRangesItem::Create( SvStream &rStream, sal_uInt16 ) const
-{
-return new SfxUShortRangesItem( Which(), rStream );
-}
-
-
-SvStream& SfxUShortRangesItem::Store( SvStream &rStream, sal_uInt16 ) const
-{
-sal_uInt16 nCount = Count_Impl( _pRanges );
-rStream.ReadUInt16( nCount );
-for ( sal_uInt16 n = 0; _pRanges[n]; ++n )
-rStream.ReadUInt16( _pRanges[n] );
-return rStream;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

93 matches

Mail list logo