[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 12 commits - loleaflet/dist loleaflet/po loleaflet/src loleaflet/unocommands.js loolwsd/Common.hpp loolwsd/DocumentBr

[Ashod Nakashian]

 loleaflet/dist/l10n/uno/af.json   |2 
 loleaflet/dist/l10n/uno/am.json   |2 
 loleaflet/dist/l10n/uno/an.json   |2 
 loleaflet/dist/l10n/uno/ar.json   |2 
 loleaflet/dist/l10n/uno/as.json   |2 
 loleaflet/dist/l10n/uno/ast.json  |2 
 loleaflet/dist/l10n/uno/be.json   |2 
 loleaflet/dist/l10n/uno/bg.json   |2 
 loleaflet/dist/l10n/uno/bn-IN.json|2 
 loleaflet/dist/l10n/uno/bn.json   |2 
 loleaflet/dist/l10n/uno/bo.json   |2 
 loleaflet/dist/l10n/uno/br.json   |2 
 loleaflet/dist/l10n/uno/brx.json  |2 
 loleaflet/dist/l10n/uno/bs.json   |2 
 loleaflet/dist/l10n/uno/ca-valencia.json  |2 
 loleaflet/dist/l10n/uno/ca.json   |2 
 loleaflet/dist/l10n/uno/cs.json   |2 
 loleaflet/dist/l10n/uno/cy.json   |2 
 loleaflet/dist/l10n/uno/da.json   |2 
 loleaflet/dist/l10n/uno/de.json   |2 
 loleaflet/dist/l10n/uno/dgo.json  |2 
 loleaflet/dist/l10n/uno/dz.json   |2 
 loleaflet/dist/l10n/uno/el.json   |2 
 loleaflet/dist/l10n/uno/en-GB.json|2 
 loleaflet/dist/l10n/uno/en-ZA.json|2 
 loleaflet/dist/l10n/uno/eo.json   |2 
 loleaflet/dist/l10n/uno/es.json   |2 
 loleaflet/dist/l10n/uno/et.json   |2 
 loleaflet/dist/l10n/uno/eu.json   |2 
 loleaflet/dist/l10n/uno/fa.json   |2 
 loleaflet/dist/l10n/uno/fi.json   |2 
 loleaflet/dist/l10n/uno/fr.json   |2 
 loleaflet/dist/l10n/uno/ga.json   |2 
 loleaflet/dist/l10n/uno/gd.json   |2 
 loleaflet/dist/l10n/uno/gl.json   |2 
 loleaflet/dist/l10n/uno/gu.json   |2 
 loleaflet/dist/l10n/uno/gug.json  |2 
 loleaflet/dist/l10n/uno/he.json   |2 
 loleaflet/dist/l10n/uno/hi.json   |2 
 loleaflet/dist/l10n/uno/hr.json   |2 
 loleaflet/dist/l10n/uno/hu.json   |2 
 loleaflet/dist/l10n/uno/id.json   |2 
 loleaflet/dist/l10n/uno/is.json   |2 
 loleaflet/dist/l10n/uno/it.json   |2 
 loleaflet/dist/l10n/uno/ja.json   |2 
 loleaflet/dist/l10n/uno/ka.json   |2 
 loleaflet/dist/l10n/uno/kk.json   |2 
 loleaflet/dist/l10n/uno/km.json   |2 
 loleaflet/dist/l10n/uno/kmr-Latn.json |2 
 loleaflet/dist/l10n/uno/kn.json   |2 
 loleaflet/dist/l10n/uno/ko.json   |2 
 loleaflet/dist/l10n/uno/kok.json  |2 
 loleaflet/dist/l10n/uno/ks.json   |2 
 loleaflet/dist/l10n/uno/lb.json   |2 
 loleaflet/dist/l10n/uno/lo.json   |2 
 loleaflet/dist/l10n/uno/lt.json   |2 
 loleaflet/dist/l10n/uno/lv.json   |2 
 loleaflet/dist/l10n/uno/mai.json  |2 
 loleaflet/dist/l10n/uno/mk.json   |2 
 loleaflet/dist/l10n/uno/ml.json   |2 
 loleaflet/dist/l10n/uno/mn.json   |2 
 loleaflet/dist/l10n/uno/mni.json  |2 
 loleaflet/dist/l10n/uno/mr.json   |2 
 loleaflet/dist/l10n/uno/my.json   |2 
 loleaflet/dist/l10n/uno/nb.json   |2 
 loleaflet/dist/l10n/uno/ne.json   |2 
 loleaflet/dist/l10n/uno/nl.json   |2 
 loleaflet/dist/l10n/uno/nn.json   |2 
 loleaflet/dist/l10n/uno/nso.json  |2 
 loleaflet/dist/l10n/uno/oc.json   |2 
 loleaflet/dist/l10n/uno/om.json   |2 
 loleaflet/dist/l10n/uno/or.json   |2 
 loleaflet/dist/l10n/uno/pa-IN.json|2 
 loleaflet/dist/l10n/uno/pl.json   |2 
 loleaflet/dist/l10n/uno/pt-BR.json|2 
 loleaflet/dist/l10n/uno/pt.json   |2 
 loleaflet/dist/l10n/uno/ro.json   |2 
 loleaflet/dist/l10n/uno/ru.json   |2 
 loleaflet/dist/l10n/uno/rw.json   |2 
 loleaflet/dist/l10n/uno/sa-IN.json|2 
 loleaflet/dist/l10n/uno/sat.json  |2 
 loleaflet/dist/l10n/uno/sd.json   |2 
 loleaflet/dist/l10n/uno/si.json   |2 
 loleaflet/dist/l10n/uno/sid.json  |2 
 loleaflet/dist/l10n/uno/sk.json   |2 
 loleaflet/dist/l10n/uno/sl.json   |2 
 loleaflet/dist/l10n/uno/sq.json   |2 
 loleaflet/dist/l10n/uno/sr-Latn.json  |2 
 loleaflet/dist/l10n/uno/sr.json   |2 
 loleaflet/dist/l10n/uno/sv.json   |2 
 loleaflet/dist/l10n/uno/sw-TZ.json|2 
 loleaflet/dist/l10n/uno/ta.json   |2 
 loleaflet/dist/l10n/uno/te.json   |2 
 loleaflet/dist/l10n/uno/tg.json   |2 
 loleaflet/dist/l10n/uno/th.json   |2 
 loleaflet/dist/l10n/uno/tr.json   |2 
 loleaflet/dist/l10n/uno/tt.json   |2 
 loleaflet/dist/l10n/uno/ug.json   |2 
 

[Libreoffice-commits] online.git: Changes to 'refs/tags/1.9.7'

[Ashod Nakashian]

Tag '1.9.7' created by Andras Timar  at 2016-11-09 
08:44 +

1.9.7

Changes since 2.0-beta3-64:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/2.0-rc1'

[Ashod Nakashian]

Tag '2.0-rc1' created by Andras Timar  at 
2016-11-09 08:45 +

2.0-rc1

Changes since 2.0-beta3-64:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/scheduler.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 81e3f5f2fdc9c573c83a37009080e4bb974c7955
Author: Stephan Bergmann 
Date:   Wed Nov 9 09:50:12 2016 +0100

Mark Scheduler as non-copyable

Change-Id: Iaabc92061a1a49720f473d35251d892dd4b4f756

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index ef6949d..74fdb3a 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -63,6 +63,9 @@ protected:
  */
 virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 
nTimeNow ) const = 0;
 
+Scheduler(Scheduler &) = delete;
+void operator =(Scheduler &) = delete;
+
 public:
 Scheduler( const sal_Char *pDebugName );
 Scheduler( const Scheduler& rScheduler );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/drawinglayer/primitive2d/baseprimitive2d.hxx |   17 +
 include/drawinglayer/primitive3d/baseprimitive3d.hxx |   15 ---
 include/vcl/svgdata.hxx  |7 ---
 svgio/source/svguno/xsvgparser.cxx   |8 +++-
 vcl/source/gdi/svgdata.cxx   |9 +
 5 files changed, 29 insertions(+), 27 deletions(-)

New commits:
commit 3a545893029c524afc0d5d6b6b6ca486c5be991c
Author: Noel Grandin 
Date:   Wed Nov 9 09:47:59 2016 +0200

convert Primitive2DContainer to std::deque

since we only care about appending to this container, and then
traversing it (normally once). So reduce the re-allocations that
std::vector requires

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

diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx 
b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index fbfafae..66250bb 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 /** defines for DeclPrimitive2DIDBlock and ImplPrimitive2DIDBlock
@@ -58,21 +59,21 @@ namespace drawinglayer { namespace primitive2d {
 typedef css::uno::Sequence< Primitive2DReference > Primitive2DSequence;
 
 
-class SAL_WARN_UNUSED DRAWINGLAYER_DLLPUBLIC Primitive2DContainer : public 
std::vector< Primitive2DReference >
+class SAL_WARN_UNUSED DRAWINGLAYER_DLLPUBLIC Primitive2DContainer : public 
std::deque< Primitive2DReference >
 {
 public:
 explicit Primitive2DContainer() {}
-explicit Primitive2DContainer( size_type count ) : vector(count) {}
-Primitive2DContainer( const Primitive2DContainer& other ) : 
vector(other) {}
-Primitive2DContainer( const Primitive2DContainer&& other ) : 
vector(other) {}
-Primitive2DContainer( const vector< Primitive2DReference >& other ) : 
vector(other) {}
-Primitive2DContainer( std::initializer_list init 
) : vector(init) {}
+explicit Primitive2DContainer( size_type count ) : deque(count) {}
+Primitive2DContainer( const Primitive2DContainer& other ) : 
deque(other) {}
+Primitive2DContainer( const Primitive2DContainer&& other ) : 
deque(other) {}
+Primitive2DContainer( const std::deque< Primitive2DReference >& other 
) : deque(other) {}
+Primitive2DContainer( std::initializer_list init 
) : deque(init) {}
 
 void append(const Primitive2DContainer& rSource);
 void append(const Primitive2DSequence& rSource);
 void append(Primitive2DContainer&& rSource);
-Primitive2DContainer& operator=(const Primitive2DContainer& r) { 
vector::operator=(r); return *this; }
-Primitive2DContainer& operator=(const Primitive2DContainer&& r) { 
vector::operator=(r); return *this; }
+Primitive2DContainer& operator=(const Primitive2DContainer& r) { 
deque::operator=(r); return *this; }
+Primitive2DContainer& operator=(const Primitive2DContainer&& r) { 
deque::operator=(r); return *this; }
 bool operator==(const Primitive2DContainer& rB) const;
 bool operator!=(const Primitive2DContainer& rB) const { return 
!operator==(rB); }
 basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& 
aViewInformation) const;
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx 
b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index ef75d4e..61a5634 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 /** defines for DeclPrimitive3DIDBlock and ImplPrimitive3DIDBlock
@@ -53,18 +54,18 @@ namespace drawinglayer { namespace primitive3d {
 typedef css::uno::Reference< css::graphic::XPrimitive3D > 
Primitive3DReference;
 typedef css::uno::Sequence< Primitive3DReference > Primitive3DSequence;
 
-class SAL_WARN_UNUSED DRAWINGLAYER_DLLPUBLIC Primitive3DContainer : public 
std::vector< Primitive3DReference >
+class SAL_WARN_UNUSED DRAWINGLAYER_DLLPUBLIC Primitive3DContainer : public 
std::deque< Primitive3DReference >
 {
 public:
 explicit Primitive3DContainer() {}
-explicit Primitive3DContainer( size_type count ) : vector(count) {}
-Primitive3DContainer( const Primitive3DContainer& other ) : 
vector(other) {}
-Primitive3DContainer( const Primitive3DContainer&& other ) : 
vector(other) {}
-Primitive3DContainer( std::initializer_list init 
) : vector(init) {}
+explicit Primitive3DContainer( size_type count ) : deque(count) {}
+Primitive3DContainer( const Primitive3DContainer& other ) : 
deque(other) {}
+Primitive3DContainer( const Primitive3DContainer&& 

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

[Stephan Bergmann]

 include/vcl/scheduler.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 80af87b0de526e06113a57f62f8f2284ecaaa45a
Author: Stephan Bergmann 
Date:   Wed Nov 9 09:58:33 2016 +0100

Revert "Mark Scheduler as non-copyable"

This reverts commit 81e3f5f2fdc9c573c83a37009080e4bb974c7955; had failed to
notice that there are already (Scheduler const & overloads of) copy member
functions (which MSVC complains about, but Clang didn't).

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 74fdb3a..ef6949d 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -63,9 +63,6 @@ protected:
  */
 virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 
nTimeNow ) const = 0;
 
-Scheduler(Scheduler &) = delete;
-void operator =(Scheduler &) = delete;
-
 public:
 Scheduler( const sal_Char *pDebugName );
 Scheduler( const Scheduler& rScheduler );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Caolán McNamara]

On Tue, 2016-11-08 at 23:08 +, Crashtest VM wrote:
> New crashtest update available at http://dev-
> builds.libreoffice.org/crashtest/64a708cba9b954afe3331f63c58218eb53b3
> d0ce/

Lots of new pptx failures since...

commit 4bcf1872bbe9db1388769485a7e4c0cbcce3d53c
Date:   Thu Oct 13 23:43:41 2016 +0200

chartx: fix sparse chart import

e.g. novell403458-1.pptx
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 include/oox/core/fastparser.hxx |6 +++---
 oox/source/core/fastparser.cxx  |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e21ef810e178e37f202e5ab8d0b582b24d5ce001
Author: Caolán McNamara 
Date:   Wed Nov 9 09:34:17 2016 +

crashtesting: unexpected exception on novell403458-1.pptx

since

commit 4bcf1872bbe9db1388769485a7e4c0cbcce3d53c
Date:   Thu Oct 13 23:43:41 2016 +0200

chartx: fix sparse chart import

because

- Matrix< Any > aMatrix( rDataSeq.maData.size(), 1 );
+ Matrix< Any > aMatrix( rDataSeq.mnPointCount, 1 );

where rDataSeq.mnPointCount is -1

Change-Id: I4bb4805dd81a342d4c0ce24e3240154daf53b452

diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index 0b48a74..4497d8b 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -74,19 +74,19 @@ public:
 /** Parses the passed SAX input source.
 @param bCloseStream  True = closes the stream in the input source 
after parsing. */
 voidparseStream( const css::xml::sax::InputSource& 
rInputSource, bool bCloseStream = false )
-throw( css::xml::sax::SAXException, 
css::io::IOException, css::uno::RuntimeException );
+throw( css::xml::sax::SAXException, 
css::io::IOException, css::uno::RuntimeException, std::exception );
 
 /** Parses the passed input stream.
 @param bCloseStream  True = closes the passed stream after parsing. */
 voidparseStream(
 const css::uno::Reference< css::io::XInputStream 
>& rxInStream,
 const OUString& rStreamName )
-throw( css::xml::sax::SAXException, 
css::io::IOException, css::uno::RuntimeException );
+throw( css::xml::sax::SAXException, 
css::io::IOException, css::uno::RuntimeException, std::exception );
 
 /** Parses a stream from the passed storage with the specified name.
 @param bCloseStream  True = closes the stream after parsing. */
 voidparseStream( StorageBase& rStorage, const OUString& 
rStreamName )
-throw( css::xml::sax::SAXException, 
css::io::IOException, css::uno::RuntimeException );
+throw( css::xml::sax::SAXException, 
css::io::IOException, css::uno::RuntimeException, std::exception );
 
 const css::uno::Reference< css::xml::sax::XFastTokenHandler >&
getTokenHandler() const { return mxTokenHandler; }
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 5a9121d..54b07b1 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -109,7 +109,7 @@ void FastParser::setDocumentHandler( const Reference< 
XFastDocumentHandler >& rx
 mxParser->setFastDocumentHandler( rxDocHandler );
 }
 
-void FastParser::parseStream( const InputSource& rInputSource, bool 
bCloseStream ) throw( SAXException, IOException, RuntimeException )
+void FastParser::parseStream( const InputSource& rInputSource, bool 
bCloseStream ) throw( SAXException, IOException, RuntimeException, 
std::exception )
 {
 // guard closing the input stream also when exceptions are thrown
 InputStreamCloseGuard aGuard( rInputSource.aInputStream, bCloseStream );
@@ -118,7 +118,7 @@ void FastParser::parseStream( const InputSource& 
rInputSource, bool bCloseStream
 mxParser->parseStream( rInputSource );
 }
 
-void FastParser::parseStream( const Reference< XInputStream >& rxInStream, 
const OUString& rStreamName ) throw( SAXException, IOException, 
RuntimeException )
+void FastParser::parseStream( const Reference< XInputStream >& rxInStream, 
const OUString& rStreamName ) throw( SAXException, IOException, 
RuntimeException, std::exception )
 {
 InputSource aInputSource;
 aInputSource.sSystemId = rStreamName;
@@ -126,7 +126,7 @@ void FastParser::parseStream( const Reference< XInputStream 
>& rxInStream, const
 parseStream( aInputSource );
 }
 
-void FastParser::parseStream( StorageBase& rStorage, const OUString& 
rStreamName ) throw( SAXException, IOException, RuntimeException )
+void FastParser::parseStream( StorageBase& rStorage, const OUString& 
rStreamName ) throw( SAXException, IOException, RuntimeException, 
std::exception )
 {
 parseStream( rStorage.openInputStream( rStreamName ), rStreamName );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 include/vcl/opengl/OpenGLContext.hxx|   16 +++
 vcl/opengl/gdiimpl.cxx  |   16 ++-
 vcl/opengl/scale.cxx|   10 +-
 vcl/opengl/shaders/areaScaleFragmentShader.glsl |  113 
 vcl/opengl/win/gdiimpl.cxx  |5 +
 5 files changed, 138 insertions(+), 22 deletions(-)

New commits:
commit d115a235bf3ff5366d992d01fb418a3eacb9d125
Author: Tomaž Vajngerl 
Date:   Thu Nov 3 23:11:18 2016 +0100

tdf#103804 reduced register areaScale shader and detection for intel

Some intel drivers crash when areaScale shader with "large" array
is used. This adds a "reduced register" version of the areaScale
shader. We still use the first version of the shader for other
drivers and switch between the 2 implementations with a runtime
detection.

Change-Id: I1860f898c03b40a600eb1b41f7262719382a7171
Reviewed-on: https://gerrit.libreoffice.org/30571
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index dbe0ec6..e3e9ce0 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -52,6 +52,15 @@ struct VCL_DLLPUBLIC GLWindow
 virtual ~GLWindow();
 };
 
+struct VCL_DLLPUBLIC OpenGLCapabilitySwitch
+{
+bool mbLimitedShaderRegisters;
+
+OpenGLCapabilitySwitch()
+: mbLimitedShaderRegisters(false)
+{}
+};
+
 class VCL_DLLPUBLIC OpenGLContext
 {
 friend class OpenGLTests;
@@ -94,6 +103,11 @@ public:
 return mpRenderState;
 }
 
+OpenGLCapabilitySwitch& getOpenGLCapabilitySwitch()
+{
+return maOpenGLCapabilitySwitch;
+}
+
 /// Is this GL context the current context ?
 virtual bool isCurrent();
 /// Is any GL context the current context ?
@@ -165,6 +179,8 @@ protected:
 OpenGLFramebuffer* mpFirstFramebuffer;
 OpenGLFramebuffer* mpLastFramebuffer;
 
+OpenGLCapabilitySwitch maOpenGLCapabilitySwitch;
+
 private:
 struct ProgramHash
 {
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index b1898df..b487468 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -993,7 +993,11 @@ bool scaleTexture(const rtl::Reference< OpenGLContext > 
&xContext,
 int nNewWidth = nWidth / ixscale;
 int nNewHeight = nHeight / iyscale;
 
-OpenGLProgram* pProgram = xContext->UseProgram("textureVertexShader", 
"areaScaleFragmentShader");
+OString sUseReducedRegisterVariantDefine;
+if (xContext->getOpenGLCapabilitySwitch().mbLimitedShaderRegisters)
+sUseReducedRegisterVariantDefine = OString("#define 
USE_REDUCED_REGISTER_VARIANT\n");
+
+OpenGLProgram* pProgram = xContext->UseProgram("textureVertexShader", 
"areaScaleFragmentShader", sUseReducedRegisterVariantDefine);
 if (pProgram == nullptr)
 return false;
 
@@ -1058,6 +1062,11 @@ void OpenGLSalGraphicsImpl::DrawTransformedTexture(
 // See OpenGLSalBitmap::ImplScaleArea().
 bool areaScaling = false;
 bool fastAreaScaling = false;
+
+OString sUseReducedRegisterVariantDefine;
+if (mpContext->getOpenGLCapabilitySwitch().mbLimitedShaderRegisters)
+sUseReducedRegisterVariantDefine = OString("#define 
USE_REDUCED_REGISTER_VARIANT\n");
+
 OUString textureFragmentShader;
 if( ixscale >= 2 && iyscale >= 2 )  // scale ratio less than 50%
 {
@@ -1122,7 +1131,7 @@ void OpenGLSalGraphicsImpl::DrawTransformedTexture(
 {
 if( !UseProgram( "transformedTextureVertexShader",
 textureFragmentShader.isEmpty() ? 
"maskedTextureFragmentShader" : textureFragmentShader,
-"#define MASKED" ) )
+"#define MASKED\n" + sUseReducedRegisterVariantDefine))
 return;
 mpProgram->SetTexture( "mask", aInMask );
 GLfloat aMaskCoord[8];
@@ -1134,7 +1143,8 @@ void OpenGLSalGraphicsImpl::DrawTransformedTexture(
 else
 {
 if( !UseProgram( "transformedTextureVertexShader",
-textureFragmentShader.isEmpty() ? "textureFragmentShader" : 
textureFragmentShader ) )
+textureFragmentShader.isEmpty() ? "textureFragmentShader" : 
textureFragmentShader,
+sUseReducedRegisterVariantDefine))
 return;
 }
 
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 9feb933..3e2b9d4 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -231,8 +231,14 @@ bool OpenGLSalBitmap::ImplScaleArea( const rtl::Reference< 
OpenGLContext > &xCon
 
 // TODO Make sure the framebuffer is alright
 
+OString sUseReducedRegisterVariantDefine;
+if (xContext->getOpenGLCapabilitySwitch().mbLimitedShaderRegisters)
+sUseReducedRegisterVariantDefine = OString("#define 
USE_REDUCED_REGISTER_VARIANT\n");
+
 OpenGLProgram* pProgram = xContext->UseProgram( "textureVertexShader",
-fast ? OUString( "areaScaleFastFra

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a14f7665f452f2f691e5e163461ea6aee663745
Author: Andras Timar 
Date:   Wed Nov 9 11:22:25 2016 +0100

fix loolwsd debian package depandency noto font package name

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 27aa5d1..bc85e9d 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.12), collaboraofficebasis5.1-calc 
(>= 5.1.10.12), collaboraofficebasis5.1-core (>= 5.1.10.12), 
collaboraofficebasis5.1-draw (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.12), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.12), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.12), collaboraofficebasi
 s5.1-images (>= 5.1.10.12), collaboraofficebasis5.1-impress (>= 5.1.10.12), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.12), collaboraofficebasis5.1-math 
(>= 5.1.10.12), collaboraofficebasis5.1-ogltrans (>= 5.1.10.12), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.12), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.12), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.12), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.12), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.12), collaboraofficebasis5.1-writer 
(>= 5.1.10.12), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.12), 
collaboraoffice5.1 (>= 5.1.10.12), collaboraoffice5.1-base (>= 5.1.10.12), 
collaboraoffice5.1-calc (>= 5.1.10.12), collaboraoffice5.1-dict-en (>= 
5.1.10.12), collaboraoffice5.1-draw (>= 5.1.10.12), 
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress (>= 5.1.10.12), 
collaboraoffice5.1-math (>= 5.1.10.12), collaboraoffice5.1-ure (>= 5.1.10.12), 
collaboraoffice5.1-writer (>= 5.1.10.12), collaboraofficeb
 asis5.1-en-us (>= 5.1.10.12), collaboraofficebasis5.1-en-us-base (>= 
5.1.10.12), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.12), 
collaboraofficebasis5.1-en-us-math (>= 5.1.10.12), 
collaboraofficebasis5.1-en-us-res (>= 5.1.10.12), 
collaboraofficebasis5.1-en-us-writer (>= 5.1.10.12), collaboraoffice5.1-en-us 
(>= 5.1.10.12), collaboraofficebasis-noto-fonts (>= 5.1.10.12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.12), collaboraofficebasis5.1-calc 
(>= 5.1.10.12), collaboraofficebasis5.1-core (>= 5.1.10.12), 
collaboraofficebasis5.1-draw (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.12), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.12), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.12), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.12), collaboraofficebasi
 s5.1-images (>= 5.1.10.12), collaboraofficebasis5.1-impress (>= 5.1.10.12), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.12), collaboraofficebasis5.1-math 
(>= 5.1.10.12), collaboraofficebasis5.1-ogltrans (>= 5.1.10.12), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.12), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.12), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.12), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.12), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.12), collaboraofficebasis5.1-writer 
(>= 5.1.10.12), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.12), 
collaboraoffice5.1 (>= 5.1.10.12), collaboraoffice5.1-base (>= 5.1.10.12), 
collaboraoffice5.1-calc (>= 5.1.10.12), collaboraoffice5.1-dict-en (>= 
5.1.10.12), collaboraoffice5.1-draw (>= 5.1.10.12), 
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress (>= 5.1.10.12), 
collaboraoffice5.1-math (>= 5.1.10.12), collaboraoffice5.1-ure (>= 5.1.10.12), 
collaboraoffice5.1-writer (>= 5.1.10.12), collaboraofficeb
 asis5.1-en-us (>= 5.1.10.12), collaboraofficebasis5.1-e

Re: Crash test update

[Caolán McNamara]

On Tue, 2016-11-08 at 23:08 +, Crashtest VM wrote:
> New crashtest update available at http://dev-
> builds.libreoffice.org/crashtest/64a708cba9b954afe3331f63c58218eb53b3
> d0ce/

commit c0c69ccd2aac45e4cca0de7d4deaa6d02ec27f4d
Author: Noel Grandin 
Date:   Fri Nov 4 15:08:14 2016 +0200

convert sdr::animation::EventList to o3tl::sorted_vector

instead of home-grown linked list

is the trigger for the crash on reexport of ooo75571-1.odp to odp. I've
reverted this for now.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 include/svx/sdr/animation/scheduler.hxx |   49 +++-
 svx/source/sdr/animation/scheduler.cxx  |  182 
 2 files changed, 184 insertions(+), 47 deletions(-)

New commits:
commit 0e0e3ea312dc09de6726318c3579671fec7de7ee
Author: Caolán McNamara 
Date:   Wed Nov 9 10:21:49 2016 +

Revert "convert sdr::animation::EventList to o3tl::sorted_vector"

This reverts commit c0c69ccd2aac45e4cca0de7d4deaa6d02ec27f4d.

because soffice --headless --convert-to odp ooo75571-1.odp crashes
after this change

diff --git a/include/svx/sdr/animation/scheduler.hxx 
b/include/svx/sdr/animation/scheduler.hxx
index 15eaa34..1d1c16a 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -23,24 +23,31 @@
 #include 
 #include 
 #include 
-#include 
 
 
+// event class
+
 namespace sdr
 {
 namespace animation
 {
-
 class SVX_DLLPUBLIC Event
 {
 // time of event in ms
 sal_uInt32  mnTime;
 
+// pointer for linked list sorted by mnTime
+Event*  mpNext;
+
 public:
 // constructor/destructor
 SAL_DLLPRIVATE explicit Event();
 virtual ~Event();
 
+// access to mpNext
+SAL_DLLPRIVATE Event* GetNext() const {  return mpNext; }
+SAL_DLLPRIVATE void SetNext(Event* pNew);
+
 // get/set time
 SAL_DLLPRIVATE sal_uInt32 GetTime() const {  return mnTime; }
 void SetTime(sal_uInt32 nNew);
@@ -48,12 +55,43 @@ namespace sdr
 // execute event
 virtual void Trigger(sal_uInt32 nTime) = 0;
 };
+} // end of namespace animation
+} // end of namespace sdr
+
 
-struct CompareEvent
+// eventlist class
+
+namespace sdr
+{
+namespace animation
+{
+class SVX_DLLPUBLIC EventList
 {
-bool operator()(Event* const& lhs, Event* const& rhs) const;
+// pointer to first entry
+Event*  mpHead;
+
+public:
+// constructor/destructor
+SAL_DLLPRIVATE EventList();
+virtual ~EventList();
+
+// insert/remove time dependent
+SAL_DLLPRIVATE void Insert(Event* pNew);
+SAL_DLLPRIVATE void Remove(Event* pOld);
+
+// get first
+SAL_DLLPRIVATE Event* GetFirst() {  return mpHead; }
 };
+} // end of namespace animation
+} // end of namespace sdr
+
 
+// scheduler class
+
+namespace sdr
+{
+namespace animation
+{
 class SVX_DLLPUBLIC Scheduler : public Timer
 {
 // time in ms
@@ -63,7 +101,7 @@ namespace sdr
 sal_uInt32  mnDeltaTime;
 
 // list of events
-o3tl::sorted_vector   maList;
+EventList   maList;
 
 // Flag which remembers if this timer is paused. Default
 // is false.
@@ -97,7 +135,6 @@ namespace sdr
 SAL_DLLPRIVATE bool IsPaused() const { return mbIsPaused; }
 SAL_DLLPRIVATE void SetPaused(bool bNew);
 };
-
 } // end of namespace animation
 } // end of namespace sdr
 
diff --git a/svx/source/sdr/animation/scheduler.cxx 
b/svx/source/sdr/animation/scheduler.cxx
index ea6bb83..3841272 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -28,7 +28,9 @@ namespace sdr
 {
 namespace animation
 {
-Event::Event() : mnTime(0)
+Event::Event()
+:   mnTime(0),
+mpNext(nullptr)
 {
 }
 
@@ -37,6 +39,15 @@ namespace sdr
 }
 
 
+void Event::SetNext(Event* pNew)
+{
+if(pNew != mpNext)
+{
+mpNext = pNew;
+}
+}
+
+
 void Event::SetTime(sal_uInt32 nNew)
 {
 if(mnTime != nNew)
@@ -44,13 +55,93 @@ namespace sdr
 mnTime = nNew;
 }
 }
+} // end of namespace animation
+} // end of namespace sdr
+
+
+// eventlist class
 
-bool CompareEvent::operator()(Event* const& lhs, Event* const& rhs) 
const
+namespace sdr
+{
+namespace animation
+{
+EventList::EventList()
+:   mpHead(nullptr)
 {
-return lhs->GetTime() < rhs->GetTime();
 }
 
+EventList::~EventList()
+{
+while(mpHead)
+{
+Event* pNext = mpHead->GetNext();
+mpHead->SetNext(nullptr);
+mpHead = pNext;
+}
+}
+
+void EventList::Insert(Event* pNew)
+{
+if(pNew)
+{
+Event* pCurrent = mpHead;
+Event* pPrev = nullptr;
+
+

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

[Noel Grandin]

 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx |7 --
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/primitivetools2d.cxx  |2 
 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx  |   19 +++
 editeng/source/accessibility/AccessibleEditableTextPara.cxx   |   25 +-
 editeng/source/accessibility/AccessibleImageBullet.cxx|   16 --
 editeng/source/editeng/editview.cxx   |7 --
 editeng/source/editeng/eehtml.hxx |   10 ++--
 editeng/source/outliner/outlin2.cxx   |5 --
 editeng/source/outliner/outliner.cxx  |   11 
 editeng/source/uno/unotext.cxx|6 --
 include/drawinglayer/attribute/sdrfillgraphicattribute.hxx|1 
 include/drawinglayer/primitive2d/borderlineprimitive2d.hxx|5 --
 include/drawinglayer/primitive2d/primitivetools2d.hxx |7 --
 include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx |4 -
 include/editeng/AccessibleEditableTextPara.hxx|7 --
 include/editeng/AccessibleImageBullet.hxx |4 -
 include/editeng/editview.hxx  |1 
 include/editeng/outliner.hxx  |2 
 include/editeng/unotext.hxx   |2 
 20 files changed, 25 insertions(+), 118 deletions(-)

New commits:
commit 30e39e4793bbfe59a53b41422b5d86a03cfe31d3
Author: Noel Grandin 
Date:   Wed Nov 9 10:26:36 2016 +0200

loplugin:expandablemethods in drawinglayer..editeng

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

diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx 
b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index 09398e5..f191dc3 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -211,11 +211,6 @@ namespace drawinglayer
 return mpSdrFillGraphicAttribute->getTiling();
 }
 
-bool SdrFillGraphicAttribute::getStretch() const
-{
-return mpSdrFillGraphicAttribute->getStretch();
-}
-
 FillGraphicAttribute 
SdrFillGraphicAttribute::createFillGraphicAttribute(const basegfx::B2DRange& 
rRange) const
 {
 // get logical size of bitmap (before possibly expanding it)
@@ -226,7 +221,7 @@ namespace drawinglayer
 basegfx::B2DVector aBitmapTopLeft(0.0, 0.0);
 
 // are changes needed? When stretched we are already done, all 
other values will have no influence
-if(getTiling() || !getStretch())
+if(getTiling() || !mpSdrFillGraphicAttribute->getStretch())
 {
 // init values with range sizes
 const double fRangeWidth(0.0 != rRange.getWidth() ? 
rRange.getWidth() : 1.0);
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 671143f..3db5cb2 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -240,7 +240,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
 const basegfx::B2DPoint aTmpEnd(getEnd() + (fExt * 
aVector));
 
 // Get which is the line to show
-bool bIsSolidline = isSolidLine();
+bool bIsSolidline = mnStyle == 
css::table::BorderLineStyle::SOLID;
 double nWidth = getLeftWidth();
 basegfx::BColor aColor = getRGBColorLeft();
 if ( basegfx::fTools::equal( 0.0, mfLeftWidth ) )
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx 
b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 509bff7..494a8cd 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -43,7 +43,7 @@ namespace drawinglayer
 if(getBuffered2DDecomposition().empty())
 {
 // remember new valid DiscreteUnit
-const_cast< DiscreteMetricDependentPrimitive2D* 
>(this)->updateDiscreteUnit(fDiscreteUnit);
+const_cast< DiscreteMetricDependentPrimitive2D* 
>(this)->mfDiscreteUnit = fDiscreteUnit;
 }
 
 // call base implementation
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx 
b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index e0fe820..1447597 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -346,16 +346,6 @

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

[Caolán McNamara]

 vcl/source/gdi/CommonSalLayout.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 243977708ceaf877e520ef0bb393aa49040d65c9
Author: Caolán McNamara 
Date:   Wed Nov 9 10:58:39 2016 +

crashtesting: crash on reexport of fdo58980-3.odt to odt

since...

commit 3a543f1f57aed3beba8879ed46e1f92f657151cb
Date:   Mon Oct 10 00:54:00 2016 +0200

Validate Kashida positions in CommonSalLayout

Currently checks only for ligatures, but that is a big improvement over
al code that didn’t do any validation except on Windows.

Change-Id: I0da70d274a2e532d1ce7e7817bddbeca03893763

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index e7ed549..c6de183 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -756,6 +756,9 @@ bool CommonSalLayout::IsKashidaPosValid(int nCharPos) const
 if (pIter->maGlyphId == 0)
 break;
 
+if (pIter == m_GlyphItems.begin())
+continue;
+
 // Search backwards for previous glyph belonging to a different
 // character. We are looking backwards because we are dealing with
 // RTL glyphs, which will be in visual order.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Caolán McNamara]

On Tue, 2016-11-08 at 23:08 +, Crashtest VM wrote:
> New crashtest update available at http://dev-
> builds.libreoffice.org/crashtest/64a708cba9b954afe3331f63c58218eb53b3
> d0ce/

commit 3a543f1f57aed3beba8879ed46e1f92f657151cb
Author: Khaled Hosny 
Date:   Mon Oct 10 00:54:00 2016 +0200

Validate Kashida positions in CommonSalLayout

triggers a crash on reexporting fdo58980-3.odt to odt.

I've bodged it with...

commit 243977708ceaf877e520ef0bb393aa49040d65c9
Author: Caolán McNamara 
Date:   Wed Nov 9 10:58:39 2016 +

crashtesting: crash on reexport of fdo58980-3.odt to odt

but you might want to see if that's a good workaround

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

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

[Noel Grandin]

 dbaccess/source/core/api/RowSetBase.cxx |8 --
 dbaccess/source/core/api/RowSetBase.hxx |3 -
 dbaccess/source/core/dataaccess/ModelImpl.cxx   |9 ---
 dbaccess/source/core/dataaccess/ModelImpl.hxx   |4 -
 dbaccess/source/core/dataaccess/commanddefinition.cxx   |2 
 dbaccess/source/core/dataaccess/commanddefinition.hxx   |2 
 dbaccess/source/core/inc/DatabaseDataProvider.hxx   |1 
 dbaccess/source/core/misc/DatabaseDataProvider.cxx  |9 ---
 dbaccess/source/filter/xml/xmlfilter.cxx|8 --
 dbaccess/source/filter/xml/xmlfilter.hxx|1 
 dbaccess/source/ui/app/AppController.cxx|   23 +++
 dbaccess/source/ui/app/AppController.hxx|   27 -
 dbaccess/source/ui/app/AppControllerGen.cxx |   15 -
 dbaccess/source/ui/browser/brwctrlr.cxx |   14 
 dbaccess/source/ui/browser/sbagrid.cxx  |   31 +++---
 dbaccess/source/ui/dlg/adtabdlg.cxx |   19 ++
 dbaccess/source/ui/dlg/dbwizsetup.cxx   |7 --
 dbaccess/source/ui/dlg/sqlmessage.cxx   |   41 ++---
 dbaccess/source/ui/inc/ConnectionLineAccess.hxx |2 
 dbaccess/source/ui/inc/JAccess.hxx  |3 -
 dbaccess/source/ui/inc/QueryDesignView.hxx  |3 -
 dbaccess/source/ui/inc/TableConnection.hxx  |3 -
 dbaccess/source/ui/inc/TableWindow.hxx  |1 
 dbaccess/source/ui/inc/TableWindowAccess.hxx|4 -
 dbaccess/source/ui/inc/TokenWriter.hxx  |3 -
 dbaccess/source/ui/inc/WCopyTable.hxx   |2 
 dbaccess/source/ui/inc/WTypeSelect.hxx  |1 
 dbaccess/source/ui/inc/adtabdlg.hxx |1 
 dbaccess/source/ui/inc/brwctrlr.hxx |2 
 dbaccess/source/ui/inc/dbwizsetup.hxx   |1 
 dbaccess/source/ui/inc/sbagrid.hxx  |5 -
 dbaccess/source/ui/inc/sqlmessage.hxx   |1 
 dbaccess/source/ui/misc/TokenWriter.cxx |   21 ++-
 dbaccess/source/ui/misc/WCopyTable.cxx  |7 --
 dbaccess/source/ui/misc/WTypeSelect.cxx |   34 +--
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx |5 -
 dbaccess/source/ui/querydesign/JAccess.cxx  |4 -
 dbaccess/source/ui/querydesign/QueryDesignView.cxx  |7 --
 dbaccess/source/ui/querydesign/TableConnection.cxx  |6 --
 dbaccess/source/ui/querydesign/TableWindow.cxx  |7 --
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx|   17 +
 desktop/inc/app.hxx |   10 ---
 desktop/inc/lib/init.hxx|1 
 desktop/source/app/app.cxx  |   47 
 desktop/source/app/appinit.cxx  |3 -
 desktop/source/deployment/gui/dp_gui_dialog2.cxx|9 ---
 desktop/source/deployment/gui/dp_gui_dialog2.hxx|1 
 desktop/source/deployment/registry/help/dp_help.cxx |   25 ++--
 desktop/source/lib/init.cxx |7 --
 desktop/source/migration/migration.cxx  |   11 +--
 desktop/source/migration/migration_impl.hxx |1 
 51 files changed, 114 insertions(+), 365 deletions(-)

New commits:
commit a71d6a2a847828b737e5b6cc5eefe877613085b7
Author: Noel Grandin 
Date:   Wed Nov 9 11:49:57 2016 +0200

loplugin:expandablemethods in dbaccess

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

diff --git a/dbaccess/source/core/api/RowSetBase.cxx 
b/dbaccess/source/core/api/RowSetBase.cxx
index 3bfa9b1..74a984a 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -186,12 +186,8 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(  ) 
throw(SQLException, RuntimeException,
 {
 ::osl::MutexGuard aGuard( *m_pMutex );
 checkCache();
-return impl_wasNull();
-}
-
-bool ORowSetBase::impl_wasNull()
-{
-return !((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && 
m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is()) || 
((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull();
+return !((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && 
m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is())
+   || ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull();
 }
 
 const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
diff --git a/dbaccess/source/core/api/RowSetBase.hxx 
b/dbaccess/source/core/api/RowSetBase.hxx
index da0fbb7..d31d0a5 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -221

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

[Noel Grandin]

 include/framework/undomanagerhelper.hxx   |2 +-
 sdext/source/presenter/PresenterTimer.cxx |2 +-
 sw/source/core/access/accdoc.hxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e74e9586f506652d18c1096ebc4508fe7f7be344
Author: Noel Grandin 
Date:   Wed Nov 9 12:16:21 2016 +0200

spelling mutext->mutex

Change-Id: If844c07d0d50d1bb9b0a1877c0fde4a198bcf781

diff --git a/include/framework/undomanagerhelper.hxx 
b/include/framework/undomanagerhelper.hxx
index 667b11b..09ac28b 100644
--- a/include/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
@@ -89,7 +89,7 @@ namespace framework
 /** helper class for implementing an XUndoManager
 
 Several of the methods of the class take an IMutexGuard instance. It 
is assumed that this guard has a lock on
-its mutext at the moment the method is entered. The lock will be 
released before any notifications to the
+its mutex at the moment the method is entered. The lock will be 
released before any notifications to the
 registered XUndoManagerListeners happen.
 
 The following locking strategy is used for this mutex:
diff --git a/sdext/source/presenter/PresenterTimer.cxx 
b/sdext/source/presenter/PresenterTimer.cxx
index 9e8ec8b..e9d3117 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -236,7 +236,7 @@ void SAL_CALL TimerScheduler::run()
 break;
 }
 
-// Restrict access to the maScheduledTasks member to one, mutext
+// Restrict access to the maScheduledTasks member to one, mutex
 // guarded, block.
 SharedTimerTask pTask;
 sal_Int64 nDifference = 0;
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 8bd7196..47caf4c 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -35,7 +35,7 @@ class SwAccessibleDocumentBase : public SwAccessibleContext
 {
 css::uno::Reference< css::accessibility::XAccessible> mxParent;
 
-VclPtr mpChildWin; // protected by solar mutext
+VclPtr mpChildWin; // protected by solar mutex
 
 using SwAccessibleFrame::SetVisArea;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/tools/gen.hxx |   55 +-
 1 file changed, 46 insertions(+), 9 deletions(-)

New commits:
commit cd61f3eb3df492113883d53e75233afcd6a19fab
Author: Stephan Bergmann 
Date:   Wed Nov 9 12:17:04 2016 +0100

Make sure not to compare different subclasses of Pair

(A related option would be to make those subclasses derive privately from 
Pair,
but there are a few places that generically operate on any Pair instances, 
like
Pair::Read/WritePair or SvxShape::ForceMetricToItemPoolMetric/100th_mm.)

Change-Id: I6c638fe65ee5684593fdeab29b144f547e173f4e

diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 987dd43..142f82c 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -48,9 +48,6 @@ public:
 long&   A() { return nA; }
 long&   B() { return nB; }
 
-booloperator == ( const Pair& rPair ) const;
-booloperator != ( const Pair& rPair ) const;
-
 TOOLS_DLLPUBLIC friend SvStream&ReadPair( SvStream& rIStream, Pair& 
rPair );
 TOOLS_DLLPUBLIC friend SvStream&WritePair( SvStream& rOStream, const 
Pair& rPair );
 
@@ -59,16 +56,16 @@ protected:
 longnB;
 };
 
-inline bool Pair::operator == ( const Pair& rPair ) const
-{
-return ((nA == rPair.nA) && (nB == rPair.nB));
-}
+namespace tools { namespace detail {
 
-inline bool Pair::operator != ( const Pair& rPair ) const
+// Used to implement operator == for subclasses of Pair:
+inline bool equal(Pair const & p1, Pair const & p2)
 {
-return ((nA != rPair.nA) || (nB != rPair.nB));
+return p1.A() == p2.A() && p1.B() == p2.B();
 }
 
+} }
+
 // Point
 
 class SAL_WARN_UNUSED SAL_DLLPUBLIC_EXPORT Point : public Pair
@@ -158,6 +155,16 @@ inline Point operator/( const Point &rVal1, const long 
nVal2 )
 return Point( rVal1.nA/nVal2, rVal1.nB/nVal2 );
 }
 
+inline bool operator ==(Point const & p1, Point const & p2)
+{
+return tools::detail::equal(p1, p2);
+}
+
+inline bool operator !=(Point const & p1, Point const & p2)
+{
+return !(p1 == p2);
+}
+
 template< typename charT, typename traits >
 inline std::basic_ostream & operator <<(
 std::basic_ostream & stream, const Point& point )
@@ -185,6 +192,16 @@ public:
 voidsetHeight(long nHeight)  { Height() = nHeight; }
 };
 
+inline bool operator ==(Size const & s1, Size const & s2)
+{
+return tools::detail::equal(s1, s2);
+}
+
+inline bool operator !=(Size const & s1, Size const & s2)
+{
+return !(s1 == s2);
+}
+
 template< typename charT, typename traits >
 inline std::basic_ostream & operator <<(
 std::basic_ostream & stream, const Size& size )
@@ -229,6 +246,16 @@ inline void Range::Justify()
 }
 }
 
+inline bool operator ==(Range const & r1, Range const & r2)
+{
+return tools::detail::equal(r1, r2);
+}
+
+inline bool operator !=(Range const & r1, Range const & r2)
+{
+return !(r1 == r2);
+}
+
 template< typename charT, typename traits >
 inline std::basic_ostream & operator <<(
 std::basic_ostream & stream, const Range& range )
@@ -281,6 +308,16 @@ inline void Selection::Justify()
 }
 }
 
+inline bool operator ==(Selection const & s1, Selection const & s2)
+{
+return tools::detail::equal(s1, s2);
+}
+
+inline bool operator !=(Selection const & s1, Selection const & s2)
+{
+return !(s1 == s2);
+}
+
 template< typename charT, typename traits >
 inline std::basic_ostream & operator <<(
 std::basic_ostream & stream, const Selection& selection )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/opengl/salbmp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed42212f53b2e52238346e64dae31a931d6c90a1
Author: Tomaž Vajngerl 
Date:   Wed Nov 9 10:32:35 2016 +0100

tdf#103758 wrong GL format for RGBA image buffers

Change-Id: I8a36234068ce0818b7baaa3b6c68d789753db6de
Reviewed-on: https://gerrit.libreoffice.org/30711
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index bce9fb7..9fb8c47 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -64,7 +64,7 @@ inline bool determineTextureFormat(sal_uInt16 nBits, GLenum& 
nFormat, GLenum& nT
 return true;
 case 32:
 nFormat = GL_RGBA;
-nType = GL_UNSIGNED_INT_8_8_8_8;
+nType = GL_UNSIGNED_BYTE;
 return true;
 default:
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Michael Stahl]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41de4df1cfbe02fcd235582b50c87c9d91757809
Author: Michael Stahl 
Date:   Wed Nov 9 12:44:43 2016 +0100

increase Office::Common::Cache::GraphicManager::TotalCacheSize to 200MB

We can use a bit more RAM for graphics than we currently do, even on 32
bits, which should improve interactive performance as there will be less
swapping of bitmap data and re-parsing of SVGs.

Note that currently the value is effectively multiplied by 2, as the
limit is stored in GraphicCache::mnMaxDisplaySize, but there are 2
independent "counters" GraphicCache::mnUsedDisplaySize and
GraphicManager::mnUsedSize that are both checked against the same limit.

Change-Id: I4e33030af7dcd953c35672f80599188a1fbc4453

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 0e645ad..eeff880 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1493,7 +1493,7 @@
 objects.
 Total Image Cache Size
   
-  6711
+  2
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/rtf/swparrtf.cxx |2 +-
 sw/source/filter/ww8/docxsdrexport.cxx|8 ++--
 sw/source/filter/ww8/docxtablestyleexport.cxx |4 +---
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   13 +
 4 files changed, 9 insertions(+), 18 deletions(-)

New commits:
commit 3c9f302b06bc3ffee910afc8404114bde728aa3b
Author: Miklos Vajna 
Date:   Wed Nov 9 09:30:15 2016 +0100

sw: clean up redundant get() calls on smart pointers in rtfattributeoutput

And a few more similar nitpicks.

Change-Id: Iac343800171658a9623bcc4d5b7aadaae56830ad

diff --git a/sw/source/filter/rtf/swparrtf.cxx 
b/sw/source/filter/rtf/swparrtf.cxx
index be7b259..37463e9 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
 /// Glue class to call RtfImport as an internal filter, needed by copy&paste 
support.
 class SwRTFReader : public Reader
 {
-virtual sal_uLong Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const 
OUString&) override;
+sal_uLong Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) 
override;
 };
 
 sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& 
rPam, const OUString&)
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 0fe507f..0cb5604 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -169,9 +169,7 @@ struct DocxSdrExport::Impl
 {
 }
 
-~Impl()
-{
-}
+~Impl() = default;
 
 /// Writes wp wrapper code around an SdrObject, which itself is written 
using drawingML syntax.
 
@@ -186,9 +184,7 @@ DocxSdrExport::DocxSdrExport(DocxExport& rExport, 
sax_fastparser::FSHelperPtr pS
 {
 }
 
-DocxSdrExport::~DocxSdrExport()
-{
-}
+DocxSdrExport::~DocxSdrExport() = default;
 
 void DocxSdrExport::setSerializer(const sax_fastparser::FSHelperPtr& 
pSerializer)
 {
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx 
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index a1b90a0..d87e805 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -691,8 +691,6 @@ DocxTableStyleExport::DocxTableStyleExport(SwDoc* pDoc, 
sax_fastparser::FSHelper
 m_pImpl->m_pSerializer = pSerializer;
 }
 
-DocxTableStyleExport::~DocxTableStyleExport()
-{
-}
+DocxTableStyleExport::~DocxTableStyleExport() = default;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5f52158..fc362a9 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -219,7 +219,7 @@ void RtfAttributeOutput::RTLAndCJKState(bool bIsRTL, 
sal_uInt16 nScript)
 void RtfAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t 
pTextNodeInfo)
 {
 // Output table/table row/table cell starts if needed
-if (pTextNodeInfo.get())
+if (pTextNodeInfo)
 {
 sal_uInt32 nRow = pTextNodeInfo->getRow();
 sal_uInt32 nCell = pTextNodeInfo->getCell();
@@ -1090,7 +1090,7 @@ void RtfAttributeOutput::EndTable()
 
 void RtfAttributeOutput::FinishTableRowCell(const 
ww8::WW8TableNodeInfoInner::Pointer_t& pInner, bool /*bForceEmptyParagraph*/)
 {
-if (pInner.get())
+if (pInner)
 {
 // Where are we in the table
 sal_uInt32 nRow = pInner->getRow();
@@ -1752,7 +1752,7 @@ void lcl_TextFrameRelativeSize(std::vector< 
std::pair >& rFlyP
 aRelation = "0"; // margin
 break;
 }
-rFlyProperties.push_back(std::make_pair("sizerelh", aRelation));
+rFlyProperties.emplace_back(std::make_pair("sizerelh", aRelation));
 }
 const sal_uInt8 nHeightPercent = rSize.GetHeightPercent();
 if (nHeightPercent && nHeightPercent != SwFormatFrameSize::SYNCED)
@@ -1769,7 +1769,7 @@ void lcl_TextFrameRelativeSize(std::vector< 
std::pair >& rFlyP
 aRelation = "0"; // margin
 break;
 }
-rFlyProperties.push_back(std::make_pair("sizerelv", aRelation));
+rFlyProperties.emplace_back(std::make_pair("sizerelv", aRelation));
 }
 }
 
@@ -3501,7 +3501,6 @@ RtfAttributeOutput::RtfAttributeOutput(RtfExport& rExport)
   m_bLastTable(true),
   m_bWroteCellInfo(false),
   m_bTableRowEnded(false),
-  m_aCells(),
   m_bSingleEmptyRun(false),
   m_bInRun(false),
   m_pFlyFrameSize(nullptr),
@@ -3509,9 +3508,7 @@ RtfAttributeOutput::RtfAttributeOutput(RtfExport& rExport)
 {
 }
 
-RtfAttributeOutput::~RtfAttributeOutput()
-{
-}
+RtfAttributeOutput::~RtfAttributeOutput() = default;
 
 MSWordExportBase& RtfAttributeOutput::GetExport()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Takeshi Abe]

 starmath/inc/helpids.h|1 +
 starmath/inc/starmath.hrc |3 +++
 starmath/source/ElementsDockingWindow.cxx |1 +
 starmath/source/commands.src  |   11 +++
 4 files changed, 16 insertions(+)

New commits:
commit 287b35c43771d3258ed877607e29882b3730201b
Author: Takeshi Abe 
Date:   Wed Nov 9 19:19:17 2016 +0900

tdf#44839 Add an "Evaluated At" command in "Brackets" section

of Elements window.

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

diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 923496b..d932d83 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -248,6 +248,7 @@
 #define HID_SMA_XUNDERBRACEY  
"STARMATH_HID_SMA_XUNDERBRACEY"
 #define HID_SMA_LRDBRACKETX   
"STARMATH_HID_SMA_LRDBRACKETX"
 #define HID_SMA_SLRDBRACKETX  
"STARMATH_HID_SMA_SLRDBRACKETX"
+#define HID_SMA_XEVALUATEDATY 
"STARMATH_HID_SMA_XEVALUATEDATY"
 
 
 #define HID_SMA_NOSPACE   
"STARMATH_HID_SMA_NOSPACE"
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 6fc8fb16f..28106ed 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -416,6 +416,7 @@
 #define RID_SLRDBRACKETX(RID_APP_START + 1824)
 #define RID_XOVERBRACEY (RID_APP_START + 1825)
 #define RID_XUNDERBRACEY(RID_APP_START + 1826)
+#define RID_XEVALUATEDATY   (RID_APP_START + 1827)
 
 #define RID_NEWLINE (RID_APP_START + 1901)
 #define RID_SBLANK  (RID_APP_START + 1902)
@@ -668,6 +669,8 @@
 #define RID_COLORX_SILVER_HELP  (RID_APP_START + 4199)
 #define RID_COLORX_TEAL_HELP(RID_APP_START + 4200)
 
+#define RID_XEVALUATEDATY_HELP  (RID_APP_START + 4201)
+
 #define RID_ALIGNLX_HELP  (RID_APP_START + 4275)
 #define RID_ALIGNCX_HELP  (RID_APP_START + 4276)
 #define RID_ALIGNRX_HELP  (RID_APP_START + 4277)
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 4721e51..6e54eff 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -189,6 +189,7 @@ const sal_uInt16 SmElementsControl::aBrackets[][2] =
 {RID_SLRANGLEX, RID_SLRANGLEX_HELP}, {RID_SLMRANGLEXY, 
RID_SLMRANGLEXY_HELP},
 {RID_SLRCEILX, RID_SLRCEILX_HELP}, {RID_SLRFLOORX, RID_SLRFLOORX_HELP},
 {RID_SLRLINEX, RID_SLRLINEX_HELP}, {RID_SLRDLINEX, RID_SLRDLINEX_HELP},
+{RID_XEVALUATEDATY, RID_XEVALUATEDATY_HELP},
 {0X, 0},
 {RID_XOVERBRACEY, RID_XOVERBRACEY_HELP}, {RID_XUNDERBRACEY, 
RID_XUNDERBRACEY_HELP},
 };
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 0df9c4e..3ab9258 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -903,6 +903,11 @@ String RID_SLMRANGLEXY_HELP
 {
 Text [ en-US ] = "Operator Brackets (Scalable)" ;
 };
+String RID_XEVALUATEDATY { Text = "left none {} right rline_{} " ; };
+String RID_XEVALUATEDATY_HELP
+{
+Text [ en-US ] = "Evaluated At" ;
+};
 String RID_XOVERBRACEY  { Text = "{} overbrace {} " ; };
 String RID_XOVERBRACEY_HELP
 {
@@ -2316,6 +2321,12 @@ Menu RID_COMMANDMENU
 };
 MenuItem
 {
+Identifier = RID_XEVALUATEDATY;
+HelpId = HID_SMA_XEVALUATEDATY;
+Text = "left none x right rline_y";
+};
+MenuItem
+{
 Separator = TRUE;
 };
 MenuItem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/svx/sdr/animation/scheduler.hxx |   49 +---
 svx/source/sdr/animation/scheduler.cxx  |  184 +++-
 2 files changed, 49 insertions(+), 184 deletions(-)

New commits:
commit 2ed4034aa51292a8bb8e770213f0021a3f1c9408
Author: Noel Grandin 
Date:   Wed Nov 9 12:46:38 2016 +0200

Revert "Revert "convert sdr::animation::EventList to o3tl::sorted_vector""

This reverts commit 0e0e3ea312dc09de6726318c3579671fec7de7ee.

and fixes the call to o3tl::sorted_vector::erase that causes a crash.

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

diff --git a/include/svx/sdr/animation/scheduler.hxx 
b/include/svx/sdr/animation/scheduler.hxx
index 1d1c16a..15eaa34 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -23,31 +23,24 @@
 #include 
 #include 
 #include 
+#include 
 
 
-// event class
-
 namespace sdr
 {
 namespace animation
 {
+
 class SVX_DLLPUBLIC Event
 {
 // time of event in ms
 sal_uInt32  mnTime;
 
-// pointer for linked list sorted by mnTime
-Event*  mpNext;
-
 public:
 // constructor/destructor
 SAL_DLLPRIVATE explicit Event();
 virtual ~Event();
 
-// access to mpNext
-SAL_DLLPRIVATE Event* GetNext() const {  return mpNext; }
-SAL_DLLPRIVATE void SetNext(Event* pNew);
-
 // get/set time
 SAL_DLLPRIVATE sal_uInt32 GetTime() const {  return mnTime; }
 void SetTime(sal_uInt32 nNew);
@@ -55,43 +48,12 @@ namespace sdr
 // execute event
 virtual void Trigger(sal_uInt32 nTime) = 0;
 };
-} // end of namespace animation
-} // end of namespace sdr
-
 
-// eventlist class
-
-namespace sdr
-{
-namespace animation
-{
-class SVX_DLLPUBLIC EventList
+struct CompareEvent
 {
-// pointer to first entry
-Event*  mpHead;
-
-public:
-// constructor/destructor
-SAL_DLLPRIVATE EventList();
-virtual ~EventList();
-
-// insert/remove time dependent
-SAL_DLLPRIVATE void Insert(Event* pNew);
-SAL_DLLPRIVATE void Remove(Event* pOld);
-
-// get first
-SAL_DLLPRIVATE Event* GetFirst() {  return mpHead; }
+bool operator()(Event* const& lhs, Event* const& rhs) const;
 };
-} // end of namespace animation
-} // end of namespace sdr
-
 
-// scheduler class
-
-namespace sdr
-{
-namespace animation
-{
 class SVX_DLLPUBLIC Scheduler : public Timer
 {
 // time in ms
@@ -101,7 +63,7 @@ namespace sdr
 sal_uInt32  mnDeltaTime;
 
 // list of events
-EventList   maList;
+o3tl::sorted_vector   maList;
 
 // Flag which remembers if this timer is paused. Default
 // is false.
@@ -135,6 +97,7 @@ namespace sdr
 SAL_DLLPRIVATE bool IsPaused() const { return mbIsPaused; }
 SAL_DLLPRIVATE void SetPaused(bool bNew);
 };
+
 } // end of namespace animation
 } // end of namespace sdr
 
diff --git a/svx/source/sdr/animation/scheduler.cxx 
b/svx/source/sdr/animation/scheduler.cxx
index 3841272..9936dfd 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -28,9 +28,7 @@ namespace sdr
 {
 namespace animation
 {
-Event::Event()
-:   mnTime(0),
-mpNext(nullptr)
+Event::Event() : mnTime(0)
 {
 }
 
@@ -39,15 +37,6 @@ namespace sdr
 }
 
 
-void Event::SetNext(Event* pNew)
-{
-if(pNew != mpNext)
-{
-mpNext = pNew;
-}
-}
-
-
 void Event::SetTime(sal_uInt32 nNew)
 {
 if(mnTime != nNew)
@@ -55,93 +44,13 @@ namespace sdr
 mnTime = nNew;
 }
 }
-} // end of namespace animation
-} // end of namespace sdr
-
-
-// eventlist class
 
-namespace sdr
-{
-namespace animation
-{
-EventList::EventList()
-:   mpHead(nullptr)
+bool CompareEvent::operator()(Event* const& lhs, Event* const& rhs) 
const
 {
+return lhs->GetTime() < rhs->GetTime();
 }
 
-EventList::~EventList()
-{
-while(mpHead)
-{
-Event* pNext = mpHead->GetNext();
-mpHead->SetNext(nullptr);
-mpHead = pNext;
-}
-}
-
-void EventList::Insert(Eve

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

[Noel Grandin]

 sd/source/ui/dlg/sdtreelb.cxx |   19 +++
 sd/source/ui/inc/sdtreelb.hxx |9 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit e9da91fd028e73846b1bed2618357d0abfbdcc57
Author: Noel Grandin 
Date:   Tue Nov 8 16:15:55 2016 +0200

tdf#103756 - CTRL+Z not working to undo changes performed through Navigator

Hooked up the tree control to do explicit handling of accelerator key
input.

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

diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 19baf9a..9b9416a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -56,6 +57,8 @@
 #include 
 #include 
 #include 
+
+
 using namespace com::sun::star;
 
 class SdPageObjsTLB::IconProvider
@@ -214,8 +217,19 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, 
WinBits nStyle )
 SetDragDropMode(
  DragDropMode::CTRL_MOVE | DragDropMode::CTRL_COPY |
 DragDropMode::APP_MOVE  | DragDropMode::APP_COPY  | 
DragDropMode::APP_DROP );
+
+m_pAccel = ::svt::AcceleratorExecute::createAcceleratorHelper();
 }
 
+void SdPageObjsTLB::SetViewFrame( SfxViewFrame* pViewFrame )
+{
+mpFrame = pViewFrame;
+sd::ViewShellBase* pBase = sd::ViewShellBase::GetViewShellBase(pViewFrame);
+const css::uno::Reference< css::frame::XFrame > xFrame = 
pBase->GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface();
+m_pAccel->init(::comphelper::getProcessComponentContext(), xFrame);
+}
+
+
 SdPageObjsTLB::~SdPageObjsTLB()
 {
 disposeOnce();
@@ -230,6 +244,7 @@ void SdPageObjsTLB::dispose()
 delete mpMedium;
 mpParent.clear();
 mpDropNavWin.clear();
+m_pAccel.reset();
 SvTreeListBox::dispose();
 }
 
@@ -1037,6 +1052,10 @@ void SdPageObjsTLB::SelectHdl()
  */
 void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
 {
+const vcl::KeyCode& aKeyCode = rKEvt.GetKeyCode();
+if ( m_pAccel->execute( aKeyCode ) )
+// the accelerator consumed the event
+return;
 if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN )
 {
 // commented code from svtools/source/contnr/svimpbox.cxx
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index a7c12d7..2053c8d 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -50,6 +50,9 @@ class DrawDocShell;
 typedef ::tools::SvRef DrawDocShellRef;
 #endif
 }
+namespace svt {
+class AcceleratorExecute;
+}
 
 /**
  * Effect-Tab-Dialog
@@ -62,6 +65,8 @@ private:
 
 // set contenttree in SdNavigatorWin
 bool   bisInSdNavigatorWin;
+
+::std::unique_ptr< ::svt::AcceleratorExecute> m_pAccel;
 public:
 
 // nested class to implement the TransferableHelper
@@ -182,7 +187,7 @@ protected:
 public:
 
 SdPageObjsTLB(vcl::Window* pParent, WinBits nStyle);
-virtual ~SdPageObjsTLB() override;
+virtual ~SdPageObjsTLB() override;
 virtual voiddispose() override;
 
// helper function for   GetEntryAltText and GetEntryLongDescription
@@ -192,7 +197,7 @@ public:
 virtual voidSelectHdl() override;
 virtual voidKeyInput( const KeyEvent& rKEvt ) override;
 
-voidSetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame 
= pViewFrame; }
+voidSetViewFrame( SfxViewFrame* pViewFrame );
 
 voidFill( const SdDrawDocument*, bool bAllPages, const 
OUString& rDocName );
 voidFill( const SdDrawDocument*, SfxMedium* 
pSfxMedium, const OUString& rDocName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Khaled Hosny]

On Wed, Nov 09, 2016 at 11:01:48AM +, Caolán McNamara wrote:
> On Tue, 2016-11-08 at 23:08 +, Crashtest VM wrote:
> > New crashtest update available at http://dev-
> > builds.libreoffice.org/crashtest/64a708cba9b954afe3331f63c58218eb53b3
> > d0ce/
> 
> commit 3a543f1f57aed3beba8879ed46e1f92f657151cb
> Author: Khaled Hosny 
> Date:   Mon Oct 10 00:54:00 2016 +0200
> 
> Validate Kashida positions in CommonSalLayout
> 
> triggers a crash on reexporting fdo58980-3.odt to odt.
> 
> I've bodged it with...
> 
> commit 243977708ceaf877e520ef0bb393aa49040d65c9
> Author: Caolán McNamara 
> Date:   Wed Nov 9 10:58:39 2016 +
> 
> crashtesting: crash on reexport of fdo58980-3.odt to odt

Where can I find that fdo58980-3.odt file? I think continuing would be
the same as breaking here, though I’d return true as well since this
position can’t be ligature if it is across to layout instances.

(the fact that we split styled text and lay it out separately is a big
limitation in itself, but that is for another day).

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

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

[Michael Stahl]

 uui/source/iahndl-authentication.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 361d5819d5c9331b0127401435d2f07467148da1
Author: Michael Stahl 
Date:   Wed Nov 9 14:27:18 2016 +0100

uui: fix use-after-free on password dialog

VclPtr returned from CreatePasswordToOpenModifyDialog implicitly
converts to plain pointer then deletes the dialog.

(regression from some vclptr refactoring)

Change-Id: I4ccdeabcd6ee718104c0f7f65d67a20ce2c70ca3

diff --git a/uui/source/iahndl-authentication.cxx 
b/uui/source/iahndl-authentication.cxx
index 3edace1..fa7d63f 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -528,8 +528,8 @@ executePasswordDialog(
 const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0;   // 
0 -> allow any length
 
 VclAbstractDialogFactory * pFact = 
VclAbstractDialogFactory::Create();
-AbstractPasswordToOpenModifyDialog *pTmp = 
pFact->CreatePasswordToOpenModifyDialog( pParent, nMaxPasswdLen, 
bIsPasswordToModify );
-ScopedVclPtr< AbstractPasswordToOpenModifyDialog > pDialog( 
pTmp );
+ScopedVclPtr const pDialog(
+pFact->CreatePasswordToOpenModifyDialog(pParent, 
nMaxPasswdLen, bIsPasswordToModify));
 
 rInfo.SetResult( pDialog->Execute() == RET_OK ? 
ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
 rInfo.SetPassword( pDialog->GetPasswordToOpen() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/layout/flowfrm.cxx |1 +
 sw/source/core/layout/wsfrm.cxx   |7 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c40e6060b2f0945cc9df052e8bdd578c88a258cb
Author: Caolán McNamara 
Date:   Wed Nov 9 13:12:14 2016 +

crashtesting: crash on layout of ooo107760-1.doc

this has begun crashing since...

commit 8f2dd1df1d6cc94ebbc1149de72bc6d6dffa6533
Author: Khaled Hosny 
Date:   Wed Nov 2 23:52:06 2016 +0200

"Enable the new text layout engine by default"

but its presumably blameless

Change-Id: I5d9bfcd3277ce6b71dce8dced6947ab38b12f148

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 772d4cc..d517103 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -587,6 +587,7 @@ void SwFlowFrame::MoveSubTree( SwLayoutFrame* pParent, 
SwFrame* pSibling )
 //SwSectionFrame::MergeNext removing the pParent we're trying to 
reparent
 //into
 FlowFrameJoinLockGuard aJoinGuard(pParent);
+SwFrameDeleteGuard aDeleteGuard(pParent);
 pOldParent = CutTree( &m_rThis );
 bInvaLay = PasteTree( &m_rThis, pParent, pSibling, pOldParent );
 }
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index b62012d..ec8d94b 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -963,8 +963,11 @@ void SwContentFrame::Cut()
 if( pTmp )
 pTmp->InvalidatePrt_();
 }
-pUp->Cut();
-SwFrame::DestroyFrame(pUp);
+if (!pUp->IsDeleteForbidden())
+{
+pUp->Cut();
+SwFrame::DestroyFrame(pUp);
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/source/filter/jpeg/jpegc.cxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 0d1571916116e16ce6a64ab231f7f8632fcbd0e8
Author: Tomaž Vajngerl 
Date:   Tue Nov 8 19:18:52 2016 +0100

tdf#103801 JPEG - don't handle buffer orientation in import

We don't need to read buffer in reverse scanline order if image
is bottom-up. This is handled by CopyScanline already.

Change-Id: Ibb20978c01115743de8a457e56003d28ef6dd6d9
Reviewed-on: https://gerrit.libreoffice.org/30710
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 28af8c9..8fc0ed8 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -177,16 +177,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* 
pInputStream, long* pLines,
 pCYMKBuffer.resize(nWidth * 4);
 }
 
-const ScanlineFormat nFormat = pAccess->GetScanlineFormat();
-
-bool bTopDown = true;
-
-if (( bGray && nFormat == ScanlineFormat::N8BitPal) ||
-(!bGray && nFormat == ScanlineFormat::N24BitTcRgb))
-{
-bTopDown = pAccess->IsTopDown();
-}
-
 std::unique_ptr pCols;
 
 if (bGray)
@@ -228,9 +218,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 jpeg_read_scanlines(&cinfo, 
reinterpret_cast(&p), 1);
 }
 
-if (!bTopDown)
-yIndex = nHeight - 1 - yIndex;
-
 if (bGray)
 {
 for (long x = 0; x < nWidth; ++x)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara]

 desktop/source/deployment/gui/dp_gui.hrc |2 
 desktop/source/deployment/gui/dp_gui_dialog.src  |5 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   92 ++-
 desktop/source/deployment/gui/dp_gui_dialog2.hxx |4 
 desktop/uiconfig/ui/extensionmanager.ui  |  136 +--
 5 files changed, 142 insertions(+), 97 deletions(-)

New commits:
commit 989cf68b68eda98b9f3942bb738e60ec649707dc
Author: Muhammet Kara 
Date:   Tue Nov 1 14:09:54 2016 +0300

tdf#103146 Revamp Extension Manager Dialog, Part 1

Moved the "Check for Updates", and "Add" buttons
to the new row, and started moving the buttons
from the ExtBoxWithBtns_Impl to the new row.

Needed to create new public methods to be able
to update button states of ExtMgrDialog from
within the ExtBoxWithBtns_Impl class.

Change-Id: Iea784d0b7237da3f8aa05862dbf1faf5acf98655
Reviewed-on: https://gerrit.libreoffice.org/30560
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/desktop/source/deployment/gui/dp_gui.hrc 
b/desktop/source/deployment/gui/dp_gui.hrc
index ddee13a..b970d44 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -67,7 +67,7 @@
 #define RID_CTX_ITEM_ENABLE(RID_DEPLOYMENT_GUI_START+81)
 #define RID_CTX_ITEM_DISABLE   (RID_DEPLOYMENT_GUI_START+82)
 #define RID_CTX_ITEM_CHECK_UPDATE  (RID_DEPLOYMENT_GUI_START+83)
-#define RID_CTX_ITEM_OPTIONS   (RID_DEPLOYMENT_GUI_START+84)
+//There is a gap here
 
 #define RID_STR_ADDING_PACKAGES(RID_DEPLOYMENT_GUI_START+85)
 #define RID_STR_REMOVING_PACKAGES  (RID_DEPLOYMENT_GUI_START+86)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src 
b/desktop/source/deployment/gui/dp_gui_dialog.src
index ae85a1d..9078a35 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -44,11 +44,6 @@ String RID_CTX_ITEM_CHECK_UPDATE
 Text [ en-US ] = "~Update...";
 };
 
-String RID_CTX_ITEM_OPTIONS
-{
-Text [ en-US ] = "~Options...";
-};
-
 String RID_STR_ADDING_PACKAGES
 {
 Text [ en-US ] = "Adding %EXTENSION_NAME";
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 6afa3ae..043021d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -116,7 +116,6 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
 {
 boolm_bInterfaceLocked;
 
-VclPtr m_pOptionsBtn;
 VclPtr m_pEnableBtn;
 VclPtr m_pRemoveBtn;
 
@@ -130,7 +129,6 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
 
 DECL_LINK( ScrollHdl, ScrollBar*, void );
 
-DECL_LINK( HandleOptionsBtn, Button*, void );
 DECL_LINK( HandleEnableBtn, Button*, void );
 DECL_LINK( HandleRemoveBtn, Button*, void );
 
@@ -153,7 +151,6 @@ public:
 ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(vcl::Window* pParent)
 : ExtensionBox_Impl(pParent)
 , m_bInterfaceLocked(false)
-, m_pOptionsBtn(nullptr)
 , m_pEnableBtn(nullptr)
 , m_pRemoveBtn(nullptr)
 , m_pParent(nullptr)
@@ -166,26 +163,21 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog 
*pParentDialog)
 
 m_pParent = pParentDialog;
 
-m_pOptionsBtn = VclPtr::Create( this, WB_TABSTOP );
 m_pEnableBtn = VclPtr::Create( this, WB_TABSTOP );
 m_pRemoveBtn = VclPtr::Create( this, WB_TABSTOP );
 
 SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );
-m_pOptionsBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_OPTIONS );
 m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE );
 m_pRemoveBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_REMOVE );
 
-m_pOptionsBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, 
HandleOptionsBtn ) );
 m_pEnableBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, 
HandleEnableBtn ) );
 m_pRemoveBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, 
HandleRemoveBtn ) );
 
-m_pOptionsBtn->SetText( DialogHelper::getResourceString( 
RID_CTX_ITEM_OPTIONS ) );
 m_pEnableBtn->SetText( DialogHelper::getResourceString( 
RID_CTX_ITEM_DISABLE ) );
 m_pRemoveBtn->SetText( DialogHelper::getResourceString( 
RID_CTX_ITEM_REMOVE ) );
 
 Size aSize = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ),
MapMode( MapUnit::MapAppFont ) );
-m_pOptionsBtn->SetSizePixel( aSize );
 m_pEnableBtn->SetSizePixel( aSize );
 m_pRemoveBtn->SetSizePixel( aSize );
 
@@ -207,7 +199,6 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
 
 void ExtBoxWithBtns_Impl::dispose()
 {
-m_pOptionsBtn.disposeAndClear();
 m_pEnableBtn.disposeAndClear();
 m_pRemoveBtn.disposeAndClear();
 m_pParent.clear();
@@ -225,8 +216,7 @@ void ExtBoxWithBtns_Impl::RecalcAll()
 }
 else
 {
-

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

[Eike Rathke]

 sc/source/core/data/bcaslot.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 129eddc18b4f2cb1320b60bf68de537cf86b60f2
Author: Eike Rathke 
Date:   Wed Nov 9 15:12:39 2016 +0100

Resolves: tdf#103689 do not slice 3D area broadcasters into separate sheets

Change-Id: Ie167e5e5e953c3e8064b8e128d52f6aa6740575b

diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 8eb426b..64cf53c 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -736,6 +736,11 @@ void ScBroadcastAreaSlotMachine::StartListeningArea(
 }
 else
 {
+// A new area needs to be inserted to the corresponding slots, for 3D
+// ranges for all sheets, do not slice into per sheet areas or the
+// !bDone will break too early (i.e. after the first sheet) if
+// subsequent listeners are to be added.
+ScBroadcastArea* pArea = nullptr;
 bool bDone = false;
 for (SCTAB nTab = rRange.aStart.Tab();
 !bDone && nTab <= rRange.aEnd.Tab(); ++nTab)
@@ -750,7 +755,6 @@ void ScBroadcastAreaSlotMachine::StartListeningArea(
 SCSIZE nOff = nStart;
 SCSIZE nBreak = nOff + nRowBreak;
 ScBroadcastAreaSlot** pp = ppSlots + nOff;
-ScBroadcastArea* pArea = nullptr;
 while ( !bDone && nOff <= nEnd )
 {
 if ( !*pp )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 281b3458940e06f9cb5f679537adc19532a0a80d
Author: Khaled Hosny 
Date:   Wed Nov 9 16:19:08 2016 +0200

Allow the Kashida here

Change-Id: Ibb408af7f989bf35faf13aa871917e7f4cb2aa6f

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index c6de183..b7e5578 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -751,14 +751,18 @@ bool CommonSalLayout::IsKashidaPosValid(int nCharPos) 
const
 {
 if (pIter->mnCharPos == nCharPos)
 {
+// The position is the first glyphs, this would happen if we
+// changed the text styling in the middle of a word. Since we 
don’t
+// do ligatures accross layout engine instances, thid can’t be a
+// ligature so it should be fine.
+if (pIter == m_GlyphItems.begin())
+return true;
+
 // If the character was not supported by this layout, return false
 // so that fallback layouts would be checked for it.
 if (pIter->maGlyphId == 0)
 break;
 
-if (pIter == m_GlyphItems.begin())
-continue;
-
 // Search backwards for previous glyph belonging to a different
 // character. We are looking backwards because we are dealing with
 // RTL glyphs, which will be in visual order.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Khaled Hosny]

On Wed, Nov 09, 2016 at 03:29:31PM +0200, Khaled Hosny wrote:
> On Wed, Nov 09, 2016 at 11:01:48AM +, Caolán McNamara wrote:
> > On Tue, 2016-11-08 at 23:08 +, Crashtest VM wrote:
> > > New crashtest update available at http://dev-
> > > builds.libreoffice.org/crashtest/64a708cba9b954afe3331f63c58218eb53b3
> > > d0ce/
> > 
> > commit 3a543f1f57aed3beba8879ed46e1f92f657151cb
> > Author: Khaled Hosny 
> > Date:   Mon Oct 10 00:54:00 2016 +0200
> > 
> > Validate Kashida positions in CommonSalLayout
> > 
> > triggers a crash on reexporting fdo58980-3.odt to odt.
> > 
> > I've bodged it with...
> > 
> > commit 243977708ceaf877e520ef0bb393aa49040d65c9
> > Author: Caolán McNamara 
> > Date:   Wed Nov 9 10:58:39 2016 +
> > 
> > crashtesting: crash on reexport of fdo58980-3.odt to odt
> 
> Where can I find that fdo58980-3.odt file? I think continuing would be
> the same as breaking here, though I’d return true as well since this
> position can’t be ligature if it is across to layout instances.

I guess it is the attachment in [1]. Indeed there is a change in color
right at the Kashida position. I pushed a slightly better fix.

Regards,
Khaled

1. https://bugs.documentfoundation.org/show_bug.cgi?id=58980
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Laurent Balland-Poirier]

 sc/qa/unit/data/ods/tdf102370_ExponentWithoutSign.ods |binary
 sc/qa/unit/subsequent_export-test.cxx |   27 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit b0901f9f0843c2d85da6742780d9aef296f62c60
Author: Laurent Balland-Poirier 
Date:   Sat Oct 22 23:51:14 2016 +0200

tdf#102370 QA test exponent without sign during export to Excel

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

diff --git a/sc/qa/unit/data/ods/tdf102370_ExponentWithoutSign.ods 
b/sc/qa/unit/data/ods/tdf102370_ExponentWithoutSign.ods
new file mode 100644
index 000..ab3fbd7
Binary files /dev/null and 
b/sc/qa/unit/data/ods/tdf102370_ExponentWithoutSign.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 9a47f47..b9bbc30 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -179,6 +180,7 @@ public:
 void testTdf88657();
 void testEscapeCharInNumberFormatXLSX();
 void testNatNumInNumberFormatXLSX();
+void testExponentWithoutSignFormatXLSX();
 
 void testHiddenRepeatedRowsODS();
 void testHyperlinkTargetFrameODS();
@@ -264,6 +266,7 @@ public:
 CPPUNIT_TEST(testTdf88657);
 CPPUNIT_TEST(testEscapeCharInNumberFormatXLSX);
 CPPUNIT_TEST(testNatNumInNumberFormatXLSX);
+CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);
 
 CPPUNIT_TEST(testHiddenRepeatedRowsODS);
 CPPUNIT_TEST(testHyperlinkTargetFrameODS);
@@ -3698,6 +3701,28 @@ void ScExportTest::testNatNumInNumberFormatXLSX()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testExponentWithoutSignFormatXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("tdf102370_ExponentWithoutSign.", 
FORMAT_ODS);
+CPPUNIT_ASSERT( xDocSh.Is() );
+xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX);
+CPPUNIT_ASSERT( xDocSh.Is() );
+
+xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.Is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+sal_uInt32 nNumberFormat;
+rDoc.GetNumberFormat(0, 0, 0, nNumberFormat);
+const SvNumberformat* pNumberFormat = 
rDoc.GetFormatTable()->GetEntry(nNumberFormat);
+const OUString& rFormatStr = pNumberFormat->GetFormatstring();
+const OUString aExpectedFormatStr = "0.00E0";
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Number format lost exponent without sign 
during Excel export", aExpectedFormatStr, rFormatStr);
+
+xDocSh->DoClose();
+}
+
 void ScExportTest::testHiddenRepeatedRowsODS()
 {
 ScDocShellRef xDocSh = loadDoc("empty.", FORMAT_ODS);
@@ -3708,7 +3733,7 @@ void ScExportTest::testHiddenRepeatedRowsODS()
 rDoc.SetRowHidden(0, 20, 0, true);
 }
 
-xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS);  // Convert [NatNum5] to 
[DBNum2] in Chinese
+xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS);
 ScDocument& rDoc = xDocSh->GetDocument();
 SCROW nFirstRow = 0;
 SCROW nLastRow = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Balland-Poirier]

 svl/qa/unit/svl.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2e84e730a89de683c97bbcab89cd2dbf5a7a9b6d
Author: Laurent Balland-Poirier 
Date:   Sat Oct 22 22:07:30 2016 +0200

tdf#102507 Add qa test of left aligned denominator

New behavior of format # ?/??? gives for 3.5
3 1/2
instead of
3 1/  2

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

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 48b5b44..b8c3fc3 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1178,6 +1178,11 @@ void Test::testUserDefinedNumberFormats()
 sExpected = "-575 540/697";
 checkPreviewString(aFormatter, sCode, -575.774749601315, eLang, 
sExpected);
 }
+{  // tdf#102507: left alignment of denominator
+sCode = "# ?/???";
+sExpected = "3 1/2  ";
+checkPreviewString(aFormatter, sCode, 3.5, eLang, sExpected);
+}
 {  // tdf#100594: forced denominator
 sCode = "# ?/100";
 sExpected = " 6/100";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 loleaflet/src/layer/tile/TileLayer.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8ef5c5fa36edbbffe5c5b347f951cb1944a5fdf8
Author: László Németh 
Date:   Wed Nov 9 12:14:13 2016 +0100

loleaflet: hide debug control in disabled tile debug mode

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 9ac52e6..74cb6e2 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -396,10 +396,12 @@ L.TileLayer = L.GridLayer.extend({
if (!this._debug) {
map.removeLayer(this._debugInfo);
map.removeLayer(this._debugInfo2);
+   $('.leaflet-control-layers-expanded').css('display', 
'none');
} else {
if (this._debugInfo) {
map.addLayer(this._debugInfo);
map.addLayer(this._debugInfo2);
+   
$('.leaflet-control-layers-expanded').css('display', 'block');
}
this._debugInit();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/source/pdfio/pdfdocument.cxx |  115 ++-
 1 file changed, 82 insertions(+), 33 deletions(-)

New commits:
commit 05bdc6739c6b29bcce41716000dc02d1271abd13
Author: Miklos Vajna 
Date:   Wed Nov 9 09:50:31 2016 +0100

xmlsecurity PDF sign: handle when Page object's Annots is an indirect array

Normally it's a direct array, but it's OK to have it as a reference, and
then the referenced object is an array.

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

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 2af2da8..8c01cd9 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -437,46 +437,95 @@ bool PDFDocument::Sign(const 
uno::Reference& xCertificat
 m_aEditBuffer.WriteCharPtr(" 0 R\n>>\n");
 m_aEditBuffer.WriteCharPtr(">>\nendobj\n\n");
 
-// Write the updated first page object, references nAnnotId.
-sal_uInt32 nFirstPageId = pFirstPage->GetObjectValue();
-if (nFirstPageId >= m_aXRef.size())
+PDFElement* pAnnots = pFirstPage->Lookup("Annots");
+auto pAnnotsReference = dynamic_cast(pAnnots);
+if (pAnnotsReference)
 {
-SAL_WARN("xmlsecurity.pdfio", "PDFDocument::Sign: invalid first page 
obj id");
-return false;
-}
-m_aXRef[nFirstPageId].m_nOffset = m_aEditBuffer.Tell();
-m_aXRef[nFirstPageId].m_bDirty = true;
-m_aEditBuffer.WriteUInt32AsString(nFirstPageId);
-m_aEditBuffer.WriteCharPtr(" 0 obj\n");
-m_aEditBuffer.WriteCharPtr("<<");
-auto pAnnots = 
dynamic_cast(pFirstPage->Lookup("Annots"));
-if (!pAnnots)
-{
-// No Annots key, just write the key with a single reference.
-m_aEditBuffer.WriteBytes(static_cast(m_aEditBuffer.GetData()) + pFirstPage->GetDictionaryOffset(), 
pFirstPage->GetDictionaryLength());
-m_aEditBuffer.WriteCharPtr("/Annots[");
+// Write the updated Annots key of the Page object.
+PDFObjectElement* pAnnotsObject = pAnnotsReference->LookupObject();
+if (!pAnnotsObject)
+{
+SAL_WARN("xmlsecurity.pdfio", "PDFDocument::Sign: invalid Annots 
reference");
+return false;
+}
+
+sal_uInt32 nAnnotsId = pAnnotsObject->GetObjectValue();
+m_aXRef[nAnnotsId].m_eType = XRefEntryType::NOT_COMPRESSED;
+m_aXRef[nAnnotsId].m_nOffset = m_aEditBuffer.Tell();
+m_aXRef[nAnnotsId].m_nGenerationNumber = 0;
+m_aXRef[nAnnotsId].m_bDirty = true;
+m_aEditBuffer.WriteUInt32AsString(nAnnotsId);
+m_aEditBuffer.WriteCharPtr(" 0 obj\n[");
+
+// Write existing references.
+PDFArrayElement* pArray = pAnnotsObject->GetArray();
+if (!pArray)
+{
+SAL_WARN("xmlsecurity.pdfio", "PDFDocument::Sign: Page Annots is a 
reference to a non-array");
+return false;
+}
+
+for (size_t i = 0; i < pArray->GetElements().size(); ++i)
+{
+auto pReference = 
dynamic_cast(pArray->GetElements()[i]);
+if (!pReference)
+continue;
+
+if (i)
+m_aEditBuffer.WriteCharPtr(" ");
+m_aEditBuffer.WriteUInt32AsString(pReference->GetObjectValue());
+m_aEditBuffer.WriteCharPtr(" 0 R");
+}
+// Write our reference.
+m_aEditBuffer.WriteCharPtr(" ");
 m_aEditBuffer.WriteUInt32AsString(nAnnotId);
-m_aEditBuffer.WriteCharPtr(" 0 R]");
+m_aEditBuffer.WriteCharPtr(" 0 R");
+
+m_aEditBuffer.WriteCharPtr("]\nendobj\n\n");
 }
 else
 {
-// Annots key is already there, insert our reference at the end.
-PDFDictionaryElement* pDictionary = pFirstPage->GetDictionary();
+// Write the updated first page object, references nAnnotId.
+sal_uInt32 nFirstPageId = pFirstPage->GetObjectValue();
+if (nFirstPageId >= m_aXRef.size())
+{
+SAL_WARN("xmlsecurity.pdfio", "PDFDocument::Sign: invalid first 
page obj id");
+return false;
+}
+m_aXRef[nFirstPageId].m_nOffset = m_aEditBuffer.Tell();
+m_aXRef[nFirstPageId].m_bDirty = true;
+m_aEditBuffer.WriteUInt32AsString(nFirstPageId);
+m_aEditBuffer.WriteCharPtr(" 0 obj\n");
+m_aEditBuffer.WriteCharPtr("<<");
+auto pAnnotsArray = dynamic_cast(pAnnots);
+if (!pAnnotsArray)
+{
+// No Annots key, just write the key with a single reference.
+m_aEditBuffer.WriteBytes(static_cast(m_aEditBuffer.GetData()) + pFirstPage->GetDictionaryOffset(), 
pFirstPage->GetDictionaryLength());
+m_aEditBuffer.WriteCharPtr("/Annots[");
+m_aEditBuffer.WriteUInt32AsString(nAnnotId);
+m_aEditBuffer.WriteCharPtr(" 0 R]");
+}
+   

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

[Stephan Bergmann]

 framework/source/uielement/toolbarmanager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 574d331e7635ed5c9a56985ba1eeadb7353040bc
Author: Stephan Bergmann 
Date:   Wed Nov 9 17:19:53 2016 +0100

Avoid starting m_aAsyncUpdateControllersTimer of disposed ToolBarManager

Seen a Jenkins build fail in JunitTest_framework_complex as below, and the 
only
remotely plausible scenario I can think of is that a call from
Frame::contextChanged -> ToolBarManager::frameAction started the timer after
Frame::close -> dispose -> ... -> ToolBarManager::dispose had been called 
but
before Frame::close -> dispose -> ... -> ~ToolBarManager had been called.  
(And
tracing the calls to Frame member functions, there indeed appear to be call
patterns during JunitTest_framework_complex where Frame::contextChanged is
called from within Frame::close -> dispose -> ...)

Any other calls to m_aAsyncUpdateControllersTimer.Start() in ToolBarManager
appear to already check for !m_bDisposed.

:
> #7  0x2b2653546566 in __assert_fail_base () at /lib64/libc.so.6
> #8  0x2b2653546612 in  () at /lib64/libc.so.6
> #9  0x2b2676f23777 in framework::ToolBarManager::~ToolBarManager() 
(this=0x3a48710, __in_chrg=) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/framework/source/uielement/toolbarmanager.cxx:198
> #10 0x2b2676f23978 in framework::ToolBarManager::~ToolBarManager() 
(this=0x3a48710, __in_chrg=) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/framework/source/uielement/toolbarmanager.cxx:201
> #11 0x2b2655fd5328 in cppu::OWeakObject::release() (this=0x3a48710) 
at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/cppuhelper/source/weak.cxx:233
> #12 0x2b2676ec7138 in 
cppu::WeakImplHelper::release() (this=0x3a48710) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/cppuhelper/implbase.hxx:113
> #13 0x2b2655ef353a in com::sun::star::uno::cpp_release(void*) 
(pCppI=0x3a48738) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/com/sun/star/uno/genfunc.hxx:48
> #14 0x2b2655c5d4ab in cppu::idestructElements(void*, 
_typelib_TypeDescriptionReference*, int, int, void (*)(void*)) 
(pElements=0x32c5a28, pElementType=0x1670d90, nStartIndex=0, nStopIndex=5, 
release=0x2b2655ef3517 ) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/cppu/source/uno/destr.hxx:238
> p = 0x3a48738
> nPos = 4
> #15 0x2b2655c5d64f in cppu::idestroySequence(_sal_Sequence*, 
_typelib_TypeDescriptionReference*, _typelib_TypeDescription*, void (*)(void*)) 
(pSeq=0x32c5a20, pType=0x24a6cf0, pTypeDescr=0x24a6cf0, release=0x2b2655ef3517 
) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/cppu/source/uno/destr.hxx:284
> __PRETTY_FUNCTION__ = "void cppu::idestroySequence(uno_Sequence*, 
typelib_TypeDescriptionReference*, typelib_TypeDescription*, uno_ReleaseFunc)"
> #16 0x2b2655c8952f in uno_type_sequence_destroy(uno_Sequence*, 
typelib_TypeDescriptionReference*, uno_ReleaseFunc) (sequence=0x32c5a20, 
type=0x24a6cf0, release=0x2b2655ef3517 
) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/cppu/source/uno/sequence.cxx:916
> #17 0x2b2655f31ba6 in 
com::sun::star::uno::Sequence
 >::~Sequence() (this=0x2679070, __in_chrg=) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/com/sun/star/uno/Sequence.hxx:113
> rType = invalid uno::Type
> #18 0x2b2655f2ef92 in 
cppu::OInterfaceIteratorHelper::~OInterfaceIteratorHelper() 
(this=0x2b26785beaf0, __in_chrg=) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/cppuhelper/source/interfacecontainer.cxx:103
> bShared = false
> #19 0x2b2655f2fb98 in 
cppu::OInterfaceContainerHelper::disposeAndClear(com::sun::star::lang::EventObject
 const&) (this=0x32bd280, rEvt=...) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/cppuhelper/source/interfacecontainer.cxx:288
> aGuard = {pT = 0x0}
> aIt = {rCont = @0x32bd280, bIsList = 1 '\001', aData = 
{pAsSequence = 0x2679070, pAsInterface = 0x2679070}, nRemain = 0}
> #20 0x2b2655f308d7 in 
cppu::OMultiTypeInterfaceContainerHelper::disposeAndClear(com::sun::star::lang::EventObject
 const&) (this=0x38bc030, rEvt=...) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/cppuhelper/source/interfacecontainer.cxx:477
> i = 0
> nSize = 3
> ppListenerContainers = 
std::unique_ptr containing 0x2f7c650
> #21 0x2b2676e37180 in (anonymous namespace)::Frame::disposing() 
(this=0x38bbf30) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/framework/source/services/frame.cxx:2242
> parent = uno::Reference to (com::sun::star::uno::XInterface *) 
0x2b26785beca0
> 

[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_bugfix_test.mk sc/CppunitTest_sc_filters_test.mk sc/qa

[David Tardon]

 sc/CppunitTest_sc_bugfix_test.mk  |2 ++
 sc/CppunitTest_sc_filters_test.mk |2 ++
 sc/qa/unit/bugfix-test.cxx|6 ++
 sc/qa/unit/filters-test.cxx   |   24 
 sc/qa/unit/helper/qahelper.cxx|2 +-
 sc/qa/unit/helper/qahelper.hxx|2 +-
 6 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 1115281560a7e204386c21fe78b8c84ce42b2017
Author: David Tardon 
Date:   Wed Nov 9 16:26:56 2016 +0100

make MS Excel 2003 XML filter tests great again!

Change-Id: Ica8a5a2f6046eabf4fa8081db0aa50ade23b5b3a

diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index 8d07cf1..d6af092 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -77,6 +77,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_bugfix_test,\
 embeddedobj/util/embobj \
 eventattacher/source/evtatt \
 filter/source/config/cache/filterconfig1 \
+filter/source/xmlfilteradaptor/xmlfa \
+filter/source/xsltfilter/xsltfilter \
 forms/util/frm \
 framework/util/fwk \
 i18npool/source/search/i18nsearch \
diff --git a/sc/CppunitTest_sc_filters_test.mk 
b/sc/CppunitTest_sc_filters_test.mk
index 4d46b68..012da5f 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -80,6 +80,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
 embeddedobj/util/embobj \
 eventattacher/source/evtatt \
 filter/source/config/cache/filterconfig1 \
+filter/source/xmlfilteradaptor/xmlfa \
+filter/source/xsltfilter/xsltfilter \
 forms/util/frm \
 framework/util/fwk \
 i18npool/util/i18npool \
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index aedcea6..692e2a8 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -89,7 +89,7 @@ public:
 void testTdf98657();
 void testTdf88821();
 void testTdf88821_2();
-// void testRhbz1390776();
+void testRhbz1390776();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testTdf64229);
@@ -101,7 +101,7 @@ public:
 CPPUNIT_TEST(testTdf98657);
 CPPUNIT_TEST(testTdf88821);
 CPPUNIT_TEST(testTdf88821_2);
-// CPPUNIT_TEST(testRhbz1390776);
+CPPUNIT_TEST(testRhbz1390776);
 CPPUNIT_TEST_SUITE_END();
 private:
 uno::Reference m_xCalcComponent;
@@ -271,7 +271,6 @@ void ScFiltersTest::testTdf88821_2()
 xDocSh->DoClose();
 }
 
-#if 0
 void ScFiltersTest::testRhbz1390776()
 {
 ScDocShellRef xDocSh = loadDoc("rhbz1390776.", FORMAT_XLS_XML);
@@ -281,7 +280,6 @@ void ScFiltersTest::testRhbz1390776()
 
 xDocSh->DoClose();
 }
-#endif
 
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "/sc/qa/unit/data" )
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index f383c68..ff0b8f4 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -73,7 +73,7 @@ public:
 void testContentLotus123();
 void testContentDIF();
 void testContentXLSB();
-//void testContentXLS_XML();
+void testContentXLS_XML();
 void testSharedFormulaXLS();
 void testSharedFormulaXLSX();
 void testSheetNamesXLSX();
@@ -95,7 +95,7 @@ public:
 CPPUNIT_TEST(testContentLotus123);
 CPPUNIT_TEST(testContentDIF);
 CPPUNIT_TEST(testContentXLSB);
-//CPPUNIT_TEST(testContentXLS_XML);
+CPPUNIT_TEST(testContentXLS_XML);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testSharedFormulaXLSX);
 CPPUNIT_TEST(testSheetNamesXLSX);
@@ -230,7 +230,7 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat ) 
//same code for ods,
 ASSERT_DOUBLES_EQUAL_MESSAGE("=C1+C2", 11.0, fValue);
 
 //check merged cells import
-if (nFormat != FORMAT_LOTUS123 && nFormat != FORMAT_DIF)
+if (nFormat != FORMAT_LOTUS123 && nFormat != FORMAT_DIF && nFormat != 
FORMAT_XLS_XML)
 {
 SCCOL nCol = 4;
 SCROW nRow = 1;
@@ -317,15 +317,15 @@ void ScFiltersTest::testContentXLSB()
 xDocSh->DoClose();
 }
 
-// void ScFiltersTest::testContentXLS_XML()
-// {
-// ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS_XML);
-// CPPUNIT_ASSERT(xDocSh);
-//
-// ScDocument& rDoc = xDocSh->GetDocument();
-// testContentImpl(pDoc, FORMAT_XLS_XML);
-// xDocSh->DoClose();
-// }
+void ScFiltersTest::testContentXLS_XML()
+{
+ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS_XML);
+CPPUNIT_ASSERT(xDocSh.Is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+testContentImpl(rDoc, FORMAT_XLS_XML);
+xDocSh->DoClose();
+}
 
 void ScFiltersTest::testSharedFormulaXLS()
 {
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index ac7a0e3..061b7b5 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -49,7 +49,7 @@
 #define CSV_FORMAT_TYPE  (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT 
| SfxFilterFlags::ALIEN )
 #define HTML_FORMA

[Libreoffice-commits] core.git: offapi/com

[Stephan Bergmann]

 offapi/com/sun/star/frame/XFrame.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa69c29c89608e50d8d41c0008f31c30e60c6d20
Author: Stephan Bergmann 
Date:   Wed Nov 9 17:47:08 2016 +0100

Typo in documentation

Change-Id: I0970a86d65aa905cbd02d892be08de8962731e8b

diff --git a/offapi/com/sun/star/frame/XFrame.idl 
b/offapi/com/sun/star/frame/XFrame.idl
index 7648413..85c8df3 100644
--- a/offapi/com/sun/star/frame/XFrame.idl
+++ b/offapi/com/sun/star/frame/XFrame.idl
@@ -313,7 +313,7 @@ published interface XFrame: com::sun::star::lang::XComponent
 
 
 According to a call to this interface, the frame calls
-XFrameEventListener::frameAction() with
+XFrameActionListener::frameAction() with
 FrameAction::CONTEXT_CHANGED to all listeners which
 are registered using XFrame::addFrameActionListener().
 For external controllers this event can be used to requery dispatches.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/grouparealistener.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 6699afb43bffb9148960cbee2013d1704e462b9e
Author: Eike Rathke 
Date:   Wed Nov 9 18:44:01 2016 +0100

assert a supposed-to-be-fixed condition, tdf#89957 related

Change-Id: Ie00840e0b8cff747e131b6bc9def0ddaf57edea7

diff --git a/sc/source/core/tool/grouparealistener.cxx 
b/sc/source/core/tool/grouparealistener.cxx
index 5c5b0a3..aca46a4 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -219,7 +219,7 @@ void FormulaGroupAreaListener::collectFormulaCells(
 const_cast(this)->mnGroupLen = nLen;
 }
 
-/* FIXME: with tdf#89957 it happened that the actual block size in column
+/* With tdf#89957 it happened that the actual block size in column
  * AP (shifted from AO) of sheet 'w' was smaller than the remembered group
  * length and correct. This is just a very ugly workaround, the real cause
  * is yet unknown, but at least don't crash in such case. The intermediate
@@ -233,6 +233,14 @@ void FormulaGroupAreaListener::collectFormulaCells(
 SAL_WARN("sc.core","FormulaGroupAreaListener::collectFormulaCells() 
nBlockSize " <<
 nBlockSize << " < " << mnGroupLen << " mnGroupLen");
 const_cast(this)->mnGroupLen = 
static_cast(nBlockSize);
+
+// erAck: 2016-11-09T18:30+01:00  XXX This doesn't occur anymore, at
+// least not in the original bug scenario (insert a column before H on
+// sheet w) of tdf#89957 with
+// http://bugs.documentfoundation.org/attachment.cgi?id=114042
+// Apparently this was fixed in the mean time, let's assume and get the
+// assert bat out to hit us if it wasn't.
+assert(!"something is still messing up the formula goup and block size 
length");
 }
 
 ScFormulaCell* const * ppEnd = pp + mnGroupLen;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 2a5bb08a2c84470a7a33547ee478d3c26f7ae159
Author: Tor Lillqvist 
Date:   Wed Nov 9 20:04:49 2016 +0200

loplugin:unnecessaryoverride and loplugin:override

Change-Id: Id9daf4f5e3208eca8d3d845983b58ab056557621

diff --git a/xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx 
b/xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx
index ecb0495..d11672b 100644
--- a/xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx
+++ b/xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
 XmlsecurityDialogsTest();
-virtual ~XmlsecurityDialogsTest();
-
-virtual void setUp() override;
+virtual ~XmlsecurityDialogsTest() override;
 
 // try to open a dialog
 void openAnyDialog();
@@ -50,11 +48,6 @@ XmlsecurityDialogsTest::~XmlsecurityDialogsTest()
 {
 }
 
-void XmlsecurityDialogsTest::setUp()
-{
-ScreenshotTest::setUp();
-}
-
 void XmlsecurityDialogsTest::registerKnownDialogsByID(mapType& 
/*rKnownDialogs*/)
 {
 // fill map of known dilogs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 comphelper/source/misc/docpasswordhelper.cxx   |6 +++---
 package/source/zippackage/ZipPackageStream.cxx |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 24063ec94bd3f8407827f03ccde8bd99790f85e2
Author: Michael Stahl 
Date:   Wed Nov 9 18:44:17 2016 +0100

comphelper: also bump PDBKDF2 count for password-to-modify

The password-to-modify misfeature does not actually provide any
security, but it may induce users to re-use passwords, so at least make
it harder to crack the passwords.

Change-Id: I0adf0e8e11b222fc469013e17a2695bd7122ad01

diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index d384b4f..49fc0c3 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -74,9 +74,9 @@ uno::Sequence< beans::PropertyValue > 
DocPasswordHelper::GenerateNewModifyPasswo
 uno::Sequence< beans::PropertyValue > aResult;
 
 uno::Sequence< sal_Int8 > aSalt = GenerateRandomByteSequence( 16 );
-sal_Int32 nCount = 1024;
+sal_Int32 const nPBKDF2IterationCount = 10;
 
-uno::Sequence< sal_Int8 > aNewHash = GeneratePBKDF2Hash( aPassword, aSalt, 
nCount, 16 );
+uno::Sequence< sal_Int8 > aNewHash = GeneratePBKDF2Hash(aPassword, aSalt, 
nPBKDF2IterationCount, 16);
 if ( aNewHash.getLength() )
 {
 aResult.realloc( 4 );
@@ -85,7 +85,7 @@ uno::Sequence< beans::PropertyValue > 
DocPasswordHelper::GenerateNewModifyPasswo
 aResult[1].Name = "salt";
 aResult[1].Value <<= aSalt;
 aResult[2].Name = "iteration-count";
-aResult[2].Value <<= nCount;
+aResult[2].Value <<= nPBKDF2IterationCount;
 aResult[3].Name = "hash";
 aResult[3].Value <<= aNewHash;
 }
commit 25205d5b29d0aade0ebd7c6405a91995d02a3a7c
Author: Michael Stahl 
Date:   Wed Nov 9 18:42:46 2016 +0100

package: ODF: bump PBKDF2 iteration counts

Given recent elections we need to build a higher wall to keep the
government out of our documents, and we will make the government
pay for it.

These iteration counts were considered appropriate a decade ago.


http://security.stackexchange.com/questions/3959/recommended-of-iterations-when-using-pkbdf2-sha256

We get similar numbers on SandyBridge-E desktop and Haswell i7-4600U laptop:
* with 10k iterations ~20 msec per derivation
* with 100k iterations ~195 msec per derivation
* with 150k iterations ~290 msec per derivation

We can't go too high though because in ODF every package stream gets
its own derived key with a different salt, so a document with embedded
images may need a lot of these.

Change-Id: I6894e71ed399f8c340eff97a9191c8d8419789a6

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 17a6fac..932a5af 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -655,7 +655,7 @@ bool ZipPackageStream::saveChild(
 uno::Sequence < sal_Int8 > aSalt( 16 ), aVector( 
GetBlockSize() );
 rtl_random_getBytes ( rRandomPool, aSalt.getArray(), 16 );
 rtl_random_getBytes ( rRandomPool, aVector.getArray(), 
aVector.getLength() );
-sal_Int32 nIterationCount = 1024;
+sal_Int32 const nPBKDF2IterationCount = 10;
 
 if ( !m_bHaveOwnKey )
 {
@@ -665,7 +665,7 @@ bool ZipPackageStream::saveChild(
 
 setInitialisationVector ( aVector );
 setSalt ( aSalt );
-setIterationCount ( nIterationCount );
+setIterationCount(nPBKDF2IterationCount);
 }
 
 // last property is digest, which is inserted later if we didn't 
have
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - basctl/Module_basctl.mk bin/gbuild-to-ide chart2/Module_chart2.mk cui/Module_cui.mk dbaccess/Module_dbaccess.mk desktop/Module

[Stephan Bergmann]

On 08/17/2016 09:47 AM, Armin Le Grand wrote:

commit f4ba3e9df26ce76abe345de696ad900bb4e130c5
Author: Armin Le Grand 
Date:   Wed Aug 17 09:43:33 2016 +0200

added and adapted to target screenshot

Up to now the screenshot creation was added/dependent of
target slowcheck. Since quite some modules have added screenshot
creations now, I added an own target 'screenshot' to allow to keep
current slowcheck and screenshot creation separated

Change-Id: I80a49a0db607edf8e0405672d570f624d29912e7

diff --git a/Makefile.in b/Makefile.in
index ef56bee..1cf3837 100644
--- a/Makefile.in
+++ b/Makefile.in

[...]

@@ -95,7 +95,7 @@ $(1).clean $(1).showdeliverables:
cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)

 $(1).all: bootstrap fetch
-   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1))
+   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1) $(WORKDIR)/Module/screenshot/$(1))


That means that 'make MODULE.all' now also builds MODULE.screenshot, 
even though a plain top-level 'make' does /not/ make any (top-level or 
per-module) screenshot targets.  In other words, 'make MODULE.all' is no 
longer doing a subset of what a top-level 'make' does.  Is that 
intentional, or should this part be reverted?

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

[Libreoffice-commits] core.git: xmlsecurity/inc

[Tor Lillqvist]

 xmlsecurity/inc/documentsignaturehelper.hxx |   46 +++-
 1 file changed, 19 insertions(+), 27 deletions(-)

New commits:
commit 6bad5027dadaa3f99a33eb752d8477d7abe92137
Author: Tor Lillqvist 
Date:   Wed Nov 9 18:48:14 2016 +0200

Don't use a class for what namespaces are for

Sure, using a namespace means we have to decorate each function with the
XMLSECURITY_DLLPUBLIC, but who cares.

Change-Id: If9a364d1be9c5f4cd02f3f146e8b01bd608b373e

diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx 
b/xmlsecurity/inc/documentsignaturehelper.hxx
index d2eb803..8aa0124 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -36,17 +36,6 @@ namespace embed {
 class XStorage; }
 }}}
 
-
-/**
- DocumentSignatureHelper
-
- Helper class for signing and verifieng document signatures
-
- Functions:
- 1. help to create a list of content to be signed/verified
-
- **/
-
 enum class DocumentSignatureMode
 {
 Content,
@@ -74,32 +63,35 @@ struct SignatureStreamHelper
 }
 };
 
-
-class XMLSECURITY_DLLPUBLIC DocumentSignatureHelper
+namespace DocumentSignatureHelper
 {
-public:
-
-static SignatureStreamHelper OpenSignatureStream(
+SignatureStreamHelper XMLSECURITY_DLLPUBLIC OpenSignatureStream(
 const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 
nOpenMode,
 DocumentSignatureMode eDocSigMode );
-static std::vector< OUString > CreateElementList(
+
+std::vector< OUString > XMLSECURITY_DLLPUBLIC CreateElementList(
 const css::uno::Reference < css::embed::XStorage >& rxStore,
 DocumentSignatureMode eMode,
 const DocumentSignatureAlgorithm mode);
-static bool isODFPre_1_2(const OUString & sODFVersion);
-static bool isOOo3_2_Signature(const SignatureInformation & sigInfo);
-static DocumentSignatureAlgorithm getDocumentAlgorithm(
+
+bool XMLSECURITY_DLLPUBLIC isODFPre_1_2(const OUString & sODFVersion);
+bool XMLSECURITY_DLLPUBLIC isOOo3_2_Signature(const SignatureInformation & 
sigInfo);
+
+DocumentSignatureAlgorithm XMLSECURITY_DLLPUBLIC getDocumentAlgorithm(
 const OUString & sODFVersion, const SignatureInformation & sigInfo);
-static bool checkIfAllFilesAreSigned( const ::std::vector< OUString > & 
sElementList,
+
+bool XMLSECURITY_DLLPUBLIC checkIfAllFilesAreSigned( const ::std::vector< 
OUString > & sElementList,
 const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm 
alg);
-static bool equalsReferenceUriManifestPath(
+
+bool XMLSECURITY_DLLPUBLIC equalsReferenceUriManifestPath(
 const OUString & rUri, const OUString & rPath);
-static OUString GetDocumentContentSignatureDefaultStreamName();
-static OUString GetScriptingContentSignatureDefaultStreamName();
-static OUString GetPackageSignatureDefaultStreamName();
-/// In case the storage is OOXML, prepend a leading '/' and append content 
type to the element URIs.
-static void AppendContentTypes(const 
css::uno::Reference& xStorage, std::vector& 
rElements);
 
+OUString XMLSECURITY_DLLPUBLIC 
GetDocumentContentSignatureDefaultStreamName();
+OUString XMLSECURITY_DLLPUBLIC 
GetScriptingContentSignatureDefaultStreamName();
+OUString XMLSECURITY_DLLPUBLIC GetPackageSignatureDefaultStreamName();
+
+/// In case the storage is OOXML, prepend a leading '/' and append content 
type to the element URIs.
+void XMLSECURITY_DLLPUBLIC AppendContentTypes(const 
css::uno::Reference& xStorage, std::vector& 
rElements);
 };
 
 #endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/source/pdfio/pdfdocument.cxx |  380 +++
 1 file changed, 289 insertions(+), 91 deletions(-)

New commits:
commit 2a7e39eac2f44ad48455c8a5c04242b1fc92c726
Author: Miklos Vajna 
Date:   Wed Nov 9 15:49:35 2016 +0100

xmlsecurity PDF sign: conditionally write xref stream

In case the input document used a PDF 1.5 xref stream, not an old xref
table, then write that as part of the incremental update. Acrobat seems
to require this.

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

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 3b90bf3..8bd942f 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -667,80 +667,197 @@ bool PDFDocument::Sign(const 
uno::Reference& xCertificat
 m_aEditBuffer.WriteCharPtr(">>\nendobj\n\n");
 }
 
-// Write the xref table.
 sal_uInt64 nXRefOffset = m_aEditBuffer.Tell();
-m_aEditBuffer.WriteCharPtr("xref\n");
-for (const auto& rXRef : m_aXRef)
-{
-size_t nObject = rXRef.first;
-size_t nOffset = rXRef.second.m_nOffset;
-if (!rXRef.second.m_bDirty)
-continue;
-
-m_aEditBuffer.WriteUInt32AsString(nObject);
-m_aEditBuffer.WriteCharPtr(" 1\n");
-OStringBuffer aBuffer;
-aBuffer.append(static_cast(nOffset));
-while (aBuffer.getLength() < 10)
-aBuffer.insert(0, "0");
-if (nObject == 0)
-aBuffer.append(" 65535 f \n");
-else
-aBuffer.append(" 0 n \n");
-m_aEditBuffer.WriteOString(aBuffer.toString());
-}
-
-// Write the trailer.
-m_aEditBuffer.WriteCharPtr("trailer\nGetGenerationValue());
-m_aEditBuffer.WriteCharPtr(" R\n");
-PDFReferenceElement* pInfo = nullptr;
 if (m_pXRefStream)
-pInfo = 
dynamic_cast(m_pXRefStream->Lookup("Info"));
-else
-pInfo = dynamic_cast(m_pTrailer->Lookup("Info"));
-if (pInfo)
 {
-m_aEditBuffer.WriteCharPtr("/Info ");
-m_aEditBuffer.WriteUInt32AsString(pInfo->GetObjectValue());
+// Write the xref stream.
+// This is a bit meta: the xref stream stores its own offset.
+sal_Int32 nXRefStreamId = m_aXRef.size();
+XRefEntry aXRefStreamEntry;
+aXRefStreamEntry.m_nOffset = nXRefOffset;
+aXRefStreamEntry.m_bDirty = true;
+m_aXRef[nXRefStreamId] = aXRefStreamEntry;
+
+// Write stream data.
+SvMemoryStream aXRefStream;
+for (const auto& rXRef : m_aXRef)
+{
+const XRefEntry& rEntry = rXRef.second;
+
+if (!rEntry.m_bDirty)
+continue;
+
+// First field.
+unsigned char nType = 0;
+switch (rEntry.m_eType)
+{
+case XRefEntryType::FREE:
+nType = 0;
+break;
+case XRefEntryType::NOT_COMPRESSED:
+nType = 1;
+break;
+case XRefEntryType::COMPRESSED:
+nType = 2;
+break;
+}
+aXRefStream.WriteUChar(nType);
+
+// Second field.
+const size_t nOffsetLen = 3;
+for (size_t i = 0; i < nOffsetLen; ++i)
+{
+size_t nByte = nOffsetLen - i - 1;
+// Fields requiring more than one byte are stored with the
+// high-order byte first.
+unsigned char nCh = (rEntry.m_nOffset & (0xff << (nByte * 8))) 
>> (nByte * 8);
+aXRefStream.WriteUChar(nCh);
+}
+
+// Third field.
+aXRefStream.WriteUChar(0);
+}
+
+m_aEditBuffer.WriteUInt32AsString(nXRefStreamId);
+m_aEditBuffer.WriteCharPtr(" 0 obj\n<<");
+
+// ID.
+auto pID = dynamic_cast(m_pXRefStream->Lookup("ID"));
+if (pID)
+{
+const std::vector& rElements = pID->GetElements();
+m_aEditBuffer.WriteCharPtr("/ID [ <");
+for (size_t i = 0; i < rElements.size(); ++i)
+{
+auto pIDString = 
dynamic_cast(rElements[i]);
+if (!pIDString)
+continue;
+
+m_aEditBuffer.WriteOString(pIDString->GetValue());
+if ((i + 1) < rElements.size())
+m_aEditBuffer.WriteCharPtr("> <");
+}
+m_aEditBuffer.WriteCharPtr("> ] ");
+}
+
+// Index.
+m_aEditBuffer.WriteCharPtr("/Index [ ");
+for (const auto& rXRef : m_aXRef)
+{
+if (!rXRef.second.m_bDirty)
+continue;
+
+m_aEditBuffer.WriteUI

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

[Miklos Vajna]

 xmlsecurity/inc/pdfio/pdfdocument.hxx|2 ++
 xmlsecurity/source/pdfio/pdfdocument.cxx |   23 +--
 2 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit f68b1541ea2f26a1137d4d20ceb23d036d0a00b7
Author: Miklos Vajna 
Date:   Wed Nov 9 16:32:48 2016 +0100

xmlsecurity PDF sign: improve suggested signature ID

So that when we have a single signature with ID="Signature2", then we
use "Signature3" for the next ID, not "Signature2". (Acrobat uses that ID
for the first signature.)

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

diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx 
b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index d90fdf5..79ef60b 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -113,6 +113,8 @@ class XMLSECURITY_DLLPUBLIC PDFDocument
 static int AsHex(char ch);
 /// Decode a hex dump.
 static std::vector DecodeHexString(PDFHexStringElement* 
pElement);
+/// Suggest a minimal, yet free signature ID to use for the next signature.
+sal_uInt32 GetNextSignature();
 
 public:
 PDFDocument();
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 8bd942f..fa0d9cc 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -335,11 +335,30 @@ bool PDFDocument::RemoveSignature(size_t nPosition)
 return m_aEditBuffer.good();
 }
 
+sal_uInt32 PDFDocument::GetNextSignature()
+{
+sal_uInt32 nRet = 0;
+for (const auto& pSignature : GetSignatureWidgets())
+{
+auto pT = 
dynamic_cast(pSignature->Lookup("T"));
+if (!pT)
+continue;
+
+const OString& rValue = pT->GetValue();
+const OString aPrefix = "Signature";
+if (!rValue.startsWith(aPrefix))
+continue;
+
+nRet = std::max(nRet, rValue.copy(aPrefix.getLength()).toUInt32());
+}
+
+return nRet + 1;
+}
+
 bool PDFDocument::Sign(const uno::Reference& 
xCertificate, const OUString& rDescription)
 {
 // Decide what identifier to use for the new signature.
-std::vector aSignatures = GetSignatureWidgets();
-sal_uInt32 nNextSignature = aSignatures.size() + 1;
+sal_uInt32 nNextSignature = GetNextSignature();
 
 m_aEditBuffer.Seek(STREAM_SEEK_TO_END);
 m_aEditBuffer.WriteCharPtr("\n");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/source/pdfio/pdfdocument.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit bf64b4f1451896810b66fd6edf6175f0dd46ac44
Author: Miklos Vajna 
Date:   Wed Nov 9 16:53:51 2016 +0100

xmlsecurity PDF sign: compress the xref stream

This way it's a bit smaller for large files and our output is closer to
what Acrobat produces.

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

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index fa0d9cc..c73ee5d 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -738,7 +738,7 @@ bool PDFDocument::Sign(const 
uno::Reference& xCertificat
 }
 
 m_aEditBuffer.WriteUInt32AsString(nXRefStreamId);
-m_aEditBuffer.WriteCharPtr(" 0 obj\n<<");
+m_aEditBuffer.WriteCharPtr(" 0 obj\n<(m_pXRefStream->Lookup("ID"));
@@ -784,6 +784,18 @@ bool PDFDocument::Sign(const 
uno::Reference& xCertificat
 
 // Length.
 m_aEditBuffer.WriteCharPtr("/Length ");
+{
+ZCodec aZCodec;
+aZCodec.BeginCompression();
+aXRefStream.Seek(0);
+SvMemoryStream aStream;
+aZCodec.Compress(aXRefStream, aStream);
+aZCodec.EndCompression();
+aXRefStream.Seek(0);
+aXRefStream.SetStreamSize(0);
+aStream.Seek(0);
+aXRefStream.WriteStream(aStream);
+}
 m_aEditBuffer.WriteUInt32AsString(aXRefStream.GetSize());
 
 if (!m_aStartXRefs.empty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/inc

[Tor Lillqvist]

 xmlsecurity/inc/documentsignaturehelper.hxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit db877a15d98b0ea6875d8150ce43bf7fa82610bf
Author: Tor Lillqvist 
Date:   Wed Nov 9 21:18:00 2016 +0200

These functions don't even need to be XMLSECURITY_DLLPUBLIC

Change-Id: I8f2963c9b6b1c8717ea4d19453815fffa6e68484

diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx 
b/xmlsecurity/inc/documentsignaturehelper.hxx
index 8aa0124..50c8d43 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -65,33 +65,33 @@ struct SignatureStreamHelper
 
 namespace DocumentSignatureHelper
 {
-SignatureStreamHelper XMLSECURITY_DLLPUBLIC OpenSignatureStream(
+SignatureStreamHelper OpenSignatureStream(
 const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 
nOpenMode,
 DocumentSignatureMode eDocSigMode );
 
-std::vector< OUString > XMLSECURITY_DLLPUBLIC CreateElementList(
+std::vector< OUString > CreateElementList(
 const css::uno::Reference < css::embed::XStorage >& rxStore,
 DocumentSignatureMode eMode,
 const DocumentSignatureAlgorithm mode);
 
-bool XMLSECURITY_DLLPUBLIC isODFPre_1_2(const OUString & sODFVersion);
-bool XMLSECURITY_DLLPUBLIC isOOo3_2_Signature(const SignatureInformation & 
sigInfo);
+bool isODFPre_1_2(const OUString & sODFVersion);
+bool isOOo3_2_Signature(const SignatureInformation & sigInfo);
 
-DocumentSignatureAlgorithm XMLSECURITY_DLLPUBLIC getDocumentAlgorithm(
+DocumentSignatureAlgorithm getDocumentAlgorithm(
 const OUString & sODFVersion, const SignatureInformation & sigInfo);
 
-bool XMLSECURITY_DLLPUBLIC checkIfAllFilesAreSigned( const ::std::vector< 
OUString > & sElementList,
+bool checkIfAllFilesAreSigned( const ::std::vector< OUString > & 
sElementList,
 const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm 
alg);
 
-bool XMLSECURITY_DLLPUBLIC equalsReferenceUriManifestPath(
+bool equalsReferenceUriManifestPath(
 const OUString & rUri, const OUString & rPath);
 
-OUString XMLSECURITY_DLLPUBLIC 
GetDocumentContentSignatureDefaultStreamName();
-OUString XMLSECURITY_DLLPUBLIC 
GetScriptingContentSignatureDefaultStreamName();
-OUString XMLSECURITY_DLLPUBLIC GetPackageSignatureDefaultStreamName();
+OUString GetDocumentContentSignatureDefaultStreamName();
+OUString GetScriptingContentSignatureDefaultStreamName();
+OUString GetPackageSignatureDefaultStreamName();
 
 /// In case the storage is OOXML, prepend a leading '/' and append content 
type to the element URIs.
-void XMLSECURITY_DLLPUBLIC AppendContentTypes(const 
css::uno::Reference& xStorage, std::vector& 
rElements);
+void AppendContentTypes(const css::uno::Reference& 
xStorage, std::vector& rElements);
 };
 
 #endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/qa/cppunit/jpeg/JpegReaderTest.cxx |   57 ++---
 vcl/qa/cppunit/jpeg/data/JPEGTestCMYK.jpeg |binary
 vcl/qa/cppunit/jpeg/data/JPEGTestGray.jpeg |binary
 vcl/qa/cppunit/jpeg/data/JPEGTestRGB.jpeg  |binary
 4 files changed, 29 insertions(+), 28 deletions(-)

New commits:
commit 7446faec4e319afaf2f0b043c45ed0df6d1885dd
Author: Tomaž Vajngerl 
Date:   Tue Nov 8 19:15:23 2016 +0100

vcl: non-symetric image to test JPEG import

Previously we used a symetric image to test JPEG import. This has
the flaw that we doesn't warn if the orientation of the JPEG
image was not correct. This commit fixes this flaw by making all
test images non-symetrical.

Change-Id: If87d257ae44d85b6a9042d09d62ba785ffc5c426
Reviewed-on: https://gerrit.libreoffice.org/30709
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx 
b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
index 99d78e3..8fcba6e 100644
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@@ -49,11 +49,12 @@ int deltaColor(BitmapColor aColor1, BitmapColor aColor2)
 return std::max(std::max(deltaR, deltaG), deltaB);
 }
 
-bool checkRect(Bitmap& rBitmap, int aLayerNumber, Color aExpectedColor, int 
nMaxDelta)
+bool checkRect(Bitmap& rBitmap, int aLayerNumber, long nAreaHeight, long 
nAreaWidth, Color aExpectedColor, int nMaxDelta)
 {
 Bitmap::ScopedWriteAccess pAccess(rBitmap);
-long nHeight = pAccess->Height();
-long nWidth = pAccess->Width();
+
+long nWidth  = std::min(nAreaWidth,  pAccess->Width());
+long nHeight = std::min(nAreaHeight, pAccess->Height());
 
 long firstX = 0 + aLayerNumber;
 long firstY = 0 + aLayerNumber;
@@ -65,24 +66,24 @@ bool checkRect(Bitmap& rBitmap, int aLayerNumber, Color 
aExpectedColor, int nMax
 
 for (long y = firstY; y <= lastY; y++)
 {
-Color aColorFirst = pAccess->GetPixel(firstX, y);
+Color aColorFirst = pAccess->GetPixel(y, firstX);
 delta = deltaColor(aColorFirst, aExpectedColor);
 if (delta > nMaxDelta)
 return false;
 
-Color aColorLast  = pAccess->GetPixel(lastX,  y);
+Color aColorLast  = pAccess->GetPixel(y, lastX);
 delta = deltaColor(aColorLast, aExpectedColor);
 if (delta > nMaxDelta)
 return false;
 }
 for (long x = firstX; x <= lastX; x++)
 {
-Color aColorFirst = pAccess->GetPixel(x, firstY);
+Color aColorFirst = pAccess->GetPixel(firstY, x);
 delta = deltaColor(aColorFirst, aExpectedColor);
 if (delta > nMaxDelta)
 return false;
 
-Color aColorLast  = pAccess->GetPixel(x, lastY);
+Color aColorLast  = pAccess->GetPixel(lastY, x);
 delta = deltaColor(aColorLast, aExpectedColor);
 if (delta > nMaxDelta)
 return false;
@@ -104,44 +105,44 @@ void JpegReaderTest::testReadRGB()
 {
 Bitmap aBitmap = loadJPG(getFullUrl("JPEGTestRGB.jpeg"));
 Size aSize = aBitmap.GetSizePixel();
-CPPUNIT_ASSERT_EQUAL(8L, aSize.Width());
-CPPUNIT_ASSERT_EQUAL(8L, aSize.Height());
+CPPUNIT_ASSERT_EQUAL(12L, aSize.Width());
+CPPUNIT_ASSERT_EQUAL(12L, aSize.Height());
 
 int nMaxDelta = 1; // still acceptable color error
-CPPUNIT_ASSERT(checkRect(aBitmap, 0, Color(0xff, 0xff, 0xff), nMaxDelta));
-CPPUNIT_ASSERT(checkRect(aBitmap, 1, Color(0xff, 0x00, 0x00), nMaxDelta));
-CPPUNIT_ASSERT(checkRect(aBitmap, 2, Color(0x00, 0xff, 0x00), nMaxDelta));
-CPPUNIT_ASSERT(checkRect(aBitmap, 3, Color(0x00, 0x00, 0xff), nMaxDelta));
+CPPUNIT_ASSERT(checkRect(aBitmap, 0, 8, 8, Color(0xff, 0xff, 0xff), 
nMaxDelta));
+CPPUNIT_ASSERT(checkRect(aBitmap, 1, 8, 8, Color(0xff, 0x00, 0x00), 
nMaxDelta));
+CPPUNIT_ASSERT(checkRect(aBitmap, 2, 8, 8, Color(0x00, 0xff, 0x00), 
nMaxDelta));
+CPPUNIT_ASSERT(checkRect(aBitmap, 3, 8, 8, Color(0x00, 0x00, 0xff), 
nMaxDelta));
 }
 
 void JpegReaderTest::testReadGray()
 {
 Bitmap aBitmap = loadJPG(getFullUrl("JPEGTestGray.jpeg"));
 Size aSize = aBitmap.GetSizePixel();
-CPPUNIT_ASSERT_EQUAL(8L, aSize.Width());
-CPPUNIT_ASSERT_EQUAL(8L, aSize.Height());
+CPPUNIT_ASSERT_EQUAL(12L, aSize.Width());
+CPPUNIT_ASSERT_EQUAL(12L, aSize.Height());
 
 aBitmap.Convert(BmpConversion::BMP_CONVERSION_24BIT); // convert to 24bit 
so we don't need to deal with palette
 
-int nMaxDelta = 3;
-CPPUNIT_ASSERT(checkRect(aBitmap, 0, Color(0xff, 0xff, 0xff), nMaxDelta));
-CPPUNIT_ASSERT(checkRect(aBitmap, 1, Color(0x36, 0x36, 0x36), nMaxDelta));
-CPPUNIT_ASSERT(checkRect(aBitmap, 2, Color(0xb6, 0xb6, 0xb6), nMaxDelta));
-CPPUNIT_ASSERT(checkRect(aBitmap, 3, Color(0x12, 0x12, 0x12), nMaxDelta));
+int nMaxDelta = 1;
+CPPUNIT_ASSERT(checkRect(aBitmap, 0, 8, 8, Color(0xff, 0xff, 0xff), 
nMaxDelta));
+CPPUNIT_ASSERT(checkRect(aBitmap, 1, 8, 8, Color(0x36, 0x36, 0x36), 
nMaxD

Re: [Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - basctl/Module_basctl.mk bin/gbuild-to-ide chart2/Module_chart2.mk cui/Module_cui.mk dbaccess/Module_dbaccess.mk desktop/Module

[Bjoern Michaelsen]

On Wed, Nov 09, 2016 at 07:37:12PM +0100, Stephan Bergmann wrote:
> In other words, 'make MODULE.all' is no longer doing a subset of what a
> top-level 'make' does.  Is that intentional, or should this part be reverted?

IMHO we should avoid 'magic' differences between top-level and module level
here. Such inconsistencies are a sure fire way to create lots of pain later.

Best,

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

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

[Khaled Hosny]

 vcl/inc/CommonSalLayout.hxx  |   14 +
 vcl/source/gdi/CommonSalLayout.cxx   |  143 +-
 vcl/source/gdi/VerticalOrientationData.cxx   |   78 ++
 vcl/source/gdi/genVerticalOrientationData.pl |  206 +++
 4 files changed, 369 insertions(+), 72 deletions(-)

New commits:
commit 73b9b72cf1658208c2b2eb10cc0acfc3833dd875
Author: Khaled Hosny 
Date:   Thu Nov 10 00:57:08 2016 +0200

tdf#103718: Correctly set vertical direction

Follow UTR#50 and set vertical direction based on character orientation,
not the resolved script.

Change-Id: I54f047e1720e8e4de14ce16a57e5d2d3f6cd2ca2

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 8861e68..0883eec 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -230,12 +230,7 @@ struct SubRun
 int32_t mnMin;
 int32_t mnEnd;
 UScriptCode maScript;
-
-SubRun(int32_t nMin, int32_t nEnd, UScriptCode aScript)
-  : mnMin(nMin)
-  , mnEnd(nEnd)
-  , maScript(aScript)
-{}
+hb_direction_t maDirection;
 };
 
 namespace vcl {
@@ -349,47 +344,6 @@ void CommonSalLayout::DrawText(SalGraphics& rSalGraphics) 
const
 rSalGraphics.DrawSalLayout( *this );
 }
 
-/* https://drafts.csswg.org/css-writing-modes-3/#script-orientations */
-static int GetVerticalFlagsForScript(UScriptCode aScript)
-{
-int nFlag = GF_NONE;
-
-switch (aScript)
-{
-/* ttb 0° */
-case USCRIPT_BOPOMOFO:
-case USCRIPT_EGYPTIAN_HIEROGLYPHS:
-case USCRIPT_HAN:
-case USCRIPT_HANGUL:
-case USCRIPT_HIRAGANA:
-case USCRIPT_KATAKANA:
-case USCRIPT_MEROITIC_CURSIVE:
-case USCRIPT_MEROITIC_HIEROGLYPHS:
-case USCRIPT_TANGUT:
-case USCRIPT_YI:
-nFlag = GF_ROTL;
-break;
-#if 0
-/* ttb -90° */
-case USCRIPT_ORKHON:
-nFlag = ??;
-break;
-/* btt -90° */
-case USCRIPT_OGHAM:
-nFlag = ??;
-break;
-#endif
-/* ttb 90°, no extra rotation needed */
-case USCRIPT_MONGOLIAN:
-case USCRIPT_PHAGS_PA:
-/* horizontal scripts */
-default:
-break;
-}
-
-return nFlag;
-}
-
 bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 {
 hb_face_t* pHbFace = hb_font_get_face(mpHbFont);
@@ -451,8 +405,40 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 {
 int32_t nMinRunPos = nCurrentPos;
 int32_t nEndRunPos = std::min(pTextLayout->runs[k].nEnd, 
nBidiEndRunPos);
-SubRun aSubRun(nMinRunPos, nEndRunPos, pTextLayout->runs[k].nCode);
-aSubRuns.push_back(aSubRun);
+hb_direction_t aDirection = bRightToLeft ? HB_DIRECTION_RTL : 
HB_DIRECTION_LTR;
+UScriptCode aScript = pTextLayout->runs[k].nCode;
+
+// For vertical text, further divide the runs based on character
+// orientation.
+if (rArgs.mnFlags & SalLayoutFlags::Vertical)
+{
+int32_t nIdx = nMinRunPos;
+while (nIdx < nEndRunPos)
+{
+int32_t nPrevIndx = nIdx;
+sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nIdx);
+switch (vcl::GetVerticalOrientation(aChar))
+{
+case VerticalOrientation::Upright:
+case VerticalOrientation::TransformedUpright:
+case VerticalOrientation::TransformedRotated:
+aDirection = HB_DIRECTION_TTB;
+break;
+default:
+aDirection = bRightToLeft ? HB_DIRECTION_RTL : 
HB_DIRECTION_LTR;
+break;
+}
+
+if (aSubRuns.empty() || aSubRuns.back().maDirection != 
aDirection)
+aSubRuns.push_back({ nPrevIdx, nIdx, aScript, 
aDirection });
+else
+aSubRuns.back().mnEnd = nIdx;
+}
+}
+else
+{
+aSubRuns.push_back({ nMinRunPos, nEndRunPos, aScript, 
aDirection });
+}
 
 nCurrentPos = nEndRunPos;
 ++k;
@@ -476,23 +462,13 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 if (sLanguage.isEmpty())
 sLanguage = OUStringToOString(rArgs.maLanguageTag.getBcp47(), 
RTL_TEXTENCODING_ASCII_US);
 
-bool bVertical = false;
-if ((rArgs.mnFlags & SalLayoutFlags::Vertical) &&
-GetVerticalFlagsForScript(aSubRun.maScript) == GF_ROTL)
-{
-bVertical = true;
-}
-
 int nHbFlags = HB_BUFFER_FLAGS_DEFAULT;
 if (nMinRunPos == 0)
 nHbFlags |= HB_BUFFER_FLAG_BOT; /*

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

[Khaled Hosny]

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

New commits:
commit f26df72f6e424492d101f527deb81f550ff3c941
Author: Khaled Hosny 
Date:   Thu Nov 10 01:33:48 2016 +0200

Typo

No idea how this ever compiled for me!

Change-Id: I7bfe5df755594448fbe6892873a7cedb2b235d98

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 0883eec..965b52a 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -415,7 +415,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 int32_t nIdx = nMinRunPos;
 while (nIdx < nEndRunPos)
 {
-int32_t nPrevIndx = nIdx;
+int32_t nPrevIdx = nIdx;
 sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nIdx);
 switch (vcl::GetVerticalOrientation(aChar))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f6391d9696bfa7485bf785ac81edef4d5441e232
Author: Khaled Hosny 
Date:   Thu Nov 10 01:48:29 2016 +0200

Who would think sal_Int32 is not the same as int32_t

Change-Id: I107cf27ea36e092ba3be45d255cc8622eb1c726f

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 965b52a..705318c 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -412,10 +412,10 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 // orientation.
 if (rArgs.mnFlags & SalLayoutFlags::Vertical)
 {
-int32_t nIdx = nMinRunPos;
+sal_Int32 nIdx = nMinRunPos;
 while (nIdx < nEndRunPos)
 {
-int32_t nPrevIdx = nIdx;
+sal_Int32 nPrevIdx = nIdx;
 sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nIdx);
 switch (vcl::GetVerticalOrientation(aChar))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Jean-Tiare LE BIGOT]

The list of files triggering the crash appears to be in 
http://dev-builds.libreoffice.org/crashtest/64a708cba9b954afe3331f63c58218eb53b3d0ce/crashlog.txt. 
Can you point at the actual files location ?


Le 09/11/2016 à 10:25, Caolán McNamara a écrit :

On Tue, 2016-11-08 at 23:08 +, Crashtest VM wrote:

New crashtest update available at http://dev-
builds.libreoffice.org/crashtest/64a708cba9b954afe3331f63c58218eb53b3
d0ce/


Lots of new pptx failures since...

commit 4bcf1872bbe9db1388769485a7e4c0cbcce3d53c
Date:   Thu Oct 13 23:43:41 2016 +0200

chartx: fix sparse chart import

e.g. novell403458-1.pptx



--
Jean-Tiare LE BIGOT
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Khaled Hosny]

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

New commits:
commit 66bd5ef022eb242a8fdecb491963bbad99fc3a9d
Author: Khaled Hosny 
Date:   Thu Nov 10 03:59:28 2016 +0200

Use hb_script_t directly

Change-Id: I58c41ce2052371e20c8c84492124c5a687695ca6

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 705318c..839e225 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -229,7 +229,7 @@ struct SubRun
 {
 int32_t mnMin;
 int32_t mnEnd;
-UScriptCode maScript;
+hb_script_t maScript;
 hb_direction_t maDirection;
 };
 
@@ -406,7 +406,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 int32_t nMinRunPos = nCurrentPos;
 int32_t nEndRunPos = std::min(pTextLayout->runs[k].nEnd, 
nBidiEndRunPos);
 hb_direction_t aDirection = bRightToLeft ? HB_DIRECTION_RTL : 
HB_DIRECTION_LTR;
-UScriptCode aScript = pTextLayout->runs[k].nCode;
+hb_script_t aScript = 
hb_icu_script_to_script(pTextLayout->runs[k].nCode);
 
 // For vertical text, further divide the runs based on character
 // orientation.
@@ -456,7 +456,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 int nMinRunPos = aSubRun.mnMin;
 int nEndRunPos = aSubRun.mnEnd;
 int nRunLen = nEndRunPos - nMinRunPos;
-aHbScript = hb_icu_script_to_script(aSubRun.maScript);
+aHbScript = aSubRun.maScript;
 
 OString sLanguage = msLanguage;
 if (sLanguage.isEmpty())
@@ -469,7 +469,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 nHbFlags |= HB_BUFFER_FLAG_EOT; /* End-of-text */
 
 hb_buffer_set_direction(pHbBuffer, aSubRun.maDirection);
-hb_buffer_set_script(pHbBuffer, aHbScript);
+hb_buffer_set_script(pHbBuffer, aSubRun.maScript);
 hb_buffer_set_language(pHbBuffer, 
hb_language_from_string(sLanguage.getStr(), -1));
 hb_buffer_set_flags(pHbBuffer, (hb_buffer_flags_t) nHbFlags);
 hb_buffer_add_utf16(
@@ -576,6 +576,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 SortGlyphItems();
 
 // determine need for kashida justification
+// XXX: This assumes all the text is in the same script, which is not
+// guaranteed. The flag should be per glyph.
 if ((rArgs.mpDXArray || rArgs.mnLayoutWidth)
 && ((aHbScript == HB_SCRIPT_ARABIC) || (aHbScript == HB_SCRIPT_SYRIAC)))
 rArgs.mnFlags |= SalLayoutFlags::KashidaJustification;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Adolfo Jayme Barrientos]

 source/text/shared/explorer/database/dabawiz02jdbc.xhp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e4ffa2f2f3a457054e75ce9a41029b94b018d2d1
Author: Adolfo Jayme Barrientos 
Date:   Wed Nov 9 22:57:32 2016 -0600

Another dead URL

Change-Id: Id313b2e262db1d699a52c1bdec9850587e3a5d83

diff --git a/source/text/shared/explorer/database/dabawiz02jdbc.xhp 
b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index ca0dcf1..149de2a 100644
--- a/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -41,8 +41,7 @@
 Oracle database
 You 
can use a JDBC driver to access an Oracle database from Solaris or Linux. To 
access the database from Windows, you need an ODBC driver.
 
-On UNIX, ensure that the Oracle database client is 
installed with JDBC support. The JDBC driver class for the Solaris Oracle 
client version 8.x is located in the /product/jdbc/lib/classes111.zip directory. You can also download the 
latest version from the Oracle web site:
-http://otn.oracle.com/tech/java/sqlj_jdbc/content.html
+On UNIX, ensure that the Oracle database client is installed 
with JDBC support. The JDBC driver class for the Solaris Oracle client version 
8.x is located in the /product/jdbc/lib/classes111.zip 
directory. You can also download the latest version from the Oracle web 
site.
 
 
 In 
the Data source URL box, enter the location of the Oracle database 
server. The syntax of the URL depends on the database type. See the 
documentation that came with the JDBC driver for more information. 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit 9d3d893f927a425da840e885c214e1990ee37f65
Author: Adolfo Jayme Barrientos 
Date:   Wed Nov 9 22:57:32 2016 -0600

Updated core
Project: help  e4ffa2f2f3a457054e75ce9a41029b94b018d2d1

Another dead URL

Change-Id: Id313b2e262db1d699a52c1bdec9850587e3a5d83

diff --git a/helpcontent2 b/helpcontent2
index 0119d6f..e4ffa2f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0119d6fd483709ee783da89d961e93e71ba41eb6
+Subproject commit e4ffa2f2f3a457054e75ce9a41029b94b018d2d1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |   33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 793e00e134e23eaec7280871e1bc2446f4f24360
Author: Ashod Nakashian 
Date:   Wed Nov 9 19:44:28 2016 -0500

loolwsd: use ostringstream when concatinating many strings

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

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 39a3239..4c9ed10 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1065,16 +1065,15 @@ public:
 static void handleClientRequest(HTTPServerRequest& request, 
HTTPServerResponse& response)
 {
 const auto id = LOOLWSD::GenSessionId();
+Util::setThreadName("client_ws_" + id);
+
+LOG_DBG("Thread started.");
 
 Poco::URI requestUri(request.getURI());
 LOG_DBG("Handling: " << request.getURI());
 
 StringTokenizer reqPathTokens(request.getURI(), "/?", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
 
-Util::setThreadName("client_ws_" + id);
-
-LOG_DBG("Thread started.");
-
 bool responded = false;
 try
 {
@@ -1386,19 +1385,19 @@ ServerSocket* findFreeMasterPort(int &nMasterPortNumber)
 
 static inline std::string getLaunchURI()
 {
-std::string aAbsTopSrcDir = 
Poco::Path(Application::instance().commandPath()).parent().toString();
-aAbsTopSrcDir = Poco::Path(aAbsTopSrcDir).absolute().toString();
-
-std::string aLaunchURI("");
-aLaunchURI += ((LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()) ? 
"https://"; : "http://";);
-aLaunchURI += LOOLWSD_TEST_HOST ":";
-aLaunchURI += std::to_string(ClientPortNumber);
-aLaunchURI += LOOLWSD_TEST_LOLEAFLET_UI;
-aLaunchURI += "?file_path=file://";
-aLaunchURI += aAbsTopSrcDir;
-aLaunchURI += LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH;
-
-return aLaunchURI;
+const std::string aAbsTopSrcDir = 
Poco::Path(Application::instance().commandPath()).parent().toString();
+
+std::ostringstream oss;
+oss << "";
+oss << ((LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()) ? 
"https://"; : "http://";);
+oss << LOOLWSD_TEST_HOST ":";
+oss << ClientPortNumber;
+oss << LOOLWSD_TEST_LOLEAFLET_UI;
+oss << "?file_path=file://";
+oss << Poco::Path(aAbsTopSrcDir).absolute().toString();
+oss << LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH;
+
+return oss.str();
 }
 
 } // anonymous namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian]

 loolwsd/AdminModel.cpp |   30 --
 loolwsd/AdminModel.hpp |2 +-
 loolwsd/Util.cpp   |   35 +--
 3 files changed, 30 insertions(+), 37 deletions(-)

New commits:
commit d5d31055c76a2fabd80102ae9708cbab2eac374c
Author: Ashod Nakashian 
Date:   Wed Nov 9 21:12:09 2016 -0500

loolwsd: Admin formatting and cleanup

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

diff --git a/loolwsd/AdminModel.cpp b/loolwsd/AdminModel.cpp
index 5142df0..d460e53 100644
--- a/loolwsd/AdminModel.cpp
+++ b/loolwsd/AdminModel.cpp
@@ -335,27 +335,21 @@ unsigned AdminModel::getTotalActiveViews()
 return nTotalViews;
 }
 
-std::string AdminModel::getDocuments()
+std::string AdminModel::getDocuments() const
 {
 std::ostringstream oss;
-for (auto& it: _documents)
+for (const auto& it: _documents)
 {
-if (it.second.isExpired())
-continue;
-
-const auto sPid = std::to_string(it.second.getPid());
-const auto sFilename = it.second.getFilename();
-const auto sViews = std::to_string(it.second.getActiveViews());
-const auto sMem = 
std::to_string(Util::getMemoryUsage(it.second.getPid()));
-const auto sElapsed = std::to_string(it.second.getElapsedTime());
-
-std::string encodedFilename;
-Poco::URI::encode(sFilename, " ", encodedFilename);
-oss << sPid << ' '
-<< encodedFilename << ' '
-<< sViews << ' '
-<< sMem << ' '
-<< sElapsed << " \n ";
+if (!it.second.isExpired())
+{
+std::string encodedFilename;
+Poco::URI::encode(it.second.getFilename(), " ", encodedFilename);
+oss << it.second.getPid() << ' '
+<< encodedFilename << ' '
+<< it.second.getActiveViews() << ' '
+<< Util::getMemoryUsage(it.second.getPid()) << ' '
+<< it.second.getElapsedTime() << " \n ";
+}
 }
 
 return oss.str();
diff --git a/loolwsd/AdminModel.hpp b/loolwsd/AdminModel.hpp
index 61286b7..a1c4812 100644
--- a/loolwsd/AdminModel.hpp
+++ b/loolwsd/AdminModel.hpp
@@ -176,7 +176,7 @@ private:
 
 unsigned getTotalActiveViews();
 
-std::string getDocuments();
+std::string getDocuments() const;
 
 private:
 std::map _subscribers;
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 1b9a63c..afa23f3 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -494,33 +494,32 @@ namespace Util
 
 int getMemoryUsage(const Poco::Process::PID nPid)
 {
-//TODO: Instead of RSS, return PSS
-const auto cmd = "ps o rss= -p " + std::to_string(nPid);
-FILE* fp = popen(cmd.c_str(), "r");
-if (fp == nullptr)
+try
 {
-return 0;
-}
+//TODO: Instead of RSS, return PSS
+const auto cmd = "ps o rss= -p " + std::to_string(nPid);
+FILE* fp = popen(cmd.c_str(), "r");
+if (fp == nullptr)
+{
+return 0;
+}
 
-std::string sResponse;
-char cmdBuffer[1024];
-while (fgets(cmdBuffer, sizeof(cmdBuffer) - 1, fp) != nullptr)
-{
-sResponse += cmdBuffer;
-}
-pclose(fp);
+std::string sResponse;
+char cmdBuffer[1024];
+while (fgets(cmdBuffer, sizeof(cmdBuffer) - 1, fp) != nullptr)
+{
+sResponse += cmdBuffer;
+}
+pclose(fp);
 
-int nMem = -1;
-try
-{
-nMem = std::stoi(sResponse);
+return std::stoi(sResponse);
 }
 catch(const std::exception&)
 {
 Log::warn() << "Trying to find memory of invalid/dead PID " << 
nPid << Log::end;
 }
 
-return nMem;
+return -1;
 }
 
 std::string replace(const std::string& s, const std::string& a, const 
std::string& b)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian]

 loolwsd/IoUtil.cpp |   52 ++--
 loolwsd/IoUtil.hpp |3 ---
 2 files changed, 26 insertions(+), 29 deletions(-)

New commits:
commit c5bff2b6e690491569a4d244569c3954f3ba44ed
Author: Ashod Nakashian 
Date:   Wed Nov 9 23:27:17 2016 -0500

loolwsd: IoUtil logs updated

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

diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 321fe40..04a6ed5 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -67,7 +67,7 @@ void SocketProcessor(const std::shared_ptr& ws,
  const std::function& closeFrame,
  const std::function& stopPredicate)
 {
-Log::info("SocketProcessor starting.");
+LOG_INF("SocketProcessor starting.");
 
 // Timeout given is in microseconds.
 static const Poco::Timespan waitTime(POLL_TIMEOUT_MS * 1000);
@@ -86,7 +86,7 @@ void SocketProcessor(const std::shared_ptr& ws,
 stop = stopPredicate();
 if (stop)
 {
-Log::info("Termination flagged. Finishing.");
+LOG_INF("Termination flagged. Finishing.");
 break;
 }
 
@@ -104,7 +104,7 @@ void SocketProcessor(const std::shared_ptr& ws,
 }
 catch (const Poco::TimeoutException&)
 {
-Log::debug("SocketProcessor: Spurious TimeoutException, 
ignored");
+LOG_DBG("SocketProcessor: Spurious TimeoutException, ignored");
 continue;
 }
 payload.resize(n > 0 ? n : 0);
@@ -112,7 +112,7 @@ void SocketProcessor(const std::shared_ptr& ws,
 if (n <= 0 || ((flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_CLOSE))
 {
 closeFrame();
-Log::warn("Connection closed.");
+LOG_WRN("Connection closed.");
 break;
 }
 
@@ -129,7 +129,7 @@ void SocketProcessor(const std::shared_ptr& ws,
 if (n <= 0 || (flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_CLOSE)
 {
 closeFrame();
-Log::warn("Connection closed while reading multiframe 
message.");
+LOG_WRN("Connection closed while reading multiframe 
message.");
 break;
 }
 
@@ -162,7 +162,7 @@ void SocketProcessor(const std::shared_ptr& ws,
 if (n <= 0 || (flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_CLOSE)
 {
 closeFrame();
-Log::warn("Connection closed.");
+LOG_WRN("Connection closed.");
 break;
 }
 
@@ -172,30 +172,29 @@ void SocketProcessor(const std::shared_ptr& ws,
 
 if (!success)
 {
-Log::info("Socket handler flagged to finish.");
+LOG_INF("Socket handler flagged to finish.");
 break;
 }
 }
 
-Log::info() << "SocketProcessor finishing. stop: " << (stop ? "true" : 
"false")
- << ", n: " << n
- << ", payload size: " << payload.size()
- << ", flags: " << std::hex << flags << Log::end;
+LOG_INF("SocketProcessor finishing. stop: " << (stop ? "true" : 
"false") <<
+", n: " << n << ", payload size: " << payload.size() <<
+", flags: " << std::hex << flags);
 
 if ((flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE 
&& payload.size() > 1)
 {
 std::string msg;
 Poco::URI::encode(std::string(payload.data(), payload.size()), "", 
msg);
-Log::warn("Last message (" + std::to_string(payload.size()) +
-  " bytes) will not be processed: [" + msg + "].");
+LOG_WRN("Last message (" << payload.size() <<
+" bytes) will not be processed: [" << msg << "].");
 }
 }
 catch (const std::exception& exc)
 {
-Log::error("SocketProcessor: exception: " + std::string(exc.what()));
+LOG_ERR("SocketProcessor: exception: " << exc.what());
 }
 
-Log::info("SocketProcessor finished.");
+LOG_INF("SocketProcessor finished.");
 }
 
 void shutdownWebSocket(const std::shared_ptr& ws)
@@ -212,7 +211,8 @@ void shutdownWebSocket(const 
std::shared_ptr& ws)
 }
 catch (const Poco::Exception& exc)
 {
-Log::warn("Util::shutdownWebSocket: Exception: " + exc.displayText() + 
(exc.nested() ? " (" + exc.nested()->displayText() + ")" : ""));
+LOG_WRN("Util::shutdownWebSocket: Exception: " << exc.displayText() <<
+(exc.nested() ? " (" + exc.nested()->displayText() + ")" : 
""));
 }
 }
 
@@ -221,7 +221

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

[Ashod Nakashian]

 loolwsd/DocumentBroker.hpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c6aae20d5d57266fdefe9193b4e9d5be9bf3201
Author: Ashod Nakashian 
Date:   Wed Nov 9 23:30:20 2016 -0500

loolwsd: don't error when killing a dead child process

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

diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index b5c1fa2..94a13f2 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -98,10 +98,10 @@ public:
 _ws.reset();
 if (_pid != -1 && kill(_pid, 0) != 0)
 {
-if (rude)
+if (errno != ESRCH && rude)
 {
 LOG_INF("Killing child [" << _pid << "].");
-if (kill(_pid, SIGINT) != 0 && kill(_pid, 0) != 0)
+if (kill(_pid, SIGINT) != 0 && kill(_pid, 0) != 0 && errno 
!= ESRCH)
 {
 Log::syserror("Cannot terminate lokit [" + 
std::to_string(_pid) + "]. Abandoning.");
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |   48 ++--
 1 file changed, 30 insertions(+), 18 deletions(-)

New commits:
commit 8b5f112ebf56cc63ada0fe02c66d31dc10f7c439
Author: Ashod Nakashian 
Date:   Wed Nov 9 23:41:21 2016 -0500

loolwsd: recover when forkit dies

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

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 4c9ed10..40876de 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1834,7 +1834,15 @@ Process::PID LOOLWSD::createForKit()
 // The Pipe dtor closes the fd, so dup it.
 ForKitWritePipe = dup(inPipe.writeHandle());
 
-return child.id();
+const auto forkitPid = child.id();
+
+// Init the Admin manager
+Admin::instance().setForKitPid(forkitPid);
+
+// Spawn some children, if necessary.
+preForkChildren();
+
+return forkitPid;
 }
 
 int LOOLWSD::main(const std::vector& /*args*/)
@@ -1925,19 +1933,13 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 srv2.start();
 
 // Fire the ForKit process; we are ready to get child connections.
-const Process::PID forKitPid = createForKit();
+Process::PID forKitPid = createForKit();
 if (forKitPid < 0)
 {
 LOG_FTL("Failed to spawn loolforkit.");
 return Application::EXIT_SOFTWARE;
 }
 
-// Init the Admin manager
-Admin::instance().setForKitPid(forKitPid);
-
-// Spawn some children, if necessary.
-preForkChildren();
-
 // Now we can serve clients; Start listening on the public port.
 std::unique_ptr psvs(
 UnitWSD::isUnitTesting() ?
@@ -1967,17 +1969,27 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 {
 if (forKitPid == pid)
 {
-if (WIFEXITED(status) == true)
+if (WIFEXITED(status) || WIFSIGNALED(status))
 {
-LOG_INF("Child process [" << pid << "] exited with code: " 
<< WEXITSTATUS(status) << ".");
-break;
-}
-else if (WIFSIGNALED(status) == true)
-{
-const auto fate = (WCOREDUMP(status) ? "core-dumped" : 
"died");
-LOG_ERR("Child process [" << pid << "] " << fate <<
-" with " << Util::signalName(WTERMSIG(status)));
-break;
+if (WIFEXITED(status))
+{
+LOG_INF("Child process [" << pid << "] exited with 
code: " <<
+WEXITSTATUS(status) << ".");
+}
+else
+{
+LOG_ERR("Child process [" << pid << "] " <<
+(WCOREDUMP(status) ? "core-dumped" : "died") <<
+" with " << 
Util::signalName(WTERMSIG(status)));
+}
+
+// Spawn a new forkit and try to dust it off and resume.
+forKitPid = createForKit();
+if (forKitPid < 0)
+{
+LOG_FTL("Failed to spawn forkit instance. Shutting 
down.");
+break;
+}
 }
 else if (WIFSTOPPED(status) == true)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - AllLangHelp_shared.mk source/text

[Gabor Kelemen]

 AllLangHelp_shared.mk  |1 
 source/text/shared/00/0402.xhp |2 -
 source/text/shared/01/0219.xhp |   47 -
 3 files changed, 50 deletions(-)

New commits:
commit e91a6393a3b573906bd3184cafb5b94bb391af7e
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:37:24 2016 +0100

Edit - Plug-in menu item was removed in 5.2

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

diff --git a/source/text/shared/00/0402.xhp 
b/source/text/shared/00/0402.xhp
index 2c91211..d075eae 100644
--- a/source/text/shared/00/0402.xhp
+++ b/source/text/shared/00/0402.xhp
@@ -247,8 +247,6 @@
 Open context menu of selected frame - choose 
Properties
 
 
-Choose Edit - Plug-in
-
 Choose Edit - ImageMap (also 
in context menu of selected object) 
 
 Choose Edit - ImageMap, 
then select a section of the ImageMap and click Properties - 
Description
commit 42dcc36e303f8b7a5d534fb3163e5c2a647560a3
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:27:48 2016 +0100

Remove a page about plug-ins

This feature was dropped from 5.2

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

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 50cf71c..1c6837a 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -121,7 +121,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/01/0211 \
 helpcontent2/source/text/shared/01/0218 \
 helpcontent2/source/text/shared/01/02180100 \
-helpcontent2/source/text/shared/01/0219 \
 helpcontent2/source/text/shared/01/0220 \
 helpcontent2/source/text/shared/01/02200100 \
 helpcontent2/source/text/shared/01/02200200 \
diff --git a/source/text/shared/01/0219.xhp 
b/source/text/shared/01/0219.xhp
deleted file mode 100644
index a24a3b3..000
--- a/source/text/shared/01/0219.xhp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-   
-
-
-
-Plug-in
-/text/shared/01/0219.xhp
-
-
-Sun Microsystems, Inc.
-
-
-
-
-plug-ins; activating and 
deactivating
-activating;plug-ins
-deactivating; plug-ins
-
-
-
-Plug-in
-Allows you to edit plug-ins in 
your file. Choose this command to enable or disable this feature. When enabled, 
a check mark appears beside this command, and you find commands to edit the 
plug-in in its context menu. When disabled, you find commands to control the 
plug-in in its context menu.
-
-
-  
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit d5d6c92fb166627cf01eb9e8a962bc127d8d8fb0
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:37:24 2016 +0100

Updated core
Project: help  e91a6393a3b573906bd3184cafb5b94bb391af7e

Edit - Plug-in menu item was removed in 5.2

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

diff --git a/helpcontent2 b/helpcontent2
index 42dcc36..e91a639 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 42dcc36e303f8b7a5d534fb3163e5c2a647560a3
+Subproject commit e91a6393a3b573906bd3184cafb5b94bb391af7e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Gabor Kelemen]

 source/text/scalc/main0102.xhp|1 -
 source/text/sdraw/main0102.xhp|1 -
 source/text/simpress/main0102.xhp |1 -
 source/text/swriter/main0102.xhp  |1 -
 4 files changed, 4 deletions(-)

New commits:
commit 9f5f37dfe07c69e090d7b1cacfd56de91689834e
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:41:18 2016 +0100

Remove embeds of the description of the Edit - Plug-in menu item

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

diff --git a/source/text/scalc/main0102.xhp b/source/text/scalc/main0102.xhp
index 42f3d07..b23d791 100644
--- a/source/text/scalc/main0102.xhp
+++ b/source/text/scalc/main0102.xhp
@@ -50,7 +50,6 @@
 
 Links
 
-
 
 ImageMap
 
diff --git a/source/text/sdraw/main0102.xhp b/source/text/sdraw/main0102.xhp
index ffc76af..5a94927 100644
--- a/source/text/sdraw/main0102.xhp
+++ b/source/text/sdraw/main0102.xhp
@@ -54,7 +54,6 @@
 UFI removed Layer 
command (as I did in zillion CWSs before...)
 Links
 
-
 ImageMap
 
 
diff --git a/source/text/simpress/main0102.xhp 
b/source/text/simpress/main0102.xhp
index 93b588e..02e109e 100644
--- a/source/text/simpress/main0102.xhp
+++ b/source/text/simpress/main0102.xhp
@@ -59,7 +59,6 @@
 
 Links
 
-
 
 ImageMap
 
diff --git a/source/text/swriter/main0102.xhp b/source/text/swriter/main0102.xhp
index 83f8344..772bc6c 100644
--- a/source/text/swriter/main0102.xhp
+++ b/source/text/swriter/main0102.xhp
@@ -71,7 +71,6 @@
 
 Links
 
-
 
 ImageMap
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 64e599d47215f4239a86e00d5cf4d6248d20e8d3
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:27:48 2016 +0100

Updated core
Project: help  42dcc36e303f8b7a5d534fb3163e5c2a647560a3

Remove a page about plug-ins

This feature was dropped from 5.2

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

diff --git a/helpcontent2 b/helpcontent2
index e4ffa2f..42dcc36 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e4ffa2f2f3a457054e75ce9a41029b94b018d2d1
+Subproject commit 42dcc36e303f8b7a5d534fb3163e5c2a647560a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit bf0a2303184d7fcbbfa4fbedbf9d2dd8cd83cf6b
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:41:18 2016 +0100

Updated core
Project: help  9f5f37dfe07c69e090d7b1cacfd56de91689834e

Remove embeds of the description of the Edit - Plug-in menu item

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

diff --git a/helpcontent2 b/helpcontent2
index e91a639..9f5f37d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e91a6393a3b573906bd3184cafb5b94bb391af7e
+Subproject commit 9f5f37dfe07c69e090d7b1cacfd56de91689834e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - source/text

[Gabor Kelemen]

 source/text/shared/00/0002.xhp |   21 +
 source/text/shared/00/0102.xhp |2 --
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 9b126a4ef3798df131b29e064e9decabea812b5c
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:48:09 2016 +0100

Remove the definition of plug-in

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

diff --git a/source/text/shared/00/0002.xhp 
b/source/text/shared/00/0002.xhp
index 0ee9c2e..8ed4833 100644
--- a/source/text/shared/00/0002.xhp
+++ b/source/text/shared/00/0002.xhp
@@ -150,25 +150,6 @@
 The Java 
programming language is a platform independent programming language that is 
especially suited for use in the Internet. Web pages and applications 
programmed with Java class files can be used on all modern operating systems. 
Programs using Java programming language are usually developed in a Java 
development environment and then compiled to a "byte code".
 
 
-
-
-  plug-ins; definition
-
-
-
-Plug-In
-Extensions 
providing additional functionality in Web browsers are referred to as 
Plug-Ins.
-A Plug-In is a 
term used in various contexts:
-
-Plug-Ins in $[officename]
-You will 
notice in $[officename] that the Formatting Bar changes after 
certain operations. For example, if you insert a formula into your text 
document, you see icons for editing the formula, in fact the same icons you see 
in formula documents. In this sense, we refer to the formula as a plug-in 
within the text document.
-
-Using 
Plug-Ins to extend your programs
-Plug-ins, 
generally speaking, are software additions to particular applications which 
provide enhanced functionality. Often import and export filters for various 
file formats are stored as plug-ins in a plug-in directory.
-Netscape web 
browser extensions produced by Netscape Communication Corporation are also 
called plug-ins. These are external programs mainly taken from the multimedia 
field and which communicate with the browser through standardized interfaces. 
These plug-ins can be linked to $[officename] documents.
-Any Netscape 
plug-ins (32 bit) installed on your system are automatically recognized by 
$[officename].removed path
-
-
 
 
 Proxy
@@ -218,4 +199,4 @@
 
 
 
-
\ No newline at end of file
+
commit 368c92d82e25d61746808d38afd3d5049f9bfe84
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:53:55 2016 +0100

Remove one more dead plug-in menu item description

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

diff --git a/source/text/shared/00/0102.xhp 
b/source/text/shared/00/0102.xhp
index 8713b1b..d26d1e9 100644
--- a/source/text/shared/00/0102.xhp
+++ b/source/text/shared/00/0102.xhp
@@ -41,8 +41,6 @@
 If you have deactivated 
the graphics display, choose the Load Graphics command to make 
them visible.
 
 Sets all graphics in the 
document to be invisible.
-
-Disables inserted 
plug-ins. Click this command again to reactivate the plug-ins.
 
 Allows you to save the 
background of a Web page.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Gabor Kelemen]

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

New commits:
commit 029a936aecb9b25d3ffefef072ba6fe86e19d305
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:48:09 2016 +0100

Updated core
Project: help  9b126a4ef3798df131b29e064e9decabea812b5c

Remove the definition of plug-in

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

diff --git a/helpcontent2 b/helpcontent2
index 368c92d..9b126a4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 368c92d82e25d61746808d38afd3d5049f9bfe84
+Subproject commit 9b126a4ef3798df131b29e064e9decabea812b5c
commit 5fabbf534984fa26eb2c7f1f6b975a9339566cc6
Author: Gabor Kelemen 
Date:   Wed Nov 9 22:53:55 2016 +0100

Updated core
Project: help  368c92d82e25d61746808d38afd3d5049f9bfe84

Remove one more dead plug-in menu item description

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

diff --git a/helpcontent2 b/helpcontent2
index 9f5f37d..368c92d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9f5f37dfe07c69e090d7b1cacfd56de91689834e
+Subproject commit 368c92d82e25d61746808d38afd3d5049f9bfe84
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 comphelper/source/misc/accessiblecontexthelper.cxx|   14 +++---
 comphelper/source/misc/componentbase.cxx  |4 -
 comphelper/source/misc/logging.cxx|   14 +-
 comphelper/source/misc/proxyaggregation.cxx   |   16 ++
 connectivity/source/commontools/DriversConfig.cxx |3 -
 connectivity/source/commontools/formattedcolumnvalue.cxx  |8 ---
 connectivity/source/commontools/sqlerror.cxx  |9 ---
 connectivity/source/cpool/ZPoolCollection.cxx |   11 +---
 connectivity/source/cpool/ZPoolCollection.hxx |1 
 connectivity/source/drivers/file/FStatement.cxx   |7 ---
 connectivity/source/drivers/jdbc/ContextClassLoader.cxx   |2 
 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx |   23 
+-
 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx |3 -
 connectivity/source/drivers/odbc/OConnection.cxx  |7 ---
 connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx   |4 -
 connectivity/source/inc/file/FStatement.hxx   |2 
 connectivity/source/inc/java/ContextClassLoader.hxx   |4 -
 connectivity/source/inc/odbc/OConnection.hxx  |2 
 connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx   |2 
 connectivity/source/parse/sqliterator.cxx |4 +
 cppuhelper/source/servicemanager.cxx  |4 -
 cppuhelper/source/servicemanager.hxx  |4 -
 cppuhelper/source/typemanager.cxx |8 ---
 cppuhelper/source/typemanager.hxx |2 
 include/comphelper/accessiblecontexthelper.hxx|   10 
 include/comphelper/componentbase.hxx  |   10 
 include/comphelper/proxyaggregation.hxx   |4 -
 include/connectivity/DriversConfig.hxx|3 -
 include/connectivity/formattedcolumnvalue.hxx |5 --
 include/connectivity/sqliterator.hxx  |6 --
 30 files changed, 47 insertions(+), 149 deletions(-)

New commits:
commit 5c2c2d8dc4449c9d4ac9d645f634772ba93373af
Author: Noel Grandin 
Date:   Wed Nov 9 15:14:57 2016 +0200

loplugin:expandablemethods in comphelper..cppuhelper

Change-Id: I9d5487af4729bd3ee4f6450092e4b77f74a12e6d
Reviewed-on: https://gerrit.libreoffice.org/30717
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx 
b/comphelper/source/misc/accessiblecontexthelper.cxx
index 55fbe23..5f855ed 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -81,15 +81,17 @@ namespace comphelper
 }
 
 
-void OAccessibleContextHelper::forgetExternalLock()
+OAccessibleContextHelper::~OAccessibleContextHelper( )
 {
-m_pImpl->setExternalLock( nullptr );
-}
+/* forgets the reference to the external lock, if present.
 
+   This means any further locking will not be guard the external 
lock anymore, never.
+
+   To be used in derived classes which do not supply the external 
lock themself, but instead get
+   them passed from own derivees (or clients).
+*/
+m_pImpl->setExternalLock( nullptr );
 
-OAccessibleContextHelper::~OAccessibleContextHelper( )
-{
-forgetExternalLock();
 // this ensures that the lock, which may be already destroyed as 
part of the derivee,
 // is not used anymore
 
diff --git a/comphelper/source/misc/componentbase.cxx 
b/comphelper/source/misc/componentbase.cxx
index 2904e46..9baec23 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -33,14 +33,14 @@ namespace comphelper
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::XInterface;
 
-void ComponentBase::impl_checkDisposed_throw() const
+void ComponentBase::checkDisposed( GuardAccess ) const
 {
 if ( m_rBHelper.bDisposed )
 throw DisposedException( OUString(), getComponent() );
 }
 
 
-void ComponentBase::impl_checkInitialized_throw() const
+void ComponentBase::checkInitialized( GuardAccess ) const
 {
 if ( !m_bInitialized )
 throw NotInitializedException( OUString(), getComponent() );
diff --git a/comphelper/source/misc/logging.cxx 
b/comphelper/source/misc/logging.cxx
index 452d2a3..ed6a79c 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -52,22 +52,16 @@ namespace comphelper
 Reference< XLogger >m_xLogger;
 
 public:
-E

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

[Noel Grandin]

 cui/source/dialogs/SpellDialog.cxx |8 +---
 cui/source/dialogs/cuigaldlg.cxx   |   16 ++--
 cui/source/dialogs/cuigrfflt.cxx   |   19 ---
 cui/source/dialogs/hltpbase.cxx|9 ++---
 cui/source/dialogs/iconcdlg.cxx|7 +--
 cui/source/dialogs/insdlg.cxx  |8 +---
 cui/source/inc/SpellDialog.hxx |1 -
 cui/source/inc/chardlg.hxx |8 
 cui/source/inc/cuigaldlg.hxx   |2 --
 cui/source/inc/cuigrfflt.hxx   |9 -
 cui/source/inc/cuitabarea.hxx  |   14 +-
 cui/source/inc/hltpbase.hxx|2 --
 cui/source/inc/iconcdlg.hxx|1 -
 cui/source/inc/insdlg.hxx  |1 -
 cui/source/inc/macroass.hxx|1 -
 cui/source/inc/numfmt.hxx  |2 --
 cui/source/inc/page.hxx|3 ---
 cui/source/tabpages/chardlg.cxx|   35 ---
 cui/source/tabpages/macroass.cxx   |   15 +--
 cui/source/tabpages/numfmt.cxx |   12 ++--
 cui/source/tabpages/page.cxx   |2 +-
 cui/source/tabpages/tpcolor.cxx|4 ++--
 22 files changed, 38 insertions(+), 141 deletions(-)

New commits:
commit 76c8336eec82862732d3a26be84b5e8a52efe022
Author: Noel Grandin 
Date:   Wed Nov 9 14:56:41 2016 +0200

loplugin:expandablemethods in cui

Change-Id: I3dae1d142874c767ec1e32401acba0bbca95df5f
Reviewed-on: https://gerrit.libreoffice.org/30716
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 7d76879..e0bdeb0 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -340,7 +340,7 @@ void SpellDialog::UpdateBoxes_Impl()
 }
 else
 SetTitle_Impl( nAltLanguage );
-SetSelectedLang_Impl( nAltLanguage );
+m_pLanguageLB->SelectLanguage( nAltLanguage );
 int nDicts = InitUserDicts();
 
 // enter alternatives
@@ -759,12 +759,6 @@ bool SpellDialog::Close()
 }
 
 
-void SpellDialog::SetSelectedLang_Impl( LanguageType nLang )
-{
-m_pLanguageLB->SelectLanguage( nLang );
-}
-
-
 LanguageType SpellDialog::GetSelectedLang_Impl() const
 {
 sal_Int16 nLang = m_pLanguageLB->GetSelectLanguage();
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index f90e719..3667772 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -218,19 +218,13 @@ void SearchProgress::dispose()
 }
 
 
-void SearchProgress::Terminate()
+IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn, Button*, void)
 {
 if (maSearchThread.is())
 maSearchThread->terminate();
 }
 
 
-IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn, Button*, void)
-{
-Terminate();
-}
-
-
 IMPL_LINK_NOARG(SearchProgress, CleanUpHdl, void*, void)
 {
 if (maSearchThread.is())
@@ -347,19 +341,13 @@ void TakeProgress::dispose()
 }
 
 
-void TakeProgress::Terminate()
+IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn, Button*, void)
 {
 if (maTakeThread.is())
 maTakeThread->terminate();
 }
 
 
-IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn, Button*, void)
-{
-Terminate();
-}
-
-
 IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void)
 {
 if (maTakeThread.is())
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index c6928c2..f90faf9 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -232,8 +232,10 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const 
Graphic& rGraphic,
  double fScaleX, double 
fScaleY )
 {
 Graphic aRet;
-const Size  aSize( std::max( FRound( GetTileWidth() * fScaleX ), 1L ),
-   std::max( FRound( GetTileHeight() * fScaleY ), 1L ) 
);
+longnTileWidth = static_cast(mpMtrWidth->GetValue());
+longnTileHeight = static_cast(mpMtrHeight->GetValue());
+const Size  aSize( std::max( FRound( nTileWidth * fScaleX ), 1L ),
+   std::max( FRound( nTileHeight * fScaleY ), 1L ) );
 BmpFilterParam  aParam( aSize );
 
 if( rGraphic.IsAnimated() )
@@ -299,7 +301,8 @@ void GraphicFilterSmooth::dispose()
 Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, 
double, double )
 {
 Graphic aRet;
-BmpFilterParam  aParam( GetRadius() );
+double  nRadius = mpMtrRadius->GetValue() / 10.0;
+BmpFilterParam  aParam( nRadius );
 
 if( rGraphic.IsAnimated() )
 {
@@ -369,7 +372,8 @@ void GraphicFilterSolarize::dispose()
 Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, 
double, double )
 {
 Graphic aRet;
-BmpFilterParam  aParam( GetGreyThreshold() );
+sal_uInt8   nGreyThreshold = (sal_uInt8) FRound( 
mpMtrThreshold->GetValue() * 2.55 );
+BmpFilterParam  aParam( nGreyThreshold );
 
 if

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

[Noel Grandin]

 canvas/source/directx/dx_canvashelper.cxx  |2 +-
 include/comphelper/sequence.hxx|9 +
 svl/source/passwordcontainer/passwordcontainer.cxx |2 +-
 vcl/source/gdi/svgdata.cxx |3 +--
 4 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit ee0e713b5333dd363e443bf471ecb5cecec09d17
Author: Noel Grandin 
Date:   Wed Nov 9 10:57:28 2016 +0200

make comphelper::sequenceToContainer a little smarter

so we don't have to specify the source type

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

diff --git a/canvas/source/directx/dx_canvashelper.cxx 
b/canvas/source/directx/dx_canvashelper.cxx
index c319239..94b9c32 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -359,7 +359,7 @@ namespace dxcanvas
 aPen.SetMiterLimit( static_cast< Gdiplus::REAL 
>(strokeAttributes.MiterLimit) );
 
 const ::std::vector< Gdiplus::REAL >& rDashArray(
-::comphelper::sequenceToContainer< ::std::vector< 
Gdiplus::REAL > >(
+::comphelper::sequenceToContainer< ::std::vector< 
Gdiplus::REAL >, double >(
 strokeAttributes.DashArray ) );
 if( !rDashArray.empty() )
 {
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index bb1b1e8..68c361c 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -340,6 +340,15 @@ namespace comphelper
 return result;
 }
 
+// this one does better type deduction, but does not allow us to copy into 
a different element type
+template < typename DstType >
+inline DstType sequenceToContainer( const css::uno::Sequence< typename 
DstType::value_type >& i_Sequence )
+{
+DstType result( i_Sequence.getLength() );
+::std::copy( i_Sequence.begin(), i_Sequence.end(), result.begin() );
+return result;
+}
+
 /** Copy from a Sequence into an existing container
 
 This potentially saves a needless extra copy operation over
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx 
b/svl/source/passwordcontainer/passwordcontainer.cxx
index 3471291..d83c699 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -638,7 +638,7 @@ void SAL_CALL PasswordContainer::addPersistent( const 
OUString& Url, const OUStr
 void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& 
UserName, const Sequence< OUString >& Passwords, char Mode, const Reference< 
XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
 {
 NamePassRecord aRecord( UserName );
-::std::vector< OUString > aStorePass = comphelper::sequenceToContainer< 
std::vector, OUString>( Passwords );
+::std::vector< OUString > aStorePass = comphelper::sequenceToContainer< 
std::vector >( Passwords );
 
 if( Mode == PERSISTENT_RECORD )
 aRecord.SetPersPasswords( EncodePasswords( aStorePass, 
GetMasterPassword( aHandler ) ) );
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
index 1ec5014..155844f 100644
--- a/vcl/source/gdi/svgdata.cxx
+++ b/vcl/source/gdi/svgdata.cxx
@@ -131,8 +131,7 @@ void SvgData::ensureSequenceAndRange()
 {
 const uno::Reference< graphic::XSvgParser > xSvgParser = 
graphic::SvgTools::create(xContext);
 
-maSequence = 
comphelper::sequenceToContainer>,
- 
css::uno::Reference< css::graphic::XPrimitive2D 
>>(xSvgParser->getDecomposition(myInputStream, maPath));
+maSequence = 
comphelper::sequenceToContainer>>(xSvgParser->getDecomposition(myInputStream, 
maPath));
 }
 catch(const uno::Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits