[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 3 commits - animations/source include/xmloff offapi/com offapi/UnoApi_offapi.mk officecfg/registry sd/inc sd/source sd/

[Sarper Akdemir (via logerrit)]

Rebased ref, commits from common ancestor:
commit 45a09fe9df5b2adec25a6015c8700e7b7721863c
Author: Sarper Akdemir 
AuthorDate: Mon Jul 27 23:02:48 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Wed Aug 5 09:57:54 2020 +0300

work-in-progress complex shapes

Change-Id: I807bbde92c143b8c96792b3d8bf9603a31216486

diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 8729300184f6..90f1d1853dba 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -11,6 +11,13 @@
 #include 
 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
 
 #define BOX2D_SLIDE_SIZE_IN_METERS 100.00f
 
@@ -62,6 +69,124 @@ b2Vec2 convertB2DPointToBox2DVec2(const basegfx::B2DPoint& 
aPoint, const double
 return { static_cast(aPoint.getX() * fScaleFactor),
  static_cast(aPoint.getY() * -fScaleFactor) };
 }
+
+// expects rPolygon to have coordinates relative to it's center
+void addTriangleVectorToBody(const basegfx::triangulator::B2DTriangleVector& 
rTriangleVector,
+ b2Body* aBody, const float fDensity, const float 
fFriction,
+ const float fRestitution, const double 
fScaleFactor)
+{
+for (const basegfx::triangulator::B2DTriangle& aTriangle : rTriangleVector)
+{
+b2FixtureDef aFixture;
+b2PolygonShape aPolygonShape;
+b2Vec2 aTriangleVertices[3]
+= { convertB2DPointToBox2DVec2(aTriangle.getA(), fScaleFactor),
+convertB2DPointToBox2DVec2(aTriangle.getB(), fScaleFactor),
+convertB2DPointToBox2DVec2(aTriangle.getC(), fScaleFactor) };
+
+bool bValidPointDistance = true;
+for (int a = 0; a < 3; a++)
+{
+for (int b = 0; b < 3; b++)
+{
+if (a == b)
+continue;
+if (b2DistanceSquared(aTriangleVertices[a], 
aTriangleVertices[b]) < 0.003f)
+{
+bValidPointDistance = false;
+}
+}
+}
+if (bValidPointDistance)
+{
+aPolygonShape.Set(aTriangleVertices, 3);
+aFixture.shape = &aPolygonShape;
+aFixture.density = fDensity;
+aFixture.friction = fFriction;
+aFixture.restitution = fRestitution;
+aBody->CreateFixture(&aFixture);
+}
+}
+}
+
+// expects rPolygon to have coordinates relative to it's center
+void addEdgeShapeToBody(const basegfx::B2DPolygon& rPolygon, b2Body* aBody, 
const float fDensity,
+const float fFriction, const float fRestitution, const 
double fScaleFactor)
+{
+basegfx::B2DPolygon aPolygon = 
basegfx::utils::removeNeutralPoints(rPolygon);
+const float fHalfWidth = 0.1;
+bool bHaveEdgeA = false;
+b2Vec2 aEdgeBoxVertices[4];
+
+for (sal_uInt32 nIndex = 0; nIndex < aPolygon.count(); nIndex++)
+{
+b2FixtureDef aFixture;
+b2PolygonShape aPolygonShape;
+
+basegfx::B2DPoint aPointA;
+basegfx::B2DPoint aPointB;
+if (nIndex != 0)
+{
+aPointA = aPolygon.getB2DPoint(nIndex - 1);
+aPointB = aPolygon.getB2DPoint(nIndex);
+}
+else if (/* nIndex == 0 && */ aPolygon.isClosed())
+{
+// start by connecting the last point to the first one
+aPointA = aPolygon.getB2DPoint(aPolygon.count() - 1);
+aPointB = aPolygon.getB2DPoint(nIndex);
+}
+else // the polygon isn't closed, won't connect last and first points
+{
+continue;
+}
+
+b2Vec2 aEdgeUnitVec = (convertB2DPointToBox2DVec2(aPointB, 
fScaleFactor)
+   - convertB2DPointToBox2DVec2(aPointA, 
fScaleFactor));
+aEdgeUnitVec.Normalize();
+
+b2Vec2 aEdgeNormal(-aEdgeUnitVec.y, aEdgeUnitVec.x);
+
+if (!bHaveEdgeA)
+{
+aEdgeBoxVertices[0]
+= convertB2DPointToBox2DVec2(aPointA, fScaleFactor) + 
fHalfWidth * aEdgeNormal;
+aEdgeBoxVertices[1]
+= convertB2DPointToBox2DVec2(aPointA, fScaleFactor) + 
-fHalfWidth * aEdgeNormal;
+bHaveEdgeA = true;
+}
+aEdgeBoxVertices[2]
+= convertB2DPointToBox2DVec2(aPointB, fScaleFactor) + fHalfWidth * 
aEdgeNormal;
+aEdgeBoxVertices[3]
+= convertB2DPointToBox2DVec2(aPointB, fScaleFactor) + -fHalfWidth 
* aEdgeNormal;
+
+bool bValidPointDistance
+= (b2DistanceSquared(aEdgeBoxVertices[0], aEdgeBoxVertices[2]) > 
0.003f);
+
+if (bValidPointDistance)
+{
+aPolygonShape.Set(aEdgeBoxVertices, 4);
+aFixture.shape = &aPolygonShape;
+aFixture.density = fDensity;
+aFixture.friction = fFriction;
+aFixture.restitution = fRestitution;
+aBody->CreateFixt

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

[Stephan Bergmann (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f121a9fd8500f849b091d704f33bfa87ea9d1fb7
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 23:31:58 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 5 08:56:56 2020 +0200

loplugin:indentation (--disable-assert-always-abort)

Change-Id: I9f5f60771e7d658e0806428eb1c515ebb6fad6dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100146
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 6bae76eab3fc..ba20f59d3ac8 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3552,7 +3552,7 @@ gboolean GtkDropTarget::signalDragDrop(GtkWidget* 
pWidget, GdkDragContext* conte
 #ifndef NDEBUG
 bool res =
 #endif
-g_idle_remove_by_data(this);
+g_idle_remove_by_data(this);
 assert(res);
 
 css::datatransfer::dnd::DropTargetDropEvent aEvent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - oox/source

[Stephan Bergmann (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0fa151a50cd9a0013aedb4010d32a25b0fe1e0cf
Author: Stephan Bergmann 
AuthorDate: Fri Jul 31 22:31:11 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 5 08:54:21 2020 +0200

Avoid UBSan signed-integer-overflow

...during CppunitTest_sd_import_tests_smartart:

> oox/source/drawingml/diagram/diagramlayoutatoms.cxx:656:50: runtime 
error: signed integer overflow: 1924451 - -2147483647 cannot be represented in 
type 'int'
>  #0 in 
oox::drawingml::AlgAtom::layoutShape(std::shared_ptr 
const&, std::__debug::vector > const&, 
std::__debug::vector 
> const&) at oox/source/drawingml/diagram/diagramlayoutatoms.cxx:656:50
>  #1 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::AlgAtom&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:202:19
>  #2 in 
oox::drawingml::AlgAtom::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:386:14
>  #3 in 
oox::drawingml::LayoutAtomVisitorBase::defaultVisit(oox::drawingml::LayoutAtom 
const&) at oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:32:16
>  #4 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::LayoutNode&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:243:5
>  #5 in 
oox::drawingml::LayoutNode::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:1452:14
>  #6 in 
oox::drawingml::LayoutAtomVisitorBase::defaultVisit(oox::drawingml::LayoutAtom 
const&) at oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:32:16
>  #7 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::LayoutNode&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:245:5
>  #8 in 
oox::drawingml::LayoutNode::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:1452:14
>  #9 in 
oox::drawingml::LayoutAtomVisitorBase::visit(oox::drawingml::ForEachAtom&) at 
oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:98:20
>  #10 in 
oox::drawingml::ForEachAtom::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:167:14
>  #11 in 
oox::drawingml::LayoutAtomVisitorBase::defaultVisit(oox::drawingml::LayoutAtom 
const&) at oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:32:16
>  #12 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::LayoutNode&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:245:5
>  #13 in 
oox::drawingml::LayoutNode::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:1452:14
>  #14 in 
oox::drawingml::Diagram::addTo(std::shared_ptr const&) 
at oox/source/drawingml/diagram/diagram.cxx:122:30
>  #15 in 
oox::drawingml::loadDiagram(std::shared_ptr const&, 
oox::core::XmlFilterBase&, rtl::OUString const&, rtl::OUString const&, 
rtl::OUString const&, rtl::OUString const&, oox::core::Relations const&) at 
oox/source/drawingml/diagram/diagram.cxx:356:15
>  #16 in oox::drawingml::DiagramGraphicDataContext::onCreateContext(int, 
oox::AttributeList const&) at oox/source/drawingml/graphicshapecontext.cxx:252:9
>  #17 in non-virtual thunk to 
oox::drawingml::DiagramGraphicDataContext::onCreateContext(int, 
oox::AttributeList const&) at oox/source/drawingml/graphicshapecontext.cxx
>  #18 in oox::core::ContextHandler2Helper::implCreateChildContext(int, 
com::sun::star::uno::Reference 
const&) at oox/source/core/contexthandler2.cxx:94:34
>  #19 in oox::core::ContextHandler2::createFastChildContext(int, 
com::sun::star::uno::Reference 
const&) at oox/source/core/contexthandler2.cxx:191:12
>  #20 in non-virtual thunk to 
oox::core::ContextHandler2::createFastChildContext(int, 
com::sun::star::uno::Reference 
const&) at oox/source/core/contexthandler2.cxx
>  #21 in (anonymous namespace)::Entity::startElement((anonymous 
namespace)::Event const*) at sax/source/fastparser/fastparser.cxx:432:44
>  #22 in sax_fastparser::FastSaxParserImpl::callbackStartElement(unsigned 
char const*, unsigned char const*, unsigned char const*, int, unsigned char 
const**, int, unsigned char const**) at 
sax/source/fastparser/fastparser.cxx:1246:21
>  #23 in (anonymous namespace)::call_callbackStartElement(void*, unsigned 
char const*, unsigned char const*, unsigned char const*, int, unsigned char 
const**, int, int, unsigned char const**) at 
sax/source/fastparser/fastparser.cxx:305:18
>  #24 in xmlParseStartTag2 at 
workdir/UnpackedTarball/libxml2/parser.c:9588:6
>  #25 in xmlParseTryOrFinish at 
workdir/UnpackedTarball/libxml2/parser.c:11378:14
>  #26 in xmlParseChunk__internal_alias at 
workdir/UnpackedTarball/libxml2/parser.c:12280:13
>  #27 in sax_fastparser::FastSaxParserImpl::parse() at 
sax/source/fastparser/fastparser.cxx:1046:

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/source sd/qa

[Miklos Vajna (via logerrit)]

 oox/source/drawingml/diagram/diagram.cxx|   20 +
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   72 ++--
 oox/source/drawingml/diagram/layoutatomvisitors.cxx |6 -
 sd/qa/unit/data/pptx/smartart-linear-rule.pptx  |binary
 sd/qa/unit/import-tests-smartart.cxx|   19 +
 5 files changed, 106 insertions(+), 11 deletions(-)

New commits:
commit a7e1a2c2bb6b02a41b9eb1d2dccbbd28e0eac49b
Author: Miklos Vajna 
AuthorDate: Fri Jul 31 11:04:02 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 5 08:54:56 2020 +0200

oox smartart: consider rules when scaling in linear layout

The bugdoc has an arrow shape which is 100% wide, and there are multiple
shapes before it, which also have a 100% wide constraint. The reason
PowerPoint scales down the shapes (but not the arrow) is because rules
declare it should happen this way.

So start taking rules into account in linear layouts.

(cherry picked from commit 0024c48b4822062995effed7db4f1281196384bb)

Conflicts:
sd/qa/unit/import-tests-smartart.cxx

Change-Id: I352443277e88be0eb711659489587127727a258f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100110
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index a03a06c39125..509a1f845e25 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -82,6 +82,25 @@ static void sortChildrenByZOrder(const ShapePtr& pShape)
 sortChildrenByZOrder(rChild);
 }
 
+/// Removes empty group shapes, now that their spacing influenced the layout.
+static void removeUnneededGroupShapes(const ShapePtr& pShape)
+{
+std::vector& rChildren = pShape->getChildren();
+
+rChildren.erase(std::remove_if(rChildren.begin(), rChildren.end(),
+   [](const ShapePtr& aChild) {
+   return aChild->getServiceName()
+  == 
"com.sun.star.drawing.GroupShape"
+  && aChild->getChildren().empty();
+   }),
+rChildren.end());
+
+for (const auto& pChild : rChildren)
+{
+removeUnneededGroupShapes(pChild);
+}
+}
+
 void Diagram::addTo( const ShapePtr & pParentShape )
 {
 if (pParentShape->getSize().Width == 0 || pParentShape->getSize().Height 
== 0)
@@ -103,6 +122,7 @@ void Diagram::addTo( const ShapePtr & pParentShape )
 mpLayout->getNode()->accept(aLayoutingVisitor);
 
 sortChildrenByZOrder(pParentShape);
+removeUnneededGroupShapes(pParentShape);
 }
 
 ShapePtr pBackground(new Shape("com.sun.star.drawing.CustomShape"));
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 82e826da0dda..b748298f7c1c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -19,6 +19,8 @@
 
 #include "diagramlayoutatoms.hxx"
 
+#include 
+
 #include "layoutatomvisitorbase.hxx"
 
 #include 
@@ -479,10 +481,21 @@ void ApplyConstraintToLayout(const Constraint& 
rConstraint, LayoutPropertyMap& r
 }
 }
 
-void AlgAtom::layoutShape( const ShapePtr& rShape,
-   const std::vector& rConstraints,
-   const std::vector& /*rRules*/ )
+void AlgAtom::layoutShape(const ShapePtr& rShape, const 
std::vector& rConstraints,
+  const std::vector& rRules)
 {
+if (mnType != XML_lin)
+{
+// TODO Handle spacing from constraints for non-lin algorithms as well.
+rShape->getChildren().erase(
+std::remove_if(rShape->getChildren().begin(), 
rShape->getChildren().end(),
+   [](const ShapePtr& aChild) {
+   return aChild->getServiceName() == 
"com.sun.star.drawing.GroupShape"
+  && aChild->getChildren().empty();
+   }),
+rShape->getChildren().end());
+}
+
 switch(mnType)
 {
 case XML_composite:
@@ -929,6 +942,45 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 }
 
 // first approximation of children size
+std::set aChildrenToShrink;
+for (const auto& rRule : rRules)
+{
+// Consider rules: when scaling down, only change children 
where the rule allows
+// doing so.
+aChildrenToShrink.insert(rRule.msForName);
+}
+
+if (!aChildrenToShrink.empty())
+{
+// Have scaling info from rules: then only count scaled 
children.
+for (auto& aCurrShape : rShape->getChildren())
+   

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/vector/SVGGroup.js |1 -
 1 file changed, 1 deletion(-)

New commits:
commit df8a6bf10a161b3e4e803f66694406e32da8fa53
Author: Dennis Francis 
AuthorDate: Wed Aug 5 09:56:07 2020 +0530
Commit: Dennis Francis 
CommitDate: Wed Aug 5 08:53:26 2020 +0200

svggroup: remove incorrect setting of opacity

This was introduced in a59076e1ca88a6f2c8c67ce45bf769e963cf0717

Change-Id: I79b3281c41b16afc73625cc48b2996e2438209e3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100149
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/vector/SVGGroup.js 
b/loleaflet/src/layer/vector/SVGGroup.js
index 7aca7c219..944057b9f 100644
--- a/loleaflet/src/layer/vector/SVGGroup.js
+++ b/loleaflet/src/layer/vector/SVGGroup.js
@@ -26,7 +26,6 @@ L.SVGGroup = L.Layer.extend({
 
setVisible: function (visible) {
this._forEachSVGNode(function (svgNode) {
-   svgNode.setAttribute('opacity', 0);
if (visible)
svgNode.setAttribute('visibility', 'visible');
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 vcl/source/app/scheduler.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 29ad99649866ffed13ea0936e9daf51463a04d92
Author: Noel Grandin 
AuthorDate: Sat Aug 1 13:18:18 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 5 08:26:17 2020 +0200

document the abort in ProcessTaskScheduling

Change-Id: I8a30e9abbf437cdf4f91a14755e5cc639dd172b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99937
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index aa716f88b763..fa18087e9fd8 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -473,6 +473,12 @@ bool Scheduler::ProcessTaskScheduling()
 
 // invoke the task
 sal_uInt32 nLockCount = Unlock( true );
+/*
+* Current policy is that scheduler tasks aren't allowed to throw an 
exception.
+* Because otherwise the exception is caught somewhere totally 
unrelated.
+* TODO Ideally we could capture a proper backtrace and feed this into 
breakpad,
+*   which is do-able, but requires writing some assembly.
+*/
 try
 {
 pTask->Invoke();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 xmloff/source/text/txtparae.cxx |   28 ++--
 1 file changed, 6 insertions(+), 22 deletions(-)

New commits:
commit 8c067a96210992bef666a96d980c2c77ae223626
Author: Mike Kaganski 
AuthorDate: Tue Aug 4 22:48:45 2020 +0200
Commit: Mike Kaganski 
CommitDate: Wed Aug 5 08:21:16 2020 +0200

Simplify this a little

Change-Id: I81298ad97ef2161fb9e52466b7e17cd5a142067b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100065
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4e85452b174d..0b8b642abc97 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1448,27 +1448,8 @@ void 
XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
 if ( xAutoStylesSupp.is() )
 {
 Reference< XAutoStyles > xAutoStyleFamilies = 
xAutoStylesSupp->getAutoStyles();
-OUString sName;
-XmlStyleFamily nFamily;
-
-for ( int i = 0; i < 3; ++i )
-{
-if ( 0 == i )
-{
-sName = "CharacterStyles" ;
-nFamily = XmlStyleFamily::TEXT_TEXT;
-}
-else if ( 1 == i )
-{
-sName = "RubyStyles" ;
-nFamily = XmlStyleFamily::TEXT_RUBY;
-}
-else
-{
-sName = "ParagraphStyles" ;
-nFamily = XmlStyleFamily::TEXT_PARAGRAPH;
-}
-
+const auto collectFamily = [this, &xAutoStyleFamilies](const OUString& 
sName,
+   XmlStyleFamily 
nFamily) {
 Any aAny = xAutoStyleFamilies->getByName( sName );
 Reference< XAutoStyleFamily > xAutoStyles = 
*o3tl::doAccess>(aAny);
 Reference < XEnumeration > xAutoStylesEnum( 
xAutoStyles->createEnumeration() );
@@ -1480,7 +1461,10 @@ void 
XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
 Reference < XPropertySet > xPSet( xAutoStyle, uno::UNO_QUERY );
 Add( nFamily, xPSet, nullptr, true );
 }
-}
+};
+collectFamily("CharacterStyles", XmlStyleFamily::TEXT_TEXT);
+collectFamily("RubyStyles", XmlStyleFamily::TEXT_RUBY);
+collectFamily("ParagraphStyles", XmlStyleFamily::TEXT_PARAGRAPH);
 }
 
 // Export Field AutoStyles:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 canvas/source/tools/verifyinput.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 99d281201cc36dbf1760701343056f8cbed11710
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 23:01:35 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 5 08:08:16 2020 +0200

Throw detailed IllegalArgumentException regardless of OSL_DEBUG_LEVEL

...assuming that such an exception is rare enough that any performance 
impact
does not matter.  (The code was like this ever since its introduction in
9e2bf1d54a6e92dcfa3076bf4d7cc623ace87cd3 "INTEGRATION: CWS canvas02".)

This nicely avoids loplugin:unusedmember about unused mpStr and mnArgPos 
when
OSL_DEBUG_LEVEL is zero.

Change-Id: I2ad3e36e98a6811ae255525cf8159db89c78ad7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100143
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins

diff --git a/canvas/source/tools/verifyinput.cxx 
b/canvas/source/tools/verifyinput.cxx
index 9d0020c12da9..ae0704d81d57 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -394,15 +394,11 @@ namespace canvas::tools
 {
 if( !std::isfinite( rVal ) || rVal < 0.0 )
 {
-#if OSL_DEBUG_LEVEL > 0
 throw lang::IllegalArgumentException(
 OUString::createFromAscii(mpStr) +
 ": verifyInput(): one of stroke attributes' 
DashArray value out of range (is " +
 OUString::number(rVal) + ")",
 mrIf, mnArgPos );
-#else
-throw lang::IllegalArgumentException();
-#endif
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 cppu/source/uno/check.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 41723365f680421f12869d5af2e895f94a25d9d5
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 17:16:59 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 5 08:07:41 2020 +0200

Avoid warnings about unused Char4

Change-Id: Ibcb256552ee03b14a76463be3d9b7ce53213fa7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100124
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx
index d1ce9bbc0c6f..8e99ff0a35c3 100644
--- a/cppu/source/uno/check.cxx
+++ b/cppu/source/uno/check.cxx
@@ -133,11 +133,6 @@ struct Char3 : public Char2
 {
 char c3 CPPU_GCC3_ALIGN( Char2 );
 };
-struct Char4
-{
-Char3 chars;
-char c;
-};
 enum Enum
 {
 v = SAL_MAX_ENUM
@@ -258,6 +253,12 @@ static_assert(sizeof(second) == sizeof(int), 
"sizeof(second) != sizeof(int)");
 
 #if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 
+struct Char4
+{
+Char3 chars;
+char c;
+};
+
 #define OFFSET_OF( s, m ) reinterpret_cast< size_t >(reinterpret_cast(&reinterpret_cast(16)->m) -16)
 
 class BinaryCompatible_Impl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Anchoring bug reports

[Telesto]

Hi All,

I have created quite an amount bug reports related to object/image 
anchoring. They current value of those is 0, as they basically 
demonstrate nothing new. It are simply different expressions/ examples/ 
consternations/ showcases of the same underlying problem (as far I’m 
able to tell).
However the might become handy if someone some day decides to work on 
this. It will give QA and they developer a number of test cases for 
analysis and testing. And easier to running into them, compared to 
creating them on demand; so more documentation of test cases.
They other view is of course that i’m repeating myself, bloating the 
bugtracker with useless reports/ samples wasting QA time (as the 
currently got to formal conformation process) and ruining they QA stats 
(UNCONFIRMED bugs).
As bugtracker is servicingthe needs of Developers, it more or less based 
on the desires of the developers.
A) Are repeated reports (variants) of any use from developer point of 
view (for specific this case)
B) If so, how can those they best be processed. I like them 
separateinstead of posting them in one bug report (unpracticalmess) or 
stacking them up to a bug as duplicate (risk of getting lost). They 
could be placed under separate meta within anchoring wrap meta. However 
the meta is still reasonable sized, so that urgent from my point of view.
C) Is there a new category needed for those examples, as numbers of they 
bugtracker don’t represent they actual number of problems. Bugs being 
set to NEW without being NEW in the sense of reporting anything new.
Sidenote: I’m don’t intend to add more; as I think I covered they 
terrain a pretty good (maybe even one or to duplicates)


Regards,
Telesto

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

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

[Noel Grandin (via logerrit)]

 sc/inc/global.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8605d47f154be97109ab3c76b543b3f30bd2d49a
Author: Noel Grandin 
AuthorDate: Tue Aug 4 09:30:28 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 5 05:03:05 2020 +0200

remove unused pStrScDoc field

Change-Id: Ie62d5cc2c0c29be14c85e618ddb65cc328fadcb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100083
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 309455adc348..de0b3311c4fc 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -508,7 +508,6 @@ class ScGlobal
 static std::atomic pAddInCollection;
 static ScUserList*  pUserList;
 static std::map* pRscString;
-static OUString*pStrScDoc;
 static SC_DLLPUBLIC const OUString aEmptyOUString;
 static OUString aStrClipDocName;
 static std::unique_ptr xEmptyBrushItem;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 unotools/source/config/configitem.cxx|   22 +--
 unotools/source/config/defaultoptions.cxx|  130 +++
 unotools/source/config/fontcfg.cxx   |  124 +++---
 unotools/source/config/pathoptions.cxx   |   62 +--
 unotools/source/config/securityoptions.cxx   |   74 ++---
 unotools/source/i18n/localedatawrapper.cxx   |   50 -
 unotools/source/i18n/readwritemutexguard.cxx |   36 +++---
 unotools/source/i18n/textsearch.cxx  |  150 +--
 unotools/source/misc/mediadescriptor.cxx |   32 ++---
 unotools/source/ucbhelper/ucblockbytes.cxx   |   22 +--
 10 files changed, 351 insertions(+), 351 deletions(-)

New commits:
commit f3ff488fd4fb56f178ffbb7b3880dfafdd9d8e9c
Author: Noel Grandin 
AuthorDate: Tue Aug 4 21:29:47 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 5 05:02:29 2020 +0200

loplugin:flatten in unotools

Change-Id: I2fad16061bca6dc3e57926863e7a3b71947a8ade
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100139
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/unotools/source/config/configitem.cxx 
b/unotools/source/config/configitem.cxx
index a6785079723a..60ded67dc837 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -537,19 +537,19 @@ bool ConfigItem::EnableNotification(const Sequence< 
OUString >& rNames,
 void ConfigItem::RemoveChangesListener()
 {
 Reference xHierarchyAccess = GetTree();
-if(xHierarchyAccess.is())
+if(!xHierarchyAccess.is())
+return;
+
+Reference xChgNot(xHierarchyAccess, UNO_QUERY);
+if(xChgNot.is() && xChangeLstnr.is())
 {
-Reference xChgNot(xHierarchyAccess, UNO_QUERY);
-if(xChgNot.is() && xChangeLstnr.is())
+try
+{
+xChgNot->removeChangesListener( xChangeLstnr );
+xChangeLstnr = nullptr;
+}
+catch (const Exception&)
 {
-try
-{
-xChgNot->removeChangesListener( xChangeLstnr );
-xChangeLstnr = nullptr;
-}
-catch (const Exception&)
-{
-}
 }
 }
 }
diff --git a/unotools/source/config/defaultoptions.cxx 
b/unotools/source/config/defaultoptions.cxx
index de7c5a4b4dfd..72a3cc8ba090 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -233,89 +233,89 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : 
ConfigItem( "Office.Common/Pa
 EnableNotification( aNames );
 const Any* pValues = aValues.getConstArray();
 DBG_ASSERT( aValues.getLength() == aNames.getLength(), "GetProperties 
failed" );
-if ( aValues.getLength() == aNames.getLength() )
-{
-SvtPathOptions aPathOpt;
-OUString aTempStr;
-OUStringBuffer aFullPathBuf;
+if ( aValues.getLength() != aNames.getLength() )
+return;
+
+SvtPathOptions aPathOpt;
+OUString aTempStr;
+OUStringBuffer aFullPathBuf;
 
-for ( int nProp = 0; nProp < aNames.getLength(); nProp++ )
+for ( int nProp = 0; nProp < aNames.getLength(); nProp++ )
+{
+if ( pValues[nProp].hasValue() )
 {
-if ( pValues[nProp].hasValue() )
+switch ( pValues[nProp].getValueTypeClass() )
 {
-switch ( pValues[nProp].getValueTypeClass() )
+case css::uno::TypeClass_STRING :
 {
-case css::uno::TypeClass_STRING :
+// multi paths
+if ( pValues[nProp] >>= aTempStr )
+aFullPathBuf = aPathOpt.SubstituteVariable( aTempStr );
+else
 {
-// multi paths
-if ( pValues[nProp] >>= aTempStr )
-aFullPathBuf = aPathOpt.SubstituteVariable( 
aTempStr );
-else
-{
-SAL_WARN( "unotools.config", "any operator >>= 
failed" );
-}
-break;
+SAL_WARN( "unotools.config", "any operator >>= failed" 
);
 }
+break;
+}
 
-case css::uno::TypeClass_SEQUENCE :
+case css::uno::TypeClass_SEQUENCE :
+{
+// single paths
+aFullPathBuf.setLength(0);
+Sequence < OUString > aList;
+if ( pValues[nProp] >>= aList )
 {
-// single paths
-aFullPathBuf.setLength(0);
-Sequence < OUString > aList;
-if ( pValues[nProp] >>= aList )
+sal_Int32 nCount = aList.getLength();
+for ( sal_Int32 nP

Other build errors

[julien2412]

Hello again,

Following previous errors, I encountered others:
[CXX] workdir/UnpackedTarball/libcmis/src/libcmis/gdrive-folder.cxx
In file included from /home/julien/lo/libo_perf/vcl/skia/salbmp.cxx:20:
/home/julien/lo/libo_perf/vcl/inc/skia/salbmp.hxx:107:10: error: this member
function can be declared static [loplugin:staticmethods]
void verify() const {};
~^
1 error generated.
make[1]: *** [/home/julien/lo/libo_perf/solenv/gbuild/LinkTarget.mk:298:
/home/julien/lo/libo_perf/workdir/CxxObject/vcl/skia/salbmp.o] Error 1
make[1]: *** Attente des tâches non terminées
In file included from /home/julien/lo/libo_perf/vcl/skia/gdiimpl.cxx:23:
/home/julien/lo/libo_perf/vcl/inc/skia/salbmp.hxx:107:10: error: this member
function can be declared static [loplugin:staticmethods]
void verify() const {};
~^
/home/julien/lo/libo_perf/vcl/skia/gdiimpl.cxx:188:17: error: this member
function can be declared static [loplugin:staticmethods]
const char* get_debug_name(SkiaSalGraphicsImpl*) { return "skia idle"; }
^~~~
2 errors generated.
make[1]: *** [/home/julien/lo/libo_perf/solenv/gbuild/LinkTarget.mk:298:
/home/julien/lo/libo_perf/workdir/CxxObject/vcl/skia/gdiimpl.o] Error 1
make: *** [Makefile:282: build] Error 2


/home/julien/lo/libo_perf/canvas/source/tools/verifyinput.cxx:409:61: error:
unused class member [loplugin:unusedmember]
const char* mpStr;
^
/home/julien/lo/libo_perf/canvas/source/tools/verifyinput.cxx:411:61: error:
unused class member [loplugin:unusedmember]
sal_Int16   mnArgPos;
^~~~
2 errors generated.


/home/julien/lo/libo_perf/canvas/source/tools/verifyinput.cxx:410:61: error:
unused class member [loplugin:unusedmember]
const char* mpStr;
^

/home/julien/lo/libo_perf/emfio/inc/emfreader.hxx:45:14: error: this member
function can be declared static [loplugin:staticmethods]
void ReadGDIComment(sal_uInt32 nCommentId);
~^
/home/julien/lo/libo_perf/emfio/source/reader/emfreader.cxx:447:21: note:
defined here: [loplugin:staticmethods]
void EmfReader::ReadGDIComment(sal_uInt32)
^~
/home/julien/lo/libo_perf/vcl/unx/gtk3/gtk3gtkframe.cxx:3556:5: error:
statement mis-aligned compared to neighbours assert [loplugin:indentation]
assert(res);
^
/home/julien/lo/libo_perf/vcl/unx/gtk3/gtk3gtkframe.cxx:3555:9: note:
measured against this one [loplugin:indentation]
g_idle_remove_by_data(this);
^
/home/julien/lo/libo_perf/vcl/unx/gtk3/gtk3gtkframe.cxx:3558:5: error:
statement mis-aligned compared to neighbours  [loplugin:indentation]
css::datatransfer::dnd::DropTargetDropEvent aEvent;
^
...


Since the build hasn't finished yet, there may be others.

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[SOLVED] Re: Build error cppu/source/uno/check.cxx:138:11: error: unused class member [loplugin:unusedmember]

[julien2412]

Indeed by cherry-picking your patch, it worked locally!
Thank you Stephan!

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar (via logerrit)]

 loleaflet/po/templates/loleaflet-ui.pot |  358 +++--
 loleaflet/po/ui-es.po   |  383 +---
 2 files changed, 351 insertions(+), 390 deletions(-)

New commits:
commit f9c5c57b93525b158cd8e85ec5c6743f1a99b3be
Author: Andras Timar 
AuthorDate: Tue Aug 4 23:32:53 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 4 23:33:53 2020 +0200

[cp] loleaflet: Updated Spanish translation of Calc sheet toolbar tooltips

Change-Id: I04f788adeb31160e62598f96e8962be1ceef1cbc

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 6f707c8a5..19e550be4 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-20 23:01+0200\n"
+"POT-Creation-Date: 2020-08-04 23:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -42,131 +42,135 @@ msgid "History"
 msgstr ""
 
 #: admin/admin.strings.js:12
-msgid "Dashboard"
+msgid "Log"
 msgstr ""
 
 #: admin/admin.strings.js:13
-msgid "Users online"
+msgid "Dashboard"
 msgstr ""
 
 #: admin/admin.strings.js:14
-msgid "User Name"
+msgid "Users online"
 msgstr ""
 
 #: admin/admin.strings.js:15
-msgid "Documents opened"
+msgid "User Name"
 msgstr ""
 
 #: admin/admin.strings.js:16
-msgid "Number of Documents"
+msgid "Documents opened"
 msgstr ""
 
 #: admin/admin.strings.js:17
-msgid "Memory consumed"
+msgid "Number of Documents"
 msgstr ""
 
 #: admin/admin.strings.js:18
-msgid "Bytes sent"
+msgid "Memory consumed"
 msgstr ""
 
 #: admin/admin.strings.js:19
-msgid "Bytes received"
+msgid "Bytes sent"
 msgstr ""
 
 #: admin/admin.strings.js:20
-msgid "PID"
+msgid "Bytes received"
 msgstr ""
 
 #: admin/admin.strings.js:21
-msgid "Document"
+msgid "PID"
 msgstr ""
 
 #: admin/admin.strings.js:22
-msgid "Number of views"
+msgid "Document"
 msgstr ""
 
 #: admin/admin.strings.js:23
-msgid "Elapsed time"
+msgid "Number of views"
 msgstr ""
 
 #: admin/admin.strings.js:24
-msgid "Idle time"
+msgid "Elapsed time"
 msgstr ""
 
 #: admin/admin.strings.js:25
-msgid "Modified"
+msgid "Idle time"
 msgstr ""
 
 #: admin/admin.strings.js:26
-msgid "Kill"
+msgid "Modified"
 msgstr ""
 
 #: admin/admin.strings.js:27
-msgid "Graphs"
+msgid "Kill"
 msgstr ""
 
 #: admin/admin.strings.js:28
-msgid "Memory Graph"
+msgid "Graphs"
 msgstr ""
 
 #: admin/admin.strings.js:29
-msgid "CPU Graph"
+msgid "Memory Graph"
 msgstr ""
 
 #: admin/admin.strings.js:30
+msgid "CPU Graph"
+msgstr ""
+
+#: admin/admin.strings.js:31
 msgid "Network Graph"
 msgstr ""
 
-#: admin/admin.strings.js:31 src/layer/marker/Annotation.js:252
-#: src/layer/tile/TileLayer.js:403
+#: admin/admin.strings.js:32 src/layer/marker/Annotation.js:253
+#: src/layer/tile/TileLayer.js:404
 msgid "Save"
 msgstr ""
 
-#: admin/admin.strings.js:32
+#: admin/admin.strings.js:33
 msgid "Cache size of memory statistics"
 msgstr ""
 
-#: admin/admin.strings.js:33
+#: admin/admin.strings.js:34
 msgid "Time interval of memory statistics (in ms)"
 msgstr ""
 
-#: admin/admin.strings.js:34
+#: admin/admin.strings.js:35
 msgid "Cache size of CPU statistics"
 msgstr ""
 
-#: admin/admin.strings.js:35
+#: admin/admin.strings.js:36
 msgid "Time interval of CPU statistics (in ms)"
 msgstr ""
 
-#: admin/admin.strings.js:36
+#: admin/admin.strings.js:37
 msgid "Maximum Document process virtual memory (in MB) - reduce only"
 msgstr ""
 
-#: admin/admin.strings.js:37
+#: admin/admin.strings.js:38
 msgid "Maximum Document process stack memory (in KB) - reduce only"
 msgstr ""
 
-#: admin/admin.strings.js:38
+#: admin/admin.strings.js:39
 msgid "Maximum file size allowed to write to disk (in MB) - reduce only"
 msgstr ""
 
-#: admin/admin.strings.js:39
+#: admin/admin.strings.js:40
 msgid "Documents:"
 msgstr ""
 
-#: admin/admin.strings.js:40
+#: admin/admin.strings.js:41
 msgid "Expired:"
 msgstr ""
 
-#: admin/admin.strings.js:41
+#: admin/admin.strings.js:42
 msgid "Refresh"
 msgstr ""
 
-#: admin/admin.strings.js:42
+#: admin/admin.strings.js:43
 msgid "Shutdown Server"
 msgstr ""
 
-#: admin/admin.strings.js:43
+#: admin/admin.strings.js:44
 msgid "Server uptime"
 msgstr ""
 
@@ -187,18 +191,18 @@ msgid "Are you sure you want to terminate this session?"
 msgstr ""
 
 #: admin/src/AdminSocketOverview.js:107 admin/src/AdminSocketSettings.js:36
-#: src/control/Control.Menubar.js:1185
-#: src/control/Control.PresentationBar.js:82 src/control/Control.Tabs.js:201
-#: src/control/Control.Tabs.js:218 src/control/Toolbar.js:584
+#: src/control/Control.Menubar.js:1191
+#: src/control/Control.PresentationBar.js:85 src/control/Control.Tabs.js:201
+#: src/control/Control.Tabs.js:218 src/control/Toolbar.js:597
 msgid "OK"
 msgstr ""
 
 #: admin/src/AdminSocketOverview.js:108 admin/src/AdminSocketSettings.js

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

[Andras Timar (via logerrit)]

 loleaflet/src/control/Control.SheetsBar.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0b37aa3f7f2f5b86b37af28ea10bbd962d1df8fb
Author: Andras Timar 
AuthorDate: Tue Aug 4 15:38:27 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 4 23:28:43 2020 +0200

Related tdf#95138 loleaflet: change tooltips for sheet navigation buttons

Change-Id: I2bc363058cb67a3d32851b3d90b9db39d5f45a03
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100060
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.SheetsBar.js 
b/loleaflet/src/control/Control.SheetsBar.js
index 1a9696a09..eeddb0538 100644
--- a/loleaflet/src/control/Control.SheetsBar.js
+++ b/loleaflet/src/control/Control.SheetsBar.js
@@ -25,10 +25,10 @@ L.Control.SheetsBar = L.Control.extend({
tooltip: 'bottom',
hidden: true,
items: [
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'firstrecord',  img: 'firstrecord', hint: 
_('First sheet')},
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'prevrecord',  img: 'prevrecord', hint: 
_('Previous sheet')},
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'nextrecord',  img: 'nextrecord', hint: 
_('Next sheet')},
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'lastrecord',  img: 'lastrecord', hint: 
_('Last sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'firstrecord',  img: 'firstrecord', hint: 
_('Scroll to the first sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'prevrecord',  img: 'prevrecord', hint: 
_('Scroll left')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'nextrecord',  img: 'nextrecord', hint: 
_('Scroll right')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'lastrecord',  img: 'lastrecord', hint: 
_('Scroll to the last sheet')},
{type: 'button',  id: 'insertsheet', img: 
'insertsheet', hint: _('Insert sheet')}
],
onClick: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source dbaccess/source dtrans/source vcl/opengl vcl/win winaccessibility/source

[Stephan Bergmann (via logerrit)]

 canvas/source/directx/dx_bitmapcanvashelper.cxx |4 ++--
 canvas/source/directx/dx_canvascustomsprite.cxx |2 +-
 canvas/source/directx/dx_canvashelper.cxx   |4 ++--
 canvas/source/directx/dx_canvashelper.hxx   |2 +-
 canvas/source/directx/dx_spritehelper.cxx   |6 +++---
 dbaccess/source/ui/dlg/odbcconfig.cxx   |8 
 dtrans/source/win32/clipb/WinClipboard.cxx  |   10 +-
 vcl/opengl/win/winlayout.cxx|2 +-
 vcl/win/gdi/gdiimpl.cxx |6 +++---
 vcl/win/gdi/salbmp.cxx  |2 +-
 winaccessibility/source/service/AccObject.cxx   |2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 48a3d6b85e3c2858c281d5f258fcf2120ca84265
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 15:47:53 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 23:28:17 2020 +0200

loplugin:simplifypointertobool (clang-cl)

Change-Id: I6512e6e4217ef9084c74e46e3b4f1e8defbd1bec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100108
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx 
b/canvas/source/directx/dx_bitmapcanvashelper.cxx
index b6d08fbbf8df..9733853f5958 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.cxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx
@@ -60,7 +60,7 @@ namespace dxcanvas
 {
 ENSURE_OR_THROW( rTarget,
   "BitmapCanvasHelper::setTarget(): Invalid target" );
-ENSURE_OR_THROW( !mpTarget.get(),
+ENSURE_OR_THROW( !mpTarget,
   "BitmapCanvasHelper::setTarget(): target set, old 
target would be overwritten" );
 
 mpTarget = rTarget;
@@ -72,7 +72,7 @@ namespace dxcanvas
 {
 ENSURE_OR_THROW( rTarget,
  "BitmapCanvasHelper::setTarget(): invalid target" );
-ENSURE_OR_THROW( !mpTarget.get(),
+ENSURE_OR_THROW( !mpTarget,
  "BitmapCanvasHelper::setTarget(): target set, old 
target would be overwritten" );
 
 mpTarget = rTarget;
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx 
b/canvas/source/directx/dx_canvascustomsprite.cxx
index f850342919b5..a0e58f29d4f9 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -45,7 +45,7 @@ namespace dxcanvas
 mpSpriteCanvas( rRefDevice ),
 mpSurface()
 {
-ENSURE_OR_THROW( rRefDevice.get(),
+ENSURE_OR_THROW( rRefDevice,
  "CanvasCustomSprite::CanvasCustomSprite(): Invalid 
sprite canvas" );
 
 mpSurface = std::make_shared(
diff --git a/canvas/source/directx/dx_canvashelper.cxx 
b/canvas/source/directx/dx_canvashelper.cxx
index 927f838244ab..de4969c6dd48 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -124,7 +124,7 @@ namespace dxcanvas
 {
 ENSURE_OR_THROW( rTarget,
   "CanvasHelper::setTarget(): Invalid target" );
-ENSURE_OR_THROW( !mpGraphicsProvider.get(),
+ENSURE_OR_THROW( !mpGraphicsProvider,
   "CanvasHelper::setTarget(): target set, old target 
would be overwritten" );
 
 mpGraphicsProvider = rTarget;
@@ -135,7 +135,7 @@ namespace dxcanvas
 {
 ENSURE_OR_THROW( rTarget,
  "CanvasHelper::setTarget(): invalid target" );
-ENSURE_OR_THROW( !mpGraphicsProvider.get(),
+ENSURE_OR_THROW( !mpGraphicsProvider,
  "CanvasHelper::setTarget(): target set, old target 
would be overwritten" );
 
 mpGraphicsProvider = rTarget;
diff --git a/canvas/source/directx/dx_canvashelper.hxx 
b/canvas/source/directx/dx_canvashelper.hxx
index 483033fd7c49..12c939e2e9ac 100644
--- a/canvas/source/directx/dx_canvashelper.hxx
+++ b/canvas/source/directx/dx_canvashelper.hxx
@@ -236,7 +236,7 @@ namespace dxcanvas
 /// Provides the Gdiplus::Graphics to render into
 GraphicsProviderSharedPtr  mpGraphicsProvider;
 
-bool needOutput() const { return mpGraphicsProvider.get() != nullptr; 
};
+bool needOutput() const { return bool(mpGraphicsProvider); };
 
 // returns transparency of color
 void setupGraphicsState( GraphicsSharedPtr const & rGraphics,
diff --git a/canvas/source/directx/dx_spritehelper.cxx 
b/canvas/source/directx/dx_spritehelper.cxx
index af4f340a5437..8f436283387c 100644
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.cxx
@@ -55,7 +55,7 @@ namespace dxcanvas
  const DXSurfaceBitmapSharedPtr& rBitmap,
  boolbShowSpriteBounds 
)
 {
-ENSURE_OR_THROW( rSpriteCanvas.get() &&
+ENSURE_OR_THROW( rSpriteCanva

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

[Andras Timar (via logerrit)]

 loleaflet/po/templates/loleaflet-ui.pot |4 +---
 loleaflet/src/control/Permission.js |4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 1e9408cf9f7e84264b0d7dca3737320161f9a64a
Author: Andras Timar 
AuthorDate: Wed Jul 22 17:30:18 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 4 23:24:18 2020 +0200

nicer formatting of alert message

Change-Id: Id4582b2ac1ad4212eb8f7c63dc6da8b2dea2e1e7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99235
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 24a8c9c37..6f707c8a5 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -824,9 +824,7 @@ msgid "The document could not be locked, and is opened in 
read-only mode."
 msgstr ""
 
 #: src/control/Permission.js:47 src/control/Permission.js:65
-msgid ""
-"\n"
-"Server returned this reason: \""
+msgid "Server returned this reason:"
 msgstr ""
 
 #: src/control/Permission.js:63
diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index b5a19439c..52e64a340 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -44,7 +44,7 @@ L.Map.include({
 
var alertMsg = _('The document could not be locked, and 
is opened in read-only mode.');
if (reason) {
-   alertMsg += _('\nServer returned this reason: 
"') + reason + '"';
+   alertMsg += '\n' + _('Server returned this 
reason:') + '\n"' + reason + '"';
}
vex.dialog.alert({ message: alertMsg });
 
@@ -62,7 +62,7 @@ L.Map.include({
// This is a failed response to an attempt to lock 
using mobile-edit-button
alertMsg = _('The document could not be locked.');
if (reason) {
-   alertMsg += _('\nServer returned this reason: 
"') + reason + '"';
+   alertMsg += '\n' + _('Server returned this 
reason:') + '\n"' + reason + '"';
}
vex.dialog.alert({ message: alertMsg });
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Other build errors

[Stephan Bergmann]

On 04/08/2020 20:57, julien2412 wrote:

Following previous errors, I encountered others:
[CXX] workdir/UnpackedTarball/libcmis/src/libcmis/gdrive-folder.cxx
In file included from /home/julien/lo/libo_perf/vcl/skia/salbmp.cxx:20:
/home/julien/lo/libo_perf/vcl/inc/skia/salbmp.hxx:107:10: error: this member
function can be declared static [loplugin:staticmethods]
 void verify() const {};
 ~^
1 error generated.


It appears that most people's --enable-compiler-plugins builds also use 
--enable-dbgutil, so various issues with 
--disable-dbgutil/--disable-assert-always-abort/etc. have sneaked in 
over time and went unnoticed.  I'm doing such a build right now, fixing 
whatever I find.


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

After several emails to you guys I have got this email that I was a little frustrating to me find you that you can not replicate my error , am maybe nothing will changed with this beautiful software L

[g adi]

Hi Victor  ! Hi guys !

 After several emails  to you guys I have got this email that I was a
little frustrating to me find you that you can not replicate my error , am
maybe nothing will changed with this beautiful software Libre and someone
else in the future  will got the same problem like me , someone else in the
past , like this guy here , and lessons are not learned because nobody
confirmed it and removed from the bugs, even with the post similar like
mine posted a few years ago .

https://ask.libreoffice.org/en/question/33150/libreoffice-just-not-saving-properly-and-deleted-1000-words-of-my-dissertation/
.

I have tried Google Docs now , never had this problem with loosing data ,
pictures in Google Docs before , did my thing , creating , editing and save
it using 2 extensions , 2 create 2 copies , I have learn my lesson with ODT
vs DOCx so on .

I have notice that the bug still persists in Google Docs too but , less
often .

So for this reason I have attached the both files , I have learned this too
Victor , now , so I have enclosed them here .
Check the pages 253 in Docx vs page 253 in pdf (empty in pdf ) , full in
Docx default Google Docs format .

So history bug is repeating and hunting still :

Hope now this will be helpful ?

One more time : Thank you for your time and for your hard work developing
this great Free product Libre !
I appreciate and respect your work and I hope my little contribution will
matter a little along with my suggestions and we can create a product even
much better ?!

Thanks .
kind regards,
adrian g

Hi, Adrian,
>
> I am sorry about it. I just want to know what could NOT happened.
> Unfortunately my bugreport without your previous document in odt format,
> which does not exist, .
> I am very sorry.
> Viktor
>


I have used now Google Docs doing


Download link
https://we.tl/t-sMvtD6l3s6
2 items

Raspunsuri detaliate la intrebari.docx
141 MB
Raspunsuri detaliate la intrebari.pdf
16.6 MB

On Thu, Jul 30, 2020 at 12:34 PM kov.h.vik.developer <
kov.h.vik.develo...@gmail.com> wrote:

> Hi, Adrian,
>
> I am sorry about it. I just want to know what could NOT happened.
> Unfortunately my bugreport without your previous document in odt format,
> which does not exist, nobody confirmed it and removed from the bugs.
> I am very sorry.
> Viktor
>
>  Eredeti üzenet 
> Feladó: g adi 
> Dátum: 2020. 07. 30. 9:51 (GMT+01:00)
> Címzett: "kov.h.vik.developer" 
> Tárgy: Re: Fwd: I have wrote for a couple of hours something like 56 pages
> after that I have save it pressing the button Save many times and I the end
> I have discovered that my document had lost 50 + pages ,
>
> No, l have copy paste pictures and screenshots, they were not web links, l
> have created index so on, it is not the first time l am doing this, like a
> small anatomic atlas with pictures, anatomy notes so on
>
> On Thu, 30 Jul 2020, 10:40 kov.h.vik.developer, <
> kov.h.vik.develo...@gmail.com> wrote:
>
>> You would like build in pictures from the web, and copied it's https
>> reference to your doc?
>>
>>  Eredeti üzenet 
>> Feladó: g adi 
>> Dátum: 2020. 07. 30. 9:25 (GMT+01:00)
>> Címzett: "kov.h.vik.developer" 
>> Tárgy: Re: Fwd: I have wrote for a couple of hours something like 56
>> pages after that I have save it pressing the button Save many times and I
>> the end I have discovered that my document had lost 50 + pages ,
>>
>> Hi Victor,
>> I still do not understand, color to red, link data? Can you  explain
>> please?
>>
>> On Thu, 30 Jul 2020, 10:20 kov.h.vik.developer, <
>> kov.h.vik.develo...@gmail.com> wrote:
>>
>>> Hi Adrian,
>>> I think a red line. I colored to red.
>>>
>>>  Eredeti üzenet 
>>> Feladó: g adi 
>>> Dátum: 2020. 07. 30. 8:17 (GMT+01:00)
>>> Címzett: "kov.h.vik.developer" 
>>> Tárgy: Re: Fwd: I have wrote for a couple of hours something like 56
>>> pages after that I have save it pressing the button Save many times and I
>>> the end I have discovered that my document had lost 50 + pages ,
>>>
>>> Hi Viktor,
>>> I don't understand yoyr question with linking data?
>>>
>>> On Thu, 30 Jul 2020, 09:00 kov.h.vik.developer, <
>>> kov.h.vik.develo...@gmail.com> wrote:
>>>
 Hi, Adrian,
 I opened your crashed doc with a simple text editor. You linked
 directly datas from the web, didn't you?
 Viktor

  Eredeti üzenet 
 Feladó: g adi 
 Dátum: 2020. 07. 29. 21:48 (GMT+01:00)
 Címzett: "kov.h.vik.developer" 
 Tárgy: Fwd: I have wrote for a couple of hours something like 56 pages
 after that I have save it pressing the button Save many times and I the end
 I have discovered that my document had lost 50 + pages ,



 -- Forwarded message -
 From: g adi 
 Date: Thu, Jul 23, 2020 at 7:56 PM
 Subject: Re: I have wrote for a couple of hours something like 56 pages
 after that I have save it pressing the button Save many times and I the end
 I have dis

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

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/modules/swriter.suppr |1 +
 sw/source/ui/table/tabledlg.cxx|   13 ++---
 sw/source/uibase/table/tablepg.hxx |1 +
 sw/uiconfig/swriter/ui/tablecolumnpage.ui  |   25 ++---
 4 files changed, 34 insertions(+), 6 deletions(-)

New commits:
commit 5eb43d74e1aea8eebb67e2d9e98335a1c5d81248
Author: Caolán McNamara 
AuthorDate: Tue Aug 4 16:37:29 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 22:16:18 2020 +0200

tdf#134930 remaining space is for display only purposes

use a label instead, keep spinbutton (but invisible) to format the label

Change-Id: I36660566df34891e8e813dee24375eacf55e09d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100127
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr 
b/solenv/sanitizers/ui/modules/swriter.suppr
index 1d7ca6b084b7..b0c581ee1cf8 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -222,6 +222,7 @@ 
sw/uiconfig/swriter/ui/tocindexpage.ui://GtkButton[@id='styles'] missing-label-f
 sw/uiconfig/swriter/ui/tocstylespage.ui://GtkButton[@id='assign'] 
button-no-label
 sw/uiconfig/swriter/ui/tablecolumnpage.ui://GtkButton[@id='back'] 
button-no-label
 sw/uiconfig/swriter/ui/tablecolumnpage.ui://GtkButton[@id='next'] 
button-no-label
+sw/uiconfig/swriter/ui/tablecolumnpage.ui://GtkSpinButton[@id='spacefmt'] 
no-labelled-by
 sw/uiconfig/swriter/ui/tablepreviewdialog.ui://GtkLabel[@id='description'] 
orphan-label
 sw/uiconfig/swriter/ui/tabletextflowpage.ui://GtkSpinButton[@id='pagenonf'] 
missing-label-for
 sw/uiconfig/swriter/ui/tabletextflowpage.ui://GtkLabel[@id='label39'] 
orphan-label
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 1705533500dd..c8f466728e80 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -732,7 +732,8 @@ SwTableColumnPage::SwTableColumnPage(weld::Container* 
pPage, weld::DialogControl
 , m_xModifyTableCB(m_xBuilder->weld_check_button("adaptwidth"))
 , m_xProportionalCB(m_xBuilder->weld_check_button("adaptcolumns"))
 , m_xSpaceFT(m_xBuilder->weld_label("spaceft"))
-, m_xSpaceED(m_xBuilder->weld_metric_spin_button("space", FieldUnit::CM))
+, m_xSpaceSFT(m_xBuilder->weld_label("space"))
+, m_xSpaceED(m_xBuilder->weld_metric_spin_button("spacefmt", 
FieldUnit::CM))
 , m_xUpBtn(m_xBuilder->weld_button("next"))
 , m_xDownBtn(m_xBuilder->weld_button("back"))
 {
@@ -1047,8 +1048,13 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 
nCurrentPos )
 m_nTableWidth += nAdd;
 }
 
-if(!m_bPercentMode)
+if (!m_bPercentMode)
+{
 m_xSpaceED->set_value(m_xSpaceED->normalize(m_xTableData->GetSpace() - 
m_nTableWidth), FieldUnit::TWIP);
+m_xSpaceSFT->set_label(m_xSpaceED->get_text());
+}
+else
+m_xSpaceSFT->set_label(OUString());
 
 for( sal_uInt16 i = 0; ( i < m_nNoOfVisibleCols ) && ( i < m_nMetFields ); 
i++)
 {
@@ -1091,12 +1097,13 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& 
)
 m_xModifyTableCB->set_active(false);
 }
 m_xSpaceFT->set_sensitive(!m_bPercentMode);
-m_xSpaceED->set_sensitive(!m_bPercentMode);
+m_xSpaceSFT->set_sensitive(!m_bPercentMode);
 m_xModifyTableCB->set_sensitive( !m_bPercentMode && m_bModifyTable );
 m_xProportionalCB->set_sensitive(!m_bPercentMode && m_bModifyTable );
 
 m_xSpaceED->set_value(m_xSpaceED->normalize(
 m_xTableData->GetSpace() - m_nTableWidth), FieldUnit::TWIP);
+m_xSpaceSFT->set_label(m_xSpaceED->get_text());
 
 }
 
diff --git a/sw/source/uibase/table/tablepg.hxx 
b/sw/source/uibase/table/tablepg.hxx
index 0643bfdf6c8a..c00f7dafb547 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -103,6 +103,7 @@ class SwTableColumnPage : public SfxTabPage
 std::unique_ptr m_xModifyTableCB;
 std::unique_ptr m_xProportionalCB;
 std::unique_ptr m_xSpaceFT;
+std::unique_ptr m_xSpaceSFT;
 std::unique_ptr m_xSpaceED;
 std::unique_ptr m_xUpBtn;
 std::unique_ptr m_xDownBtn;
diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui 
b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
index 00050c4e2a81..f0850b6c4c66 100644
--- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui
+++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -110,13 +110,32 @@
   
 
 
-  
-True
+  
 True
+True
 True
 adjustment1
 2
   
+  
+2
+0
+  
+
+
+  
+True
+False
+True
+True
+True
+0
+
+  
+static
+  
+
+  

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

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/modules/swriter.suppr |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 4bc8a29bcc311945c60a167a3615ad01453a714c
Author: Caolán McNamara 
AuthorDate: Tue Aug 4 16:33:44 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 22:16:01 2020 +0200

two unused suppressions

Change-Id: Ia8df1177bb0d60ce2201f1e91d19845c8b873602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100126
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr 
b/solenv/sanitizers/ui/modules/swriter.suppr
index cac93d642a2a..1d7ca6b084b7 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -18,7 +18,6 @@ 
sw/uiconfig/swriter/ui/bibliofragment.ui://GtkEntry[@id='entry'] no-labelled-by
 sw/uiconfig/swriter/ui/bibliofragment.ui://GtkComboBoxText[@id='listbox'] 
no-labelled-by
 sw/uiconfig/swriter/ui/bibliofragment.ui://GtkComboBoxText[@id='combobox'] 
no-labelled-by
 sw/uiconfig/swriter/ui/bibliofragment.ui://GtkLabel[@id='label'] orphan-label
-sw/uiconfig/swriter/ui/businessdatapage.ui://GtkEntry[@id='state'] 
no-labelled-by
 sw/uiconfig/swriter/ui/cardmediumpage.ui://GtkLabel[@id='formatinfo'] 
orphan-label
 sw/uiconfig/swriter/ui/cardmediumpage.ui://GtkComboBoxText[@id='hiddentype'] 
no-labelled-by
 sw/uiconfig/swriter/ui/ccdialog.ui://GtkLabel[@id='label4'] orphan-label
@@ -175,7 +174,6 @@ 
sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='docname'] orphan-la
 sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printing'] 
orphan-label
 sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printer'] 
orphan-label
 sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printinfo'] 
orphan-label
-sw/uiconfig/swriter/ui/privateuserpage.ui://GtkEntry[@id='state'] 
no-labelled-by
 
sw/uiconfig/swriter/ui/readonlymenu.ui://GtkMenuItem[@id='backgroundtogallery'] 
button-no-label
 sw/uiconfig/swriter/ui/readonlymenu.ui://GtkMenuItem[@id='backaslink'] 
button-no-label
 sw/uiconfig/swriter/ui/readonlymenu.ui://GtkMenuItem[@id='backascopy'] 
button-no-label
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/extras/macros-test.cxx |   33 +++
 sc/qa/extras/testdocuments/tdf128218.ods |binary
 2 files changed, 33 insertions(+)

New commits:
commit 178e3acd41225d2ba0c1bcca371c34770f1f30db
Author: Xisco Fauli 
AuthorDate: Tue Aug 4 16:50:39 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 4 21:59:38 2020 +0200

tdf#128218: sc_macros_test: Add unittest

Change-Id: Id0597de78873dccd7316c406364f1c4c2ae5bb93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100120
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 7289dcc75888..d158d8c412c5 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -46,6 +46,7 @@ public:
 void testTdf107902();
 void testTdf131296_legacy();
 void testTdf131296_new();
+void testTdf128218();
 
 CPPUNIT_TEST_SUITE(ScMacrosTest);
 CPPUNIT_TEST(testStarBasic);
@@ -60,6 +61,7 @@ public:
 CPPUNIT_TEST(testTdf107902);
 CPPUNIT_TEST(testTdf131296_legacy);
 CPPUNIT_TEST(testTdf131296_new);
+CPPUNIT_TEST(testTdf128218);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -705,6 +707,37 @@ void ScMacrosTest::testTdf131296_new()
 xCloseable->close(true);
 }
 
+void ScMacrosTest::testTdf128218()
+{
+OUString aFileName;
+createFileURL("tdf128218.ods", aFileName);
+uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
+
+CPPUNIT_ASSERT_MESSAGE("Failed to load the doc", xComponent.is());
+
+Any aRet;
+Sequence< sal_Int16 > aOutParamIndex;
+Sequence< Any > aOutParam;
+Sequence< uno::Any > aParams;
+
+SfxObjectShell::CallXScript(
+xComponent,
+
"vnd.sun.Star.script:Standard.Module1.TestRAND?language=Basic&location=document",
+aParams, aRet, aOutParamIndex, aOutParam);
+
+OUString aReturnValue;
+aRet >>= aReturnValue;
+
+// Without the fix in place, this test would have failed with
+// - Expected: Double
+// - Actual  : Object()
+
+CPPUNIT_ASSERT_EQUAL(OUString("Double"), aReturnValue);
+
+css::uno::Reference xCloseable(xComponent, 
css::uno::UNO_QUERY_THROW);
+xCloseable->close(true);
+}
+
 ScMacrosTest::ScMacrosTest()
   : UnoApiTest("/sc/qa/extras/testdocuments")
 {
diff --git a/sc/qa/extras/testdocuments/tdf128218.ods 
b/sc/qa/extras/testdocuments/tdf128218.ods
new file mode 100644
index ..9fa3e8b4ecbd
Binary files /dev/null and b/sc/qa/extras/testdocuments/tdf128218.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - 2 commits - source/text

[Olivier Hallot (via logerrit)]

 source/text/scalc/00/sheet_menu.xhp|2 +-
 source/text/shared/01/digitalsignaturespdf.xhp |2 +-
 source/text/shared/main0212.xhp|1 -
 source/text/simpress/main0200.xhp  |5 ++---
 source/text/simpress/main0210.xhp  |5 ++---
 5 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 2561fcba5336501a97630aa33e4604a17b416390
Author: Olivier Hallot 
AuthorDate: Tue Aug 4 14:15:19 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Aug 4 21:55:35 2020 +0200

Fix some "D'oh! You found a bug" here and there

Change-Id: I0b3b4eec07378dcc3a110bfb7e2205220f30c579
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100132
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 92d4f32170e6d3a1b65857bb83e22c4bf7f565bd)



No impact on translations

Change-Id: I5cbf545db5c2c603e1dce66ef2d3989a134ae85a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100062
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/digitalsignaturespdf.xhp 
b/source/text/shared/01/digitalsignaturespdf.xhp
index 809ef75a6..c804c02bc 100644
--- a/source/text/shared/01/digitalsignaturespdf.xhp
+++ b/source/text/shared/01/digitalsignaturespdf.xhp
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 About 
Digital Signatures
 
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index 92cf50a6e..7a71fa89c 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -70,7 +70,6 @@
   
   
   
-  
   
   
   
diff --git a/source/text/simpress/main0200.xhp 
b/source/text/simpress/main0200.xhp
index 716cd6aa3..63f944750 100644
--- a/source/text/simpress/main0200.xhp
+++ b/source/text/simpress/main0200.xhp
@@ -25,8 +25,7 @@
 
 
 
-Toolbars
-
+Toolbars
 
 
 
@@ -37,7 +36,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/simpress/main0210.xhp 
b/source/text/simpress/main0210.xhp
index b675d8bce..05b6561bf 100644
--- a/source/text/simpress/main0210.xhp
+++ b/source/text/simpress/main0210.xhp
@@ -92,8 +92,7 @@
 Switches the 3D 
effects on and off for the selected objects.
 
 
-Interaction
-
-
+
+
 
 
commit 0ab371609e39742bfb63f0783351029ac04ea8b7
Author: Olivier Hallot 
AuthorDate: Mon Aug 3 11:49:12 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Aug 4 21:55:24 2020 +0200

Fix tag contents

Found you finally...

Change-Id: I71e11b570e31ad1cc470dfea3e54935e000d80f0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100011
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 8b7b468cfcb1591972ee2e47a295ee4cf86a46e8)

No Impact on translations

Change-Id: If2f64048ef18595aed9c3f2ef193494c14558fcc
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100057
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/00/sheet_menu.xhp 
b/source/text/scalc/00/sheet_menu.xhp
index f192d0775..2264ccae8 100644
--- a/source/text/scalc/00/sheet_menu.xhp
+++ b/source/text/scalc/00/sheet_menu.xhp
@@ -21,7 +21,7 @@
 
   
 Sheet Menu
-/scalc/00/sheet_menu.xhp
+/text/scalc/00/sheet_menu.xhp
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - 2 commits - helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 0a903341e2516ead793643edf0a1d1e035436065
Author: Olivier Hallot 
AuthorDate: Tue Aug 4 16:55:35 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Aug 4 21:55:35 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 2561fcba5336501a97630aa33e4604a17b416390
  - Fix some "D'oh! You found a bug" here and there

Change-Id: I0b3b4eec07378dcc3a110bfb7e2205220f30c579
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100132
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 92d4f32170e6d3a1b65857bb83e22c4bf7f565bd)



No impact on translations

Change-Id: I5cbf545db5c2c603e1dce66ef2d3989a134ae85a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100062
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 0ab371609e39..2561fcba5336 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0ab371609e39742bfb63f0783351029ac04ea8b7
+Subproject commit 2561fcba5336501a97630aa33e4604a17b416390
commit 7dcee042265022121026e29098e0e7804a630d78
Author: Olivier Hallot 
AuthorDate: Tue Aug 4 16:55:24 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Aug 4 21:55:24 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 0ab371609e39742bfb63f0783351029ac04ea8b7
  - Fix tag contents

Found you finally...

Change-Id: I71e11b570e31ad1cc470dfea3e54935e000d80f0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100011
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 8b7b468cfcb1591972ee2e47a295ee4cf86a46e8)

No Impact on translations

Change-Id: If2f64048ef18595aed9c3f2ef193494c14558fcc
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100057
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 6a57daed4f84..0ab371609e39 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6a57daed4f84b22c773fc79eae10d76d7d46fd75
+Subproject commit 0ab371609e39742bfb63f0783351029ac04ea8b7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/dlg/adtabdlg.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cd9c8851baf0f74f0f5044eedf8d2afaff895164
Author: Caolán McNamara 
AuthorDate: Tue Aug 4 14:19:01 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 21:40:24 2020 +0200

explicit text column to avoid dummy nodes for non-toggle case

Change-Id: If216705929454146d39b291b9a6483c68c3eac89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100123
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx 
b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 4ad01555d226..35e29ed17f31 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -106,12 +106,12 @@ OUString TableListFacade::getSelectedName( OUString& 
_out_rAliasName ) const
 if (rTableList.iter_parent(*xCatalog))
 {
 if (!xAll || !xCatalog->equal(*xAll))
-aCatalog = rTableList.get_text(*xCatalog);
+aCatalog = rTableList.get_text(*xCatalog, 0);
 }
-aSchema = rTableList.get_text(*xSchema);
+aSchema = rTableList.get_text(*xSchema, 0);
 }
 }
-aTableName = rTableList.get_text(*xEntry);
+aTableName = rTableList.get_text(*xEntry, 0);
 
 OUString aComposedName;
 try
@@ -318,7 +318,7 @@ OUString QueryListFacade::getSelectedName( OUString& 
_out_rAliasName ) const
 std::unique_ptr xEntry(m_rQueryList.make_iterator());
 const bool bEntry = m_rQueryList.get_selected(xEntry.get());
 if (bEntry)
-sSelected = _out_rAliasName = m_rQueryList.get_text(*xEntry);
+sSelected = _out_rAliasName = m_rQueryList.get_text(*xEntry, 0);
 return sSelected;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/UIConfig_dbaccess.mk   |1 
 dbaccess/source/ui/inc/JoinExchange.hxx |8 
 dbaccess/source/ui/inc/TableWindow.hxx  |2 
 dbaccess/source/ui/inc/TableWindowListBox.hxx   |   67 +++-
 dbaccess/source/ui/querydesign/ConnectionLine.cxx   |   31 +-
 dbaccess/source/ui/querydesign/JoinExchange.cxx |   22 -
 dbaccess/source/ui/querydesign/JoinTableView.cxx|   36 +-
 dbaccess/source/ui/querydesign/QTableWindow.cxx |   26 -
 dbaccess/source/ui/querydesign/QTableWindow.hxx |2 
 dbaccess/source/ui/querydesign/QueryTableView.cxx   |   10 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx   |7 
 dbaccess/source/ui/querydesign/TableWindow.cxx  |   84 +++--
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx|1 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx   |  228 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx |3 
 dbaccess/source/ui/relationdesign/RelationTableView.cxx |6 
 dbaccess/uiconfig/ui/tablelistbox.ui|   71 
 17 files changed, 309 insertions(+), 296 deletions(-)

New commits:
commit 67e5f16e53a05587c4f36518a56e931f4708e16b
Author: Caolán McNamara 
AuthorDate: Sun Aug 2 15:05:27 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 21:40:44 2020 +0200

weld OTableWindowListBox

Change-Id: Iae1d2da93fd150d2a333a55bd5b3c06aad0a308f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100030
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index d2d30dd9b7fd..74ba080879d8 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/sqlexception \
 dbaccess/uiconfig/ui/tabledesignrowmenu \
 dbaccess/uiconfig/ui/tabledesignsavemodifieddialog \
+dbaccess/uiconfig/ui/tablelistbox \
 dbaccess/uiconfig/ui/tablesfilterdialog \
 dbaccess/uiconfig/ui/tablesfilterpage \
 dbaccess/uiconfig/ui/tablesjoindialog \
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx 
b/dbaccess/source/ui/inc/JoinExchange.hxx
index a1a73595ae5c..2412c64c365f 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -30,7 +30,7 @@ namespace dbaui
 // OJoinExchObj: Additional data to create Joins in the JoinShell
 
 typedef ::cppu::ImplHelper1< css::lang::XUnoTunnel > OJoinExchObj_Base;
-class OJoinExchObj final : public TransferableHelper, public 
OJoinExchObj_Base
+class OJoinExchObj final : public TransferDataContainer, public 
OJoinExchObj_Base
 {
 boolm_bFirstEntry;
 
@@ -40,8 +40,8 @@ namespace dbaui
 virtual ~OJoinExchObj() override;
 
 public:
-OJoinExchObj(const OJoinExchangeData& jxdSource, bool _bFirstEntry);
-
+OJoinExchObj();
+void setDescriptors(const OJoinExchangeData& jxdSource, bool 
_bFirstEntry);
 
 // XInterface
 virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& 
aType ) override;
@@ -61,8 +61,6 @@ namespace dbaui
 virtual voidAddSupportedFormats() override;
 virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, 
const OUString& rDestDoc ) override;
 virtual voidDragFinished( sal_Int8 nDropAction ) 
override;
-
-using TransferableHelper::StartDrag;
 };
 }
 #endif
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx 
b/dbaccess/source/ui/inc/TableWindow.hxx
index e356a5a265f7..83baf38e53fd 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -90,7 +90,7 @@ namespace dbaui
 void FillListBox();
 // called at EACH Init
 
-virtual void OnEntryDoubleClicked(SvTreeListEntry* /*pEntry*/) { }
+virtual void OnEntryDoubleClicked(weld::TreeIter& /*rEntry*/) { }
 // called from the DoubleClickHdl of the ListBox
 
 /** HandleKeyInput tries to handle the KeyEvent. Movement or deletion
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx 
b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 249a1dedf330..5ca01098266b 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
 
-#include 
-#include 
+#include 
+#include 
 #include "callbacks.hxx"
 
 struct AcceptDropEvent;
@@ -32,67 +32,88 @@ namespace dbaui
 {
 public:
 VclPtrpListBox;   // the ListBox inside 
the same (you can get the TabWin and the WinName out of it)
-SvTreeListEntry*pEntry; // the entry, which was 
dragged or to which was dr

[Libreoffice-commits] core.git: embedserv/source extensions/source sal/qa vcl/source

[Stephan Bergmann (via logerrit)]

 embedserv/source/embed/docholder.cxx |4 +---
 extensions/source/ole/unoobjw.cxx|   20 +---
 sal/qa/osl/file/osl_File.cxx |3 +--
 vcl/source/treelist/transfer.cxx |3 +--
 4 files changed, 8 insertions(+), 22 deletions(-)

New commits:
commit ef0815d8e19e18cc10d7078d47a04c8848668738
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 14:47:29 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 21:38:25 2020 +0200

loplugin:elidestringvar (clang-cl)

...plus ensuing loplugin:unnecessaryparen in 
vcl/source/treelist/transfer.cxx

Change-Id: I1abf2e0c589c2c124399c1337f5dd703ee7d04a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100094
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/embedserv/source/embed/docholder.cxx 
b/embedserv/source/embed/docholder.cxx
index a4b5462199d9..cb6f19b68e7e 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -1004,10 +1004,8 @@ IDispatch* DocumentHolder::GetIDispatch()
 {
 if ( !m_pIDispatch && m_xDocument.is() )
 {
-const OUString aServiceName (
-"com.sun.star.bridge.OleBridgeSupplier2" );
 uno::Reference< bridge::XBridgeSupplier2 > xSupplier(
-m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );
+m_xFactory->createInstance( 
"com.sun.star.bridge.OleBridgeSupplier2" ), uno::UNO_QUERY );
 
 if ( xSupplier.is() )
 {
diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index e878fddbb682..65382fa542bc 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2037,9 +2037,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
InterfaceOleWrapper::Invoke(DISPID dispidMembe
 }
 catch(...)
 {
-OUString message= "InterfaceOleWrapper::Invoke : \n"
-  "Unexpected exception";
-writeExcepinfo(pexcepinfo, message);
+writeExcepinfo(pexcepinfo, "InterfaceOleWrapper::Invoke : \nUnexpected 
exception");
 ret = DISP_E_EXCEPTION;
 }
 
@@ -2130,9 +2128,7 @@ HRESULT InterfaceOleWrapper::doInvoke( DISPPARAMS * 
pdispparams, VARIANT * pvarR
 }
 catch( ... )
  {
-OUString message= "InterfaceOleWrapper::doInvoke : \n"
-  "Unexpected exception";
-writeExcepinfo(pexcepinfo, message);
+writeExcepinfo(pexcepinfo, "InterfaceOleWrapper::doInvoke : 
\nUnexpected exception");
 ret = DISP_E_EXCEPTION;
  }
 return ret;
@@ -2168,9 +2164,7 @@ HRESULT InterfaceOleWrapper::doGetProperty( DISPPARAMS * 
/*pdispparams*/, VARIAN
 }
 catch( ... )
 {
-OUString message= "InterfaceOleWrapper::doInvoke : \n"
-  "Unexpected exception";
-writeExcepinfo(pexcepinfo, message);
+writeExcepinfo(pexcepinfo, "InterfaceOleWrapper::doInvoke : 
\nUnexpected exception");
 ret = DISP_E_EXCEPTION;
 }
 return  ret;
@@ -2962,9 +2956,7 @@ HRESULT InterfaceOleWrapper::InvokeGeneral( DISPID 
dispidMember, unsigned short
 }
 catch( ... )
  {
-OUString message= "InterfaceOleWrapper::InvokeGeneral : \n"
-  "Unexpected exception";
-writeExcepinfo(pexcepinfo, message);
+writeExcepinfo(pexcepinfo, "InterfaceOleWrapper::InvokeGeneral : 
\nUnexpected exception");
 ret = DISP_E_EXCEPTION;
  }
 return ret;
@@ -3431,9 +3423,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP  
UnoObjectWrapperRemoteOpt::Invoke ( DISPID di
 }
 catch(...)
 {
-OUString message= "UnoObjectWrapperRemoteOpt::Invoke : \n"
-  "Unexpected exception";
-writeExcepinfo(pexcepinfo, message);
+writeExcepinfo(pexcepinfo, "UnoObjectWrapperRemoteOpt::Invoke : 
\nUnexpected exception");
 ret = DISP_E_EXCEPTION;
 }
 
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index dbe461ae3f53..9bf73c421d45 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1805,8 +1805,7 @@ namespace osl_FileStatus
 #else // Windows version
 void getAttributes_004()
 {
-OUString aUserHiddenFileURL ("file:///c:/AUTOEXEC.BAT");
-nError = DirectoryItem::get(aUserHiddenFileURL, rItem_hidden);
+nError = DirectoryItem::get("file:///c:/AUTOEXEC.BAT", 
rItem_hidden);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("get item fail", 
osl::FileBase::E_None, nError);
 FileStatus   rFileStatus(osl_FileStatus_Mask_Attributes);
 nError = rItem_hidden.getFileStatus(rFileStatus);
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index eefc22e8ba6c..dca44726b609 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -843,8 +843,7 @@ bool TransferableHelper::SetINetBookmark( const 
INetBookmark& rBmk,
 
   

[Libreoffice-commits] core.git: external/gpgmepp

[Stephan Bergmann (via logerrit)]

 external/gpgmepp/UnpackedTarball_gpgmepp.mk |1 +
 external/gpgmepp/clang-cl.patch |   20 
 2 files changed, 21 insertions(+)

New commits:
commit fc7464a882f22e7974135e44867d1a183881edd9
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 14:37:42 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 21:37:57 2020 +0200

external/gpgmepp: Avoid overloaded utf8_to_wchar in C code

> w32-util.c(176,1): error: conflicting types for 'utf8_to_wchar'
> utf8_to_wchar (const char *string)
> ^
> workdir/UnpackedTarball/libgpg-error/src\gpg-error.h(1109,10): note: 
previous declaration is here
> wchar_t *utf8_to_wchar (const char *string, size_t length, size_t 
*retlen);
>  ^

with clang-cl on Windows, while in a case like this where there is only one
definition, the mismatching declaration merely gets warned about by MSVC 
with
"warning C4029: declared formal parameter list different from definition".  
(And
on non-Windows that w32-util.c apparently doesn't get compiled at all.)

Change-Id: I76cfc3ec086325c527c04dbe0e8341cb9b775c50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100091
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk 
b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index 933d228ac1d3..b2feb6ebc2b7 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -29,5 +29,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
 external/gpgmepp/gcc9.patch \
 external/gpgmepp/ubsan.patch \
 external/gpgmepp/c++20.patch \
+external/gpgmepp/clang-cl.patch \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgmepp/clang-cl.patch b/external/gpgmepp/clang-cl.patch
new file mode 100644
index ..3f63d0bc6bc8
--- /dev/null
+++ b/external/gpgmepp/clang-cl.patch
@@ -0,0 +1,20 @@
+--- src/w32-util.c
 src/w32-util.c
+@@ -173,7 +173,7 @@
+NULL; caller may use GetLastError to get the actual error number.
+Calling this function with STRING set to NULL is not defined. */
+ static wchar_t *
+-utf8_to_wchar (const char *string)
++utf8_to_wchar_ (const char *string)
+ {
+   int n;
+   wchar_t *result;
+@@ -206,7 +206,7 @@
+   if (!string)
+ return NULL;
+ 
+-  return utf8_to_wchar (string);
++  return utf8_to_wchar_ (string);
+ }
+ 
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 linguistic/source/dlistimp.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 5a28a2ac3f692975306025e9e35e95f4c9ddcd38
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 14:30:04 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 20:48:15 2020 +0200

loplugin:referencecasting (clang-cl)

("the source reference is already a subtype of the destination reference")

Change-Id: Ifba02593d77057eaa356ec7c3c76de64ba65cf09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100089
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 31f0a20c4230..03c576a820f4 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -530,10 +530,8 @@ void SAL_CALL
 size_t nCount = rDicList.size();
 for (size_t i = 0;  i < nCount;  i++)
 {
-uno::Reference< XDictionary > xDic( rDicList[i], UNO_QUERY );
-
 // save (modified) dictionaries
-uno::Reference< frame::XStorable >  xStor( xDic , UNO_QUERY );
+uno::Reference< frame::XStorable >  xStor( rDicList[i] , UNO_QUERY 
);
 if (xStor.is())
 {
 try
@@ -548,8 +546,8 @@ void SAL_CALL
 
 // release references to (members of) this object hold by
 // dictionaries
-if (xDic.is())
-xDic->removeDictionaryEventListener( mxDicEvtLstnrHelper.get() 
);
+if (rDicList[i].is())
+rDicList[i]->removeDictionaryEventListener( 
mxDicEvtLstnrHelper.get() );
 }
 }
 mxDicEvtLstnrHelper.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd.service

[Michael Meeks (via logerrit)]

 loolwsd.service |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b38909bfa4a4f0ce8bd10364b8dfe13fff12ec07
Author: Michael Meeks 
AuthorDate: Tue Aug 4 19:30:20 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Aug 4 20:43:03 2020 +0200

Remove default file descriptor limit.

Change-Id: I1b811bd2fbabaa7c23861b215dc254832d200324
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100134
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/loolwsd.service b/loolwsd.service
index 2204bb736..7d64887d6 100644
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -10,6 +10,7 @@ TimeoutStopSec=120
 User=lool
 KillMode=control-group
 Restart=always
+LimitNOFILE=infinity:infinity
 
 ProtectSystem=strict
 ReadWritePaths=/opt/lool
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Build error cppu/source/uno/check.cxx:138:11: error: unused class member [loplugin:unusedmember]

[julien2412]

Hello,

On pc Debian x86-64 with master sources updated on a 2nd build where I don't
use enable-dbgutil but I still use --enable-werror, I got these errors:
/home/julien/lo/libo_perf/cppu/source/uno/check.cxx:138:11: error: unused
class member [loplugin:unusedmember]
Char3 chars;
~~^
/home/julien/lo/libo_perf/cppu/source/uno/check.cxx:139:10: error: unused
class member [loplugin:unusedmember]
char c;
~^

I must recognize I don't know why I didn't get these before.

Any thoughts?

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: desktop/source dtrans/source extensions/source fpicker/source sal/osl setup_native/source shell/source vcl/win

[Stephan Bergmann (via logerrit)]

 desktop/source/minidump/minidump.cxx|2 
 dtrans/source/win32/ftransl/ftransl.cxx |2 
 extensions/source/scanner/scanwin.cxx   |2 
 fpicker/source/win32/VistaFilePickerEventHandler.cxx|4 
 fpicker/source/win32/VistaFilePickerImpl.cxx|   32 ++--
 fpicker/source/win32/VistaFilePickerImpl.hxx|   68 
+-
 sal/osl/w32/file_dirvol.cxx |6 
 sal/osl/w32/file_error.cxx  |2 
 setup_native/source/win32/customactions/inst_msu/inst_msu.cxx   |2 
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |   10 -
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx   |2 
 shell/source/win32/spsupp/spsuppServ.cxx|2 
 vcl/win/gdi/salfont.cxx |4 
 vcl/win/gdi/salprn.cxx  |4 
 vcl/win/window/keynames.cxx |   16 +-
 vcl/win/window/salframe.cxx |2 
 16 files changed, 80 insertions(+), 80 deletions(-)

New commits:
commit 924341e2c73e28b92fb927f2a4b5494ded5f257a
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 15:42:52 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 20:20:41 2020 +0200

Improved loplugin:staticanonymous -> redundantstatic redux, clang-cl

Change-Id: Ie6dc22edbcfdf05ab8d7d668cb7cc33b5b747995
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100100
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/desktop/source/minidump/minidump.cxx 
b/desktop/source/minidump/minidump.cxx
index cdf7bf049ecb..5c245abde693 100644
--- a/desktop/source/minidump/minidump.cxx
+++ b/desktop/source/minidump/minidump.cxx
@@ -16,7 +16,7 @@
 
 #include 
 
-static const char kUserAgent[] = "Breakpad/1.0 (Linux)";
+const char kUserAgent[] = "Breakpad/1.0 (Linux)";
 
 static std::map readStrings(std::istream& file)
 {
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx 
b/dtrans/source/win32/ftransl/ftransl.cxx
index f2c5d6487e48..991bc2d2c10f 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -89,7 +89,7 @@ FormatEntry::FormatEntry(
 // format number we can stop if we find the first
 // CF_INVALID
 
-static const std::vector< FormatEntry > g_TranslTable {
+const std::vector< FormatEntry > g_TranslTable {
 //SotClipboardFormatId::DIF
 FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", 
"DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT),
 // SotClipboardFormatId::BITMAP
diff --git a/extensions/source/scanner/scanwin.cxx 
b/extensions/source/scanner/scanwin.cxx
index 58fca685fac3..bfe4c3c37006 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -125,7 +125,7 @@ private:
 void Reset(); // cleanup thread and manager
 };
 
-static Twain aTwain;
+Twain aTwain;
 
 Twain::ShimListenerThread::ShimListenerThread(const VclPtr& 
xTopWindow)
 : salhelper::Thread("TWAINShimListenerThread")
diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.cxx 
b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
index a116a69092c2..4275adf3b749 100644
--- a/fpicker/source/win32/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
@@ -233,8 +233,8 @@ void VistaFilePickerEventHandler::stopListening()
 }
 }
 
-static const char PROP_CONTROL_ID[] = "control_id";
-static const char PROP_PICKER_LISTENER[] = "picker_listener";
+const char PROP_CONTROL_ID[] = "control_id";
+const char PROP_PICKER_LISTENER[] = "picker_listener";
 
 namespace {
 
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 3b8443a40c65..6c0c6b53856f 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -78,19 +78,19 @@ namespace vista{
 // types, const etcpp.
 
 
-static const ::sal_Int16 INVALID_CONTROL_ID = -1;
-static const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
+const ::sal_Int16 INVALID_CONTROL_ID = -1;
+const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
 
 // Guids used for IFileDialog::SetClientGuid
-static const GUID CLIENTID_FILEDIALOG_SIMPLE= {0xB8628FD3, 0xA3F5, 
0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
-static const GUID CLIENTID_FILEDIALOG_OPTIONS   = {0x93ED486F, 0x0D04, 
0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36};
-static const GUID CLIENTID_FILESAVE_PASSWORD= {0xC12D4F4C, 0x4D41, 
0x4D4F, 0x97, 0xEF, 0x87, 0xF9, 0x8D, 0xB6, 0x1E, 0xA6};
-static const GUID CLIENTID_FILESAVE_SELECTION   = {0x5B2482B3, 0x0358, 
0x4E09, 0xAA, 0x64, 0x2B, 0x76, 0xB2, 0xA0, 0xDD, 0xFE};
-static con

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

[Stephan Bergmann (via logerrit)]

 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit ca4df96c7d5c0883da42774a3e99f552739f371f
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 16:06:44 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 20:21:21 2020 +0200

Remove seemingly unused #includes

...that caused

> desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx(81,10): error: 
macro is not used [-Werror,-Wunused-macros]
> # define WIN32_LEAN_AND_MEAN
>  ^

with clang-cl

Change-Id: I129f659aa196e0e713d7bd9065c637d65ee2ac10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100118
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx 
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 19a3585689bd..ad03a9a7d66f 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -77,12 +77,7 @@
 #include 
 
 #ifdef _WIN32
-#if !defined WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
 #include 
-#include 
-#include 
 #endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 Package_html_media.mk|7 +
 source/media/helpimg/sbasic/Input_statement.svg  |   42 
 source/media/helpimg/sbasic/Line-Input_statement.svg |   35 +++
 source/media/helpimg/sbasic/Reset_statement.svg  |   32 ++
 source/media/helpimg/sbasic/Seek_statement.svg   |   38 
 source/media/helpimg/sbasic/Write_statement.svg  |   42 
 source/text/sbasic/shared/03010103.xhp   |   69 --
 source/text/sbasic/shared/03020104.xhp   |   66 +++--
 source/text/sbasic/shared/03020202.xhp   |   90 +--
 source/text/sbasic/shared/03020203.xhp   |   50 ++
 source/text/sbasic/shared/03020204.xhp   |   13 +-
 source/text/sbasic/shared/03020205.xhp   |   68 --
 source/text/sbasic/shared/03020305.xhp   |   36 ---
 13 files changed, 395 insertions(+), 193 deletions(-)

New commits:
commit 7bb1ec81e997e270be39f5639073f5190dd3655e
Author: Alain Romedenne 
AuthorDate: Mon Aug 3 15:00:01 2020 +0200
Commit: Olivier Hallot 
CommitDate: Tue Aug 4 19:37:54 2020 +0200

tdf131416 Basic syntax diagrams

- Input, Line Input, Print, Put, Reset, Seek and Write statements

Added comma|semicolon delimiter information

Change-Id: I1ef994f1fe68db3d1b8f5d1a85d3764078ab33f3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99925
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/Package_html_media.mk b/Package_html_media.mk
index 1c755389d..a2a8641da 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -108,6 +108,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/smzb8.png \
 helpimg/smzb9.png \
 helpimg/sbasic/a_statement.svg \
+helpimg/sbasic/access_fragment.svg \
 helpimg/sbasic/argument_fragment.svg \
 helpimg/sbasic/array_fragment.svg \
 helpimg/sbasic/char_fragment.svg \
@@ -129,12 +130,13 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/Function_statement.svg \
 helpimg/sbasic/Get_statement.svg \
 helpimg/sbasic/If_statement.svg \
+helpimg/sbasic/Input_statement.svg \
 helpimg/sbasic/LetSet_statement.svg \
+helpimg/sbasic/Line-Input_statement.svg \
 helpimg/sbasic/On-Error_statement.svg \
 helpimg/sbasic/On-GoSub-GoTo_statement.svg \
 helpimg/sbasic/Option_statement.svg \
 helpimg/sbasic/Open_statement.svg \
-helpimg/sbasic/access_fragment.svg \
 helpimg/sbasic/locking_fragment.svg \
 helpimg/sbasic/Print_statement.svg \
 helpimg/sbasic/Property-Get_statement.svg \
@@ -142,10 +144,13 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/Put_statement.svg \
 helpimg/sbasic/ReDim_statement.svg \
 helpimg/sbasic/Resume_statement.svg \
+helpimg/sbasic/Reset_statement.svg \
+helpimg/sbasic/Seek_statement.svg \
 helpimg/sbasic/Select-Case_statement.svg \
 helpimg/sbasic/Sub_statement.svg \
 helpimg/sbasic/Type_statement.svg \
 helpimg/sbasic/While_statement.svg \
+helpimg/sbasic/Write_statement.svg \
 helpimg/scalc/coordinates-to-polar-01.svg \
 helpimg/starmath/harpoon.svg \
 helpimg/starmath/wideharpoon.svg \
diff --git a/source/media/helpimg/sbasic/Input_statement.svg 
b/source/media/helpimg/sbasic/Input_statement.svg
new file mode 100644
index 0..1c4b27035
--- /dev/null
+++ b/source/media/helpimg/sbasic/Input_statement.svg
@@ -0,0 +1,42 @@
+http://www.w3.org/2000/svg";>
+
+/*  */
+
+
+Input
+
+
+#
+fileNum
+
+,
+;
+
+var
+,
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/Line-Input_statement.svg 
b/source/media/helpimg/sbasic/Line-Input_statement.svg
new file mode 100644
index 0..8d6479967
--- /dev/null
+++ b/source/media/helpimg/sbasic/Line-Input_statement.svg
@@ -0,0 +1,35 @@
+http://www.w3.org/2000/svg";>
+
+/* 

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 3e582159682a66fbe342e6a70809a3f7378472f4
Author: Alain Romedenne 
AuthorDate: Tue Aug 4 19:37:54 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Aug 4 19:37:54 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7bb1ec81e997e270be39f5639073f5190dd3655e
  - tdf131416 Basic syntax diagrams

- Input, Line Input, Print, Put, Reset, Seek and Write statements

Added comma|semicolon delimiter information

Change-Id: I1ef994f1fe68db3d1b8f5d1a85d3764078ab33f3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99925
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 8b7b468cfcb1..7bb1ec81e997 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8b7b468cfcb1591972ee2e47a295ee4cf86a46e8
+Subproject commit 7bb1ec81e997e270be39f5639073f5190dd3655e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 56223a535d9c1da3ebf36dac9ee09e62b6de242a
Author: Olivier Hallot 
AuthorDate: Tue Aug 4 14:38:17 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Aug 4 19:38:17 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 92d4f32170e6d3a1b65857bb83e22c4bf7f565bd
  - Fix some "D'oh! You found a bug" here and there

Change-Id: I0b3b4eec07378dcc3a110bfb7e2205220f30c579
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100132
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 7bb1ec81e997..92d4f32170e6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7bb1ec81e997e270be39f5639073f5190dd3655e
+Subproject commit 92d4f32170e6d3a1b65857bb83e22c4bf7f565bd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/shared/01/digitalsignaturespdf.xhp |2 +-
 source/text/shared/main0212.xhp|1 -
 source/text/simpress/main0200.xhp  |5 ++---
 source/text/simpress/main0210.xhp  |5 ++---
 4 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 92d4f32170e6d3a1b65857bb83e22c4bf7f565bd
Author: Olivier Hallot 
AuthorDate: Tue Aug 4 14:15:19 2020 -0300
Commit: Olivier Hallot 
CommitDate: Tue Aug 4 19:38:17 2020 +0200

Fix some "D'oh! You found a bug" here and there

Change-Id: I0b3b4eec07378dcc3a110bfb7e2205220f30c579
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100132
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/digitalsignaturespdf.xhp 
b/source/text/shared/01/digitalsignaturespdf.xhp
index b244e2ae5..992423c9d 100644
--- a/source/text/shared/01/digitalsignaturespdf.xhp
+++ b/source/text/shared/01/digitalsignaturespdf.xhp
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 About 
Digital Signatures
 
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index 570aff2f5..26fbe8d88 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -70,7 +70,6 @@
   
   
   
-  
   
   
   
diff --git a/source/text/simpress/main0200.xhp 
b/source/text/simpress/main0200.xhp
index 716cd6aa3..63f944750 100644
--- a/source/text/simpress/main0200.xhp
+++ b/source/text/simpress/main0200.xhp
@@ -25,8 +25,7 @@
 
 
 
-Toolbars
-
+Toolbars
 
 
 
@@ -37,7 +36,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/simpress/main0210.xhp 
b/source/text/simpress/main0210.xhp
index 887e0f5c2..56626f488 100644
--- a/source/text/simpress/main0210.xhp
+++ b/source/text/simpress/main0210.xhp
@@ -92,8 +92,7 @@
 Switches the 3D 
effects on and off for the selected objects.
 
 
-Interaction
-
-
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js|   
33 +-
 cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js  |   
 2 
 cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js|   
 2 
 cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js  |   
 2 
 cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js |   
 2 
 cypress_test/integration_tests/multiuser/slide_operations_user2_spec.js|   
 2 
 6 files changed, 23 insertions(+), 20 deletions(-)

New commits:
commit f657321d2b5a8a3bdfc0af842aacbd609511f68e
Author: Tamás Zolnai 
AuthorDate: Tue Aug 4 17:40:28 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Aug 4 19:04:56 2020 +0200

cypress: don't copy the test file by the second user.

We use file copying to create a clean test document
in the working directory. We don't need to do this twice,
the first user will do it first, then the second user
will open the same document.

Change-Id: Ide01b162b0c6a2b3a694706848c3ce93758f3f22
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100125
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index d7dc0862d..d35637a16 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -2,24 +2,27 @@
 
 require('cypress-wait-until');
 
-function loadTestDoc(fileName, subFolder) {
+function loadTestDoc(fileName, subFolder, noFileCopy) {
cy.log('Loading test document - start.');
cy.log('Param - fileName: ' + fileName);
cy.log('Param - subFolder: ' + subFolder);
+   cy.log('Param - noFileCopy: ' + noFileCopy);
 
// Get a clean test document
-   if (subFolder === undefined) {
-   cy.task('copyFile', {
-   sourceDir: Cypress.env('DATA_FOLDER'),
-   destDir: Cypress.env('WORKDIR'),
-   fileName: fileName,
-   });
-   } else {
-   cy.task('copyFile', {
-   sourceDir: Cypress.env('DATA_FOLDER') + subFolder + '/',
-   destDir: Cypress.env('WORKDIR') + subFolder + '/',
-   fileName: fileName,
-   });
+   if (noFileCopy !== true) {
+   if (subFolder === undefined) {
+   cy.task('copyFile', {
+   sourceDir: Cypress.env('DATA_FOLDER'),
+   destDir: Cypress.env('WORKDIR'),
+   fileName: fileName,
+   });
+   } else {
+   cy.task('copyFile', {
+   sourceDir: Cypress.env('DATA_FOLDER') + 
subFolder + '/',
+   destDir: Cypress.env('WORKDIR') + subFolder + 
'/',
+   fileName: fileName,
+   });
+   }
}
 
doIfOnMobile(function() {
@@ -156,8 +159,8 @@ function matchClipboardText(regexp) {
});
 }
 
-function beforeAll(fileName, subFolder) {
-   loadTestDoc(fileName, subFolder);
+function beforeAll(fileName, subFolder, noFileCop) {
+   loadTestDoc(fileName, subFolder, noFileCop);
 }
 
 function afterAll(fileName) {
diff --git 
a/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js 
b/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
index 05cf43b65..0f2b05198 100644
--- a/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
+++ b/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
@@ -9,7 +9,7 @@ describe('Change paragraph properties: user-2.', function() {
// Wait here, before loading the document.
// Opening two clients at the same time causes an issue.
cy.wait(5000);
-   helper.beforeAll(testFileName);
+   helper.beforeAll(testFileName, undefined, true);
});
 
afterEach(function() {
diff --git 
a/cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js 
b/cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js
index 10f032d50..266a34965 100644
--- a/cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js
+++ b/cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js
@@ -9,7 +9,7 @@ describe('Sheet operations: user-2.', function() {
// Wait here, before loading the document.
// Opening two clients at the same time causes an issue.
cy.wait(5000);
-   helper.beforeAll(testFileName);
+   helper.beforeAll(testFileName, undefined, true);
});
 
afterEach(function() {
diff --git 
a/cypress_test/i

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/Library_oox.mk oox/source

[Miklos Vajna (via logerrit)]

 oox/Library_oox.mk |1 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx|   16 
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx|   24 ++-
 oox/source/drawingml/diagram/layoutatomvisitorbase.cxx |5 +
 oox/source/drawingml/diagram/layoutatomvisitorbase.hxx |4 -
 oox/source/drawingml/diagram/layoutatomvisitors.cxx|   20 +
 oox/source/drawingml/diagram/layoutatomvisitors.hxx|4 +
 oox/source/drawingml/diagram/layoutnodecontext.cxx |4 -
 oox/source/drawingml/diagram/rulelistcontext.cxx   |   58 +
 oox/source/drawingml/diagram/rulelistcontext.hxx   |   42 
 10 files changed, 172 insertions(+), 6 deletions(-)

New commits:
commit 92262649a0511146a21a5171b8ff33d4994d75b3
Author: Miklos Vajna 
AuthorDate: Fri Jul 24 15:52:10 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 4 18:49:15 2020 +0200

oox smartart: start parsing rule lists

I have a linear algorithm where some elements should be scaled down, but
not all of them. These requirements are described using rules. This
commit just adds the parsing for them, so that later
AlgAtom::layoutShape() can create an improved layout, taking rules into
account.

(cherry picked from commit 6ca5412bac9e3da5cd20f315fc853c7733f10858)

Change-Id: I5f0f9ffcaff75a804796851e48a9ce10583ec362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100109
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index cc235b87e360..4c12b9ea6a19 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -148,6 +148,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/drawingml/diagram/layoutatomvisitorbase \
 oox/source/drawingml/diagram/layoutatomvisitors \
 oox/source/drawingml/diagram/layoutnodecontext \
+oox/source/drawingml/diagram/rulelistcontext \
 oox/source/drawingml/drawingmltypes \
 oox/source/drawingml/effectproperties \
 oox/source/drawingml/effectpropertiescontext \
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 72e334e80608..82e826da0dda 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -338,6 +338,11 @@ void ConstraintAtom::accept( LayoutAtomVisitor& rVisitor )
 rVisitor.visit(*this);
 }
 
+void RuleAtom::accept( LayoutAtomVisitor& rVisitor )
+{
+rVisitor.visit(*this);
+}
+
 void ConstraintAtom::parseConstraint(std::vector& rConstraints,
  bool bRequireForName) const
 {
@@ -367,6 +372,14 @@ void 
ConstraintAtom::parseConstraint(std::vector& rConstraints,
 }
 }
 
+void RuleAtom::parseRule(std::vector& rRules) const
+{
+if (!maRule.msForName.isEmpty())
+{
+rRules.push_back(maRule);
+}
+}
+
 void AlgAtom::accept( LayoutAtomVisitor& rVisitor )
 {
 rVisitor.visit(*this);
@@ -467,7 +480,8 @@ void ApplyConstraintToLayout(const Constraint& rConstraint, 
LayoutPropertyMap& r
 }
 
 void AlgAtom::layoutShape( const ShapePtr& rShape,
-   const std::vector& rConstraints )
+   const std::vector& rConstraints,
+   const std::vector& /*rRules*/ )
 {
 switch(mnType)
 {
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 2e4551642389..8904e525a181 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -63,6 +63,7 @@ struct ConditionAttr
 sal_Int32 mnVal;
 };
 
+/// Constraints allow you to specify an ideal (or starting point) size for 
each shape.
 struct Constraint
 {
 sal_Int32 mnFor;
@@ -78,6 +79,12 @@ struct Constraint
 sal_Int32 mnOperator;
 };
 
+/// Rules allow you to specify what to do when constraints can't be fully 
satisfied.
+struct Rule
+{
+OUString msForName;
+};
+
 typedef std::map LayoutProperty;
 typedef std::map LayoutPropertyMap;
 
@@ -146,6 +153,20 @@ private:
 Constraint maConstraint;
 };
 
+/// Represents one  element.
+class RuleAtom
+: public LayoutAtom
+{
+public:
+RuleAtom(LayoutNode& rLayoutNode) : LayoutAtom(rLayoutNode) {}
+virtual void accept( LayoutAtomVisitor& ) override;
+Rule& getRule()
+{ return maRule; }
+void parseRule(std::vector& rRules) const;
+private:
+Rule maRule;
+};
+
 class AlgAtom
 : public LayoutAtom
 {
@@ -162,7 +183,8 @@ public:
 { maMap[nType]=nVal; }
 sal_Int32 getVerticalShapesCount(const ShapePtr& rShape);
 void layoutShape( const ShapePtr& rShape,
-  const std::vector& rConstraints );
+  const std::vector& rConstraints,
+  const std::vector& rRules );
 
 void

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

[Stephan Bergmann (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c12947404d60aa779242d3fc1f2cccaaf8b5f51
Author: Stephan Bergmann 
AuthorDate: Fri Jul 31 22:31:11 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 4 18:48:33 2020 +0200

Avoid UBSan signed-integer-overflow

...during CppunitTest_sd_import_tests_smartart:

> oox/source/drawingml/diagram/diagramlayoutatoms.cxx:656:50: runtime 
error: signed integer overflow: 1924451 - -2147483647 cannot be represented in 
type 'int'
>  #0 in 
oox::drawingml::AlgAtom::layoutShape(std::shared_ptr 
const&, std::__debug::vector > const&, 
std::__debug::vector 
> const&) at oox/source/drawingml/diagram/diagramlayoutatoms.cxx:656:50
>  #1 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::AlgAtom&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:202:19
>  #2 in 
oox::drawingml::AlgAtom::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:386:14
>  #3 in 
oox::drawingml::LayoutAtomVisitorBase::defaultVisit(oox::drawingml::LayoutAtom 
const&) at oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:32:16
>  #4 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::LayoutNode&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:243:5
>  #5 in 
oox::drawingml::LayoutNode::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:1452:14
>  #6 in 
oox::drawingml::LayoutAtomVisitorBase::defaultVisit(oox::drawingml::LayoutAtom 
const&) at oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:32:16
>  #7 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::LayoutNode&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:245:5
>  #8 in 
oox::drawingml::LayoutNode::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:1452:14
>  #9 in 
oox::drawingml::LayoutAtomVisitorBase::visit(oox::drawingml::ForEachAtom&) at 
oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:98:20
>  #10 in 
oox::drawingml::ForEachAtom::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:167:14
>  #11 in 
oox::drawingml::LayoutAtomVisitorBase::defaultVisit(oox::drawingml::LayoutAtom 
const&) at oox/source/drawingml/diagram/layoutatomvisitorbase.cxx:32:16
>  #12 in 
oox::drawingml::ShapeLayoutingVisitor::visit(oox::drawingml::LayoutNode&) at 
oox/source/drawingml/diagram/layoutatomvisitors.cxx:245:5
>  #13 in 
oox::drawingml::LayoutNode::accept(oox::drawingml::LayoutAtomVisitor&) at 
oox/source/drawingml/diagram/diagramlayoutatoms.cxx:1452:14
>  #14 in 
oox::drawingml::Diagram::addTo(std::shared_ptr const&) 
at oox/source/drawingml/diagram/diagram.cxx:122:30
>  #15 in 
oox::drawingml::loadDiagram(std::shared_ptr const&, 
oox::core::XmlFilterBase&, rtl::OUString const&, rtl::OUString const&, 
rtl::OUString const&, rtl::OUString const&, oox::core::Relations const&) at 
oox/source/drawingml/diagram/diagram.cxx:356:15
>  #16 in oox::drawingml::DiagramGraphicDataContext::onCreateContext(int, 
oox::AttributeList const&) at oox/source/drawingml/graphicshapecontext.cxx:252:9
>  #17 in non-virtual thunk to 
oox::drawingml::DiagramGraphicDataContext::onCreateContext(int, 
oox::AttributeList const&) at oox/source/drawingml/graphicshapecontext.cxx
>  #18 in oox::core::ContextHandler2Helper::implCreateChildContext(int, 
com::sun::star::uno::Reference 
const&) at oox/source/core/contexthandler2.cxx:94:34
>  #19 in oox::core::ContextHandler2::createFastChildContext(int, 
com::sun::star::uno::Reference 
const&) at oox/source/core/contexthandler2.cxx:191:12
>  #20 in non-virtual thunk to 
oox::core::ContextHandler2::createFastChildContext(int, 
com::sun::star::uno::Reference 
const&) at oox/source/core/contexthandler2.cxx
>  #21 in (anonymous namespace)::Entity::startElement((anonymous 
namespace)::Event const*) at sax/source/fastparser/fastparser.cxx:432:44
>  #22 in sax_fastparser::FastSaxParserImpl::callbackStartElement(unsigned 
char const*, unsigned char const*, unsigned char const*, int, unsigned char 
const**, int, unsigned char const**) at 
sax/source/fastparser/fastparser.cxx:1246:21
>  #23 in (anonymous namespace)::call_callbackStartElement(void*, unsigned 
char const*, unsigned char const*, unsigned char const*, int, unsigned char 
const**, int, int, unsigned char const**) at 
sax/source/fastparser/fastparser.cxx:305:18
>  #24 in xmlParseStartTag2 at 
workdir/UnpackedTarball/libxml2/parser.c:9588:6
>  #25 in xmlParseTryOrFinish at 
workdir/UnpackedTarball/libxml2/parser.c:11378:14
>  #26 in xmlParseChunk__internal_alias at 
workdir/UnpackedTarball/libxml2/parser.c:12280:13
>  #27 in sax_fastparser::FastSaxParserImpl::parse() at 
sax/source/fastparser/fastparser.cxx:1046:

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/makeshared.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 4f294e6976287b936d59035c4fe74ce18d3f132c
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 14:51:41 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 18:47:10 2020 +0200

Avoid some unhelpful loplugin:makeshared

...like

> canvas/source/directx/dx_impltools.cxx(137,31): error: rather use 
make_shared than constructing from 'Gdiplus::Graphics *' [loplugin:makeshared]
> GraphicsSharedPtr 
pRet(Gdiplus::Graphics::FromImage(rBitmap.get()));
>   
^

on Windows, where those functions like FromImage are provided by Windows 
(so we
can't help it that they are returning pointers)

Change-Id: Iae5c4b20d64cc6b38ff66409519fbd25f6e509cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100095
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/makeshared.cxx 
b/compilerplugins/clang/makeshared.cxx
index 9f12b6c3bd6b..9b512371d635 100644
--- a/compilerplugins/clang/makeshared.cxx
+++ b/compilerplugins/clang/makeshared.cxx
@@ -132,6 +132,19 @@ bool MakeShared::VisitCXXConstructExpr(CXXConstructExpr 
const* constructExpr)
 return true;
 else if (isa(arg0))
 return true;
+else if (auto const call = dyn_cast(arg0))
+{
+if (auto const decl = call->getDirectCallee())
+{
+// Don't warn about cases where e.g. the Bitmap* result of calling 
Windows'
+// Bitmap::FromBITMAPINFO is wrapped in a shared_ptr:
+if (decl->getReturnType()->isPointerType()
+&& 
compiler.getSourceManager().isInSystemHeader(decl->getLocation()))
+{
+return true;
+}
+}
+}
 
 StringRef fn = getFilenameOfLocation(
 
compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(constructExpr)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 canvas/source/directx/dx_bitmap.cxx|2 +-
 canvas/source/directx/dx_canvas.cxx|5 +++--
 canvas/source/directx/dx_impltools.cxx |4 ++--
 canvas/source/directx/dx_impltools.hxx |2 +-
 canvas/source/directx/dx_surfacebitmap.cxx |2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 3e9ce173d5ee46147aeac6820eacfa0a67b1209c
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 15:35:34 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 18:46:15 2020 +0200

loplugin:makeshared (clang-cl)

Change-Id: Ie28438633d9d81d756013772c573f02a756478d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100096
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/canvas/source/directx/dx_bitmap.cxx 
b/canvas/source/directx/dx_bitmap.cxx
index 524e3a6fdd2d..2f42170d6d77 100644
--- a/canvas/source/directx/dx_bitmap.cxx
+++ b/canvas/source/directx/dx_bitmap.cxx
@@ -71,7 +71,7 @@ namespace dxcanvas
 PixelFormat24bppRGB);
 }
 
-mpGraphics.reset( tools::createGraphicsFromBitmap(mpBitmap) );
+mpGraphics = tools::createGraphicsFromBitmap(mpBitmap);
 }
 
 BitmapSharedPtr DXBitmap::getBitmap() const
diff --git a/canvas/source/directx/dx_canvas.cxx 
b/canvas/source/directx/dx_canvas.cxx
index cb7a3199e126..08ce658249db 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -57,7 +58,7 @@ namespace dxcanvas
 {
 GraphicsSharedPtr mpGraphics;
 public:
-explicit GraphicsProviderImpl( Gdiplus::Graphics* pGraphics ) : 
mpGraphics( pGraphics ) {}
+explicit GraphicsProviderImpl( GraphicsSharedPtr && pGraphics ) : 
mpGraphics( std::move(pGraphics) ) {}
 virtual GraphicsSharedPtr getGraphics() override { return mpGraphics; }
 };
 
@@ -106,7 +107,7 @@ namespace dxcanvas
 maCanvasHelper.setDevice( *this );
 maCanvasHelper.setTarget(
 std::make_shared(
-Gdiplus::Graphics::FromHDC(pSysData->hDC)));
+
GraphicsSharedPtr(Gdiplus::Graphics::FromHDC(pSysData->hDC;
 
 maArguments.realloc(0);
 }
diff --git a/canvas/source/directx/dx_impltools.cxx 
b/canvas/source/directx/dx_impltools.cxx
index 413af7556643..27b98364bad1 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -132,9 +132,9 @@ namespace dxcanvas::tools
 return pRet;
 }
 
-Gdiplus::Graphics* createGraphicsFromBitmap(const BitmapSharedPtr& 
rBitmap)
+GraphicsSharedPtr createGraphicsFromBitmap(const BitmapSharedPtr& 
rBitmap)
 {
-Gdiplus::Graphics* pRet = 
Gdiplus::Graphics::FromImage(rBitmap.get());
+GraphicsSharedPtr 
pRet(Gdiplus::Graphics::FromImage(rBitmap.get()));
 if( pRet )
 setupGraphics( *pRet );
 return pRet;
diff --git a/canvas/source/directx/dx_impltools.hxx 
b/canvas/source/directx/dx_impltools.hxx
index f4f5a98ddfaa..720826e35652 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -62,7 +62,7 @@ namespace dxcanvas::tools
 polyPolygonFromXPolyPolygon2D( const css::uno::Reference< 
css::rendering::XPolyPolygon2D >& );
 
 Gdiplus::Graphics* createGraphicsFromHDC(HDC);
-Gdiplus::Graphics* createGraphicsFromBitmap(const BitmapSharedPtr&);
+GraphicsSharedPtr createGraphicsFromBitmap(const BitmapSharedPtr&);
 
 void setupGraphics( Gdiplus::Graphics& rGraphics );
 
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx 
b/canvas/source/directx/dx_surfacebitmap.cxx
index 52c83de26829..0d23674ca91b 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -228,7 +228,7 @@ namespace dxcanvas
 maSize.getY(),
 PixelFormat32bppARGB
 );
-mpGraphics.reset( tools::createGraphicsFromBitmap(mpGDIPlusBitmap) 
);
+mpGraphics = tools::createGraphicsFromBitmap(mpGDIPlusBitmap);
 
 // create the colorbuffer object, which is basically a simple
 // wrapper around the directx surface. the colorbuffer is the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need help for unit tests

[Regina Henschel]

Regina Henschel schrieb am 27-Jul-20 um 01:17:

I have seen in 
https://opengrok.libreoffice.org/xref/core/chart2/qa/extras/chart2import.cxx 

2541  Reference 
xDataPointLabel1(getShapeByName(xShapes,
2542 
"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"), 
UNO_SET_THROW);

How is the string build, what does it mean?


I have found it. CID=ClassifiedIdentifier
That belongs to
https://opengrok.libreoffice.org/xref/core/chart2/source/tools/ObjectIdentifier.cxx
https://opengrok.libreoffice.org/xref/core/chart2/source/inc/ObjectIdentifier.hxx

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

[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - slideshow/source

[Sarper Akdemir (via logerrit)]

Rebased ref, commits from common ancestor:
commit 803c9170806f3f54a6169887b65ebc05f84b4c82
Author: Sarper Akdemir 
AuthorDate: Mon Jul 27 23:02:48 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Tue Aug 4 19:12:44 2020 +0300

work-in-progress complex shapes

Change-Id: I807bbde92c143b8c96792b3d8bf9603a31216486

diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 8729300184f6..90f1d1853dba 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -11,6 +11,13 @@
 #include 
 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
 
 #define BOX2D_SLIDE_SIZE_IN_METERS 100.00f
 
@@ -62,6 +69,124 @@ b2Vec2 convertB2DPointToBox2DVec2(const basegfx::B2DPoint& 
aPoint, const double
 return { static_cast(aPoint.getX() * fScaleFactor),
  static_cast(aPoint.getY() * -fScaleFactor) };
 }
+
+// expects rPolygon to have coordinates relative to it's center
+void addTriangleVectorToBody(const basegfx::triangulator::B2DTriangleVector& 
rTriangleVector,
+ b2Body* aBody, const float fDensity, const float 
fFriction,
+ const float fRestitution, const double 
fScaleFactor)
+{
+for (const basegfx::triangulator::B2DTriangle& aTriangle : rTriangleVector)
+{
+b2FixtureDef aFixture;
+b2PolygonShape aPolygonShape;
+b2Vec2 aTriangleVertices[3]
+= { convertB2DPointToBox2DVec2(aTriangle.getA(), fScaleFactor),
+convertB2DPointToBox2DVec2(aTriangle.getB(), fScaleFactor),
+convertB2DPointToBox2DVec2(aTriangle.getC(), fScaleFactor) };
+
+bool bValidPointDistance = true;
+for (int a = 0; a < 3; a++)
+{
+for (int b = 0; b < 3; b++)
+{
+if (a == b)
+continue;
+if (b2DistanceSquared(aTriangleVertices[a], 
aTriangleVertices[b]) < 0.003f)
+{
+bValidPointDistance = false;
+}
+}
+}
+if (bValidPointDistance)
+{
+aPolygonShape.Set(aTriangleVertices, 3);
+aFixture.shape = &aPolygonShape;
+aFixture.density = fDensity;
+aFixture.friction = fFriction;
+aFixture.restitution = fRestitution;
+aBody->CreateFixture(&aFixture);
+}
+}
+}
+
+// expects rPolygon to have coordinates relative to it's center
+void addEdgeShapeToBody(const basegfx::B2DPolygon& rPolygon, b2Body* aBody, 
const float fDensity,
+const float fFriction, const float fRestitution, const 
double fScaleFactor)
+{
+basegfx::B2DPolygon aPolygon = 
basegfx::utils::removeNeutralPoints(rPolygon);
+const float fHalfWidth = 0.1;
+bool bHaveEdgeA = false;
+b2Vec2 aEdgeBoxVertices[4];
+
+for (sal_uInt32 nIndex = 0; nIndex < aPolygon.count(); nIndex++)
+{
+b2FixtureDef aFixture;
+b2PolygonShape aPolygonShape;
+
+basegfx::B2DPoint aPointA;
+basegfx::B2DPoint aPointB;
+if (nIndex != 0)
+{
+aPointA = aPolygon.getB2DPoint(nIndex - 1);
+aPointB = aPolygon.getB2DPoint(nIndex);
+}
+else if (/* nIndex == 0 && */ aPolygon.isClosed())
+{
+// start by connecting the last point to the first one
+aPointA = aPolygon.getB2DPoint(aPolygon.count() - 1);
+aPointB = aPolygon.getB2DPoint(nIndex);
+}
+else // the polygon isn't closed, won't connect last and first points
+{
+continue;
+}
+
+b2Vec2 aEdgeUnitVec = (convertB2DPointToBox2DVec2(aPointB, 
fScaleFactor)
+   - convertB2DPointToBox2DVec2(aPointA, 
fScaleFactor));
+aEdgeUnitVec.Normalize();
+
+b2Vec2 aEdgeNormal(-aEdgeUnitVec.y, aEdgeUnitVec.x);
+
+if (!bHaveEdgeA)
+{
+aEdgeBoxVertices[0]
+= convertB2DPointToBox2DVec2(aPointA, fScaleFactor) + 
fHalfWidth * aEdgeNormal;
+aEdgeBoxVertices[1]
+= convertB2DPointToBox2DVec2(aPointA, fScaleFactor) + 
-fHalfWidth * aEdgeNormal;
+bHaveEdgeA = true;
+}
+aEdgeBoxVertices[2]
+= convertB2DPointToBox2DVec2(aPointB, fScaleFactor) + fHalfWidth * 
aEdgeNormal;
+aEdgeBoxVertices[3]
+= convertB2DPointToBox2DVec2(aPointB, fScaleFactor) + -fHalfWidth 
* aEdgeNormal;
+
+bool bValidPointDistance
+= (b2DistanceSquared(aEdgeBoxVertices[0], aEdgeBoxVertices[2]) > 
0.003f);
+
+if (bValidPointDistance)
+{
+aPolygonShape.Set(aEdgeBoxVertices, 4);
+aFixture.shape = &aPolygonShape;
+aFixture.density = fDensity;
+aFixture.friction = fFriction;
+aFixture.restitution = fRestitution;
+aBody->CreateFixt

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

[Stephan Bergmann (via logerrit)]

 extensions/source/ole/oleobjw.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b278193deb75d5487d9fb4e936a1a26926acb4af
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 14:44:06 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 17:56:25 2020 +0200

loplugin:simplifybool (clang-cl)

Change-Id: Ib53c1d0d11962067d3a18dab453a6530398bc5a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100093
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index c0a830eece91..bde55278c174 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1281,7 +1281,7 @@ uno::Any SAL_CALL IUnknownWrapper::directInvoke( const 
OUString& aName, const un
 
 // fill the named arguments
 if ( dispparams.cNamedArgs > 0
-  && !( dispparams.cNamedArgs == 1 && pInvkinds[nStep] == 
INVOKE_PROPERTYPUT ) )
+  && ( dispparams.cNamedArgs != 1 || pInvkinds[nStep] != 
INVOKE_PROPERTYPUT ) )
 {
 int nSizeAr = dispparams.cNamedArgs + 1;
 if ( pInvkinds[nStep] == INVOKE_PROPERTYPUT )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedmethods.results |  158 ++--
 include/vcl/treelistbox.hxx |1 
 svx/source/form/fmexch.cxx  |6 -
 svx/source/inc/fmexch.hxx   |1 
 vcl/source/treelist/treelistbox.cxx |5 
 5 files changed, 80 insertions(+), 91 deletions(-)

New commits:
commit 72a67f11586f953d74bb934570b63b326cde
Author: Noel Grandin 
AuthorDate: Tue Aug 4 13:30:19 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 4 17:44:21 2020 +0200

loplugin:unusedmethods

Change-Id: I5fa2bbeff17a9933ff55afb0c3544d025d096a63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100085
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index ab0940766b3f..6a24160930b2 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -400,8 +400,6 @@ include/comphelper/basicio.hxx:52
 const class com::sun::star::uno::Reference & comphelper::operator>>(const class 
com::sun::star::uno::Reference 
&,unsigned int &)
 include/comphelper/basicio.hxx:53
 const class com::sun::star::uno::Reference & comphelper::operator<<(const class 
com::sun::star::uno::Reference 
&,unsigned int)
-include/comphelper/componentmodule.hxx:49
- comphelper::OModule::OModule()
 include/comphelper/configuration.hxx:248
 type-parameter-?-? comphelper::ConfigurationLocalizedProperty::get(const 
class com::sun::star::uno::Reference &)
 include/comphelper/configuration.hxx:264
@@ -750,21 +748,21 @@ include/tools/datetime.hxx:92
 class DateTime operator+(const class DateTime &,const class tools::Time &)
 include/tools/datetime.hxx:93
 class DateTime operator-(const class DateTime &,const class tools::Time &)
-include/tools/fract.hxx:69
+include/tools/fract.hxx:68
 class Fraction & Fraction::operator+=(double)
-include/tools/fract.hxx:70
+include/tools/fract.hxx:69
 class Fraction & Fraction::operator-=(double)
-include/tools/fract.hxx:86
+include/tools/fract.hxx:85
 _Bool operator>=(const class Fraction &,const class Fraction &)
-include/tools/fract.hxx:105
+include/tools/fract.hxx:104
 class Fraction operator+(const class Fraction &,double)
-include/tools/fract.hxx:106
+include/tools/fract.hxx:105
 class Fraction operator-(const class Fraction &,double)
-include/tools/fract.hxx:108
+include/tools/fract.hxx:107
 class Fraction operator/(const class Fraction &,double)
-include/tools/gen.hxx:259
+include/tools/gen.hxx:258
 class Pair & Range::toPair()
-include/tools/gen.hxx:326
+include/tools/gen.hxx:325
 class Pair & Selection::toPair()
 include/tools/link.hxx:134
 const char * Link::getSourceFilename() const
@@ -780,7 +778,7 @@ include/tools/simd.hxx:21
 type-parameter-?-? simd::roundDown(type-parameter-?-?,unsigned int)
 include/tools/stream.hxx:507
 class rtl::OString read_uInt32_lenPrefixed_uInt8s_ToOString(class SvStream 
&)
-include/tools/UnitConversion.hxx:30
+include/tools/UnitConversion.hxx:32
 double convertPointToTwip(double)
 include/tools/urlobj.hxx:448
 _Bool INetURLObject::SetHost(const class rtl::OUString &)
@@ -806,15 +804,15 @@ include/vcl/alpha.hxx:48
 _Bool AlphaMask::operator!=(const class AlphaMask &) const
 include/vcl/animate/Animation.hxx:40
 _Bool Animation::operator!=(const class Animation &) const
-include/vcl/animate/AnimationBitmap.hxx:69
+include/vcl/animate/AnimationBitmap.hxx:68
 _Bool AnimationBitmap::operator!=(const struct AnimationBitmap &) const
 include/vcl/BitmapBasicMorphologyFilter.hxx:63
  BitmapDilateFilter::BitmapDilateFilter(int,unsigned char)
 include/vcl/BitmapColor.hxx:39
 void BitmapColor::SetAlpha(unsigned char)
-include/vcl/builder.hxx:338
+include/vcl/builder.hxx:337
 void VclBuilder::connectNumericFormatterAdjustment(const class 
rtl::OString &,const class rtl::OUString &)
-include/vcl/builder.hxx:480
+include/vcl/builder.hxx:479
 class rtl::OString VclBuilderContainer::getUIFile() const
 include/vcl/builderpage.hxx:36
 void BuilderPage::SetHelpId(const class rtl::OString &)
@@ -870,7 +868,7 @@ include/vcl/lok.hxx:22
 void vcl::lok::unregisterPollCallbacks()
 include/vcl/menu.hxx:517
 void PopupMenu::SetSelectedEntry(unsigned short)
-include/vcl/NotebookBarAddonsMerger.hxx:64
+include/vcl/NotebookBarAddonsMerger.hxx:63
  NotebookBarAddonsMerger::NotebookBarAddonsMerger()
 include/vcl/opengl/OpenGLHelper.hxx:67
 void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &)
@@ -900,11 +898,11 @@ include/vcl/settings.hxx:722
 _Bool AllSettings::operator!=(const class AllSettings &) const
 include/vcl/split.hxx:92
 void Splitter::SetHorizontal(_Bool)
-include/vcl/svapp.hxx:163
+include/vcl/svapp.hxx:162
  ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const 
class std::__debug::vect

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

[Stephan Bergmann (via logerrit)]

 filter/source/svg/svgexport.cxx |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit f9f88e2c4fbd33bbe60a8df34bfd1cffaf5ee6df
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 14:28:50 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 17:29:10 2020 +0200

loplugin:referencecasting (clang-cl)

("the source reference is already a subtype of the destination reference")

Change-Id: I1183eaa2015bd9d6567001bb14f7809dffcae7ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100088
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 76ad8c3b2ca2..f28d9811cf64 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1593,16 +1593,11 @@ bool SVGFilter::implExportMasterPages( const 
std::vector< Reference< css::drawin
 {
 if( rxPages[i].is() )
 {
-Reference< css::drawing::XShapes > xShapes( rxPages[i], UNO_QUERY 
);
+// add id attribute
+const OUString & sPageId = implGetValidIDFromInterface( rxPages[i] 
);
+mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sPageId );
 
-if( xShapes.is() )
-{
-// add id attribute
-const OUString & sPageId = implGetValidIDFromInterface( 
rxPages[i] );
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sPageId );
-
-bRet = implExportPage( sPageId, rxPages[i], xShapes, true /* 
is a master page */ ) || bRet;
-}
+bRet = implExportPage( sPageId, rxPages[i], rxPages[i], true /* is 
a master page */ ) || bRet;
 }
 }
 return bRet;
@@ -1654,7 +1649,7 @@ void SVGFilter::implExportDrawPages( const std::vector< 
Reference< css::drawing:
 }
 else
 {
-xShapes.set( rxPages[i], UNO_QUERY );
+xShapes = rxPages[i];
 }
 
 if( xShapes.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 canvas/source/directx/dx_spritecanvas.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit a8fbf8e0d144587af2905fe4c0a5e9225db65d8d
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 14:27:21 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 17:19:30 2020 +0200

-Werror,-Wunused-function (clang-cl)

Change-Id: I85149c0618a9b347fd1710f46b825844b3119bf4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100087
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/canvas/source/directx/dx_spritecanvas.cxx 
b/canvas/source/directx/dx_spritecanvas.cxx
index eb589dfa9344..24e8ffa1b545 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -178,13 +178,6 @@ namespace dxcanvas
 return maDeviceHelper.getBackBuffer();
 }
 
-static uno::Reference initCanvas( SpriteCanvas* pCanvas )
-{
-uno::Reference 
xRet(static_cast(pCanvas));
-pCanvas->initialize();
-return xRet;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 canvas_directx9_SpriteCanvas_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence 
const& args)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build error cppu/source/uno/check.cxx:138:11: error: unused class member [loplugin:unusedmember]

[Stephan Bergmann]

On 04/08/2020 16:39, julien2412 wrote:

On pc Debian x86-64 with master sources updated on a 2nd build where I don't
use enable-dbgutil but I still use --enable-werror, I got these errors:
/home/julien/lo/libo_perf/cppu/source/uno/check.cxx:138:11: error: unused
class member [loplugin:unusedmember]
 Char3 chars;
 ~~^
/home/julien/lo/libo_perf/cppu/source/uno/check.cxx:139:10: error: unused
class member [loplugin:unusedmember]
 char c;
 ~^

I must recognize I don't know why I didn't get these before.

Any thoughts?


 "Avoid warnings about 
unused Char4" should fix it


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

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/table/tabledlg.cxx |  120 ++--
 sw/source/uibase/inc/swtablerep.hxx |5 +
 sw/source/uibase/table/tablepg.hxx  |3 
 3 files changed, 68 insertions(+), 60 deletions(-)

New commits:
commit 31c7f9c79d20afdd72de530b8bec22c10b472bf7
Author: Caolán McNamara 
AuthorDate: Tue Aug 4 10:43:48 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 17:02:21 2020 +0200

tdf#134925 operate on a copy of the original SwTableRep

and keep the original around for use from ::Reset and overwrite
the original SwTableRep on commit

Change-Id: I18e078e577382c4c13d6f5e576cc1eeec15a7906
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100072
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index a13e0b1c2be3..1705533500dd 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -707,7 +707,7 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* 
_pSet )
 //Description: Page column configuration
 SwTableColumnPage::SwTableColumnPage(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet& rSet)
 : SfxTabPage(pPage, pController, "modules/swriter/ui/tablecolumnpage.ui", 
"TableColumnPage", &rSet)
-, m_pTableData(nullptr)
+, m_pOrigTableData(nullptr)
 , m_pSizeHdlEvent(nullptr)
 , m_nTableWidth(0)
 , m_nMinWidth(MINLAY)
@@ -792,17 +792,18 @@ void  SwTableColumnPage::Reset( const SfxItemSet* )
 const SfxPoolItem* pItem;
 if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
 {
-m_pTableData = static_cast(static_cast( 
pItem)->GetValue());
-m_nNoOfVisibleCols = m_pTableData->GetColCount();
-m_nNoOfCols = m_pTableData->GetAllColCount();
-m_nTableWidth = m_pTableData->GetAlign() != 
text::HoriOrientation::FULL &&
-m_pTableData->GetAlign() != 
text::HoriOrientation::LEFT_AND_WIDTH?
-m_pTableData->GetWidth() : m_pTableData->GetSpace();
+m_pOrigTableData = static_cast(static_cast( pItem)->GetValue());
+m_xTableData.reset(new SwTableRep(*m_pOrigTableData));
+m_nNoOfVisibleCols = m_xTableData->GetColCount();
+m_nNoOfCols = m_xTableData->GetAllColCount();
+m_nTableWidth = m_xTableData->GetAlign() != 
text::HoriOrientation::FULL &&
+m_xTableData->GetAlign() != 
text::HoriOrientation::LEFT_AND_WIDTH?
+m_xTableData->GetWidth() : m_xTableData->GetSpace();
 
 for( sal_uInt16 i = 0; i < m_nNoOfCols; i++ )
 {
-if( m_pTableData->GetColumns()[i].nWidth  < m_nMinWidth )
-m_nMinWidth = m_pTableData->GetColumns()[i].nWidth;
+if( m_xTableData->GetColumns()[i].nWidth  < m_nMinWidth )
+m_nMinWidth = m_xTableData->GetColumns()[i].nWidth;
 }
 sal_Int64 nMinTwips = m_aFieldArr[0].NormalizePercent( m_nMinWidth );
 sal_Int64 nMaxTwips = m_aFieldArr[0].NormalizePercent( m_nTableWidth );
@@ -914,7 +915,7 @@ bool SwTableColumnPage::FillItemSet( SfxItemSet* )
 
 if (m_bModified)
 {
-m_pTableData->SetColsChanged();
+m_xTableData->SetColsChanged();
 }
 return m_bModified;
 }
@@ -950,7 +951,7 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nCurrentPos )
 
 for( sal_uInt16 i = 0; i < m_nNoOfCols; i++ )
 {
-nSum += (m_pTableData->GetColumns())[i].nWidth;
+nSum += (m_xTableData->GetColumns())[i].nWidth;
 }
 SwTwips nDiff = nSum - m_nTableWidth;
 
@@ -1001,11 +1002,11 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 
nCurrentPos )
 {
 //Difference is balanced by the width of the table,
 //other columns remain unchanged.
-OSL_ENSURE(nDiff <= m_pTableData->GetSpace() - m_nTableWidth, "wrong 
maximum" );
-SwTwips nActSpace = m_pTableData->GetSpace() - m_nTableWidth;
+OSL_ENSURE(nDiff <= m_xTableData->GetSpace() - m_nTableWidth, "wrong 
maximum" );
+SwTwips nActSpace = m_xTableData->GetSpace() - m_nTableWidth;
 if(nDiff > nActSpace)
 {
-m_nTableWidth = m_pTableData->GetSpace();
+m_nTableWidth = m_xTableData->GetSpace();
 SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) - nDiff 
+ nActSpace );
 }
 else
@@ -1017,11 +1018,11 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 
nCurrentPos )
 {
 //All columns will be changed proportionally with,
 //the table width is adjusted accordingly.
-OSL_ENSURE(nDiff * m_nNoOfVisibleCols <= m_pTableData->GetSpace() - 
m_nTableWidth, "wrong maximum" );
+OSL_ENSURE(nDiff * m_nNoOfVisibleCols <= m_xTableData->GetSpace() - 
m_nTableWidth, "wrong maximum" );
 long nAdd = nDiff;
-if(nDiff * m_nNoOfVisibleCols > m_pTableData->GetSpace

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/inc/swtablerep.hxx   |   12 +---
 sw/source/uibase/table/swtablerep.cxx |   22 +++---
 sw/source/uibase/table/tablepg.hxx|6 --
 3 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 43ad29331c3f3cda4a0455545d83b7a9e2b2df4b
Author: Caolán McNamara 
AuthorDate: Tue Aug 4 10:37:53 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 17:01:28 2020 +0200

Related: tdf#134925 use std::vector

Change-Id: I7046814570a3ac98c92dc3d08e8dd05ed4d3483c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100071
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/inc/swtablerep.hxx 
b/sw/source/uibase/inc/swtablerep.hxx
index 82f9fb92bffa..e57a4e6d19b6 100644
--- a/sw/source/uibase/inc/swtablerep.hxx
+++ b/sw/source/uibase/inc/swtablerep.hxx
@@ -24,10 +24,16 @@
 #include 
 
 class SwTabCols;
-struct TColumn;
+
+struct TColumn
+{
+SwTwips nWidth;
+boolbVisible;
+};
+
 class SW_DLLPUBLIC SwTableRep
 {
-std::unique_ptr m_pTColumns;
+std::vector m_aTColumns;
 
 SwTwips m_nTableWidth;
 SwTwips m_nSpace;
@@ -77,7 +83,7 @@ public:
 SwTwips GetSpace() const{ return m_nSpace;}
 voidSetSpace(SwTwips nSet)  {m_nSpace = nSet;}
 
-TColumn*GetColumns() const  {return m_pTColumns.get();}
+TColumn*GetColumns(){return m_aTColumns.data();}
 };
 #endif
 
diff --git a/sw/source/uibase/table/swtablerep.cxx 
b/sw/source/uibase/table/swtablerep.cxx
index 97e8522335a2..a7518c14ebb5 100644
--- a/sw/source/uibase/table/swtablerep.cxx
+++ b/sw/source/uibase/table/swtablerep.cxx
@@ -36,20 +36,20 @@ SwTableRep::SwTableRep( const SwTabCols& rTabCol )
 m_bColsChanged(false)
 {
 m_nAllCols = m_nColCount = rTabCol.Count();
-m_pTColumns.reset( new TColumn[ m_nColCount + 1 ] );
+m_aTColumns.resize(m_nColCount + 1);
 SwTwips nStart = 0,
 nEnd;
 for( sal_uInt16 i = 0; i < m_nAllCols; ++i )
 {
 nEnd  = rTabCol[ i ] - rTabCol.GetLeft();
-m_pTColumns[ i ].nWidth = nEnd - nStart;
-m_pTColumns[ i ].bVisible = !rTabCol.IsHidden(i);
-if(!m_pTColumns[ i ].bVisible)
+m_aTColumns[ i ].nWidth = nEnd - nStart;
+m_aTColumns[ i ].bVisible = !rTabCol.IsHidden(i);
+if(!m_aTColumns[ i ].bVisible)
 m_nColCount --;
 nStart = nEnd;
 }
-m_pTColumns[ m_nAllCols ].nWidth = rTabCol.GetRight() - rTabCol.GetLeft() 
- nStart;
-m_pTColumns[ m_nAllCols ].bVisible = true;
+m_aTColumns[ m_nAllCols ].nWidth = rTabCol.GetRight() - rTabCol.GetLeft() 
- nStart;
+m_aTColumns[ m_nAllCols ].bVisible = true;
 m_nColCount++;
 m_nAllCols++;
 }
@@ -66,7 +66,7 @@ bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
 bool bSingleLine = false;
 
 for ( size_t i = 0; i < rTabCols.Count(); ++i )
-if(!m_pTColumns[i].bVisible)
+if(!m_aTColumns[i].bVisible)
 {
 bSingleLine = true;
 break;
@@ -109,7 +109,7 @@ bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
 }
 while((bFirst || !bOld ) && nNewPos < m_nAllCols )
 {
-nNew += m_pTColumns[nNewPos].nWidth;
+nNew += m_aTColumns[nNewPos].nWidth;
 nNewPos++;
 if(pOldTColumns[nNewPos - 1].bVisible)
 break;
@@ -127,10 +127,10 @@ bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
 {
 for ( sal_uInt16 i = 0; i < m_nAllCols - 1; ++i )
 {
-nPos += m_pTColumns[i].nWidth;
+nPos += m_aTColumns[i].nWidth;
 rTabCols[i] = nPos + rTabCols.GetLeft();
-rTabCols.SetHidden( i, !m_pTColumns[i].bVisible );
-rTabCols.SetRight(nLeft + m_pTColumns[m_nAllCols - 1].nWidth + 
nPos);
+rTabCols.SetHidden( i, !m_aTColumns[i].bVisible );
+rTabCols.SetRight(nLeft + m_aTColumns[m_nAllCols - 1].nWidth + 
nPos);
 }
 }
 
diff --git a/sw/source/uibase/table/tablepg.hxx 
b/sw/source/uibase/table/tablepg.hxx
index f2a6311fb951..1e4e355d87dc 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -27,12 +27,6 @@ class SwWrtShell;
 class SwTableRep;
 struct ImplSVEvent;
 
-struct TColumn
-{
-SwTwips nWidth;
-boolbVisible;
-};
-
 class SwFormatTablePage : public SfxTabPage
 {
 SwTableRep* pTableData;
___
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/tpbitmap.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a1cb7ede7841de1cb38f260cecd5c067f0a8dac6
Author: Caolán McNamara 
AuthorDate: Tue Aug 4 11:16:17 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 16:59:05 2020 +0200

tdf#134420 select neighbour when deleted

Change-Id: I55c6135360d3d77b7b3d2e54012ad82e1a4813ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100086
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 87f22835adc3..c679339199db 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -572,10 +572,14 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, 
SvxPresetListBox*, void)
 
 if (xQueryBox->run() == RET_YES)
 {
+sal_uInt16 nNextId = m_xBitmapLB->GetItemId(nPos + 1);
+if (!nNextId)
+nNextId = m_xBitmapLB->GetItemId(nPos - 1);
+
 m_pBitmapList->Remove( static_cast(nPos) );
 m_xBitmapLB->RemoveItem( nId );
-nId = m_xBitmapLB->GetItemId(0);
-m_xBitmapLB->SelectItem( nId );
+
+m_xBitmapLB->SelectItem(nNextId);
 
 m_aCtlBitmapPreview.Invalidate();
 ModifyBitmapHdl(m_xBitmapLB.get());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedfields.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 01b96fcefe5c8d9a7078b24b26134278b89f3f12
Author: Noel Grandin 
AuthorDate: Tue Aug 4 13:12:09 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 4 16:12:06 2020 +0200

remove some debug code

Change-Id: I6aff84ce7b9d4fed27d8442d1366bcf14bc44f86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100084
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/unusedfields.cxx 
b/compilerplugins/clang/unusedfields.cxx
index 6bbb35930696..7a8df9939d02 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -1152,16 +1152,6 @@ void UnusedFields::checkTouchedFromOutside(const 
FieldDecl* fieldDecl, const Exp
 
 // it's touched from somewhere outside a class
 if (!methodDecl) {
-if (fieldDecl->getName() == "m_pShell")
-{
-if (memberExprParentFunction)
-memberExprParentFunction->dump();
-memberExpr->dump();
-const Decl *decl = 
loplugin::getFunctionDeclContext(compiler.getASTContext(), memberExpr);
-if (decl)
-decl->dump();
-std::cout << "site1" << std::endl;
-}
 touchedFromOutsideSet.insert(fieldInfo);
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

 loleaflet/po/templates/loleaflet-ui.pot |  285 +++-
 1 file changed, 175 insertions(+), 110 deletions(-)

New commits:
commit 7620b394009b91395f1e0835b4b7a7fa0d04ae59
Author: Andras Timar 
AuthorDate: Tue Aug 4 15:39:38 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 4 15:58:50 2020 +0200

loleaflet: update UI pot

Change-Id: I3ff0feabb83ab6d0e73b47eedfc4ef678136ce6c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100099
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index be1c1dbcb..5a7103044 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-29 10:42+0200\n"
+"POT-Creation-Date: 2020-08-04 15:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -122,7 +122,7 @@ msgid "Network Graph"
 msgstr ""
 
 #: admin/admin.strings.js:32 src/control/Control.Notebookbar.js:128
-#: src/control/Control.NotebookbarImpress.js:17
+#: src/control/Control.NotebookbarImpress.js:22
 #: src/layer/marker/Annotation.js:271 src/layer/tile/TileLayer.js:404
 msgid "Save"
 msgstr ""
@@ -217,17 +217,17 @@ msgid "Are you sure you want to terminate this session?"
 msgstr ""
 
 #: admin/src/AdminSocketOverview.js:16 admin/src/AdminSocketOverview.js:123
-#: admin/src/AdminSocketSettings.js:36 src/control/Control.Menubar.js:1203
-#: src/control/Control.PresentationBar.js:85 src/control/Control.Tabs.js:200
-#: src/control/Control.Tabs.js:217 src/control/Toolbar.js:607
+#: admin/src/AdminSocketSettings.js:36 src/control/Control.Menubar.js:1224
+#: src/control/Control.PresentationBar.js:85 src/control/Control.Tabs.js:199
+#: src/control/Control.Tabs.js:216 src/control/Toolbar.js:609
 msgid "OK"
 msgstr ""
 
 #: admin/src/AdminSocketOverview.js:17 admin/src/AdminSocketOverview.js:124
 #: admin/src/AdminSocketSettings.js:37 src/control/Control.LanguageDialog.js:86
-#: src/control/Control.Menubar.js:1204 src/control/Control.MobileTopBar.js:45
-#: src/control/Control.PresentationBar.js:86 src/control/Control.Tabs.js:201
-#: src/control/Control.Tabs.js:218 src/control/Toolbar.js:608
+#: src/control/Control.Menubar.js:1225 src/control/Control.MobileTopBar.js:45
+#: src/control/Control.PresentationBar.js:86 src/control/Control.Tabs.js:200
+#: src/control/Control.Tabs.js:217 src/control/Toolbar.js:610
 #: src/layer/marker/Annotation.js:202 src/layer/tile/TileLayer.js:405
 msgid "Cancel"
 msgstr ""
@@ -413,143 +413,151 @@ msgstr ""
 msgid "Fixed size"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1196
+#: src/control/Control.JSDialogBuilder.js:1209
 msgid "From"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1199
+#: src/control/Control.JSDialogBuilder.js:1212
 msgid "To"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1324
+#: src/control/Control.JSDialogBuilder.js:1337
 msgid "Select range"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1353
+#: src/control/Control.JSDialogBuilder.js:1366
 msgid "Font Name"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1355
+#: src/control/Control.JSDialogBuilder.js:1368
 msgid "Font Size"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1894
+#: src/control/Control.JSDialogBuilder.js:1907
 msgid "Cell borders"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1917
+#: src/control/Control.JSDialogBuilder.js:1930
 msgid "Background Color"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1919
+#: src/control/Control.JSDialogBuilder.js:1932
 msgid "Gradient Start"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1921
+#: src/control/Control.JSDialogBuilder.js:1934
 msgid "Gradient End"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:2099
+#: src/control/Control.JSDialogBuilder.js:2112
 msgid "Rows"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:2100
+#: src/control/Control.JSDialogBuilder.js:2113
 msgid "Columns"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:2120
+#: src/control/Control.JSDialogBuilder.js:2133
 #: src/control/Control.TopToolbar.js:209
 msgid "Insert table"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:2149
+#: src/control/Control.JSDialogBuilder.js:2162
 msgid "Line style:"
 msgstr ""
 
 #: src/control/Control.LanguageDialog.js:69 src/control/Control.Menubar.js:231
 #: src/control/Control.Menubar.js:233 src/control/Control.Menubar.js:235
-#: src/control/Control.Menubar.js:359 src/control/Control.Menubar.js:475
+#: src/control/Control.Menubar.js:360 src/control/Control.Menubar.js:476
 #: src/control/Control.StatusBar.js:498
+#: src/control/Control.NotebookbarBuilder.js:599
+#: src/control/Control.NotebookbarBuilder.js:601
+#: src/control/Control.NotebookbarBuilder.js:603
+#: sr

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 0086c2df7eadcfafe8378d2520e08e2d6a1e038b
Author: Christian Lohmaier 
AuthorDate: Tue Aug 4 15:50:59 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Aug 4 15:50:59 2020 +0200

Update git submodules

* Update translations from branch 'master'
  to 1c00f748202eb64ffa0be5ce38e57a47f6e5798a
  - update translations for master

and force-fix errors using pocheck

Change-Id: I7e90d467017ce8e49d81e914d60d944e2e69e0f1

diff --git a/translations b/translations
index d0e75e01d08c..1c00f748202e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d0e75e01d08cb94b06a00110a0dd16404bec760c
+Subproject commit 1c00f748202eb64ffa0be5ce38e57a47f6e5798a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

 loleaflet/src/control/Control.SheetsBar.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2f2061b5543ae240b4f61535a9d1b29d8b8181b0
Author: Andras Timar 
AuthorDate: Tue Aug 4 15:38:27 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 4 15:51:48 2020 +0200

Related tdf#95138 loleaflet: change tooltips for sheet navigation buttons

Change-Id: I2bc363058cb67a3d32851b3d90b9db39d5f45a03
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100098
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.SheetsBar.js 
b/loleaflet/src/control/Control.SheetsBar.js
index 1a9696a09..eeddb0538 100644
--- a/loleaflet/src/control/Control.SheetsBar.js
+++ b/loleaflet/src/control/Control.SheetsBar.js
@@ -25,10 +25,10 @@ L.Control.SheetsBar = L.Control.extend({
tooltip: 'bottom',
hidden: true,
items: [
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'firstrecord',  img: 'firstrecord', hint: 
_('First sheet')},
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'prevrecord',  img: 'prevrecord', hint: 
_('Previous sheet')},
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'nextrecord',  img: 'nextrecord', hint: 
_('Next sheet')},
-   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'lastrecord',  img: 'lastrecord', hint: 
_('Last sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'firstrecord',  img: 'firstrecord', hint: 
_('Scroll to the first sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'prevrecord',  img: 'prevrecord', hint: 
_('Scroll left')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'nextrecord',  img: 'nextrecord', hint: 
_('Scroll right')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'lastrecord',  img: 'lastrecord', hint: 
_('Scroll to the last sheet')},
{type: 'button',  id: 'insertsheet', img: 
'insertsheet', hint: _('Insert sheet')}
],
onClick: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/docdesc.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit af38654b4b8388f0a0236601742b7ab3d1590ae8
Author: Michael Stahl 
AuthorDate: Tue Aug 4 12:26:23 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 4 15:38:53 2020 +0200

tdf#135144 sw: copy bookmarks in SwDoc::CopyMasterHeader()

... and SwDoc::CopyMasterFooter(); this is the same as commit
9f7ee38acec0cb614e37aecc5ea9c5f1c63b61b6 but for 2 other functions that
do the same thing.

Change-Id: Id7ed449a004ee3c9452d4603bf8632e2720651ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100077
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index e63097b29279..9da9fb21ad9d 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -293,7 +293,9 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, 
const SwFormatHeader &rHe
 GetNodes().Copy_( aRange, aTmp, false );
 aTmp = *pSttNd;
 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 
nullptr, aTmp);
-
+SwPaM const source(aRange.aStart, aRange.aEnd);
+SwPosition dest(aTmp);
+sw::CopyBookmarks(source, dest);
 pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
 rDescFrameFormat.SetFormatAttr( SwFormatHeader( pFormat ) );
 }
@@ -365,7 +367,9 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, 
const SwFormatFooter &rFo
 GetNodes().Copy_( aRange, aTmp, false );
 aTmp = *pSttNd;
 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 
nullptr, aTmp);
-
+SwPaM const source(aRange.aStart, aRange.aEnd);
+SwPosition dest(aTmp);
+sw::CopyBookmarks(source, dest);
 pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
 rDescFrameFormat.SetFormatAttr( SwFormatFooter( pFormat ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   22 
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |1 
 oox/source/drawingml/diagram/layoutnodecontext.cxx  |   19 -
 sd/qa/unit/import-tests-smartart.cxx|5 ++--
 4 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit 3c185bf386b4c9609ab32d19bf95b83fe0a3
Author: Miklos Vajna 
AuthorDate: Tue Aug 4 10:58:00 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 4 15:30:00 2020 +0200

oox smartart: add support for 

This changes the order of children, which matters when they have no
explicit ZOrder. With this, the text shapes on the arrow shape are on
top of the arrow, not behind it.

The trick is that nominally chOrder can be "t"(op) or "b"(ottom),
defaulting to bottom, but there is a difference between an explicit "b"
and not setting it. When not setting it, the layout node is expected to
inherit it from its parent layout node, recursively.

This would probably make sense for other algorithms as well, but set it
only for the linear algorithm for now, as that's where we have a bug
document showing the PowerPoint behavior.

Change-Id: I433f92c620149ef5590aebc8cbf43110e1d2fb85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100047
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 89fc12546165..e4980991795a 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1146,6 +1146,28 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const 
std::vector&
 if (aCurrShape->getSubType() == XML_conn)
 aCurrShape->setRotation(nConnectorAngle * PER_DEGREE);
 }
+
+// Newer shapes are behind older ones by default. Reverse this if 
requested.
+sal_Int32 nChildOrder = XML_b;
+const LayoutNode* pParentLayoutNode = nullptr;
+for (LayoutAtomPtr pAtom = getParent(); pAtom; pAtom = 
pAtom->getParent())
+{
+auto pLayoutNode = dynamic_cast(pAtom.get());
+if (pLayoutNode)
+{
+pParentLayoutNode = pLayoutNode;
+break;
+}
+}
+if (pParentLayoutNode)
+{
+nChildOrder = pParentLayoutNode->getChildOrder();
+}
+if (nChildOrder == XML_t)
+{
+std::reverse(rShape->getChildren().begin(), 
rShape->getChildren().end());
+}
+
 break;
 }
 
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index cb34f7a005f1..f36224f0f882 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -271,6 +271,7 @@ public:
 { msStyleLabel = sLabel; }
 void setChildOrder( sal_Int32 nOrder )
 { mnChildOrder = nOrder; }
+sal_Int32 getChildOrder() const { return mnChildOrder; }
 void setExistingShape( const ShapePtr& pShape )
 { mpExistingShape = pShape; }
 const ShapePtr& getExistingShape() const
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx 
b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 80ae1d5bb6a9..93f927531cf6 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -198,7 +198,24 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
 {
 LayoutNodePtr pNode = 
std::make_shared(mpNode->getLayoutNode().getDiagram());
 LayoutAtom::connect(mpNode, pNode);
-pNode->setChildOrder( rAttribs.getToken( XML_chOrder, XML_b ) );
+
+if (rAttribs.hasAttribute(XML_chOrder))
+{
+pNode->setChildOrder(rAttribs.getToken(XML_chOrder, XML_b));
+}
+else
+{
+for (LayoutAtomPtr pAtom = mpNode; pAtom; pAtom = 
pAtom->getParent())
+{
+auto pLayoutNode = dynamic_cast(pAtom.get());
+if (pLayoutNode)
+{
+pNode->setChildOrder(pLayoutNode->getChildOrder());
+break;
+}
+}
+}
+
 pNode->setMoveWith( rAttribs.getString( XML_moveWith ).get() );
 pNode->setStyleLabel( rAttribs.getString( XML_styleLbl ).get() );
 return new LayoutNodeContext( *this, rAttribs, pNode );
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index 6fc195ccd101..bdf320ce831f 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -1532,8 +1532,9 @@ void SdImportTestSmartAr

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/uiconfig

[Szymon Kłos (via logerrit)]

 sd/uiconfig/simpress/ui/notebookbar.ui |  132 -
 1 file changed, 66 insertions(+), 66 deletions(-)

New commits:
commit 50dfdbeb14ebfde67568296492467d6dca3b6dd0
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:46:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 15:19:46 2020 +0200

notebookbar: keep align items together

Change-Id: I24fe425b6b578dc80487464c3206c52ecac8aab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100079
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 712e9a9fbc12..c8f258613db7 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -11203,17 +11203,6 @@
 True
 icons
 False
-
-  
-True
-False
-.uno:ObjectAlignLeft
-  
-  
-False
-True
-  
-
   
   
 False
@@ -11227,17 +11216,6 @@
 True
 icons
 False
-
-  
-True
-False
-.uno:AlignUp
-  
-  
-False
-True
-  
-
   
   
 False
@@ -11301,6 +11279,17 @@
 True
 icons
 False
+
+  
+True
+False
+.uno:ObjectAlignLeft
+  
+  
+False
+True
+  
+
 
   
 True
@@ -11336,6 +11325,17 @@
 True
 icons
 False
+
+  
+True
+False
+.uno:AlignUp
+  
+  
+False
+True
+  
+
 
   
 True
@@ -12403,17 +12403,6 @@
 True
 icons
 False
-
-  
-True
-False
-.uno:ObjectAlignLeft
-  
-  
-False
-True
-  
-
   
   
 False
@@ -12427,17 +12416,6 @@
 True
 icons
 False
-
-

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

[Stephan Bergmann (via logerrit)]

 basic/source/sbx/sbxbase.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 16a3a548d4e8e1132689de5615e025d0d4b3d564
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 11:54:42 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 15:00:24 2020 +0200

Remove dead code

As discussed at  "fix 
shutdown
crash in basic" the code was added in error, and at least clang-cl with 
latest
MSVC standard library and C++20 mode gives a helpful

> basic/source/sbx/sbxbase.cxx(53,5): error: ignoring return value of 
function declared with 'nodiscard' attribute [-Werror,-Wunused-result]
> std::move(m_Factories);
> ^ ~~~

now.

Change-Id: I052efe51d4415838b50de06bb308692fa937b7b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100076
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index f62949ada7ec..0e057540c8bc 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -48,9 +48,6 @@ SbxAppData::~SbxAppData()
 pBasicFormater.reset();
 // basic manager repository must be destroyed before factories
 mrImplRepository.clear();
-// we need to move stuff out otherwise the destruction of the factories
-// calls back into SbxBase::RemoveFactory and sees partially destructed 
data
-std::move(m_Factories);
 }
 
 SbxBase::SbxBase()
___
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.4' - desktop/source sfx2/source

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx  |6 ++
 sfx2/source/control/unoctitm.cxx |6 ++
 2 files changed, 12 insertions(+)

New commits:
commit 66d48bd6090f826dbbcb0802f0cb05322c1f8b26
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:58:49 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 14:57:56 2020 +0200

lok: send state updates for shape editing commands

Change-Id: I0fcb8ef76df89723ee74aa96a003e0d49d558872
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100081
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d655a60e6863..89269803af04 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2793,6 +2793,12 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AlignMiddle"),
 OUString(".uno:AlignDown"),
 OUString(".uno:TraceChangeMode"),
+OUString(".uno:Combine"),
+OUString(".uno:Merge"),
+OUString(".uno:Dismantle"),
+OUString(".uno:Substract"),
+OUString(".uno:DistributeSelection"),
+OUString(".uno:Intersect"),
 OUString(".uno:FreezePanesRow")
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 5e841bd382c6..01a398800813 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1156,6 +1156,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "CharmapControl" ||
  aEvent.FeatureURL.Path == "EnterGroup" ||
  aEvent.FeatureURL.Path == "LeaveGroup" ||
+ aEvent.FeatureURL.Path == "Combine" ||
+ aEvent.FeatureURL.Path == "Merge" ||
+ aEvent.FeatureURL.Path == "Dismantle" ||
+ aEvent.FeatureURL.Path == "Substract" ||
+ aEvent.FeatureURL.Path == "DistributeSelection" ||
+ aEvent.FeatureURL.Path == "Intersect" ||
  aEvent.FeatureURL.Path == "ResetAttributes")
 {
 aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : 
OUStringLiteral("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 sc/inc/document.hxx|   11 +++
 sc/source/core/data/documen2.cxx   |9 ++---
 sc/source/core/data/document.cxx   |   19 +--
 sfx2/source/notebookbar/SfxNotebookBar.cxx |   11 +++
 4 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit adb901ca11afa5a153ecd433375b9ab1dfc2fd03
Author: Szymon Kłos 
AuthorDate: Mon Aug 3 09:40:31 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 14:58:34 2020 +0200

notebookbar: control early init per view

Change-Id: I9b743bc6d62256289549cd8002b76bcb918222b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99986
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit fddfeb653dfd5dd73cbccb4433678d397f092df9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99921
Tested-by: Jenkins

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index dd79e65fa3ec..16a0608f7b30 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace sfx2;
@@ -366,13 +367,16 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
 if ((!sFile.isEmpty() && bChangedFile) || !pNotebookBar || 
!pNotebookBar->IsVisible()
 || bReloadNotebookbar || comphelper::LibreOfficeKit::isActive())
 {
+const SfxViewShell* pViewShell = SfxViewShell::Current();
+
 // Notebookbar was loaded too early what caused:
 //   * in LOK: Paste Special feature was incorrectly initialized
 // Skip first request so Notebookbar will be initialized after 
document was loaded
-static bool bSkipFirstInit = true;
-if (comphelper::LibreOfficeKit::isActive() && bSkipFirstInit)
+static std::map bSkippedFirstInit;
+if (comphelper::LibreOfficeKit::isActive()
+&& bSkippedFirstInit.find(pViewShell) == 
bSkippedFirstInit.end())
 {
-bSkipFirstInit = false;
+bSkippedFirstInit[pViewShell] = true;
 return false;
 }
 
@@ -393,7 +397,6 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
 pNotebookBar = pSysWindow->GetNotebookBar();
 pNotebookBar->Show();
 
-const SfxViewShell* pViewShell = SfxViewShell::Current();
 
 bool hasWeldedWrapper = 
m_pNotebookBarWeldedWrapper.find(pViewShell) != 
m_pNotebookBarWeldedWrapper.end();
 if ((!hasWeldedWrapper || bReloadNotebookbar) && 
pNotebookBar->IsWelded())
commit 7959953e990b9fc10dbffd5a92553037d2b419c2
Author: Noel Grandin 
AuthorDate: Tue Aug 4 11:23:16 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 4 14:58:14 2020 +0200

fix leak in CppunitTest_sc_ucalc

Change-Id: Iee5f4bfcd8ad90d37e787d225928a5ae7b269f2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100048
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f2ceca43fcbf..69e0b06a6cab 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -296,14 +296,11 @@ const sal_uInt8 SC_DDE_IGNOREMODE= 255;   /// For 
usage in FindDdeLink()
 // During threaded calculation fields being mutated are kept in this struct
 struct ScDocumentThreadSpecific
 {
-ScRecursionHelper*  pRecursionHelper;   // information for 
recursive and iterative cell formulas
+std::unique_ptr xRecursionHelper; // information for 
recursive and iterative cell formulas
 ScInterpreterContext* pContext;  // references the context passed around 
for easier access
 
-ScDocumentThreadSpecific()
-: pRecursionHelper(nullptr)
-, pContext(nullptr)
-{
-}
+ScDocumentThreadSpecific();
+~ScDocumentThreadSpecific();
 
 // To be called in the thread at start
 static void SetupFromNonThreadedData(const ScDocumentThreadSpecific& 
rNonThreadedData);
@@ -2225,8 +,6 @@ private:
 
 DECL_LINK(TrackTimeHdl, Timer *, void);
 
-static ScRecursionHelper*   CreateRecursionHelperInstance();
-
 /** Adjust a range to available sheets.
 
 Used to start and stop listening on a sane range. Both o_rRange and
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 9b966c8d5cf5..e4413853aa71 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -387,8 +387,8 @@ ScDocument::~ScDocument()
 mxPoolHelper.clear();
 
 pScriptTypeData.reset();
-delete maNonThreaded.pRecursionHelper;
-delete maThreadSpecific.pRecursionHelper;
+maNonThreaded.xRecursionHelper.reset();
+maThreadSpecific.xRecursionHelper.reset();
 
 pPreviewFont.reset();
 SAL_WARN_IF( pAutoNameCache, "sc.core", "AutoNameCache 

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

[Noel Grandin (via logerrit)]

 sc/inc/global.hxx |   12 +++
 sc/source/core/data/dpcache.cxx   |2 -
 sc/source/core/data/global.cxx|   46 ++
 sc/source/core/data/table3.cxx|2 -
 sc/source/core/tool/cellkeytranslator.cxx |2 -
 sc/source/core/tool/compare.cxx   |2 -
 sc/source/ui/app/inputwin.cxx |2 -
 7 files changed, 33 insertions(+), 35 deletions(-)

New commits:
commit 8c8543ed7f554eb9b26456dbeba6614e26699c89
Author: Noel Grandin 
AuthorDate: Tue Aug 4 10:27:12 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 4 14:57:27 2020 +0200

fix more leaks in CppunitTest_sc_cache_test

To be honest, I don't know why this fixes the leak, but it's generally
good practice anyway to use unique_ptr.

Change-Id: Ic5aa2a0c6ab092450e9eae96616a998c08e2e723
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100045
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 3f7ce5d622ee..309455adc348 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -510,10 +510,10 @@ class ScGlobal
 static std::map* pRscString;
 static OUString*pStrScDoc;
 static SC_DLLPUBLIC const OUString aEmptyOUString;
-static OUString*pStrClipDocName;
-static SvxBrushItem*pEmptyBrushItem;
-static SvxBrushItem*pButtonBrushItem;
-static SvxBrushItem*pEmbeddedBrushItem;
+static OUString aStrClipDocName;
+static std::unique_ptr xEmptyBrushItem;
+static std::unique_ptr xButtonBrushItem;
+static std::unique_ptr xEmbeddedBrushItem;
 
 static ScFunctionList*  pStarCalcFunctionList;
 static ScFunctionMgr*   pStarCalcFunctionMgr;
@@ -536,7 +536,7 @@ class ScGlobal
 static void InitPPT();
 
 public:
-static SvtSysLocale*pSysLocale;
+static std::unique_ptr xSysLocale;
 SC_DLLPUBLIC static const LocaleDataWrapper* getLocaleDataPtr();
 SC_DLLPUBLIC static const CharClass* getCharClassPtr();
 
@@ -594,7 +594,7 @@ public:
 SC_DLLPUBLIC static void Clear();// at the end of the 
program
 
 static void InitTextHeight(const SfxItemPool* pPool);
-static SvxBrushItem*GetEmptyBrushItem() { return pEmptyBrushItem; }
+static SvxBrushItem*GetEmptyBrushItem() { return 
xEmptyBrushItem.get(); }
 static SvxBrushItem*GetButtonBrushItem();
 static const OUString&  GetEmptyOUString() { return aEmptyOUString; }
 
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 32a8a83b2b73..42fafd7fff1d 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -815,7 +815,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam 
&rParam) const
 {
 OUString aQueryStr = 
rEntry.GetQueryItem().maString.getString();
 css::uno::Sequence< sal_Int32 > xOff;
-const LanguageType nLang = 
ScGlobal::pSysLocale->GetLanguageTag().getLanguageType();
+const LanguageType nLang = 
ScGlobal::xSysLocale->GetLanguageTag().getLanguageType();
 OUString aCell = pTransliteration->transliterate(
 aCellStr, nLang, 0, aCellStr.getLength(), &xOff);
 OUString aQuer = pTransliteration->transliterate(
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index f416d28673fe..538702c87097 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -79,7 +79,7 @@ std::atomic 
ScGlobal::pAddInCollection(nullptr);
 ScUserList* ScGlobal::pUserList = nullptr;
 LanguageTypeScGlobal::eLnge = LANGUAGE_SYSTEM;
 std::atomic ScGlobal::pLocale(nullptr);
-SvtSysLocale*   ScGlobal::pSysLocale = nullptr;
+std::unique_ptr   ScGlobal::xSysLocale;
 CalendarWrapper* ScGlobal::pCalendar = nullptr;
 std::atomic ScGlobal::pCollator(nullptr);
 std::atomic ScGlobal::pCaseCollator(nullptr);
@@ -87,11 +87,11 @@ std::atomic<::utl::TransliterationWrapper*> 
ScGlobal::pTransliteration(nullptr);
 std::atomic<::utl::TransliterationWrapper*> 
ScGlobal::pCaseTransliteration(nullptr);
 css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix;
 const OUString  ScGlobal::aEmptyOUString;
-OUString*   ScGlobal::pStrClipDocName = nullptr;
+OUStringScGlobal::aStrClipDocName;
 
-SvxBrushItem*   ScGlobal::pEmptyBrushItem = nullptr;
-SvxBrushItem*   ScGlobal::pButtonBrushItem = nullptr;
-SvxBrushItem*   ScGlobal::pEmbeddedBrushItem = nullptr;
+std::unique_ptr ScGlobal::xEmptyBrushItem;
+std::unique_ptr ScGlobal::xButtonBrushItem;
+std::unique_ptr ScGlobal::xEmbeddedBrushItem;
 
 ScFunctionList* ScGlobal::pStarCalcFunctionList = nullptr;
 ScFunctionMgr*  ScGlobal::pStarCalcFunctionMgr  = nullptr;
@@ -430,8 +430,8 @@ OUString ScGlobal::GetLongEr

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0d3f588fd53151a4d4dac848bf57f1c66cdad99e
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:05:15 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 14:57:23 2020 +0200

lok: update track changes status for calc

Change-Id: Ifb5ac3739ff19154b97ea1258c77739bde0cfb80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100075
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 97ef1635c719..d655a60e6863 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2792,6 +2792,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AlignUp"),
 OUString(".uno:AlignMiddle"),
 OUString(".uno:AlignDown"),
+OUString(".uno:TraceChangeMode"),
 OUString(".uno:FreezePanesRow")
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1cf61d9bab91..5e841bd382c6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1015,6 +1015,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "AlignUp" ||
 aEvent.FeatureURL.Path == "AlignMiddle" ||
 aEvent.FeatureURL.Path == "AlignDown" ||
+aEvent.FeatureURL.Path == "TraceChangeMode" ||
 aEvent.FeatureURL.Path == "FormatPaintbrush")
 {
 bool bTemp = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/notebookbar.css   |   10 ++
 loleaflet/images/lc_combine.svg |1 +
 loleaflet/images/lc_dismantle.svg   |1 +
 loleaflet/images/lc_distributeselection.svg |1 +
 loleaflet/images/lc_forward.svg |1 +
 loleaflet/images/lc_intersect.svg   |1 +
 loleaflet/images/lc_merge.svg   |1 +
 loleaflet/images/lc_substract.svg   |1 +
 loleaflet/src/control/Control.NotebookbarBuilder.js |   16 
 loleaflet/src/control/Control.NotebookbarImpress.js |6 ++
 10 files changed, 39 insertions(+)

New commits:
commit 60a92ec348a6a85e966c01c664f4e422bd9fe893
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:47:57 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 14:57:10 2020 +0200

notebookbar: Draw tab for Impress

Change-Id: I8332b8c71aa9af724592377de9f6fcd171e5014d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100080
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 22991e442..15924d608 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -680,6 +680,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
margin-top: 10px;
 }
 
+/* Draw Tab */
+
+#table-DrawTab #table-box6 #XLineColor.notebookbar {
+   margin-left: -10px;
+}
+
+#table-DrawTab #table-Draw #table-GroupB102.notebookbar {
+   margin-left: -70px;
+}
+
 /* other */
 
 .ui-drawing-area-container
diff --git a/loleaflet/images/lc_combine.svg b/loleaflet/images/lc_combine.svg
new file mode 100644
index 0..716fb3b7c
--- /dev/null
+++ b/loleaflet/images/lc_combine.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_dismantle.svg 
b/loleaflet/images/lc_dismantle.svg
new file mode 100644
index 0..9aea821c0
--- /dev/null
+++ b/loleaflet/images/lc_dismantle.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_distributeselection.svg 
b/loleaflet/images/lc_distributeselection.svg
new file mode 100644
index 0..e581f95db
--- /dev/null
+++ b/loleaflet/images/lc_distributeselection.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_forward.svg b/loleaflet/images/lc_forward.svg
new file mode 100644
index 0..c0f1b54ae
--- /dev/null
+++ b/loleaflet/images/lc_forward.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_intersect.svg 
b/loleaflet/images/lc_intersect.svg
new file mode 100644
index 0..4c9bd5e72
--- /dev/null
+++ b/loleaflet/images/lc_intersect.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_merge.svg b/loleaflet/images/lc_merge.svg
new file mode 100644
index 0..d3f5df9f8
--- /dev/null
+++ b/loleaflet/images/lc_merge.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_substract.svg 
b/loleaflet/images/lc_substract.svg
new file mode 100644
index 0..067dac7de
--- /dev/null
+++ b/loleaflet/images/lc_substract.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 7d88c0512..da036bf85 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -148,6 +148,22 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:FontworkCharacterSpacingFloater'] 
= function() {};
this._toolitemHandlers['.uno:Paste'] = function() {};
this._toolitemHandlers['.uno:DataDataPilotRun'] = function() {};
+   this._toolitemHandlers['.uno:AdvancedMode'] = function() {};
+   this._toolitemHandlers['.uno:Shear'] = function() {};
+   this._toolitemHandlers['.uno:CrookSlant'] = function() {};
+   this._toolitemHandlers['.uno:LineEndStyle'] = function() {};
+   this._toolitemHandlers['.uno:FillShadow'] = function() {};
+   this._toolitemHandlers['.uno:BezierConvert'] = function() {};
+   this._toolitemHandlers['.uno:BezierSymmetric'] = function() {};
+   this._toolitemHandlers['.uno:BezierClose'] = function() {};
+   this._toolitemHandlers['.uno:BezierEliminatePoints'] = 
function() {};
+   this._toolitemHandlers['.uno:BezierMove'] = function() {};
+   this._toolitemHandlers['.uno:BezierCutLine'] = function() {};
+   this._toolitemHa

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

[Samuel Mehrbrodt (via logerrit)]

 loleaflet/reference.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 497707eade432f7f16a19831cb2e62cc14ae5340
Author: Samuel Mehrbrodt 
AuthorDate: Tue Aug 4 14:18:17 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Aug 4 14:55:30 2020 +0200

Fix typo

Change-Id: I85cb2f0d88a35a5e92482550bb1cfe1909c6d92f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100056
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index c6fe9e008..2c7e538de 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -3446,7 +3446,7 @@ Note that they usually don't change but there is no 
guarantee that they are stab
 
Note that this notification may be published without a change
from the prior value, so care must be taken to check the 
Values.Modified
-   value and not assume the notifiaction itself implies the
+   value and not assume the notification itself implies the
modified state of the document on its own.


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

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/test/makeshared.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 30ededbd00c3b69bc7bfe72d1431e17df82542a6
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 11:50:37 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 14:24:47 2020 +0200

Adapt compilerplugins/clang/test/makeshared.cxx to MSVC standard library

> error: 'error' diagnostics seen but not expected:
>   File compilerplugins/clang/test/makeshared.cxx Line 47: rather use 
make_shared than constructing from 'unique_ptr' [loplugin:makeshared]
>   File compilerplugins/clang/test/makeshared.cxx Line 49: rather use 
make_shared than constructing from 'unique_ptr' [loplugin:makeshared]
>   File compilerplugins/clang/test/makeshared.cxx Line 53: rather use 
make_shared than constructing from 'unique_ptr' [loplugin:makeshared]

Change-Id: I5d2d1b129c9d0fee496eceb4e2cf14f5853ba00b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100074
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/test/makeshared.cxx 
b/compilerplugins/clang/test/makeshared.cxx
index fe73d7e0e47c..d3ac22389c8f 100644
--- a/compilerplugins/clang/test/makeshared.cxx
+++ b/compilerplugins/clang/test/makeshared.cxx
@@ -43,13 +43,13 @@ void test1()
 
 void test2()
 {
-// expected-error-re@+1 {{rather use make_shared than constructing from 
{{.+}} (aka 'unique_ptr') [loplugin:makeshared]}}
+// expected-error-re@+1 {{rather use make_shared than constructing from 
{{.*}}'unique_ptr'{{.*}} [loplugin:makeshared]}}
 std::shared_ptr x = std::make_unique(1);
-// expected-error-re@+1 {{rather use make_shared than constructing from 
{{.+}} (aka 'unique_ptr') [loplugin:makeshared]}}
+// expected-error-re@+1 {{rather use make_shared than constructing from 
{{.*}}'unique_ptr'{{.*}} [loplugin:makeshared]}}
 x = std::make_unique(1);
 (void)x;
 
-// expected-error-re@+1 {{rather use make_shared than constructing from 
{{.+}} (aka 'unique_ptr') [loplugin:makeshared]}}
+// expected-error-re@+1 {{rather use make_shared than constructing from 
{{.*}}'unique_ptr'{{.*}} [loplugin:makeshared]}}
 std::shared_ptr y(std::make_unique(1));
 (void)y;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/test/getstr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a8edae67c106f3793ca71540eb0e1740a5f18c1
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 11:46:03 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 14:24:10 2020 +0200

Adapt compilerplugins/clang/test/getstr.cxx to latest MSVC standard library

...that now defines the wide-character-to-narrow-stream inserters as deleted
too, at least in C++20 mode.

Change-Id: I554f2530d5905e46343bf0d8bf12a6feb3d63075
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100073
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/test/getstr.cxx 
b/compilerplugins/clang/test/getstr.cxx
index 59b52a390e3a..976d39c25c71 100644
--- a/compilerplugins/clang/test/getstr.cxx
+++ b/compilerplugins/clang/test/getstr.cxx
@@ -24,7 +24,7 @@
 // "libstdc++: P1423R3 char8_t remediation (2/4)" for -std=c++2a; TODO: the 
checks here and the
 // relevant code in loplugin:getstr should eventually be removed once support 
for the deleted
 // operators is widespread):
-#if __cplusplus > 201703L && defined __GLIBCXX__
+#if __cplusplus > 201703L && (defined __GLIBCXX__ || defined _MSC_VER)
 #define HAVE_DELETED_OPERATORS true
 #else
 #define HAVE_DELETED_OPERATORS false
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 187a6f5d2dfd8a94708cedea992aa551074726a4
Author: Stephan Bergmann 
AuthorDate: Tue Aug 4 11:40:38 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 4 14:23:47 2020 +0200

Silence -Werror,-Wdeprecated-enum-enum-conversion (clang-cl)

"bitwise operation between different enumeration types ('CommandTypeEnum' 
and
'ExecuteOptionEnum')", but where  
documents
parameter Options as "A Long [...] Can be a bitmask of one or more
CommandTypeEnum or ExecuteOptionEnum values."

Change-Id: If000490127e7215863ea750a3f9f30e69916978e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100070
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/ado/AStatement.cxx 
b/connectivity/source/drivers/ado/AStatement.cxx
index 01fea934cd19..6f2c14617e0e 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -396,7 +396,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const 
OUString& sql )
 try {
 ADORecordset* pSet = nullptr;
 CHECK_RETURN(m_Command.put_CommandText(sql))
-
CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,adCmdText|adExecuteNoRecords,&pSet))
+
CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,long(adCmdText)|long(adExecuteNoRecords),&pSet))
 }
 catch (SQLWarning& ex) {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/notebookbar.css   |6 
 loleaflet/src/control/Control.Menubar.js|2 
 loleaflet/src/control/Control.NotebookbarBuilder.js |9 
 loleaflet/src/control/Control.NotebookbarCalc.js|  280 +++-
 4 files changed, 295 insertions(+), 2 deletions(-)

New commits:
commit 9719e6c4ef3f33b60a696adda2fda3574c5d856c
Author: Pedro Pinto Silva 
AuthorDate: Mon Aug 3 12:24:27 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Aug 4 14:01:11 2020 +0200

NotebookbarCalc: Add Layout and Data tabs,

Change-Id: I0dedbcf9c361969e1134406e2f782cf21aa585e4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/7
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 07d494bed..22991e442 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -611,6 +611,12 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
width: 32px !important;
 }
 
+/* Sheet Tab */
+
+#table-Sheet-Section.notebookbar {
+   margin-top: 10px;
+}
+
 /* Impress */
 
 /* Home Tab */
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8838a3efd..f5e0818e5 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -409,7 +409,7 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 
'inserthyperlink', type: 'action'},
{uno: '.uno:InsertSymbol'},
-   {uno: '.uno:EditHeaderAndFooter'}
+   {uno: '.uno:EditHeaderAndFooter'} /*todo: add 
to Control.Notebookbar.Calc.js (as Insert tab)*/
]},
{name: _UNO('.uno:FormatMenu', 'spreadsheet'), id: 
'format', type: 'menu', menu: [
{uno: '.uno:ResetAttributes'},
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index cd9fae8f1..7d88c0512 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -149,6 +149,15 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:Paste'] = function() {};
this._toolitemHandlers['.uno:DataDataPilotRun'] = function() {};
 
+   /*Calc: Data Tab*/
+   this._toolitemHandlers['.uno:DataProvider'] = function() {};
+   this._toolitemHandlers['.uno:ManageXMLSource'] = function() {};
+   this._toolitemHandlers['.uno:DataStreams'] = function() {};
+   this._toolitemHandlers['.uno:InsertExternalDataSource'] = 
function() {};
+   this._toolitemHandlers['.uno:RecalcPivotTable'] = function() {};
+   this._toolitemHandlers['.uno:DataProviderRefresh'] = function() 
{};
+   this._toolitemHandlers['.uno:Calculate'] = function() {};
+
this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] = 
function() {};
},
 
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js 
b/loleaflet/src/control/Control.NotebookbarCalc.js
index b806bb4b8..e15a695f8 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -5,7 +5,7 @@
 
 /* global _ _UNO */
 L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
-   
+
getTabs: function() {
return [
{
@@ -24,6 +24,16 @@ L.Control.NotebookbarCalc = 
L.Control.NotebookbarWriter.extend({
'id': '3',
'name': 'InsertLabel'
},
+   {
+   'text': _('~Sheet'),
+   'id': '-3',
+   'name': 'Sheet'
+   },
+   {
+   'text': _('~Data'),
+   'id': '5',
+   'name': 'DataLabel'
+   },
{
'text': _('~Review'),
'id': '6',
@@ -37,6 +47,23 @@ L.Control.NotebookbarCalc = 
L.Control.NotebookbarWriter.extend({
];
},
 
+   selectedTab: function(tabName) {
+   switch (tabName) {
+   case 'File':
+   this.loadTab(this.getFileTab());
+   break;
+
+   case 'Help':
+   this.loadTab(this.getHelpTab());
+   break;
+
+   case 'Sheet':
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - bridges/Library_cpp_uno.mk bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/Library_cpp_uno.mk |8 -
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx  |   60 --
 bridges/source/cpp_uno/gcc3_linux_aarch64/vtableslotcall.s |   72 +
 3 files changed, 75 insertions(+), 65 deletions(-)

New commits:
commit 1c846db29d0dc2ce2675f84a378ccb2ee0bca6e7
Author: Stephan Bergmann 
AuthorDate: Wed Jul 29 02:50:32 2020 -0400
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:52:53 2020 +0200

Replace brittle gcc3_linux_aarch64 vtableSlotCall with pure assembler code

*  For one, as discussed in the comment at 
 "Port to
FreeBSD aarch64":

"So it looks like Clang does not treat those register asm as we expect it 
would,
at least on aarch64.

"Witness a local Linux recent master --with-distro=LibreOfficeAndroidAarch64
[i.e., using Clang] build's

> $ llvm-objdump --disassemble instdir/program/libgcc3_uno.a
[...]
>  :
>0: ff 43 03 d1   sub sp, sp, #208
>4: f4 4f 0b a9   stp x20, x19, [sp, #176]
>8: fd 7b 0c a9   stp x29, x30, [sp, #192]
>c: fd 03 03 91   add x29, sp, #192
>   10: a8 43 00 91   add x8, x29, #16
>   14: bf 83 1d f8   sturxzr, [x29, #-40]
>   18: e0 07 04 a9   stp x0, x1, [sp, #64]
>   1c: e2 0f 05 a9   stp x2, x3, [sp, #80]
>   20: e4 17 06 a9   stp x4, x5, [sp, #96]
>   24: e6 1f 07 a9   stp x6, x7, [sp, #112]
>   28: e0 07 00 6d   stp d0, d1, [sp]
>   2c: e2 0f 01 6d   stp d2, d3, [sp, #16]
>   30: e4 17 02 6d   stp d4, d5, [sp, #32]
>   34: e6 1f 03 6d   stp d6, d7, [sp, #48]
>   38: a8 03 1c f8   sturx8, [x29, #-64]
>   3c: a0 43 5e b8   ldurw0, [x29, #-28]
>   40: a1 03 5e b8   ldurw1, [x29, #-32]
>   44: a5 83 5e f8   ldurx5, [x29, #-24]
>   48: e4 03 08 aa   mov x4, x8
>   4c: e2 03 01 91   add x2, sp, #64
>   50: e3 03 00 91   mov x3, sp
>   54: f3 03 01 91   add x19, sp, #64
>   58: f4 03 00 91   mov x20, sp
>   5c: 00 00 00 94   bl  0x5c 
>   60: 60 06 40 a9   ldp x0, x1, [x19]
>   64: 80 06 40 6d   ldp d0, d1, [x20]
>   68: 82 0e 41 6d   ldp d2, d3, [x20, #16]
>   6c: fd 7b 4c a9   ldp x29, x30, [sp, #192]
>   70: f4 4f 4b a9   ldp x20, x19, [sp, #176]
>   74: ff 43 03 91   add sp, sp, #208
>   78: c0 03 5f d6   ret
[...]

vs. [this commit's vtableslotcall.s; see below for details].

"And also latest Clang 12 trunk still does e.g.

> $ cat test.c
> void f(long);
> void g() {
> register long volatile a asm ("x8");
> f(a);
> }
> $ clang --target=unknown-linux-aarch64 -S -O2 test.c
> $ cat test.s
> .text
> .file   "test.c"
> .globl  g   // -- Begin function g
> .p2align2
> .type   g,@function
> g:  // @g
> // %bb.0:   // %entry
> sub sp, sp, #16 // =16
> ldr x0, [sp, #8]
> add sp, sp, #16 // =16
> b   f
> .Lfunc_end0:
> .size   g, .Lfunc_end0-g
> // -- End function
> .ident  "clang version 12.0.0 (g...@github.com:llvm/llvm-project 
eb31ddd71eb44d53ebe12a09c9587198bb6f2a2e)"
> .section".note.GNU-stack","",@progbits
> .addrsig

"(This is probably also the underlying issue that
eb15ac837e06087fb8148330e9171d6697d89ee6 'android: Avoid throwing exceptions
through the bridges' tries to hack arond.)"

*  For another, this also gets rid of the
dddb527db1562f30a2a2b20338dfc8458086a4a9 "Again, no 
-fstack-protector-strong for
gcc3_linux_aarch64/cpp2uno.cxx" hack.

The contents of the new vtableslotcall.s is effectively the GCC 10 -S 
output of
the old vtableSlotCall C++ function from cpp2uno.cxx.  (And as cpp2uno.cxx 
only
takes the address of vtableSlotCall, never calls it directly, it does not 
matter
that it declares it with an imprecise

  extern "C" void vtableSlotCall();

signature.)

Change-Id: Icfbf0622a47825ff7cf21008de27d3da6a2f0ebd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99660
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100020
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_

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

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 924fb638ed3983461a5f503b99bc84be2cc23d84
Author: Stephan Bergmann 
AuthorDate: Wed Feb 12 12:47:04 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:52:03 2020 +0200

Blind fix for Linux aarch64 with libcxxabi

...after untested a7d1fed24557b203acb5016a98af26f4ef24d27a "Hack to 
dynamically
adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" had been submitted

Change-Id: I68694645825ddebb249a90d9af9b8ba04c0bdbb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100019
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 611442a31e31..4a5a1d1b662d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -153,8 +153,8 @@ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void 
* exception) {
 // unaffected, as it only accesses members towards the start of the struct,
 // through a pointer known to actually point at the start):
 if (header->exceptionDestructor != &deleteException) {
-header = reinterpret_cast<__cxa_exception const *>(
-reinterpret_cast(header) - 8);
+header = reinterpret_cast<__cxxabiv1::__cxa_exception *>(
+reinterpret_cast(header) - 8);
 assert(header->exceptionDestructor == &deleteException);
 }
 #endif
___
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.4' - bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx |7 
+--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 88c103186cd7cc0bc2bcdea8648e0fb038061d93
Author: Stephan Bergmann 
AuthorDate: Tue Jan 7 17:35:18 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:48:32 2020 +0200

aarch64 r18 is reserved at least on Android

 states:  "The role of register r18 is platform specific.  If a
platform ABI has need of a dedicated general purpose register to carry 
inter-
procedural state (for example, the thread context) then it should use this
register for that purpose.  If the platform ABI has no such requirements, 
then
it should use r18 as an additional temporary register."

For a --host=aarch64-linux-android build, Clang warned

> bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx:39:9: 
error: inline asm clobber list contains reserved registers: X18 
[-Werror,-Winline-asm]
> "ldp x0, x1, [%[gpr_]]\n\t"
> ^
> :1:1: note: instantiated into assembly here
> ldp x0, x1, [x20]
> ^
> bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx:39:9: 
note: Reserved registers on the clobber list may not be preserved across the 
asm statement, and clobbering them may lead to undefined behaviour.
> "ldp x0, x1, [%[gpr_]]\n\t"
> ^
> :1:1: note: instantiated into assembly here
> ldp x0, x1, [x20]
> ^

and  "Start reserving x18 by default on
Android targets" shows that at least LLVM/Clang claims that the Android ABI
reserves it (though it doesn't cite any sources for that).

(If this bridges/source/cpp_uno/ implementation is used for other non-Linux 
OS
like Fuchsia, we may need to extend the #if accordingly; see the above LLVM
commit for which platforms it claims reserve the register.)

Change-Id: I62a5210ddc4784eee2ab56ee134b9e195827b9dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86366
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99928
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
index 2f7188ea4f99..ba5194d6f8c8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
@@ -54,8 +54,11 @@ void callVirtualFunction(
[ret_]"m" (ret),
"m" (stackargs) // dummy input to prevent optimizing the alloca away
 : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",
-  "r11", "r12", "r13", "r14", "r15", "r16", "r17", "r18"/*TODO?*/, 
"v0",
-  "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11",
+  "r11", "r12", "r13", "r14", "r15", "r16", "r17",
+#if !defined ANDROID
+  "r18"/*TODO?*/,
+#endif
+  "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", 
"v11",
   "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "v21",
   "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31",
   "memory"
___
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.4' - bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit 1f362b6977aa1307fa1897cdd48f456f48802e74
Author: Stephan Bergmann 
AuthorDate: Tue Feb 11 15:46:45 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:49:02 2020 +0200

Hack to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi

...for Linux aarch64, similar to 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 
"Hack
to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" for macOS 
x86-64.
But unlike on macOS (which is known to always use libcxxabi), be careful to 
only
execute the hack in builds targeting libcxxabi.

Change-Id: I5417fde425d2d6bac9400592193a9fe5d2bfe175
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88458
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100018
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 892bf6e81963..611442a31e31 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -136,6 +136,28 @@ std::type_info * getRtti(typelib_TypeDescription const & 
type) {
 extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) {
 __cxxabiv1::__cxa_exception * header =
 static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1;
+#if defined _LIBCPPABI_VERSION // detect libc++abi
+// The libcxxabi commit
+// 
+// "[libcxxabi] Align unwindHeader on a double-word boundary" towards
+// LLVM 5.0 changed the size of __cxa_exception by adding
+//
+//   __attribute__((aligned))
+//
+// to the final member unwindHeader, on x86-64 effectively adding a hole of
+// size 8 in front of that member (changing its offset from 88 to 96,
+// sizeof(__cxa_exception) from 120 to 128, and alignof(__cxa_exception)
+// from 8 to 16); a hack to dynamically determine whether we run against a
+// new libcxxabi is to look at the exceptionDestructor member, which must
+// point to this function (the use of __cxa_exception in fillUnoException 
is
+// unaffected, as it only accesses members towards the start of the struct,
+// through a pointer known to actually point at the start):
+if (header->exceptionDestructor != &deleteException) {
+header = reinterpret_cast<__cxa_exception const *>(
+reinterpret_cast(header) - 8);
+assert(header->exceptionDestructor == &deleteException);
+}
+#endif
 OUString unoName(toUnoName(header->exceptionType->name()));
 typelib_TypeDescription * td = 0;
 typelib_typedescription_getByName(&td, unoName.pData);
___
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.2' - bridges/Library_cpp_uno.mk bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/Library_cpp_uno.mk |9 -
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx  |   60 --
 bridges/source/cpp_uno/gcc3_linux_aarch64/vtableslotcall.s |   72 +
 3 files changed, 75 insertions(+), 66 deletions(-)

New commits:
commit 61b3d406ae4122bdf3d2d36679fb81077834d3ba
Author: Stephan Bergmann 
AuthorDate: Wed Jul 29 02:50:32 2020 -0400
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:47:33 2020 +0200

Replace brittle gcc3_linux_aarch64 vtableSlotCall with pure assembler code

*  For one, as discussed in the comment at 
 "Port to
FreeBSD aarch64":

"So it looks like Clang does not treat those register asm as we expect it 
would,
at least on aarch64.

"Witness a local Linux recent master --with-distro=LibreOfficeAndroidAarch64
[i.e., using Clang] build's

> $ llvm-objdump --disassemble instdir/program/libgcc3_uno.a
[...]
>  :
>0: ff 43 03 d1   sub sp, sp, #208
>4: f4 4f 0b a9   stp x20, x19, [sp, #176]
>8: fd 7b 0c a9   stp x29, x30, [sp, #192]
>c: fd 03 03 91   add x29, sp, #192
>   10: a8 43 00 91   add x8, x29, #16
>   14: bf 83 1d f8   sturxzr, [x29, #-40]
>   18: e0 07 04 a9   stp x0, x1, [sp, #64]
>   1c: e2 0f 05 a9   stp x2, x3, [sp, #80]
>   20: e4 17 06 a9   stp x4, x5, [sp, #96]
>   24: e6 1f 07 a9   stp x6, x7, [sp, #112]
>   28: e0 07 00 6d   stp d0, d1, [sp]
>   2c: e2 0f 01 6d   stp d2, d3, [sp, #16]
>   30: e4 17 02 6d   stp d4, d5, [sp, #32]
>   34: e6 1f 03 6d   stp d6, d7, [sp, #48]
>   38: a8 03 1c f8   sturx8, [x29, #-64]
>   3c: a0 43 5e b8   ldurw0, [x29, #-28]
>   40: a1 03 5e b8   ldurw1, [x29, #-32]
>   44: a5 83 5e f8   ldurx5, [x29, #-24]
>   48: e4 03 08 aa   mov x4, x8
>   4c: e2 03 01 91   add x2, sp, #64
>   50: e3 03 00 91   mov x3, sp
>   54: f3 03 01 91   add x19, sp, #64
>   58: f4 03 00 91   mov x20, sp
>   5c: 00 00 00 94   bl  0x5c 
>   60: 60 06 40 a9   ldp x0, x1, [x19]
>   64: 80 06 40 6d   ldp d0, d1, [x20]
>   68: 82 0e 41 6d   ldp d2, d3, [x20, #16]
>   6c: fd 7b 4c a9   ldp x29, x30, [sp, #192]
>   70: f4 4f 4b a9   ldp x20, x19, [sp, #176]
>   74: ff 43 03 91   add sp, sp, #208
>   78: c0 03 5f d6   ret
[...]

vs. [this commit's vtableslotcall.s; see below for details].

"And also latest Clang 12 trunk still does e.g.

> $ cat test.c
> void f(long);
> void g() {
> register long volatile a asm ("x8");
> f(a);
> }
> $ clang --target=unknown-linux-aarch64 -S -O2 test.c
> $ cat test.s
> .text
> .file   "test.c"
> .globl  g   // -- Begin function g
> .p2align2
> .type   g,@function
> g:  // @g
> // %bb.0:   // %entry
> sub sp, sp, #16 // =16
> ldr x0, [sp, #8]
> add sp, sp, #16 // =16
> b   f
> .Lfunc_end0:
> .size   g, .Lfunc_end0-g
> // -- End function
> .ident  "clang version 12.0.0 (g...@github.com:llvm/llvm-project 
eb31ddd71eb44d53ebe12a09c9587198bb6f2a2e)"
> .section".note.GNU-stack","",@progbits
> .addrsig

"(This is probably also the underlying issue that
eb15ac837e06087fb8148330e9171d6697d89ee6 'android: Avoid throwing exceptions
through the bridges' tries to hack arond.)"

*  For another, this also gets rid of the
dddb527db1562f30a2a2b20338dfc8458086a4a9 "Again, no 
-fstack-protector-strong for
gcc3_linux_aarch64/cpp2uno.cxx" hack.

The contents of the new vtableslotcall.s is effectively the GCC 10 -S 
output of
the old vtableSlotCall C++ function from cpp2uno.cxx.  (And as cpp2uno.cxx 
only
takes the address of vtableSlotCall, never calls it directly, it does not 
matter
that it declares it with an imprecise

  extern "C" void vtableSlotCall();

signature.)

Change-Id: Icfbf0622a47825ff7cf21008de27d3da6a2f0ebd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99660
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100017
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - bridges/Library_cpp_uno.mk config_host.mk.in configure.ac

[Stephan Bergmann (via logerrit)]

 bridges/Library_cpp_uno.mk |7 ++-
 config_host.mk.in  |1 +
 configure.ac   |   11 +++
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit b7ea898726f29cdd3d6c3929c790371de3d1dfcb
Author: Stephan Bergmann 
AuthorDate: Fri Oct 11 23:50:19 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:47:00 2020 +0200

aarch64 callVirtualFunction needs to be compiled w/o 
-fstack-clash-protection

At least when doing an aarch64 Flatpak build against 
org.freedesktop.Sdk//19.08,
which uses GCC 9.2.0 and passes in `CXXFLAGS=-O2 -g -pipe
-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions
-fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables
-fstack-clash-protection`, callVirtualMethod (in
bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx) would
decrement the stack pointer another 16 bytes after the

  stackargs = alloca(...);

and before the asm block, so in the called virtual function, arguments read 
from
the stack would read garbage (and CustomTarget_testtools/uno_test would fail
with SIGSEGV at

> #0  0xb733eb48 in rtl::OUString::operator= (this=0xf9c1ac30, 
str=...) at /run/build/libreoffice/include/rtl/ustring.hxx:453
> #1  0xb733a7bc in bridge_object::assign (rData=..., bBool=true, 
cChar=64 u'@', nByte=17 '\021', nShort=4660, nUShort=65244, nLong=305419896, 
nULong=4275878552, nHyper=0, nUHyper=187651311381888, fFloat=17.0814991, 
fDouble=3.141592635899, eEnum=-1698898192, rStr=..., xTest=..., rAny=...) 
at /run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:99
> #2  0xb733a87c in bridge_object::assign (rData=..., bBool=true, 
cChar=64 u'@', nByte=17 '\021', nShort=4660, nUShort=65244, nLong=305419896, 
nULong=4275878552, nHyper=0, nUHyper=187651311381888, fFloat=17.0814991, 
fDouble=3.141592635899, eEnum=-1698898192, rStr=..., xTest=..., rAny=..., 
rSequence=...) at 
/run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:115
> #3  0xb733ade4 in bridge_object::Test_Impl::setValues 
(this=0xf9c1abb0, bBool=1 '\001', cChar=64 u'@', nByte=17 '\021', 
nShort=4660, nUShort=65244, nLong=305419896, nULong=4275878552, nHyper=0, 
nUHyper=187651311381888, fFloat=17.0814991, fDouble=3.141592635899, 
eEnum=-1698898192, rStr=..., xTest=..., rAny=..., rSequence=..., rStruct=...) 
at /run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:548
> #4  0xb740bff4 in callVirtualFunction (function=281473755360772, 
gpr=0xd1ab1f28, fpr=0xd1ab1f68, stack=0xd1ab1d40, sp=8, 
ret=0xd1ab22c0) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx:63
> #5  0xb740ca70 in (anonymous namespace)::call 
(proxy=0xf9c291c0, slot=..., returnType=0xf9c00770, count=17, 
parameters=0xf9c3a210, returnValue=0xd1ab22c0, 
arguments=0xd1ab2230, exception=0xd1ab2370) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx:178
> #6  0xb740d4c4 in 
bridges::cpp_uno::shared::unoInterfaceProxyDispatch (pUnoI=0xf9c291c0, 
pMemberDescr=0xf9c55950, pReturn=0xd1ab22c0, pArgs=0xd1ab2230, 
ppException=0xd1ab2370) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx:361
> #7  0xb740720c in (anonymous namespace)::call 
(proxy=0xf9c549c0, description=..., returnType=0xf9c00770, count=17, 
parameters=0xf9c3a210, gpr=0xd1ab2510, fpr=0xd1ab2550, 
stack=0xd1ab2590, indirectRet=0xb7d24790) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:120
> #8  0xb74079a0 in (anonymous namespace)::vtableCall 
(functionIndex=40, vtableOffset=0, gpr=0xd1ab2510, fpr=0xd1ab2550, 
stack=0xd1ab2590, indirectRet=0xb7d24790) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:291
> #9  0xb7407b00 in (anonymous namespace)::vtableSlotCall 
(gpr0=187651311618536, gpr1=1, gpr2=64, gpr3=17, gpr4=4660, gpr5=65244, 
gpr6=305419896, gpr7=4275878552, fpr0=5.4321266044931319e-315, 
fpr1=3.141592635899, fpr2=0, fpr3=4.0039072046065485, fpr4=0, 
fpr5=4.003911019303815, fpr6=8.9589789687541617e+102, 
fpr7=-4.4588500238274385e-308) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:348
> #10 0xb739e60c in bridge_test::performTest (xContext=..., 
xLBT=..., noCurrentContext=false) at 
/run/build/libreoffice/testtools/source/bridgetest/bridgetest.cxx:378
> #11 0xb73a3d58 in bridge_test::TestBridgeImpl::run 
(this=0xf9c18550, rArgs=...) at 
/run/build/libreoffice/testtools/source/bridgetest/bridgetest.cxx:1162
> #12 0xd292a3ec in sal_main () at 
/run/build/libreoffice/cpputools/source/unoexe/unoexe.cxx:509
> #13 0xd29297a0 in main (ar

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

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx |   32 ++-
 bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx  |   15 
 2 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit 9a9cef72c404b8636c98644b3298b78841e2da94
Author: Stephan Bergmann 
AuthorDate: Thu Feb 13 08:40:11 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:45:48 2020 +0200

Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi

(where the new change to __cxa_exception effectively reverts the change that
prompted 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically 
adapt to
__cxa_exceptiom in LLVM 5.0 libcxxabi")

Change-Id: Iec4ef1dc188bea2223d99b1b7eb8adec636c98e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88583
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100015
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 2df4356c81b5..250aef479637 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -270,7 +270,11 @@ static void deleteException( void * pExc )
 // new libcxxabi is to look at the exceptionDestructor member, which must
 // point to this function (the use of __cxa_exception in fillUnoException 
is
 // unaffected, as it only accesses members towards the start of the struct,
-// through a pointer known to actually point at the start):
+// through a pointer known to actually point at the start).  The libcxxabi 
commit
+// 

+// "[libcxxabi] Insert padding in __cxa_exception struct for 
compatibility" towards LLVM 11
+// removes the need for this hack, so it can be removed again once we can 
be sure that we only
+// run against libcxxabi from LLVM >= 11:
 if (header->exceptionDestructor != &deleteException) {
 header = reinterpret_cast<__cxa_exception const *>(
 reinterpret_cast(header) - 8);
@@ -344,6 +348,32 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * 
pCpp2Uno)
 return;
 }
 
+// Very bad HACK to find out whether we run against a libcxxabi that has a 
new
+// __cxa_exception::reserved member at the start, introduced with LLVM 11
+// 

+// "[libcxxabi] Insert padding in __cxa_exception struct for 
compatibility".  The layout of the
+// start of __cxa_exception is
+//
+//  [8 byte  void *reserve]
+//   8 byte  size_t referenceCount
+//
+// where the (bad, hacky) assumption is that reserve (if present) is null
+// (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, 
and nothing actively
+// sets reserve) while referenceCount is non-null (__cxa_throw sets it to 
1, and
+// __cxa_decrement_exception_refcount destroys the exception as soon as it 
drops to 0; for a
+// __cxa_dependent_exception, the referenceCount member is rather
+//
+//   8 byte  void* primaryException
+//
+// but which also will always be set to a non-null value in 
__cxa_rethrow_primary_exception).
+// As described in the definition of __cxa_exception
+// (bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx), this hack 
(together with the "#if 0"
+// there) can be dropped once we can be sure that we only run against new 
libcxxabi that has the
+// reserve member:
+if (*reinterpret_cast(header) == nullptr) {
+header = reinterpret_cast<__cxa_exception *>(reinterpret_cast(header) + 1);
+}
+
 std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type();
 
 typelib_TypeDescription * pExcTypeDescr = nullptr;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index 39939ab6be72..015cda1c00e5 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
@@ -68,6 +68,21 @@ typedef unsigned _Unwind_Ptr 
__attribute__((__mode__(__pointer__)));
 struct __cxa_exception
 {
 #if __LP64__
+#if 0
+// This is a new field added with LLVM 11
+// 

+// "[libcxxabi] Insert padding in __cxa_exception struct for 
compatibility".  The HACK in
+// fillUnoException (bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx) 
tries to find out at
+// runtime whether a __cxa_exception has this member.  Once we can be sure 
that we only run
+// against new libcxxabi that has this member, we can drop the "#if 0" 
here and drop the hack
+// in fillUnoException.
+
+

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

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69d6c4b42bdeb9ed2fa0d3680510b8f0cf81a72e
Author: Stephan Bergmann 
AuthorDate: Wed Feb 12 12:47:04 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:43:39 2020 +0200

Blind fix for Linux aarch64 with libcxxabi

...after untested a7d1fed24557b203acb5016a98af26f4ef24d27a "Hack to 
dynamically
adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" had been submitted

Change-Id: I68694645825ddebb249a90d9af9b8ba04c0bdbb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100014
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 02d7bcd9aa9d..83359439456a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -153,8 +153,8 @@ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void 
* exception) {
 // unaffected, as it only accesses members towards the start of the struct,
 // through a pointer known to actually point at the start):
 if (header->exceptionDestructor != &deleteException) {
-header = reinterpret_cast<__cxa_exception const *>(
-reinterpret_cast(header) - 8);
+header = reinterpret_cast<__cxxabiv1::__cxa_exception *>(
+reinterpret_cast(header) - 8);
 assert(header->exceptionDestructor == &deleteException);
 }
 #endif
___
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.2' - bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit 8b1a1036f254dc8c68a4a067ec368abea5b27e83
Author: Stephan Bergmann 
AuthorDate: Tue Feb 11 15:46:45 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:43:00 2020 +0200

Hack to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi

...for Linux aarch64, similar to 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 
"Hack
to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" for macOS 
x86-64.
But unlike on macOS (which is known to always use libcxxabi), be careful to 
only
execute the hack in builds targeting libcxxabi.

Change-Id: I5417fde425d2d6bac9400592193a9fe5d2bfe175
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88458
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100013
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 462efc7b41d1..02d7bcd9aa9d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -136,6 +136,28 @@ std::type_info * getRtti(typelib_TypeDescription const & 
type) {
 extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) {
 __cxxabiv1::__cxa_exception * header =
 static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1;
+#if defined _LIBCPPABI_VERSION // detect libc++abi
+// The libcxxabi commit
+// 
+// "[libcxxabi] Align unwindHeader on a double-word boundary" towards
+// LLVM 5.0 changed the size of __cxa_exception by adding
+//
+//   __attribute__((aligned))
+//
+// to the final member unwindHeader, on x86-64 effectively adding a hole of
+// size 8 in front of that member (changing its offset from 88 to 96,
+// sizeof(__cxa_exception) from 120 to 128, and alignof(__cxa_exception)
+// from 8 to 16); a hack to dynamically determine whether we run against a
+// new libcxxabi is to look at the exceptionDestructor member, which must
+// point to this function (the use of __cxa_exception in fillUnoException 
is
+// unaffected, as it only accesses members towards the start of the struct,
+// through a pointer known to actually point at the start):
+if (header->exceptionDestructor != &deleteException) {
+header = reinterpret_cast<__cxa_exception const *>(
+reinterpret_cast(header) - 8);
+assert(header->exceptionDestructor == &deleteException);
+}
+#endif
 OUString unoName(toUnoName(header->exceptionType->name()));
 typelib_TypeDescription * td = 0;
 typelib_typedescription_getByName(&td, unoName.pData);
___
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.2' - bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx |7 
+--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 666fb8d3c6f5af94450d1f1b2249293fec0fe722
Author: Stephan Bergmann 
AuthorDate: Tue Jan 7 17:35:18 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Aug 4 13:40:23 2020 +0200

aarch64 r18 is reserved at least on Android

 states:  "The role of register r18 is platform specific.  If a
platform ABI has need of a dedicated general purpose register to carry 
inter-
procedural state (for example, the thread context) then it should use this
register for that purpose.  If the platform ABI has no such requirements, 
then
it should use r18 as an additional temporary register."

For a --host=aarch64-linux-android build, Clang warned

> bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx:39:9: 
error: inline asm clobber list contains reserved registers: X18 
[-Werror,-Winline-asm]
> "ldp x0, x1, [%[gpr_]]\n\t"
> ^
> :1:1: note: instantiated into assembly here
> ldp x0, x1, [x20]
> ^
> bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx:39:9: 
note: Reserved registers on the clobber list may not be preserved across the 
asm statement, and clobbering them may lead to undefined behaviour.
> "ldp x0, x1, [%[gpr_]]\n\t"
> ^
> :1:1: note: instantiated into assembly here
> ldp x0, x1, [x20]
> ^

and  "Start reserving x18 by default on
Android targets" shows that at least LLVM/Clang claims that the Android ABI
reserves it (though it doesn't cite any sources for that).

(If this bridges/source/cpp_uno/ implementation is used for other non-Linux 
OS
like Fuchsia, we may need to extend the #if accordingly; see the above LLVM
commit for which platforms it claims reserve the register.)

Change-Id: I62a5210ddc4784eee2ab56ee134b9e195827b9dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86366
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100012
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
index 2f7188ea4f99..ba5194d6f8c8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
@@ -54,8 +54,11 @@ void callVirtualFunction(
[ret_]"m" (ret),
"m" (stackargs) // dummy input to prevent optimizing the alloca away
 : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",
-  "r11", "r12", "r13", "r14", "r15", "r16", "r17", "r18"/*TODO?*/, 
"v0",
-  "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11",
+  "r11", "r12", "r13", "r14", "r15", "r16", "r17",
+#if !defined ANDROID
+  "r18"/*TODO?*/,
+#endif
+  "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", 
"v11",
   "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "v21",
   "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31",
   "memory"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx|   20 
 include/sfx2/sidebar/SidebarController.hxx |1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit ff23d87cb00388095a94b90e061564fc179e1823
Author: Mert Tumer 
AuthorDate: Fri May 8 17:23:12 2020 +0300
Commit: Mert Tumer 
CommitDate: Tue Aug 4 12:44:31 2020 +0200

mobile: fix calc chart wizard properties is not shown

Change-Id: I2fd98ddbdb529c3f224299c6824b4743797925be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93747
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97061
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98248
Tested-by: Jenkins
Reviewed-by: Mert Tumer 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 346c5174accd..db6dc07262a0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -907,10 +907,24 @@ void setupSidebar(bool bShow, const OUString& 
sidebarDeckId = "")
 if (!pDockingWin)
 return;
 
+OUString currentDeckId = 
pDockingWin->GetSidebarController()->GetCurrentDeckId();
+
+// check if it is the chart deck id, if it is, don't switch to default 
deck
+bool switchToDefault = true;
+
+if (currentDeckId == "ChartDeck")
+switchToDefault = false;
+
 if (!sidebarDeckId.isEmpty())
 {
 pDockingWin->GetSidebarController()->SwitchToDeck(sidebarDeckId);
 }
+else
+{
+if (switchToDefault)
+pDockingWin->GetSidebarController()->SwitchToDefaultDeck();
+}
+
 pDockingWin->SyncUpdate();
 }
 else
@@ -3750,7 +3764,6 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 SfxObjectShell* pDocSh = SfxObjectShell::Current();
 OUString aCommand(pCommand, strlen(pCommand), RTL_TEXTENCODING_UTF8);
 LibLODocument_Impl* pDocument = static_cast(pThis);
-OUString sidebarDeckId = "PropertyDeck";
 
 std::vector 
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
 
@@ -3906,13 +3919,12 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 }
 else if (gImpl && aCommand == ".uno:LOKSidebarWriterPage")
 {
-sidebarDeckId = "WriterPageDeck";
-setupSidebar(true, sidebarDeckId);
+setupSidebar(true, "WriterPageDeck");
 return;
 }
 else if (gImpl && aCommand == ".uno:SidebarShow")
 {
-setupSidebar(true, sidebarDeckId);
+setupSidebar(true);
 return;
 }
 else if (gImpl && aCommand == ".uno:SidebarHide")
diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index d03576b3416d..e9b653762e82 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -134,6 +134,7 @@ public:
 FocusManager& GetFocusManager() { return maFocusManager;}
 
 ResourceManager* GetResourceManager() { return mpResourceManager.get();}
+auto& GetCurrentDeckId() const { return msCurrentDeckId; }
 
// std::unique_ptr GetResourceManager() { return 
mpResourceManager;}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx   |   19 ---
 include/sfx2/sidebar/SidebarDockingWindow.hxx |2 +-
 sfx2/source/sidebar/ResourceManager.cxx   |9 +
 3 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 87c58f6a9351f2a2ec40fd99c4e5a63bfe29d0b8
Author: Mert Tumer 
AuthorDate: Wed Apr 29 16:29:57 2020 +0300
Commit: Mert Tumer 
CommitDate: Tue Aug 4 12:43:29 2020 +0200

added ability to switch sidebar deck on init.cxx for mobilewizard

Change-Id: I532398bc41e1c984c24b1d39e4844315a0a69847
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93162
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97062
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98247
Tested-by: Jenkins
Reviewed-by: Mert Tumer 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index dc1b6b1664fc..346c5174accd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -111,6 +111,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -883,10 +884,10 @@ void ExecuteOrientationChange()
 mxUndoManager->leaveUndoContext();
 }
 
-void setupSidebar(bool bShow)
+void setupSidebar(bool bShow, const OUString& sidebarDeckId = "")
 {
 SfxViewShell* pViewShell = SfxViewShell::Current();
-SfxViewFrame* pViewFrame = pViewShell? pViewShell->GetViewFrame(): nullptr;
+SfxViewFrame* pViewFrame = pViewShell ? pViewShell->GetViewFrame() : 
nullptr;
 if (pViewFrame)
 {
 if (bShow && !pViewFrame->GetChildWindow(SID_SIDEBAR))
@@ -905,6 +906,11 @@ void setupSidebar(bool bShow)
 auto pDockingWin = dynamic_cast(pChild->GetWindow());
 if (!pDockingWin)
 return;
+
+if (!sidebarDeckId.isEmpty())
+{
+pDockingWin->GetSidebarController()->SwitchToDeck(sidebarDeckId);
+}
 pDockingWin->SyncUpdate();
 }
 else
@@ -3744,6 +3750,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 SfxObjectShell* pDocSh = SfxObjectShell::Current();
 OUString aCommand(pCommand, strlen(pCommand), RTL_TEXTENCODING_UTF8);
 LibLODocument_Impl* pDocument = static_cast(pThis);
+OUString sidebarDeckId = "PropertyDeck";
 
 std::vector 
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
 
@@ -3897,9 +3904,15 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 return;
 }
 }
+else if (gImpl && aCommand == ".uno:LOKSidebarWriterPage")
+{
+sidebarDeckId = "WriterPageDeck";
+setupSidebar(true, sidebarDeckId);
+return;
+}
 else if (gImpl && aCommand == ".uno:SidebarShow")
 {
-setupSidebar(true);
+setupSidebar(true, sidebarDeckId);
 return;
 }
 else if (gImpl && aCommand == ".uno:SidebarHide")
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx 
b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index 6d726ddd1260..f156ab0cb0fb 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -49,7 +49,7 @@ public:
 void SyncUpdate();
 
 void NotifyResize();
-
+auto& GetSidebarController() const { return mpSidebarController; }
 using SfxDockingWindow::Close;
 
 private:
diff --git a/sfx2/source/sidebar/ResourceManager.cxx 
b/sfx2/source/sidebar/ResourceManager.cxx
index f3440e6dcb46..c61781643f49 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -429,6 +429,15 @@ void ResourceManager::ReadPanelList()
 if (!aPanelNode.isValid())
 continue;
 
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Hide these panels in LOK as they aren't fully functional.
+OUString aPanelId = getString(aPanelNode, "Id");
+if (aPanelId == "PageStylesPanel" || aPanelId == "PageHeaderPanel"
+|| aPanelId == "PageFooterPanel")
+continue;
+}
+
 maPanels.push_back(std::make_shared());
 PanelDescriptor& rPanelDescriptor(*maPanels.back());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 34decd703e880a04634585e20651a2f9b7fef393
Author: Mert Tumer 
AuthorDate: Wed Jun 10 14:41:41 2020 +0300
Commit: Mert Tumer 
CommitDate: Tue Aug 4 12:42:50 2020 +0200

Fix .uno:SidebarHide command works for online

Signed-off-by: Mert Tumer 
Change-Id: I03743d15300687b1da947d3c44be6a42aab83107
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96513
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e844243207d8..dc1b6b1664fc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -911,6 +911,16 @@ void setupSidebar(bool bShow)
 SetLastExceptionMsg("No view shell or sidebar");
 }
 
+void hideSidebar()
+{
+SfxViewShell* pViewShell = SfxViewShell::Current();
+SfxViewFrame* pViewFrame = pViewShell? pViewShell->GetViewFrame(): nullptr;
+if (pViewFrame)
+pViewFrame->SetChildWindow(SID_SIDEBAR, false , false );
+else
+SetLastExceptionMsg("No view shell or sidebar");
+}
+
 VclPtr getSidebarWindow()
 {
 VclPtr xRet;
@@ -3894,7 +3904,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 }
 else if (gImpl && aCommand == ".uno:SidebarHide")
 {
-setupSidebar(false);
+hideSidebar();
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Szűcs (via logerrit)]

 sc/qa/unit/data/xlsx/tdf134817_HeaderFooterTextWith2Section.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx|   20 
++
 sc/source/filter/excel/xehelper.cxx  |2 -
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit ceb2282e392dbe90379a893b2282d9d5beae89ed
Author: Attila Szűcs 
AuthorDate: Fri Jul 17 09:21:45 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 4 12:16:42 2020 +0200

tdf#134817 XLSX export: fix partially lost header/footer

When header/footer text contain text portions with different
font setting, only the last text portion was exported.

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: Id4cba2b9188459cdaa0ade30c2217d8f59fe6316
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98938
Tested-by: László Németh 
Reviewed-by: László Németh 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99788
Tested-by: Jenkins
Reviewed-by: Attila Szűcs 

diff --git a/sc/qa/unit/data/xlsx/tdf134817_HeaderFooterTextWith2Section.xlsx 
b/sc/qa/unit/data/xlsx/tdf134817_HeaderFooterTextWith2Section.xlsx
new file mode 100644
index ..224ac8d18429
Binary files /dev/null and 
b/sc/qa/unit/data/xlsx/tdf134817_HeaderFooterTextWith2Section.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 096c95e0f575..d74d4d63d0ec 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -249,6 +249,7 @@ public:
 void testTdf131372();
 void testTdf122331();
 void testTdf83779();
+void testTdf134817_HeaderFooterTextWith2SectionXLSX();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -396,6 +397,7 @@ public:
 CPPUNIT_TEST(testTdf131372);
 CPPUNIT_TEST(testTdf122331);
 CPPUNIT_TEST(testTdf83779);
+CPPUNIT_TEST(testTdf134817_HeaderFooterTextWith2SectionXLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -5081,6 +5083,24 @@ void ScExportTest::testTdf83779()
 xShell->DoClose();
 }
 
+void ScExportTest::testTdf134817_HeaderFooterTextWith2SectionXLSX()
+{
+// Header/footer text with multiple selection should be exported, and 
imported properly
+ScDocShellRef xShell = loadDoc("tdf134817_HeaderFooterTextWith2Section.", 
FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, 
m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddHeader", 
"&L&\"Abadi,Regular\"&11aaa&\"Bembo,Regular\"&20bbb");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddFooter", 
"&R&\"Cambria,Regular\"&14camb&\"Dante,Regular\"&18dant");
+
+xDocSh->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xehelper.cxx 
b/sc/source/filter/excel/xehelper.cxx
index 6584c314aae5..88dcabe1b58f 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -739,7 +739,7 @@ void XclExpHFConverter::AppendPortion( const 
EditTextObject* pTextObj, sal_Unico
  (aFontData.mbItalic != aNewData.mbItalic);
 if( bNewFont || (bNewStyle && pFontList) )
 {
-aParaText = "&\"" + aNewData.maName;
+aParaText.append("&\"").append(aNewData.maName);
 if( pFontList )
 {
 FontMetric aFontMetric( pFontList->Get(
___
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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf135216_evenOddFooter.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx|   28 ++
 sw/source/filter/ww8/wrtw8sty.cxx |2 -
 3 files changed, 29 insertions(+), 1 deletion(-)

New commits:
commit eb0201b9424ca9cfbbfa7af736cc314cf8f78fca
Author: Justin Luth 
AuthorDate: Tue Jul 28 15:44:41 2020 +0300
Commit: Miklos Vajna 
CommitDate: Tue Aug 4 12:08:05 2020 +0200

tdf#135216 sw MSexport: save LeftPageDesc as left page style

GetMaster() is for right pages. I assume this was a
copy/paste mistake which came in already at initial import.

And since left/right are alternating, they always use
the first version of the header/footer. Although the UI
doesn't allow changing these, they still COULD be different,
as is the case with the unit test.

No existing unit tests even touch this code,
so not a common situation at all.

Change-Id: I9e3720ddf34a8f7e08ce196780fbe16e8c88940b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99628
Tested-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf135216_evenOddFooter.odt 
b/sw/qa/extras/ooxmlexport/data/tdf135216_evenOddFooter.odt
new file mode 100644
index ..ab0ac591e29a
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf135216_evenOddFooter.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 7d83cadf520e..77cfd3bf3507 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -81,6 +81,34 @@ DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle, 
"tdf98000_changePageStyle
 CPPUNIT_ASSERT_MESSAGE("Different page1/page2 styles", sPageOneStyle != 
sPageTwoStyle);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf135216_evenOddFooter, 
"tdf135216_evenOddFooter.odt")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+
+// get LO page style for the first page (even page #2)
+OUString pageStyleName = getProperty(xCursor, "PageStyleName");
+uno::Reference xPageStyles = 
getStyles("PageStyles");
+uno::Reference 
xPageStyle(xPageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+
+xCursor->jumpToFirstPage();  // Even/Left page #2
+uno::Reference xFooter = 
getProperty>(xPageStyle, "FooterTextLeft");
+CPPUNIT_ASSERT_EQUAL(OUString("even page"), xFooter->getString());
+
+xCursor->jumpToNextPage();
+pageStyleName = getProperty(xCursor, "PageStyleName");
+xPageStyle.set(xPageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+xFooter.set(getProperty>(xPageStyle, 
"FooterTextRight"));
+CPPUNIT_ASSERT_EQUAL(OUString("odd page - first footer"), 
xFooter->getString());
+
+xCursor->jumpToNextPage();
+pageStyleName = getProperty(xCursor, "PageStyleName");
+xPageStyle.set(xPageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+xFooter.set(getProperty>(xPageStyle, 
"FooterTextLeft"));
+CPPUNIT_ASSERT_EQUAL(OUString("even page"), xFooter->getString());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf133370_columnBreak, 
"tdf133370_columnBreak.odt")
 {
 // Since non-DOCX formats ignores column breaks in non-column situations, 
don't export to docx.
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index fc973381db09..0e7830ccfb04 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1823,7 +1823,7 @@ void MSWordExportBase::SectionProperties( const 
WW8_SepInfo& rSepInfo, WW8_PdAtt
 sal_uInt8 nHeadFootFlags = 0;
 
 const SwFrameFormat* pPdLeftFormat = bLeftRightPgChain
-? &pPd->GetFollow()->GetMaster()
+? &pPd->GetFollow()->GetFirstLeft()
 : &pPd->GetLeft();
 
 // Ensure that headers are written if section is first paragraph
___
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.4' - sc/source

[Mike Kaganski (via logerrit)]

 sc/source/ui/view/prevwsh.cxx |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 6d0fa8a959f426d278f72fcace58f7f0900f7d84
Author: Mike Kaganski 
AuthorDate: Sat Jul 25 18:55:18 2020 +0300
Commit: Mike Kaganski 
CommitDate: Tue Aug 4 12:03:24 2020 +0200

tdf#130559: don't fail creation of preview when BackingComp can't add...

an event listener. This crashes when loading a document with print preview
set as active view.

Regression after commit 128ecffe53394c1f045521c2efb42ea03a319f4b.

Change-Id: I5dc421f7c08dd70d51772fac5432f33cd9a1491a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99442
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit e3b695f6a1525ac6b32abd27a6368a7e8b7d09fa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99740
Reviewed-by: Caolán McNamara 
(cherry picked from commit a9457b3c18f6030b19d8cb1aada3709649a05460)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99747
Reviewed-by: Michael Stahl 
(cherry picked from commit 810b9dabc0b91629b0aadadb999b396a7879b385)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100051
Tested-by: Jenkins CollaboraOffice 

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index fe3688abdd43..54187748819f 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -153,10 +153,21 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 {
 Construct( &pViewFrame->GetWindow() );
 
-SfxShell::SetContextBroadcasterEnabled(true);
-
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Printpreview));
-SfxShell::BroadcastContextForActivation(true);
-
+try
+{
+SfxShell::SetContextBroadcasterEnabled(true);
+SfxShell::SetContextName(
+
vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Printpreview));
+SfxShell::BroadcastContextForActivation(true);
+}
+catch (const css::uno::RuntimeException& e)
+{
+// tdf#130559: allow BackingComp to fail adding listener when opening 
document
+css::uno::Reference xServiceInfo(e.Context, 
css::uno::UNO_QUERY);
+if (!xServiceInfo || 
!xServiceInfo->supportsService("com.sun.star.frame.StartModule"))
+throw;
+SAL_WARN("sc.ui", "Opening file from StartModule straight into print 
preview");
+}
 
 auto& pNotebookBar = 
pViewFrame->GetWindow().GetSystemWindow()->GetNotebookBar();
 if (pNotebookBar)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 387d2a10b2bff325dfc307214d12a7049f33f42d
Author: Tamás Zolnai 
AuthorDate: Tue Aug 4 11:28:56 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Aug 4 11:59:55 2020 +0200

cypress: wait more time for closing the document.

Change-Id: Icbfef53b630e2a0317e346f40f47f88b694fb909
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100049
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index 7995e7bbb..d7dc0862d 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -177,7 +177,7 @@ function afterAll(fileName) {
// also on the PID number we can make sure to match on the
// whole file name, not on a suffix of a file name.
var regex = new RegExp('[0-9]' + fileName);
-   cy.get('#docview')
+   cy.get('#docview', { timeout: Cypress.config('defaultCommandTimeout') * 
2.0 })
.invoke('text')
.should('not.match', regex);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Thibault (via logerrit)]

 filter/source/graphicfilter/ieps/ieps.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c39b27a4d0dfc3b75d8486c0d7592c5209fb6b14
Author: Samuel Thibault 
AuthorDate: Tue Aug 4 04:29:48 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 4 11:37:20 2020 +0200

tdf#135427 Make pstoedit delegate letter placement to us

As pstoedit documents itself, its wmf/emf driver uses a very approximate
interletter spacing, making the text look really awful. But it provides a
-nfw option that delegates the letter placement to the emf reader, and we
happen to be doing a proper job, thus getting a proper vectorized output.

This is not a concern on Windows (and the option is ignored there). The
option is available since version 3.40 (~2005). So we can just always pass
it on.

Change-Id: I8ffd3fbf046b5a80e8011651eeaf060a8f5107e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100035
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index 413e6725fc73..a6c764adaff2 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -220,9 +220,14 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 
nBytesRead, Graphic &r
 //-usebbfrominput forces pstoedit to take the original ps bounding box
 //as the bounding box as it sees it, instead of calculating its own
 //which also doesn't work for this example
+//
+//Under Linux, positioning of letters within pstoedit is very approximate.
+//Using the -nfw option delegates the positioning to the reader, and we
+//will do a proper job.  The option is ignored on Windows.
 OUString arg1("-usebbfrominput");   //-usebbfrominput use the original ps 
bounding box
 OUString arg2("-f");
-OUString arg3("emf:-OO -drawbb");   //-drawbb mark out the bounding box 
extent with bg pixels
+OUString arg3("emf:-OO -drawbb -nfw"); //-drawbb mark out the bounding box 
extent with bg pixels
+   //-nfw delegate letter placement to 
us
 rtl_uString *args[] =
 {
 arg1.pData, arg2.pData, arg3.pData, input.pData, output.pData
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - xmloff/CppunitTest_xmloff_text.mk xmloff/Module_xmloff.mk xmloff/qa xmloff/source

[Miklos Vajna (via logerrit)]

 xmloff/CppunitTest_xmloff_text.mk  |   44 ++
 xmloff/Module_xmloff.mk|1 
 xmloff/qa/unit/data/mail-merge-editeng.odt |binary
 xmloff/qa/unit/text.cxx|   58 +
 xmloff/source/text/txtvfldi.cxx|   40 
 5 files changed, 127 insertions(+), 16 deletions(-)

New commits:
commit fec8b842d701cca0b79af9ea9f6192a8cf7610b0
Author: Miklos Vajna 
AuthorDate: Mon Aug 3 21:03:43 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 4 11:33:46 2020 +0200

tdf#130707 xmloff: survive  in editeng text

Regression from commit 28d67b792724a23015dec32fb0278b729f676736
(tdf#107776 sw ODF shape import: make is-textbox check more strict,
2019-08-26), now that we correctly identify what shape text to import as
"textbox" (Writer TextFrame) and what to import as editeng text, there
are documents out there that try to import mailmerge fields into
editeng-based shape text. Fix missing error handling there.

Note that the error is not just silently ignored, we do insert the field
result into the shape text, existing code provides this already.

(cherry picked from commit fd18d12efdfbe0e26d41d733edc711d0f40a7804)

Change-Id: Ibe631ac5d94c1c7795dd00bad05fdcca0e6741a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100038
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/xmloff/CppunitTest_xmloff_text.mk 
b/xmloff/CppunitTest_xmloff_text.mk
new file mode 100644
index ..e3259672605b
--- /dev/null
+++ b/xmloff/CppunitTest_xmloff_text.mk
@@ -0,0 +1,44 @@
+# -*- 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_CppunitTest_CppunitTest,xmloff_text))
+
+$(eval $(call gb_CppunitTest_use_externals,xmloff_text,\
+   boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,xmloff_text, \
+xmloff/qa/unit/text \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,xmloff_text, \
+comphelper \
+cppu \
+embobj \
+sal \
+test \
+unotest \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,xmloff_text))
+
+$(eval $(call gb_CppunitTest_use_ure,xmloff_text))
+$(eval $(call gb_CppunitTest_use_vcl,xmloff_text))
+
+$(eval $(call gb_CppunitTest_use_rdb,xmloff_text,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,xmloff_text,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,xmloff_text))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index 16cf0f817889..fe69b86b09f6 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_check_targets,xmloff,\
$(if $(MERGELIBS),, \
CppunitTest_xmloff_uxmloff) \
CppunitTest_xmloff_style \
+   CppunitTest_xmloff_text \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
diff --git a/xmloff/qa/unit/data/mail-merge-editeng.odt 
b/xmloff/qa/unit/data/mail-merge-editeng.odt
new file mode 100644
index ..e6466e44e01e
Binary files /dev/null and b/xmloff/qa/unit/data/mail-merge-editeng.odt differ
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
new file mode 100644
index ..2a5c65e5c2d9
--- /dev/null
+++ b/xmloff/qa/unit/text.cxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+char const DATA_DIRECTORY[] = "/xmloff/qa/unit/data/";
+
+/// Covers xmloff/source/text/ fixes.
+class XmloffStyleTest : public test::BootstrapFixture, public 
unotest::MacrosTest
+{
+private:
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+};
+
+void XmloffStyleTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void XmloffStyleTest::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
+CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMailMergeInEditeng)
+{
+OUString a

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang connectivity/source cui/source dbaccess/source desktop/source framework/source oox/source package/source sd/source sw/source unoidl/so

[Noel Grandin (via logerrit)]

 compilerplugins/clang/buriedassign.cxx  |8 
 compilerplugins/clang/compat.hxx|9 
 compilerplugins/clang/simplifybool.cxx  |2 
 connectivity/source/drivers/dbase/DTable.cxx|4 
 connectivity/source/drivers/firebird/Connection.cxx |2 
 cui/source/customize/cfg.cxx|2 
 dbaccess/source/core/dataaccess/definitioncontainer.cxx |5 
 desktop/source/deployment/registry/package/dp_package.cxx   |2 
 framework/source/uielement/imagebuttontoolbarcontroller.cxx |4 
 oox/source/core/filterdetect.cxx|4 
 package/source/manifest/ManifestImport.cxx  |3 
 sd/source/filter/eppt/pptx-text.cxx |4 
 sw/source/core/access/accpara.cxx   |4 
 sw/source/core/doc/docbm.cxx|4 
 sw/source/core/doc/docedt.cxx   |4 
 sw/source/core/doc/docnum.cxx   |2 
 sw/source/core/unocore/unomap.cxx   |2 
 sw/source/filter/ww8/wrtw8nds.cxx   |2 
 sw/source/uibase/uno/unotxdoc.cxx   |4 
 unoidl/source/legacyprovider.cxx|6 
 vcl/backendtest/VisualBackendTest.cxx   |   22 
 vcl/headless/CustomWidgetDraw.cxx   |   44 
 vcl/headless/svpframe.cxx   |   42 
 vcl/headless/svpgdi.cxx |   48 
 vcl/opengl/RenderList.cxx   |  112 -
 vcl/opengl/gdiimpl.cxx  |  102 -
 vcl/opengl/texture.cxx  |   54 
 vcl/opengl/x11/X11DeviceInfo.cxx|   32 
 vcl/opengl/x11/gdiimpl.cxx  |   26 
 vcl/qt5/Qt5FilePicker.cxx   |   50 
 vcl/qt5/Qt5Frame.cxx|  164 -
 vcl/qt5/Qt5Menu.cxx |   84 
 vcl/skia/SkiaHelper.cxx |   78 
 vcl/skia/salbmp.cxx |   22 
 vcl/skia/zone.cxx   |   30 
 vcl/source/animate/Animation.cxx|   95 -
 vcl/source/app/help.cxx |   24 
 vcl/source/app/salvtables.cxx   |  151 -
 vcl/source/app/settings.cxx |   24 
 vcl/source/app/svapp.cxx|   26 
 vcl/source/app/svdata.cxx   |   44 
 vcl/source/app/unohelp.cxx  |   23 
 vcl/source/bitmap/Octree.cxx|   62 
 vcl/source/bitmap/bitmap.cxx|   94 
 vcl/source/control/button.cxx   |  426 ++--
 vcl/source/control/combobox.cxx |   54 
 vcl/source/control/edit.cxx |  237 +-
 vcl/source/control/field.cxx|   94 
 vcl/source/control/field2.cxx   |  292 +--
 vcl/source/control/imp_listbox.cxx  |  166 -
 vcl/source/control/listbox.cxx  |  120 -
 vcl/source/control/prgsbar.cxx  |   32 
 vcl/source/control/scrbar.cxx   |  101 -
 vcl/source/control/slider.cxx   |  130 -
 vcl/source/control/spinbtn.cxx  |   23 
 vcl/source/control/spinfld.cxx  |  142 -
 vcl/source/control/tabctrl.cxx  |  312 +--
 vcl/source/edit/textdata.cxx|   48 
 vcl/source/edit/texteng.cxx |  102 -
 vcl/source/edit/textundo.cxx|   34 
 vcl/source/edit/textview.cxx|  362 +--
 vcl/source/edit/vclmedit.cxx|   64 
 vcl/source/filter/FilterConfigCache.cxx |  106 -
 vcl/source/filter/FilterConfigItem.cxx  |  148 -
 vcl/source/filter/igif/gifread.cxx  |   34 
 vcl/source/filter/jpeg/JpegReader.cxx   |   22 
 vcl/source/filter/png/pngwrite.cxx  |  232 +-
 vcl/source/filter/wmf/emfwr.cxx |  186 -
 vcl/source/filter/wmf/wmfwr.cxx | 1136 ++--
 vcl/source/fontsubset/sft.cxx   |   62 
 vcl/source/fontsubset/ttcr.cxx  |   86 
 vcl/source/helper/canvasbitmap.cxx  

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

[Thorsten Behrens (via logerrit)]

 sw/qa/extras/odfimport/data/tdf134971a.odt |binary
 sw/qa/extras/odfimport/data/tdf134971b.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx   |   24 
 xmloff/source/style/xmlstyle.cxx   |4 +++-
 4 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit a975573406553f46507dd309f02a5bf5198596fc
Author: Thorsten Behrens 
AuthorDate: Mon Jul 20 02:29:58 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Aug 4 10:23:19 2020 +0200

tdf#134971 Don't overwrite default styles when inserting doc

Seems code never really bothered not to touch default style
info, when inserting from file. Original commit is:

 Author: Sascha Ballach 
 Date:   Wed Feb 28 08:24:41 2001 +

import of default styles added

Change-Id: Ibb639a585bedabdcc5987900ecca1e04f4bb593a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99015
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit c84764e08da5e1c6202d300684baab0076d6b3ed)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99919
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/odfimport/data/tdf134971a.odt 
b/sw/qa/extras/odfimport/data/tdf134971a.odt
new file mode 100644
index ..ee9fa68236a2
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf134971a.odt differ
diff --git a/sw/qa/extras/odfimport/data/tdf134971b.odt 
b/sw/qa/extras/odfimport/data/tdf134971b.odt
new file mode 100644
index ..9bfadda694f0
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf134971b.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 70d5a158b22c..2cd4f40b2267 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -1078,5 +1080,27 @@ DECLARE_ODFIMPORT_TEST(testTdf133459, "tdf133459.odt")
 CPPUNIT_ASSERT_EQUAL(OUString("QQ "), getProperty(xFormat, 
"FormatString"));
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf134971, "tdf134971a.odt")
+{
+// now insert 2nd file somewhere - insertDocumentFromURL should
+// _not_ touch pool defaults
+uno::Sequence aPropertyValues = 
comphelper::InitPropertySequence(
+{
+{"Name", uno::makeAny(
+m_directories.getURLFromSrc(mpTestDocumentPath) + 
"tdf134971b.odt")},
+{"Filter", uno::makeAny(OUString("writer8"))},
+});
+dispatchCommand(mxComponent, ".uno:InsertDoc", aPropertyValues);
+
+// tdf134971b re-defines default font as "Liberation Sans" - make sure 
this stays
+// Arial in final doc:
+OUString sString;
+uno::Reference 
xParaStyles(getStyles("ParagraphStyles"));
+uno::Reference xStyle1(xParaStyles->getByName(
+"Standard"), uno::UNO_QUERY);
+xStyle1->getPropertyValue("CharFontName") >>= sString;
+CPPUNIT_ASSERT_EQUAL(OUString("Arial"), sString);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index d020280cb173..f6eeb70dea17 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -839,7 +839,9 @@ void SvXMLStylesContext::CopyStylesToDoc( bool bOverwrite,
 continue;
 
 if (pStyle->IsDefaultStyle())
-pStyle->SetDefaults();
+{
+if (bOverwrite) pStyle->SetDefaults();
+}
 else if( InsertStyleFamily( pStyle->GetFamily() ) )
 pStyle->CreateAndInsert( bOverwrite );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/core/Socket.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d6bfb8867495f34010620b68a8d298e96cb51d56
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 09:27:00 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 09:51:21 2020 +0200

Don't show [object Window] in about dialog

Change-Id: I4ba1ab2fa443a46dd205411da558980ddee44865
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100043
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 7fcd7f4ac..526c51410 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -283,7 +283,7 @@ L.Socket = L.Class.extend({
this.WSDServer = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = this.WSDServer.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-online/' + 
h + '\'));">' + h + '';

$('#loolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
}
else {
@@ -306,7 +306,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-core/' + h 
+ '\'));">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.NotebookbarImpress.js |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e19d1d6dc73dd089aa317c320418a3f5d4c19442
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 09:24:22 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 09:39:00 2020 +0200

notebookbar: help page in impress

Change-Id: Id04625892b6e287bfc8ed9abc57227bf306e0584
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100042
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js 
b/loleaflet/src/control/Control.NotebookbarImpress.js
index 5ecf920c1..e0eaa620a 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -36,11 +36,6 @@ L.Control.NotebookbarImpress = 
L.Control.NotebookbarWriter.extend({
'type': 'toolitem',
'text': _('Redo'),
'command': '.uno:Redo'
-   },
-   {
-   'text': _('~Help'),
-   'id': '-2',
-   'name': 'Help',
}
]
}
@@ -113,6 +108,11 @@ L.Control.NotebookbarImpress = 
L.Control.NotebookbarWriter.extend({
'id': '8',
'name': 'TableLabel',
'context': 'Table'
+   },
+   {
+   'text': _('~Help'),
+   'id': '-2',
+   'name': 'Help',
}
];
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 include/svx/framelink.hxx   |   86 +---
 svx/source/dialog/framelink.cxx |  212 ++--
 2 files changed, 82 insertions(+), 216 deletions(-)

New commits:
commit 58937aa4a50ecd681382f03331340da4c843b01e
Author: Noel Grandin 
AuthorDate: Mon Aug 3 18:38:58 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 4 09:31:54 2020 +0200

simplify svx::frame::Style

no need to use shared_ptr here, this class is not doing copy-on-write.

Change-Id: I4e921bfc789cc5989d98b5f9ab7074eb7d5ac33e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100022
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 1af8abc6599b..b98ea5eab9aa 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -35,7 +35,7 @@ namespace svx::frame {
 
 /** Specifies how the reference points for frame borders are used.
  */
-enum class RefMode
+enum class RefMode : sal_uInt8
 {
 /** Frame borders are drawn centered to the reference points. */
 Centered,
@@ -100,45 +100,17 @@ enum class RefMode
 class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Style
 {
 private:
-class implStyle
-{
-private:
-friend class Style;
-
-Color   maColorPrim;
-Color   maColorSecn;
-Color   maColorGap;
-boolmbUseGapColor;
-RefMode meRefMode;  /// Reference point handling for this 
frame border.
-double  mfPrim; /// Width of primary (single, left, or 
top) line.
-double  mfDist; /// Distance between primary and 
secondary line.
-double  mfSecn; /// Width of secondary (right or 
bottom) line.
-double  mfPatternScale; /// Scale used for line pattern 
spacing.
-SvxBorderLineStyle  mnType;
-bool mbWordTableCell;
-
-public:
-/** Constructs an invisible frame style. */
-explicit implStyle() :
-maColorPrim(),
-maColorSecn(),
-maColorGap(),
-mbUseGapColor(false),
-meRefMode(RefMode::Centered),
-mfPrim(0.0),
-mfDist(0.0),
-mfSecn(0.0),
-mfPatternScale(1.0),
-mnType(SvxBorderLineStyle::SOLID),
-mbWordTableCell(false)
-{}
-};
-
-/// the impl class holding the data
-std::shared_ptr< implStyle >maImplStyle;
-
-/// call to set maImplStyle on demand
-void implEnsureImplStyle();
+Color   maColorPrim;
+Color   maColorSecn;
+Color   maColorGap;
+double  mfPrim; /// Width of primary (single, left, or 
top) line.
+double  mfDist; /// Distance between primary and secondary 
line.
+double  mfSecn; /// Width of secondary (right or bottom) 
line.
+double  mfPatternScale; /// Scale used for line pattern 
spacing.
+RefMode meRefMode;  /// Reference point handling for this 
frame border.
+SvxBorderLineStyle  mnType;
+boolmbWordTableCell : 1;
+boolmbUseGapColor : 1;
 
 public:
 /** Constructs an invisible frame style. */
@@ -150,23 +122,23 @@ public:
 /** Constructs a frame style from the passed SvxBorderLine struct. */
 explicit Style( const editeng::SvxBorderLine* pBorder, double fScale );
 
-RefMode GetRefMode() const { if(!maImplStyle) return RefMode::Centered; 
return maImplStyle->meRefMode; }
-Color GetColorPrim() const { if(!maImplStyle) return Color(); return 
maImplStyle->maColorPrim; }
-Color GetColorSecn() const { if(!maImplStyle) return Color(); return 
maImplStyle->maColorSecn; }
-Color GetColorGap() const { if(!maImplStyle) return Color(); return 
maImplStyle->maColorGap; }
-bool UseGapColor() const { if(!maImplStyle) return false; return 
maImplStyle->mbUseGapColor; }
-double Prim() const { if(!maImplStyle) return 0.0; return 
maImplStyle->mfPrim; }
-double Dist() const { if(!maImplStyle) return 0.0; return 
maImplStyle->mfDist; }
-double Secn() const { if(!maImplStyle) return 0.0; return 
maImplStyle->mfSecn; }
-double PatternScale() const { if(!maImplStyle) return 1.0; return 
maImplStyle->mfPatternScale;}
-SvxBorderLineStyle Type() const { if(!maImplStyle) return 
SvxBorderLineStyle::SOLID; return maImplStyle->mnType; }
+RefMode GetRefMode() const { return meRefMode; }
+Color GetColorPrim() const { return maColorPrim; }
+Color GetColorSecn() const { return maColorSecn; }
+Color GetColorGap() const { return maColorGap; }
+bool UseGapColor() const { return mbUseGapColor; }
+double Prim() const { return mfPrim; }
+double Dist() const { return mfDist; }
+double Secn() const { return mfSecn; }
+double PatternScale() const { return mfPatter

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.NotebookbarBuilder.js |   65 +++-
 1 file changed, 10 insertions(+), 55 deletions(-)

New commits:
commit 66582a39342a98c3ed0065da6676a28087a5fe0e
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 08:55:11 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 09:29:58 2020 +0200

notebookbar: remove unsupported items from hamburger menu

Change-Id: I64cd0f66483f6756ad822441c498197ae603a561
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100039
Tested-by: Jenkins
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index f78570ea4..cd9fae8f1 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -587,46 +587,23 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
],
spreadsheet: [
{name: _('Menu'), type: 'menu', menu: [
-   {name: _UNO('.uno:FullScreen', 'text'), 
id: 'fullscreen', type: 'action'},
-   {name: _('Show Ruler'), id: 
'showruler', type: 'action'},
+   {name: _UNO('.uno:FullScreen', 
'spreadsheet'), id: 'fullscreen', type: 'action'},
{type: 'separator'},
-   {name: _UNO('.uno:ChangesMenu', 
'text'), id: 'changesmenu', type: 'menu', menu: [
-   {uno: '.uno:TrackChanges'},
-   {uno: 
'.uno:ShowTrackedChanges'},
-   {type: 'separator'},
-   {uno: 
'.uno:AcceptTrackedChanges'},
-   {uno: 
'.uno:AcceptAllTrackedChanges'},
-   {uno: 
'.uno:RejectAllTrackedChanges'},
-   {uno: 
'.uno:PreviousTrackedChange'},
-   {uno: '.uno:NextTrackedChange'}
-   ]},
{uno: '.uno:SearchDialog'},
{type: 'separator'},
{name: _('Repair'), id: 'repair',  
type: 'action'},
-   {name: _UNO('.uno:ToolsMenu', 'text'), 
id: 'tools', type: 'menu', menu: [
-   {uno: 
'.uno:SpellingAndGrammarDialog'},
+   {name: _UNO('.uno:ToolsMenu', 
'spreadsheet'), id: 'tools', type: 'menu', menu: [
+   {uno: '.uno:SpellDialog'},
{uno: '.uno:SpellOnline'},
-   {uno: '.uno:ThesaurusDialog'},
{name: 
_UNO('.uno:LanguageMenu'), type: 'menu', menu: [
-   {name: 
_UNO('.uno:SetLanguageSelectionMenu', 'text'), type: 'menu', menu: [
-   {name: _('None 
(Do not check spelling)'), id: 'noneselection', uno: 
'.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
-   {name: 
_UNO('.uno:SetLanguageParagraphMenu', 'text'), type: 'menu', menu: [
-   {name: _('None 
(Do not check spelling)'), id: 'noneparagraph', uno: 
'.uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE'}]},
-   {name: 
_UNO('.uno:SetLanguageAllTextMenu', 'text'), type: 'menu', menu: [
-   {name: _('None 
(Do not check spelling)'), id: 'nonelanguage', uno: 
'.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
-   ]},
-   {uno: '.uno:WordCountDialog'},
-   {uno: 
'.uno:LineNumberingDialog'},
-   {type: 'separator'},
-   {name: 
_UNO('.uno:AutoFormatMenu', 'text'), type: 'menu', menu: [
-   {uno: 
'.uno:OnlineAutoFormat'}]}
+   {name: _('None (Do not 
check spelling)'), id: 'nonelanguage', uno: 
'.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
+   {uno: '.uno:GoalSeekDialog'}
]}
 

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

[Balazs Varga (via logerrit)]

 sw/source/filter/ww8/docxexport.cxx |   26 +++---
 1 file changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 2a755d748aecd65d1a3d0c2685678a85472481cd
Author: Balazs Varga 
AuthorDate: Tue Jul 21 16:23:29 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 4 09:25:06 2020 +0200

tdf#131288 Chart: fix export of embedded xlsx

To avoid exporting a broken DOCX, we have to seek
the 'embeddingsStream', so we avoid to export an empty
(0 Kb) embedded xlsx.
Co-authored-by: Balázs Regényi

Change-Id: I1723091aab3e2070f3db75ce866897e38021718d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99151
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
(cherry picked from commit b115d4899d827f885f7d35ced4cb64d2385e3422)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99926
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 5e9dcc6718e3..849c987845cc 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -426,7 +427,7 @@ OString DocxExport::WriteOLEObject(SwOLEObj& rObject, 
OUString & io_rProgID)
 
 try
 {
-::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream);
+comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream);
 }
 catch (uno::Exception const&)
 {
@@ -1596,24 +1597,11 @@ void DocxExport::WriteEmbeddings()
 contentType);
 try
 {
-sal_Int32 nBufferSize = 512;
-uno::Sequence< sal_Int8 > aDataBuffer(nBufferSize);
-sal_Int32 nRead;
-do
-{
-nRead = embeddingsStream->readBytes( aDataBuffer, 
nBufferSize );
-if( nRead )
-{
-if( nRead < nBufferSize )
-{
-nBufferSize = nRead;
-aDataBuffer.realloc(nRead);
-}
-xOutStream->writeBytes( aDataBuffer );
-}
-}
-while( nRead );
-xOutStream->flush();
+// tdf#131288: the stream must be seekable for direct access
+uno::Reference< io::XSeekable > xSeekable(embeddingsStream, 
uno::UNO_QUERY);
+if (xSeekable)
+xSeekable->seek(0); // tdf#131288: a previous save could 
position it elsewhere
+
comphelper::OStorageHelper::CopyInputToOutput(embeddingsStream, xOutStream);
 }
 catch(const uno::Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits