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

[Andrea Gelmini]

 include/svx/xmlgrhlp.hxx |1 -
 svx/source/svdraw/svdpdf.cxx |2 +-
 svx/source/svdraw/svdpdf.hxx |4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f81714d8e70569506bd10cffc9dc6c18d7c6966f
Author: Andrea Gelmini 
Date:   Thu Jun 7 19:03:55 2018 +0200

Removed duplicated include

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

diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 4d9fa58a1b49..e4f7952d6215 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 
 enum class SvXMLGraphicHelperMode
 {
commit 63e404e4105cee07c9e58760cdc4ad7e917fa3de
Author: Andrea Gelmini 
Date:   Thu Jun 7 19:16:33 2018 +0200

Fix typos

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

diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 6721f463f53c..0b6d70ff26a8 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -1121,7 +1121,7 @@ void ImpSdrPdfImport::ImportPath(FPDF_PAGEOBJECT 
pPageObject, int /*nPageObjectI
 float fx, fy;
 if (!FPDFPathSegment_GetPoint(pPathSegment, &fx, &fy))
 {
-SAL_WARN("sd.filter", "Failed to get PDF path segement point");
+SAL_WARN("sd.filter", "Failed to get PDF path segment point");
 continue;
 }
 
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index 37f112eeda28..4110a92e260a 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -90,7 +90,7 @@ class ImpSdrPdfImport final
 double e() const { return me; }
 double f() const { return mf; }
 
-/// Mutliply this * other.
+/// Multiply this * other.
 void Concatinate(const Matrix& other)
 {
 ma = ma * other.ma + mb * other.mc;
@@ -198,7 +198,7 @@ class ImpSdrPdfImport final
 Matrix mCurMatrix;
 
 /// Correct the vertical coordinate to start at the top.
-/// PDF coordinate system has orign at the bottom right.
+/// PDF coordinate system has origin at the bottom right.
 double correctVertOrigin(double offsetPts) const { return mdPageHeightPts 
- offsetPts; }
 /// Convert PDF points to logic (twips).
 tools::Rectangle PointsToLogic(double left, double right, double top, 
double bottom) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 sd/IwyuFilter_sd.yaml |   28 
++
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |6 ++
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |4 +
 sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx |1 
 sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx |1 
 sd/source/ui/dlg/sddlgfact.cxx|1 
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx   |   24 
+++-
 sd/source/ui/inc/AccessibleDrawDocumentView.hxx   |3 +
 sd/source/ui/inc/AccessibleOutlineEditSource.hxx  |2 
 sd/source/ui/inc/AccessiblePageShape.hxx  |   13 +---
 sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx   |4 +
 sd/source/ui/inc/AccessiblePresentationOLEShape.hxx   |1 
 sd/source/ui/inc/AccessibleSlideSorterObject.hxx  |3 -
 sd/source/ui/inc/AccessibleSlideSorterView.hxx|3 -
 sd/source/ui/inc/BezierObjectBar.hxx  |3 -
 sd/source/ui/inc/Client.hxx   |2 
 sd/source/ui/inc/animobjs.hxx |4 -
 sd/source/ui/inc/annotationmanager.hxx|5 +
 sd/source/ui/inc/assclass.hxx |1 
 sd/source/ui/inc/copydlg.hxx  |2 
 sd/source/ui/inc/createtabledesignpanel.hxx   |4 +
 sd/source/ui/view/sdwindow.cxx|1 
 22 files changed, 70 insertions(+), 46 deletions(-)

New commits:
commit bff31df1398b81c0348aebae2c346474724c4884
Author: Gabor Kelemen 
Date:   Fri Jun 8 01:16:42 2018 +0200

tdf#42949 Fix IWYU warnings in sd/source/ui/inc/[a-c]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here,
with a bit of fallout management

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

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 67eb50eb2851..a0316591746f 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -83,3 +83,31 @@ blacklist:
 sd/source/filter/eppt/pptexanimations.hxx:
 # base class has to be a complete type
 - memory
+sd/source/ui/inc/AccessibleDocumentViewBase.hxx:
+# base class has to be a complete type
+- com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp
+- com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp
+- com/sun/star/awt/XFocusListener.hpp
+- com/sun/star/awt/XWindowListener.hpp
+- com/sun/star/beans/XPropertyChangeListener.hpp
+sd/source/ui/inc/AccessibleDrawDocumentView.hxx:
+# base class has to be a complete type
+- com/sun/star/accessibility/XAccessibleGroupPosition.hpp
+sd/source/ui/inc/AccessibleSlideSorterObject.hxx:
+# base class has to be a complete type
+- com/sun/star/accessibility/XAccessible.hpp
+- com/sun/star/accessibility/XAccessibleComponent.hpp
+- com/sun/star/accessibility/XAccessibleContext.hpp
+- com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+sd/source/ui/inc/AccessibleSlideSorterView.hxx:
+# base class has to be a complete type
+- com/sun/star/accessibility/XAccessible.hpp
+- com/sun/star/accessibility/XAccessibleComponent.hpp
+- com/sun/star/accessibility/XAccessibleContext.hpp
+- com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+- com/sun/star/accessibility/XAccessibleSelection.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+sd/source/ui/inc/BezierObjectBar.hxx:
+# Used via macro, really needed to compile
+- class SfxModule
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx 
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 470aa565e4ea..b3f570c1193d 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -48,6 +49,11 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 355c579d96ce..66450360ca34 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -29,13 +29,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
 #include 
-
+#include 
 #include 
 #include 

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

[Miklos Vajna]

 filter/source/msfilter/msdffimp.cxx |3 +++
 sd/qa/unit/data/ppt/crop.ppt|binary
 sd/qa/unit/import-tests.cxx |   21 +
 3 files changed, 24 insertions(+)

New commits:
commit 11d542352e1088a2c870b0e73e14e10266276483
Author: Miklos Vajna 
Date:   Fri Jun 8 09:27:32 2018 +0200

tdf#118037 PPT import: fix lost crop of graphic

Regression from commit b11188835d3b87cd9d2a8cdb3da204cfda5d3e6e (DOC
import: lazy-read images, 2018-04-20).

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

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 2e6843eb2d61..7d7e5e385390 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3719,6 +3719,9 @@ static void lcl_ApplyCropping( const DffPropSet& 
rPropSet, SfxItemSet* pSet, Gra
 BitmapExaCropBitmap;
 sal_uInt32  nTop( 0 ),  nBottom( 0 ), nLeft( 0 ), nRight( 0 );
 
+// Cropping has to be applied on a loaded graphic.
+rGraf.makeAvailable();
+
 if ( pSet ) // use crop attributes ?
 aCropSize = lcl_GetPrefSize(rGraf, MapMode(MapUnit::Map100thMM));
 else
diff --git a/sd/qa/unit/data/ppt/crop.ppt b/sd/qa/unit/data/ppt/crop.ppt
new file mode 100644
index ..844a4392a1d4
Binary files /dev/null and b/sd/qa/unit/data/ppt/crop.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 9e07f8be4774..39f7f6df766e 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -75,6 +75,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -187,6 +188,7 @@ public:
 
 bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, 
std::vector& rExpected);
 void testPatternImport();
+void testPptCrop();
 
 CPPUNIT_TEST_SUITE(SdImportTest);
 
@@ -268,6 +270,7 @@ public:
 CPPUNIT_TEST(testTdf116899);
 CPPUNIT_TEST(testTdf77747);
 CPPUNIT_TEST(testTdf116266);
+CPPUNIT_TEST(testPptCrop);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -634,6 +637,24 @@ void SdImportTest::testFdo68594()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testPptCrop()
+{
+sd::DrawDocShellRef xDocShRef
+= 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/crop.ppt"), PPT);
+
+uno::Reference xPropertySet(
+getShapeFromPage(/*nShape=*/1, /*nPage=*/0, xDocShRef));
+text::GraphicCrop aCrop;
+xPropertySet->getPropertyValue("GraphicCrop") >>= aCrop;
+// These were all 0, lazy-loading broke cropping.
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Top);
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Bottom);
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Left);
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Right);
+
+xDocShRef->DoClose();
+}
+
 void SdImportTest::testFdo72998()
 {
 sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/cshapes.pptx"), 
PPTX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/b292a27698e85fd9d60c03613c3b0c67835c4dc1/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/karasa_jaga

[Rizal Muttaqin]

 dev/null |binary
 icon-themes/karasa_jaga/cmd/32/line_diagonal.png |binary
 icon-themes/karasa_jaga/cmd/lc_connectorcurve.png|binary
 icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowend.png|binary
 icon-themes/karasa_jaga/cmd/lc_connectorcurvearrows.png  |binary
 icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowstart.png  |binary
 icon-themes/karasa_jaga/cmd/lc_connectorcurvecircleend.png   |binary
 icon-themes/karasa_jaga/cmd/lc_connectorcurvecircles.png |binary
 icon-themes/karasa_jaga/cmd/lc_connectorcurvecirclestart.png |binary
 icon-themes/karasa_jaga/cmd/lc_line_diagonal.png |binary
 icon-themes/karasa_jaga/cmd/sc_connectorcurve.png|binary
 icon-themes/karasa_jaga/cmd/sc_connectorcurvearrowend.png|binary
 icon-themes/karasa_jaga/cmd/sc_connectorcurvearrows.png  |binary
 icon-themes/karasa_jaga/cmd/sc_connectorcurvearrowstart.png  |binary
 icon-themes/karasa_jaga/cmd/sc_connectorcurvecircleend.png   |binary
 icon-themes/karasa_jaga/cmd/sc_connectorcurvecircles.png |binary
 icon-themes/karasa_jaga/cmd/sc_connectorcurvecirclestart.png |binary
 icon-themes/karasa_jaga/cmd/sc_line_diagonal.png |binary
 icon-themes/karasa_jaga/cmd/sc_linearrowend.png  |binary
 icon-themes/karasa_jaga/database/linked_text_table.png   |binary
 icon-themes/karasa_jaga/links.txt|1 +
 21 files changed, 1 insertion(+)

New commits:
commit 60a52a811edf06ded4ae1d97896238e5f4d976b9
Author: Rizal Muttaqin 
Date:   Thu Jun 7 12:11:53 2018 +0700

Karasa Jaga: Update curved line and spacing icons

Change-Id: Id8565b07e612bff77009322a9b82a7800d748385
Reviewed-on: https://gerrit.libreoffice.org/55395
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/karasa_jaga/cmd/32/insertdoc.png 
b/icon-themes/karasa_jaga/cmd/32/insertdoc.png
old mode 100755
new mode 100644
diff --git a/icon-themes/karasa_jaga/cmd/32/line_diagonal.png 
b/icon-themes/karasa_jaga/cmd/32/line_diagonal.png
index e144acceef5b..1f1c13d016ac 100755
Binary files a/icon-themes/karasa_jaga/cmd/32/line_diagonal.png and 
b/icon-themes/karasa_jaga/cmd/32/line_diagonal.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_connectorcurve.png 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurve.png
index 4e2578a65bb7..dbbe96b26570 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_connectorcurve.png and 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurve.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowend.png 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowend.png
index 58b3f22317ab..b939c6c65dc1 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowend.png and 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowend.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrows.png 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrows.png
index d2ae1d152ba6..d371bc1ec362 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrows.png and 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrows.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowstart.png 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowstart.png
index ce7ceca3c7be..69cc2150c0f9 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowstart.png and 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvearrowstart.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircleend.png 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircleend.png
index e6d3433b651b..0899370d2969 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircleend.png and 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircleend.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircles.png 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircles.png
index 53be95163601..1ce2bcc2be02 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircles.png and 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvecircles.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_connectorcurvecirclestart.png 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvecirclestart.png
index 4b6e25886b22..47a367df4415 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_connectorcurvecirclestart.png and 
b/icon-themes/karasa_jaga/cmd/lc_connectorcurvecirclestart.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_line_diagonal.png 
b/icon-themes/karasa_jaga/cmd/lc_line_diagonal.png
index 37719af4ba07..2a16a8fce5d8 100755
Binary files a/icon-themes/karasa_jaga/cmd/lc_line_diagonal.png and 
b/icon-themes/karasa_jaga/cmd/lc_line_diagonal.png differ
diff --git a/icon-themes/karasa_jaga/cmd/sc_connectorcurve.png 
b/icon-themes/karasa_jaga/cmd/sc_connectorcurve.png
index 92add57a2492..b99b88b5896d 100755
Binary files a/icon-themes/karasa_jaga/cmd/sc_connectorcurve.png and 
b/icon-them

[Libreoffice-commits] dev-tools.git: clang/Makefile

[Miklos Vajna]

 clang/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 657f9edeb491f67aab4c1b797fb97eed9c54a19e
Author: Miklos Vajna 
Date:   Fri Jun 8 12:20:42 2018 +0200

clang: fix build with clang-5.0

I assume in practice only I use these tools so no version check for now.

diff --git a/clang/Makefile b/clang/Makefile
index 482a9c9..b6db521 100644
--- a/clang/Makefile
+++ b/clang/Makefile
@@ -3,7 +3,7 @@
 CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS 
-D__STDC_LIMIT_MACROS -fno-rtti
 CLANGWARNS=-Werror -Wall -Wno-missing-braces -Wnon-virtual-dtor -Wendif-labels 
-Wextra -Wundef -Wunused-macros -Wshadow -Woverloaded-virtual
 CLANGFLAGS = $(CLANGDEFS) $(CLANGWARNS) -g -std=c++11
-CLANGLIBS = -lclangAST -lclangBasic -lclangFrontend -lclangRewrite 
-lclangTooling -lLLVMSupport
+CLANGLIBS = -lclangAST -lclangBasic -lclangFrontend -lclangRewrite 
-lclangTooling -lLLVM
 ifneq ($(GCOV),)
 CLANGFLAGS += --coverage
 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.0' - oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk sw/source

[Tor Lillqvist]

 oovbaapi/UnoApi_oovbaapi.mk|1 
 oovbaapi/ooo/vba/word/XApplication.idl |1 
 oovbaapi/ooo/vba/word/XWordBasic.idl   |   24 
 sw/source/ui/vba/vbaapplication.cxx|   38 +
 sw/source/ui/vba/vbaapplication.hxx|1 
 5 files changed, 65 insertions(+)

New commits:
commit cfc32724c3a61e3e806f028b207ee3b53ca36204
Author: Tor Lillqvist 
Date:   Tue May 15 14:33:17 2018 +0300

Add WordBasic property and its FileOpen "command"

Change-Id: I74aca823bb871040b15f35b92f961dfe48807843
Reviewed-on: https://gerrit.libreoffice.org/55136
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 56a7ddaadc4a6fd7fc4019813041e93b10c91504)
Reviewed-on: https://gerrit.libreoffice.org/55456
Tested-by: Tor Lillqvist 

diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index bb9601f8152b..421dd057a347 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -1100,6 +1100,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/word,\
XVariables \
XView \
XWindow \
+   XWordBasic \
XWrapFormat \
 ))
 
diff --git a/oovbaapi/ooo/vba/word/XApplication.idl 
b/oovbaapi/ooo/vba/word/XApplication.idl
index 141f9c5be2ac..d061586b8de1 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -32,6 +32,7 @@ interface XApplication : XConnectable
 [attribute, readonly] XSystem System;
 [attribute, readonly] XOptions Options;
 [attribute, readonly] XSelection Selection;
+[attribute, readonly] XWordBasic WordBasic;
 [attribute] boolean DisplayAutoCompleteTips;
 [attribute] long EnableCancelKey;
 [attribute] long WindowState;
diff --git a/oovbaapi/ooo/vba/word/XWordBasic.idl 
b/oovbaapi/ooo/vba/word/XWordBasic.idl
new file mode 100644
index ..1920f20543a6
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+#ifndef __ooo_vba_word_XWordBasic_idl__
+#define __ooo_vba_word_XWordBasic_idl__
+
+module ooo {  module vba {  module word {
+
+interface XWordBasic
+{
+void FileOpen( [in] string Name, [in] any ConfirmConversions, [in] any 
ReadOnly, [in] any AddToMru, [in] any PasswordDoc, [in] any PasswordDot, [in] 
any Revert, [in] any WritePasswordDoc, [in] any WritePasswordDot );
+};
+
+}; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index fb0218511af6..3fcfc12f3a1e 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -56,6 +56,18 @@ public:
 void SAL_CALL Unadvise( sal_uInt32 Cookie ) override;
 };
 
+class SwWordBasic : public cppu::WeakImplHelper
+{
+private:
+SwVbaApplication* mpApp;
+
+public:
+SwWordBasic( SwVbaApplication* pApp );
+
+// XWordBasic
+virtual void SAL_CALL FileOpen( const OUString& Name, const uno::Any& 
ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToMru, const 
uno::Any& PasswordDoc, const uno::Any& PasswordDot, const uno::Any& Revert, 
const uno::Any& WritePasswordDoc, const uno::Any& WritePasswordDot ) override;
+};
+
 SwVbaApplication::SwVbaApplication( uno::Reference& 
xContext ):
 SwVbaApplication_BASE( xContext )
 {
@@ -138,6 +150,13 @@ SwVbaApplication::getSelection()
 return new SwVbaSelection( this, mxContext, getCurrentDocument() );
 }
 
+uno::Reference< word::XWordBasic > SAL_CALL
+SwVbaApplication::getWordBasic()
+{
+uno::Reference< word::XWordBasic > xWB( new SwWordBasic( this ) );
+return xWB;
+}
+
 uno::Any SAL_CALL
 SwVbaApplication::Documents( const uno::Any& index )
 {
@@ -404,4 +423,23 @@ SwVbaApplicationOutgoingConnectionPoint::Unadvise( 
sal_uInt32 Cookie )
 mpApp->RemoveSink( Cookie );
 }
 
+// SwWordBasic
+
+SwWordBasic::SwWordBasic( SwVbaApplication* pApp ) :
+mpApp(pApp)
+{
+}
+
+// XWordBasic
+void SAL_CALL
+SwWordBasic::FileOpen( const OUString& Name, const uno::Any& 
ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToMru, const 
uno::Any& PasswordDoc, const uno::Any& PasswordDot, const uno::Any& Revert, 
const uno::Any& WritePasswordDoc, const uno::Any& WritePasswordDot )
+{
+uno::Any aDocuments = mpApp->Documents( uno::Any() );
+
+uno::Reference rDocuments;
+
+if (aDocuments >>= rDocuments)
+rDocuments->Open( Name, ConfirmConversions, ReadOnly, AddToMru, 
PasswordDoc, PasswordDot, Revert, WritePasswordDoc, WritePasswordDot, 
uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any

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

[Tor Lillqvist]

 sw/source/ui/vba/vbaapplication.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 779538c0e50eadb579b0669937fc758f1cc9caca
Author: Tor Lillqvist 
Date:   Thu Jun 7 14:23:58 2018 +0300

Show the "status bar" property in the LO status indicator also in Writer

Note that the semantics of the ooo.vba.word.XApplication StatusBar
property is much simpler than that in ooo.vba.excel.XApplication. The
setter always takes a string, not alternatively a boolean.

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

diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index 3fcfc12f3a1e..f3bdd9968667 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -16,6 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include 
+#include 
+
 #include "vbaapplication.hxx"
 #include "vbadocument.hxx"
 #include 
@@ -295,6 +299,19 @@ OUString SAL_CALL SwVbaApplication::getStatusBar()
 
 void SAL_CALL SwVbaApplication::setStatusBar( const OUString& _statusbar )
 {
+// ScVbaAppSettings::setStatusBar() also uses the XStatusIndicator to show 
this, so maybe that is OK?
+uno::Reference< frame::XModel > xModel( getCurrentDocument(), 
uno::UNO_QUERY );
+if (xModel.is())
+{
+uno::Reference< task::XStatusIndicatorSupplier > 
xStatusIndicatorSupplier( xModel->getCurrentController(), uno::UNO_QUERY );
+if (xStatusIndicatorSupplier.is())
+{
+uno::Reference< task::XStatusIndicator > xStatusIndicator( 
xStatusIndicatorSupplier->getStatusIndicator(), uno::UNO_QUERY );
+if (xStatusIndicator.is())
+xStatusIndicator->start( _statusbar, 100 );
+}
+}
+
 // Yes, we intentionally use the "extensions.olebridge" tag here even if 
this is sw. We
 // interpret setting the StatusBar property as a request from an 
Automation client to display
 // the string in LibreOffice's debug output, and all other generic 
Automation support debug
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 extensions/source/ole/unoobjw.cxx |  435 ++
 1 file changed, 209 insertions(+), 226 deletions(-)

New commits:
commit 5ea0d9dfc3319c37fd5505f6504640de96386ce8
Author: Stephan Bergmann 
Date:   Fri Jun 1 14:59:01 2018 +0200

Various clang-cl/loplugin errors in extensions/source/ole/unoobjw.cxx

-Werror,-Wnon-virtual-dtor: made various dtors virtual

-Werror,-Winconsistent-missing-override in END_COM_MAP: silenced the same 
way as
in other places across the code base

loplugin:unreffun in BEGIN_COM_MAP and END_COM_MAP: silence with
-Wunused-function

various -Werror in atlbase.h and atlcom.h: silenced the same way as in e.g.
embedserv/source/inc/stdafx.h

-Werror,-Wshadow
-Werror,-Wunused-function
loplugin:casttovoid
loplugin:cstylecast
loplugin:nullptr
loplugin:salbool
loplugin:subtlezeroinit

Change-Id: Ifefdc930a1d3ecf5366523dea509bfaca1f4e001
Reviewed-on: https://gerrit.libreoffice.org/55186
Reviewed-by: Tor Lillqvist 
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/55426
Tested-by: Tor Lillqvist 

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 7033f5c9eddc..df8932374896 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -32,8 +32,27 @@
 #include 
 #include 
 
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wattributes"
+#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#pragma clang diagnostic ignored "-Wdynamic-class-memaccess"
+#pragma clang diagnostic ignored "-Wextra"
+#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#pragma clang diagnostic ignored "-Winvalid-noreturn"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#pragma clang diagnostic ignored "-Wnon-pod-varargs"
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#pragma clang diagnostic ignored "-Wnonportable-include-path"
+#pragma clang diagnostic ignored "-Wsequence-point"
+#pragma clang diagnostic ignored "-Wtypename-missing"
+#endif
 #include 
 #include 
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
 #include 
 
 #include 
@@ -92,73 +111,6 @@ static bool writeBackOutParameter(VARIANTARG* pDest, 
VARIANT* pSource);
 static bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource);
 static HRESULT mapCannotConvertException(const CannotConvertException &e, 
unsigned int * puArgErr);
 
-static std::string DumpTypeInfo(ITypeInfo *pTypeInfo, int indentLevel)
-{
-std::ostringstream os;
-os << std::string(indentLevel, ' ') << "ITypeInfo@" << std::hex << (void*) 
pTypeInfo;
-
-BSTR sName;
-if (SUCCEEDED(pTypeInfo->GetDocumentation(MEMBERID_NIL, &sName, NULL, 
NULL, NULL)))
-{
-os << ":" << std::wstring_convert, 
wchar_t>().to_bytes(sName);
-}
-
-return os.str();
-}
-
-static std::string DumpDispatch(IDispatch *pDispatch, int indentLevel)
-{
-std::ostringstream os;
-os << std::string(indentLevel, ' ') << "IDispatch@" << (void*) pDispatch;
-#if 0 // Doesn't work anyway, see comment "Sadly" below
-// We "know" that we call this on the IUnknown passed to 
IConnectionPoint::Advise(), so check
-// the event names we "know" are used in my Events.vbs test script. I.e. 
this is debug code very
-// specific to the author's arbitrary transient development environment.
-LPOLESTR vNames[] = {
-L"DocumentOpen",
-L"DocumentChange",
-L"DocumentBeforeClose",
-L"Foobar"
-L"Quit",
-L"WindowActivate"
-};
-for (int i = 0; i < SAL_N_ELEMENTS(vNames); i++)
-{
-DISPID nDispId;
-HRESULT hr;
-// Sadly it turns out that the IUnknown passed to 
IConnectionPoint::Advise does have an
-// IDispatch, but its GetIDsOfNames() returns E_NOTIMPL?! How is the 
COM object supposed to
-// be able to invoke events in the outgoing interface when it can't 
look them up by name?
-// Need to google harder for informative articles from the early 2000s.
-hr = pDispatch->GetIDsOfNames(IID_NULL, vNames+i, 1, 
LOCALE_USER_DEFAULT, &nDispId);
-if (SUCCEEDED(hr))
-{
-os << "\n" << std::string(indentLevel+2, ' ')
-   << std::wstring_convert, 
wchar_t>().to_bytes(vNames[i])
-   << ": " << nDispId;
-}
-else if (hr == DISP_E_UNKNOWNNAME)
-{
-os << "\n" << std::string(indentLevel+2, ' ')
-   << std::wstring_convert, 
wchar_t>().to_bytes(vNames[i])
-   << ": unknown";
-}
-}
-#endif
-
-UINT nTypeInfoCount = 0;
-if (SUCCEEDED(pDispatch->GetTypeInfoCount(&nTypeInfoCount)) && 
nTypeInfoCount == 1)
-{
-ITypeInfo *pTypeInfo = NULL;
-if (SUCCEEDED(pDi

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

[Maxim Monastirsky]

 vcl/source/window/menubarwindow.cxx |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit bff36583c7be2eb4112adfb778d19a308b458ca8
Author: Maxim Monastirsky 
Date:   Wed May 9 23:52:00 2018 +0300

tdf#117440 Can't move focus to disposed window

xSaveFocusId is the already disposed comments floating window,
so it can't accept focus anymore. Moreover, if closing the
menu by clicking its title, the focus results nowhere, and no
keyboard interaction works at all (including e.g. F6 or F10).

This patch makes the focus switch back to the document, like
it was in earlier LO versions. And does it in a way that
doesn't break tdf#115227.

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

diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index c264e89fba0a..e2d6660dd7af 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -514,20 +514,25 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, 
bool bSelectEntry, bool b
 ImplGetSVData()->maWinData.mbNoDeactivate = false;
 if( !ImplGetSVData()->maWinData.mbNoSaveFocus )
 {
-VclPtr xTempFocusId = xSaveFocusId;
+VclPtr xTempFocusId;
+if (xSaveFocusId && !xSaveFocusId->isDisposed())
+xTempFocusId = xSaveFocusId;
 xSaveFocusId = nullptr;
+
 if (bAllowRestoreFocus)
 {
 // tdf#115227 the popup is already killed, so temporarily set 
us as the
 // focus window, so we could avoid sending superfluous 
activate events
 // to top window listeners.
-ImplGetSVData()->maWinData.mpFocusWin = this;
-Window::EndSaveFocus(xTempFocusId);
-assert(xTempFocusId == nullptr || 
ImplGetSVData()->maWinData.mpFocusWin != this);
+if (xTempFocusId || bDefaultToDocument)
+ImplGetSVData()->maWinData.mpFocusWin = this;
+
+// #105406# restore focus to document if we could not save 
focus before
+if (!xTempFocusId && bDefaultToDocument)
+GrabFocusToDocument();
+else
+Window::EndSaveFocus(xTempFocusId);
 }
-// #105406# restore focus to document if we could not save focus 
before
-if (bDefaultToDocument && xTempFocusId == nullptr && 
bAllowRestoreFocus)
-GrabFocusToDocument();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Stephan Bergmann]

 distro-configs/LibreOfficeFlatpak.conf |1 -
 solenv/flatpak-manifest.in |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a7db7f3ce699a46ce7e9eafdf4388a3213264464
Author: Stephan Bergmann 
Date:   Fri Jun 8 09:50:31 2018 +0200

solenv/flatpak-manifest.in: Properly disable debug information

...see 02248e9e191f798f96218a0c4d281f99e15bea31 "solenv/flatpak-manifest.in:
Disable debug information again, for now" commit message

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

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 23b3780c934e..4440c3aaf589 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,7 +1,6 @@
 --disable-gtk
 --disable-odk
 --enable-release-build
---enable-symbols
 --with-ant-home=/run/build/libreoffice/ant
 --with-extra-buildid=Flatpak version
 --with-jdk-home=/usr/lib/sdk/openjdk10/jvm/openjdk-10
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6355a56c865f..7554a0ddc8c3 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -599,7 +599,7 @@
 ],
 "buildsystem": "simple",
 "build-commands": [
-"./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols",
+"./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
 "make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide' - 104 commits - sw/inc sw/source

[Michael Stahl]

Rebased ref, commits from common ancestor:
commit fea957954c3481239e277f463438d74599573bcb
Author: Michael Stahl 
Date:   Mon May 7 17:44:44 2018 +0200

hack in Show - not sure if...

Change-Id: I6ca49cfe9c61b3562e87ca994b284e056c2bab54

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index a7a56c6f81aa..ad1a5925d644 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -60,6 +60,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -1672,6 +1673,20 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
 *pItem = *Start();
 for( auto& pItem : aBehindArr )
 *pItem = *End();
+
+// sw_redlinehide: assume that Show will only be called by filters;
+// when it is called, ensure that no MergedPara instance survives
+for (SwNodeIndex node = Start()->nNode; node.GetIndex() <= 
End()->nNode.GetIndex(); ++node)
+{
+if (SwTextNode const*const pNode = node.GetNode().GetTextNode())
+{
+SwIterator aIter(*pNode);
+for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+pFrame->SetMergedPara(nullptr);
+}
+}
+}
 }
 else
 InvalidateRange();
commit 458f5e849011bbb7c507607f32612493191c634f
Author: Michael Stahl 
Date:   Thu May 17 13:00:33 2018 +0200

sw_redlinehide: let the Show menu item toggle new mode

Change-Id: I1201e84b231be17e6a5ec2294acfb1e3111c9ada

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 90ca68a0f404..1d57aefdd498 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -140,6 +140,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -639,7 +640,15 @@ void SwView::Execute(SfxRequest &rReq)
 if( static_cast(pItem)->GetValue() )
 nMode |= RedlineFlags::ShowDelete;
 
-m_pWrtShell->SetRedlineFlagsAndCheckInsMode( nMode );
+if (getenv("SW_REDLINEHIDE")) // TODO...
+{
+m_pWrtShell->GetLayout()->SetHideRedlines(
+!static_cast(pItem)->GetValue());
+if (m_pWrtShell->IsRedlineOn())
+m_pWrtShell->SetInsMode();
+}
+else
+m_pWrtShell->SetRedlineFlagsAndCheckInsMode( nMode );
 }
 break;
 case FN_MAILMERGE_SENDMAIL_CHILDWINDOW:
commit a488f8e48f5e0fa3a9e6506aa95944f2bb122258
Author: Michael Stahl 
Date:   Thu May 17 14:16:27 2018 +0200

sw_redlinehide: very incomplete impl. of SwRootFrame::SetHideRedlines()

Change-Id: Icff1b1aac20a0a6d3f957e7025f6a08a6d0edbee

diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index a25bb8d7bb9f..cdce7870a536 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -4171,6 +4171,53 @@ void SwRootFrame::SetHideRedlines(bool const 
bHideRedlines)
 return;
 }
 mbHideRedlines = bHideRedlines;
+SwNodes const& rNodes(GetFormat()->GetDoc()->GetNodes());
+// Hide->Show: clear MergedPara, create frames
+// Show->Hide: call CheckParaRedlineMerge, delete frames
+// TODO how to traverse
+// * via layout
+//  - but that won't find nodes that don't have frames in ->Show case
+// * via nodes
+//  - what about special sections before content? flys? footnotes?
+//is order of these predictable? flys not anchored in content?
+// * ideally should call something existing that tries to create 
everything?
+//  - is that done automatically somewhere already?
+// * other direction ->Hide - delete frames!
+// in-order traversal should init flags in nodes *before* the nodes are 
found
+for (sal_uLong i = 0; i < rNodes.Count(); ++i)
+{
+SwNode *const pNode(rNodes[i]);
+if (pNode->IsTextNode())
+{
+SwTextNode & rTextNode(*pNode->GetTextNode());
+SwIterator 
aIter(rTextNode);
+std::vector frames;
+for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+if (pFrame->getRootFrame() == this)
+{
+frames.push_back(pFrame);
+}
+}
+// this messes with pRegisteredIn so do it outside SwIterator
+for (SwTextFrame * pFrame : frames)
+{
+if (mbHideRedlines && pNode->IsCreateFrameWhenHidingRedlines())
+{
+pFrame->SetMergedPara(CheckParaRedlineMerge(*pFrame, 
rTextNode));
+}
+else
+{
+if (pFrame->GetMergedPara())
+{
+  

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

[Caolán McNamara]

 vcl/source/app/salvtables.cxx |3 +++
 vcl/source/window/builder.cxx |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 465fedc3501284cc5db43b03163d5bd9fc344cd7
Author: Caolán McNamara 
Date:   Fri Jun 8 11:32:38 2018 +0100

sync tristate/inconsistent feature

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 443e562192e8..0772b53943ee 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1129,6 +1129,7 @@ public:
 virtual void set_active(bool active) override
 {
 m_bBlockNotify = true;
+m_xCheckButton->EnableTriState(false);
 m_xCheckButton->Check(active);
 m_bBlockNotify = false;
 }
@@ -1141,6 +1142,7 @@ public:
 virtual void set_inconsistent(bool inconsistent) override
 {
 m_bBlockNotify = true;
+m_xCheckButton->EnableTriState(true);
 m_xCheckButton->SetState(inconsistent ? TRISTATE_INDET : 
TRISTATE_FALSE);
 m_bBlockNotify = false;
 }
@@ -1160,6 +1162,7 @@ IMPL_LINK_NOARG(SalInstanceCheckButton, ToggleHdl, 
CheckBox&, void)
 {
 if (m_bBlockNotify)
 return;
+m_xCheckButton->EnableTriState(false);
 signal_toggled();
 }
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 72f41efad638..8ba726cfdfed 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1550,7 +1550,10 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 else
 xCheckBox = VclPtr::Create(pParent, nBits);
 if (bIsTriState)
+{
+xCheckBox->EnableTriState(true);
 xCheckBox->SetState(TRISTATE_INDET);
+}
 xCheckBox->SetImageAlign(ImageAlign::Left); //default to left
 
 xWindow = xCheckBox;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/inc i18npool/source i18npool/util include/svl include/unotools offapi/com offapi/UnoApi_offapi.mk svl/qa svl/source unotools/source

[Mike Kaganski]

 i18npool/inc/nativenumbersupplier.hxx |   17 +-
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   19 +-
 i18npool/source/nativenumber/nativenumbersupplier.cxx |   44 
+++---
 i18npool/util/i18npool.component  |1 
 include/svl/zformat.hxx   |6 
 include/unotools/nativenumberwrapper.hxx  |   12 +
 offapi/UnoApi_offapi.mk   |2 
 offapi/com/sun/star/i18n/NativeNumberMode.idl |   13 -
 offapi/com/sun/star/i18n/NativeNumberSupplier2.idl|   45 
++
 offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl   |   69 
++
 svl/qa/unit/svl.cxx   |4 
 svl/source/numbers/zformat.cxx|   35 
-
 unotools/source/i18n/nativenumberwrapper.cxx  |   28 
+++-
 13 files changed, 237 insertions(+), 58 deletions(-)

New commits:
commit 90d233b0311a208967a3e264820e00395bf057fb
Author: Mike Kaganski 
Date:   Sun May 13 03:09:43 2018 +0300

tdf#115007: Use [NatNum12 params...] syntax

This allows using all the libnumbertext library functions.

[NatNum12] gives cardinal number names (one, two, three, ...)
[NatNum12 ordinal] gives ordinal number names (first, second, third, ...)
[NatNum12 ordinal-number] gives ordinal indicators (1st, 2nd, 3rd, ...)
[NatNum12 money USD][$-409] gives formal English (US) money text
... etc (see numbertext.org for syntax).

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

diff --git a/i18npool/inc/nativenumbersupplier.hxx 
b/i18npool/inc/nativenumbersupplier.hxx
index e248a1812004..d17c39fe7490 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX
 #define INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -32,7 +32,7 @@ namespace i18npool {
 //  
 class NativeNumberSupplierService : public cppu::WeakImplHelper
 <
-css::i18n::XNativeNumberSupplier,
+css::i18n::XNativeNumberSupplier2,
 css::lang::XServiceInfo
 >
 {
@@ -52,6 +52,11 @@ public:
 virtual sal_Int16 SAL_CALL convertFromXmlAttributes(
 const css::i18n::NativeNumberXmlAttributes& aAttr ) override;
 
+// XNativeNumberSupplier2
+virtual OUString SAL_CALL getNativeNumberStringParams(
+const OUString& rNumberString, const css::lang::Locale& rLocale,
+sal_Int16 nNativeNumberMode, const OUString& rNativeNumberParams) 
override;
+
 //XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 
override;
@@ -59,9 +64,11 @@ public:
 
 // following methods are not for XNativeNumberSupplier, they are for 
calling from transliterations
 /// @throws css::uno::RuntimeException
-OUString getNativeNumberString( const OUString& aNumberString,
-const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode,
-css::uno::Sequence< sal_Int32 >& offset  );
+OUString getNativeNumberString(const OUString& rNumberString,
+   const css::lang::Locale& rLocale,
+   sal_Int16 nNativeNumberMode,
+   css::uno::Sequence& offset,
+   const OUString& rNativeNumberParams = 
OUString());
 /// @throws css::uno::RuntimeException
 sal_Unicode getNativeNumberChar( const sal_Unicode inChar,
 const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode 
) ;
diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index af4e27d0f69f..45a222ce9efd 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -585,6 +585,7 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequence xNatNum(new 
NativeNumberSupplierService);
-OUString aNum
-= xNatNum->getNativeNumberString(OUString::number(number), 
locale, natNum);
+OUString aNum = 
xNatNum->getNativeNumberStringParams(OUString::number(number), locale,
+ natNum, 
sNatNumParams);
 if (bCapitalize)
   

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/qa sc/source

[Vasily Melenchuk]

Rebased ref, commits from common ancestor:
commit 0896fdb1b165b44ef22c2b909184ce6ae5548b48
Author: Vasily Melenchuk 
Date:   Fri Apr 6 20:19:10 2018 +0300

tdf#62268: allow row height recalculation on document load

During document load rows with style:use-optimal-row-height="true"
should recalculate it's height.

Reviewed-on: https://gerrit.libreoffice.org/52521
Reviewed-by: Katarina Behrens 
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

Conflicts:
sc/qa/unit/subsequent_filters-test.cxx
sc/source/filter/xml/xmlimprt.hxx
sc/source/filter/xml/xmlimprt.cxx
sc/source/filter/xml/xmlrowi.cxx

Change-Id: Ib38b5b753d9ff8352116d77851d228c5d77bd530

diff --git a/sc/qa/unit/data/ods/tdf62268.ods b/sc/qa/unit/data/ods/tdf62268.ods
new file mode 100644
index ..da88adfd25cd
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf62268.ods differ
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index ac61dc2f9955..7ec3668a1213 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -731,7 +731,8 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam* 
aTestValues, unsigned in
 bool bOpt = !(rDoc.GetRowFlags( nRow, nTab ) & 
CR_MANUALSIZE);
 CPPUNIT_ASSERT_EQUAL(aTestValues[ index ].pData[ i 
].bOptimal, bOpt);
 }
-CPPUNIT_ASSERT_EQUAL(nExpectedHeight, nHeight);
+// Due to some minor differences on Mac this comparison is 
made bit fuzzy
+CPPUNIT_ASSERT( 3 > abs( nHeight - nExpectedHeight ) );
 }
 }
 xShell->DoClose();
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 4e90034a5f99..ba3e5dc610af 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -800,60 +800,57 @@ void ScExportTest::testOutlineExportXLSX()
 // We expected that exactly 13 unique Nodes will be produced
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col", 13);
 
-// We need to save all 30 rows, as it provides information about 
outLineLevel
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "r", "1");
+// First row is empty and default so it is not written into XML file
+// so we need to save 29 rows, as it provides information about 
outLineLevel
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "r", "2");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "hidden", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "outlineLevel", 
"0");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "outlineLevel", 
"1");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "collapsed", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "r", "2");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "r", "3");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "hidden", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "outlineLevel", 
"1");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "outlineLevel", 
"2");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "collapsed", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "r", "3");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "r", "4");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "hidden", 
"false");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "outlineLevel", 
"2");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "collapsed", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "r", "4");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "r", "5");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "hidden", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "outlineLevel", 
"2");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "outlineLevel", 
"3");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "collapsed", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "r", "5");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "r", "6");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "hidden", 
"false");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "outlineLevel", 
"3");
 assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "collapsed", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "r", "6");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "hidden", 
"false");
-assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "outlineLevel", 
"3");
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "r", "7");
+assertXPath(pSheet, "/x:worksheet/x:shee

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Stephan Bergmann]

 distro-configs/LibreOfficeFlatpak.conf |1 -
 solenv/flatpak-manifest.in |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7841362f9cc0622559e6984735febb035c46812d
Author: Stephan Bergmann 
Date:   Fri Jun 8 09:50:31 2018 +0200

solenv/flatpak-manifest.in: Properly disable debug information

...see 02248e9e191f798f96218a0c4d281f99e15bea31 "solenv/flatpak-manifest.in:
Disable debug information again, for now" commit message

Change-Id: I4a9f8c547a50e8a8c83b5f96768949867aa4bb7b
Reviewed-on: https://gerrit.libreoffice.org/55453
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit a7db7f3ce699a46ce7e9eafdf4388a3213264464)
Reviewed-on: https://gerrit.libreoffice.org/55463

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 23b3780c934e..4440c3aaf589 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,7 +1,6 @@
 --disable-gtk
 --disable-odk
 --enable-release-build
---enable-symbols
 --with-ant-home=/run/build/libreoffice/ant
 --with-extra-buildid=Flatpak version
 --with-jdk-home=/usr/lib/sdk/openjdk10/jvm/openjdk-10
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 42d2189935c2..3c602517d187 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -593,7 +593,7 @@
 ],
 "buildsystem": "simple",
 "build-commands": [
-"./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols",
+"./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
 "make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/source/xmlsec/xmlstreamio.cxx |   51 +-
 1 file changed, 37 insertions(+), 14 deletions(-)

New commits:
commit 3d532502c9a17049bdd383a3d5c56005222331b7
Author: Miklos Vajna 
Date:   Thu Jun 7 09:41:19 2018 +0200

Fix CppunitTest_xmlsecurity_signing with system-xmlsec 1.2.26

Swap the order of the default and custom callback registration, since
the order of lookup is now reversed since

.

Thanks Tomas Chvatal for reporting this.

(cherry picked from commit 576f899811a22e83b6fb6a120c8da303b1f4cac1)

xmlsecurity: check for the libxmlsec version runtime, not build-time

For the general benefit of --with-system-xmlsec usage scenarios (where
LO may be built against an old version of xmlsec and run against a new
one).

(cherry picked from commit bc4e43dd926bbe6f5315b5c372770ac8c7222177)

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

diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx 
b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index de32f8286c1b..910944e11611 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -157,21 +157,44 @@ XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks()
 //Notes: all none default callbacks will lose.
 xmlSecIOCleanupCallbacks() ;
 
-//Register my classbacks.
-int cbs = xmlSecIORegisterCallbacks(
-xmlStreamMatch,
-xmlStreamOpen,
-xmlStreamRead,
-xmlStreamClose ) ;
-if( cbs < 0 ) {
-return -1 ;
+// Newer xmlsec wants the callback order in the opposite direction.
+if (xmlSecCheckVersionExt(1, 2, 26, xmlSecCheckVersionABICompatible))
+{
+//Register the default callbacks.
+//Notes: the error will cause xmlsec working problems.
+int cbs = xmlSecIORegisterDefaultCallbacks() ;
+if( cbs < 0 ) {
+return -1 ;
+}
+
+//Register my classbacks.
+cbs = xmlSecIORegisterCallbacks(
+xmlStreamMatch,
+xmlStreamOpen,
+xmlStreamRead,
+xmlStreamClose ) ;
+if( cbs < 0 ) {
+return -1 ;
+}
 }
-
-//Register the default callbacks.
-//Notes: the error will cause xmlsec working problems.
-cbs = xmlSecIORegisterDefaultCallbacks() ;
-if( cbs < 0 ) {
-return -1 ;
+else
+{
+//Register my classbacks.
+int cbs = xmlSecIORegisterCallbacks(
+xmlStreamMatch,
+xmlStreamOpen,
+xmlStreamRead,
+xmlStreamClose ) ;
+if( cbs < 0 ) {
+return -1 ;
+}
+
+//Register the default callbacks.
+//Notes: the error will cause xmlsec working problems.
+cbs = xmlSecIORegisterDefaultCallbacks() ;
+if( cbs < 0 ) {
+return -1 ;
+}
 }
 
 enableXmlStreamIO |= XMLSTREAMIO_INITIALIZED ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 9 commits - bin/upload_symbols.py cli_ure/Executable_climaker.mk cli_ure/Library_cli_cppuhelper_native.mk cli_ure/Library_cli_uno.mk

[Markus Mohrhard]

 bin/upload_symbols.py |1 
 cli_ure/Executable_climaker.mk|2 -
 cli_ure/Library_cli_cppuhelper_native.mk  |1 
 cli_ure/Library_cli_uno.mk|1 
 desktop/source/app/app.cxx|5 +-
 distro-configs/LibreOfficeLinux.conf  |1 
 distro-configs/LibreOfficeWin32.conf  |1 
 distro-configs/LibreOfficeWin64.conf  |1 
 external/breakpad/ExternalProject_breakpad.mk |2 -
 external/breakpad/UnpackedTarball_breakpad.mk |1 
 external/breakpad/breakpad-stackwalk.patch.1  |   32 +
 sal/inc/signalshared.hxx  |2 -
 sal/osl/all/signalshared.cxx  |9 +---
 sal/osl/unx/signal.cxx|2 -
 sal/osl/w32/signal.cxx|   48 --
 salhelper/source/thread.cxx   |   10 -
 solenv/gbuild/platform/com_MSC_defs.mk|2 -
 17 files changed, 48 insertions(+), 73 deletions(-)

New commits:
commit 22aab5f1e129ffb1c592e7b709d8d0b2a6deba48
Author: Markus Mohrhard 
Date:   Sun Jun 5 22:34:26 2016 +0200

enable breakpad in distro configs

Change-Id: Ib321a62223c77e3f62d48f358a228465280458ad
Reviewed-on: https://gerrit.libreoffice.org/26022
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 439b47e84bb12ec1c5cc2332b4c6a9ea59f462ad)

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index d57706cb5e6a..392b49562774 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -32,5 +32,6 @@
 --enable-epm
 --enable-python=internal
 --enable-online-update
+--enable-breakpad
 --disable-dconf
 --enable-mergelibs
diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index cf32f30ef0bf..2b08ded2c179 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -7,6 +7,7 @@
 --enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-online-update
+--enable-breakpad
 --with-help
 --with-myspell-dicts
 --with-package-format=msi
diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index e2d7aca80b8a..de9172bfb774 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -8,6 +8,7 @@
 --enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-online-update
+--enable-breakpad
 --with-help
 --with-myspell-dicts
 --with-package-format=msi
commit 8eacc3876969d8af49e011626b4491d93ff4d58f
Author: Markus Mohrhard 
Date:   Thu Jan 5 22:35:52 2017 +0100

add the locale info to the crashreporter metadata

We have a few crashes that seem locale dependent. Especially the font
related problems.

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

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7a8636cb61fb..a2b18f201578 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2098,6 +2098,8 @@ void Desktop::OpenClients()
 }
 #if HAVE_FEATURE_BREAKPAD
 CrashReporter::writeCommonInfo();
+// write this information here to avoid depending on vcl in the crash 
reporter lib
+CrashReporter::AddKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
 #endif
 
 RequestHandler::EnableRequests();
commit 66a0fc92ac37f4c632fe002902805bbf4df8df99
Author: Markus Mohrhard 
Date:   Mon Jun 27 04:42:22 2016 +0200

I screwed up with the breakpad minidump_stackwalk patch

This does not affect normal LibreOffice and is only important for the
server side.

Change-Id: I270262ed6e1b22c3ef41099fda19fa386f386203

diff --git a/external/breakpad/breakpad-stackwalk.patch.1 
b/external/breakpad/breakpad-stackwalk.patch.1
index 9a3ce954e8b3..8df1fa3e2f43 100644
--- a/external/breakpad/breakpad-stackwalk.patch.1
+++ b/external/breakpad/breakpad-stackwalk.patch.1
@@ -24,9 +24,9 @@ diff -ur breakpad.org/src/processor/stackwalk_common.cc 
breakpad/src/processor/s
 kOutputSeparator, base_address + module->size() - 1,
 kOutputSeparator,
 -   main_module != NULL && base_address == main_address ? 1 : 0);
-+   main_module != NULL && base_address == main_address ? 1 : 0),
++   main_module != NULL && base_address == main_address ? 1 : 0,
 +   kOutputSeparator,
-+   
StripSeparator(PathnameStripper::File(module->code_identifier())).c_str();
++   
StripSeparator(PathnameStripper::File(module->code_identifier())).c_str());
}
  }
  
commit 710bf7dda6a1d3f31e37e7a0f196d6f0feb92f95
Author: Markus Mohrhard 
Date:   Mon Jun 27 04:41:57 2016 +0200

always compile breakpad with O2

Change-Id: I4cda93fee47244cf3eb7b13bb6cb2a3e

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |   21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit a4bc1364e2fda875b2c7d91b21625039f3bc38ec
Author: Tor Lillqvist 
Date:   Thu Jun 7 15:53:06 2018 +0300

Fix glitch in SAL_INFO logging

Change-Id: I421d3980c50706f927a0611e48c33a43267dd01b

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index cbbef90f7d42..14020457e5bd 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2108,12 +2108,13 @@ public:
 return S_OK;
 }
 
-virtual HRESULT STDMETHODCALLTYPE STDMETHODCALLTYPE Skip(ULONG celt) 
override
+virtual HRESULT STDMETHODCALLTYPE STDMETHODCALLTYPE Skip(ULONG const celt) 
override
 {
 comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
+ULONG nLeft = celt;
 ULONG nSkipped = 0;
-while (celt > 0)
+while (nLeft > 0)
 {
 if (mnIndex > mxCollection->getCount())
 {
@@ -2121,7 +2122,7 @@ public:
 return S_FALSE;
 }
 mnIndex++;
-celt--;
+nLeft--;
 }
 SAL_INFO("extensions.olebridge", this << "@CXEnumVariant::Skip(" << 
celt << "): S_OK");
 return S_OK;
commit fe57da646d0f458eee20071a0565169f5f4ee3e7
Author: Tor Lillqvist 
Date:   Fri Jun 8 16:08:29 2018 +0300

Log all the names being looked up in GetIDsOfNames()

Change-Id: Ia116021ecc9f20c82622a4bc8ee40e7a9a1508fa

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index df8932374896..cbbef90f7d42 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1074,9 +1074,17 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID 
/*riid*/,
 {
 comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
-SAL_INFO("extensions.olebridge", this << 
"@InterfaceOleWrapper::GetIDsOfNames("
- << OUString(o3tl::toU(rgszNames[0]))
- << (cNames > 1 ? "...!" : "") << "," << cNames << ")");
+OUString sNames;
+sNames += "[";
+for (unsigned int i = 0; i < cNames; ++i)
+{
+if (i > 0)
+sNames += ",";
+sNames += "\"" + OUString(o3tl::toU(rgszNames[i])) + "\"";
+}
+sNames += "]";
+
+SAL_INFO("extensions.olebridge", this << 
"@InterfaceOleWrapper::GetIDsOfNames(" << sNames);
 
 HRESULT ret = DISP_E_UNKNOWNNAME;
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 3 commits - desktop/Library_crashreport.mk desktop/source

[Samuel Mehrbrodt]

 desktop/Library_crashreport.mk |1 +
 desktop/source/app/app.cxx |5 +++--
 desktop/source/app/crashreport.cxx |   33 -
 3 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit 21151d01e8340a44af42f3e212529ec6c9ca3b64
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 11:50:12 2017 +0100

Crashdump: Make crash directory configurable

Change-Id: I8106ec674080ede7072581dab2e6700040de5828

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index dd7b3e66708e..bb3a035524a1 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -90,22 +90,35 @@ void CrashReporter::writeCommonInfo()
 
 namespace {
 
-OUString getCrashUserProfileDirectory()
+OUString getCrashDirectory()
 {
-OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/crash/");
-rtl::Bootstrap::expandMacros(url);
-osl::Directory::create(url);
+OUString aCrashURL;
 
-OUString aProfilePath;
-osl::FileBase::getSystemPathFromFileURL(url, aProfilePath);
-return aProfilePath;
+// First check whether a user-defined path is available (crashreport.ini)
+OUString aCrashPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("crashreport") ":CrashDirectory}");
+rtl::Bootstrap::expandMacros(aCrashPath);
+osl::FileBase::getFileURLFromSystemPath(aCrashPath, aCrashURL);
+
+// Fall back to user profile
+if (aCrashPath.isEmpty())
+{
+aCrashURL = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/crash";
+rtl::Bootstrap::expandMacros(aCrashURL);
+}
+
+if (!aCrashURL.endsWith("/"))
+aCrashURL += "/";
+osl::FileBase::RC rc = osl::Directory::create(aCrashURL);
+(void)rc;
+osl::FileBase::getSystemPathFromFileURL(aCrashURL, aCrashPath);
+return aCrashPath;
 }
 
 }
 
 void CrashReporter::updateMinidumpLocation()
 {
-OUString aURL = getCrashUserProfileDirectory();
+OUString aURL = getCrashDirectory();
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
 OString aOStringUrl = OUStringToOString(aURL, RTL_TEXTENCODING_UTF8);
 google_breakpad::MinidumpDescriptor descriptor(aOStringUrl.getStr());
@@ -122,7 +135,7 @@ void 
CrashReporter::storeExceptionHandler(google_breakpad::ExceptionHandler* pEx
 
 std::string CrashReporter::getIniFileName()
 {
-OUString url = getCrashUserProfileDirectory() + "dump.ini";
+OUString url = getCrashDirectory() + "dump.ini";
 OString aUrl = OUStringToOString(url, RTL_TEXTENCODING_UTF8);
 std::string aRet(aUrl.getStr());
 return aRet;
commit 261862f000dce95013843d4a183ad09fe1639041
Author: Samuel Mehrbrodt 
Date:   Thu Jan 12 16:47:40 2017 +0100

Disable CrashReportUI

since we don't offer upload - only want the dumps

Change-Id: I6d084757d83204cb960905d7eb78571b13f8f875

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a2b18f201578..03dcdf477817 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1039,7 +1039,8 @@ bool crashReportInfoExists()
 #if HAVE_FEATURE_BREAKPAD
 void handleCrashReport()
 {
-static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
 
 css::uno::Reference< css::uno::XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
 
@@ -1053,7 +1054,7 @@ void handleCrashReport()
 css::util::URL aURL;
 css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL, 
css::uno::Sequence< css::beans::PropertyValue >());
 bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
 }
 #endif
 
commit ea8971414738c35ae683416ddd3d7da30e72f1f9
Author: Samuel Mehrbrodt 
Date:   Thu Jan 12 16:46:45 2017 +0100

Add build id to crash metadata

Change-Id: I0e11a96936ea08cc439fcc1b1e3ff1f59c636665

diff --git a/desktop/Library_crashreport.mk b/desktop/Library_crashreport.mk
index ba2f3483a416..d6d9b8b91cc5 100644
--- a/desktop/Library_crashreport.mk
+++ b/desktop/Library_crashreport.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,crashreport,\
 cppuhelper \
 sal \
 salhelper \
+utl \
$(gb_UWINAPI) \
 ))
 
diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 9715fde513c9..dd7b3e66708e 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -73,6 +74,7 @@ void CrashReporter::writeCommonInfo()
 std::ofstream minidump_file(ini_path, std::ios_base::trunc);
 minidump_file << "ProductName=LibreOffice\n";
 minidump_file << "Version=" LIBO_VERSIO

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

[Vasily Melenchuk]

 sc/qa/unit/helper/qahelper.cxx |2 +-
 sc/qa/unit/subsequent_filters-test.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4ab0c08e74746a96dcf23c3d50cd2e65ee31342
Author: Vasily Melenchuk 
Date:   Fri Jun 8 11:19:36 2018 +0300

Row height tolerance level increase for unittest

Changes in tests done in 1e55a47e89a9d9d6cf9cb3993484022aaf2c097b
have issues on Mac machines and row height after recalculation
produces somewhat different results there making exact comparison
fail.

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

diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index ed660cfa7928..d414b1abfb96 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -755,7 +755,7 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam 
const * aTestValues, unsi
 CPPUNIT_ASSERT_EQUAL(aTestValues[ index ].pData[ i 
].bOptimal, bOpt);
 }
 // Due to some minor differences on Mac this comparison is 
made bit fuzzy
-CPPUNIT_ASSERT_LESSEQUAL( 3, abs( nHeight - nExpectedHeight ) 
);
+CPPUNIT_ASSERT_LESSEQUAL( 15, abs( nHeight - nExpectedHeight ) 
);
 }
 }
 xShell->DoClose();
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index d65a82b5878b..264040beb49a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2688,7 +2688,7 @@ void ScFiltersTest::testOptimalHeightReset()
 // be triggered ) *and* you can't delete cell contents.
 int nHeight = rDoc.GetRowHeight(nRow, nTab, false);
 // Due to some minor differences on Mac this comparison is made bit fuzzy
-CPPUNIT_ASSERT_LESSEQUAL( 3, abs( nHeight - 701 ) );
+CPPUNIT_ASSERT_LESSEQUAL( 8, abs( nHeight - 701 ) );
 
 ScDocFunc &rFunc = xDocSh->GetDocFunc();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC weekly update : Add Support for Python in LOEclipse Plugin - Shobhan Mandal

[Shobhan Mandal]

Hello Everyone,

This week worked on the changes mentioned by Samuel pointed out earlier,
and made a push which can be seen in:
https://github.com/shobhanmandal/loeclipse/commit/fbd5b5a87a475bfd2b508f8c9c0bf6239680017c#diff-a8a37f3011f274b0a8ce84af5dd6afb5

The work that remains currently are:-
1. Removing the unrelated code from the plugin.xml and Manifest.mf of the
Python module
2. Creating an empty Python file during the starting of the project.
3. Working on the build.xml file in the Python module.

Thanks and Regards,
Shobhan.


On Sat, Jun 2, 2018 at 7:57 PM, Shobhan Mandal 
wrote:

> Hello Everyone,
>
> The update till date includes the following :
> 1. My mentor (Samuel Mehrbrodt) pointed out the codes that are redundant
> in the Push request earlier, therefore will be working on removing them,
> before we can merge it with the original code. https://github.com/
> LibreOffice/loeclipse/pull/68#discussion_r191344809
> 2. Found out that the export made in the earlier week had a incomplete
> Manifest, so need to work on it.
>
> Have been fixing the requested changes which will continue to the next
> week.
>
> Thanks and Regards,
> Shobhan.
>
> On Fri, May 25, 2018 at 12:25 PM, Shobhan Mandal <
> dev.shobhanman...@gmail.com> wrote:
>
>> Hello Everyone,
>>
>> The update till date includes the following things that I have worked on:
>> 1. Create a separate module for putting in the various classes of Python
>> which will be needed for the creation of Project and Exporting it.
>> 2. Made the necessary code changes so that we can create a new Python Uno
>> Project, this project will not have any of the Java Dependencies that a
>> normal Java Uno Project usually has.
>> 3. Also the export option has been enabled allowing users to export the
>> project if the necessary files have been put into the Project.
>>
>> Currently working on finding out which of the files have to be created
>> automatically during the creation of the Project.
>>
>> https://github.com/LibreOffice/loeclipse/pull/68 : Contains the pull
>> request for Project creation and export.
>>
>> Thanks and Regards,
>> Shobhan.
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 8fef261588c40b8bd85395650afbaf0c9dbdac72
Author: Tor Lillqvist 
Date:   Fri Jun 8 16:08:29 2018 +0300

Log all the names being looked up in GetIDsOfNames()

Change-Id: Ia116021ecc9f20c82622a4bc8ee40e7a9a1508fa
Reviewed-on: https://gerrit.libreoffice.org/55479
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index ca31169b1b6f..2ec57765b45e 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1071,9 +1071,17 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID 
/*riid*/,
 {
 comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
-SAL_INFO("extensions.olebridge", this << 
"@InterfaceOleWrapper::GetIDsOfNames("
- << OUString(o3tl::toU(rgszNames[0]))
- << (cNames > 1 ? "...!" : "") << "," << cNames << ")");
+OUString sNames;
+sNames += "[";
+for (unsigned int i = 0; i < cNames; ++i)
+{
+if (i > 0)
+sNames += ",";
+sNames += "\"" + OUString(o3tl::toU(rgszNames[i])) + "\"";
+}
+sNames += "]";
+
+SAL_INFO("extensions.olebridge", this << 
"@InterfaceOleWrapper::GetIDsOfNames(" << sNames);
 
 HRESULT ret = DISP_E_UNKNOWNNAME;
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 loleaflet/src/layer/tile/GridLayer.js |   79 ++
 1 file changed, 42 insertions(+), 37 deletions(-)

New commits:
commit d35fb55511c1d1d7bc851696dd1655dcb6468602
Author: Tamás Zolnai 
Date:   Fri Jun 8 13:27:10 2018 +0200

Zooming in for the first time shows tiles appearing instead of interpolation

Drop only those tiles which are not part of the new visible area.

Change-Id: I4cf86266b4f51cd7e96b9db10da108f644ecdceb
Reviewed-on: https://gerrit.libreoffice.org/55467
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 8a37a04dd..11fbebed5 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -542,24 +542,7 @@ L.GridLayer = L.Layer.extend({
if (newView) {
// we know that a new set of tiles that cover 
the whole view has been requested
// so we're able to cancel the previous 
requests that are being processed
-   this._map._socket.sendMessage('canceltiles');
-   for (key in this._tiles) {
-   // When _invalidCount > 0 the tile has 
been invalidated, however the new tile content
-   // has not yet been fetched and because 
of `canceltiles` message it will never be
-   // so we need to remove the tile, or 
when the tile is back inside the visible area
-   // its content would be the old 
invalidated one;
-   // example: a tile is invalidated but a 
sudden scroll to the cell cursor position causes
-   // to move the tile out of the visible 
area before the new content is fetched
-   if (!this._tiles[key].loaded || 
this._tiles[key]._invalidCount > 0) {
-   
L.DomUtil.remove(this._tiles[key].el);
-   delete this._tiles[key];
-   if (this._debug) {
-   
this._debugCancelledTiles++;
-   
this._debugShowTileData();
-   }
-   }
-   }
-   this._emptyTilesCount = 0;
+   this._cancelTiles();
}
 
// if its the first batch of tiles to load
@@ -620,25 +603,7 @@ L.GridLayer = L.Layer.extend({
if (newView) {
// we know that a new set of tiles that cover 
the whole view has been requested
// so we're able to cancel the previous 
requests that are being processed
-   this._map._socket.sendMessage('canceltiles');
-   for (key in this._tiles) {
-   tile = this._tiles[key];
-   // When _invalidCount > 0 the tile has 
been invalidated, however the new tile content
-   // has not yet been fetched and because 
of `canceltiles` message it will never be
-   // so we need to remove the tile, or 
when the tile is back inside the visible area
-   // its content would be the old 
invalidated one;
-   // example: a tile is invalidated but a 
sudden scroll to the cell cursor position causes
-   // to move the tile out of the visible 
area before the new content is fetched
-   if (!tile.loaded || tile._invalidCount 
> 0) {
-   L.DomUtil.remove(tile.el);
-   delete this._tiles[key];
-   if (this._debug && 
this._debugDataCancelledTiles) {
-   
this._debugCancelledTiles++;
-   
this._debugDataCancelledTiles.setPrefix('Cancelled tiles: ' + 
this._debugCancelledTiles);
-   }
-   }
-   }
-   this._emptyTilesCount = 0;
+   this._cancelTiles();
}
 
// if its the first batch of tiles to load
@@ -719,6 +684,46 @@ L.GridLayer = L.Layer.extend({
 

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

[Tamás Zolnai]

 loleaflet/src/layer/tile/GridLayer.js |   79 ++
 1 file changed, 42 insertions(+), 37 deletions(-)

New commits:
commit 0e1a70795b94e120ac3f70b48848e85bb572f00c
Author: Tamás Zolnai 
Date:   Fri Jun 8 13:27:10 2018 +0200

Zooming in for the first time shows tiles appearing instead of interpolation

Drop only those tiles which are not part of the new visible area.

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

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 0325284f8..1fc666a7f 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -542,24 +542,7 @@ L.GridLayer = L.Layer.extend({
if (newView) {
// we know that a new set of tiles that cover 
the whole view has been requested
// so we're able to cancel the previous 
requests that are being processed
-   this._map._socket.sendMessage('canceltiles');
-   for (key in this._tiles) {
-   // When _invalidCount > 0 the tile has 
been invalidated, however the new tile content
-   // has not yet been fetched and because 
of `canceltiles` message it will never be
-   // so we need to remove the tile, or 
when the tile is back inside the visible area
-   // its content would be the old 
invalidated one;
-   // example: a tile is invalidated but a 
sudden scroll to the cell cursor position causes
-   // to move the tile out of the visible 
area before the new content is fetched
-   if (!this._tiles[key].loaded || 
this._tiles[key]._invalidCount > 0) {
-   
L.DomUtil.remove(this._tiles[key].el);
-   delete this._tiles[key];
-   if (this._debug) {
-   
this._debugCancelledTiles++;
-   
this._debugShowTileData();
-   }
-   }
-   }
-   this._emptyTilesCount = 0;
+   this._cancelTiles();
}
 
// if its the first batch of tiles to load
@@ -620,25 +603,7 @@ L.GridLayer = L.Layer.extend({
if (newView) {
// we know that a new set of tiles that cover 
the whole view has been requested
// so we're able to cancel the previous 
requests that are being processed
-   this._map._socket.sendMessage('canceltiles');
-   for (key in this._tiles) {
-   tile = this._tiles[key];
-   // When _invalidCount > 0 the tile has 
been invalidated, however the new tile content
-   // has not yet been fetched and because 
of `canceltiles` message it will never be
-   // so we need to remove the tile, or 
when the tile is back inside the visible area
-   // its content would be the old 
invalidated one;
-   // example: a tile is invalidated but a 
sudden scroll to the cell cursor position causes
-   // to move the tile out of the visible 
area before the new content is fetched
-   if (!tile.loaded || tile._invalidCount 
> 0) {
-   L.DomUtil.remove(tile.el);
-   delete this._tiles[key];
-   if (this._debug && 
this._debugDataCancelledTiles) {
-   
this._debugCancelledTiles++;
-   
this._debugDataCancelledTiles.setPrefix('Cancelled tiles: ' + 
this._debugCancelledTiles);
-   }
-   }
-   }
-   this._emptyTilesCount = 0;
+   this._cancelTiles();
}
 
// if its the first batch of tiles to load
@@ -719,6 +684,46 @@ L.GridLayer = L.Layer.extend({
 

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

[Jan Holesovsky]

 loleaflet/dist/toolbar.css |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 92d9fae1a1b084361193c8f5fdd194fce823dd07
Author: Jan Holesovsky 
Date:   Thu Jun 7 22:05:13 2018 +0200

Make sure we have enough space for the insert table grid.

Change-Id: I9c6cf2b038663bc68098b6abf4c7c69599ebe070
Reviewed-on: https://gerrit.libreoffice.org/55447
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 6492ac7d4..9d04ed1bc 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -346,11 +346,12 @@ button.leaflet-control-search-next
 position: relative;
 padding: 2px;
 display: block;
-height: 232px;
+width: 243px;
 }
 
 .inserttable-grid .row {
 height: 20px;
+margin: 3px;
 }
 
 .inserttable-grid .col {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[ekuiitr]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   99 
 1 file changed, 84 insertions(+), 15 deletions(-)

New commits:
commit 8d43de9a88dc7c7fec0e7c794cef14953fb34b6e
Author: ekuiitr 
Date:   Mon May 21 01:07:19 2018 +0530

tdf#117761 Corrected Snake Algorithm

Now it displays correct position of child layout nodes along a
linear path in two dimensions, with the correct number of rows and
columns and aspect ratio, this algorithm is for smartarts
like Basic Block List - grouped blocks of information.
It also specifies the behaviour of the direction that
additional nodes are added to new rows or columns
in the snake algorithm.

Added Reverse Algorithm and SameDirection Algorithm in this patch,
rather than commiting new Patch.

Change-Id: I85ba53690fd716f0387cfdb21f8874e63bc44194
Reviewed-on: https://gerrit.libreoffice.org/54606
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 3c8993bd687d..92b6e9129591 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -402,18 +402,19 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 // TODO: get values from constraints
 sal_Int32 nCount = rShape->getChildren().size();
 double fSpace = 0.3;
-double fAspectRatio = 0.6;
+double fAspectRatio = 0.54; // diagram should not spill outside, 
earlier it was 0.6
 
 sal_Int32 nCol = 1;
 sal_Int32 nRow = 1;
-for ( ; nColgetSize().Height;
 const double fShapeWidth = rShape->getSize().Width;
-if ((fShapeHeight / nRow) / (fShapeWidth / nCol) >= 
fAspectRatio)
+if ((fShapeHeight / nCol) / (fShapeWidth / nRow) >= 
fAspectRatio)
 break;
 }
+
 SAL_INFO("oox.drawingml", "Snake layout grid: " << nCol << "x" << 
nRow);
 
 sal_Int32 nWidth = rShape->getSize().Width / (nCol + 
(nCol-1)*fSpace);
@@ -426,20 +427,89 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 aCurrPos.Y = rShape->getSize().Height - aChildSize.Height;
 
 sal_Int32 nStartX = aCurrPos.X;
-sal_Int32 nColIdx = 0;
+sal_Int32 nColIdx = 0,index = 0;
 
-for (auto & aCurrShape : rShape->getChildren())
+sal_Int32 num = rShape->getChildren().size();
+
+const sal_Int32 aContDir = maMap.count(XML_contDir) ? 
maMap.find(XML_contDir)->second : XML_sameDir;
+
+switch(aContDir)
 {
-aCurrShape->setPosition(aCurrPos);
-aCurrShape->setSize(aChildSize);
-aCurrShape->setChildSize(aChildSize);
-aCurrPos.X += nIncX * (aChildSize.Width + 
fSpace*aChildSize.Width);
-if (++nColIdx == nCol)
+case XML_sameDir:
+for (auto & aCurrShape : rShape->getChildren())
+{
+aCurrShape->setPosition(aCurrPos);
+aCurrShape->setSize(aChildSize);
+aCurrShape->setChildSize(aChildSize);
+
+index++; // counts index of child, helpful for positioning.
+
+if(index%nCol==0 || ((index/nCol)+1)!=nRow)
+aCurrPos.X += nIncX * (aChildSize.Width + 
fSpace*aChildSize.Width);
+
+if(++nColIdx == nCol) // condition for next row
+{
+// if last row, then position children according to 
number of shapes.
+if((index+1)%nCol!=0 && (index+1)>=3 && 
((index+1)/nCol+1)==nRow && num!=nRow*nCol)
+// position first child of last row
+aCurrPos.X = nStartX + (nIncX * (aChildSize.Width 
+ fSpace*aChildSize.Width))/2;
+else
+// if not last row, positions first child of that 
row
+aCurrPos.X = nStartX;
+aCurrPos.Y += nIncY * (aChildSize.Height + 
fSpace*aChildSize.Height);
+nColIdx = 0;
+}
+
+// positions children in the last row.
+if(index%nCol!=0 && index>=3 && ((index/nCol)+1)==nRow)
+aCurrPos.X += (nIncX * (aChildSize.Width + 
fSpace*aChildSize.Width));
+}
+break;
+case XML_revDir:
+for (auto & aCurrShape : rShape->getChildren())
 {
-aCurrPos.X = nStartX;
-aCurrPos.Y += nIncY * (aChildSize.Height + 
fSpace*aChildSize.Height);
-nColIdx = 0;
+aCurrShape->setPosition(aCurrPos);
+ 

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 4328d181b670356c9dbd69f1ec1dedb473b59e8e
Author: Tor Lillqvist 
Date:   Thu Jun 7 15:53:06 2018 +0300

Fix glitch in SAL_INFO logging

Change-Id: I421d3980c50706f927a0611e48c33a43267dd01b
Reviewed-on: https://gerrit.libreoffice.org/55477
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 2ec57765b45e..cbe7992852df 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2105,12 +2105,13 @@ public:
 return S_OK;
 }
 
-virtual HRESULT STDMETHODCALLTYPE STDMETHODCALLTYPE Skip(ULONG celt) 
override
+virtual HRESULT STDMETHODCALLTYPE STDMETHODCALLTYPE Skip(ULONG const celt) 
override
 {
 comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
+ULONG nLeft = celt;
 ULONG nSkipped = 0;
-while (celt > 0)
+while (nLeft > 0)
 {
 if (mnIndex > mxCollection->getCount())
 {
@@ -2118,7 +2119,7 @@ public:
 return S_FALSE;
 }
 mnIndex++;
-celt--;
+nLeft--;
 }
 SAL_INFO("extensions.olebridge", this << "@CXEnumVariant::Skip(" << 
celt << "): S_OK");
 return S_OK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source include/svl include/xmloff offapi/com offapi/UnoApi_offapi.mk svl/source xmloff/source

[László Németh]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |5 
 i18npool/source/nativenumber/nativenumbersupplier.cxx |9 -
 include/svl/zformat.hxx   |2 
 include/xmloff/xmltoken.hxx   |3 
 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl   |   62 
++
 svl/source/numbers/zformat.cxx|   15 ++
 xmloff/source/core/xmltoken.cxx   |3 
 xmloff/source/style/xmlnumfe.cxx  |   19 
++-
 xmloff/source/style/xmlnumfi.cxx  |   47 
---
 xmloff/source/token/tokens.txt|2 
 11 files changed, 142 insertions(+), 26 deletions(-)

New commits:
commit 32f1c56d8ff5e6f87dbcf086fd3743d6d36182bc
Author: László Németh 
Date:   Wed May 30 17:28:17 2018 +0200

tdf#115007: add import/export to NatNum12 (spell out numbers,

dates and money amounts, supporting all the
XNumberText/libnumbertext formatting codes, for example
"ordinal", "ordinal-number", "ordinal-feminine", etc., and
ISO 4217 currency codes, also their possible combinations.
NatNum12 formatting codes are stored by using the newly
introduced (yet, loext:)transliteration-spellout attribute.

creator-initials also added to token list

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

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 45a222ce9efd..d363407c19fe 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -642,12 +642,13 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequence= 0);
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 92a8080e3383..59c3a293d5b3 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace utl {
 class DigitGroupingIterator;
@@ -436,6 +437,7 @@ public:
 // rAttr.Number not empty if NatNum attributes are to be stored
 void GetNatNumXml(
 css::i18n::NativeNumberXmlAttributes& rAttr,
+css::i18n::NativeNumberXmlAttributes2& rAttr2,
 sal_uInt16 nNumFor ) const;
 
 /** Switches to the first non-"gregorian" calendar, but only if the current
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 6ab3cdd217f5..5a1cd6157887 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3316,6 +3316,9 @@ namespace xmloff { namespace token {
 
 XML_CREATOR_INITIALS,
 
+// tdf#115007
+XML_TRANSLITERATION_SPELLOUT,
+
 XML_TOKEN_END
 };
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index bd8932463c12..93a76c5908a2 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2753,6 +2753,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/i18n,\
MultipleCharsOutputException \
NativeNumberMode \
NativeNumberXmlAttributes \
+   NativeNumberXmlAttributes2 \
NumberFormatCode \
NumberFormatIndex \
ParseResult \
diff --git a/offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl 
b/offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl
new file mode 100644
index ..34dbc9cc6e1d
--- /dev/null
+++ b/offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl
@@ -0,0 +1,62 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __com_sun_star_i18n_NativeNumberXmlAttributes_idl__
+#define __com_sun_star_i18n_NativeNumberXmlAttributes_idl__
+
+#include 
+
+
+module com { module sun 

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

[ekuiitr]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit f1368d6a45456b5682d588371cfa2efa5571d798
Author: ekuiitr 
Date:   Sun May 27 01:49:09 2018 +0530

Smartart: Corrected Line Algorithm

Earlier it display odd height of the children nodes as compared to
their width.

Change-Id: I379fb192afc5078d089ef276f35ca5a95ff60cfb
Reviewed-on: https://gerrit.libreoffice.org/54866
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 92b6e9129591..366759581bc0 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -361,12 +361,22 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 if (nIncY)
 aChildSize.Height /= (nCount + (nCount-1)*fSpace);
 
+if(nCount <= 2 && nIncY)
+aChildSize.Height /= 2;
+else
+aChildSize.Height /= (nCount+1);
+
 awt::Point aCurrPos(0, 0);
 if (nIncX == -1)
 aCurrPos.X = rShape->getSize().Width - aChildSize.Width;
 if (nIncY == -1)
 aCurrPos.Y = rShape->getSize().Height - aChildSize.Height;
 
+if(nCount <= 2 && nIncY == -1)
+aCurrPos.Y = rShape->getSize().Height - aChildSize.Height*2;
+else
+aCurrPos.Y = rShape->getSize().Height - 
aChildSize.Height*(nCount+1);
+
 for (auto & aCurrShape : rShape->getChildren())
 {
 aCurrShape->setPosition(aCurrPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[ekuiitr]

 sd/qa/unit/import-tests-smartart.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0d0716411e3d66e8beb9093ebe94fb5545106fbf
Author: ekuiitr 
Date:   Wed May 30 19:04:03 2018 +0530

Unit test for Line algorithm

TestMaxDepth test checks the linear (lin) algorithm such that it arranges
child layout nodes along a linear path.

Change-Id: Ibf6f654d2f68f31a1c1a0f57044b411add954fa0
Reviewed-on: https://gerrit.libreoffice.org/55080
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index e86dab7f4745..27d81f99b7ee 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -165,6 +165,10 @@ void SdImportTestSmartArt::testMaxDepth()
 uno::Reference xText1(xShapeGroup->getByIndex(1), 
uno::UNO_QUERY_THROW);
 CPPUNIT_ASSERT_EQUAL(OUString("second"), xText1->getString());
 
+uno::Reference xShape0(xShapeGroup->getByIndex(0), 
uno::UNO_QUERY_THROW);
+uno::Reference xShape1(xShapeGroup->getByIndex(1), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y , xShape1->getPosition().Y); 
// Confirms shapes are in same Y axis-level.
+
 xDocShRef->DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[ekuiitr]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   21 ++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit cf7b97d1328ec2f2c8254abb9ce67d63d9c54c80
Author: ekuiitr 
Date:   Wed Jun 6 13:00:27 2018 +0530

Support autoTxRot parameter in Text algorithm

Specifies how text is oriented relative to the shape, according to values:
none, upright(default) and gravity.

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 366759581bc0..c085fb6daa7f 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -544,8 +544,25 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 break;
 }
 
-if (rShape->getRotation())
-pTextBody->getTextProperties().moRotation = 
-rShape->getRotation();
+const sal_Int32 nautoTxRot = maMap.count(XML_autoTxRot) ? 
maMap.find(XML_autoTxRot)->second : XML_upr;
+
+switch(nautoTxRot)
+{
+case XML_upr:
+{
+if (rShape->getRotation())
+pTextBody->getTextProperties().moRotation = 
-F_PI180*90*rShape->getRotation();
+}
+break;
+case XML_grav:
+{
+if (rShape->getRotation()==90*F_PI180 || 
rShape->getRotation()==180*F_PI180)
+pTextBody->getTextProperties().moRotation = 
180*F_PI180;
+}
+break;
+case XML_none:
+break;
+}
 
 // text centered vertically by default
 pTextBody->getTextProperties().meVA = 
css::drawing::TextVerticalAdjust_CENTER;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide' - 365 commits - accessibility/source avmedia/source basic/source canvas/source chart2/inc chart2/IwyuFilter_chart2.yaml chart2/qa ch

[Michael Stahl]

Rebased ref, commits from common ancestor:
commit 5e6ba08f2f1ecd11ba81b28830f349bc26f045b3
Author: Michael Stahl 
Date:   Mon May 7 17:44:44 2018 +0200

hack in Show - not sure if...

Change-Id: I6ca49cfe9c61b3562e87ca994b284e056c2bab54

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 1e31e7150324..f46749e24830 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -60,6 +60,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -1673,6 +1674,20 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
 *pItem = *Start();
 for( auto& pItem : aBehindArr )
 *pItem = *End();
+
+// sw_redlinehide: assume that Show will only be called by filters;
+// when it is called, ensure that no MergedPara instance survives
+for (SwNodeIndex node = Start()->nNode; node.GetIndex() <= 
End()->nNode.GetIndex(); ++node)
+{
+if (SwTextNode const*const pNode = node.GetNode().GetTextNode())
+{
+SwIterator aIter(*pNode);
+for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+pFrame->SetMergedPara(nullptr);
+}
+}
+}
 }
 else
 InvalidateRange();
commit f9b5ee4abf4217b464b5194c71e3badb7b289d8b
Author: Michael Stahl 
Date:   Thu May 17 13:00:33 2018 +0200

sw_redlinehide: let the Show menu item toggle new mode

Change-Id: I1201e84b231be17e6a5ec2294acfb1e3111c9ada

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index f2cbaa68c93f..e5a7fa8b95c7 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -139,6 +139,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -638,7 +639,15 @@ void SwView::Execute(SfxRequest &rReq)
 if( static_cast(pItem)->GetValue() )
 nMode |= RedlineFlags::ShowDelete;
 
-m_pWrtShell->SetRedlineFlagsAndCheckInsMode( nMode );
+if (getenv("SW_REDLINEHIDE")) // TODO...
+{
+m_pWrtShell->GetLayout()->SetHideRedlines(
+!static_cast(pItem)->GetValue());
+if (m_pWrtShell->IsRedlineOn())
+m_pWrtShell->SetInsMode();
+}
+else
+m_pWrtShell->SetRedlineFlagsAndCheckInsMode( nMode );
 }
 break;
 case FN_MAILMERGE_SENDMAIL_CHILDWINDOW:
commit 4b55404e02f02fe53973633bf715e84541f92505
Author: Michael Stahl 
Date:   Thu May 17 14:16:27 2018 +0200

sw_redlinehide: very incomplete impl. of SwRootFrame::SetHideRedlines()

Change-Id: Icff1b1aac20a0a6d3f957e7025f6a08a6d0edbee

diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index a25bb8d7bb9f..cdce7870a536 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -4171,6 +4171,53 @@ void SwRootFrame::SetHideRedlines(bool const 
bHideRedlines)
 return;
 }
 mbHideRedlines = bHideRedlines;
+SwNodes const& rNodes(GetFormat()->GetDoc()->GetNodes());
+// Hide->Show: clear MergedPara, create frames
+// Show->Hide: call CheckParaRedlineMerge, delete frames
+// TODO how to traverse
+// * via layout
+//  - but that won't find nodes that don't have frames in ->Show case
+// * via nodes
+//  - what about special sections before content? flys? footnotes?
+//is order of these predictable? flys not anchored in content?
+// * ideally should call something existing that tries to create 
everything?
+//  - is that done automatically somewhere already?
+// * other direction ->Hide - delete frames!
+// in-order traversal should init flags in nodes *before* the nodes are 
found
+for (sal_uLong i = 0; i < rNodes.Count(); ++i)
+{
+SwNode *const pNode(rNodes[i]);
+if (pNode->IsTextNode())
+{
+SwTextNode & rTextNode(*pNode->GetTextNode());
+SwIterator 
aIter(rTextNode);
+std::vector frames;
+for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+if (pFrame->getRootFrame() == this)
+{
+frames.push_back(pFrame);
+}
+}
+// this messes with pRegisteredIn so do it outside SwIterator
+for (SwTextFrame * pFrame : frames)
+{
+if (mbHideRedlines && pNode->IsCreateFrameWhenHidingRedlines())
+{
+pFrame->SetMergedPara(CheckParaRedlineMerge(*pFrame, 
rTextNode));
+}
+else
+{
+if (pFrame->GetMergedPara())
+{
+  

Re: GSoC weekly update: Smarart Editing in Impress

[Ekansh Jha]

Hello Community,

This mail is regarding status update about the work till now in the GSoC
period.
I have written a blog about the work I've done till now:
https://medium.com/@ekanshjha/gsoc18-smartart-week-4-4ccdc1b91a2f
and will be writing updates at https://medium.com/@ekanshjha.

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

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

[Caolán McNamara]

 vcl/source/app/salvtables.cxx |3 +++
 vcl/source/window/builder.cxx |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit e15f7b3f670a5146516beeb05269227c0dde75cf
Author: Caolán McNamara 
Date:   Fri Jun 8 11:32:38 2018 +0100

sync tristate/inconsistent feature

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 590d0acefa8d..8e9689c7c2c1 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1130,6 +1130,7 @@ public:
 virtual void set_active(bool active) override
 {
 m_bBlockNotify = true;
+m_xCheckButton->EnableTriState(false);
 m_xCheckButton->Check(active);
 m_bBlockNotify = false;
 }
@@ -1142,6 +1143,7 @@ public:
 virtual void set_inconsistent(bool inconsistent) override
 {
 m_bBlockNotify = true;
+m_xCheckButton->EnableTriState(true);
 m_xCheckButton->SetState(inconsistent ? TRISTATE_INDET : 
TRISTATE_FALSE);
 m_bBlockNotify = false;
 }
@@ -1161,6 +1163,7 @@ IMPL_LINK_NOARG(SalInstanceCheckButton, ToggleHdl, 
CheckBox&, void)
 {
 if (m_bBlockNotify)
 return;
+m_xCheckButton->EnableTriState(false);
 signal_toggled();
 }
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 72f41efad638..8ba726cfdfed 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1550,7 +1550,10 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 else
 xCheckBox = VclPtr::Create(pParent, nBits);
 if (bIsTriState)
+{
+xCheckBox->EnableTriState(true);
 xCheckBox->SetState(TRISTATE_INDET);
+}
 xCheckBox->SetImageAlign(ImageAlign::Left); //default to left
 
 xWindow = xCheckBox;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/builder.hxx   |   13 -
 vcl/source/outdev/text.cxx|1 -
 vcl/source/window/builder.cxx |   23 ---
 3 files changed, 28 insertions(+), 9 deletions(-)

New commits:
commit 83cefb5ceb4428d61a5b9fae80d1e673131e9bfe
Author: Caolán McNamara 
Date:   Fri Jun 8 11:08:27 2018 +0100

support comboboxtext id values

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

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 71819bf8b2da..0c1ea3b56b14 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -49,6 +49,17 @@ class VclExpander;
 class VclMultiLineEdit;
 namespace xmlreader { class XmlReader; }
 
+struct ComboBoxTextItem
+{
+OUString m_sItem;
+OString m_sId;
+ComboBoxTextItem(const OUString& rItem, const OString& rId)
+: m_sItem(rItem)
+, m_sId(rId)
+{
+}
+};
+
 class VCL_DLLPUBLIC VclBuilder
 {
 public:
@@ -361,7 +372,7 @@ private:
 voidhandleRow(xmlreader::XmlReader &reader, const OString &rID);
 voidhandleTabChild(vcl::Window *pParent, xmlreader::XmlReader 
&reader);
 voidhandleMenu(xmlreader::XmlReader &reader, const OString &rID);
-std::vector handleItems(xmlreader::XmlReader &reader) const;
+std::vector handleItems(xmlreader::XmlReader &reader) 
const;
 
 voidhandleSizeGroup(xmlreader::XmlReader &reader);
 
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 1d115dc56397..211dda947df8 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -713,7 +713,6 @@ void OutputDevice::SetTextFillColor()
 
 void OutputDevice::SetTextFillColor( const Color& rColor )
 {
-
 Color aColor( rColor );
 bool bTransFill = ImplIsColorTransparent( aColor );
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8ba726cfdfed..677bd646b6c9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2639,11 +2639,11 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader 
&reader, vcl::Window *pWin
 }
 }
 
-std::vector VclBuilder::handleItems(xmlreader::XmlReader &reader) 
const
+std::vector VclBuilder::handleItems(xmlreader::XmlReader 
&reader) const
 {
 int nLevel = 1;
 
-std::vector aItems;
+std::vector aItems;
 sal_Int32 nItemIndex = 0;
 
 while(true)
@@ -2663,7 +2663,7 @@ std::vector 
VclBuilder::handleItems(xmlreader::XmlReader &reader) cons
 if (name.equals("item"))
 {
 bool bTranslated = false;
-OString sContext;
+OString sContext, sId;
 
 while (reader.nextAttribute(&nsId, &name))
 {
@@ -2676,6 +2676,11 @@ std::vector 
VclBuilder::handleItems(xmlreader::XmlReader &reader) cons
 name = reader.getAttributeValue(false);
 sContext = OString(name.begin, name.length);
 }
+else if (name.equals("id"))
+{
+name = reader.getAttributeValue(false);
+sId = OString(name.begin, name.length);
+}
 }
 
 reader.nextItem(
@@ -2695,7 +2700,7 @@ std::vector 
VclBuilder::handleItems(xmlreader::XmlReader &reader) cons
 if (m_pStringReplace)
 sFinalValue = (*m_pStringReplace)(sFinalValue);
 
-aItems.push_back(sFinalValue);
+aItems.emplace_back(sFinalValue, sId);
 ++nItemIndex;
 }
 }
@@ -3021,7 +3026,7 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, 
PopupMenu *pSubMenu, const
 
 /// Insert items to a ComboBox or a ListBox.
 /// They have no common ancestor that would have 'InsertEntry()', so use a 
template.
-template bool insertItems(vcl::Window *pWindow, 
VclBuilder::stringmap &rMap, const std::vector &rItems)
+template bool insertItems(vcl::Window *pWindow, 
VclBuilder::stringmap &rMap, const std::vector &rItems)
 {
 T *pContainer = dynamic_cast(pWindow);
 if (!pContainer)
@@ -3029,7 +3034,11 @@ template bool insertItems(vcl::Window 
*pWindow, VclBuilder::stringma
 
 sal_uInt16 nActiveId = extractActive(rMap);
 for (auto const& item : rItems)
-pContainer->InsertEntry(item);
+{
+sal_Int32 nPos = pContainer->InsertEntry(item.m_sItem);
+if (!item.m_sId.isEmpty())
+pContainer->SetEntryData(nPos, new 
OUString(OUString::fromUtf8(item.m_sId)));
+}
 if (nActiveId < rItems.size())
 pContainer->SelectEntryPos(nActiveId);
 
@@ -3090,7 +3099,7 @@ VclPtr VclBuilder::handleObject(vcl::Window 
*pParent, xmlreader::Xm
 
 stringmap aProperties, aPangoAttributes;
 stringmap aAtkAttributes;
-std::vector aIt

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

[Caolán McNamara]

 sw/source/ui/table/tabledlg.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 54a5b9144b29951fd57def1e356418f46d9b03c5
Author: Caolán McNamara 
Date:   Fri Jun 8 12:16:05 2018 +0100

drop ancient SW_FILEFORMAT_40 ifdef

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

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 91cdb2dbe3d3..ae260c093031 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1278,11 +1278,9 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 LINK( this, SwTextFlowPage, SplitRowHdl_Impl));
 m_pHeadLineCB->SetClickHdl( LINK( this, SwTextFlowPage, HeadLineCBClickHdl 
) );
 
-#ifndef SW_FILEFORMAT_40
 const SfxPoolItem *pItem;
 if(SfxItemState::SET == rSet.GetItemState( SID_HTML_MODE, false,&pItem )
 && static_cast(pItem)->GetValue() & HTMLMODE_ON)
-#endif
 {
 m_pKeepCB->Hide();
 m_pSplitCB->Hide();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/quartz vcl/source vcl/unx vcl/win

[Noel Grandin]

 include/vcl/outdev.hxx |2 
 vcl/inc/PhysicalFontFace.hxx   |2 
 vcl/inc/fontinstance.hxx   |9 -
 vcl/inc/fontselect.hxx |3 
 vcl/inc/impfontcache.hxx   |   20 ---
 vcl/inc/quartz/salgdi.h|6 -
 vcl/inc/sallayout.hxx  |2 
 vcl/inc/salwtype.hxx   |3 
 vcl/inc/unx/freetype_glyphcache.hxx|4 
 vcl/inc/unx/glyphcache.hxx |5 
 vcl/inc/win/salgdi.h   |7 -
 vcl/inc/win/winlayout.hxx  |2 
 vcl/quartz/ctfonts.cxx |2 
 vcl/quartz/salgdi.cxx  |   10 -
 vcl/source/font/PhysicalFontFace.cxx   |2 
 vcl/source/font/fontcache.cxx  |  148 +
 vcl/source/font/fontinstance.cxx   |   22 ---
 vcl/source/font/fontselect.cxx |1 
 vcl/source/gdi/CommonSalLayout.cxx |2 
 vcl/source/gdi/pdfwriter_impl.cxx  |   12 +-
 vcl/source/gdi/print.cxx   |   25 
 vcl/source/gdi/virdev.cxx  |6 -
 vcl/source/outdev/font.cxx |   26 +---
 vcl/source/outdev/outdev.cxx   |3 
 vcl/source/outdev/outdevstate.cxx  |7 -
 vcl/source/outdev/textline.cxx |8 -
 vcl/source/window/window.cxx   |5 
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |9 -
 vcl/win/gdi/salfont.cxx|   14 --
 vcl/win/gdi/salgdi.cxx |1 
 vcl/win/gdi/winlayout.cxx  |5 
 31 files changed, 101 insertions(+), 272 deletions(-)

New commits:
commit c4c56de1b0e62ec866b519b2b24c5e805f0a86d3
Author: Noel Grandin 
Date:   Tue Jun 5 14:16:23 2018 +0200

hold LogicalFontInstance with rtl::Reference

instead of manual reference counting.

Also the releasing of not-currently-in-use LogicalFontInstance objects
from the cache is made less aggressive - we now only flush entries until
we have less than CACHE_SIZE instances, instead of flushing the whole
cache.

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 174987e51757..93a3ce610c32 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -332,7 +332,7 @@ private:
 mutable VclPtrmpPrevGraphics; ///< Previous output 
device in list
 mutable VclPtrmpNextGraphics; ///< Next output 
device in list
 GDIMetaFile*mpMetaFile;
-mutable LogicalFontInstance*mpFontInstance;
+mutable rtl::Reference mpFontInstance;
 mutable ImplFontCache*  mpFontCache;
 mutable PhysicalFontCollection* mpFontCollection;
 mutable std::unique_ptr mpDeviceFontList;
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index 2406b6cf41da..e289345716ca 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -54,7 +54,7 @@ public:
 class VCL_PLUGIN_PUBLIC PhysicalFontFace : public FontAttributes, public 
salhelper::SimpleReferenceObject
 {
 public:
-virtual LogicalFontInstance* CreateFontInstance(const FontSelectPattern&) 
const;
+virtual rtl::Reference CreateFontInstance(const 
FontSelectPattern&) const;
 virtual rtl::Reference Clone() const = 0;
 
 int GetHeight() const   { return mnHeight; }
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 317b7181198d..149bb553c3eb 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -24,6 +24,7 @@
 #include "impfontmetricdata.hxx"
 
 #include 
+#include 
 #include 
 #include 
 
@@ -35,7 +36,7 @@ class PhysicalFontFace;
 
 // TODO: allow sharing of metrics for related fonts
 
-class VCL_PLUGIN_PUBLIC LogicalFontInstance
+class VCL_PLUGIN_PUBLIC LogicalFontInstance : public 
salhelper::SimpleReferenceObject
 {
 // just declaring the factory function doesn't work AKA
 // friend LogicalFontInstance* PhysicalFontFace::CreateFontInstance(const 
FontSelectPattern&) const;
@@ -43,7 +44,7 @@ class VCL_PLUGIN_PUBLIC LogicalFontInstance
 friend class ImplFontCache;
 
 public: // TODO: make data members private
-virtual ~LogicalFontInstance();
+virtual ~LogicalFontInstance() override;
 
 ImplFontMetricDataRef mxFontMetric;// Font attributes
 const ConvertChar* mpConversion;// used e.g. for 
StarBats->StarSymbol
@@ -57,9 +58,6 @@ public: // TODO: make data members private
 boolGetFallbackForUnicode( sal_UCS4, FontWeight eWeight, 
OUString* pFontName ) const;
 voidIgnoreFallbackForUnic

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - 2 commits - vcl/unx

[Katarina Behrens]

 vcl/unx/kde5/KDE5FilePicker.cxx  |   27 ---
 vcl/unx/kde5/KDE5FilePicker.hxx  |6 ++
 vcl/unx/kde5/KDE5FilePicker2.cxx |   31 +++
 3 files changed, 37 insertions(+), 27 deletions(-)

New commits:
commit d0f6f32a5217106c14ba0a6e234c8ee90011894e
Author: Katarina Behrens 
Date:   Fri Jun 8 22:49:26 2018 +0200

Distinguish between open vs. save file dialog

Change-Id: I1b9dee1a8cd4034f64c2c1b843cee1863a5dc1d9

diff --git a/vcl/unx/kde5/KDE5FilePicker.cxx b/vcl/unx/kde5/KDE5FilePicker.cxx
index 02135eaa4a9a..dd5f3c0ecc45 100644
--- a/vcl/unx/kde5/KDE5FilePicker.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker.cxx
@@ -141,21 +141,6 @@ QString KDE5FilePicker::getLabel(sal_Int16 controlId) const
 return label;
 }*/
 
-/*void KDE5FilePicker::initialize(bool saveDialog)
-{
-//default is opening
-QFileDialog::AcceptMode operationMode
-= saveDialog ? QFileDialog::AcceptSave : QFileDialog::AcceptOpen;
-
-_dialog->setAcceptMode(operationMode);
-
-if (saveDialog)
-{
-_dialog->setConfirmOverwrite(true);
-_dialog->setFileMode(QFileDialog::AnyFile);
-}
-}*/
-
 void KDE5FilePicker::setWinId(sal_uIntPtr winId) { _winId = winId; }
 
 bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index a920b9f3cbb7..ab3cc61191ed 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -452,6 +452,19 @@ void SAL_CALL KDE5FilePicker::initialize(const 
uno::Sequence& args)
 OSL_TRACE("Unknown templates %d", templateId);
 return;
 }
+
+//default is opening
+QFileDialog::AcceptMode operationMode
+= saveDialog ? QFileDialog::AcceptSave : QFileDialog::AcceptOpen;
+
+_dialog->setAcceptMode(operationMode);
+
+if (saveDialog)
+{
+_dialog->setConfirmOverwrite(true);
+_dialog->setFileMode(QFileDialog::AnyFile);
+}
+
 setTitle(VclResId(saveDialog ? STR_FPICKER_SAVE : STR_FPICKER_OPEN));
 }
 
commit 5c628b4bd569eec4d7624e8f11c3b4d8812c4ec8
Author: Katarina Behrens 
Date:   Fri Jun 8 22:40:45 2018 +0200

Implement setValue of fpicker checkboxes, signal+slot

Change-Id: I0d75ef9f5584935d05a0526a626145e00761efd9

diff --git a/vcl/unx/kde5/KDE5FilePicker.cxx b/vcl/unx/kde5/KDE5FilePicker.cxx
index d3939e1d7e1f..02135eaa4a9a 100644
--- a/vcl/unx/kde5/KDE5FilePicker.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker.cxx
@@ -91,18 +91,6 @@ QString KDE5FilePicker::getCurrentFilter() const
 return filter;
 }
 
-void KDE5FilePicker::setValue(sal_Int16 controlId, sal_Int16 nControlAction, 
bool value)
-{
-if (_customWidgets.contains(controlId))
-{
-QCheckBox* cb = 
dynamic_cast(_customWidgets.value(controlId));
-if (cb)
-cb->setChecked(value);
-}
-else
-qWarning() << "set value on unknown control" << controlId;
-}
-
 bool KDE5FilePicker::getValue(sal_Int16 controlId, sal_Int16 nControlAction) 
const
 {
 bool ret = false;
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index d303ba30a6ac..675becf0bf68 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -174,10 +174,16 @@ protected:
 Q_SIGNALS:
 void setTitleSignal(const OUString& rTitle);
 void setDisplayDirectorySignal(const OUString& rDir);
+void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction,
+const css::uno::Any& rValue);
 
 private Q_SLOTS:
 void setTitleSlot(const OUString& rTitle) { return setTitle(rTitle); }
 void setDisplayDirectorySlot(const OUString& rDir) { return 
setDisplayDirectory(rDir); }
+void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const 
css::uno::Any& rValue)
+{
+return setValue(nControlAction, nControlAction, rValue);
+}
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 96b6a0fe3c4f..a920b9f3cbb7 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -105,6 +105,8 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
 connect(this, &KDE5FilePicker::setDisplayDirectorySignal /*(const 
OUString&)*/, this,
 &KDE5FilePicker::setDisplayDirectorySlot /*(const OUString&)*/,
 Qt::BlockingQueuedConnection);
+connect(this, &KDE5FilePicker::setValueSignal, this, 
&KDE5FilePicker::setValueSlot,
+Qt::BlockingQueuedConnection);
 
 qApp->installEventFilter(this);
 setMultiSelectionMode(false);
@@ -205,6 +207,23 @@ void SAL_CALL KDE5FilePicker::appendFilterGroup(const 
OUString& /*rGroupTitle*/,
 void SAL_CALL KDE5FilePicker::setValue(sal_Int16 controlId, sal_Int16 
nControlAction,
const uno::Any& value)
 {
+if (qApp->thread() != QThread::currentThread())

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

[Miklos Vajna]

 filter/source/msfilter/msdffimp.cxx |3 +++
 sd/qa/unit/data/ppt/crop.ppt|binary
 sd/qa/unit/import-tests.cxx |   21 +
 3 files changed, 24 insertions(+)

New commits:
commit aecab50c291a535bc0ccfd30b86060faf6bea994
Author: Miklos Vajna 
Date:   Fri Jun 8 09:27:32 2018 +0200

tdf#118037 PPT import: fix lost crop of graphic

Regression from commit b11188835d3b87cd9d2a8cdb3da204cfda5d3e6e (DOC
import: lazy-read images, 2018-04-20).

(cherry picked from commit 11d542352e1088a2c870b0e73e14e10266276483)

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

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 3e80858d9275..923013f96d82 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3719,6 +3719,9 @@ static void lcl_ApplyCropping( const DffPropSet& 
rPropSet, SfxItemSet* pSet, Gra
 BitmapExaCropBitmap;
 sal_uInt32  nTop( 0 ),  nBottom( 0 ), nLeft( 0 ), nRight( 0 );
 
+// Cropping has to be applied on a loaded graphic.
+rGraf.makeAvailable();
+
 if ( pSet ) // use crop attributes ?
 aCropSize = lcl_GetPrefSize(rGraf, MapMode(MapUnit::Map100thMM));
 else
diff --git a/sd/qa/unit/data/ppt/crop.ppt b/sd/qa/unit/data/ppt/crop.ppt
new file mode 100644
index ..844a4392a1d4
Binary files /dev/null and b/sd/qa/unit/data/ppt/crop.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 28474a88d4bb..cc2c11b01813 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -74,6 +74,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -186,6 +187,7 @@ public:
 
 bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, 
std::vector& rExpected);
 void testPatternImport();
+void testPptCrop();
 
 CPPUNIT_TEST_SUITE(SdImportTest);
 
@@ -267,6 +269,7 @@ public:
 CPPUNIT_TEST(testTdf116899);
 CPPUNIT_TEST(testTdf77747);
 CPPUNIT_TEST(testTdf116266);
+CPPUNIT_TEST(testPptCrop);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -633,6 +636,24 @@ void SdImportTest::testFdo68594()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testPptCrop()
+{
+sd::DrawDocShellRef xDocShRef
+= 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/crop.ppt"), PPT);
+
+uno::Reference xPropertySet(
+getShapeFromPage(/*nShape=*/1, /*nPage=*/0, xDocShRef));
+text::GraphicCrop aCrop;
+xPropertySet->getPropertyValue("GraphicCrop") >>= aCrop;
+// These were all 0, lazy-loading broke cropping.
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Top);
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Bottom);
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Left);
+CPPUNIT_ASSERT_GREATER(static_cast(0), aCrop.Right);
+
+xDocShRef->DoClose();
+}
+
 void SdImportTest::testFdo72998()
 {
 sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/cshapes.pptx"), 
PPTX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák]

 sc/source/core/data/column.cxx  |2 +-
 sc/source/core/data/column2.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cbe3ae1894800a5fddbd598403be54f9495cc964
Author: Luboš Luňák 
Date:   Fri Jun 8 21:14:19 2018 +0200

properly go to next row when walking mdds container

Since only elements from nOffset up to nEnd are iterated, then the 
difference
is not just nEnd but (nEnd-nOffset).
Without this, ScColumn::HandleRefArrayForParallelism() skips some cells
and e.g. fdo#77750-1 asserts in ScFormulaCell::MaybeInterpret().

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

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ae6813988293..d7c25de498de 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -184,7 +184,7 @@ sc::MatrixEdge ScColumn::GetBlockMatrixEdges( SCROW nRow1, 
SCROW nRow2, sc::Matr
 bOpen = false;  // bottom edge closes
 }
 
-nRow += nEnd;
+nRow += nEnd - nOffset;
 }
 if (bOpen)
 nEdges |= MatrixEdge::Open; // not closed, matrix continues
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 3c856fd161cd..6eb7697d074f 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2841,7 +2841,7 @@ bool ScColumn::HandleRefArrayForParallelism( SCROW nRow1, 
SCROW nRow2 )
 // Loop inside the formula block.
 (*itCell)->MaybeInterpret();
 }
-nRow += nEnd;
+nRow += nEnd - nOffset;
 break;
 }
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek]

 sc/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 081d7b92ce503fa77043332728d056af7ead1604
Author: Zdeněk Crhonek 
Date:   Thu Jun 7 12:25:28 2018 +0200

delete space in string in Calc-Statistics-Descriptive Statistics

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

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index ad3a8fa583dd..470f06161690 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -252,7 +252,7 @@
 #define STRID_CALC_MAX  NC_("STRID_CALC_MAX", 
"Maximum")
 #define STRID_CALC_SUM  NC_("STRID_CALC_SUM", 
"Sum")
 #define STRID_CALC_COUNTNC_("STRID_CALC_COUNT", 
"Count")
-#define STRID_CALC_FIRST_QUARTILE   
NC_("STRID_CALC_FIRST_QUARTILE", "First Quartile ")
+#define STRID_CALC_FIRST_QUARTILE   
NC_("STRID_CALC_FIRST_QUARTILE", "First Quartile")
 #define STRID_CALC_THIRD_QUARTILE   
NC_("STRID_CALC_THIRD_QUARTILE", "Third Quartile")
 /* RandomNumberGeneratorDialog */
 #define STR_UNDO_DISTRIBUTION_TEMPLATE  
NC_("STR_UNDO_DISTRIBUTION_TEMPLATE", "Random ($(DISTRIBUTION))")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits