[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.4.0-3'

[Libreoffice Gerrit user]

Tag 'cd-3.4.0-3' created by Andras Timar  at 
2018-08-30 06:41 +

cd-3.4.0-3

Changes since cd-3.4.0-2-1:
---
 0 files changed
---
___
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-cd-3-4' - debian/changelog loolwsd.spec.in

[Libreoffice Gerrit user]

 debian/changelog |6 ++
 loolwsd.spec.in  |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ef9835593d4334a58755849cf6e16af4f256d949
Author: Andras Timar 
AuthorDate: Thu Aug 30 08:40:34 2018 +0200
Commit: Andras Timar 
CommitDate: Thu Aug 30 08:40:34 2018 +0200

Bump package version to 3.4.0-3

Change-Id: Ia73a770b5c442db232da0286fe173550649c4333

diff --git a/debian/changelog b/debian/changelog
index 2953d0976..e2b92dfaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.0-3) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool3
+
+ -- Andras Timar   Fri, 30 Aug 2018 08:30:00 +0200
+
 loolwsd (3.4.0-2) unstable; urgency=medium
 
   * see the git log: http://col.la/cool3
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 0ab7cf170..59191c142 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:2%{?dist}
+Release:3%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
___
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-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/core/Socket.js |1 +
 loleaflet/src/map/Map.js |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 59296494f1f91223e7eec5987447d6537e987afe
Author: Tamás Zolnai 
AuthorDate: Wed Aug 29 23:26:26 2018 +0200
Commit: Andras Timar 
CommitDate: Thu Aug 30 08:37:43 2018 +0200

Make tilerendering working again after connection lost

(cherry picked from commit ab7943edd6dff69d729bfd5fb042c3483d449102)

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

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index cc7f94257..b07e4c098 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -748,6 +748,7 @@ L.Socket = L.Class.extend({
else if (this._reconnecting) {
// we are reconnecting ...
this._reconnecting = false;
+   this._map._docLayer.viewReset();

this._map._docLayer._onMessage('invalidatetiles: EMPTY', null);
this._map.fire('statusindicator', {statusType: 
'reconnected'});

this._map.setPermission(this._map.options.permission);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d04c2e817..f93606bc2 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -818,6 +818,8 @@ L.Map = L.Evented.extend({
this._active = true;
if (this._doclayer) {

this._docLayer._onMessage('invalidatetiles: EMPTY', null);
+   this._docLayer._clientVisibleArea = '';
+   this._docLayer._clientZoom = '';
}
 
if (vex.dialogID > 0) {
___
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-cd-3-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/core/Socket.js |1 +
 loleaflet/src/map/Map.js |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit da5e2df186df937dd4b8ea7298feae593b65b3e1
Author: Tamás Zolnai 
AuthorDate: Wed Aug 29 23:26:26 2018 +0200
Commit: Andras Timar 
CommitDate: Thu Aug 30 08:37:33 2018 +0200

Make tilerendering working again after connection lost

(cherry picked from commit ab7943edd6dff69d729bfd5fb042c3483d449102)

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

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index e0eb62990..f22f6addf 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -749,6 +749,7 @@ L.Socket = L.Class.extend({
else if (this._reconnecting) {
// we are reconnecting ...
this._reconnecting = false;
+   this._map._docLayer.viewReset();

this._map._docLayer._onMessage('invalidatetiles: EMPTY', null);
this._map.fire('statusindicator', {statusType: 
'reconnected'});

this._map.setPermission(this._map.options.permission);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d04c2e817..f93606bc2 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -818,6 +818,8 @@ L.Map = L.Evented.extend({
this._active = true;
if (this._doclayer) {

this._docLayer._onMessage('invalidatetiles: EMPTY', null);
+   this._docLayer._clientVisibleArea = '';
+   this._docLayer._clientZoom = '';
}
 
if (vex.dialogID > 0) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 6c99bca30449589a2904891939e12e6a474464eb
Author: Noel Grandin 
AuthorDate: Wed Aug 29 15:06:36 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 08:31:30 2018 +0200

loplugin:useuniqueptr in InverseColorMap

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

diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx
index 9178ce730381..ae819d858872 100644
--- a/vcl/inc/octree.hxx
+++ b/vcl/inc/octree.hxx
@@ -93,8 +93,8 @@ class VCL_PLUGIN_PUBLIC InverseColorMap
 {
 private:
 
-sal_uInt8*  pBuffer;
-sal_uInt8*  pMap;
+std::unique_ptr pBuffer;
+std::unique_ptr pMap;
 const sal_uLong nBits;
 
 SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax );
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 3397a1fb08f3..21af8416fee9 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -262,8 +262,8 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal 
) :
 const long cginc = ( xsqr - ( cGreen << nBits ) ) << 1;
 const long cbinc = ( xsqr - ( cBlue << nBits ) ) << 1;
 
-sal_uLong* cdp = reinterpret_cast(pBuffer);
-sal_uInt8* crgbp = pMap;
+sal_uLong* cdp = reinterpret_cast(pBuffer.get());
+sal_uInt8* crgbp = pMap.get();
 
 for( r = 0, rxx = crinc; r < nColorMax; rdist += rxx, r++, rxx += 
xsqr2 )
 {
@@ -282,8 +282,6 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal 
) :
 
 InverseColorMap::~InverseColorMap()
 {
-std::free( pBuffer );
-std::free( pMap );
 }
 
 void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax )
@@ -291,11 +289,11 @@ void InverseColorMap::ImplCreateBuffers( const sal_uLong 
nMax )
 const sal_uLong nCount = nMax * nMax * nMax;
 const sal_uLong nSize = nCount * sizeof( sal_uLong );
 
-pMap = static_cast(std::malloc( nCount ));
-memset( pMap, 0x00, nCount );
+pMap.reset(new sal_uInt8[ nCount ]);
+memset( pMap.get(), 0x00, nCount );
 
-pBuffer = static_cast(std::malloc( nSize ));
-memset( pBuffer, 0xff, nSize );
+pBuffer.reset(new sal_uInt8[ nSize ]);
+memset( pBuffer.get(), 0xff, nSize );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/filter/igif/decode.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit ab6da907521514cfa85eb8e5786a9c9bae3ceb2e
Author: Noel Grandin 
AuthorDate: Wed Aug 29 15:01:55 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 08:31:13 2018 +0200

use realloc instead of malloc+memcpy

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

diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 8cbb52c9f9d8..276d75c64e24 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -79,13 +79,10 @@ Scanline GIFLZWDecompressor::DecompressBlock( sal_uInt8* 
pSrc, sal_uInt8 cBufSiz
 {
 sal_uLong   nNewSize = nTargetSize << 1;
 sal_uLong   nOffset = pTmpTarget - pTarget;
-sal_uInt8*  pTmp = static_cast(std::malloc( nNewSize 
));
-
-memcpy( pTmp, pTarget, nTargetSize );
-std::free( pTarget );
+pTarget = static_cast(std::realloc( pTarget, nNewSize 
));
 
 nTargetSize = nNewSize;
-pTmpTarget = ( pTarget = pTmp ) + nOffset;
+pTmpTarget = pTarget + nOffset;
 }
 
 memcpy( pTmpTarget, pOutBufData, nOutBufDataLen );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sdext/source/pdfimport/inc/pdfparse.hxx|2 -
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |   43 +++--
 2 files changed, 20 insertions(+), 25 deletions(-)

New commits:
commit 27d03cc31acb6a3c06dc56ac0a45a56062b873ec
Author: Noel Grandin 
AuthorDate: Wed Aug 29 13:07:32 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 08:30:52 2018 +0200

loplugin:useuniqueptr in PDFObject

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

diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx 
b/sdext/source/pdfimport/inc/pdfparse.hxx
index 62edc35a015c..0636ad412e63 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -275,7 +275,7 @@ private:
 // fills *ppStream and *pBytes with start of stream and count of bytes
 // memory returned in *ppStream must be freed with std::free afterwards
 // fills in NULL and 0 in case of error
-bool getDeflatedStream( char** ppStream, unsigned int* pBytes, const 
PDFContainer* pObjectContainer, EmitContext& rContext ) const;
+bool getDeflatedStream( std::unique_ptr& rpStream, unsigned int* 
pBytes, const PDFContainer* pObjectContainer, EmitContext& rContext ) const;
 };
 
 struct PDFPart : public PDFContainer
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx 
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 9c6b169b266e..a0c15c9d14ef 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -650,7 +650,7 @@ PDFObject::~PDFObject()
 {
 }
 
-bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, 
const PDFContainer* pObjectContainer, EmitContext& rContext ) const
+bool PDFObject::getDeflatedStream( std::unique_ptr& rpStream, unsigned 
int* pBytes, const PDFContainer* pObjectContainer, EmitContext& rContext ) const
 {
 bool bIsDeflated = false;
 if( m_pStream && m_pStream->m_pDict &&
@@ -658,12 +658,11 @@ bool PDFObject::getDeflatedStream( char** ppStream, 
unsigned int* pBytes, const
 )
 {
 unsigned int nOuterStreamLen = m_pStream->m_nEndOffset - 
m_pStream->m_nBeginOffset;
-*ppStream = static_cast(std::malloc( nOuterStreamLen ));
-unsigned int nRead = rContext.readOrigBytes( 
m_pStream->m_nBeginOffset, nOuterStreamLen, *ppStream );
+rpStream.reset(new char[ nOuterStreamLen ]);
+unsigned int nRead = rContext.readOrigBytes( 
m_pStream->m_nBeginOffset, nOuterStreamLen, rpStream.get() );
 if( nRead != nOuterStreamLen )
 {
-std::free( *ppStream );
-*ppStream = nullptr;
+rpStream.reset();
 *pBytes = 0;
 return false;
 }
@@ -689,7 +688,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, 
unsigned int* pBytes, const
 }
 }
 // prepare compressed data section
-char* pStream = *ppStream;
+char* pStream = rpStream.get();
 if( pStream[0] == 's' )
 pStream += 6; // skip "stream"
 // skip line end after "stream"
@@ -697,14 +696,14 @@ bool PDFObject::getDeflatedStream( char** ppStream, 
unsigned int* pBytes, const
 pStream++;
 // get the compressed length
 *pBytes = m_pStream->getDictLength( pObjectContainer );
-if( pStream != *ppStream )
-memmove( *ppStream, pStream, *pBytes );
+if( pStream != rpStream.get() )
+memmove( rpStream.get(), pStream, *pBytes );
 if( rContext.m_bDecrypt )
 {
 EmitImplData* pEData = getEmitData( rContext );
-pEData->decrypt( reinterpret_cast(*ppStream),
+pEData->decrypt( reinterpret_cast(rpStream.get()),
  *pBytes,
- reinterpret_cast(*ppStream),
+ reinterpret_cast(rpStream.get()),
  m_nNumber,
  m_nGeneration
  ); // decrypt inplace
@@ -712,7 +711,6 @@ bool PDFObject::getDeflatedStream( char** ppStream, 
unsigned int* pBytes, const
 }
 else
 {
-*ppStream = nullptr;
 *pBytes = 0;
 }
 return bIsDeflated;
@@ -769,19 +767,18 @@ void PDFObject::writeStream( EmitContext& rWriteContext, 
const PDFFile* pParsedF
 {
 if( m_pStream )
 {
-char* pStream = nullptr;
+std::unique_ptr pStream;
 unsigned int nBytes = 0;
-if( getDeflatedStream( &pStream, &nBytes, pParsedFile, rWriteContext ) 
&& nBytes && rWriteContext.m_bDeflate )
+if( getDeflatedStream( pStream, &nBytes, pParsedFile, rWriteContext ) 
&& nBytes && rWriteContext.m_bDeflate )
 {
 sal_uInt8* pOutBytes = nullptr;
 sal_uInt32 nOutBytes = 0;
-unzipToBuffer( pStream, nBytes, &pOutByt

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

[Libreoffice Gerrit user]

 idlc/source/idlccompile.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d695fdf9ddf713c90b4c53fc1a7eb96a8ff5f065
Author: Noel Grandin 
AuthorDate: Wed Aug 29 12:38:22 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 08:30:32 2018 +0200

loplugin:useuniqueptr in idlc::compileFile

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

diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 8d6386b66a44..3492e899e733 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -314,8 +314,7 @@ sal_Int32 compileFile(const OString * pathname)
 oslProcessError procError = osl_Process_E_None;
 
 const int nCmdArgs = lCppArgs.size();
-rtl_uString** pCmdArgs = nullptr;
-pCmdArgs = static_cast(rtl_allocateZeroMemory(nCmdArgs * 
sizeof(rtl_uString*)));
+std::unique_ptr pCmdArgs(new rtl_uString*[nCmdArgs]);
 
 int i = 0;
 for (auto const& elem : lCppArgs)
@@ -323,7 +322,7 @@ sal_Int32 compileFile(const OString * pathname)
 pCmdArgs[i++] = elem.pData;
 }
 
-procError = osl_executeProcess( cpp.pData, pCmdArgs, nCmdArgs, 
osl_Process_WAIT,
+procError = osl_executeProcess( cpp.pData, pCmdArgs.get(), nCmdArgs, 
osl_Process_WAIT,
 nullptr, startDir.pData, nullptr, 0, 
&hProcess );
 
 oslProcessInfo hInfo;
@@ -344,11 +343,9 @@ sal_Int32 compileFile(const OString * pathname)
 pathname == nullptr ? "" : "file ", fileName.getStr());
 
 osl_freeProcessHandle(hProcess);
-std::free(pCmdArgs);
 exit(hInfo.Code ? hInfo.Code : 99);
 }
 osl_freeProcessHandle(hProcess);
-std::free(pCmdArgs);
 
 if (unlink(tmpFile.getStr()) != 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - idlc/inc idlc/source include/comphelper sd/inc sd/source

[Libreoffice Gerrit user]

 idlc/inc/aststack.hxx |7 +-
 idlc/source/aststack.cxx  |   65 +-
 include/comphelper/interfacecontainer2.hxx|   10 
 sd/inc/helper/simplereferencecomponent.hxx|   23 -
 sd/source/helper/simplereferencecomponent.cxx |   39 ---
 5 files changed, 17 insertions(+), 127 deletions(-)

New commits:
commit cb2c7428f68d2c07f5e97ae4b42fee7c43e709a8
Author: Noel Grandin 
AuthorDate: Wed Aug 29 12:34:52 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 08:30:17 2018 +0200

use std::vector in AstStack

instead of a hand-coded equivalent. Note that I can't use
std::unique_ptr, because the parsing code appears to just randomly leak
AstScope

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

diff --git a/idlc/inc/aststack.hxx b/idlc/inc/aststack.hxx
index fa13d7affd92..b3f4cda695fd 100644
--- a/idlc/inc/aststack.hxx
+++ b/idlc/inc/aststack.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_IDLC_INC_ASTSTACK_HXX
 
 #include 
+#include 
 
 class AstScope;
 
@@ -29,7 +30,7 @@ public:
 AstStack();
 ~AstStack();
 
-sal_uInt32 depth() const { return m_top;}
+sal_uInt32 depth() const { return m_stack.size();}
 AstScope* top();
 AstScope* bottom();
 AstScope* nextToTop();
@@ -39,9 +40,7 @@ public:
 void clear();
 
 private:
-AstScope**  m_stack;
-sal_uInt32  m_size;
-sal_uInt32  m_top;
+std::vector  m_stack;
 };
 
 #endif // INCLUDED_IDLC_INC_ASTSTACK_HXX
diff --git a/idlc/source/aststack.cxx b/idlc/source/aststack.cxx
index 464879794d53..6e01cdabf089 100644
--- a/idlc/source/aststack.cxx
+++ b/idlc/source/aststack.cxx
@@ -21,102 +21,65 @@
 #include 
 #include 
 
-#define STACKSIZE_INCREMENT 64
-
 AstStack::AstStack()
-: m_stack(static_cast(rtl_allocateZeroMemory(sizeof(AstScope*) 
* STACKSIZE_INCREMENT)))
-, m_size(STACKSIZE_INCREMENT)
-, m_top(0)
 {
 }
 
 AstStack::~AstStack()
 {
-for(sal_uInt32 i=0; i < m_top; i++)
-{
-if (m_stack[i])
-delete m_stack[i];
-}
-
-std::free(m_stack);
+for (AstScope* p : m_stack)
+delete p;
 }
 
 
 AstScope* AstStack::top()
 {
-if (m_top < 1)
+if (m_stack.empty())
 return nullptr;
-return m_stack[m_top - 1];
+return m_stack.back();
 }
 
 AstScope* AstStack::bottom()
 {
-if (m_top == 0)
+if (m_stack.empty())
 return nullptr;
-return m_stack[0];
+return m_stack.front();
 }
 
 AstScope* AstStack::nextToTop()
 {
-AstScope *tmp, *retval;
-
-if (depth() < 2)
+if (m_stack.size() < 2)
 return nullptr;
 
-tmp = top();// Save top
-pop();  // Pop it
-retval = top(); // Get next one down
-(void) push(tmp);   // Push top back
-return retval;  // Return next one down
+return m_stack[m_stack.size() - 2];
 }
 
 AstScope* AstStack::topNonNull()
 {
-for (sal_uInt32 i = m_top; i > 0; i--)
+for (sal_uInt32 i = m_stack.size(); i > 0; i--)
 {
 if ( m_stack[i - 1] )
 return m_stack[i - 1];
-  }
+}
 return nullptr;
 }
 
 AstStack* AstStack::push(AstScope* pScope)
 {
-AstScope**tmp;
-//  AstDeclaration  *pDecl = ScopeAsDecl(pScope);
-sal_uInt32  newSize;
-sal_uInt32  i;
-
-// Make sure there's space for one more
-if (m_size == m_top)
-{
-newSize = m_size;
-newSize += STACKSIZE_INCREMENT;
-tmp = static_cast(rtl_allocateZeroMemory(sizeof(AstScope*) 
* newSize));
-
-for(i=0; i < m_size; i++)
-tmp[i] = m_stack[i];
-
-std::free(m_stack);
-m_stack = tmp;
-}
-
-// Insert new scope
-m_stack[m_top++] = pScope;
-
+m_stack.push_back(pScope);
 return this;
 }
 
 void AstStack::pop()
 {
-if (m_top < 1)
+if (m_stack.empty())
 return;
---m_top;
+m_stack.pop_back();
 }
 
 void AstStack::clear()
 {
-m_top = 0;
+   m_stack.clear();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e040d8defb774255e083825863641493f4c7d9ff
Author: Noel Grandin 
AuthorDate: Wed Aug 29 09:14:35 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 08:30:07 2018 +0200

don't declare allocation operators for internal code

since they just call into malloc/free now, we can ignore them. Should
have some nice side-effects like letting the compiler allocate
temporaries on the stack.

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

diff --git a/include/comphelper/interfacecontainer2.hxx 
b/include/comphelper/interfacecontainer2.hxx
index f0f79c3033df..60bf7e74a1db 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecont

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

[Libreoffice Gerrit user]

 include/test/table/xcellcursor.hxx  |   39 +
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |5 
 qadevOOo/tests/java/ifc/table/_XCellCursor.java |  210 
--
 sc/qa/extras/sccellcursorobj.cxx|9 
 test/Library_subsequenttest.mk  |1 
 test/source/table/xcellcursor.cxx   |  128 ++
 7 files changed, 177 insertions(+), 216 deletions(-)

New commits:
commit 9e1df712d6e247f4dc9391c0a006b3da2df40403
Author: Rahul Gurung 
AuthorDate: Sun Aug 26 20:26:17 2018 +0530
Commit: Jens Carl 
CommitDate: Thu Aug 30 07:38:08 2018 +0200

tdf#45904 Move _XCellCursor Java tests to C++

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

diff --git a/include/test/table/xcellcursor.hxx 
b/include/test/table/xcellcursor.hxx
new file mode 100644
index ..0fb5c06225c5
--- /dev/null
+++ b/include/test/table/xcellcursor.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef INCLUDED_TEST_TABLE_XCELLCURSOR_HXX
+#define INCLUDED_TEST_TABLE_XCELLCURSOR_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCellCursor
+{
+public:
+virtual css::uno::Reference init() = 0;
+virtual css::uno::Reference getXSpreadsheet() = 0;
+
+void testGoToNext();
+void testGoToOffset();
+void testGoToPrevious();
+void testGoToStart();
+void testGoToEnd();
+
+protected:
+~XCellCursor() {}
+};
+}
+
+#endif // INCLUDED_TEST_TABLE_XCELLCURSOR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 57b0dbf6e34b..4aba76420ecb 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -588,7 +588,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/table/_TableRow \
 qadevOOo/tests/java/ifc/table/_XAutoFormattable \
 qadevOOo/tests/java/ifc/table/_XCell \
-qadevOOo/tests/java/ifc/table/_XCellCursor \
 qadevOOo/tests/java/ifc/table/_XCellRange \
 qadevOOo/tests/java/ifc/table/_XColumnRowRange \
 qadevOOo/tests/java/ifc/table/_XTableChart \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 1a7e1096bf15..2dfea634963b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -41,11 +41,6 @@
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance"
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules"
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoStart()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoEnd()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoNext()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoPrevious()"
-"ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoOffset()"
 
"ScCellCursorObj";"com::sun::star::util::XReplaceable";"createReplaceDescriptor()"
 "ScCellCursorObj";"com::sun::star::util::XReplaceable";"replaceAll()"
 
"ScCellCursorObj";"com::sun::star::chart::XChartData";"addChartDataChangeEventListener()"
diff --git a/qadevOOo/tests/java/ifc/table/_XCellCursor.java 
b/qadevOOo/tests/java/ifc/table/_XCellCursor.java
deleted file mode 100644
index a78991abbe8a..
--- a/qadevOOo/tests/java/ifc/table/_XCellCursor.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with

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

[Libreoffice Gerrit user]

 sal/osl/all/log.cxx |  193 +++-
 1 file changed, 178 insertions(+), 15 deletions(-)

New commits:
commit 9fae75c41dd507a00b4dbf1d978af3e2a3127626
Author: Jan Holesovsky 
AuthorDate: Mon May 5 18:32:49 2014 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Aug 30 04:09:03 2018 +0200

sal: backport logging features

This is:
- sal logging: Flush after having written the output.
- V804: Decreased performance
- add an option to pipe log output to file
- Allow to set log level/path in file
- sal: don't reopen logfile on every log line
- sal: log windows trace output to debugger console
- Optionally include timestamp in the log
- This code wouldn't otherwise build on 5.0.7@Linux
- Fix crash when logging.ini does not exist
- sal: flush log-to-file, remove extra linefeeds otherwise

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 056d2a4cd437..c7ea7970c195 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -15,13 +15,17 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
 #include 
+#include 
 
 #include "osl/thread.hxx"
+#include "osl/process.h"
 #include "rtl/string.h"
+#include "rtl/ustring.hxx"
 #include "sal/detail/log.h"
 #include "sal/log.hxx"
 #include "sal/types.h"
@@ -32,6 +36,7 @@
 #include 
 #elif defined WNT
 #include 
+#include 
 #define OSL_DETAIL_GETPID _getpid()
 #else
 #include 
@@ -80,16 +85,16 @@ 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");
 }
 
 #else
 
-char const * getEnvironmentVariable_() {
-char const * p1 = std::getenv("SAL_LOG");
-if (p1 == 0) {
-return 0;
+char const * getEnvironmentVariable_(const char* env) {
+char const * p1 = std::getenv(env);
+if (p1 == nullptr) {
+return nullptr;
 }
 char const * p2 = strdup(p1); // leaked
 if (p2 == 0) {
@@ -98,9 +103,146 @@ char const * getEnvironmentVariable_() {
 return p2;
 }
 
-char const * getEnvironmentVariable() {
-static char const * env = getEnvironmentVariable_();
-return env;
+bool getValueFromLoggingIniFile(const char* key, char* value) {
+rtl::OUString programDirectoryURL;
+rtl::OUString programDirectoryPath;
+osl_getProcessWorkingDir(&(programDirectoryURL.pData));
+osl_getSystemPathFromFileURL(programDirectoryURL.pData, 
&programDirectoryPath.pData);
+rtl::OUString aLogFile(programDirectoryPath + "/" + "logging.ini");
+std::ifstream logFileStream(rtl::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 const * env = getEnvironmentVariable_("SAL_LOG");
+if (env != nullptr)
+return env;
+
+static char logLevel[1024];
+if (getValueFromLoggingIniFile("LogLevel", logLevel)) {
+return logLevel;
+}
+
+return nullptr;
+}
+
+char const * getLogFilePath() {
+// First check the environment variable, then the setting in logging.ini
+static char const * logFile = getEnvironmentVariable_("SAL_LOG_FILE");
+if (logFile != nullptr)
+return logFile;
+
+static char logFilePath[1024];
+if (getValueFromLoggingIniFile("LogFilePath", logFilePath)) {
+return logFilePath;
+}
+
+return nullptr;
+}
+
+std::ofstream * getLogFile() {
+static char const * logFilePath = getLogFilePath();
+if (logFilePath == nullptr)
+return nullptr;
+
+static std::ofstream file(logFilePath, std::ios::app | std::ios::out);
+return &file;
+}
+
+void maybeOutputTimestamp(std::ostringstream &s) {
+char const * env = getLogLevel();
+if (env == nullptr)
+return;
+bool outputTimestamp = false;
+bool outputRelativeTimer = false;
+for (char const * p = env;;) {
+switch (*p++) {
+case '\0':
+if (outputTimestamp) {
+char ts[100];
+TimeValue systemTime;
+osl_getSystemTime(&systemTime);
+TimeValue localTime;
+osl_getLocalTimeFromSystemTime(&systemTime, &localTime);
+oslDateTime dateTime;
+

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

[Libreoffice Gerrit user]

 svx/uiconfig/ui/findreplacedialog.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c446df46df21472d3465be69603473a4ddad9b82
Author: Samuel Thibault 
AuthorDate: Mon Aug 27 16:48:31 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Aug 30 02:20:31 2018 +0200

findreplacedialog: Set a11y role of hint text to static

Since this is not a label for another widget, but some text that screen
readers should speak.

Change-Id: Iddc2840e60c8a55caf2e6581831024e2658e084e
Reviewed-on: https://gerrit.libreoffice.org/59668
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index 5f382f188344..1fbade190035 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -167,6 +167,9 @@
 True
 end
 0
+
+  
+
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/rtfexport/data/fdo69384-paste.rtf  |4 ++--
 sw/qa/extras/rtfexport/rtfexport2.cxx   |   13 ++---
 writerfilter/source/dmapper/StyleSheetTable.cxx |7 ---
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 634527cf866adf5cc7fb501b09e36bb3f7be89e5
Author: Caolán McNamara 
AuthorDate: Thu Aug 23 17:19:07 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Aug 30 02:19:25 2018 +0200

Resolves: tdf#118382 crash on paste of rtf

into an existing document since

commit deaa16bd24fba4a3a6b072ab2b94542a7dbd41c6
Author: Serge Krot 
Date:   Mon Jan 29 12:17:06 2018 +0100

tdf#72942 Do not overwrite styles from the inserted doc

During inserting of the text from the external document
we should not change original default styles in
currently opened document.

because missing styles aren't created, so there's exceptons
thrown on their use.

I see that the m_bIsNewDoc flag is already checked for since...

commit 5ebe826caf75e8d00656b385bf0bbc05cb27
Author: Miklos Vajna 
Date:   Fri Oct 4 11:02:59 2013 +0200

fdo#69384 fix impress -> writer copy&paste

Regression from 2ade07126971b79c92f729fae5709f2e2e2b495c (fdo#62044 RTF
import: don't overwrite existing styles when pasting, 2013-06-04),
during paste, if existing style was found, then the intention was to
skip that style, but instead we tried to create one.

in the body of the following loop, which should mean that existing
styles are left alone and only missing styles created if we remove
this hunk of the tdf#72942 commit

Change-Id: Ia4aedb5e309c991490656061aa20d11ff24f4f9e
Reviewed-on: https://gerrit.libreoffice.org/59519
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 1f1e349bbee1b2bff01a850d9a7fe4d6a77c4f29)
Reviewed-on: https://gerrit.libreoffice.org/59636
Reviewed-by: Thorsten Behrens 

diff --git a/sw/qa/extras/rtfexport/data/fdo69384-paste.rtf 
b/sw/qa/extras/rtfexport/data/fdo69384-paste.rtf
index cbdca5be6e9c..e0a9733c7475 100644
--- a/sw/qa/extras/rtfexport/data/fdo69384-paste.rtf
+++ b/sw/qa/extras/rtfexport/data/fdo69384-paste.rtf
@@ -8,10 +8,10 @@
 
{\s4\fi0\li0\ri0\sb0\sa0\sl200\slmult0\cf0\f3\fs36\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs36\fs36\b0\b0\i0\i0\accnone\olnone\sbasedon1\snext4
 Object without fill;}
 
{\s5\fi0\li0\ri0\sb0\sa0\sl200\slmult0\cf0\f3\fs36\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs36\fs36\b0\b0\i0\i0\accnone\olnone\sbasedon1\snext5
 Object with no fill and no line;}
 
{\s6\fi0\li0\ri0\sb0\sa0\sl200\slmult0\cf0\f3\fs36\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs36\fs36\b0\b0\i0\i0\accnone\olnone\sbasedon1\snext6
 Text;}
-{\s7\fi0\li0\ri0\sb0\sa0\sl200\slmult0\cf0\f3\fs32\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs36\fs36\b0\b0\i0\i0\accnone\olnone\sbasedon1\snext7
 Text body;}
+{\s7\fi0\li0\ri0\sb0\sa0\sl200\slmult0\cf0\f3\fs132\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs136\fs136\b0\b0\i0\i0\accnone\olnone\sbasedon1\snext7
 Text Body;}
 
{\s8\fi0\li0\ri0\sb0\sa0\sl200\slmult0\ql\cf0\f3\fs36\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs36\fs36\b0\b0\i0\i0\accnone\olnone\sbasedon1\snext8
 Text body justified;}}
 
{\*\EditEnginePoolDefaults\ltrpar\fi0\li0\ri0\fi0\li0\ri0\sb0\sa0\sl0\slmult0\ql\cf0\f0\fs48\b0\ulnone\strike0\i0\outl0\shad0\kerning0\expndtw0\f1\f2\fs48\fs48\b0\b0\i0\i0\accnone\olnone}
 \deftab709
 {
-\s27\fi0\li0\ri0\qc\cf0\f3\fs64\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs64\fs64\b0\b0\i0\i0\accnone\olnone
 {\f3\fs64\b0\i0 sss}\par\pard\plain
+\s7\fi0\li0\ri0\qc\cf0\f3\fs64\b0\ulnone\strike0\i0\outl0\shad0\kerning1\f4\f2\fs64\fs64\b0\b0\i0\i0\accnone\olnone
 {\f3\fs64\b0\i0 sss}\par\pard\plain
 }}
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx 
b/sw/qa/extras/rtfexport/rtfexport2.cxx
index 64de79280e25..e5b2fd4f958b 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -655,8 +655,12 @@ DECLARE_RTFEXPORT_TEST(testFdo63428, "hello.rtf")
 
 DECLARE_RTFEXPORT_TEST(testFdo69384, "fdo69384-paste.rtf")
 {
-// Check if the style is loaded
+// Ensure non-default style is loaded
 getStyles("ParagraphStyles")->getByName("Text body justified");
+// Ensure default styles were modified, vs testFdo69384Inserted where it 
is not
+uno::Reference xPropertySet(
+getStyles("ParagraphStyles")->getByName("Text Body"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(68.f, getProperty(xPropertySet, "CharHeight"));
 }
 
 DECLARE_RTFEXPORT_TEST(testFdo69384Inserted, "hello.rtf")
@@ -666,8 +670,11 @@ DECLARE_RTFEXPORT_TEST(testFdo69384Inserted, "hello.rtf")
 uno::Reference xEnd = xText->getEnd();
 paste("rtfexport/data/fdo69384-paste.rtf", xEnd);
 
-// During insert of the RTF document we do not insert new styles

Bijan Tabatabai license statement

[Bijan Tabatabai]

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

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

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

[Libreoffice Gerrit user]

 include/xmloff/txtimp.hxx|6 ++--
 sw/qa/extras/odfexport/data/tdf101856_overlapped.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx |   24 +++
 xmloff/source/text/XMLTextMarkImportContext.cxx  |   10 +++
 xmloff/source/text/txtimp.cxx|   19 +++
 5 files changed, 41 insertions(+), 18 deletions(-)

New commits:
commit 3559daee24ea1224d3d40e6a86b10cf37e18443f
Author: Serge Krot 
AuthorDate: Tue Aug 28 14:32:14 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Aug 30 00:21:23 2018 +0200

tdf#101856 Handle properties of nested bookmarks

Change-Id: I1a92d2001e58751c5bbe41f6480f4c46dcc8c9e7
Reviewed-on: https://gerrit.libreoffice.org/59766
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index c8e060f15d9c..2caeff3ea689 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -712,9 +712,9 @@ public:
 void AddCrossRefHeadingMapping(OUString const& rFrom, OUString const& rTo);
 void MapCrossRefHeadingFieldsHorribly();
 
-void setBookmarkAttributes(bool hidden, OUString const& condition);
-bool getBookmarkHidden();
-const OUString& getBookmarkCondition();
+void setBookmarkAttributes(OUString const& bookmark, bool hidden, OUString 
const& condition);
+bool getBookmarkHidden(OUString const& bookmark) const;
+const OUString& getBookmarkCondition(OUString const& bookmark) const;
 
 };
 
diff --git a/sw/qa/extras/odfexport/data/tdf101856_overlapped.odt 
b/sw/qa/extras/odfexport/data/tdf101856_overlapped.odt
new file mode 100644
index ..c05df538da52
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/tdf101856_overlapped.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index ef48e648661b..ab993fb28439 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -1997,6 +1997,30 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, 
"spellout-numberingtypes.odt"
 }
 
 // MAILMERGE Add conditional to expand / collapse bookmarks
+DECLARE_ODFEXPORT_TEST(tdf101856_overlapped, "tdf101856_overlapped.odt")
+{
+// get bookmark interface
+uno::Reference xBookmarksSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+uno::Reference 
xBookmarksByName(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+
+// check: we have 2 bookmarks
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
xBookmarksByIdx->getCount());
+CPPUNIT_ASSERT(xBookmarksByName->hasByName("BookmarkNonHidden"));
+CPPUNIT_ASSERT(xBookmarksByName->hasByName("BookmarkHidden"));
+
+// 
+uno::Reference 
xBookmark1(xBookmarksByName->getByName("BookmarkNonHidden"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xBookmark1, 
UNO_NAME_BOOKMARK_CONDITION));
+CPPUNIT_ASSERT_EQUAL(false, getProperty(xBookmark1, 
UNO_NAME_BOOKMARK_HIDDEN));
+
+// 
+uno::Reference 
xBookmark2(xBookmarksByName->getByName("BookmarkHidden"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xBookmark2, 
UNO_NAME_BOOKMARK_CONDITION));
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xBookmark2, 
UNO_NAME_BOOKMARK_HIDDEN));
+}
+
+// MAILMERGE Add conditional to expand / collapse bookmarks
 DECLARE_ODFEXPORT_TEST(tdf101856, "tdf101856.odt")
 {
 // get bookmark interface
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 6641bec775a8..ea00d0aae2cd 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -174,9 +174,9 @@ void XMLTextMarkImportContext::StartElement(
 
 if (IsXMLToken(GetLocalName(), XML_BOOKMARK_START))
 {
-OUString sHidden = xAttrList->getValueByName("loext:hidden");
-OUString sCondition = xAttrList->getValueByName("loext:condition");
-m_rHelper.setBookmarkAttributes(sHidden == "true", sCondition);
+const OUString sHidden= xAttrList->getValueByName("loext:hidden");
+const OUString sCondition = 
xAttrList->getValueByName("loext:condition");
+m_rHelper.setBookmarkAttributes(m_sBookmarkName, sHidden == "true", 
sCondition);
 }
 }
 
@@ -357,8 +357,8 @@ void XMLTextMarkImportContext::EndElement()
 const Reference 
xPropertySet(xContent, UNO_QUERY);
 if (xPropertySet.is())
 {
-
xPropertySet->setPropertyValue("BookmarkHidden",
uno::Any(m_rHelper.getBookmarkHidden()));
-
xPropertySet->setPropertyValue("BookmarkCondition", 
uno::Any(m_rHelper.getBookmarkCondition()));
+
xPropertySet->setProp

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-7' created by Andras Timar  at 
2018-08-29 21:48 +

cp-6.0-7

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

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-7' created by Andras Timar  at 
2018-08-29 21:48 +

cp-6.0-7

Changes since cp-6.0-6-4:
---
 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-6.0-7'

[Libreoffice Gerrit user]

Tag 'cp-6.0-7' created by Andras Timar  at 
2018-08-29 21:48 +

cp-6.0-7

Changes since cp-6.0-6:
Olivier R (1):
  French dictionary update (v6.3)

---
 fr_FR/README_fr.txt   |2 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |7 
 fr_FR/fr.dic  | 1032 --
 fr_FR/package-description.txt |2 
 5 files changed, 1003 insertions(+), 42 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-7' created by Andras Timar  at 
2018-08-29 21:48 +

cp-6.0-7

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

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

[Libreoffice Gerrit user]

 loleaflet/src/core/Socket.js |1 +
 loleaflet/src/map/Map.js |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit ab7943edd6dff69d729bfd5fb042c3483d449102
Author: Tamás Zolnai 
AuthorDate: Wed Aug 29 23:26:26 2018 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Aug 29 23:34:05 2018 +0200

Make tilerendering working again after connection lost

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index cbeebb435..1208e6e75 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -761,6 +761,7 @@ L.Socket = L.Class.extend({
else if (this._reconnecting) {
// we are reconnecting ...
this._reconnecting = false;
+   this._map._docLayer.viewReset();

this._map._docLayer._onMessage('invalidatetiles: EMPTY', null);
this._map.fire('statusindicator', {statusType: 
'reconnected'});

this._map.setPermission(this._map.options.permission);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index ca842afc5..0a4a4662b 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -823,6 +823,8 @@ L.Map = L.Evented.extend({
this._active = true;
if (this._docLayer) {

this._docLayer._onMessage('invalidatetiles: EMPTY', null);
+   this._docLayer._clientVisibleArea = '';
+   this._docLayer._clientZoom = '';
}
 
if (vex.dialogID > 0) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

[Samuel Thibault]

Jan-Marek Glogowski, le mer. 29 août 2018 06:53:52 +, a ecrit:
> Am August 28, 2018 4:04:37 PM UTC schrieb Samuel Thibault 
> :
> >Samuel Thibault, le lun. 12 févr. 2018 15:30:59 +0100, a ecrit:
> >> - At some point we'll get confident that we won't introduce other
> >> big classes of warnings over hundreds of .ui files. That's the point
> >> where we can say "ok, let's start fixing the existing issues over
> >> all .ui files once for good". We can then run through .ui files one
> >> by one, fixing the issues and removing the corresponding suppression
> >> lines. These could be used as "easy hacks" entries, they are usually
> >> just a few lines to fix.
> 
> I'm not sure we want this handled as "easy hacks". The goal was to enable the 
> checks always for the build. Is this implemented and can I enable it?

The checks are already enabled, and any new issue will fail the
build.  The goal now is to fix existing issues (currently suppressed by
suppression rules).

> My preferred solution would be, that generating the error files in the 
> current build wouldn't break it, but spill the errors to the console to annoy 
> people, to get this fixed in time. Mind I have no ideas about the amount of 
> output / the current state.

The current amount of warnings is ~2000 lines, so I don't think we want
to just enable it: new warnings (i.e. regressions, which is what we
strictly want to avoid) would be buried in the flow.

> >> The progression of all of this could be monitored with statistics reported 
> >> e.g. in the minutes of ESC calls.
> So who would be responsible to fix it? If we don't test it on patch 
> submission and break on error, it would just pile up again.

The principle is that the patch submission contains both the fix and
the removal of the suppression rules, i.e. the build breaks if the fix
doesn't actually fix the warnings which used to be suppressed by the
rules.

Of course, review is still needed to check that the .ui change used to
fix the warning does make sense and is not a "quick hack" to get the
warning away.

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

java.awt.AWTError: Assistive Technology failure after Ubuntu / Debain Upgrade

[Luke Benes]

Subsequent Java Unit tests are failing after the Ubuntu 16.04 to 18.04 upgrade. 
 


According to a Debian bug report, multiple Java apps are experiencing this 
issue after a Debian testing upgrade including Minecraft and draw9patch.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798794

Ubuntu:
https://askubuntu.com/questions/695560/assistive-technology-not-found-awterror

The problem is caused by a change in openjdk-8-jre, which now depends on 
openjdk-8-jre-headless. Java sees the presence of headless and assumes 
accessibility should be unavailable. 

Since you cannot easily remove headless, the workaround that worked for me was:
Comment out "assistive_technologies=org.GNOME.Accessibility.AtkWrapper" in file 
 /etc/java-8-openjdk/accessibility.properties or 
/etc/java-11-openjdk/accessibility.properties


LibreOffice build log error:
java.awt.AWTError: Assistive Technology not found: 
org.GNOME.Accessibility.AtkWrapper
at java.desktop/java.awt.Toolkit.newAWTError(Toolkit.java:472)
at 
java.desktop/java.awt.Toolkit.fallbackToLoadClassForAT(Toolkit.java:488)
at 
java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183)
at 
java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:177)
at 
java.base/java.util.HashMap$KeySpliterator.forEachRemaining(HashMap.java:1608)
at 
java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
at 
java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
at 
java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:150)
at 
java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:173)
at 
java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at 
java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:497)
at 
java.desktop/java.awt.Toolkit.loadAssistiveTechnologies(Toolkit.java:532)
at java.desktop/java.awt.Toolkit.getDefaultToolkit(Toolkit.java:613)
at 
mod._toolkit.UnoScrollBarControl.initialize(UnoScrollBarControl.java:65)
at lib.TestCase.initializeTestCase(TestCase.java:67)
at base.java_fat.executeTest(java_fat.java:138)
at org.openoffice.Runner.run(Runner.java:175)
at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:41)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:564)
at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:52)
at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
Caused by: java.lang.ClassNotFoundException: org.GNOME.Accessibility.AtkWrapper
a

Minutes from the design meeting 2018-Aug-29

[Heiko Tietze]

Present: Heiko

 * Autocomplete taking special characters
   + https://bugs.documentfoundation.org/show_bug.cgi?id=118399 
   + WFM; editing capabilities would be nice though (Heiko)
   => kept open for dev advice

 * Associate a character style to cross-reference fields
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119048
   + use case not perfectly clear to me
   + 3x +1 on BZ
   => needsDevEval

 * Wrong paper size B5, instead of A4
+ https://bugs.documentfoundation.org/show_bug.cgi?id=116386
+ default to "Fit to printable page"? and c12
+ solved with https://gerrit.libreoffice.org/#/c/59581/ ?
=> RESOLVED?

 * Improve anchor of images
   + https://bugs.documentfoundation.org/show_bug.cgi?id=117329
   => DUPLICATE of tdf#89477

 * Right-click section title to expand this section and collapse all other 
sections
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119275
   + +1 (Cor)
   + -1 (Stuart)
   + -1, perhaps a button to collapse all section on the deck title (Heiko)
   => kept open for further interest

 * LibreOffice hangs reopening the "Select Firefox Theme" for a second time
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119127
   + dup of "Personas not found again"  
   + https://bugs.documentfoundation.org/show_activity.cgi?id=118881
   => timeout would be a bad solution






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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jurt/java ridljar/java solenv/ant

[Libreoffice Gerrit user]

 ridljar/java/ridl/build.xml |4 -
 solenv/ant/aoo-ant.xml  |   52 +++-
 solenv/ant/idl.xml  |  143 +---
 3 files changed, 84 insertions(+), 115 deletions(-)

New commits:
commit 063857bd52709009430d2c2a36d5b2dc80390769
Author: Damjan Jovanovic 
AuthorDate: Wed Aug 29 17:45:06 2018 +
Commit: Damjan Jovanovic 
CommitDate: Wed Aug 29 17:45:06 2018 +

Automatically build .idl files found in src/main/idl and src/test/idl

without having to specify them.

Clean up the Ant build a little, removing the unused cppumaker
functions I was experimenting with, and fully generalize IDL building
so it doesn't use any Ant properties, only macrodefs.

Patch by: me

diff --git 
a/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/interfaces.idl
 b/jurt/java/jurt/src/test/idl/com/sun/star/lib/uno/protocols/urp/interfaces.idl
similarity index 100%
rename from 
jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/interfaces.idl
rename to 
jurt/java/jurt/src/test/idl/com/sun/star/lib/uno/protocols/urp/interfaces.idl
diff --git a/ridljar/java/ridl/build.xml b/ridljar/java/ridl/build.xml
index f4fcab15a901..b99799c34aae 100644
--- a/ridljar/java/ridl/build.xml
+++ b/ridljar/java/ridl/build.xml
@@ -44,8 +44,8 @@
 
 
 
+rdbFile="${OUTDIR}/bin/udkapi.rdb"
+outputDir="${main.build.dir}"/>
 
 
 
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 37ffb804e123..e47f2b52b1ed 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -35,11 +35,20 @@
 
 
 
+
 
-
+
 
+
+
+
+
+
 
+
+
 
+
 
 
 
@@ -63,7 +72,10 @@
 
 
 
-
+
+
+
+
 
 
 
@@ -71,19 +83,14 @@
 
 
 
+
 
+
 
 
-
 
 
 
-
-
-
-
-
-
 
 
 
@@ -109,7 +116,14 @@
 
 
 
-
+
+
+
+
+
+
 
 
 
 
@@ -146,7 +160,14 @@
 
 
 
-
+
+
+
+
+
+
 
 
 
 
+ manifest="${jar.manifest}"
+ duplicate="fail">
 
 
 
 
+
+
+
 
 
 
diff --git a/solenv/ant/idl.xml b/solenv/ant/idl.xml
index 24174332d01c..f7bf0ac3a17d 100644
--- a/solenv/ant/idl.xml
+++ b/solenv/ant/idl.xml
@@ -28,160 +28,105 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
 
-
-
-
+
+
+
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
 
+
 
 
 
 
+
+
+
 
-
-
-
-
-
+
 
+urdDir="@{idlBuildDir}/urd"
+rdbFile="@{idlBuildDir}/registry.rdb"/>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
 
-
-
+
+
 
-
+
 
 
 
 
 
-
+
 
 
 
-
-
-
+
 
 
 
 
 
-
-
+
+
 
-
-
+
 
 
 
-
+
 
-
+
 
 
 
 
 
-
-
+
+
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-

[Libreoffice-commits] online.git: 5 commits - common/FileUtil.cpp common/Log.cpp common/Util.cpp common/Util.hpp net/Socket.hpp

[Libreoffice Gerrit user]

 common/FileUtil.cpp |   22 ++-
 common/Log.cpp  |   15 
 common/Util.cpp |   31 +++-
 common/Util.hpp |   96 
 net/Socket.hpp  |   20 +-
 5 files changed, 168 insertions(+), 16 deletions(-)

New commits:
commit d07f686b281844938db412cfa7c1d77b77087597
Author: Tor Lillqvist 
AuthorDate: Wed Aug 29 18:48:13 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Aug 29 20:56:59 2018 +0300

Make this file compile for iOS

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 965f08247..5275ec61e 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -33,10 +33,10 @@
 #include 
 #include 
 
-#include "common/Common.hpp"
-#include "common/Log.hpp"
-#include "common/Util.hpp"
-#include "common/SigUtil.hpp"
+#include "Common.hpp"
+#include "Log.hpp"
+#include "Util.hpp"
+#include "SigUtil.hpp"
 
 namespace Poco
 {
@@ -262,8 +262,8 @@ public:
 {
 if (InhibitThreadChecks)
 return;
-// 0 owner means detached and can be invoked by any thread.
-const bool sameThread = (_owner == std::thread::id(0) || 
std::this_thread::get_id() == _owner);
+// uninitialized owner means detached and can be invoked by any thread.
+const bool sameThread = (_owner == std::thread::id() || 
std::this_thread::get_id() == _owner);
 if (!sameThread)
 LOG_ERR("#" << _fd << " Invoked from foreign thread. Expected: " <<
 Log::to_string(_owner) << " but called from " <<
@@ -384,7 +384,7 @@ public:
 
 LOG_DBG("Removing socket #" << socket->getFD() << " from " << 
_name);
 socket->assertCorrectThread();
-socket->setThreadOwner(std::thread::id(0));
+socket->setThreadOwner(std::thread::id());
 
 _pollSockets.pop_back();
 }
@@ -416,8 +416,8 @@ public:
 {
 if (InhibitThreadChecks)
 return;
-// 0 owner means detached and can be invoked by any thread.
-const bool sameThread = (!isAlive() || _owner == std::thread::id(0) || 
std::this_thread::get_id() == _owner);
+// uninitialized owner means detached and can be invoked by any thread.
+const bool sameThread = (!isAlive() || _owner == std::thread::id() || 
std::this_thread::get_id() == _owner);
 if (!sameThread)
 LOG_ERR("Incorrect thread affinity for " << _name << ". Expected: 
" <<
 Log::to_string(_owner) << " (" << Util::getThreadId() <<
@@ -564,7 +564,7 @@ public:
 std::lock_guard lock(_mutex);
 LOG_DBG("Inserting socket #" << newSocket->getFD() << " into " << 
_name);
 // sockets in transit are un-owned.
-newSocket->setThreadOwner(std::thread::id(0));
+newSocket->setThreadOwner(std::thread::id());
 _newSockets.emplace_back(newSocket);
 wakeup();
 }
commit 39072dbae5aeee2fc09cb401ec9900b3e7eb7ac5
Author: Tor Lillqvist 
AuthorDate: Wed Aug 29 18:48:00 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Aug 29 20:41:16 2018 +0300

Make this file compile for iOS

diff --git a/common/Util.hpp b/common/Util.hpp
index afc42dcd0..9233a2142 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -23,6 +23,10 @@
 
 #include 
 
+#ifndef __linux
+#include 
+#endif
+
 #include 
 #include 
 #include 
@@ -138,7 +142,11 @@ namespace Util
 
 const char *getThreadName();
 
+#ifdef __linux
 pid_t getThreadId();
+#else
+std::thread::id getThreadId();
+#endif
 
 /// Get version information
 void getVersionInfo(std::string& version, std::string& hash);
@@ -354,48 +362,110 @@ namespace Util
 case ELOOP: return "ELOOP";
 case ENOMSG: return "ENOMSG";
 case EIDRM: return "EIDRM";
+#ifdef ECHRNG
 case ECHRNG: return "ECHRNG";
+#endif
+#ifdef EL2NSYNC
 case EL2NSYNC: return "EL2NSYNC";
+#endif
+#ifdef EL3HLT
 case EL3HLT: return "EL3HLT";
+#endif
+#ifdef EL3RST
 case EL3RST: return "EL3RST";
+#endif
+#ifdef ELNRNG
 case ELNRNG: return "ELNRNG";
+#endif
+#ifdef EUNATCH
 case EUNATCH: return "EUNATCH";
+#endif
+#ifdef ENOCSI
 case ENOCSI: return "ENOCSI";
+#endif
+#ifdef EL2HLT
 case EL2HLT: return "EL2HLT";
+#endif
+#ifdef EBADE
 case EBADE: return "EBADE";
+#endif
+#ifdef EBADR
 case EBADR: return "EBADR";
+#endif
+#ifdef EXFULL
 case EXFULL: return "EXFULL";
+#endif
+#ifdef ENOANO
 case ENOANO: return "ENOANO";
+#endif
+#ifdef EBADRQC
 case EBADRQC: return "EBADRQC";
+#endif
+#ifdef EBADSLT
 case EBADSLT: return "EBADSLT";
+#endif
+#ifdef EBFONT
 case EBFONT: return "EBFONT";
+#endif
 case ENOSTR: return "ENOSTR";
 case ENODATA: return "ENODATA";
 case ETIME: return "ETIME";
 case ENOSR: return "ENOSR";
+#ifdef ENONET
 case ENONET: return "ENONET";
+#endif
+#ifdef ENOPKG
 

[Libreoffice-commits] online.git: ios/config.h ios/.gitignore

[Libreoffice Gerrit user]

 ios/.gitignore |1 
 ios/config.h   |  115 +
 2 files changed, 116 insertions(+)

New commits:
commit 3131dc9d10770e735322478c718e90690c662770
Author: Tor Lillqvist 
AuthorDate: Wed Aug 29 18:20:40 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Aug 29 20:34:34 2018 +0300

Add manually created config.h for iOS

diff --git a/ios/.gitignore b/ios/.gitignore
new file mode 100644
index 0..120fe7749
--- /dev/null
+++ b/ios/.gitignore
@@ -0,0 +1 @@
+!config.h
diff --git a/ios/config.h b/ios/config.h
new file mode 100644
index 0..b9090b03e
--- /dev/null
+++ b/ios/config.h
@@ -0,0 +1,115 @@
+/* config.h.  Manually edited from config.h.in.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Whether to disable SECCOMP */
+#define DISABLE_SECCOMP 1
+
+/* Whether to compile in some extra debugging support code and disable some
+   security pieces */
+#undef ENABLE_DEBUG
+
+/* Whether to enable setting of capabilities */
+#undef ENABLE_SETCAP
+
+/* Whether to enable SSL */
+#undef ENABLE_SSL
+
+/* Whether to enable support key */
+#undef ENABLE_SUPPORT_KEY
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `pam' library (-lpam). */
+#undef HAVE_LIBPAM
+
+/* Define to 1 if you have the  header file.
+   */
+#undef HAVE_LIBREOFFICEKIT_LIBREOFFICEKIT_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_LINUX_SECCOMP_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_MEMORY_H
+
+/* Whether OpenSSL has PKCS5_PBKDF2_HMAC() */
+#undef HAVE_PKCS5_PBKDF2_HMAC
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_POCO_NET_WEBSOCKET_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_SECURITY_PAM_APPL_H
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_UNISTD_H 1
+
+/* Cache folder */
+#define LOOLWSD_CACHEDIR getCacheDir()
+
+/* LibreOffice Online WebSocket server version */
+#define LOOLWSD_VERSION "master" // ???
+
+/* LibreOffice Online git hash if present */
+#define LOOLWSD_VERSION_HASH "xx" // ???
+
+/* Path to LibreOffice installation */
+#undef LO_PATH
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Limit the maximum number of open connections */
+#undef MAX_CONNECTIONS
+
+/* Limit the maximum number of open documents */
+#undef MAX_DOCUMENTS
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+/* #undef VERSION */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/MessageQueue.hpp

[Libreoffice Gerrit user]

 common/MessageQueue.hpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d7dea2ea510669b09db9b4840255b2a40d8a8c28
Author: Tor Lillqvist 
AuthorDate: Wed Aug 29 19:38:19 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Aug 29 19:57:58 2018 +0300

Need to include  here

diff --git a/common/MessageQueue.hpp b/common/MessageQueue.hpp
index 14c448c2a..761e64bc3 100644
--- a/common/MessageQueue.hpp
+++ b/common/MessageQueue.hpp
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 /// Thread-safe message queue (FIFO).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/karasa_jaga

[Libreoffice Gerrit user]

 icon-themes/karasa_jaga/cmd/32/combine.png|binary
 icon-themes/karasa_jaga/cmd/32/copyobjects.png|binary
 icon-themes/karasa_jaga/cmd/32/equalizeheight.png |binary
 icon-themes/karasa_jaga/cmd/32/equalizewidth.png  |binary
 icon-themes/karasa_jaga/cmd/32/intersect.png  |binary
 icon-themes/karasa_jaga/cmd/32/merge.png  |binary
 icon-themes/karasa_jaga/cmd/32/morphing.png   |binary
 icon-themes/karasa_jaga/cmd/32/shrink.png |binary
 icon-themes/karasa_jaga/cmd/32/substract.png  |binary
 icon-themes/karasa_jaga/cmd/lc_combine.png|binary
 icon-themes/karasa_jaga/cmd/lc_copyobjects.png|binary
 icon-themes/karasa_jaga/cmd/lc_equalizeheight.png |binary
 icon-themes/karasa_jaga/cmd/lc_equalizewidth.png  |binary
 icon-themes/karasa_jaga/cmd/lc_intersect.png  |binary
 icon-themes/karasa_jaga/cmd/lc_merge.png  |binary
 icon-themes/karasa_jaga/cmd/lc_morphing.png   |binary
 icon-themes/karasa_jaga/cmd/lc_shrink.png |binary
 icon-themes/karasa_jaga/cmd/lc_substract.png  |binary
 icon-themes/karasa_jaga/cmd/sc_autosum.png|binary
 icon-themes/karasa_jaga/cmd/sc_combine.png|binary
 icon-themes/karasa_jaga/cmd/sc_convertinto3d.png  |binary
 icon-themes/karasa_jaga/cmd/sc_copyobjects.png|binary
 icon-themes/karasa_jaga/cmd/sc_equalizeheight.png |binary
 icon-themes/karasa_jaga/cmd/sc_equalizewidth.png  |binary
 icon-themes/karasa_jaga/cmd/sc_intersect.png  |binary
 icon-themes/karasa_jaga/cmd/sc_merge.png  |binary
 icon-themes/karasa_jaga/cmd/sc_morphing.png   |binary
 icon-themes/karasa_jaga/cmd/sc_shrink.png |binary
 icon-themes/karasa_jaga/cmd/sc_substract.png  |binary
 icon-themes/karasa_jaga/links.txt |9 +
 30 files changed, 9 insertions(+)

New commits:
commit a1dd8098e6e2a7d5ba4b9c1a2d094db11d3d6b27
Author: Rizal Muttaqin 
AuthorDate: Wed Aug 29 09:00:06 2018 +0700
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Aug 29 18:27:47 2018 +0200

KJ: Draw menubar: add icons to shape menusection

Change-Id: I21c9d1a938266be9dcc6a43c2681a6b98b49e937
Reviewed-on: https://gerrit.libreoffice.org/59723
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/karasa_jaga/cmd/32/combine.png 
b/icon-themes/karasa_jaga/cmd/32/combine.png
new file mode 100644
index ..a27ac85be019
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/combine.png differ
diff --git a/icon-themes/karasa_jaga/cmd/32/copyobjects.png 
b/icon-themes/karasa_jaga/cmd/32/copyobjects.png
new file mode 100644
index ..a7c7f0f0ba79
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/copyobjects.png 
differ
diff --git a/icon-themes/karasa_jaga/cmd/32/equalizeheight.png 
b/icon-themes/karasa_jaga/cmd/32/equalizeheight.png
new file mode 100644
index ..f07c5b090025
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/equalizeheight.png 
differ
diff --git a/icon-themes/karasa_jaga/cmd/32/equalizewidth.png 
b/icon-themes/karasa_jaga/cmd/32/equalizewidth.png
new file mode 100644
index ..d03c69dd9447
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/equalizewidth.png 
differ
diff --git a/icon-themes/karasa_jaga/cmd/32/intersect.png 
b/icon-themes/karasa_jaga/cmd/32/intersect.png
new file mode 100644
index ..b76ad10694e5
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/intersect.png differ
diff --git a/icon-themes/karasa_jaga/cmd/32/merge.png 
b/icon-themes/karasa_jaga/cmd/32/merge.png
new file mode 100644
index ..33601db88fbb
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/merge.png differ
diff --git a/icon-themes/karasa_jaga/cmd/32/morphing.png 
b/icon-themes/karasa_jaga/cmd/32/morphing.png
new file mode 100644
index ..a7f54d135176
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/morphing.png differ
diff --git a/icon-themes/karasa_jaga/cmd/32/shrink.png 
b/icon-themes/karasa_jaga/cmd/32/shrink.png
index 490ba55ceb87..d2714fbf9806 100644
Binary files a/icon-themes/karasa_jaga/cmd/32/shrink.png and 
b/icon-themes/karasa_jaga/cmd/32/shrink.png differ
diff --git a/icon-themes/karasa_jaga/cmd/32/substract.png 
b/icon-themes/karasa_jaga/cmd/32/substract.png
new file mode 100644
index ..a27ac85be019
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/substract.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_combine.png 
b/icon-themes/karasa_jaga/cmd/lc_combine.png
new file mode 100644
index ..426b83ccf9bf
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/lc_combine.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_copyobjects.png 
b/icon-themes/karasa_jaga/cmd/lc_copyobjects.png
new file mode 100644
index ..26fd84f3e850
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/lc_copyobjects.png 
differ
diff --git a/icon-themes/karasa_jaga/cmd

[Libreoffice-commits] online.git: common/SigUtil.cpp

[Libreoffice Gerrit user]

 common/SigUtil.cpp |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c184270934373018c06ce84056bb2de436b18fc5
Author: Tor Lillqvist 
AuthorDate: Wed Aug 29 18:44:35 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Aug 29 18:44:35 2018 +0300

Bin some unneeded #includes

Change-Id: I5957417b5f81cb373299f3386d509e475bed2b6e

diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index ae6d6b18e..8274d1967 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -14,10 +14,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Log.hpp common/Seccomp.cpp common/Util.cpp

[Libreoffice Gerrit user]

 common/Log.hpp |3 +--
 common/Seccomp.cpp |1 +
 common/Util.cpp|1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 57326ae27cd9eb4a9a69b075395784836bbc9f99
Author: Tor Lillqvist 
AuthorDate: Wed Aug 29 18:32:48 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Aug 29 18:36:16 2018 +0300

Third parameter to prefix() is a bool

Passing syscall(SYS_gettid) as a bool is equivalent to passing true,
as far as I understand.

Change-Id: I31bb15000a9e6c95b657d58bc78df4f3da0fe687

diff --git a/common/Log.hpp b/common/Log.hpp
index 0ae6a2a7e..cc60e4148 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_LOG_HPP
 #define INCLUDED_LOG_HPP
 
-#include 
 #include 
 
 #include 
@@ -83,7 +82,7 @@ namespace Log
 _enabled(true)
 {
 char buffer[1024];
-_stream << prefix(buffer, level, syscall(SYS_gettid));
+_stream << prefix(buffer, level, true);
 }
 
 StreamLogger(StreamLogger&& sl) noexcept
diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index 3f363923a..2c77f35ed 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/common/Util.cpp b/common/Util.cpp
index a03cf4c46..e14412329 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 tools/qa/cppunit/test_time.cxx  |   30 --
 tools/source/datetime/ttime.cxx |   14 +++---
 2 files changed, 35 insertions(+), 9 deletions(-)

New commits:
commit 5f352a7289786e9648d0aca61a8ec867be4f4aa4
Author: Eike Rathke 
AuthorDate: Wed Aug 29 10:44:53 2018 +0200
Commit: Eike Rathke 
CommitDate: Wed Aug 29 17:30:28 2018 +0200

Round fraction if possible, else truncate; tools::Time::GetClock()

With this also some test cases can be narrowed.

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

diff --git a/tools/qa/cppunit/test_time.cxx b/tools/qa/cppunit/test_time.cxx
index 0de7190bf354..39c8476bce75 100644
--- a/tools/qa/cppunit/test_time.cxx
+++ b/tools/qa/cppunit/test_time.cxx
@@ -96,24 +96,42 @@ void TimeTest::testClockValues()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(0), nHour);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
-// Last digit may differ.
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.999, 
fFractionOfSecond, 1.1e-3);
+// Expect this to be a truncated 0.99
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.999, 
fFractionOfSecond, 0.0);
 
 fTime = 0.524268391203704;
 Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 3);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(12), nHour);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(34), nMinute);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(56), nSecond);
-// Last digit may differ.
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.789, 
fFractionOfSecond, 1.1e-3);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.789, 
fFractionOfSecond, 0.0);
 
 fTime = -0.01;
-Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 9);
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 13);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(23), nHour);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(59), nMinute);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(59), nSecond);
 // Expect this to be exact within floating point accuracy.
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.91359, 
fFractionOfSecond, 1e-15);
+// This is a hairy rounding condition, if it yields problems on any
+// platform feel free to disable the test for that platform.
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.91359, 
fFractionOfSecond,
+ 1e-14);
+
+fTime = -0.01;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 4);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(23), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(59), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(59), nSecond);
+// Expect this to be rounded.
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.9136, 
fFractionOfSecond, 0.0);
+
+fTime = -0.001;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 4);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(23), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(59), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(59), nSecond);
+// Expect this to be a truncated 0.99
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0., 
fFractionOfSecond, 0.0);
 
 fTime = -1e-24; // value insignificant for time
 Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index f1dea02a6afb..7f058cf2ac6d 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -313,10 +313,18 @@ void tools::Time::GetClock( double fTimeInDays,
 nSecond = fSeconds;
 fSeconds -= nSecond;
 
-// Do not round the fraction, otherwise .999 would end up as .00 again.
+assert(fSeconds < 1.0); // or back to the drawing board..
+
 if (nFractionDecimals > 0)
-fFractionOfSecond = rtl::math::pow10Exp( std::trunc(
-rtl::math::pow10Exp( fSeconds, nFractionDecimals)), 
-nFractionDecimals);
+{
+// Do not simply round the fraction, otherwise .999 would end up as .00
+// again. Truncate instead if rounding would round up into an integer
+// value.
+fFractionOfSecond = rtl::math::round( fSeconds, nFractionDecimals);
+if (fFractionOfSecond >= 1.0)
+fFractionOfSecond = rtl::math::pow10Exp( std::trunc(
+rtl::math::pow10Exp( fSeconds, nFractionDecimals)), 
-nFractionD

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

[Libreoffice Gerrit user]

 filter/source/svg/presentation_engine.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff1dd003b7094594d0b8d799d56546005e9094f2
Author: Andrea Gelmini 
AuthorDate: Wed Aug 15 14:38:46 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 17:13:36 2018 +0200

Fix typo

Change-Id: Ice092364268cdae09ad5ac31a922bbde049cfd8f
Reviewed-on: https://gerrit.libreoffice.org/59105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index 61e0d5fd7277..7c6c190f9347 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -7321,7 +7321,7 @@ BaseNode.prototype.registerDeactivatingListener = 
function( aNotifiee )
 
 if( !aNotifiee )
 {
-log( 'BaseNode.registerDeactivatingListener(): invalid notifee' );
+log( 'BaseNode.registerDeactivatingListener(): invalid notifiee' );
 return false;
 }
 this.aDeactivatingListenerArray.push( aNotifiee );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/LibreOfficeKit include/sfx2 include/svx include/vcl instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo jurt/com offapi/

[Libreoffice Gerrit user]

 include/LibreOfficeKit/LibreOfficeKitEnums.h|2 +-
 include/sfx2/shell.hxx  |2 +-
 include/svx/svdedtv.hxx |2 +-
 include/vcl/task.hxx|2 +-
 instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt  |2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt   |2 +-
 jurt/com/sun/star/comp/connections/PipedConnection.java |2 +-
 offapi/com/sun/star/chart2/XTransformation.idl  |2 +-
 offapi/com/sun/star/form/FormComponentType.idl  |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit dd6c80e4336d4c30e733f126f968b8fb7152851c
Author: Andrea Gelmini 
AuthorDate: Wed Aug 15 14:18:38 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 17:12:35 2018 +0200

Fix typo: s/an other/another/g

Change-Id: Ifd83affcb16209f4134c725640fbd95077c8ab0f
Reviewed-on: https://gerrit.libreoffice.org/59099
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 74d49fa15824..c3ccc6aa0e10 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -349,7 +349,7 @@ typedef enum
 
 /**
  * The size and/or the position of the view cursor changed. A view cursor
- * is a cursor of an other view, the current view can't change it.
+ * is a cursor of another view, the current view can't change it.
  *
  * The payload format:
  *
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index d2d72093338a..0887c4f3dfe9 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -97,7 +97,7 @@ enum class SfxShellFeature
 FormTBMoreControls  = 0x0800,
 FormTBDesign= 0x1000,
 FormShowDataNavigator   = 0x2000,
-// masks to make sure modules don't use flags from an other
+// masks to make sure modules don't use flags from another
 SwMask  = 0x0001,
 BasicMask   = 0x0004,
 FormMask= 0x3ff8
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 27eb85e8c607..4e7f7e63eb56 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -194,7 +194,7 @@ public:
 void DeleteLayer(const OUString& rName);
 
 // Marked objects which are outside a page
-// are assigned to an other page; at the moment without undo!!!
+// are assigned to another page; at the moment without undo!!!
 void ForceMarkedObjToAnotherPage();
 void ForceMarkedToAnotherPage()   { ForceMarkedObjToAnotherPage(); }
 
diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx
index 2711d4343932..7c450099c830 100644
--- a/include/vcl/task.hxx
+++ b/include/vcl/task.hxx
@@ -61,7 +61,7 @@ protected:
  *
  * Simply return Scheduler::ImmediateTimeoutMs if you're ready, like an
  * Idle. If you have to return Scheduler::InfiniteTimeoutMs, you probably
- * need an other mechanism to wake up the Scheduler or rely on other
+ * need another mechanism to wake up the Scheduler or rely on other
  * Tasks to be scheduled, or simply use a polling Timer.
  *
  * @param nMinPeriod the currently expected sleep time
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
index 789a6d5d979b..499c013e343d 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -88,7 +88,7 @@ Condition Feature_N   Feature 
1   Identifier  Reference to a Feature entry in Fea
 Condition  Level   N   0   32767   
New selection Level to set in Feature table if Condition evaluates to TRUE.
 ControlAttributes  Y   0   2147483647  
A 32-bit word that specifies the attribute flags to be applied 
to this control.
 ControlControl N   Identifier  
Name of the control. This name must be unique within a dialog, but can 
repeat on different dialogs. 
-ControlControl_NextY   Control 2   
Identifier  The name of an other control on the same dialog. This 
link defines the tab order of the controls. The links have to form one or more 
cycles!
+ControlControl_NextY   Control 2   
Identifier  The name of another control on the same dialog. This 
link defines the

[Libreoffice-commits] core.git: basic/source odk/examples package/qa qadevOOo/tests UnoControls/source

[Libreoffice Gerrit user]

 UnoControls/source/base/basecontrol.cxx |2 +-
 basic/source/classes/sbxmod.cxx |4 ++--
 odk/examples/java/Storage/Test03.java   |6 +++---
 odk/examples/java/Storage/Test06.java   |4 ++--
 package/qa/ofopxmlstorages/Test03.java  |6 +++---
 package/qa/ofopxmlstorages/Test06.java  |4 ++--
 package/qa/storages/Test03.java |6 +++---
 package/qa/storages/Test06.java |4 ++--
 qadevOOo/tests/java/ifc/container/_XHierarchicalNameAccess.java |4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 718f63002e52ad3d80fae148c28c6994592c1c09
Author: Andrea Gelmini 
AuthorDate: Mon Aug 13 17:11:07 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 17:10:21 2018 +0200

Fix typos

Change-Id: I6ca53ead2b125618d0aceff05d5fdfa374662799
Reviewed-on: https://gerrit.libreoffice.org/58809
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/UnoControls/source/base/basecontrol.cxx 
b/UnoControls/source/base/basecontrol.cxx
index b31dad766a58..1e072f1bb3f7 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -293,7 +293,7 @@ void SAL_CALL BaseControl::createPeer(  const   Reference< 
XToolkit >&  xToo
 m_xMultiplexer->setPeer( m_xPeerWindow );
 }
 
-// create new referenz to xgraphics for painting on a peer
+// create new reference to xgraphics for painting on a peer
 // and add a paint listener
 Reference< XDevice > xDevice( m_xPeerWindow, UNO_QUERY );
 
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c26df9c906ee..fd6713b6eb49 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1920,7 +1920,7 @@ SbMethod::SbMethod( const OUString& r, SbxDataType t, 
SbModule* p )
 nLine2   = 0;
 refStatics   = new SbxArray;
 mCaller  = nullptr;
-// HACK due to 'Referenz could not be saved'
+// HACK due to 'Reference could not be saved'
 SetFlag( SbxFlagBits::NoModify );
 }
 
@@ -1982,7 +1982,7 @@ bool SbMethod::LoadData( SvStream& rStrm, sal_uInt16 nVer 
)
 nStart = nTempStart;
 }
 
-// HACK ue to 'Referenz could not be saved'
+// HACK due to 'Reference could not be saved'
 SetFlag( SbxFlagBits::NoModify );
 
 return true;
diff --git a/odk/examples/java/Storage/Test03.java 
b/odk/examples/java/Storage/Test03.java
index 51be98575b8c..500d46b923b7 100644
--- a/odk/examples/java/Storage/Test03.java
+++ b/odk/examples/java/Storage/Test03.java
@@ -90,10 +90,10 @@ public class Test03 implements StorageTest {
 // check storage hierarchy tree
 
 
-// check that isStorageElement() and isStreamElement reacts to 
nonexisting object correctly
+// check that isStorageElement() and isStreamElement reacts to 
nonexistent object correctly
 try {
 xTempStorage.isStorageElement( "does not exist" );
-m_aTestHelper.Error( "Nonexisting element doesn't detected by 
isStorageElement() call!" );
+m_aTestHelper.Error( "Nonexistent element doesn't detected by 
isStorageElement() call!" );
 return false;
 }
 catch( com.sun.star.container.NoSuchElementException ne )
@@ -107,7 +107,7 @@ public class Test03 implements StorageTest {
 
 try {
 xTempStorage.isStreamElement( "does not exist" );
-m_aTestHelper.Error( "Nonexisting element doesn't detected by 
isStreamElement() call!" );
+m_aTestHelper.Error( "Nonexistent element doesn't detected by 
isStreamElement() call!" );
 return false;
 }
 catch( com.sun.star.container.NoSuchElementException ne )
diff --git a/odk/examples/java/Storage/Test06.java 
b/odk/examples/java/Storage/Test06.java
index 74a6332ea1dc..22ff96a72221 100644
--- a/odk/examples/java/Storage/Test06.java
+++ b/odk/examples/java/Storage/Test06.java
@@ -214,7 +214,7 @@ public class Test06 implements StorageTest {
 try
 {
 xTempStorage.copyElementTo( "Nonexistent element", 
xTargetStorage, "Target" );
-m_aTestHelper.Error( "An exception must be thrown in case of 
copying of nonexisting element!" );
+m_aTestHelper.Error( "An exception must be thrown in case of 
copying of nonexistent element!" );
 return false;
 }
 catch( com.sun.star.container.NoSuchElementException ne )
@@ -229,7 +229,7 @@ public class Test06 implements StorageTest {
 try
 {
 xTempStorage.moveElementTo( "Non

[Libreoffice-commits] core.git: sysui/desktop

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit ce1d0fd8da41798ab91228cd4fd7e0d713b20e0e
Author: Andrea Gelmini 
AuthorDate: Mon Jul 9 10:15:05 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:51:46 2018 +0200

Removed executable permission on simple ASCII files

Change-Id: I3feef220283d57fd07cff836ddd22937b1b8c77f
Reviewed-on: https://gerrit.libreoffice.org/57593
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
old mode 100755
new mode 100644
diff --git a/sysui/desktop/solaris/copyright b/sysui/desktop/solaris/copyright
old mode 100755
new mode 100644
diff --git a/sysui/desktop/solaris/depend b/sysui/desktop/solaris/depend
old mode 100755
new mode 100644
diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo
old mode 100755
new mode 100644
diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit eeb827111c4c523d31b9c204e698dceda3590f61
Author: Andrea Gelmini 
AuthorDate: Wed Aug 22 21:40:34 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:51:09 2018 +0200

Removed execution flag on pptx file

Change-Id: I7beaea418a995670d26f1542ef09416410fdb722
Reviewed-on: https://gerrit.libreoffice.org/59466
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/qa/unit/data/pptx/tdf119118.pptx 
b/sd/qa/unit/data/pptx/tdf119118.pptx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit fc4a26cf1701f7206f5f23ce2b8f59a8e1c1a042
Author: Andrea Gelmini 
AuthorDate: Sun Aug 19 18:47:58 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:50:46 2018 +0200

Removed executable permission on xml file

Change-Id: Iaf8ca3004c209291a42edf4e6eea7c3631847db1
Reviewed-on: https://gerrit.libreoffice.org/59307
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/extras/source/templates/officorr/Modern_business_letter_serif/meta.xml 
b/extras/source/templates/officorr/Modern_business_letter_serif/meta.xml
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit 04ddcfd98a849b30442c72cb64a3e262ccaf347f
Author: Andrea Gelmini 
AuthorDate: Thu Aug 23 22:46:41 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:50:27 2018 +0200

Removed execution flag on xlsx file

Change-Id: Iaf82d475825b4794dadad50093839fad319e3ba5
Reviewed-on: https://gerrit.libreoffice.org/59527
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/qa/extras/data/xlsx/testDataseriesOverlapStackedChart.xlsx 
b/chart2/qa/extras/data/xlsx/testDataseriesOverlapStackedChart.xlsx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/control/imp_listbox.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit b8bf10d8123276cd9b9cb73f4fc595bba8d29c2f
Author: Jan-Marek Glogowski 
AuthorDate: Thu Aug 23 10:12:45 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:46:11 2018 +0200

tdf#119477 fix list box focused text color

This ignores the rollover state for text colors if the list box
has the focus and just uses the highlight text color.

The normal text color is a result from commit 9897fd1c4715 ("Fix
list box focused text color"), which makes the highlighted list
box text "invisible" (black on dark blue) in the "gen" VCL plugin
and on Windows, e.g. when the focus is in the Math symbol list box.

Reviewed-on: https://gerrit.libreoffice.org/59488
Reviewed-on: https://gerrit.libreoffice.org/59549
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 7a14326fea2cc317b8be57d45be7ca57aebd8bdd)
(cherry picked from commit 9897fd1c4715e7dbbe99fae2b82c2eda1d2b6f7e)

Change-Id: I751a811f2e2bbca112b8f9e0de2fffb04c437ba4
Reviewed-on: https://gerrit.libreoffice.org/59564
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index 32a82b1ac2cf..b2e002a05ef5 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2683,18 +2683,16 @@ void ImplWin::ImplDraw(vcl::RenderContext& 
rRenderContext, bool bLayout)
 if (bHasFocus && !ImplGetSVData()->maNWFData.mbDDListBoxNoTextArea)
 {
 if ( !ImplGetSVData()->maNWFData.mbNoFocusRects )
+{
 rRenderContext.SetFillColor( 
rStyleSettings.GetHighlightColor() );
+rRenderContext.SetTextColor( 
rStyleSettings.GetHighlightTextColor() );
+}
 else
 {
 rRenderContext.SetLineColor();
 rRenderContext.SetFillColor();
+rRenderContext.SetTextColor( 
rStyleSettings.GetFieldTextColor() );
 }
-Color aColor;
-if( bNativeOK && (nState & ControlState::ROLLOVER) )
-aColor = rStyleSettings.GetFieldRolloverTextColor();
-else
-aColor = rStyleSettings.GetFieldTextColor();
-rRenderContext.SetTextColor( aColor );
 rRenderContext.DrawRect( maFocusRect );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/vcl sw/inc sw/source vcl/source

[Libreoffice Gerrit user]

 include/vcl/scheduler.hxx   |   12 +++
 sw/inc/IDocumentTimerAccess.hxx |9 +++--
 sw/source/core/doc/DocumentTimerManager.cxx |   45 
 sw/source/core/inc/DocumentTimerManager.hxx |8 ++--
 vcl/source/app/scheduler.cxx|5 +++
 5 files changed, 53 insertions(+), 26 deletions(-)

New commits:
commit 20e46a6ca5b62f7177f799eae9e0f26e659fd03b
Author: Jan-Marek Glogowski 
AuthorDate: Fri Aug 24 08:05:26 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:45:42 2018 +0200

tdf#119458 reorganize sw background Idle handling

This is the squashed version of the following commits:
- ce68889678bc tdf#119458 always start the SwDocIdle
- 107f0e6dba57 tdf#119458 fix sw background Idle state handling
- 771544544ee1 tdf#119458 fix sw background Idle unblocking
- 3bd8316718fd tdf#119458 just wakeup Scheduler on active Idle

While the first commit was really wrong, the third is just an
optimization to prevent unnecessary wakeups and Idle task
interrups from new calls to StartIdling(). The 4th one contains
the reset of the Idle state on run, which was probably the main
origin of the problem and allows to wake up the Scheduler
without moving the Task to the end of the queue.

Starting the SwDocIdle in StartIdeling() just reintroduces the
bug fixed in commit 401cba4c20fb ("tdf#116370 cleanup Writer idle
job handing"), so trading one bug for the other.

For the real solution we have to handle two states:
1. The SwDocIdle being active
2. The SwDocIdle being blocked

For the first state we can just use the active state of the Idle
itself. Since it's not a AutoIdle, it will be turned of, if
invoked. Either some Idle handler will want to be run it again or
some other thread might start it again, if needed.
Since we're now tracking the wanted Idle state via the active task
flag, we can drop the explicit mbStartIdleTimer handling.

As a result of the first change, we can't stop the Idle anymore
when blocking it. But the Idle itself checks its ready state via
IsDocIdle() in its UpdateMinPeriod function, so we have to add
the blocking state to IsDocIdle().

But we can't handle the correct state when blocking via a tasks
mbActive bool, as this also schedules the task and starts the
scheduler timer. So reintroduce a bool for the unblock state.

This should prevent fdo#73165, which I couldn't reproduce, but
just to be sure.

More importantly this patch resets the m_bStartOnUnblock when
the Idle job actually runs. This run should already determinates
if more Idle work needs to be done, and others can still call
BeginIdling() to ensure further processing.

Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/59536
(cherry picked from commit ce68889678bca3b51c258452f7bfdd21982e4a0d)
Reviewed-on: https://gerrit.libreoffice.org/59586
(cherry picked from commit 107f0e6dba57a5b27366a35a5cdb184079546df0)
Reviewed-on: https://gerrit.libreoffice.org/59692
(cherry picked from commit 771544544ee13ec98961f93b5313a7d2e29429cd)
Reviewed-on: https://gerrit.libreoffice.org/59730
(cherry picked from commit 3bd8316718fdfed454c01a9c4ae6af6beb34437d)

Change-Id: I2d4328f31644017b09786ff4cba45cf7643f0a4b
(cherry picked from commit f1fb30cf43eda45137ab96177238a29c3725789d)
Reviewed-on: https://gerrit.libreoffice.org/59757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index ac429ed33b09..6233d134a8ed 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -65,6 +65,18 @@ public:
  */
 static void   ProcessEventsToIdle();
 
+/**
+ * Wakes up the scheduler
+ *
+ * This doesn't handle any events! It just ensures the Scheduler is run as
+ * soon as possible by forcing the Scheduler timer to fire.
+ *
+ * Can be used for complex UpdateMinPeriod function, where the task is
+ * actually active but not ready and we want to skip the Task::Start()
+ * queue append for faster reaction.
+ */
+static void   Wakeup();
+
 /// Control the deterministic mode.  In this mode, two subsequent runs of
 /// LibreOffice fire about the same amount idles.
 static void   SetDeterministicMode(bool bDeterministic);
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index 1ed8679c00ac..f3e2738485af 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
 
 /**
- * Handle the background job of the Writer document.
+ * Handle the background jobs of a Writer document.
  *
  * Initially it'

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Libreoffice Gerrit user]

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

New commits:
commit db55d2a53af04a88ba070e619760f573e89e12fd
Author: Alex McMurchy1917 
AuthorDate: Tue Jun 12 08:09:49 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:44:48 2018 +0200

tdf#109353 - Base: Listbox doesn't show a value.

This is because text in box is same colour as the background.
This is only an issue for Linux/KDE.
This change fixes this issue.

Change-Id: Icb908ace25c69fd2fb51f8f44082ca6b00f55c43
Reviewed-on: https://gerrit.libreoffice.org/55660
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 3f31455fdd10309ab85fc3d324096698d3f38e5b)
Reviewed-on: https://gerrit.libreoffice.org/59563
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index f4100e13089d..32a82b1ac2cf 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2693,7 +2693,7 @@ void ImplWin::ImplDraw(vcl::RenderContext& 
rRenderContext, bool bLayout)
 if( bNativeOK && (nState & ControlState::ROLLOVER) )
 aColor = rStyleSettings.GetFieldRolloverTextColor();
 else
-aColor = rStyleSettings.GetHighlightTextColor();
+aColor = rStyleSettings.GetFieldTextColor();
 rRenderContext.SetTextColor( aColor );
 rRenderContext.DrawRect( maFocusRect );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 7d6a139bbb63a5b3c472b2460d15d6fdb0b7fb80
Author: Arnold Dumas 
AuthorDate: Fri Aug 10 09:30:56 2018 +0200
Commit: Muhammet Kara 
CommitDate: Wed Aug 29 16:41:50 2018 +0200

tdf#117058: Simplify calls to Menu::CheckItem

Change-Id: Ib4cba3af376d8d031d5282a5459eaecc18e3ed9a
Reviewed-on: https://gerrit.libreoffice.org/58811
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 36db2f809efd..cc07c9c37717 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2036,7 +2036,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, 
void)
 }
 
 if (nWidth == mdUserPaintStrokeWidth)
-
pWidthMenu->CheckItem(pWidthMenu->GetItemId(OString::number(nWidth)));
+pWidthMenu->CheckItem(OString::number(nWidth));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/sidebar/PanelTitleBar.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9ee057d06f3d27ce3b4e92b76d070fbe75204a41
Author: Jim Raykowski 
AuthorDate: Mon Aug 27 13:02:22 2018 -0800
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:39:42 2018 +0200

tdf#119527 Fix focus hidden by mouse click panel collapse

Set focus to the clicked panel title

Change-Id: I65993a6a2f8e7a9a2bdaa6cf4527d5b163d81409
Reviewed-on: https://gerrit.libreoffice.org/59694
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index ce5a3683fb88..d20427a2ca6d 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -183,6 +183,7 @@ void PanelTitleBar::MouseButtonUp (const MouseEvent& 
rMouseEvent)
 {
 mpPanel->SetExpanded( ! mpPanel->IsExpanded());
 Invalidate();
+GrabFocus();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 1eeda4a32f33b9f37f093c6e9905c3ce9523b81a
Author: Jim Raykowski 
AuthorDate: Mon Aug 27 14:12:00 2018 -0800
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:40:12 2018 +0200

tdf#119554 Expand collapsed panel when panel content gets focus

Change-Id: I1af7a9e93affc5c6e5e3ba90ba335e59a0900d20
Reviewed-on: https://gerrit.libreoffice.org/59737
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/sidebar/FocusManager.cxx 
b/sfx2/source/sidebar/FocusManager.cxx
index 244291240e7b..6218efd88679 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -265,6 +265,9 @@ void FocusManager::FocusPanel (
 
 void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex)
 {
+if (!maPanels[nPanelIndex]->IsExpanded())
+maPanels[nPanelIndex]->SetExpanded(true);
+
 VclPtr pWindow = 
VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow());
 if (pWindow)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/sfx2/sidebar/FocusManager.hxx  |5 -
 include/sfx2/sidebar/SidebarController.hxx |4 +++-
 include/sfx2/sidebar/TabBar.hxx|1 +
 sfx2/source/sidebar/FocusManager.cxx   |   23 ++-
 sfx2/source/sidebar/SidebarController.cxx  |   24 
 sfx2/source/sidebar/TabBar.cxx |   12 
 6 files changed, 54 insertions(+), 15 deletions(-)

New commits:
commit 2c92b886b7538c4786a4d9a33cbcfe694daf1f62
Author: Jim Raykowski 
AuthorDate: Sun Aug 26 18:01:09 2018 -0800
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:38:28 2018 +0200

tdf#119461 Fix focus hidden on deck collapse

Makes Space key behavior the same as mouse click. Focus remains on the
tab button when the deck collapses.

Makes Enter key never collapses the deck but to open if collapsed and
always place focus on the first panel title.

Change-Id: Id6d7624e88b421dcfc62f3d0e79986f10c76a65d
Reviewed-on: https://gerrit.libreoffice.org/59616
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/sidebar/FocusManager.hxx 
b/include/sfx2/sidebar/FocusManager.hxx
index 84464c4b475f..c089419f05c8 100644
--- a/include/sfx2/sidebar/FocusManager.hxx
+++ b/include/sfx2/sidebar/FocusManager.hxx
@@ -50,7 +50,8 @@ class DeckTitleBar;
 class FocusManager
 {
 public:
-FocusManager(const std::function& rShowPanelFunctor);
+FocusManager(const std::function& rShowPanelFunctor,
+ const std::function 
&rIsDeckOpenFunctor);
 ~FocusManager();
 
 /** Forget all panels and buttons.  Remove all window listeners.
@@ -63,6 +64,7 @@ public:
 */
 void GrabFocus();
 void GrabFocusPanel();
+void GrabFocusButton(const sal_Int32 nIndex);
 
 void SetDeckTitle(DeckTitleBar* pDeckTitleBar);
 void SetPanels(const SharedPanelContainer& rPanels);
@@ -73,6 +75,7 @@ private:
 std::vector > maPanels;
 std::vector > maButtons;
 const std::function maShowPanelFunctor;
+const std::function mbIsDeckOpenFunctor;
 bool mbObservingContentControlFocus;
 VclPtr mpFirstFocusedContentControl;
 VclPtr mpLastFocusedWindow;
diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index 33cdfc395200..8274605ba03f 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -125,7 +125,7 @@ public:
 
 /** Show only the tab bar, not the deck.
 */
-void RequestCloseDeck();
+void RequestCloseDeck(bool bFocusMenuTab = false);
 
 /** Open the deck area and restore the parent window to its old width.
 */
@@ -135,6 +135,8 @@ public:
  */
 bool IsDeckVisible(const OUString& rsDeckId);
 
+bool IsDeckOpen(const sal_Int32 nIndex = -1);
+
 FocusManager& GetFocusManager() { return maFocusManager;}
 
 ResourceManager* GetResourceManager() { return mpResourceManager.get();}
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index e9ce313c6a68..e0f12a5f15ee 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -86,6 +86,7 @@ public:
 void HighlightDeck (const OUString& rsDeckId);
 void RemoveDeckHighlight ();
 OUString const & GetDeckIdForIndex (const sal_Int32 nIndex) const;
+sal_Int32 GetDeckIndexForId (const OUString& rsDeckId);
 void ToggleHideFlag (const sal_Int32 nIndex);
 void RestoreHideFlags();
 
diff --git a/sfx2/source/sidebar/FocusManager.cxx 
b/sfx2/source/sidebar/FocusManager.cxx
index acdb50f7739c..244291240e7b 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -35,11 +35,13 @@ FocusManager::FocusLocation::FocusLocation (const 
PanelComponent eComponent, con
 {
 }
 
-FocusManager::FocusManager(const std::function& 
rShowPanelFunctor)
+FocusManager::FocusManager(const std::function& 
rShowPanelFunctor,
+   const std::function& 
rIsDeckOpenFunctor)
 : mpDeckTitleBar(),
   maPanels(),
   maButtons(),
   maShowPanelFunctor(rShowPanelFunctor),
+  mbIsDeckOpenFunctor(rIsDeckOpenFunctor),
   mbObservingContentControlFocus(false),
   mpFirstFocusedContentControl(nullptr),
   mpLastFocusedWindow(nullptr)
@@ -61,6 +63,11 @@ void FocusManager::GrabFocusPanel()
 FocusPanel(0, false);
 }
 
+void FocusManager::GrabFocusButton(const sal_Int32 nIndex)
+{
+FocusButton(nIndex);
+}
+
 void FocusManager::Clear()
 {
 SetDeckTitle(nullptr);
@@ -275,10 +282,13 @@ void FocusManager::FocusButton (const sal_Int32 
nButtonIndex)
 
 void FocusManager::ClickButton (const sal_Int32 nButtonIndex)
 {
-maButtons[nButtonIndex]->Click();
+if (mbIsDeckOpenFunctor)
+{
+if (!mbIsDeckOpenFunctor(-1) || !mbIsDeckOpenFunctor(nButtonIndex-1))
+maButtons[nButtonIndex]->Click();
+}
 if (nButtonIndex > 0)

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

[Libreoffice Gerrit user]

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

New commits:
commit 17d8f6b0d78c11ac40a335917b3576f13d1e1b9d
Author: Jim Raykowski 
AuthorDate: Tue Aug 7 14:31:16 2018 -0800
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 16:36:57 2018 +0200

tdf#102031 Expand collapsed deck when sidebar docking window gets focus

SidebarDockingWindow::GetFocus hides focus when deck is in collapsed
state so request open deck before setting focus to deck/panel title

Change-Id: I7d7f6d940a3722eb02e6356c069c4d9df9642326
Reviewed-on: https://gerrit.libreoffice.org/58712
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 1c02f63a41e6..fe24d5523ad8 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -74,7 +74,10 @@ void SidebarDockingWindow::DoDispose()
 void SidebarDockingWindow::GetFocus()
 {
 if (mpSidebarController.is())
+{
+mpSidebarController->RequestOpenDeck();
 mpSidebarController->GetFocusManager().GrabFocus();
+}
 else
 SfxDockingWindow::GetFocus();
 }
___
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-cd-3-4' - 8 commits - common/Rectangle.hpp debian/changelog loleaflet/src loolwsd.spec.in wsd/ClientSession.cpp wsd/ClientSe

[Libreoffice Gerrit user]

 common/Rectangle.hpp  |   10 +
 debian/changelog  |6 +++
 loleaflet/src/layer/tile/GridLayer.js |   49 +---
 loolwsd.spec.in   |2 -
 wsd/ClientSession.cpp |   67 ++
 wsd/ClientSession.hpp |   24 +---
 wsd/DocumentBroker.cpp|7 +++
 wsd/TestStubs.cpp |2 -
 wsd/TileCache.cpp |2 -
 9 files changed, 120 insertions(+), 49 deletions(-)

New commits:
commit dad7321da957f3d5099dba56f1d707b0c7f7311b
Author: Andras Timar 
AuthorDate: Tue Aug 28 10:58:05 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 16:14:24 2018 +0200

Bump package version to 3.4.0-2

Change-Id: Ifbe9fb476ebc131f8f7f819939c206527ee1e5e3
(cherry picked from commit 65d15707baf7d9af51459805dd08c2aa340023c5)
Signed-off-by: Andras Timar 

diff --git a/debian/changelog b/debian/changelog
index 38969b61c..2953d0976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.0-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool3
+
+ -- Andras Timar   Thu, 28 Aug 2018 10:50:00 +0200
+
 loolwsd (3.4.0-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool3
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index deafcde4d..0ab7cf170 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
commit 21108d433ec7f6d9278b7c2320268b9e50dd9138
Author: Tamás Zolnai 
AuthorDate: Sun Aug 26 06:11:08 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 16:14:10 2018 +0200

loleaflet: Request invalid tiles too by view change

Change-Id: I43c65ce025d3b18bd664d2ad16107cf828bab300
(cherry picked from commit 9473908d45a884827356b504c5f768e2f29cc46b)
Reviewed-on: https://gerrit.libreoffice.org/59650
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit d331ddee38ff27cfad95ab821786c55fde85e29a)
Signed-off-by: Andras Timar 

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index a337e3835..3bd563639 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -532,7 +532,8 @@ L.GridLayer = L.Layer.extend({
 
key = this._tileCoordsToKey(coords);
var tile = this._tiles[key];
-   if (tile) {
+   var invalid = tile && tile._invalidCount && 
tile._invalidCount > 0;
+   if (tile && tile.loaded && !invalid) {
tile.current = true;
newView = false;
} else {
@@ -866,34 +867,36 @@ L.GridLayer = L.Layer.extend({
key = this._tileCoordsToKey(coords);
 
if (coords.part === this._selectedPart) {
-   var tile = 
this.createTile(this._wrapCoords(coords), L.bind(this._tileReady, this, 
coords));
+   if (!this._tiles[key]) {
+   var tile = 
this.createTile(this._wrapCoords(coords), L.bind(this._tileReady, this, 
coords));
 
-   this._initTile(tile);
+   this._initTile(tile);
 
-   // if createTile is defined with a second 
argument ("done" callback),
-   // we know that tile is async and will be ready 
later; otherwise
-   if (this.createTile.length < 2) {
-   // mark tile as ready, but delay one 
frame for opacity animation to happen
-   setTimeout(L.bind(this._tileReady, 
this, coords, null, tile), 0);
-   }
+   // if createTile is defined with a 
second argument ("done" callback),
+   // we know that tile is async and will 
be ready later; otherwise
+   if (this.createTile.length < 2) {
+   // mark tile as ready, but 
delay one frame for opacity animation to happen
+   
setTimeout(L.bind(this._tileReady, this, coords, null, tile), 0);
+   }
 
-   // we prefer top/left over translate3d so that 
we don't create a HW-accelerated layer from each tile
-

[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.4.0-2'

[Libreoffice Gerrit user]

Tag 'cd-3.4.0-2' created by Andras Timar  at 
2018-08-29 14:14 +

cd-3.4.0-2

Changes since cd-3.4.0-1-11:
---
 0 files changed
---
___
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-cd-3-4' - loleaflet/po

[Libreoffice Gerrit user]

 loleaflet/po/ui-de.po|2 +-
 loleaflet/po/ui-es.po|2 +-
 loleaflet/po/ui-fr.po|2 +-
 loleaflet/po/ui-it.po|2 +-
 loleaflet/po/ui-ja.po|2 +-
 loleaflet/po/ui-ko.po|2 +-
 loleaflet/po/ui-pt.po|2 +-
 loleaflet/po/ui-pt_BR.po |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 9456c56895abd8ca576614f9f5d45ef79b9db503
Author: Andras Timar 
AuthorDate: Wed Aug 29 10:45:51 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 16:10:05 2018 +0200

loleaflet: l10n of IE11 websocket limit warning

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

diff --git a/loleaflet/po/ui-de.po b/loleaflet/po/ui-de.po
index ea17f82ef..692649656 100644
--- a/loleaflet/po/ui-de.po
+++ b/loleaflet/po/ui-de.po
@@ -697,7 +697,7 @@ msgstr "Diese Version von %productName wird bereitgestellt 
von"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 hat die maximale Anzahl an Verbindungen erreicht. Falls benötigt, 
lesen Sie in diesem Dokument nach, wie Sie diese Grenze erhöhen können: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-es.po b/loleaflet/po/ui-es.po
index 1488b1321..e32672d94 100644
--- a/loleaflet/po/ui-es.po
+++ b/loleaflet/po/ui-es.po
@@ -697,7 +697,7 @@ msgstr "Esta versión de %productName funciona con"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 ha alcanzado su número máximo de conexiones. Consulte ese 
documento si necesita aumentar este límite: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-fr.po b/loleaflet/po/ui-fr.po
index 717bb292d..ce00eaed0 100644
--- a/loleaflet/po/ui-fr.po
+++ b/loleaflet/po/ui-fr.po
@@ -697,7 +697,7 @@ msgstr "Cette version de %productName est alimentée par"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 a atteint son nombre maximum de connexions. Veuillez consulter ce 
document (en anglais) pour augmenter cette limite si nécessaire␠: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-it.po b/loleaflet/po/ui-it.po
index e76e01696..09dee66a1 100644
--- a/loleaflet/po/ui-it.po
+++ b/loleaflet/po/ui-it.po
@@ -697,7 +697,7 @@ msgstr "Questa versione di %productName è alimentata da"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 ha raggiunto il limite massimo delle connessioni. Consulta questo 
documento per aumentare il limite, se lo ritieni necessario: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-ja.po b/loleaflet/po/ui-ja.po
index 770d9904d..c36cfc443 100644
--- a/loleaflet/po/ui-ja.po
+++ b/loleaflet/po/ui-ja.po
@@ -697,7 +697,7 @@ msgstr "このバージョンの %productName は以下で動作しています"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general

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

[Libreoffice Gerrit user]

 loleaflet/po/ui-de.po|2 +-
 loleaflet/po/ui-es.po|2 +-
 loleaflet/po/ui-fr.po|2 +-
 loleaflet/po/ui-it.po|2 +-
 loleaflet/po/ui-ja.po|2 +-
 loleaflet/po/ui-ko.po|2 +-
 loleaflet/po/ui-pt.po|2 +-
 loleaflet/po/ui-pt_BR.po |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 703da16243733365cd0e435e59e8494e795e1fca
Author: Andras Timar 
AuthorDate: Wed Aug 29 10:45:51 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 16:09:55 2018 +0200

loleaflet: l10n of IE11 websocket limit warning

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

diff --git a/loleaflet/po/ui-de.po b/loleaflet/po/ui-de.po
index ea17f82ef..692649656 100644
--- a/loleaflet/po/ui-de.po
+++ b/loleaflet/po/ui-de.po
@@ -697,7 +697,7 @@ msgstr "Diese Version von %productName wird bereitgestellt 
von"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 hat die maximale Anzahl an Verbindungen erreicht. Falls benötigt, 
lesen Sie in diesem Dokument nach, wie Sie diese Grenze erhöhen können: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-es.po b/loleaflet/po/ui-es.po
index 1488b1321..e32672d94 100644
--- a/loleaflet/po/ui-es.po
+++ b/loleaflet/po/ui-es.po
@@ -697,7 +697,7 @@ msgstr "Esta versión de %productName funciona con"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 ha alcanzado su número máximo de conexiones. Consulte ese 
documento si necesita aumentar este límite: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-fr.po b/loleaflet/po/ui-fr.po
index 717bb292d..ce00eaed0 100644
--- a/loleaflet/po/ui-fr.po
+++ b/loleaflet/po/ui-fr.po
@@ -697,7 +697,7 @@ msgstr "Cette version de %productName est alimentée par"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 a atteint son nombre maximum de connexions. Veuillez consulter ce 
document (en anglais) pour augmenter cette limite si nécessaire␠: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-it.po b/loleaflet/po/ui-it.po
index e76e01696..09dee66a1 100644
--- a/loleaflet/po/ui-it.po
+++ b/loleaflet/po/ui-it.po
@@ -697,7 +697,7 @@ msgstr "Questa versione di %productName è alimentata da"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
-msgstr ""
+msgstr "IE11 ha raggiunto il limite massimo delle connessioni. Consulta questo 
documento per aumentare il limite, se lo ritieni necessario: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections"
 
 #: src/core/Socket.js:49
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
diff --git a/loleaflet/po/ui-ja.po b/loleaflet/po/ui-ja.po
index 770d9904d..c36cfc443 100644
--- a/loleaflet/po/ui-ja.po
+++ b/loleaflet/po/ui-ja.po
@@ -697,7 +697,7 @@ msgstr "このバージョンの %productName は以下で動作しています"
 
 #: src/core/Socket.js:47
 msgid "IE11 has reached its maximum number of connections. Please see this 
document to increase this limit if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/Library_mysql.mk connectivity/Module_connectivity.mk connectivity/source Repository.mk

[Libreoffice Gerrit user]

 Repository.mk  |1 +
 connectivity/Library_mysql.mk  |   20 
 connectivity/Module_connectivity.mk|1 +
 connectivity/source/drivers/mysqlc/mysql_dummy.cxx |   20 
 4 files changed, 42 insertions(+)

New commits:
commit da2c4acc4e2e51252d2ef1751bc77966be32ec80
Author: Andras Timar 
AuthorDate: Wed Aug 29 16:03:30 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 16:03:30 2018 +0200

Add source for zero stub mysqllo.dll (MSP needs it)

Change-Id: Ia36bbd0bd7c1f650366215bfc70b0ced5b96e70a

diff --git a/Repository.mk b/Repository.mk
index 5cfe4a115f91..6c617dd2843b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -390,6 +390,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
+   $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
odbc \
odfflatxml \
offacc \
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
new file mode 100644
index ..f82593c23d2e
--- /dev/null
+++ b/connectivity/Library_mysql.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,mysql))
+
+$(eval $(call gb_Library_use_libraries,mysql,\
+   sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mysql,\
+   connectivity/source/drivers/mysqlc/mysql_dummy \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk 
b/connectivity/Module_connectivity.mk
index 0fc587daa340..250172e936a1 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -83,6 +83,7 @@ ifeq ($(ENABLE_MARIADBC),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mysql \
Library_mysqlc \
+   Library_mysql \
 ))
 endif
 
diff --git a/connectivity/source/drivers/mysqlc/mysql_dummy.cxx 
b/connectivity/source/drivers/mysqlc/mysql_dummy.cxx
new file mode 100644
index ..05d4cc35b69e
--- /dev/null
+++ b/connectivity/source/drivers/mysqlc/mysql_dummy.cxx
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+using namespace com::sun::star;
+
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+const sal_Char* /*pImplementationName*/, void* /*pServiceManager*/, void* 
/*pRegistryKey*/)
+{
+return nullptr;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/attrdlg/scdlgfact.cxx |   38 +-
 sc/source/ui/attrdlg/scdlgfact.hxx |   76 ++---
 2 files changed, 57 insertions(+), 57 deletions(-)

New commits:
commit ca2b546a8a4c80f4f589ef529b3cb98d0c3bf048
Author: Noel Grandin 
AuthorDate: Wed Aug 29 11:54:46 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 15:26:36 2018 +0200

loplugin:useuniqueptr in the sc dialog classes

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

diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 9f40c38f2b7e..159a04fa21c9 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -746,12 +746,12 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScAutoFormat
 VclPtr  
ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(weld::Window* pParent,
 bool bCol, 
bool bRow)
 {
-return VclPtr::Create(new 
ScColRowLabelDlg(pParent, bCol, bRow));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 bCol, bRow));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScSortWarningDlg(weld::Window* pParent, 
const OUString& rExtendText, const OUString& rCurrentText)
 {
-return VclPtr::Create(new 
ScSortWarningDlg(pParent, rExtendText, rCurrentText));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rExtendText, rCurrentText));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, 
ScDocument* pDoc, const ScConditionalFormatList* pFormatList )
@@ -762,25 +762,25 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScCon
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(weld::Window* 
pParent)
 {
-return VclPtr::Create(new 
ScDataPilotDatabaseDlg(pParent));
+return 
VclPtr::Create(o3tl::make_unique(pParent));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg(
 weld::Window* pParent, bool bEnableExternal)
 {
-return VclPtr::Create(new 
ScDataPilotSourceTypeDlg(pParent, bEnableExternal));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 bEnableExternal));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg(weld::Window* pParent,
 const 
std::vector& rServices)
 {
-return VclPtr::Create(new 
ScDataPilotServiceDlg(pParent, rServices));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rServices));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(weld::Window* pParent,
 bool bDisallowCellMove)
 {
-return VclPtr::Create(new 
ScDeleteCellDlg(pParent, bDisallowCellMove));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 bDisallowCellMove));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDataFormDlg(vcl::Window* pParent,
@@ -792,7 +792,7 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDataFormDlg(
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(weld::Window* pParent)
 {
-return VclPtr::Create(new 
ScDeleteContentsDlg(pParent));
+return 
VclPtr::Create(o3tl::make_unique(pParent));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg(weld::Window*   pParent,
@@ -805,41 +805,41 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeries
 double  
fMax,
 sal_uInt16  
nPossDir)
 {
-return VclPtr::Create(new 
ScFillSeriesDlg(pParent, rDocument,eFillDir, eFillCmd,eFillDateCmd, 
aStartStr,fStep,fMax,nPossDir));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rDocument,eFillDir, eFillCmd,eFillDateCmd, aStartStr,fStep,fMax,nPossDir));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(weld::Window* pParent, 
bool bUnGroup)
 {
-return VclPtr::Create(new ScGroupDlg(pParent, 
bUnGroup, true/*bRows*/));
+return 
VclPtr::Create(o3tl::make_unique(pParent, 
bUnGroup, true/*bRows*/));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertCellDlg(weld::Window* pParent,
 bool 
bDisallowCellMove)
 {
-return VclPtr::Create(new 
ScInsertCellDlg(pParent, bDisallowCellMove));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 bDisallowCellMove));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg(weld::Window* pParent,

 const OUString* pStrTitle)
 {
-return VclPtr::Create(new 
ScInsertContentsDlg(pParent, pStrTitle));
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 pStrTitle));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(weld::Window* pParent, 
ScViewData& rViewData,
 SCTAB nTa

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

[Libreoffice Gerrit user]

 configure.ac |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bd26eb29d7d2bc0f3a990bfcd3f2c82148ee913d
Author: Caolán McNamara 
AuthorDate: Wed Aug 29 11:18:05 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 15:10:52 2018 +0200

drop gpgme for oss-fuzz

Change-Id: I0ed32f520cf5592ddaf95a849aed16a125b52656
Reviewed-on: https://gerrit.libreoffice.org/59761
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 2a60d92430e8..3be9d4efcc43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10423,6 +10423,9 @@ if test "$build_for_ios" = "YES"; then
 elif test "$enable_mpl_subset" = "yes"; then
 AC_MSG_CHECKING([whether gpgmepp should be disabled due to building just 
MPL])
 AC_MSG_RESULT([yes])
+elif test "$enable_fuzzers" = "yes"; then
+AC_MSG_CHECKING([whether gpgmepp should be disabled due to oss-fuzz])
+AC_MSG_RESULT([yes])
 elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
 dnl ===
 dnl Check for system gpgme
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/o3tl

[Libreoffice Gerrit user]

 include/o3tl/safeint.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ab68b9fb02797f9b5242ae0e7cc406a5a1b1adc
Author: Stephan Bergmann 
AuthorDate: Wed Aug 29 13:49:03 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 29 15:10:16 2018 +0200

32-bit Clang trunk (towards Clang 9) still doesn't have __mulodi4

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

diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index fa08b6dfc899..6f879965840c 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -112,8 +112,8 @@ template inline bool checked_sub(T a, T b, T& 
result)
 return !msl::utilities::SafeSubtract(a, b, result);
 }
 
-#elif (defined __GNUC__ && __GNUC__ >= 5) || 
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined 
__clang__) && !(defined(__clang__) && defined(__i386__) && __clang_major__ == 
4))
-// 32-bit clang 4.0.1 fails with undefined reference to `__mulodi4'
+#elif (defined __GNUC__ && __GNUC__ >= 5) || 
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined 
__clang__) && !(defined(__clang__) && defined(__i386__)))
+// 32-bit clang fails with undefined reference to `__mulodi4'
 
 template inline bool checked_multiply(T a, T b, T& result)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |   32 
++
 include/sal/log-areas.dox  |1 
 2 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 98a03d8ff4b3ce665a5e851fec4f4ace7b268f6a
Author: Tamas Bunth 
AuthorDate: Wed Aug 29 10:49:52 2018 +0200
Commit: Tamás Bunth 
CommitDate: Wed Aug 29 14:53:37 2018 +0200

mysqlc: Add library to log areas and put some

warnings into databasemetadata

Change-Id: I4c2841e9174e738fff6b8627f8860588c7838c49
Reviewed-on: https://gerrit.libreoffice.org/59755
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 1fe3f3976ae5..4319405ad9eb 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include "mysqlc_general.hxx"
 #include "mysqlc_statement.hxx"
@@ -101,6 +102,7 @@ sal_Int32 SAL_CALL 
ODatabaseMetaData::getMaxCursorNameLength() { return 64; }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections()
 {
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 // TODO
 // SELECT @@max_connections
 return 100;
@@ -110,6 +112,7 @@ sal_Int32 SAL_CALL 
ODatabaseMetaData::getMaxColumnsInTable() { return 512; }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength()
 {
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 // TODO
 // "SHOW VARIABLES LIKE 'max_allowed_packet'"
 return 32767;
@@ -123,18 +126,21 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::doesMaxRowSizeIncludeBlobs() { return true;
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers()
 {
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 // TODO
 return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers()
 {
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 //TODO;
 return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
 {
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 // TODO
 return false;
 }
@@ -142,18 +148,21 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers()
 {
 // TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers()
 {
 // TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers()
 {
 // TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 return false;
 }
 
@@ -262,6 +271,7 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsTableCorrelationNames() { return tr
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /*fromType*/, 
sal_Int32 /*toType*/)
 {
 // TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 return false;
 }
 
@@ -291,17 +301,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll()
 return m_rConnection.getMysqlVersion() >= 4;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers()
-{
-// TODO
-return false;
-}
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers() { return 
false; }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers()
-{
-// TODO
-return false;
-}
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers() { 
return false; }
 
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd() { return false; }
 
@@ -363,6 +365,7 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getURL()
 rtl::OUString SAL_CALL ODatabaseMetaData::getUserName()
 {
 // TODO execute "SELECT USER()"
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 return rtl::OUString();
 }
 
@@ -391,6 +394,7 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { 
return rtl::OUString
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
 {
 // TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 return MARIADBC_VERSION_MAJOR;
 }
 
@@ -403,6 +407,7 @@ sal_Int32 SAL_CALL 
ODatabaseMetaData::getDefaultTransactionIsolation()
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
 {
 // TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 return MARIADBC_VERSION_MINOR;
 }
 
@@ -859,6 +864,7 @@ Reference
  UNO_QUERY);
 std::vector> rRows;
 // TODO IMPL
+SAL_WARN("connectivity.mysqlc", "method not implemented");
 lcl_setRows_throw(xResultSet, 7, rRows);
 return xResultSet;
 }
@@ -883,6 +889,7 @@ Re

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

[Libreoffice Gerrit user]

 svx/source/dialog/dlgctrl.cxx |   22 +++---
 1 file changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 70492ce8b0fd4e03b0beff9b72f00a718394937c
Author: Caolán McNamara 
AuthorDate: Wed Aug 29 11:45:49 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 14:31:38 2018 +0200

match preview buffer device mapmode and pixel size

Change-Id: Ie5ac758b788357e1d54ea3dc5abd233ff9e4abf0
Reviewed-on: https://gerrit.libreoffice.org/59762
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index dce8c6d4b4b0..aee18ab17494 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -2213,13 +2213,8 @@ void PreviewBase::LocalPrePaint(vcl::RenderContext const 
& rRenderContext)
 {
 // init BufferDevice
 if (mpBufferDevice->GetOutputSizePixel() != GetOutputSizePixel())
-{
-mpBufferDevice->SetDrawMode(rRenderContext.GetDrawMode());
-mpBufferDevice->SetSettings(rRenderContext.GetSettings());
-mpBufferDevice->SetAntialiasing(rRenderContext.GetAntialiasing());
 mpBufferDevice->SetOutputSizePixel(GetOutputSizePixel());
-mpBufferDevice->SetMapMode(rRenderContext.GetMapMode());
-}
+mpBufferDevice->SetAntialiasing(rRenderContext.GetAntialiasing());
 
 const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
 
@@ -2275,9 +2270,7 @@ XRectPreview::XRectPreview()
 // in e.g. page dialog
 tools::Rectangle XRectPreview::GetPreviewSize() const
 {
-tools::Rectangle aObjectSize(Point(), GetOutputSizePixel());
-aObjectSize.AdjustRight(1);
-aObjectSize.AdjustBottom(1);
+tools::Rectangle aObjectSize(Point(), 
getBufferDevice().PixelToLogic(GetOutputSizePixel()));
 return aObjectSize;
 }
 
@@ -2287,9 +2280,7 @@ void XRectPreview::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 InitSettings();
 
 // create RectangleObject
-mpRectangleObject = new SdrRectObj(
-getModel(),
-GetPreviewSize());
+mpRectangleObject = new SdrRectObj(getModel(), GetPreviewSize());
 }
 
 void XRectPreview::Resize()
@@ -2297,9 +2288,7 @@ void XRectPreview::Resize()
 SdrObject *pOrigObject = mpRectangleObject;
 if (pOrigObject)
 {
-mpRectangleObject = new SdrRectObj(
-getModel(),
-GetPreviewSize());
+mpRectangleObject = new SdrRectObj(getModel(), GetPreviewSize());
 SetAttributes(pOrigObject->GetMergedItemSet());
 SdrObject::Free(pOrigObject);
 }
@@ -2319,6 +2308,8 @@ void XRectPreview::SetAttributes(const SfxItemSet& 
rItemSet)
 
 void XRectPreview::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&)
 {
+rRenderContext.Push(PushFlags::MAPMODE);
+rRenderContext.SetMapMode(MapMode(MapUnit::Map100thMM));
 LocalPrePaint(rRenderContext);
 
 sdr::contact::SdrObjectVector aObjectVector;
@@ -2331,6 +2322,7 @@ void XRectPreview::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rectan
 aPainter.ProcessDisplay(aDisplayInfo);
 
 LocalPostPaint(rRenderContext);
+rRenderContext.Pop();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 desktop/source/app/cmdlinehelp.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1697000180c0674413f1df000ce3348eb4e9691f
Author: Thorsten Behrens 
AuthorDate: Tue Aug 28 17:44:06 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 29 14:02:28 2018 +0200

desktop: improve help blurb for various cases

- tdf#109202 fix was missing --convert-images-to example
- its not the mimetype, but the filter name that's needed
- also add backslash line continuation where example cmd line
  overflows

Change-Id: I80a461eb4a6ae5c9268bc0f888abd43a179c7a68
Reviewed-on: https://gerrit.libreoffice.org/59722
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index 10c469902b34..b7d40c31577e 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -144,12 +144,12 @@ namespace desktop
 "   of each immediately. Files are closed after 
the showing.\n"
 "   Files other than Impress documents are opened 
in\n"
 "   default mode , regardless of previous mode.\n"
-"   --convert-to OutputFileExtension[:OutputFilterName] \n"
+"   --convert-to OutputFileExtension[:OutputFilterName] \\\n"
 " [--outdir output_dir] [--convert-images-to]\n"
 "   Batch convert files (implies --headless). If 
--outdir\n"
 "   isn't specified, then current working 
directory is used\n"
 "   as output_dir. If --convert-images-to is 
given, its\n"
-"   parameter is taken as the target MIME format 
for *all*\n"
+"   parameter is taken as the target filter format 
for *all*\n"
 "   images written to the output format. If 
--convert-to is\n"
 "   used more than once, the last value of 
OutputFileExtension\n"
 "   [:OutputFilterName] is effective. If --outdir 
is used more\n"
@@ -157,7 +157,8 @@ namespace desktop
 "   --convert-to pdf *.odt\n"
 "   --convert-to epub *.doc\n"
 "   --convert-to pdf:writer_pdf_Export --outdir 
/home/user *.doc\n"
-"   --convert-to \"html:XHTML Writer File:UTF8\" 
*.doc\n"
+"   --convert-to \"html:XHTML Writer File:UTF8\" \\\n"
+"--convert-images-to \"jpg\" *.doc\n"
 "   --convert-to \"txt:Text (encoded):UTF8\" *.doc\n"
 "   --print-to-file [--printer-name printer_name] [--outdir 
output_dir]\n"
 "   Batch print files to file. If --outdir is not 
specified,\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - include/xmloff sw/qa xmloff/source

[Libreoffice Gerrit user]

 include/xmloff/txtimp.hxx|6 ++--
 sw/qa/extras/odfexport/data/tdf101856_overlapped.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx |   24 +++
 xmloff/source/text/XMLTextMarkImportContext.cxx  |   10 +++
 xmloff/source/text/txtimp.cxx|   19 +++
 5 files changed, 41 insertions(+), 18 deletions(-)

New commits:
commit 92e91039d004c2214b844c0256caf4271b8d28d2
Author: Serge Krot 
AuthorDate: Tue Aug 28 14:32:14 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 29 14:00:43 2018 +0200

tdf#101856 Handle properties of nested bookmarks

Change-Id: I1a92d2001e58751c5bbe41f6480f4c46dcc8c9e7
Reviewed-on: https://gerrit.libreoffice.org/59704
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index ab2aef9816d5..7366857af514 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -722,9 +722,9 @@ public:
 void AddCrossRefHeadingMapping(OUString const& rFrom, OUString const& rTo);
 void MapCrossRefHeadingFieldsHorribly();
 
-void setBookmarkAttributes(bool hidden, OUString const& condition);
-bool getBookmarkHidden();
-const OUString& getBookmarkCondition();
+void setBookmarkAttributes(OUString const& bookmark, bool hidden, OUString 
const& condition);
+bool getBookmarkHidden(OUString const& bookmark) const;
+const OUString& getBookmarkCondition(OUString const& bookmark) const;
 
 };
 
diff --git a/sw/qa/extras/odfexport/data/tdf101856_overlapped.odt 
b/sw/qa/extras/odfexport/data/tdf101856_overlapped.odt
new file mode 100644
index ..c05df538da52
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/tdf101856_overlapped.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index e49c359eeb2a..fbb9df3a9f9d 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -967,6 +967,30 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype, 
"image-mimetype.odt")
 #endif
 
 // MAILMERGE Add conditional to expand / collapse bookmarks
+DECLARE_ODFEXPORT_TEST(tdf101856_overlapped, "tdf101856_overlapped.odt")
+{
+// get bookmark interface
+uno::Reference xBookmarksSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+uno::Reference 
xBookmarksByName(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+
+// check: we have 2 bookmarks
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
xBookmarksByIdx->getCount());
+CPPUNIT_ASSERT(xBookmarksByName->hasByName("BookmarkNonHidden"));
+CPPUNIT_ASSERT(xBookmarksByName->hasByName("BookmarkHidden"));
+
+// 
+uno::Reference 
xBookmark1(xBookmarksByName->getByName("BookmarkNonHidden"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xBookmark1, 
UNO_NAME_BOOKMARK_CONDITION));
+CPPUNIT_ASSERT_EQUAL(false, getProperty(xBookmark1, 
UNO_NAME_BOOKMARK_HIDDEN));
+
+// 
+uno::Reference 
xBookmark2(xBookmarksByName->getByName("BookmarkHidden"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xBookmark2, 
UNO_NAME_BOOKMARK_CONDITION));
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xBookmark2, 
UNO_NAME_BOOKMARK_HIDDEN));
+}
+
+// MAILMERGE Add conditional to expand / collapse bookmarks
 DECLARE_ODFEXPORT_TEST(tdf101856, "tdf101856.odt")
 {
 // get bookmark interface
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 5e30b56b65cc..25853d68beb8 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -176,9 +176,9 @@ void XMLTextMarkImportContext::StartElement(
 
 if (IsXMLToken(GetLocalName(), XML_BOOKMARK_START))
 {
-OUString sHidden = xAttrList->getValueByName("loext:hidden");
-OUString sCondition = xAttrList->getValueByName("loext:condition");
-m_rHelper.setBookmarkAttributes(sHidden == "true", sCondition);
+const OUString sHidden= xAttrList->getValueByName("loext:hidden");
+const OUString sCondition = 
xAttrList->getValueByName("loext:condition");
+m_rHelper.setBookmarkAttributes(m_sBookmarkName, sHidden == "true", 
sCondition);
 }
 }
 
@@ -363,8 +363,8 @@ void XMLTextMarkImportContext::EndElement()
 const Reference 
xPropertySet(xContent, UNO_QUERY);
 if (xPropertySet.is())
 {
-
xPropertySet->setPropertyValue("BookmarkHidden",
uno::Any(m_rHelper.getBookmarkHidden()));
-
xPropertySet->setPropertyValue("BookmarkCondition", 
uno::Any(m_rHelper.getBookmarkCondition()));
+
xPropertySet->setProperty

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

[Libreoffice Gerrit user]

 sc/source/filter/excel/xestyle.cxx |   46 +
 sc/source/filter/inc/xestyle.hxx   |5 ++--
 2 files changed, 25 insertions(+), 26 deletions(-)

New commits:
commit b9d83751d236552e474151f2eb4196d33cebe9e6
Author: Noel Grandin 
AuthorDate: Wed Aug 29 11:44:04 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 13:08:40 2018 +0200

loplugin:useuniqueptr in XclExpDxf

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

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index 04884494f467..d1699d498fe3 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3040,46 +3040,43 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
 
 SfxItemSet& rSet = pStyle->GetItemSet();
 
-XclExpCellBorder* pBorder = new XclExpCellBorder;
+std::unique_ptr pBorder(new 
XclExpCellBorder);
 if (!pBorder->FillFromItemSet( rSet, GetPalette(), 
GetBiff()) )
 {
-delete pBorder;
-pBorder = nullptr;
+pBorder.reset();
 }
 
-XclExpCellAlign* pAlign = new XclExpCellAlign;
+std::unique_ptr pAlign(new 
XclExpCellAlign);
 if (!pAlign->FillFromItemSet( rSet, false, GetBiff()))
 {
-delete pAlign;
-pAlign = nullptr;
+pAlign.reset();
 }
 
-XclExpCellProt* pCellProt = new XclExpCellProt;
+std::unique_ptr pCellProt(new 
XclExpCellProt);
 if (!pCellProt->FillFromItemSet( rSet ))
 {
-delete pCellProt;
-pCellProt = nullptr;
+pCellProt.reset();
 }
 
-XclExpColor* pColor = new XclExpColor;
+std::unique_ptr pColor(new XclExpColor);
 if(!pColor->FillFromItemSet( rSet ))
 {
-delete pColor;
-pColor = nullptr;
+pColor.reset();
 }
 
-XclExpDxfFont* pFont = new XclExpDxfFont(rRoot, rSet);
+std::unique_ptr pFont(new 
XclExpDxfFont(rRoot, rSet));
 
-XclExpNumFmt* pNumFormat = nullptr;
+std::unique_ptr pNumFormat;
 const SfxPoolItem *pPoolItem = nullptr;
 if( rSet.GetItemState( ATTR_VALUE_FORMAT, true, 
&pPoolItem ) == SfxItemState::SET )
 {
 sal_uInt32 nScNumFmt = static_cast< const 
SfxUInt32Item* >(pPoolItem)->GetValue();
 sal_Int32 nXclNumFmt = 
GetRoot().GetNumFmtBuffer().Insert(nScNumFmt);
-pNumFormat = new XclExpNumFmt( nScNumFmt, 
nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, xFormatter.get(), 
mpKeywordTable.get() ));
+pNumFormat.reset(new XclExpNumFmt( nScNumFmt, 
nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, xFormatter.get(), 
mpKeywordTable.get() )));
 }
 
-maDxf.push_back(o3tl::make_unique( rRoot, 
pAlign, pBorder, pFont, pNumFormat, pCellProt, pColor ));
+maDxf.push_back(o3tl::make_unique( rRoot, 
std::move(pAlign), std::move(pBorder),
+std::move(pFont), std::move(pNumFormat), 
std::move(pCellProt), std::move(pColor) ));
 ++nIndex;
 }
 
@@ -3115,15 +3112,16 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm )
 rStyleSheet->endElement( XML_dxfs );
 }
 
-XclExpDxf::XclExpDxf( const XclExpRoot& rRoot, XclExpCellAlign* pAlign, 
XclExpCellBorder* pBorder,
-XclExpDxfFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* 
pProt, XclExpColor* pColor)
+XclExpDxf::XclExpDxf( const XclExpRoot& rRoot, 
std::unique_ptr pAlign, std::unique_ptr 
pBorder,
+std::unique_ptr pFont, 
std::unique_ptr pNumberFmt, std::unique_ptr pProt,
+std::unique_ptr pColor)
 : XclExpRoot( rRoot ),
-mpAlign(pAlign),
-mpBorder(pBorder),
-mpFont(pFont),
-mpNumberFmt(pNumberFmt),
-mpProt(pProt),
-mpColor(pColor)
+mpAlign(std::move(pAlign)),
+mpBorder(std::move(pBorder)),
+mpFont(std::move(pFont)),
+mpNumberFmt(std::move(pNumberFmt)),
+mpProt(std::move(pProt)),
+mpColor(std::move(pColor))
 {
 }
 
diff --gi

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

[Libreoffice Gerrit user]

 sd/qa/unit/export-tests-ooxml2.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 6563b399aea5292d04e32511d0aac397aed76200
Author: Justin Luth 
AuthorDate: Wed Aug 29 11:43:50 2018 +0300
Commit: Justin Luth 
CommitDate: Wed Aug 29 13:00:51 2018 +0200

fix sd_export_ooxml2 fail on Linux-rpm_deb-x86@71-TDF, MASTER

due to rounding differences, it was failing on 32bit linux only.

Test name: SdOOXMLExportTest2::testTdf91999_rotateShape
equality assertion failed
- Expected: 1449000
- Actual  : 1448640

Test name: SdOOXMLExportTest2::testTdf114845_rotateShape
equality assertion failed
- Expected: 3287520
- Actual  : 3287160

I also re-added the extra test that had previously
failed for a similar reason under Linux64 even.

Change-Id: I6c8be5ef1545d48f1e59319c3b3df1d2580e1f95
Reviewed-on: https://gerrit.libreoffice.org/59754
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index fdd65130a0b4..6920531af778 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1355,7 +1355,10 @@ void SdOOXMLExportTest2::testSmartartRotation2()
 xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
 assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:txBody/a:p/a:r/a:t", "Text");
 assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:txBody/a:bodyPr", "rot", "1080");
-assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "2276280");
+double dX = getXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "x").toDouble();
+double dY = getXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "y").toDouble();
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 2276280.0, dX, dX * .001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 3158280.0, dY, dY * .001);
 }
 
 void SdOOXMLExportTest2::testTdf91999_rotateShape()
@@ -1368,8 +1371,10 @@ void SdOOXMLExportTest2::testTdf91999_rotateShape()
 xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
 assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:nvSpPr/p:cNvPr", "name", "CustomShape 2");
 assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm", "rot", "1080");
-assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:off", "x", "2960640");
-assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:off", "y", "1449000");
+double dX = getXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:off", "x").toDouble();
+double dY = getXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:off", "y").toDouble();
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 2960640.0, dX, dX * .001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 1449000.0, dY, dY * .001);
 }
 
 void SdOOXMLExportTest2::testTdf114845_rotateShape()
@@ -1382,8 +1387,10 @@ void SdOOXMLExportTest2::testTdf114845_rotateShape()
 xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
 assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:nvSpPr/p:cNvPr", "name", "CustomShape 5");
 assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:xfrm", "flipV", "1");
-assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:xfrm/a:off", "x", "4059000");
-assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:xfrm/a:off", "y", "3287520");
+double dX = getXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:xfrm/a:off", "x").toDouble();
+double dY = getXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:xfrm/a:off", "y").toDouble();
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 4059000.0, dX, dX * .001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 3287520.0, dY, dY * .001);
 }
 
 void SdOOXMLExportTest2::testGroupsPosition()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 starmath/source/parse.cxx |   49 +-
 1 file changed, 40 insertions(+), 9 deletions(-)

New commits:
commit f41cbea9a49c3059498a1ff432ac545b296db5a5
Author: Stephan Bergmann 
AuthorDate: Wed Aug 29 10:42:36 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 29 12:32:59 2018 +0200

More -Werror=redundant-move

...similar to dc06c8f4989fc28d0c31ebd333e53dfe0e0f5f66 
"-Werror=redundant-move
(GCC 9), take two"

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

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 051c62d5de8d..56d778f9b44c 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -995,7 +996,11 @@ std::unique_ptr SmParser::DoAlign(bool 
bUseExtraSpaces)
 if (xSNode)
 {
 xSNode->SetSubNode(0, pNode.release());
-return std::move(xSNode); // this explicit move can be omitted since 
C++14
+#if HAVE_CXX_CWG1579_FIX
+return xSNode;
+#else
+return std::move(xSNode);
+#endif
 }
 return pNode;
 }
@@ -1030,7 +1035,11 @@ std::unique_ptr SmParser::DoLine()
 
 auto xSNode = o3tl::make_unique(m_aCurToken);
 xSNode->SetSubNodes(buildNodeArray(ExpressionArray));
-return std::move(xSNode); // this explicit move can be omitted since C++14
+#if HAVE_CXX_CWG1579_FIX
+return xSNode;
+#else
+return std::move(xSNode);
+#endif
 }
 
 std::unique_ptr SmParser::DoExpression(bool bUseExtraSpaces)
@@ -1049,9 +1058,11 @@ std::unique_ptr SmParser::DoExpression(bool 
bUseExtraSpaces)
 std::unique_ptr xSNode(new 
SmExpressionNode(m_aCurToken));
 xSNode->SetSubNodes(buildNodeArray(RelationArray));
 xSNode->SetUseExtraSpaces(bUseExtraSpaces);
-// the following explicit move can be omitted since C++14:
-// 
https://stackoverflow.com/questions/22018115/converting-stdunique-ptrderived-to-stdunique-ptrbase
+#if HAVE_CXX_CWG1579_FIX
+return xSNode;
+#else
 return std::move(xSNode);
+#endif
 }
 else
 {
@@ -1256,7 +1267,11 @@ std::unique_ptr SmParser::DoSubSup(TG 
nActiveGroup, SmNode *pGivenNode)
 }
 
 pNode->SetSubNodes(buildNodeArray(aSubNodes));
-return std::move(pNode); // this explicit move can be omitted since C++14
+#if HAVE_CXX_CWG1579_FIX
+return pNode;
+#else
+return std::move(pNode);
+#endif
 }
 
 std::unique_ptr SmParser::DoOpSubSup()
@@ -1272,7 +1287,11 @@ std::unique_ptr SmParser::DoOpSubSup()
 // get sub- supscripts if any
 if (m_aCurToken.nGroup == TG::Power)
 return DoSubSup(TG::Power, pNode.release());
-return std::move(pNode); // this explicit move can be omitted since C++14
+#if HAVE_CXX_CWG1579_FIX
+return pNode;
+#else
+return std::move(pNode);
+#endif
 }
 
 std::unique_ptr SmParser::DoPower()
@@ -1776,7 +1795,11 @@ std::unique_ptr SmParser::DoAttribut()
 
 xSNode->SetSubNodes(xAttr.release(), nullptr); // the body will be filled 
later
 xSNode->SetScaleMode(eScaleMode);
-return std::move(xSNode); // this explicit move can be omitted since C++14
+#if HAVE_CXX_CWG1579_FIX
+return xSNode;
+#else
+return std::move(xSNode);
+#endif
 }
 
 std::unique_ptr SmParser::DoFontAttribut()
@@ -1797,7 +1820,11 @@ std::unique_ptr 
SmParser::DoFontAttribut()
 {
 auto pNode = o3tl::make_unique(m_aCurToken);
 NextToken();
-return std::move(pNode); // this explicit move can be omitted 
since C++14
+#if HAVE_CXX_CWG1579_FIX
+return pNode;
+#else
+return std::move(pNode);
+#endif
 }
 
 case TSIZE :
@@ -1959,7 +1986,11 @@ std::unique_ptr SmParser::DoFontSize()
 NextToken();
 
 pFontNode->SetSizeParameter(aValue, Type);
-return std::move(pFontNode); // this explicit move can be omitted since 
C++14
+#if HAVE_CXX_CWG1579_FIX
+return pFontNode;
+#else
+return std::move(pFontNode);
+#endif
 }
 
 SmStructureNode *SmParser::DoBrace()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/app/drwtrans.cxx   |4 ++--
 sc/source/ui/app/seltrans.cxx   |4 ++--
 sc/source/ui/inc/drwtrans.hxx   |2 +-
 sc/source/ui/navipi/content.cxx |4 ++--
 sc/source/ui/view/drawvie4.cxx  |   12 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 527d0028115611bf4ea3d497cf27bfcdb182
Author: Noel Grandin 
AuthorDate: Wed Aug 29 10:59:52 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 12:25:45 2018 +0200

loplugin:useuniqueptr in ScDrawTransferObj

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

diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 7f60ebcd3ad8..3cb2fefebf0b 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -72,9 +72,9 @@ constexpr sal_uInt32 SCDRAWTRANS_TYPE_EMBOBJ= 1;
 constexpr sal_uInt32 SCDRAWTRANS_TYPE_DRAWMODEL = 2;
 constexpr sal_uInt32 SCDRAWTRANS_TYPE_DOCUMENT  = 3;
 
-ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* 
pContainerShell,
+ScDrawTransferObj::ScDrawTransferObj( std::unique_ptr pClipModel, 
ScDocShell* pContainerShell,
 const TransferableObjectDescriptor& 
rDesc ) :
-m_pModel( pClipModel ),
+m_pModel( std::move(pClipModel) ),
 m_aObjDesc( rDesc ),
 m_pBookmark( nullptr ),
 m_bGraphic( false ),
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index e2e6004c6154..c42134bb28cd 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -327,7 +327,7 @@ void ScSelectionTransferObj::CreateDrawData()
 }
 
 ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
-SdrModel* pModel = pDrawView->GetMarkedObjModel();
+std::unique_ptr pModel(pDrawView->GetMarkedObjModel());
 ScDrawLayer::SetGlobalDrawPersist(nullptr);
 
 ScViewData& rViewData = pView->GetViewData();
@@ -338,7 +338,7 @@ void ScSelectionTransferObj::CreateDrawData()
 aObjDesc.maDisplayName = 
pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
 // maSize is set in ScDrawTransferObj ctor
 
-rtl::Reference pTransferObj = new 
ScDrawTransferObj( pModel, pDocSh, aObjDesc );
+rtl::Reference pTransferObj = new 
ScDrawTransferObj( std::move(pModel), pDocSh, aObjDesc );
 
 SfxObjectShellRef aPersistRef( aDragShellRef.get() );
 pTransferObj->SetDrawPersist( aPersistRef );// keep persist 
for ole objects alive
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index e403e967b7c8..0a4dcb952e28 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -69,7 +69,7 @@ private:
 void CreateOLEData();
 
 public:
-ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* 
pContainerShell,
+ScDrawTransferObj( std::unique_ptr pClipModel, 
ScDocShell* pContainerShell,
 const TransferableObjectDescriptor& rDesc );
 virtual ~ScDrawTransferObj() override;
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 71405a56d22d..ecaecee72982 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1253,14 +1253,14 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, 
const OUString& rName, ScCo
 SdrPageView* pPV = aEditView.GetSdrPageView();
 aEditView.MarkObj(pObject, pPV);
 
-SdrModel* pDragModel = aEditView.GetMarkedObjModel();
+std::unique_ptr 
pDragModel(aEditView.GetMarkedObjModel());
 
 TransferableObjectDescriptor aObjDesc;
 pSrcShell->FillTransferableObjectDescriptor( aObjDesc );
 aObjDesc.maDisplayName = 
pSrcShell->GetMedium()->GetURLObject().GetURLNoPass();
 // maSize is set in ScDrawTransferObj ctor
 
-rtl::Reference pTransferObj = new 
ScDrawTransferObj( pDragModel, pSrcShell, aObjDesc );
+rtl::Reference pTransferObj = new 
ScDrawTransferObj( std::move(pDragModel), pSrcShell, aObjDesc );
 
 pTransferObj->SetDragSourceObj( *pObject, nTab );
 pTransferObj->SetDragSourceFlags(ScDragSrc::Navigator);
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index caf786900f96..4bd6b11719cf 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -80,7 +80,7 @@ void ScDrawView::BeginDrag( vcl::Window* pWindow, const 
Point& rStartPos )
 aDragShellRef->DoInitNew();
 }
 ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
-SdrModel* pModel = GetMarkedObjModel();
+std::unique_ptr pModel(GetMarkedObjModel());
 ScDrawLayer::SetGlobalDrawPersist(nullptr);
 
 //  Charts now always copy thei

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

[Libreoffice Gerrit user]

 sc/source/filter/excel/xiescher.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit b59feb122b13ec91571db774cedbf19ee73f5719
Author: Stephan Bergmann 
AuthorDate: Wed Aug 29 10:41:51 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 29 11:59:08 2018 +0200

More -Werror=redundant-move

...similar to dc06c8f4989fc28d0c31ebd333e53dfe0e0f5f66 
"-Werror=redundant-move
(GCC 9), take two"

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

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 3ad8791d6101..1d7e22dd2834 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1020,7 +1021,11 @@ SdrObjectPtr XclImpGroupObj::DoCreateSdrObj( 
XclImpDffConverter& rDffConv, const
 for( ::std::vector< XclImpDrawObjRef >::const_iterator aIt = 
maChildren.begin(), aEnd = maChildren.end(); aIt != aEnd; ++aIt )
 rDffConv.ProcessObject( rObjList, **aIt );
 rDffConv.Progress();
+#if HAVE_CXX_CWG1579_FIX
+return xSdrObj;
+#else
 return std::move(xSdrObj);
+#endif
 }
 
 XclImpLineObj::XclImpLineObj( const XclImpRoot& rRoot ) :
@@ -1455,7 +1460,11 @@ SdrObjectPtr XclImpTextObj::DoCreateSdrObj( 
XclImpDffConverter& rDffConv, const
 xSdrObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bAutoSize ) );
 xSdrObj->SetMergedItem( makeSdrTextWordWrapItem( true ) );
 rDffConv.Progress();
+#if HAVE_CXX_CWG1579_FIX
+return xSdrObj;
+#else
 return std::move(xSdrObj);
+#endif
 }
 
 void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, 
SdrObject& rSdrObj ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

[Jan-Marek Glogowski]

Am 29.08.2018 um 09:33 schrieb Samuel Thibault:
> Jan-Marek Glogowski, le mer. 29 août 2018 06:53:52 +, a ecrit:
>> Am August 28, 2018 4:04:37 PM UTC schrieb Samuel Thibault 
>> :
>>> Samuel Thibault, le lun. 12 févr. 2018 15:30:59 +0100, a ecrit:
 - At some point we'll get confident that we won't introduce other
 big classes of warnings over hundreds of .ui files. That's the point
 where we can say "ok, let's start fixing the existing issues over
 all .ui files once for good". We can then run through .ui files one
 by one, fixing the issues and removing the corresponding suppression
 lines. These could be used as "easy hacks" entries, they are usually
 just a few lines to fix.
>>
>> I'm not sure we want this handled as "easy hacks". The goal was to enable 
>> the checks always for the build. Is this implemented and can I enable it?
> 
> The checks are already enabled, and any new issue will fail the
> build.  The goal now is to fix existing issues (currently suppressed by
> suppression rules).

Great. Guess I should have checked :-)
Thanks for the additional info.

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 8 commits - configure.ac editeng/source .gitignore include/editeng instsetoo_native/util officecfg/registry setup_native/source solen

[Libreoffice Gerrit user]

 .gitignore |1 
 configure.ac   |5 
 editeng/source/items/textitem.cxx  |   12 +
 include/editeng/rsiditem.hxx   |5 
 instsetoo_native/util/openoffice.lst.in|2 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   24 +++
 setup_native/source/packinfo/finals_instsetoo.txt.in   |1 
 solenv/bin/modules/installer/globals.pm|2 
 solenv/bin/modules/installer/windows/msp.pm|2 
 svl/source/passwordcontainer/passwordcontainer.cxx |   11 -
 svl/source/passwordcontainer/passwordcontainer.hxx |2 
 sw/qa/extras/ooxmlexport/data/tdf116436_rowFill.odt|binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |9 +
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx  |7 
 sw/qa/extras/ww8export/data/tdf116436_tableBackground.odt  |binary
 sw/qa/extras/ww8export/ww8export2.cxx  |   13 +
 sw/source/filter/ww8/docxattributeoutput.cxx   |   27 +++
 sw/source/filter/ww8/docxexport.cxx|4 
 sw/source/filter/ww8/docxexport.hxx|2 
 sw/source/filter/ww8/rtfexport.cxx |4 
 sw/source/filter/ww8/rtfexport.hxx |2 
 sw/source/filter/ww8/wrtww8.cxx|   80 
++
 sw/source/filter/ww8/wrtww8.hxx|6 
 23 files changed, 173 insertions(+), 48 deletions(-)

New commits:
commit 75069eddea917213f57c9f01223f92cac6dccf4d
Author: Andras Timar 
AuthorDate: Wed Aug 29 11:44:01 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 11:44:01 2018 +0200

Bump version to 6.0-7

Change-Id: I2fa339d6b874d4338ea0be5582fe75cdbb1df1b9

diff --git a/configure.ac b/configure.ac
index 2c552ee9636a..f521b9f272bd 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],[6.0.10.6],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.0.10.7],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 310620d3f80558b0daadd058670dae9ac5985e86
Author: Andras Timar 
AuthorDate: Wed Aug 29 11:39:22 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 11:43:18 2018 +0200

[cp] Enable MSP patching

Change-Id: Ib9059106e224622990823f2a3b790e5899256385

diff --git a/.gitignore b/.gitignore
index ab3a638307b5..aad4142986f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@
 /README
 /AUTHORS
 /MAINTAINERS
+/setup_native/source/packinfo/finals_instsetoo.txt
 
 # make id
 /ID
diff --git a/configure.ac b/configure.ac
index 9ed771bf868a..2c552ee9636a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3057,6 +3057,7 @@ if test "$_os" = "WINNT"; then
 BITNESS_OVERRIDE=64
 fi
 fi
+AC_SUBST(WINDOWS_SDK_ARCH)
 if test "$_os" = "iOS"; then
 cross_compiling="yes"
 fi
@@ -4365,6 +4366,7 @@ if test "$cross_compiling" = "yes"; then
 bin/odfvalidator.sh.in \
 bin/officeotron.sh.in \
 instsetoo_native/util/openoffice.lst.in \
+setup_native/source/packinfo/finals_instsetoo.txt.in \
 config_host/*.in \
 sysui/desktop/macosx/Info.plist.in) \
 | (cd CONF-FOR-BUILD && tar xf -)
@@ -12538,6 +12540,7 @@ AC_CONFIG_FILES([config_host.mk
  bin/odfvalidator.sh
  bin/officeotron.sh
  instsetoo_native/util/openoffice.lst
+ setup_native/source/packinfo/finals_instsetoo.txt
  sysui/desktop/macosx/Info.plist])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 4d5a01bbf158..721e6788fd0d 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -27,7 +27,7 @@ Globals
 REGISTRYLAYERNAME Layers
 SERVICEPACK 1
 UPDATE_DATABASE 1
-CREATE_MSP_INSTALLSET 0
+CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
 WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt 
b/setup_native/source/packinfo/finals_instsetoo.txt.in
similarity index 82%
rename from setup_native/source/packinfo/finals_instsetoo.txt
rename to setup_native/source/packinfo/finals_instsetoo.txt.in
index d5a68d

Re: make check fails in [build JCS]

[Noel Grandin]

On 2018/08/29 11:06 AM, Stephan Bergmann wrote:
investigating deeper into the issue.  (Apparently, Java no longer accepts file:... URLs there, at least on Windows, and 
won't accept full pathnames starting with a drive letter like C:/..., but does accept ("drive-absolute") pathnames like 
/...; so my hack should work as long as your files are on drive C.)




That probably needs whatever magic will convert a cygwin path into a DOS/NT 
path i.e. something starting with

   C:\

(note the backslash instead of a forwardslash)

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

[Libreoffice-commits] core.git: chart2/source comphelper/source configmgr/source connectivity/source cui/source dbaccess/source desktop/source editeng/source extensions/source forms/source formula/sou

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/DataBrowserModel.cxx |   10 +++
 chart2/source/model/template/DataInterpreter.cxx  |4 +--
 comphelper/source/property/propertycontainerhelper.cxx|3 --
 configmgr/source/setnode.cxx  |5 +--
 connectivity/source/parse/sqlnode.cxx |   15 ---
 cui/source/dialogs/pastedlg.cxx   |   13 --
 dbaccess/source/ui/app/subcomponentmanager.cxx|4 +--
 dbaccess/source/ui/browser/formadapter.cxx|4 +--
 dbaccess/source/ui/browser/genericcontroller.cxx  |4 +--
 dbaccess/source/ui/misc/RowSetDrop.cxx|4 +--
 dbaccess/source/ui/misc/WCopyTable.cxx|4 +--
 desktop/source/lib/init.cxx   |4 +--
 desktop/source/lib/lokclipboard.cxx   |4 +--
 editeng/source/editeng/editobj.cxx|6 +---
 extensions/source/propctrlr/cellbindinghelper.cxx |6 
 extensions/source/propctrlr/propcontroller.cxx|4 +--
 forms/source/component/ListBox.cxx|4 +--
 formula/source/ui/dlg/formula.cxx |5 +--
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx|5 ---
 jvmfwk/source/framework.cxx   |5 +--
 sal/cppunittester/cppunittester.cxx   |2 -
 sal/osl/all/debugbase.cxx |4 +--
 sc/source/core/tool/dbdata.cxx|6 ++--
 sc/source/ui/dbgui/filtdlg.cxx|6 +---
 sd/source/ui/sidebar/MasterPageContainerQueue.cxx |5 +--
 sd/source/ui/view/ViewShellManager.cxx|8 +-
 sfx2/source/dialog/filtergrouping.cxx |5 ---
 sfx2/source/doc/Metadatable.cxx   |2 -
 sfx2/source/view/classificationhelper.cxx |4 +--
 shell/source/unix/sysshell/recently_used_file_handler.cxx |4 ---
 shell/source/win32/zipfile/zipfile.cxx|4 ---
 svtools/source/misc/transfer.cxx  |8 +++---
 svtools/source/misc/transfer2.cxx |4 +--
 svx/source/dialog/ClassificationCommon.cxx|5 +--
 svx/source/dialog/charmap.cxx |9 ++-
 svx/source/items/customshapeitem.cxx  |4 +--
 sw/qa/extras/layout/layout.cxx|7 ++---
 sw/source/core/undo/rolbck.cxx|4 +--
 sw/source/core/unocore/unostyle.cxx   |5 +--
 toolkit/source/controls/geometrycontrolmodel.cxx  |8 --
 unoidl/source/unoidl-check.cxx|   10 +++
 vcl/unx/generic/printer/ppdparser.cxx |4 +--
 vcl/unx/gtk3/gtk3gtkinst.cxx  |2 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   14 +++---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|5 +--
 xmlsecurity/qa/unit/signing/signing.cxx   |2 -
 xmlsecurity/source/helper/ooxmlsecexporter.cxx|4 +--
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  |   18 +++---
 48 files changed, 107 insertions(+), 169 deletions(-)

New commits:
commit 085269d25a705b656436feac47149296b4b4b35d
Author: Arkadiy Illarionov 
AuthorDate: Wed Aug 29 00:47:33 2018 +0300
Commit: Noel Grandin 
CommitDate: Wed Aug 29 11:40:29 2018 +0200

Replace find_if with proper quantifier algorithms

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

diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx 
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 7a2a041d41f8..10af6e5cbf4c 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -485,11 +485,9 @@ void 
DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu
 Sequence > 
aSequencesOfDeleted = xSourceOfDeleted->getDataSequences();
 for (sal_Int32 i = 0; i < aSequencesOfDeleted.getLength(); ++i)
 {
-std::vector 
>::const_iterator aHitIt(
-std::find_if( aAllDataSeqs.begin(), aAllDataSeqs.end(),
-lcl_RepresentationsOfLSeqMatch( aSequencesOfDeleted[i] )));
 // if not used by the remaining series this sequence can be deleted
-if( aHitIt == aAllDataSeqs.end() )
+if( std::none_of( aAllDataSeqs.begin(), aAllDataSeqs.end(),
+ lcl_RepresentationsOfLSeqMatch( 
aSequencesOfDeleted[i] )) )
 aSequenceIndexesToDelete.push_back( 
lcl_getValuesRepresentationIndex( aSeque

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

[Libreoffice Gerrit user]

 bin/gbuild-to-ide |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit b0e74b65a86eb965c3e93da2fb77972cc5445f3c
Author: Miklos Vajna 
AuthorDate: Wed Aug 29 09:13:03 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 29 11:25:04 2018 +0200

vim-ide-integration: remove no longer needed workaround

Fixes the problem that e.g. this code:

OUString str;
str += "";

is marked as a compile error, when clang would still work with c++11,
but the tree is configured for gnu++17.

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

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index b016bfe02a0c..9ac6949ffec8 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -378,9 +378,6 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
 command += cxxflag
 command += ' -c '
 command += file
-# Help clang when the tree is configured for gcc.
-for gnu in ('-std=gnu++11', '-std=gnu++1y', '-std=gnu++17'):
-command = command.replace(gnu, '-std=c++11')
 return command
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/datasource.cxx |   19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 4d40c1afd98cd30a0ab59da6cbd4a8dadb1027fa
Author: Caolán McNamara 
AuthorDate: Thu Aug 23 15:13:16 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Aug 29 11:20:48 2018 +0200

give the migration warn dialog a parent

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

diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index 22c7f6685d1a..7943104ff0a5 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -578,6 +578,23 @@ void ODatabaseSource::disposing()
 m_pImpl.clear();
 }
 
+namespace
+{
+weld::Window* GetFrameWeld(const Reference& rModel)
+{
+if (!rModel.is())
+return nullptr;
+Reference xController(rModel->getCurrentController());
+if (!xController.is())
+return nullptr;
+Reference xFrame(xController->getFrame());
+if (!xFrame.is())
+return nullptr;
+Reference xWindow(xFrame->getContainerWindow());
+return Application::GetFrameWeld(xWindow);
+}
+}
+
 Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const 
OUString& _rUid, const OUString& _rPwd)
 {
 Reference< XConnection > xReturn;
@@ -597,7 +614,7 @@ Reference< XConnection > 
ODatabaseSource::buildLowLevelConnection(const OUString
 bNeedMigration = true;
 else
 {
-MigrationWarnDialog aWarnDlg{nullptr};
+MigrationWarnDialog 
aWarnDlg(GetFrameWeld(m_pImpl->getModel_noCreate()));
 bNeedMigration = aWarnDlg.run() == RET_OK;
 }
 if (bNeedMigration)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ww8export/data/tdf119232_startEvenPage.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx   |5 +
 sw/source/filter/ww8/ww8par6.cxx|   12 +---
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 2127581728ae61eca7470b288c21d1c02754fb5b
Author: Justin Luth 
AuthorDate: Thu Aug 16 15:49:37 2018 +0300
Commit: Miklos Vajna 
CommitDate: Wed Aug 29 11:20:15 2018 +0200

tdf#119232 ww8import: even page means default to start on page 2

I didn't see this mentioned in the sprm documentation,
but that is how MS Word seems to implement it.

Change-Id: I5b86ecf99a884e768877cdb0e71f43cdb9f2ad76
Reviewed-on: https://gerrit.libreoffice.org/59221
Reviewed-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ww8export/data/tdf119232_startEvenPage.doc 
b/sw/qa/extras/ww8export/data/tdf119232_startEvenPage.doc
new file mode 100644
index ..c50bf46c0b58
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf119232_startEvenPage.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index d540cece3c6d..078079f969ec 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -282,6 +282,11 @@ DECLARE_WW8EXPORT_TEST(testTdf106174_rtlParaAlign, 
"tdf106174_rtlParaAlign.docx"
 CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(14), "ParaAdjust"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf119232_startEvenPage, 
"tdf119232_startEvenPage.doc")
+{
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), getProperty(getParagraph(1), 
"PageNumberOffset"));
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf104805, "tdf104805.doc")
 {
 uno::Reference 
xPropertySet(getStyles("NumberingStyles")->getByName("WW8Num1"), 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index cc43a90d4077..7844ef2a07e9 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -874,6 +874,8 @@ void wwSectionManager::CreateSep(const long nTextPos)
 
 const sal_uInt16* pIds = eVer <= ww::eWW2 ? aVer2Ids0 : eVer <= ww::eWW7 ? 
aVer67Ids0 : aVer8Ids0;
 
+SprmResult aRes = pSep->HasSprm(pIds[0]);
+const sal_uInt8* pSprmBkc = aRes.pSprm;
 if (!maSegments.empty())
 {
 // Type of break: break codes are:
@@ -882,8 +884,6 @@ void wwSectionManager::CreateSep(const long nTextPos)
 // 2 New page
 // 3 Even page
 // 4 Odd page
-SprmResult aRes = pSep->HasSprm(pIds[0]);
-const sal_uInt8* pSprmBkc = aRes.pSprm;
 if (pSprmBkc && aRes.nRemainingData >= 1)
 aNewSection.maSep.bkc = *pSprmBkc;
 }
@@ -1036,7 +1036,13 @@ void wwSectionManager::CreateSep(const long nTextPos)
 
 aNewSection.maSep.pgnStart = ReadUSprm( pSep, pIds[7], 0 );
 
-SprmResult aRes;
+// if the document's first page number is unspecified, but it starts with 
an even page break,
+// then set the first page number to two
+if ( maSegments.empty() && !aNewSection.maSep.fPgnRestart && pSprmBkc && 
*pSprmBkc == 3 )
+{
+aNewSection.maSep.pgnStart = 2;
+aNewSection.maSep.fPgnRestart = 1;
+}
 
 if (eVer >= ww::eWW6)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk sal/osl

[Libreoffice Gerrit user]

 instsetoo_native/CustomTarget_setup.mk |2 -
 sal/osl/unx/security.cxx   |   35 -
 2 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit 41427a5682ba83167f3b0abfa0e1e61b9ea6fa9d
Author: Kacper Kasper 
AuthorDate: Sun Aug 5 23:04:09 2018 +0200
Commit: Michael Meeks 
CommitDate: Wed Aug 29 11:18:50 2018 +0200

sal: use correct settings path for Haiku

* Don't lowercase the name.

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

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index ebeb00dcd019..da4f697993df 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -40,7 +40,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'InstallMode=' \
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
$(if $(ENABLE_RELEASE_BUILD),\
-   && echo 'UserInstallation=$$SYSUSERCONFIG/$(if 
$(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" 
"[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
+   && echo 'UserInstallation=$$SYSUSERCONFIG/$(if 
$(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr 
"[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', 
\
&& echo 'UserInstallation=$$ORIGIN/..') \
) > $@
 
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index 49a0320bc023..a7a47640c693 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -41,6 +41,11 @@
 #include 
 #endif
 
+#if defined HAIKU
+#include 
+#include 
+#endif
+
 #include "secimpl.hxx"
 
 #ifdef ANDROID
@@ -246,6 +251,18 @@ static bool osl_psz_getHomeDir(oslSecurity Security, 
sal_Char* pszDirectory, sal
 if (pSecImpl == nullptr)
 return false;
 
+#ifdef HAIKU
+dev_t volume = dev_for_path("/boot");
+sal_Char homeDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
+status_t result = find_directory(B_USER_DIRECTORY, volume, false, homeDir,
+ sizeof(homeDir));
+if (result == B_OK && strlen(homeDir) < nMax) {
+strcpy(pszDirectory, homeDir);
+return true;
+}
+return false;
+#endif
+
 #ifdef ANDROID
 {
 sal_Bool bRet = sal_False;
@@ -347,7 +364,23 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, 
rtl_uString **pustrDire
 return bRet;
 }
 
-#if !defined(MACOSX) && !defined(IOS)
+#if defined HAIKU
+
+static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, 
sal_uInt32 nMax)
+{
+(void) Security;
+dev_t volume = dev_for_path("/boot");
+sal_Char configDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
+status_t result = find_directory(B_USER_SETTINGS_DIRECTORY, volume, false,
+ configDir, sizeof(configDir));
+if (result == B_OK && strlen(configDir) < nMax) {
+strcpy(pszDirectory, configDir);
+return true;
+}
+return false;
+}
+
+#elif !defined(MACOSX) && !defined(IOS)
 
 #define DOT_CONFIG "/.config"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeHaiku.conf Repository.mk solenv/gbuild vcl/inc

[Libreoffice Gerrit user]

 Repository.mk  |6 +-
 configure.ac   |   14 ++---
 distro-configs/LibreOfficeHaiku.conf   |   68 +
 solenv/gbuild/platform/HAIKU_INTEL_GCC.mk  |2 
 solenv/gbuild/platform/HAIKU_X86_64_GCC.mk |2 
 solenv/gbuild/platform/haiku.mk|   19 
 vcl/inc/svsys.h|1 
 7 files changed, 16 insertions(+), 96 deletions(-)

New commits:
commit 5f60f6fe1475491ac0c2f529fb2d074c32336add
Author: Kacper Kasper 
AuthorDate: Mon Aug 6 00:22:39 2018 +0200
Commit: Michael Meeks 
CommitDate: Wed Aug 29 11:17:33 2018 +0200

Various Haiku improvements

* Fix make distro-pack-install.
* Remove Xorg dependency.
* Remove stack protector workaround.
* Update distro-config and enabled features.

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

diff --git a/Repository.mk b/Repository.mk
index fdcb6115c507..56174af8ef07 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -142,7 +142,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
-   $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
+   $(if $(filter-out ANDROID HAIKU IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
$(if $(filter WNT,$(OS)), \
@@ -236,7 +236,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,pdfimport, \
 endif
 
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
-   $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter 
DESKTOP,$(BUILD_TYPE))),javaldx) \
+   $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter 
DESKTOP,$(BUILD_TYPE))),javaldx) \
$(if $(ENABLE_MACOSX_SANDBOX),, \
regmerge \
regview \
@@ -1016,7 +1016,7 @@ $(eval $(call 
gb_Helper_register_packages_for_install,brand,\
desktop_branding \
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
-   $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter 
DESKTOP,$(BUILD_TYPE))),\
+   $(if $(and $(filter-out MACOSX HAIKU WNT,$(OS)),$(filter 
DESKTOP,$(BUILD_TYPE))),\
$(if $(DISABLE_GUI),, \
desktop_soffice_sh \
) \
diff --git a/configure.ac b/configure.ac
index a96f968581b4..2a60d92430e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -795,17 +795,13 @@ haiku*)
 test_randr=no
 test_xrender=no
 test_freetype=yes
-enable_java=no
-enable_opengl=no
 enable_odk=no
-enable_gconf=no
-enable_gnome_vfs=no
-enable_gstreamer=no
+enable_gstreamer_0_10=no
+enable_gstreamer_1_0=no
 enable_vlc=no
-enable_gltf=no
-enable_collada=no
 enable_coinmp=no
 enable_pdfium=no
+enable_sdremote=no
 enable_postgresql_sdbc=no
 enable_firebird_sdbc=no
 _os=Haiku
@@ -11239,7 +11235,9 @@ then
 AC_MSG_ERROR([KF5 libraries not found.  Please specify the root of 
your KF5 installation by exporting KF5DIR before running "configure".])
 fi
 
-PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])])
+if test "$USING_X11" = TRUE; then
+PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])])
+fi
 
 KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n 
-I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore 
-I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir 
-I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets 
-I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT 
$KF5_XCB_CFLAGS"
 KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore 
-lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets 
-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network $KF5_XCB_LIBS"
diff --git a/distro-configs/LibreOfficeHaiku.conf 
b/distro-configs/LibreOfficeHaiku.conf
index 426d19a825f6..46f497f7e348 100644
--- a/distro-configs/LibreOfficeHaiku.conf
+++ b/distro-configs/LibreOfficeHaiku.conf
@@ -1,66 +1,6 @@
 --with-vendor=The Document Foundation
---with-system-libxml
---with-system-neon
---with-system-boost
---with-boost-libdir=/boot/system/lib
---with-system-clucene
---with-system-expat
---with-system-libpng
---with-system-jpeg
---with-system-zlib
---with-system-bzip2
---with-system-icu
---with-system-openssl
---with-system-curl
---with-system-cppunit
---with-system-hunspell
---with-system-altlinuxhyph
---with-system-lcms2
---with-system-librevenge
---with-system-libodfgen
---with-system-l

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

[Libreoffice Gerrit user]

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

New commits:
commit 5cbbd7d858a7753c1cbe4ecbf9b9366f3f3bc897
Author: Kacper Kasper 
AuthorDate: Wed Aug 1 19:09:48 2018 +0200
Commit: Michael Meeks 
CommitDate: Wed Aug 29 11:15:51 2018 +0200

Fix stack protector check

* "return 0;" is not enough to trigger it.

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

diff --git a/configure.ac b/configure.ac
index 4ab159b4146a..a96f968581b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5923,7 +5923,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
 save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -Werror -fstack-protector-strong"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; return 0; ]])],[ 
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
 CFLAGS=$save_CFLAGS
 if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.fetch

[Libreoffice Gerrit user]

 Makefile.fetch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84151f7aa93521070fe405c60cbd0eaab4305805
Author: Kacper Kasper 
AuthorDate: Sun Aug 5 21:18:33 2018 +0200
Commit: Michael Meeks 
CommitDate: Wed Aug 29 11:16:23 2018 +0200

Fetch xmlsec only if necessary

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

diff --git a/Makefile.fetch b/Makefile.fetch
index 2d1aa0481735..59aadccaffe3 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -161,7 +161,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
-   XMLSEC_TARBALL \
+   $(call fetch_Optional,XMLSEC,XMLSEC_TARBALL) \
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
$(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \
$(call fetch_Optional,LXML,LXML_TARBALL) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/inc sfx2/source svx/inc sw/inc sw/source unotools/source vcl/inc vcl/opengl

[Libreoffice Gerrit user]

 sfx2/inc/guisaveas.hxx   |3 +--
 sfx2/inc/preventduplicateinteraction.hxx |5 ++---
 sfx2/source/appl/appopen.cxx |2 +-
 sfx2/source/doc/guisaveas.cxx|   11 +--
 svx/inc/sxmovitm.hxx |4 ++--
 svx/inc/sxroaitm.hxx |2 +-
 svx/inc/sxrooitm.hxx |2 +-
 svx/inc/sxsalitm.hxx |4 ++--
 svx/inc/sxsoitm.hxx  |4 ++--
 sw/inc/crsrsh.hxx|4 ++--
 sw/source/core/crsr/crsrsh.cxx   |6 +++---
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/wrtw8nds.cxx|   18 +-
 sw/source/filter/ww8/wrtww8.hxx  |2 +-
 sw/source/ui/dbui/mmresultdialogs.cxx|4 ++--
 unotools/source/i18n/localedatawrapper.cxx   |   13 +
 vcl/inc/opengl/texture.hxx   |2 +-
 vcl/opengl/texture.cxx   |   18 +-
 18 files changed, 42 insertions(+), 64 deletions(-)

New commits:
commit 3dfc17ed6334c619228668ffeff591bc75d32025
Author: Noel Grandin 
AuthorDate: Tue Aug 28 14:43:10 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 11:12:47 2018 +0200

loplugin:constantparam (3)

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

diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index fb93a33c5328..ac9df75aea61 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -70,8 +70,7 @@ public:
 
 static void SetDocInfoState(
 const css::uno::Reference< css::frame::XModel >& xModel,
-const css::uno::Reference< css::document::XDocumentProperties>& 
i_xOldDocInfo,
-bool bNoModify );
+const css::uno::Reference< css::document::XDocumentProperties>& 
i_xOldDocInfo );
 
 static bool WarnUnacceptableFormat(
 const css::uno::Reference< 
css::frame::XModel >& xModel,
diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index 46e998a213e7..8fdf8f79ea22 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -182,10 +182,9 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
 
 public:
 
-InteractionInfo(const css::uno::Type& aInteraction,
-  sal_Int32   nMaxCount   )
+InteractionInfo(const css::uno::Type& aInteraction)
 : m_aInteraction(aInteraction)
-, m_nMaxCount   (nMaxCount   )
+, m_nMaxCount   (1   )
 , m_nCallCount  (0   )
 {}
 };
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index ad839b0ccb24..632a2f985268 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -686,7 +686,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
 // define rules for this handler
 css::uno::Type
aInteraction = ::cppu::UnoType::get();
-::sfx2::PreventDuplicateInteraction::InteractionInfo aRule
(aInteraction, 1);
+::sfx2::PreventDuplicateInteraction::InteractionInfo 
aRule(aInteraction);
 pHandler->addInteractionRule(aRule);
 
 if (!aDocService.isEmpty())
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index f4427d0f2035..acab90b6cd4a 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1654,7 +1654,7 @@ bool SfxStoringHelper::GUIStoreModel( const 
uno::Reference< frame::XModel >& xMo
 
 if ( nStoreMode & EXPORT_REQUESTED )
 {
-SfxStoringHelper::SetDocInfoState(aModel.GetModel(), 
xOldDocProps, true);
+SfxStoringHelper::SetDocInfoState(aModel.GetModel(), 
xOldDocProps);
 }
 };
 
@@ -1728,8 +1728,7 @@ bool SfxStoringHelper::CheckFilterOptionsAppearance(
 // static
 void SfxStoringHelper::SetDocInfoState(
 const uno::Reference< frame::XModel >& xModel,
-const uno::Reference< document::XDocumentProperties>& i_xOldDocProps,
-bool bNoModify )
+const uno::Reference< document::XDocumentProperties>& i_xOldDocProps )
 {
 uno::Reference const
 xModelDocPropsSupplier(xModel, uno::UNO_QUERY_THROW);
@@ -1739,10 +1738,10 @@ void SfxStoringHelper::SetDocInfoState(
 i_xOldDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
 
 uno::Reference< util::XModifiable > xModifiable( xModel, uno::UNO_QUERY );
-if ( bNoModify && !xModifiable.is() )
+if ( !xModifiable.is() )
 throw uno::RuntimeExcep

[Libreoffice-commits] core.git: include/android

[Libreoffice Gerrit user]

 include/android/compatibility.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f8e989c2384250d30f84651eb03673fb8d8dd096
Author: Noel Grandin 
AuthorDate: Wed Aug 29 11:08:38 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 11:08:38 2018 +0200

fix android build

after
commit 37f9fdc11c4e95d6a34cb515a454503256a82c63
replace rtl_allocateMemory with std::malloc

just add cstdlib as in include to the compatibility header, so that
std::malloc/etc is visible

Change-Id: I3f0569434c41f5427a037a3c8d0ff75389169241

diff --git a/include/android/compatibility.hxx 
b/include/android/compatibility.hxx
index a60d59cfd653..f8375bfe6916 100644
--- a/include/android/compatibility.hxx
+++ b/include/android/compatibility.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace std
 {
___
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-6.0' - 2 commits - external/mariadb-connector-c Repository.mk

[Libreoffice Gerrit user]

 Repository.mk |1 -
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |8 

 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0f31ccc4c3c5548ed1f9f133228936bea1155da2
Author: Andras Timar 
AuthorDate: Tue Aug 28 23:40:36 2018 -0700
Commit: Andras Timar 
CommitDate: Wed Aug 29 02:08:31 2018 -0700

Remove numbertext from Repository.mk (mismerge)

Change-Id: I9b100187e64b05ee087669b44e3e3e4f2b42f7e5

diff --git a/Repository.mk b/Repository.mk
index 415b10b78ed3..5cfe4a115f91 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -390,7 +390,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
-   numbertext \
odbc \
odfflatxml \
offacc \
commit 12aeb21638de108d8207ff7c5d796ea4d0d49965
Author: Miklos Vajna 
AuthorDate: Wed May 30 12:07:46 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 02:08:31 2018 -0700

mariadb-connector-c: fix Windows build

--enable-ext-mariadb-connector is not the default, this fixes the build
after using that switch up to the mariadb-connector-c module.
mysql-connector-cpp is still broken, VS 2015 gives internal compiler
error there for the used boost pieces...

Change-Id: I1845cde03d5166594aac67c23e61186920ab3785
Reviewed-on: https://gerrit.libreoffice.org/55055
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 46ac3e24f65ee69154afa6ba93997635629f79c0)

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 38803b594a1a..78641c53d27e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -25,6 +25,14 @@ $(eval $(call 
gb_StaticLibrary_set_include,mariadb-connector-c,\
 ## (but then need to add "-lssl -lcrypto -lz" to mysqlcppconn linking)
 $(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D 
ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
 
+ifeq ($(OS),WNT)
+$(eval $(call 
gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED 
-DHAVE_STRTOULL))
+$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
+   $$(INCLUDE) \
+   -I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
+))
+endif
+
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/array \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_dyncol \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make check fails in [build JCS]

[Stephan Bergmann]

On 29/08/18 10:04, Regina Henschel wrote:

[build JCS] JunitTest/comphelper_complex
[build JCS] JunitTest/forms_unoapi_3
[build JCS] JunitTest/forms_unoapi_4
[build JCS] JunitTest/forms_complex
[build JCS] JunitTest/framework_complex
error: illegal argument for --class-path: Illegal char <:> at index 4: 
file:///D:/Build_sep18/core/instdir/program/classes/juh.jar
make[1]: *** [D:/Build_Sep18/core/solenv/gbuild/JavaClassSet.mk:53: 
D:/Build_sep18/core/workdir/JavaClassSet/JunitTest/comphelper_complex/done] 
Error 2

make[1]: *** Waiting for unfinished jobs
error: illegal argument for --class-path: Illegal char <:> at index 4: 
file:///D:/Build_sep18/core/instdir/program/classes/juh.jar
make[1]: *** [D:/Build_Sep18/core/solenv/gbuild/JavaClassSet.mk:53: 
D:/Build_sep18/core/workdir/JavaClassSet/JunitTest/forms_complex/done] 
Error 2

make: *** [Makefile:286: build] Error 2
I run into such errors on Windows with recent JDK (9/10; I /think/ it 
started with 9) for quite a while now, wondered why apparently nobody 
else did, locally applied below hack for now, and moved on for the time 
being without investigating deeper into the issue.  (Apparently, Java no 
longer accepts file:... URLs there, at least on Windows, and won't 
accept full pathnames starting with a drive letter like C:/..., but does 
accept ("drive-absolute") pathnames like /...; so my hack should work as 
long as your files are on drive C.)


Apparently, needs more investigation and a proper fix, eventually.



diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 151fb990a0a6..87f76d8a75a4 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -196,7 +196,7 @@ endef
 
 define gb_Jar_use_system_jar

 $(call gb_JavaClassSet_use_system_jar,$(call 
gb_Jar_get_classsetname,$(1)),$(2))
-$(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2)))
+$(call gb_Jar_add_manifest_classpath,$(1),$(subst C:,,$(2)))
 
 endef
 
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk

index cc5fde435c7b..dd0420382e28 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -11,9 +11,9 @@
 $(eval $(call gb_Jar_Jar,test))
 
 $(eval $(call gb_Jar_add_manifest_classpath,test,\

-   $(call gb_Helper_make_url,$(call gb_Jar_get_target,juh)) \
-   $(call gb_Helper_make_url,$(call gb_Jar_get_target,ridl)) \
-   $(call gb_Helper_make_url,$(call gb_Jar_get_target,unoil)) \
+   $(subst C:,,$(call gb_Jar_get_target,juh)) \
+   $(subst C:,,$(call gb_Jar_get_target,ridl)) \
+   $(subst C:,,$(call gb_Jar_get_target,unoil)) \
 ))
 
 $(eval $(call gb_Jar_use_jars,test,\

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - chart2/qa oox/source sfx2/source sw/qa sw/source

[Libreoffice Gerrit user]

 chart2/qa/extras/chart2export.cxx |   40 +++
 chart2/qa/extras/data/docx/testBarChartDataPointPropDOCX.docx |binary
 chart2/qa/extras/data/xlsx/testBarChartDataPointPropXLSX.xlsx |binary
 oox/source/export/chartexport.cxx |   51 ++
 sfx2/source/doc/objserv.cxx   |2 
 sw/qa/extras/layout/data/tdf118058.fodt   |   37 +++
 sw/qa/extras/layout/layout.cxx|9 +
 sw/source/core/layout/sectfrm.cxx |   16 ++-
 8 files changed, 153 insertions(+), 2 deletions(-)

New commits:
commit 0a3a5434ab3d2f9d28dba759d3da2a22498ee13e
Author: Miklos Vajna 
AuthorDate: Mon Aug 13 21:03:08 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 10:53:37 2018 +0200

tdf#118058 sw, sections in tables: no split for multiple columns

The original use-case was "group a few paragraphs together" for the
split sections inside tables, i.e. it's safe to not split when the
section has multiple columns.

And the multiple columns case would mean that we don't find where to put
the follow section inside a table, resulting in a layout loop.

Reviewed-on: https://gerrit.libreoffice.org/58951
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit d2d996db4806e84ae0bf6aef1c285b498f2d2867)

Conflicts:
sw/qa/extras/layout/layout.cxx

Reviewed-on: https://gerrit.libreoffice.org/59686
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 57d732c628b39834a97165404ae02a32577259f5)

Change-Id: Ifab220e582439d2e757b5645f3167b55a051a379

diff --git a/sw/qa/extras/layout/data/tdf118058.fodt 
b/sw/qa/extras/layout/data/tdf118058.fodt
new file mode 100644
index ..dbdf26bf519f
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf118058.fodt
@@ -0,0 +1,37 @@
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  Para 
1.No. However, you will not be able to 
see the colours produced on a black-and-white 
set.
+
+  
+
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 6344a29fd1d4..936909538bfc 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -20,12 +20,14 @@ public:
 void testTdf116925();
 void testTdf117028();
 void testTdf117923();
+void testTdf118058();
 
 CPPUNIT_TEST_SUITE(SwLayoutWriter);
 CPPUNIT_TEST(testTdf116830);
 CPPUNIT_TEST(testTdf116925);
 CPPUNIT_TEST(testTdf117028);
 CPPUNIT_TEST(testTdf117923);
+CPPUNIT_TEST(testTdf118058);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -123,6 +125,13 @@ void SwLayoutWriter::testTdf117923()
 assertXPath(pXmlDoc, "/root/page/body/tab/row/cell/txt[3]/Special", 
"nHeight", "220");
 }
 
+void SwLayoutWriter::testTdf118058()
+{
+SwDoc* pDoc = createDoc("tdf118058.fodt");
+// This resulted in a layout loop.
+pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/layout/sectfrm.cxx 
b/sw/source/core/layout/sectfrm.cxx
index 1030d9ecb0e2..3790c92a199d 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -617,7 +617,21 @@ namespace
 return true;
 
 // The frame is in a table, see if the table is in a section.
-return !pFrame->FindTabFrame()->IsInSct();
+bool bRet = !pFrame->FindTabFrame()->IsInSct();
+
+if (bRet)
+{
+// Don't try to split if the frame itself is a section frame with
+// multiple columns.
+if (pFrame->IsSctFrame())
+{
+const SwFrame* pLower = pFrame->GetLower();
+if (pLower && pLower->IsColumnFrame())
+bRet = false;
+}
+}
+
+return bRet;
 }
 }
 
commit fa465c8506e99d9bc396b33dd8d3d30d6d791de1
Author: Balazs Varga 
AuthorDate: Thu Aug 9 00:06:47 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 29 10:51:52 2018 +0200

tdf#96469 Export Data Point properties in Charts on DOCX/XLSX

If the color or other property of a datapoint in the chart
deviates from the dataseries property, this patch will write it
into a separate dPt tag and fixing the lost properies during
OOXML export.

Reviewed-on: https://gerrit.libreoffice.org/58806
Reviewed-by: Bartosz Kosiorek 
Tested-by: Jenkins
(cherry picked from commit 15035b98dc694bde4c4073fa75bdd2ce9d7e6670)

Change-Id: I3d975675ac3691fcafe76de16e46851561eb2807
Reviewed-on: https://gerrit.libreoffice.org/58807
Tested-by: Jenkins
   

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/inc vcl/source vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/inc/printdlg.hxx   |1 +
 vcl/source/window/printdlg.cxx |9 +
 vcl/uiconfig/ui/printdialog.ui |4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit d6b74181df4a1ddb562fc888f919f56c66242db9
Author: Michael Weghorn 
AuthorDate: Tue Aug 28 07:53:43 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 29 10:54:40 2018 +0200

tdf119556 Sync "Use only paper size from printer preferences"

Since commit ee6dad51150fd53d19f882edfefa879e18f9897d,
the "Use only paper size from printer settings" is shown
at two places in the print dialog

1) in the "Options" tab
2) in the "Properties" -> "Paper" tab

This makes the setting being correctly updated in the UI in
1) as well if changed in 2).

The other way around was already working previously.

Reviewed-on: https://gerrit.libreoffice.org/59581
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 571df3ede6f09c945c4cdfd37f34ef760b6b1af2)

Conflicts:
vcl/inc/printdlg.hxx
vcl/uiconfig/ui/printdialog.ui

Change-Id: I41d29a11b4e1695a4b2f676b8d7a9c01e4abde3e
Reviewed-on: https://gerrit.libreoffice.org/59745
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 1017f509c78b..4e32ed209613 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -234,6 +234,7 @@ namespace vcl
 DECL_LINK_TYPED( ToggleHdl, CheckBox&, void );
 DECL_LINK_TYPED( ToggleRadioHdl, RadioButton&, void );
 DECL_LINK_TYPED( ModifyHdl, Edit&, void );
+DECL_LINK_TYPED( ActivatePageHdl, TabControl *, void);
 
 DECL_LINK_TYPED( UIOption_CheckHdl, CheckBox&, void );
 DECL_LINK_TYPED( UIOption_RadioHdl, RadioButton&, void );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 4761ab68e8c2..3b8fb87fb26b 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -728,6 +728,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const 
std::shared_ptrSetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
+mpTabCtrl->SetActivatePageHdl( LINK( this, PrintDialog, ActivatePageHdl ) 
);
 
 // setup sizes for N-Up
 Size aNupSize( maPController->getPrinter()->PixelToLogic(
@@ -1765,6 +1766,14 @@ IMPL_LINK_TYPED( PrintDialog, ModifyHdl, Edit&, rEdit, 
void )
 }
 }
 
+IMPL_LINK_TYPED( PrintDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
+{
+const sal_uInt16 id = pTabCtrl->GetCurPageId();
+if (pTabCtrl->GetPageName(id) == "optionstab" ) {
+maOptionsPage.mpPapersizeFromSetup->Check( 
maPController->getPapersizeFromSetup() );
+}
+}
+
 PropertyValue* PrintDialog::getValueForWindow( vcl::Window* i_pWindow ) const
 {
 PropertyValue* pVal = nullptr;
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 50a86b55b658..d1db837fef5c 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1510,10 +1510,10 @@
   
 
 
-  
+  
 True
 False
-Options
+Options
   
   
 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Jenkins CI behaviour

[Stephan Bergmann]

On 28/08/18 18:45, Eike Rathke wrote:

This specific (JunitTest_framework_complex) test seemed to always fail on
(only?) tb75 building gerrit_linux_clang_dbgutil, for the last two days
or so; then for the last 14 hours looked stable; currently it seems
those builds get aborted by whoever/whatever. See
https://ci.libreoffice.org/computer/tb75-lilith/builds


JunitTest_framework_complex had failed there because stale processes 
from a previous build were still hanging around, so ca. two days ago I 
took tb75 temporarily offline, killed the leftover processes, and took 
the tb back online.


At least the most recent build of "Gerrit Linux clang/dbgutil" on tb75, 
 is 
green again, so I assume the above actions were effective and 
everything's back to fine again.

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

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

[Libreoffice Gerrit user]

 tools/qa/cppunit/test_time.cxx |   88 +
 1 file changed, 88 insertions(+)

New commits:
commit 7cb6dc2652ce7e2e7d9ec7464bb1eed0d93306d7
Author: Eike Rathke 
AuthorDate: Tue Aug 28 19:51:37 2018 +0200
Commit: Eike Rathke 
CommitDate: Wed Aug 29 10:41:07 2018 +0200

Add unit tests for tools::Time::GetClock()

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

diff --git a/tools/qa/cppunit/test_time.cxx b/tools/qa/cppunit/test_time.cxx
index f1915b71baa1..0de7190bf354 100644
--- a/tools/qa/cppunit/test_time.cxx
+++ b/tools/qa/cppunit/test_time.cxx
@@ -18,9 +18,11 @@ class TimeTest : public CppUnit::TestFixture
 {
 public:
 void testTime();
+void testClockValues();
 
 CPPUNIT_TEST_SUITE(TimeTest);
 CPPUNIT_TEST(testTime);
+CPPUNIT_TEST(testClockValues);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -35,6 +37,92 @@ void TimeTest::testTime()
 CPPUNIT_ASSERT(bool(aOrigTime == aNewTime));
 }
 
+void TimeTest::testClockValues()
+{
+double fTime, fFractionOfSecond;
+sal_uInt16 nHour, nMinute, nSecond;
+
+fTime = 0.0;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(0), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.0, 
fFractionOfSecond, 0.0);
+
+fTime = 1.0;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(0), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.0, 
fFractionOfSecond, 0.0);
+
+fTime = -1.0;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(0), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.0, 
fFractionOfSecond, 0.0);
+
+fTime = 1.5;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(12), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.0, 
fFractionOfSecond, 0.0);
+
+fTime = -1.5;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(12), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.0, 
fFractionOfSecond, 0.0);
+
+fTime = 0.75;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(18), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.0, 
fFractionOfSecond, 0.0);
+
+fTime = 0.0208;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(0), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(30), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.0, 
fFractionOfSecond, 0.0);
+
+fTime = 0.115740625;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 3);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(0), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(0), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(0), nSecond);
+// Last digit may differ.
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.999, 
fFractionOfSecond, 1.1e-3);
+
+fTime = 0.524268391203704;
+Time::GetClock(fTime, nHour, nMinute, nSecond, fFractionOfSecond, 3);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Hour value.", sal_uInt16(12), nHour);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Minute value.", sal_uInt16(34), nMinute);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Second value.", sal_uInt16(56), nSecond);
+// Last digit may differ.
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Fraction value.", 0.789, 
f

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

[Libreoffice Gerrit user]

 include/vcl/scheduler.hxx   |   12 
 sw/source/core/doc/DocumentTimerManager.cxx |   25 +
 vcl/source/app/scheduler.cxx|5 +
 3 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit 3bd8316718fdfed454c01a9c4ae6af6beb34437d
Author: Jan-Marek Glogowski 
AuthorDate: Tue Aug 28 15:24:26 2018 +
Commit: Jan-Marek Glogowski 
CommitDate: Wed Aug 29 10:10:14 2018 +0200

tdf#119458 just wakeup Scheduler on active Idle

So this almost returns the code to the original state, before I
started fixing tdf#116370... a long way. This introduces the new
Scheduler::Wakeup() function, which will just queue a Scheduler
event in the System event queue unconditionally.

This should prevent fdo#73165, which I couldn't reproduce, but
just to be sure.

More importantly this patch resets the m_bStartOnUnblock when
the Idle job actually runs. This run should already determinates
if more Idle work needs to be done, and others can still call
BeginIdling() to ensure further processing.

This also drops the IsBusyDoc() test from UnblockIdling(). We
can't really know, if the document is still busy when the
Scheduler is finally running, be it by the system timer or
Application::Reschedule().

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

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index ac429ed33b09..6233d134a8ed 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -65,6 +65,18 @@ public:
  */
 static void   ProcessEventsToIdle();
 
+/**
+ * Wakes up the scheduler
+ *
+ * This doesn't handle any events! It just ensures the Scheduler is run as
+ * soon as possible by forcing the Scheduler timer to fire.
+ *
+ * Can be used for complex UpdateMinPeriod function, where the task is
+ * actually active but not ready and we want to skip the Task::Start()
+ * queue append for faster reaction.
+ */
+static void   Wakeup();
+
 /// Control the deterministic mode.  In this mode, two subsequent runs of
 /// LibreOffice fire about the same amount idles.
 static void   SetDeterministicMode(bool bDeterministic);
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx 
b/sw/source/core/doc/DocumentTimerManager.cxx
index 81c46b125840..7bd2e505a3a4 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace sw
 {
@@ -49,10 +50,14 @@ DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc 
) : m_rDoc( i_rSwdoc
 
 void DocumentTimerManager::StartIdling()
 {
-if (m_nIdleBlockCount > 0)
-m_bStartOnUnblock = true;
-else if (!m_aDocIdle.IsActive())
-m_aDocIdle.Start();
+m_bStartOnUnblock = true;
+if (0 == m_nIdleBlockCount)
+{
+if (!m_aDocIdle.IsActive())
+m_aDocIdle.Start();
+else
+Scheduler::Wakeup();
+}
 }
 
 void DocumentTimerManager::StopIdling()
@@ -64,11 +69,6 @@ void DocumentTimerManager::StopIdling()
 void DocumentTimerManager::BlockIdling()
 {
 assert(SAL_MAX_UINT32 != m_nIdleBlockCount);
-if (0 == m_nIdleBlockCount)
-{
-assert(!m_bStartOnUnblock);
-m_bStartOnUnblock = false;
-}
 ++m_nIdleBlockCount;
 }
 
@@ -79,10 +79,10 @@ void DocumentTimerManager::UnblockIdling()
 
 if ((0 == m_nIdleBlockCount) && m_bStartOnUnblock)
 {
-m_bStartOnUnblock = false;
-// kick the active idle, if it's not anymore blocked by IsDocIdle()
-if (IsDocIdle())
+if (!m_aDocIdle.IsActive())
 m_aDocIdle.Start();
+else
+Scheduler::Wakeup();
 }
 }
 
@@ -137,6 +137,7 @@ IMPL_LINK_NOARG( DocumentTimerManager, DoIdleJobs, Timer*, 
void )
 pModLogFile = new ::rtl::Logfile( "First DoIdleJobs" );
 #endif
 BlockIdling();
+StopIdling();
 
 IdleJob eJob = GetNextIdleJob();
 
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 4a35115f2db3..93fcfeca7df9 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -506,6 +506,11 @@ next_entry:
 return !!pMostUrgent;
 }
 
+void Scheduler::Wakeup()
+{
+Scheduler::ImplStartTimer( 0, false, tools::Time::GetSystemTicks() );
+}
+
 void Task::StartTimer( sal_uInt64 nMS )
 {
 Scheduler::ImplStartTimer( nMS, false, tools::Time::GetSystemTicks() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

make check fails in [build JCS]

[Regina Henschel]

Hi all,

after a successful build with "build-nocheck", the next step "make 
check" fails in [build JCS].


I get the error messages:
[build JCS] JunitTest/comphelper_complex
[build JCS] JunitTest/forms_unoapi_3
[build JCS] JunitTest/forms_unoapi_4
[build JCS] JunitTest/forms_complex
[build JCS] JunitTest/framework_complex
error: illegal argument for --class-path: Illegal char <:> at index 4: 
file:///D:/Build_sep18/core/instdir/program/classes/juh.jar
make[1]: *** [D:/Build_Sep18/core/solenv/gbuild/JavaClassSet.mk:53: 
D:/Build_sep18/core/workdir/JavaClassSet/JunitTest/comphelper_complex/done] 
Error 2

make[1]: *** Waiting for unfinished jobs
error: illegal argument for --class-path: Illegal char <:> at index 4: 
file:///D:/Build_sep18/core/instdir/program/classes/juh.jar
make[1]: *** [D:/Build_Sep18/core/solenv/gbuild/JavaClassSet.mk:53: 
D:/Build_sep18/core/workdir/JavaClassSet/JunitTest/forms_complex/done] 
Error 2

make: *** [Makefile:286: build] Error 2

My configure is
--with-external-tar=/cygdrive/d/Build_Sep18/externalsrc
--with-junit=/cygdrive/c/cygwin64/junit/junit-4.10.jar
--with-ant-home=/cygdrive/c/cygwin64/ant199
--disable-ccache
--with-visual-studio=2017
--with-help=html
--with-lang=de
--enable-64-bit
--enable-debug
--disable-cve-tests
--with-parallelism=4
--with-jdk-home=/cygdrive/c/Programme/Java/jdk-9.0.1

Kind regards
Regina

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

[Libreoffice-commits] core.git: 2 commits - chart2/source cppu/source dbaccess/source filter/source include/oox include/package include/sfx2 oox/source package/source sc/source sfx2/source sw/source

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |   26 +++---
 cppu/source/uno/copy.hxx  |2 -
 dbaccess/source/ui/dlg/dbadmin.cxx|6 +--
 filter/source/xsltfilter/OleHandler.cxx   |2 -
 include/oox/export/drawingml.hxx  |2 -
 include/package/Deflater.hxx  |2 -
 include/sfx2/tabdlg.hxx   |1 
 oox/source/export/drawingml.cxx   |3 +
 oox/source/export/shapes.cxx  |2 -
 package/source/zipapi/Deflater.cxx|6 +--
 package/source/zipapi/ZipOutputEntry.cxx  |2 -
 sc/source/filter/excel/xicontent.cxx  |   12 ++
 sc/source/filter/inc/formulabase.hxx  |3 -
 sc/source/filter/oox/formulabase.cxx  |   18 -
 sc/source/ui/dataprovider/dataprovider.cxx|5 +-
 sc/source/ui/docshell/docsh.cxx   |3 -
 sc/source/ui/inc/dataprovider.hxx |2 -
 sfx2/source/dialog/dinfdlg.cxx|2 -
 sfx2/source/dialog/tabdlg.cxx |5 +-
 sw/source/uibase/app/docsh2.cxx   |2 -
 20 files changed, 49 insertions(+), 57 deletions(-)

New commits:
commit b406744b8f2af5ea4e2440df62caa0f896efa2f4
Author: Noel Grandin 
AuthorDate: Wed Aug 29 09:43:11 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 09:43:11 2018 +0200

fix android build

after
commit 37f9fdc11c4e95d6a34cb515a454503256a82c63
replace rtl_allocateMemory with std::malloc

Change-Id: Ib565eeb5277a9184f875e67b55040bedbbbdb952

diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index 31f70092c279..79c738f7f37b 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.hxx
@@ -21,7 +21,7 @@
 
 #include "prim.hxx"
 #include "constr.hxx"
-
+#include 
 
 namespace cppu
 {
commit 80343351c9444bba7a5ac98f22fddbbecf5abb9f
Author: Noel Grandin 
AuthorDate: Tue Aug 28 13:43:50 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 09:38:51 2018 +0200

loplugin:constantparam (2)

Change-Id: I528f22876497f87159e3b9453362ebbfb55b7092

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 26e2a6cc1164..6d509a41b66e 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -350,7 +350,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
 AddTabPage(RID_SVXPAGE_TRANSPARENCE, 
SchResId(STR_PAGE_TRANSPARENCY));
 AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
 AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, 
SchResId(STR_PAGE_FONT_EFFECTS));
-AddTabPage(TP_ALIGNMENT, SchResId(STR_PAGE_ALIGNMENT), 
SchAlignmentTabPage::Create, nullptr);
+AddTabPage(TP_ALIGNMENT, SchResId(STR_PAGE_ALIGNMENT), 
SchAlignmentTabPage::Create);
 if( aCJKOptions.IsAsianTypographyEnabled() )
 AddTabPage(RID_SVXPAGE_PARA_ASIAN, SchResId(STR_PAGE_ASIAN));
 break;
@@ -361,7 +361,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
 AddTabPage(RID_SVXPAGE_TRANSPARENCE, 
SchResId(STR_PAGE_TRANSPARENCY));
 AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
 AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, 
SchResId(STR_PAGE_FONT_EFFECTS));
-AddTabPage(TP_LEGEND_POS, SchResId(STR_PAGE_POSITION), 
SchLegendPosTabPage::Create, nullptr);
+AddTabPage(TP_LEGEND_POS, SchResId(STR_PAGE_POSITION), 
SchLegendPosTabPage::Create);
 if( aCJKOptions.IsAsianTypographyEnabled() )
 AddTabPage(RID_SVXPAGE_PARA_ASIAN, SchResId(STR_PAGE_ASIAN));
 break;
@@ -369,12 +369,12 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
 case OBJECTTYPE_DATA_SERIES:
 case OBJECTTYPE_DATA_POINT:
 if( m_pParameter->ProvidesSecondaryYAxis() || 
m_pParameter->ProvidesOverlapAndGapWidth() || 
m_pParameter->ProvidesMissingValueTreatments() )
-AddTabPage(TP_OPTIONS, 
SchResId(STR_PAGE_OPTIONS),SchOptionTabPage::Create, nullptr);
+AddTabPage(TP_OPTIONS, 
SchResId(STR_PAGE_OPTIONS),SchOptionTabPage::Create);
 if( m_pParameter->ProvidesStartingAngle())
-AddTabPage(TP_POLAROPTIONS, 
SchResId(STR_PAGE_OPTIONS),PolarOptionsTabPage::Create, nullptr);
+AddTabPage(TP_POLAROPTIONS, 
SchResId(STR_PAGE_OPTIONS),PolarOptionsTabPage::Create);
 
 if( m_pParameter->HasGeometryProperties() )
-AddTabPage(TP_LAYOUT, 
SchResId(STR_PAGE_LAYOUT),SchLayoutTabPage::Create, nullptr

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - svtools/qa svtools/source

[Libreoffice Gerrit user]

 svtools/qa/unit/testHtmlReader.cxx |   22 ++
 svtools/source/svhtml/parhtml.cxx  |3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit b922673b9a1f1537a77c8fc8a0063f445a983193
Author: Miklos Vajna 
AuthorDate: Tue Aug 28 18:10:03 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 29 08:51:13 2018 +0200

XHTML import:  is one line break

But only for XHTML, HTML stays unchanged to be in sync with web
browsers.

Change-Id: I3a1cf6651dab565bafece68963acb112ae715cdd
Reviewed-on: https://gerrit.libreoffice.org/59727
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 60362accc78fdff4213fa6c28bb4fbf00e06972f)

diff --git a/svtools/qa/unit/testHtmlReader.cxx 
b/svtools/qa/unit/testHtmlReader.cxx
index 151976eabc9d..d5ad61d4a9a5 100644
--- a/svtools/qa/unit/testHtmlReader.cxx
+++ b/svtools/qa/unit/testHtmlReader.cxx
@@ -23,8 +23,11 @@ class TestHTMLParser : public HTMLParser
 public:
 TestHTMLParser(SvStream& rStream);
 virtual void NextToken(HtmlTokenId nToken) override;
+/// Make this public for test purposes.
+using HTMLParser::SetNamespace;
 
 OUString m_aDocument;
+int m_nLineBreakCount = 0;
 };
 
 TestHTMLParser::TestHTMLParser(SvStream& rStream)
@@ -36,6 +39,8 @@ void TestHTMLParser::NextToken(HtmlTokenId nToken)
 {
 if (nToken == HtmlTokenId::TEXTTOKEN)
 m_aDocument += aToken;
+else if (nToken == HtmlTokenId::LINEBREAK)
+++m_nLineBreakCount;
 }
 
 /// Tests HTMLParser.
@@ -43,9 +48,11 @@ class Test : public CppUnit::TestFixture
 {
 public:
 void testTdf114428();
+void testLineBreak();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testTdf114428);
+CPPUNIT_TEST(testLineBreak);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -64,6 +71,21 @@ void Test::testTdf114428()
 CPPUNIT_ASSERT_EQUAL(OUString("hello"), xParser->m_aDocument.trim());
 }
 
+void Test::testLineBreak()
+{
+SvMemoryStream aStream;
+OString aDocument("aaabbb");
+aStream.WriteBytes(aDocument.getStr(), aDocument.getLength());
+aStream.Seek(0);
+
+tools::SvRef xParser = new TestHTMLParser(aStream);
+xParser->SetNamespace("reqif-xhtml");
+xParser->CallParser();
+
+// This was 2,  was interpreted as 2 line breaks in XHTML mode.
+CPPUNIT_ASSERT_EQUAL(1, xParser->m_nLineBreakCount);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index 1964dd9a42fd..ad65dec1484f 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1077,10 +1077,11 @@ HtmlTokenId HTMLParser::GetNextToken_()
 // and there is an off token, return off token 
instead
 nRet = (HtmlTokenId)((int)nRet + 1);
  }
- else if( HtmlTokenId::LINEBREAK!=nRet )
+ else if( HtmlTokenId::LINEBREAK!=nRet || 
!maNamespace.isEmpty())
  {
 // and there is no off token, return unknown token.
 // (except for , that is treated like )
+// No exception for XHTML, though.
 nRet = HtmlTokenId::UNKNOWNCONTROL_OFF;
  }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: binaryurp/source bridges/source cli_ure/source cppuhelper/source cppu/source filter/source forms/source idlc/source io/source javaunohelper/source registry/source regis

[Libreoffice Gerrit user]

 binaryurp/source/unmarshal.cxx  |2 
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx  |   12 -
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |4 
 bridges/source/jni_uno/jni_base.h   |6 
 cli_ure/source/uno_bridge/cli_base.h|6 
 cppu/source/uno/copy.hxx|   22 +--
 cppu/source/uno/destr.hxx   |   12 -
 cppu/source/uno/sequence.cxx|   10 -
 cppuhelper/source/component_context.cxx |2 
 filter/source/graphicfilter/ipcd/ipcd.cxx   |   48 +++
 forms/source/xforms/xpathlib/xpathlib.cxx   |6 
 idlc/source/aststack.cxx|4 
 idlc/source/idlccompile.cxx |4 
 io/source/stm/streamhelper.cxx  |6 
 javaunohelper/source/bootstrap.cxx  |2 
 registry/source/keyimpl.cxx |  124 ++--
 registry/source/regimpl.cxx |   12 -
 registry/source/regkey.cxx  |   14 +-
 registry/test/testregcpp.cxx|   12 -
 sal/rtl/alloc_cache.cxx |7 -
 sdext/source/pdfimport/inc/pdfparse.hxx |2 
 sdext/source/pdfimport/pdfparse/pdfentries.cxx  |   22 +--
 sdext/source/pdfimport/pdfparse/pdfparse.cxx|4 
 sdext/source/pdfimport/test/pdfunzip.cxx|6 
 store/source/lockbyte.cxx   |4 
 store/source/storbase.hxx   |4 
 store/source/storbios.cxx   |6 
 store/source/storcach.cxx   |6 
 svl/source/misc/strmadpt.cxx|   12 -
 sw/source/filter/ww8/ww8par.cxx |2 
 ucb/source/ucp/ftp/ftpurl.cxx   |4 
 vcl/headless/svpprn.cxx |2 
 vcl/osx/salprn.cxx  |6 
 vcl/qt5/Qt5Instance_Print.cxx   |2 
 vcl/quartz/salbmp.cxx   |6 
 vcl/quartz/salvd.cxx|8 -
 vcl/quartz/utils.cxx|4 
 vcl/source/filter/igif/decode.cxx   |6 
 vcl/source/filter/igif/gifread.cxx  |2 
 vcl/source/fontsubset/list.cxx  |   11 -
 vcl/source/gdi/impvect.cxx  |6 
 vcl/source/gdi/jobset.cxx   |6 
 vcl/source/gdi/octree.cxx   |8 -
 vcl/source/gdi/pdfwriter_impl.cxx   |2 
 vcl/source/gdi/pdfwriter_impl2.cxx  |7 -
 vcl/source/gdi/print.cxx|2 
 vcl/unx/generic/app/sm.cxx  |   12 -
 vcl/unx/generic/dtrans/bmp.cxx  |6 
 vcl/unx/generic/print/genprnpsp.cxx |4 
 vcl/unx/generic/printer/jobdata.cxx |2 
 vcl/win/gdi/salprn.cxx  |   42 +++---
 51 files changed, 265 insertions(+), 266 deletions(-)

New commits:
commit 37f9fdc11c4e95d6a34cb515a454503256a82c63
Author: Noel Grandin 
AuthorDate: Tue Aug 28 09:09:33 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 09:05:39 2018 +0200

replace rtl_allocateMemory with std::malloc

where used directly, since rtl_allocateMemory now just calls into 
std::malloc

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

diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index 3ea3d2058553..41145ccffca5 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -55,7 +55,7 @@ namespace binaryurp {
 namespace {
 
 void * allocate(sal_Size size) {
-void * p = rtl_allocateMemory(size);
+void * p = std::malloc(size);
 if (p == nullptr) {
 throw std::bad_alloc();
 }
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 82fcf345cd0d..8e6a1795f898 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -132,7 +132,7 @@ type_info * RTTInfos::getRTTI( OUString const & rUNOname ) 
throw ()
 {
 // insert new type_info
 OString aRawName( OUStringToOString( toRTTIname( rUNOname ), 
RTL_TEXTENCODING_ASCII_US ) );
-__type_info * pRTTI = new( ::rtl_allocateMemory( sizeof(__type_info) + 
aRawName.getLength() ) )
+__type_info * pRTTI = new( std::malloc( sizeof(__type_info) + 
aRawName.getLength() ) )
 __type_info( NULL, aRawName.getStr() );
 
 // put into map
@@ -162,7 +162,7 @@ RTTInfos::~RTTInfos() throw ()
 {
  

[Libreoffice-commits] core.git: chart2/qa chart2/source compilerplugins/clang connectivity/source dbaccess/qa dbaccess/source filter/source forms/source i18nlangtag/source sc/source sd/source sfx2/sou

[Libreoffice Gerrit user]

 chart2/qa/extras/chart2dump/chart2dump.cxx   |4 
 chart2/source/tools/ExponentialRegressionCurveCalculator.cxx |   12 -
 chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx |8 -
 chart2/source/tools/PolynomialRegressionCurveCalculator.cxx  |2 
 chart2/source/tools/PotentialRegressionCurveCalculator.cxx   |6 
 chart2/source/view/charttypes/VSeriesPlotter.cxx |2 
 compilerplugins/clang/stringbuffer.cxx   |   67 +++
 compilerplugins/clang/test/stringbuffer.cxx  |   22 +++
 connectivity/source/drivers/postgresql/pq_xkeys.cxx  |2 
 connectivity/source/drivers/postgresql/pq_xtables.cxx|2 
 connectivity/source/drivers/postgresql/pq_xuser.cxx  |6 
 connectivity/source/drivers/postgresql/pq_xviews.cxx |6 
 dbaccess/qa/unit/embeddeddb_performancetest.cxx  |   17 +-
 dbaccess/source/core/api/CacheSet.cxx|6 
 dbaccess/source/core/api/KeySet.cxx  |   10 -
 dbaccess/source/core/api/OptimisticSet.cxx   |4 
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx   |   20 +--
 dbaccess/source/core/dataaccess/ContentHelper.cxx|2 
 dbaccess/source/ext/macromigration/migrationlog.cxx  |8 -
 dbaccess/source/filter/xml/xmlServerDatabase.cxx |   22 +--
 dbaccess/source/ui/misc/WCopyTable.cxx   |2 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx   |2 
 dbaccess/source/ui/uno/copytablewizard.cxx   |2 
 filter/source/config/cache/filtercache.cxx   |   24 +--
 forms/source/xforms/model_ui.cxx |2 
 i18nlangtag/source/languagetag/languagetag.cxx   |6 
 sc/source/core/tool/chgtrack.cxx |4 
 sc/source/core/tool/compiler.cxx |4 
 sd/source/filter/html/htmlex.cxx |   12 -
 sfx2/source/control/unoctitm.cxx |6 
 solenv/CompilerTest_compilerplugins_clang.mk |1 
 sw/source/uibase/uiview/pview.cxx|4 
 vcl/source/uitest/logger.cxx |   12 -
 xmloff/source/draw/animationexport.cxx   |2 
 xmloff/source/draw/shapeexport.cxx   |2 
 xmloff/source/style/xmlbahdl.cxx |4 
 xmloff/source/style/xmlexppr.cxx |2 
 xmloff/source/style/xmlnumfi.cxx |6 
 xmloff/source/xforms/xformsexport.cxx|6 
 xmlsecurity/source/dialogs/resourcemanager.cxx   |2 
 40 files changed, 212 insertions(+), 121 deletions(-)

New commits:
commit 4c91b89d8ce9c34179f31854dc88bd0a9fa84cba
Author: Noel Grandin 
AuthorDate: Tue Aug 28 15:09:33 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 09:05:18 2018 +0200

new loplugin:oustringbuffer

look for places where we are appending the temporary result of adding
strings together, to an OUStringBuffer, where we could rather call
append repeatedly and avoid the temporary creation

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

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index ceb818c70e0f..e06ce2f76415 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -230,7 +230,7 @@ protected:
 OUStringBuffer aBufer;
 for (const OUString& seqItem : rSeq)
 {
-aBufer.append(seqItem + ";");
+aBufer.append(seqItem).append(";");
 }
 return aBufer.makeStringAndClear();
 }
@@ -240,7 +240,7 @@ protected:
 OUStringBuffer aBufer;
 for (const double& vectorItem : rVector)
 {
-aBufer.append(OUString::number(vectorItem) + ";");
+aBufer.append(OUString::number(vectorItem)).append(";");
 }
 return aBufer.makeStringAndClear();
 }
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx 
b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index db59250b76b0..42d0480d6b73 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -179,13 +179,13 @@ OUString 
ExponentialRegressionCurveCalculator::ImplGetRepresentation(
 // if nValueLength not calculated then nullptr
 sal_Int32* pValueLength = nValueLength ? &nValueLength : nullptr;
 if ( m_fSign < 0.0 )
-aTmpBuf.append( OUStringLiteral1(aMinusSign) + " " );
+aTmpBuf.append( OUStringLiteral1(aMinu

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

[Libreoffice Gerrit user]

 include/svx/dlgctrl.hxx   |1 +
 svx/source/dialog/dlgctrl.cxx |   17 +
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit a1f31211920bfae1a21ea375fa5280c9c6595e15
Author: Caolán McNamara 
AuthorDate: Tue Aug 28 15:59:34 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 29 09:03:06 2018 +0200

remove 1 pixel white band in XRectPreview

Change-Id: I3089f9305b8142e2c78405a4f9ae6a2066e90cfa
Reviewed-on: https://gerrit.libreoffice.org/59725
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index eb587a299378..a355c50e2907 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -478,6 +478,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC XRectPreview : public 
PreviewBase
 private:
 SdrObject* mpRectangleObject;
 
+tools::Rectangle GetPreviewSize() const;
 public:
 XRectPreview();
 virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index b7a3e6c5f92e..dce8c6d4b4b0 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -2270,27 +2270,36 @@ XRectPreview::XRectPreview()
 {
 }
 
+// expand to avoid 1 pixel band to the right and bottom of previews
+// in color/gradient/bitmap/pattern/hatch subpages of area tab
+// in e.g. page dialog
+tools::Rectangle XRectPreview::GetPreviewSize() const
+{
+tools::Rectangle aObjectSize(Point(), GetOutputSizePixel());
+aObjectSize.AdjustRight(1);
+aObjectSize.AdjustBottom(1);
+return aObjectSize;
+}
+
 void XRectPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
 PreviewBase::SetDrawingArea(pDrawingArea);
 InitSettings();
 
 // create RectangleObject
-const tools::Rectangle aObjectSize(Point(), GetOutputSizePixel());
 mpRectangleObject = new SdrRectObj(
 getModel(),
-aObjectSize);
+GetPreviewSize());
 }
 
 void XRectPreview::Resize()
 {
-const tools::Rectangle aObjectSize(Point(), GetOutputSizePixel());
 SdrObject *pOrigObject = mpRectangleObject;
 if (pOrigObject)
 {
 mpRectangleObject = new SdrRectObj(
 getModel(),
-aObjectSize);
+GetPreviewSize());
 SetAttributes(pOrigObject->GetMergedItemSet());
 SdrObject::Free(pOrigObject);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source comphelper/source connectivity/source cppu/source dbaccess/source editeng/source include/comphelper include/connectivity include/editeng reportdesign/sour

[Libreoffice Gerrit user]

 chart2/source/model/template/ScatterChartType.cxx |   14 ---
 chart2/source/model/template/ScatterChartType.hxx |5 -
 comphelper/source/misc/sequence.cxx   |   49 +--
 connectivity/source/commontools/ConnectionWrapper.cxx |2 
 connectivity/source/commontools/dbtools2.cxx  |6 -
 cppu/source/uno/sequence.cxx  |   78 +-
 dbaccess/source/core/dataaccess/connection.cxx|2 
 dbaccess/source/ui/querydesign/QueryTableView.cxx |   12 +-
 editeng/source/items/textitem.cxx |4 
 include/comphelper/sequence.hxx   |6 -
 include/connectivity/dbtools.hxx  |5 -
 include/editeng/nhypitem.hxx  |3 
 reportdesign/source/core/api/ReportDefinition.cxx |2 
 svx/source/fmcomp/gridcell.cxx|   12 +-
 sw/source/core/bastyp/init.cxx|2 
 15 files changed, 74 insertions(+), 128 deletions(-)

New commits:
commit 6dbae37b8d2d2d1ecad85c772fd684803b5a52cb
Author: Noel Grandin 
AuthorDate: Tue Aug 28 11:15:47 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 29 09:00:52 2018 +0200

loplugin:constantparam (1)

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

diff --git a/chart2/source/model/template/ScatterChartType.cxx 
b/chart2/source/model/template/ScatterChartType.cxx
index 749a3e049c9d..fb73766efb75 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -136,20 +136,8 @@ struct StaticScatterChartTypeInfo : public 
rtl::StaticAggregate< uno::Reference<
 namespace chart
 {
 
-ScatterChartType::ScatterChartType(
-chart2::CurveStyle eCurveStyle /* chart2::CurveStyle_LINES */ ,
-sal_Int32 nResolution /* = 20 */,
-sal_Int32 nOrder /* = 3 */ )
+ScatterChartType::ScatterChartType()
 {
-if( eCurveStyle != chart2::CurveStyle_LINES )
-setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_CURVE_STYLE,
-  uno::Any( eCurveStyle ));
-if( nResolution != 20 )
-setFastPropertyValue_NoBroadcast( 
PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION,
-  uno::Any( nResolution ));
-if( nOrder != 3 )
-setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_SPLINE_ORDER,
-  uno::Any( nOrder ));
 }
 
 ScatterChartType::ScatterChartType( const ScatterChartType & rOther ) :
diff --git a/chart2/source/model/template/ScatterChartType.hxx 
b/chart2/source/model/template/ScatterChartType.hxx
index cf61b9421537..28a7aab24488 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -28,10 +28,7 @@ namespace chart
 class ScatterChartType final : public ChartType
 {
 public:
-ScatterChartType(
-css::chart2::CurveStyle eCurveStyle =  css::chart2::CurveStyle_LINES,
-sal_Int32 nResolution = 20,
-sal_Int32 nOrder = 3 );
+ScatterChartType();
 virtual ~ScatterChartType() override;
 
 virtual OUString SAL_CALL
diff --git a/comphelper/source/misc/sequence.cxx 
b/comphelper/source/misc/sequence.cxx
index 9236ee7d9bb6..81079de2223c 100644
--- a/comphelper/source/misc/sequence.cxx
+++ b/comphelper/source/misc/sequence.cxx
@@ -21,56 +21,21 @@
 
 namespace comphelper
 {
-css::uno::Sequence findValue(const css::uno::Sequence< OUString >& 
_rList, const OUString& _rValue, bool _bOnlyFirst)
+sal_Int32 findValue(const css::uno::Sequence< OUString >& _rList, const 
OUString& _rValue)
 {
 sal_Int32 nLength = _rList.getLength();
 
-if( _bOnlyFirst )
+// at which position do I find the value?
+const OUString* pTArray = _rList.getConstArray();
+for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
 {
-// at which position do I find the value?
-sal_Int32 nPos = -1;
-const OUString* pTArray = _rList.getConstArray();
-for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
+if( *pTArray == _rValue )
 {
-if( *pTArray == _rValue )
-{
-nPos = i;
-break;
-}
+return i;
 }
-
-// fill sequence
-if( nPos>-1 )
-{
-css::uno::Sequence aRetSeq( 1 );
-aRetSeq.getArray()[0] = static_cast(nPos);
-
-return aRetSeq;
-}
-
-return css::uno::Sequence();
-
 }
-else
-{
-css::uno::Sequence aRetSeq( nLength );
-sal_Int16* pReturn = aRetSeq.getArray();
-
-// how often does the value occur?
-const OUString* pTArray = _rList.getConstArray();
-for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
-{
-if( *pTArray =