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

[Stephan Bergmann]

 external/gpgmepp/ExternalProject_gpgmepp.mk   |6 ++
 external/libassuan/ExternalProject_libassuan.mk   |5 +
 external/libgpg-error/ExternalProject_libgpg-error.mk |1 +
 3 files changed, 12 insertions(+)

New commits:
commit 7a9fe4d735207160b1458b4dd480cc089a8b7153
Author: Stephan Bergmann 
Date:   Mon Dec 4 21:54:48 2017 +0100

tdf#114086: Fix macOS paths of external GPG libraries

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

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 806cd6817e3b..73a0ad68e6cd 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -63,7 +63,13 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \
   $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
+  $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
  && $(MAKE) \
+ $(if $(filter MACOSX,$(OS)),\
+ && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+ 
$(EXTERNAL_WORKDIR)/lang/cpp/src/.libs/libgpgmepp.6.dylib \
+ $(EXTERNAL_WORKDIR)/src/.libs/libgpgme.11.dylib \
+   ) \
)
 endif
 
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index f477280c0172..8162d6339411 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -48,7 +48,12 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \
   $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
+  $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
  && $(MAKE) \
+ $(if $(filter MACOSX,$(OS)),\
+ && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+ $(EXTERNAL_WORKDIR)/src/.libs/libassuan.0.dylib \
+   ) \
)
 
 endif
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index efd13f2c02e4..6c437ef8c884 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -44,6 +44,7 @@ $(call 
gb_ExternalProject_get_state_target,libgpg-error,build):
CPPFLAGS=" $(SOLARINC)" \
$(if $(filter MSC,$(COM)),--force_use_syscfg=true) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
+   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
  && $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Let failed Jenkins builds set Verified: -1 in Gerrit?

[David Ostrovsky]

On Fri, 2017-12-01 at 11:27 -0600, Norbert Thiebaud wrote:
> On Fri, Dec 1, 2017 at 1:32 AM, David Ostrovsky 
> wrote:
> > On Thu Nov 30 08:25:40 UTC 2017, Stephan Bergmann wrote:
> > 
> > > Does "(with a help of maintainers)" imply that there are change
> > > owners who could not override a VRFY-1 from Jenkins themselves?
> > 
> > Yes. I believe that "registered users" group members will not be
> > able to remove VRFY-1 vote.
> 
> I do not know of anyway, anyone can remove it using the ui, short of
> impersonating jenkins' user.

RTFM: [1]? Quoting:

"
*Remove Reviewer*

This category permits users to remove other users from the list of
reviewers on a change.
[...]
Project owners and site administrators can always remove any reviewer
(even without having the Remove Reviewer access right assigned).

Users without this access right can only remove themselves from the
reviewer list on a change.
"

Also note, that the ancient/legacy Gerrit version @LibreOffice
has a major design bug/missing feature: [2] there is now way to
remove a vote. Only the whole reviewer, with all votes can
be wiped out. I fixed this years ago: [3]. But unfortunately,
LibreOffice's infra team is unable to allocate resources to
upgrade gerrit. We are almost 4 major releases behind.
(Wikimedia: [3] and OpenStack: [4] projects upgraded to
2.13.9 years ago without any issue).

[1] https://gerrit.libreoffice.org/Documentation/access-control.html#ca
tegory_remove_reviewer
[2] https://bugs.chromium.org/p/gerrit/issues/detail?id=3035
[2] https://gerrit-review.googlesource.com/#/c/gerrit/+/62410/
[3] https://gerrit.wikimedia.org
[4] https://review.openstack.org

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

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

[Noel Grandin]

 compilerplugins/clang/salcall.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 720cc05a76510964b779a30366d48fb854984d06
Author: Noel Grandin 
Date:   Tue Dec 5 09:13:18 2017 +0200

fix compile of salcall plugin

changes from sberg and myself crossed paths in the night

Change-Id: I2606902f84739e552b2aad292e63e7b8e6757965

diff --git a/compilerplugins/clang/salcall.cxx 
b/compilerplugins/clang/salcall.cxx
index 071e3a87841a..08b0230a9d49 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -57,10 +57,8 @@ public:
 
 private:
 void checkForFunctionDecl(Expr const*, bool bCheckOnly = false);
-#if 0
 bool rewrite(SourceLocation);
 bool checkOverlap(SourceRange);
-#endif
 bool isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation* 
pLoc = nullptr);
 
 std::set m_addressOfSet;
@@ -311,7 +309,6 @@ bool SalCall::isSalCallFunction(FunctionDecl const* 
functionDecl, SourceLocation
 return true;
 }
 
-#if 0
 bool SalCall::rewrite(SourceLocation locBegin)
 {
 if (!rewriter)
@@ -353,7 +350,6 @@ bool SalCall::checkOverlap(SourceRange range)
 mvModifiedRanges.emplace_back(p1, p2);
 return true;
 }
-#endif
 
 static loplugin::Plugin::Registration reg("salcall", false);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jens Carl]

 include/test/sheet/xfunctiondescriptions.hxx  |   34 ++
 qadevOOo/Jar_OOoRunner.mk |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv |1 
 qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java |  124 
--
 sc/CppunitTest_sc_functionlistobj.mk  |  105 

 sc/Module_sc.mk   |1 
 sc/qa/extras/scfunctionlistobj.cxx|   93 
+++
 test/Library_subsequenttest.mk|1 
 test/source/sheet/xfunctiondescriptions.cxx   |   75 ++
 9 files changed, 309 insertions(+), 126 deletions(-)

New commits:
commit eff70347190a6642fd62a9e0b20e4366c39fbc7a
Author: Jens Carl 
Date:   Mon Dec 4 05:52:24 2017 +

tdf#45904 Move _XFunctionDescriptions Java test to C++

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

diff --git a/include/test/sheet/xfunctiondescriptions.hxx 
b/include/test/sheet/xfunctiondescriptions.hxx
new file mode 100644
index ..e3b59f30
--- /dev/null
+++ b/include/test/sheet/xfunctiondescriptions.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XFUNCTIONDESCRIPTIONS_HXX
+#define INCLUDED_TEST_SHEET_XFUNCTIONDESCRIPTIONS_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XFunctionDescriptions
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetById();
+
+protected:
+~XFunctionDescriptions() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XFUNCTIONDESCRIPTIONS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 775cdb348625..24dd5cd7f8a9 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -603,7 +603,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing \
 qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XFormulaQuery \
-qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions \
 qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
 qadevOOo/tests/java/ifc/sheet/_XScenario \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv
index a784e0e0f29f..5253ef4dbe6f 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv
@@ -5,5 +5,4 @@
 "ScFunctionListObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
 
"ScFunctionListObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScFunctionListObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScFunctionListObj";"com::sun::star::sheet::XFunctionDescriptions";"getById()"
 
"ScFunctionListObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java 
b/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java
deleted file mode 100644
index 20c4240c35bd..
--- a/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.sheet;
-
-import java.util.Random;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.sheet.XFunctionDescriptions;
-
-/**
-* Testing com.sun.star.sheet.XFunctionDescriptions
-* interface

[Libreoffice-commits] core.git: framework/qa include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_recentfunctionsobj.mk sc/Module_sc.mk sc/qa test/Library_subsequent

[Jens Carl]

 framework/qa/complex/api_internal/api.lst|1 
 include/test/sheet/xrecentfunctions.hxx  |   36 ++
 qadevOOo/Jar_OOoRunner.mk|2 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv |3 
 qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java |  158 
--
 qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java|  112 
---
 sc/CppunitTest_sc_recentfunctionsobj.mk  |  105 
++
 sc/Module_sc.mk  |1 
 sc/qa/extras/screcentfunctionsobj.cxx|   97 
++
 sc/qa/unoapi/sc_6.sce|1 
 test/Library_subsequenttest.mk   |1 
 test/source/sheet/xrecentfunctions.cxx   |   76 

 12 files changed, 316 insertions(+), 277 deletions(-)

New commits:
commit 958d8d316dbda970dc31d5b060f8d317db0516ff
Author: Jens Carl 
Date:   Fri Dec 1 06:22:30 2017 +

tdf#45904 Move _XRecentFunctions Java tests to C++

Fix for #i84761.

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

diff --git a/framework/qa/complex/api_internal/api.lst 
b/framework/qa/complex/api_internal/api.lst
index dae7278c29b0..3f89f85de88d 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -118,7 +118,6 @@ 
job119=sc.ScIndexEnumeration_TableConditionalEntryEnumeration
 job120=sc.ScIndexEnumeration_TextFieldEnumeration
 job122=sc.ScLabelRangesObj
 job123=sc.ScNamedRangeObj
-job124=sc.ScRecentFunctionsObj
 job125=sc.ScScenariosObj
 job126=sc.ScSheetLinkObj
 job127=sc.ScSheetLinksObj
diff --git a/include/test/sheet/xrecentfunctions.hxx 
b/include/test/sheet/xrecentfunctions.hxx
new file mode 100644
index ..8f7ac55a2521
--- /dev/null
+++ b/include/test/sheet/xrecentfunctions.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XRECENTFUNCTIONS_HXX
+#define INCLUDED_TEST_SHEET_XRECENTFUNCTIONS_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XRecentFunctions
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetRecentFunctionIds();
+void testSetRecentFunctionIds();
+void testGetMaxRecentFunctions();
+
+protected:
+~XRecentFunctions() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XRECENTFUNCTIONS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d7476b028d5a..775cdb348625 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -605,7 +605,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XFormulaQuery \
 qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions \
 qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
-qadevOOo/tests/java/ifc/sheet/_XRecentFunctions \
 qadevOOo/tests/java/ifc/sheet/_XScenario \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
 qadevOOo/tests/java/ifc/style/_CharacterProperties \
@@ -1070,7 +1069,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/mod/_sc/ScModelObj \
 qadevOOo/tests/java/mod/_sc/ScNamedRangeObj \
 qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
-qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj \
 qadevOOo/tests/java/mod/_sc/ScScenariosObj \
 qadevOOo/tests/java/mod/_sc/ScShapeObj \
 qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv
deleted file mode 100644
index 67bf2d9a2a5c..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"ScRecentFunctionsObj";"com::sun::star::sheet::XRecentFunctions";"getRecentFunctionIds()"
-"ScRecentFunctionsObj";"com::sun::star::sheet::XRecentFunctions";"setRecentFunctionIds()"
-"ScRecentFunctionsObj";"com::sun::star::sheet::XRecentFunctions";"getMaxRecentFunctions()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java 
b/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java
deleted file mode 100644
index 3ca88e281f68..
--- a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java
+++ /dev/null
@

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

[Szymon Kłos]

 filter/source/msfilter/msdffimp.cxx|   17 ++---
 oox/source/vml/vmlshape.cxx|   15 +--
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |3 ++-
 sw/source/core/edit/edfcol.cxx |   29 -
 4 files changed, 37 insertions(+), 27 deletions(-)

New commits:
commit 17a416759291426999d5b79eceeeb729ca95bc93
Author: Szymon Kłos 
Date:   Thu Nov 30 18:26:11 2017 +0100

tdf#113037 Unify Watermark in DOC & DOCX

* use correct font for calculations

Change-Id: Idd370678c000bf22c460c3323bd55cd827ba7153
Reviewed-on: https://gerrit.libreoffice.org/45698
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 923ca4efe2095998e3da75c372cd7d716db9abb3)
Reviewed-on: https://gerrit.libreoffice.org/45824

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index c2f77d7beb2b..38d7e5ed9e8d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "viscache.hxx"
 
 // SvxItem-Mapping. Is needed to successfully include the SvxItem-Header
@@ -4424,16 +4425,18 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 aSet.Put(makeSdrTextAutoGrowWidthItem(false));
 
 double fRatio = 0;
-OutputDevice* pOut = Application::GetDefaultDevice();
-vcl::Font aFont( pOut->GetFont() );
+VclPtr pDevice = 
VclPtr::Create();
+vcl::Font aFont = pDevice->GetFont();
 aFont.SetFamilyName( aFontName );
-tools::Rectangle aBoundingRect;
-pOut->GetTextBoundRect( aBoundingRect, aObjectText );
+aFont.SetFontSize( Size( 0, 96 ) );
+pDevice->SetFont( aFont );
 
-OUString aObjName = GetPropertyString(DFF_Prop_wzName, 
rSt);
-if ( aBoundingRect.GetWidth() && aObjData.eShapeType 
== mso_sptTextPlainText && aObjName.match( "PowerPlusWaterMarkObject" ) )
+auto nTextWidth = pDevice->GetTextWidth( aObjectText );
+OUString aObjName = GetPropertyString( 
DFF_Prop_wzName, rSt );
+if ( nTextWidth && aObjData.eShapeType == 
mso_sptTextPlainText
+&& aObjName.match( "PowerPlusWaterMarkObject" ) )
 {
-fRatio = (double)aBoundingRect.GetHeight() / 
aBoundingRect.GetWidth();
+fRatio = (double)pDevice->GetTextHeight() / 
nTextWidth;
 sal_Int32 nNewHeight = fRatio * 
aObjData.aBoundRect.getWidth();
 sal_Int32 nPaddingY = 
aObjData.aBoundRect.getHeight() - nNewHeight;
 
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index f9fa58669c35..3a0736d8c53f 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1172,15 +1173,17 @@ sal_Int32 lcl_correctWatermarkRect( awt::Rectangle& 
rShapeRect, const OUString&
 {
 sal_Int32 nPaddingY = 0;
 double fRatio = 0;
-OutputDevice* pOut = Application::GetDefaultDevice();
-vcl::Font aFont( pOut->GetFont() );
+VclPtr pDevice = VclPtr::Create();
+vcl::Font aFont = pDevice->GetFont();
 aFont.SetFamilyName( sFont );
+aFont.SetFontSize( Size( 0, 96 ) );
+pDevice->SetFont( aFont );
 
-tools::Rectangle aBoundingRect;
-pOut->GetTextBoundRect( aBoundingRect, sText );
-if( aBoundingRect.GetWidth() )
+auto nTextWidth = pDevice->GetTextWidth( sText );
+if( nTextWidth )
 {
-fRatio = (double)aBoundingRect.GetHeight() / aBoundingRect.GetWidth();
+fRatio = pDevice->GetTextHeight();
+fRatio /= nTextWidth;
 
 sal_Int32 nNewHeight = fRatio * rShapeRect.Width;
 nPaddingY = rShapeRect.Height - nNewHeight;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 24e57e21c369..9c29fd434dd9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1759,8 +1759,9 @@ DECLARE_OOXMLEXPORT_TEST(testWatermark, "watermark.docx")
 // Rounding errors
 sal_Int32 nDifference = 5198 - nTotalHeight;
 std::stringstream ss;
-ss << "Difference: " << nDifference;
+ss << "Difference: " << nDifference << " TotalHeight: " << nTotalHeight;
 CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference <= 4);
+CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference >= -4);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 61a4c15cc939..a4d4ddb0b00f 100644
--- a/

[Libreoffice-commits] core.git: 2 commits - bin/find-unused-defines.awk bin/find-unused-defines.py bin/find-unused-defines.sh connectivity/inc editeng/inc editeng/source filter/source include/editeng

[Noel Grandin]

 bin/find-unused-defines.awk  |   19 ---
 bin/find-unused-defines.py   |  163 +++
 bin/find-unused-defines.sh   |   30 -
 connectivity/inc/strings.hrc |2 
 editeng/inc/editdoc.hxx  |2 
 editeng/source/editeng/editobj2.hxx  |2 
 editeng/source/editeng/impedit.hxx   |2 
 filter/source/msfilter/msdffimp.cxx  |2 
 filter/source/msfilter/svdfppt.cxx   |4 
 include/editeng/boxitem.hxx  |2 
 include/filter/msfilter/msdffimp.hxx |   10 -
 include/sfx2/strings.hrc |1 
 include/svtools/strings.hrc  |1 
 include/svx/strings.hrc  |   14 --
 package/inc/ZipOutputEntry.hxx   |4 
 package/source/zippackage/ZipPackage.cxx |4 
 sc/inc/globstr.hrc   |6 -
 sc/inc/sc.hrc|   17 ---
 sc/source/filter/excel/xiescher.cxx  |2 
 sd/inc/app.hrc   |2 
 sd/inc/strings.hrc   |4 
 sd/source/filter/ppt/pptin.cxx   |4 
 sw/inc/strings.hrc   |3 
 sw/source/filter/ww8/ww8graf2.cxx|2 
 24 files changed, 183 insertions(+), 119 deletions(-)

New commits:
commit eaf89e477af94bd3977aca17d72dd442c7604e63
Author: Noel Grandin 
Date:   Mon Dec 4 13:52:55 2017 +0200

loplugin:countusersofdefaultparams in editeng..package

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

diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 45cd7f0bf907..760d9a079cc3 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -772,7 +772,7 @@ public:
 voidSetDefTab( sal_uInt16 nTab ){ nDefTab = nTab ? nTab : 
DEFTAB; }
 sal_uInt16  GetDefTab() const   { return nDefTab; }
 
-voidSetVertical( bool bVertical, bool bTopToBottom = true )
+voidSetVertical( bool bVertical, bool bTopToBottom )
 { bIsVertical = bVertical; bIsTopToBottomVert = bVertical 
&& bTopToBottom; }
 boolIsVertical() const  { return bIsVertical; }
 boolIsTopToBottom() const   { return 
bIsTopToBottomVert; }
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index f7c853668bac..f8645a5e93c4 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -215,7 +215,7 @@ public:
 
 boolIsVertical() const;
 boolIsTopToBottom() const;
-voidSetVertical( bool bVert, bool bTopToBottom = true);
+voidSetVertical( bool bVert, bool bTopToBottom);
 
 SvtScriptType   GetScriptType() const { return nScriptType;}
 voidSetScriptType( SvtScriptType nType );
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index d9ec9a17136a..06fec2bc7e6a 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -740,7 +740,7 @@ public:
 const Size& GetPaperSize() const{ return 
aPaperSize; }
 voidSetPaperSize( const Size& rSz ) { 
aPaperSize = rSz; }
 
-voidSetVertical( bool bVertical, bool bTopToBottom = 
true);
+voidSetVertical( bool bVertical, bool bTopToBottom);
 boolIsVertical() const  { return 
GetEditDoc().IsVertical(); }
 boolIsTopToBottom() const   { return 
GetEditDoc().IsTopToBottom(); }
 
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 38d7e5ed9e8d..75ee77299717 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6266,7 +6266,7 @@ bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& 
rpShape,
 if (!bSeeked || rStCtrl.GetError())
 rStCtrl.ResetError();
 else
-rpShape = ImportObj( rStCtrl, &rData, rData.aParentRect, 
rData.aParentRect );
+rpShape = ImportObj( rStCtrl, &rData, rData.aParentRect, 
rData.aParentRect, /*nCalledByGroup*/0, /*pShapeId*/nullptr );
 
 // restore old FilePos of the stream(s)
 rStCtrl.Seek( nOldPosCtrl );
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index aedba3aad7b9..cf0527555ea8 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2819,7 +2819,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, 
const PptSlidePersistEntry*
 // do not follow master 
colorscheme?
 

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

[Jens Carl]

 sc/inc/servuno.hxx  |3 ++-
 sc/source/ui/unoobj/servuno.cxx |   10 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit e978a52fc7321feaf5148daa5b5bde22689aec75
Author: Jens Carl 
Date:   Mon Dec 4 05:50:12 2017 +

Add ServiceProvider "com.sun.star.sheet.FunctionDescriptions"

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

diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index ec15219a8ca0..00c03b5a5320 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -31,7 +31,8 @@ public:
 enum class Type
 {
 SHEET , URLFIELD , PAGEFIELD , PAGESFIELD , DATEFIELD , TIMEFIELD , 
TITLEFIELD , FILEFIELD ,
-SHEETFIELD , CELLSTYLE , PAGESTYLE , AUTOFORMAT , CELLRANGES , 
RECENTFUNCTIONS ,
+SHEETFIELD , CELLSTYLE , PAGESTYLE , AUTOFORMAT , CELLRANGES , 
FUNCTIONDESCRIPTIONS ,
+RECENTFUNCTIONS ,
 //  drawing layer tables
 GRADTAB , HATCHTAB , BITMAPTAB , TRGRADTAB , MARKERTAB , DASHTAB , 
NUMRULES ,
 
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 69cd7273576a..1573bf7f8cb5 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -264,6 +264,7 @@ const ProvNamesId_Type aProvNamesId[] =
 { "com.sun.star.style.PageStyle",   Type::PAGESTYLE },
 { "com.sun.star.sheet.TableAutoFormat", Type::AUTOFORMAT },
 { "com.sun.star.sheet.SheetCellRanges", Type::CELLRANGES },
+{ "com.sun.star.sheet.FunctionDescriptions",
Type::FUNCTIONDESCRIPTIONS },
 { "com.sun.star.sheet.RecentFunctions", Type::RECENTFUNCTIONS 
},
 { "com.sun.star.drawing.GradientTable", Type::GRADTAB },
 { "com.sun.star.drawing.HatchTable",Type::HATCHTAB },
@@ -422,15 +423,18 @@ uno::Reference 
ScServiceProvider::MakeInstance(
 case Type::AUTOFORMAT:
 xRet.set(static_cast(new 
ScAutoFormatObj( SC_AFMTOBJ_INVALID )));
 break;
-case Type::RECENTFUNCTIONS:
-xRet.set(static_cast(new 
ScRecentFunctionsObj()));
-break;
 case Type::CELLRANGES:
 //  isn't inserted, rather filled
 //  -> DocShell must be set, but empty ranges
 if (pDocShell)
 xRet.set(static_cast(new 
ScCellRangesObj( pDocShell, ScRangeList() )));
 break;
+case Type::FUNCTIONDESCRIPTIONS:
+xRet.set(static_cast(new 
ScFunctionListObj()));
+break;
+case Type::RECENTFUNCTIONS:
+xRet.set(static_cast(new 
ScRecentFunctionsObj()));
+break;
 case Type::DOCDEFLTS:
 if (pDocShell)
 xRet.set(static_cast(new 
ScDocDefaultsObj( pDocShell )));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 sw/source/uibase/dbui/maildispatcher.cxx |   28 ++--
 sw/source/uibase/inc/maildispatcher.hxx  |5 +++--
 2 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit 102f257ee007aecaccbf1370a3c89104d87fe43f
Author: Julien Nabet 
Date:   Mon Dec 4 21:57:42 2017 +0100

Replace list by vector for MailDispatcherListenerContainer_t (sw)

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

diff --git a/sw/source/uibase/dbui/maildispatcher.cxx 
b/sw/source/uibase/dbui/maildispatcher.cxx
index 89678bc34529..ae789beb30c5 100644
--- a/sw/source/uibase/dbui/maildispatcher.cxx
+++ b/sw/source/uibase/dbui/maildispatcher.cxx
@@ -27,7 +27,7 @@
 
 using namespace ::com::sun::star;
 
-typedef std::list< ::rtl::Reference > 
MailDispatcherListenerContainer_t;
+typedef std::vector< ::rtl::Reference > 
MailDispatcherListenerContainer_t;
 
 namespace /* private */
 {
@@ -153,8 +153,8 @@ void MailDispatcher::start()
 m_aWakeupCondition.set();
 thread_status_guard.clear();
 
-MailDispatcherListenerContainer_t aClonedListenerList(cloneListener());
-std::for_each( aClonedListenerList.begin(), aClonedListenerList.end(),
+MailDispatcherListenerContainer_t 
aClonedListenerVector(cloneListener());
+std::for_each( aClonedListenerVector.begin(), 
aClonedListenerVector.end(),
GenericEventNotifier(&IMailDispatcherListener::started, 
this) );
 }
 }
@@ -173,8 +173,8 @@ void MailDispatcher::stop()
 m_aWakeupCondition.reset();
 thread_status_guard.clear();
 
-MailDispatcherListenerContainer_t aClonedListenerList(cloneListener());
-std::for_each( aClonedListenerList.begin(), aClonedListenerList.end(),
+MailDispatcherListenerContainer_t 
aClonedListenerVector(cloneListener());
+std::for_each( aClonedListenerVector.begin(), 
aClonedListenerVector.end(),
GenericEventNotifier(&IMailDispatcherListener::stopped, 
this) );
 }
 }
@@ -195,13 +195,13 @@ void 
MailDispatcher::addListener(::rtl::Reference const
 OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shuting down 
already");
 
 ::osl::MutexGuard guard( m_aListenerContainerMutex );
-m_aListenerList.push_back( listener );
+m_aListenerVector.push_back( listener );
 }
 
-std::list< ::rtl::Reference > 
MailDispatcher::cloneListener()
+std::vector< ::rtl::Reference > 
MailDispatcher::cloneListener()
 {
 ::osl::MutexGuard guard( m_aListenerContainerMutex );
-return m_aListenerList;
+return m_aListenerVector;
 }
 
 void 
MailDispatcher::sendMailMessageNotifyListener(uno::Reference
 const & message)
@@ -209,20 +209,20 @@ void 
MailDispatcher::sendMailMessageNotifyListener(uno::ReferencesendMailMessage( message );
-MailDispatcherListenerContainer_t aClonedListenerList(cloneListener());
-std::for_each( aClonedListenerList.begin(), aClonedListenerList.end(),
+MailDispatcherListenerContainer_t 
aClonedListenerVector(cloneListener());
+std::for_each( aClonedListenerVector.begin(), 
aClonedListenerVector.end(),
MailDeliveryNotifier(this, message) );
 }
 catch (const mail::MailException& ex)
 {
-MailDispatcherListenerContainer_t aClonedListenerList(cloneListener());
-std::for_each( aClonedListenerList.begin(), aClonedListenerList.end(),
+MailDispatcherListenerContainer_t 
aClonedListenerVector(cloneListener());
+std::for_each( aClonedListenerVector.begin(), 
aClonedListenerVector.end(),
MailDeliveryErrorNotifier(this, message, ex.Message) );
 }
 catch (const uno::RuntimeException& ex)
 {
-MailDispatcherListenerContainer_t aClonedListenerList(cloneListener());
-std::for_each( aClonedListenerList.begin(), aClonedListenerList.end(),
+MailDispatcherListenerContainer_t 
aClonedListenerVector(cloneListener());
+std::for_each( aClonedListenerVector.begin(), 
aClonedListenerVector.end(),
MailDeliveryErrorNotifier(this, message, ex.Message) );
 }
 }
diff --git a/sw/source/uibase/inc/maildispatcher.hxx 
b/sw/source/uibase/inc/maildispatcher.hxx
index ddcb48e30ce6..af7494b19d87 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -28,6 +28,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -136,13 +137,13 @@ protected:
 virtual void SAL_CALL onTerminated() override;
 
 private:
-std::list< ::rtl::Reference > cloneListener();
+std::vector< ::rtl::Reference > cloneListener();
 void sendMailMessageNotifyListener(css::uno::Reference< 
css::mail::XMailMessage> const & message);
 
 private:
 css::uno::Reference< css::mail::XSmtpService> m_xMailserver;
 std::list< css::uno::Reference< css::mail::XMailMessage > 

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

[Jens Carl]

 sc/inc/servuno.hxx  |2 +-
 sc/source/ui/unoobj/servuno.cxx |5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1c893292849bf699f3c9411461248f67fa35d027
Author: Jens Carl 
Date:   Fri Dec 1 05:57:04 2017 +

Add ServiceProvider "com.sun.star.sheet.RecentFunctions"

Add the type and functionality to make instance of ServiceProvider
"com.sun.star.sheet.RecentFunctions". The ServiceProvider is needed
to test XRecentFunctions UNOAPI and a fix for #i84761.

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

diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index e81463273c49..ec15219a8ca0 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -31,7 +31,7 @@ public:
 enum class Type
 {
 SHEET , URLFIELD , PAGEFIELD , PAGESFIELD , DATEFIELD , TIMEFIELD , 
TITLEFIELD , FILEFIELD ,
-SHEETFIELD , CELLSTYLE , PAGESTYLE , AUTOFORMAT , CELLRANGES ,
+SHEETFIELD , CELLSTYLE , PAGESTYLE , AUTOFORMAT , CELLRANGES , 
RECENTFUNCTIONS ,
 //  drawing layer tables
 GRADTAB , HATCHTAB , BITMAPTAB , TRGRADTAB , MARKERTAB , DASHTAB , 
NUMRULES ,
 
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 0d18e1894f86..69cd7273576a 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -30,6 +30,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -263,6 +264,7 @@ const ProvNamesId_Type aProvNamesId[] =
 { "com.sun.star.style.PageStyle",   Type::PAGESTYLE },
 { "com.sun.star.sheet.TableAutoFormat", Type::AUTOFORMAT },
 { "com.sun.star.sheet.SheetCellRanges", Type::CELLRANGES },
+{ "com.sun.star.sheet.RecentFunctions", Type::RECENTFUNCTIONS 
},
 { "com.sun.star.drawing.GradientTable", Type::GRADTAB },
 { "com.sun.star.drawing.HatchTable",Type::HATCHTAB },
 { "com.sun.star.drawing.BitmapTable",   Type::BITMAPTAB },
@@ -420,6 +422,9 @@ uno::Reference 
ScServiceProvider::MakeInstance(
 case Type::AUTOFORMAT:
 xRet.set(static_cast(new 
ScAutoFormatObj( SC_AFMTOBJ_INVALID )));
 break;
+case Type::RECENTFUNCTIONS:
+xRet.set(static_cast(new 
ScRecentFunctionsObj()));
+break;
 case Type::CELLRANGES:
 //  isn't inserted, rather filled
 //  -> DocShell must be set, but empty ranges
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/Kit.cpp

[Pranav Kant]

 kit/Kit.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 155b3131fc78ca7d7807c67d6781eee884aa20fd
Author: Pranav Kant 
Date:   Tue Dec 5 09:38:04 2017 +0530

Fix build; -Wunused-var

Change-Id: Iba03c7b64188c89d668aac07365fd8c706eeefdd

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 37405142..4e83df9b 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -408,7 +408,7 @@ class PngCache
int width, int height,
int bufferWidth, int bufferHeight,
std::vector& output, 
LibreOfficeKitTileMode mode,
-   TileBinaryHash hash, TileWireId wid, 
TileWireId oldWid)
+   TileBinaryHash hash, TileWireId wid, 
TileWireId /*oldWid*/)
 {
 LOG_DBG("PNG cache with hash " << hash << " missed.");
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_gpgme.h.in xmlsecurity/source

[Thorsten Behrens]

 config_host/config_gpgme.h.in   |7 +++
 xmlsecurity/source/gpg/SEInitializer.cxx|2 ++
 xmlsecurity/source/gpg/SecurityEnvironment.cxx  |2 ++
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |2 ++
 4 files changed, 13 insertions(+)

New commits:
commit 5daa364922ba75442e2aa834095e9bef16d141d9
Author: Thorsten Behrens 
Date:   Mon Dec 4 16:17:18 2017 +0100

gpg4libre: add gpgme config header where gpgme.h is included

Also pull in config_lgpl.h in that case.

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

diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in
index 86f3f07931f6..aa894a9f2d97 100644
--- a/config_host/config_gpgme.h.in
+++ b/config_host/config_gpgme.h.in
@@ -10,10 +10,17 @@
 /* Configuration for gpgme++.
  */
 
+#ifndef CONFIG_GPGME_H
+#define CONFIG_GPGME_H
+
+#include "config_lgpl.h"
+
 // Defined if gpgme support is available
 #define GPGME_HAVE_GPGME 0
 
 // Defined if gpgme supports exporting minimal key.
 #define GPGME_CAN_EXPORT_MINIMAL_KEY 0
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx 
b/xmlsecurity/source/gpg/SEInitializer.cxx
index 59e45d1bd2ea..667e9ce355c7 100644
--- a/xmlsecurity/source/gpg/SEInitializer.cxx
+++ b/xmlsecurity/source/gpg/SEInitializer.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
 #include 
 #include "SecurityEnvironment.hxx"
 #include "XMLSecurityContext.hxx"
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx 
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 2bbcf8ddf79b..152e8c600019 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
 #include "SecurityEnvironment.hxx"
 #include "CertificateImpl.hxx"
 
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx 
b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 40ff550aea9b..4daa74b103c4 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 sw/source/core/text/xmldump.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit b19aa21f0efa2aa72c144bacae801aeae59300c0
Author: Tamás Zolnai 
Date:   Mon Dec 4 20:12:13 2017 +0100

Dump page valid flags in dumpAsXml

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

diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 02b47ff1ebc7..794458141e01 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -304,6 +305,18 @@ void SwFrame::dumpAsXml( xmlTextWriterPtr writer ) const
 xmlTextWriterEndElement(writer);
 }
 
+if (IsPageFrame())
+{
+const SwPageFrame* pPageFrame = static_cast(this);
+xmlTextWriterStartElement(writer, BAD_CAST("page_status"));
+xmlTextWriterWriteAttribute(writer, BAD_CAST("ValidFlyLayout"), 
BAD_CAST(OString::boolean(!pPageFrame->IsInvalidFlyLayout()).getStr()));
+xmlTextWriterWriteAttribute(writer, BAD_CAST("ValidFlyContent"), 
BAD_CAST(OString::boolean(!pPageFrame->IsInvalidFlyContent()).getStr()));
+xmlTextWriterWriteAttribute(writer, BAD_CAST("ValidFlyInCnt"), 
BAD_CAST(OString::boolean(!pPageFrame->IsInvalidFlyInCnt()).getStr()));
+xmlTextWriterWriteAttribute(writer, BAD_CAST("ValidLayout"), 
BAD_CAST(OString::boolean(!pPageFrame->IsInvalidLayout()).getStr()));
+xmlTextWriterWriteAttribute(writer, BAD_CAST("ValidContent"), 
BAD_CAST(OString::boolean(!pPageFrame->IsInvalidContent()).getStr()));
+xmlTextWriterEndElement(writer);
+}
+
 xmlTextWriterStartElement( writer, BAD_CAST( "infos" ) );
 dumpInfosAsXml( writer );
 xmlTextWriterEndElement( writer );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f2d4510cb98d1eefcba85db6edb7cf754b4519d
Author: Eike Rathke 
Date:   Mon Dec 4 20:17:22 2017 +0100

assert(mnRangeOpPosInSymbol < MAXSTRLEN)

We should survive that now..

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

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 8f74f42276a4..909bf0afe1c7 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3268,8 +3268,9 @@ bool ScCompiler::IsReference( const OUString& rName, 
const OUString* pErrRef )
 return true;
 // Now try with a symbol up to the range operator, rewind source
 // position.
-if (mnRangeOpPosInSymbol == MAXSTRLEN-1)
-return false;
+assert(mnRangeOpPosInSymbol < MAXSTRLEN);   // We should have caught 
the maldoers.
+if (mnRangeOpPosInSymbol >= MAXSTRLEN)  // TODO: this check and 
return
+return false;   // can be removed when 
sure.
 sal_Int32 nLen = mnRangeOpPosInSymbol;
 while (cSymbol[++nLen])
 ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

FOSDEM DevRoom Deadline

[Italo Vignoli]

We have decided to postpone the deadline to Wednesday, because of the
issues some people have experienced today with Pentabarf.

I will send the message to the developer's mailing list, but please
spread the news to your channels.

-- 
Italo Vignoli - it...@italovignoli.com
mobile/signal +39.348.5653829 - skype italovignoli
hangout/jabber italo.vign...@gmail.com
GPG Key ID - 0xAAB8D5C0
DB75 1534 3FD0 EA5F 56B5 FDA6 DE82 934C AAB8 D5C0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About Textbody class

[Eike Rathke]

Hi serdar,

On Tuesday, 2017-11-28 11:41:58 +0200, serdar tunc wrote:

> I cant get emails from mail list i subscribed 2 times,i send licence mail
> and still i cant get mails.

Make sure that after subscribing to the mailing list you reply to the
subscription mail that is sent to you. Check your spam folder if it
doesn't appear after a few minutes after subscribing.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - configure.ac external/gpgmepp external/libassuan external/libgpg-error

[Thorsten Behrens]

 configure.ac  |6 ++
 external/gpgmepp/UnpackedTarball_gpgmepp.mk   |1 +
 external/gpgmepp/w32-build-fixes-2.patch  |   12 
 external/libassuan/UnpackedTarball_libassuan.mk   |1 +
 external/libassuan/w32-build-fixes-2.patch|   12 
 external/libgpg-error/UnpackedTarball_libgpg-error.mk |1 +
 external/libgpg-error/w32-build-fixes-4.patch |   13 +
 7 files changed, 42 insertions(+), 4 deletions(-)

New commits:
commit e045e971a69f75d36069ed005d014ae3a682d944
Author: Thorsten Behrens 
Date:   Tue Nov 28 16:02:43 2017 +0100

Remove arch-pinning for gpgme on Windows again

With e0d94237878d4949573fc9b6d97eea3146cada6d the dependency on gcc
is gone, so we should be able to build on all cygwin flavours again
for all Windows arch targets.

Well almost - we still have windres on cygwin32 only able to produce
pe-i386 targets, so let's exclude the case cyg32 and WIN64 for the
moment.

Change-Id: Ibe7f967585995586985177d4c36cc33d9850d9de
Reviewed-on: https://gerrit.libreoffice.org/45422
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 8444bf1d7314f7ff2ea4d17da19b4d276c4086ae)
Reviewed-on: https://gerrit.libreoffice.org/45768
Reviewed-by: Katarina Behrens 

diff --git a/configure.ac b/configure.ac
index 20a730cb8678..d0caf9491ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10138,11 +10138,9 @@ fi
 AC_SUBST(ENABLE_PDFIUM)
 
 SYSTEM_GPGMEPP=
-# need matching cygwin arch for building gpgme sadly, for the while
 if test "$_os" = "Linux" -o "$_os" = "Darwin" \
-   -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = 
"x86" \) \
-   -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" -a "$WINDOWS_SDK_ARCH" = 
"x64" \) ; then
-
+   -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \
+   -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = 
"x86" \) ; then
 dnl ===
 dnl Check for system gpgme
 dnl ===
commit 6fabdde7c7748ad55140f814c2eee74ccc2a0821
Author: Thorsten Behrens 
Date:   Wed Nov 29 04:48:26 2017 +0100

gpg4libre: remove silly afxres.h / MFC dependency from gpgme

Change-Id: Ibc74b89aca6a26952c27cd313f7c8203a507641d
Reviewed-on: https://gerrit.libreoffice.org/45458
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 4c7289c3d769217045e3c4f3fc3a3ab5108600f7)
Reviewed-on: https://gerrit.libreoffice.org/45766
Reviewed-by: Katarina Behrens 

diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk 
b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index 8f69b8d2af96..bcddcca1a218 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -22,5 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
 $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-win32-macro.patch.1) \
 $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \
 $(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \
+external/gpgmepp/w32-build-fixes-2.patch \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgmepp/w32-build-fixes-2.patch 
b/external/gpgmepp/w32-build-fixes-2.patch
new file mode 100644
index ..062c14409cbc
--- /dev/null
+++ b/external/gpgmepp/w32-build-fixes-2.patch
@@ -0,0 +1,12 @@
+Avoid MFC dependency - can go with very basic includes instead
+
+--- src/versioninfo.rc.in~ 2017-03-28 15:12:30.0 +0200
 src/versioninfo.rc.in  2017-11-29 04:22:18.607421900 +0100
+@@ -14,7 +14,6 @@
+ 
+ #line __LINE__ "versioninfo.rc.in"
+ 
+-#include 
+ 
+ 
+ VS_VERSION_INFO VERSIONINFO
diff --git a/external/libassuan/UnpackedTarball_libassuan.mk 
b/external/libassuan/UnpackedTarball_libassuan.mk
index f23608eb6a6c..b969fecc6097 100644
--- a/external/libassuan/UnpackedTarball_libassuan.mk
+++ b/external/libassuan/UnpackedTarball_libassuan.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
 external/libassuan/find-libgpg-error.patch \
 external/libassuan/fix-autoconf-macros.patch \
 $(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
+external/libassuan/w32-build-fixes-2.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libassuan/w32-build-fixes-2.patch 
b/external/libassuan/w32-build-fixes-2.patch
new file mode 100644
index ..918405d15193
--- /dev/null
+++ b/external/libassuan/w32-build-fixes-2.patch
@@ -0,0 +1,12 @@
+Avoid MFC dependency - can go with very basic includes instead
+
+--- src/versioninfo.rc.in~ 2015-10-16 15:40:36.0 +0200
 src/versioninfo.rc.in  2017-11-29 04:19:57.870117200 +0100
+@@ -14,7 +14,6 @@
+ 
+ #line __LINE__ "ve

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/gpgmepp external/libassuan external/libgpg-error

[Thorsten Behrens]

 external/gpgmepp/ExternalProject_gpgmepp.mk   |8 +---
 external/libassuan/ExternalProject_libassuan.mk   |   11 ++-
 external/libgpg-error/ExternalProject_libgpg-error.mk |   12 +---
 3 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 29228e83df009cf76ac819ed024527be1092f065
Author: Thorsten Behrens 
Date:   Mon Dec 4 00:12:10 2017 +0100

gpg4libre: pass windows arch down to windres

At least for cygwin64 windres, a wider number of cross-building
targets are supported. Utilize that for getting suitable versionrc
arch built, obviating the need to disable x86_64 on cyg32 and vice
versa.

Change-Id: I9770a3c1d6602a9747b5b3caa4961d66c471f4e4
Reviewed-on: https://gerrit.libreoffice.org/45763
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 293df86b2ec38727f3b966b2c272ab4b05b227b7)
Reviewed-on: https://gerrit.libreoffice.org/45767
Reviewed-by: Katarina Behrens 

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 7aaa42a12b40..806cd6817e3b 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_ExternalProject_use_externals,gpgmepp,\
 ))
 
 ifeq ($(COM),MSC)
+gb_ExternalProject_gpgmepp_host := $(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
+gb_ExternalProject_gpgmepp_target := $(if $(filter 
INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call 
gb_Executable_get_target,cpp)
$(call gb_ExternalProject_run,build,\
autoreconf \
@@ -37,10 +39,10 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): 
$(call gb_Executable_

$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
$(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
-  --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+  --host=$(gb_ExternalProject_libgpg-error_host) \
+  RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
   MAKE=$(MAKE) \
-  RC='windres --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) 
-I$(ATL_INCLUDE)'\' \
- && $(MAKE) \
+   && $(MAKE) \
)
 else
 $(call gb_ExternalProject_get_state_target,gpgmepp,build):
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index fdadb2851042..f477280c0172 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -20,22 +20,23 @@ $(eval $(call gb_ExternalProject_use_externals,libassuan,\
 ))
 
 ifeq ($(COM),MSC)
+gb_ExternalProject_libassuan_host := $(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
+gb_ExternalProject_libassuan_target := $(if $(filter 
INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,libassuan,build): $(call 
gb_Executable_get_target,cpp)
$(call gb_ExternalProject_run,build,\
-   autoreconf \
-   && ./configure \
+ autoreconf \
+ && ./configure \
--enable-static \
--disable-shared \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(CXXFLAGS)" \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
-   --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+   --host=$(gb_ExternalProject_libgpg-error_host) \
+   RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
MAKE=$(MAKE) \
-   RC='windres --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) 
-I$(ATL_INCLUDE)'\' \
  && $(MAKE) \
)
-
 else
 $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_ExternalProject_run,build,\
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index ecb96f00b496..efd13f2c02e4 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -16,6 +16,8 @@ $(eval $(call 
gb_ExternalProject_register_targets,libgpg-error,\
 $(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build)

Re: tests sc_array_functions_test fail due to floating point precision

[Eike Rathke]

Hi Milton,

On Saturday, 2017-12-02 02:47:03 -0500, Milton Vandersloot wrote:

> The issue seems to be (again) floating point precision. Indeed, I've compiled 
> LibreOffice with FMA (fused multiply-add) instructions, if I disable them, 
> i.e. passing -ffp-contract=off to GCC, then the tests succeed. Note that FMA 
> has slightly different floating point precision than ordinary plus and mult 
> [0, 1].

From what I understood by browsing shortly gcc enables this by default
for -std=gnu* and it can be unset by

#pragma STDC FP_CONTRACT OFF

https://stackoverflow.com/questions/15933100/how-to-use-fused-multiply-add-fma-instructions-with-sse-avx#15933677

Could you try if adding the pragma to include/sal/config.h helps?

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - i18nlangtag/source include/i18nlangtag svtools/inc

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a76e28636a4f3c293b9e10135ca9100885289136
Author: Eike Rathke 
Date:   Mon Dec 4 20:04:27 2017 +0100

Resolves: tdf#114201 Add Plautdietsch [pdt-CA] to language listbox

(cherry picked from commit 01c7c4e1cb074f88440336068285495743bd6b37)

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

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c2bdbf567b2a..af2f48cb3151 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -669,6 +669,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_XIBE,  "sjo", "CN", k0 },
 { LANGUAGE_USER_KITUBA_DRCONGO,"ktu", "CD", k0 },
 { LANGUAGE_USER_FON,   "fon", "BJ", k0 },
+{ LANGUAGE_USER_PLAUTDIETSCH,  "pdt", "CA", k0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 2c90af7110fe..74d404e3a91b 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -735,6 +735,7 @@ namespace o3tl
 #define LANGUAGE_USER_XIBE  LanguageType(0x069B)
 #define LANGUAGE_USER_KITUBA_DRCONGOLanguageType(0x069C)
 #define LANGUAGE_USER_FON   LanguageType(0x069D)
+#define LANGUAGE_USER_PLAUTDIETSCH  LanguageType(0x069E)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 54e356feb1d1..b23d30e6fb8a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -405,7 +405,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Manchu") , LANGUAGE_USER_MANCHU },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xibe") , LANGUAGE_USER_XIBE },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the 
Congo)"), LANGUAGE_USER_KITUBA_DRCONGO },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Plautdietsch"), 
LANGUAGE_USER_PLAUTDIETSCH }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - kit/Kit.cpp tools/map.cpp

[Michael Meeks]

 kit/Kit.cpp   |4 
 tools/map.cpp |   47 ---
 2 files changed, 24 insertions(+), 27 deletions(-)

New commits:
commit e11794da2551639e52d9f94867f6f35bae40a6c4
Author: Michael Meeks 
Date:   Mon Dec 4 16:11:03 2017 +

Disable delta generator for now.

Change-Id: I7aee52b5dc0dc0b09868170e50afc8ccb0e2f7b6

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index ac06a8d4..37405142 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -411,10 +411,14 @@ class PngCache
TileBinaryHash hash, TileWireId wid, 
TileWireId oldWid)
 {
 LOG_DBG("PNG cache with hash " << hash << " missed.");
+/*
+ *Disable for now - pushed in error.
+ *
 if (_deltaGen.createDelta(pixmap, startX, startY, width, height,
   bufferWidth, bufferHeight,
   output, wid, oldWid))
 return true;
+*/
 
 LOG_DBG("Encode a new png for this tile.");
 CacheEntry newEntry(bufferWidth * bufferHeight * 1, wid);
commit 73327ce2ecad60c11ce04853fe6e183617143c25
Author: Michael Meeks 
Date:   Fri Dec 1 17:58:08 2017 +

loolmap: more cleanup print more metrics.

Change-Id: Ie6d8a5d8960a317ea22d0628e6250330bbc7

diff --git a/tools/map.cpp b/tools/map.cpp
index a95455c1..413576d7 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -129,14 +129,6 @@ static void dumpDiff(const std::string &pageStr, const 
std::string &parentStr)
 }
 }
 
-static bool pageIsZero(const std::vector &page)
-{
-for (char c : page)
-if (c != 0)
-return false;
-return true;
-}
-
 static void dumpPages(unsigned proc_id, unsigned parent_id, const char *type, 
const std::vector &pages)
 {
 char path_proc[PATH_SIZE];
@@ -154,7 +146,8 @@ static void dumpPages(unsigned proc_id, unsigned parent_id, 
const char *type, co
 printf ("\nUn-shared data dump\n");
 
 size_t cnt = 0;
-long long int bytesTouched = 0;
+addr_t sameButUnshared = 0;
+addr_t bytesTouched = 0;
 for (auto page : pages)
 {
 std::vector pageData, parentData;
@@ -177,22 +170,32 @@ static void dumpPages(unsigned proc_id, unsigned 
parent_id, const char *type, co
 std::stringstream parentStr;
 Util::dumpHex(parentStr, "", "", parentData, false);
 
-bool matchesParent = pageStr.str() == parentStr.str();
+int touched = 0;
 const char *style;
 if (parentData.size() > 0)
 {
-if (pageIsZero(parentData))
+bool bZeroParent = true;
+for (size_t i = 0; i < pageData.size(); ++i)
 {
-style = "was shared with zeros";
-parentData.resize(0);
+if (pageData[i] != parentData[i])
+touched++;
+if (parentData[i] != 0)
+bZeroParent = false;
+}
+if (bZeroParent)
+{
+style = "was shared with parent zeros";
+parentData.resize(0); // diff un-interesting.
 }
-if (matchesParent)
+if (touched == 0)
 {
 if (DumpAll)
 style = "dump unchanged";
 else
+{
 style = "un-shared but matches parent";
-parentData.resize(0);
+sameButUnshared++;
+}
 }
 else
 style = "was shared";
@@ -200,16 +203,6 @@ static void dumpPages(unsigned proc_id, unsigned 
parent_id, const char *type, co
 else
 style = "unique";
 
-int touched = 0;
-if (parentData.size() > 0)
-{
-for (size_t i = 0; i < pageData.size(); ++i)
-{
-if (pageData[i] != parentData[i])
-touched++;
-}
-}
-
 if (DumpHex)
 {
 printf ("%s page: 0x%.8llx (%d/%d) - touched: %d - %s\n",
@@ -228,7 +221,8 @@ static void dumpPages(unsigned proc_id, unsigned parent_id, 
const char *type, co
 close (mem_fd);
 close (parent_fd);
 
-printf ("\tdirtied bytes touched %5lld per page %.2f\n\n",
+printf ("\tsame but unshared %6lld (%lldkB)\n", sameButUnshared, 
sameButUnshared * 4);
+printf ("\tdirtied bytes touched %6lld per page %.2f\n\n",
 bytesTouched, (double)bytesTouched / pages.size());
 }
 
@@ -423,7 +417,6 @@ static unsigned getParent(int proc_id)
 path_proc, buffer);
 exit (1);
 }
-fprintf(stderr,"parent of %u is %u\n", proc_id, ppid);
 
 return ppid;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: jenkins for master: successful linux builds now prerequisite for triggering mac and win

[Eike Rathke]

Hi Christian,

On Monday, 2017-12-04 13:30:15 +0100, Christian Lohmaier wrote:

> Since the jenkins linux-clang bot now has code-style checks in place,
> it's a waste to wait for the slow windows and mac build results in
> case the build fails because of a code-style issue.
> [...]
> Another change re jenkins was that new patch revisions now
> automatically cancel/abort previous patchsets. So if you're interested
> in the build-result of a currently-building patchset, you need to wait
> with your rebase/changes, as the build would otherwise be aborted.

Thanks a lot!


> verification. Specifically the windows builders did break with a
> failing testArabic test in vcl.
> Turns out that this was due to a longer pathname (3 characters more
> than the plain gerrit one) - why a font-metric check would fail due to
> path name length is the real question,

Just guessing, but maybe a font could not be loaded or otherwise results
in a different font due to some cryptic path length limit?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[Stephan Bergmann]

 sal/osl/unx/thread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa0b08980aba7bc82ab75151129b0c643cde7dfa
Author: Stephan Bergmann 
Date:   Mon Dec 4 22:33:35 2017 +0100

Condition for definition of LastIdent must match condition for its use

Change-Id: Iccc58d396d8c80a717e9d33ed8d872aadea08afa
Reviewed-on: https://gerrit.libreoffice.org/45829
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 639e8b6cec26..affbc5c3fb9c 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -567,7 +567,7 @@ static int HashSize = SAL_N_ELEMENTS(HashTable);
 
 static pthread_mutex_t HashLock = PTHREAD_MUTEX_INITIALIZER;
 
-#if ! (defined LINUX || defined MACOSX || defined IOS)
+#if ! ((defined LINUX && !defined __FreeBSD_kernel__) || defined MACOSX || 
defined IOS)
 static oslThreadIdentifier LastIdent = 0;
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ahmed GHANMI]

 sw/source/uibase/app/docsh2.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 4b45c95556d19cf51aab3658e533a2aeaa023d10
Author: Ahmed GHANMI 
Date:   Mon Dec 4 16:39:34 2017 +0100

tdf#113876: fix hardcoded compare strings

Checks of listbox values are hardcoded in english so we replaced
the hardcoded compare with "SwResId" function which give us
the string in correspondant language and in addition with
"startsWith" function we check if the string is in the listbox's
item of user choice.

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

diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 6fbae6d556ae..97982108de3a 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1030,15 +1030,16 @@ void SwDocShell::Execute(SfxRequest& rReq)
 OUString sTmpl;
 aTemplateValue >>= sTmpl;
 
-sal_Int32 nColonPos = sTmpl.indexOf( ':' );
-OUString sPrefix = sTmpl.copy( 0, nColonPos );
-if ( sPrefix == "Style" )
+OUString aStyle(SwResId(STR_FDLG_STYLE));
+OUString aOutline(SwResId(STR_FDLG_OUTLINE_LEVEL));
+
+if ( sTmpl.startsWith(aStyle) )
 {
-aTemplateName = sTmpl.copy( 7 );   //get 
string behind "Style: "
+aTemplateName = sTmpl.copy( aStyle.getLength() 
);   //get string behind "Style: "
 }
-else if ( sPrefix == "Outline" )
+else if ( sTmpl.startsWith(aOutline) )
 {
-nTemplateOutlineLevel = ( sTmpl.copy( 15 
)).toInt32(); //get string behind "Outline: Leve  ";
+nTemplateOutlineLevel = 
sTmpl.copy(aOutline.getLength()).toInt32(); //get string behind "Outline: Level 
 ";
 bCreateByOutlineLevel = true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 4 commits - bundled/include common/Message.hpp kit/ChildSession.cpp kit/ChildSession.hpp kit/Kit.cpp kit/KitHelper.hpp loleaflet/src tools/KitClient.cpp wsd/ClientSes

[Pranav Kant]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h  |   38 --
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx|   77 +
 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   27 -
 bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |1 
 common/Message.hpp   |3 
 kit/ChildSession.cpp |  145 +-
 kit/ChildSession.hpp |6 
 kit/Kit.cpp  |2 
 kit/KitHelper.hpp|7 
 loleaflet/src/control/Control.LokDialog.js   |  273 +--
 loleaflet/src/core/Socket.js |2 
 loleaflet/src/layer/tile/TileLayer.js|   42 --
 tools/KitClient.cpp  |3 
 wsd/ClientSession.cpp|9 
 14 files changed, 262 insertions(+), 373 deletions(-)

New commits:
commit a5d4c3bb90df48330c32142e8c235d23be089802
Author: Pranav Kant 
Date:   Tue Dec 5 02:39:26 2017 +0530

lokdialog: Set view id before posting to LOK dialog api

Change-Id: I53925a71718f1acfc2337f86f97f4f5526546383

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 4a804aac..326dabcd 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -810,11 +810,9 @@ bool ChildSession::keyEvent(const char* /*buffer*/, int 
/*length*/,
 }
 
 std::unique_lock lock(_docManager.getDocumentMutex());
+getLOKitDocument()->setView(_viewId);
 if (target == LokEventTargetEnum::Document)
-{
-getLOKitDocument()->setView(_viewId);
 getLOKitDocument()->postKeyEvent(type, charcode, keycode);
-}
 else if (winId != 0)
 getLOKitDocument()->postWindowKeyEvent(winId, type, charcode, keycode);
 
@@ -876,10 +874,10 @@ bool ChildSession::mouseEvent(const char* /*buffer*/, int 
/*length*/,
 
 std::unique_lock lock(_docManager.getDocumentMutex());
 
+getLOKitDocument()->setView(_viewId);
 switch (target)
 {
 case LokEventTargetEnum::Document:
-getLOKitDocument()->setView(_viewId);
 getLOKitDocument()->postMouseEvent(type, x, y, count, buttons, 
modifier);
 break;
 case LokEventTargetEnum::Window:
@@ -1026,6 +1024,8 @@ bool ChildSession::sendWindowCommand(const char* 
/*buffer*/, int /*length*/, con
 reader >> winId;
 }
 
+getLOKitDocument()->setView(_viewId);
+
 if (tokens.size() > 2 && tokens[2] == "close")
 getLOKitDocument()->postWindow(winId, LOK_WINDOW_CLOSE);
 
commit 53fc694a3c413684179c4cf1026b2c6d3e8959ef
Author: Pranav Kant 
Date:   Tue Dec 5 00:41:02 2017 +0530

lokdialog: Use dialog close LOK API when user clicks 'X'

Change-Id: I3a90eb8b83688eed7db8228763633e31f82e58d1

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 7de22985..4a804aac 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -13,6 +13,9 @@
 
 #include 
 
+#define LOK_USE_UNSTABLE_API
+#include 
+
 #include 
 #include 
 #include 
@@ -233,7 +236,8 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
tokens[0] == "resetselection" ||
tokens[0] == "saveas" ||
tokens[0] == "useractive" ||
-   tokens[0] == "userinactive");
+   tokens[0] == "userinactive" ||
+   tokens[0] == "windowcommand");
 
 if (tokens[0] == "clientzoom")
 {
@@ -311,6 +315,10 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 {
 setIsActive(false);
 }
+else if (tokens[0] == "windowcommand")
+{
+sendWindowCommand(buffer, length, tokens);
+}
 else
 {
 assert(false && "Unknown command token.");
@@ -1005,6 +1013,25 @@ bool ChildSession::renderWindow(const char* /*buffer*/, 
int /*length*/, const st
 return true;
 }
 
+
+bool ChildSession::sendWindowCommand(const char* /*buffer*/, int /*length*/, 
const std::vector& tokens)
+{
+std::unique_lock lock(_docManager.getDocumentMutex());
+getLOKitDocument()->setView(_viewId);
+
+unsigned winId = 0;
+if (tokens.size() > 1)
+{
+std::istringstream reader(tokens[1]);
+reader >> winId;
+}
+
+if (tokens.size() > 2 && tokens[2] == "close")
+getLOKitDocument()->postWindow(winId, LOK_WINDOW_CLOSE);
+
+return true;
+}
+
 bool ChildSession::selectGraphic(const char* /*buffer*/, int /*length*/, const 
std::vector& tokens)
 {
 int type, x, y;
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 47c79421..c0ca190d 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -198,6 +198,7 @@ private:
 bool saveAs(const char* buffer, int length, const 
std::vector& tokens);
 bool setClientPart(const char* buffer, int length, const 
std::vector& tokens);
 bool setPage(const char* buffer, int length, const 
std::vector

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

[Caolán McNamara]

 test/source/vclbootstrapprotector.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 6a49f78b36243ba1ed1dbf2f9bd893c7a660a983
Author: Caolán McNamara 
Date:   Sun Dec 3 21:00:37 2017 +

silence coverity#1421122 Uncaught exception

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

diff --git a/test/source/vclbootstrapprotector.cxx 
b/test/source/vclbootstrapprotector.cxx
index 786e3774be83..cf6341737919 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -28,9 +28,18 @@ public:
 
 private:
 virtual ~Protector() override {
-DeInitVCL();
-// for the 6 tests that use it
-comphelper::ThreadPool::getSharedOptimalPool().shutdown();
+#if defined(__COVERITY__)
+try {
+#endif
+DeInitVCL();
+// for the 6 tests that use it
+comphelper::ThreadPool::getSharedOptimalPool().shutdown();
+#if defined(__COVERITY__)
+} catch (const std::exception& e) {
+SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+std::terminate();
+}
+#endif
 }
 
 virtual bool protect(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/inc/shellio.hxx   |2 +
 sw/source/filter/html/swhtml.cxx |   40 +++
 sw/source/filter/ww8/ww8par.cxx  |   15 --
 vcl/workben/fftester.cxx |   14 +
 4 files changed, 65 insertions(+), 6 deletions(-)

New commits:
commit fc26ea9e0e8cd4873ddd1f5736d7fed071f5e3e2
Author: Caolán McNamara 
Date:   Mon Dec 4 17:01:09 2017 +

add html to fftester

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

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 3509685638f7..abe6d48d209f 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -179,6 +179,7 @@ protected:
 
 extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(SvStream &rStream, 
const OUString &rFltName);
 extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream &rStream);
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHTML(SvStream 
&rStream);
 SAL_DLLPUBLIC_EXPORT void FlushFontCache();
 
 class SW_DLLPUBLIC Reader
@@ -186,6 +187,7 @@ class SW_DLLPUBLIC Reader
 friend class SwReader;
 friend bool TestImportDOC(SvStream &rStream, const OUString &rFltName);
 friend bool TestImportRTF(SvStream &rStream);
+friend bool TestImportHTML(SvStream &rStream);
 rtl::Reference mxTemplate;
 OUString aTemplateNm;
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7a6d70b612d1..d5eb72ed2450 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -107,6 +107,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -5499,4 +5500,43 @@ void SwHTMLParser::AddMetaUserDefined( OUString const & 
i_rMetaName )
 }
 }
 
+namespace
+{
+class FontCacheGuard
+{
+public:
+~FontCacheGuard()
+{
+FlushFontCache();
+}
+};
+}
+
+bool SAL_CALL TestImportHTML(SvStream &rStream)
+{
+FontCacheGuard aFontCacheGuard;
+std::unique_ptr xReader(new HTMLReader);
+xReader->pStrm = &rStream;
+
+SwGlobals::ensure();
+
+SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL));
+xDocSh->DoInitNew();
+SwDoc *pD =  static_cast((&xDocSh))->GetDoc();
+
+SwNodeIndex aIdx(
+*pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
+if( !aIdx.GetNode().IsTextNode() )
+{
+pD->GetNodes().GoNext( &aIdx );
+}
+SwPaM aPaM( aIdx );
+aPaM.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(), 0);
+pD->SetInReading(true);
+bool bRet = xReader->Read(*pD, OUString(), aPaM, OUString()) == 
ERRCODE_NONE;
+pD->SetInReading(false);
+
+return bRet;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e448087db0f3..4e7b346a90fd 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6213,14 +6213,17 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL 
ImportDOC()
 return new WW8Reader;
 }
 
-class FontCacheGuard
+namespace
 {
-public:
-~FontCacheGuard()
+class FontCacheGuard
 {
-FlushFontCache();
-}
-};
+public:
+~FontCacheGuard()
+{
+FlushFontCache();
+}
+};
+}
 
 bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName)
 {
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index db9b8d0f7ca6..3dd2fdb014f6 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -375,6 +375,20 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 SvFileStream aFileStream(out, StreamMode::READ);
 ret = (int) (*pfnImport)(aFileStream);
 }
+else if (strcmp(argv[2], "html") == 0)
+{
+static FFilterCall pfnImport(nullptr);
+if (!pfnImport)
+{
+osl::Module aLibrary;
+aLibrary.loadRelative(&thisModule, "libswlo.so", 
SAL_LOADMODULE_LAZY);
+pfnImport = reinterpret_cast(
+aLibrary.getFunctionSymbol("TestImportHTML"));
+aLibrary.release();
+}
+SvFileStream aFileStream(out, StreamMode::READ);
+ret = (int) (*pfnImport)(aFileStream);
+}
 else if (strcmp(argv[2], "fodt") == 0)
 {
 static FFilterCall pfnImport(nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos]

 sw/qa/extras/uiwriter/uiwriter.cxx |4 
 sw/source/core/edit/edfcol.cxx |8 
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 58784b89c22c6d63fff18fea0aa6636a1370044c
Author: Szymon Kłos 
Date:   Mon Dec 4 12:45:11 2017 +0100

tdf#113037 Watermark centered in DOC

Change-Id: I3b0383ef85f82c3076331026a49c0005f920ea61
Reviewed-on: https://gerrit.libreoffice.org/45804
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 69ff0a74e643..9641350c13e0 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1028,6 +1028,10 @@ void SwUiWriterTest::testWatermarkPosition()
 
 // Check if Watermark is inside a page
 CPPUNIT_ASSERT_MESSAGE(aMessage.str(), nPageHeight >= rRect.Bottom());
+
+// Check if Watermark is centered
+CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER, 
getProperty(xShape, "HoriOrient"));
+CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, 
getProperty(xShape, "VertOrient"));
 }
 }
 
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index a4d4ddb0b00f..19db9f1d0a41 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1536,7 +1536,6 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 xPropertySet->setPropertyValue(UNO_NAME_FILLCOLOR, 
uno::makeAny(static_cast(nColor)));
 xPropertySet->setPropertyValue(UNO_NAME_FILLSTYLE, 
uno::makeAny(drawing::FillStyle_SOLID));
 xPropertySet->setPropertyValue(UNO_NAME_FILL_TRANSPARENCE, 
uno::makeAny(nTransparency));
-xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT_RELATION, 
uno::makeAny(static_cast(text::RelOrientation::PAGE_PRINT_AREA)));
 xPropertySet->setPropertyValue(UNO_NAME_LINESTYLE, 
uno::makeAny(drawing::LineStyle_NONE));
 xPropertySet->setPropertyValue(UNO_NAME_OPAQUE, uno::makeAny(false));
 xPropertySet->setPropertyValue(UNO_NAME_TEXT_AUTOGROWHEIGHT, 
uno::makeAny(false));
@@ -1544,13 +1543,12 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 xPropertySet->setPropertyValue(UNO_NAME_TEXT_MINFRAMEHEIGHT, 
uno::makeAny(nFrameHeight));
 xPropertySet->setPropertyValue(UNO_NAME_TEXT_MINFRAMEWIDTH, 
uno::makeAny(nWidth));
 xPropertySet->setPropertyValue(UNO_NAME_TEXT_WRAP, 
uno::makeAny(text::WrapTextMode_THROUGH));
+xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT_RELATION, 
uno::makeAny(static_cast(text::RelOrientation::PAGE_PRINT_AREA)));
 xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT_RELATION, 
uno::makeAny(static_cast(text::RelOrientation::PAGE_PRINT_AREA)));
 xPropertySet->setPropertyValue(UNO_NAME_CHAR_FONT_NAME, 
uno::makeAny(sFont));
 xPropertySet->setPropertyValue(UNO_NAME_CHAR_HEIGHT, 
uno::makeAny(WATERMARK_AUTO_SIZE));
 xPropertySet->setPropertyValue(UNO_NAME_TEXT_UPPERDIST, 
uno::makeAny(sal_Int32(nFrameHeight - nHeight)));
 xPropertySet->setPropertyValue("Transformation", uno::makeAny(aMatrix));
-xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT, 
uno::makeAny(static_cast(text::HoriOrientation::CENTER)));
-xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT, 
uno::makeAny(static_cast(text::VertOrientation::CENTER)));
 
 uno::Reference xTextRange(xShape, uno::UNO_QUERY);
 xTextRange->setString(rWatermark.GetText());
@@ -1579,10 +1577,12 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 xPropertySet->getPropertyValue("Transformation") >>= aMatrix;
 xPropertySet->setPropertyValue("Transformation", uno::makeAny(aMatrix));
 
+xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT, 
uno::makeAny(static_cast(text::HoriOrientation::CENTER)));
+xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT, 
uno::makeAny(static_cast(text::VertOrientation::CENTER)));
+
 uno::Reference xNamed(xShape, uno::UNO_QUERY);
 xNamed->setName(sWatermark);
 xLockable->removeActionLock();
-
 }
 
 void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 +-
 sc/inc/strings.hrc|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7ace16688c503795a5af0c82b63856b1e737aa87
Author: Heiko Tietze 
Date:   Tue Nov 28 10:34:38 2017 +0100

tdf#107601 Rename t-test to paired t-test

Change-Id: Ic67089eb591411d9aa8a57369d739bf096a799db
Reviewed-on: https://gerrit.libreoffice.org/45393
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index c709e396fa85..d4fd477c22e6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -850,7 +850,7 @@
   
   
 
-  ~t-test...
+  Paired ~t-test...
 
 
   1
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index a29c93b54a7c..27d534532c5c 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -277,8 +277,8 @@
 /* Names of dialogs */
 #define STR_FTEST   NC_("STR_FTEST", "F-test")
 #define STR_FTEST_UNDO_NAME NC_("STR_FTEST_UNDO_NAME", 
"F-test")
-#define STR_TTEST   NC_("STR_TTEST", "t-test")
-#define STR_TTEST_UNDO_NAME NC_("STR_TTEST_UNDO_NAME", 
"t-test")
+#define STR_TTEST   NC_("STR_TTEST", "Paired 
t-test")
+#define STR_TTEST_UNDO_NAME NC_("STR_TTEST_UNDO_NAME", 
"Paired t-test")
 #define STR_ZTEST   NC_("STR_ZTEST", "z-test")
 #define STR_ZTEST_UNDO_NAME NC_("STR_ZTEST_UNDO_NAME", 
"z-test")
 #define STR_CHI_SQUARE_TEST NC_("STR_CHI_SQUARE_TEST", 
"Test of Independence (Chi-Square)")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 sc/source/ui/inc/output.hxx   |2 
 sc/source/ui/view/output2.cxx |  115 ++
 2 files changed, 41 insertions(+), 76 deletions(-)

New commits:
commit eafc42a2b46e70a0840a870b8c8cce85b32980c1
Author: tagezi 
Date:   Fri Nov 24 19:55:15 2017 +0200

tdf#39593 deduplicate code in ScOutputData

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

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index e68c92e9c379..a59b3937264b 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -252,6 +252,8 @@ private:
long nEngineHeight, bool 
bWrapFields );
 
 bool AdjustAreaParamClipRect(OutputAreaParam& rAreaParam);
+long SetEngineTextAndGetWidth( DrawEditParam& rParam, const OUString& 
rSetString,
+   long& rNeededPixel, long nAddWidthPixels );
 
 public:
 /**
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 3bb430f9883a..8195ad00fab6 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2801,6 +2801,22 @@ private:
 boolmbMetaFile;
 };
 
+// Returns needed width in current units; sets rNeededPixel to needed width in 
pixels
+long ScOutputData::SetEngineTextAndGetWidth( DrawEditParam& rParam, const 
OUString& rSetString,
+ long& rNeededPixel, long 
nAddWidthPixels )
+{
+rParam.mpEngine->SetText( rSetString );
+long nEngineWidth = static_cast( rParam.mpEngine->CalcTextWidth() );
+if ( rParam.mbPixelToLogic )
+rNeededPixel = mpRefDevice->LogicToPixel( Size( nEngineWidth, 0 ) 
).Width();
+else
+rNeededPixel = nEngineWidth;
+
+rNeededPixel += nAddWidthPixels;
+
+return nEngineWidth;
+}
+
 void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
 {
 OSL_ASSERT(rParam.meOrient == SvxCellOrientation::Standard);
@@ -2808,7 +2824,6 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
 
 Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1));
 
-bool bHidden = false;
 bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && 
!rParam.mbBreak);
 bool bShrink = !rParam.mbBreak && !bRepeat && 
lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet);
 long nAttrRotate = lcl_GetValue(*rParam.mpPattern, 
ATTR_ROTATE_VALUE, rParam.mpCondSet);
@@ -2831,12 +2846,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 {
 //! set flag to find the cell in DrawRotated again ?
 //! (or flag already set during DrawBackground, then no query here)
-bHidden = true; // rotated is outputted separately
+return; // rotated is outputted separately
 }
 
-if (bHidden)
-return;
-
 SvxCellHorJustify eOutHorJust = rParam.meHorJustContext;
 
 //! mirror margin values for RTL?
@@ -2951,11 +2963,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 {
 // "repeat" is handled with unformatted text (for performance 
reasons)
 OUString aCellStr = rParam.mpEngine->GetText();
-rParam.mpEngine->SetText( aCellStr );
 
-long nRepeatSize = (long) rParam.mpEngine->CalcTextWidth();
-if (rParam.mbPixelToLogic)
-nRepeatSize = 
mpRefDevice->LogicToPixel(Size(nRepeatSize,0)).Width();
+long nRepeatSize = 0;
+SetEngineTextAndGetWidth( rParam, aCellStr, nRepeatSize, 0 );
 if ( pFmtDevice != mpRefDevice )
 ++nRepeatSize;
 if ( nRepeatSize > 0 )
@@ -2966,29 +2976,20 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 OUString aRepeated = aCellStr;
 for ( long nRepeat = 1; nRepeat < nRepeatCount; 
nRepeat++ )
 aRepeated += aCellStr;
-rParam.mpEngine->SetText( aRepeated );
+
+nEngineWidth = SetEngineTextAndGetWidth( rParam, 
aRepeated,
+nNeededPixel, (nLeftM 
+ nRightM ) );
 
 nEngineHeight = rParam.mpEngine->GetTextHeight();
-nEngineWidth = (long) rParam.mpEngine->CalcTextWidth();
-if (rParam.mbPixelToLogic)
-nNeededPixel = 
mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width();
-else
-nNeededPixel = nEngineWidth;
-nNeededPixel += nLeftM + nRightM;
 }
 }
 }
 }
 
+
 if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || 
aAreaParam.mbRightClip ) )
 

[Libreoffice-commits] core.git: postprocess/Module_postprocess.mk

[Michael Stahl]

 postprocess/Module_postprocess.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0616a5e13e6656a97071b1407912e1043a903407
Author: Michael Stahl 
Date:   Mon Dec 4 20:16:41 2017 +0100

postprocess: only check-dynamic-objects if instset is created

People who use --with-system-libs will derive no benefit from
check-elf-dynamic-objects.  Since checking all SYSTEM_* variables
seems unmaintainable, check if an instset is to be created as a
heuristic that the build should be portable and libraries checked.
This should run with no config changes at least on the tinderboxes;
Jenkins builders don't create instsets.

Change-Id: I2407429891210ea79917fc4d01a933ec661325b1

diff --git a/postprocess/Module_postprocess.mk 
b/postprocess/Module_postprocess.mk
index cde1613084af..27cc0b940327 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -42,10 +42,12 @@ $(eval $(call gb_Module_add_targets,postprocess, \
 endif
 
 ifeq ($(OS),LINUX)
+ifneq ($(PKGFORMAT),)
 $(eval $(call gb_Module_add_check_targets,postprocess,\
CustomTarget_check_dynamic_objects \
 ))
 endif
+endif
 
 $(eval $(call gb_Module_add_check_targets,postprocess,\
CppunitTest_services \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/inc

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 01c7c4e1cb074f88440336068285495743bd6b37
Author: Eike Rathke 
Date:   Mon Dec 4 20:04:27 2017 +0100

Add Plautdietsch [pdt-CA] to language listbox

Change-Id: Icf2307649858721a7cde38e8fa892fc3cb1ff08c

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c2bdbf567b2a..af2f48cb3151 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -669,6 +669,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_XIBE,  "sjo", "CN", k0 },
 { LANGUAGE_USER_KITUBA_DRCONGO,"ktu", "CD", k0 },
 { LANGUAGE_USER_FON,   "fon", "BJ", k0 },
+{ LANGUAGE_USER_PLAUTDIETSCH,  "pdt", "CA", k0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 2c90af7110fe..74d404e3a91b 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -735,6 +735,7 @@ namespace o3tl
 #define LANGUAGE_USER_XIBE  LanguageType(0x069B)
 #define LANGUAGE_USER_KITUBA_DRCONGOLanguageType(0x069C)
 #define LANGUAGE_USER_FON   LanguageType(0x069D)
+#define LANGUAGE_USER_PLAUTDIETSCH  LanguageType(0x069E)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 54e356feb1d1..b23d30e6fb8a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -405,7 +405,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Manchu") , LANGUAGE_USER_MANCHU },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xibe") , LANGUAGE_USER_XIBE },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the 
Congo)"), LANGUAGE_USER_KITUBA_DRCONGO },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Plautdietsch"), 
LANGUAGE_USER_PLAUTDIETSCH }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/get_tree.sh

[Shinnok]

 help3xsl/get_tree.sh |   35 ---
 1 file changed, 35 deletions(-)

New commits:
commit a624e855010b2e572f526d2b4b149c2baa6890a3
Author: Shinnok 
Date:   Mon Dec 4 19:49:35 2017 +0100

Remove confusing white space.

Change-Id: I0f6e35f720c5744757f0ac804a9d780df23d1804
Reviewed-on: https://gerrit.libreoffice.org/45819
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/get_tree.sh b/help3xsl/get_tree.sh
index 58b3f48f8..d9582f551 100755
--- a/help3xsl/get_tree.sh
+++ b/help3xsl/get_tree.sh
@@ -50,38 +50,6 @@ done
 echo $'\047'';'>>$treeFileHTML
 exit
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ALL_LANGS='en-US am ar ast bg bn bn-IN bo bs ca ca-valencia cs da de dz el 
en-GB en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lo lt lv 
mk nb ne nl nn om pl pt-BR pt ro ru sid si sk sl sq sv ta tg tr ug uk vi zh-CN 
zh-TW'
 
 here=$(pwd)
@@ -96,9 +64,6 @@ export 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${rootTreex}"/instd
 rm -rf $here/html
 
 
-#
-
-
 ALL_LANGS='fr pt-BR'
 ALL_TREE='sbasic.tree  scalc.tree  schart.tree  shared.tree  simpress.tree  
smath.tree  swriter.tree'
 for lang in $ALL_LANGS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Shinnok]

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

New commits:
commit 433fdce3fd1dc370afb81fe5a5723c8aae9e586c
Author: Shinnok 
Date:   Mon Dec 4 19:49:35 2017 +0100

Updated core
Project: help  a624e855010b2e572f526d2b4b149c2baa6890a3

Remove confusing white space.

Change-Id: I0f6e35f720c5744757f0ac804a9d780df23d1804
Reviewed-on: https://gerrit.libreoffice.org/45819
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 19c8267824c9..a624e855010b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 19c8267824c96ce837140c7edf94b8ab0231a485
+Subproject commit a624e855010b2e572f526d2b4b149c2baa6890a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

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

New commits:
commit 8aa13d257eaee42428bea7b649a3ca35903ed551
Author: Thorsten Behrens 
Date:   Mon Dec 4 03:34:01 2017 +0100

Fail when building Win64 from cygwin32

The gpgme libs need cross-arch windres support, which cygwin32
lacks.

Change-Id: Icbe013cf7983754e8b485dd7368cfc10f8fd0bcb
Reviewed-on: https://gerrit.libreoffice.org/45769
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index 264e4ba99750..841428971511 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10151,9 +10151,7 @@ fi
 AC_SUBST(ENABLE_PDFIUM)
 
 SYSTEM_GPGMEPP=
-if test "$_os" = "Linux" -o "$_os" = "Darwin" \
-   -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \
-   -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = 
"x86" \) ; then
+if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
 dnl ===
 dnl Check for system gpgme
 dnl ===
@@ -10180,6 +10178,8 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" \
 if test "$_os" != "WINNT"; then
 
GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error"
 LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs 
-lassuan"
+elif test "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x64"; then
+AC_MSG_ERROR(gpgme cannot be built on cygwin32 for Win64.)
 fi
 fi
 ENABLE_GPGMEPP=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 compilerplugins/clang/salcall.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 5940f3020e513c769c5cf452b49c1f211358c525
Author: Stephan Bergmann 
Date:   Mon Dec 4 18:41:09 2017 +0100

-Werror=unused-function

Change-Id: I411a134daef6ad061ab54b300e379b882395905b

diff --git a/compilerplugins/clang/salcall.cxx 
b/compilerplugins/clang/salcall.cxx
index f982d7f41b11..2c34f8281b96 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -57,8 +57,10 @@ public:
 
 private:
 void checkForFunctionDecl(Expr const*, bool bCheckOnly = false);
+#if 0
 bool rewrite(SourceLocation);
 bool checkOverlap(SourceRange);
+#endif
 bool isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation* 
pLoc = nullptr);
 
 std::set m_addressOfSet;
@@ -326,6 +328,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* 
functionDecl, SourceLocation
 return true;
 }
 
+#if 0
 bool SalCall::rewrite(SourceLocation locBegin)
 {
 if (!rewriter)
@@ -363,6 +366,7 @@ bool SalCall::checkOverlap(SourceRange range)
 mvModifiedRanges.emplace_back(p1, p2);
 return true;
 }
+#endif
 
 static loplugin::Plugin::Registration reg("salcall", true);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 82e794f782de6c922d0323172715d4dff2151c28
Author: Stephan Bergmann 
Date:   Mon Dec 4 14:48:36 2017 +0100

Honor GTK theming in LO flatpak

...according to alexlarson, for now (until "eventually we'll have a sane 
dconf
in the sandbox") apps need to specify --filesystem=xdg-run/dconf,
--filesystem=~/.config/dconf:ro, --talk-name=ca.desrt.dconf,
--env=DCONF_USER_CONFIG_DIR=.config/dconf (where the first two are 
irrelevant
for LO due to its --filesystem=host).

This fixes 
"Libreoffice flatpak is not respecting user theme".

Change-Id: If5ed33e1b524bfa877b89f052c6067398b5600a3
(cherry picked from commit 12ba14c6bee1c773e4500f79a90a07f871cf3feb)
Reviewed-on: https://gerrit.libreoffice.org/45806
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index f316d143843f..a6e8340ee693 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -392,8 +392,10 @@
 "--socket=wayland",
 "--socket=pulseaudio",
 "--filesystem=host",
+"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
+"--talk-name=ca.desrt.dconf",
 "--talk-name=org.gtk.vfs.*"
 ]
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/text/txtfrm.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8aeb8825cbb0ffba2b214624a9869ce8e6e0390a
Author: Caolán McNamara 
Date:   Mon Dec 4 17:14:03 2017 +

use LANGUAGE_ENGLISH_US for fuzzing

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

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 05037aa7ead3..51b7adf14893 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -332,7 +332,9 @@ SwDigitModeModifier::SwDigitModeModifier( const 
OutputDevice& rOutp, LanguageTyp
 rOut( rOutp ), nOldLanguageType( rOutp.GetDigitLanguage() )
 {
 LanguageType eLang = eCurLang;
-if (!utl::ConfigManager::IsFuzzing())
+if (utl::ConfigManager::IsFuzzing())
+eLang = LANGUAGE_ENGLISH_US;
+else
 {
 const SvtCTLOptions::TextNumerals nTextNumerals = 
SW_MOD()->GetCTLOptions().GetCTLTextNumerals();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 oox/source/crypto/Standard2007Engine.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5fe781828506862c0bfcabb224418e038bee584d
Author: Caolán McNamara 
Date:   Mon Dec 4 11:22:53 2017 +

ofz#4526 Null-reference READ with openssl crypto backend

which is not the default backend

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

diff --git a/oox/source/crypto/Standard2007Engine.cxx 
b/oox/source/crypto/Standard2007Engine.cxx
index 1f39a9aab410..748911612a8f 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -124,6 +124,8 @@ bool Standard2007Engine::generateEncryptionKey(const 
OUString& password)
 {
 mKey.clear();
 mKey.resize(mInfo.header.keyBits / 8, 0);
+if (mKey.empty())
+return false;
 
 calculateEncryptionKey(password);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog-backport' - include/vcl vcl/source

[Jan Holesovsky]

Rebased ref, commits from common ancestor:
commit f53d4e656a6a72936309b641c778b6d47c25ffae
Author: Jan Holesovsky 
Date:   Mon Dec 4 17:55:21 2017 +0100

lokdialog: Window* -> VclPtr, and a small simplification.

Change-Id: I853e2d6ec2e55c78894a9942aa201763a57fe195

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index c17c8ab3b108..b4323c185e93 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1208,13 +1208,15 @@ public:
 voidSetLOKNotifier(const 
vcl::ILibreOfficeKitNotifier* pNotifier);
 const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() const;
 vcl::LOKWindowIdGetLOKWindowId() const;
-vcl::Window*GetParentWithLOKNotifier();
+
+/// Find the nearest parent with LOK Notifier; can be itself if this 
Window has LOK notifier set.
+VclPtr GetParentWithLOKNotifier();
 
 /// Indicate that LOK is not going to use this dialog any more.
 voidReleaseLOKNotifier();
 
 /// Find an existing Window based on the LOKWindowId.
-static VclPtr   FindLOKWindow(vcl::LOKWindowId 
nWindowId);
+static VclPtr  FindLOKWindow(vcl::LOKWindowId 
nWindowId);
 
 /// Dialog / window tunneling related methods.
 Size PaintActiveFloatingWindow(VirtualDevice& rDevice) const;
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 9b5b16a7509a..b2adcb1d7ccf 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -425,7 +425,7 @@ void Control::LogicInvalidate(const Rectangle* 
/*pRectangle*/)
 // ignore all of those
 if (comphelper::LibreOfficeKit::isActive() && 
!comphelper::LibreOfficeKit::isDialogPainting())
 {
-if (vcl::Window* pParent = GetParentWithLOKNotifier())
+if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 // invalidate the complete floating window for now
 if (pParent->ImplIsFloatingWindow())
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 4c2eae984c54..676c3f0dbb06 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -597,7 +597,7 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
 
 void FloatingWindow::LogicInvalidate(const Rectangle* /*pRectangle*/)
 {
-if (vcl::Window* pParent = GetParentWithLOKNotifier())
+if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 const vcl::ILibreOfficeKitNotifier* pNotifier = 
pParent->GetLOKNotifier();
 pNotifier->notifyWindow(GetLOKWindowId(), "invalidate");
@@ -613,7 +613,7 @@ void FloatingWindow::StateChanged( StateChangedType nType )
 
 SystemWindow::StateChanged( nType );
 
-if (vcl::Window* pParent = GetParentWithLOKNotifier())
+if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 const vcl::ILibreOfficeKitNotifier* pNotifier = 
pParent->GetLOKNotifier();
 if (nType == StateChangedType::InitShow && IsVisible())
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0bc0fe7bd33b..962c90904c43 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3240,19 +3240,14 @@ vcl::LOKWindowId Window::GetLOKWindowId() const
 return mpWindowImpl->mnLOKWindowId;
 }
 
-vcl::Window* Window::GetParentWithLOKNotifier()
+VclPtr Window::GetParentWithLOKNotifier()
 {
-vcl::Window* pWindow = this;
-bool found = false;
-while (pWindow && !found)
-{
-if (pWindow->GetLOKNotifier())
-found = true;
-else
-pWindow = pWindow->GetParent();
-}
+VclPtr pWindow(this);
+
+while (pWindow && !pWindow->GetLOKNotifier())
+pWindow = pWindow->GetParent();
 
-return found ? pWindow : nullptr;
+return pWindow;
 }
 
 void Window::LogicMouseButtonDown(const MouseEvent& rMouseEvent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] voting.git: vote/2017-board

[Miklos Vajna]

 vote/2017-board/rules.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e2a06239e7f2a639b459f427e06175a1504c9f4
Author: Miklos Vajna 
Date:   Mon Dec 4 16:59:29 2017 +

Clarify wording

diff --git a/vote/2017-board/rules.wml b/vote/2017-board/rules.wml
index 5ad27df..4bde3ed 100644
--- a/vote/2017-board/rules.wml
+++ b/vote/2017-board/rules.wml
@@ -25,8 +25,8 @@
 
   
 As per § 7 II of our statues, the Board's term lasts two years. The
-current board started its duty on February 18, 2016. Therefore, the old
-board remains in charge until the end of February 17, 2018, so the new
+current board started its duty on February 18, 2016. Therefore, it
+remains in charge until the end of February 17, 2018, so the new
 board will be in charge the day after that, which is February 18, 2018.
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog-backport' - include/vcl vcl/source

[Jan Holesovsky]

 include/vcl/window.hxx |6 --
 vcl/source/control/ctrl.cxx|2 +-
 vcl/source/window/floatwin.cxx |4 ++--
 vcl/source/window/window.cxx   |   17 ++---
 4 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 35094a3f687280f01a53ed6e25c938821ac63717
Author: Jan Holesovsky 
Date:   Mon Dec 4 17:55:21 2017 +0100

lokdialog: Window* -> VclPtr, and a small simplification.

Change-Id: I853e2d6ec2e55c78894a9942aa201763a57fe195

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index c17c8ab3b108..2fe75400 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1208,13 +1208,15 @@ public:
 voidSetLOKNotifier(const 
vcl::ILibreOfficeKitNotifier* pNotifier);
 const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() const;
 vcl::LOKWindowIdGetLOKWindowId() const;
-vcl::Window*GetParentWithLOKNotifier();
+
+/// Find the nearest parent with LOK Notifier; can be iteself if this 
Window has LOK notifier set.
+VclPtr GetParentWithLOKNotifier();
 
 /// Indicate that LOK is not going to use this dialog any more.
 voidReleaseLOKNotifier();
 
 /// Find an existing Window based on the LOKWindowId.
-static VclPtr   FindLOKWindow(vcl::LOKWindowId 
nWindowId);
+static VclPtr  FindLOKWindow(vcl::LOKWindowId 
nWindowId);
 
 /// Dialog / window tunneling related methods.
 Size PaintActiveFloatingWindow(VirtualDevice& rDevice) const;
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 9b5b16a7509a..b2adcb1d7ccf 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -425,7 +425,7 @@ void Control::LogicInvalidate(const Rectangle* 
/*pRectangle*/)
 // ignore all of those
 if (comphelper::LibreOfficeKit::isActive() && 
!comphelper::LibreOfficeKit::isDialogPainting())
 {
-if (vcl::Window* pParent = GetParentWithLOKNotifier())
+if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 // invalidate the complete floating window for now
 if (pParent->ImplIsFloatingWindow())
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 4c2eae984c54..676c3f0dbb06 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -597,7 +597,7 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
 
 void FloatingWindow::LogicInvalidate(const Rectangle* /*pRectangle*/)
 {
-if (vcl::Window* pParent = GetParentWithLOKNotifier())
+if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 const vcl::ILibreOfficeKitNotifier* pNotifier = 
pParent->GetLOKNotifier();
 pNotifier->notifyWindow(GetLOKWindowId(), "invalidate");
@@ -613,7 +613,7 @@ void FloatingWindow::StateChanged( StateChangedType nType )
 
 SystemWindow::StateChanged( nType );
 
-if (vcl::Window* pParent = GetParentWithLOKNotifier())
+if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 const vcl::ILibreOfficeKitNotifier* pNotifier = 
pParent->GetLOKNotifier();
 if (nType == StateChangedType::InitShow && IsVisible())
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0bc0fe7bd33b..962c90904c43 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3240,19 +3240,14 @@ vcl::LOKWindowId Window::GetLOKWindowId() const
 return mpWindowImpl->mnLOKWindowId;
 }
 
-vcl::Window* Window::GetParentWithLOKNotifier()
+VclPtr Window::GetParentWithLOKNotifier()
 {
-vcl::Window* pWindow = this;
-bool found = false;
-while (pWindow && !found)
-{
-if (pWindow->GetLOKNotifier())
-found = true;
-else
-pWindow = pWindow->GetParent();
-}
+VclPtr pWindow(this);
+
+while (pWindow && !pWindow->GetLOKNotifier())
+pWindow = pWindow->GetParent();
 
-return found ? pWindow : nullptr;
+return pWindow;
 }
 
 void Window::LogicMouseButtonDown(const MouseEvent& rMouseEvent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog-backport' - vcl/source

[Jan Holesovsky]

 vcl/source/window/floatwin.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit c9d1df376a949a2edf7d0cea7c695b9ff213d8f0
Author: Jan Holesovsky 
Date:   Mon Dec 4 17:30:45 2017 +0100

lokdialog: Make the Autofilter popup work in Calc.

For the moment we treat it as a 'dialog', but maybe we'll need a separate
window type for this later.

Change-Id: I21bff0b50b5f3e9f51d323600f7ba6d37c16bc9b

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index ce289a804e50..4c2eae984c54 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -621,8 +621,18 @@ void FloatingWindow::StateChanged( StateChangedType nType )
 SetLOKNotifier(pNotifier);
 
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "child"));
-aItems.emplace_back(std::make_pair("parentId", 
OString::number(pParent->GetLOKWindowId(;
+if (pParent == this)
+{
+// we are a toplevel window, let's so far pretend to be a
+// dialog - but maybe we'll need a separate type for this
+// later
+aItems.emplace_back(std::make_pair("type", "dialog"));
+}
+else
+{
+aItems.emplace_back(std::make_pair("type", "child"));
+aItems.emplace_back(std::make_pair("parentId", 
OString::number(pParent->GetLOKWindowId(;
+}
 aItems.emplace_back(std::make_pair("size", 
GetSizePixel().toString()));
 aItems.emplace_back(std::make_pair("position", 
mpImplData->maPos.toString()));
 pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 include/xmloff/shapeexport.hxx |1 
 xmloff/source/draw/shapeexport.cxx |   48 +
 2 files changed, 49 insertions(+)

New commits:
commit bfd613a4628c8827168f64fc2a97685785d04a84
Author: Samuel Mehrbrodt 
Date:   Thu Nov 23 15:06:08 2017 +0100

tdf#83877 ODF extension to write signature lines

This adds a  element to draw:image if the image
is a signatureline.

Example:

  


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

diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index c883886126a5..1865210d5bde 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -217,6 +217,7 @@ private:
 SAL_DLLPRIVATE void ImpExportEvents( const css::uno::Reference< 
css::drawing::XShape >& xShape );
 SAL_DLLPRIVATE void ImpExportDescription( const css::uno::Reference< 
css::drawing::XShape >& xShape ); // #i68101#
 SAL_DLLPRIVATE void ImpExportGluePoints( const css::uno::Reference< 
css::drawing::XShape >& xShape );
+SAL_DLLPRIVATE void ImpExportSignatureLine(const 
css::uno::Reference& xShape);
 
 // single shape exporters
 SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< 
css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, 
css::awt::Point* pRefPoint = nullptr );
diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 887f5ecfd372..86b4f621b182 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1256,6 +1256,53 @@ void XMLShapeExport::ImpExportGluePoints( const 
uno::Reference< drawing::XShape
 }
 }
 
+void XMLShapeExport::ImpExportSignatureLine(const 
uno::Reference& xShape)
+{
+uno::Reference xPropSet(xShape, uno::UNO_QUERY);
+
+bool bIsSignatureLine = false;
+xPropSet->getPropertyValue("IsSignatureLine") >>= bIsSignatureLine;
+if (!bIsSignatureLine)
+return;
+
+OUString aSignatureLineId;
+xPropSet->getPropertyValue("SignatureLineId") >>= aSignatureLineId;
+mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "id", aSignatureLineId);
+
+OUString aSuggestedSignerName;
+xPropSet->getPropertyValue("SignatureLineSuggestedSignerName") >>= 
aSuggestedSignerName;
+if (!aSuggestedSignerName.isEmpty())
+mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "suggested-signer-name", 
aSuggestedSignerName);
+
+OUString aSuggestedSignerTitle;
+xPropSet->getPropertyValue("SignatureLineSuggestedSignerTitle") >>= 
aSuggestedSignerTitle;
+if (!aSuggestedSignerTitle.isEmpty())
+mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "suggested-signer-title", 
aSuggestedSignerTitle);
+
+OUString aSuggestedSignerEmail;
+xPropSet->getPropertyValue("SignatureLineSuggestedSignerEmail") >>= 
aSuggestedSignerEmail;
+if (!aSuggestedSignerEmail.isEmpty())
+mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "suggested-signer-email", 
aSuggestedSignerEmail);
+
+OUString aSigningInstructions;
+xPropSet->getPropertyValue("SignatureLineSigningInstructions") >>= 
aSigningInstructions;
+if (!aSigningInstructions.isEmpty())
+mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "signing-instructions", 
aSigningInstructions);
+
+bool bShowSignDate = false;
+xPropSet->getPropertyValue("SignatureLineShowSignDate") >>= bShowSignDate;
+mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "show-sign-date",
+  bShowSignDate ? OUString("true") : 
OUString("false"));
+
+bool bCanAddComment = false;
+xPropSet->getPropertyValue("SignatureLineCanAddComment") >>= 
bCanAddComment;
+mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "can-add-comment",
+  bCanAddComment ? OUString("true") : 
OUString("false"));
+
+SvXMLElementExport aSignatureLineElement(mrExport, XML_NAMESPACE_LO_EXT, 
"signatureline", true,
+ true);
+}
+
 void XMLShapeExport::ExportGraphicDefaults()
 {
 rtl::Reference aStEx(new XMLStyleExport(mrExport, 
mrExport.GetAutoStylePool().get()));
@@ -2364,6 +2411,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
 GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", 
aMimeType);
 
 SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, 
true, true);
+ImpExportSignatureLine( xShape );
 
 if( !sImageURL.isEmpty() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt |binary
 sw/qa/extras/fodfexport/fodfexport.cxx |   13 +
 2 files changed, 13 insertions(+)

New commits:
commit 6ac72f5f7584adc11341c6986dc4bf4d5f7f933f
Author: Samuel Mehrbrodt 
Date:   Mon Dec 4 09:14:27 2017 +0100

Related tdf#113696 Unit test for Writer images fallback graphic

Change-Id: I2f14d6ab9a107f5b50ab0ec83019f86751dd79f6
Reviewed-on: https://gerrit.libreoffice.org/45778
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 282bc5a824d103dcf4b19c9cf83698a2334e2e34)
Reviewed-on: https://gerrit.libreoffice.org/45803

diff --git a/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt 
b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt
new file mode 100644
index ..f8aee0836011
Binary files /dev/null and 
b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt differ
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx 
b/sw/qa/extras/fodfexport/fodfexport.cxx
index 6cd00b49ba47..c79d0f35b420 100644
--- a/sw/qa/extras/fodfexport/fodfexport.cxx
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -40,5 +40,18 @@ DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
 }
 }
 
+DECLARE_FODFEXPORT_TEST(testTdf113696WriterImage, "tdf113696-writerimage.odt")
+{
+// Same as testTdf113696, but with a writer image instead of a draw image
+// (they use different code paths).
+if (xmlDocPtr pXmlDoc = parseExportedFile())
+{
+assertXPath(pXmlDoc, 
"/office:document/office:body/office:text/text:p/draw:frame/"
+ 
"draw:image[@loext:mime-type='image/x-vclgraphic']");
+assertXPath(pXmlDoc, 
"/office:document/office:body/office:text/text:p/draw:frame/"
+ "draw:image[@loext:mime-type='image/png']");
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] voting.git: 10 commits - configure.in include/add-header.xsl include/evilsedhack vote/2016-mc vote/2017-board vote/include vote/index.wml vote/Makefile.am

[Florian Effenberger]

 configure.in|2 
 include/add-header.xsl  |   12 -
 include/evilsedhack |   12 -
 vote/2016-mc/Makefile.am|   14 +
 vote/2016-mc/candidates.wml |  176 ++
 vote/2016-mc/index.wml  |   58 +++
 vote/2016-mc/mkical.py  |  252 +++
 vote/2016-mc/rules.wml  |   58 +++
 vote/2016-mc/shuffle.js |8 +
 vote/2016-mc/timeline.ics   |   71 
 vote/2016-mc/voting-instructions.txt|   38 
 vote/2017-board/Makefile.am |   14 +
 vote/2017-board/candidates.wml  |  163 
 vote/2017-board/index.wml   |   57 +++
 vote/2017-board/mkical.py   |  253 
 vote/2017-board/rules.wml   |  122 +++
 vote/2017-board/shuffle.js  |8 +
 vote/2017-board/voting-instructions.txt |   40 +
 vote/Makefile.am|2 
 vote/include/step3-confirm.php  |3 
 vote/index.wml  |2 
 21 files changed, 1351 insertions(+), 14 deletions(-)

New commits:
commit 6354c4c489cc36ef92d0f3208baacf7f950c03c1
Author: Florian Effenberger 
Date:   Mon Dec 4 16:02:00 2017 +

corrected date of duty, as discussed with Gabriele

diff --git a/vote/2017-board/rules.wml b/vote/2017-board/rules.wml
index a938cff..5ad27df 100644
--- a/vote/2017-board/rules.wml
+++ b/vote/2017-board/rules.wml
@@ -26,12 +26,12 @@
   
 As per § 7 II of our statues, the Board's term lasts two years. The
 current board started its duty on February 18, 2016. Therefore, the old
-board remains in charge until the end of Sunday, February 18, 2018, so the new
-board will be in charge the day after that, which is Monday, February 19, 2018.
+board remains in charge until the end of February 17, 2018, so the new
+board will be in charge the day after that, which is February 18, 2018.
   
 
   
-That upcoming term will then (regularly) end on Tuesday, February 18,
+That upcoming term will then (regularly) end on February 17,
 2020, so the next elections of the Board of Directors will take place
 before.
  
commit babcf1908a2155b61e0174268da67ad4ef71c091
Author: Florian Effenberger 
Date:   Thu Nov 30 09:41:13 2017 +

replaced HTTP by HTTPS and updated favicon before

diff --git a/include/add-header.xsl b/include/add-header.xsl
index 51b5a5b..509f618 100644
--- a/include/add-header.xsl
+++ b/include/add-header.xsl
@@ -52,14 +52,14 @@
   
   
 
-  http://www.documentfoundation.org/privacy";>Privacy 
Policy | http://www.documentfoundation.org/imprint";>Impressum 
(Legal Info) | Copyright information: Unless otherwise specified, all text
- and images on this website are licensed under the http://creativecommons.org/licenses/by-sa/3.0/";>Creative Commons
-  Attribution-Share Alike 3.0 License. This site is based on 
the http://www.gnome.org/";>GNOME Foundation election system, whose 
textual content is itself available under a http://creativecommons.org/licenses/by/3.0/";>Creative Commons
+  https://www.documentfoundation.org/privacy";>Privacy 
Policy | https://www.documentfoundation.org/imprint";>Impressum 
(Legal Info) | Copyright information: Unless otherwise specified, all text
+ and images on this website are licensed under the https://creativecommons.org/licenses/by-sa/3.0/";>Creative Commons
+  Attribution-Share Alike 3.0 License. This site is based on 
the https://www.gnome.org/";>GNOME Foundation election system, 
whose textual content is itself available under a https://creativecommons.org/licenses/by/3.0/";>Creative Commons
   Attribution 3.0 License, and the underlying voting code, 
which is available under GPLv2+. This does not include the source code of 
LibreOffice, which is licensed under the GNU Lesser General
- Public License (http://www.libreoffice.org/download/license/";>Mozilla Public License 
v2.0).
+ Public License (https://www.libreoffice.org/download/license/";>Mozilla Public License 
v2.0).
  "LibreOffice" and "The Document Foundation" are registered trademarks. 
Their respective logos and icons are subject to
  international copyright laws. The use of these therefore is subject to our
- http://wiki.documentfoundation.org/TradeMark_Policy";>trademark 
policy.
+ https://wiki.documentfoundation.org/TradeMark_Policy";>trademark 
policy.
   
 
   
diff --git a/include/evilsedhack b/include/evilsedhack
index def12b2..d902ffd 100755
--- a/include/evilsedhack
+++ b/include/evilsedhack
@@ -11,14 +11,14 @@ cat <<-FOOT
   
   
 
-  http://www.documentfoundation.org/privacy";>Privacy 
Policy | http://www.documentfoundation.org/imprint";>Impressum 
(

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

[Caolán McNamara]

 starmath/source/mathtype.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 6b0a2d193aa8974baef5e7d585521baad6078e3e
Author: Caolán McNamara 
Date:   Mon Dec 4 15:49:49 2017 +

ofz: allow std::out_of_range

Change-Id: I4d63214e3691e56816d66162660c243a7454e114

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 3843bc0d1da7..000d5878ed5b 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -3340,7 +3340,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL 
TestImportMathType(SvStream &rStre
 {
 OUString sText;
 MathType aEquation(sText);
-return aEquation.Parse(&rStream);
+bool bRet = false;
+try
+{
+bRet = aEquation.Parse(&rStream);
+}
+catch (const std::out_of_range&)
+{
+}
+return bRet;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sfx2/source/view/lokcharthelper.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 3dd00bbe28b24396f67f91cd72a00059057be74d
Author: Miklos Vajna 
Date:   Mon Dec 4 16:29:37 2017 +0100

sfx2 android: fix -Werror,-Wunused-parameter warnings

Change-Id: Ib48144f5463248e8ceb6c979d1e2148893efa2ba

diff --git a/sfx2/source/view/lokcharthelper.cxx 
b/sfx2/source/view/lokcharthelper.cxx
index c8d46b134ad4..17df4dac3817 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -263,6 +263,14 @@ void LokChartHelper::PaintAllChartsOnTile(VirtualDevice& 
rDevice,
 pViewShell = SfxViewShell::GetNext(*pViewShell);
 }
 rDevice.Pop();
+#else
+(void)rDevice;
+(void)nOutputWidth;
+(void)nOutputHeight;
+(void)nTilePosX;
+(void)nTilePosY;
+(void)nTileWidth;
+(void)nTileHeight;
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 xmloff/source/text/txtparae.cxx |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 5219c6eccb55874c8a8670f44c3f03558384f9b7
Author: Samuel Mehrbrodt 
Date:   Mon Dec 4 09:13:06 2017 +0100

Related tdf#113696 Write fallback graphic for fodf files also

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

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index eaaf3ff0f2aa..932505961e75 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3050,7 +3050,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
 SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, 
false, true);
 
 // replacement graphic for backwards compatibility, but
-// only for SVG currently
+// only for SVG and metafiles currently
 OUString sReplacementOrigURL;
 rPropSet->getPropertyValue( sReplacementGraphicURL ) >>= 
sReplacementOrigURL;
 
@@ -3110,15 +3110,20 @@ void XMLTextParagraphExport::_exportTextGraphic(
 GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE);
 GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED);
 GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD);
+}
 
-// xlink:href for replacement, only written for Svg content
-SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, 
XML_IMAGE, false, true);
+uno::Reference xInputStream(
+GetExport().GetEmbeddedGraphicObjectStream(sReplacementOrigURL));
+OUString aMimeType(
+
comphelper::GraphicMimeTypeHelper::GetMimeTypeForImageStream(xInputStream));
+if (!aMimeType.isEmpty())
+GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", 
aMimeType);
 
-// optional office:binary-data
-GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementURL);
-}
-}
+SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, 
XML_IMAGE, true, true);
 
+// optional office:binary-data
+GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementOrigURL);
+}
 
 // script:events
 Reference xEventsSupp( rPropSet, UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 sw/source/filter/ww8/ww8par6.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 88ffde02b427afd2fa0214efbdc5d57e90b9d20e
Author: Andrea Gelmini 
Date:   Mon Dec 4 13:09:52 2017 +0100

Fix typos

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

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d4b17f9b6f81..28bb9fd072b7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5134,7 +5134,7 @@ long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* 
pRes)
 {
 /* 0 (256) */   &SwWW8ImplReader::Read_Footnote, // FootNote
 /* 1 (257) */   &SwWW8ImplReader::Read_Footnote, // EndNote
-/* 2 (258) */   &SwWW8ImplReader::Read_Field,  // Feld
+/* 2 (258) */   &SwWW8ImplReader::Read_Field,  // Field
 /* 3 (259) */   &SwWW8ImplReader::Read_Book,   // Bookmark
 /* 4 (260) */   &SwWW8ImplReader::Read_And, // Annotation
 /* 5 (261) */   &SwWW8ImplReader::Read_AtnBook, // Annotationmark
@@ -5162,7 +5162,7 @@ void SwWW8ImplReader::EndExtSprm(sal_uInt16 nSprmId)
 {
 /* 0 (256) */   &SwWW8ImplReader::End_Footnote,  // FootNote
 /* 1 (257) */   &SwWW8ImplReader::End_Footnote,  // EndNote
-/* 2 (258) */   &SwWW8ImplReader::End_Field,  // Feld
+/* 2 (258) */   &SwWW8ImplReader::End_Field,  // Field
 /* 3 (259) */   nullptr,   // Bookmark
 /* 4 (260) */   nullptr // Annotation
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8d7ec6693adc269d5ab7edb1782ceafd69152fa3
Author: Stephan Bergmann 
Date:   Mon Dec 4 14:48:36 2017 +0100

Honor GTK theming in LO flatpak

...according to alexlarson, for now (until "eventually we'll have a sane 
dconf
in the sandbox") apps need to specify --filesystem=xdg-run/dconf,
--filesystem=~/.config/dconf:ro, --talk-name=ca.desrt.dconf,
--env=DCONF_USER_CONFIG_DIR=.config/dconf (where the first two are 
irrelevant
for LO due to its --filesystem=host).

This fixes 
"Libreoffice flatpak is not respecting user theme".

(cherry picked from commit 12ba14c6bee1c773e4500f79a90a07f871cf3feb)
Conflicts:
solenv/flatpak-manifest.in

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 466a08198330..d16838d6a14b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -394,6 +394,7 @@
 "--socket=system-bus",
 "--socket=session-bus",
 "--filesystem=host",
+"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
 "--env=LIBO_FLATPAK=1"
 ]
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - avmedia/source

[Xisco Fauli]

 avmedia/source/framework/mediaplayer.cxx   |2 +-
 avmedia/source/viewer/mediawindow_impl.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2206e05974d8bda94d0bfee5c611d5e6f767e03c
Author: Xisco Fauli 
Date:   Wed Oct 25 13:21:32 2017 +0200

tdf#113380: if the player doesn't exist,...

... use the same size as VLC does.

See:

https://opengrok.libreoffice.org/xref/core/avmedia/source/vlc/vlcplayer.cxx#167

Change-Id: Ib878ded6c8aacf3a04227ab9efaa59b388f8ff51
Reviewed-on: https://gerrit.libreoffice.org/43827
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit a2ec30240f7a9889e8e97b798bd862be160b47bc)
Reviewed-on: https://gerrit.libreoffice.org/45781
Reviewed-by: Xisco Faulí 
(cherry picked from commit 5ea28efc864b0b064512f2049a9acd82aeaae808)
Reviewed-on: https://gerrit.libreoffice.org/45789
Reviewed-by: Michael Stahl 

diff --git a/avmedia/source/framework/mediaplayer.cxx 
b/avmedia/source/framework/mediaplayer.cxx
index 0a0c86f88c8c..c965d24463f4 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -53,7 +53,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, 
SfxChildWindow* pCW, vcl::W
 SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | 
WB_SIZEABLE | WB_DOCKABLE ),
 mpMediaWindow( new MediaWindow( this, true ) )
 {
-const Size aSize( 378, 256 );
+const Size aSize( mpMediaWindow->getPreferredSize() );
 
 SetPosSizePixel( Point( 0, 0 ), aSize );
 SetMinOutputSizePixel( aSize );
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index 172e4a3610ab..0844845a1bac 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -308,7 +308,7 @@ bool MediaWindowImpl::isValid() const
 
 Size MediaWindowImpl::getPreferredSize() const
 {
-Size aRet;
+Size aRet(480, 360);
 
 if( mxPlayer.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 xmloff/source/text/txtparae.cxx |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit a0647dfdbbea483ed3a8372b7a54e1934dfa1fe5
Author: Samuel Mehrbrodt 
Date:   Mon Dec 4 09:13:06 2017 +0100

Related tdf#113696 Write fallback graphic for fodf files also

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

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index eaaf3ff0f2aa..932505961e75 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3050,7 +3050,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
 SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, 
false, true);
 
 // replacement graphic for backwards compatibility, but
-// only for SVG currently
+// only for SVG and metafiles currently
 OUString sReplacementOrigURL;
 rPropSet->getPropertyValue( sReplacementGraphicURL ) >>= 
sReplacementOrigURL;
 
@@ -3110,15 +3110,20 @@ void XMLTextParagraphExport::_exportTextGraphic(
 GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE);
 GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED);
 GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD);
+}
 
-// xlink:href for replacement, only written for Svg content
-SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, 
XML_IMAGE, false, true);
+uno::Reference xInputStream(
+GetExport().GetEmbeddedGraphicObjectStream(sReplacementOrigURL));
+OUString aMimeType(
+
comphelper::GraphicMimeTypeHelper::GetMimeTypeForImageStream(xInputStream));
+if (!aMimeType.isEmpty())
+GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", 
aMimeType);
 
-// optional office:binary-data
-GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementURL);
-}
-}
+SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, 
XML_IMAGE, true, true);
 
+// optional office:binary-data
+GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementOrigURL);
+}
 
 // script:events
 Reference xEventsSupp( rPropSet, UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit c6f3a5375a59f9982626f601897249398bab11bf
Author: Samuel Mehrbrodt 
Date:   Mon Dec 4 09:58:20 2017 +0100

xhtml export: Prefer svg if it's available

And not use the replacement graphic in this case.

Change-Id: I5e1bb7a694f210e2681ff5acf241a131d38a4c5d
Reviewed-on: https://gerrit.libreoffice.org/45782
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit aa768bdbfd7442947cf0756f58c9bfe791ce047a)
Reviewed-on: https://gerrit.libreoffice.org/45801

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 9719932fcf2d..78d4117b1a84 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1483,10 +1483,12 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sw/source/core/graphic/ndgrf.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4e8f20a5c2731f3aecffa515dc73a3fc071af6d6
Author: Samuel Mehrbrodt 
Date:   Fri Dec 1 15:16:18 2017 +0100

Related tdf#72966 Provide replacement graphic also for metafiles

In 6b3cc69fd2b2de5ace68f2739eb383267d66f76f this was done for draw images,
this patch also implements this for Writer images.

Change-Id: I54f8142c3d22e1a356aedbcf2daf9d7a9b049423
Reviewed-on: https://gerrit.libreoffice.org/45673
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 2d3023c9713c4c7cac732a6831c69dec581a7751)
Reviewed-on: https://gerrit.libreoffice.org/45800

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 7ef061715ba8..412122fb4da9 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -403,9 +403,10 @@ const GraphicObject* SwGrfNode::GetReplacementGrfObj() 
const
 {
 const_cast< SwGrfNode* >(this)->mpReplacementGraphic = new 
GraphicObject(rVectorGraphicDataPtr->getReplacement());
 }
-else if (GetGrfObj().GetGraphic().getPdfData().hasElements())
+else if (GetGrfObj().GetGraphic().getPdfData().hasElements()
+ || GetGrfObj().GetGraphic().GetType() == 
GraphicType::GdiMetafile)
 {
-// This returns the bitmap, without the pdf data.
+// Replacement graphic for PDF and metafiles is just the bitmap.
 const_cast(this)->mpReplacementGraphic = new 
GraphicObject(GetGrfObj().GetGraphic().GetBitmapEx());
 }
 if (mpReplacementGraphic)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/lok_dialog-backport'

[Pranav Kant]

New branch 'feature/lok_dialog-backport' available with the following commits:
commit 9f7a32627beb72416bbc8f9bbe25add277c1fc8b
Author: Pranav Kant 
Date:   Mon Dec 4 13:58:44 2017 +0530

lokdialog: sc: Guard autofilter popup's LOK notification

Change-Id: I8d39a701618926e35c84f200ac7e2ce66e62b8b7

commit de5bef13019ca95429865d4a9794fbc2a6f81a1b
Author: Pranav Kant 
Date:   Sat Dec 2 02:47:38 2017 +0530

lokdialog: multiview: Do not mix one view with other

In GTV, use correct application window object to fetch the dialog
object.

Use correct view shell to notify window (dialogs, etc.) callbacks.

Change-Id: I7d82b39d4522a4b4904e156757a032c342c71efb

commit 9d2b7628d901bed92fc2a490084b0ac51aa6691b
Author: Pranav Kant 
Date:   Fri Dec 1 14:27:21 2017 +0530

lokdialog: Merge dialog & dialog child mouse event APIs into one

Change-Id: I91aaa6a58f33dd2d817e02533de96e0c8191f2ca

commit b4d5eb3837f5109692ed058657bd092696af
Author: Pranav Kant 
Date:   Fri Dec 1 14:19:30 2017 +0530

lokdialog: Rename postDialogKeyEvent -> postWindowKeyEvent

Change-Id: I78b434106fbef153adde255d4fcc8f74a7169175

commit c7b4877f1951a23be82208ee05560e06799b
Author: Pranav Kant 
Date:   Fri Dec 1 13:54:45 2017 +0530

lokdialog: Simplify; make the LOK dialog API more generic

Merge the dialog floating window callbacks and function calls into one.
Unique window ids across vcl::Window is enough to distinguish between
them.

Floating windows don't have a LOK notifier as they are created in the
vcl itself (so we can't access them from sfx2). Use the parent LOK
notifier in that case (which would be a dialog).

This API should also help in autopopup filter tunneling later.

Change-Id: I63a2c97ffdd84695dc967e14c793089a7c50b41b

commit 65d1b6efa687179af6b09843f33ff2c02e2a8bf8
Author: Pranav Kant 
Date:   Fri Dec 1 00:37:11 2017 +0530

lokdialog: Do not underestimate the dialog size

Some of them like, EditStyle, can be much bigger.

Change-Id: Iaad02fadba18846976b959369f06e2020feffc6f

commit 04f29d8c6f12410b0526fa07852e49ce8560
Author: Pranav Kant 
Date:   Thu Nov 30 23:35:05 2017 +0530

lokdialog: Kill some code; use already existing method to paint

This is not require now in the new approach where the dialog is already
created by the time paint request call for dialog happens. Layouting is
already complete by that time.

Change-Id: I610b050a268e61e8d4036aa7eb5766cf0c8b37e0

commit 0002dfb6d723dfc7c29b5344240de4a525fa49a2
Author: Pranav Kant 
Date:   Wed Nov 29 17:47:10 2017 +0530

lokdialog: Allow closing a dialog from LOK client

... and rename paintDialog -> paintWindow before it's too late. We not
only render dialogs now but also popups.

Change-Id: I6b1253c4d9be0c79199b683df4413658a461f850

commit 3d5b550bd68a88f85f793aa2194932a61ecd8983
Author: Pranav Kant 
Date:   Tue Nov 28 16:43:54 2017 +0530

gtv: Remember recently executed UNO commands

Saves the recently executed UNO commands in a temp file and make it
accessible to user in a combo box. Useful when debugging.

Change-Id: Ic66961a388cc59dee3f65cb8d4de3c29a8a75eaa

commit c3353d23b1b069b7270fae825c777dfccc889939
Author: Pranav Kant 
Date:   Tue Nov 28 20:16:05 2017 +0530

gtv: Width, height properties should not be construct only

Change-Id: I2d1b29f52c1fe0449cf9afe47c509ef6250804a8

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

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   10 +---
 sw/qa/extras/rtfimport/rtfimport.cxx  |6 --
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   15 +-
 writerfilter/source/dmapper/PropertyMap.cxx   |   32 ++
 writerfilter/source/dmapper/PropertyMap.hxx   |4 +
 6 files changed, 54 insertions(+), 13 deletions(-)

New commits:
commit b360322c63d62b54b5e6adac4def3f8b761dc1da
Author: Justin Luth 
Date:   Mon Sep 18 14:57:47 2017 -0400

tdf#97648 ooxmlimport: calculate percentage-based widths

MSO seems to write 100% width horizontal lines with a
"suggested" width of 0, so we need to calculate what
the proper width is.

A better fix would be to add "percentage-width" support
to the shape class itself, but that complex enhancement
is way beyond my abilities.

Limiting the patch ONLY to shapes with an undefined
width because it otherwise slightly increases the
size of various other unit tests, and I'm not sure
if those are desirable changes or not. The list of
the unit tests is documented in the bug report.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx 
b/sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx
index 8419113f1617..686fd6803ade 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx and 
b/sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index dddc7b2b918c..66eda44719f8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -228,12 +228,10 @@ DECLARE_OOXMLEXPORT_TEST(tdf105490_negativeMargins, 
"tdf105490_negativeMargins.d
 
 
DECLARE_OOXMLEXPORT_TEST(testTdf97648_relativeWidth,"tdf97648_relativeWidth.docx")
 {
-int i = mbExported ? 0 : 1;
-//divide everything by 10 to avoid rounding errors etc
-CPPUNIT_ASSERT_EQUAL( sal_Int32(15995/10), 
getShape(++i)->getSize().Width/10);
-CPPUNIT_ASSERT_EQUAL( sal_Int32(8001/10),  
getShape(++i)->getSize().Width/10);
-CPPUNIT_ASSERT_EQUAL( sal_Int32(4001/10),  
getShape(++i)->getSize().Width/10);
-CPPUNIT_ASSERT_EQUAL( sal_Int32(1600/10),  
getShape(++i)->getSize().Width/10);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(7616), 
getShape(1)->getSize().Width, 10);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(8001), 
getShape(2)->getSize().Width, 10);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(4001), 
getShape(3)->getSize().Width, 10);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(1600), 
getShape(4)->getSize().Width, 10);
 }
 
 
DECLARE_OOXMLEXPORT_TEST(testTdf104061_tableSectionColumns,"tdf104061_tableSectionColumns.docx")
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index fabf17d152e9..b3bb4f4e0a5f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -418,11 +418,9 @@ DECLARE_RTFIMPORT_TEST(testFdo79319, "fdo79319.rtf")
 // the thin horizontal rule was imported as a big fat rectangle
 uno::Reference xShape(getShape(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int16(100), getProperty(xShape, 
"RelativeWidth"));
-// FIXME the width/height numbers here are bogus; they should be 15238 / 53
-// (as they are when opening the file in a full soffice)
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(15238), xShape->getSize().Width, 
10);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(53), xShape->getSize().Height, 10);
 #if 0
-CPPUNIT_ASSERT_EQUAL(sal_Int32(15238), xShape->getSize().Width);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(53), xShape->getSize().Height);
 CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, 
getProperty(xShape, "VertOrient"));
 CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER, 
getProperty(xShape, "HoriOrient"));
 #endif
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e5eee0325289..745daba638b8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2176,6 +2176,7 @@ void DomainMapper_Impl::PopShapeContext()
 // this is normal: the shape is already attached
 }
 
+const uno::Reference xShape( xObj, 
uno::UNO_QUERY_THROW );
 // Remove the shape if required (most likely replacement shape for OLE 
object)
 // or anchored to a discarded header or footer
 if ( m_aAnchoredStack.top().bToRemove || m_bDiscardHeaderFooter )
@@ -2185,15 +2186,23 @@ void DomainMapper_Impl::PopShapeContext()
 uno::Reference 
xDrawPa

[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source writerperfect/uiconfig

[Miklos Vajna]

 sw/inc/authratr.hxx |   10 ++---
 sw/source/core/access/accpara.cxx   |   16 
 sw/source/ui/config/optpage.cxx |   28 +++---
 sw/source/uibase/app/swmodul1.cxx   |   18 -
 sw/source/uibase/config/modcfg.cxx  |   62 
 sw/source/uibase/config/viewopt.cxx |6 +--
 writerperfect/uiconfig/ui/exportepub.ui |2 -
 7 files changed, 71 insertions(+), 71 deletions(-)

New commits:
commit b39b9b5822aa084cfa3ef85908c9cb504165277f
Author: Miklos Vajna 
Date:   Mon Dec 4 10:16:23 2017 +0100

EPUB export dialog: fix wrong string context

I forgot to update this after copy&paste.

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

diff --git a/writerperfect/uiconfig/ui/exportepub.ui 
b/writerperfect/uiconfig/ui/exportepub.ui
index da0124161652..86d82c64128e 100644
--- a/writerperfect/uiconfig/ui/exportepub.ui
+++ b/writerperfect/uiconfig/ui/exportepub.ui
@@ -422,7 +422,7 @@
 True
 False
 6
-Metadata
+Metadata
 True
 versionlb
 0
commit a36cab2b689b26bbf5374b4974e85c9f250b89e9
Author: Miklos Vajna 
Date:   Mon Dec 4 09:43:56 2017 +0100

sw: prefix members of AuthorCharAttr

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

diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 814e914f3f9d..1507e088addf 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -27,16 +27,16 @@
 class SW_DLLPUBLIC AuthorCharAttr
 {
 public:
-sal_uInt16  nItemId;
-sal_uInt16  nAttr;
-ColorData nColor;
+sal_uInt16  m_nItemId;
+sal_uInt16  m_nAttr;
+ColorData m_nColor;
 
 AuthorCharAttr();
 
 bool operator == ( const AuthorCharAttr& rAttr ) const
 {
-return  nItemId == rAttr.nItemId && nAttr == rAttr.nAttr &&
-nColor == rAttr.nColor;
+return  m_nItemId == rAttr.m_nItemId && m_nAttr == rAttr.m_nAttr &&
+m_nColor == rAttr.m_nColor;
 }
 };
 
diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 6a9d33767e35..4fb50f858d8d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2092,7 +2092,7 @@ void SwAccessibleParagraph::_correctValues( const 
sal_Int32 nIndex,
 break;
 }
 }
-switch( aChangeAttr.nItemId )
+switch( aChangeAttr.m_nItemId )
 {
 case SID_ATTR_CHAR_WEIGHT:
 ChangeAttr.Name = UNO_NAME_CHAR_WEIGHT;
@@ -2108,26 +2108,26 @@ void SwAccessibleParagraph::_correctValues( const 
sal_Int32 nIndex,
 break;
 case SID_ATTR_CHAR_UNDERLINE:
 ChangeAttr.Name = UNO_NAME_CHAR_UNDERLINE;
-ChangeAttr.Value <<= aChangeAttr.nAttr; //underline line
+ChangeAttr.Value <<= aChangeAttr.m_nAttr; //underline line
 break;
 }
-if( aChangeAttr.nColor != COL_NONE_COLOR )
+if( aChangeAttr.m_nColor != COL_NONE_COLOR )
 {
-if( aChangeAttr.nItemId == SID_ATTR_BRUSH )
+if( aChangeAttr.m_nItemId == SID_ATTR_BRUSH )
 {
 ChangeAttrColor.Name = UNO_NAME_CHAR_BACK_COLOR;
-if( aChangeAttr.nColor == COL_TRANSPARENT )//char backcolor
+if( aChangeAttr.m_nColor == COL_TRANSPARENT )//char backcolor
 ChangeAttrColor.Value <<= COL_BLUE;
 else
-ChangeAttrColor.Value <<= aChangeAttr.nColor;
+ChangeAttrColor.Value <<= aChangeAttr.m_nColor;
 }
 else
 {
 ChangeAttrColor.Name = UNO_NAME_CHAR_COLOR;
-if( aChangeAttr.nColor == COL_TRANSPARENT )//char color
+if( aChangeAttr.m_nColor == COL_TRANSPARENT )//char color
 ChangeAttrColor.Value <<= COL_BLUE;
 else
-ChangeAttrColor.Value <<= aChangeAttr.nColor;
+ChangeAttrColor.Value <<= aChangeAttr.m_nColor;
 }
 }
 }
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 1ce7ae23e78d..ccbed1e2e6ac 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1720,8 +1720,8 @@ namespace
 {
 CharAttr& rAttr(aRedlineAttr[pAttrMap[i]]);
 rLB.SetEntryData(i, &rAttr);
-if (rAttr.nItemId == rAttrToSelect.nItemId &&
-rAttr.nAttr == rAttrToSelect.nAttr)
+if (rAttr.nItemId == rAttrToSelect.m_nItemId &&
+rAttr.nAttr == rAttrToS

Re: min version of gtk3

[Caolán McNamara]

On Fri, 2017-12-01 at 13:31 +, Caolán McNamara wrote:
> On Fri, 2017-12-01 at 14:25 +0100, Jan-Marek Glogowski wrote:
> > You want to drop Gtk+ < 3.20.0 support in or after 6.0?
> 
> For me I was thinking for > 6.0, scarabeus (for suse) was wondering
> additionally about 6.0

I've bumped the min requirement to build and run to gtk3 3.18 and
propose to raise that to 3.20 for master if there's no objection to
that https://gerrit.libreoffice.org/#/c/45735/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 12ba14c6bee1c773e4500f79a90a07f871cf3feb
Author: Stephan Bergmann 
Date:   Mon Dec 4 14:48:36 2017 +0100

Honor GTK theming in LO flatpak

...according to alexlarson, for now (until "eventually we'll have a sane 
dconf
in the sandbox") apps need to specify --filesystem=xdg-run/dconf,
--filesystem=~/.config/dconf:ro, --talk-name=ca.desrt.dconf,
--env=DCONF_USER_CONFIG_DIR=.config/dconf (where the first two are 
irrelevant
for LO due to its --filesystem=host).

This fixes 
"Libreoffice flatpak is not respecting user theme".

Change-Id: If5ed33e1b524bfa877b89f052c6067398b5600a3

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 40621a67e1ea..fce711672617 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -392,8 +392,10 @@
 "--socket=wayland",
 "--socket=pulseaudio",
 "--filesystem=host",
+"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
+"--talk-name=ca.desrt.dconf",
 "--talk-name=org.gtk.vfs.*"
 ]
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] voting.git: configure.in vote/include

[Miklos Vajna]

 configure.in  |4 ++--
 vote/include/step4-commit.php |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9cc8d6505c546b9f7b8457bba723612b29d0a418
Author: Miklos Vajna 
Date:   Mon Dec 4 13:44:22 2017 +

Silence automake and php warnings

diff --git a/configure.in b/configure.in
index 7de36f7..14e038c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
-AC_INIT
-AM_INIT_AUTOMAKE(foundation-web, 0.1)
+AC_INIT(foundation-web, 0.1)
+AM_INIT_AUTOMAKE([foreign])
 
 AC_ARG_WITH(http_prefix, [  --with-http-prefix=DISTRIBUTOR  Specify http 
prefix for local testing, such as http://localhost/~user/gnomesites/])
 
diff --git a/vote/include/step4-commit.php b/vote/include/step4-commit.php
index 384b2b6..c68d423 100644
--- a/vote/include/step4-commit.php
+++ b/vote/include/step4-commit.php
@@ -38,7 +38,7 @@ function basic_vote_validation($votes_array) {
   $votes_set=array();
   foreach($votes_array as $vote) {
 // should probably check here again if the vote is still in the valid range
-if($votes_set[$vote] === true) {
+if(isset($votes_set[$vote]) && $votes_set[$vote] === true) {
   $error .= "preference for $vote cast twice. \n";
   return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: tools/map.cpp

[Pranav Kant]

 tools/map.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99a7f1f9929f66bdf483e5a4905fe5c9aef1b5dd
Author: Pranav Kant 
Date:   Mon Dec 4 19:03:06 2017 +0530

Fix build; no operator== on std::stringstream

I guess we wanted to match strings there.

Change-Id: I5b76435144ce931718cc758963e79de7d0f5a9ea

diff --git a/tools/map.cpp b/tools/map.cpp
index 5ef1b00a..a95455c1 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -177,7 +177,7 @@ static void dumpPages(unsigned proc_id, unsigned parent_id, 
const char *type, co
 std::stringstream parentStr;
 Util::dumpHex(parentStr, "", "", parentData, false);
 
-bool matchesParent = pageStr == parentStr;
+bool matchesParent = pageStr.str() == parentStr.str();
 const char *style;
 if (parentData.size() > 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 loleaflet/src/control/Control.Menubar.js |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 245cb007af729260af8d4f5d33eb0a8f3bccbd13
Author: Pranav Kant 
Date:   Mon Dec 4 18:53:40 2017 +0530

lokdialog: Add FormatCellDialog, EditStyle dialog commands to menubar

There is no exact menubar header as in calc, impress desktop version and
it doesn't look nice to create a new menubar header just for these
commands. So adjust them in most appropriate menubar headers for now.

Change-Id: Id52a2946904f0031168dcffcd0ab445f1a07a5bb

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index db3a68c2..8b061151 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -226,7 +226,9 @@ L.Control.Menubar = L.Control.extend({
{name: _('Paste'), type: 'unocommand', uno: 
'.uno:Paste'},
{name: _('Select all'), type: 'unocommand', 
uno: '.uno:SelectAll'},
{type: 'separator'},
-   {name: _('Find & Replace'), id: 
'.uno:SearchDialog', type: 'dialog'}
+   {name: _('Edit Style...'), type: 'dialog', id: 
'.uno:EditStyle'},
+   {type: 'separator'},
+   {name: _('Find & Replace'), id: 
'.uno:SearchDialog', id: 'dialog'}
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen', 
type: 'action'},
@@ -313,8 +315,10 @@ L.Control.Menubar = L.Control.extend({
{name: _('Insert column'), type: 'unocommand', 
uno: '.uno:InsertColumns'},
{type: 'separator'},
{name: _('Delete row'), type: 'unocommand', 
uno: '.uno:DeleteRows'},
-   {name: _('Delete column'), type: 'unocommand', 
uno: '.uno:DeleteColumns'}]
-   },
+   {name: _('Delete column'), type: 'unocommand', 
uno: '.uno:DeleteColumns'},
+   {type: 'separator'},
+   {name: _('Format'), type: 'dialog', id: 
'.uno:FormatCellDialog'},
+   ]},
{name: _('Data'), type: 'menu', menu: [
{name: _('Group'), type: 'unocommand', uno: 
'.uno:Group'},
{name: _('Ungroup'), type: 'unocommand', uno: 
'.uno:Ungroup'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt |binary
 sw/qa/extras/fodfexport/fodfexport.cxx |   13 +
 2 files changed, 13 insertions(+)

New commits:
commit 282bc5a824d103dcf4b19c9cf83698a2334e2e34
Author: Samuel Mehrbrodt 
Date:   Mon Dec 4 09:14:27 2017 +0100

Related tdf#113696 Unit test for Writer images fallback graphic

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

diff --git a/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt 
b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt
new file mode 100644
index ..f8aee0836011
Binary files /dev/null and 
b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt differ
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx 
b/sw/qa/extras/fodfexport/fodfexport.cxx
index 6cd00b49ba47..c79d0f35b420 100644
--- a/sw/qa/extras/fodfexport/fodfexport.cxx
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -40,5 +40,18 @@ DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
 }
 }
 
+DECLARE_FODFEXPORT_TEST(testTdf113696WriterImage, "tdf113696-writerimage.odt")
+{
+// Same as testTdf113696, but with a writer image instead of a draw image
+// (they use different code paths).
+if (xmlDocPtr pXmlDoc = parseExportedFile())
+{
+assertXPath(pXmlDoc, 
"/office:document/office:body/office:text/text:p/draw:frame/"
+ 
"draw:image[@loext:mime-type='image/x-vclgraphic']");
+assertXPath(pXmlDoc, 
"/office:document/office:body/office:text/text:p/draw:frame/"
+ "draw:image[@loext:mime-type='image/png']");
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit aa768bdbfd7442947cf0756f58c9bfe791ce047a
Author: Samuel Mehrbrodt 
Date:   Mon Dec 4 09:58:20 2017 +0100

xhtml export: Prefer svg if it's available

And not use the replacement graphic in this case.

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

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 9719932fcf2d..78d4117b1a84 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1483,10 +1483,12 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sw/source/core/graphic/ndgrf.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2d3023c9713c4c7cac732a6831c69dec581a7751
Author: Samuel Mehrbrodt 
Date:   Fri Dec 1 15:16:18 2017 +0100

Related tdf#72966 Provide replacement graphic also for metafiles

In 6b3cc69fd2b2de5ace68f2739eb383267d66f76f this was done for draw images,
this patch also implements this for Writer images.

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

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 98426d77745f..1ad720d0d2d5 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -404,9 +404,10 @@ const GraphicObject* SwGrfNode::GetReplacementGrfObj() 
const
 {
 const_cast< SwGrfNode* >(this)->mpReplacementGraphic = new 
GraphicObject(rVectorGraphicDataPtr->getReplacement());
 }
-else if (GetGrfObj().GetGraphic().getPdfData().hasElements())
+else if (GetGrfObj().GetGraphic().getPdfData().hasElements()
+ || GetGrfObj().GetGraphic().GetType() == 
GraphicType::GdiMetafile)
 {
-// This returns the bitmap, without the pdf data.
+// Replacement graphic for PDF and metafiles is just the bitmap.
 const_cast(this)->mpReplacementGraphic = new 
GraphicObject(GetGrfObj().GetGraphic().GetBitmapEx());
 }
 if (mpReplacementGraphic)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Content is not visible on Android Viewer

[Christian Lohmaier]

Hi Mert, *,

On Wed, Nov 15, 2017 at 10:27 AM, Mert Tümer  wrote:
> Hello,
>
> Is there anyone working on this bug:
> https://bugs.documentfoundation.org/show_bug.cgi?id=111871

A workaround has been merged now.

> or does anyone know what caused this?

As mentioned previously: the commit that broke it was identified
rather early, but nobody really had time to investigate more.

> It seems to be a major bug.

It surely was, it was blocking quite a few things, not only for you..

> I was
> contributing to the Android Viewer but due to this i can't really work on
> anything.

I tracked that down a litte more to that simple workaround patch that
disables the problematic code, so it should not block you anymore (and
having that new anchorpoint will hopefully make properly
fixing/debugging the problem easier than just knowing the initial
commit).

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

jenkins for master: successful linux builds now prerequisite for triggering mac and win

[Christian Lohmaier]

Hi *,

hard to put it into a concise summary, but hopefully this will explain:

Since the jenkins linux-clang bot now has code-style checks in place,
it's a waste to wait for the slow windows and mac build results in
case the build fails because of a code-style issue.

Thus to enable that, the gerrit configurations have been split into
the individual branches and master/feature-branches.

So what does it mean for you?

0) you commit a change to gerrit for master (or a feature-branch)
1) jenkins will trigger the linux builders
2 a) both linux builders finish with success → win and mac builds are triggered.
2 b) one (or both) of the linux builds fail) → jenkins will
immediately report failure and not trigger win or mac

2a) assuming an empty build-queue/buildslaves would be available:
this delay time to get results for about 15-20 minutes (the typical
build time of the clang builder)
in reality though the win/mac builders would be busy, and would not be
available right away to build in parallel with the linux ones anyway.

2b) now instead of waiting 90 minutes or more, you get failure notice
right away, and more importantly don't "steal"/waste buildtime on
mac/win - those can build other changesets in the meantime

*** ATTENTION ***
What might be irritating/misleading with this is the jenkins results page.
take e.g. https://jenkins.libreoffice.org/job/lo_gerrit/23517/ that
one failed in the linux stage, and while it shows the dots for mac and
win, those are pale/lighter and their color doesn't have any meaning
whatsoever for the current changeset (just shows result from the
previous gerrit build)

(So please don't even try overrule verification like "linux build
breaker is from master/not my change and others are fine, so
overruling verification" - the point is that others are unknown. You
must not confuse the pale dots with actual results, even when they are
not blinking :-))


The config for the release-branches doesn't have those so-called
"touchdown" builds first, they trigger all builds at once, as
code-style is assumed to be verified on the corresponding master
commit(s) already.

Another change re jenkins was that new patch revisions now
automatically cancel/abort previous patchsets. So if you're interested
in the build-result of a currently-building patchset, you need to wait
with your rebase/changes, as the build would otherwise be aborted.

If you're still reading this: Whilst doing the above changes, there
were some hiccups in the windows builds for the release-branch
verification. Specifically the windows builders did break with a
failing testArabic test in vcl.
Turns out that this was due to a longer pathname (3 characters more
than the plain gerrit one) - why a font-metric check would fail due to
path name length is the real question, but to get builds running the
paths were shortened for the release-branch config.
Also a new mac builder was added (thanks Thorsten) that had some
initial problems, but those should also be resolved now. To avoid
having connection cuts right in the middle of a build (causing it to
be marked as failed), that box is on a schedule (active from 6 am to
9pm) so it is normal for it to be listed as "suspended" during the
off-ours.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/breakpad

[Stephan Bergmann]

 external/breakpad/UnpackedTarball_breakpad.mk |1 
 external/breakpad/ucontext.patch  |  194 ++
 2 files changed, 195 insertions(+)

New commits:
commit c0a8bc9e314dcf476e5078035ffed73a9b6f2314
Author: Stephan Bergmann 
Date:   Tue Nov 14 18:21:22 2017 +0100

Use proper ucontext_t in external/breakpad

SUSv4 merely claims that ucontext_t is defined as a structure type (in
), and at least /usr/include/sys/ucontext.h in
glibc-headers-2.26-15.fc27.x86_64 now defines it as

  typedef struct ucontext_t { ... } ucontext_t;

instead of as

  typedef struct ucontext { ... } ucontext_t;

as was done in older glibc, so referring to it as "struct ucontext" (C/C++) 
or
"ucontext" (C++) no longer works.

Change-Id: I3d515a4ce7e5a49d0277136cad2b982bdf799ac5
(cherry picked from commit 935f76d0edeb0025dee39f95e1f0bc1a840e316e)
Reviewed-on: https://gerrit.libreoffice.org/45785
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/external/breakpad/UnpackedTarball_breakpad.mk 
b/external/breakpad/UnpackedTarball_breakpad.mk
index 108004ddee36..e970bd5ad3f3 100644
--- a/external/breakpad/UnpackedTarball_breakpad.mk
+++ b/external/breakpad/UnpackedTarball_breakpad.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
external/breakpad/breakpad-wshadow.patch.1 \
external/breakpad/breakpad-wshadow2.patch.1 \
external/breakpad/breakpad-stackwalk.patch.1 \
+   external/breakpad/ucontext.patch \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/breakpad/ucontext.patch b/external/breakpad/ucontext.patch
new file mode 100644
index ..a108ae11cd59
--- /dev/null
+++ b/external/breakpad/ucontext.patch
@@ -0,0 +1,194 @@
+--- src/client/linux/dump_writer_common/ucontext_reader.cc
 src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -40,15 +40,15 @@
+ 
+ #if defined(__i386__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_ESP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_EIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fp) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -88,15 +88,15 @@
+ 
+ #elif defined(__x86_64)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RSP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fpregs) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -145,15 +145,15 @@
+ 
+ #elif defined(__ARM_EABI__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) 
{
+   out->context_flags = MD_CONTEXT_ARM_FULL;
+ 
+   out->iregs[0] = uc->uc_mcontext.arm_r0;
+@@ -184,15 +184,15 @@
+ 
+ #elif defined(__aarch64__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct fpsimd_context* fpregs) {
+   out->context_flags = MD_CONTEXT_ARM64_FULL;
+ 
+@@ -210,15 +210,15 @@
+ 
+ #elif defined(__mips__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   

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

[Tamás Zolnai]

 sw/source/core/layout/frmtool.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit db51a3721b5e52afc1bd54bfef7f03e895a2670e
Author: Tamás Zolnai 
Date:   Sun Dec 3 21:00:37 2017 +0100

tdf#74693: Footnotes text appearing above footnote separator line

When invalidate a footnoteframe, invalidate also the lower textframe,
so it will be recalculated before text rendering.

Change-Id: I5fd29bdad4afae4947e0701e5727482958453d03
Reviewed-on: https://gerrit.libreoffice.org/45756
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit a172f854b6e1d61bf0fe0fe4efc3058bb7a760bf)
Reviewed-on: https://gerrit.libreoffice.org/45765
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 70c1409a0dc0..f94b859474ed 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -560,7 +560,11 @@ SwLayNotify::~SwLayNotify()
 const bool bSize = pLay->Frame().SSize() != maFrame.SSize();
 
 if ( bPos && pLay->Lower() && !IsLowersComplete() )
+{
 pLay->Lower()->InvalidatePos();
+if(pLay->Lower()->IsFootnoteFrame())
+
static_cast(pLay->Lower())->Lower()->InvalidatePos();
+}
 
 if ( bPrtPos )
 pLay->SetCompletePaint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - cui/inc cui/source

[Muhammet Kara]

 cui/inc/strings.hrc |2 
 cui/source/customize/CommandCategoryListBox.cxx |  215 ++--
 cui/source/inc/CommandCategoryListBox.hxx   |5 
 3 files changed, 211 insertions(+), 11 deletions(-)

New commits:
commit 3b12778af71951bfce321c73509e8b0c59b02853
Author: Muhammet Kara 
Date:   Mon Nov 27 21:10:21 2017 +0300

tdf#112207: Allow assigning macros to ui elements

* Adds "Macros" category to the categories list

* Search/filter feature now works also on the macros category

* Since macros category has multiple trees and subtrees, and many leaf
  elements (macros). I chose to implement the behavior like this:

  If there is no filter/search term, the trees will be presented as in the 
old
  macro selector dialog (collapsed), but if user types a search term, then
  filtering happens: non-matching elements and empty containers/(sub)trees
  are removed and everything is expanded so that user easily sees what
  (s)he is looking for.

Change-Id: I1a93f156a7293c7e61baac882a10ff631961e2af
Reviewed-on: https://gerrit.libreoffice.org/44938
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 3f2915c40fcc42ac91f2019fd506bfbdd1e5933f)
Reviewed-on: https://gerrit.libreoffice.org/45779

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index dca50c2cd57a..27dd89ba48d1 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -89,8 +89,10 @@
 #define RID_SVXSTR_ERR_TEXTNOTFOUND 
NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.")
 #define RID_SVXSTR_SELECT_FILE_IFRAME   
NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame")
 #define RID_SVXSTR_ALLFUNCTIONS 
NC_("RID_SVXSTR_ALLFUNCTIONS", "All categories")
+#define RID_SVXSTR_MACROS   NC_("RID_SVXSTR_MACROS", 
"Macros")
 #define RID_SVXSTR_MYMACROS NC_("RID_SVXSTR_MYMACROS", 
"My Macros")
 #define RID_SVXSTR_PRODMACROS   
NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
+#define RID_SVXSTR_NOMACRODESC  
NC_("RID_SVXSTR_NOMACRODESC", "There is no description available for this 
macro.")
 #define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
 #define RID_SVXSTR_SELECTOR_RUN 
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
 #define RID_SVXSTR_ROW  NC_("RID_SVXSTR_ROW", 
"Insert Rows")
diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 1763196db5ab..ae100bf0bc03 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -20,9 +20,15 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 // include search util
@@ -65,8 +71,7 @@ void CommandCategoryListBox::dispose()
 
 void CommandCategoryListBox::ClearAll()
 {
-//TODO: Handle SfxCfgKind::GROUP_SCRIPTCONTAINER when it gets added to Init
-// Clear style info objects from m_aGroupInfo vector to avoid memory leak
+// Clear objects from m_aGroupInfo vector to avoid memory leak
 for (const auto & It : m_aGroupInfo)
 {
 if ( It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject )
@@ -74,6 +79,19 @@ void CommandCategoryListBox::ClearAll()
 SfxStyleInfo_Impl* pStyle = 
static_cast(It->pObject);
 delete pStyle;
 }
+else if ( It->nKind == SfxCfgKind::FUNCTION_SCRIPT && It->pObject )
+{
+OUString* pScriptURI = static_cast(It->pObject);
+delete pScriptURI;
+}
+else if ( It->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER && 
It->pObject)
+{
+css::uno::XInterface* xi = static_cast(It->pObject);
+if (xi != nullptr)
+{
+xi->release();
+}
+}
 }
 
 m_aGroupInfo.clear();
@@ -85,6 +103,7 @@ void CommandCategoryListBox::Init(
 const css::uno::Reference< css::frame::XFrame >& xFrame,
 const OUString& sModuleLongName)
 {
+// User will not see incomplete UI
 SetUpdateMode(false);
 ClearAll();
 
@@ -107,7 +126,6 @@ void CommandCategoryListBox::Init(
 m_aStylesInfo.init(sModuleLongName, xModel);
 SetStylesInfo(&m_aStylesInfo);
 
-/ InitModule Start /
 try
 {
 css::uno::Reference< css::frame::XDispatchInformationProvider > 
xProvider(m_xFrame, css::uno::UNO_QUERY_THROW);
@@ -143,23 +161,32 @@ void CommandCategoryListBox::Init(
 }
 
 nEntryPos = InsertEntry( sGroupName );
-m_aGroupInfo.push_back( o3tl::make_unique( 
SfxCfgKind::GROUP_FUNCTION, rGroupID ) );
+m_aGroupInfo.push_back(
+

[Libreoffice-commits] core.git: 9 commits - desktop/source include/LibreOfficeKit include/sfx2 include/vcl libreofficekit/qa libreofficekit/source sc/source sfx2/source vcl/source

[Pranav Kant]

 desktop/source/lib/init.cxx |  110 
+-
 include/LibreOfficeKit/LibreOfficeKit.h |   32 -
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   58 ---
 include/LibreOfficeKit/LibreOfficeKitEnums.h|   27 -
 include/sfx2/lokhelper.hxx  |7 
 include/sfx2/viewsh.hxx |1 
 include/vcl/IDialogRenderable.hxx   |2 
 include/vcl/dialog.hxx  |5 
 include/vcl/floatwin.hxx|2 
 include/vcl/window.hxx  |5 
 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |   46 +-
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx |4 
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx |  179 
+-
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx |6 
 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx |  107 
++---
 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx |3 
 libreofficekit/source/gtk/lokdocview.cxx|   55 ---
 sc/source/ui/view/gridwin.cxx   |3 
 sfx2/source/dialog/basedlgs.cxx |8 
 sfx2/source/dialog/tabdlg.cxx   |1 
 sfx2/source/view/lokhelper.cxx  |   26 -
 sfx2/source/view/viewsh.cxx |7 
 vcl/source/control/ctrl.cxx |   22 -
 vcl/source/window/dialog.cxx|   23 -
 vcl/source/window/floatwin.cxx  |   39 +-
 vcl/source/window/window.cxx|   86 +---
 26 files changed, 313 insertions(+), 551 deletions(-)

New commits:
commit 59e6230d1c2c71148309f2a292a4143e7bc0e3fc
Author: Pranav Kant 
Date:   Mon Dec 4 13:58:44 2017 +0530

lokdialog: sc: Guard autofilter popup's LOK notification

Change-Id: I8d39a701618926e35c84f200ac7e2ce66e62b8b7

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c5ff3fa47721..d19d5a4c5abc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -627,7 +627,8 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 
 mpAutoFilterPopup.disposeAndClear();
 mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
-mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
+if (comphelper::LibreOfficeKit::isActive())
+mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
 mpAutoFilterPopup->setPopupEndAction(
 new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab)));
commit 727c2303cb70a62a35f2e7ff7cd47cdb3ccd556d
Author: Pranav Kant 
Date:   Sat Dec 2 02:47:38 2017 +0530

lokdialog: multiview: Do not mix one view with other

In GTV, use correct application window object to fetch the dialog
object.

Use correct view shell to notify window (dialogs, etc.) callbacks.

Change-Id: I7d82b39d4522a4b4904e156757a032c342c71efb

diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index f342b502e810..52c9b9763eae 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -42,7 +42,8 @@ public:
 /// Same as notifyOtherViews(), but works on a selected "other" view, not 
on all of them.
 static void notifyOtherView(SfxViewShell* pThisView, SfxViewShell const* 
pOtherView, int nType, const OString& rKey, const OString& rPayload);
 /// Emits a LOK_CALLBACK_WINDOW
-static void notifyWindow(vcl::LOKWindowId nWindowId,
+static void notifyWindow(const SfxViewShell* pThisView,
+ vcl::LOKWindowId nWindowId,
  const OUString& rAction,
  const std::vector& rPayload 
= std::vector());
 /// Emits a LOK_CALLBACK_INVALIDATE_TILES, but tweaks it according to 
setOptionalFeatures() if needed.
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index f58884c79207..d9c709604a28 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -315,7 +315,7 @@ static void setupDocView(GtvApplicationWindow* window)
 g_signal_connect(window->lokdocview, "formula-changed", 
G_CALLBACK(LOKDocViewSigHandlers::formulaChanged), nullptr);
 g_signal_connect(window->lokdocview, "password-required", 
G_CALLBACK(LOKDocViewSigHandlers::passwordR

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/icu

[Eike Rathke]

 external/icu/UnpackedTarball_icu.mk|1 +
 external/icu/icu4c-59-icu13329-xlocale.patch.1 |   14 ++
 2 files changed, 15 insertions(+)

New commits:
commit fbdb8df922080d4c1564be50e3c3ed36f338ad1e
Author: Eike Rathke 
Date:   Wed Sep 13 13:42:29 2017 +0200

icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASED

... should be more platforms ... but be conservative.
U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises.

"The file and this data structure is not standardized.  Don't rely on it.  
It
can go away without warning."

...

And since glibc 2.26 it's gone.

https://ssl.icu-project.org/trac/ticket/13329

Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a
(cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b)
Reviewed-on: https://gerrit.libreoffice.org/45786
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index cffdcdec3cc8..304d71399561 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/khmerbreakengine.patch \
external/icu/icu4c-changeset-39671.patch.1 \
external/icu/icu4c-changeset-40324.patch.1 \
+   external/icu/icu4c-59-icu13329-xlocale.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-59-icu13329-xlocale.patch.1 
b/external/icu/icu4c-59-icu13329-xlocale.patch.1
new file mode 100644
index ..34d4eb56d884
--- /dev/null
+++ b/external/icu/icu4c-59-icu13329-xlocale.patch.1
@@ -0,0 +1,14 @@
+# xlocale.h is gone with glibc 2.26 and should never had been included.
+# https://ssl.icu-project.org/trac/ticket/13329
+diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
+--- icu.org/source/i18n/digitlst.cpp   2017-01-20 01:20:31.0 +0100
 icu/source/i18n/digitlst.cpp   2017-09-13 13:25:59.980160603 +0200
+@@ -63,6 +63,8 @@
+ #if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
+ # if U_PLATFORM == U_PF_CYGWIN
+ #   include 
++# elif U_PLATFORM_IS_LINUX_BASED
++#   include// should be for all POSIX.2008 compliant platforms, 
but..
+ # else
+ #   include 
+ # endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 loleaflet/src/control/Control.ColumnHeader.js |5 ++---
 loleaflet/src/control/Control.Header.js   |   17 +
 loleaflet/src/control/Control.RowHeader.js|1 -
 3 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit a7581752a2c54c01ab51c1d5852f17eaad755220
Author: Marco Cecchetti 
Date:   Sat Dec 2 16:42:31 2017 +0100

loleaflet: calc: some small fixes

- the very last col/row (CTRL+RIGHT/DOWN) had no header
- in some cases DataImpl.getNext() didn't catch that there was no more
header ranges
- parent group of a collapsed group spanning exactly the same range
was not drawn correctly
- removed some console.log code lines
- fixed some typos

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

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index ae95f183..7b0a25ab 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -406,11 +406,11 @@ L.Control.ColumnHeader = L.Control.Header.extend({
this._data.pushBack(index, headerEntry);
}
 
-   // setup last header headerEntry
+   // setup last header entry
index = nextIndex - this._startHeaderIndex;
pos = parseInt(columns[last].size);
width = pos - prevPos;
-   this._data.pushBack(index, {pos: pos, size: pos - width});
+   this._data.pushBack(index, {pos: pos, size: width});
 
// collect group controls data
if (colGroups !== undefined && this._groups) {
@@ -652,7 +652,6 @@ L.Control.ColumnHeader = L.Control.Header.extend({
var deltaTop = height - this._canvas.height;
var rowHdrTop = parseInt(L.DomUtil.getStyle(rowHeader, 'top')) 
+ deltaTop;
var docTop = parseInt(L.DomUtil.getStyle(document, 'top')) + 
deltaTop;
-   console.log('resize: height: ' + height + ', deltaTop: ' + 
deltaTop + ', rowHdrTop: ' + rowHdrTop + ', docTop: ' + docTop);
L.DomUtil.setStyle(rowHeader, 'top', rowHdrTop + 'px');
L.DomUtil.setStyle(document, 'top', docTop + 'px');
 
diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 4bb38769..e77c7799 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -555,7 +555,7 @@ L.Control.Header = L.Control.extend({
var startPos = 
this._twipsToPixels(parseInt(groupData.startPos));
var endPos = 
this._twipsToPixels(parseInt(groupData.endPos));
var isHidden = !!parseInt(groupData.hidden);
-   if (isHidden) {
+   if (isHidden || startPos === endPos) {
startPos -= this._groupHeadSize / 2;
endPos = startPos + this._groupHeadSize;
}
@@ -699,7 +699,7 @@ L.Control.Header = L.Control.extend({
return null; // you need to call getFirst on 
initial step
 
this._currentIndex += 1;
-   if (this._currentIndex >= this._endIndex) {
+   if (this._currentIndex > this._endIndex) {
// we iterated over all entries, reset 
everything
this._currentIndex = undefined;
this._currentRange = undefined;
@@ -719,8 +719,17 @@ L.Control.Header = L.Control.extend({
break;
}
}
-   this._currentRange = i;
-   this._currentIndex = index;
+   if (i < len) {
+   this._currentRange = i;
+   this._currentIndex = index;
+   }
+   else {
+   // we iterated over all 
entries, reset everything
+   this._currentIndex = undefined;
+   this._currentRange = undefined;
+   this._skipZeroSize = false;
+   return null;
+   }
}
}
 
diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index 1eed7cd0

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

[Marco Cecchetti]

 sc/source/ui/view/tabview.cxx |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

New commits:
commit adac52d22b5cddaa3fd025fe13634df59a6beb49
Author: Marco Cecchetti 
Date:   Sat Dec 2 17:42:54 2017 +0100

lok: calc: fix: the last col/row headers were not collected

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

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7161edb75525..8676d1cad5c6 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2574,9 +2574,9 @@ void lcl_getGroupIndexes(const ScOutlineArray& rArray, 
SCCOLROW nStart, SCCOLROW
 {
 if (rArray.GetCount(nLevel))
 {
-// look for a group inside the [nStartRow+1, nEndRow-1] range
+// look for a group inside the [nStartRow+1, nEndRow] range
 size_t nIndex;
-bool bFound = rArray.GetEntryIndexInRange(nLevel, nStart + 1, nEnd 
- 1, nIndex);
+bool bFound = rArray.GetEntryIndexInRange(nLevel, nStart + 1, 
nEnd, nIndex);
 if (bFound)
 {
 if (nIndex > 0)
@@ -2596,8 +2596,8 @@ void lcl_getGroupIndexes(const ScOutlineArray& rArray, 
SCCOLROW nStart, SCCOLROW
 bFound = rArray.GetEntryIndex(nLevel, nStart + 1, nIndex);
 if (!bFound)
 {
-// look for a group which contains nEndRow-1
-bFound = rArray.GetEntryIndex(nLevel, nEnd - 1, nIndex);
+// look for a group which contains nEndRow
+bFound = rArray.GetEntryIndex(nLevel, nEnd, nIndex);
 }
 }
 
@@ -2613,7 +2613,7 @@ void lcl_getGroupIndexes(const ScOutlineArray& rArray, 
SCCOLROW nStart, SCCOLROW
 bFound = true;
 break;
 }
-if (pEntry && pEntry->GetStart() > nEnd - 1)
+if (pEntry && pEntry->GetStart() > nEnd)
 {
 break;
 }
@@ -2649,16 +2649,17 @@ void lcl_createGroupsData(
 {
 rGroupStartPositions[nLevel] = nTotalTwips - nSizePx * 
TWIPS_PER_PIXEL;
 }
-else if (nHeaderIndex > pEntry->GetStart() && (nHeaderIndex < nEnd 
- 1 && nHeaderIndex < pEntry->GetEnd()))
+else if (nHeaderIndex > pEntry->GetStart() && (nHeaderIndex < nEnd 
&& nHeaderIndex < pEntry->GetEnd()))
 {
 // for handling group started before the current view range
 if (rGroupStartPositions[nLevel] < 0)
 rGroupStartPositions[nLevel] *= -TWIPS_PER_PIXEL;
 break;
 }
-if (nHeaderIndex == pEntry->GetEnd() || (nHeaderIndex == nEnd - 1 
&& rGroupStartPositions[nLevel] != -1))
+if (nHeaderIndex == pEntry->GetEnd() || (nHeaderIndex == nEnd && 
rGroupStartPositions[nLevel] != -1))
 {
-// nRow is the end row of a group or is the last row and a 
group started and not yet ended
+// nHeaderIndex is the end col/row of a group or is the last 
col/row and a group started and not yet ended
+
 // append a new group control data
 if (rGroupsBuffer.endsWith("}"))
 {
@@ -2835,7 +2836,7 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle& 
rRectangle)
 aRowGroupsBuffer += "\"rowGroups\": [\n";
 std::vector aRowGroupStartPositions(nRowGroupDepth, -nTotalPixels);
 long nPrevSizePx = -1;
-for (SCROW nRow = nStartRow + 1; nRow < nEndRow; ++nRow)
+for (SCROW nRow = nStartRow + 1; nRow <= nEndRow; ++nRow)
 {
 // nSize will be 0 for hidden rows.
 const long nSizePx = lcl_GetRowHeightPx(pDoc, nRow, nTab);
@@ -2848,7 +2849,7 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle& 
rRectangle)
 *pRowArray, aRowGroupIndexes, aRowGroupStartPositions, 
aRowGroupsBuffer);
 }
 
-if (nRow < nEndRow - 1 && nSizePx == nPrevSizePx)
+if (nRow < nEndRow && nSizePx == nPrevSizePx)
 continue;
 nPrevSizePx = nSizePx;
 
@@ -2974,7 +2975,7 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle& 
rRectangle)
 aColGroupsBuffer += "\"columnGroups\": [\n";
 std::vector aColGroupStartPositions(nColGroupDepth, -nTotalPixels);
 nPrevSizePx = -1;
-for (SCCOL nCol = nStartCol + 1; nCol < nEndCol; ++nCol)
+for (SCCOL nCol = nStartCol + 1; nCol <= nEndCol; ++nCol)
 {
 // nSize will be 0 for hidden columns.
 const long nSizePx = lcl_GetColWidthPx(pDoc, nCol, nTab);
@@ -2987,7 +2988,7 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle& 
rRectangle)
 *pColArray, aColGroupIndexes, aColGroupStartPosi

Re: BUILD FAIL WITH LIBREOFFICE ANDROID

[Christian Lohmaier]

On Tue, Nov 28, 2017 at 12:09 PM, Mert Tümer  wrote:
> Hello,
>
> I am getting this error while building libreoffice with the android viewer:
>
>
> [build MAK] CustomTarget/android/source/done
> make[2]: Warning: File '/home/mert/libreoffice/config_build.mk' has
> modification time 5720 s in the future

don't mess around with system time so much, while unrelated to the
poblem with icudata, that can cause all kinds of other issues.

> creating liboSettings.gradle
> Linking obj/local/armeabi-v7a/liblo-native-code.so
> /home/mert/libreoffice/workdir/UnpackedTarball/icu/source/lib/libicuuc.a(udata.ao):udata.cpp:function
> openCommonData(char const*, int, UErrorCode*): error: undefined reference to
> 'icudt60_dat'
> […]
> Why am i getting this

because icu doesn't build the data if you disable building icu tools...

> and is there anything i can do to fix this?

use current master that tells it to build the icudata nevertheless.
( https://gerrit.libreoffice.org/#/c/45107/ )

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

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

[Marco Cecchetti]

 sc/source/ui/view/gridwin4.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0b8dc9678c65451048613dba22d370bad3b5c2f7
Author: Marco Cecchetti 
Date:   Sat Dec 2 17:19:33 2017 +0100

lok: calc: fix: CTRL+RIGHT => crash

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

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 13b82122d6fd..4283785c4fb7 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1088,7 +1088,8 @@ namespace {
 {
 long nTmp = 0; // row/col to render for nPosition
 long nLastScrPos = 0, nScrPos = 0;
-while (nScrPos <= nPosition && nTmp < MAXROW)
+const long nMaxIndex = bRowNotCol ? MAXROW : MAXCOL;
+while (nScrPos <= nPosition && nTmp < nMaxIndex)
 {
 long nSize = bRowNotCol ? pDoc->GetRowHeight( nTmp, nTabNo )
 : pDoc->GetColWidth( nTmp, nTabNo );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Weekly QA Report (W48-2017)

[Xisco Fauli]

Hello,

What have happened in QA in the last 7 days?

  * 144 bugs have been created, of which, 24 are still unconfirmed (
Total Unconfirmed bugs: 358 )
    Link: http://tinyurl.com/yaymvzz3

  * 1209 comments have been written.

== STATUSES CHANGED ==
  * 3 bugs have been changed to 'RESOLVED WONTFIX'.
    Link: http://tinyurl.com/yd9xdz7b
    Done by: Heiko Tietze ( 2 ), Buovjaga ( 1 )

  * 19 bugs have been changed to 'NEEDINFO'.
    Link: http://tinyurl.com/yb4naxsr
    Done by: Xisco Faulí ( 6 ), Buovjaga ( 3 ), Heiko Tietze ( 2 ), Alex
Thurgood ( 2 ), Aron Budea ( 2 ), Kevin Suo ( 1 ), Muhammet Kara ( 1 ),
Alex ARNAUD ( 1 ), Alessandro ( 1 )

  * 5 bugs have been changed to 'RESOLVED NOTABUG'.
    Link: http://tinyurl.com/yaurvdm2
    Done by: V Stuart Foote ( 1 ), Gustavo Pinsard ( 1 ), m.a.riosv ( 1
), Papamatti ( 1 ), Keith ( 1 )

  * 96 bugs have been changed to 'NEW'.
    Link: http://tinyurl.com/y8b3z8k3
    Done by: Buovjaga ( 24 ), Xisco Faulí ( 13 ), Kevin Suo ( 10 ),
Jacques Guilleron ( 9 ), Alex Thurgood ( 6 ), Heiko Tietze ( 5 ), Aron
Budea ( 5 ), Dieter Praas ( 4 ), Yousuf Philips (jay) ( 3 ), V Stuart
Foote ( 2 ), raal ( 2 ), Harald Koester ( 2 ), Timur ( 2 ), Tran Ngoc
Thinh ( 1 ), Thomas Krumbein ( 1 ), Telesto ( 1 ), Regina Henschel ( 1
), Mike Kaganski ( 1 ), m.a.riosv ( 1 ), martin.lund ( 1 ), Lior Kaplan
( 1 ), Adolfo Jayme ( 1 )

  * 9 bugs have been changed to 'UNCONFIRMED'.
    Link: http://tinyurl.com/ydhjbzoy
    Done by: Buovjaga ( 2 ), Kevin Suo ( 1 ), l2683566 ( 1 ), Jay
Michael ( 1 ), jan.prochaska ( 1 ), gmolleda ( 1 ), Aron Budea ( 1 ),
Joerg ( 1 )

  * 3 bugs have been changed to 'RESOLVED NOTOURBUG'.
    Link: http://tinyurl.com/yatwlnh3
    Done by: Khaled Hosny ( 1 ), Alex Thurgood ( 1 ), Caolán McNamara ( 1 )

  * 6 bugs have been changed to 'REOPENED'.
    Link: http://tinyurl.com/yd3xbl5z
    Done by: Heiko Tietze ( 1 ), Volga ( 1 ), Ilya Melnikov ( 1 ),
Norbert X ( 1 ), jerryzihye ( 1 ), Karsten ( 1 )

  * 1 bug has been changed to 'CLOSED'.
    Link: http://tinyurl.com/y8t3nwpf
    Done by: Eike Rathke ( 1 )

  * 5 bugs have been changed to 'VERIFIED FIXED'.
    Link: http://tinyurl.com/yaldnnxd
    Done by: Xisco Faulí ( 3 ), Timur ( 1 ), Aron Budea ( 1 )

  * 31 bugs have been changed to 'RESOLVED WORKSFORME'.
    Link: http://tinyurl.com/y7amdrqu
    Done by: Xisco Faulí ( 3 ), Buovjaga ( 3 ), Kevin Suo ( 3 ),
odinatlas ( 3 ), Heiko Tietze ( 2 ), tim ( 1 ), Thorsten Wagner ( 1 ),
Thomas Woltjer ( 1 ), Volga ( 1 ), robert ( 1 ), Yousuf Philips (jay) (
1 ), Rubem ( 1 ), paulystefan ( 1 ), Muhammet Kara ( 1 ), m.a.riosv ( 1
), Timur ( 1 ), Cor Nouws ( 1 ), Chris Sherlock ( 1 ), Mike ( 1 ), Aron
Budea ( 1 ), Alex ARNAUD ( 1 ), Junichi Matsukawa ( 1 )

  * 18 bugs have been changed to 'ASSIGNED'.
    Link: http://tinyurl.com/yb5zum3e
    Done by: Xisco Faulí ( 5 ), Yousuf Philips (jay) ( 2 ), Gabor
Kelemen ( 2 ), Bartosz ( 2 ), Miklos Vajna ( 1 ), Heiko Tietze ( 1 ),
rking ( 1 ), kurtaazz ( 1 ), Laurent BP ( 1 ), Adolfo Jayme ( 1 ),
Dennis Francis ( 1 )

  * 43 bugs have been changed to 'RESOLVED FIXED'.
    Link: http://tinyurl.com/ydya35v8
    Done by: Tamás Zolnai ( 5 ), Heiko Tietze ( 5 ), Caolán McNamara ( 4
), Xisco Faulí ( 2 ), Andras Timar ( 2 ), Mark Hung ( 2 ), Eike Rathke (
2 ), Aron Budea ( 2 ), Winfried Donkers ( 1 ), V Stuart Foote ( 1 ),
Vasily Melenchuk (CIB) ( 1 ), Szymon Kłos ( 1 ), Stephan Bergmann ( 1 ),
Samuel Mehrbrodt (CIB) ( 1 ), Rene Engelhard ( 1 ), Yousuf Philips (jay)
( 1 ), paulystefan ( 1 ), Muhammet Kara ( 1 ), Martin Srebotnjak ( 1 ),
Mike Kaganski ( 1 ), Kü ( 1 ), Jan Holesovsky ( 1 ), Gabor Kelemen ( 1
), Harald Koester ( 1 ), Bartosz ( 1 ), David Tardon ( 1 ), Daniel Silva
( 1 )

  * 37 bugs have been changed to 'RESOLVED DUPLICATE'.
    Link: http://tinyurl.com/y86rdmut
    Done by: Kevin Suo ( 5 ), Buovjaga ( 4 ), Aron Budea ( 4 ), V Stuart
Foote ( 3 ), Gabor Kelemen ( 3 ), Jacques Guilleron ( 3 ), Xisco Faulí (
2 ), Telesto ( 2 ), Regina Henschel ( 2 ), Yousuf Philips (jay) ( 2 ),
Mike Kaganski ( 2 ), m.a.riosv ( 2 ), Heiko Tietze ( 1 ), Alex Thurgood
( 1 ), gmolleda ( 1 )

  * 4 bugs have been changed to 'RESOLVED INVALID'.
    Link: http://tinyurl.com/yboed3dp
    Done by: Telesto ( 1 ), Shyukri Shyukriev ( 1 ), Timur ( 1 ), Adolfo
Jayme ( 1 )

== KEYWORDS ADDED ==
  * 'filter:pptx' has been added to 1 bug.
    Link: http://tinyurl.com/yaqzqrws
    Done by: Buovjaga ( 1 )

  * 'bibisectRequest' has been added to 7 bugs.
    Link: http://tinyurl.com/ybrszuxl
    Done by: Buovjaga ( 4 ), Telesto ( 1 ), Mike Kaganski ( 1 ), Dieter
Praas ( 1 )

  * 'regression' has been added to 22 bugs.
    Link: http://tinyurl.com/yafdwoy8
    Done by: Buovjaga ( 6 ), Xisco Faulí ( 5 ), Mike Kaganski ( 4 ),
Aron Budea ( 2 ), Kevin Suo ( 1 ), raal ( 1 ), Yousuf Philips (jay) ( 1
), Alex Thurgood ( 1 ), Timur ( 1 )

  * 'perf' has been added to 2 bugs.
    Link: http://tinyurl.com/y93rn86r
    Done by: Buovjaga ( 1 ), Aron Budea ( 1 )

  * 'acc

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - avmedia/source

[Xisco Fauli]

 avmedia/source/framework/mediaplayer.cxx   |2 +-
 avmedia/source/viewer/mediawindow_impl.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5ea28efc864b0b064512f2049a9acd82aeaae808
Author: Xisco Fauli 
Date:   Wed Oct 25 13:21:32 2017 +0200

tdf#113380: if the player doesn't exist,...

... use the same size as VLC does.

See:

https://opengrok.libreoffice.org/xref/core/avmedia/source/vlc/vlcplayer.cxx#167

Change-Id: Ib878ded6c8aacf3a04227ab9efaa59b388f8ff51
Reviewed-on: https://gerrit.libreoffice.org/43827
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit a2ec30240f7a9889e8e97b798bd862be160b47bc)
Reviewed-on: https://gerrit.libreoffice.org/45781
Reviewed-by: Xisco Faulí 

diff --git a/avmedia/source/framework/mediaplayer.cxx 
b/avmedia/source/framework/mediaplayer.cxx
index 452d1f1c1566..dad2b2ddbd24 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -53,7 +53,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, 
SfxChildWindow* pCW, vcl::W
 SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | 
WB_SIZEABLE | WB_DOCKABLE ),
 mpMediaWindow( new MediaWindow( this, true ) )
 {
-const Size aSize( 378, 256 );
+const Size aSize( mpMediaWindow->getPreferredSize() );
 
 SetPosSizePixel( Point( 0, 0 ), aSize );
 SetMinOutputSizePixel( aSize );
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index f5d77615fb1e..b819d4f58b0f 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -291,7 +291,7 @@ bool MediaWindowImpl::isValid() const
 
 Size MediaWindowImpl::getPreferredSize() const
 {
-Size aRet;
+Size aRet(480, 360);
 
 if( mxPlayer.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0e2a3619bdecd903516c96a64dc7cbf8552b85bf
Author: Stephan Bergmann 
Date:   Mon Dec 4 12:00:09 2017 +0100

Adapt solenv/flatpak-manifest.in to recent download.lst changes

Change-Id: I74845d4cdab0f4769cb4970db12f3dfa09037c41

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index f316d143843f..40621a67e1ea 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -226,10 +226,10 @@
 "dest-filename": "external/tarballs/libmspub-0.1.2.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.12.tar.xz";,
-"sha256": 
"7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7",
+"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";,
+"sha256": 
"db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea",
 "type": "file",
-"dest-filename": "external/tarballs/libmwaw-0.3.12.tar.xz"
+"dest-filename": "external/tarballs/libmwaw-0.3.13.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";,
@@ -328,10 +328,10 @@
 "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";,
-"sha256": 
"676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908",
+"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz";,
+"sha256": 
"d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937",
 "type": "file",
-"dest-filename": "external/tarballs/liborcus-0.12.1.tar.gz"
+"dest-filename": "external/tarballs/liborcus-0.13.1.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

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

New commits:
commit 1943c4b8f12f5ca48b36501710e2b7d1b82d1ea4
Author: Marco Cecchetti 
Date:   Fri Dec 1 12:29:35 2017 +0100

loleaflet: calc: fix styles fetching in browsers different from Chrome

'font', 'border-width', 'border-color' are shortcut properties that
are available on Chrome but not on other browsers such as Firefox or
Edge.

Change-Id: I22d2a3db87b9d6f888bd345e06e605530358be51
Reviewed-on: https://gerrit.libreoffice.org/45665
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 3da83248..4bb38769 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -51,10 +51,14 @@ L.Control.Header = L.Control.extend({
var elem = L.DomUtil.create('div', className, baseElem);
this._textColor = L.DomUtil.getStyle(elem, 'color');
this._backgroundColor = L.DomUtil.getStyle(elem, 
'background-color');
-   this._font = L.DomUtil.getStyle(elem, 'font');
-   this._borderColor = L.DomUtil.getStyle(elem, 'border-color');
-   var borderWidth = L.DomUtil.getStyle(elem, 'border-width');
-   this._borderWidth = parseInt(borderWidth.slice(0, -2));
+   var fontFamily = L.DomUtil.getStyle(elem, 'font-family');
+   var fontSize = parseInt(L.DomUtil.getStyle(elem, 'font-size'));
+   var fontHeight = parseInt(L.DomUtil.getStyle(elem, 
'line-height'));
+   var rate = fontHeight / fontSize;
+   this._font = fontSize + 'px/' + rate + ' ' + fontFamily;
+   this._borderColor = L.DomUtil.getStyle(elem, 
'border-top-color');
+   var borderWidth = L.DomUtil.getStyle(elem, 'border-top-width');
+   this._borderWidth = parseInt(borderWidth);
this._cursor = L.DomUtil.getStyle(elem, 'cursor');
L.DomUtil.remove(elem);
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Christian Lohmaier]

 check.php |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit b70a7b26eb7bfaf44ab669e0af87fbe84b9e219d
Author: Christian Lohmaier 
Date:   Mon Dec 4 11:48:54 2017 +0100

enable update for 5.4.3 and remove type preselection

that should give us more realistic way to tell how many users really
need 32bit and not just keep using it because that's what they installed
some day in the past

diff --git a/check.php b/check.php
index f0390bc..e1fef66 100644
--- a/check.php
+++ b/check.php
@@ -487,6 +487,9 @@ $build_hash_to_version = array(
 '50d9bf2b0a79cdb85a3814b592608037a682059d' => '5.3.5.2', # Final
 # 5.3.6
 '686f202eff87ef707079aeb7f485847613344eb7' => '5.3.6.1', # Final, to fix 
translation issues in 5.3.5
+# 5.3.7
+'376eaac300a303c4ad2193fb7f6a7522caf550b9' => '5.3.7.1',
+'6b8ed514a9f8b44d37a1b96673cbbdd077e24059' => '5.3.7.2', # Final
 
 ##
 # 5.4.0 versions
@@ -503,6 +506,10 @@ $build_hash_to_version = array(
 # 5.4.2
 'dfa67a98bede79c671438308dc9036d50465d2cb' => '5.4.2.1',
 '22b09f6418e8c2d508a9eaf86b2399209b0990f4' => '5.4.2.2', # Final
+# 5.4.3
+'32c8895c6cae21571f364dbb059f419a743ee44d' => '5.4.3.1',
+'facb2780328619f348f035e17baa8b2984099ca4' => '5.4.3.2',
+'92a7159f7e4af62137622921e809f8546db437e5' => '5.4.3.2', # hotfix1, Final
 );
 
 # Descriptions of the target versions
@@ -515,17 +522,17 @@ $build_hash_to_version = array(
 #   where '' and '' will be substitued with the right value
 #   NOTE: '&' in the URL has to be escaped as &
 $update_map = array(
-'stable' => array('gitid'   => 
'686f202eff87ef707079aeb7f485847613344eb7',
-  'id'  => 'LibreOffice 5.3.6',
-  'version' => '5.3.6',
+'stable' => array('gitid'   => 
'6b8ed514a9f8b44d37a1b96673cbbdd077e24059',
+  'id'  => 'LibreOffice 5.3.7',
+  'version' => '5.3.7',
   'update_type' => 'text/html',
-  'update_src'  => 
'https://www.libreoffice.org/download/download/?type=&lang=&version=5.3.6',
+  'update_src'  => 
'https://www.libreoffice.org/download/download/?lang=&version=5.3.7',
   'substitute'  => true ),
-'latest' => array('gitid'   => 
'22b09f6418e8c2d508a9eaf86b2399209b0990f4',
-  'id'  => 'LibreOffice 5.4.2',
-  'version' => '5.4.2',
+'latest' => array('gitid'   => 
'92a7159f7e4af62137622921e809f8546db437e5',
+  'id'  => 'LibreOffice 5.4.3',
+  'version' => '5.4.3',
   'update_type' => 'text/html',
-  'update_src'  => 
'https://www.libreoffice.org/download/download/?type=&lang=&version=5.4.2',
+  'update_src'  => 
'https://www.libreoffice.org/download/download/?lang=&version=5.4.3',
   'substitute'  => true ),
 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Drop support for cygwin i686 building Win64 binaries?

[Thorsten Behrens]

Regina Henschel wrote:
> but it will still be possible to produce Win32 binaries from a 32bit
> cygwin on a Win32 machine?
> 
Yes, that's still supported, should the patch get merged.

Cheers,

-- Thorsten


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

Invitation: Important issue @ Mon Dec 4, 2017 6am - 7am (EST) (libreoffice@lists.freedesktop.org)

[mrjoeden]

BEGIN:VCALENDAR
PRODID:-//Google Inc//Google Calendar 70.9054//EN
VERSION:2.0
CALSCALE:GREGORIAN
METHOD:REQUEST
BEGIN:VEVENT
DTSTART:20171204T11Z
DTEND:20171204T12Z
DTSTAMP:20171204T103821Z
ORGANIZER;CN=mrjoe...@gmail.com:mailto:mrjoe...@gmail.com
UID:01ajg04o8beal40l4uo4u79...@google.com
ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=
 TRUE;CN=libreoffice@lists.freedesktop.org;X-NUM-GUESTS=0:mailto:libreoffice
 @lists.freedesktop.org
CREATED:20171204T103820Z
DESCRIPTION:Greeting friend. I sent to you message few days ago\, did you g
 ot it? Plz reply me at (jpede...@gmail.com) Mr. Joseph Eden.\n\n-::~:~::~:~
 :~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~::~:~::
 -\nPlease do not edit this section of the description.\n\nView your event a
 t https://www.google.com/calendar/event?action=VIEW&eid=MDFhamcwNG84YmVhbDQ
 wbDR1bzR1NzlmNWkgbGlicmVvZmZpY2VAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn&tok=MTgjbXJqb
 2VkZW5AZ21haWwuY29tMmU3M2Q2N2RkMDUzOWM2MGY1ZjM5ODIzZGFiNzM0NzVmOTUyNWZmNw&c
 tz=America/New_York&hl=en.\n-::~:~::~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~
 :~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~::~:~::-
LAST-MODIFIED:20171204T103820Z
LOCATION:
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:Important issue
TRANSP:OPAQUE
END:VEVENT
END:VCALENDAR


invite.ics
Description: application/ics
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Pranav Kant]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |2 ++
 desktop/source/lib/init.cxx |6 ++
 2 files changed, 8 insertions(+)

New commits:
commit 1fdd9b3fbfac165e944516d87f02d2f9ff6e3a58
Author: Pranav Kant 
Date:   Thu Nov 30 01:22:33 2017 +0530

lokdialog: Execute all UNO commands asynchronously for LOK

Especially in case of dialogs, Online cannot afford to wait till the
call to UNO command returns as the same thread is responsible for doing
many more tasks as well.

And just adding this check doesn't seem to have any repurcussions, so I
guess we are fine.

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 2a995277081a..81a9f11e7eb5 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -529,6 +529,7 @@ void DesktopLOKTest::testPasteWriter()
 CPPUNIT_ASSERT(pDocument->pClass->paste(pDocument, 
"text/plain;charset=utf-8", aText.getStr(), aText.getLength()));
 
 pDocument->pClass->postUnoCommand(pDocument, ".uno:SelectAll", nullptr, 
false);
+Scheduler::ProcessEventsToIdle();
 char* pText = pDocument->pClass->getTextSelection(pDocument, 
"text/plain;charset=utf-8", nullptr);
 CPPUNIT_ASSERT_EQUAL(OString("hello"), OString(pText));
 free(pText);
@@ -902,6 +903,7 @@ void DesktopLOKTest::testSheetOperations()
 pDocument->pClass->postUnoCommand(pDocument, ".uno:Remove",
   "{ \"Index\": { \"type\": \"long\", \"value\": 3 } }", false);
 
+Scheduler::ProcessEventsToIdle();
 CPPUNIT_ASSERT_EQUAL(pDocument->pClass->getParts(pDocument), 6);
 
 std::vector aExpected = { "FirstSheet", "Renamed", "Sheet3", 
"Sheet4", "Sheet5", "LastSheet" };
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c4b922c75332..1c4922eacacf 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2329,6 +2329,12 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
 std::vector 
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
+
+beans::PropertyValue aSynchronMode;
+aSynchronMode.Name = "SynchronMode";
+aSynchronMode.Value <<= false;
+aPropertyValuesVector.push_back(aSynchronMode);
+
 int nView = SfxLokHelper::getView();
 if (nView < 0)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Daniel]

 sc/source/core/data/table4.cxx |   67 -
 1 file changed, 47 insertions(+), 20 deletions(-)

New commits:
commit 87efbdb1ae5a73d081667e10f1571f1e523c1b9c
Author: Daniel 
Date:   Sat Nov 25 01:48:18 2017 -0200

tdf#105268 - Auto Fill: Fix The Next Value for 001-001-001

Change-Id: If1d1a23afb6209c35092d7cd95235ea1699fe7fb
Reviewed-on: https://gerrit.libreoffice.org/45262
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 76c1e7287e29a2a2739fce895fbded3c04764bca)
Reviewed-on: https://gerrit.libreoffice.org/45742

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index f7bab382a76c..bd1d18d0443d 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -78,10 +78,10 @@ short lcl_DecompValueString( OUString& rValue, sal_Int32& 
nVal, sal_uInt16* pMin
 return 0;
 }
 const sal_Unicode* p = rValue.getStr();
-sal_Int32 nNeg = 0;
+sal_Int32 nSign = 0;
 sal_Int32 nNum = 0;
-if ( p[nNum] == '-' )
-nNum = nNeg = 1;
+if ( p[nNum] == '-' || p[nNum] == '+' )
+nNum = nSign = 1;
 while ( p[nNum] && CharClass::isAsciiNumeric( OUString(p[nNum]) ) )
 nNum++;
 
@@ -91,34 +91,37 @@ short lcl_DecompValueString( OUString& rValue, sal_Int32& 
nVal, sal_uInt16* pMin
 // #i5550# If there are numbers at the beginning and the end,
 // prefer the one at the beginning only if it's followed by a space.
 // Otherwise, use the number at the end, to enable things like IP 
addresses.
-if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || 
!CharClass::isAsciiNumeric(OUString(cLast)) ) )
+if ( nNum > nSign && ( cNext == 0 || cNext == ' ' || 
!CharClass::isAsciiNumeric(OUString(cLast)) ) )
 {   // number at the beginning
 nVal = rValue.copy( 0, nNum ).toInt32();
 //  any number with a leading zero sets the minimum number of digits
-if ( p[nNeg] == '0' && pMinDigits && ( nNum - nNeg > *pMinDigits ) )
-*pMinDigits = nNum - nNeg;
+if ( p[nSign] == '0' && pMinDigits && ( nNum - nSign > *pMinDigits ) )
+*pMinDigits = nNum - nSign;
 rValue = rValue.copy(nNum);
 return -1;
 }
 else
 {
-nNeg = 0;
+nSign = 0;
 sal_Int32 nEnd = nNum = rValue.getLength() - 1;
 while ( nNum && CharClass::isAsciiNumeric( OUString(p[nNum]) ) )
 nNum--;
-if ( p[nNum] == '-' )
+if ( p[nNum] == '-' || p[nNum] == '+' )
 {
 nNum--;
-nNeg = 1;
+nSign = 1;
 }
-if ( nNum < nEnd - nNeg )
+if ( nNum < nEnd - nSign )
 {   // number at the end
 nVal = rValue.copy( nNum + 1 ).toInt32();
 //  any number with a leading zero sets the minimum number of 
digits
-if ( p[nNum+1+nNeg] == '0' && pMinDigits && ( nEnd - nNum - nNeg > 
*pMinDigits ) )
-*pMinDigits = nEnd - nNum - nNeg;
+if ( p[nNum+1+nSign] == '0' && pMinDigits && ( nEnd - nNum - nSign 
> *pMinDigits ) )
+*pMinDigits = nEnd - nNum - nSign;
 rValue = rValue.copy(0, nNum + 1);
-return 1;
+if (nSign) // use the return value = 2 to put back the '+'
+return 2;
+else
+return 1;
 }
 }
 nVal = 0;
@@ -938,11 +941,19 @@ OUString ScTable::GetAutoFillPreview( const ScRange& 
rSource, SCCOL nEndX, SCROW
 {
 if (aValue == ScGlobal::GetOrdinalSuffix( 
nVal))
 aValue = ScGlobal::GetOrdinalSuffix( nVal 
+ nDelta);
-
 aValue = lcl_ValueString( nVal + nDelta, 
nCellDigits ) + aValue;
 }
 else if ( nFlag > 0 )
-aValue += lcl_ValueString( nVal + nDelta, 
nCellDigits );
+{
+sal_Int32 nNextValue;
+if ( nVal < 0 )
+nNextValue = nVal - nDelta;
+else
+nNextValue = nVal + nDelta;
+if ( nFlag == 2 && nNextValue >= 0 ) // Put 
back the '+'
+aValue += "+";
+aValue += lcl_ValueString( nNextValue, 
nCellDigits );
+}
 }
 }
 break;
@@ -1044,7 +1055,11 @@ OUString ScTable::GetAutoFillPreview( const ScRange& 
rSource, SCCOL nEndX, SCROW
 aValue = lcl_ValueString( (sal_Int32)nStart, 
nMinDigits ) + aValue;
 }
 else
+{
+if ( nH

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

[Marco Cecchetti]

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

New commits:
commit 250eda5b800e6f4ac664976cb3e374435f63b857
Author: Marco Cecchetti 
Date:   Fri Dec 1 12:40:05 2017 +0100

loleaflet: calc: fix styles fetching in browsers different from Chrome

'font', 'border-width', 'border-color' are shortcut properties that
are available on Chrome but not on other browsers such as Firefox or
Edge.

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

diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 3da83248..4bb38769 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -51,10 +51,14 @@ L.Control.Header = L.Control.extend({
var elem = L.DomUtil.create('div', className, baseElem);
this._textColor = L.DomUtil.getStyle(elem, 'color');
this._backgroundColor = L.DomUtil.getStyle(elem, 
'background-color');
-   this._font = L.DomUtil.getStyle(elem, 'font');
-   this._borderColor = L.DomUtil.getStyle(elem, 'border-color');
-   var borderWidth = L.DomUtil.getStyle(elem, 'border-width');
-   this._borderWidth = parseInt(borderWidth.slice(0, -2));
+   var fontFamily = L.DomUtil.getStyle(elem, 'font-family');
+   var fontSize = parseInt(L.DomUtil.getStyle(elem, 'font-size'));
+   var fontHeight = parseInt(L.DomUtil.getStyle(elem, 
'line-height'));
+   var rate = fontHeight / fontSize;
+   this._font = fontSize + 'px/' + rate + ' ' + fontFamily;
+   this._borderColor = L.DomUtil.getStyle(elem, 
'border-top-color');
+   var borderWidth = L.DomUtil.getStyle(elem, 'border-top-width');
+   this._borderWidth = parseInt(borderWidth);
this._cursor = L.DomUtil.getStyle(elem, 'cursor');
L.DomUtil.remove(elem);
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Miklos Vajna]

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

New commits:
commit 1a3b7229b87901c8bc6cf3f86d79d68ddfba735b
Author: Miklos Vajna 
Date:   Mon Dec 4 10:51:24 2017 +0100

Updated core
Project: help  19c8267824c96ce837140c7edf94b8ab0231a485

EPUB export: add documentation for new UI elements

Change-Id: I716b035bfd15e770e6acb3016912c88d510e54dc

diff --git a/helpcontent2 b/helpcontent2
index d0dad7954d14..19c8267824c9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d0dad7954d1432b998cb1f3eb9c74fb6a56d280f
+Subproject commit 19c8267824c96ce837140c7edf94b8ab0231a485
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 source/text/shared/01/ref_epub_export.xhp |   48 +++---
 1 file changed, 44 insertions(+), 4 deletions(-)

New commits:
commit 19c8267824c96ce837140c7edf94b8ab0231a485
Author: Miklos Vajna 
Date:   Mon Dec 4 10:51:24 2017 +0100

EPUB export: add documentation for new UI elements

Change-Id: I716b035bfd15e770e6acb3016912c88d510e54dc

diff --git a/source/text/shared/01/ref_epub_export.xhp 
b/source/text/shared/01/ref_epub_export.xhp
index 4c1241546..569c27f7c 100644
--- a/source/text/shared/01/ref_epub_export.xhp
+++ b/source/text/shared/01/ref_epub_export.xhp
@@ -35,19 +35,59 @@
 
 
 Export as 
EPUB
-Saves the 
current file to EPUB. An EPUB file can be viewed and printed on any platform, 
provided that supporting software is installed.
+Saves the 
current file to EPUB. An EPUB is a reflowable file that can be viewed or 
printed on any platform, provided that supporting software is 
installed.
 
 
 
 
-Version
+General
+
+
+Version
 Sets the 
version of the resulting EPUB file.
 
 
-Split 
method
-Determines if 
a next EPUB section will start on page breaks or on paragraphs with the Heading 
1 style.
+Split 
method
+Determines if 
a next EPUB section will start on page breaks or on paragraphs according to 
outline numbering.
 
 
+Layout 
method
+Determines if 
a reflowable or a fixed layout EPUB will be generated.
+
+
+Custom 
cover image
+The exporter 
uses a cover image from the media directory (see below) if the image is named 
cover.gif, cover.jpg, cover.png or cover.svg. This default can be customized 
here.
+
+
+Custom 
media directory
+The exporter 
uses media from the FILENAME (without extension) directory (in the same 
directory than the document itself) by default. This can be customized 
here.
+The media 
directory may contain: a cover image (see above), custom metadata 
(FILENAME-WITHOUT-EXTENSION.xmp, has priority over in-document metadata) and 
image links. Image links mean that if you create relative links on images or 
text and they link an image that's available in the media directory, then this 
media will be available in the EPUB export result as a popup.
+
+
+Metadata
+Allows manual 
override of document metadata. This is handy if for example the user creating 
the document is not the author of the publication in fact. If a metadata 
property should not be customized, it can be left empty.
+
+
+Identifier
+Unique 
identifier for the publication.
+
+
+Title
+Title of the 
publication.
+
+
+Author
+Author of the 
publication.
+
+
+Language
+Language of 
the publication (see RFC4646 and ISO 639 for possible values).
+
+
+Date
+Last 
modification date for the publication. The value of this property must be an 
XML Schema dateTime conformant date of the form: 
CCYY-MM-DDThh:mm:ssZ.
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in Repository.mk solenv/bin vcl/commonfuzzer.mk vcl/CustomTarget_nativemath.mk vcl/Executable_mmlfuzzer.mk vcl/Module_vcl.mk vcl/StaticLibrary_fuzzer_math.mk v

[Caolán McNamara]

 Makefile.in  |2 -
 Repository.mk|1 
 solenv/bin/native-code.py|   12 +
 vcl/CustomTarget_nativemath.mk   |   18 ++
 vcl/Executable_mmlfuzzer.mk  |   49 +++
 vcl/Module_vcl.mk|3 ++
 vcl/StaticLibrary_fuzzer_math.mk |   25 +++
 vcl/commonfuzzer.mk  |3 ++
 vcl/workben/mmlfuzzer.cxx|   33 ++
 9 files changed, 145 insertions(+), 1 deletion(-)

New commits:
commit 1706ccb6704cd85b9603bf9d9181dbb6736a42e6
Author: Caolán McNamara 
Date:   Fri Dec 1 14:52:13 2017 +

add mml fuzzer

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

diff --git a/Makefile.in b/Makefile.in
index 004d1007f371..78658cd84caa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -483,7 +483,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale 
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc 
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui 
Library_binaryurp Library_io Library_invocation Library_namingservice 
Library_proxyfac Library_uuresolver Module_ure Exe
 cutable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer 
Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer 
Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer 
Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer 
Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer 
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer 
Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer 
Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer 
Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer 
Executable_xlsxfuzzer Executable_pptxfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale 
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc 
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math 
Library_forui Library_binaryurp Library_io Library_invocation 
Library_namingservice Library_proxyfac Library
 _uuresolver Module_ure Executable_wmffuzzer Executable_jpgfuzzer 
Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer 
Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer 
Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer 
Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer 
Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer 
Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer 
Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer 
Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer 
Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer 
Executable_qpwfuzzer Executable_slkfuzzer Executable_fodtfuzzer 
Executable_fodsfuzzer Executable_fodpfuzzer Executable_xlsfuzzer 
Executable_scrtffuzzer Executable_wksfuzzer Executable_diffuzzer 
Executable_docxfuzzer Executable_xlsxfuzzer Executable_pptxfuzzer 
Executable_mmlfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/R

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

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx|   19 ---
 libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx|   23 +++
 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx |6 -
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx   |   60 
+-
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx   |8 -
 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx|   34 
+
 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx|2 
 libreofficekit/qa/gtktiledviewer/gtv.ui |   49 
+++-
 8 files changed, 170 insertions(+), 31 deletions(-)

New commits:
commit 0d5ccc4eb114117b11f7ec53a2c75f9efcb4c651
Author: Pranav Kant 
Date:   Tue Nov 28 16:43:54 2017 +0530

gtv: Remember recently executed UNO commands

Saves the recently executed UNO commands in a temp file and make it
accessible to user in a combo box. Useful when debugging.

Change-Id: Ic66961a388cc59dee3f65cb8d4de3c29a8a75eaa
Reviewed-on: https://gerrit.libreoffice.org/45540
Tested-by: Jenkins 
Reviewed-by: pranavk 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
index 3c4457b38215..d2fcb979e3d3 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
@@ -146,23 +146,4 @@ const std::string GtvHelpers::getDirPath(const 
std::string& filePath)
 return dirPath;
 }
 
-const std::vector GtvHelpers::splitIntoIntegers(const std::string& 
aPayload, const std::string& aDelim, const int nItems)
-{
-std::vector aRet;
-
-if (!aPayload.empty())
-{
-gchar** ppCoordinates = g_strsplit(aPayload.c_str(), aDelim.c_str(), 
nItems);
-gchar** ppCoordinate  = ppCoordinates;
-while (*ppCoordinate)
-{
-aRet.push_back(atoi(*ppCoordinate));
-++ppCoordinate;
-}
-g_strfreev(ppCoordinates);
-}
-
-return aRet;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx 
b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
index 9e984846f0ab..9474f4c0271a 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
@@ -39,7 +39,28 @@ namespace GtvHelpers
 
 const std::string getDirPath(const std::string& filePath);
 
-const std::vector splitIntoIntegers(const std::string& aPayload, 
const std::string& aDelim, const int nItems);
+template
+const std::vector split(const std::string& aPayload, const std::string& 
aDelim, const int nItems)
+{
+std::vector aRet;
+
+if (!aPayload.empty())
+{
+gchar** ppCoordinates = g_strsplit(aPayload.c_str(), 
aDelim.c_str(), nItems);
+gchar** ppCoordinate  = ppCoordinates;
+while (*ppCoordinate)
+{
+std::stringstream strstream(*ppCoordinate);
+T item;
+strstream >> item;
+aRet.push_back(item);
+++ppCoordinate;
+}
+g_strfreev(ppCoordinates);
+}
+
+return aRet;
+}
 }
 
 #endif
diff --git 
a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index 79839aeccad2..2c97bd4d7393 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -314,7 +314,7 @@ void LOKDocViewSigHandlers::dialog(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 if (aAction == "created")
 {
 const std::string aSize = aRoot.get("size");
-std::vector aPoints = GtvHelpers::splitIntoIntegers(aSize, ", ", 
2);
+std::vector aPoints = GtvHelpers::split(aSize, ", ", 2);
 GtkWidget* pDialog = gtv_lok_dialog_new(pDocView, nDialogId, 
aPoints[0], aPoints[1]);
 g_info("created  dialog, for dialogid: %d with size: %s", nDialogId, 
aSize.c_str());
 
@@ -345,7 +345,7 @@ void LOKDocViewSigHandlers::dialog(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 else if (aAction == "size_changed")
 {
 const std::string aSize = aRoot.get("size");
-std::vector aSizePoints = 
GtvHelpers::splitIntoIntegers(aSize, ", ", 2);
+std::vector aSizePoints = GtvHelpers::split(aSize, 
", ", 2);
 if (aSizePoints.size() != 2)
 {
 g_error("Malformed size_changed callback");
@@ -366,7 +366,7 @@ void LOKDocViewSigHandlers::dialog(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 try
 {
 const std::string aRectangle = 
aRoot.get("rectangle");
-std::vector aRectPoints = 
GtvHelpe

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

[Caolán McNamara]

 sd/source/ui/slidesorter/shell/SlideSorter.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 75b0afa1f23f4da928a5f0d866250e19d762f49f
Author: Caolán McNamara 
Date:   Sun Dec 3 21:05:49 2017 +

silence coverity#1405937 Uncaught exception

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

diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx 
b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 398cc2a0edc3..6afbd935294c 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -82,7 +83,8 @@ std::shared_ptr SlideSorter::CreateSlideSorter(
 pContentWindow,
 pHorizontalScrollBar,
 pVerticalScrollBar,
-pScrollBarBox));
+pScrollBarBox),
+o3tl::default_delete());
 pSlideSorter->Init();
 return pSlideSorter;
 }
@@ -95,7 +97,8 @@ std::shared_ptr SlideSorter::CreateSlideSorter (
 new SlideSorter(
 rBase,
 nullptr,
-rParentWindow));
+rParentWindow),
+o3tl::default_delete());
 pSlideSorter->Init();
 return pSlideSorter;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 avmedia/source/framework/mediaplayer.cxx   |2 +-
 avmedia/source/viewer/mediawindow_impl.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a2ec30240f7a9889e8e97b798bd862be160b47bc
Author: Xisco Fauli 
Date:   Wed Oct 25 13:21:32 2017 +0200

tdf#113380: if the player doesn't exist,...

... use the same size as VLC does.

See:

https://opengrok.libreoffice.org/xref/core/avmedia/source/vlc/vlcplayer.cxx#167

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

diff --git a/avmedia/source/framework/mediaplayer.cxx 
b/avmedia/source/framework/mediaplayer.cxx
index 452d1f1c1566..dad2b2ddbd24 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -53,7 +53,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, 
SfxChildWindow* pCW, vcl::W
 SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | 
WB_SIZEABLE | WB_DOCKABLE ),
 mpMediaWindow( new MediaWindow( this, true ) )
 {
-const Size aSize( 378, 256 );
+const Size aSize( mpMediaWindow->getPreferredSize() );
 
 SetPosSizePixel( Point( 0, 0 ), aSize );
 SetMinOutputSizePixel( aSize );
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index e3045a63ece8..c8af35df34bf 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -290,7 +290,7 @@ bool MediaWindowImpl::isValid() const
 
 Size MediaWindowImpl::getPreferredSize() const
 {
-Size aRet;
+Size aRet(480, 360);
 
 if( mxPlayer.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog2' - sc/source

[Pranav Kant]

 sc/source/ui/view/gridwin.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ddc0f69ca4a016ed5b6e749c01d6362c9a4d9014
Author: Pranav Kant 
Date:   Mon Dec 4 13:58:44 2017 +0530

lokdialog: sc: Guard autofilter popup's LOK notification

Change-Id: I8d39a701618926e35c84f200ac7e2ce66e62b8b7

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c5ff3fa47721..d19d5a4c5abc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -627,7 +627,8 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 
 mpAutoFilterPopup.disposeAndClear();
 mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
-mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
+if (comphelper::LibreOfficeKit::isActive())
+mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
 mpAutoFilterPopup->setPopupEndAction(
 new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara]

 cui/inc/strings.hrc |2 
 cui/source/customize/CommandCategoryListBox.cxx |  215 ++--
 cui/source/inc/CommandCategoryListBox.hxx   |5 
 3 files changed, 211 insertions(+), 11 deletions(-)

New commits:
commit 3f2915c40fcc42ac91f2019fd506bfbdd1e5933f
Author: Muhammet Kara 
Date:   Mon Nov 27 21:10:21 2017 +0300

tdf#112207: Allow assigning macros to ui elements

* Adds "Macros" category to the categories list

* Search/filter feature now works also on the macros category

* Since macros category has multiple trees and subtrees, and many leaf
  elements (macros). I chose to implement the behavior like this:

  If there is no filter/search term, the trees will be presented as in the 
old
  macro selector dialog (collapsed), but if user types a search term, then
  filtering happens: non-matching elements and empty containers/(sub)trees
  are removed and everything is expanded so that user easily sees what
  (s)he is looking for.

Change-Id: I1a93f156a7293c7e61baac882a10ff631961e2af
Reviewed-on: https://gerrit.libreoffice.org/44938
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Reviewed-by: Katarina Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 18ea70bd6f4e..16db3c213f71 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -89,8 +89,10 @@
 #define RID_SVXSTR_ERR_TEXTNOTFOUND 
NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.")
 #define RID_SVXSTR_SELECT_FILE_IFRAME   
NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame")
 #define RID_SVXSTR_ALLFUNCTIONS 
NC_("RID_SVXSTR_ALLFUNCTIONS", "All categories")
+#define RID_SVXSTR_MACROS   NC_("RID_SVXSTR_MACROS", 
"Macros")
 #define RID_SVXSTR_MYMACROS NC_("RID_SVXSTR_MYMACROS", 
"My Macros")
 #define RID_SVXSTR_PRODMACROS   
NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
+#define RID_SVXSTR_NOMACRODESC  
NC_("RID_SVXSTR_NOMACRODESC", "There is no description available for this 
macro.")
 #define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
 #define RID_SVXSTR_SELECTOR_RUN 
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
 #define RID_SVXSTR_ROW  NC_("RID_SVXSTR_ROW", 
"Insert Rows")
diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 1763196db5ab..ae100bf0bc03 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -20,9 +20,15 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 // include search util
@@ -65,8 +71,7 @@ void CommandCategoryListBox::dispose()
 
 void CommandCategoryListBox::ClearAll()
 {
-//TODO: Handle SfxCfgKind::GROUP_SCRIPTCONTAINER when it gets added to Init
-// Clear style info objects from m_aGroupInfo vector to avoid memory leak
+// Clear objects from m_aGroupInfo vector to avoid memory leak
 for (const auto & It : m_aGroupInfo)
 {
 if ( It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject )
@@ -74,6 +79,19 @@ void CommandCategoryListBox::ClearAll()
 SfxStyleInfo_Impl* pStyle = 
static_cast(It->pObject);
 delete pStyle;
 }
+else if ( It->nKind == SfxCfgKind::FUNCTION_SCRIPT && It->pObject )
+{
+OUString* pScriptURI = static_cast(It->pObject);
+delete pScriptURI;
+}
+else if ( It->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER && 
It->pObject)
+{
+css::uno::XInterface* xi = static_cast(It->pObject);
+if (xi != nullptr)
+{
+xi->release();
+}
+}
 }
 
 m_aGroupInfo.clear();
@@ -85,6 +103,7 @@ void CommandCategoryListBox::Init(
 const css::uno::Reference< css::frame::XFrame >& xFrame,
 const OUString& sModuleLongName)
 {
+// User will not see incomplete UI
 SetUpdateMode(false);
 ClearAll();
 
@@ -107,7 +126,6 @@ void CommandCategoryListBox::Init(
 m_aStylesInfo.init(sModuleLongName, xModel);
 SetStylesInfo(&m_aStylesInfo);
 
-/ InitModule Start /
 try
 {
 css::uno::Reference< css::frame::XDispatchInformationProvider > 
xProvider(m_xFrame, css::uno::UNO_QUERY_THROW);
@@ -143,23 +161,32 @@ void CommandCategoryListBox::Init(
 }
 
 nEntryPos = InsertEntry( sGroupName );
-m_aGroupInfo.push_back( o3tl::make_unique( 
SfxCfgKind::GROUP_FUNCTION, rGroupID ) );
+m_aGroupInfo.push_back(
+  o3tl::make_unique( 
SfxCfgKind::GROUP_FUNCTION, rGroupID ) );
 SetEntryData( nEntryPos, m_aGroupInfo.back().g

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 3 commits - filter/source sw/CppunitTest_sw_fodfexport.mk sw/Module_sw.mk sw/qa xmloff/source

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   41 ---
 sw/CppunitTest_sw_fodfexport.mk|   57 +
 sw/Module_sw.mk|1 
 sw/qa/extras/fodfexport/data/tdf113696.odt |binary
 sw/qa/extras/fodfexport/fodfexport.cxx |   44 
 sw/qa/extras/inc/swmodeltestbase.hxx   |   11 
 xmloff/source/draw/shapeexport.cxx |8 ++
 7 files changed, 144 insertions(+), 18 deletions(-)

New commits:
commit b89834591f83058649dfa839297346ccc6ed689d
Author: Samuel Mehrbrodt 
Date:   Thu Nov 30 10:28:33 2017 +0100

Unit test for tdf#113696

Change-Id: I566cd5d38cf86547b664f0ae9a1c2f8c37edc0ca
Reviewed-on: https://gerrit.libreoffice.org/45560
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
Reviewed-on: https://gerrit.libreoffice.org/45680

diff --git a/sw/CppunitTest_sw_fodfexport.mk b/sw/CppunitTest_sw_fodfexport.mk
new file mode 100644
index ..4703b85435f7
--- /dev/null
+++ b/sw/CppunitTest_sw_fodfexport.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_fodfexport, \
+   sw/qa/extras/fodfexport/fodfexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_fodfexport, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   sfx \
+   sw \
+   test \
+   tl \
+   unotest \
+   utl \
+   vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_fodfexport,\
+   boost_headers \
+   libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_fodfexport,\
+   -I$(SRCDIR)/sw/inc \
+   -I$(SRCDIR)/sw/source/core/inc \
+   -I$(SRCDIR)/sw/qa/extras/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_fodfexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_fodfexport,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_fodfexport,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_fodfexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 39772b8b930e..966c71d097fd 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sw_uwriter) \
 CppunitTest_sw_docbookexport \
+CppunitTest_sw_fodfexport \
 CppunitTest_sw_htmlexport \
 CppunitTest_sw_htmlimport \
 CppunitTest_sw_macros_test \
diff --git a/sw/qa/extras/fodfexport/data/tdf113696.odt 
b/sw/qa/extras/fodfexport/data/tdf113696.odt
new file mode 100644
index ..03e0612a3d14
Binary files /dev/null and b/sw/qa/extras/fodfexport/data/tdf113696.odt differ
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx 
b/sw/qa/extras/fodfexport/fodfexport.cxx
new file mode 100644
index ..6cd00b49ba47
--- /dev/null
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/extras/fodfexport/data/", "OpenDocument Text 
Flat XML")
+{
+}
+
+/**
+ * Blacklist handling
+ */
+bool mustTestImportOf(const char* filename) const override
+{
+// Only test import of .fodt document
+return OString(filename).endsWith(".odt") || 
OString(filename).endsWith(".fodt");
+}
+};
+
+DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
+{
+// Test that an image which is written in svm format (image/x-vclgraphic)
+// is accompanied by a png fallback graphic.
+if (xmlDocPtr pXmlDoc = parseExportedFile())
+{
+assertXPath(pXmlDoc, 
"/office:document/office:body/office:text/text:p/draw:frame/"
+ 
"draw:image[@loext:mime-type='image/x-vclgraphic']");
+assertXPath(pXmlDoc, 
"/office:document/office:body/office:text/text:p/draw:frame/"
+

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

[Samuel Mehrbrodt]

 xmloff/source/draw/shapeexport.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 58822e6f1686eac7a8a7c028ea8f233493594437
Author: Samuel Mehrbrodt 
Date:   Thu Nov 30 12:45:26 2017 +0100

tdf#113696 Write replacement graphic also to flat odf

Not only to zipped ODF

Change-Id: Ic86656aea31c9fc20862628cdd31698b9904e999
Reviewed-on: https://gerrit.libreoffice.org/45568
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 38602abc2d2b59bc3644e37797b9b1bc779fd993)
Reviewed-on: https://gerrit.libreoffice.org/45675

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 7f43937f0c7d..3a60df4f3b68 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2392,13 +2392,12 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
 mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE );
 mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, 
XML_EMBED );
 mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD );
+}
+SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, 
XML_IMAGE, true, true);
 
-// xlink:href for replacement, only written for Svg content
-SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, 
XML_IMAGE, true, true);
+// optional office:binary-data
+mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
 
-// optional office:binary-data
-mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
-}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - comphelper/source include/comphelper include/xmloff svx/source xmloff/source

[Samuel Mehrbrodt]

 comphelper/source/misc/graphicmimetype.cxx |   54 +
 include/comphelper/graphicmimetype.hxx |8 
 include/xmloff/xmlexp.hxx  |2 +
 svx/source/svdraw/svdograf.cxx |5 +-
 xmloff/source/core/xmlexp.cxx  |   18 +
 xmloff/source/draw/shapeexport.cxx |   11 +
 xmloff/source/text/txtparae.cxx|   22 ---
 7 files changed, 97 insertions(+), 23 deletions(-)

New commits:
commit 5dc757b5d25894c08792036043b8714fa28a8b87
Author: Samuel Mehrbrodt 
Date:   Wed Nov 29 21:12:32 2017 +0100

tdf#113696 Add mimetype to image element

Otherwise browsers don't recognize base64 encoded svg files.

Change-Id: I54d0b87c52a1ca9da1d820751ae32159b88ed28f
Reviewed-on: https://gerrit.libreoffice.org/45528
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 32efde5cef2b8516a9decd0bf7091d7def1da971)
Reviewed-on: https://gerrit.libreoffice.org/45674

diff --git a/comphelper/source/misc/graphicmimetype.cxx 
b/comphelper/source/misc/graphicmimetype.cxx
index f8eeb3e92de5..bf88312304b1 100644
--- a/comphelper/source/misc/graphicmimetype.cxx
+++ b/comphelper/source/misc/graphicmimetype.cxx
@@ -19,6 +19,22 @@
 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+using namespace css;
+using namespace css::beans;
+using namespace css::graphic;
+using namespace css::io;
+using namespace css::uno;
+
 namespace comphelper
 {
 OUString GraphicMimeTypeHelper::GetMimeTypeForExtension(const OString& rExt)
@@ -47,5 +63,43 @@ OUString 
GraphicMimeTypeHelper::GetMimeTypeForExtension(const OString& rExt)
 
 return aMimeType;
 }
+
+OUString GraphicMimeTypeHelper::GetMimeTypeForXGraphic(Reference 
xGraphic)
+{
+OUString aSourceMimeType;
+Reference const xGraphicPropertySet(xGraphic, UNO_QUERY);
+if (xGraphicPropertySet.is() && // it's null if it's an external link
+(xGraphicPropertySet->getPropertyValue("MimeType") >>= 
aSourceMimeType))
+{
+return aSourceMimeType;
+}
+return OUString("");
+}
+
+OUString GraphicMimeTypeHelper::GetMimeTypeForImageUrl(const OUString& 
rImageUrl)
+{
+// Create the graphic to retrieve the mimetype from it
+Reference xProvider
+= 
css::graphic::GraphicProvider::create(comphelper::getProcessComponentContext());
+Sequence aMediaProperties(1);
+aMediaProperties[0].Name = "URL";
+aMediaProperties[0].Value <<= rImageUrl;
+Reference xGraphic(xProvider->queryGraphic(aMediaProperties));
+
+return GetMimeTypeForXGraphic(xGraphic);
+}
+
+OUString 
GraphicMimeTypeHelper::GetMimeTypeForImageStream(Reference 
xInputStream)
+{
+// Create the graphic to retrieve the mimetype from it
+Reference xProvider
+= 
css::graphic::GraphicProvider::create(comphelper::getProcessComponentContext());
+Sequence aMediaProperties(1);
+aMediaProperties[0].Name = "InputStream";
+aMediaProperties[0].Value <<= xInputStream;
+Reference xGraphic(xProvider->queryGraphic(aMediaProperties));
+
+return GetMimeTypeForXGraphic(xGraphic);
+}
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/graphicmimetype.hxx 
b/include/comphelper/graphicmimetype.hxx
index 3f2b5308b2d6..970342f2e5f5 100644
--- a/include/comphelper/graphicmimetype.hxx
+++ b/include/comphelper/graphicmimetype.hxx
@@ -13,12 +13,20 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+
 namespace comphelper
 {
 class COMPHELPER_DLLPUBLIC GraphicMimeTypeHelper
 {
 public:
 static OUString GetMimeTypeForExtension(const OString& rExt);
+static OUString 
GetMimeTypeForXGraphic(css::uno::Reference xGraphic);
+static OUString GetMimeTypeForImageUrl(const OUString& rImageUrl);
+static OUString
+GetMimeTypeForImageStream(css::uno::Reference 
xInputStream);
 };
 }
 
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 474d718d5a41..4127e2a883fa 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -460,6 +460,8 @@ public:
 
 OUString AddEmbeddedGraphicObject(
 const OUString& rGraphicObjectURL );
+css::uno::Reference GetEmbeddedGraphicObjectStream(
+const OUString& rGraphicObjectURL);
 bool AddEmbeddedGraphicObjectAsBase64(
 const OUString& rGraphicObjectURL );
 
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index f8970a58f2c2..329fe258b766 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1885,6 +1885,24 @@ OUString SvXMLExport::AddEmbeddedGraphicObject( const 
OUString& rGraphicObjectUR
 return sRet;
 }
 
+Reference< XInputStream > SvXMLExport::GetEmbeddedGraphicObjectStream( const 
OUString& rGraphicObjectURL )
+{
+if( (getExportFlags() & SvXMLExportFlags::EMBEDDED) &&
+rGraphicObjectURL.startsWith( msGrap

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

[Miklos Vajna]

 writerperfect/source/writer/EPUBExportDialog.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 32fd735a6a30a8e552488f78a1577755a0e3db3d
Author: Miklos Vajna 
Date:   Fri Dec 1 16:35:05 2017 +0100

EPUB export, fixed layout always means "split at the end of the page"

So disable split type on the UI, as it has no effect.

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

diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx 
b/writerperfect/source/writer/EPUBExportDialog.cxx
index 232ca4128fec..2d429abf657c 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -9,8 +9,11 @@
 
 #include "EPUBExportDialog.hxx"
 
+#include 
+
 #include 
 #include 
+#include 
 #include 
 
 #include "EPUBExportFilter.hxx"
@@ -147,6 +150,9 @@ IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, ListBox 
&, void)
 // No conversion, 1:1 mapping between entry positions and
 // libepubgen::EPUBLayoutMethod.
 mrFilterData["EPUBLayoutMethod"] <<= m_pLayout->GetSelectedEntryPos();
+#if LIBEPUBGEN_VERSION_SUPPORT
+m_pSplit->Enable(m_pLayout->GetSelectedEntryPos() != 
libepubgen::EPUB_LAYOUT_METHOD_FIXED);
+#endif
 }
 
 IMPL_LINK_NOARG(EPUBExportDialog, CoverClickHdl, Button *, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - configure.ac external/libepubgen filter/source writerperfect/qa writerperfect/source

[Miklos Vajna]

 configure.ac |3 
 external/libepubgen/libepubgen-epub3.patch.1 |  561 +++
 filter/source/svg/impsvgdialog.hxx   |1 
 filter/source/svg/svgexport.cxx  |5 
 filter/source/svg/svgfilter.hxx  |2 
 writerperfect/qa/unit/EPUBExportTest.cxx |   25 +
 writerperfect/source/writer/EPUBExportFilter.cxx |5 
 writerperfect/source/writer/exp/txtparai.cxx |7 
 writerperfect/source/writer/exp/txtstyli.cxx |   96 ---
 writerperfect/source/writer/exp/txtstyli.hxx |   29 -
 writerperfect/source/writer/exp/xmlfmt.cxx   |   13 
 writerperfect/source/writer/exp/xmlfmt.hxx   |8 
 writerperfect/source/writer/exp/xmlimp.cxx   |   33 -
 writerperfect/source/writer/exp/xmlimp.hxx   |7 
 14 files changed, 606 insertions(+), 189 deletions(-)

New commits:
commit d4246aeaa2b182c3defcefb68426d1be8e2caf75
Author: Miklos Vajna 
Date:   Fri Dec 1 12:00:35 2017 +0100

EPUB export, fixed layout: fix spine names

They are pages, not sections.

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

diff --git a/configure.ac b/configure.ac
index 8c5434bd1883..264e4ba99750 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7688,7 +7688,8 @@ AS_IF([test "$SYSTEM_EPUBGEN" = "TRUE"], [
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 #include 
 ], [
-const libepubgen::EPUBTextGenerator generator(nullptr, 
EPUB_SPLIT_METHOD_NONE, 30);
+libepubgen::EPUBTextGenerator generator(nullptr);
+generator.setOption(libepubgen::EPUB_GENERATOR_OPTION_SPLIT, 
libepubgen::EPUB_SPLIT_METHOD_NONE);
 ])],
 [
 AC_MSG_RESULT([yes])
diff --git a/external/libepubgen/libepubgen-epub3.patch.1 
b/external/libepubgen/libepubgen-epub3.patch.1
index af6c9366fbc1..bf9670995049 100644
--- a/external/libepubgen/libepubgen-epub3.patch.1
+++ b/external/libepubgen/libepubgen-epub3.patch.1
@@ -5856,3 +5856,564 @@ index 02c299a..38573ec 100644
 -- 
 2.13.6
 
+diff --git a/NEWS b/NEWS
+index 912efbc..ad3d4d1 100644
+--- a/NEWS
 b/NEWS
+@@ -1,3 +1,13 @@
++- Fix various validation problems, pointed out by epubcheck.
++- Add EPUB3 support.
++- Split on headings: add user-friendly section names.
++- Support writing CSS styles inline in the XHTML streams.
++- Support various image wrap types.
++- Support embedded fonts.
++- Support cover images.
++- Support footnotes.
++- Support EPUB3 fixed layout.
++
+ libepubgen-0.0.1
+ 
+ - Fix escaping of HTML entities.
+diff --git a/inc/libepubgen/EPUBDrawingGenerator.h 
b/inc/libepubgen/EPUBDrawingGenerator.h
+index 963e3b8..8f14959 100644
+--- a/inc/libepubgen/EPUBDrawingGenerator.h
 b/inc/libepubgen/EPUBDrawingGenerator.h
+@@ -36,13 +36,19 @@ public:
+ *
+ * @param[in] version possible values: 20, 30.
+ */
+-  explicit EPUBDrawingGenerator(EPUBPackage *package, EPUBSplitMethod split = 
EPUB_SPLIT_METHOD_PAGE_BREAK, int version = 20);
++  explicit EPUBDrawingGenerator(EPUBPackage *package, int version = 30);
+   EPUBDrawingGenerator(EPUBEmbeddingContact &contact, EPUBPackage *package);
+   ~EPUBDrawingGenerator() override;
+ 
+   void setSplitHeadingLevel(unsigned level);
+   void setSplitSize(unsigned size);
+ 
++  /** Set an option for the EPUB generator
++   * @param[in] key a value from the EPUBGeneratorOption enumeration
++   * @param[in] value depends on the value of key
++   */
++  void setOption(int key, int value);
++
+   /** Register a handler for embedded images.
+ *
+ * The handler must convert the image to one of the OPS Core Media Types.
+diff --git a/inc/libepubgen/EPUBPresentationGenerator.h 
b/inc/libepubgen/EPUBPresentationGenerator.h
+index 512c52d..b7ad190 100644
+--- a/inc/libepubgen/EPUBPresentationGenerator.h
 b/inc/libepubgen/EPUBPresentationGenerator.h
+@@ -36,13 +36,19 @@ public:
+ *
+ * @param[in] version possible values: 20, 30.
+ */
+-  explicit EPUBPresentationGenerator(EPUBPackage *package, EPUBSplitMethod 
split = EPUB_SPLIT_METHOD_PAGE_BREAK, int version = 20);
++  explicit EPUBPresentationGenerator(EPUBPackage *package, int version = 30);
+   EPUBPresentationGenerator(EPUBEmbeddingContact &contact, EPUBPackage 
*package);
+   ~EPUBPresentationGenerator() override;
+ 
+   void setSplitHeadingLevel(unsigned level);
+   void setSplitSize(unsigned size);
+ 
++  /** Set an option for the EPUB generator
++   * @param[in] key a value from the EPUBGeneratorOption enumeration
++   * @param[in] value depends on the value of key
++   */
++  void setOption(int key, int value);
++
+   /** Register a handler for embedded images.
+ *
+ * The handler must convert the image to one of the OPS Core Media Types.
+diff --git a/inc/libepubgen/EPUBTextGenerator.h 
b/inc/libepubgen/EPUBTextGenerator.h
+index beb05aa..