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

[Tomaž Vajngerl (via logerrit)]

 vcl/inc/quartz/CGHelpers.hxx |   34 ++
 vcl/inc/quartz/salbmp.h  |2 -
 vcl/inc/quartz/salgdi.h  |   12 +++---
 vcl/inc/quartz/salvd.h   |4 +-
 vcl/quartz/salbmp.cxx|   13 +++---
 vcl/quartz/salgdi.cxx|   15 +++-
 vcl/quartz/salgdicommon.cxx  |   74 +++
 vcl/quartz/salgdiutils.cxx   |   28 +++
 vcl/quartz/salvd.cxx |   80 ---
 9 files changed, 147 insertions(+), 115 deletions(-)

New commits:
commit 368eb33bf21e2537410bf45171f56ad1dc668b99
Author: Tomaž Vajngerl 
AuthorDate: Thu May 16 15:21:08 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat May 18 08:49:30 2019 +0200

use CGContextHolder in AquaVirtualDevice

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

diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index bda6dc87e7cc..9c2d707981cc 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -39,7 +39,7 @@ class AquaSalVirtualDevice : public SalVirtualDevice
 private:
 bool mbGraphicsUsed; // is Graphics used
 bool mbForeignContext;   // is mxContext from outside VCL
-CGContextRef mxBitmapContext;
+CGContextHolder maBitmapContext;
 int mnBitmapDepth;
 CGLayerHolder maLayer; // Quartz layer
 AquaSalGraphics* mpGraphics; // current VirDev graphics
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 84e6c7cf992f..c438f5245eba 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -65,7 +65,6 @@ std::unique_ptr 
AquaSalInstance::CreateVirtualDevice( SalGraph
 AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long 
&nDX, long &nDY,
 DeviceFormat eFormat, const 
SystemGraphicsData *pData )
   : mbGraphicsUsed( false )
-  , mxBitmapContext( nullptr )
   , mnBitmapDepth( 0 )
   , mnWidth(0)
   , mnHeight(0)
@@ -180,13 +179,13 @@ void AquaSalVirtualDevice::Destroy()
 maLayer.set(nullptr);
 }
 
-if( mxBitmapContext )
+if (maBitmapContext.isSet())
 {
-void* pRawData = CGBitmapContextGetData( mxBitmapContext );
-std::free( pRawData );
-SAL_INFO( "vcl.cg",  "CGContextRelease(" << mxBitmapContext << ")" );
-CGContextRelease( mxBitmapContext );
-mxBitmapContext = nullptr;
+void* pRawData = CGBitmapContextGetData(maBitmapContext.get());
+std::free(pRawData);
+SAL_INFO( "vcl.cg",  "CGContextRelease(" << maBitmapContext.get() << 
")" );
+CGContextRelease(maBitmapContext.get());
+maBitmapContext.set(nullptr);
 }
 }
 
@@ -233,18 +232,18 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 mnHeight = nDY;
 
 // create a Quartz layer matching to the intended virdev usage
-CGContextRef xCGContext = nullptr;
+CGContextHolder xCGContextHolder;
 if( mnBitmapDepth && (mnBitmapDepth < 16) )
 {
 mnBitmapDepth = 8;  // TODO: are 1bit vdevs worth it?
 const int nBytesPerRow = (mnBitmapDepth * nDX + 7) / 8;
 
 void* pRawData = std::malloc( nBytesPerRow * nDY );
-mxBitmapContext = CGBitmapContextCreate( pRawData, nDX, nDY,
+maBitmapContext.set(CGBitmapContextCreate( pRawData, nDX, nDY,
  mnBitmapDepth, nBytesPerRow,
- GetSalData()->mxGraySpace, 
kCGImageAlphaNone );
-SAL_INFO( "vcl.cg",  "CGBitmapContextCreate(" << nDX << "x" << nDY << 
"x" << mnBitmapDepth << ") = " << mxBitmapContext );
-xCGContext = mxBitmapContext;
+ GetSalData()->mxGraySpace, 
kCGImageAlphaNone));
+SAL_INFO("vcl.cg",  "CGBitmapContextCreate(" << nDX << "x" << nDY << 
"x" << mnBitmapDepth << ") = " << maBitmapContext.get());
+xCGContextHolder = maBitmapContext;
 }
 else
 {
@@ -267,13 +266,13 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 NSGraphicsContext* pNSContext = [NSGraphicsContext 
graphicsContextWithWindow: pNSWindow];
 if( pNSContext )
 {
-xCGContext = [pNSContext CGContext];
+xCGContextHolder.set([pNSContext CGContext]);
 }
 }
 }
 #endif
 
-if (!xCGContext)
+if (!xCGContextHolder.isSet())
 {
 // assert(Application::IsBitmapRendering());
 mnBitmapDepth = 32;
@@ -285,18 +284,18 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 #else
 const int nFlags = kCGImageAlphaNoneSkipFirst | 
kCGImageByteOrder32Little;
 #endif
-mxBitmapContext = CGBitmapContextCreate(pRawData, nDX, nDY, 8, 
nBytesPerRow,
-

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

[Tomaž Vajngerl (via logerrit)]

 vcl/inc/quartz/CGHelpers.hxx |   55 +++
 vcl/inc/quartz/salgdi.h  |   46 ++-
 vcl/inc/quartz/salvd.h   |   14 +-
 vcl/quartz/salvd.cxx |   17 +++--
 4 files changed, 75 insertions(+), 57 deletions(-)

New commits:
commit 1b1c750146b07bb760603a8d1d2ef0a3ae5d98c2
Author: Tomaž Vajngerl 
AuthorDate: Wed May 15 16:35:40 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat May 18 08:38:23 2019 +0200

macOS: store VirtualDevice size in an instance variable

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

diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index 17d539182d7f..f5fc6e38b7bb 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -44,6 +44,9 @@ private:
 CGLayerRef mxLayer;  // Quartz layer
 AquaSalGraphics* mpGraphics; // current VirDev graphics
 
+long mnWidth;
+long mnHeight;
+
 void Destroy();
 
 public:
@@ -54,8 +57,15 @@ public:
 virtual voidReleaseGraphics( SalGraphics* pGraphics ) 
override;
 virtual boolSetSize( long nNewDX, long nNewDY ) 
override;
 
-virtual long GetWidth() const override;
-virtual long GetHeight() const override;
+long GetWidth() const override
+{
+return mnWidth;
+}
+
+long GetHeight() const override
+{
+return mnHeight;
+}
 };
 
 #endif // INCLUDED_VCL_INC_QUARTZ_SALVD_H
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 0fe4e7f923d3..a08345dfd1c1 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -68,6 +68,8 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* 
pGraphic, long &nDX
   , mxBitmapContext( nullptr )
   , mnBitmapDepth( 0 )
   , mxLayer( nullptr )
+  , mnWidth(0)
+  , mnHeight(0)
 {
 SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::AquaSalVirtualDevice() 
this=" << this
   << " size=(" << nDX << "x" << nDY << ") bitcount=" << 
static_cast(eFormat) <<
@@ -228,6 +230,9 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 
 Destroy();
 
+mnWidth = nDX;
+mnHeight = nDY;
+
 // create a Quartz layer matching to the intended virdev usage
 CGContextRef xCGContext = nullptr;
 if( mnBitmapDepth && (mnBitmapDepth < 16) )
@@ -305,16 +310,4 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 return (mxLayer != nullptr);
 }
 
-long AquaSalVirtualDevice::GetWidth() const
-{
-const CGSize aSize = CGLayerGetSize( mxLayer );
-return aSize.width;
-}
-
-long AquaSalVirtualDevice::GetHeight() const
-{
-const CGSize aSize = CGLayerGetSize( mxLayer );
-return aSize.height;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 356dd5430ac928b87aed714d7c8ef92a9b4a6b19
Author: Tomaž Vajngerl 
AuthorDate: Wed May 8 15:31:49 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat May 18 08:38:11 2019 +0200

Move CGCotextHolder to separate file - CGHelpers.hxx

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

diff --git a/vcl/inc/quartz/CGHelpers.hxx b/vcl/inc/quartz/CGHelpers.hxx
new file mode 100644
index ..cbd13d76fcf4
--- /dev/null
+++ b/vcl/inc/quartz/CGHelpers.hxx
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_INC_QUARTZ_CGHELPER_HXX
+#define INCLUDED_VCL_INC_QUARTZ_CGHELPER_HXX
+
+#include 
+#include 
+#include 
+
+class CGContextHolder
+{
+CGContextRef mpContext;
+#if OSL_DEBUG_LEVEL > 0
+int mnContextStackDepth;
+#endif
+
+public:
+CGContextHolder()
+: mpContext(nullptr)
+#if OSL_DEBUG_LEVEL > 0
+, mnContextStackDepth(0)
+#endif
+{
+}
+
+CGContextRef get() const { return mpContext; }
+
+bool isSet() const { return mpContext != nullptr; }
+
+void set(CGContextRef const& pContext) { mpContext = pContext; }
+
+void saveState()
+{
+SAL_INFO("vcl.cg", "CGContextSaveGState(" << mpContext << ") " << 
++mnContextStackDepth);
+CGContextSaveGState(mpContext);
+}
+
+void restoreState()
+{
+SAL_INFO("vcl.cg", "CGContextRestoreGState(" << mpContext << ") " << 
mnContextStackDepth--);
+CGContextRestoreGState(mpContext);
+}
+};
+
+#endif // INCLUDED_VCL_INC_QUARTZ_CGHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 7d5df4

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

[Andrea Gelmini (via logerrit)]

 desktop/test/deployment/update/defect/update/info2.update.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad3c5210fe308e71a8be246c8968a0f3535cb6e4
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:26:06 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:29:00 2019 +0200

Fix typo

Change-Id: I052de7eabad2b406b258404efd75293b6b49625d
Reviewed-on: https://gerrit.libreoffice.org/72504
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/desktop/test/deployment/update/defect/update/info2.update.xml 
b/desktop/test/deployment/update/defect/update/info2.update.xml
index 1446608022f0..7e26b0b179ba 100644
--- a/desktop/test/deployment/update/defect/update/info2.update.xml
+++ b/desktop/test/deployment/update/defect/update/info2.update.xml
@@ -1 +1 @@
-This is a invalid update information file!!!
+This is an invalid update information file!!!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 092abbe988691cf97be6462b9d6b31ccb623eed5
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:25:57 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:28:29 2019 +0200

Fix typo

Change-Id: I6767316c630f479c6dc6ccb961865811ce8a2e0d
Reviewed-on: https://gerrit.libreoffice.org/72509
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx 
b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 1d8d0db3ff8e..a0b2fe78673c 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -249,7 +249,7 @@ namespace drawinglayer
 
 if (nCount)
 {
-// rotate to have sphere cap orientned to negative 
X-Axis; do not
+// rotate to have sphere cap oriented to negative 
X-Axis; do not
 // forget to transform normals, too
 basegfx::B3DHomMatrix aSphereTrans;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/primitive2d/graphicprimitive2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aff51c3fd10604fa32fb512a9d5941dfb1bc6f2c
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:25:59 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:27:44 2019 +0200

Fix typo

Change-Id: Ia50e867c10b1389b97ecf3dd7f61c169288e38ba
Reviewed-on: https://gerrit.libreoffice.org/72507
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx 
b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index f684227ba1c8..df95a456178a 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -71,7 +71,7 @@ namespace drawinglayer
 // Get transformed graphic. Suppress rotation and cropping, only 
filtering is needed
 // here (and may be replaced later on). Cropping is handled below 
as mask primitive (if set).
 // Also need to suppress mirroring, it is part of the 
transformation now (see above).
-// Also move transparency handling to embedding to a 
UnifiedTransparencePrimitive2D; do
+// Also move transparency handling to embedding to an 
UnifiedTransparencePrimitive2D; do
 // that by remembering original transparency and applying that 
later if needed
 GraphicAttr aSuppressGraphicAttr(getGraphicAttr());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b70c29c330d925fe9647f129089ee27a4bfe200c
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:25:56 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:27:00 2019 +0200

Fix typo

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

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 3b0af02df486..78e98f9cc206 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -372,7 +372,7 @@ namespace drawinglayer
 // #i113922# the LineWidth is duplicated in the MetaPolylineAction,
 // and also inside the SvtGraphicStroke and needs transforming into
 // the same space as its co-ordinates here cf. fdo#61789
-// This is a partial fix. When a object transformation is used 
which
+// This is a partial fix. When an object transformation is used 
which
 // e.g. contains a scaleX != scaleY, an unproportional scaling 
will happen.
 const basegfx::B2DVector aDiscreteUnit( maCurrentTransformation * 
basegfx::B2DVector( fWidth, 0.0 ) );
 
@@ -508,7 +508,7 @@ namespace drawinglayer
 }
 
 // #i101734# apply current object transformation to created 
geometry.
-// This is a partial fix. When a object transformation is used 
which
+// This is a partial fix. When an object transformation is 
used which
 // e.g. contains a scaleX != scaleY, an unproportional scaling 
would
 // have to be applied to the evtl. existing fat line. The 
current
 // concept of PDF export and SvtGraphicStroke usage does 
simply not
@@ -658,7 +658,7 @@ namespace drawinglayer
 Used from slideshow for URLs, created from diverse SvxField 
implementations inside
 createBeginComment()/createEndComment(). createBeginComment() is 
used from editeng\impedit3.cxx
 inside ImpEditEngine::Paint.
-Created TextHierarchyFieldPrimitive2D and added needed infos 
there; it is an group primitive and wraps
+Created TextHierarchyFieldPrimitive2D and added needed infos 
there; it is a group primitive and wraps
 text primitives (but is not limited to that). It contains the 
field type if special actions for the
 support of FIELD_SEQ_BEGIN/END are needed; this is the case for 
Page and URL fields. If more is
 needed, it may be supported there.
@@ -672,7 +672,7 @@ namespace drawinglayer
 XTEXT_EOW(i) end of word
 XTEXT_EOS(i) end of sentence
 
-this three are with index and are created with the help of a 
i18n::XBreakIterator in
+this three are with index and are created with the help of an 
i18n::XBreakIterator in
 ImplDrawWithComments. Simplifying, moving out text painting, 
reworking to create some
 data structure for holding those TEXT infos.
 Supported directly by TextSimplePortionPrimitive2D with adding a 
Locale to the basic text
@@ -1998,7 +1998,7 @@ namespace drawinglayer
 {
 // set VCL clip region; subdivide before conversion to 
tools polygon. Subdivision necessary (!)
 // Removed subdivision and fixed in 
vcl::Region::ImplPolyPolyRegionToBandRegionFunc() in VCL where
-// the ClipRegion is built from the Polygon. A 
AdaptiveSubdivide on the source polygon was missing there
+// the ClipRegion is built from the Polygon. An 
AdaptiveSubdivide on the source polygon was missing there
 mpOutputDevice->Push(PushFlags::CLIPREGION);
 
mpOutputDevice->SetClipRegion(vcl::Region(maClipPolyPolygon));
 
@@ -2127,7 +2127,7 @@ namespace drawinglayer
 // - uses DrawTransparent with metafile for content and a gradient
 // i can detect this here with checking the gradient part for a 
single
 // FillGradientPrimitive2D and reconstruct the gradient.
-// If that detection goes wrong, I have to create an 
transparence-blended bitmap. Eventually
+// If that detection goes wrong, I have to create a 
transparence-blended bitmap. Eventually
 // do that in stripes, else RenderTransparencePrimitive2D may just 
be used
 const primitive2d::Primitive2DContainer& rContent = 
rTransparenceCandidate.getChildren();
 const primitive2d::Primitive2DContainer& rTransparence = 
rTransparenceCandidate.getTransparence();
___

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dd9d0dec99ef88ca1ff1e2f46bd022f540c0451e
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:25:55 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:26:25 2019 +0200

Fix typo

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

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 03012fb5d35a..560eafec8c19 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -609,7 +609,7 @@ namespace drawinglayer
 OSL_ENSURE(pPoHair, "OOps, PrimitiveID and 
PrimitiveType do not match (!)");
 
 // do no tallow by default - problem is 
that self-overlapping parts of this geometry will
-// not be in a all-same transparency but 
will already alpha-cover themselves with blending.
+// not be in an all-same transparency but 
will already alpha-cover themselves with blending.
 // This is not what the 
UnifiedTransparencePrimitive2D defines: It requires all its
 // content to be uniformly transparent.
 // For hairline the effect is pretty 
minimal, but still not correct.
@@ -623,7 +623,7 @@ namespace drawinglayer
 OSL_ENSURE(pPoStroke, "OOps, PrimitiveID 
and PrimitiveType do not match (!)");
 
 // do no tallow by default - problem is 
that self-overlapping parts of this geometry will
-// not be in a all-same transparency but 
will already alpha-cover themselves with blending.
+// not be in an all-same transparency but 
will already alpha-cover themselves with blending.
 // This is not what the 
UnifiedTransparencePrimitive2D defines: It requires all its
 // content to be uniformly transparent.
 // To check, activate and draw a wide 
transparent self-crossing line/curve
@@ -714,7 +714,7 @@ namespace drawinglayer
 
 // polygon stroke primitive
 
-// Lines with 1 and 2 pixel width without AA need special 
treatment since their vsiualisation
+// Lines with 1 and 2 pixel width without AA need special 
treatment since their visualization
 // as filled polygons is geometrically correct but looks wrong 
since polygon filling avoids
 // the right and bottom pixels. The used method evaluates that and 
takes the correct action,
 // including calling recursively with decomposition if line is 
wide enough
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
 |4 ++--
 drawinglayer/source/primitive2d/textlayoutdevice.cxx   
 |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c3cab06902f56eb539961ff75327345cfdd1023b
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:26:09 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:25:49 2019 +0200

Fix typo

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

diff --git 
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
 
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 2dd230b7da00..b360f470bef3 100644
--- 
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ 
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -195,7 +195,7 @@ public class OptionsEventHandler {
 XControl xControl = 
xContainer.getControl(m_arStringControls[i]);
 
 //This generic handler and the corresponding registry schema 
support
-//up to five text controls. However, if a options page does 
not use all
+//up to five text controls. However, if an options page does 
not use all
 //five controls then we will not complain here.
 if (xControl == null)
 continue;
@@ -290,7 +290,7 @@ public class OptionsEventHandler {
 XControl xControl = 
xContainer.getControl(m_arStringControls[i]);
 
 //This generic handler and the corresponding registry schema 
support
-//up to five text controls. However, if a options page does 
not use all
+//up to five text controls. However, if an options page does 
not use all
 //five controls then we will not complain here.
 if (xControl == null)
 continue;
commit 1c00f79d17cabc290cf960495253ef1f0fc6d5b7
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:25:58 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:25:35 2019 +0200

Fix typo

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

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx 
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 9740469ba304..e15e9f826d77 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -42,7 +42,7 @@ namespace
 {
 class ImpTimedRefDev;
 
-//the scoped_timed_RefDev owns a ImpTimeRefDev and releases it on dtor
+//the scoped_timed_RefDev owns an ImpTimeRefDev and releases it on dtor
 //or disposing of the default XComponentContext which causes the underlying
 //OutputDevice to get released
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3151c3b714699ed5be0bc5a1b0dabbb371c397a3
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:26:02 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:08:59 2019 +0200

Fix typo

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

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index e23a48921dc6..32b689e959d2 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -177,7 +177,7 @@ namespace drawinglayer
 // with stroke, we have a problem - a filled 
polygon would lose the
 // stroke. Let's represent the start and/or 
end as triangles, the main
 // line still as PolygonStrokePrimitive2D.
-// Fill default line Start/End for stroke, so 
we need no adaptions in else paths
+// Fill default line Start/End for stroke, so 
we need no adaptations in else paths
 basegfx::B2DPoint aStrokeStart(aStart - 
(aVector * candidate.getStartLeft()));
 basegfx::B2DPoint aStrokeEnd(aEnd + (aVector * 
candidate.getEndLeft()));
 const basegfx::B2DVector 
aHalfLineOffset(aPerpendicular * (candidate.getLineAttribute().getWidth() * 
0.5));
@@ -391,7 +391,7 @@ namespace drawinglayer
 else
 {
 // when not gap, the line extends have at least reach to 
the center ( > 0.0),
-// else there is a extend usage. When > 0.0 they just 
overlap, no problem
+// else there is an extend usage. When > 0.0 they just 
overlap, no problem
 if(rBT.getEndLeft() >= 0.0
 && rBT.getEndRight() >= 0.0
 && rBC.getStartLeft() >= 0.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/primitive2d/cropprimitive2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41f79d910ac03ef9f5ad5f0a87ad78c8e97ebd0b
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:26:00 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:07:44 2019 +0200

Fix typo

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

diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx 
b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index b5e459c07db6..82bbb2606400 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -100,7 +100,7 @@ namespace drawinglayer
 {
 // create new transform; first take out old transform 
to get
 // to unit coordinates by inverting. Inverting should 
be flawless
-// since we already cheched that object size is not 
zero in X or Y
+// since we already checked that object size is not 
zero in X or Y
 basegfx::B2DHomMatrix 
aNewTransform(getTransformation());
 
 aNewTransform.invert();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 xmloff/source/style/impastpl.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e94fa48afcae49c7ef64a9ec6f3f5d59b93ad2a5
Author: Andrea Gelmini 
AuthorDate: Wed May 15 09:01:07 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:07:11 2019 +0200

Fix typo

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

diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index c64a35d26141..f760de29f0a1 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -286,7 +286,7 @@ struct ComparePartial
 }
 };
 
-// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
+// Adds an array of XMLPropertyState ( vector< XMLPropertyState > ) to list
 // if not added, yet.
 
 bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const 
vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
@@ -312,7 +312,7 @@ bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& 
rFamilyData, const vector<
 }
 
 
-// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) with a 
given name.
+// Adds an array of XMLPropertyState ( vector< XMLPropertyState > ) with a 
given name.
 // If the name exists already, nothing is done. If a style with a different 
name and
 // the same properties exists, a new one is added (like with bDontSeek).
 
@@ -333,7 +333,7 @@ bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& 
rFamilyData, const ve
 }
 
 
-// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in 
list
+// Search for an array of XMLPropertyState ( vector< XMLPropertyState > ) in 
list
 
 
 OUString XMLAutoStylePoolParent::Find( const XMLAutoStyleFamily& rFamilyData, 
const vector< XMLPropertyState >& rProperties ) const
@@ -465,7 +465,7 @@ void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
 std::copy( aNames.begin(), aNames.end(), rNames.getArray() );
 }
 
-// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
+// Adds an array of XMLPropertyState ( vector< XMLPropertyState > ) to list
 // if not added, yet.
 
 bool SvXMLAutoStylePoolP_Impl::Add(
@@ -520,7 +520,7 @@ bool SvXMLAutoStylePoolP_Impl::AddNamed(
 }
 
 
-// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in 
list
+// Search for an array of XMLPropertyState ( vector< XMLPropertyState > ) in 
list
 
 
 OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung (via logerrit)]

 sw/qa/core/data/doc/tdf124937.doc |binary
 sw/source/core/text/itrform2.cxx  |1 +
 2 files changed, 1 insertion(+)

New commits:
commit 96acebb72211b4718eb3038c427df37b55b17b0b
Author: Mark Hung 
AuthorDate: Tue May 14 01:49:03 2019 +0800
Commit: Mark Hung 
CommitDate: Sat May 18 04:33:35 2019 +0200

tdf#124937 reset m_pFirstOfBorderMerge before truncate.

SwLinePortion::Truncate() called in
SwTextFormatter::FormatReset() delete the portion referred
by m_pFirstOfBorderMerge.

Change-Id: I68e134c86db617d37ea2efa09dad4409772146b5
Reviewed-on: https://gerrit.libreoffice.org/72300
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/sw/qa/core/data/doc/tdf124937.doc 
b/sw/qa/core/data/doc/tdf124937.doc
new file mode 100644
index ..4a3f91f7c020
Binary files /dev/null and b/sw/qa/core/data/doc/tdf124937.doc differ
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index fa56ada86eba..da17ddeff5da 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1859,6 +1859,7 @@ void SwTextFormatter::FeedInf( SwTextFormatInfo &rInf ) 
const
 
 void SwTextFormatter::FormatReset( SwTextFormatInfo &rInf )
 {
+m_pFirstOfBorderMerge = nullptr;
 m_pCurr->Truncate();
 m_pCurr->Init();
 if( pBlink && m_pCurr->IsBlinking() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand (via logerrit)]

 include/svx/autoformathelper.hxx  |   72 ++--
 sc/inc/autoform.hxx   |3 
 sc/source/core/tool/autoform.cxx  |   60 
 svx/source/items/autoformathelper.cxx |   43 +++
 sw/inc/tblafmt.hxx|8 +-
 sw/source/core/doc/tblafmt.cxx|  122 ++
 6 files changed, 171 insertions(+), 137 deletions(-)

New commits:
commit 10d8682e4cf77361e0ebf68a4ea1b565f05e91a9
Author: Armin Le Grand 
AuthorDate: Thu May 16 11:33:38 2019 +0200
Commit: Armin Le Grand 
CommitDate: Sat May 18 01:29:25 2019 +0200

Adapt AutoFormatHelper to std::unique_ptr

Change-Id: I3087a7e95e73dbcda798ca62705f7941a6466ccb
Reviewed-on: https://gerrit.libreoffice.org/72401
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/include/svx/autoformathelper.hxx b/include/svx/autoformathelper.hxx
index a2d72646cbce..c731ff70b5e0 100644
--- a/include/svx/autoformathelper.hxx
+++ b/include/svx/autoformathelper.hxx
@@ -93,47 +93,50 @@ class SVX_DLLPUBLIC AutoFormatBase
 protected:
 // common attributes of Calc and Writer
 // --- from 641 on: CJK and CTL font settings
-std::shared_ptrm_aFont;
-std::shared_ptr  m_aHeight;
-std::shared_ptr  m_aWeight;
-std::shared_ptr m_aPosture;
-
-std::shared_ptrm_aCJKFont;
-std::shared_ptr  m_aCJKHeight;
-std::shared_ptr  m_aCJKWeight;
-std::shared_ptr m_aCJKPosture;
-
-std::shared_ptrm_aCTLFont;
-std::shared_ptr  m_aCTLHeight;
-std::shared_ptr  m_aCTLWeight;
-std::shared_ptr m_aCTLPosture;
-
-std::shared_ptr   m_aUnderline;
-std::shared_ptrm_aOverline;
-std::shared_ptr  m_aCrossedOut;
-std::shared_ptr m_aContour;
-std::shared_ptrm_aShadowed;
-std::shared_ptr   m_aColor;
-std::shared_ptr m_aBox;
-std::shared_ptrm_aTLBR;
-std::shared_ptrm_aBLTR;
-std::shared_ptr   m_aBackground;
+std::unique_ptrm_aFont;
+std::unique_ptr  m_aHeight;
+std::unique_ptr  m_aWeight;
+std::unique_ptr m_aPosture;
+
+std::unique_ptrm_aCJKFont;
+std::unique_ptr  m_aCJKHeight;
+std::unique_ptr  m_aCJKWeight;
+std::unique_ptr m_aCJKPosture;
+
+std::unique_ptrm_aCTLFont;
+std::unique_ptr  m_aCTLHeight;
+std::unique_ptr  m_aCTLWeight;
+std::unique_ptr m_aCTLPosture;
+
+std::unique_ptr   m_aUnderline;
+std::unique_ptrm_aOverline;
+std::unique_ptr  m_aCrossedOut;
+std::unique_ptr m_aContour;
+std::unique_ptrm_aShadowed;
+std::unique_ptr   m_aColor;
+std::unique_ptr m_aBox;
+std::unique_ptrm_aTLBR;
+std::unique_ptrm_aBLTR;
+std::unique_ptr   m_aBackground;
 
 // Writer specific
-std::shared_ptr  m_aAdjust;
+std::unique_ptr  m_aAdjust;
 
 // Calc specific
-std::shared_ptr  m_aHorJustify;
-std::shared_ptr  m_aVerJustify;
-std::shared_ptrm_aStacked;
-std::shared_ptr  m_aMargin;
-std::shared_ptrm_aLinebreak;
+std::unique_ptr  m_aHorJustify;
+std::unique_ptr  m_aVerJustify;
+std::unique_ptrm_aStacked;
+std::unique_ptr  m_aMargin;
+std::unique_ptrm_aLinebreak;
 
 // from SO5, 504k on, rotated text
-std::shared_ptr   m_aRotateAngle;
-std::shared_ptr  m_aRotateMode;
+std::unique_ptr   m_aRotateAngle;
+std::unique_ptr  m_aRotateMode;
+
+// assignment-op is protected due to this being a tooling
+// class, so callers need to be aware of what they do
+AutoFormatBase& operator=(const AutoFormatBase&);
 
-public:
 AutoFormatBase();
 AutoFormatBase( const AutoFormatBase& rNew );
 ~AutoFormatBase();
@@ -141,6 +144,7 @@ public:
 /// Comparing based of boxes backgrounds.
 bool operator==(const AutoFormatBase& rRight);
 
+public:
 // The get-methods.
 const SvxFontItem   &GetFont() const{ return *m_aFont; }
 const SvxFontHeightItem &GetHeight() const  { return *m_aHeight; }
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 5a6676f15500..8fad143b8400 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -112,6 +112,9 @@ public:
 ScAutoFormatDataField( const ScAutoFormatDataField& rCopy );
 ~ScAutoFormatDataField();
 
+// block assignment operator
+ScAutoFormatDataField& operator=(const ScAutoFormatDataField& rRef) = 
delete;
+
 // number format
 const ScNumFormatAbbrev&GetNumFormat() const{ return aNumFormat; }
 
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/a

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

[Katarina Behrens (via logerrit)]

 dbaccess/source/ui/dlg/generalpage.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 21e1aa9d6b13b39b87435f8998c7ea6123a069fd
Author: Katarina Behrens 
AuthorDate: Wed May 15 20:12:23 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Sat May 18 00:25:51 2019 +0200

tdf#125267: relax the requirement of fixed value of current filter

In a filepicker, user can select any file filter ('All files' for
example) and still choose to open .odb file. Specific UIName of
the current filter ('ODF Database' in this case) shouldn't therefore
be a hard requirement, the correct file extension is enough.

Change-Id: I641a267c545c66aa4d34954922783cc5ff7efd24
Reviewed-on: https://gerrit.libreoffice.org/72377
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit dc17f247daeb281dda531ff335873d563db5b653)
Reviewed-on: https://gerrit.libreoffice.org/72453
Reviewed-by: Michael Stahl 

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index 9f1c2c6f58a6..06a6e7d8b720 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -701,7 +701,10 @@ namespace dbaui
 if ( aFileDlg.Execute() == ERRCODE_NONE )
 {
 OUString sPath = aFileDlg.GetPath();
-if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || 
!pFilter->GetWildcard().Matches(sPath) )
+// check for aFileDlg.GetCurrentFilter used to be here but current 
fpicker filter
+// can be set to anything, see tdf#125267 how this breaks if other 
value
+// than 'ODF Database' is selected. Let's therefore check only if 
wildcard matches
+if ( !pFilter->GetWildcard().Matches(sPath) )
 {
 OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO));
 std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adam Kovacs (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf125298_crossreflink_nonascii_charlimit.docx 
|binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   | 
  25 ++
 sw/source/filter/ww8/docxattributeoutput.cxx | 
   8 ---
 sw/source/filter/ww8/wrtw8nds.cxx| 
   2 
 4 files changed, 28 insertions(+), 7 deletions(-)

New commits:
commit 1cbf0ee54519bf81d934609352e8a1a641d8a534
Author: Adam Kovacs 
AuthorDate: Fri May 17 11:30:26 2019 +0200
Commit: László Németh 
CommitDate: Sat May 18 00:07:55 2019 +0200

tdf#125298 DOCX export: fix bookmark name truncation

The 40-character bookmark name truncation for MSO was
applied on percent encoded Unicode letters, resulting
shorter bookmark names, than needed (for example,
only 6 letters instead of 40).

This is a clean-up of the commit b9afb9959c31c3c57d0f2fe91107a92abfd82cdb
"tdf#113483: DOCX: fix encoding of bookmarks with non-ASCII letters".

Change-Id: I6fbcdc47c57ef228abcf29e0a68d3d8bb66c5661
Reviewed-on: https://gerrit.libreoffice.org/72456
Tested-by: László Németh 
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf125298_crossreflink_nonascii_charlimit.docx 
b/sw/qa/extras/ooxmlexport/data/tdf125298_crossreflink_nonascii_charlimit.docx
new file mode 100644
index ..d15739971c23
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf125298_crossreflink_nonascii_charlimit.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index ff2030df8b5f..b056ad16071d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -277,10 +277,35 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113483, 
"tdf113483_crossreflink_nonascii_bookmar
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
 if (!pXmlDoc)
 return;
+// check whether test file keeps non-ascii values or not
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:bookmarkStart[1]", 
"name", OUString::fromUtf8("Els\u0151"));
 assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[5]/w:r[2]/w:instrText[1]", OUString::fromUtf8(" REF 
Els\u0151 \\h "));
 }
 
+//tdf#125298: fix charlimit restrictions in bookmarknames and field references 
if they contain non-ascii characters
+DECLARE_OOXMLEXPORT_TEST(testTdf125298, 
"tdf125298_crossreflink_nonascii_charlimit.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// check whether test file keeps non-ascii values or not
+OUString bookmarkName1 = getXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:bookmarkStart[1]", "name");
+
CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8("\u00e1rv\u00edzt\u0171r\u0151_t\u00fck\u00f6rf\u00far\u00f3g\u00e9p"),
 bookmarkName1);
+
+OUString bookmarkName2 = getXPath(pXmlDoc, 
"/w:document/w:body/w:p[3]/w:bookmarkStart[1]", "name");
+
CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8("\u00e91\u00e12\u01713\u01514\u00fa5\u00f66\u00fc7\u00f38\u00ed9"),
 bookmarkName2);
+OUString fieldName1 = getXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[5]/w:r[2]/w:instrText[1]");
+OUString expectedFieldName1(" REF ");
+expectedFieldName1 += bookmarkName1;
+expectedFieldName1 += " \\h ";
+CPPUNIT_ASSERT_EQUAL(expectedFieldName1, fieldName1);
+OUString fieldName2 = getXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[7]/w:r[2]/w:instrText[1]");
+OUString expectedFieldName2(" REF ");
+expectedFieldName2 += bookmarkName2;
+expectedFieldName2 += " \\h ";
+CPPUNIT_ASSERT_EQUAL(expectedFieldName2, fieldName2);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d351101cf4a7..f47d539ddfb5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1612,7 +1612,7 @@ void DocxAttributeOutput::DoWriteBookmarkTagStart(const 
OUString & bookmarkName)
 {
 m_pSerializer->singleElementNS(XML_w, XML_bookmarkStart,
 FSNS(XML_w, XML_id), OString::number(m_nNextBookmarkId),
-FSNS(XML_w, XML_name), 
INetURLObject::decode(BookmarkToWord(bookmarkName), 
INetURLObject::DecodeMechanism::Unambiguous, RTL_TEXTENCODING_UTF8).toUtf8());
+FSNS(XML_w, XML_name), BookmarkToWord(bookmarkName).toUtf8());
 }
 
 void DocxAttributeOutput::DoWriteBookmarkTagEnd(const OUString & bookmarkName)
@@ -1981,12 +1981,6 @@ void DocxAttributeOutput::CmdField_Impl( const 
SwTextNode* pNode, sal_Int32 nPos
sToken = sToken.replaceAll("", "");
sToken = sToken.replaceAll("NN", "ddd");
 }
-//tdf#113483: fix non-ascii characters inside instrText xml tags
-else if ( rInfos.eType ==

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

[Balazs Varga (via logerrit)]

 chart2/source/view/axes/VCartesianAxis.cxx |   25 ++---
 chart2/source/view/axes/VCartesianAxis.hxx |2 +-
 sw/qa/extras/layout/data/tdf125334.odt |binary
 sw/qa/extras/layout/layout.cxx |   20 +++-
 4 files changed, 38 insertions(+), 9 deletions(-)

New commits:
commit 75ef0e41ea8a9096ac619356d2b837c5333b47e6
Author: Balazs Varga 
AuthorDate: Fri May 17 11:40:27 2019 +0200
Commit: László Németh 
CommitDate: Sat May 18 00:06:28 2019 +0200

tdf#125334 Chart: allow text break in bar chart axis labels

Now vertical category axis labels support text breaking.

Change-Id: I8b1c6eff921ea999bc4f745aa5f85bae278e735b
Reviewed-on: https://gerrit.libreoffice.org/72457
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 234e1000140a..4fac1f83b72e 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -510,7 +510,7 @@ TickInfo* MaxLabelTickIter::nextInfo()
 }
 
 bool VCartesianAxis::isBreakOfLabelsAllowed(
-const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis ) 
const
+const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, 
bool bIsVerticalAxis) const
 {
 if( m_aTextLabels.getLength() > 100 )
 return false;
@@ -525,8 +525,10 @@ bool VCartesianAxis::isBreakOfLabelsAllowed(
rAxisLabelProperties.fRotationAngleDegree == 90.0 ||
rAxisLabelProperties.fRotationAngleDegree == 270.0 ) )
 return false;
-//break only for horizontal axis
-return bIsHorizontalAxis;
+if ( !m_aAxisProperties.m_bSwapXAndY )
+return bIsHorizontalAxis;
+else
+return bIsVerticalAxis;
 }
 namespace{
 
@@ -702,7 +704,7 @@ bool VCartesianAxis::createTextShapes(
 const bool bIsHorizontalAxis = pTickFactory->isHorizontalAxis();
 const bool bIsVerticalAxis = pTickFactory->isVerticalAxis();
 
-if (!isBreakOfLabelsAllowed(rAxisLabelProperties, bIsHorizontalAxis) &&
+if (!isBreakOfLabelsAllowed(rAxisLabelProperties, bIsHorizontalAxis, 
bIsVerticalAxis) &&
 !isAutoStaggeringOfLabelsAllowed(rAxisLabelProperties, 
bIsHorizontalAxis, bIsVerticalAxis) &&
 !rAxisLabelProperties.isStaggered())
 return createTextShapesSimple(xTarget, rTickIter, 
rAxisLabelProperties, pTickFactory);
@@ -714,7 +716,7 @@ bool VCartesianAxis::createTextShapes(
 B2DVector aTextToTickDistance = 
pTickFactory->getDistanceAxisTickToText(m_aAxisProperties, true);
 sal_Int32 nLimitedSpaceForText = -1;
 
-if( isBreakOfLabelsAllowed( rAxisLabelProperties, bIsHorizontalAxis ) )
+if( isBreakOfLabelsAllowed( rAxisLabelProperties, bIsHorizontalAxis, 
bIsVerticalAxis ) )
 {
 nLimitedSpaceForText = nScreenDistanceBetweenTicks;
 if( bIsStaggered )
@@ -742,6 +744,12 @@ bool VCartesianAxis::createTextShapes(
 nLimitedSpaceForText = -1;
 }
 }
+
+// recalculate the nLimitedSpaceForText in case of vertical category 
axis if the text break is true
+if ( m_aAxisProperties.m_bSwapXAndY && bIsVerticalAxis && 
rAxisLabelProperties.fRotationAngleDegree == 0.0 )
+{
+nLimitedSpaceForText = 
rAxisLabelProperties.m_aMaximumSpaceForLabels.X;
+}
 }
 
  // Stores an array of text label strings in case of a normal
@@ -750,8 +758,11 @@ bool VCartesianAxis::createTextShapes(
 if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories )
 pCategories = &m_aTextLabels;
 
-bool bLimitedHeight = fabs(aTextToTickDistance.getX()) > 
fabs(aTextToTickDistance.getY());
-
+bool bLimitedHeight;
+if( !m_aAxisProperties.m_bSwapXAndY )
+bLimitedHeight = fabs(aTextToTickDistance.getX()) > 
fabs(aTextToTickDistance.getY());
+else
+bLimitedHeight = fabs(aTextToTickDistance.getX()) < 
fabs(aTextToTickDistance.getY());
 //prepare properties for multipropertyset-interface of shape
 tNameSequence aPropNames;
 tAnySequence aPropValues;
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx 
b/chart2/source/view/axes/VCartesianAxis.hxx
index df15e4896198..1c020bc4174c 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -150,7 +150,7 @@ private: //methods
  * @return true if we can break a single line label text into multiple
  * lines for better fitting, otherwise false.
  */
-bool isBreakOfLabelsAllowed( const AxisLabelProperties& 
rAxisLabelProperties, bool bIsHorizontalAxis ) const;
+bool isBreakOfLabelsAllowed( const AxisLabelProperties& 
rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const;
 
 ::basegfx::B2DVector getScreenPosition( double fLogicX, double fLogicY, 
double fLogicZ ) const;
 ScreenPosAndLogicPos getScreenPosAndLogicPos( double fLo

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

[Stephan Bergmann (via logerrit)]

 sw/qa/uitest/writer_tests5/xwindow.py |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9976aa7b8420daa9f7a5290ae433e2ab338ca146
Author: Stephan Bergmann 
AuthorDate: Fri May 17 15:23:04 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri May 17 23:38:10 2019 +0200

Fix expected mouseEntered/Exited values in xwindow.py test

(see  "Temporarily disable broken
part of xwindow.py test")

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

diff --git a/sw/qa/uitest/writer_tests5/xwindow.py 
b/sw/qa/uitest/writer_tests5/xwindow.py
index 51bee376968a..c1b86323d629 100644
--- a/sw/qa/uitest/writer_tests5/xwindow.py
+++ b/sw/qa/uitest/writer_tests5/xwindow.py
@@ -167,11 +167,12 @@ class XWindow(UITestCase):
 global mouseReleasedEventsIntercepted
 self.assertEqual(2, mouseReleasedEventsIntercepted)
 
+# Upon xMouseEvent, enter the vcl::Window with GetText() being 
"Standard", then upon
+# xMouseEvent2, exit that vcl::Window and enter the one with get_id() 
being "writer_edit":
 global mouseEnteredEventsIntercepted
-#TODO: self.assertEqual(1, mouseEnteredEventsIntercepted)
-
+self.assertEqual(2, mouseEnteredEventsIntercepted)
 global mouseExitedEventsIntercepted
-#TODO: self.assertEqual(0, mouseExitedEventsIntercepted)
+self.assertEqual(1, mouseExitedEventsIntercepted)
 
 # close document
 self.ui_test.close_doc()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regina Henschel (via logerrit)]

 include/svx/svdoashp.hxx|6 
 svx/qa/unit/customshapes.cxx|   75 
++
 svx/qa/unit/data/tdf115813_HandleMovementOOXMLPresetShapes.pptx |binary
 svx/source/customshapes/EnhancedCustomShape2d.cxx   |   51 +-
 4 files changed, 120 insertions(+), 12 deletions(-)

New commits:
commit 4ca556d041b3e27c4aeebf7434814eb8a4350203
Author: Regina Henschel 
AuthorDate: Mon May 13 14:21:05 2019 +0200
Commit: Regina Henschel 
CommitDate: Fri May 17 21:16:24 2019 +0200

tdf#115813 unit test for handle position of OOXML shapes

The patch contains some additions to tdf#115813 and a unit test.
The test covers nearly all OOXML preset shapes with handles. Only
some shapes do not fit to the test pattern: swooshArrow and polar
handle shapes arc, blockArc, chord, circularArror, mathNotEqual,
pie, leftCircularArrow, leftRightCicularArrow.
The shapes star24 and star32 are excluded because of tdf#125181.
The shapes gear6 and gear9 are excluded because a correct handle
movement is not yet implemented.
Connector shapes are inserted as ordinary shapes to prevent
converting.
The error string is designed to identify the affected shape.

Change-Id: Icd3358f3701ac2db2cc61eb045ae10bc4b72b9ca
Reviewed-on: https://gerrit.libreoffice.org/72229
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index e7f915992eae..662ddb5d446b 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -98,11 +98,11 @@ public:
 
 css::uno::Reference< css::drawing::XCustomShapeEngine > const & 
GetCustomShapeEngine() const;
 
-SVX_DLLPRIVATE std::vector< SdrCustomShapeInteraction > 
GetInteractionHandles() const;
+std::vector< SdrCustomShapeInteraction > GetInteractionHandles() const; // 
needed in unit test
 SVX_DLLPRIVATE void DragCreateObject( SdrDragStat& rDrag );
 SVX_DLLPRIVATE void DragResizeCustomShape( const tools::Rectangle& 
rNewRect );
-SVX_DLLPRIVATE void DragMoveCustomShapeHdl( const Point& rDestination,
-const sal_uInt16 nCustomShapeHdlNum, bool bMoveCalloutRectangle );
+void DragMoveCustomShapeHdl( const Point& rDestination,
+const sal_uInt16 nCustomShapeHdlNum, bool bMoveCalloutRectangle ); 
// needed in unit test
 
 // #i37011# centralize throw-away of render geometry
 void InvalidateRenderGeometry();
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index 526721d1a6c3..470d838cda3b 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -38,6 +38,7 @@ protected:
 uno::Reference mxComponent;
 // get shape nShapeIndex from page 0
 uno::Reference getShape(sal_uInt8 nShapeIndex);
+sal_uInt8 countShapes();
 
 public:
 virtual void setUp() override
@@ -69,6 +70,17 @@ uno::Reference 
CustomshapesTest::getShape(sal_uInt8 nShapeIndex
 return xShape;
 }
 
+sal_uInt8 CustomshapesTest::countShapes()
+{
+uno::Reference xDrawPagesSupplier(mxComponent,
+   
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("Could not get XDrawPagesSupplier", 
xDrawPagesSupplier.is());
+uno::Reference 
xDrawPages(xDrawPagesSupplier->getDrawPages());
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("Could not get xDrawPage", xDrawPage.is());
+return xDrawPage->getCount();
+}
+
 CPPUNIT_TEST_FIXTURE(CustomshapesTest, testViewBoxLeftTop)
 {
 // tdf#121890 formula values "left" and "top" are wrongly calculated
@@ -318,6 +330,69 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, 
testTdf124740_handle_path_coordsystem)
 // tolerance for rounding to integer
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("handle X coordinate", 8000.0, fX, 
2.0);
 }
+
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf115813_OOXML_XY_handle)
+{
+// The test covers all preset shapes with handles. Only these ones are
+// excluded: arc, blockArc, chord, circularArrow, gear6, gear9, 
mathNotEqual, pie,
+// leftCircularArrow, leftRightCircularArrow, star24, star32, swooshArrow.
+// Connectors are included as ordinary shapes to prevent converting.
+// Error was, that the handle movement and the changes to the shape did 
not follow
+// the mouse movement.
+const OUString sFileName("tdf115813_HandleMovementOOXMLPresetShapes.pptx");
+OUString sURL = m_directories.getURLFromSrc(sDataDirectory) + sFileName;
+mxComponent = loadFromDesktop(sURL, 
"com.sun.star.comp.drawing.DrawingDocument");
+CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is());
+
+OUString sErrors;
+// values in vector InteractionsHandles are in 1/100 mm and refer to page
+for (sal_uInt8 i = 0; i < countShapes(); i++)
+{
+uno::Reference xShape(getShape(i));
+

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-4' - cui/source include/vcl sc/source vcl/source

[Caolán McNamara (via logerrit)]

 cui/source/inc/paragrph.hxx   |   28 +---
 cui/source/tabpages/paragrph.cxx  |   20 --
 include/vcl/weld.hxx  |   12 
 sc/source/ui/attrdlg/tabpages.cxx |   51 --
 sc/source/ui/inc/tabpages.hxx |   13 -
 vcl/source/app/salvtables.cxx |   20 ++
 6 files changed, 89 insertions(+), 55 deletions(-)

New commits:
commit 64576639c4f2d42268692dde8edb53d6791354cd
Author: Caolán McNamara 
AuthorDate: Tue May 7 12:06:30 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 21:13:49 2019 +0200

Resolves: tdf#125106 fix cell protect TriState toggles

and merge duplicated TriStateEnabled class

Reviewed-on: https://gerrit.libreoffice.org/71905
Tested-by: Xisco Faulí 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 2376db068d8194d3455681a559369e50743e29f3)

Change-Id: I1f145558fe9d86682e03481fb2800386d04d2b1d
Reviewed-on: https://gerrit.libreoffice.org/71994
Reviewed-by: Michael Stahl 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 183dbba699dc..b741934754ef 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -184,18 +184,6 @@ public:
 virtual voidPageCreated(const SfxAllItemSet& aSet) override;
 };
 
-struct TriStateEnabled
-{
-TriState eState;
-bool bTriStateEnabled;
-TriStateEnabled()
-: eState(TRISTATE_INDET)
-, bTriStateEnabled(true)
-{
-}
-void ButtonToggled(weld::ToggleButton& rToggle);
-};
-
 // class SvxExtParagraphTabPage --
 /*
 [Description]
@@ -235,14 +223,14 @@ protected:
 private:
 SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
 
-TriStateEnabled aHyphenState;
-TriStateEnabled aPageBreakState;
-TriStateEnabled aApplyCollState;
-TriStateEnabled aPageNumState;
-TriStateEnabled aKeepTogetherState;
-TriStateEnabled aKeepParaState;
-TriStateEnabled aOrphanState;
-TriStateEnabled aWidowState;
+weld::TriStateEnabled aHyphenState;
+weld::TriStateEnabled aPageBreakState;
+weld::TriStateEnabled aApplyCollState;
+weld::TriStateEnabled aPageNumState;
+weld::TriStateEnabled aKeepTogetherState;
+weld::TriStateEnabled aKeepParaState;
+weld::TriStateEnabled aOrphanState;
+weld::TriStateEnabled aWidowState;
 
 boolbPageBreak;
 boolbHtmlMode;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index a8d9d8ab6003..35515175c760 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2063,26 +2063,6 @@ IMPL_LINK(SvxExtParagraphTabPage, WidowHdl_Impl, 
weld::ToggleButton&, rToggle, v
 WidowHdl();
 }
 
-void TriStateEnabled::ButtonToggled(weld::ToggleButton& rToggle)
-{
-if (bTriStateEnabled)
-{
-switch (eState)
-{
-case TRISTATE_INDET:
-rToggle.set_state(TRISTATE_FALSE);
-break;
-case TRISTATE_TRUE:
-rToggle.set_state(TRISTATE_INDET);
-break;
-case TRISTATE_FALSE:
-rToggle.set_state(TRISTATE_TRUE);
-break;
-}
-}
-eState = rToggle.get_state();
-}
-
 IMPL_LINK(SvxExtParagraphTabPage, OrphanHdl_Impl, weld::ToggleButton&, 
rToggle, void)
 {
 aOrphanState.ButtonToggled(rToggle);
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 449829015054..a124cd09786d 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -627,6 +627,18 @@ public:
 virtual void connect_toggled(const Link& rLink) { 
m_aToggleHdl = rLink; }
 };
 
+struct VCL_DLLPUBLIC TriStateEnabled
+{
+TriState eState;
+bool bTriStateEnabled;
+TriStateEnabled()
+: eState(TRISTATE_INDET)
+, bTriStateEnabled(true)
+{
+}
+void ButtonToggled(ToggleButton& rToggle);
+};
+
 class VCL_DLLPUBLIC MenuButton : virtual public ToggleButton
 {
 protected:
diff --git a/sc/source/ui/attrdlg/tabpages.cxx 
b/sc/source/ui/attrdlg/tabpages.cxx
index 4e82125791dc..8795514813aa 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -49,10 +49,10 @@ ScTabPageProtection::ScTabPageProtection(TabPageParent 
pParent, const SfxItemSet
 //  States will be set in Reset
 bTriEnabled = bDontCare = bProtect = bHideForm = bHideCell = bHidePrint = 
false;
 
-m_xBtnProtect->connect_toggled(LINK(this, ScTabPageProtection, 
ButtonClickHdl));
-m_xBtnHideCell->connect_toggled(LINK(this, ScTabPageProtection, 
ButtonClickHdl));
-m_xBtnHideFormula->connect_toggled(LINK(this, ScTabPageProtection, 
ButtonClickHdl));
-m_xBtnHidePrint->connect_toggled(LINK(this, ScTabPageProtection, 
ButtonClickHdl));

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

[Caolán McNamara (via logerrit)]

 include/sfx2/childwin.hxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 2719821c21761926db46f836cd4190b10fa9d4ff
Author: Caolán McNamara 
AuthorDate: Mon May 13 21:33:31 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 20:25:34 2019 +0200

drop now unused SFX_IMPL_MODELESSDIALOG_WITHID

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

diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index a01881c7698a..ce6dcb47b5fe 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -290,14 +290,6 @@ public:
 static_cast(GetWindow())->FillInfo( aInfo );  \
 return aInfo; }
 
-#define SFX_IMPL_MODELESSDIALOG_WITHID(Class, MyID)\
-SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID)   \
-SfxChildWinInfo Class::GetInfo() const \
-{   \
-SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
-static_cast(GetWindow())->FillInfo( aInfo );  \
-return aInfo; }
-
 #define SFX_IMPL_MODELESSDIALOGCONTOLLER_WITHID(Class, MyID)\
 SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID)   \
 SfxChildWinInfo Class::GetInfo() const \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Serge Krot (via logerrit)]

 sc/source/core/data/table1.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 91bb6196ab7b174fa02acbc1852739cf76439d3e
Author: Serge Krot 
AuthorDate: Tue May 7 10:10:33 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Fri May 17 20:09:53 2019 +0200

tdf#124829 sc: fix crash during progress update

Call reschedule() during update of the cells height is not
thread safe.

Reviewed-on: https://gerrit.libreoffice.org/71892
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/72236
Tested-by: Thorsten Behrens 
(cherry picked from commit 5f410088767e05ef5b5a7a7d5bebdce899cfe86a)

Conflicts:
sc/source/core/data/table1.cxx

Change-Id: Ia938aead79a048f12a53aa55c034e84ce3bf433b
Reviewed-on: https://gerrit.libreoffice.org/72498
Reviewed-by: Serge Krot (CIB) 
Tested-by: Serge Krot (CIB) 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index bd4e779d0984..409968693df5 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -107,7 +107,6 @@ void GetOptimalHeightsInColumn(
 const SCROW nMinStart = nStartRow + nPos;
 
 sal_uLong nWeightedCount = nProgressStart + 
rCol[MAXCOL].GetWeightedCount(nStartRow, nEndRow);
-const SCCOL progressUpdateStep = MAXCOL / 10;
 for (SCCOL nCol=0; nColSetState( nWeightedCount );
-
-if ((nCol % progressUpdateStep) == 0)
-{
-// try to make sure the progress dialog is painted before 
continuing
-Application::Reschedule(true);
-}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: shell/CustomTarget_x64.mk shell/Library_spsupp_x64.mk shell/source solenv/gbuild

[Mike Kaganski (via logerrit)]

 shell/CustomTarget_x64.mk|8 +---
 shell/Library_spsupp_x64.mk  |   11 +--
 shell/source/win32/spsupp/COMOpenDocuments_x64.cxx   |   13 +
 shell/source/win32/spsupp/registrar_x64.cxx  |   13 +
 shell/source/win32/spsupp/spsuppClassFactory_x64.cxx |   13 +
 shell/source/win32/spsupp/spsuppServ_x64.cxx |   13 +
 solenv/gbuild/LinkTarget.mk  |1 -
 solenv/gbuild/platform/com_MSC_class.mk  |4 ++--
 8 files changed, 60 insertions(+), 16 deletions(-)

New commits:
commit 3259ec8fb318f484ca2bcd798df95fd28dea74f6
Author: Mike Kaganski 
AuthorDate: Fri May 17 14:30:51 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri May 17 19:34:32 2019 +0200

Make spsupp_x64 independent of shell/CustomTarget_x64

... in preparation for further changes.
Thanks to Noel Grandin for the hint!

Change-Id: I2b223322d1d42099b56a74a92e3c39631d6b581c
Reviewed-on: https://gerrit.libreoffice.org/72470
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk
index 42dd36c03edb..79dcde80d0e3 100644
--- a/shell/CustomTarget_x64.mk
+++ b/shell/CustomTarget_x64.mk
@@ -44,12 +44,6 @@ SHELL_PROPERTYHDL_FILES := \
 SHELL_XMLPARSER_FILES := \
all/xml_parser
 
-SHELL_SPSUPP_FILES := \
-win32/spsupp/COMOpenDocuments \
-win32/spsupp/registrar \
-win32/spsupp/spsuppClassFactory \
-win32/spsupp/spsuppServ
-
 SHELL_HEADERS := \
win32/ooofilereader/autostyletag \
win32/ooofilereader/dummytag \
@@ -64,7 +58,7 @@ SHELL_HEADERS := \
win32/zipfile/zipexcptn
 
 $(call gb_CustomTarget_get_target,shell/source) : \
-   $(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) 
$(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) 
$(SHELL_XMLPARSER_FILES) $(SHELL_SPSUPP_FILES),\
+   $(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) 
$(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) 
$(SHELL_XMLPARSER_FILES),\
$(call gb_CustomTarget_get_workdir,shell/source)/$(source).cxx) 
\
$(foreach header,$(SHELL_HEADERS),\
$(call gb_CustomTarget_get_workdir,shell/source)/$(header).hxx)
diff --git a/shell/Library_spsupp_x64.mk b/shell/Library_spsupp_x64.mk
index cbb69df7d352..1988b2745539 100644
--- a/shell/Library_spsupp_x64.mk
+++ b/shell/Library_spsupp_x64.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,spsupp_x64))
 $(eval $(call gb_Library_set_x64,spsupp_x64,YES))
 
 $(eval $(call gb_Library_use_custom_headers,spsupp_x64,\
-   shell/source \
shell/source/win32/spsupp/idl \
 ))
 
@@ -35,11 +34,11 @@ $(eval $(call gb_Library_add_ldflags,spsupp_x64,\
/DEF:$(SRCDIR)/shell/source/win32/spsupp/spsupp.def \
 ))
 
-$(eval $(call gb_Library_add_x64_generated_exception_objects,spsupp_x64,\
-CustomTarget/shell/source/win32/spsupp/COMOpenDocuments \
-CustomTarget/shell/source/win32/spsupp/registrar \
-CustomTarget/shell/source/win32/spsupp/spsuppClassFactory \
-CustomTarget/shell/source/win32/spsupp/spsuppServ \
+$(eval $(call gb_Library_add_exception_objects,spsupp_x64,\
+shell/source/win32/spsupp/COMOpenDocuments_x64 \
+shell/source/win32/spsupp/registrar_x64 \
+shell/source/win32/spsupp/spsuppClassFactory_x64 \
+shell/source/win32/spsupp/spsuppServ_x64 \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/source/win32/spsupp/COMOpenDocuments_x64.cxx 
b/shell/source/win32/spsupp/COMOpenDocuments_x64.cxx
new file mode 100644
index ..2a155fefa303
--- /dev/null
+++ b/shell/source/win32/spsupp/COMOpenDocuments_x64.cxx
@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+// A stub for generating x64 DLL without the need to copy source files to a 
temporary directory
+#include "COMOpenDocuments.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/spsupp/registrar_x64.cxx 
b/shell/source/win32/spsupp/registrar_x64.cxx
new file mode 100644
index ..18372bb27cf3
--- /dev/null
+++ b/shell/source/win32/spsupp/registrar_x64.cxx
@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+// A stub for generating x64 DLL without the need to copy source

[Libreoffice-commits] core.git: Repository.mk shell/AllLangMoTarget_shell.mk shell/Executable_spsupp_helper.mk shell/inc shell/Module_shell.mk shell/source shell/WinResTarget_spsupp_dlg.mk

[Mike Kaganski (via logerrit)]

 Repository.mk  |2 
 shell/AllLangMoTarget_shell.mk |   11 +
 shell/Executable_spsupp_helper.mk  |   37 
 shell/Module_shell.mk  |6 
 shell/WinResTarget_spsupp_dlg.mk   |   14 +
 shell/inc/spsupp/spsuppServ.hpp|2 
 shell/inc/spsupp/spsuppStrings.hrc |   23 ++
 shell/source/win32/spsupp/COMOpenDocuments.cxx |  113 ++--
 shell/source/win32/spsupp/res/spsuppDlg.h  |   27 ++
 shell/source/win32/spsupp/res/spsuppDlg.rc |   29 +++
 shell/source/win32/spsupp/spsuppHelper.cxx |  231 +
 shell/source/win32/spsupp/spsuppServ.cxx   |   17 -
 12 files changed, 453 insertions(+), 59 deletions(-)

New commits:
commit f60cc89ec35f8b1bf56e9f69ef15143fd002c409
Author: Mike Kaganski 
AuthorDate: Tue May 7 21:22:08 2019 +0300
Commit: Mike Kaganski 
CommitDate: Fri May 17 19:15:02 2019 +0200

SharePoint: Add dialog to choose opening in read-only or edit mode.

ViewDocument3 method takes OpenType parameter, which allows to decide
if user can choose opening the document read-only or to edit.

Since we need to show localizable strings, we need to bootstrap part
of LO (l10n), which is impossible when e.g. 64-bit ActiveX DLL tries
to load installed 32-bit sal DLLs. Thus, we need a separate helper
.exe, which architecture matches the rest of installed LO, and which
handles user interaction.

Change-Id: I0ad53ba64272fb84728d2221e3dc85d3eefdda68
Reviewed-on: https://gerrit.libreoffice.org/72355
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/Repository.mk b/Repository.mk
index d9654e717025..a88b0f282897 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -208,6 +208,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,ooo, \
) \
$(if $(filter WNT,$(OS)), \
senddoc \
+   spsupp_helper \
) \
$(if $(filter OPENCL,$(BUILD_TYPE)),opencltest) \
 ))
@@ -1120,6 +1121,7 @@ $(eval $(call gb_Helper_register_mos,\
scc \
sd \
sfx \
+   shell \
sm \
svl \
svt \
diff --git a/shell/AllLangMoTarget_shell.mk b/shell/AllLangMoTarget_shell.mk
new file mode 100644
index ..41285974e3b7
--- /dev/null
+++ b/shell/AllLangMoTarget_shell.mk
@@ -0,0 +1,11 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,shell))
+
+# vim: set noet sw=4 ts=4:
diff --git a/shell/Executable_spsupp_helper.mk 
b/shell/Executable_spsupp_helper.mk
new file mode 100644
index ..5daeff28da56
--- /dev/null
+++ b/shell/Executable_spsupp_helper.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,spsupp_helper))
+
+$(eval $(call gb_Executable_set_targettype_gui,spsupp_helper,YES))
+
+$(eval $(call gb_Executable_set_include,spsupp_helper,\
+-I$(SRCDIR)/shell/inc/spsupp \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_sdk_api,spsupp_helper))
+
+$(eval $(call gb_Executable_use_libraries,spsupp_helper,\
+   i18nlangtag \
+   sal \
+   utl \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,spsupp_helper,\
+shell/source/win32/spsupp/spsuppHelper \
+))
+
+$(eval $(call gb_Executable_add_nativeres,spsupp_helper,spsupp_dlg))
+
+$(eval $(call gb_Executable_use_system_win32_libs,spsupp_helper,\
+shell32 \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 2aeb69177a13..c0c42cc5bea5 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_senddoc \
Library_smplmail \
Library_wininetbe \
+   Executable_spsupp_helper \
 ))
 
 ifeq ($(COM),MSC)
@@ -57,6 +58,7 @@ $(eval $(call gb_Module_add_targets,shell,\
CustomTarget_spsupp_idl \
Library_spsupp \
WinResTarget_spsupp \
+   WinResTarget_spsupp_dlg \
 ))
 
 $(eval $(call gb_Module_add_check_targets,shell,\
@@ -104,4 +106,8 @@ endif
 
 endif
 
+$(eval $(call gb_Module_add_l10n_targets,shell,\
+AllLangMoTarget_shell \
+))
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/WinResTarget_spsupp_dlg.mk b/shell/WinResTarget_spsupp_dlg.mk
new file mode 100

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

[Caolán McNamara (via logerrit)]

 include/svx/graphctl.hxx |3 ++-
 include/svx/svdpntv.hxx  |5 ++---
 sd/source/ui/inc/ClientView.hxx  |4 ++--
 sd/source/ui/view/clview.cxx |4 ++--
 svx/source/dialog/graphctl.cxx   |   15 +--
 svx/source/svdraw/sdrpagewindow.cxx  |2 +-
 svx/source/svdraw/sdrpaintwindow.cxx |6 --
 svx/source/svdraw/svdpagv.cxx|2 +-
 svx/source/svdraw/svdpntv.cxx|   10 ++
 9 files changed, 29 insertions(+), 22 deletions(-)

New commits:
commit 810e1a86b0f87086f972f0b1190130ce3ec088b2
Author: Caolán McNamara 
AuthorDate: Thu May 16 13:57:07 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 18:10:30 2019 +0200

there's already a way to customize the invalidation

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

diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index b4044d2b072b..d4fe23b3abca 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -264,7 +264,8 @@ public:
 // override these so we can get the occasions SdrPaintView would call 
Window::Invalidate on its vcl::Window
 // if it had one, and route to WidgetController::Invalidate instead
 virtual rtl::Reference 
CreateOverlayManager(OutputDevice& rDevice) const override;
-virtual void InvalidateWindow(const tools::Rectangle& rArea, OutputDevice& 
rDevice) const override;
+virtual void InvalidateOneWin(OutputDevice& rWin) override;
+virtual void InvalidateOneWin(OutputDevice& rWin, const tools::Rectangle& 
rRect) override;
 };
 
 #endif // INCLUDED_SVX_GRAPHCTL_HXX
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 7fe1a838b8d3..ce62413bc7c5 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -238,7 +238,6 @@ public:
 SdrPaintWindow* GetPaintWindow(sal_uInt32 nIndex) const;
 // Replacement for GetWin(0), may return 0L (!)
 OutputDevice* GetFirstOutputDevice() const;
-virtual void InvalidateWindow(const tools::Rectangle& rArea, OutputDevice& 
rDevice) const;
 
 private:
 SVX_DLLPRIVATE void ImpClearVars();
@@ -432,8 +431,8 @@ public:
 
 /// If the View should not call Invalidate() on the windows, override
 /// the following 2 methods and do something else.
-virtual void InvalidateOneWin(vcl::Window& rWin);
-virtual void InvalidateOneWin(vcl::Window& rWin, const tools::Rectangle& 
rRect);
+virtual void InvalidateOneWin(OutputDevice& rWin);
+virtual void InvalidateOneWin(OutputDevice& rWin, const tools::Rectangle& 
rRect);
 
 void SetActiveLayer(const OUString& rName) { maActualLayer=rName; }
 const OUString&  GetActiveLayer() const { return maActualLayer; }
diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx
index a7bb20b51bf2..a616a6252bce 100644
--- a/sd/source/ui/inc/ClientView.hxx
+++ b/sd/source/ui/inc/ClientView.hxx
@@ -38,8 +38,8 @@ public:
 
 /* if the view should not do a Invalidate() on the windows, you have to
override the following two methods and do something different */
-virtual void InvalidateOneWin(vcl::Window& rWin) override;
-virtual void InvalidateOneWin(vcl::Window& rWin, const ::tools::Rectangle& 
rRect) override;
+virtual void InvalidateOneWin(OutputDevice& rWin) override;
+virtual void InvalidateOneWin(OutputDevice& rWin, const 
::tools::Rectangle& rRect) override;
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx
index 29905c83909f..a73bd292314f 100644
--- a/sd/source/ui/view/clview.cxx
+++ b/sd/source/ui/view/clview.cxx
@@ -48,7 +48,7 @@ ClientView::~ClientView()
  * to be overridden and properly handled.
  */
 
-void ClientView::InvalidateOneWin(vcl::Window& rWin)
+void ClientView::InvalidateOneWin(OutputDevice& rWin)
 {
 vcl::Region aRegion;
 CompleteRedraw(&rWin, aRegion);
@@ -59,7 +59,7 @@ void ClientView::InvalidateOneWin(vcl::Window& rWin)
  * to be overridden and properly handled.
  */
 
-void ClientView::InvalidateOneWin(vcl::Window& rWin, const ::tools::Rectangle& 
rRect)
+void ClientView::InvalidateOneWin(OutputDevice& rWin, const 
::tools::Rectangle& rRect)
 {
 CompleteRedraw(&rWin, vcl::Region(rRect));
 }
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index d77a7c6e6069..470912a649c5 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -1494,7 +1494,18 @@ rtl::Reference 
SvxGraphCtrlView::CreateOverlayMana
 return SdrView::CreateOverlayManager(rDevice);
 }
 
-void SvxGraphCtrlView::InvalidateWindow(const tools::Rectangle& rArea, 
OutputDevice& rDevice) const
+void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice)
+{
+assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
+if (rDevice.GetOutDevType() 

Re: Update of file oox-drawingml-cs-presets

[Miklos Vajna]

Hi Regina,

On Fri, May 17, 2019 at 05:00:02PM +0200, Regina Henschel 
 wrote:
> to fix https://bugs.documentfoundation.org/show_bug.cgi?id=125181 it is
> needed to correct the file
> oox/source/drawingml/customshapes/presetShapeDefinitions.xml.

IIRC that file is from the OOXML spec, so please double-check that you
indeed have to change it.

> Do I need to include all changed files into the patch? Or is the change to
> presetShapeDefinitions.xml sufficient and there is a way to run the script
> afterwards?

It's perfectly fine to do this in two commits if you prefer that. If you
just change presetShapeDefinitions.xml, then I think nothing will change
in practice; but separating your real change and the generated changes
make sense.

Tracking the generated file in git is needed because of the circular
dependency here: to generate the file, you need a working installation
set, but to create the installation set, first you need to generate the
file. :-)

Regards,

Miklos


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

Re: [Libreoffice-commits] core.git: The -fvisibility-ms-compat hack is no longer needed for UBSan on Linux...

[Stephan Bergmann]

On 03/05/2019 13:58, Stephan Bergmann wrote:

This is a heads up for anybody using Clang ASan/UBSan on Linux:

(1)  If you are using Clang trunk (towards Clang 9), make sure you have 
 
"Adapt -fsanitize=function to SANITIZER_NON_UNIQUE_TYPEINFO".  Configure 
now assumes that "Clang >= 9" implies that fix, and otherwise building 
or running LO could fail.


(2)  I want to eventually get rid of the legacy 
NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY code, so if you are using an 
older Clang, it would be great if you could upgrade as soon as 
convenient for you (and once Clang 9 is even out).


*  is now using an appropriate 
Clang trunk (see 
 
"Bump ASan/UBSan bot to Clang trunk towards Clang 9").


* The fuzzer machinery was already using Clang trunk and appears to not 
be negatively affected by the below 
9a7aa3326d087c79879e435179e359dd76aa5e0a "The -fvisibility-ms-compat 
hack is no longer needed for UBSan on Linux..." (Caolán, correct me if 
I'm wrong).


*  "Remove legacy 
solenv/sanitizers/asan-suppressions support" will drop the legacy 
NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY code (and the no longer needed 
solenv/sanitizers/asan-suppressions, which people might still reference 
from their ASAN_OPTIONS), I plan on submitting it in a week, say.  Speak 
up now if you still need non-trunk Clang supported for sanitizer builds!



On 03/05/2019 13:47, Stephan Bergmann (via logerrit) wrote:

New commits:
commit 9a7aa3326d087c79879e435179e359dd76aa5e0a
Author: Stephan Bergmann 
AuthorDate: Tue Apr 16 16:11:39 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri May 3 13:46:25 2019 +0200

 The -fvisibility-ms-compat hack is no longer needed for UBSan on 
Linux...
 ...with latest Clang trunk towards Clang 9.  All the no-longer 
necessary hacks
 are made conditional on new 
NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY, which is
 still set for UBSan builds with older Clang on Linux (but which 
should

 eventually be purged).
 Various classes needed additional SAL_DLLPUBLIC_RTTI annotations, 
as building
 with UBSan instrumentation can generate references to RTTI 
symbols from
 additional places like outside a dynamic library that used to 
hide those symbols
 by default (but used to not hide them for old UBSan builds thanks 
to the

 -fvisibility-ms-compat hack).
 The odr-violation suppressions in 
solenv/sanitizers/asan-suppressions (which is
 not referenced from anywhere in the code base, but meant to be 
included in an
 ASan/UBSan build's ASAN_OPTIONS env var) are also no longer 
needed when

 NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY is false.
 Change-Id: I24ec3e388b0cbab50dbe2bf008d9569bff7bf25a
 Reviewed-on: https://gerrit.libreoffice.org/70829
 Tested-by: Jenkins
 Reviewed-by: Stephan Bergmann 

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

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

[Libreoffice Gerrit user]

Tag 'libreoffice-6.2.4.2' created by Christian Lohmaier 
 at 2019-05-17 15:35 +

Tag libreoffice-6.2.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlze1LcACgkQ9DSh76/u
rqOmcw//Q/NYVQPm+sEBA1XEkRD7XyGzQiPyEnkoSgEX3BTqPH2HxVk6IJkGIlFI
L5y/4JTKTdVWtXYgZhHzbYDZwxUwi0ijGk2MMpJiWPpCv7GCQIHBzvWw5Occxb/T
/3kXARt7+qhnF/do7D5s6icRGcGNJAfUKrqTN36UcxkYuNmt81emRx2hb66E0YwX
jv5SaabGuhfRLr3vi+g2GDqqib2QoPlV/CvLVS9vvnngOyhKRh13UG2tgs3j7a4l
rwq+yCw/FmDYpI0BBN8wGnhN752Vme5FIjxVBNrumeofr2XcW0Gs4n1ijJB9yeRN
quEcHlcOqjCT3sG1ycEfiQ9HMZ9w3J9k0Ae1q/hrE3kfa2WFIQICovPj5f71p1r1
6qrmlwraLxSC6SIuYtjonJeDJJcEHYwKQzSr3DqydDeitZQr1sMyJM9RtqgpJq5+
nCNQubNRSpHPBZaR0gCSVYXB8JNqyt5vexd2ipQihxyNK/KLlJThmZpHv0qf6192
fnYVRseWDkOuGUa1V5ANhwkdmoKsDJpPdpdkJGlv+y+vKDg5sGNHemnr3FOqAe0n
wEsItqIrh8vd6L3IVguOGXbC9awahypDxp5PViNajvTF4hjolIIHxBSu2gV+8QYa
/5Vv442nbDL7rvivBN4Am7Ii3/8hnMdlJ4fyw8RxecJYkxW43Oo=
=Il9T
-END PGP SIGNATURE-

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

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

[Libreoffice Gerrit user]

Tag 'libreoffice-6.2.4.2' created by Christian Lohmaier 
 at 2019-05-17 15:35 +

Tag libreoffice-6.2.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlze1LEACgkQ9DSh76/u
rqO/LhAAm2aeyxt3rEjFM6baM4fJE3+mCh6rsDXgq3K71afvKQ+IEwb4mz4b93hv
6tkHmTlGkzREcXfmJ+qCnhjSZmXfgZfaTljCfmfxn3Nez3W+ZCkOxR3kJRmOnshS
4nj8RqlaNu6n+CaYkM7tMFb3831RI8O0Xwz0YmeURcgO+0KnV8ZnwmWYFM8CaClT
ZY6EOlzeRbiekuLKy/iA1juYVSEIibQQ/v/o051EDmlznCBP2d408yLKwmijd8HQ
FfZ3mRSiliWhWm9mp2S0BETJBzzxGNqmPiLOaU4UEUh+ws7Alp1RkddW2AgNcVlr
ihOB+FAyNYk073Xp2pqMxe6h+Y+MQsArnMaxdiR3nF8qYeBnOxSoXZUmsuq7wsOW
7Kr/3cErQ68jiWRVMNhIqE3hxY7tLRGP2397q3UpkKWmaYWlCHWzVcupeQYJgnZs
PqOqEzg3S9nleiTczW3Kk1fd+g5Fy41hHNl873WyiHY+0kNqOpb048H0w2CuKisJ
IogK3WRvwDn3FIQ+ZVW1d7mnSjC/OpER40P0BTCr1eeNG5rwFpqkEYd38q5PNdKj
WEOMYLPGTr4Sui/hKh1h0KbB/WiepgJ/EQXTTAcGNx9AwJ2gp987tb1unVIxHIxH
psjhLaFXmh+AUFSZ1z6IOxVUYeg3lpOgvpXPsvtZtbhOGQtLxXA=
=xQH/
-END PGP SIGNATURE-

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

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

[Libreoffice Gerrit user]

Tag 'libreoffice-6.2.4.2' created by Christian Lohmaier 
 at 2019-05-17 15:35 +

Tag libreoffice-6.2.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlze1LcACgkQ9DSh76/u
rqPM4g//Rh9lX5xqnNTYirqf2vc8IxDuf/lyfT1/tdSAkULSVbxS7MrlS96RsCW1
4+50PFseQpcHNW+PqJb/A/kMzvhQbkPBb8ipr5EvL5/oah43kKCyg/zknpEBZ/1c
f/5MgaDMQ/zuY5sGp0RUBrsKexcDHIPN0rJRypVMMjjPo1xoAgYwOkpcVlbkYth5
1T1yvExQPB5SLcvydmWARuJt20n0snkokIzaBgaR7vq4DPgBmuqo3yrNtCSIHfZB
A27cd1Ofp/0mZhbSBRS6y83Q8AwEwj8ASP/u+w5DX6TPXRvFBOf+/p0OdrTHk99P
urgH5dn0w6ILu5AqfLfbQti8X1AGBTCjPzG6Ga0Ky+Qhv3QS+MUu2XFlMek2/R8X
8+u506XTBq6U4OVq1w94IGAoyNHuswu3UtaTrBMUgQwCodVohDZy9Z9HejMsfRaV
+uujLEavKIdCvAL8UAOp2LxyltVEPYZ8ze/00QwBoJ+xHXqw8c6UhoYMB6jFRHxh
olS2aCmmUwD/lUzyX0m3CUZ1pBfjvgQoxrUrvMRCzzLsszVjrhOHYybGlo9e7UVE
JI/raJTbg3zNCpcm++Fr1pN4uoacrVgyuMBVcJDKF3xm1vm5q2ebWLxWLlZQSMSY
gcUhSKCZda+VPTSh43OABtPp1Y9CNdVHrL87LWyHkd7ZGFQpN7s=
=m8NA
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit d541b9080e117539cc97d1f48d5df488cff7353f
Author: Christian Lohmaier 
AuthorDate: Fri May 17 17:35:40 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 17 17:35:40 2019 +0200

bump product version to 6.2.4.2.0+

Change-Id: Ib55310bd8aad8872d70ce2bb83d2918f702da6a2

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.2.4.2' created by Christian Lohmaier 
 at 2019-05-17 15:35 +

Tag libreoffice-6.2.4.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlze1LcACgkQ9DSh76/u
rqM9tA//Vz9o2BGcKeQtL5mnSWDkh0pLQASGOoW7PXvbFf1KBYeZ/24P5ki+Kyxn
9o14tXroeXOZxdiRV41oc6XSWpfiNVZQQu1fvKzPzo/WsKcD535vG8kbr6w1zUH4
Tw2SE+4T1susGXxD1JRMeUk58ELJ3JzeBCIQMj9pMtjo3OAkrPnAni99+fYety3H
iDR8WvXcJ62wDjo63xNd1H19Ofw0LwbREZ+LpRlaaCBMZDoApKTNy3QYUEFnqomo
QIicVTRSohz9T2nXhdSOL+gJgccHgG+UL03bWu9vBmiel1A2lJQ2Ke+/YnGJV/zO
ToHu7VPkiEdMbImc0CXM5jOB25edJtg8XeeIV0Gpetyo2AeK3LPOryyJ/jGQMmyW
YxupPC8W1JnK9kIsx3CrBqVHX+V83YDQOiC7zbp2US3G0POD34Gnlxvpgz2q5rjU
qumQR73hW8O+dF7rjKL53b+jblvLfkeeGA+3bOmBdU8VEsrJ0rTiRUwdry5Q9DMP
nRX+sAdxqojqG1BTd7fXRHvTBfOqmU5EXZ2G5HFv0PfS2sEfMBLoRhwY5j0gvZNe
gfdG8gBMeRHhJrstdb/GBK7LY57LdjSuWFaAEUCtdPpie3ZKD3qjLC9V/HGFs4TO
HCr2iN+DB5cqUJ1v3kyc609L9UiDTNqWfu2BHnGT++7YpvBzUcA=
=+3pE
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 8329 +---
 1 file changed, 4162 insertions(+), 4167 deletions(-)

New commits:
commit 90cf72f8a4988b4978c40d19ec7a4db314b97480
Author: Christian Lohmaier 
AuthorDate: Fri May 17 17:30:38 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 17 17:31:51 2019 +0200

update credits

Change-Id: I7d712426ff82242fd1a53779ad1e7df6d6fa86d9
(cherry picked from commit b5bc0d40ce55ced3c5019bdce27395e2a4f74454)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ad5c69379a8f..dbb04b1ff79e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   584
+   552
501
32440
18152
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 584
+ 552
  32939
- 18734
+ 18703
  0
  0
  false
@@ -114,7 +114,7 @@
true
false
true
-   8509381
+   8636398
false
false
false
@@ -325,105 +325,87 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  
+   
+  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
+   
   
-  
-   
+  
+   
   
-  
-   
-  
-  
+  

   
-  
+  

   
   
@@ -1059,7 +1041,7 @@

   
  Credits
-1427 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-25 14:12:30.
+1433 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-05-17 11:02:01.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1083,16 +1065,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 25940Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 26036Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 16926Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16967Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
11234Joined: 2011-12-12
+   *Noel GrandinCommits: 
11289Joined: 2011-12-1

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

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 8329 +---
 1 file changed, 4162 insertions(+), 4167 deletions(-)

New commits:
commit b5bc0d40ce55ced3c5019bdce27395e2a4f74454
Author: Christian Lohmaier 
AuthorDate: Fri May 17 17:30:38 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 17 17:30:38 2019 +0200

update credits

Change-Id: I7d712426ff82242fd1a53779ad1e7df6d6fa86d9

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ad5c69379a8f..dbb04b1ff79e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   584
+   552
501
32440
18152
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 584
+ 552
  32939
- 18734
+ 18703
  0
  0
  false
@@ -114,7 +114,7 @@
true
false
true
-   8509381
+   8636398
false
false
false
@@ -325,105 +325,87 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  
+   
+  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
+   
   
-  
-   
+  
+   
   
-  
-   
-  
-  
+  

   
-  
+  

   
   
@@ -1059,7 +1041,7 @@

   
  Credits
-1427 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-25 14:12:30.
+1433 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-05-17 11:02:01.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1083,16 +1065,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 25940Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 26036Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 16926Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16967Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
11234Joined: 2011-12-12
+   *Noel GrandinCommits: 
11289Joined: 2011-12-12
   
  
  
@@ -1100,10 +1082,10 @@
Ivo 
HinkelmannCo

Re: Converting Python Tuples / Lists into Any in PyUNO

[Thorsten Behrens]

Stephan Bergmann wrote:
> On 16/05/2019 14:41, Thomas Viehmann wrote:
> > 2. If 1. is yes, would investigating github projects featuring "import
> > uno" and checking whether and how they use "Any" interfaces be an OKish
> > assessment method?
> 
> Lets hope that somebody else with an actual interest in PyUNO steps in for
> the above.
> 
Well mostly a user for that one - that said, perhaps this github
research could inform further discussions (e.g. if we find many
instances, it's probably a non-starter. if we don't, could tip the
balance to do a low-impact cleanup)?

Alternatively, we could consider collecting breaking changes in an
experimental mode, and at some stage pull a 'python2 -> python3' alike
move.

Cheers,

-- Thorsten


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

Re: minutes of ESC call ...

[Thorsten Behrens]

Stephan Bergmann wrote:
> Whenever I recently happened to look at Gerrit/Jenkins builds that
> hadn't finished yet, it was the Mac build that was still
> outstanding, so I think we do have a bottleneck there after all.
>
Yeah, same anecdotal evidence here. Is the assumption we don't need
more Mac build power based on hard data?

Cheers,

-- Thorsten


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

Update of file oox-drawingml-cs-presets

[Regina Henschel]

Hi all,

to fix https://bugs.documentfoundation.org/show_bug.cgi?id=125181 it is 
needed to correct the file 
oox/source/drawingml/customshapes/presetShapeDefinitions.xml. But in 
addition the script oox/source/drawingml/customshapes/README needs to 
run for to generate an updated version of oox-drawingml-cs-presets. This 
script re-generates a lot of other files in addition.


Do I need to include all changed files into the patch? Or is the change 
to presetShapeDefinitions.xml sufficient and there is a way to run the 
script afterwards?


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

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit e4576e3da166b97c5c5b2d72903d51bddc04780f
Author: Caolán McNamara 
AuthorDate: Fri May 17 09:38:06 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 16:46:36 2019 +0200

tdf#125241 SvTreeListBox has a separate SetUpdateMode

so just Window:SetUpdateMode was called, not also
SvTreeListBox::SetUpdateMode

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0f925613ac8e..afb51ee80791 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1898,6 +1898,18 @@ public:
 m_aRadioButtonData.SetLink(LINK(this, SalInstanceTreeView, ToggleHdl));
 }
 
+virtual void freeze() override
+{
+SalInstanceWidget::freeze();
+m_xTreeView->SetUpdateMode(false);
+}
+
+virtual void thaw() override
+{
+m_xTreeView->SetUpdateMode(true);
+SalInstanceWidget::thaw();
+}
+
 virtual void set_column_fixed_widths(const std::vector& rWidths) 
override
 {
 std::vector aTabPositions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 7fcbb0a9115c3e125578dcd3c88c410a9c4aff08
Author: Stephan Bergmann 
AuthorDate: Fri May 17 11:02:01 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri May 17 16:30:25 2019 +0200

Remove spurious trailing whitespace

...introduced with 5187d3ae495a07373a12fd5980c9269bc8ce3f8f "Resolves: 
tdf#69042
- Add a 'What's New' infobar"

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

diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs 
b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 34bca3e15c5e..9d93e7eb6a64 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -262,7 +262,7 @@
   
   
 
-  Specifies the version number of the previously used product 
for 
+  Specifies the version number of the previously used product for
   whats-new comparison.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - shell/source

[Mike Kaganski (via logerrit)]

 shell/source/win32/spsupp/res/spsupp.rc |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 59c4940c4f1eff1cec3e58e0fe3b926b6547256e
Author: Mike Kaganski 
AuthorDate: Fri May 17 14:39:04 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri May 17 16:25:52 2019 +0200

Add license statement

Change-Id: Ib7ed7b3d94c04c09debe910a76cd720802f1a6f6
Reviewed-on: https://gerrit.libreoffice.org/72475
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit fa7412039f7d89a9b15aeabb99b0f5380b690cfa)
Reviewed-on: https://gerrit.libreoffice.org/72484

diff --git a/shell/source/win32/spsupp/res/spsupp.rc 
b/shell/source/win32/spsupp/res/spsupp.rc
index c7f62aeb24e3..20e323e16a7b 100644
--- a/shell/source/win32/spsupp/res/spsupp.rc
+++ b/shell/source/win32/spsupp/res/spsupp.rc
@@ -1 +1,12 @@
-1 TYPELIB TLB_FILE
\ No newline at end of file
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+// Type library
+
+1 TYPELIB TLB_FILE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 shell/source/win32/spsupp/res/spsupp.rc |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit fa7412039f7d89a9b15aeabb99b0f5380b690cfa
Author: Mike Kaganski 
AuthorDate: Fri May 17 14:39:04 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri May 17 16:25:12 2019 +0200

Add license statement

Change-Id: Ib7ed7b3d94c04c09debe910a76cd720802f1a6f6
Reviewed-on: https://gerrit.libreoffice.org/72475
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/shell/source/win32/spsupp/res/spsupp.rc 
b/shell/source/win32/spsupp/res/spsupp.rc
index c7f62aeb24e3..20e323e16a7b 100644
--- a/shell/source/win32/spsupp/res/spsupp.rc
+++ b/shell/source/win32/spsupp/res/spsupp.rc
@@ -1 +1,12 @@
-1 TYPELIB TLB_FILE
\ No newline at end of file
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+// Type library
+
+1 TYPELIB TLB_FILE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit a0a8351ab8582ec891df51ecee6bba3d591873dd
Author: Christian Lohmaier 
AuthorDate: Fri May 17 15:46:44 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Fri May 17 16:09:04 2019 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-2-4'
  - update translations for 6.2.4 rc2

and force-fix errors using pocheck

Change-Id: Ic143bd8070d7f8ef2c46265a88cfc215717c807c
(cherry picked from commit b4ac8d65832ab402e449f0e294bb3f09c4095fef)

diff --git a/translations b/translations
index 4e36c4799930..9214024f80f5 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4e36c4799930dc79470dd5d69a351d08fda298eb
+Subproject commit 9214024f80f56375207f34282b51c595166d72c2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit a894e2307a277e05cc9631e5871a3e86b96fd5ea
Author: Christian Lohmaier 
AuthorDate: Fri May 17 15:46:44 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Fri May 17 16:07:59 2019 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-2'
  - update translations for 6.2.4 rc2

and force-fix errors using pocheck

Change-Id: Ic143bd8070d7f8ef2c46265a88cfc215717c807c

diff --git a/translations b/translations
index a53a97b84749..b4ac8d65832a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a53a97b84749dda48d6796989fdaf21ad16afd4d
+Subproject commit b4ac8d65832ab402e449f0e294bb3f09c4095fef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 5a160ba0c0504f65bdfb3b0def9f39637b8b7e4b
Author: Jan Holesovsky 
AuthorDate: Fri May 17 13:42:00 2019 +0200
Commit: Michael Meeks 
CommitDate: Fri May 17 15:50:07 2019 +0200

Prefer HTML over RTF for pasting on the Mac.

Safari provides RTF clipboard content which doesn't contain the images.
We do not know where the content comes from, so let's always prefer HTML
over RTF on Mac.

Change-Id: I2f449ff4cf025e5f51dbe6e0683667f2d319ac21
Reviewed-on: https://gerrit.libreoffice.org/72461
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit 2998ab914e057d5c9bae3e3b03c0cf5f13e531b9)
Reviewed-on: https://gerrit.libreoffice.org/72480

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index f39102829..00759ca65 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2384,6 +2384,16 @@ L.TileLayer = L.GridLayer.extend({
['text/plain', 'text/plain;charset=utf-8'],
['Text', 'text/plain;charset=utf-8']
];
+   } else if (navigator.platform.startsWith('Mac')) {
+   // Safari provides RTF clipboard content which doesn't 
contain the
+   // images.  We do not know where the content comes 
from, so let's
+   // always prefer HTML over RTF on Mac.
+   mimeTypes = [
+   ['text/html', 'text/html'],
+   ['text/rtf', 'text/rtf'],
+   ['text/plain', 'text/plain;charset=utf-8'],
+   ['Text', 'text/plain;charset=utf-8']
+   ];
} else {
mimeTypes = [
['text/rtf', 'text/rtf'],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/ClientSession.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8be093ed671eaf58124ebfc0404d241ee56d64de
Author: Michael Meeks 
AuthorDate: Fri May 17 14:26:07 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri May 17 14:27:47 2019 +0100

Tolerate empty first lines.

Change-Id: Ib9aaf82560fc3f5adaa97f40a3de5f3946c6f65d

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 596c1c757..df68df351 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -87,6 +87,12 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 return false;
 }
 
+if (tokens.size() < 1)
+{
+sendTextFrame("error: cmd=empty kind=unknown");
+return false;
+}
+
 LOOLWSD::dumpIncomingTrace(docBroker->getJailId(), getId(), firstLine);
 
 if (LOOLProtocol::tokenIndicatesUserInteraction(tokens[0]))
@@ -97,7 +103,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 }
 if (tokens[0] == "loolclient")
 {
-if (tokens.size() < 1)
+if (tokens.size() < 2)
 {
 sendTextFrame("error: cmd=loolclient kind=badprotocolversion");
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'distro/collabora/collabora-online-4-0'

[Libreoffice Gerrit user]

New branch 'distro/collabora/collabora-online-4-0' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/ClientSession.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 9bc61c5f9865f3ae120a4ad45381aee2cb8ff8bf
Author: Michael Meeks 
AuthorDate: Fri May 17 14:26:07 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri May 17 14:26:34 2019 +0100

Tolerate empty first lines.

Change-Id: Ib9aaf82560fc3f5adaa97f40a3de5f3946c6f65d

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index f1ae9e897..9c8a4cd2a 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -87,6 +87,12 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 return false;
 }
 
+if (tokens.size() < 1)
+{
+sendTextFrame("error: cmd=empty kind=unknown");
+return false;
+}
+
 LOOLWSD::dumpIncomingTrace(docBroker->getJailId(), getId(), firstLine);
 
 if (LOOLProtocol::tokenIndicatesUserInteraction(tokens[0]))
@@ -97,7 +103,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 }
 if (tokens[0] == "loolclient")
 {
-if (tokens.size() < 1)
+if (tokens.size() < 2)
 {
 sendTextFrame("error: cmd=loolclient kind=badprotocolversion");
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/autocdlg.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit aa6b59c4bc4462b451cd6fe674b8fb8600698b2b
Author: Caolán McNamara 
AuthorDate: Thu May 16 17:24:13 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 15:11:16 2019 +0200

not much point setting the checkbox on each insertion

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

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 884163bb2085..20042f986d47 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -816,7 +816,6 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool 
bFromReset,
 // formatted text is only in Writer
 if (bSWriter || bTextOnly)
 {
-m_xTextOnlyCB->set_active(bTextOnly);
 OUString sId;
 if (!bTextOnly)
 {
@@ -843,7 +842,6 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool 
bFromReset,
 // formatted text is only in Writer
 if (bSWriter || bTextOnly)
 {
-m_xTextOnlyCB->set_active(elem->IsTextOnly());
 OUString sId;
 if (!bTextOnly)
 {
@@ -875,6 +873,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool 
bFromReset,
 }
 else
 {
+m_xTextOnlyCB->set_active(true);
 m_xTextOnlyCB->set_sensitive(false);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

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

New commits:
commit 390bd27d92971d9f523b20510554334e30ae9b9d
Author: Luboš Luňák 
AuthorDate: Thu May 16 15:59:58 2019 +0200
Commit: Luboš Luňák 
CommitDate: Fri May 17 14:46:26 2019 +0200

cache mdds position in ScAttrArray::RemoveCellCharAttribs() (tdf#108298)

Once more, mdds normally starts a container search from the beginning,
so this is quadratic. Doesn't happen with the bugdoc after Ctrl+A,
ScAttrArray::SetPatternAreaImpl() special-cases that, but with explicitly
giving a range this triggers.

Change-Id: Ic1177c1a115ffde23d7e11a90156ae05e02d067d
Reviewed-on: https://gerrit.libreoffice.org/72416
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 3805ad4fa662..9431c468bfe6 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using ::editeng::SvxBorderLine;
@@ -397,10 +398,13 @@ void ScAttrArray::RemoveCellCharAttribs( SCROW nStartRow, 
SCROW nEndRow,
const ScPatternAttr* pPattern, 
ScEditDataArray* pDataArray )
 {
 assert( nCol != -1 );
+// cache mdds position, this doesn't modify the mdds container, just 
EditTextObject's
+sc::ColumnBlockPosition blockPos;
+pDocument->InitColumnBlockPosition( blockPos, nTab, nCol );
 for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
 {
 ScAddress aPos(nCol, nRow, nTab);
-ScRefCellValue aCell(*pDocument, aPos);
+ScRefCellValue aCell(*pDocument, aPos, blockPos);
 if (aCell.meType != CELLTYPE_EDIT || !aCell.mpEditText)
 continue;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Toolbar.js |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 8d359cedbe352659adbe79a201c5b4c149ea6817
Author: Samuel Mehrbrodt 
AuthorDate: Fri May 17 14:12:56 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Fri May 17 14:38:28 2019 +0200

Statusbar search: Placeholder instead of label

Matches the desktop layout and reduces clutter

Change-Id: Ibbee6206281b37bbd9acaad23778389a20fe883f
Reviewed-on: https://gerrit.libreoffice.org/72466
Reviewed-by: Jan Holesovsky 
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 14a762315..648eb338a 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -985,9 +985,8 @@ function initNormalToolbar() {
tooltip: 'top',
items: [
{type: 'html',  id: 'search',
-html: '' +
-' ' + _('Search:') +
-'' +
+'' +
 ''
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - common/Util.cpp common/Util.hpp loleaflet/html loleaflet/src wsd/Admin.cpp wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Libreoffice Gerrit user]

 common/Util.cpp  |   10 ++
 common/Util.hpp  |3 +++
 loleaflet/html/loleaflet.html.m4 |1 +
 loleaflet/src/core/Socket.js |   12 ++--
 wsd/Admin.cpp|7 +--
 wsd/ClientSession.cpp|8 +---
 wsd/DocumentBroker.cpp   |3 +++
 wsd/LOOLWSD.cpp  |   39 +--
 wsd/LOOLWSD.hpp  |3 +++
 9 files changed, 65 insertions(+), 21 deletions(-)

New commits:
commit d8bcc1cf9cde6c792d4509a6be7af9e577a9b7b7
Author: Michael Meeks 
AuthorDate: Fri May 17 13:22:02 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri May 17 13:24:32 2019 +0100

debug: cleanup ID display as a simple link.

And cleanup debug printout in 'make run' too.

Change-Id: I7a399eb00f15e43ceb230f66a2b17d437c5c79b0

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index f88b2374d..583851954 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -181,10 +181,9 @@ ifelse(MOBILEAPP,[true],
   
   LOOLWSD
   
+  
   LOKit
   
-  Id
-  
 
 
 

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

[Libreoffice Gerrit user]

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

New commits:
commit 85b2bd3ab24d883cc1f94d7de53e4204c310178d
Author: Jan Holesovsky 
AuthorDate: Fri May 17 13:42:00 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Fri May 17 14:11:32 2019 +0200

Prefer HTML over RTF for pasting on the Mac.

Safari provides RTF clipboard content which doesn't contain the images.
We do not know where the content comes from, so let's always prefer HTML
over RTF on Mac.

Change-Id: I2f449ff4cf025e5f51dbe6e0683667f2d319ac21
Reviewed-on: https://gerrit.libreoffice.org/72461
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit 2998ab914e057d5c9bae3e3b03c0cf5f13e531b9)
Reviewed-on: https://gerrit.libreoffice.org/72465
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 43256a15e..75a28a3d0 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2381,6 +2381,16 @@ L.TileLayer = L.GridLayer.extend({
['text/plain', 'text/plain;charset=utf-8'],
['Text', 'text/plain;charset=utf-8']
];
+   } else if (navigator.platform.startsWith('Mac')) {
+   // Safari provides RTF clipboard content which doesn't 
contain the
+   // images.  We do not know where the content comes 
from, so let's
+   // always prefer HTML over RTF on Mac.
+   mimeTypes = [
+   ['text/html', 'text/html'],
+   ['text/rtf', 'text/rtf'],
+   ['text/plain', 'text/plain;charset=utf-8'],
+   ['Text', 'text/plain;charset=utf-8']
+   ];
} else {
mimeTypes = [
['text/rtf', 'text/rtf'],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: .gitreview

[Libreoffice Gerrit user]

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

New commits:
commit 8aea4599e2867060b118e01b3d0c06f6c1a455cd
Author: Jan Holesovsky 
AuthorDate: Fri May 17 14:01:57 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Fri May 17 14:10:33 2019 +0200

git-review: Use the hostname instead of alias.

Change-Id: Iaf7ea129e7fec3201af68107d327acc902a5b9d6
Reviewed-on: https://gerrit.libreoffice.org/72462
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 1bf8e78cac760dc0100012ca72488a18af0a6d20)
Reviewed-on: https://gerrit.libreoffice.org/72464
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/.gitreview b/.gitreview
index fc87636e3..6907d1470 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=logerrit
+host=gerrit.libreoffice.org
 port=29418
 project=online
 defaultremote=logerrit
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src

[Libreoffice Gerrit user]

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

New commits:
commit 2998ab914e057d5c9bae3e3b03c0cf5f13e531b9
Author: Jan Holesovsky 
AuthorDate: Fri May 17 13:42:00 2019 +0200
Commit: Michael Meeks 
CommitDate: Fri May 17 14:07:57 2019 +0200

Prefer HTML over RTF for pasting on the Mac.

Safari provides RTF clipboard content which doesn't contain the images.
We do not know where the content comes from, so let's always prefer HTML
over RTF on Mac.

Change-Id: I2f449ff4cf025e5f51dbe6e0683667f2d319ac21
Reviewed-on: https://gerrit.libreoffice.org/72461
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 9136da41c..15e8acdbb 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2503,6 +2503,16 @@ L.TileLayer = L.GridLayer.extend({
['text/plain', 'text/plain;charset=utf-8'],
['Text', 'text/plain;charset=utf-8']
];
+   } else if (navigator.platform.startsWith('Mac')) {
+   // Safari provides RTF clipboard content which doesn't 
contain the
+   // images.  We do not know where the content comes 
from, so let's
+   // always prefer HTML over RTF on Mac.
+   mimeTypes = [
+   ['text/html', 'text/html'],
+   ['text/rtf', 'text/rtf'],
+   ['text/plain', 'text/plain;charset=utf-8'],
+   ['Text', 'text/plain;charset=utf-8']
+   ];
} else {
mimeTypes = [
['text/rtf', 'text/rtf'],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - .gitreview

[Libreoffice Gerrit user]

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

New commits:
commit 1bf8e78cac760dc0100012ca72488a18af0a6d20
Author: Jan Holesovsky 
AuthorDate: Fri May 17 14:01:57 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri May 17 14:06:37 2019 +0200

git-review: Use the hostname instead of alias.

Change-Id: Iaf7ea129e7fec3201af68107d327acc902a5b9d6
Reviewed-on: https://gerrit.libreoffice.org/72462
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/.gitreview b/.gitreview
index 489239f60..5b4192ac1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=logerrit
+host=gerrit.libreoffice.org
 port=29418
 project=online
 defaultremote=logerrit
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - filter/source Module_ooo.mk officecfg/registry rat-excludes sc/source testgraphical/Ant_ConvwatchGUIProject.mk testgraphical/Makefile t

[Matthias Seidel (via logerrit)]

 Module_ooo.mk  |1 
 filter/source/config/cache/filtercache.cxx |  152 -
 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   37 +++-
 rat-excludes   |5 
 sc/source/core/tool/interpr2.cxx   |5 
 testgraphical/Ant_ConvwatchGUIProject.mk   |   28 +++
 testgraphical/Makefile |   32 +++
 testgraphical/Module_testgraphical.mk  |   34 +++
 testgraphical/prj/build.lst|3 
 testgraphical/prj/makefile.mk  |   44 
 wizards/source/euro/Common.xba |   28 +--
 wizards/source/euro/DlgConvert.xdl |2 
 wizards/source/euro/Protect.xba|   18 +-
 13 files changed, 282 insertions(+), 107 deletions(-)

New commits:
commit 7c244d0f7d0f47a39375afbc056af1fd2df00f3b
Author: Matthias Seidel 
AuthorDate: Thu May 16 15:08:22 2019 +
Commit: Matthias Seidel 
CommitDate: Thu May 16 15:08:22 2019 +

Fixed a lot of typos

diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index 17b7b453c4a1..e80f9ed289a4 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -72,8 +72,8 @@ namespace css = ::com::sun::star;
 // definitions
 
 // Error message in case filter config seems to be corrupted.
-// Note: Dont tell user something about "setup -repair"!
-// Its no longer supported by using native installers ...
+// Note: Don't tell user something about "setup -repair"!
+// It's no longer supported by using native installers ...
 static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG = 
::rtl::OUString::createFromAscii("The filter configuration appears to be 
defective. Please install the office suite again.");
 
 /*---
@@ -105,7 +105,7 @@ FilterCache* FilterCache::clone() const
 
 FilterCache* pClone = new FilterCache();
 
-// Dont copy the configuration access points here.
+// Don't copy the configuration access points here.
 // They will be created on demand inside the cloned instance,
 // if they are needed.
 
@@ -145,7 +145,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
 ::osl::ResettableMutexGuard aLock(m_aLock);
 
 // a)
-// Dont copy the configuration access points here!
+// Don't copy the configuration access points here!
 // We must use our own ones ...
 
 // b)
@@ -154,7 +154,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
 
 // c)
 // Take over only changed items!
-// Otherwhise we risk the following scenario:
+// Otherwise we risk the following scenario:
 // c1) clone_1 contains changed filters
 // c2) clone_2 container changed types
 // c3) clone_1 take over changed filters and unchanged types
@@ -178,12 +178,12 @@ void FilterCache::takeOver(const FilterCache& rClone)
 m_lChangedFrameLoaders.clear();
 m_lChangedContentHandlers.clear();
 
-m_sActLocale = rClone.m_sActLocale;
+m_sActLocale = rClone.m_sActLocale;
 m_sProductName = rClone.m_sProductName;
 m_sOOoXMLFormatName = rClone.m_sOOoXMLFormatName;
 m_sOOoXMLFormatVersion = rClone.m_sOOoXMLFormatVersion;
 
-m_eFillState = rClone.m_eFillState;
+m_eFillState = rClone.m_eFillState;
 
 // renew all dependencies and optimizations
 // Because we can't be sure, that changed filters on one clone
@@ -226,10 +226,10 @@ void FilterCache::load(EFillState eRequired,
 }
 #endif
 
-// Otherwhise load the missing items.
+// Otherwise load the missing items.
 
 // --
-// a) load some const values from configration.
+// a) load some const values from configuration.
 //These values are needed there for loading
 //config items ...
 //Further we load some std items from the
@@ -260,13 +260,13 @@ void FilterCache::load(EFillState eRequired,
 m_sOOoXMLFormatVersion = DEFAULT_FORMATVERSION;
 }
 
-// Support the old configuration support. Read it only one times 
during office runtime!
+// Support the old configuration support. Read it only one time during 
office runtime!
 impl_readOldFormat();
 
 // enable "loadOnDemand" feature ...
 // Create uno listener, which waits for finishing the office startup
 // and starts a thread, which calls loadAll() at this filter cache.
-// Note: Its not a leak to create this listener with new here.
+// Note: It's not a leak to create this listener with new here.
 // It kills itself after working!
 /* LateInitListener* pLateInit = */ new LateInitListener(m_xSMGR);
 }
@@ -303,8 +303,8 @@ OUStringList FilterCache::getMatchingItemsByProps(  
EItem

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

[Miklos Vajna (via logerrit)]

 oox/source/drawingml/shape.cxx   |5 -
 oox/source/shape/WpgContext.cxx  |6 +-
 sw/qa/extras/ooxmlimport/data/tdf124398.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx|   12 
 4 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 9baed128acbbac24ef85a8470d721e8ee59b776f
Author: Miklos Vajna 
AuthorDate: Mon Apr 29 08:35:29 2019 +0200
Commit: Caolán McNamara 
CommitDate: Fri May 17 13:25:59 2019 +0200

tdf#124398 DOCX drawingML import: handle charts in group shapes

Regression from commit 8c73b16f5f18f3bc1dbf9ff6c1475db56b44d304 (DOCX
import: declare wpg as a supported feature, 2013-12-05), the problem was
that  did not forward to to the relevant oox context,
and also Writer had no idea how to create a
com.sun.star.drawing.OLE2Shape. Fix the later by using the same service
name that's in use for the non-groupshape case.

(cherry picked from commit fdf4aaa3dc5cc1d2e7a112e6c32d7845f13caef8)

Change-Id: Id3536854da7c1f01525bb38d801496ecebd4c161
Reviewed-on: https://gerrit.libreoffice.org/71524
Tested-by: Xisco Faulí 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index ba3e8d7fdb5d..d45a88a692cf 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -218,7 +218,10 @@ ChartShapeInfo& Shape::setChartType( bool bEmbedShapes )
 {
 OSL_ENSURE( meFrameType == FRAMETYPE_GENERIC, "Shape::setChartType - 
multiple frame types" );
 meFrameType = FRAMETYPE_CHART;
-msServiceName = "com.sun.star.drawing.OLE2Shape";
+if (mbWps)
+msServiceName = "com.sun.star.drawing.temporaryForXMLImportOLE2Shape";
+else
+msServiceName = "com.sun.star.drawing.OLE2Shape";
 mxChartShapeInfo.reset( new ChartShapeInfo( bEmbedShapes ) );
 return *mxChartShapeInfo;
 }
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index 95264e53ce15..75ff0422bcf2 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -57,7 +57,11 @@ oox::core::ContextHandlerRef 
WpgContext::onCreateContext(sal_Int32 nElementToken
 return new oox::drawingml::ShapeGroupContext(*this, mpShape, 
std::make_shared("com.sun.star.drawing.GroupShape"));
 }
 case XML_graphicFrame:
-break;
+{
+auto pShape = 
std::make_shared("com.sun.star.drawing.GraphicObjectShape");
+pShape->setWps(true);
+return new oox::drawingml::GraphicalObjectFrameContext(*this, mpShape, 
pShape, /*bEmbedShapesInChart=*/true);
+}
 default:
 SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled 
element: " << getBaseToken(nElementToken));
 break;
diff --git a/sw/qa/extras/ooxmlimport/data/tdf124398.docx 
b/sw/qa/extras/ooxmlimport/data/tdf124398.docx
new file mode 100644
index ..4d1855347fd6
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf124398.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 57c7f7ef4245..e5c6e182a02e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -235,6 +235,18 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
 // and as result only one page should be generated.
 DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx") { 
CPPUNIT_ASSERT_EQUAL(1, getPages()); }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf124398, "tdf124398.docx")
+{
+uno::Reference xGroup(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xGroup.is());
+// Without the accompanying fix in place, this test would have failed with 
'Expected: 2; Actual:
+// 1', i.e. the chart children of the group shape was lost.
+CPPUNIT_ASSERT_EQUAL(static_cast(2), xGroup->getCount());
+
+uno::Reference xShape(xGroup->getByIndex(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.OLE2Shape"), 
xShape->getShapeType());
+}
+
 DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
 {
 OUString aTop = 
parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 4 commits - common/Util.cpp common/Util.hpp loleaflet/html loleaflet/src net/WebSocketHandler.hpp test/test.cpp wsd/Adm

[Libreoffice Gerrit user]

 common/Util.cpp  |   10 +
 common/Util.hpp  |3 
 loleaflet/html/loleaflet.html.m4 |2 
 loleaflet/src/core/Socket.js |9 -
 net/WebSocketHandler.hpp |  275 +--
 test/test.cpp|   39 ++---
 wsd/Admin.cpp|7 
 wsd/ClientSession.cpp|8 -
 wsd/DocumentBroker.cpp   |3 
 wsd/LOOLWSD.cpp  |   15 +-
 wsd/LOOLWSD.hpp  |3 
 11 files changed, 248 insertions(+), 126 deletions(-)

New commits:
commit 994669aedbe131e3386110210b6863988c74fa5c
Author: Gabriel Masei 
AuthorDate: Fri Mar 8 10:21:17 2019 +0200
Commit: Michael Meeks 
CommitDate: Fri May 17 11:44:38 2019 +0100

Added support for defragmentation of incoming websocket fragmented messages 
and handled some protocol error cases

Change-Id: I4d11a6527b6b131c65101fd53b71015529645f74
Reviewed-on: https://gerrit.libreoffice.org/68901
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 3b65ee89a..b4c14ede6 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -37,6 +37,8 @@ private:
 std::atomic _shuttingDown;
 bool _isClient;
 bool _isMasking;
+bool _inFragmentBlock;
+bool _isManualDefrag;
 
 protected:
 struct WSFrameMask
@@ -50,16 +52,29 @@ protected:
 
 public:
 /// Perform upgrade ourselves, or select a client web socket.
-WebSocketHandler(bool isClient = false, bool isMasking = true) :
+/// Parameters:
+/// isClient: the instance should behave like a client (true) or like a 
server (false)
+///   (from websocket perspective)
+/// isMasking: a client should mask (true) or not (false) outgoing frames
+/// isManualDefrag: the message handler should be called for every 
fragment of a message and
+/// defragmentation should be handled inside message 
handler (true) or the message handler
+/// should be called after all fragments of a message were 
received and the message
+/// was defragmented (false).
+WebSocketHandler(bool isClient = false, bool isMasking = true, bool 
isManualDefrag = false) :
 _lastPingSentTime(std::chrono::steady_clock::now()),
 _pingTimeUs(0),
 _shuttingDown(false),
 _isClient(isClient),
-_isMasking(isClient && isMasking)
+_isMasking(isClient && isMasking),
+_inFragmentBlock(false),
+_isManualDefrag(isManualDefrag)
 {
 }
 
 /// Upgrades itself to a websocket directly.
+/// Parameters:
+/// socket: the TCP socket which received the upgrade request
+/// request: the HTTP upgrade request to WebSocket
 WebSocketHandler(const std::weak_ptr& socket,
  const Poco::Net::HTTPRequest& request) :
 _socket(socket),
@@ -69,7 +84,9 @@ public:
 _pingTimeUs(0),
 _shuttingDown(false),
 _isClient(false),
-_isMasking(false)
+_isMasking(false),
+_inFragmentBlock(false),
+_isManualDefrag(false)
 {
 upgradeToWebSocket(request);
 }
@@ -99,8 +116,8 @@ public:
 RESERVED_TLS_FAILURE= 1015
 };
 
-/// Sends WS shutdown message to the peer.
-void shutdown(const StatusCodes statusCode = StatusCodes::NORMAL_CLOSE, 
const std::string& statusMessage = "")
+/// Sends WS Close frame to the peer.
+void sendCloseFrame(const StatusCodes statusCode = 
StatusCodes::NORMAL_CLOSE, const std::string& statusMessage = "")
 {
 std::shared_ptr socket = _socket.lock();
 if (socket == nullptr)
@@ -126,7 +143,22 @@ public:
 #endif
 }
 
-bool handleOneIncomingMessage(const std::shared_ptr& socket)
+void shutdown(const StatusCodes statusCode = StatusCodes::NORMAL_CLOSE, 
const std::string& statusMessage = "")
+{
+if (!_shuttingDown)
+sendCloseFrame(statusCode, statusMessage);
+std::shared_ptr socket = _socket.lock();
+if (socket)
+{
+socket->closeConnection();
+socket->getInBuffer().clear();
+}
+_wsPayload.clear();
+_inFragmentBlock = false;
+_shuttingDown = false;
+}
+
+bool handleTCPStream(const std::shared_ptr& socket)
 {
 assert(socket && "Expected a valid socket instance.");
 
@@ -177,7 +209,7 @@ public:
 headerLen += 8;
 }
 
-unsigned char *data, *mask;
+unsigned char *data, *mask = nullptr;
 
 if (hasMask)
 {
@@ -187,121 +219,164 @@ public:
 
 if (payloadLen + headerLen > len)
 { // partial read wait for more data.
-LOG_TRC("#" << socket->getFD() << ": Still incomplete WebSocket 
message, have " << len
-<< " bytes, message is " << payloadLen + headerLen << 
" bytes");
+  

[Libreoffice-commits] core.git: cui/source include/svtools include/svx include/vcl sc/source sd/source solenv/sanitizers svtools/source svx/source svx/uiconfig sw/source vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/cuiimapwnd.cxx  |2 
 cui/source/factory/dlgfact.cxx |4 
 cui/source/factory/dlgfact.hxx |4 
 cui/source/inc/cuiimapwnd.hxx  |2 
 cui/source/inc/macroass.hxx|2 
 cui/source/tabpages/macroass.cxx   |2 
 include/svtools/inettbc.hxx|   44 
 include/svx/fmview.hxx |2 
 include/svx/graphctl.hxx   |  128 ++
 include/svx/imapdlg.hxx|   81 -
 include/svx/svdcrtv.hxx|2 
 include/svx/svdedxv.hxx|6 
 include/svx/svdmrkv.hxx|2 
 include/svx/svdpntv.hxx|   10 
 include/svx/svdview.hxx|6 
 include/svx/svxdlg.hxx |6 
 include/vcl/customweld.hxx |1 
 include/vcl/weld.hxx   |   24 
 sc/source/ui/pagedlg/tphfedit.cxx  |2 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx  |1 
 sd/source/ui/dlg/vectdlg.cxx   |2 
 solenv/sanitizers/ui/svx.suppr |3 
 svtools/source/control/inettbc.cxx |1 
 svtools/source/control/valueacc.cxx|3 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx |  160 +--
 svx/source/dialog/ClassificationEditView.cxx   |2 
 svx/source/dialog/graphctl.cxx |  771 
 svx/source/dialog/imapdlg.cxx  |  569 +---
 svx/source/dialog/imapwnd.cxx  |  108 +-
 svx/source/dialog/imapwnd.hxx  |   40 
 svx/source/form/fmview.cxx |2 
 svx/source/inc/GraphCtlAccessibleContext.hxx   |   29 
 svx/source/svdraw/sdrpagewindow.cxx|2 
 svx/source/svdraw/sdrpaintwindow.cxx   |2 
 svx/source/svdraw/svdcrtv.cxx  |2 
 svx/source/svdraw/svdedxv.cxx  |9 
 svx/source/svdraw/svdmrkv.cxx  |2 
 svx/source/svdraw/svdview.cxx  |6 
 svx/uiconfig/ui/imapdialog.ui  |  778 +
 sw/source/uibase/shells/basesh.cxx |6 
 vcl/source/app/salvtables.cxx  |   62 +
 vcl/source/window/builder.cxx  |2 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |  108 ++
 43 files changed, 2007 insertions(+), 993 deletions(-)

New commits:
commit 8a35ae3e6c5c45aa1426cfd81472b309d02a1b48
Author: Caolán McNamara 
AuthorDate: Thu May 16 15:17:38 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 12:43:13 2019 +0200

weld SvxIMapDlg

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

diff --git a/cui/source/dialogs/cuiimapwnd.cxx 
b/cui/source/dialogs/cuiimapwnd.cxx
index c4b41afcad54..1882406f7c77 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -43,7 +43,7 @@
 |*
 \/
 
-URLDlg::URLDlg(weld::Window* pWindow, const OUString& rURL, const OUString& 
rAlternativeText,
+URLDlg::URLDlg(weld::Widget* pWindow, const OUString& rURL, const OUString& 
rAlternativeText,
const OUString& rDescription, const OUString& rTarget, const 
OUString& rName,
TargetList& rTargetList)
 : GenericDialogController(pWindow, "cui/ui/cuiimapdlg.ui", "IMapDialog")
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 31e52bce2bf6..7cb8b4335921 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1103,7 +1103,7 @@ VclPtr 
AbstractDialogFactory_Impl::CreateGalleryThemeProperti
  pParent, pData, 
pItemSet));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateURLDialog(weld::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateURLDialog(weld::Widget* pParent,
 const OUString& rURL, const 
OUString& rAltText, const OUString& rDescription,
 const OUString& rTarget, const 
OUString& rName,
 TargetList& rTargetList )
@@ -1292,7 +1292,7 @@ VclPtr 
AbstractDialogFactory_Impl::CreateCharMapDialog(weld::
 return 
VclPtr::Create(std::make_unique(pParent,
 &rAttr, rDocumentFrame));
 }
 
-VclPtr 
Abs

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

[Libreoffice Gerrit user]

 loleaflet/html/framed.html |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 6cd248a29c24a65d6bd5c8cf144e35de4c9e6c6b
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 15 10:19:29 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Fri May 17 12:24:40 2019 +0200

Remove obsolete comment

Change-Id: Ie2034737461d4dd9c42f31a9968e8109bfd87488
Reviewed-on: https://gerrit.libreoffice.org/72445
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/html/framed.html b/loleaflet/html/framed.html
index ee216ce14..cee6b610a 100644
--- a/loleaflet/html/framed.html
+++ b/loleaflet/html/framed.html
@@ -215,9 +215,7 @@
 Document frame
 
 
+personal environment and need to be changed appropriately.  -->
 
 http://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file:///libreoffice/online/test/data/hello-world.ods&NotWOPIButIframe=true";
 height="1000" width="1000">
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/documen2.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4c2034b808fed4f9dfd715d8a4813e788a7e97a4
Author: Noel Grandin 
AuthorDate: Thu May 16 16:52:19 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri May 17 11:58:34 2019 +0200

avoid two lookups in ScDocument::GetLookupCache

doing an emplace_hint when the iterator points to end(), doesn't really
help, so rather attempt to insert a fake value

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

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 56506490ec5d..b87d73a8da56 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1136,12 +1136,12 @@ ScLookupCache & ScDocument::GetLookupCache( const 
ScRange & rRange, ScInterprete
 ScLookupCacheMap*& rpCacheMap = pContext->mScLookupCache;
 if (!rpCacheMap)
 rpCacheMap = new ScLookupCacheMap;
-auto findIt(rpCacheMap->aCacheMap.find(rRange));
-if (findIt == rpCacheMap->aCacheMap.end())
+// insert with temporary value to avoid doing two lookups
+auto [findIt, bInserted] = rpCacheMap->aCacheMap.emplace(rRange, nullptr);
+if (bInserted)
 {
-auto insertIt = rpCacheMap->aCacheMap.emplace_hint(findIt,
-rRange, std::make_unique(this, rRange, 
*rpCacheMap) );
-pCache = insertIt->second.get();
+findIt->second = std::make_unique(this, rRange, 
*rpCacheMap);
+pCache = findIt->second.get();
 // The StartListeningArea() call is not thread-safe, as all threads
 // would access the same SvtBroadcaster.
 osl::MutexGuard guard( mScLookupMutex );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - config_host.mk.in configure.ac external/msc-externals postprocess/signing RepositoryExternal.mk Repository.mk scp2/InstallModule_wind

[Mike Kaganski (via logerrit)]

 Repository.mk |1 
 RepositoryExternal.mk |4 
 config_host.mk.in |1 
 configure.ac  |   46 
 external/msc-externals/Module_msc-externals.mk|9 
 external/msc-externals/Package_ucrt.mk|   21 
 postprocess/signing/no_signing.txt|6 
 scp2/InstallModule_windows.mk |1 
 scp2/source/ooo/ucrt.scp  |  154 ++
 scp2/source/ooo/vc_redist.scp |   12 
 setup_native/Library_inst_msu_msi.mk  |   40 
 setup_native/Module_setup_native.mk   |3 
 setup_native/source/win32/customactions/inst_msu/inst_msu.cxx |  515 
++
 setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def |5 
 solenv/bin/modules/installer/windows/idtglobal.pm |   11 
 15 files changed, 807 insertions(+), 22 deletions(-)

New commits:
commit b7ed0d21c8d3f100a8ac9cb576e16f5626b0ccfe
Author: Mike Kaganski 
AuthorDate: Sun Apr 15 23:24:42 2018 +0300
Commit: Vasily Melenchuk 
CommitDate: Fri May 17 12:25:02 2019 +0300

Install UCRT from MSUs, not using nested VC Redist install

Using nested install is bad because (1) MS advises against it (though it
most possibly doesn't relate to our specific case, when we install the
vc redist exe package in UI part, so actually only a single MSI session
is active at any time); (2) because it adds some extra interactions
(user sees something "unrelated" being installed, which raises concerns;
additional admin authentication required); and (3) because it runs in
InstallUISequence, thus only installing the UCRT when doing interactive
installation (unattended installs, including GPO, need to install UCRT
separately).

This patch aims to incorporate the original UCRT MSU (Windows Update)
packages (https://support.microsoft.com/en-us/help/2999226) available as
a zip archive from
https://www.microsoft.com/en-us/download/details.aspx?id=48234
- the same as used in VC redists for VS 2015 and 2017. This obsoletes
the separate installation of the redist; since we also have the redist
as merge module in our MSI, that is enough (and removes redundancy).
The MSUs are installed using wusa.exe in a custom action (deferred,
non-impersonating).

As a small bonus, embedding MSUs instead of redist EXE allows us to
shrink the size of installer a little (~10 MB).

As deferred custom actions cannot access current installer database,
we workaround this by using initial immediate impersonating action to
extract the binaries into a temporary location. To ensure that the file
gets removed upon completion (both successful and failed), we use an
additional cleanup action.

Commit 61b1d631331551b43bc7d619be33bfbfeff7cad6 is effectively reverted.

Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd
Reviewed-on: https://gerrit.libreoffice.org/52923
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/Repository.mk b/Repository.mk
index 14a1c07e59c7..01ab27e12115 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -637,6 +637,7 @@ endif
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \
$(if $(WINDOWS_SDK_HOME),\
instooofiltmsi \
+   inst_msu_msi \
qslnkmsi \
reg4allmsdoc \
sdqsmsi \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 22fd07859a54..32a5cbf98682 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3980,4 +3980,8 @@ $(call gb_LinkTarget_set_include,$(1), \
 $(call gb_LinkTarget_use_libraries,$(1),clew)
 endef
 
+$(eval $(call gb_Helper_register_packages_for_install,ucrt_binarytable,\
+   $(if $(UCRT_REDISTDIR),ucrt) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
index 04fc400554fa..9f6ab639cc47 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -599,6 +599,7 @@ export TOUCH=@TOUCH@
 export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
 export UCRTSDKDIR=@UCRTSDKDIR@
 export UCRTVERSION=@UCRTVERSION@
+export UCRT_REDISTDIR=@UCRT_REDISTDIR@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
diff --git a/configure.ac b/configure.ac
index 52f9c6504db1..71df7d328a61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6937,6 +6937,21 @@ fi
 AC_SUBST([JITC_PROCESSOR_TYPE])
 
 # Misc Windows Stuff
+AC_ARG_WITH(ucrt-dir,
+AS_HELP_STRING([--with-ucrt-dir],
+[path to the directory with the arch-specific MSU packages 

Re: minutes of ESC call ...

[Stephan Bergmann]

On 09/05/2019 16:46, Michael Meeks wrote:

* Jenkins / CI update (Christian)
 from:Thu May  2 13:58:26 2019
 master linux rel  jobs: 129 ok: 129 ko:   0 fail ratio:  0.00 % break:   0 
broken duration: 0.00%
 master linux dbg  jobs:  86 ok:  83 ko:   3 fail ratio:  3.49 % break:   2 
broken duration: 4.03%
 master mac reljobs:  75 ok:  70 ko:   5 fail ratio:  6.67 % break:   4 
broken duration: 5.67%
 master mac dbgjobs:  69 ok:  62 ko:   7 fail ratio: 10.14 % break:   4 
broken duration:12.32%
 master win reljobs:  86 ok:  63 ko:  23 fail ratio: 26.74 % break:  17 
broken duration:23.09%
 master win dbgjobs:  90 ok:  75 ko:  15 fail ratio: 16.67 % break:  12 
broken duration:12.80%
 master win64 dbg  jobs:  88 ok:  67 ko:  21 fail ratio: 23.86 % break:  16 
broken duration:25.91%
 lo-5.3 macjobs:   0 ok:   0 ko:   0 fail ratio:  0.00 % break:   0 
broken duration: 0.00%
 lo-5.4 macjobs:   0 ok:   0 ko:   0 fail ratio:  0.00 % break:   0 
broken duration: 0.00%
 master gerrit lin jobs: 451 ok: 331 ko:  21 fail ratio:  4.66% time for 
ok: mean:  21 median:  21
 master gerrit plg jobs: 462 ok: 297 ko:  92 fail ratio: 19.91% time for 
ok: mean:  36 median:  33
 master gerrit win jobs: 498 ok: 292 ko:  75 fail ratio: 15.06% time for 
ok: mean:  65 median:  64
 master gerrit mac jobs: 478 ok: 291 ko:  74 fail ratio: 15.48% time for 
ok: mean:  62 median:  37
 master gerrit all jobs: 434 ok: 240 ko: 165 fail ratio: 38.02% time for 
ok: mean: 120 median:  85
+ https://dev-www.libreoffice.org/tmp/gerrit_190509.html
+ notable test failures in last seven days:
   4 JunitTest_forms_unoapi_2
   5 UITest_conditional_format
   7 CppunitTest_sc_bugfix_test
  11 UITest_writer_tests5
+ dis-connected bots over the weekend
+ one failing mac killed a lot of builds until disabled
+ 2 Mac Pros dis-connected, one mis-behaving, one in power-save state ?
   + right now – 1 Mac short.
   + 1 is at Norbert’s company – needs an ask for a reboot, or re-route
+ could we get another Mac Pro for hosting ? (Thorsten)
   + hard to host – but no mounting for racks (Christian)
  + newer Mac Minis are perhaps suitable.
   + Macs shouldn’t be the bottleneck anyway
   + Windows is the limiting factor


Whenever I recently happened to look at Gerrit/Jenkins builds that 
hadn't finished yet, it was the Mac build that was still outstanding, so 
I think we do have a bottleneck there after all.


Witness:

* My "May 16 22:51" comment at 
: "gerrit_mac is hopelessly 
overloaded right now, with a 30+ long build queue (waiting builds #33071 
through #33095)" (though that's rather 20+ than 30+, of course)


* Armin's "May 16 23:32" comment at 
: "sooo... Build is blocked 
prob due to Mac missing - due to no Macs available...?"

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

[Libreoffice-commits] core.git: lingucomponent/source linguistic/source oox/source package/source pyuno/source reportdesign/source

[Arkadiy Illarionov (via logerrit)]

 lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |6 ++---
 lingucomponent/source/spellcheck/spell/sspellimp.cxx  |6 ++---
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx   |   14 ++--
 linguistic/source/gciterator.cxx  |4 +--
 linguistic/source/hyphdsp.cxx |   14 ++--
 linguistic/source/lngsvcmgr.cxx   |   20 +-
 linguistic/source/spelldsp.cxx|8 +++
 linguistic/source/thesdsp.cxx |8 +++
 oox/source/core/filterbase.cxx|2 -
 oox/source/core/filterdetect.cxx  |2 -
 oox/source/core/xmlfilterbase.cxx |2 -
 oox/source/drawingml/chart/chartspaceconverter.cxx|4 +--
 oox/source/drawingml/customshapeproperties.cxx|2 -
 oox/source/drawingml/shape.cxx|6 ++---
 oox/source/export/chartexport.cxx |   10 -
 oox/source/export/drawingml.cxx   |   20 +-
 oox/source/export/shapes.cxx  |2 -
 oox/source/helper/zipstorage.cxx  |2 -
 oox/source/ole/olestorage.cxx |2 -
 package/source/xstor/owriteablestream.cxx |8 +++
 package/source/xstor/xstorage.cxx |2 -
 package/source/zipapi/XBufferedThreadedStream.cxx |2 -
 package/source/zipapi/XUnbufferedStream.cxx   |8 +++
 package/source/zipapi/ZipFile.cxx |   20 +-
 package/source/zipapi/ZipOutputEntry.cxx  |2 -
 package/source/zippackage/ZipPackage.cxx  |   16 +++---
 package/source/zippackage/ZipPackageFolder.cxx|2 -
 package/source/zippackage/ZipPackageStream.cxx|   16 +++---
 package/source/zippackage/zipfileaccess.cxx   |2 -
 pyuno/source/module/pyuno_adapter.cxx |2 -
 reportdesign/source/core/api/ReportDefinition.cxx |2 -
 reportdesign/source/filter/xml/xmlControlProperty.cxx |2 -
 reportdesign/source/filter/xml/xmlExport.cxx  |2 -
 reportdesign/source/ui/dlg/GroupExchange.cxx  |2 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx  |8 +++
 reportdesign/source/ui/dlg/Navigator.cxx  |2 -
 reportdesign/source/ui/report/ReportController.cxx|   16 +++---
 reportdesign/source/ui/report/ReportSection.cxx   |2 -
 reportdesign/source/ui/report/ViewsWindow.cxx |2 -
 reportdesign/source/ui/report/propbrw.cxx |4 +--
 40 files changed, 128 insertions(+), 128 deletions(-)

New commits:
commit 0e4c542f7a862e681baf25f042bc3a928c14004f
Author: Arkadiy Illarionov 
AuthorDate: Fri May 3 22:11:02 2019 +0300
Commit: Michael Stahl 
CommitDate: Fri May 17 11:20:15 2019 +0200

Use hasElements to check Sequence emptiness in [l-r]*

Similar to clang-tidy readability-container-size-empty

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

diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx 
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 8ad50fa36915..bc4d91038a25 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -171,8 +171,8 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
 k = 0;
 for (auto const& dict :  aDics)
 {
-if (dict.aLocaleNames.getLength() > 0 &&
-dict.aLocations.getLength() > 0)
+if (dict.aLocaleNames.hasElements() &&
+dict.aLocations.hasElements())
 {
 uno::Sequence< OUString > aLocaleNames(dict.aLocaleNames);
 sal_Int32 nLocales = aLocaleNames.getLength();
@@ -218,7 +218,7 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& 
rLocale)
 MutexGuard  aGuard( GetLinguMutex() );
 
 bool bRes = false;
-if (!aSuppLocales.getLength())
+if (!aSuppLocales.hasElements())
 getLocales();
 
 const Locale *pLocale = aSuppLocales.getConstArray();
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 3462899714a2..64032ad14b2d 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -197,8 +197,8 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 m_DictItems.reserve(nDictSize);
 for (auto const& dict : aDics)
 {
-if (dict.aLocaleNames.getLength() > 0 &&
-dict.aLocations.getLength() > 0)
+   

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/dialog.cxx |   18 +
 vcl/unx/gtk3/gtk3gtkinst.cxx |  141 +--
 2 files changed, 114 insertions(+), 45 deletions(-)

New commits:
commit 644ca26af744aec1e66c8dd4199d1228e0f780be
Author: Caolán McNamara 
AuthorDate: Tue May 14 21:50:36 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 10:59:44 2019 +0200

allow closing welded dialogs to be cancelled

from both directions of window manager close button and esc

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

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 21957995644e..5348e206f2c0 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -835,8 +835,26 @@ bool Dialog::Close()
 if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() && 
!IsInExecute() )
 return false;
 
+// If there's a cancel button with a custom handler, then always give it a 
chance to
+// handle Dialog::Close
+PushButton* pCustomCancelButton;
+PushButton* pCancelButton = 
dynamic_cast(get_widget_for_response(RET_CANCEL));
+if (!mbInClose && pCancelButton && pCancelButton->GetClickHdl().IsSet())
+pCustomCancelButton = pCancelButton;
+else
+pCustomCancelButton = nullptr;
+
 mbInClose = true;
 
+if (pCustomCancelButton)
+{
+pCustomCancelButton->Click();
+if (xWindow->IsDisposed())
+return true;
+mbInClose = false;
+return false;
+}
+
 if ( !(GetStyle() & WB_CLOSEABLE) )
 {
 bool bRet = true;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index dac1bccae151..0d60969bff8d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2995,6 +2995,8 @@ namespace
 }
 }
 
+class GtkInstanceButton;
+
 class GtkInstanceDialog : public GtkInstanceWindow, public virtual weld::Dialog
 {
 private:
@@ -3006,6 +3008,7 @@ private:
 std::function m_aFunc;
 gulong m_nCloseSignalId;
 gulong m_nResponseSignalId;
+gulong m_nSignalDeleteId;
 
 // for calc ref dialog that shrink to range selection widgets and resize 
back
 GtkWidget* m_pRefEdit;
@@ -3014,10 +3017,12 @@ private:
 int m_nOldEditWidthReq; // Original width request of the input field
 int m_nOldBorderWidth; // border width for expanded dialog
 
+void signal_close();
+
 static void signalClose(GtkWidget*, gpointer widget)
 {
 GtkInstanceDialog* pThis = static_cast(widget);
-pThis->response(RET_CANCEL);
+pThis->signal_close();
 }
 
 static void signalAsyncResponse(GtkWidget*, gint ret, gpointer widget)
@@ -3026,6 +3031,11 @@ private:
 pThis->asyncresponse(ret);
 }
 
+static gboolean signalAsyncDelete(GtkDialog*, GdkEventAny*, gpointer)
+{
+return true; /* Do not destroy */
+}
+
 static int GtkToVcl(int ret)
 {
 if (ret == GTK_RESPONSE_OK)
@@ -3043,24 +3053,7 @@ private:
 return ret;
 }
 
-void asyncresponse(gint ret)
-{
-if (ret == GTK_RESPONSE_HELP)
-{
-help();
-return;
-}
-else if (has_click_handler(ret))
-return;
-
-hide();
-m_aFunc(GtkToVcl(ret));
-m_aFunc = nullptr;
-// move the self pointer, otherwise it might be de-allocated by time 
we try to reset it
-std::shared_ptr me = std::move(m_xRunAsyncSelf);
-m_xDialogController.reset();
-me.reset();
-}
+void asyncresponse(gint ret);
 
 public:
 GtkInstanceDialog(GtkDialog* pDialog, GtkInstanceBuilder* pBuilder, bool 
bTakeOwnership)
@@ -3069,6 +3062,7 @@ public:
 , m_aDialogRun(pDialog)
 , m_nCloseSignalId(g_signal_connect(m_pDialog, "close", 
G_CALLBACK(signalClose), this))
 , m_nResponseSignalId(0)
+, m_nSignalDeleteId(0)
 , m_pRefEdit(nullptr)
 , m_nOldEditWidth(0)
 , m_nOldEditWidthReq(0)
@@ -3086,6 +3080,7 @@ public:
 show();
 
 m_nResponseSignalId = g_signal_connect(m_pDialog, "response", 
G_CALLBACK(signalAsyncResponse), this);
+m_nSignalDeleteId = g_signal_connect(m_pDialog, "delete-event", 
G_CALLBACK(signalAsyncDelete), this);
 
 return true;
 }
@@ -3100,32 +3095,14 @@ public:
 show();
 
 m_nResponseSignalId = g_signal_connect(m_pDialog, "response", 
G_CALLBACK(signalAsyncResponse), this);
+m_nSignalDeleteId = g_signal_connect(m_pDialog, "delete-event", 
G_CALLBACK(signalAsyncDelete), this);
 
 return true;
 }
 
-bool has_click_handler(int nResponse);
+GtkInstanceButton* has_click_handler(int nResponse);
 
-virtual int run() override
-{
-
sort_native_button_order(GTK_BOX(gtk_dialog_get_action_area(m_pDialog)));
-  

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

[Katarina Behrens (via logerrit)]

 dbaccess/source/ui/dlg/generalpage.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit dc17f247daeb281dda531ff335873d563db5b653
Author: Katarina Behrens 
AuthorDate: Wed May 15 20:12:23 2019 +0200
Commit: Katarina Behrens 
CommitDate: Fri May 17 10:51:28 2019 +0200

tdf#125267: relax the requirement of fixed value of current filter

In a filepicker, user can select any file filter ('All files' for
example) and still choose to open .odb file. Specific UIName of
the current filter ('ODF Database' in this case) shouldn't therefore
be a hard requirement, the correct file extension is enough.

Change-Id: I641a267c545c66aa4d34954922783cc5ff7efd24
Reviewed-on: https://gerrit.libreoffice.org/72377
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index 829333294d05..8f3fb2e79943 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -709,7 +709,10 @@ namespace dbaui
 if ( aFileDlg.Execute() == ERRCODE_NONE )
 {
 OUString sPath = aFileDlg.GetPath();
-if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || 
!pFilter->GetWildcard().Matches(sPath) )
+// check for aFileDlg.GetCurrentFilter used to be here but current 
fpicker filter
+// can be set to anything, see tdf#125267 how this breaks if other 
value
+// than 'ODF Database' is selected. Let's therefore check only if 
wildcard matches
+if ( !pFilter->GetWildcard().Matches(sPath) )
 {
 OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO));
 std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[heiko tietze (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +
 sc/inc/viewopti.hxx  |3 +
 sc/source/core/tool/viewopti.cxx |   11 ++-
 sc/source/ui/dialogs/searchresults.cxx   |   11 ++-
 sc/source/ui/inc/searchresults.hxx   |2 +
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |7 
 sc/source/ui/view/viewfun2.cxx   |4 +-
 sc/uiconfig/scalc/ui/searchresults.ui|   23 +--
 sc/uiconfig/scalc/ui/tpviewpage.ui   |   20 -
 10 files changed, 83 insertions(+), 7 deletions(-)

New commits:
commit 019c6ae2ee20a5923055c261abdd22575b69299b
Author: heiko tietze 
AuthorDate: Tue May 7 14:17:48 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri May 17 10:45:01 2019 +0200

Resolves tdf#87965 - Make 'Search Results' dialog optional

* Option introduced at Tools > Options > Calc > View (Windows)
* Convenience checkbox added to the dialog

Change-Id: Ic30fb302e61e77b0eefacd504f61f955bcf6e595
Reviewed-on: https://gerrit.libreoffice.org/71910
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index e5b3318ff701..1517514c903d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -390,6 +390,14 @@
   
   true
 
+
+  
+  
+Specifies whether a summarizing dialog is displayed after 
search.
+Search summary
+  
+  true
+
   
   
 
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index e768b1ba4a8a..99936ee284bb 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -44,7 +44,8 @@ enum ScViewOption
 VOPT_HELPLINES,
 VOPT_ANCHOR,
 VOPT_PAGEBREAKS,
-VOPT_CLIPMARKS
+VOPT_SUMMARY,
+VOPT_CLIPMARKS,
 };
 
 enum ScVObjType
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 58262ae65ba8..95ad06cfa69f 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -109,6 +109,7 @@ void ScViewOptions::SetDefaults()
 aOptArr[ VOPT_ANCHOR  ] = true;
 aOptArr[ VOPT_PAGEBREAKS  ] = true;
 aOptArr[ VOPT_CLIPMARKS   ] = true;
+aOptArr[ VOPT_SUMMARY ] = true;
 
 aModeArr[VOBJ_TYPE_OLE ]  = VOBJ_MODE_SHOW;
 aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
@@ -214,6 +215,7 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
 #define SCLAYOUTOPT_SHEETTAB7
 #define SCLAYOUTOPT_OUTLINE 8
 #define SCLAYOUTOPT_GRID_ONCOLOR9
+#define SCLAYOUTOPT_SUMMARY 10
 
 #define CFGPATH_DISPLAY "Office.Calc/Content/Display"
 
@@ -251,7 +253,8 @@ Sequence ScViewCfg::GetLayoutPropertyNames()
 "Window/VerticalScroll",// SCLAYOUTOPT_VERTSCROLL
 "Window/SheetTab",  // SCLAYOUTOPT_SHEETTAB
 "Window/OutlineSymbol", // SCLAYOUTOPT_OUTLINE
-"Line/GridOnColoredCells"}; // SCLAYOUTOPT_GRID_ONCOLOR;
+"Line/GridOnColoredCells",  // SCLAYOUTOPT_GRID_ONCOLOR;
+"Window/SearchSummary"};// SCLAYOUTOPT_SUMMARY
 }
 
 Sequence ScViewCfg::GetDisplayPropertyNames()
@@ -339,6 +342,9 @@ ScViewCfg::ScViewCfg() :
 case SCLAYOUTOPT_OUTLINE:
 SetOption( VOPT_OUTLINER, 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
 break;
+case SCLAYOUTOPT_SUMMARY:
+SetOption( VOPT_SUMMARY, 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
+break;
 }
 }
 }
@@ -503,6 +509,9 @@ IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, 
ScLinkConfigItem&, void)
 case SCLAYOUTOPT_OUTLINE:
 pValues[nProp] <<= GetOption( VOPT_OUTLINER );
 break;
+case SCLAYOUTOPT_SUMMARY:
+pValues[nProp] <<= GetOption( VOPT_SUMMARY );
+break;
 }
 }
 aLayoutItem.PutProperties(aNames, aValues);
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index 9491123f77e5..8b896b466ab6 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -26,9 +26,10 @@ SearchResultsDlg::SearchResultsDlg(SfxBindings* _pBindings, 
weld::Window* pParen
 , mpDoc(nullptr)
 , mxList(m_xBuilder->weld_tree_view("results"))
 , mxSearchResults(m_xBuilder->weld_label("lbSearchResults"))
+, mxShowDialog(m_xBuilder->weld_check_button("cbShow"))
 {
 mxList->set_size_request(mxList->get_approximate_digi

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/sfx2 include/unotools officecfg/registry sfx2/sdi sfx2/source test/user-template unotools/source

[heiko tietze (via logerrit)]

 cui/source/dialogs/about.cxx   |9 ++
 cui/source/inc/about.hxx   |1 
 cui/uiconfig/ui/aboutdialog.ui |   22 +
 include/sfx2/sfxsids.hrc   |2 
 include/sfx2/strings.hrc   |6 +
 include/sfx2/viewfrm.hxx   |3 
 include/unotools/configmgr.hxx |2 
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |3 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 +
 officecfg/registry/schema/org/openoffice/Setup.xcs |7 +
 sfx2/sdi/appslots.sdi  |4 +
 sfx2/sdi/sfx.sdi   |   14 +++
 sfx2/source/appl/appserv.cxx   |9 ++
 sfx2/source/view/viewfrm.cxx   |   48 ++---
 test/user-template/registry/modifications.xcd  |3 
 unotools/source/config/configmgr.cxx   |6 +
 16 files changed, 129 insertions(+), 15 deletions(-)

New commits:
commit 5187d3ae495a07373a12fd5980c9269bc8ce3f8f
Author: heiko tietze 
AuthorDate: Mon May 13 10:59:18 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri May 17 10:43:57 2019 +0200

Resolves: tdf#69042 - Add a "What's New" infobar

Shows an infobar with a link to the respective wiki page
Adds a button to the About dialog
Replaces If6eb1542d2ad310226f76850f480f2f99070b803

Change-Id: I1eeb504994a6364feb90cfa447029875e0ec1969
Reviewed-on: https://gerrit.libreoffice.org/72218
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 0943c163b42e..7d5266682144 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -76,6 +76,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent)
 m_aCopyrightTextStr = m_pCopyrightText->GetText();
 get(m_pWebsiteButton, "website");
 get(m_pCreditsButton, "credits");
+get(m_pReleaseNotesButton, "btnReleaseNotes");
 m_aCreditsLinkStr = get("link")->GetText();
 m_sBuildStr = get("buildid")->GetText();
 m_aVendorTextStr = get("vendor")->GetText();
@@ -100,6 +101,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent)
 // Connect all handlers
 m_pCreditsButton->SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 m_pWebsiteButton->SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
+m_pReleaseNotesButton->SetClickHdl( LINK( this, AboutDialog, HandleClick ) 
);
 
 get("close")->GrabFocus();
 }
@@ -119,6 +121,7 @@ void AboutDialog::dispose()
 m_pCreditsButton.clear();
 m_pWebsiteButton.clear();
 m_pBuildIdLink.clear();
+m_pReleaseNotesButton.clear();
 SfxModalDialog::dispose();
 }
 
@@ -134,6 +137,12 @@ IMPL_LINK( AboutDialog, HandleClick, Button*, pButton, 
void )
 sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get();
 localizeWebserviceURI(sURL);
 }
+else if (pButton == m_pReleaseNotesButton)
+{
+sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get() +
+   "?LOvers=" + utl::ConfigManager::getProductVersion() +
+   "&LOlocale=" + 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
+}
 
 // If the URL is empty, don't do anything
 if ( sURL.isEmpty() )
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 9885cdec7d47..d191343f941a 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -43,6 +43,7 @@ private:
 VclPtr   m_pLogoReplacement;
 VclPtr  m_pCreditsButton;
 VclPtr  m_pWebsiteButton;
+VclPtr  m_pReleaseNotesButton;
 
 OUString m_aVersionTextStr;
 OUString m_aVendorTextStr;
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 552fd1570185..2fc67d43913b 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -21,6 +21,21 @@
 False
 end
 
+  
+_Release Notes
+True
+True
+True
+True
+  
+  
+False
+True
+0
+True
+  
+
+
   
 Cre_dits
 True
@@ -31,7 +46,7 @@
   
 False
 True
-0
+1
 True
   
 
@@ -46,7 +61,7 @@
   
 False
 True
-1
+2
 True
   
 
@@ -63,7 +78,7 @@
   
 False
 True
-

[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/osx vcl/quartz

[Tomaž Vajngerl (via logerrit)]

 vcl/inc/quartz/salgdi.h  |   47 
 vcl/osx/salnativewidgets.cxx |   84 
 vcl/quartz/salgdi.cxx|   52 ++---
 vcl/quartz/salgdicommon.cxx  |  414 ---
 vcl/quartz/salgdiutils.cxx   |   68 +++
 5 files changed, 338 insertions(+), 327 deletions(-)

New commits:
commit 9e35b5a70844c8a0f6bc8e9dd8e0055cf5597b07
Author: Tomaž Vajngerl 
AuthorDate: Mon May 6 13:57:36 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri May 17 10:38:25 2019 +0200

handle CG state save/restore in ContextHolder class

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

diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index ac906b339f9e..7d5df4bcbaf3 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -130,10 +130,16 @@ private:
 class CGContextHolder
 {
 CGContextRef mpContext;
+#if OSL_DEBUG_LEVEL > 0
+int mnContextStackDepth;
+#endif
 public:
 
 CGContextHolder()
 : mpContext(nullptr)
+#if OSL_DEBUG_LEVEL > 0
+, mnContextStackDepth( 0 )
+#endif
 {}
 
 CGContextRef get() const
@@ -150,6 +156,18 @@ public:
 {
 mpContext = pContext;
 }
+
+void saveState()
+{
+SAL_INFO("vcl.cg", "CGContextSaveGState(" << mpContext << ") " << 
++mnContextStackDepth );
+CGContextSaveGState(mpContext);
+}
+
+void restoreState()
+{
+SAL_INFO( "vcl.cg", "CGContextRestoreGState(" << mpContext << ") " << 
mnContextStackDepth-- );
+CGContextRestoreGState(mpContext);
+}
 };
 
 class AquaSalGraphics : public SalGraphics
@@ -159,7 +177,6 @@ class AquaSalGraphics : public SalGraphics
 #ifdef MACOSX
 AquaSalFrame*   mpFrame;
 #endif
-int mnContextStackDepth;
 XorEmulation*   mpXorEmulation;
 int mnXorMode; // 0: off 1: on 2: 
invert only
 int mnWidth;
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 575abc976f8c..ad1362d438de 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -303,7 +303,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 if( ! CheckContext() )
 return false;
 
-CGContextSaveGState( maContextHolder.get() );
+maContextHolder.saveState();
 
 tools::Rectangle buttonRect = rControlRegion;
 HIRect rc = ImplGetHIRectFromRectangle(buttonRect);
@@ -986,7 +986,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 default: break;
 }
 
-CGContextRestoreGState( maContextHolder.get() );
+maContextHolder.restoreState();
 
 /* #i90291# in most cases invalidating the whole control region instead
of just the unclipped part of it is sufficient (and probably faster).
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 826b4bff4339..a68f9e9736ef 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -185,9 +185,6 @@ AquaSalGraphics::AquaSalGraphics()
 #ifdef MACOSX
 , mpFrame( nullptr )
 #endif
-#if OSL_DEBUG_LEVEL > 0
-, mnContextStackDepth( 0 )
-#endif
 , mpXorEmulation( nullptr )
 , mnXorMode( 0 )
 , mnWidth( 0 )
@@ -449,8 +446,7 @@ void AquaSalGraphics::DrawTextLayout(const 
GenericSalLayout& rLayout)
 std::cerr << "]\n";
 #endif
 
-SAL_INFO("vcl.cg", "CGContextSaveGState(" << maContextHolder.get() << ") " 
<< ++mnContextStackDepth );
-CGContextSaveGState(maContextHolder.get());
+maContextHolder.saveState();
 
 // The view is vertically flipped (no idea why), flip it back.
 SAL_INFO("vcl.cg", "CGContextScaleCTM(" << maContextHolder.get() << 
",1,-1)");
@@ -478,8 +474,7 @@ void AquaSalGraphics::DrawTextLayout(const 
GenericSalLayout& rLayout)
 size_t nStartIndex = std::distance(aGlyphOrientation.cbegin(), aIt);
 size_t nLen = std::distance(aIt, aNext);
 
-SAL_INFO("vcl.cg", "CGContextSaveGState(" << maContextHolder.get() << 
") " << ++mnContextStackDepth );
-CGContextSaveGState(maContextHolder.get());
+maContextHolder.saveState();
 if (rStyle.mfFontRotation && !bUprightGlyph)
 {
 SAL_INFO("vcl.cg", "CGContextRotateCTM(" << maContextHolder.get() 
<< "," << rStyle.mfFontRotation << ")");
@@ -487,14 +482,12 @@ void AquaSalGraphics::DrawTextLayout(const 
GenericSalLayout& rLayout)
 }
 SAL_INFO("vcl.cg", "CTFontDrawGlyphs() @" << nStartIndex << ":" << 
nLen << "," << maContextHolder.get());
 CTFontDrawGlyphs(pFont, &aGlyphIds[nStartIndex], 
&aGlyphPos[nStartIndex], nLen, maContextHolder.get());
-SAL_INFO("vcl.cg", "CGContextRestoreGState(" << maContextHolder.get() 
<< ") " << mnContextStackDepth-- );
-CGContextRestoreGState(maContextHolder.get());
+ma

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

[Julien Nabet (via logerrit)]

 dbaccess/source/ui/dlg/dbfindex.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 27ac7f9bcfafde845dcd1979272b66301a75f53c
Author: Julien Nabet 
AuthorDate: Thu May 16 22:23:31 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri May 17 10:25:59 2019 +0200

Replace list by deque in dbfindex (dbaccess)

Change-Id: I9503cce6eff31f08c2762940b881ba1dc8633288
goal: to get rid of std::list when not mandatory
Reviewed-on: https://gerrit.libreoffice.org/72434
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx 
b/dbaccess/source/ui/dlg/dbfindex.hxx
index cd086c89b139..d0c23a416a5f 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DBFINDEX_HXX
 
 #include 
-#include 
+#include 
 
 namespace dbaui
 {
@@ -40,7 +40,7 @@ public:
 const OUString& GetIndexFileName() const { return aIndexFileName; }
 };
 
-typedef std::list< OTableIndex >  TableIndexList;
+typedef std::deque< OTableIndex >  TableIndexList;
 
 // OTableInfo
 class ODbaseIndexDialog;
@@ -59,7 +59,7 @@ public:
 void WriteInfFile( const OUString& rDSN ) const;
 };
 
-typedef std::list< OTableInfo >   TableInfoList;
+typedef std::deque< OTableInfo >   TableInfoList;
 
 // IndexDialog
 class ODbaseIndexDialog : public weld::GenericDialogController
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 include/svx/strings.hrc |1 +
 sw/source/ui/frmdlg/frmpage.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 52e47276694575f119192f6ddafa69ec7a7eb6b4
Author: Miklos Vajna 
AuthorDate: Thu May 16 22:07:03 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri May 17 10:06:18 2019 +0200

sw btlr writing mode: implement UI for fly frames

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

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 042d4d59aee0..7434d1e3f890 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1666,6 +1666,7 @@
 #define RID_SVXSTR_PAGEDIR_RTL_HORI 
NC_("RID_SVXSTR_PAGEDIR_RTL_HORI", "Right-to-left (horizontal)")
 #define RID_SVXSTR_PAGEDIR_RTL_VERT 
NC_("RID_SVXSTR_PAGEDIR_RTL_VERT", "Right-to-left (vertical)")
 #define RID_SVXSTR_PAGEDIR_LTR_VERT 
NC_("RID_SVXSTR_PAGEDIR_LTR_VERT", "Left-to-right (vertical)")
+#define RID_SVXSTR_PAGEDIR_LTR_BTT_VERT 
NC_("RID_SVXSTR_PAGEDIR_LTR_BTT_VERT", "Bottom-to-top, left-to-right 
(vertical)")
 
 #endif
 
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 4517fdf89392..7d99d3b0fcf9 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2802,6 +2802,7 @@ SwFrameAddPage::SwFrameAddPage(TabPageParent pParent, 
const SfxItemSet &rSet)
 m_xTextFlowLB->append(SvxFrameDirection::Horizontal_RL_TB, 
SvxResId(RID_SVXSTR_FRAMEDIR_RTL));
 m_xTextFlowLB->append(SvxFrameDirection::Vertical_RL_TB, 
SvxResId(RID_SVXSTR_PAGEDIR_RTL_VERT));
 m_xTextFlowLB->append(SvxFrameDirection::Vertical_LR_TB, 
SvxResId(RID_SVXSTR_PAGEDIR_LTR_VERT));
+m_xTextFlowLB->append(SvxFrameDirection::Vertical_LR_BT, 
SvxResId(RID_SVXSTR_PAGEDIR_LTR_BTT_VERT));
 m_xTextFlowLB->append(SvxFrameDirection::Environment, 
SvxResId(RID_SVXSTR_FRAMEDIR_SUPER));
 m_xDescriptionED->set_size_request(-1, 
m_xDescriptionED->get_preferred_size().Height());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/source include/svx sc/source sd/source svx/source sw/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/accessibility/AccessibleChartShape.cxx |2 -
 include/svx/AccessibleShapeTreeInfo.hxx |   15 
++
 sc/source/ui/Accessibility/AccessibleDocument.cxx   |4 +-
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx|2 -
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx   |2 -
 svx/source/accessibility/AccessibleControlShape.cxx |6 ++--
 svx/source/accessibility/AccessibleShapeTreeInfo.cxx|   11 +--
 svx/source/accessibility/GraphCtlAccessibleContext.cxx  |2 -
 sw/source/core/access/accmap.cxx|2 -
 9 files changed, 22 insertions(+), 24 deletions(-)

New commits:
commit 57a23fcb90a3af9ed362dc053c4112f844a81a2c
Author: Caolán McNamara 
AuthorDate: Thu May 16 14:14:48 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 09:54:56 2019 +0200

allow a OutputDevice parent where that is sufficient

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

diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx 
b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index b935bd9923d1..6b751a369d24 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -50,7 +50,7 @@ AccessibleChartShape::AccessibleChartShape(
 
 m_aShapeTreeInfo.SetSdrView( rAccInfo.m_pSdrView );
 m_aShapeTreeInfo.SetController( nullptr );
-m_aShapeTreeInfo.SetWindow( VCLUnoHelper::GetWindow( 
rAccInfo.m_xWindow ) );
+m_aShapeTreeInfo.SetDevice( VCLUnoHelper::GetWindow( 
rAccInfo.m_xWindow ) );
 m_aShapeTreeInfo.SetViewForwarder( rAccInfo.m_pViewForwarder );
 
 ::accessibility::ShapeTypeHandler& rShapeHandler = 
::accessibility::ShapeTypeHandler::Instance();
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx 
b/include/svx/AccessibleShapeTreeInfo.hxx
index 6057433c4181..0b5ddf8fae52 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -22,7 +22,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 namespace com { namespace sun { namespace star {
 namespace accessibility { class XAccessibleComponent; }
@@ -31,7 +31,6 @@ namespace com { namespace sun { namespace star {
 } } }
 
 class SdrView;
-namespace vcl { class Window; }
 
 namespace accessibility {
 
@@ -135,13 +134,19 @@ public:
 /** Set the window that is used to construct SvxTextEditSources which in
 turn is used to create accessible edit engines.
 */
-void SetWindow (vcl::Window* pWindow);
+void SetDevice(OutputDevice* pWindow);
 
 /** Return the current Window.
 @return
 The returned value may be NULL.
 */
-vcl::Window* GetWindow() const { return mpWindow;}
+vcl::Window* GetWindow() const
+{
+if (mpWindow && mpWindow->GetOutDevType() == OUTDEV_WINDOW)
+return static_cast(mpWindow.get());
+return nullptr;
+}
+OutputDevice* GetDevice() const { return mpWindow;}
 
 /** The view forwarder allows the transformation between internal
 and pixel coordinates and can be asked for the visible area.
@@ -183,7 +188,7 @@ private:
 /** This window is necessary to construct an SvxTextEditSource which in
 turn is used to create an accessible edit engine.
 */
-VclPtr mpWindow;
+VclPtr mpWindow;
 
 /** The view forwarder allows the transformation between internal
 and pixel coordinates and can be asked for the visible area.
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f95028b5aca3..9ad7aa3a98f0 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -317,7 +317,7 @@ ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument* 
pAccessibleDocument, Sc
 maShapeTreeInfo.SetModelBroadcaster( new 
ScDrawModelBroadcaster(rViewData.GetDocument()->GetDrawLayer()) );
 maShapeTreeInfo.SetSdrView(rViewData.GetScDrawView());
 maShapeTreeInfo.SetController(nullptr);
-maShapeTreeInfo.SetWindow(pViewShell->GetWindowByPos(meSplitPos));
+maShapeTreeInfo.SetDevice(pViewShell->GetWindowByPos(meSplitPos));
 maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument);
 }
 }
@@ -350,7 +350,7 @@ void ScChildrenShapes::SetDrawBroadcaster()
 maShapeTreeInfo.SetModelBroadcaster( new 
ScDrawModelBroadcaster(rViewData.GetDocument()->GetDrawLayer()) );
 maShapeTreeInfo.SetSdrView(rViewData.GetScDrawView());
 maShapeTreeInfo.SetController(nullptr);
-maShapeTreeInf

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

[Caolán McNamara (via logerrit)]

 include/svx/svdpntv.hxx  |1 +
 svx/source/svdraw/sdrpagewindow.cxx  |8 
 svx/source/svdraw/sdrpaintwindow.cxx |6 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit f90a48046331eaa1ca60c5298ccdbaf0738077aa
Author: Caolán McNamara 
AuthorDate: Thu May 16 10:37:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 09:54:18 2019 +0200

split out toplevel window area invalidate

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

diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index a5eee136faec..bdfa2c705484 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -238,6 +238,7 @@ public:
 SdrPaintWindow* GetPaintWindow(sal_uInt32 nIndex) const;
 // Replacement for GetWin(0), may return 0L (!)
 OutputDevice* GetFirstOutputDevice() const;
+static void InvalidateWindow(const tools::Rectangle& rArea, OutputDevice& 
rDevice);
 
 private:
 SVX_DLLPRIVATE void ImpClearVars();
diff --git a/svx/source/svdraw/sdrpagewindow.cxx 
b/svx/source/svdraw/sdrpagewindow.cxx
index 573fd792284f..cae3610c839f 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -413,11 +413,11 @@ void SdrPageWindow::InvalidatePageWindow(const 
basegfx::B2DRange& rRange)
 if (GetPageView().IsVisible() && GetPaintWindow().OutputToWindow())
 {
 const SvtOptionsDrawinglayer aDrawinglayerOpt;
-vcl::Window& rWindow(static_cast< vcl::Window& 
>(GetPaintWindow().GetOutputDevice()));
+OutputDevice& rWindow(GetPaintWindow().GetOutputDevice());
 basegfx::B2DRange aDiscreteRange(rRange);
 aDiscreteRange.transform(rWindow.GetViewTransformation());
 
-if(aDrawinglayerOpt.IsAntiAliasing())
+if (aDrawinglayerOpt.IsAntiAliasing())
 {
 // invalidate one discrete unit more under the assumption that AA
 // needs one pixel more
@@ -429,10 +429,10 @@ void SdrPageWindow::InvalidatePageWindow(const 
basegfx::B2DRange& rRange)
 static_cast(floor(aDiscreteRange.getMinY())),
 static_cast(ceil(aDiscreteRange.getMaxX())),
 static_cast(ceil(aDiscreteRange.getMaxY(;
-const bool bWasMapModeEnabled(rWindow.IsMapModeEnabled());
 
+const bool bWasMapModeEnabled(rWindow.IsMapModeEnabled());
 rWindow.EnableMapMode(false);
-rWindow.Invalidate(aVCLDiscreteRectangle, InvalidateFlags::NoErase);
+SdrPaintView::InvalidateWindow(aVCLDiscreteRectangle, rWindow);
 rWindow.EnableMapMode(bWasMapModeEnabled);
 }
 else if (comphelper::LibreOfficeKit::isActive())
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx 
b/svx/source/svdraw/sdrpaintwindow.cxx
index 666a81c92312..f160ff2341c3 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -225,6 +225,12 @@ rtl::Reference 
SdrPaintView::CreateOverlayManager(
 return xOverlayManager;
 }
 
+void SdrPaintView::InvalidateWindow(const tools::Rectangle& rArea, 
OutputDevice& rDevice)
+{
+vcl::Window& rWindow(static_cast(rDevice));
+rWindow.Invalidate(rArea, InvalidateFlags::NoErase);
+}
+
 void SdrPaintWindow::impCreateOverlayManager()
 {
 // not yet one created?
___
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

[Caolán McNamara (via logerrit)]

 include/svx/sdrpaintwindow.hxx   |6 +-
 svx/source/svdraw/sdrpaintwindow.cxx |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5ccaa8976fc9bffddacfbe804646f4dce099ddb0
Author: Caolán McNamara 
AuthorDate: Wed May 15 21:40:13 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 17 09:53:38 2019 +0200

allow overruling treatment as not-Window

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

diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index dda0185f9e9d..d8ca1db6b735 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -87,6 +87,8 @@ private:
 // #i72889# flag if this is only a temporary target for repaint, default 
is false
 boolmbTemporaryTarget : 1;
 
+boolmbOutputToWindow : 1;
+
 // helpers
 void impCreateOverlayManager();
 
@@ -112,7 +114,9 @@ public:
 bool OutputToPrinter() const { return (OUTDEV_PRINTER == 
mpOutputDevice->GetOutDevType()); }
 
 // Is OutDev a window?
-bool OutputToWindow() const { return (OUTDEV_WINDOW == 
mpOutputDevice->GetOutDevType()); }
+bool OutputToWindow() const { return mbOutputToWindow; }
+
+void SetOutputToWindow(bool bOutputToWindow) { mbOutputToWindow = 
bOutputToWindow; }
 
 // Is OutDev a VirtualDevice?
 bool OutputIsVirtualDevice() const { return mpOutputDevice->IsVirtual(); }
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx 
b/svx/source/svdraw/sdrpaintwindow.cxx
index 91ca3860e7b0..666a81c92312 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -236,7 +236,8 @@ SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, 
OutputDevice& rOut,
 :   mpOutputDevice(&rOut),
 mpWindow(pWindow),
 mrPaintView(rNewPaintView),
-mbTemporaryTarget(false) // #i72889#
+mbTemporaryTarget(false), // #i72889#
+mbOutputToWindow(OUTDEV_WINDOW == mpOutputDevice->GetOutDevType())
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: UnoControls/inc UnoControls/IwyuFilter_UnoControls.yaml UnoControls/source

[Gabor Kelemen (via logerrit)]

 UnoControls/IwyuFilter_UnoControls.yaml|   12 ++
 UnoControls/inc/basecontainercontrol.hxx   |   11 --
 UnoControls/inc/basecontrol.hxx|   69 +
 UnoControls/inc/multiplexer.hxx|   22 +---
 UnoControls/source/base/basecontainercontrol.cxx   |4 
 UnoControls/source/base/basecontrol.cxx|3 
 UnoControls/source/base/multiplexer.cxx|3 
 UnoControls/source/base/registercontrols.cxx   |3 
 UnoControls/source/controls/framecontrol.cxx   |3 
 UnoControls/source/controls/progressbar.cxx|4 
 UnoControls/source/controls/progressmonitor.cxx|4 
 UnoControls/source/controls/statusindicator.cxx|3 
 UnoControls/source/inc/OConnectionPointContainerHelper.hxx |5 
 UnoControls/source/inc/OConnectionPointHelper.hxx  |5 
 UnoControls/source/inc/framecontrol.hxx|8 -
 UnoControls/source/inc/progressbar.hxx |4 
 UnoControls/source/inc/progressmonitor.hxx |   37 --
 UnoControls/source/inc/statusindicator.hxx |   13 +-
 18 files changed, 60 insertions(+), 153 deletions(-)

New commits:
commit 55961e110f0bf2d571a27e56806dae50fa353233
Author: Gabor Kelemen 
AuthorDate: Fri May 10 08:06:22 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri May 17 09:21:49 2019 +0200

tdf#42949 Fix IWYU warnings in UnoControls/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/UnoControls/IwyuFilter_UnoControls.yaml 
b/UnoControls/IwyuFilter_UnoControls.yaml
new file mode 100644
index ..998e200af2cd
--- /dev/null
+++ b/UnoControls/IwyuFilter_UnoControls.yaml
@@ -0,0 +1,12 @@
+---
+assumeFilename: UnoControls/source/base/basecontrol.cxx
+blacklist:
+UnoControls/inc/multiplexer.hxx:
+# Don't propose hxx -> h change in URE libs
+- cppuhelper/interfacecontainer.hxx
+UnoControls/source/inc/OConnectionPointContainerHelper.hxx:
+# Don't propose hxx -> h change in URE libs
+- cppuhelper/interfacecontainer.hxx
+UnoControls/source/controls/framecontrol.cxx:
+# Needed for use in cppu::UnoType template
+- com/sun/star/awt/XControlContainer.hpp
diff --git a/UnoControls/inc/basecontainercontrol.hxx 
b/UnoControls/inc/basecontainercontrol.hxx
index d297e417b9ce..500313fc9096 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -20,20 +20,11 @@
 #ifndef INCLUDED_UNOCONTROLS_INC_BASECONTAINERCONTROL_HXX
 #define INCLUDED_UNOCONTROLS_INC_BASECONTAINERCONTROL_HXX
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 
 #include "basecontrol.hxx"
+#include 
 
 namespace unocontrols {
 
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index e10a7ce8ead7..c19e3d9cb04b 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -20,78 +20,23 @@
 #ifndef INCLUDED_UNOCONTROLS_INC_BASECONTROL_HXX
 #define INCLUDED_UNOCONTROLS_INC_BASECONTROL_HXX
 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
-#include "multiplexer.hxx"
-
-namespace com { namespace sun { namespace star { namespace uno {
-class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::awt { class XFocusListener; }
+namespace com::sun::star::awt { class XMouseListener; }
+namespace com::sun::star::awt { class XMouseMotionListener; }
+namespace com::sun::star::awt { struct PaintEvent; }
+namespace com::sun::star::awt { struct WindowEvent; }
+namespace unocontrols { class OMRCListenerMultiplexerHelper; }
 
 namespace unocontrols {
 
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index f36ba3a3d6cb..dda3013a3600 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -22,31 +22,21 @@
 
 #include 
 #include 
-#include 
-#i

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 3c0003c9f0ff5bdc49da046a604a3d2c8cc5d5df
Author: Julien Nabet 
AuthorDate: Thu May 16 22:01:45 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri May 17 09:21:04 2019 +0200

tdf#125325: fix crash about index managements for dBase

See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=151468

Pb is aSearch becomes invalid after _rList.erase(aSearch); line 101
so just test aReturn.GetIndexFileName() isn't empty

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

diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx 
b/dbaccess/source/ui/dlg/dbfindex.cxx
index 734af6e961bc..fe934b7914c0 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -107,8 +107,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const 
OUString& _rName, TableInde
 else
 _rDisplay.select(static_cast(nPos));
 }
-
-OSL_ENSURE(!_bMustExist || (aSearch != _rList.end()), 
"ODbaseIndexDialog::implRemoveIndex : did not find the index!");
+OSL_ENSURE(!_bMustExist || !aReturn.GetIndexFileName().isEmpty(), 
"ODbaseIndexDialog::implRemoveIndex : did not find the index!");
 return aReturn;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek (via logerrit)]

 sc/qa/uitest/calc_tests8/tdf124829.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 218d2ab43ac2f1c238349a9e45d5c228ad1c62c4
Author: Zdeněk Crhonek 
AuthorDate: Thu May 16 18:19:43 2019 +0200
Commit: Zdenek Crhonek 
CommitDate: Fri May 17 09:12:43 2019 +0200

uitest repair test 124829

Change-Id: I8b31da520f1cc609f97488a0c10c19bfe3b3b8e6
Reviewed-on: https://gerrit.libreoffice.org/72420
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/uitest/calc_tests8/tdf124829.py 
b/sc/qa/uitest/calc_tests8/tdf124829.py
index b2aa6d3647e5..97a43f641472 100644
--- a/sc/qa/uitest/calc_tests8/tdf124829.py
+++ b/sc/qa/uitest/calc_tests8/tdf124829.py
@@ -35,7 +35,7 @@ class tdf124829(UITestCase):
 self.xUITest.executeCommand(".uno:Undo")
 
 #verify; no crashes
-self.assertEqual(get_cell_by_position(document, 5, 0, 0).getString(), 
"First Name")
+self.assertEqual(document.Sheets.getCount(), 6)
 
 self.ui_test.close_doc()
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits