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

[Stephan Bergmann]

 solenv/bin/assemble-flatpak.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d7d12bf1ff10570de5f3392058f7f9c2de04c0a2
Author: Stephan Bergmann 
Date:   Tue Nov 14 18:42:03 2017 +0100

Make sure there is a org.libreoffice.LibreOffice.desktop again in the 
Flatpak

...after 1b85d725663a7d7546549e6b78ea43bea1cde7b9 "Include all .desktop 
files in
the Flatpak".  org.libreoffice.LibreOffice.appdata.xml references that in 
its

  org.libreoffice.LibreOffice.desktop

which is at least used to find an icon for the AppData (see
 "No icon 
shown
on flathub.org").  On #flatpak it was deemed impossible to change that id to
point at the the LibreOffice-startcenter.desktop file, so rather change 
that one
desktop file's name.

Change-Id: I78c3ae131be213e41cc4fcdeddae1b6c9e6c29df

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index d514c3ee41fc..e678b9894b86 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -24,6 +24,8 @@ do
   -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' "$i" \
   
>/app/share/applications/org.libreoffice.LibreOffice-"${i#"${PREFIXDIR?}"/share/applications/libreoffice-}"
 done
+mv /app/share/applications/org.libreoffice.LibreOffice-startcenter.desktop \
+ /app/share/applications/org.libreoffice.LibreOffice.desktop
 
 ## icons/hicolor/*/apps/libreoffice-* ->
 ## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 external/harfbuzz/harfbuzz-rtti.patch |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d2957be36da3e7c513abbcdc048f568b323fb2f
Author: Stephan Bergmann 
Date:   Wed Nov 15 08:45:56 2017 +0100

Adpat external/harfbuzz/harfbuzz-rtti.patch

...to 7e56dce9efa7184e522c83130dcf79d894488657 "tdf#105992: Upload HarfBuzz
1.7.0"

Change-Id: Ia13d406ae78edb3b431716ae7e2044c483430c6e

diff --git a/external/harfbuzz/harfbuzz-rtti.patch 
b/external/harfbuzz/harfbuzz-rtti.patch
index 65c6fbbf9ff5..83fd0f40b856 100644
--- a/external/harfbuzz/harfbuzz-rtti.patch
+++ b/external/harfbuzz/harfbuzz-rtti.patch
@@ -1,7 +1,7 @@
 --- configure
 +++ configure
-@@ -18255,7 +18255,7 @@
-   CXXFLAGS="$CXXFLAGS -std=c++11"
+@@ -18918,7 +18918,7 @@
+   LDFLAGS="$LDFLAGS -Bsymbolic-functions"
  
# Make sure we don't link to libstdc++
 -  CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
___
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/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/xsheetannotationssupplier.hxx|   34 ++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |1 
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java   |   49 
--
 sc/qa/extras/sctablesheetobj.cxx|7 +
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xsheetannotationssupplier.cxx |   33 ++
 7 files changed, 74 insertions(+), 52 deletions(-)

New commits:
commit 1dde2e441451ba6e7d760b1e150113993c24
Author: Jens Carl 
Date:   Wed Nov 15 05:09:23 2017 +

tdf#45904 Move _XSheetAnnotationsSupplier Java test to C++

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

diff --git a/include/test/sheet/xsheetannotationssupplier.hxx 
b/include/test/sheet/xsheetannotationssupplier.hxx
new file mode 100644
index ..cc9e008ec6ae
--- /dev/null
+++ b/include/test/sheet/xsheetannotationssupplier.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_XSHEETANNOTATIONSSUPPLIER_HXX
+#define INCLUDED_TEST_SHEET_XSHEETANNOTATIONSSUPPLIER_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XSheetAnnotationsSupplier
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetAnnotations();
+
+protected:
+~XSheetAnnotationsSupplier() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XSHEETANNOTATIONSSUPPLIER_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 24db4d9f20a8..f239a22e9cfd 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -612,7 +612,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced \
 qadevOOo/tests/java/ifc/sheet/_XScenariosSupplier \
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \
-qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier \
 qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
 qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index 4fbb1a5f92da..d43bdf798988 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -135,7 +135,6 @@
 "ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"IsVisible"
 "ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"PageStyle"
 
"ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"AutomaticPrintArea#optional"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAnnotationsSupplier";"getAnnotations()"
 "ScTableSheetObj";"com::sun::star::table::XTableChartsSupplier";"getCharts()"
 
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java 
b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java
deleted file mode 100644
index 389ae138b6e3..
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java
+++ /dev/null
@@ -1,49 +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 lib.MultiMethodTest;
-
-import com.sun.star.sheet.XSheetAnnotations;
-import com.sun.star.sheet.XSheetAnnotationsSupplier;
-
-/**
-* Testing com.sun.star.sheet.XSheetAnnotationsSupplier
-* inter

[Libreoffice-commits] core.git: chart2/source editeng/inc editeng/source filter/source forms/source include/editeng include/svl include/svx sc/source sd/qa sd/source svx/source sw/source

[Noel Grandin]

 chart2/source/controller/dialogs/res_DataLabel.cxx |   
 2 
 chart2/source/controller/dialogs/tp_AxisLabel.cxx  |   
 2 
 chart2/source/controller/dialogs/tp_LegendPosition.cxx |   
 2 
 chart2/source/controller/dialogs/tp_TitleRotation.cxx  |   
 2 
 chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx |   
 8 -
 chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx  |   
 2 
 chart2/source/view/main/ChartView.cxx  |   
 2 
 chart2/source/view/main/DrawModelWrapper.cxx   |   
 2 
 editeng/inc/editdoc.hxx|   
 5 
 editeng/source/accessibility/AccessibleEditableTextPara.cxx|   
 5 
 editeng/source/editeng/editdbg.cxx |   
14 +-
 editeng/source/editeng/editdoc.cxx |   
 4 
 editeng/source/editeng/editeng.cxx |   
 2 
 editeng/source/editeng/edtspell.cxx|   
 6 
 editeng/source/editeng/eerdll.cxx  |   
22 +--
 editeng/source/editeng/eertfpar.cxx|   
 2 
 editeng/source/editeng/impedit.cxx |   
 4 
 editeng/source/editeng/impedit.hxx |   
 5 
 editeng/source/editeng/impedit2.cxx|   
 4 
 editeng/source/editeng/impedit3.cxx|   
11 -
 editeng/source/editeng/impedit4.cxx|   
 8 -
 editeng/source/outliner/outliner.cxx   |   
20 +--
 editeng/source/outliner/outlvw.cxx |   
12 -
 editeng/source/uno/unotext.cxx |   
12 -
 editeng/source/xml/xmltxtexp.cxx   |   
 6 
 filter/source/msfilter/msdffimp.cxx|   
 6 
 filter/source/msfilter/svdfppt.cxx |   
20 +--
 forms/source/richtext/rtattributehandler.cxx   |   
 2 
 include/editeng/editeng.hxx|   
 6 
 include/editeng/eeitem.hxx |   
31 +++--
 include/editeng/unotext.hxx|   
20 +--
 include/svl/itempool.hxx   |   
17 ++
 include/svl/itemset.hxx|   
26 
 include/svl/poolitem.hxx   |   
 9 +
 include/svl/typedwhich.hxx |   
61 ++
 include/svx/svdobj.hxx |   
 6 
 sc/source/core/data/column2.cxx|   
 2 
 sc/source/core/data/drwlayer.cxx   |   
 4 
 sc/source/core/data/patattr.cxx|   
 8 -
 sc/source/ui/app/inputwin.cxx  |   
 2 
 sc/source/ui/drawfunc/drawsh2.cxx  |   
 2 
 sc/source/ui/drawfunc/drawsh5.cxx  |   
 4 
 sc/source/ui/drawfunc/drtxtob.cxx  |   
11 -
 sc/source/ui/drawfunc/drtxtob2.cxx |   
 8 -
 sc/source/ui/drawfunc/futext.cxx   |   
 2 
 sc/source/ui/view/output2.cxx  |   
 4 
 sc/source/ui/view/printfun.cxx |   
 2 
 sd/qa/unit/export-tests-ooxml1.cxx |   
 8 -
 sd/qa/unit/import-tests.cxx|   
 6 
 sd/source/core/drawdoc.cxx |   
 2 
 sd/source/core/drawdoc4.cxx|   
16 +-
 sd/source/core/sdpage.cxx  |   
10 -
 sd/source/core/stlpool.cxx |   
13 --
 sd/source/core/stlsheet.cxx|   
 4 
 sd/source/ui/dlg/dlgolbul.cxx  |   
 4 
 sd/source/ui/func/fuolbull.cxx |   
 6 
 sd/source/ui/func/fupage.cxx   |   
 4 
 sd/source/ui/func/fuparagr.cxx |   
 2 
 sd/source/ui/func/

[Libreoffice-commits] core.git: basic/source extensions/source odk/examples sc/source sd/source

[Andrea Gelmini]

 basic/source/runtime/iosys.cxx   |2 +-
 extensions/source/dbpilots/controlwizard.cxx |2 +-
 odk/examples/java/PropertySet/PropTest.java  |2 +-
 sc/source/core/tool/interpr8.cxx |2 +-
 sc/source/ui/view/dbfunc3.cxx|6 +++---
 sd/source/ui/view/Outliner.cxx   |2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit a8f31d5120c2ae9109d316db73b5adf9cb26c892
Author: Andrea Gelmini 
Date:   Tue Nov 14 12:10:55 2017 +0100

Fix typos

Change-Id: I8bdced3fa572074aedabdcfce841adf525ae8b81
Reviewed-on: https://gerrit.libreoffice.org/44710
Tested-by: Jenkins 
Reviewed-by: Mark Page 

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 68f039a7b377..e8f4185c5bcf 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -831,7 +831,7 @@ void SbiIoSystem::ReadCon(OString& rIn)
 aPrompt.clear();
 }
 
-// output of a MessageBox, if theres a CR in the console-buffer
+// output of a MessageBox, if there's a CR in the console-buffer
 
 void SbiIoSystem::WriteCon(const OUString& rText)
 {
diff --git a/extensions/source/dbpilots/controlwizard.cxx 
b/extensions/source/dbpilots/controlwizard.cxx
index 496b52dd0e58..54d10fd2c036 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -438,7 +438,7 @@ namespace dbp
 // set the new connection
 if ( _bAutoDispose )
 {
-// for this, use a AutoDisposer (so the conn is cleaned up 
when the form dies or get's another connection)
+// for this, use a AutoDisposer (so the conn is cleaned up 
when the form dies or gets another connection)
 Reference< XRowSet > xFormRowSet( m_aContext.xForm, UNO_QUERY 
);
 rtl::Reference pAutoDispose = new 
OAutoConnectionDisposer( xFormRowSet, _rxConn );
 }
diff --git a/odk/examples/java/PropertySet/PropTest.java 
b/odk/examples/java/PropertySet/PropTest.java
index 50fed5c36cbe..c77a905e870d 100644
--- a/odk/examples/java/PropertySet/PropTest.java
+++ b/odk/examples/java/PropertySet/PropTest.java
@@ -57,7 +57,7 @@ import com.sun.star.lang.XTypeProvider;
 import com.sun.star.beans.PropertyAttribute;
 
 /**
-   This component contains the followin properties:
+   This component contains the following properties:
  *  
  *  
  *   Property Name 
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 07bea611d5f8..fa87be067f89 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -80,7 +80,7 @@ private:
 std::unique_ptr mpForecast; // forecasted value 
array
 SCSIZE mnSmplInPrd; // samples per period
 double mfStepSize;  // increment of X in maRange
-double mfAlpha, mfBeta, mfGamma;// constants to minimise the RMSE in 
the ES-equations
+double mfAlpha, mfBeta, mfGamma;// constants to minimize the RMSE in 
the ES-equations
 SCSIZE mnCount; // No of data points
 bool mbInitialised;
 int mnMonthDay; // n-month X-interval, value is day of 
month
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 99db0e7f6839..11a16575e36a 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -2158,12 +2158,12 @@ void ScDBFunc::RepeatDB( bool bRecord )
 
 if (bSort)
 {
-pDBData->GetSortParam( aSortParam );// range may have 
chaged
+pDBData->GetSortParam( aSortParam );// range may have 
changed
 Sort( aSortParam, false, false);
 }
 if (bQuery)
 {
-pDBData->GetQueryParam( aQueryParam );  // range may have 
chaged
+pDBData->GetQueryParam( aQueryParam );  // range may have 
changed
 ScRange aAdvSource;
 if (pDBData->GetAdvancedQuerySource(aAdvSource))
 {
@@ -2179,7 +2179,7 @@ void ScDBFunc::RepeatDB( bool bRecord )
 }
 if (bSubTotal)
 {
-pDBData->GetSubTotalParam( aSubTotalParam );// range may have 
chaged
+pDBData->GetSubTotalParam( aSubTotalParam );// range may have 
changed
 aSubTotalParam.bRemoveOnly = false;
 DoSubTotals( aSubTotalParam, false );
 }
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 22ab4facd0ae..2609e6e65bce 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1007,7 +1007,7 @@ void SdOutliner::RestoreStartPosition()
 // start position is not requested.
 if (mnStartPageIndex == (sal_uInt16)-1 )
 bRestore = false;
-// Dont't restore when the view shell is not valid.
+// Don't restore when the view shell is not valid.
 std::shar

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

[Stephan Bergmann]

 compilerplugins/clang/plugin.cxx   |   32 +
 compilerplugins/clang/test/unnecessaryoverride.cxx |7 
 compilerplugins/clang/unnecessaryoverride.cxx  |   15 +++--
 3 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit cab6e6836973a9ddfc5ed9df757e07138328c1c3
Author: Stephan Bergmann 
Date:   Tue Nov 14 19:17:07 2017 +0100

Make checkIdenticalDefaultArguments more precise

...when creating objects involves copy/move constructors

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

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 717d88b23091..80fff7651ae0 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -30,7 +30,7 @@ namespace {
 
 Expr const * skipImplicit(Expr const * expr) {
 if (auto const e = dyn_cast(expr)) {
-expr = e->GetTemporaryExpr();
+expr = e->GetTemporaryExpr()->IgnoreImpCasts();
 }
 if (auto const e = dyn_cast(expr)) {
 expr = e->getSubExpr();
@@ -271,18 +271,26 @@ Plugin::IdenticalDefaultArgumentsResult 
Plugin::checkIdenticalDefaultArguments(
 }
 }
 // catch params with defaults like "= OUString()"
-if (auto const e1 = dyn_cast(skipImplicit(desugared1))) {
-if (auto const e2 = dyn_cast(
-skipImplicit(desugared2)))
+for (Expr const * e1 = desugared1, * e2 = desugared2;;) {
+auto const ce1 = dyn_cast(skipImplicit(e1));
+auto const ce2 = dyn_cast(skipImplicit(e2));
+if (ce1 == nullptr || ce2 == nullptr) {
+break;
+}
+if (ce1->getConstructor()->getCanonicalDecl() != 
ce2->getConstructor()->getCanonicalDecl())
 {
-if ((e1->getConstructor()->getCanonicalDecl()
- != e2->getConstructor()->getCanonicalDecl()))
-{
-return IdenticalDefaultArgumentsResult::No;
-}
-if (e1->getNumArgs() == 0 && e2->getNumArgs() == 0) {
-return IdenticalDefaultArgumentsResult::Yes;
-}
+return IdenticalDefaultArgumentsResult::No;
+}
+if (ce1->isElidable() && ce2->isElidable() && ce1->getNumArgs() == 1
+&& ce2->getNumArgs() == 1)
+{
+assert(ce1->getConstructor()->isCopyOrMoveConstructor());
+e1 = ce1->getArg(0)->IgnoreImpCasts();
+e2 = ce2->getArg(0)->IgnoreImpCasts();
+continue;
+}
+if (ce1->getNumArgs() == 0 && ce2->getNumArgs() == 0) {
+return IdenticalDefaultArgumentsResult::Yes;
 }
 }
 return IdenticalDefaultArgumentsResult::Maybe;
diff --git a/compilerplugins/clang/test/unnecessaryoverride.cxx 
b/compilerplugins/clang/test/unnecessaryoverride.cxx
index 7abcf971986f..1f5c1f9fb4a7 100644
--- a/compilerplugins/clang/test/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/test/unnecessaryoverride.cxx
@@ -94,6 +94,7 @@ struct Base2
 {
 void default1(Base const& = SimpleDerived());
 void default2(Base const& = SimpleDerived());
+void default3(Base = Base());
 };
 
 struct Derived2 : Base2
@@ -105,6 +106,12 @@ struct Derived2 : Base2
 {
 Base2::default2(x);
 }
+void
+default3( // expected-error {{public function just calls public parent 
[loplugin:unnecessaryoverride]}}
+Base x = Base())
+{
+(Base2::default3(x));
+}
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx 
b/compilerplugins/clang/unnecessaryoverride.cxx
index 13ed723385d8..336c7712a95f 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -289,10 +289,12 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const 
CXXMethodDecl* methodDecl)
 if (!compoundStmt || compoundStmt->size() != 1)
 return true;
 
-const CXXMemberCallExpr* callExpr;
+const CXXMemberCallExpr* callExpr = nullptr;
 if (compat::getReturnType(*methodDecl).getCanonicalType()->isVoidType())
 {
-callExpr = dyn_cast(*compoundStmt->body_begin());
+if (auto const e = dyn_cast(*compoundStmt->body_begin())) {
+callExpr = 
dyn_cast(e->IgnoreImplicit()->IgnoreParens());
+}
 }
 else
 {
@@ -355,8 +357,13 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const 
CXXMethodDecl* methodDecl)
 if (!expr2)
 return true;
 for (unsigned i = 0; igetNumArgs(); ++i) {
-// ignore ImplicitCastExpr
-const DeclRefExpr * declRefExpr = 
dyn_cast(callExpr->getArg(i)->IgnoreImplicit());
+auto e = callExpr->getArg(i)->IgnoreImplicit();
+if (auto const e1 = dyn_cast(e)) {
+if (e1->getConstructor()->isCopyOrMoveConstruct

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

[Julien Nabet]

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

New commits:
commit 4283092eb219968870e23bd0d600e1ef521dab89
Author: Julien Nabet 
Date:   Mon Nov 13 23:03:41 2017 +0100

Related tdf#113652: fix crash when closing Data provider

Test also mpScrollBar to know if should keep on with RecalcAll
bt:
5  0x7fffec06b6f0 in vcl::Window::Hide() (this=0x0) at 
/home/julien/lo/libreoffice/include/vcl/window.hxx:948
6  0x7fffec2eb344 in ListControl::RecalcAll() (this=0x58b25090) at 
/home/julien/lo/libreoffice/vcl/source/control/listctrl.cxx:76
7  0x7fffec2eb6ec in ListControl::queue_resize(StateChangedType) 
(this=0x58b25090, eReason=StateChangedType::Layout)
   at /home/julien/lo/libreoffice/vcl/source/control/listctrl.cxx:110
8  0x7fffec24c6b0 in vcl::(anonymous 
namespace)::queue_ungrouped_resize(vcl::Window const*) 
(pOrigWindow=0x58b06620)
   at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1343
9  0x7fffec24c799 in vcl::Window::queue_resize(StateChangedType) 
(this=0x58b06620, eReason=StateChangedType::Layout)
   at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1362
10 0x7fffec14a701 in VclContainer::queue_resize(StateChangedType) 
(this=0x58b06620, eReason=StateChangedType::Layout)
   at /home/julien/lo/libreoffice/vcl/source/window/layout.cxx:179
11 0x7fffec24c6b0 in vcl::(anonymous 
namespace)::queue_ungrouped_resize(vcl::Window const*) 
(pOrigWindow=0x58b287b0)
   at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1343
12 0x7fffec24c799 in vcl::Window::queue_resize(StateChangedType) 
(this=0x58b287b0, eReason=StateChangedType::Layout)
   at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1362
13 0x7fffec14a701 in VclContainer::queue_resize(StateChangedType) 
(this=0x58b287b0, eReason=StateChangedType::Layout)
   at /home/julien/lo/libreoffice/vcl/source/window/layout.cxx:179
14 0x7fffec24c6b0 in vcl::(anonymous 
namespace)::queue_ungrouped_resize(vcl::Window const*) 
(pOrigWindow=0x58b26fd0)
   at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1343
15 0x7fffec24c799 in vcl::Window::queue_resize(StateChangedType) 
(this=0x58b26fd0, eReason=StateChangedType::Visible)
   at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1362
16 0x7fffec25f2d5 in vcl::Window::StateChanged(StateChangedType) 
(this=0x58b26fd0, eType=StateChangedType::Visible)
   at /home/julien/lo/libreoffice/vcl/source/window/window.cxx:1940
17 0x7fffec2675ae in vcl::Window::CompatStateChanged(StateChangedType) 
(this=0x58b26fd0, nStateChange=StateChangedType::Visible)
   at /home/julien/lo/libreoffice/vcl/source/window/window.cxx:3696
18 0x7fffec260548 in vcl::Window::Show(bool, ShowFlags) 
(this=0x58b26fd0, bVisible=false, nFlags=ShowFlags::NONE)
   at /home/julien/lo/libreoffice/vcl/source/window/window.cxx:2200
19 0x7fffec06b6f0 in vcl::Window::Hide() (this=0x58b26fd0) at 
/home/julien/lo/libreoffice/include/vcl/window.hxx:948
20 0x7fffec256f11 in vcl::Window::dispose() (this=0x58b26fd0) at 
/home/julien/lo/libreoffice/vcl/source/window/window.cxx:394
21 0x7fffec2b1395 in Control::dispose() (this=0x58b26fd0) at 
/home/julien/lo/libreoffice/vcl/source/control/ctrl.cxx:68
22 0x7fffec289da8 in Button::dispose() (this=0x58b26fd0) at 
/home/julien/lo/libreoffice/vcl/source/control/button.cxx:109
23 0x7fffec3ef640 in VclReferenceBase::disposeOnce() 
(this=0x58b27240) at 
/home/julien/lo/libreoffice/vcl/source/outdev/vclreferencebase.cxx:42
24 0x7fffca047c8a in VclPtr::disposeAndClear() 
(this=0x58b068c0) at /home/julien/lo/libreoffice/include/vcl/vclptr.hxx:208
25 0x7fffca0432a6 in ScDataProviderBaseControl::dispose() 
(this=0x58b06620) at 
/home/julien/lo/libreoffice/sc/source/ui/miscdlgs/dataproviderdlg.cxx:104

Change-Id: Ie1f2b156a5743354f39e95048e50bb0709095fd0
Reviewed-on: https://gerrit.libreoffice.org/44697
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
Reviewed-by: Julien Nabet 

diff --git a/vcl/source/control/listctrl.cxx b/vcl/source/control/listctrl.cxx
index fd94a50abed1..50b03eddc918 100644
--- a/vcl/source/control/listctrl.cxx
+++ b/vcl/source/control/listctrl.cxx
@@ -48,7 +48,7 @@ void ListControl::RecalcAll()
 // avoid recalculating while we are disposing
 // children. This just leads to complex invalid memory
 // access patterns that are not fixable.
-if (IsDisposed())
+if (isDisposed())
 return;
 
 sal_Int32 nTotalHeight = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

121 new defect(s) introduced to LibreOffice found with Coverity Scan.
19 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 20 of 121 defect(s)


** CID 1421169:  Error handling issues  (UNCAUGHT_EXCEPT)
/connectivity/source/inc/java/GlobalRef.hxx: 58 in 
connectivity::jdbc::GlobalRef<_jobject *>::~GlobalRef()()



*** CID 1421169:  Error handling issues  (UNCAUGHT_EXCEPT)
/connectivity/source/inc/java/GlobalRef.hxx: 58 in 
connectivity::jdbc::GlobalRef<_jobject *>::~GlobalRef()()
52 
53 SDBThreadAttach t;
54 set( t.env(), _source.get() );
55 return *this;
56 }
57 
>>> CID 1421169:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type 
>>> "jvmaccess::VirtualMachine::AttachGuard::CreationException" is thrown but 
>>> the throw list "throw()" doesn't allow it to be thrown. This will cause a 
>>> call to unexpected() which usually calls terminate().
58 ~GlobalRef()
59 {
60 reset();
61 }
62 
63 void reset()

** CID 1421168:  Error handling issues  (UNCAUGHT_EXCEPT)
/starmath/source/tmpdevice.hxx: 37 in SmTmpDevice::~SmTmpDevice()()



*** CID 1421168:  Error handling issues  (UNCAUGHT_EXCEPT)
/starmath/source/tmpdevice.hxx: 37 in SmTmpDevice::~SmTmpDevice()()
31 SmTmpDevice& operator=(const SmTmpDevice&) = delete;
32 
33 Color   Impl_GetColor( const Color& rColor );
34 
35 public:
36 SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm);
>>> CID 1421168:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type 
>>> "boost::exception_detail::clone_impl
>>>  >" is thrown but the throw list "throw()" doesn't allow it to be thrown. 
>>> This will cause a call to unexpected() which usually calls terminate().
37 ~SmTmpDevice()  { rOutDev.Pop(); }
38 
39 void SetFont(const vcl::Font &rNewFont);
40 
41 void SetLineColor( const Color& rColor ){ rOutDev.SetLineColor( 
Impl_GetColor(rColor) ); }
42 void SetFillColor( const Color& rColor ){ rOutDev.SetFillColor( 
Impl_GetColor(rColor) ); }

** CID 1421167:  Error handling issues  (UNCAUGHT_EXCEPT)
/svx/source/unodraw/unoshap3.cxx: 60 in 
Svx3DSceneObject::Svx3DSceneObject(SdrObject *, SvxDrawPage *)()



*** CID 1421167:  Error handling issues  (UNCAUGHT_EXCEPT)
/svx/source/unodraw/unoshap3.cxx: 60 in 
Svx3DSceneObject::Svx3DSceneObject(SdrObject *, SvxDrawPage *)()
54 using namespace ::com::sun::star::container;
55 
56 #define QUERYINT( xint ) \
57 if( rType == cppu::UnoType::get() ) \
58 aAny <<= Reference< xint >(this)
59 
>>> CID 1421167:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown 
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause 
>>> a call to unexpected() which usually calls terminate().
60 Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* 
pDrawPage ) throw()
61 :   SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSCENEOBJECT), 
getSvxMapProvider().GetPropertySet(SVXMAP_3DSCENEOBJECT, 
SdrObject::GetGlobalDrawObjectItemPool()) )
62 ,   mxPage( pDrawPage )
63 {
64 }
65 

** CID 1421166:  Error handling issues  (UNCAUGHT_EXCEPT)
/svx/source/unodraw/unoshap4.cxx: 66 in SvxOle2Shape::SvxOle2Shape(SdrObject 
*)()



*** CID 1421166:  Error handling issues  (UNCAUGHT_EXCEPT)
/svx/source/unodraw/unoshap4.cxx: 66 in SvxOle2Shape::SvxOle2Shape(SdrObject 
*)()
60 using namespace ::com::sun::star::uno;
61 using namespace ::com::sun::star::lang;
62 using namespace ::com::sun::star::container;
63 using namespace ::com::sun::star::beans;
64 
65 
>>> CID 1421166:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown 
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause 
>>> a call to unexpected() which usually calls terminate().
66 SvxOle2Shape::SvxOle2Shape( SdrObject* pObject ) throw()
67 : SvxShapeText( pObject, getSvxMapProvider().GetMap(SVXMAP_OLE2),
68 
getSvxMapProvider().GetPropertySet(SVXMAP_OLE2,SdrObject::GetGlobalDrawObjectItemPool())
 )
69 {
70

[Libreoffice-commits] core.git: download.lst external/harfbuzz

[Khaled Hosny]

 download.lst  |4 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |1 
 external/harfbuzz/revert-make-inert.patch |  200 ++
 3 files changed, 203 insertions(+), 2 deletions(-)

New commits:
commit 7e56dce9efa7184e522c83130dcf79d894488657
Author: Khaled Hosny 
Date:   Mon Nov 13 21:18:47 2017 +0200

tdf#105992: Upload HarfBuzz 1.7.0

This release supports old-style kern table in the code path we are using in
CommonLayout.

Change-Id: Id20e6fe1cfe98ef65b8fa4a5627f6246cbac54a6
Reviewed-on: https://gerrit.libreoffice.org/44693
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/download.lst b/download.lst
index 51553c95a7fe..78bac45c9514 100644
--- a/download.lst
+++ b/download.lst
@@ -84,8 +84,8 @@ export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e64
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
 export GRAPHITE_SHA256SUM := 
aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
-export HARFBUZZ_SHA256SUM := 
e31eb367beb61a9399d2c78b51c225ab2b1cbd46f364f2d80d97bb422b44101a
-export HARFBUZZ_TARBALL := harfbuzz-1.6.3.tar.bz2
+export HARFBUZZ_SHA256SUM := 
042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029
+export HARFBUZZ_TARBALL := harfbuzz-1.7.0.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 74c990c0c1aa..537862531bfd 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/clang-cl.patch \
 external/harfbuzz/ubsan.patch \
+   external/harfbuzz/revert-make-inert.patch \
 ))
 
 ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
diff --git a/external/harfbuzz/revert-make-inert.patch 
b/external/harfbuzz/revert-make-inert.patch
new file mode 100644
index ..366750d87fb9
--- /dev/null
+++ b/external/harfbuzz/revert-make-inert.patch
@@ -0,0 +1,200 @@
+From 93f7c1652a05e806c2e3ac7edf498d2f4a508a3a Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod 
+Date: Tue, 14 Nov 2017 10:59:54 -0800
+Subject: [PATCH] Revert "[glib/ucdn/icu/ft/ot] Make returned funcs inert"
+
+This reverts commit 5daf3bd4494cce6b4fb074533be9e99c4d9e0edd.
+
+If other atexit callbacks try to destruct the objects we destruct
+in atexit callbacks, bad things will happen.
+
+I'll come up with some other way to catch premature destruction
+of HB-owned objects.
+
+Fixes https://github.com/behdad/harfbuzz/issues/618
+---
+ src/hb-ft.cc |  3 ---
+ src/hb-glib.cc   |  3 ---
+ src/hb-icu.cc|  3 ---
+ src/hb-object-private.hh | 37 ++---
+ src/hb-ot-font.cc|  3 ---
+ src/hb-ucdn.cc   |  3 ---
+ 6 files changed, 6 insertions(+), 46 deletions(-)
+
+diff --git src/hb-ft.cc src/hb-ft.cc
+index 68c774547..0f15f8c3d 100644
+--- src/hb-ft.cc
 src/hb-ft.cc
+@@ -423,7 +423,6 @@ static hb_font_funcs_t *static_ft_funcs = nullptr;
+ static
+ void free_static_ft_funcs (void)
+ {
+-  hb_object_undo_inert (static_ft_funcs);
+   hb_font_funcs_destroy (static_ft_funcs);
+ }
+ #endif
+@@ -454,10 +453,8 @@ _hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, 
bool unref)
+ hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, 
nullptr, nullptr);
+ 
+ hb_font_funcs_make_immutable (funcs);
+-hb_object_make_inert (funcs);
+ 
+ if (!hb_atomic_ptr_cmpexch (&static_ft_funcs, nullptr, funcs)) {
+-  hb_object_undo_inert (funcs);
+   hb_font_funcs_destroy (funcs);
+   goto retry;
+ }
+diff --git src/hb-glib.cc src/hb-glib.cc
+index 31de68e86..50c30e9c7 100644
+--- src/hb-glib.cc
 src/hb-glib.cc
+@@ -370,7 +370,6 @@ static hb_unicode_funcs_t *static_glib_funcs = nullptr;
+ static
+ void free_static_glib_funcs (void)
+ {
+-  hb_object_undo_inert (static_glib_funcs);
+   hb_unicode_funcs_destroy (static_glib_funcs);
+ }
+ #endif
+@@ -391,10 +390,8 @@ hb_glib_get_unicode_funcs (void)
+ #undef HB_UNICODE_FUNC_IMPLEMENT
+ 
+ hb_unicode_funcs_make_immutable (funcs);
+-hb_object_make_inert (funcs);
+ 
+ if (!hb_atomic_ptr_cmpexch (&static_glib_funcs, nullptr, funcs)) {
+-  hb_object_undo_inert (funcs);
+   hb_unicode_funcs_destroy (funcs);
+   goto retry;
+ }
+diff --git src/hb-icu.cc src/hb-icu.cc
+index 44a198937..552eaeca5 100644
+--- src/hb-icu.cc
 src/hb-icu.cc
+@@ -351,7 +351,6 @@ static hb_unicode_funcs_t *static_icu_funcs = nullptr;
+ static

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

[Henry Castro]

 sd/qa/unit/tiledrendering/data/notes-view.odp |binary
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |   29 ++
 sd/source/ui/unoidl/unomodel.cxx  |4 ---
 sd/source/ui/view/ImpressViewShellBase.cxx|4 ++-
 4 files changed, 32 insertions(+), 5 deletions(-)

New commits:
commit 831dca83f073bca9ad6242f1b96183eb4a49af69
Author: Henry Castro 
Date:   Tue Nov 14 16:15:52 2017 -0400

sd lok: ensure default view

In Tiled rendering case, the only default view is supported

Change-Id: Ia6df85dba28f8ebb41bdc20ae48916b0437ea185
Reviewed-on: https://gerrit.libreoffice.org/44737
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/sd/qa/unit/tiledrendering/data/notes-view.odp 
b/sd/qa/unit/tiledrendering/data/notes-view.odp
new file mode 100644
index ..d41bdf9599a4
Binary files /dev/null and b/sd/qa/unit/tiledrendering/data/notes-view.odp 
differ
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 6d5c0bc84af2..37ded6498370 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -8,6 +8,7 @@
  */
 
 #include "../sdmodeltestbase.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -104,6 +105,7 @@ public:
 void testMultiViewInsertDeletePage();
 void testDisableUndoRepair();
 void testLanguageStatus();
+void testDefaultView();
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -142,6 +144,7 @@ public:
 CPPUNIT_TEST(testMultiViewInsertDeletePage);
 CPPUNIT_TEST(testDisableUndoRepair);
 CPPUNIT_TEST(testLanguageStatus);
+CPPUNIT_TEST(testDefaultView);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1836,6 +1839,8 @@ void SdTiledRenderingTest::testDisableUndoRepair()
 CPPUNIT_ASSERT(pUInt32Item);
 CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
pUInt32Item->GetValue());
 }
+
+comphelper::LibreOfficeKit::setActive(false);
 }
 
 void SdTiledRenderingTest::testLanguageStatus()
@@ -1854,6 +1859,30 @@ void SdTiledRenderingTest::testLanguageStatus()
 CPPUNIT_ASSERT(dynamic_cast< const SfxStringListItem* >(pItem1.get()));
 CPPUNIT_ASSERT(dynamic_cast< const SfxStringListItem* >(pItem2.get()));
 }
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
+void SdTiledRenderingTest::testDefaultView()
+{
+// Load the document with notes view.
+comphelper::LibreOfficeKit::setActive();
+
+SdXImpressDocument* pXImpressDocument = createDoc("notes-view.odp");
+sd::ViewShell* pView = pXImpressDocument->GetDocShell()->GetViewShell();
+{
+std::unique_ptr pItem1;
+std::unique_ptr pItem2;
+
pView->GetViewFrame()->GetBindings().QueryState(SID_NORMAL_MULTI_PANE_GUI, 
pItem1);
+pView->GetViewFrame()->GetBindings().QueryState(SID_NOTES_MODE, 
pItem2);
+const SfxBoolItem* pImpressView = dynamic_cast< const SfxBoolItem* 
>(pItem1.get());
+const SfxBoolItem* pNotesView = dynamic_cast< const SfxBoolItem* 
>(pItem2.get());
+CPPUNIT_ASSERT(pImpressView);
+CPPUNIT_ASSERT(pNotesView);
+CPPUNIT_ASSERT_EQUAL(true, pImpressView->GetValue());
+CPPUNIT_ASSERT_EQUAL(false, pNotesView->GetValue());
+}
+comphelper::LibreOfficeKit::setActive(false);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 4cd01e61acff..ab16b1b1419f 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2413,10 +2413,6 @@ void 
SdXImpressDocument::initializeForTiledRendering(const css::uno::SequenceGetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_VIEWSHELL0,
 SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
-
 if (DrawViewShell* pViewShell = GetViewShell())
 {
 DrawView* pDrawView = pViewShell->GetDrawView();
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx 
b/sd/source/ui/view/ImpressViewShellBase.cxx
index 6cc5cd504f19..6c6c95acbb8a 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -25,10 +25,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 namespace sd {
 
@@ -41,7 +43,7 @@ SfxViewShell* ImpressViewShellBase::CreateInstance (
 SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
 ImpressViewShellBase* pBase = new ImpressViewShellBase(pFrame, pOldView);
-pBase->LateInit("");
+pBase->LateInit(comphelper::LibreOfficeKit::isActive() ? 
framework::FrameworkHelper::msImpressViewURL : "");
 return pBase;
 }
 void ImpressViewShellBase::RegisterFactory( SfxInterfaceId nPrio )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b56479e88edeabd6c6fe51cc0095a23543229856
Author: Caolán McNamara 
Date:   Tue Nov 14 21:07:43 2017 +

ofz#4211 Integer-overflow

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

diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 68f796178d8a..3b0238e8705d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -413,7 +413,7 @@ void GetTextAreaOutline( const FWData& rFWData, const 
SdrObject* pCustomShape, F
 }
 }
 
-void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape )
+bool GetFontWorkOutline(FWData& rFWData, const SdrObject* pCustomShape)
 {
 SdrTextHorzAdjust eHorzAdjust( static_cast(pCustomShape->GetMergedItem( SDRATTR_TEXT_HORZADJUST 
)).GetValue() );
 drawing::TextFitToSizeType const eFTS( static_cast(pCustomShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE 
)).GetValue() );
@@ -424,6 +424,9 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* 
pCustomShape )
 rFWData.nSingleLineHeight = (sal_Int32)( ( 
(double)pCustomShape->GetLogicRect().GetHeight()
 / 
rFWData.nMaxParagraphsPerTextArea ) * rFWData.fHorizontalTextScaling );
 
+if (rFWData.nSingleLineHeight == SAL_MIN_INT32)
+return false;
+
 bool bSameLetterHeights = false;
 const SdrCustomShapeGeometryItem& rGeometryItem = static_cast(pCustomShape->GetMergedItem( 
SDRATTR_CUSTOMSHAPE_GEOMETRY ));
 const css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( 
"TextPath", "SameLetterHeights" );
@@ -507,6 +510,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* 
pCustomShape )
 }
 ++aTextAreaIter;
 }
+
+return true;
 }
 
 basegfx::B2DPolyPolygon GetOutlinesFromShape2d( const SdrObject* pShape2d )
@@ -867,8 +872,8 @@ SdrObject* EnhancedCustomShapeFontWork::CreateFontWork( 
const SdrObject* pShape2
 CalculateHorizontalScalingFactor( pCustomShape, aFWData, 
aOutlines2d );
 
 /* retrieving the Outlines for the each Paragraph. */
-
-GetFontWorkOutline( aFWData, pCustomShape );
+if (!GetFontWorkOutline(aFWData, pCustomShape))
+return nullptr;
 
 FitTextOutlinesToShapeOutlines( aOutlines2d, aFWData );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Serge Krot]

 cui/source/dialogs/linkdlg.cxx |4 
 cui/source/inc/linkdlg.hxx |1 -
 cui/uiconfig/ui/baselinksdialog.ui |   20 ++--
 3 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit 27e4a3c4e364d1858eb3e77348ee78c6c6d33cf1
Author: Serge Krot 
Date:   Tue Nov 14 15:29:47 2017 +0100

related tdf#113807: Clean up Links dialog: remove useless hidden button

Change-Id: I0e8f9d7b538dd094d53cda69517e94fbafd0d752
Reviewed-on: https://gerrit.libreoffice.org/44725
Reviewed-by: Katarina Behrens 
Tested-by: Thorsten Behrens 

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 4ffa5c090cad..6d61767457a5 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -108,7 +108,6 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, 
LinkManager* pMgr, bool b
 get(m_pRbAutomatic, "AUTOMATIC");
 get(m_pRbManual, "MANUAL");
 get(m_pPbUpdateNow, "UPDATE_NOW");
-get(m_pPbOpenSource, "OPEN");
 get(m_pPbChangeSource, "CHANGE_SOURCE");
 get(m_pPbBreakLink, "BREAK_LINK");
 
@@ -126,8 +125,6 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, 
LinkManager* pMgr, bool b
 aUpdateIdle.SetInvokeHandler( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl 
) );
 aUpdateIdle.SetPriority( TaskPriority::LOWEST );
 
-m_pPbOpenSource->Hide();
-
 m_pTbLinks->SetSelectHdl( LINK( this, SvBaseLinksDlg, LinksSelectHdl ) );
 m_pTbLinks->SetDoubleClickHdl( LINK( this, SvBaseLinksDlg, 
LinksDoubleClickHdl ) );
 m_pRbAutomatic->SetClickHdl( LINK( this, SvBaseLinksDlg, AutomaticClickHdl 
) );
@@ -156,7 +153,6 @@ void SvBaseLinksDlg::dispose()
 m_pRbAutomatic.clear();
 m_pRbManual.clear();
 m_pPbUpdateNow.clear();
-m_pPbOpenSource.clear();
 m_pPbChangeSource.clear();
 m_pPbBreakLink.clear();
 ModalDialog::dispose();
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 9d274b431951..15fcb6f7a8d9 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -52,7 +52,6 @@ class SvBaseLinksDlg : public ModalDialog
 VclPtr m_pRbAutomatic;
 VclPtr m_pRbManual;
 VclPtr m_pPbUpdateNow;
-VclPtr m_pPbOpenSource;
 VclPtr m_pPbChangeSource;
 VclPtr m_pPbBreakLink;
 OUString aStrAutolink;
diff --git a/cui/uiconfig/ui/baselinksdialog.ui 
b/cui/uiconfig/ui/baselinksdialog.ui
index b04ed44cc7d0..6fe5c16bf870 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -65,21 +65,6 @@
   
 
 
-  
-_Open
-False
-True
-True
-True
-True
-  
-  
-False
-True
-3
-  
-
-
   
 _Modify...
 False
@@ -91,7 +76,7 @@
   
 False
 True
-4
+3
   
 
 
@@ -106,7 +91,7 @@
   
 False
 True
-5
+4
   
 
   
@@ -430,7 +415,6 @@
   CLOSE
   HELP
   UPDATE_NOW
-  OPEN
   CHANGE_SOURCE
   BREAK_LINK
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: include/svl sc/qa sc/sdi sc/source sc/uiconfig sfx2/source

[Henry Castro]

Hi Eike,

> What is this supposed to do? It adds a non-functional status bar item to
> Calc that only takes precious space to display the global document
> language and all associated context menu entries to change language are
> without functionality.

The idea was to show only the language status, not the context menu, perhaps
I forgot some flags to disable them, but I added to my queue task
list, to fix those
unwanted context menu on language status bar.

> Spell checking in Calc does not work this way with a global document
> language or paragraph language, language is a cell attribute (or in-cell
> EditEngine text portion attribute).

Indeed, after reading code they are designed to cell attribute, but I did not
find anything to apply this, since they are not set, the cell take the global
document language

Regards
Henry



2017-11-14 16:19 GMT-04:00 Eike Rathke :
> Hi Henry,
>
> On Sunday, 2017-10-22 15:18:38 +, Henry Castro wrote:
>
>>  include/svl/hint.hxx |1
>>  sc/qa/unit/tiledrendering/tiledrendering.cxx |   51 +++
>>  sc/sdi/docsh.sdi |1
>>  sc/source/ui/docshell/docsh4.cxx |   89 
>> +++
>>  sc/source/ui/view/gridwin4.cxx   |1
>>  sc/source/ui/view/tabvwsh5.cxx   |8 ++
>>  sc/uiconfig/scalc/menubar/menubar.xml|2
>>  sc/uiconfig/scalc/statusbar/statusbar.xml|1
>>  sfx2/source/control/unoctitm.cxx |   13 +++
>>  9 files changed, 165 insertions(+), 2 deletions(-)
>>
>> New commits:
>> commit 2fa424f40a185eb43d862a29abce07345695fcf3
>> Author: Henry Castro 
>> Date:   Thu Oct 19 22:47:17 2017 -0400
>>
>> sc lok: fix spell checking languages in Calc
>
> What is this supposed to do? It adds a non-functional status bar item to
> Calc that only takes precious space to display the global document
> language and all associated context menu entries to change language are
> without functionality.
>
> Spell checking in Calc does not work this way with a global document
> language or paragraph language, language is a cell attribute (or in-cell
> EditEngine text portion attribute).
>
>   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
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/RotateFlyFrame3' - 626 commits - accessibility/inc accessibility/source animations/source avmedia/source basctl/source basegfx/source basic/inc basic/so

[Armin Le Grand]

Rebased ref, commits from common ancestor:
commit 43658985c8a68cf6ef53182a527f13f8288c95bf
Author: Armin Le Grand 
Date:   Tue Nov 14 18:07:32 2017 +0100

RotateFlyFrame3: Made interactions work properly

Have now created working interactive Rotation, Scale, Move
and Crop. Using as much of the old code as possible since
it does corrections based on BorderWidth/s stuff and similar.
To do so, need to back-transform and execute in unrotated/
untransformed state as much as possible. Had some problems
with SwVirtFlyDrawObj::NbcMove usages and hacks there, had
to restructure some of these.

Change-Id: Ibedf6d834f96b2f8e9c1ace2a0c984aa26cedc74

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index cb436581adf2..811bd390d82d 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -29,8 +29,8 @@
 #include 
 #include 
 #include 
-
 #include 
+#include 
 
 class SwLayoutFrame;
 class SwRootFrame;
commit 75c522ac031e3ca8fa38ffd35f2e1914f13b0772
Author: Armin Le Grand 
Date:   Tue Nov 14 18:07:32 2017 +0100

RotateFlyFrame3: Made interactions work properly

Have now created working interactive Rotation, Scale, Move
and Crop. Using as much of the old code as possible since
it does corrections based on BorderWidth/s stuff and similar.
To do so, need to back-transform and execute in unrotated/
untransformed state as much as possible. Had some problems
with SwVirtFlyDrawObj::NbcMove usages and hacks there, had
to restructure some of these.

Change-Id: Ibedf6d834f96b2f8e9c1ace2a0c984aa26cedc74

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 3971c9140da2..9432576bdcf4 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -473,7 +473,7 @@ const Size& SwNoTextFrame::GetSize() const
 void SwNoTextFrame::MakeAll(vcl::RenderContext* pRenderContext)
 {
 // RotateFlyFrame3 - inner frame. Get rotation and check if used
-const double fRotation(getFrameRotation());
+const double fRotation(getLocalFrameRotation());
 const bool bRotated(!basegfx::fTools::equalZero(fRotation));
 
 if(bRotated)
@@ -498,7 +498,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 // is currently beyond scope
 if(pUpperFly->isTransformableSwFrame())
 {
-
pUpperFly->getTransformableSwFrame()->resetAreaDefinitionsToUntransformed();
+pUpperFly->getTransformableSwFrame()->restoreFrameAreas();
 }
 }
 
@@ -508,7 +508,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 // Reset to BoundAreas will be done below automatically
 if(isTransformableSwFrame())
 {
-getTransformableSwFrame()->resetAreaDefinitionsToUntransformed();
+getTransformableSwFrame()->restoreFrameAreas();
 }
 }
 
@@ -549,7 +549,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 // upper frame, so it can bre re-created on the fly
 if(pUpperFly->isTransformableSwFrame())
 {
-
pUpperFly->getTransformableSwFrame()->resetAreaDefinitionsToTransformed();
+
pUpperFly->getTransformableSwFrame()->adaptFrameAreasToTransformations();
 }
 }
 
@@ -566,7 +566,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 getTransformableSwFrame()->createFrameAreaTransformations(
 fRotation,
 aB2DCenter);
-getTransformableSwFrame()->resetAreaDefinitionsToTransformed();
+getTransformableSwFrame()->adaptFrameAreasToTransformations();
 }
 else
 {
@@ -615,13 +615,13 @@ void SwNoTextFrame::transform_translate(const Point& 
rOffset)
 rOffset.X(), rOffset.Y()));
 
 // transform using TransformableSwFrame
-getTransformableSwFrame()->doTransform(aTransform);
+getTransformableSwFrame()->transform(aTransform);
 }
 }
 
 // RotateFlyFrame3 - inner frame
 // Check if we contain a SwGrfNode and get possible rotation from it
-double SwNoTextFrame::getFrameRotation() const
+double SwNoTextFrame::getLocalFrameRotation() const
 {
 const SwNoTextNode* pSwNoTextNode(nullptr != GetNode() ? 
GetNode()->GetNoTextNode() : nullptr);
 
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index cc12dd1baad9..e1035a3754fa 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -630,9 +630,18 @@ void SwVirtFlyDrawObj::NbcSetLogicRect(const 
tools::Rectangle& )
 }
 
 //  SwVirtFlyDrawObj::Move() and Resize()
-
 void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
 {
+if(GetFlyFrame()->IsFlyFreeFrame() && 
static_cast(GetFlyFrame())->isTransformableSwFrame())
+{
+// When we have a change in transformed state, we need to fall back to 
the
+// state w

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

[Stephan Bergmann]

 compilerplugins/clang/test/unnecessaryoverride.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 12d75e5fa387767776c35945303fcd969f5cbbde
Author: Stephan Bergmann 
Date:   Tue Nov 14 19:26:31 2017 +0100

clang-format fix

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

diff --git a/compilerplugins/clang/test/unnecessaryoverride.cxx 
b/compilerplugins/clang/test/unnecessaryoverride.cxx
index b3733a7e192d..7abcf971986f 100644
--- a/compilerplugins/clang/test/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/test/unnecessaryoverride.cxx
@@ -99,7 +99,12 @@ struct Base2
 struct Derived2 : Base2
 {
 void default1(Base const& x = Intermediate1()) { Base2::default1(x); } // 
no warning
-void default2(Base const& x = SimpleDerived()) { Base2::default2(x); } // 
expected-error {{public function just calls public parent 
[loplugin:unnecessaryoverride]}}
+void
+default2( // expected-error {{public function just calls public parent 
[loplugin:unnecessaryoverride]}}
+Base const& x = SimpleDerived())
+{
+Base2::default2(x);
+}
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: include/svl sc/qa sc/sdi sc/source sc/uiconfig sfx2/source

[Eike Rathke]

Hi Henry,

On Sunday, 2017-10-22 15:18:38 +, Henry Castro wrote:

>  include/svl/hint.hxx |1 
>  sc/qa/unit/tiledrendering/tiledrendering.cxx |   51 +++
>  sc/sdi/docsh.sdi |1 
>  sc/source/ui/docshell/docsh4.cxx |   89 
> +++
>  sc/source/ui/view/gridwin4.cxx   |1 
>  sc/source/ui/view/tabvwsh5.cxx   |8 ++
>  sc/uiconfig/scalc/menubar/menubar.xml|2 
>  sc/uiconfig/scalc/statusbar/statusbar.xml|1 
>  sfx2/source/control/unoctitm.cxx |   13 +++
>  9 files changed, 165 insertions(+), 2 deletions(-)
> 
> New commits:
> commit 2fa424f40a185eb43d862a29abce07345695fcf3
> Author: Henry Castro 
> Date:   Thu Oct 19 22:47:17 2017 -0400
> 
> sc lok: fix spell checking languages in Calc

What is this supposed to do? It adds a non-functional status bar item to
Calc that only takes precious space to display the global document
language and all associated context menu entries to change language are
without functionality.

Spell checking in Calc does not work this way with a global document
language or paragraph language, language is a cell attribute (or in-cell
EditEngine text portion attribute).

  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: include/vcl vcl/source

[Caolán McNamara]

 include/vcl/vectorgraphicdata.hxx|1 +
 vcl/source/gdi/vectorgraphicdata.cxx |5 -
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 10bcb72a98595eeed26848f541ef51071d3c27f5
Author: Caolán McNamara 
Date:   Tue Nov 14 12:41:56 2017 +

ofz: if parsing failed we keep reparsing it

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

diff --git a/include/vcl/vectorgraphicdata.hxx 
b/include/vcl/vectorgraphicdata.hxx
index a045b01ee46e..66541616b41c 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -57,6 +57,7 @@ private:
 OUStringmaPath;
 
 // on demand created content
+boolmbSequenceCreated;
 basegfx::B2DRange   maRange;
 std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > maSequence;
 BitmapExmaReplacement;
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx 
b/vcl/source/gdi/vectorgraphicdata.cxx
index 48d6ecf65286..e59d87495e5d 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -147,7 +147,7 @@ void VectorGraphicData::ensureReplacement()
 
 void VectorGraphicData::ensureSequenceAndRange()
 {
-if(maSequence.empty() && maVectorGraphicDataArray.hasElements())
+if (!mbSequenceCreated && maVectorGraphicDataArray.hasElements())
 {
 // import SVG to maSequence, also set maRange
 maRange.reset();
@@ -206,6 +206,7 @@ void VectorGraphicData::ensureSequenceAndRange()
 }
 }
 mNestedBitmapSize = estimateSize(maSequence);
+mbSequenceCreated = true;
 }
 }
 
@@ -227,6 +228,7 @@ VectorGraphicData::VectorGraphicData(
 VectorGraphicDataType eVectorDataType)
 :   maVectorGraphicDataArray(rVectorGraphicDataArray),
 maPath(rPath),
+mbSequenceCreated(false),
 maRange(),
 maSequence(),
 maReplacement(),
@@ -241,6 +243,7 @@ VectorGraphicData::VectorGraphicData(
 VectorGraphicDataType eVectorDataType)
 :   maVectorGraphicDataArray(),
 maPath(rPath),
+mbSequenceCreated(false),
 maRange(),
 maSequence(),
 maReplacement(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |6 +++---
 include/svx/obj3d.hxx  |2 +-
 sc/source/core/tool/interpr4.cxx   |8 
 sd/source/filter/ppt/pptin.hxx |2 +-
 sfx2/source/appl/appinit.cxx   |4 ++--
 sfx2/source/doc/objxtor.cxx|2 +-
 svx/source/fmcomp/gridcell.cxx |2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 425c64fa274ab62ad2f2b0f2ea4f922d35aa747d
Author: Johnny_M 
Date:   Sat Nov 11 18:31:05 2017 +0100

Translate German comments and debug strings

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

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index b3e71892e671..482133b88553 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1609,7 +1609,7 @@ namespace
 if (pCondition->getChild(i)->getNodeType() == 
SQLNodeType::Equal)
 i++;
 
-// Bedingung parsen
+// parse the condition
 aCondition = ParseCondition(rController
 ,pCondition
 ,_pView->getDecimalSeparator()
@@ -2789,7 +2789,7 @@ OUString OQueryDesignView::getStatement()
 if( aFieldListStr.isEmpty() )
 return OUString();
 
-// Exceptionhandling, if no fields have been passed we should not
+// Exception handling, if no fields have been passed we should not
 // change the tab page
 // TabBarSelectHdl will query the SQL-OUString for STATEMENT_NOFIELDS
 // and trigger a error message
@@ -2804,7 +2804,7 @@ OUString OQueryDesignView::getStatement()
 // exist but no tables exist (and aFieldListStr has its length, I secure 
this above)
 OUStringBuffer aHavingStr,aCriteriaListStr;
 
-// - Kriterien aufbauen --
+// - build the criteria --
 if (!GenerateCriterias(this,aCriteriaListStr,aHavingStr,rFieldList, 
nTabcount > 1))
 return OUString();
 
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 34a9dab81010..008482a1dba6 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -64,7 +64,7 @@ class E3DObjGeoData : public SdrObjGeoData
 {
 public:
 basegfx::B3DRange   maLocalBoundVol;// surrounding volume of 
the object
-basegfx::B3DHomMatrix   maTransformation;   // lokal transformations
+basegfx::B3DHomMatrix   maTransformation;   // local transformations
 
 E3DObjGeoData() {}
 };
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 50350fac8e85..6a05c5c22795 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -502,7 +502,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, 
SCTAB nTab1,
 if (!aCell.isEmpty())
 {
 FormulaError  nErr = FormulaError::NONE;
-sal_uInt16  nType = 0; // 0 = Zahl; 1 = String
+sal_uInt16  nType = 0; // 0 = number; 1 = string
 double  nVal = 0.0;
 OUString  aStr;
 boolbOk = true;
@@ -3244,13 +3244,13 @@ void ScInterpreter::ScMacro()
 OUString aBasicStr;
 if (pObject->GetParent())
 {
-aBasicStr = pObject->GetParent()->GetName();// Dokumentenbasic
+aBasicStr = pObject->GetParent()->GetName();// document BASIC
 }
 else
 {
-aBasicStr = SfxGetpApp()->GetName();   // Applikationsbasic
+aBasicStr = SfxGetpApp()->GetName();// application BASIC
 }
-//  Parameter-Array zusammenbauen
+//  assemble a parameter array
 
 SbxArrayRef refPar = new SbxArray;
 bool bOk = true;
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index 468aae6c53dc..f4b6de81d752 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -31,7 +31,7 @@ class SfxMedium;
 
 /*
 |*
-|* lokaler Import
+|* local import
 |*
 \/
 
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 80e14989ec48..a026765176b4 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -234,7 +234,7 @@ void SfxApplication::Initialize_Impl()
 
 Registrations_Impl();
 
-// Subklasse initialisieren
+// initialize the subclass
 pImpl->bDowning = false;
 
 // get CHAOS item pool...
@@ -244,

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

[Andrea Gelmini]

 cli_ure/source/scripts/increment_version.pl|2 +-
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7bcb66baecc9bfbd9930552f984d0e9599ccb6ea
Author: Andrea Gelmini 
Date:   Tue Nov 14 11:53:02 2017 +0100

Fix typos

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

diff --git a/cli_ure/source/scripts/increment_version.pl 
b/cli_ure/source/scripts/increment_version.pl
index 85be523d9835..df0c677a8954 100644
--- a/cli_ure/source/scripts/increment_version.pl
+++ b/cli_ure/source/scripts/increment_version.pl
@@ -32,7 +32,7 @@ my $usage =
 "the respective policy files. This is only done if new uno types have been 
added since".
 "the last product update. This information is obtained from the file which is 
passed as ".
 "argument changedTypes. The names in the version file must have a particular 
form. ".
-"They must end on one of folling terms: NEW_VERSION, OLD_VERSION, 
POLICY_VERSION\n".
+"They must end on one of following terms: NEW_VERSION, OLD_VERSION, 
POLICY_VERSION\n".
 "If no new published types have been added then no output, argument  
newVersions, is written".
 "Usage is: \n increment_version.pl oldVersions  incVersions newVersions 
changedTypes\n\n".
 "oldVersion: Contains name value pairs, which are used for forming the config 
files of ".
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 76567ceb4cf0..1172e7efdbc3 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -329,7 +329,7 @@
 
 
 
-

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

[Johnny_M]

 svl/source/numbers/zforfind.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 5c1cadfd964c35bd29308304f75ff90d22e13700
Author: Johnny_M 
Date:   Sat Nov 11 16:37:43 2017 +0100

Translate German variable names

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

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 5f717108f263..7e4f3f69e128 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -3880,11 +3880,11 @@ bool ImpSvNumberInputScan::IsNumberFormat( const 
OUString& rString, // s
 }
 else
 {
-double fZaehler = StringToDouble(sStrArray[nNums[0]]);
-double fNenner = StringToDouble(sStrArray[nNums[1]]);
-if (fNenner != 0.0)
+double fNumerator = StringToDouble(sStrArray[nNums[0]]);
+double fDenominator = StringToDouble(sStrArray[nNums[1]]);
+if (fDenominator != 0.0)
 {
-fOutNumber = fZaehler/fNenner;
+fOutNumber = fNumerator/fDenominator;
 }
 else
 {
@@ -3907,11 +3907,11 @@ bool ImpSvNumberInputScan::IsNumberFormat( const 
OUString& rString, // s
 
 if (k == nNumericsCnt-2)
 {
-double fZaehler = StringToDouble(sStrArray[nNums[k]]);
-double fNenner = StringToDouble(sStrArray[nNums[k + 1]]);
-if (fNenner != 0.0)
+double fNumerator = StringToDouble(sStrArray[nNums[k]]);
+double fDenominator = StringToDouble(sStrArray[nNums[k + 
1]]);
+if (fDenominator != 0.0)
 {
-fOutNumber += fZaehler/fNenner;
+fOutNumber += fNumerator/fDenominator;
 }
 else
 {
___
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' - Makefile.in

[Tor Lillqvist]

 Makefile.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 327ad42f4b641f37cf4dd9936346bc386252669a
Author: Tor Lillqvist 
Date:   Tue Nov 14 17:13:48 2017 +0200

Don't bother with unoinfo either in the sandboxed app bundle

Note: Only for the ENABLE_MACOSX_SANDBOX case. Does not affect a
regular signed build.

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

diff --git a/Makefile.in b/Makefile.in
index e54f43cb6d76..8566d0fb0fba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -345,9 +345,10 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
 #
 ifneq ($(ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal binary and unopkg script that we don't want
+# Remove the gengal binary and unopkg and unoinfo scripts that we don't want
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/gengal
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unopkg
+   rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unoinfo
 endif
 #
 # Then use the macosx-codesign-app-bundle script
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 source/text/scalc/01/04060118.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 008c845819cd34a02fba16ee89c784d02d6740fa
Author: Eike Rathke 
Date:   Tue Nov 14 19:59:10 2017 +0100

Related: tdf#113768 VDB change Type parameter opposite to NoSwitch

Change-Id: I9a603cb70f5922c83482da55fa797441bffab93c

diff --git a/source/text/scalc/01/04060118.xhp 
b/source/text/scalc/01/04060118.xhp
index 14181ccbb..0ecb0f41b 100644
--- a/source/text/scalc/01/04060118.xhp
+++ b/source/text/scalc/01/04060118.xhp
@@ -145,14 +145,14 @@
 Returns the depreciation of an asset for a specified or 
partial period using a variable declining balance method.
 
 Syntax
-VDB(Cost; Salvage; 
Life; S; End; Factor; Type)
+VDB(Cost; Salvage; 
Life; S; End; Factor; NoSwitch)
 Cost is the initial value of an asset.
 Salvage is the value of an asset at the end of 
the depreciation.
 Life is the depreciation duration of the 
asset.
 S 
is the start of the depreciation. A must be entered in the same date unit as 
the duration.
 End is the end of the depreciation.
 Factor (optional) is the depreciation factor. 
Factor = 2 is double rate depreciation.
-Type 
is an optional parameter. Type = 1 means a switch to linear 
depreciation. In Type = 0 no switch is made.
+NoSwitchis an optional parameter. NoSwitch = 0 
(default) means a switch to linear depreciation. In NoSwitch = 1 no switch is 
made.
 
 
 Example
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Eike Rathke]

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

New commits:
commit 82b25c22819e84d2ec6d92cf8e9c0ee4a0b3723e
Author: Eike Rathke 
Date:   Tue Nov 14 19:59:10 2017 +0100

Updated core
Project: help  008c845819cd34a02fba16ee89c784d02d6740fa

Related: tdf#113768 VDB change Type parameter opposite to NoSwitch

Change-Id: I9a603cb70f5922c83482da55fa797441bffab93c

diff --git a/helpcontent2 b/helpcontent2
index ac105fe860f0..008c845819cd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ac105fe860f05e66f574e135fa6fcb738db9347f
+Subproject commit 008c845819cd34a02fba16ee89c784d02d6740fa
___
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 a6259d1a9572f766d01d573d3d5bdf80d43df762
Author: Eike Rathke 
Date:   Tue Nov 14 19:41:09 2017 +0100

Resolves: tdf#113835 add Fon [fon-BJ] to language list

Change-Id: Iee741421d8f6a9a2b9b14439612890426cdf4712

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 46343d3751ea..c2bdbf567b2a 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -668,6 +668,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_MANCHU,"mnc", "CN", k0 },
 { LANGUAGE_USER_XIBE,  "sjo", "CN", k0 },
 { LANGUAGE_USER_KITUBA_DRCONGO,"ktu", "CD", k0 },
+{ LANGUAGE_USER_FON,   "fon", "BJ", 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 c83bd82e041e..2c90af7110fe 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -734,6 +734,7 @@ namespace o3tl
 #define LANGUAGE_USER_MANCHULanguageType(0x069A)
 #define LANGUAGE_USER_XIBE  LanguageType(0x069B)
 #define LANGUAGE_USER_KITUBA_DRCONGOLanguageType(0x069C)
+#define LANGUAGE_USER_FON   LanguageType(0x069D)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 95a6b23b62bf..54e356feb1d1 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -404,7 +404,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Malaysia)") , 
LANGUAGE_ENGLISH_MALAYSIA },
 { 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", "Kituba (Democratic Republic of the 
Congo)"), LANGUAGE_USER_KITUBA_DRCONGO },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON }
 };
 
 #endif
___
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' - sw/source

[Martin Hosken]

 sw/source/core/text/itradj.cxx  |   11 ---
 sw/source/core/text/portxt.cxx  |3 ++-
 sw/source/core/txtnode/fntcache.cxx |9 ++---
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 0a03336a68701f592f563538f70bb3465808c644
Author: Martin Hosken 
Date:   Tue Nov 14 15:20:31 2017 +0700

Only do kashida insertion with fonts that have non-zero width kashidas

Change-Id: I54f51432531072a8ec3cde832003369b23cb6eaf
Reviewed-on: https://gerrit.libreoffice.org/44723
Tested-by: Jenkins 
Reviewed-by: Martin Hosken 

diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 08c6938028b3..0c39304900ac 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -112,6 +112,9 @@ void SwTextAdjuster::FormatBlock( )
 static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& 
rInf, SwTextIter& rItr,
 sal_Int32& rKashidas, sal_Int32& nGluePortion )
 {
+if ( rInf.GetOut()->GetMinKashida() <= 0 )
+return false;
+
 // i60594 validate Kashida justification
 sal_Int32 nIdx = rItr.GetStart();
 sal_Int32 nEnd = rItr.GetEnd();
@@ -148,12 +151,6 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, 
SwTextSizeInfo& rInf,
 sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, 
nIdx, nNext - nIdx );
 if (nKashidasInAttr > 0)
 {
-// Kashida glyph looks suspicious, skip Kashida justification
-if ( rInf.GetOut()->GetMinKashida() <= 0 )
-{
-return false;
-}
-
 sal_Int32 nKashidasDropped = 0;
 if ( !SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - 
nIdx ) )
 {
@@ -211,7 +208,7 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, 
SwTextSizeInfo& rInf, SwT
 sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, 
nIdx, nNext - nIdx );
 
 long nFontMinKashida = rInf.GetOut()->GetMinKashida();
-if ( nFontMinKashida && nKashidasInAttr > 0 && 
SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) )
+if ( nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( 
rInf.GetText(), nIdx, nNext - nIdx ) )
 {
 sal_Int32 nKashidasDropped = 0;
 while ( rKashidas && nGluePortion && nKashidasInAttr > 0 &&
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index bcdd4772cd31..da605c53de7f 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -112,7 +112,8 @@ static sal_Int32 lcl_AddSpace( const SwTextSizeInfo &rInf, 
const OUString* pStr,
 // Kashida Justification: Insert Kashidas
 if ( nEnd > nPos && pSI && COMPLEX == nScript )
 {
-if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && 
pSI->CountKashida() )
+if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && 
rInf.GetOut()->GetMinKashida()
+&& pSI->CountKashida() )
 {
 const sal_Int32 nKashRes = pSI->KashidaJustify( nullptr, nullptr, 
nPos, nEnd - nPos );
 // i60591: need to check result of KashidaJustify
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 8617a3b80db4..f7b055bccb65 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1254,7 +1254,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontScript::CTL == nActual && nSpaceAdd )
 {
-if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() ) )
+if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() )
+&& rInf.GetOut().GetMinKashida() )
 {
 if ( pSI && pSI->CountKashida() &&
 pSI->KashidaJustify( pKernArray.get(), nullptr, 
rInf.GetIdx(),
@@ -1458,7 +1459,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontScript::CTL == nActual && nSpaceAdd )
 {
-if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() ) )
+if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() )
+&& rInf.GetOut().GetMinKashida() )
 {
 if ( pSI && pSI->CountKashida() &&
  pSI->KashidaJustify( pKernArray.get(), 
pScrArray.get(), rInf.GetIdx(),
@@ -2051,7 +2053,8 @@ sal_Int32 SwFntObj::GetCursorOfst( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontScript::CTL == nActual && rInf.GetSpace() )
 {
-if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), 
rInf.Get

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

[Martin Hosken]

 sw/source/core/text/itradj.cxx  |   11 ---
 sw/source/core/text/portxt.cxx  |3 ++-
 sw/source/core/txtnode/fntcache.cxx |9 ++---
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit c45b23377bb2fe44c26f1287ff38495344e4ca50
Author: Martin Hosken 
Date:   Tue Nov 14 15:20:31 2017 +0700

Only do kashida insertion with fonts that have non-zero width kashidas

Change-Id: I54f51432531072a8ec3cde832003369b23cb6eaf
Reviewed-on: https://gerrit.libreoffice.org/44704
Tested-by: Jenkins 
Reviewed-by: Martin Hosken 

diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index f82a3f6d1df2..29ee5e81a438 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -112,6 +112,9 @@ void SwTextAdjuster::FormatBlock( )
 static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& 
rInf, SwTextIter& rItr,
 sal_Int32& rKashidas, sal_Int32& nGluePortion )
 {
+if ( rInf.GetOut()->GetMinKashida() <= 0 )
+return false;
+
 // i60594 validate Kashida justification
 sal_Int32 nIdx = rItr.GetStart();
 sal_Int32 nEnd = rItr.GetEnd();
@@ -148,12 +151,6 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, 
SwTextSizeInfo& rInf,
 sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, 
nIdx, nNext - nIdx );
 if (nKashidasInAttr > 0)
 {
-// Kashida glyph looks suspicious, skip Kashida justification
-if ( rInf.GetOut()->GetMinKashida() <= 0 )
-{
-return false;
-}
-
 sal_Int32 nKashidasDropped = 0;
 if ( !SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - 
nIdx ) )
 {
@@ -211,7 +208,7 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, 
SwTextSizeInfo& rInf, SwT
 sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, 
nIdx, nNext - nIdx );
 
 long nFontMinKashida = rInf.GetOut()->GetMinKashida();
-if ( nFontMinKashida && nKashidasInAttr > 0 && 
SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) )
+if ( nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( 
rInf.GetText(), nIdx, nNext - nIdx ) )
 {
 sal_Int32 nKashidasDropped = 0;
 while ( rKashidas && nGluePortion && nKashidasInAttr > 0 &&
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index d541607b64a0..7ffc17e970fb 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -112,7 +112,8 @@ static sal_Int32 lcl_AddSpace( const SwTextSizeInfo &rInf, 
const OUString* pStr,
 // Kashida Justification: Insert Kashidas
 if ( nEnd > nPos && pSI && COMPLEX == nScript )
 {
-if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && 
pSI->CountKashida() )
+if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && 
rInf.GetOut()->GetMinKashida()
+&& pSI->CountKashida() )
 {
 const sal_Int32 nKashRes = pSI->KashidaJustify( nullptr, nullptr, 
nPos, nEnd - nPos );
 // i60591: need to check result of KashidaJustify
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 6bca3c4c8a52..c7ab996bf40b 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1248,7 +1248,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontScript::CTL == nActual && nSpaceAdd )
 {
-if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() ) )
+if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() )
+&& rInf.GetOut().GetMinKashida() )
 {
 if ( pSI && pSI->CountKashida() &&
 pSI->KashidaJustify( pKernArray.get(), nullptr, 
rInf.GetIdx(),
@@ -1452,7 +1453,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontScript::CTL == nActual && nSpaceAdd )
 {
-if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() ) )
+if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() )
+&& rInf.GetOut().GetMinKashida() )
 {
 if ( pSI && pSI->CountKashida() &&
  pSI->KashidaJustify( pKernArray.get(), 
pScrArray.get(), rInf.GetIdx(),
@@ -2045,7 +2047,8 @@ sal_Int32 SwFntObj::GetCursorOfst( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontScript::CTL == nActual && rInf.GetSpace() )
 {
-if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), 
rInf.Get

[Libreoffice-commits] core.git: Branch 'feature/RotateFlyFrame3' - sw/source

[Armin Le Grand]

 sw/source/core/inc/frame.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 598098875b920f46e0c0e628a25850b89f5a766b
Author: Armin Le Grand 
Date:   Tue Nov 14 18:07:32 2017 +0100

RotateFlyFrame3: Made interactions work properly

Have now created working interactive Rotation, Scale, Move
and Crop. Using as much of the old code as possible since
it does corrections based on BorderWidth/s stuff and similar.
To do so, need to back-transform and execute in unrotated/
untransformed state as much as possible. Had some problems
with SwVirtFlyDrawObj::NbcMove usages and hacks there, had
to restructure some of these.

Change-Id: Ibedf6d834f96b2f8e9c1ace2a0c984aa26cedc74

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index cb436581adf2..811bd390d82d 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -29,8 +29,8 @@
 #include 
 #include 
 #include 
-
 #include 
+#include 
 
 class SwLayoutFrame;
 class SwRootFrame;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bernhard Widl]

 vcl/source/window/settings.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 606393be5fdbded38d986db60cdba6f0353f22ef
Author: Bernhard Widl 
Date:   Fri Oct 20 14:34:53 2017 +0200

tdf#113444 removed capping of default font size

Change-Id: Ic2ef7eeea7dd9306b57d55952ab716d6255f9576
Reviewed-on: https://gerrit.libreoffice.org/43605
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Tested-by: Jenkins 
(cherry picked from commit cb151051d79a7ec176e769a33a56e7d906fc1425)

diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index c9a8fd1c7ba0..7a14740bc85e 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -152,18 +152,9 @@ void Window::ImplUpdateGlobalSettings( AllSettings& 
rSettings, bool bCallHdl )
 ImplGetFrame()->UpdateSettings( rSettings );
 
 StyleSettings aStyleSettings = rSettings.GetStyleSettings();
-// #97047: Force all fonts except Menu and Help to a fixed height
-// to avoid UI scaling due to large fonts
-// - but allow bigger fonts on bigger screens (i16682, i21238)
-//   dialogs were designed to fit 800x600 with an 8pt font, so scale 
accordingly
-int maxFontheight = 9; // #107886#: 9 is default for some asian systems, 
so always allow if requested
-if( GetDesktopRectPixel().getHeight() > 600 )
-maxFontheight = (int) ((( 8.0 * (double) 
GetDesktopRectPixel().getHeight()) / 600.0) + 1.5);
 
 vcl::Font aFont = aStyleSettings.GetMenuFont();
 int defFontheight = aFont.GetFontHeight();
-if( defFontheight > maxFontheight )
-defFontheight = maxFontheight;
 
 // if the UI is korean, chinese or another locale
 // where the system font size is kown to be often too small to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 935f76d0edeb0025dee39f95e1f0bc1a840e316e
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

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) {
+   return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionP

[Libreoffice-commits] core.git: Branch 'feature/RotateFlyFrame3' - sw/source

[Armin Le Grand]

 sw/source/core/doc/notxtfrm.cxx  |   14 +-
 sw/source/core/draw/dflyobj.cxx  |  228 +++
 sw/source/core/inc/flyfrms.hxx   |4 
 sw/source/core/inc/frame.hxx |   20 +--
 sw/source/core/inc/notxtfrm.hxx  |4 
 sw/source/core/layout/fly.cxx|1 
 sw/source/core/layout/flycnt.cxx |2 
 sw/source/core/layout/flylay.cxx |   16 +-
 sw/source/core/layout/wsfrm.cxx  |6 -
 9 files changed, 216 insertions(+), 79 deletions(-)

New commits:
commit 9a39d5e86da72b21aa64653fb5f098accdc7ee80
Author: Armin Le Grand 
Date:   Tue Nov 14 18:07:32 2017 +0100

RotateFlyFrame3: Made interactions work properly

Have now created working interactive Rotation, Scale, Move
and Crop. Using as much of the old code as possible since
it does corrections based on BorderWidth/s stuff and similar.
To do so, need to back-transform and execute in unrotated/
untransformed state as much as possible. Had some problems
with SwVirtFlyDrawObj::NbcMove usages and hacks there, had
to restructure some of these.

Change-Id: Ibedf6d834f96b2f8e9c1ace2a0c984aa26cedc74

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 3971c9140da2..9432576bdcf4 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -473,7 +473,7 @@ const Size& SwNoTextFrame::GetSize() const
 void SwNoTextFrame::MakeAll(vcl::RenderContext* pRenderContext)
 {
 // RotateFlyFrame3 - inner frame. Get rotation and check if used
-const double fRotation(getFrameRotation());
+const double fRotation(getLocalFrameRotation());
 const bool bRotated(!basegfx::fTools::equalZero(fRotation));
 
 if(bRotated)
@@ -498,7 +498,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 // is currently beyond scope
 if(pUpperFly->isTransformableSwFrame())
 {
-
pUpperFly->getTransformableSwFrame()->resetAreaDefinitionsToUntransformed();
+pUpperFly->getTransformableSwFrame()->restoreFrameAreas();
 }
 }
 
@@ -508,7 +508,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 // Reset to BoundAreas will be done below automatically
 if(isTransformableSwFrame())
 {
-getTransformableSwFrame()->resetAreaDefinitionsToUntransformed();
+getTransformableSwFrame()->restoreFrameAreas();
 }
 }
 
@@ -549,7 +549,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 // upper frame, so it can bre re-created on the fly
 if(pUpperFly->isTransformableSwFrame())
 {
-
pUpperFly->getTransformableSwFrame()->resetAreaDefinitionsToTransformed();
+
pUpperFly->getTransformableSwFrame()->adaptFrameAreasToTransformations();
 }
 }
 
@@ -566,7 +566,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 getTransformableSwFrame()->createFrameAreaTransformations(
 fRotation,
 aB2DCenter);
-getTransformableSwFrame()->resetAreaDefinitionsToTransformed();
+getTransformableSwFrame()->adaptFrameAreasToTransformations();
 }
 else
 {
@@ -615,13 +615,13 @@ void SwNoTextFrame::transform_translate(const Point& 
rOffset)
 rOffset.X(), rOffset.Y()));
 
 // transform using TransformableSwFrame
-getTransformableSwFrame()->doTransform(aTransform);
+getTransformableSwFrame()->transform(aTransform);
 }
 }
 
 // RotateFlyFrame3 - inner frame
 // Check if we contain a SwGrfNode and get possible rotation from it
-double SwNoTextFrame::getFrameRotation() const
+double SwNoTextFrame::getLocalFrameRotation() const
 {
 const SwNoTextNode* pSwNoTextNode(nullptr != GetNode() ? 
GetNode()->GetNoTextNode() : nullptr);
 
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index cc12dd1baad9..e1035a3754fa 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -630,9 +630,18 @@ void SwVirtFlyDrawObj::NbcSetLogicRect(const 
tools::Rectangle& )
 }
 
 //  SwVirtFlyDrawObj::Move() and Resize()
-
 void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
 {
+if(GetFlyFrame()->IsFlyFreeFrame() && 
static_cast(GetFlyFrame())->isTransformableSwFrame())
+{
+// When we have a change in transformed state, we need to fall back to 
the
+// state without possible transformations. Restore FrameArea and use 
aOutRect
+// from old FrameArea. From here, all former actions below should be 
fine
+TransformableSwFrame* 
pTransformableSwFrame(static_cast(GetFlyFrame())->getTransformableSwFrame());
+pTransformableSwFrame->restoreFrameAreas();
+aOutRect = GetFlyFrame()->getFrameArea().SVRect();
+}
+
 MoveRect( aOutRect, rSiz );
 const Point aOldPos( GetFlyFrame()->getFrameArea().Pos() );
 const Point 

[Libreoffice-commits] core.git: Makefile.in

[Tor Lillqvist]

 Makefile.in |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 404f9f5e457850f3af62204c8c572f044e2e19dc
Author: Tor Lillqvist 
Date:   Tue Nov 14 18:54:27 2017 +0200

Add clarifying comment about shell scripts in Contents/MacOS

Change-Id: I0f0bda04cc94705e44d78456756905fd6a821561

diff --git a/Makefile.in b/Makefile.in
index 5a6d5e8d1ae9..7dfad58cf39f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -351,7 +351,14 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
 #
 ifneq ($(ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal binary and unopkg and unoinfo scripts that we don't want
+
+# Remove the gengal binary that we hardly need and the shell scripts
+# for which code signatures (stored as extended attributes) won't
+# survice upload to the App Store anyway. See
+# 
https://developer.apple.com/library/content/documentation/Security/Conceptual/CodeSigningGuide/Procedures/Procedures.html#//apple_ref/doc/uid/TP40005929-CH4-TNTAG201
+# We could put the shell scripts somewhere in Resources instead, but
+# no 3rd-party code that would be interested in them would look there
+# anyway.
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/gengal
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unopkg
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unoinfo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

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


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

[Serge Krot]

 cui/source/dialogs/linkdlg.cxx |1 +
 cui/source/inc/linkdlg.hxx |3 ++-
 cui/uiconfig/ui/baselinksdialog.ui |   26 --
 3 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 8f26c68a96d34684a8377adb3ac17ffb81fe313e
Author: Serge Krot 
Date:   Mon Nov 13 17:35:48 2017 +0100

tdf#113807 Enable clicking on pathfile-names in "Links" dialog

Improved:
* Very long pathfilename now do not overwrite its label on the dialog
* Full pathfilename could be clicked to show attachment/image
with default viewer.

Change-Id: I6e5398ed2a2013aae0d9b51a719e694b3206dcce
Reviewed-on: https://gerrit.libreoffice.org/44689
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/44726

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 011f09173c33..108dbb6ab985 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -245,6 +245,7 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, 
SvTreeListBox *, pSvTabListBox,
 sfx2::LinkManager::GetDisplayNames( pLink, &sType, &aFileName, 
pLinkNm, pFilter );
 aFileName = INetURLObject::decode(aFileName, 
INetURLObject::DECODE_UNAMBIGUOUS);
 m_pFtFullFileName->SetText( aFileName );
+m_pFtFullFileName->SetURL( aFileName );
 m_pFtFullSourceName->SetText( sLink );
 m_pFtFullTypeName->SetText( sType );
 }
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 1bc2f1cc4181..18809c129580 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -45,7 +46,7 @@ class SvBaseLinksDlg : public ModalDialog
 using Window::SetType;
 
 VclPtr m_pTbLinks;
-VclPtr m_pFtFullFileName;
+VclPtr m_pFtFullFileName;
 VclPtr m_pFtFullSourceName;
 VclPtr m_pFtFullTypeName;
 VclPtr m_pRbAutomatic;
diff --git a/cui/uiconfig/ui/baselinksdialog.ui 
b/cui/uiconfig/ui/baselinksdialog.ui
index 1d77a0a68c54..a8fb9069dfef 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -297,16 +297,38 @@
   
 
 
-  
+  
 True
 False
-0
+True
+vertical
+6
+
+  
+
+True
+True
+True
+True
+none
+False
+0
+
+  
+  
+1
+1
+  
+
   
   
 1
 0
 1
 1
+True
+True
+1
   
 
 
___
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/ui/app/transobj.cxx |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 329eeefcbd65ea88f0c8c3f034d49ba73045d059
Author: Eike Rathke 
Date:   Tue Nov 14 17:39:41 2017 +0100

Distinguish single/multiple cell copy for plain text, tdf#113571 follow-up

A single cell may contain embedded line breaks and tabs,
copy/pasting multiple cells may not.

Change-Id: Iae58f5c6b5330b327acfb50a37e9d210e72de7c7

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index a45583af79d7..e2e57ed657b6 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -320,18 +320,27 @@ bool ScTransferObj::GetData( const 
datatransfer::DataFlavor& rFlavor, const OUSt
 }
 
 ScImportExport aObj( pDoc, aReducedBlock );
-// Plain string ("Unformatted text") contains embedded line breaks
-// but is not enclosed in quotes. Which makes it unsuitable for
-// multiple cells if one of them is multi-line, but otherwise is
-// expected behavior for plain text.
+// Plain text ("Unformatted text") may contain embedded tabs and
+// line breaks but is not enclosed in quotes. Which makes it
+// unsuitable for multiple cells, especially if one of them is
+// multi-line, but otherwise is expected behavior for plain text.
+// For multiple cells replace embedded line breaks (and tabs) with
+// space character, otherwise pasting would yield odd results.
+/* XXX: it's debatable whether this is actually expected, but
+ * there's no way to satisfy all possible requirements when
+ * copy/pasting unformatted text. */
+const bool bPlainMulti = (nFormat == SotClipboardFormatId::STRING 
&&
+aReducedBlock.aStart != aReducedBlock.aEnd);
 // Add quotes only for STRING_TSVC.
 /* TODO: a possible future STRING_TSV should not contain embedded
- * line breaks nor tab (separator) characters and not be quoted. */
+ * line breaks nor tab (separator) characters and not be quoted.
+ * A possible STRING_CSV should. */
 ScExportTextOptions aTextOptions( ScExportTextOptions::None, 0,
 (nFormat == SotClipboardFormatId::STRING_TSVC));
-if ( bUsedForLink )
+if ( bPlainMulti || bUsedForLink )
 {
-// For a DDE link, convert line breaks and separators to space.
+// For a DDE link or plain text multiple cells, convert line
+// breaks and separators to space.
 aTextOptions.meNewlineConversion = 
ScExportTextOptions::ToSpace;
 aTextOptions.mcSeparatorConvertTo = ' ';
 aTextOptions.mbAddQuotes = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Tor Lillqvist]

 Makefile.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ed89b432dff252d3b1a18ad7694bbf2c4abc36ff
Author: Tor Lillqvist 
Date:   Tue Nov 14 17:13:48 2017 +0200

Don't bother with unoinfo either in the sandboxed app bundle

Note: Only for the ENABLE_MACOSX_SANDBOX case. Does not affect a
regular signed build.

Change-Id: I296ebdd5de075c1efbd198c671a3ec082681deb4

diff --git a/Makefile.in b/Makefile.in
index fcd4a8cbfc32..5a6d5e8d1ae9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -351,9 +351,10 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
 #
 ifneq ($(ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal binary and unopkg script that we don't want
+# Remove the gengal binary and unopkg and unoinfo scripts that we don't want
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/gengal
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unopkg
+   rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unoinfo
 endif
 #
 # Then use the macosx-codesign-app-bundle script
___
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/plugin.cxx   |   46 ++---
 compilerplugins/clang/test/unnecessaryoverride.cxx |   12 +
 2 files changed, 43 insertions(+), 15 deletions(-)

New commits:
commit 17cfe6e25d479428de308c22fcd218dcf8827840
Author: Stephan Bergmann 
Date:   Tue Nov 14 13:55:17 2017 +0100

Make checkIdenticalDefaultArguments more precise

...when creating objects of the same derived type

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

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 6697f94b3ee8..717d88b23091 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -26,6 +26,20 @@ Base classes for plugin actions.
 namespace loplugin
 {
 
+namespace {
+
+Expr const * skipImplicit(Expr const * expr) {
+if (auto const e = dyn_cast(expr)) {
+expr = e->GetTemporaryExpr();
+}
+if (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
+}
+return expr;
+}
+
+}
+
 Plugin::Plugin( const InstantiationData& data )
 : compiler( data.compiler ), handler( data.handler ), name( data.name )
 {
@@ -247,27 +261,29 @@ Plugin::IdenticalDefaultArgumentsResult 
Plugin::checkIdenticalDefaultArguments(
 : IdenticalDefaultArgumentsResult::No;
 }
 #endif
-if (auto const lit1 = dyn_cast(
-argument1->IgnoreParenImpCasts()))
-{
-if (auto const lit2 = dyn_cast(
-argument2->IgnoreParenImpCasts()))
-{
+auto const desugared1 = argument1->IgnoreParenImpCasts();
+auto const desugared2 = argument2->IgnoreParenImpCasts();
+if (auto const lit1 = dyn_cast(desugared1)) {
+if (auto const lit2 = dyn_cast(desugared2)) {
 return lit1->getBytes() == lit2->getBytes()
 ? IdenticalDefaultArgumentsResult::Yes
 : IdenticalDefaultArgumentsResult::No;
 }
 }
 // catch params with defaults like "= OUString()"
-if (isa(argument1)
-&& isa(argument2))
-{
-return IdenticalDefaultArgumentsResult::Yes;
-}
-if (isa(argument1)
-&& isa(argument2))
-{
-return IdenticalDefaultArgumentsResult::Yes;
+if (auto const e1 = dyn_cast(skipImplicit(desugared1))) {
+if (auto const e2 = dyn_cast(
+skipImplicit(desugared2)))
+{
+if ((e1->getConstructor()->getCanonicalDecl()
+ != e2->getConstructor()->getCanonicalDecl()))
+{
+return IdenticalDefaultArgumentsResult::No;
+}
+if (e1->getNumArgs() == 0 && e2->getNumArgs() == 0) {
+return IdenticalDefaultArgumentsResult::Yes;
+}
+}
 }
 return IdenticalDefaultArgumentsResult::Maybe;
 }
diff --git a/compilerplugins/clang/test/unnecessaryoverride.cxx 
b/compilerplugins/clang/test/unnecessaryoverride.cxx
index 816feb9d6af4..b3733a7e192d 100644
--- a/compilerplugins/clang/test/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/test/unnecessaryoverride.cxx
@@ -90,4 +90,16 @@ struct DerivedSlightlyDifferent : Base
 }
 };
 
+struct Base2
+{
+void default1(Base const& = SimpleDerived());
+void default2(Base const& = SimpleDerived());
+};
+
+struct Derived2 : Base2
+{
+void default1(Base const& x = Intermediate1()) { Base2::default1(x); } // 
no warning
+void default2(Base const& x = SimpleDerived()) { Base2::default2(x); } // 
expected-error {{public function just calls public parent 
[loplugin:unnecessaryoverride]}}
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 solenv/vs/LibreOffice.natvis |   86 ---
 1 file changed, 57 insertions(+), 29 deletions(-)

New commits:
commit 2d42c1a8e90fbbef11d03cb6d1d206c2216ab554
Author: Mike Kaganski 
Date:   Tue Nov 14 19:14:22 2017 +0300

LibreOffice.natvis: update visualizers

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

diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index 56e1e80ae48b..0277cfafee87 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -105,15 +105,11 @@
   
 _sal_Sequence 
(empty)
 _sal_Sequence of {nElements,d} elements
-
-  nElements,d
-
   
   
 Sequence 
(empty)
 Sequence of {_pSequence->nElements,d} 
{"$T1",sb}
 
-  _pSequence->nElements,d
   
 _pSequence->nElements
 reinterpret_cast < const $T1 * >( 
_pSequence->elements )
@@ -123,8 +119,6 @@
   
 {{{m_nSize} nodes}}
 
-  m_nSize
-
   
 

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

[Szymon Kłos]

 oox/source/export/vmlexport.cxx  |   18 ++-
 oox/source/vml/vmlshape.cxx  |   68 ++-
 sw/qa/extras/ooxmlexport/data/watermark.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx   |   18 +++
 4 files changed, 102 insertions(+), 2 deletions(-)

New commits:
commit a3a917748892a6a3194ebfc4db64cfd764cc054a
Author: Szymon Kłos 
Date:   Thu Nov 2 19:53:53 2017 +0100

tdf#113037 DOCX Watermark correct ratio

Import and export Watermark with padding like MSO does.
Shape is scaled to save correct ratio.

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

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 363dd363cffb..a290db597df7 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -382,7 +383,22 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, 
const tools::Rectangle&
 if ( m_nShapeType == ESCHER_ShpInst_Line )
 AddLineDimensions( rRect );
 else
-AddRectangleDimensions( m_ShapeStyle, rRect );
+{
+if ( IsWaterMarkShape( m_pSdrObject->GetName() ) )
+{
+// Watermark need some padding to be compatible with MSO
+long nPaddingY = 0;
+const SfxItemSet& rSet = m_pSdrObject->GetMergedItemSet();
+if ( const SdrMetricItem* pItem = static_cast( rSet.GetItem( SDRATTR_TEXT_UPPERDIST ) ) )
+nPaddingY += pItem->GetValue();
+
+tools::Rectangle aRect( rRect );
+aRect.setHeight( aRect.getHeight() + nPaddingY );
+AddRectangleDimensions( m_ShapeStyle, aRect );
+}
+else
+AddRectangleDimensions( m_ShapeStyle, rRect );
+}
 
 // properties
 bool bAlreadyWritten[ 0xFFF ];
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 7679ca838f67..f9fa58669c35 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -72,6 +72,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::uno::Any;
@@ -1139,12 +1140,77 @@ CustomShape::CustomShape( Drawing& rDrawing ) :
 {
 }
 
+static OUString lcl_getFontFamily( const oox::OptValue& rStyle )
+{
+OUString sFont = "";
+
+if( rStyle.has() )
+{
+OUString aStyle = rStyle.get( OUString() );
+
+sal_Int32 nIndex = 0;
+while( nIndex >= 0 )
+{
+OUString aName;
+if( ConversionHelper::separatePair( aName, sFont, aStyle.getToken( 
0, ';', nIndex ), ':' ) )
+{
+if( aName == "font-family" )
+{
+// remove " (first, and last character)
+if( sFont.getLength() > 2 )
+sFont = sFont.copy( 1, sFont.getLength() - 2 );
+}
+}
+}
+}
+
+return sFont;
+}
+
+/// modifies rShapeRect's height and returns difference
+sal_Int32 lcl_correctWatermarkRect( awt::Rectangle& rShapeRect, const 
OUString& sFont, const OUString& sText )
+{
+sal_Int32 nPaddingY = 0;
+double fRatio = 0;
+OutputDevice* pOut = Application::GetDefaultDevice();
+vcl::Font aFont( pOut->GetFont() );
+aFont.SetFamilyName( sFont );
+
+tools::Rectangle aBoundingRect;
+pOut->GetTextBoundRect( aBoundingRect, sText );
+if( aBoundingRect.GetWidth() )
+{
+fRatio = (double)aBoundingRect.GetHeight() / aBoundingRect.GetWidth();
+
+sal_Int32 nNewHeight = fRatio * rShapeRect.Width;
+nPaddingY = rShapeRect.Height - nNewHeight;
+rShapeRect.Height = nNewHeight;
+}
+
+return nPaddingY;
+}
+
 Reference< XShape > CustomShape::implConvertAndInsert( const Reference< 
XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const
 {
+awt::Rectangle aShapeRect( rShapeRect );
+
+// Add padding for Watermark like Word does
+sal_Int32 nPaddingY = 0;
+if( getShapeName().match( "PowerPlusWaterMarkObject" ) && 
maTypeModel.maTextpathModel.moString.has() )
+{
+OUString sText = maTypeModel.maTextpathModel.moString.get();
+OUString sFont = lcl_getFontFamily( 
maTypeModel.maTextpathModel.moStyle );
+nPaddingY = lcl_correctWatermarkRect( aShapeRect, sFont, sText );
+}
+
 // try to create a custom shape
-Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, 
rShapeRect );
+Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, 
aShapeRect );
 if( xShape.is() ) try
 {
+// Remember padding for Watermark
+if( nPaddingY )
+PropertySet( xShape ).setAnyProperty( PROP_TextUpperDistance, 
makeAny( nPaddingY ) );
+
 // create the custom shape g

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

[Mike Kaganski]

 sw/qa/extras/uiwriter/data/tdf113790.docx |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   25 +
 sw/source/filter/ww8/wrtw8nds.cxx |   20 
 3 files changed, 45 insertions(+)

New commits:
commit e128d83b5e7fd2ceb8d5ec9a346a3b7351be79cc
Author: Mike Kaganski 
Date:   Tue Nov 14 12:32:41 2017 +0300

tdf#113790: skip charfmt grabbag items existing in autofmt grabbag

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

diff --git a/sw/qa/extras/uiwriter/data/tdf113790.docx 
b/sw/qa/extras/uiwriter/data/tdf113790.docx
new file mode 100644
index ..b6334aae7617
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf113790.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 34f0e21466d1..7b09d0a35cab 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -285,6 +285,7 @@ public:
 void testTdf99689TableOfContents();
 void testTdf99689TableOfFigures();
 void testTdf99689TableOfTables();
+void testTdf113790();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -452,6 +453,7 @@ public:
 CPPUNIT_TEST(testTdf99689TableOfContents);
 CPPUNIT_TEST(testTdf99689TableOfFigures);
 CPPUNIT_TEST(testTdf99689TableOfTables);
+CPPUNIT_TEST(testTdf113790);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -5553,6 +,29 @@ void SwUiWriterTest::testParagraphOfTextRange()
 CPPUNIT_ASSERT_EQUAL(OUString("In section"), xParagraph->getString());
 }
 
+void SwUiWriterTest::testTdf113790()
+{
+SwDoc* pDoc = createDoc("tdf113790.docx");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+// Create the clipboard document.
+SwDoc aClipboard;
+aClipboard.SetClipBoard(true);
+
+// Go to fourth line - to "ABCD" bulleted list item
+pWrtShell->Down(/*bSelect=*/false, 4);
+pWrtShell->SelPara(nullptr);
+CPPUNIT_ASSERT_EQUAL(OUString("ABCD"), pWrtShell->GetSelText());
+pWrtShell->Copy(&aClipboard);
+
+// Go down to next-to-last (empty) line above "Title3"
+pWrtShell->Down(/*bSelect=*/false, 4);
+pWrtShell->Paste(&aClipboard);
+
+// Save it as DOCX & load it again
+reload("Office Open XML Text", "tdf113790.docx");
+CPPUNIT_ASSERT(dynamic_cast(mxComponent.get()));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index b1c1d7a71315..a9d5146d7dac 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -462,6 +463,25 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby 
, bool bWriteCombChars
 if ( pCharFormatItem )
 ClearOverridesFromSet( *pCharFormatItem, aExportSet );
 
+// tdf#113790: AutoFormat style overwrites char style, so remove all
+// elements from CHARFMT grab bag which are set in AUTOFMT grab bag
+if (const SfxGrabBagItem *pAutoFmtGrabBag = dynamic_cast(pGrabBag))
+{
+if (const SfxGrabBagItem *pCharFmtGrabBag = 
aExportSet.GetItem(RES_CHRATR_GRABBAG, false))
+{
+std::unique_ptr pNewItem(pCharFmtGrabBag->Clone());
+SfxGrabBagItem* pNewCharFmtGrabBag = 
dynamic_cast(pNewItem.get());
+assert(pNewCharFmtGrabBag);
+auto & rNewFmtMap = pNewCharFmtGrabBag->GetGrabBag();
+for (auto const & item : pAutoFmtGrabBag->GetGrabBag())
+{
+if (item.second.hasValue())
+rNewFmtMap.erase(item.first);
+}
+aExportSet.Put(*pNewCharFmtGrabBag);
+}
+}
+
 ww8::PoolItems aExportItems;
 GetPoolItems( aExportSet, aExportItems, false );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 offapi/com/sun/star/util/XTextSearch2.idl |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit dee307cbc903caa6ec7141fb4d69949133963af3
Author: Eike Rathke 
Date:   Tue Nov 14 15:54:53 2017 +0100

Add comment and @since LibreOffice 5.2

Change-Id: Iee7b0a6cd6f6f83f88b836e4efd7e7d6f17e6197

diff --git a/offapi/com/sun/star/util/XTextSearch2.idl 
b/offapi/com/sun/star/util/XTextSearch2.idl
index 2fe89fafc8e4..597a2c5eeb1d 100644
--- a/offapi/com/sun/star/util/XTextSearch2.idl
+++ b/offapi/com/sun/star/util/XTextSearch2.idl
@@ -17,6 +17,12 @@
 module com { module sun { module star { module util {
 
 /** enables an object to search in its content.
+
+Derived from com::sun::star::util::XTextSearch this interface adds
+simple wildcard search capabilities using
+com::sun::star::util::SearchOptions2 options.
+
+@since LibreOffice 5.2
  */
 interface XTextSearch2 : com::sun::star::util::XTextSearch
 {
___
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 |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 20671bcbc5aa0e85181295c63f544514e3ccb27f
Author: Stephan Bergmann 
Date:   Tue Nov 14 15:22:31 2017 +0100

Adapt solenv/flatpak-manifest.in to recently added Noto fonts

b97e713e76c88141d26f6e19a74db80a105cb911 "tdf#103080 Add Noto fonts into 
default
installation"

Change-Id: I4e2bb52b533321dc2a9ca32ca548bda5a2ad9a02

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bc2995b2325e..2c5a3ff1df47 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -316,6 +316,12 @@
 "dest-filename": "external/tarballs/neon-0.30.2.tar.gz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/noto-fonts-20170306.tar.gz";,
+"sha256": 
"8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8",
+"type": "file",
+"dest-filename": 
"external/tarballs/noto-fonts-20170306.tar.gz"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";,
 "sha256": 
"cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824",
 "type": "file",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian]

 libreofficekit/qa/gtktiledviewer/gtv.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3f432a68733b6e76ecb68cf5704a59d1be1e5cb
Author: Ashod Nakashian 
Date:   Tue Nov 14 09:17:59 2017 -0500

gtktiledviewer downgrade min gtk+ to 3.16

Change-Id: Ieb964ec1bbdeb632bd771db9b773f64b78107fc5
Reviewed-on: https://gerrit.libreoffice.org/44724
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv.ui 
b/libreofficekit/qa/gtktiledviewer/gtv.ui
index ab93d0d48105..7030ecaead5b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv.ui
+++ b/libreofficekit/qa/gtktiledviewer/gtv.ui
@@ -1,7 +1,7 @@
 
 
 
-  
+  
   
 True
 False
___
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 |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit db27a97a21795b0b8b66b4147eedd47298a748ae
Author: Stephan Bergmann 
Date:   Tue Nov 14 15:11:56 2017 +0100

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

Change-Id: Id3b856cce8b6182dfcc433b2b633977b7445703d

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index daa787ebb4aa..bc2995b2325e 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -250,10 +250,10 @@
 "dest-filename": 
"external/tarballs/librevenge-0.0.4.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libstaroffice-0.0.4.tar.xz";,
-"sha256": 
"6e728784d002144716b10fe122973b3e4edda9004538386b0b58bb303404903a",
+"url": 
"https://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz";,
+"sha256": 
"315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982",
 "type": "file",
-"dest-filename": 
"external/tarballs/libstaroffice-0.0.4.tar.xz"
+"dest-filename": 
"external/tarballs/libstaroffice-0.0.5.tar.xz"
 },
 {
 "url": "https://dev-www.libreoffice.org/src/ltm-1.0.zip";,
@@ -298,10 +298,10 @@
 "dest-filename": 
"external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/mdds-1.3.0.tar.bz2";,
-"sha256": 
"00aa92a28af9f1168a8e5c38e46f311abb65ef5b113ef56078ff104b94211460",
+"url": 
"https://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2";,
+"sha256": 
"dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1",
 "type": "file",
-"dest-filename": "external/tarballs/mdds-1.3.0.tar.bz2"
+"dest-filename": "external/tarballs/mdds-1.3.1.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";,
@@ -310,16 +310,16 @@
 "dest-filename": 
"external/tarballs/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";,
-"sha256": 
"00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd",
+"url": 
"https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";,
+"sha256": 
"db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca",
 "type": "file",
-"dest-filename": 
"external/tarballs/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"
+"dest-filename": "external/tarballs/neon-0.30.2.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";,
-"sha256": 
"d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400",
+"url": 
"https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";,
+"sha256": 
"cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824",
 "type": "file",
-"dest-filename": "external/tarballs/openldap-2.4.44.tgz"
+"dest-filename": "external/tarballs/openldap-2.4.45.tgz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 sd/qa/unit/dialogs-test.cxx|4 ++--
 sd/source/ui/annotations/annotationtag.cxx |2 +-
 svx/source/form/fmexpl.cxx |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4598e59cfb4c504719c7a8c78021ac47a5d671f5
Author: Andrea Gelmini 
Date:   Tue Nov 14 12:13:46 2017 +0100

Fix typos

Change-Id: Id8df807bb96e036f0cef07cd1095b2d3336efe36
Reviewed-on: https://gerrit.libreoffice.org/44711
Tested-by: Jenkins 
Reviewed-by: Mark Page 

diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 3e0b4d11cec7..3263cc715a02 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -466,7 +466,7 @@ VclPtr 
SdDialogsTest::createDialogByID(sal_uInt32 nID)
 {
 // CreateSdPresLayoutTemplateDlg(SfxObjectShell* pDocSh, 
vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, 
PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool) override;
 // use STR_PSEUDOSHEET_TITLE configuration, see futempl.cxx for 
more possible configurations
-// may be nicer on the long run to take a configuration whch 
represents a selected SdrObject
+// may be nicer on the long run to take a configuration which 
represents a selected SdrObject
 SfxStyleSheetBasePool* pStyleSheetPool = 
getDocShell()->GetStyleSheetPool();
 CPPUNIT_ASSERT(pStyleSheetPool);
 SfxStyleSheetBase* pStyleSheet = pStyleSheetPool->First();
@@ -492,7 +492,7 @@ VclPtr 
SdDialogsTest::createDialogByID(sal_uInt32 nID)
 {
 // CreateSdTabTemplateDlg(const SfxObjectShell* pDocShell, 
SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) override;
 // pretty similar to CreateSdPresLayoutTemplateDlg, see above
-// may be nicer on the long run to take a configuration whch 
represents a selected SdrObject
+// may be nicer on the long run to take a configuration which 
represents a selected SdrObject
 SfxStyleSheetBasePool* pStyleSheetPool = 
getDocShell()->GetStyleSheetPool();
 CPPUNIT_ASSERT(pStyleSheetPool);
 SfxStyleSheetBase* pStyleSheet = pStyleSheetPool->First();
diff --git a/sd/source/ui/annotations/annotationtag.cxx 
b/sd/source/ui/annotations/annotationtag.cxx
index d1adeefb4505..68d2f165c147 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -641,7 +641,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, 
VclWindowEvent&, rEvent, void)
 break;
 case VclEventId::WindowMouseMove:
 {
-// if we move the mouse after a button down we wan't 
to start draging
+// if we move the mouse after a button down we want to 
start dragging
 mpListenWindow->RemoveEventListener( LINK(this, 
AnnotationTag, WindowEventHandler));
 mpListenWindow = nullptr;
 
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index c798bd28b9fd..96166a275440 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -254,7 +254,7 @@ FmFormData::FmFormData(const Reference< XForm >& _rxForm, 
FmFormData* _pParent)
 // set images
 m_aNormalImage = Image(RID_SVXBMP_FORM);
 
-// set titel
+// set title
 if (m_xForm.is())
 {
 Reference< XPropertySet >  xSet(m_xForm, UNO_QUERY);
@@ -307,7 +307,7 @@ FmControlData::FmControlData(const Reference< 
XFormComponent >& _rxComponent, Fm
 m_aNormalImage = GetImage();
 
 
-// set titel
+// set title
 Reference< XPropertySet >  xSet(m_xFormComponent, UNO_QUERY);
 if( xSet.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 sc/qa/unit/pivottable_filters_test.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e4e4097a95cc66785d5828f05dd43cb0cc98b845
Author: Andrea Gelmini 
Date:   Tue Nov 14 11:46:39 2017 +0100

Changed encoding from cp1252 to UTF-8

In [54]: open("sc/qa/unit/pivottable_filters_test.cxx",'r').readlines()
---
UnicodeDecodeErrorTraceback (most recent call last)
 in ()
> 1 open("sc/qa/unit/pivottable_filters_test.cxx",'r').readlines()

/usr/lib/python3.6/codecs.py in decode(self, input, final)
319 # decode input (taking the buffer into account)
320 data = self.buffer + input
--> 321 (result, consumed) = self._buffer_decode(data, self.errors, 
final)
322 # keep undecoded input until the next call
323 self.buffer = data[consumed:]

UnicodeDecodeError: 'utf-8' codec can't decode byte 0xe1 in position 1648: 
invalid continuation byte

In [55]: 
open("sc/qa/unit/pivottable_filters_test.cxx",'r',encoding="cp1252").readlines()
Out[55]:
['/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */\n',
 '/*\n',
...

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

diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index 167b68f0d773..79f8f002ee14 100755
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -1382,15 +1382,15 @@ void 
ScPivotTableFiltersTest::testPivotTableDateFieldFilter()
 const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers();
 CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size());
 auto aIter = rMembers.begin();
-ScDPSaveMember* pMember = *aIter; // "2016. január 6."
+ScDPSaveMember* pMember = *aIter; // "2016. január 6."
 CPPUNIT_ASSERT(pMember);
 CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible());
 ++aIter;
-pMember = *aIter; // "2016. január 7."
+pMember = *aIter; // "2016. január 7."
 CPPUNIT_ASSERT(pMember);
 CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible());
 ++aIter;
-pMember = *aIter; // "2016. január 8."
+pMember = *aIter; // "2016. január 8."
 CPPUNIT_ASSERT(pMember);
 CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible());
 }
@@ -1875,11 +1875,11 @@ void 
ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX()
 const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers();
 //CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size());
 auto aIter = rMembers.begin();
-ScDPSaveMember* pMember = *aIter; // "2016. január 7."
+ScDPSaveMember* pMember = *aIter; // "2016. január 7."
 CPPUNIT_ASSERT(pMember);
 CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible());
 ++aIter;
-pMember = *aIter; // "2016. január 8."
+pMember = *aIter; // "2016. január 8."
 CPPUNIT_ASSERT(pMember);
 CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible());
 }
___
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-2-1' - wsd/DocumentBroker.cpp wsd/Storage.hpp

[Tor Lillqvist]

 wsd/DocumentBroker.cpp |   54 -
 wsd/Storage.hpp|8 +++
 2 files changed, 61 insertions(+), 1 deletion(-)

New commits:
commit 2ed9d4c5ce5bfb9d61df157b23457565009d00d7
Author: Tor Lillqvist 
Date:   Tue Nov 7 15:15:36 2017 +0200

Add handling of "prefilter" plug-ins

When the name of a document to be edited ends with an extension
matching that mentioned in a prefilter plug-in's configuration file,
the command specified is run and it is the output file that is
actually edited.

Change-Id: I3f107a50bb25a5a93e52932ba3c40a8758a1dc35
Reviewed-on: https://gerrit.libreoffice.org/44718
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 0d5e7342..93d285f9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -534,7 +535,58 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 // Let's load the document now, if not loaded.
 if (!_storage->isLoaded())
 {
-const auto localPath = 
_storage->loadStorageFileToLocal(session->getAuthorization());
+auto localPath = 
_storage->loadStorageFileToLocal(session->getAuthorization());
+
+// Check if we have a prefilter "plugin" for this document format
+for (const auto& plugin : LOOLWSD::PluginConfigurations)
+{
+try
+{
+std::string 
extension(plugin->getString("prefilter.extension"));
+std::string 
newExtension(plugin->getString("prefilter.newextension"));
+std::string 
commandLine(plugin->getString("prefilter.commandline"));
+
+if (localPath.length() > extension.length()+1 &&
+strcasecmp(localPath.substr(localPath.length() - 
extension.length() -1).data(), (std::string(".") + extension).data()) == 0)
+{
+// Extension matches, try the conversion. We convert the 
file to another one in
+// the same (jail) directory, with just the new extension 
tacked on.
+
+std::string newRootPath = _storage->getRootFilePath() + 
"." + newExtension;
+
+// The commandline must contain the space-separated 
substring @INPUT@ that is
+// replaced with the input file name, and @OUTPUT@ for the 
output file name.
+
+std::vectorargs;
+
+Poco::StringTokenizer tokenizer(commandLine, " ");
+if (tokenizer.replace("@INPUT@", 
_storage->getRootFilePath()) != 1 ||
+tokenizer.replace("@OUTPUT@", newRootPath) != 1)
+throw Poco::NotFoundException();
+
+for (std::size_t i = 1; i < tokenizer.count(); i++)
+args.push_back(tokenizer[i]);
+
+Poco::ProcessHandle process = 
Poco::Process::launch(tokenizer[0], args);
+int rc = process.wait();
+if (rc != 0)
+{
+LOG_ERR("Conversion from " << extension << " to " << 
newExtension <<" failed");
+return false;
+}
+_storage->setRootFilePath(newRootPath);
+localPath += "." + newExtension;
+}
+
+// We successfully converted the file to something LO can use; 
break out of the for
+// loop.
+break;
+}
+catch (const Poco::NotFoundException&)
+{
+// This plugin is not a proper prefilter one
+}
+}
 
 std::ifstream istr(localPath, std::ios::binary);
 Poco::SHA1Engine sha1;
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 90dad874..c15ed130 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -129,6 +129,14 @@ public:
 /// Returns the root path to the jailed file.
 const std::string& getRootFilePath() const { return _jailedFilePath; };
 
+/// Set the root path of the jailed file, only for use in cases where we 
actually have converted
+/// it to another format, in the same directory
+void setRootFilePath(const std::string& newPath)
+{
+// Could assert here that it is in the same directory?
+_jailedFilePath = newPath;
+};
+
 bool isLoaded() const { return _isLoaded; }
 
 /// Asks the storage object to force overwrite to storage upon next save
___
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-2-1' - wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Tor Lillqvist]

 wsd/LOOLWSD.cpp |   30 ++
 wsd/LOOLWSD.hpp |4 
 2 files changed, 34 insertions(+)

New commits:
commit 18af0a60872e73633674db4ce07d75a5aa1ebc7a
Author: Tor Lillqvist 
Date:   Tue Nov 7 15:12:18 2017 +0200

Add a "plug-in" mechanism

Look in the directory LOOLWSD_CONFIGDIR/conf.d (or pathname passed
with --config-dir option) for extra .xml files containing a Poco
configuration tree. These are not merged with the actual configuration
but kept separate. This commit does not yet actually use them for
anything.

Change-Id: I67ff27e694d6be74a52e7bd027263b00486f60bd
Reviewed-on: https://gerrit.libreoffice.org/44717
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7aed341b..37b83a29 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -48,6 +48,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -78,12 +79,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include "Admin.hpp"
 #include "Auth.hpp"
@@ -121,6 +124,7 @@
 
 using namespace LOOLProtocol;
 
+using Poco::DirectoryIterator;
 using Poco::Environment;
 using Poco::Exception;
 using Poco::File;
@@ -153,6 +157,7 @@ using Poco::Util::MissingOptionException;
 using Poco::Util::Option;
 using Poco::Util::OptionSet;
 using Poco::Util::ServerApplication;
+using Poco::Util::XMLConfiguration;
 using Poco::XML::AutoPtr;
 using Poco::XML::DOMParser;
 using Poco::XML::DOMWriter;
@@ -551,12 +556,14 @@ std::string LOOLWSD::ServerName;
 std::string LOOLWSD::FileServerRoot;
 std::string LOOLWSD::LOKitVersion;
 std::string LOOLWSD::ConfigFile = LOOLWSD_CONFIGDIR "/loolwsd.xml";
+std::string LOOLWSD::ConfigDir = LOOLWSD_CONFIGDIR "/conf.d";
 Util::RuntimeConstant LOOLWSD::SSLEnabled;
 Util::RuntimeConstant LOOLWSD::SSLTermination;
 std::set LOOLWSD::EditFileExtensions;
 unsigned LOOLWSD::MaxConnections;
 unsigned LOOLWSD::MaxDocuments;
 std::string LOOLWSD::OverrideWatermark;
+std::set 
LOOLWSD::PluginConfigurations;
 
 static std::string UnitTestLibrary;
 
@@ -681,6 +688,22 @@ void LOOLWSD::initialize(Application& self)
 loadConfiguration(ConfigFile, PRIO_DEFAULT);
 }
 
+// Load extra ("plug-in") configuration files, if present
+File dir(ConfigDir);
+if (dir.exists() && dir.isDirectory())
+{
+for (auto configFileIterator = DirectoryIterator(dir); 
configFileIterator != DirectoryIterator(); ++configFileIterator)
+{
+// Only accept configuration files ending in .xml
+const std::string configFile = 
configFileIterator.path().getFileName();
+if (configFile.length() > 4 && 
strcasecmp(configFile.substr(configFile.length() - 4).data(), ".xml") == 0)
+{
+const std::string fullFileName = dir.path() + "/" + configFile;
+PluginConfigurations.insert(new 
XMLConfiguration(fullFileName));
+}
+}
+}
+
 // Override any settings passed on the command-line.
 AutoPtr overrideConfig(new AppConfigMap(_overrideSettings));
 conf.addWriteable(overrideConfig, PRIO_APPLICATION); // Highest priority
@@ -991,6 +1014,11 @@ void LOOLWSD::defineOptions(OptionSet& optionSet)
 .repeatable(false)
 .argument("path"));
 
+optionSet.addOption(Option("config-dir", "", "Override extra configuration 
directory path.")
+.required(false)
+.repeatable(false)
+.argument("path"));
+
 #if ENABLE_DEBUG
 optionSet.addOption(Option("unitlib", "", "Unit testing library path.")
 .required(false)
@@ -1043,6 +1071,8 @@ void LOOLWSD::handleOption(const std::string& optionName,
 }
 else if (optionName == "config-file")
 ConfigFile = value;
+else if (optionName == "config-dir")
+ConfigDir = value;
 #if ENABLE_DEBUG
 else if (optionName == "unitlib")
 UnitTestLibrary = value;
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 80d2d9e2..ad858a4e 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -12,10 +12,12 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -46,6 +48,7 @@ public:
 static std::string FuzzFileName;
 static std::string Cache;
 static std::string ConfigFile;
+static std::string ConfigDir;
 static std::string SysTemplate;
 static std::string LoTemplate;
 static std::string ChildRoot;
@@ -59,6 +62,7 @@ public:
 static unsigned MaxConnections;
 static unsigned MaxDocuments;
 static std::string OverrideWatermark;
+static std::set 
PluginConfigurations;
 
 /// Flag to shutdown the server.
 std::atomic ShutdownFlag;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.fre

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

[Serge Krot]

 cui/source/dialogs/linkdlg.cxx |1 +
 cui/source/inc/linkdlg.hxx |3 ++-
 cui/uiconfig/ui/baselinksdialog.ui |   26 --
 3 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 2818280eb4f2af5a76a338676d12dcf2d721c2e9
Author: Serge Krot 
Date:   Mon Nov 13 17:35:48 2017 +0100

tdf#113807 Enable clicking on pathfile-names in "Links" dialog

Improved:
* Very long pathfilename now do not overwrite its label on the dialog
* Full pathfilename could be clicked to show attachment/image
with default viewer.

Change-Id: I6e5398ed2a2013aae0d9b51a719e694b3206dcce
Reviewed-on: https://gerrit.libreoffice.org/44689
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 86a2963014dd..4ffa5c090cad 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -243,6 +243,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, 
pSvTabListBox, void
 sfx2::LinkManager::GetDisplayNames( pLink, &sType, &aFileName, 
pLinkNm, pFilter );
 aFileName = INetURLObject::decode(aFileName, 
INetURLObject::DecodeMechanism::Unambiguous);
 m_pFtFullFileName->SetText( aFileName );
+m_pFtFullFileName->SetURL( aFileName );
 m_pFtFullSourceName->SetText( sLink );
 m_pFtFullTypeName->SetText( sType );
 }
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index ecfcd3855fa4..9d274b431951 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -45,7 +46,7 @@ class SvBaseLinksDlg : public ModalDialog
 using Window::SetType;
 
 VclPtr m_pTbLinks;
-VclPtr m_pFtFullFileName;
+VclPtr m_pFtFullFileName;
 VclPtr m_pFtFullSourceName;
 VclPtr m_pFtFullTypeName;
 VclPtr m_pRbAutomatic;
diff --git a/cui/uiconfig/ui/baselinksdialog.ui 
b/cui/uiconfig/ui/baselinksdialog.ui
index bd14fce35e68..b04ed44cc7d0 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -297,16 +297,38 @@
   
 
 
-  
+  
 True
 False
-0
+True
+vertical
+6
+
+  
+
+True
+True
+True
+True
+none
+False
+0
+
+  
+  
+1
+1
+  
+
   
   
 1
 0
 1
 1
+True
+True
+1
   
 
 
___
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-2-1' - Makefile.am

[Henry Castro]

 Makefile.am |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6f93ec31f318788001cbb12b26e81a3c7ea8efb3
Author: Henry Castro 
Date:   Sun Jun 18 14:19:10 2017 -0400

fix compilation errors with --disable-ssl option

Change-Id: I777f0ebf054db0a5fd2c64e6d56a222826b40045
(cherry picked from commit c24585741d19a9512cf81a6629e8c410ea35de13)
Reviewed-on: https://gerrit.libreoffice.org/44715
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/Makefile.am b/Makefile.am
index ec73f8f9..7ac3368f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,10 @@ AM_LDFLAGS = -pthread 
-Wl,-E,-rpath,/snap/loolwsd/current/usr/lib $(ZLIB_LIBS)
 
 if ENABLE_SSL
 AM_LDFLAGS += -lssl -lcrypto
+else
+loolwsd_fuzzer_LDADD = -lssl -lcrypto
+loolwsd_LDADD = -lssl -lcrypto
+loolconfig_LDADD = -lssl -lcrypto
 endif
 
 loolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 
-DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 emfio/inc/emfreader.hxx   |8 ++--
 emfio/source/reader/emfreader.cxx |   63 ++
 2 files changed, 41 insertions(+), 30 deletions(-)

New commits:
commit 7d6f8b48ad4131b13f18ce9d92c10f6b998a68ec
Author: Caolán McNamara 
Date:   Tue Nov 14 09:47:57 2017 +

ofz: stop at min of end of record and end of stream

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

diff --git a/emfio/inc/emfreader.hxx b/emfio/inc/emfreader.hxx
index 4b2855cf54f6..a54eee1a9c70 100644
--- a/emfio/inc/emfreader.hxx
+++ b/emfio/inc/emfreader.hxx
@@ -44,10 +44,10 @@ namespace emfio
 bool ReadEnhWMF();
 
 private:
-template  void ReadAndDrawPolyPolygon();
-template  void ReadAndDrawPolyLine();
-template  tools::Polygon ReadPolygon(sal_uInt32 nStartIndex, 
sal_uInt32 nPoints);
-template  tools::Polygon ReadPolygonWithSkip(const bool 
skipFirst);
+template  void ReadAndDrawPolyPolygon(sal_uInt32 nNextPos);
+template  void ReadAndDrawPolyLine(sal_uInt32 nNextPos);
+template  tools::Polygon ReadPolygon(sal_uInt32 nStartIndex, 
sal_uInt32 nPoints, sal_uInt32 nNextPos);
+template  tools::Polygon ReadPolygonWithSkip(const bool 
skipFirst, sal_uInt32 nNextPos);
 
 tools::Rectangle ReadRectangle();
 void ReadEMFPlusComment(sal_uInt32 length, bool& bHaveDC);
diff --git a/emfio/source/reader/emfreader.cxx 
b/emfio/source/reader/emfreader.cxx
index bcd8b7a83855..6ee222d427cb 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -468,7 +468,7 @@ namespace emfio
  * skipFirst: if the first point read is the 0th point or the 1st point in 
the array.
  * */
 template 
-tools::Polygon EmfReader::ReadPolygonWithSkip(const bool skipFirst)
+tools::Polygon EmfReader::ReadPolygonWithSkip(const bool skipFirst, 
sal_uInt32 nNextPos)
 {
 sal_uInt32 nPoints(0), nStartIndex(0);
 mpInputStream->SeekRel( 16 );
@@ -479,7 +479,7 @@ namespace emfio
 nStartIndex ++;
 }
 
-return ReadPolygon(nStartIndex, nPoints);
+return ReadPolygon(nStartIndex, nPoints, nNextPos);
 }
 
 /**
@@ -490,13 +490,22 @@ namespace emfio
  * mpInputStream: the stream containing the polygons
  * */
 template 
-tools::Polygon EmfReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 
nPoints)
+tools::Polygon EmfReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 
nPoints, sal_uInt32 nNextPos)
 {
 bool bRecordOk = nPoints <= SAL_MAX_UINT16;
 SAL_WARN_IF(!bRecordOk, "emfio", "polygon record has more polygons 
than we can handle");
 if (!bRecordOk)
 return tools::Polygon();
 
+auto nRemainingSize = std::min(nNextPos - mpInputStream->Tell(), 
mpInputStream->remainingSize());
+auto nMaxPossiblePoints = nRemainingSize / (sizeof(T) * 2);
+auto nPointCount = nPoints - nStartIndex;
+if (nPointCount > nMaxPossiblePoints)
+{
+SAL_WARN("emfio", "polygon claims more points than record can 
provide, truncating");
+nPoints = nMaxPossiblePoints + nStartIndex;
+}
+
 tools::Polygon aPolygon(nPoints);
 for (sal_uInt32 i = nStartIndex ; i < nPoints && 
mpInputStream->good(); i++ )
 {
@@ -519,20 +528,21 @@ namespace emfio
  * The \ parameter refers to the type of the points. (e.g. 
sal_uInt16 or sal_uInt32)
  * */
 template 
-void EmfReader::ReadAndDrawPolyLine()
+void EmfReader::ReadAndDrawPolyLine(sal_uInt32 nNextPos)
 {
 sal_uInt32  nPoints;
 sal_uInt32  i, nNumberOfPolylines( 0 ), nCount( 0 );
 mpInputStream->SeekRel( 0x10 ); // TODO Skipping Bounds. A 128-bit WMF 
RectL object (specifies the bounding rectangle in device units.)
 mpInputStream->ReadUInt32( nNumberOfPolylines );
 mpInputStream->ReadUInt32( nCount ); // total number of points in all 
polylines
-if (mpInputStream->Tell() >= mnEndPos)
+const auto nEndPos = std::min(nNextPos, mnEndPos);
+if (mpInputStream->Tell() >= nEndPos)
 return;
 
 // taking the amount of points of each polygon, retrieving the total 
number of points
 if ( mpInputStream->good() &&
  ( nNumberOfPolylines < SAL_MAX_UINT32 / sizeof( sal_uInt16 ) ) &&
- ( nNumberOfPolylines * sizeof( sal_uInt16 ) ) <= ( mnEndPos - 
mpInputStream->Tell() )
+ ( nNumberOfPolylines * sizeof( sal_uInt16 ) ) <= ( nEndPos - 
mpInputStream->Tell() )
)
 {
 std::unique_ptr< sal_uInt32[] > pnPolylinePointCount( new 
sal_uInt32[ nNumberOfPolylines ] );
@@ -544,8 +554,8 @@ namespace emfio
 // Get polyline points:
 for ( i = 0; ( i < nNu

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - net/Ssl.cpp

[Christian Glombek]

 net/Ssl.cpp |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 7d2f40a8068bebc18b9f705ecd1184d9c2689bbc
Author: Christian Glombek 
Date:   Sat Sep 16 08:38:01 2017 +0200

Add Support for OpenSSL 1.1.0

Change-Id: I0aa58b893e8577bba94fa45c0c4c81449b12e4e2
Reviewed-on: https://gerrit.libreoffice.org/42356
Reviewed-by: Ashod Nakashian 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 702bbdd5d8dd31eda8a2dfdb726be3c6cd978ec2)
Reviewed-on: https://gerrit.libreoffice.org/44713
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index e350257c..64f279d4 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -42,13 +42,18 @@ SslContext::SslContext(const std::string& certFilePath,
 _mutexes.emplace_back(new std::mutex);
 }
 
-#if OPENSSL_VERSION_NUMBER >= 0x0907000L
+#if OPENSSL_VERSION_NUMBER >= 0x0907000L && OPENSSL_VERSION_NUMBER < 
0x1013L
 OPENSSL_config(nullptr);
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= 0x1013L
+SSL_CTX_set_options(nullptr, 0);
+OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
+#else
 SSL_library_init();
 SSL_load_error_strings();
 OpenSSL_add_all_algorithms();
+#endif
 
 CRYPTO_set_locking_callback(&SslContext::lock);
 CRYPTO_set_id_callback(&SslContext::id);
@@ -233,10 +238,19 @@ void SslContext::initDH()
 throw std::runtime_error("Error creating Diffie-Hellman parameters: " 
+ msg);
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x1013L
+// OpenSSL v1.1.0 has public API changes
+// p, g and length of the Diffie-Hellman param can't be set directly 
anymore,
+// instead DH_set0_pqg and DH_set_length are used
+BIGNUM* p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), 0);
+BIGNUM* g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), 0);
+if ((DH_set0_pqg(dh, p, NULL, g) == 0) || (DH_set_length(dh, 160) == 0))
+#else
 dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), 0);
 dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), 0);
 dh->length = 160;
 if ((!dh->p) || (!dh->g))
+#endif
 {
 DH_free(dh);
 throw std::runtime_error("Error creating Diffie-Hellman parameters");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 solenv/gbuild/Package.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36e0acffbe2759dd2a910d2393f266c5c4898786
Author: Stephan Bergmann 
Date:   Tue Nov 14 11:59:54 2017 +0100

Another workaround for "xargs: environment is too large for exec" errors

...on Windows, similar to df9edbcd2883cec2d0596133131cfbc220dee91f "Work 
around
'xargs: environment is too large for exec' errors on Windows"

Change-Id: Ibc23960bbe2b8001eb7e08ed4cff12e4726df01b

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 1ab45b687800..841e819c7c78 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -65,7 +65,7 @@ $(dir $(call gb_Package_get_target,%))%/.dir :
 $(call gb_Package_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PKG,2)
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
-   && cat $${RESPONSEFILE} | xargs $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
+   && cat $${RESPONSEFILE} | $(if $(filter WNT,$(OS)),env -i 
PATH="$$PATH") xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
&& rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/vcl/layout.hxx |6 --
 vcl/inc/window.h   |6 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cd4dd4f7c47694e9d7b8ae9cdfefeb3bee4145c9
Author: Tor Lillqvist 
Date:   Tue Nov 14 12:24:07 2017 +0200

Two more functions that are private to vcl and not even VCL_DLLPUBLIC

... and thus don't need to be declared in a public include file.

Change-Id: Ia59040d3ef3ebf73b2372531bef086b0847911ce

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 7c89f568442b..d973704f8802 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -703,12 +703,6 @@ Size getLegacyBestSizeForChildren(const vcl::Window 
&rWindow);
 //Get first parent which is not a layout widget
 VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent);
 
-//return true if this window and its stack of containers are all shown
-bool isVisibleInLayout(const vcl::Window *pWindow);
-
-//return true if this window and its stack of containers are all enabled
-bool isEnabledInLayout(const vcl::Window *pWindow);
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 4ecc2940dc17..d9108e71cf1f 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -80,6 +80,12 @@ namespace dnd {
 
 VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize);
 
+//return true if this window and its stack of containers are all shown
+bool isVisibleInLayout(const vcl::Window *pWindow);
+
+//return true if this window and its stack of containers are all enabled
+bool isEnabledInLayout(const vcl::Window *pWindow);
+
 bool ImplWindowFrameProc( vcl::Window* pInst, SalEvent nEvent, const void* 
pEvent );
 
 struct ImplWinData
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx |   88 --
 1 file changed, 64 insertions(+), 24 deletions(-)

New commits:
commit 80cbc18c6d79f6dfb1d7ed8c03b216983298e1b3
Author: Stephan Bergmann 
Date:   Tue Nov 14 11:44:12 2017 +0100

Fix ASan "alloc-dealloc-mismatch (operator new [] vs operator delete)"

...e.g. during CppunitTest_smoketest, after
be2d9d3407ddae22797879e93778513be30ec5aa "Clean up m_generatedRttis at exit"

Change-Id: Ife4b07927ba11cf5b99e987b3bb9af068652ba62

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 844cd1038449..038f88f1d18e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -28,6 +28,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -40,6 +41,37 @@
 
 namespace {
 
+class Generated {
+public:
+virtual ~Generated() {};
+
+virtual std::type_info * get() const = 0;
+};
+
+class GeneratedPlain: public Generated {
+public:
+GeneratedPlain(std::unique_ptr && info): 
info_(std::move(info)) {};
+
+std::type_info * get() const override { return info_.get(); }
+
+private:
+std::unique_ptr info_;
+};
+
+class GeneratedPad: public Generated {
+public:
+public:
+GeneratedPad(std::unique_ptr && pad): pad_(std::move(pad)) {};
+
+~GeneratedPad() override { get()->~type_info(); }
+
+std::type_info * get() const override
+{ return reinterpret_cast(pad_.get()); }
+
+private:
+std::unique_ptr pad_;
+};
+
 class RTTI
 {
 typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
@@ -47,8 +79,7 @@ class RTTI
 osl::Mutex m_mutex;
 t_rtti_map m_rttis;
 std::vector m_rttiNames;
-std::unordered_map>
-m_generatedRttis;
+std::unordered_map> m_generatedRttis;
 
 void * m_hApp;
 
@@ -115,7 +146,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription 
const & pTypeDescr)
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr,"generated rtti for %s\n", rttiName );
 #endif
-std::unique_ptr newRtti;
+std::unique_ptr newRtti;
 switch (pTypeDescr.eTypeClass) {
 case typelib_TypeClass_EXCEPTION:
 {
@@ -129,15 +160,18 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription 
const & pTypeDescr)
 std::type_info * base_rtti = getRTTI(
 ctd.pBaseTypeDescription->aBase);
 m_rttiNames.emplace_back(OString(rttiName));
-newRtti.reset(
+std::unique_ptr info(
 new __cxxabiv1::__si_class_type_info(
 m_rttiNames.back().getStr(), 
static_cast<__cxxabiv1::__class_type_info *>(base_rtti) ));
+newRtti.reset(new GeneratedPlain(std::move(info)));
 }
 else
 {
 // this class has no base class
 m_rttiNames.emplace_back(OString(rttiName));
-newRtti.reset(new 
__cxxabiv1::__class_type_info(m_rttiNames.back().getStr()));
+std::unique_ptr info(
+new 
__cxxabiv1::__class_type_info(m_rttiNames.back().getStr()));
+newRtti.reset(new GeneratedPlain(std::move(info)));
 }
 break;
 }
@@ -153,30 +187,36 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription 
const & pTypeDescr)
 }
 switch (itd.nBaseTypes) {
 case 0:
-m_rttiNames.emplace_back(OString(rttiName));
-newRtti.reset(
-new __cxxabiv1::__class_type_info(
-m_rttiNames.back().getStr()));
-break;
+{
+m_rttiNames.emplace_back(OString(rttiName));
+std::unique_ptr info(
+new __cxxabiv1::__class_type_info(
+m_rttiNames.back().getStr()));
+newRtti.reset(new 
GeneratedPlain(std::move(info)));
+break;
+}
 case 1:
-m_rttiNames.emplace_back(OString(rttiName));
-newRtti.reset(
-new __cxxabiv1::__si_class_type_info(
-m_rttiNames.back().getStr(),
-static_cast<
-__cxxabiv1::__class_type

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

[Stephan Bergmann]

 vcl/qt5/Qt5Graphics.hxx  |2 +-
 vcl/qt5/Qt5Graphics_Text.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 34efaa8a7508ea73f7aa6e41e6ff4682f2772af3
Author: Stephan Bergmann 
Date:   Tue Nov 14 11:40:50 2017 +0100

Adapt Library_vclplug_qt5

...to 8f54136caa786523fd224f6c98fc8e7c45cd805d "use std::unique_ptr for
SalLayout"

Change-Id: Ibf8962de1b43881c70a1bad1881df61bf4b551a4

diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index daf1ff0bb748..6e8332356d49 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/qt5/Qt5Graphics.hxx
@@ -184,7 +184,7 @@ public:
 virtual bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) 
override;
 virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) 
override;
 
-virtual SalLayout* GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) 
override;
+virtual std::unique_ptr GetTextLayout(ImplLayoutArgs&, int 
nFallbackLevel) override;
 virtual void DrawTextLayout(const CommonSalLayout&) override;
 
 // Native control support
diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
index cc69ae956ef0..ab9e1afb78d7 100644
--- a/vcl/qt5/Qt5Graphics_Text.cxx
+++ b/vcl/qt5/Qt5Graphics_Text.cxx
@@ -137,11 +137,11 @@ bool Qt5Graphics::GetGlyphBoundRect(const GlyphItem&, 
tools::Rectangle&) { retur
 
 bool Qt5Graphics::GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) 
{ return false; }
 
-SalLayout* Qt5Graphics::GetTextLayout(ImplLayoutArgs&, int nFallbackLevel)
+std::unique_ptr Qt5Graphics::GetTextLayout(ImplLayoutArgs&, int 
nFallbackLevel)
 {
 if (m_pTextStyle[nFallbackLevel])
-return new CommonSalLayout(*m_pTextStyle[nFallbackLevel]);
-return nullptr;
+return std::unique_ptr(new 
CommonSalLayout(*m_pTextStyle[nFallbackLevel]));
+return std::unique_ptr();
 }
 
 void Qt5Graphics::DrawTextLayout(const CommonSalLayout&) {}
___
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' - svx/sdi

[Muhammet Kara]

 svx/sdi/svx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d7c3298fcf1b41dbbeb58144531bc2f1cd54e720
Author: Muhammet Kara 
Date:   Fri Nov 10 11:59:17 2017 +0300

tdf#108916: uno:LanguageStatus shouldn't appear in the customize dialog

Backported from master.
Original commit: d6214b8e9b3f9956c91d7b88e1985cb56112ea37

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index a8c2a3431aa1..64a0ce84cc4e 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -11079,9 +11079,9 @@ SfxStringListItem LanguageStatus SID_LANGUAGE_STATUS
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = GID_FORMAT;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source chart2/source svtools/source svx/source sw/source vcl/source

[Andrea Gelmini]

 canvas/source/vcl/canvashelper_texturefill.cxx |2 +-
 chart2/source/view/axes/ScaleAutomatism.cxx|2 +-
 svtools/source/contnr/fileview.cxx |2 +-
 svx/source/table/svdotable.cxx |2 +-
 sw/source/core/layout/tabfrm.cxx   |2 +-
 vcl/source/window/legacyaccessibility.cxx  |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6b56336e2378c150a34bd8de4ed7521493d8a8ff
Author: Andrea Gelmini 
Date:   Tue Nov 14 10:36:53 2017 +0100

Fix typos

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

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx 
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 631f0f154458..c2735a5ce46d 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -868,7 +868,7 @@ namespace vclcanvas
 // =
 
 // calc device space direction vectors. We employ
-// the followin approach for tiled output: the
+// the following approach for tiled output: the
 // texture bitmap is output in texture space
 // x-major order, i.e. tile neighbors in texture
 // space x direction are rendered back-to-back in
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx 
b/chart2/source/view/axes/ScaleAutomatism.cxx
index 468d21003292..6e99df1b9c6a 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -115,7 +115,7 @@ void ScaleAutomatism::expandValueRange( double fMinimum, 
double fMaximum )
 {
 // if m_fValueMinimum and m_fValueMaximum == 0, it means that they were 
not determined.
 // m_fValueMinimum == 0 makes impossible to determine real minimum,
-// so they need to be reseted tdf#96807
+// so they need to be reset tdf#96807
 if( (m_fValueMinimum == 0.0) && (m_fValueMaximum == 0.0) )
 resetValueRange();
 if( (fMinimum < m_fValueMinimum) || ::rtl::math::isNan( m_fValueMinimum ) )
diff --git a/svtools/source/contnr/fileview.cxx 
b/svtools/source/contnr/fileview.cxx
index 24853fa6f268..7d6eeecd440e 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1542,7 +1542,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
 m_aAsyncActionFinished.reset();
 
 // don't (yet) set m_aCurrentAsyncActionHandler to 
pTimeout->aFinishHandler.
-// By definition, this handler *only* get's called when the result cannot 
be obtained
+// By definition, this handler *only* gets called when the result cannot 
be obtained
 // during the minimum wait time, so it is only set below, when needed.
 m_aCurrentAsyncActionHandler = Link();
 
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 78f6261c43a2..441b4a01fbbb 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2120,7 +2120,7 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const
 }
 
 
-// Draging
+// Dragging
 
 bool SdrTableObj::hasSpecialDrag() const
 {
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 245d636b4552..491c3f3b2e52 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3601,7 +3601,7 @@ void SwTabFrame::Paste( SwFrame* pParent, SwFrame* 
pSibling )
 }
 }
 else if ( GetNext() )
-//Take the marging into account when dealing with ContentFrame's. 
There are
+//Take the margin into account when dealing with ContentFrame's. There 
are
 //two situations (both always happen at once):
 //a) The Content becomes the first in a chain
 //b) The new follower was the first in a chain before
diff --git a/vcl/source/window/legacyaccessibility.cxx 
b/vcl/source/window/legacyaccessibility.cxx
index ece1de64d6dd..b2b3e0634c6e 100644
--- a/vcl/source/window/legacyaccessibility.cxx
+++ b/vcl/source/window/legacyaccessibility.cxx
@@ -166,7 +166,7 @@ static Window* ImplGetLabeledBy( Window* pFrameWindow, 
WindowType nMyType, Windo
  nType == WindowType::FIXEDLINE ||
  nType == WindowType::GROUPBOX )
 {
-// a fixed text can't be labeld by a fixed text.
+// a fixed text can't be labelled by a fixed text.
 if ( ( nMyType != WindowType::FIXEDTEXT ) || ( nType 
!= WindowType::FIXEDTEXT ) )
 pWindow = pSWindow;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/sbkodd.rtf |   10 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   10 ++
 2 files changed, 20 insertions(+)

New commits:
commit 348d8af8a7f8073eb50d364696bf6a311080c8c1
Author: Miklos Vajna 
Date:   Tue Nov 14 08:28:16 2017 +0100

RTF import: add odd section break testcase

lcov points out this was not covered so far.

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

diff --git a/sw/qa/extras/rtfimport/data/sbkodd.rtf 
b/sw/qa/extras/rtfimport/data/sbkodd.rtf
new file mode 100644
index ..3450afa78633
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/sbkodd.rtf
@@ -0,0 +1,10 @@
+{\rtf1
+\pard\plain
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid12023156 Page 1\sect }
+\sectd \ltrsect
+\sbkodd\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid12023156\sftnbj 
\pard\plain \ltrpar\ql 
\li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12023156
 \rtlch\fcs1
+\af31507\afs22\alang1025 \ltrch\fcs0 
\f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid12023156 Page 3}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14181417
+\par }
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 50c39d5eb1ce..424ade30cacd 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -459,6 +459,16 @@ DECLARE_RTFIMPORT_TEST(testFdo81944, "fdo81944.rtf")
 CPPUNIT_ASSERT_EQUAL(11.0f, getProperty(xStyle, 
"CharHeightComplex"));
 }
 
+DECLARE_RTFIMPORT_TEST(testSbkodd, "sbkodd.rtf")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xCursor->getPage());
+xCursor->jumpToNextPage();
+CPPUNIT_ASSERT_EQUAL(static_cast(3), xCursor->getPage());
+}
+
 DECLARE_RTFIMPORT_TEST(testPoshPosv, "posh-posv.rtf")
 {
 CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER, 
getProperty(getShape(1), "HoriOrient"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/vcl/outdev.hxx   |9 +++-
 vcl/headless/svptext.cxx |2 -
 vcl/inc/headless/svpgdi.hxx  |3 +
 vcl/inc/quartz/salgdi.h  |3 +
 vcl/inc/salgdi.hxx   |3 +
 vcl/inc/sallayout.hxx|6 +--
 vcl/inc/textrender.hxx   |3 +
 vcl/inc/unx/cairotextrender.hxx  |3 +
 vcl/inc/unx/genpspgraphics.h |3 +
 vcl/inc/unx/salgdi.h |3 +
 vcl/inc/win/salgdi.h |3 +
 vcl/qa/cppunit/complextext.cxx   |2 +
 vcl/quartz/salgdi.cxx|4 +-
 vcl/source/gdi/pdfwriter_impl.cxx|9 +---
 vcl/source/gdi/print2.cxx|6 +--
 vcl/source/gdi/sallayout.cxx |   10 ++---
 vcl/source/outdev/font.cxx   |   20 --
 vcl/source/outdev/text.cxx   |   61 ++-
 vcl/source/outdev/textline.cxx   |4 --
 vcl/source/window/status.cxx |   12 ++
 vcl/unx/generic/gdi/cairotextrender.cxx  |4 +-
 vcl/unx/generic/gdi/font.cxx |2 -
 vcl/unx/generic/print/genpspgraphics.cxx |4 +-
 vcl/win/gdi/winlayout.cxx|4 +-
 24 files changed, 82 insertions(+), 101 deletions(-)

New commits:
commit 8f54136caa786523fd224f6c98fc8e7c45cd805d
Author: Noel Grandin 
Date:   Tue Oct 17 13:40:38 2017 +0200

use std::unique_ptr for SalLayout

to make the ownership passing around more obvious

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index dab8630eab47..e5d496a29e97 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1315,7 +1315,8 @@ public:
 SAL_DLLPRIVATE void ReMirror( vcl::Region &rRegion ) const;
 SAL_DLLPRIVATE bool ImplIsRecordLayout() const;
 virtual boolHasMirroredGraphics() const;
-SAL_DLLPRIVATE SalLayout*   ImplLayout( const OUString&, sal_Int32 nIndex, 
sal_Int32 nLen,
+SAL_DLLPRIVATE std::unique_ptr
+ImplLayout( const OUString&, sal_Int32 nIndex, 
sal_Int32 nLen,
 const Point& rLogicPos = 
Point(0,0), long nLogicWidth=0,
 const long* pLogicDXArray=nullptr, 
SalLayoutFlags flags = SalLayoutFlags::NONE,
 vcl::TextLayoutCache const* = 
nullptr) const;
@@ -1323,9 +1324,11 @@ public:
  DeviceCoordinate 
nPixelWidth, const DeviceCoordinate* pPixelDXArray,
  SalLayoutFlags flags 
= SalLayoutFlags::NONE,
  vcl::TextLayoutCache 
const* = nullptr) const;
-SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, 
ImplLayoutArgs& ) const;
+SAL_DLLPRIVATE std::unique_ptr
+ImplGlyphFallbackLayout( 
std::unique_ptr, ImplLayoutArgs& ) const;
 // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
-SAL_DLLPRIVATE SalLayout*   getFallbackFont(
+SAL_DLLPRIVATE std::unique_ptr
+getFallbackFont(
 FontSelectPattern &rFontSelData, int 
nFallbackLevel,
 ImplLayoutArgs& rLayoutArgs) const;
 
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 1149e5ca1b49..47f158d56b51 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -101,7 +101,7 @@ bool SvpSalGraphics::GetGlyphOutline(const GlyphItem& 
rGlyph, basegfx::B2DPolyPo
 return m_aTextRenderImpl.GetGlyphOutline(rGlyph, rPolyPoly);
 }
 
-SalLayout* SvpSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int 
nFallbackLevel )
+std::unique_ptr SvpSalGraphics::GetTextLayout( ImplLayoutArgs& 
rArgs, int nFallbackLevel )
 {
 return m_aTextRenderImpl.GetTextLayout(rArgs, nFallbackLevel);
 }
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 6fe1b07a2af9..8204538cb132 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -164,7 +164,8 @@ public:
 Ucs2UIntMap& rUnicodeEnc ) 
override;
 virtual boolGetGlyphBoundRect(const GlyphItem&, 
tools::Rectangle&) override;
 virtual boolGetGlyphOutline(const GlyphItem&, 
basegfx::B2DPolyPolygon&) override;
-virtual SalLayout*  GetTextLayout( ImplLayoutArgs&, int nFallbackLevel 
) override;
+virtual std::unique_ptr
+GetTextLayout( ImplLayoutArgs&, int nFallbackLevel 
) override;
 virtual voidDrawTextLayout( const 

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

[Caolán McNamara]

 emfio/source/reader/wmfreader.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b5344daa0cfc31cf187832261651e5490b19d922
Author: Caolán McNamara 
Date:   Mon Nov 13 21:06:57 2017 +

ofz: further limit exttextout to record size is smaller than stream size

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

diff --git a/emfio/source/reader/wmfreader.cxx 
b/emfio/source/reader/wmfreader.cxx
index b27b49e307f7..97861c225306 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -553,7 +553,8 @@ namespace emfio
 aRect = tools::Rectangle( aPt1, aPt2 );
 }
 
-auto nRemainingSize = mpInputStream->remainingSize();
+auto nMaxStreamPos = nRecordPos + (nRecordSize << 1);
+auto nRemainingSize = 
std::min(mpInputStream->remainingSize(), nMaxStreamPos - mpInputStream->Tell());
 if (nRemainingSize < 
static_cast(nOriginalBlockLen))
 {
 SAL_WARN("vcl.wmf", "exttextout record claimed more 
data than the stream can provide");
@@ -568,7 +569,6 @@ namespace emfio
 if ( nNewTextLen )
 {
 std::unique_ptr pDXAry, pDYAry;
-auto nMaxStreamPos = nRecordPos + ( nRecordSize << 1 );
 auto nDxArySize =  nMaxStreamPos - 
mpInputStream->Tell();
 auto nDxAryEntries = nDxArySize >> 1;
 boolbUseDXAry = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/vcl/layout.hxx  |2 --
 vcl/inc/window.h|2 ++
 vcl/qt5/Qt5Frame.cxx|1 +
 vcl/unx/generic/window/salframe.cxx |1 +
 vcl/unx/gtk/gtksalframe.cxx |1 +
 vcl/unx/gtk3/gtk3gtkframe.cxx   |1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 15fb717539c00fe26c59a6b1b86b464764b9749a
Author: Tor Lillqvist 
Date:   Tue Nov 14 00:10:58 2017 +0200

No need for bestmaxFrameSizeForScreenSize to be declared publicly

It is used only inside vcl, and it should stay that way.

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

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 49f69db5b421..7c89f568442b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -654,8 +654,6 @@ public:
 VclMultiLineEdit *pSecondaryMessage);
 };
 
-VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize);
-
 //Get first window of a pTopLevel window as
 //if any intermediate layout widgets didn't exist
 //i.e. acts like pChild = pChild->GetWindow(GetWindowType::FirstChild);
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index f11c1afcffa9..4ecc2940dc17 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -78,6 +78,8 @@ namespace dnd {
 class XDropTarget;
 }
 
+VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize);
+
 bool ImplWindowFrameProc( vcl::Window* pInst, SalEvent nEvent, const void* 
pEvent );
 
 struct ImplWinData
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index e853b7d43d9e..95e3363efe3f 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -33,6 +33,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/vcl/unx/generic/window/salframe.cxx 
b/vcl/unx/generic/window/salframe.cxx
index 39d90583dc12..4d539934f464 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -61,6 +61,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 2d53534c0934..fd1c3857fc4b 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -54,6 +54,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 3169ef152e2e..1f76432faded 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits