date:20171122

[Libreoffice-commits] core.git: 3 commits - include/LibreOfficeKit ios/CustomTarget_iOS.mk ios/CustomTarget_iOS_setup.mk ios/LibreOfficeKit ios/loKit.xcconfig.in ios/Module_ios.mk ios/source ios/Stati

2017-11-22 Thread jan Iversen

 include/LibreOfficeKit/LibreOfficeKitInit.h |1 
 ios/CustomTarget_iOS_setup.mk   |   88 ---
 ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj |  334 
 ios/Module_ios.mk   |3 
 ios/StaticLibrary_iOSkit.mk |   31 +
 ios/loKit.xcconfig.in   |   19 
 ios/source/LibreOfficeKit.c |8 
 7 files changed, 50 insertions(+), 434 deletions(-)

New commits:
commit ed885a3cdbfc4b4d194d40508a29334b9780858f
Author: jan Iversen 
Date:   Thu Nov 23 08:47:59 2017 +0100

iOS, do not use different C compilers

LibreOfficeKit.c was compiled with an xcode project and not like
all other sources. Changed to use clang with same switches as
rest of LO.

Separated resource generation in own makefile

Removed project LibreOfficeKit which was responsible for prelink.

Change-Id: Iaf9fbb4b652501af0b7f3643ed3efcc2ed93b611

diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS_setup.mk
similarity index 55%
rename from ios/CustomTarget_iOS.mk
rename to ios/CustomTarget_iOS_setup.mk
index a9fb058db406..a1ae23e0fa3e 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -8,43 +8,20 @@
 #- Env 
 IOSGEN := $(SRCDIR)/ios/generated
 IOSRES := $(IOSGEN)/resources
-IOSKITXC := $(WORKDIR)/ios/loKit.xcconfig
 IOSAPPXC := $(WORKDIR)/ios/loApp.xcconfig
-IOSKITSRC := $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit
-IOSAPPSRC := $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight
-IOSKITPRJ := $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj
-IOSAPPPRJ := $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj
-IOSAPP := $(INSTDIR)/LibreOfficeLight.app
-ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT := libLibreOfficeKit_$(CPUNAME)_debug.a
-else
-IOSKIT := libLibreOfficeKit_$(CPUNAME).a
-endif
 
 
 #- Top level  -
-$(eval $(call gb_CustomTarget_CustomTarget,ios/ios))
+$(eval $(call gb_CustomTarget_CustomTarget,ios/ios_setup))
 
-$(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT)
 
 
+$(call gb_CustomTarget_get_target,ios/ios_setup): $(IOSAPPXC) 
$(IOSGEN)/native-code.h
 
 
-#- Generate xcconfig files  ---
-$(IOSKITXC): $(SRCDIR)/ios/loKit.xcconfig.in $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_iOS.mk
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-   @mkdir -p $(WORKDIR)/ios
-   sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
-   -e "s'@INSTDIR@'$(INSTDIR)'g" \
-   -e "s'@SRCDIR@'$(SRC_ROOT)'g" \
-   -e "s'@WORKDIR@'$(WORKDIR)'g" \
-   -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-   -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-   -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
-   -e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \
-   $(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig
 
-$(IOSAPPXC): $(SRCDIR)/ios/loKit.xcconfig.in $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_iOS.mk
+#- Generate dynamic files  ---
+$(IOSAPPXC): $(SRCDIR)/ios/loApp.xcconfig.in $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_iOS_setup.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
@mkdir -p $(WORKDIR)/ios
sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
@@ -54,9 +31,11 @@ $(IOSAPPXC): $(SRCDIR)/ios/loKit.xcconfig.in 
$(BUILDDIR)/config_host.mk $(SRCDIR
-e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
-   $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig
+   $(SRCDIR)/ios/loApp.xcconfig.in > $(IOSAPPXC)
+
+
 
-$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_iOS.mk
+$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_iOS_setup.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 $(IOSRES)/share/config $(IOSRES)/share/filter 
$(IOSRES)/program \
@@ -113,59 +92,12 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_i
echo "buildid=$(BUILDID)"   >> $(IOSRES)/program/versionrc
 
 
-#- build  -
-$(IOSGEN)/$(IOSKIT): $(IOSKITXC) $(IOSAPPXC) $(IOSGEN)/native-code.h 
STAT_LIB_DEPEND
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
-   CC=; \
-   $(call gb_Helper_print_on_error, \
-   xcodebuild \
-   -xcconfig $(IOSKITXC) \
-   -project $(IOSKITPRJ) \

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

2017-11-22 Thread Julien Nabet

 svx/source/tbxctrls/tbcontrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 439a6e7c7e32089810b878dca77fa64ee454a596
Author: Julien Nabet 
Date:   Tue Sep 19 20:41:13 2017 +0200

tdf#111894: fix leak memory with PaletteManager (take 2)

Thanks to Maxim Monastirsky for the suggestion!

Change-Id: I6ab799848f80f785fd24905c0a540885c41afb86
Reviewed-on: https://gerrit.libreoffice.org/42494
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit 46fa042b94a0364c09482e8a09f8874119db231c)
Reviewed-on: https://gerrit.libreoffice.org/42610
Reviewed-by: David Tardon 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 628bacad7065..5ef9cf378206 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3230,7 +3230,7 @@ void SvxColorListBox::EnsurePaletteManager()
 if (!m_xPaletteManager)
 {
 m_xPaletteManager.reset(new PaletteManager);
-m_xPaletteManager->SetColorSelectFunction(m_aColorWrapper);
+m_xPaletteManager->SetColorSelectFunction(std::ref(m_aColorWrapper));
 m_xPaletteManager->SetLastColor(m_aSelectedColor.first);
 }
 }
___
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

2017-11-22 Thread Jens Carl

 include/test/sheet/xsheetauditing.hxx   |   38 +
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |7 
 qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java  |  195 
--
 sc/qa/extras/sctablesheetobj.cxx|   20 -
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xsheetauditing.cxx|  136 ++
 7 files changed, 192 insertions(+), 206 deletions(-)

New commits:
commit 39c5ade7bbb444eb204015955276748a5b381ad9
Author: Jens Carl 
Date:   Thu Nov 23 01:50:39 2017 +

tdf#45904 Move _XSheetAuditing Java tests to C++

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

diff --git a/include/test/sheet/xsheetauditing.hxx 
b/include/test/sheet/xsheetauditing.hxx
new file mode 100644
index ..44c1ddd5c5d5
--- /dev/null
+++ b/include/test/sheet/xsheetauditing.hxx
@@ -0,0 +1,38 @@
+/* -*- 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_XSHEETAUDITING_HXX
+#define INCLUDED_TEST_SHEET_XSHEETAUDITING_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XSheetAuditing
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testShowHideDependents();
+void testShowHidePrecedents();
+void testShowErrors();
+void testShowInvalid();
+void testClearArrows();
+
+protected:
+~XSheetAuditing() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XSHEETAUDITING_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 9faab8d10327..f8d6b4a5ecd8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -611,7 +611,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XScenario \
 qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced \
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \
-qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
 qadevOOo/tests/java/ifc/style/_CharacterProperties \
 qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
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 9c5a9b9fe29f..6f434c9b484c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -142,13 +142,6 @@
 
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryColumnDifferences()"
 
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryRowDifferences()"
 
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryIntersection()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"hideDependents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"hidePrecedents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showDependents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showPrecedents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showErrors()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showInvalid()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"clearArrows()"
 "ScTableSheetObj";"com::sun::star::sheet::XScenario";"getIsScenario()"
 "ScTableSheetObj";"com::sun::star::sheet::XScenario";"getScenarioComment()"
 "ScTableSheetObj";"com::sun::star::sheet::XScenario";"setScenarioComment()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java 
b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
deleted file mode 100644
index 49665104abd2..
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
+++ /dev/null
@@ -1,195 +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 un

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

2017-11-22 Thread Stephan Bergmann

 sw/source/core/unocore/unoframe.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0e2f224d07a0e7f542984d9e9f48c9cda86a80f6
Author: Stephan Bergmann 
Date:   Wed Nov 22 10:38:15 2017 +0100

An anonymous GraphicObject instance suffices here

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

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index d3d527a8e2ca..76ea5752dc97 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1661,8 +1661,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 OString sId(OUStringToOString(
 aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
 RTL_TEXTENCODING_ASCII_US));
-GraphicObject pGrfObj( sId );
-aGraphic = pGrfObj.GetGraphic();
+aGraphic = GraphicObject( sId ).GetGraphic();
 bApply = true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Stephan Bergmann

 sw/source/core/unocore/unoframe.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d7f2de780e73d23a80cc3d15f84f433d9d056685
Author: Stephan Bergmann 
Date:   Tue Nov 21 23:33:51 2017 +0100

put GraphicObject on stack instead of heap

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

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index a65b25e47c0c..d3d527a8e2ca 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1661,8 +1661,8 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 OString sId(OUStringToOString(
 aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
 RTL_TEXTENCODING_ASCII_US));
-auto pGrfObj = o3tl::make_unique( sId );
-aGraphic = pGrfObj->GetGraphic();
+GraphicObject pGrfObj( sId );
+aGraphic = pGrfObj.GetGraphic();
 bApply = true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Stephan Bergmann

 sw/source/core/unocore/unoframe.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1f56087504e30ae81bd8e55b8f1364f326b75e76
Author: Stephan Bergmann 
Date:   Tue Nov 21 23:31:14 2017 +0100

reduce scope of var

Change-Id: If9f4974fa1bf664b14c81e243f7dcd36abd3a1ce
Reviewed-on: https://gerrit.libreoffice.org/45061
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index e2e8a0232ef8..a65b25e47c0c 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1650,7 +1650,6 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 Graphic aGraphic;
 if( bURL )
 {
-std::unique_ptr pGrfObj;
 OUString aGrfUrl;
 aValue >>= aGrfUrl;
 
@@ -1662,7 +1661,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 OString sId(OUStringToOString(
 aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
 RTL_TEXTENCODING_ASCII_US));
-pGrfObj = o3tl::make_unique( sId );
+auto pGrfObj = o3tl::make_unique( sId );
 aGraphic = pGrfObj->GetGraphic();
 bApply = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Stephan Bergmann

 sw/source/core/unocore/unoframe.cxx |   25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

New commits:
commit c7e0f494bfc7a663f07769b8ed5de0b59bdd11da
Author: Stephan Bergmann 
Date:   Tue Nov 21 23:28:44 2017 +0100

use std::unique_ptr

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

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 789c24eb1903..e2e8a0232ef8 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1576,7 +1577,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 {
 OUString sGrfName;
 OUString sFltName;
-GraphicObject *pGrfObj = nullptr;
+std::unique_ptr pGrfObj;
 SwDoc::GetGrfNms( *static_cast(pFormat), 
&sGrfName, &sFltName );
 OUString sTmp;
 aValue >>= sTmp;
@@ -1585,7 +1586,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 {
 if( sTmp.startsWith(sPackageProtocol) )
 {
-pGrfObj = new GraphicObject;
+pGrfObj = o3tl::make_unique();
 pGrfObj->SetUserData( sTmp );
 sGrfName.clear();
 }
@@ -1594,7 +1595,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 const OString sId(OUStringToOString(
 sTmp.copy(sizeof(sGraphicObjectProtocol)-1),
 RTL_TEXTENCODING_ASCII_US));
-pGrfObj = new GraphicObject( sId );
+pGrfObj = o3tl::make_unique( sId );
 sGrfName.clear();
 }
 else
@@ -1614,14 +1615,12 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
 if(!pGrfNode)
 {
-delete pGrfObj;
 throw uno::RuntimeException();
 }
 SwPaM aGrfPaM(*pGrfNode);
 pFormat->GetDoc()->getIDocumentContentOperations().ReRead( 
aGrfPaM, sGrfName, sFltName, nullptr,
-pGrfObj );
+pGrfObj.get() );
 }
-delete pGrfObj;
 }
 else if( FN_UNO_GRAPHIC == pEntry->nWID )
 {
@@ -1651,7 +1650,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 Graphic aGraphic;
 if( bURL )
 {
-GraphicObject *pGrfObj = nullptr;
+std::unique_ptr pGrfObj;
 OUString aGrfUrl;
 aValue >>= aGrfUrl;
 
@@ -1663,11 +1662,10 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 OString sId(OUStringToOString(
 aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
 RTL_TEXTENCODING_ASCII_US));
-pGrfObj = new GraphicObject( sId );
+pGrfObj = o3tl::make_unique( sId );
 aGraphic = pGrfObj->GetGraphic();
 bApply = true;
 }
-delete pGrfObj;
 }
 else
 {
@@ -2813,13 +2811,13 @@ void SwXFrame::attachToRange(const uno::Reference< 
text::XTextRange > & xTextRan
 UnoActionContext aCont(pDoc);
 const ::uno::Any* pGraphicURL;
 OUString sGraphicURL;
-GraphicObject *pGrfObj = nullptr;
+std::unique_ptr pGrfObj;
 if(pProps->GetProperty(FN_UNO_GRAPHIC_U_R_L, 0, pGraphicURL))
 {
 (*pGraphicURL) >>= sGraphicURL;
 if( sGraphicURL.startsWith(sPackageProtocol) )
 {
-pGrfObj = new GraphicObject;
+pGrfObj = o3tl::make_unique();
 pGrfObj->SetUserData( sGraphicURL );
 sGraphicURL.clear();
 }
@@ -2828,7 +2826,7 @@ void SwXFrame::attachToRange(const uno::Reference< 
text::XTextRange > & xTextRan
 OString sId(OUStringToOString(
 sGraphicURL.copy( sizeof(sGraphicObjectProtocol)-1 ),
 RTL_TEXTENCODING_ASCII_US));
-pGrfObj = new GraphicObject( sId );
+pGrfObj = o3tl::make_unique( sId );
 sGraphicURL.clear();
 }
 }
@@ -2851,12 +2849,11 @@ void SwXFrame::attachToRange(const uno::Reference< 
text::XTextRange > & xTextRan
 
 pFormat = pGrfObj
 ? pDoc->getIDocum

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

2017-11-22 Thread Julien Nabet

 vcl/headless/svpframe.cxx |7 +++
 vcl/headless/svpvd.cxx|7 +++
 vcl/inc/headless/svpframe.hxx |3 ++-
 vcl/inc/headless/svpvd.hxx|4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 4ccddab6ef74cb07c2998eaf420785eeceda5a8d
Author: Julien Nabet 
Date:   Wed Nov 22 20:39:13 2017 +0100

Replace some lists by vectors in vcl/headless

+use for range loops when loops included "std::list"

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

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 12fbf88ba63b..711806226c49 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -156,7 +156,7 @@ SalGraphics* SvpSalFrame::AcquireGraphics()
 void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
 {
 SvpSalGraphics* pSvpGraphics = dynamic_cast(pGraphics);
-m_aGraphics.remove( pSvpGraphics );
+m_aGraphics.erase(std::remove(m_aGraphics.begin(), m_aGraphics.end(), 
pSvpGraphics), m_aGraphics.end());
 delete pSvpGraphics;
 }
 
@@ -275,10 +275,9 @@ void SvpSalFrame::SetPosSize( long nX, long nY, long 
nWidth, long nHeight, sal_u
 aFrameSize.getY());
 
 // update device in existing graphics
-for( std::list< SvpSalGraphics* >::iterator it = m_aGraphics.begin();
- it != m_aGraphics.end(); ++it )
+for (auto const& graphic : m_aGraphics)
 {
- (*it)->setSurface(m_pSurface, aFrameSize);
+ graphic->setSurface(m_pSurface, aFrameSize);
 }
 }
 if( m_bVisible )
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 660185da1d41..cf78ebc8eb7d 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -45,7 +45,7 @@ SalGraphics* SvpSalVirtualDevice::AcquireGraphics()
 
 void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics )
 {
-m_aGraphics.remove( dynamic_cast(pGraphics) );
+m_aGraphics.erase(std::remove(m_aGraphics.begin(), m_aGraphics.end(), 
dynamic_cast(pGraphics)), m_aGraphics.end());
 delete pGraphics;
 }
 
@@ -96,9 +96,8 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, 
long nNewDY,
 #endif
 
 // update device in existing graphics
-for( std::list< SvpSalGraphics* >::iterator it = m_aGraphics.begin();
- it != m_aGraphics.end(); ++it )
-(*it)->setSurface(m_pSurface, m_aFrameSize);
+for (auto const& graphic : m_aGraphics)
+graphic->setSurface(m_pSurface, m_aFrameSize);
 }
 return true;
 }
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index eed5efec0c66..16de568794f8 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -26,6 +26,7 @@
 #include 
 
 #include 
+#include 
 
 #ifdef IOS
 #define SvpSalInstance AquaSalInstance
@@ -52,7 +53,7 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
 
 SystemEnvData   m_aSystemChildData;
 
-std::list< SvpSalGraphics* >m_aGraphics;
+std::vector< SvpSalGraphics* >  m_aGraphics;
 
 static SvpSalFrame*   s_pFocusFrame;
 public:
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 7ac156305abd..704488cdfae0 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-#include 
+#include 
 
 class SvpSalGraphics;
 typedef struct _cairo_surface cairo_surface_t;
@@ -33,7 +33,7 @@ class VCL_DLLPUBLIC SvpSalVirtualDevice : public 
SalVirtualDevice
 cairo_surface_t*m_pSurface;
 basegfx::B2IVector  m_aFrameSize;
 double  m_fScale;
-std::list< SvpSalGraphics* >m_aGraphics;
+std::vector< SvpSalGraphics* >  m_aGraphics;
 
 public:
 SvpSalVirtualDevice(DeviceFormat eFormat, double fScale)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Julien Nabet

 vcl/source/gdi/pdfwriter_impl.cxx |   12 ++--
 vcl/source/gdi/pdfwriter_impl.hxx |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3c508bf9fc1b2704080a71d7374bf3720343beb5
Author: Julien Nabet 
Date:   Wed Nov 22 21:21:18 2017 +0100

Replace list by vector for m_aJPGs pdfwriter_impl (vcl)

+use for range loop just for the loop containing "std::list"

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

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index e9dfafb02b57..6d958b3bc231 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2293,13 +2293,13 @@ void PDFWriterImpl::endPage()
 it->m_aBitmap = BitmapEx();
 }
 }
-for( std::list::iterator jpeg = m_aJPGs.begin(); jpeg != 
m_aJPGs.end(); ++jpeg )
+for (auto & jpeg : m_aJPGs)
 {
-if( jpeg->m_pStream )
+if( jpeg.m_pStream )
 {
-writeJPG( *jpeg );
-jpeg->m_pStream.reset();
-jpeg->m_aMask = Bitmap();
+writeJPG( jpeg );
+jpeg.m_pStream.reset();
+jpeg.m_aMask = Bitmap();
 }
 }
 for( std::list::iterator t = 
m_aTransparentObjects.begin();
@@ -9796,7 +9796,7 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, 
bool bIsTrueColor, const
 if( ! rMask.IsEmpty() )
 aID.m_nMaskChecksum = rMask.GetChecksum();
 
-std::list< JPGEmit >::const_iterator it;
+std::vector< JPGEmit >::const_iterator it;
 for( it = m_aJPGs.begin(); it != m_aJPGs.end() && ! (aID == it->m_aID); 
++it )
 ;
 if( it == m_aJPGs.end() )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx 
b/vcl/source/gdi/pdfwriter_impl.hxx
index 7aba8c50d0e6..cf8fe720050c 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -634,7 +634,7 @@ private:
  *  file stream as XObjects*/
 std::list< BitmapEmit > m_aBitmaps;
 /* contains JPG streams until written to file */
-std::list  m_aJPGs;
+std::vectorm_aJPGs;
 /*--->i56629 contains all named destinations ever set during the PDF 
creation,
destination id is always the destination's position in this vector
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Julien Nabet

 binaryurp/source/bridge.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 86cda9ab3cdfc2f253b4d2f44dd00f40d8574210
Author: Julien Nabet 
Date:   Wed Nov 22 18:48:12 2017 +0100

Revert partly 9d1f61a61893435b26f7239136ad92b7354545a8

The use of erase/remove idiom is wrong here since "there can be multiple
registrations of the same listener"

See Stephan's comments in 
https://gerrit.libreoffice.org/#/c/44892/3/binaryurp/source/bridge.cxx

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

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 92a1665d8a45..d39d1f24e667 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -927,7 +927,11 @@ void Bridge::removeEventListener(
 css::uno::Reference< css::lang::XEventListener > const & aListener)
 {
 osl::MutexGuard g(mutex_);
-listeners_.erase(std::remove(listeners_.begin(), listeners_.end(), 
aListener), listeners_.end());
+Listeners::iterator i(
+std::find(listeners_.begin(), listeners_.end(), aListener));
+if (i != listeners_.end()) {
+listeners_.erase(i);
+}
 }
 
 void Bridge::sendCommitChangeRequest() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Noel Grandin

 sc/inc/scitems.hxx|  201 +-
 sc/qa/unit/helper/qahelper.cxx|2 
 sc/qa/unit/subsequent_filters-test.cxx|2 
 sc/source/core/data/attarray.cxx  |   19 --
 sc/source/core/data/conditio.cxx  |3 
 sc/source/core/data/docpool.cxx   |5 
 sc/source/core/data/documen3.cxx  |3 
 sc/source/core/data/documen8.cxx  |8 -
 sc/source/core/data/documen9.cxx  |   13 -
 sc/source/core/data/document.cxx  |   12 -
 sc/source/core/data/fillinfo.cxx  |   10 -
 sc/source/core/data/global.cxx|4 
 sc/source/core/data/patattr.cxx   |  111 +-
 sc/source/core/data/postit.cxx|2 
 sc/source/core/data/stlpool.cxx   |4 
 sc/source/core/data/stlsheet.cxx  |5 
 sc/source/core/data/table2.cxx|6 
 sc/source/core/tool/autoform.cxx  |   56 +++
 sc/source/core/tool/detfunc.cxx   |3 
 sc/source/core/tool/editutil.cxx  |2 
 sc/source/filter/excel/xehelper.cxx   |2 
 sc/source/filter/excel/xepage.cxx |   56 +++
 sc/source/filter/excel/xestyle.cxx|   30 +--
 sc/source/filter/excel/xetable.cxx|   12 -
 sc/source/filter/excel/xipage.cxx |   10 -
 sc/source/filter/html/htmlexp.cxx |4 
 sc/source/filter/html/htmlimp.cxx |6 
 sc/source/filter/oox/sheetdatabuffer.cxx  |2 
 sc/source/filter/rtf/eeimpars.cxx |2 
 sc/source/filter/rtf/rtfparse.cxx |1 
 sc/source/ui/Accessibility/AccessibleText.cxx |2 
 sc/source/ui/app/transobj.cxx |2 
 sc/source/ui/cctrl/dpcontrol.cxx  |2 
 sc/source/ui/docshell/docsh3.cxx  |7 
 sc/source/ui/docshell/docsh4.cxx  |   40 ++---
 sc/source/ui/pagedlg/hfedtdlg.cxx |   21 --
 sc/source/ui/pagedlg/tphf.cxx |3 
 sc/source/ui/undo/undocell.cxx|2 
 sc/source/ui/unoobj/afmtuno.cxx   |1 
 sc/source/ui/unoobj/cellsuno.cxx  |   14 -
 sc/source/ui/unoobj/defltuno.cxx  |1 
 sc/source/ui/unoobj/styleuno.cxx  |   36 ++--
 sc/source/ui/unoobj/textuno.cxx   |2 
 sc/source/ui/vba/vbaformat.cxx|4 
 sc/source/ui/view/formatsh.cxx|   46 ++---
 sc/source/ui/view/gridwin4.cxx|4 
 sc/source/ui/view/preview.cxx |   17 +-
 sc/source/ui/view/prevwsh.cxx |4 
 sc/source/ui/view/printfun.cxx|   67 
 sc/source/ui/view/tabvwsha.cxx|6 
 sc/source/ui/view/viewfunc.cxx|   13 -
 51 files changed, 418 insertions(+), 472 deletions(-)

New commits:
commit a675428e349d3424ffcc844e9c3884a82cf82ef7
Author: Noel Grandin 
Date:   Wed Nov 22 14:31:53 2017 +0200

TypedWhichId for sc constants

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

diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 6664e91742d5..c1c60561b050 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_SCITEMS_HXX
 
 #include 
+#include 
 
 //  EditEngine is not allowed to define it's own ITEMID's
 #define INCLUDED_EDITENG_EEITEMID_HXX
@@ -51,110 +52,110 @@
 
 #define ATTR_PATTERN_START  100 // begin of cell-attribute-pattern
 
-#define ATTR_FONT   100 // begin of cell-attributes
-#define ATTR_FONT_HEIGHT101
-#define ATTR_FONT_WEIGHT102
-#define ATTR_FONT_POSTURE   103
-#define ATTR_FONT_UNDERLINE 104
-#define ATTR_FONT_OVERLINE  105
-#define ATTR_FONT_CROSSEDOUT106
-#define ATTR_FONT_CONTOUR   107
-#define ATTR_FONT_SHADOWED  108
-#define ATTR_FONT_COLOR 109
-#define ATTR_FONT_LANGUAGE  110
-#define ATTR_CJK_FONT   111
-#define ATTR_CJK_FONT_HEIGHT112
-#define ATTR_CJK_FONT_WEIGHT113
-#define ATTR_CJK_FONT_POSTURE   114
-#define ATTR_CJK_FONT_LANGUAGE  115
-#define ATTR_CTL_FONT   116
-#define ATTR_CTL_FONT_HEIGHT117
-#define ATTR_CTL_FONT_WEIGHT118
-#define ATTR_CTL_FONT_POSTURE   119
-#define ATTR_CTL_FONT_LANGUAGE  120
-#define ATTR_FONT_EMPHASISMARK  121
-#define ATTR_USERDEF122 // not saved in binary files
-#define ATTR_FONT_WORDLINE  123
-#define ATTR_FONT_RELIEF124
-#define ATTR_HYPHENATE  125
-#define ATTR_SCRIPTSPACE126
-#define ATTR_HANGPUNCTUATION127
-#define ATTR_FORBIDDEN_RULES128
-#define ATTR_HOR_JUSTIFY129
-#define ATTR_HOR_JUSTIFY_METHOD 130
-#define ATTR_INDENT 131
-#define ATTR_VER_JUSTIFY132
-#defi

[Libreoffice-commits] core.git: basctl/source comphelper/source compilerplugins/clang connectivity/source cui/source extensions/source filter/source framework/source hwpfilter/source io/source jvmfwk/

2017-11-22 Thread Noel Grandin

 basctl/source/basicide/brkdlg.cxx  |2 
 comphelper/source/misc/types.cxx   |2 
 compilerplugins/clang/simplifybool.cxx |   52 +++--
 compilerplugins/clang/test/simplifybool.cxx|   18 +
 connectivity/source/drivers/odbc/OResultSet.cxx|2 
 cui/source/tabpages/swpossizetabpage.cxx   |2 
 extensions/source/update/feed/updatefeed.cxx   |2 
 filter/source/graphicfilter/icgm/class4.cxx|4 -
 framework/source/fwe/helper/propertysetcontainer.cxx   |4 -
 framework/source/fwi/uielement/itemcontainer.cxx   |2 
 framework/source/fwi/uielement/rootitemcontainer.cxx   |2 
 framework/source/layoutmanager/uielement.cxx   |4 -
 hwpfilter/source/hwpread.cxx   |   28 -
 io/source/stm/odata.cxx|6 -
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx   |2 
 oox/source/ole/vbainputstream.cxx  |2 
 pyuno/source/module/pyuno_runtime.cxx  |2 
 registry/source/regimpl.cxx|2 
 sal/osl/unx/pipe.cxx   |2 
 sal/rtl/digest.cxx |   18 ++---
 sal/rtl/math.cxx   |2 
 sax/source/expatwrap/saxwriter.cxx |2 
 sc/source/core/data/document.cxx   |4 -
 sc/source/core/opencl/op_database.cxx  |4 -
 sc/source/core/tool/charthelper.cxx|2 
 sc/source/filter/excel/xiescher.cxx|2 
 sc/source/filter/html/htmlpars.cxx |2 
 sc/source/filter/orcus/filterdetect.cxx|2 
 sc/source/filter/xml/XMLStylesExportHelper.cxx |6 -
 sc/source/ui/view/tabview.cxx  |2 
 sc/source/ui/view/viewdata.cxx |   12 +--
 sd/source/ui/dlg/sdtreelb.cxx  |2 
 sd/source/ui/presenter/PresenterTextView.cxx   |2 
 sfx2/source/dialog/templdlg.cxx|2 
 sfx2/source/doc/DocumentMetadataAccess.cxx |2 
 solenv/CompilerTest_compilerplugins_clang.mk   |1 
 starmath/source/accessibility.cxx  |   14 ++--
 store/source/lockbyte.cxx  |8 +-
 store/source/stordata.cxx  |6 -
 store/source/storpage.cxx  |6 -
 store/source/stortree.cxx  |   10 +--
 store/source/stortree.hxx  |2 
 svl/source/misc/inethist.cxx   |2 
 svl/source/numbers/zforlist.cxx|4 -
 svl/source/numbers/zformat.cxx |2 
 svtools/source/control/valueacc.cxx|2 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx |2 
 svx/source/dialog/docrecovery.cxx  |4 -
 svx/source/form/formcontrolfactory.cxx |2 
 sw/source/core/doc/DocumentRedlineManager.cxx  |2 
 sw/source/core/doc/docfld.cxx  |2 
 sw/source/core/docnode/nodes.cxx   |2 
 sw/source/core/layout/flycnt.cxx   |4 -
 sw/source/core/layout/sectfrm.cxx  |2 
 sw/source/core/layout/trvlfrm.cxx  |2 
 sw/source/core/text/EnhancedPDFExportHelper.cxx|2 
 sw/source/core/text/porlay.cxx |2 
 sw/source/core/txtnode/ndtxt.cxx   |4 -
 sw/source/core/unocore/unofield.cxx|2 
 sw/source/filter/ww8/ww8atr.cxx|2 
 sw/source/filter/ww8/ww8par3.cxx   |2 
 sw/source/ui/frmdlg/frmpage.cxx|2 
 sw/source/uibase/app/swmodul1.cxx  |2 
 sw/source/uibase/frmdlg/frmmgr.cxx |4 -
 sw/source/uibase/shells/textfld.cxx|2 
 sw/source/uibase/uno/unomod.cxx|2 
 sw/source/uibase/utlui/content.cxx |2 
 toolkit/source/helper/formpdfexport.cxx|2 
 tools/source/generic/b3dtrans.cxx  |4 -
 vcl/source/font/font.cxx   |2 
 vcl/source/gdi/pdfwriter_impl.cxx  |2 
 vcl/source/opengl/OpenGLHelper.cxx |2 
 vcl/source/window/decoview.cxx |2 
 vcl/source/window/winproc.cxx  |4 -
 vcl/unx/generic/print/common_gfx.cxx   |4 -
 writerfilter/source/dmapper/ConversionHelper.cxx   |2 
 xmloff/source/style/xmlnumfi.cxx   |2 
 77 fi

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

2017-11-22 Thread Stephan Bergmann

 sal/rtl/math.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c24c32bf71b8e64bd0d36e511f554e1f6c015842
Author: Stephan Bergmann 
Date:   Wed Nov 22 15:34:09 2017 +0100

ofz#4366 Divide-by-zero

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

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 997280784351..96c5843dcfea 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -365,8 +366,15 @@ inline void doubleToString(typename T::String ** pResult,
 int nExp = 0;
 if ( fValue > 0.0 )
 {
-nExp = static_cast< int >(floor(log10(fValue)));
-fValue /= getN10Exp(nExp);
+// Cap nExp at a small value beyond which "fValue /= N10Exp" would 
lose precision (or N10Exp
+// might even be zero); that will produce output with the decimal 
point in a non-normalized
+// position, but the current quality of output for such small values 
is probably abysmal,
+// anyway:
+nExp = std::max(
+static_cast< int >(floor(log10(fValue))), 
std::numeric_limits::min_exponent10);
+double const N10Exp = getN10Exp(nExp);
+assert(N10Exp != 0);
+fValue /= N10Exp;
 }
 
 switch (eFormat)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Delay when running the Build

2017-11-22 Thread Eike Rathke

Hi Koushik,

On Monday, 2017-11-20 17:31:28 -0800, Koushik Sekhar wrote:

> So, is this delay have to do with my
> environment or generally it takes a long time for the build to complete? If
> so, could you tell me how long does it take for the build to complete?

Depending on your machine, number of cores, available RAM and disk speed
it may take any time between 2 and 6 hours, in bad cases even more,
worst case your build starts swapping with too little RAM (8GB
advisable, more if you build with debug).

For example, 4 cores (8 CPUs), 16GB RAM, SSD and a handful of
localizations (which each take extra time to build help and resources)
still takes 2-3 hours.

  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: external/cairo

2017-11-22 Thread Christian Lohmaier

 external/cairo/UnpackedTarball_cairo.mk |1 -
 external/cairo/cairo/cairo-1.10.2.android.patch |   24 
 2 files changed, 25 deletions(-)

New commits:
commit 54e1441949b83a76eecd02f2839693697773f711
Author: Christian Lohmaier 
Date:   Wed Nov 22 23:14:26 2017 +0100

cairo: drop no longer needed patch for android

Change-Id: I7f52cc8686556e21b9d2b5fdf43ce13307bcfac0

diff --git a/external/cairo/UnpackedTarball_cairo.mk 
b/external/cairo/UnpackedTarball_cairo.mk
index 503e762cb4f5..d38ba6bac2e2 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -24,7 +24,6 @@ endif
 
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
-   external/cairo/cairo/cairo-1.10.2.android.patch \
external/cairo/cairo/cairo.GL_RGBA.patch \
 ))
 endif
diff --git a/external/cairo/cairo/cairo-1.10.2.android.patch 
b/external/cairo/cairo/cairo-1.10.2.android.patch
deleted file mode 100644
index 237a0d4c2372..
--- a/external/cairo/cairo/cairo-1.10.2.android.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 misc/cairo-1.10.2/build/ltmain.sh
-+++ misc/build/cairo-1.10.2/build/ltmain.sh
-@@ -3228,6 +3228,10 @@
- func_warning "\`-release' is ignored for convenience libraries"
-   else
- 
-+  # Force no versioning suffix for Android
-+
-+  version_type=none
-+
-   # Parse the version information argument.
-   save_ifs="$IFS"; IFS=':'
-   set dummy $vinfo 0 0 0
-diff -ur cairo.org/src/cairo-compiler-private.h 
cairo/src/cairo-compiler-private.h
 a/cairo.org/src/cairo-compiler-private.h   2016-01-16 00:47:17.392420675 
+0100
-+++ b/cairo/src/cairo-compiler-private.h   2016-01-16 00:51:55.601110129 
+0100
-@@ -258,4 +258,7 @@
- #define inline __inline__
- #endif
- 
-+/* no ffs in libc on android x86 (at least not in v15 that we compile 
against) */
-+#define ffs __builtin_ffs
-+
- #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - libreofficekit/Executable_tilebench.mk libreofficekit/Module_libreofficekit.mk libreofficekit/qa Repository.mk

2017-11-22 Thread Ashod Nakashian

 Repository.mk |2 
 libreofficekit/Executable_tilebench.mk|1 
 libreofficekit/Module_libreofficekit.mk   |5 -
 libreofficekit/qa/tilebench/tilebench.cxx |  134 +++---
 4 files changed, 90 insertions(+), 52 deletions(-)

New commits:
commit 84db465fdf9314b4a775d7cfb6558bd91bae7ab9
Author: Ashod Nakashian 
Date:   Tue Nov 21 22:04:27 2017 -0500

LOK: tilebench improvements

* Arguments for max number of parts and tiles to render (optional).
  + Automatic estimation of maximum tiles to render based on max parts
for Writer docs, since there is only 1 part, this caps the number
of pages to render, similar to other doc types.
* Fixed rendering of Writer documents over and over (as many times as 
pages).
  + Writer has a single part, unlike other doc types.
  + No point in rendering the whole document in writer to a single tile,
since that's completely unrealistic and impractical (it takes
forever for large docs and artificially spikes the memory).
* Rendering starts at the current part and not the first.
  + This gives the spreadsheet of interest priority (if saved as visible).
* The tile size is now more realistic as we use the same dimensions
  as the Online client does.
* When rendering tiles at scale, we use the same dimensions as the
  Online client rather than splitting the width by 4, for realism.
* Rendering of tiles is done rows-first, rather than columns-first,
  which is similar to what the Online client does, which is more
  cache friendly, therefore more realistic.
* Enabled compiling of tilebench when GTK3 is disabled, which
  was erroneous, since tilebench doesn't have any dependency on GTK.
  + Now it's possible to compile with local Cairo/Pixman libs.

Change-Id: If8439834cef9b0a2988a6d2c25d63b2b5bc6087f
Reviewed-on: https://gerrit.libreoffice.org/45090
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/Repository.mk b/Repository.mk
index 6eade9020edd..51c1b1b73dea 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -70,7 +70,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 svptest \
 svpclient \
 pixelctl ) \
-   $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), 
tilebench) \
+   $(if $(filter LINUX %BSD SOLARIS,$(OS)), tilebench) \
$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
outdevgrind) \
vcldemo \
diff --git a/libreofficekit/Executable_tilebench.mk 
b/libreofficekit/Executable_tilebench.mk
index 4da51d3ca686..9d8b2a134f99 100644
--- a/libreofficekit/Executable_tilebench.mk
+++ b/libreofficekit/Executable_tilebench.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Executable_set_include,tilebench,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,tilebench,\
-libreofficekitgtk \
sal \
 ))
 
diff --git a/libreofficekit/Module_libreofficekit.mk 
b/libreofficekit/Module_libreofficekit.mk
index cc842b2f3f2c..079e4e15e5b4 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -23,10 +23,13 @@ ifneq ($(ENABLE_GTK3),)
 $(eval $(call gb_Module_add_targets,libreofficekit,\
 Library_libreofficekitgtk \
 Executable_gtktiledviewer \
+))
+endif # ($(ENABLE_GTK3),)
+
+$(eval $(call gb_Module_add_targets,libreofficekit,\
 Executable_tilebench \
 Package_selectionhandles \
 ))
-endif # ($(ENABLE_GTK3),)
 
 endif
 
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx 
b/libreofficekit/qa/tilebench/tilebench.cxx
index b4912b1611ef..6ad0d578c464 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -10,10 +10,12 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -21,7 +23,7 @@ using namespace lok;
 
 static int help()
 {
-fprintf( stderr, "Usage: tilebench  
[path to document]\n" );
+fprintf( stderr, "Usage: tilebench  
[path to document] [max parts|-1] [max tiles|-1]\n" );
 fprintf( stderr, "renders a selection of small tiles from the document, 
checksums them and times the process\n" );
 return 1;
 }
@@ -36,13 +38,17 @@ static double getTimeNow()
 
 int main( int argc, char* argv[] )
 {
+static const double origin = getTimeNow();
 struct TimeRecord {
 const char *mpName;
 double mfTime;
 
 TimeRecord() : mpName(nullptr), mfTime(getTimeNow()) { }
 explicit TimeRecord(const char *pName) :
-   mpName(pName ), mfTime(getTimeNow()) { }
+   mpName(pName), mfTime(getTimeNow())
+{
+fprintf(stderr, "%3.3fs - %s\n", (mfTime - origin), mpName);
+}
 };
 std::vector< TimeRecord > aTimes;
 if( argc < 2 ||
@@ -55,24 +61,38 @@ int main( int argc, char* argv[] )
 return 1;
 }
 
-aTimes.push_b

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

2017-11-22 Thread Michael Meeks

 sc/source/core/tool/interpr4.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit df755b1b39fd501b18a513c342f4104dea7eaee8
Author: Michael Meeks 
Date:   Tue Nov 21 17:15:23 2017 +

Avoid using the hideous std::stack -> deque inside ::Interpret

dequeue loves to allocate and free memory crazily, vector is much saner.

Change-Id: Idcd2c1d693594f280ce94423161651502f25dc2d
Reviewed-on: https://gerrit.libreoffice.org/45086
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 28f14137f077..67052e8906d4 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3959,7 +3959,7 @@ StackVar ScInterpreter::Interpret()
 sal_uLong nRetIndexExpr = 0;
 sal_uInt16 nErrorFunction = 0;
 sal_uInt16 nErrorFunctionCount = 0;
-std::stack aErrorFunctionStack;
+std::vector aErrorFunctionStack;
 sal_uInt16 nStackBase;
 
 nGlobalError = FormulaError::NONE;
@@ -4522,15 +4522,15 @@ StackVar ScInterpreter::Interpret()
 if ( nLevel == 1 || (nLevel == 2 && aCode.IsEndOfPath()) )
 {
 if (nLevel == 1)
-aErrorFunctionStack.push( nErrorFunction);
+aErrorFunctionStack.push_back( nErrorFunction);
 bGotResult = JumpMatrix( nLevel );
 if (aErrorFunctionStack.empty())
 assert(!"ScInterpreter::Interpret - aErrorFunctionStack 
empty in JumpMatrix context");
 else
 {
-nErrorFunction = aErrorFunctionStack.top();
+nErrorFunction = aErrorFunctionStack.back();
 if (bGotResult)
-aErrorFunctionStack.pop();
+aErrorFunctionStack.pop_back();
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Michael Meeks

 sc/source/core/tool/formulagroup.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7ced0f88e0af360d5b47b320b9dd23b692d8d1ad
Author: Michael Meeks 
Date:   Tue Nov 21 17:26:43 2017 +

Don't re-create the interpreter context for each row.

Change-Id: I272c9dc09806d47add26866f517e6ea07282c35f
Reviewed-on: https://gerrit.libreoffice.org/45087
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index f6565e732086..b8b1ef1a79a8 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -175,6 +175,9 @@ public:
 double fNan;
 rtl::math::setNan(&fNan);
 ScTokenArray aCode2;
+
+ScInterpreterContext aContext(mrDoc, mpFormatter);
+
 for (SCROW i = mnIdx; i <= mnLastIdx; ++i, maBatchTopPos.IncRow())
 {
 formula::FormulaTokenArrayPlainIterator aIter(mrCode);
@@ -298,7 +301,6 @@ public:
 
 ScCompiler aComp(&mrDoc, maBatchTopPos, aCode2);
 aComp.CompileTokenArray();
-ScInterpreterContext aContext(mrDoc, mpFormatter);
 ScInterpreter aInterpreter(pDest, &mrDoc, aContext, maBatchTopPos, 
aCode2);
 aInterpreter.Interpret();
 mrResults[i] = aInterpreter.GetResultToken();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the design/UX meeting 2017-Nov-22

2017-11-22 Thread Heiko Tietze

Present: Thomas, Csongor, Jay, Heiko

 * Vertical alignment of images anchored as character
   + https://bugs.documentfoundation.org/show_bug.cgi?id=87742
   + screenshot - 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=111368
   + WF because alignment depend on use case; center is as good as top (Heiko, 
Csongor)
   + Top is better than centered, ideally first line at top, last at bottom 
(Thomas)
   => no objection but not worth the effort

 * Toggle read access at statusbar
   + https://bugs.documentfoundation.org/show_bug.cgi?id=86303
   + no need for this feature in the sb => WF (Heiko)
   + use case: multiple open documents where some are secured by the function 
(Csongor)
   + 2x pro the suggestion, 1x no opinion, 1x con
   => go

 * Shortcut for Double Underline in all modules
   + https://bugs.documentfoundation.org/show_bug.cgi?id=113939
   + if we do that it requires to switch from ctrl+D to shift+ctrl+U in Writer 
(Heiko)
   + advantage of consistency but have a better shortcut (Thomas)
   => go with shift+ctrl+U for double underline for all modules

 * Change string from 'Left' to 'Default' or 'Start' or code 'Right' entry
   + https://bugs.documentfoundation.org/show_bug.cgi?id=98211
   => postponed for Stuart

 * Removal of tango, breeze and libreoffice palettes
   + https://bugs.documentfoundation.org/show_bug.cgi?id=113858
   + at least LibreOffice should remain as it is our branding (Heiko)
   + Thomas, Jay pro cleaning up
   + keep LibO, remove Tango/Breeze (Csongor)
   + better names for LibO? (Thomas)
  + idea has been refused last year 
https://bugs.documentfoundation.org/show_bug.cgi?id=104053
   => keep going

 * Removal of Open Sans, PT_Serif, Source Sans/Code fonts (Jay)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=103080
   + ESC were against removing of Libertine and DejaVu
   + would still like to remove Open Sans, PT_Serif, Source Sans Pro
 and Source Code that were added in 4.0 and 4.4 now that we are
 bundling Noto Sans and Noto Serif families.
 + we dont bundle Source Serif Pro as it isnt available in italics
   https://bugs.documentfoundation.org/show_bug.cgi?id=79022
   + like many different fonts (Csongor)
   + hate many different fonts, esp. when not installed via distro management 
(Heiko)
   + no opinion, don't like too much very similar fonts (Thomas)
   + be mindful of fallback for unique glyphs, U+1f512 for example--Source Code 
Pro our only location (Stuart)
  + what did we do before Source Code Pro was added in 4.0? (Jay)
  + shove them into OpenSymbol, the Emoji support has been painful (Stuart)
   => AI: ESC should confirm removal of the three

 * Optimal column width
   + https://bugs.documentfoundation.org/show_bug.cgi?id=113604
(auto size behavior, "style" instead of direct formatting)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=113960
(table properties: col sizing tedious)
   + solution could include UI proposal from 
https://bugs.documentfoundation.org/show_bug.cgi?id=113603
   + Working With Tables in Writer - 
https://docs.google.com/document/d/1D212Ihf8BYVOa1VjSPifq4sO_Cq4CZPhC0vya68zk3c
   => would be a cool GSoC project, needs a design session
   => keep tickets but do not make small patches



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

[Libreoffice-commits] core.git: translations

2017-11-22 Thread Christian Lohmaier

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

New commits:
commit dbe27473220cef519afde0a0acc67845bab596c8
Author: Christian Lohmaier 
Date:   Wed Nov 22 19:49:53 2017 +0100

Updated core
Project: translations  a0c08eb77f9fd9e3b53f5c40abb554e83195fa27

update translations for 6.0 beta1

and force-fix errors using pocheck

Change-Id: Ie5900800b8c1f0e6064d00b2b028afcf51e84e20

diff --git a/translations b/translations
index e113c687b97d..a0c08eb77f9f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e113c687b97d0f1b3b5a0afdddc04d2de33edb20
+Subproject commit a0c08eb77f9fd9e3b53f5c40abb554e83195fa27
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread qzheng

 extensions/source/config/ldap/ldapaccess.cxx |   31 +--
 starmath/source/dialog.cxx   |5 +---
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 1783b33b52c4332be6163d15ae78bbeb4e16c172
Author: qzheng 
Date:   Tue Nov 14 15:19:26 2017 +0800

tdf#112689 Replace chained O(U)StringBuffer::append with operator+

Change OUStringBuffer::append() to operator+.

Change-Id: I13232cb69b1d62acfcf15d5ba5a2d72e5ab5d253
Reviewed-on: https://gerrit.libreoffice.org/44703
Tested-by: Jenkins 
Reviewed-by: Mark Hung 
Reviewed-by: Michael Stahl 

diff --git a/extensions/source/config/ldap/ldapaccess.cxx 
b/extensions/source/config/ldap/ldapaccess.cxx
index 1f6667ce4851..caece9d1cde5 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -66,13 +66,13 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
 {
 if (aRetCode == LDAP_SUCCESS) { return ; }
 
-OUStringBuffer message;
+OUString message;
 
 if (aOperation != nullptr)
 {
-message.appendAscii(aOperation).append(": ") ;
+message += OUString::createFromAscii(aOperation) + ": ";
 }
-message.appendAscii(ldap_err2string(aRetCode)).append(" (") ;
+message += OUString::createFromAscii(ldap_err2string(aRetCode)) + " (" ;
 sal_Char *stub = nullptr ;
 
 #ifndef LDAP_OPT_SIZELIMIT // for use with OpenLDAP
@@ -80,7 +80,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
 #endif
 if (stub != nullptr)
 {
-message.appendAscii(stub) ;
+message += OUString::createFromAscii(stub) ;
 // It would seem the message returned is actually
 // not a copy of a string but rather some static
 // string itself. At any rate freeing it seems to
@@ -88,10 +88,9 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
 // This call is thus disabled for the moment.
 //ldap_memfree(stub) ;
 }
-else { message.append("No additional information") ; }
-message.append(")") ;
-throw ldap::LdapGenericException(message.makeStringAndClear(),
- nullptr, aRetCode) ;
+else { message += "No additional information" ; }
+message += ")" ;
+throw ldap::LdapGenericException(message, nullptr, aRetCode) ;
 }
 
 void  LdapConnection::connectSimple(const LdapDefinition& aDefinition)
@@ -234,11 +233,13 @@ void LdapConnection::initConnection()
 nullptr, 0) ;
 }
 
-
-OUStringBuffer filter( "(&(objectclass=" );
-
-filter.append( mLdapDefinition.mUserObjectClass ).append(")(") ;
-filter.append( mLdapDefinition.mUserUniqueAttr 
).append("=").append(aUser).append("))") ;
+OUString filter = "(&(objectclass="
++ mLdapDefinition.mUserObjectClass
++ ")("
++ mLdapDefinition.mUserUniqueAttr
++ "="
++ aUser
++ "))";
 
 LdapMessageHolder result;
 #ifdef _WIN32
@@ -246,13 +247,13 @@ void LdapConnection::initConnection()
 LdapErrCode retCode = ldap_search_sW(mConnection,
   
const_cast(o3tl::toW(mLdapDefinition.mBaseDN.getStr())),
   LDAP_SCOPE_SUBTREE,
-  
const_cast(o3tl::toW(filter.makeStringAndClear().getStr())), attributes, 
0, &result.msg) ;
+  
const_cast(o3tl::toW(filter.getStr())), attributes, 0, &result.msg) ;
 #else
 sal_Char * attributes [2] = { const_cast(LDAP_NO_ATTRS), 
nullptr };
 LdapErrCode retCode = ldap_search_s(mConnection,
   OUStringToOString( 
mLdapDefinition.mBaseDN, RTL_TEXTENCODING_UTF8 ).getStr(),
   LDAP_SCOPE_SUBTREE,
-  OUStringToOString( 
filter.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), attributes, 0, 
&result.msg) ;
+  OUStringToOString( filter, 
RTL_TEXTENCODING_UTF8 ).getStr(), attributes, 0, &result.msg) ;
 #endif
 checkLdapReturnCode("FindUserDn", retCode) ;
 OUString userDn ;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index f710aa1988f0..e02ad89b86c6 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1484,12 +1484,11 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl, Button*, 
void )
 const SmSym *pSym = GetSymbol();
 if (pSym)
 {
-OUStringBuffer aText;
-aText.append('%').append(pSym->GetName()).append(' ');
+OUString aText = "%" + pSym->GetName() + " ";
 
 rViewSh.GetViewFrame()->GetDispatcher()->ExecuteList(
 SID_INSERTSYMBOL, SfxCallMode::RECORD,
-{ new SfxStringItem(SID_INSERTSYMBOL, 
aText.makeStringAndClear()) });
+{ new SfxStri

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

2017-11-22 Thread Eike Rathke

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

New commits:
commit 95da9d4c8f320d865939ef2cea268ad1aac20a8e
Author: Eike Rathke 
Date:   Wed Nov 22 21:14:10 2017 +0100

Follow our naming conventions, tdf#39593 follow-up

Change-Id: Iee95b5bf0dd42169447163a41be5b2aa1899e83c

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 7abff2e541e2..2237b7daa560 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -250,7 +250,7 @@ private:
 bool Clip( DrawEditParam& rParam, const Size& aCellSize, OutputAreaParam& 
aAreaParam,
long nEngineHeight, bool bWrapFields);
 
-bool AdjustAreaParamClipRect(OutputAreaParam& aAreaParam);
+bool AdjustAreaParamClipRect(OutputAreaParam& rAreaParam);
 
 public:
 /**
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index a3a0348a3dd5..c6918b04640f 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2720,29 +2720,29 @@ void 
ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, const
 }
 
 // Returns true if the rect is clipped vertically
-bool ScOutputData::AdjustAreaParamClipRect(OutputAreaParam& aAreaParam)
+bool ScOutputData::AdjustAreaParamClipRect(OutputAreaParam& rAreaParam)
 {
-if( aAreaParam.maClipRect.Left() < nScrX )
+if( rAreaParam.maClipRect.Left() < nScrX )
 {
-aAreaParam.maClipRect.Left() = nScrX;
-aAreaParam.mbLeftClip = true;
+rAreaParam.maClipRect.Left() = nScrX;
+rAreaParam.mbLeftClip = true;
 }
-if( aAreaParam.maClipRect.Right() > nScrX + nScrW )
+if( rAreaParam.maClipRect.Right() > nScrX + nScrW )
 {
-aAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
-aAreaParam.mbRightClip = true;
+rAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
+rAreaParam.mbRightClip = true;
 }
 
 bool bVClip = false;
 
-if( aAreaParam.maClipRect.Top() < nScrY )
+if( rAreaParam.maClipRect.Top() < nScrY )
 {
-aAreaParam.maClipRect.Top() = nScrY;
+rAreaParam.maClipRect.Top() = nScrY;
 bVClip = true;
 }
-if( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
+if( rAreaParam.maClipRect.Bottom() > nScrY + nScrH )
 {
-aAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one?
+rAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one?
 bVClip = true;
 }
 return bVClip;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Henry Castro

 loleaflet/debug/document/loleaflet.html  |8 +---
 loleaflet/main.js|7 ---
 loleaflet/src/control/Control.Menubar.js |7 +++
 loleaflet/src/map/handler/Map.WOPI.js|7 ---
 4 files changed, 8 insertions(+), 21 deletions(-)

New commits:
commit f5620db55ffbf5b4c7c2b2181976cb51a62fa141
Author: Henry Castro 
Date:   Tue Nov 21 18:09:23 2017 -0400

loleaflet: replace title parameter with wopi BaseFileName

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

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 2134f31b..ff9b80f4 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -100,14 +100,8 @@
 wopiSrc += '?access_header=' + access_header;
 }
 
-
-var filePath = getParameterByName('file_path');
-var title = getParameterByName('title');
-if (title === '') {
-title = 
decodeURIComponent(filePath.substring(filePath.lastIndexOf('/')+1));
-}
-
 var host = '%HOST%';
+var filePath = getParameterByName('file_path');
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 var closebutton = getParameterByName('closebutton');
diff --git a/loleaflet/main.js b/loleaflet/main.js
index a08e5054..ca143017 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -65,11 +65,6 @@ else if (wopiSrc !== '' && access_header !== '') {
 }
 
 var filePath = getParameterByName('file_path');
-var title = getParameterByName('title');
-if (title === '') {
-title = 
decodeURIComponent(filePath.substring(filePath.lastIndexOf('/')+1));
-}
-
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 // Shows close button if non-zero value provided
@@ -91,7 +86,6 @@ if (host === '') {
 // TODO: Get rid of these globals
 global.closebutton = closebutton;
 global.revHistoryEnabled = revHistoryEnabled;
-global.title = title;
 global.errorMessages = errorMessages;
 var docURL, docParams;
 var isWopi = false;
@@ -104,7 +98,6 @@ if (wopiSrc != '') {
docParams = {};
 }
 
-document.title = title;
 var map = L.map('map', {
server: host,
doc: docURL,
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 19464469..fda37f4b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -2,7 +2,7 @@
 * Control.Menubar
 */
 
-/* global $ _ map title vex revHistoryEnabled closebutton L */
+/* global $ _ map vex revHistoryEnabled closebutton L */
 L.Control.Menubar = L.Control.extend({
// TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
options: {
@@ -672,9 +672,8 @@ L.Control.Menubar = L.Control.extend({
map.print();
} else if (id.startsWith('downloadas-')) {
var format = id.substring('downloadas-'.length);
-   // remove the extension if any
-   var fileName = title.substr(0, title.lastIndexOf('.')) 
|| title;
-   // check if it is empty
+   var fileName = map['wopi'].BaseFileName;
+   fileName = fileName.substr(0, 
fileName.lastIndexOf('.'));
fileName = fileName === '' ? 'document' : fileName;
map.downloadAs(fileName + '.' + format, format);
} else if (id === 'findandreplace') {
diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index 2a00b05d..54278376 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -2,7 +2,7 @@
  * L.WOPI contains WOPI related logic
  */
 
-/* global title w2ui toolbarUpMobileItems resizeToolbar */
+/* global w2ui toolbarUpMobileItems resizeToolbar */
 L.Map.WOPI = L.Handler.extend({
// If the CheckFileInfo call fails on server side, we won't have any 
PostMessageOrigin.
// So use '*' because we still needs to send 'close' message to the 
parent frame which
@@ -198,8 +198,9 @@ L.Map.WOPI = L.Handler.extend({
else if (msg.MessageId === 'Action_Export') {
if (msg.Values) {
var format = msg.Values.Format;
-   var filename = title.substr(0, 
title.lastIndexOf('.')) || title;
-   filename = filename === '' ? 'document' : 
filename;
+   var fileName = this._map['wopi'].BaseFileName;
+   fileName = fileName.substr(0, 
fileName.lastIndexOf('.'));
+   fileName = fileName === '' ? 'document' : 
fileName;

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

2017-11-22 Thread Noel Grandin

 sfx2/source/doc/objcont.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 5ee141ee2fb77c3cc452ac656235d7e83e15072c
Author: Noel Grandin 
Date:   Wed Nov 22 15:46:20 2017 +0200

tdf#113935 Switching from read-only to edit mode slow

Regression introduced by

commit 389da66dfc96d06c407bff156c4ea21e940c5e06
remove unused uno::Reference vars

I'm guessing this variable keeps some kind of cache alive which prevents
us from re-parsing the PDF file when we switch to edit mode - which is
clearly what we are doing when I remove the line.

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

diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 4cacda2ff0a5..4a82866a5019 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -383,6 +383,11 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
 // update only for documents loaded from the local file system
 return;
 
+// tdf#113935 - do not remove this line - somehow, it makes the process
+// of switching from viewing a read-only document to opening it in writable
+// mode much faster.
+uno::Reference< embed::XStorage > xDocStor = pFile->GetStorage();
+
 // only for own storage formats
 if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() )
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Tor Lillqvist

 solenv/bin/ooinstall |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 852ffcae172c8ce1536f847410d94b6fcb486b96
Author: Tor Lillqvist 
Date:   Wed Nov 22 21:05:48 2017 +0200

Use the same solenv/bin/ooinstall as in the cp-5.1 branch

Specifically, pass the correct product name and not a hardcoded
"LibreOffice" for the make_installer.pl script's -p option.

As such, instsetoo_native/util/openoffice.lst.in hardcodes the product
name as "CollaboraOffice" so we could as well do that also in
ooinstall.

Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 8d0f5be27512..edd3d83f2c4b 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -89,11 +89,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d 
"$ENV{DESTDIR}") {
 
 print "Running LibreOffice installer\n";
 
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 "perl " .
 (scalar keys(%DB::sub) ? "-d " : "") .
 "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
$PRODUCTNAME_no_spaces " .
 "-u $tmp_dir " .
 "-buildid $BUILD $destdir $strip $msi " .
 "-simple $path") && die "Failed to install: $!";
___
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' - officecfg/registry sc/inc sc/Library_scui.mk sc/source

2017-11-22 Thread Bernhard Widl

Rebased ref, commits from common ancestor:
commit 306db5d9840507501cc82cfa481e7abe33f50dd1
Author: Bernhard Widl 
Date:   Wed Apr 5 14:41:22 2017 +0200

tdf#55236 save settings of CSV export dialog

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index bd17f4aa8153..0f732969278d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1023,6 +1023,60 @@
   -1
 
   
+  
+
+  Contains setting for Text CSV Export
+
+
+  
+Char Set
+CharSet
+  
+  -1
+
+
+  
+Field delimiter
+FieldSeparator
+  
+  
+
+
+  
+Text delimiter
+TextSeparator
+  
+  
+
+
+  
+If true, formatted cell content is exported. If false, raw 
cell content is exported.
+SaveTrueCellContent
+  
+  true
+
+
+  
+If true, text formulas are exported instead of the 
calculated values.
+SaveCellFormulas
+  
+  false
+
+
+  
+If true, text cells are always enclosed in quotes with no 
exception.
+QuoteAllTextCells
+  
+  false
+
+
+  
+All fields are exported having the same width
+FixedWidth
+  
+  false
+
+  
   
 
   Contains setting for Text CSV Import
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index e694885aa13b..4b911d6846b1 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_Library_set_include,scui,\
$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,scui,\
+   officecfg/registry \
+)) \
+
 $(eval $(call 
gb_Library_set_precompiled_header,scui,$(SRCDIR)/sc/inc/pch/precompiled_scui))
 
 $(eval $(call gb_Library_use_sdk_api,scui))
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4f946f771cd7..9fd86f5fb265 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -313,6 +313,7 @@ class AbstractScImportOptionsDlg : public VclAbstractDialog
 {
 public:
 virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
+virtual void SaveImportOptions() const = 0;
 };
 
 class AbstractScTextImportOptionsDlg : public VclAbstractDialog
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 6bf050d4c0cb..d257401560cc 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -587,6 +587,11 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( 
ScImportOptions& rOption
 pDlg->GetImportOptions(rOptions);
 }
 
+void AbstractScImportOptionsDlg_Impl::SaveImportOptions() const
+{
+pDlg->SaveImportOptions();
+}
+
 LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
 {
 return pDlg->getLanguageType();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index ea9ea53f925f..62fa40ad5f23 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -365,6 +365,7 @@ class AbstractScImportOptionsDlg_Impl : public 
AbstractScImportOptionsDlg
 {
 DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
 virtual void GetImportOptions( ScImportOptions& rOptions ) const override;
+virtual void SaveImportOptions() const override;
 };
 
 class AbstractScTextImportOptionsDlg_Impl : public 
AbstractScTextImportOptionsDlg
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx 
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 114ec3c88e5f..f807606f3824 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -24,6 +24,7 @@
 #include "scresid.hxx"
 #include "sc.hrc"
 #include 
+#include 
 #include 
 #include 
 
@@ -202,18 +203,34 @@ ScImportOptionsDlg::ScImportOptionsDlg(
 
 if( bAscii )
 {
+sal_Int32 nCharSet = 
officecfg::Office::Calc::Dialogs::CSVExport::CharSet::get();
+OUString strFieldSeparator = 
officecfg::Office::Calc::Dialogs::CSVExport::FieldSeparator::get();
+OUString strTextSeparator = 
officecfg::Office::Calc::Dialogs::CSVExport::TextSeparator::get();
+bool bSaveTrueCellContent = 
officecfg::Office::Calc::Dialogs::CSVExport::SaveTrueCellContent::get();
+bool bSaveCellFormulas = 
officecfg::Office::Calc::Dialogs::CSVExport::SaveCellFormulas::get();
+bool bQuoteAllTextCells = 
officecfg::Office::Calc::Dialogs::CSVExport::QuoteA

[Libreoffice-commits] core.git: avmedia/source basegfx/source chart2/source comphelper/source compilerplugins/clang cui/source dbaccess/source drawinglayer/source extensions/source filter/source frame

2017-11-22 Thread Stephan Bergmann

 avmedia/source/viewer/mediawindow.cxx |2 -
 basegfx/source/polygon/b2dlinegeometry.cxx|4 +-
 basegfx/source/polygon/b2dpolygoncutandtouch.cxx  |2 -
 chart2/source/tools/StatisticsHelper.cxx  |4 +-
 comphelper/source/misc/string.cxx |2 -
 compilerplugins/clang/test/unnecessaryparen.cxx   |3 -
 compilerplugins/clang/unnecessaryparen.cxx|   13 ---
 cui/source/tabpages/numfmt.cxx|6 +--
 dbaccess/source/ui/app/AppSwapWindow.cxx  |2 -
 dbaccess/source/ui/misc/UITools.cxx   |2 -
 drawinglayer/source/processor3d/defaultprocessor3d.cxx|2 -
 extensions/source/propctrlr/formmetadata.cxx  |8 ++--
 filter/source/graphicfilter/eps/eps.cxx   |2 -
 filter/source/graphicfilter/icgm/cgm.cxx  |2 -
 filter/source/msfilter/escherex.cxx   |8 ++--
 filter/source/msfilter/svdfppt.cxx|2 -
 filter/source/svg/svgwriter.cxx   |2 -
 framework/source/layoutmanager/toolbarlayoutmanager.cxx   |6 +--
 hwpfilter/source/hbox.cxx |8 ++--
 include/osl/file.hxx  |2 -
 include/vcl/button.hxx|4 +-
 include/vcl/toolbox.hxx   |2 -
 reportdesign/source/ui/inspection/metadata.cxx|6 +--
 sal/osl/unx/socket.cxx|2 -
 sax/qa/cppunit/test_converter.cxx |6 +--
 sax/source/tools/converter.cxx|   10 ++---
 sc/source/core/data/table2.cxx|2 -
 sc/source/core/tool/interpr5.cxx  |6 +--
 sc/source/filter/excel/excrecds.cxx   |2 -
 sc/source/ui/cctrl/checklistmenu.cxx  |2 -
 sc/source/ui/miscdlgs/delcodlg.cxx|2 -
 sc/source/ui/miscdlgs/inscodlg.cxx|2 -
 sd/source/core/stlpool.cxx|2 -
 sd/source/filter/eppt/pptx-stylesheet.cxx |2 -
 sd/source/filter/ppt/pptin.cxx|2 -
 sd/source/ui/animations/motionpathtag.cxx |2 -
 sd/source/ui/annotations/annotationtag.cxx|2 -
 sd/source/ui/view/ViewShellBase.cxx   |4 +-
 sfx2/source/appl/newhelp.cxx  |2 -
 starmath/source/parse.cxx |2 -
 svtools/source/control/ctrlbox.cxx|4 +-
 svx/source/dialog/dlgctrl.cxx |2 -
 svx/source/fmcomp/gridctrl.cxx|2 -
 svx/source/sdr/overlay/overlaymanager.cxx |2 -
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx |2 -
 svx/source/sidebar/area/AreaPropertyPanel.cxx |8 ++--
 svx/source/svdraw/svdattr.cxx |2 -
 svx/source/svdraw/svdedtv.cxx |2 -
 svx/source/svdraw/svdmark.cxx |8 ++--
 svx/source/svdraw/svdmrkv.cxx |2 -
 svx/source/svdraw/svdpage.cxx |2 -
 svx/source/svdraw/svdpoev.cxx |2 -
 svx/source/svdraw/svdviter.cxx|6 +--
 svx/source/tbxctrls/fillctrl.cxx  |6 +--
 svx/source/unodraw/unoshape.cxx   |2 -
 sw/source/core/bastyp/swregion.cxx|2 -
 sw/source/core/crsr/crstrvl.cxx   |4 +-
 sw/source/core/crsr/findattr.cxx  |2 -
 sw/source/core/crsr/findtxt.cxx   |4 +-
 sw/source/core/crsr/trvlfnfl.cxx  |2 -
 sw/source/core/doc/DocumentContentOperationsManager.cxx   |4 +-
 sw/source/core/doc/DocumentFieldsManager.cxx  |2 -
 sw/source/core/doc/DocumentLinksAdministrationManager.cxx |4 +-
 sw/source/core/doc/DocumentRedlineManager.cxx |2 -
 sw/source/core/doc/doccomp.cxx|4 +-
 sw/source/core/doc/doccorr.cxx|4 +-
 sw/source/core/doc/docdesc.cxx|8 ++--
 sw/source/core/doc/docglos.cxx|2 -
 sw/source/core/docnode/ndsect.cxx |4 +-
 sw/source/core/docnode/ndtbl.cxx  |4 +-
 sw/source/core/docnode/nodes.cxx  |2 -
 sw/source/core/docnode/section.cxx|4 +-
 sw/source/core/edit/acorrect.cxx

[Libreoffice-commits] core.git: bin/ios-mapfile-statistics

2017-11-22 Thread jan Iversen

 bin/ios-mapfile-statistics |   78 -
 1 file changed, 78 deletions(-)

New commits:
commit b140f92531396c1087b997852d7ece18429b79d1
Author: jan Iversen 
Date:   Wed Nov 22 18:58:31 2017 +0100

iOS, remove unused script.

This script is no longer used for the iOS development,
and in order to prevent anybody wasting time porting it,
it is nuked.

Change-Id: I46d520fa9b8aeabee78cfe1f02a25e4d1ead3d7f

diff --git a/bin/ios-mapfile-statistics b/bin/ios-mapfile-statistics
deleted file mode 100755
index 07f3f0aa68b4..
--- a/bin/ios-mapfile-statistics
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-use Getopt::Std;
-$Getopt::Std::STANDARD_HELP_VERSION++;
-
-my %args;
-
-getopts('f:s', \%args);
-
-sub VERSION_MESSAGE {
-  # Nothing
-}
-
-sub HELP_MESSAGE {
-  print <) {
-  if ($state == 0 && m!^# Object files:!) {
-$state = 1;
-  } elsif ($state == 1 && m!^\[ *([0-9]+)\] .*/([-_a-z0-9]+\.a)\(.*!i) {
-$libofnumber{$1} = $2;
-  } elsif ($state == 1 && m!^# Sections:!) {
-$state = 2;
-  } elsif ($state == 2 && m!^# Address\s+Size\s+File\s+Name!) {
-$state = 3;
-  } elsif ($state == 3 && m!^0x[0-9A-F]+\s+(0x[0-9A-F]+)\s+\[ *([0-9]+)\] 
(.*)!) {
-my ($size,$libnum,$symbol) = ($1, $2, $3);
-if (defined($libofnumber{$libnum})) {
-  $sizeoflib{$libofnumber{$libnum}} += hex($size);
-  if (!defined($args{'f'}) || $libofnumber{$libnum} =~ /$args{'f'}/) {
- $sizeofsym{$symbol} = hex($size);
-   }
-}
-  }
-}
-
-if ($args{'s'}) {
-  # Print symbols in reverse size order
-  foreach (sort { $sizeofsym{$b} <=> $sizeofsym{$a} } keys(%sizeofsym)) {
-print $_, ": ", $sizeofsym{$_}, "\n";
-  }
-} else {
-  # Print libraries in reverse size order
-  foreach (sort { $sizeoflib{$b} <=> $sizeoflib{$a} } keys(%sizeoflib)) {
-print $_, ": ", $sizeoflib{$_}, "\n";
-  }
-}
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_xmlsec.mk

2017-11-22 Thread Thorsten Behrens

 xmlsecurity/Library_xsec_xmlsec.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c11c7c4765c2a45d7d58cd1dc2799bb9c64fc7e3
Author: Thorsten Behrens 
Date:   Wed Nov 22 18:17:36 2017 +0100

fix build

Change-Id: Ibb83ef0bb6a304f2e78a669502a1bdd1f6dcc4bd

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 5bb1828f61ea..3e9f1633070a 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
libxml2 \
xmlsec \
 ))
-ifneq ($(filter-out ANDROID IOS,$(OS)),)
+ifneq ($(filter GPGMEPP,$(BUILD_TYPE)),)
 $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
gpgmepp \
 ))
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifneq ($(filter-out ANDROID IOS,$(OS)),)
+ifneq ($(filter GPGMEPP,$(BUILD_TYPE)),)
 $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/gpg/CertificateImpl \
xmlsecurity/source/gpg/CipherContext \
___
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

2017-11-22 Thread scan-admin


Hi,

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

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
7 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 1 of 1 defect(s)


** CID 1401344:  Error handling issues  (UNCAUGHT_EXCEPT)
/usr/include/c++/7/bits/shared_ptr_base.h: 375 in 
std::_Sp_counted_ptr::_M_dispose()()



*** CID 1401344:  Error handling issues  (UNCAUGHT_EXCEPT)
/usr/include/c++/7/bits/shared_ptr_base.h: 375 in 
std::_Sp_counted_ptr::_M_dispose()()
369 public:
370   explicit
371   _Sp_counted_ptr(_Ptr __p) noexcept
372   : _M_ptr(__p) { }
373 
374   virtual void
>>> CID 1401344:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::DeploymentException" 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().
375   _M_dispose() noexcept
376   { delete _M_ptr; }
377 
378   virtual void
379   _M_destroy() noexcept
380   { delete this; }



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyqm-2BPyB9atMFKJ1KqKFTtUxUvFX9eoB51-2FtHTFv-2B6uEPzkBHdOQgVGN2qkgxuwqJUN1BTYHkvXqZP3T0KaIk61YsAXkXolnCBPMhVFYr9VOEYAlpiZTk0-2FjktQKjQ6S3z098afMvG4BMqVTs5b7fz9rWiPi1A5l2JBrvhxtFIZds-3D

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5lwWgMDuK-2FivqaohkU3M9kT-2Fww10Qt2GoaCJAOQCa0Wv4ijH4oV8jCt0XXa7QeAwh_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyqm-2BPyB9atMFKJ1KqKFTtU4p8U3aPJLQtzqLS1ZugLNwqsz5mDknqY2SJFxp44bLgEH4MNABkWfaNRmveG7TdzX7zOCO8X7w3gLsghWRB-2B2HwAwbguTlgHpt10-2FZRYTSKojXd53XwBeTGB-2BTTMKzLfLbqdHbaJosV-2Bwq9rys25eU-3D

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

[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_xmlsec.mk

2017-11-22 Thread Thorsten Behrens

 xmlsecurity/Library_xsec_xmlsec.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c8833fd9dfc743e114f14fcfee12e233029c93d4
Author: Thorsten Behrens 
Date:   Wed Nov 22 09:57:57 2017 +0100

gpg4libre: enable gpgme support for Windows and OSX

Change-Id: Ifa266e1c18a8a09cd5c815adc70d0236e00f72b5
Reviewed-on: https://gerrit.libreoffice.org/45092
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 30c792177fc8..5bb1828f61ea 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
libxml2 \
xmlsec \
 ))
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
+ifneq ($(filter-out ANDROID IOS,$(OS)),)
 $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
gpgmepp \
 ))
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
+ifneq ($(filter-out ANDROID IOS,$(OS)),)
 $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/gpg/CertificateImpl \
xmlsecurity/source/gpg/CipherContext \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

2017-11-22 Thread Thorsten Behrens

 xmlsecurity/Library_xsec_xmlsec.mk|1 +
 xmlsecurity/inc/certificate.hxx   |2 +-
 xmlsecurity/source/gpg/CertificateImpl.hxx|4 ++--
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 17c7d876431ac2334c2a1d5225dcda56dc42c62c
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:51:42 2017 +0100

gpg4libre: fix warnings

This code was not previously built on Windows

Change-Id: I9394907f143d862f40c95672f4e3398b65b7bd2c
Reviewed-on: https://gerrit.libreoffice.org/45091
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 51f0f2a0834f..30c792177fc8 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_NO_XSLT \
-DXSECXMLSEC_DLLIMPLEMENTATION \
+   -DXSECGPG_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call 
gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec))
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 0698e91f422f..494dc6e30d40 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -25,7 +25,7 @@ public:
 /// Returns the SHA-256 thumbprint.
 ///
 /// @throws css::uno::RuntimeException
-virtual css::uno::Sequence getSHA256Thumbprint() = 0;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() = 0;
 
 protected:
 ~Certificate() noexcept = default;
diff --git a/xmlsecurity/source/gpg/CertificateImpl.hxx 
b/xmlsecurity/source/gpg/CertificateImpl.hxx
index 9db3ab85de14..63cddc6dc7b9 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.hxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.hxx
@@ -78,8 +78,8 @@ public:
 static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
 /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-virtual css::uno::Sequence getSHA256Thumbprint() override;
-virtual css::security::CertificateKind getCertificateKind() override;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() 
override;
+virtual css::security::CertificateKind SAL_CALL getCertificateKind() 
override;
 
 // Helper methods
 void setCertificate(GpgME::Context* ctx, const GpgME::Key& key);
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index b36b1c3c5d8f..94d53529bf21 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -80,7 +80,7 @@ class X509Certificate_MSCryptImpl : public 
::cppu::WeakImplHelper<
 virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) override;
 
 /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-virtual css::uno::Sequence getSHA256Thumbprint() override;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() 
override;
 
 static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
 static X509Certificate_MSCryptImpl* getImplementation( const 
css::uno::Reference< css::uno::XInterface >& rObj ) ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac external/gpgme external/gpgmepp external/Module_external.mk RepositoryExternal.mk

2017-11-22 Thread Thorsten Behrens

 RepositoryExternal.mk|   67 +-
 configure.ac |   24 +--
 external/Module_external.mk  |2 
 external/gpgme/ExternalPackage_gpgme.mk  |   30 
 external/gpgme/UnpackedTarball_gpgme.mk  |   22 ---
 external/gpgmepp/ExternalPackage_gpgmepp.mk  |   30 
 external/gpgmepp/ExternalProject_gpgmepp.mk  |   29 ++--
 external/gpgmepp/Library_gpgmepp.mk  |   79 
 external/gpgmepp/Module_gpgmepp.mk   |   23 ++-
 external/gpgmepp/UnpackedTarball_gpgmepp.mk  |   25 +++
 external/gpgmepp/w32-build-fixes.patch.1 |   11 +
 external/gpgmepp/w32-disable-docs.patch.1|   15 ++
 external/gpgmepp/w32-fix-libtool.patch.1 |   38 +
 external/gpgmepp/w32-fix-win32-macro.patch.1 |  175 +++
 14 files changed, 474 insertions(+), 96 deletions(-)

New commits:
commit 50a55d862034b7a06510c014332236f44e306831
Author: Thorsten Behrens 
Date:   Wed Nov 15 21:31:07 2017 +0100

gpg4libre: cleanup gpgme & add gbuild lib for gpgmepp

This moves the external to gpgmepp, since that's what we _actually_
link against; plus tons of enablement for Windows build, mostly
related to linker probs integration.

There's still no good way to build a DLL with autotools, so we fall
back to gbuild manual make, see also tdf#91480

Change-Id: Ifd8217ef58536612d2389d48e343db133a13fb9c
Reviewed-on: https://gerrit.libreoffice.org/44970
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index db70ce875e71..995a490214ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3472,7 +3472,7 @@ endef
 else # NON-SYSTEM_GPGME
 
 define gb_ExternalProject__use_gpgmepp
-$(call gb_ExternalProject_use_external_project,$(1),gpgme)
+$(call gb_ExternalProject_use_external_project,$(1),gpgmepp)
 
 endef
 define gb_ExternalProject__use_libassuan
@@ -3484,24 +3484,77 @@ $(call 
gb_ExternalProject_use_external_project,$(1),libgpg-error)
 
 endef
 
+ifneq ($(filter WNT,$(OS)),)
+
+define gb_LinkTarget__use_libgpg-error
+$(call gb_LinkTarget_use_package,$(1),libgpg-error)
+
+$(call gb_LinkTarget_set_include,$(1),\
+   $(GPG_ERROR_CFLAGS) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -LIBPATH:$(call gb_UnpackedTarball_get_dir,libgpg-error)/src/.libs 
libgpg-error.lib \
+)
+
+endef
+
+define gb_LinkTarget__use_libassuan
+$(call gb_LinkTarget_use_package,$(1),libassuan)
+
+$(call gb_LinkTarget_set_include,$(1),\
+   $(LIBASSUAN_CFLAGS) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -LIBPATH:$(call gb_UnpackedTarball_get_dir,libassuan)/src/.libs 
libassuan.lib \
+)
+
+endef
+
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
$$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
+$(call gb_LinkTarget_use_libraries,$(1),\
+   gpgmepp \
 )
-$(call gb_LinkTarget_use_package,$(1),gpgme)
 
 endef
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   libassuan \
+   libgpg-error \
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   gpgmepp \
+))
+
+endif
+
 ifneq ($(filter MACOSX LINUX,$(OS)),)
 
+define gb_LinkTarget__use_gpgmepp
+$(call gb_LinkTarget_use_package,$(1),gpgmepp)
+
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
+   $$(GPG_ERROR_CFLAGS) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ 
-lgpgmepp \
+)
+
+endef
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   gpgme \
+   gpgmepp \
libassuan \
libgpg-error \
 ))
diff --git a/configure.ac b/configure.ac
index 25d3f4153f5b..08a9c9cccf39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10128,7 +10128,11 @@ fi
 AC_SUBST(ENABLE_PDFIUM)
 
 SYSTEM_GPGMEPP=
-if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
+# need matching cygwin arch for building gpgme sadly, for the while
+if test "$_os" = "Linux" -o "$_os" = "Darwin" \
+   -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = 
"x86" \) \
+   -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" -a "$WINDOWS_SDK_ARCH" = 
"x64" \) ; then
+
 dnl ===
 dnl Check for system gpgme
 dnl ===

[Libreoffice-commits] core.git: configure.ac external/gpgme

2017-11-22 Thread David Ostrovsky

 configure.ac|2 
 external/gpgme/ExternalProject_gpgme.mk |   25 ++
 external/gpgme/UnpackedTarball_gpgme.mk |1 
 external/gpgme/w32-build-fixes.patch.1  |  122 
 4 files changed, 149 insertions(+), 1 deletion(-)

New commits:
commit bafbaa3fed95f28f368b0bd4256dbe2a714e3bd8
Author: David Ostrovsky 
Date:   Wed Sep 27 08:57:36 2017 +0200

gpg4libre: build gpgme natively on windows

Change-Id: I0b77ba0c1b8f84affa483181e26a26beaf39e878
Reviewed-on: https://gerrit.libreoffice.org/42838
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index dacb5ee98ffe..25d3f4153f5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10162,7 +10162,7 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
 else
 # TODO(davido): Windows build must be protected with a configure option
 # unless CI doesn't support libtool with windres with gcc preprocessor
-BUILD_TYPE="$BUILD_TYPE LIBASSUAN LIBGPGERROR"
+BUILD_TYPE="$BUILD_TYPE LIBASSUAN LIBGPGERROR GPGMEPP"
 GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
 GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs 
-lgpg-error"
 LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
diff --git a/external/gpgme/ExternalProject_gpgme.mk 
b/external/gpgme/ExternalProject_gpgme.mk
index 5c2407c1c771..dcaaf6bdfa2a 100644
--- a/external/gpgme/ExternalProject_gpgme.mk
+++ b/external/gpgme/ExternalProject_gpgme.mk
@@ -20,6 +20,30 @@ $(eval $(call gb_ExternalProject_use_externals,gpgme,\
libassuan \
 ))
 
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_get_state_target,gpgme,build):
+   $(call gb_ExternalProject_run,build,\
+   autoreconf \
+   && ./configure \
+  --enable-languages="cl cpp" \
+  --disable-gpgconf-test \
+  --disable-gpg-test \
+  --disable-gpgsm-test \
+  --disable-g13-test \
+  GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
+  GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
+  LIBASSUAN_CFLAGS="$(LIBASSUAN_CFLAGS)" \
+  LIBASSUAN_LIBS="$(LIBASSUAN_LIBS)" \
+   CFLAGS='$(CFLAGS) \
+   $(if $(ENABLE_OPTIMIZED), \
+   
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+   $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
+   $(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
+  --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+ && $(MAKE) \
+   )
+
+else
 $(call gb_ExternalProject_get_state_target,gpgme,build):
$(call gb_ExternalProject_run,build,\
autoreconf \
@@ -41,4 +65,5 @@ $(call gb_ExternalProject_get_state_target,gpgme,build):
  && $(MAKE) \
)
 
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/UnpackedTarball_gpgme.mk 
b/external/gpgme/UnpackedTarball_gpgme.mk
index 15259971f798..4e95fe0ab160 100644
--- a/external/gpgme/UnpackedTarball_gpgme.mk
+++ b/external/gpgme/UnpackedTarball_gpgme.mk
@@ -17,5 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgme, \
 external/gpgme/find-libgpg-error-libassuan.patch \
 external/gpgme/fix-autoconf-macros.patch \
 external/gpgme/add-minimal-keyexport.patch \
+$(if $(filter MSC,$(COM)),external/gpgme/w32-build-fixes.patch.1) \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/w32-build-fixes.patch.1 
b/external/gpgme/w32-build-fixes.patch.1
new file mode 100755
index ..cd45b45a31d9
--- /dev/null
+++ b/external/gpgme/w32-build-fixes.patch.1
@@ -0,0 +1,122 @@
+diff -ru gpgme.orig/m4/ax_cxx_compile_stdcxx.m4 
gpgme/m4/ax_cxx_compile_stdcxx.m4
+--- gpgme.orig/m4/ax_cxx_compile_stdcxx.m4 2016-05-27 22:04:36.0 
+0200
 gpgme/m4/ax_cxx_compile_stdcxx.m4  2017-09-29 17:34:49.795243600 +0200
+@@ -156,7 +156,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
+--- gpgme.orig/src/dirinfo.c   2017-03-21 11:09:41.0 +0100
 gpgme/src/dirinfo.c2017-09-30 08:36:13.239279300 +0200
+@@ -33,6 +33,10 @@
+ 
+ DEFINE_STATIC_LOCK (dirinfo_lock);
+ 
++#ifndef F_OK
++#define F_OK 0
++#endif
++
+ /* Constants used internally to select the data.  */
+ enum
+   {
+diff -ru gpgme.orig/src/mbox-util.c gpgme/src/mbox-util.c
+--- gpgme.orig/src/mbox-util.c 2016-11-16 13:22:41.0 +0100
 gpgme/src/mbox-util.c  2017-09-30 08:18:29.270567500 +0200
+@@ -28,7 +28,9 @@
+ #include 
+ #include 
+ #include 
++#if HAVE_UNISTD_H
+ #include 
++#endif
+ #include 
+

[Libreoffice-commits] core.git: configure.ac external/libassuan

2017-11-22 Thread David Ostrovsky

 configure.ac|8 ++
 external/libassuan/ExternalProject_libassuan.mk |   16 
 external/libassuan/UnpackedTarball_libassuan.mk |1 
 external/libassuan/w32-build-fixes.patch.1  |   77 
 4 files changed, 101 insertions(+), 1 deletion(-)

New commits:
commit 5f981d30e2f186ab6b7fc925832b6eb1ae658308
Author: David Ostrovsky 
Date:   Sun Sep 24 10:28:05 2017 +0200

gpg4libre: build libassuan natively on windows

Change-Id: Id374ebc5ed70a1b4313dc74461524ac2b864b114
Reviewed-on: https://gerrit.libreoffice.org/42745
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index fe5731470d2e..dacb5ee98ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10160,7 +10160,13 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
 LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs 
-lassuan"
 fi
 else
-BUILD_TYPE="$BUILD_TYPE LIBGPGERROR"
+# TODO(davido): Windows build must be protected with a configure option
+# unless CI doesn't support libtool with windres with gcc preprocessor
+BUILD_TYPE="$BUILD_TYPE LIBASSUAN LIBGPGERROR"
+GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
+GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs 
-lgpg-error"
+LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
+LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan"
 fi
 AC_SUBST(SYSTEM_GPGMEPP)
 AC_SUBST(GPG_ERROR_CFLAGS)
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index bcfc08a82cca..e796f16bf017 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -19,6 +19,21 @@ $(eval $(call gb_ExternalProject_use_externals,libassuan,\
libgpg-error \
 ))
 
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_get_state_target,libassuan,build):
+   $(call gb_ExternalProject_run,build,\
+   autoreconf \
+   && ./configure \
+   --enable-static \
+   --disable-shared \
+   CXXFLAGS="$(CXXFLAGS)" \
+   GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
+   GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
+   --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+ && $(MAKE) \
+   )
+
+else
 $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_ExternalProject_run,build,\
autoreconf \
@@ -32,4 +47,5 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
  && $(MAKE) \
)
 
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/libassuan/UnpackedTarball_libassuan.mk 
b/external/libassuan/UnpackedTarball_libassuan.mk
index 924d610bf9c9..f23608eb6a6c 100644
--- a/external/libassuan/UnpackedTarball_libassuan.mk
+++ b/external/libassuan/UnpackedTarball_libassuan.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
 external/libassuan/find-libgpg-error.patch \
 external/libassuan/fix-autoconf-macros.patch \
+$(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libassuan/w32-build-fixes.patch.1 
b/external/libassuan/w32-build-fixes.patch.1
new file mode 100755
index ..c9250c4e5573
--- /dev/null
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -0,0 +1,77 @@
+--- libassuan.orig/src/Makefile.in 2017-09-15 08:16:41.601057500 +0200
 libassuan/src/Makefile.in  2017-09-24 13:01:24.950711300 +0200
+@@ -424,7 +424,7 @@
+ nodist_include_HEADERS = assuan.h
+ @HAVE_LD_VERSION_SCRIPT_FALSE@libassuan_version_script_cmd = 
+ @HAVE_LD_VERSION_SCRIPT_TRUE@libassuan_version_script_cmd = 
-Wl,--version-script=$(srcdir)/libassuan.vers
+-CLEANFILES = mkheader assuan.h
++CLEANFILES = mkheader$(EXEEXT) assuan.h
+ BUILT_SOURCES = assuan.h
+ parts_of_assuan_h = \
+   posix-includes.inc.h   w32-includes.inc.h \
+@@ -1183,10 +1183,10 @@
+ @HAVE_W32CE_SYSTEM_TRUE@  mv -f $(DESTDIR)$(bindir)/libgpgcedev-0.dll \
+ @HAVE_W32CE_SYSTEM_TRUE@  $(DESTDIR)$(bindir)/gpgcedev.dll
+ 
+-mkheader: mkheader.c Makefile
++mkheader$(EXEEXT): mkheader.c Makefile
+   $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
+ 
+-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
++assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
+   ./mkheader $(host_os) $(srcdir)/assuan.h.in \
+@VERSION@ @VERSION_NUMBER@ >$@
+ 
+--- libassuan.orig/src/mkheader.c  2013-03-15 20:26:09.0 +0100
 libassuan/src/mkheader.c   2017-09-24 14:17:33.584583300 +0200
+@@ -99,7 +99,7 @@
+"# include \n"
+"#endif\n", stdout);
+   else
+-

[Libreoffice-commits] core.git: configure.ac external/libgpg-error

2017-11-22 Thread Thorsten Behrens

 configure.ac  |2 
 external/libgpg-error/ExternalProject_libgpg-error.mk |   21 +
 external/libgpg-error/UnpackedTarball_libgpg-error.mk |3 
 external/libgpg-error/w32-build-fixes-2.patch.1   |   31 ++
 external/libgpg-error/w32-build-fixes-3.patch.1   |   57 
 external/libgpg-error/w32-build-fixes.patch   |  206 ++
 6 files changed, 320 insertions(+)

New commits:
commit 4be15fdd7974564faa97454fda415b3882c4142f
Author: Thorsten Behrens 
Date:   Wed Feb 22 01:47:15 2017 +0100

gpg4libre: build libgpg-error natively on windows

Change-Id: I479b79a7626469169af582dc79c4e99dc4620546
Reviewed-on: https://gerrit.libreoffice.org/34530
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index e634474cffb8..fe5731470d2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10159,6 +10159,8 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
 LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
 LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs 
-lassuan"
 fi
+else
+BUILD_TYPE="$BUILD_TYPE LIBGPGERROR"
 fi
 AC_SUBST(SYSTEM_GPGMEPP)
 AC_SUBST(GPG_ERROR_CFLAGS)
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 34a87c546f4e..ef22e3926b69 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -15,17 +15,38 @@ $(eval $(call 
gb_ExternalProject_register_targets,libgpg-error,\
 
 $(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build))
 
+ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,libgpg-error,build):
$(call gb_ExternalProject_run,build,\
MAKE=$(MAKE) ./configure \
+   --enable-static \
+   --disable-shared \
--disable-rpath \
--disable-languages \
--disable-doc \
+   --disable-tests \
$(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \
+   --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+ && $(MAKE) \
+   )
+
+else
+$(call gb_ExternalProject_get_state_target,libgpg-error,build):
+   $(call gb_ExternalProject_run,build,\
+   MAKE=$(MAKE) ./configure \
+   --disable-rpath \
+   --disable-languages \
+   --disable-doc \
+   $(if $(filter LINUX,$(OS)), \
+   'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
+   -Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \
+   CPPFLAGS=" $(SOLARINC)" \
+   $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
  && $(MAKE) \
)
 
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk 
b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 8ac6cf77a560..2d662f4161d2 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -15,6 +15,9 @@ $(eval $(call 
gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
 external/libgpg-error/disable-rpath-option.patch \
+   $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
+   $(if $(filter 
MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
+   $(if $(filter 
MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/w32-build-fixes-2.patch.1 
b/external/libgpg-error/w32-build-fixes-2.patch.1
new file mode 100755
index ..3d9c4324a89c
--- /dev/null
+++ b/external/libgpg-error/w32-build-fixes-2.patch.1
@@ -0,0 +1,31 @@
+diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
+--- libgpg-error.orig/src/Makefile.in  2017-09-12 08:18:29.376536700 +0200
 libgpg-error/src/Makefile.in   2017-09-12 08:57:11.648083800 +0200
+@@ -512,8 +512,7 @@
+ @HAVE_W32_SYSTEM_TRUE@arch_sources = w32-gettext.c w32-lock.c w32-lock-obj.h 
w32-thread.c \
+ @HAVE_W32_SYSTEM_TRUE@   w32-iconv.c w32-estream.c
+ 
+-@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) 
$(INCLUDES) \
+-@HAVE_W32_SYSTEM_TRUE@-DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) 
$(CPPFLAGS)
++@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) 
$(INCLUDE

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

2017-11-22 Thread Caolán McNamara

 vcl/workben/commonfuzzer.hxx |1 +
 vcl/workben/fftester.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 1dcfa88c307d2f3ebe6d42fe00570c25c1efacf8
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 16:43:37 2017 +

ofz#4386/ofz#4387 Abrt

Change-Id: I2ed1ade1322102a0d6ac623156b9d3c2084b481c
Reviewed-on: https://gerrit.libreoffice.org/45102
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index e8fc91ec4f83..ec1d22948cfb 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -80,6 +80,7 @@ void CommonInitialize(int *argc, char ***argv)
 setenv("SAL_USE_VCLPLUGIN", "svp", 1);
 setenv("JPEGMEM", "768M", 1);
 setenv("SC_MAX_MATRIX_ELEMENTS", "6000", 1);
+setenv("SC_NO_THREADED_CALCULATION", "1", 1);
 setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
 setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
 setenv("SAL_DISABLE_DEFAULTPRINTER", "1", 1);
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 87c99203e8f5..591a28589022 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -73,6 +73,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 setenv("SAL_USE_VCLPLUGIN", "svp", 1);
 setenv("JPEGMEM", "768M", 1);
 setenv("SC_MAX_MATRIX_ELEMENTS", "6000", 1);
+setenv("SC_NO_THREADED_CALCULATION", "1", 1);
 setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
 setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
 setenv("SAL_DISABLE_DEFAULTPRINTER", "1", 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd.xml.in net/Ssl.cpp

2017-11-22 Thread Michael Meeks

 loolwsd.xml.in |1 +
 net/Ssl.cpp|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ec80d623b82e203bef5adb31d3ccf60fe6bca220
Author: Michael Meeks 
Date:   Wed Nov 22 16:47:05 2017 +

Edit the right configuration XML file.

Change-Id: If72006918550ee5c440ad6b2ff26a5bd0d1efef1

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index abec21ca..754aa6c3 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -66,6 +66,7 @@
 /etc/loolwsd/cert.pem
 /etc/loolwsd/key.pem
 /etc/loolwsd/ca-chain.cert.pem
+
 
 1000
 
diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index cd28f53b..dd0094b8 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -26,7 +26,7 @@ extern "C"
 };
 }
 
-#define DEFAULT_CIPHER_SET "ALL:!RC4:!SEED:!ADH:!LOW:!EXP:!MD5:@STRENGTH"
+#define DEFAULT_CIPHER_SET "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"
 
 std::unique_ptr SslContext::Instance(nullptr);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Need code pointer for import of attributes

2017-11-22 Thread Regina Henschel


Hi all,

I've started on 
https://bugs.documentfoundation.org/show_bug.cgi?id=101242. My current 
work is in the attachment.


Problem: Although I remove the config-items IsVisible, IsPrintable, 
IsLocked from the settings.xml of a file, the values from draw:display 
and draw:locked of the  element are not used. It seems to 
me, that somewhere the read values are overwritten with a default.


Where and when are the values from settings.xml transformed to 
properties of the layers of a newly opened draw document?

Any other hint, where to look?

Besides that, it would be nice, if you could tell me, if my approach is 
correct so far.


Kind regards
Regina
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index e1a3727f97f0..ec880e24f211 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -56,6 +56,9 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
 const OUString strName( "Name" );
 const OUString strTitle( "Title" );
 const OUString strDescription( "Description" );
+const OUString strIsLocked( "IsLocked" );
+const OUString strIsVisible( "IsVisible" );
+const OUString strIsPrintable( "IsPrintable" );
 
 OUString sTmp;
 
@@ -70,6 +73,40 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
 if(!sTmp.isEmpty())
 rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, sTmp );
 
+bool bIsLocked;
+xLayer->getPropertyValue( strIsLocked ) >>= bIsLocked;
+if ( bIsLocked )
+rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_PROTECTED, 
"true" );
+else
+rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_PROTECTED, 
"false" );
+
+bool bIsVisible;
+xLayer->getPropertyValue( strIsVisible ) >>= bIsVisible;
+bool bIsPrintable;
+xLayer->getPropertyValue( strIsPrintable ) >>= bIsPrintable;
+if ( bIsVisible )
+{
+if ( bIsPrintable )
+{
+rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY, 
"always" );
+}
+else
+{
+rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY, 
"screen" );
+}
+}
+else
+{
+if ( bIsPrintable )
+{
+rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY, 
"printer" );
+}
+else
+{
+rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY, 
"none" );
+}
+}
+
 SvXMLElementExport aEle( rExport, XML_NAMESPACE_DRAW, XML_LAYER, 
true, true );
 
 // title property (as  element)
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index bc28f6c83226..77b7dabe4b43 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -58,6 +58,8 @@ public:
 private:
 css::uno::Reference< css::container::XNameAccess > mxLayerManager;
 OUString msName;
+OUString mseDisplay; // always, none, printer, screen
+OUString msbProtected; // false, true
 OUStringBuffer sDescriptionBuffer;
 OUStringBuffer sTitleBuffer;
 };
@@ -77,7 +79,14 @@ SdXMLLayerContext::SdXMLLayerContext( SvXMLImport& rImport, 
sal_uInt16 nPrefix,
 if( IsXMLToken( aLocalName, XML_NAME ) )
 {
 msName = sValue;
-break; // no more attributes needed
+}
+if( IsXMLToken( aLocalName, XML_PROTECTED ) )
+{
+msbProtected = sValue;
+}
+if( IsXMLToken( aLocalName, XML_DISPLAY ) )
+{
+mseDisplay = sValue;
 }
 }
 }
@@ -127,6 +136,27 @@ void SdXMLLayerContext::EndElement()
 {
 xLayer->setPropertyValue("Title", Any( 
sTitleBuffer.makeStringAndClear() ) );
 xLayer->setPropertyValue("Description", Any( 
sDescriptionBuffer.makeStringAndClear() ) );
+xLayer->setPropertyValue("IsLocked",(msbProtected == "true") ? 
Any(true) : Any(false) );
+if( mseDisplay == "always" )
+{
+xLayer->setPropertyValue("IsVisible", Any(true) );
+xLayer->setPropertyValue("IsPrintable", Any(true) );
+}
+else if( mseDisplay == "screen" )
+{
+xLayer->setPropertyValue("IsVisible", Any(true) );
+xLayer->setPropertyValue("IsPrintable",Any(false) );
+}
+else if( mseDisplay == "printer" )
+{
+xLayer->setPropertyValue("IsVisible", Any(false) );
+xLayer->setPropertyValue("IsPrintable", Any(true) );
+}
+else // "none"
+{
+xLayer->setPropertyValue("IsVisible", Any(false)

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 2 commits - Makefile.in

2017-11-22 Thread Tor Lillqvist

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

New commits:
commit 2cfe8412300a9ffe68228e0faf2c36eb1037cb6b
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 
(cherry picked from commit 327ad42f4b641f37cf4dd9936346bc386252669a)

diff --git a/Makefile.in b/Makefile.in
index 0643277fed80..c5739ce976b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -341,9 +341,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
commit 59157f89f70e6e99c1f3a9ad37004a2dc6d5a7c4
Author: Stephan Bergmann 
Date:   Wed May 10 15:21:02 2017 +0200

typo

Change-Id: If5876ca8ecb8e6c6fe1135ddd0d1aa31ebfc47ca
Reviewed-on: https://gerrit.libreoffice.org/37468
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit d4e4c85d3cdf9faf678ea43e6a29e35bee0bc371)

diff --git a/Makefile.in b/Makefile.in
index 50d9dc0cfb09..0643277fed80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -340,7 +340,7 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 # And with it removed, presumably the other stuff in the Python 
lib/python3.3/config-3.3m probably does not make sense either.
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),)
+ifneq ($(ENABLE_MACOSX_SANDBOX),)
 # Remove the gengal binary and unopkg script that we don't want
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/gengal
rm 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unopkg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Dennis Francis

 sc/inc/interpretercontext.hxx |   19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

New commits:
commit df5a0a62a3f0a0be931fb079b675bebdf4b252c7
Author: Dennis Francis 
Date:   Wed Nov 22 17:12:06 2017 +0530

clang-format on non-blacklisted file interpretercontext.hxx

which is a new header file introduced in calc formulagroup threading
work.

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

diff --git a/sc/inc/interpretercontext.hxx b/sc/inc/interpretercontext.hxx
index ff52267dfb26..d2b6814fad6e 100644
--- a/sc/inc/interpretercontext.hxx
+++ b/sc/inc/interpretercontext.hxx
@@ -25,25 +25,22 @@ struct ScInterpreterContext
 size_t mnTokenCachePos;
 std::vector maTokens;
 
-ScInterpreterContext(const ScDocument& rDoc, SvNumberFormatter* 
pFormatter) :
-mrDoc(rDoc),
-mpFormatter(pFormatter),
-mnTokenCachePos(0),
-maTokens(TOKEN_CACHE_SIZE, nullptr)
+ScInterpreterContext(const ScDocument& rDoc, SvNumberFormatter* pFormatter)
+: mrDoc(rDoc)
+, mpFormatter(pFormatter)
+, mnTokenCachePos(0)
+, maTokens(TOKEN_CACHE_SIZE, nullptr)
 {
 }
 
 ~ScInterpreterContext()
 {
-for ( auto p : maTokens )
-if ( p )
+for (auto p : maTokens)
+if (p)
 p->DecRef();
 }
 
-SvNumberFormatter* GetFormatTable() const
-{
-return mpFormatter;
-}
+SvNumberFormatter* GetFormatTable() const { return mpFormatter; }
 };
 
 #endif // INCLUDED_SC_INC_INTERPRETERCONTEXT_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 9 commits - kit/Delta.hpp kit/Kit.cpp loleaflet/src net/Ssl.cpp net/Ssl.hpp test/data test/DeltaTests.cpp test/Makefile.am wsd/LOOLWSD.cpp wsd/TileDesc.hpp

2017-11-22 Thread Michael Meeks

 kit/Delta.hpp |  219 ++
 kit/Kit.cpp   |   10 +
 loleaflet/src/core/Socket.js  |   20 ++-
 loleaflet/src/layer/tile/TileLayer.js |   96 ++
 net/Ssl.cpp   |   10 +
 net/Ssl.hpp   |8 -
 test/DeltaTests.cpp   |  209 
 test/Makefile.am  |1 
 test/data/delta-text.png  |binary
 test/data/delta-text2.png |binary
 wsd/LOOLWSD.cpp   |6 
 wsd/TileDesc.hpp  |1 
 12 files changed, 568 insertions(+), 12 deletions(-)

New commits:
commit 92379ffbf2a52d3430eb7f693f64850413a1f347
Author: Michael Meeks 
Date:   Wed Nov 22 15:54:42 2017 +

Make the WSD SSL cipher list configurable.

Change-Id: If79b9efc9438cf0a2345b8e81385adafef63ce22

diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index 5a9f8280..cd28f53b 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -26,11 +26,14 @@ extern "C"
 };
 }
 
+#define DEFAULT_CIPHER_SET "ALL:!RC4:!SEED:!ADH:!LOW:!EXP:!MD5:@STRENGTH"
+
 std::unique_ptr SslContext::Instance(nullptr);
 
 SslContext::SslContext(const std::string& certFilePath,
const std::string& keyFilePath,
-   const std::string& caFilePath) :
+   const std::string& caFilePath,
+   const std::string& cipherList) :
 _ctx(nullptr)
 {
 const std::vector rand = Util::rng::getBytes(512);
@@ -107,7 +110,10 @@ SslContext::SslContext(const std::string& certFilePath,
 }
 
 SSL_CTX_set_verify(_ctx, SSL_VERIFY_NONE, nullptr 
/*&verifyServerCallback*/);
-SSL_CTX_set_cipher_list(_ctx, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
+std::string ciphers(cipherList);
+if (ciphers.empty())
+ciphers = DEFAULT_CIPHER_SET;
+SSL_CTX_set_cipher_list(_ctx, ciphers.c_str());
 SSL_CTX_set_verify_depth(_ctx, 9);
 
 // The write buffer may re-allocate, and we don't mind partial writes.
diff --git a/net/Ssl.hpp b/net/Ssl.hpp
index b6fc0427..90ba4f44 100644
--- a/net/Ssl.hpp
+++ b/net/Ssl.hpp
@@ -29,10 +29,11 @@ class SslContext
 public:
 static void initialize(const std::string& certFilePath,
const std::string& keyFilePath,
-   const std::string& caFilePath)
+   const std::string& caFilePath,
+   const std::string& cipherList = "")
 {
 assert (!Instance);
-Instance.reset(new SslContext(certFilePath, keyFilePath, caFilePath));
+Instance.reset(new SslContext(certFilePath, keyFilePath, caFilePath, 
cipherList));
 }
 
 static void uninitialize();
@@ -47,7 +48,8 @@ public:
 private:
 SslContext(const std::string& certFilePath,
const std::string& keyFilePath,
-   const std::string& caFilePath);
+   const std::string& caFilePath,
+   const std::string& cipherList);
 
 void initDH();
 void initECDH();
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7ff87b79..102670e7 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -927,11 +927,15 @@ void LOOLWSD::initializeSSL()
 const auto ssl_ca_file_path = getPathFromConfig("ssl.ca_file_path");
 LOG_INF("SSL CA file: " << ssl_ca_file_path);
 
+const auto ssl_cipher_list = getPathFromConfig("ssl.cipher_list");
+LOG_INF("SSL Cipher list: " << ssl_cipher_list);
+
 #if ENABLE_SSL
 // Initialize the non-blocking socket SSL.
 SslContext::initialize(ssl_cert_file_path,
ssl_key_file_path,
-   ssl_ca_file_path);
+   ssl_ca_file_path,
+   ssl_cipher_list);
 #endif
 }
 
commit 74f44251b782e5cab42960d1e328102a1538e72f
Author: Michael Meeks 
Date:   Mon Oct 23 20:59:10 2017 +0100

Deltas - collapse multiple rows to a single row.

Change-Id: Ia2a617c2adbbc4e66b7c773c2280ec609aead16e

diff --git a/kit/Delta.hpp b/kit/Delta.hpp
index 82f871bb..e1890370 100644
--- a/kit/Delta.hpp
+++ b/kit/Delta.hpp
@@ -64,6 +64,7 @@ class DeltaGenerator {
 
 // How do the rows look against each other ?
 size_t lastMatchOffset = 0;
+size_t lastCopy = 0;
 for (int y = 0; y < prev._height; ++y)
 {
 // Life is good where rows match:
@@ -78,12 +79,25 @@ class DeltaGenerator {
 if (prev._rows[match].identical(cur._rows[y]))
 {
 // TODO: if offsets are >256 - use 16bits?
+if (lastCopy > 0)
+{
+char cnt = output[lastCopy];
+if (output[lastCopy + 1] + cnt == (char)(match) &&
+output[lastCopy + 2] + cnt == (char)(y))
+{
+

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

2017-11-22 Thread Caolán McNamara

 sw/inc/unodraw.hxx |1 +
 sw/source/core/unocore/unodraw.cxx |   20 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit f2eb40825cf66a0e01bb94171d7b0cbe86daa3f2
Author: CaolÃ¡n McNamara 
Date:   Tue Nov 14 16:51:56 2017 +

Resolves: tdf#113615 wrong SwXShape from three possibilities returned

There is the group object itself and the two subobjects all registered
with this SwFrameFormat and the right line is randomly returned
instead of the wanted one.

Its possibly the presence of working a11y under gtk3 causing it to be
the only platform apparently with this trouble with a11y querying
for details of the grouped object

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

diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 123b4e771745..c824414c4859 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -127,6 +127,7 @@ class SwXShape : public SwXShapeBaseClass,
 {
 friend class SwXGroupShape;
 friend class SwXDrawPage;
+friend class SwFmDrawPage;
 
 css::uno::Reference< css::uno::XAggregation > xShapeAgg;
 // reference to , determined in the
diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index 4d9e3a29df3d..2e23d35e48e2 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -296,9 +296,25 @@ uno::Reference< uno::XInterface >   
SwFmDrawPage::GetInterface( SdrObject* pObj
 if( pObj )
 {
 SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
-SwXShape* pxShape = SwIterator( *pFormat ).First();
-if(pxShape)
+
+SwIterator aIter(*pFormat);
+SwXShape* pxShape = aIter.First();
+if (pxShape)
 {
+//tdf#113615 when mapping from SdrObject to XShape via
+//SwFrameFormat check all the SdrObjects belonging to this
+//SwFrameFormat to find the right one. In the case of Grouped
+//objects there can be both the group and the elements of the group
+//registered here so the first one isn't necessarily the right one
+while (SwXShape* pNext = aIter.Next())
+{
+SvxShape* pSvxShape = pNext->GetSvxShape();
+if (pSvxShape && pSvxShape->GetSdrObject() == pObj)
+{
+pxShape = pNext;
+break;
+}
+}
 xShape =  *static_cast(pxShape);
 }
 else
___
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' - officecfg/registry sc/inc sc/Library_scui.mk sc/source

2017-11-22 Thread Bernhard Widl

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   54 +++
 sc/Library_scui.mk   |4 +
 sc/inc/scabstdlg.hxx |1 
 sc/source/ui/attrdlg/scdlgfact.cxx   |5 +
 sc/source/ui/attrdlg/scdlgfact.hxx   |1 
 sc/source/ui/dbgui/scuiimoptdlg.cxx  |   49 +++--
 sc/source/ui/inc/scuiimoptdlg.hxx|4 -
 sc/source/ui/unoobj/filtuno.cxx  |1 
 8 files changed, 109 insertions(+), 10 deletions(-)

New commits:
commit ac4072fe932b0ebfd9283f3b8da2b3ffdaded028
Author: Bernhard Widl 
Date:   Wed Apr 5 14:41:22 2017 +0200

tdf#55236 save settings of CSV export dialog

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index bd17f4aa8153..0f732969278d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1023,6 +1023,60 @@
   -1
 
   
+  
+
+  Contains setting for Text CSV Export
+
+
+  
+Char Set
+CharSet
+  
+  -1
+
+
+  
+Field delimiter
+FieldSeparator
+  
+  
+
+
+  
+Text delimiter
+TextSeparator
+  
+  
+
+
+  
+If true, formatted cell content is exported. If false, raw 
cell content is exported.
+SaveTrueCellContent
+  
+  true
+
+
+  
+If true, text formulas are exported instead of the 
calculated values.
+SaveCellFormulas
+  
+  false
+
+
+  
+If true, text cells are always enclosed in quotes with no 
exception.
+QuoteAllTextCells
+  
+  false
+
+
+  
+All fields are exported having the same width
+FixedWidth
+  
+  false
+
+  
   
 
   Contains setting for Text CSV Import
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index e694885aa13b..4b911d6846b1 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_Library_set_include,scui,\
$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,scui,\
+   officecfg/registry \
+)) \
+
 $(eval $(call 
gb_Library_set_precompiled_header,scui,$(SRCDIR)/sc/inc/pch/precompiled_scui))
 
 $(eval $(call gb_Library_use_sdk_api,scui))
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4f946f771cd7..9fd86f5fb265 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -313,6 +313,7 @@ class AbstractScImportOptionsDlg : public VclAbstractDialog
 {
 public:
 virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
+virtual void SaveImportOptions() const = 0;
 };
 
 class AbstractScTextImportOptionsDlg : public VclAbstractDialog
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 6bf050d4c0cb..d257401560cc 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -587,6 +587,11 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( 
ScImportOptions& rOption
 pDlg->GetImportOptions(rOptions);
 }
 
+void AbstractScImportOptionsDlg_Impl::SaveImportOptions() const
+{
+pDlg->SaveImportOptions();
+}
+
 LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
 {
 return pDlg->getLanguageType();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index ea9ea53f925f..62fa40ad5f23 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -365,6 +365,7 @@ class AbstractScImportOptionsDlg_Impl : public 
AbstractScImportOptionsDlg
 {
 DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
 virtual void GetImportOptions( ScImportOptions& rOptions ) const override;
+virtual void SaveImportOptions() const override;
 };
 
 class AbstractScTextImportOptionsDlg_Impl : public 
AbstractScTextImportOptionsDlg
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx 
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 114ec3c88e5f..f807606f3824 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -24,6 +24,7 @@
 #include "scresid.hxx"
 #include "sc.hrc"
 #include 
+#include 
 #include 
 #include 
 
@@ -202,18 +203,34 @@ ScImportOptionsDlg::ScImportOptionsDlg(
 
 if( bAscii )
 {
+sal_Int32 nChar

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

2017-11-22 Thread Stephan Bergmann

 embeddedobj/source/commonembedding/persistence.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2da9e6836926ff9b767f0ad603407acbdae2bb67
Author: Stephan Bergmann 
Date:   Wed Nov 22 16:40:57 2017 +0100

Help old GCC

Change-Id: I29093aa7975394b74952a4856632e8e657b33ae0

diff --git a/embeddedobj/source/commonembedding/persistence.cxx 
b/embeddedobj/source/commonembedding/persistence.cxx
index ab171e3a478b..6c820f851ab2 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -445,7 +445,7 @@ OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 
nVersion ) const
 if (utl::ConfigManager::IsFuzzing() && nVersion == 
SOFFICE_FILEFORMAT_CURRENT &&
 sDocumentServiceName == "com.sun.star.chart2.ChartDocument")
 {
-return "chart8";
+return OUString("chart8");
 }
 try {
 ::comphelper::MimeConfigurationHelper aHelper( m_xContext );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - include/rtl sw/qa writerfilter/source

2017-11-22 Thread Mike Kaganski

 include/rtl/ustring.h |4 +-
 include/rtl/ustring.hxx   |4 +-
 sw/qa/extras/ooxmlexport/data/tdf111964.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   10 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   28 +-
 5 files changed, 43 insertions(+), 3 deletions(-)

New commits:
commit f3af5926f93f46e96caa6b85e08723f150c94463
Author: Mike Kaganski 
Date:   Wed Aug 23 09:09:57 2017 +0300

tdf#111964: only trim XML whitespace

OUString::trim() uses rtl_uString_newTrim, which relies upon
rtl_ImplIsWhitespace. The latter treats as whitespaces not only
characters with values less than or equal to 32, but also Unicode
General Punctuation area Space and some Control characters. Thus,
using OUString::trim() is incorrect when the goal is to trim XML
whitespace, which is defined as one of 0x09, 0x0A, 0x0D, 0x20.

The comments for OUString::trim() and rtl_uString_newTrim are
corrected to describe which characters are considered whitespace.

A unit test included.

Change-Id: I45a132be923a52dcd5a4c35aeecb53d423b49fec
Reviewed-on: https://gerrit.libreoffice.org/41444
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 5b518ab051cc04e672ceb01da42b06625a1a4ce9)
Reviewed-on: https://gerrit.libreoffice.org/44758
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index 831ecd66d9be..50dbd75a5ecc 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -2023,7 +2023,9 @@ SAL_DLLPUBLIC void SAL_CALL 
rtl_uString_newToAsciiUpperCase(
 string.
 
 The new string results from removing all characters with values less than
-or equal to 32 (the space character) form both ends of str.
+or equal to 32 (the space character), and also Unicode General Punctuation
+area Space and some Control characters, form both ends of str (see
+rtl_ImplIsWhitespace).
 
 This function cannot be used for language-specific conversion.  The new
 string does not necessarily have a reference count of 1 (in cases where
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 337e8509a53d..bc87c2936eef 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -2635,7 +2635,9 @@ public:
   of the string.
 
   All characters that have codes less than or equal to
-  32 (the space character) are considered to be white space.
+  32 (the space character), and Unicode General Punctuation area Space
+  and some Control characters are considered to be white space (see
+  rtl_ImplIsWhitespace).
   If the string doesn't contain white spaces at both ends,
   then the new string is assigned with str.
 
diff --git a/sw/qa/extras/ooxmlexport/data/tdf111964.docx 
b/sw/qa/extras/ooxmlexport/data/tdf111964.docx
new file mode 100644
index ..7cb85a1d87df
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf111964.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index b2c8a417109c..8c1537ffc268 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -384,6 +384,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107684, "tdf107684.odt")
 assertXPath(pXmlDoc, 
"//w:style[@w:styleId='Heading1']/w:pPr/w:outlineLvl", 1);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf111964, "tdf111964.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// Unicode spaces that are not XML whitespace must not be trimmed
+const sal_Unicode sWSReference [] { 0x2002, 0x2002, 0x2002, 0x2002, 
0x2002, 0 };
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[4]/w:t", 
sWSReference);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index bb59ed9bebdc..1485ce0ed177 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -620,6 +620,32 @@ void OOXMLFastContextHandler::endTxbxContent()
 mpParserState->endTxbxContent();
 }
 
+namespace {
+// XML schema defines white space as one of four characters:
+// #x9 (tab), #xA (line feed), #xD (carriage return), and #x20 (space)
+bool IsXMLWhitespace(sal_Unicode cChar)
+{
+return cChar == 0x9 || cChar == 0xA || cChar == 0xD || cChar == 0x20;
+}
+
+OUString TrimXMLWhitespace(const OUString & sText)
+{
+sal_Int32 nTrimmedStart = 0;
+const sal_Int32 nLen = sText.getLength();
+sal_Int32 nTrimmedEnd = nLen - 1;
+while (nTrimmedStart < nLen && IsXMLWhitespace(sText[nTrimmedStart]))
+++nTrimmedStart;
+while (nTrimmedStart <= nTrimmedE

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

2017-11-22 Thread Caolán McNamara

 embeddedobj/source/commonembedding/persistence.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 366e35799d8c4d9ef871edbb592747b0f4d7ef70
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 13:19:26 2017 +

fuzzing: common case of embedded charts in docx

Change-Id: Idc6fdc221ce60e33e6b9fcb1689840dd96570d6b
Reviewed-on: https://gerrit.libreoffice.org/45089
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/embeddedobj/source/commonembedding/persistence.cxx 
b/embeddedobj/source/commonembedding/persistence.cxx
index 07bc635a44a4..ab171e3a478b 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -56,6 +56,7 @@
 #include 
 
 #include 
+#include 
 #include "persistence.hxx"
 
 using namespace ::com::sun::star;
@@ -440,9 +441,15 @@ OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 
nVersion ) const
 OUString aFilterName = GetPresetFilterName();
 if ( aFilterName.isEmpty() )
 {
+OUString sDocumentServiceName = GetDocumentServiceName();
+if (utl::ConfigManager::IsFuzzing() && nVersion == 
SOFFICE_FILEFORMAT_CURRENT &&
+sDocumentServiceName == "com.sun.star.chart2.ChartDocument")
+{
+return "chart8";
+}
 try {
 ::comphelper::MimeConfigurationHelper aHelper( m_xContext );
-aFilterName = aHelper.GetDefaultFilterFromServiceName( 
GetDocumentServiceName(), nVersion );
+aFilterName = 
aHelper.GetDefaultFilterFromServiceName(sDocumentServiceName, nVersion);
 
 // If no filter is found, fall back to the FileFormatVersion=6200 
filter, Base only has that.
 if (aFilterName.isEmpty() && nVersion == 
SOFFICE_FILEFORMAT_CURRENT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - distro-configs/CPOSX.conf

2017-11-22 Thread Tor Lillqvist

 distro-configs/CPOSX.conf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a3ee97bf2d3541a4cecfaa785465b24fb6737dd
Author: Tor Lillqvist 
Date:   Wed Nov 22 17:19:56 2017 +0200

Use same language list as in cp-5.1 for now

diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index 060ddc9682a0..5fd874950e88 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -17,4 +17,4 @@
 --disable-gtk
 --with-package-format=dmg
 --with-macosx-bundle-identifier=com.collaboraoffice
---with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es 
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn 
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
+--with-lang=bg br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga 
gd gl hr hu id is it ja km lt lv nb nl nn pl pt pt-BR ro ru sk sl sv ta tr uk 
zh-CN zh-TW
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Christian Lohmaier

 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |   34 +++---
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui|   24 -
 2 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 74b77481b43225fe2e8fd8edd2fb30a863a0b1e1
Author: Christian Lohmaier 
Date:   Wed Nov 22 15:54:51 2017 +0100

fix duplicate strings in notebookbar ui

Change-Id: I13ba872b8d3b8108384dc0fa4436ccaa1eedefa8

diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui 
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index ec60b2c9c773..2fdf2d2798cd 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -2881,7 +2881,7 @@
 False
 
   
-_Slide Show
+_Slide Show
 True
 True
 False
@@ -3009,7 +3009,7 @@
 False
 
   
-S_lide
+S_lide
 True
 True
 False
@@ -3160,7 +3160,7 @@
 False
 
   
-_Insert
+_Insert
 True
 True
 False
@@ -3329,7 +3329,7 @@
 False
 
   
-D_raw
+D_raw
 True
 True
 False
@@ -3613,7 +3613,7 @@
 False
 
   
-_View
+_View
 True
 True
 False
@@ -3903,7 +3903,7 @@
 False
 
   
-_Slide Show
+_Slide Show
 True
 True
 False
@@ -4489,7 +4489,7 @@
 False
 
   
-_Insert
+_Insert
 True
 True
 False
@@ -4623,7 +4623,7 @@
 False
 
   
-_View
+_View
 True
 True
 False
@@ -4911,7 +4911,7 @@
 False
 
   
-_Slide Show
+_Slide Show
 True
 True
 False
@@ -5476,7 +5476,7 @@
 False
 
   
-R_ows
+R_ows
 True
 True
 False
@@ -5792,7 +5792,7 @@
 False
 
   
-_Calc
+_Calc
 True
 True
 False
@@ -7729,7 +7729,7 @@
 False
 
   
-_Slide Show
+_Slide Show
 True
 True
 False
@@ -8481,7 +8481,7 @@
 False

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

2017-11-22 Thread Caolán McNamara

 filter/source/graphicfilter/itiff/ccidecom.cxx |2 +-
 filter/source/graphicfilter/itiff/itiff.cxx|4 ++--
 filter/source/msfilter/msdffimp.cxx|4 ++--
 sc/source/filter/lotus/lotread.cxx |4 ++--
 sc/source/filter/qpro/qpro.cxx |2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 129852d379fa03c36886b5f48d6a10e530a9c3de
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 10:27:36 2017 +

turn some eof checks to eof or error

Change-Id: I4592d7aa86c2cc2f420bccc622ffb95aa5cefa17
Reviewed-on: https://gerrit.libreoffice.org/45077
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx 
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 815a75e5deba..9d638c0260c3 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -769,7 +769,7 @@ bool CCIDecompressor::ReadEOL()
 while ( nInputBitsBufSize < 12 )
 {
 pIStream->ReadUChar( nByte );
-if ( pIStream->eof() )
+if (!pIStream->good())
 return false;
 if ( pIStream->Tell() > nMaxPos )
 return false;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 988e791a6431..12e53b314478 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1234,7 +1234,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 nMaxPos = std::max(nOrigPos + nOffset + DataTypeSize() * 
nDataLen, nMaxPos);
 }
 pTIFF->ReadUInt32( nOffset );
-if ( pTIFF->eof() )
+if (!pTIFF->good())
 nOffset = 0;
 
 nMaxPos = std::max( pTIFF->Tell(), nMaxPos );
@@ -1325,7 +1325,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 break;
 }
 pTIFF->ReadUInt32( nNextIfd );
-if ( pTIFF->eof() )
+if (!pTIFF->good())
 nNextIfd = 0;
 }
 if ( !nBitsPerSample || ( nBitsPerSample > 32 ) )
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index ebc214ef36fb..eac8803da7f4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6774,7 +6774,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, 
sal_uInt32 nReadLen,
 
 nBytesRead += 6 * sizeof( sal_uInt32 ) + nStrLen + nDataLen;
 
-if( !rStm.eof() && nReadLen > nBytesRead && nDataLen )
+if (rStm.good() && nReadLen > nBytesRead && nDataLen)
 {
 if( xOle10Stm.is() )
 {
@@ -6828,7 +6828,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, 
sal_uInt32 nReadLen,
 else
 rStm.SeekRel( nDataLen );
 }
-} while( !rStm.eof() && nReadLen >= nBytesRead );
+} while (rStm.good() && nReadLen >= nBytesRead);
 
 if( !bMtfRead && pMtf )
 {
diff --git a/sc/source/filter/lotus/lotread.cxx 
b/sc/source/filter/lotus/lotread.cxx
index afb176ec7f19..7878c97288c0 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -61,7 +61,7 @@ ErrCode ImportLotus::Read()
 {
 pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen );
 
-if( pIn->eof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
+if (!pIn->good() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4)
 eAkt = S_END;
 
 nNextRec += nRecLen + 4;
@@ -245,7 +245,7 @@ ErrCode ImportLotus::Read(SvStream& rIn)
 {
 pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen );
 
-if( pIn->eof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
+if (!pIn->good() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4)
 bRead = false;
 else
 {
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 6326aae08cf6..0c1d18d59ffd 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -225,7 +225,7 @@ ErrCode ScQProReader::import( ScDocument *pDoc )
 
 bool ScQProReader::recordsLeft()
 {
-return mpStream && !mpStream->eof();
+return mpStream && mpStream->good();
 }
 
 bool ScQProReader::nextRecord()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Caolán McNamara

 sd/source/filter/ppt/pptin.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 97f087f4b2737aea7ddfbb7ac637370bac871cb5
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 11:44:56 2017 +

ofz#4381 Divide-by-zero

Change-Id: I608ea751cec11935f37b625ebde0798f8887e225
Reviewed-on: https://gerrit.libreoffice.org/45081
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 79020b01dac7..2c189d79516c 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2488,8 +2488,9 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 if (std::abs(aLogicRect.Left()   - 
aOutlineRect.Left())   > MAX_USER_MOVE ||
 std::abs(aLogicRect.Top()- 
aOutlineRect.Top())> MAX_USER_MOVE ||
 std::abs(aLogicRect.Bottom() - 
aOutlineRect.Bottom()) > MAX_USER_MOVE ||
-(double)aLogicSize.Width()  / 
aOutlineSize.Width()   < 0.48  ||
-(double)aLogicSize.Width()  / 
aOutlineSize.Width()   > 0.5)
+aOutlineSize.Width() == 0  
   ||
+(double)aLogicSize.Width()  / 
aOutlineSize.Width()   < 0.48   ||
+(double)aLogicSize.Width()  / 
aOutlineSize.Width()   > 0.5)
 {
 pPresObj->SetUserCall(nullptr);
 }
@@ -2518,7 +2519,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 if (std::abs(aLogicRect.Right()  - 
aOutlineRect.Right())  > MAX_USER_MOVE ||
 std::abs(aLogicRect.Top()- 
aOutlineRect.Top())> MAX_USER_MOVE ||
 std::abs(aLogicRect.Bottom() - 
aOutlineRect.Bottom()) > MAX_USER_MOVE ||
-(double)aLogicSize.Width()  / 
aOutlineSize.Width()   < 0.48  ||
+aOutlineSize.Width() == 0  
   ||
+(double)aLogicSize.Width()  / 
aOutlineSize.Width()   < 0.48   ||
 (double)aLogicSize.Width()  / 
aOutlineSize.Width()   > 0.5)
 {
 pPresObj->SetUserCall( nullptr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Running unit test by make

2017-11-22 Thread Michael Stahl

On 12.11.2017 21:03, Bjoern Michaelsen wrote:
> Hi,
> 
> On Sun, Nov 12, 2017 at 07:00:33PM +0100, Zolnai Tamás wrote:
>> Independently from the actual question, which is still unanswered, 
> 
> If the question is "why do we have this status quo?" the answer is "because it
> is result of some dozen discussions between developers (mostly on the ESC).".
> ~Every argument has already been made and I assume most are also preserved for
> eternity in the ESC minutes.

>> it's always a pleasure to see how "old" developers - living in a symbiosis
>> with the code - are worrying about the status quo.
> 
> If you assume the status quo to be my personal best preference, I can assure 
> you
> that is not the case. If you would dig through the six years of debate on ESC,
> you will even find that I was supporting tests to only be run on "make check"
> (to be consistent with autotools). That was not going to be due to this thing
> called "compromise".

see also the most recent attempt to consolidate this:

https://gerrit.libreoffice.org/#/c/31075/
https://gerrit.libreoffice.org/#/c/31081/

sadly failed because the "make check" took measurably longer...

-- 
DDJ: You've mentioned Edsger Dijkstra. What do you think of his work?
DK:  His great strength is that he is uncompromising. It would make
 him physically ill to think of programming in C++.

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

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

2017-11-22 Thread Stephan Bergmann

 vcl/source/gdi/pngread.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 1c93732e98c4ce1182a132eef416adbf6ae1fffa
Author: Stephan Bergmann 
Date:   Tue Nov 21 08:58:04 2017 +0100

ASan heap-buffer-overflow

e.g. during CppunitTest_sd_misc_tests (see
) after
66dbd4da3afcadb1393daf9be9cecff71b86509a "tdf#113918: Workaround: Load 1bpp
indexed PNG as 8bpp indexed Bitmap".  Looks like 
PNGReaderImpl::ImplDrawScanline
also needs to special-case mnPngDepth == 1 in the mbTransparent case (and, 
TODO,
also in the mbAlphaChannel case)?

Change-Id: Ie6a0230ec606f7cc5aaf174b9c0075a3b4cb5b1d
(cherry picked from commit bb11e1283e3d49ec1bfe14c4271edbd49af3e3c1)
Reviewed-on: https://gerrit.libreoffice.org/45022
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 62172d12a8c5..7c9fb7870019 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -1325,6 +1325,22 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 
nXStart, sal_uInt32 nXAdd )
 for ( long nX = nXStart; nX < maOrigSize.Width(); nX 
+= nXAdd, pTmp++ )
 ImplSetAlphaPixel( nY, nX, *pTmp, mpTransTab[ 
*pTmp ] );
 }
+else if (mnPngDepth == 1 )
+{
+for ( long nX = nXStart, nShift = 0; nX < 
maOrigSize.Width(); nX += nXAdd )
+{
+nShift = (nShift - 1) & 7;
+
+sal_uInt8 nCol;
+if ( nShift == 0 )
+nCol = *(pTmp++);
+else
+nCol = static_cast( *pTmp >> nShift 
);
+nCol &= 1;
+
+ImplSetAlphaPixel( nY, nX, nCol, mpTransTab[ nCol 
] );
+}
+}
 else
 {
 for ( long nX = nXStart; nX < maOrigSize.Width(); nX 
+= nXAdd, pTmp += 2 )
___
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

2017-11-22 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par.hxx  |2 +-
 sw/source/filter/ww8/ww8par2.cxx |   39 ---
 sw/source/filter/ww8/ww8par6.cxx |2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit a9ed411b4ad92cab9a9642e55a0dae06b039a748
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 20 12:37:35 2017 +

ofz#4335 verify sprmTDefTable length

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

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 31425907dc6d..9f6b1fef2c22 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1033,7 +1033,7 @@ struct WW8TabBandDesc
 WW8TabBandDesc(WW8TabBandDesc& rBand);// deep copy
 ~WW8TabBandDesc();
 static void setcelldefaults(WW8_TCell *pCells, short nCells);
-void ReadDef(bool bVer67, const sal_uInt8* pS);
+void ReadDef(bool bVer67, const sal_uInt8* pS, short nLen);
 void ProcessDirection(const sal_uInt8* pParams);
 void ProcessSprmTSetBRC(int nBrcVer, const sal_uInt8* pParamsTSetBRC);
 void ProcessSprmTTableBorders(int nBrcVer, const sal_uInt8* pParams);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6ce9e4e5b161..b65b763b73b1 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1226,27 +1226,35 @@ WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc& rBand )
 }
 
 // ReadDef reads the cell position and the borders of a band
-void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS)
+void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen)
 {
 if (!bVer67)
+{
+//the ww8 version of this is unusual in masquerading as a a srpm with a
+//single byte len arg while it really has a word len arg, after this
+//increment nLen is correct to describe the remaining amount of data
 pS++;
+}
 
-short nLen = (sal_Int16)SVBT16ToShort( pS - 2 ); // not beautiful
-
+--nLen; //reduce len by expected nCols arg
+if (nLen < 0)
+return;
 sal_uInt8 nCols = *pS;   // number of cells
-short nOldCols = nWwCols;
 
-if( nCols > MAX_COL )
+if (nCols > MAX_COL)
 return;
 
+short nOldCols = nWwCols;
 nWwCols = nCols;
 
+nLen -= 2 * (nCols + 1); //reduce len by claimed amount of next x-borders 
arguments
+if (nLen < 0)
+return;
+
 const sal_uInt8* pT = &pS[1];
-nLen --;
-int i;
-for(i=0; i<=nCols; i++, pT+=2 )
+for (int i = 0; i <= nCols; i++, pT+=2)
 nCenter[i] = (sal_Int16)SVBT16ToShort( pT );// X-borders
-nLen -= 2 * ( nCols + 1 );
+
 if( nCols != nOldCols ) // different column count
 {
 delete[] pTCs;
@@ -1266,11 +1274,9 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const 
sal_uInt8* pS)
 setcelldefaults(pTCs,nCols);
 }
 
-short nColsToRead = nFileCols;
-if (nColsToRead > nCols)
-nColsToRead = nCols;
+short nColsToRead = std::min(nFileCols, nCols);
 
-if( nColsToRead )
+if (nColsToRead > 0)
 {
 // read TCs
 
@@ -1286,7 +1292,7 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const 
sal_uInt8* pS)
 if( bVer67 )
 {
 WW8_TCellVer6 const * pTc = reinterpret_cast(pT);
-for(i=0; iGetFib().GetFIBVersion());
 switch (eSprm)
 {
@@ -1966,7 +1975,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP 
nStartCp) :
 m_bClaimLineFormat = true;
 break;
 case sprmTDefTable:
-pNewBand->ReadDef(bOldVer, pParams);
+pNewBand->ReadDef(bOldVer, pParams, nLen);
 bTabRowJustRead = true;
 break;
 case sprmTDefTableShd:
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index b8362e6983c0..81efda11a8e2 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5109,7 +5109,7 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, 
WW8PLCFx_Cp_FKP* pPap)
 if (nullptr != aRes.pSprm)
 {
 WW8TabBandDesc aDesc;
-aDesc.ReadDef(false, aRes.pSprm);
+aDesc.ReadDef(false, aRes.pSprm, aRes.nRemainingData);
 int nTableWidth = aDesc.nCenter[aDesc.nWwCols] - aDesc.nCenter[0];
 int nTextAreaWidth = m_aSectionManager.GetTextAreaWidth();
 // If the table is wider than the text area, then don't create a fly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/benchmark-document-loading

2017-11-22 Thread Arkadiy Illarionov

 bin/benchmark-document-loading |  190 +
 1 file changed, 83 insertions(+), 107 deletions(-)

New commits:
commit 0c358f71e2b72251dd47ae5782d44c5c6a13727c
Author: Arkadiy Illarionov 
Date:   Sat Oct 21 16:48:49 2017 +0300

Modernize benchmark-document-loading script

 - use argparse instead of getopt
 - use with statement for opening files
 - refactor writeReport function to reduce copypaste
 - various fixes to make code more pythonic

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

diff --git a/bin/benchmark-document-loading b/bin/benchmark-document-loading
index 6d06580929c8..11611a2b29da 100644
--- a/bin/benchmark-document-loading
+++ b/bin/benchmark-document-loading
@@ -32,21 +32,19 @@
 # ~/lo/master-suse/instdir/program/python 
~/lo/master-suse/bin/benchmark-document-loading  
--soffice=path:/home/tml/lo/master-suse/instdir/program/soffice 
--outdir=file://$PWD/out --userdir=file:///tmp/test $PWD/docs
 #
 
+import argparse
 import datetime
-import getopt
 import os
 import subprocess
 import sys
+import threading
 import time
 import urllib
-import uuid
-
-import signal
-import threading
 try:
 from urllib.parse import quote
 except ImportError:
 from urllib import quote
+import uuid
 
 try:
 import pyuno
@@ -72,11 +70,15 @@ validWriterFileExtensions = [ ".docx" , ".rtf", ".odt", 
".fodt", ".doc" ]
 validImpressFileExtensions = [ ".ppt", ".pptx", ".odp", ".fodp" ]
 validDrawFileExtensions = [ ".odg", ".fodg" ]
 validRevereseFileExtensions = [ ".vsd", ".vdx", ".cdr", ".pub", ".wpd" ]
-validFileExtensions = dict([("calc", validCalcFileExtensions), ("writer", 
validWriterFileExtensions), ("impress", validImpressFileExtensions), ("draw", 
validDrawFileExtensions), ("reverse", validRevereseFileExtensions) ])
-flatODFTypes = dict([("calc", (".fods", "OpenDocument Spreadsheet Flat XML")), 
- ("writer", (".fodt", "OpenDocument Text Flat XML")), 
- ("impress", (".fodp", "OpenDocument Presentation Flat 
XML")), 
- ("draw", (".fodg", "OpenDocument Drawing Flat XML"))])
+validFileExtensions = {"calc": validCalcFileExtensions,
+   "writer": validWriterFileExtensions,
+   "impress": validImpressFileExtensions,
+   "draw": validDrawFileExtensions,
+   "reverse": validRevereseFileExtensions}
+flatODFTypes = {"calc": (".fods", "OpenDocument Spreadsheet Flat XML"),
+"writer": (".fodt", "OpenDocument Text Flat XML"),
+"impress": (".fodp", "OpenDocument Presentation Flat XML"),
+"draw": (".fodg", "OpenDocument Drawing Flat XML")}
 
 outdir = ""
 
@@ -90,12 +92,12 @@ def partition(list, pred):
 right.append(e)
 return (left, right)
 
-def filelist(dir, suffix):
-if len(dir) == 0:
+def filelist(directory, suffix):
+if not directory:
 raise Exception("filelist: empty directory")
-if not(dir[-1] == "/"):
-dir += "/"
-files = [dir + f for f in os.listdir(dir)]
+if directory[-1] != "/":
+directory += "/"
+files = [directory + f for f in os.listdir(directory)]
 #print(files)
 return [f for f in files
 if os.path.isfile(f) and os.path.splitext(f)[1] == suffix]
@@ -103,8 +105,8 @@ def filelist(dir, suffix):
 def getFiles(dirs, suffix):
 #print( dirs )
 files = []
-for dir in dirs:
-files += filelist(dir, suffix)
+for d in dirs:
+files += filelist(d, suffix)
 return files
 
 ### UNO utilities ###
@@ -130,20 +132,19 @@ class OfficeConnection:
 self.xContext = None
 self.pro = None
 def setUp(self):
-(method, sep, rest) = self.args["--soffice"].partition(":")
+(method, sep, rest) = self.args.soffice.partition(":")
 if sep != ":":
 raise Exception("soffice parameter does not specify method")
 if method == "path":
-socket = "pipe,name=pytest" + str(uuid.uuid1())
-try:
-userdir = self.args["--userdir"]
-except KeyError:
-raise Exception("'path' method requires --userdir")
-if not(userdir.startswith("file://")):
-raise Exception("--userdir must be file URL")
-self.soffice = self.bootstrap(rest, userdir, socket)
+socket = "pipe,name=pytest" + str(uuid.uuid1())
+userdir = self.args.userdir
+if not userdir:
+raise Exception("'path' method requires --userdir")
+if not userdir.startswith("file://"):
+raise Exception("--userdir must be file URL")
+self.soffice = self.bootstrap(rest, userdir, socket)
 elif method == "connect":
-

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

2017-11-22 Thread jan Iversen

 tools/source/misc/cpuid.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7329b4423c0d348d0af0ab5b5b7bfcdc25bc7618
Author: jan Iversen 
Date:   Wed Nov 22 14:48:03 2017 +0100

cpuid is only for x86 processors.

clang for macOS did not like cpuid when compiling for arm cpu.

Change-Id: Iede658a524e5c3e1aa2d33137ed399679b021987

diff --git a/tools/source/misc/cpuid.cxx b/tools/source/misc/cpuid.cxx
index e3ba82dffda5..ee5093ce1892 100644
--- a/tools/source/misc/cpuid.cxx
+++ b/tools/source/misc/cpuid.cxx
@@ -25,11 +25,18 @@ void getCpuId(uint32_t array[4])
 __cpuid(reinterpret_cast(array), 1);
 }
 #else
+#if (defined(__i386__) || defined(__x86_64__))
 #include 
 void getCpuId(uint32_t array[4])
 {
 __get_cpuid(1, array + 0, array + 1, array + 2, array + 3);
 }
+#else
+void getCpuId(uint32_t array[4])
+{
+   array[0] = array[1] =  array[2] = array[3] = 0;
+}
+#endif
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre-win32' - 3 commits - configure.ac external/gpgme external/gpgmepp external/Module_external.mk RepositoryExternal.mk xmlsecurity/inc xmlsec

2017-11-22 Thread Thorsten Behrens

Rebased ref, commits from common ancestor:
commit 31bcf22df134fb59746c4145f0600b0fe4768948
Author: Thorsten Behrens 
Date:   Wed Nov 22 09:57:57 2017 +0100

gpg4libre: enable gpgme support for Windows and OSX

Change-Id: Ifa266e1c18a8a09cd5c815adc70d0236e00f72b5

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 30c792177fc8..5bb1828f61ea 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
libxml2 \
xmlsec \
 ))
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
+ifneq ($(filter-out ANDROID IOS,$(OS)),)
 $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
gpgmepp \
 ))
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
+ifneq ($(filter-out ANDROID IOS,$(OS)),)
 $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/gpg/CertificateImpl \
xmlsecurity/source/gpg/CipherContext \
commit 315259c4b4f992a7936fe52a7fe604ce536b6589
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:51:42 2017 +0100

gpg4libre: fix warnings

This code was not previously built on Windows

Change-Id: I9394907f143d862f40c95672f4e3398b65b7bd2c

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 51f0f2a0834f..30c792177fc8 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_NO_XSLT \
-DXSECXMLSEC_DLLIMPLEMENTATION \
+   -DXSECGPG_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call 
gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec))
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 0698e91f422f..494dc6e30d40 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -25,7 +25,7 @@ public:
 /// Returns the SHA-256 thumbprint.
 ///
 /// @throws css::uno::RuntimeException
-virtual css::uno::Sequence getSHA256Thumbprint() = 0;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() = 0;
 
 protected:
 ~Certificate() noexcept = default;
diff --git a/xmlsecurity/source/gpg/CertificateImpl.hxx 
b/xmlsecurity/source/gpg/CertificateImpl.hxx
index 9db3ab85de14..63cddc6dc7b9 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.hxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.hxx
@@ -78,8 +78,8 @@ public:
 static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
 /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-virtual css::uno::Sequence getSHA256Thumbprint() override;
-virtual css::security::CertificateKind getCertificateKind() override;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() 
override;
+virtual css::security::CertificateKind SAL_CALL getCertificateKind() 
override;
 
 // Helper methods
 void setCertificate(GpgME::Context* ctx, const GpgME::Key& key);
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index b36b1c3c5d8f..94d53529bf21 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -80,7 +80,7 @@ class X509Certificate_MSCryptImpl : public 
::cppu::WeakImplHelper<
 virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) override;
 
 /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-virtual css::uno::Sequence getSHA256Thumbprint() override;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() 
override;
 
 static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
 static X509Certificate_MSCryptImpl* getImplementation( const 
css::uno::Reference< css::uno::XInterface >& rObj ) ;
commit 86ab94851ab5fa79365b27ed6a2c24bac6d49238
Author: Thorsten Behrens 
Date:   Wed Nov 15 21:31:07 2017 +0100

gpg4libre: cleanup gpgme & add gbuild lib for gpgmepp

This moves the external to gpgmepp, since that's what we _actually_
link against; plus tons of enablement for Windows build, mostly
related to linker probs integration.

There's still no good way to build a DLL with autotools, so we fall
back to gbuild manual make, see also tdf#91480

Change-Id: Ifd8217ef58536612d2389d48e343db133a13fb9c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index db70ce875e71..995a490214ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3472,7 +3472,7 @@ endef
 else # NON-SYSTEM_GPGME
 
 define gb_ExternalProject__use_gpgmep

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

2017-11-22 Thread Eike Rathke

 sc/source/core/data/column.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e2dcf7fbb5924838fb65a915639f6266e01174d8
Author: Eike Rathke 
Date:   Thu Nov 2 12:53:14 2017 +0100

Resolves: tdf#111428 swap ScColumn::mnBlkCountFormula

 This is a combination of 2 commits.

(cherry picked from commit 423df1fa929784c14e3a133c06468589fe9269cd)
(cherry picked from commit 911e2aff3cc37cb7410292728ffea05fffbfb0b3)

CellStoreEvent remembered the original ScColumn::mnBlkCountFormula,
hence after inserting a column to the left the quick check of
ScColumn::HasFormulaCell() whether there are any formula cells worked on
the swapped in count (originally the one to the right) that happens to
be empty in the scenario. Things worked correctly by accident if the
next column to the right already contained a formula cell.

c44fed96c49bea7365bf1200e06788860966795c

Change-Id: If993856ceee657736f516a81c293506041a6b7eb
Reviewed-on: https://gerrit.libreoffice.org/44210
Reviewed-by: Markus Mohrhard 
Tested-by: Eike Rathke 
Reviewed-on: https://gerrit.libreoffice.org/44493
(cherry picked from commit 7f1297d9b4f449eb9ada8008fb21b7046d1a8f19)

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ac65f8a1b7ca..d868333c8b7a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1891,6 +1891,9 @@ void ScColumn::SwapCol(ScColumn& rCol)
 maCellTextAttrs.swap(rCol.maCellTextAttrs);
 maCellNotes.swap(rCol.maCellNotes);
 
+// Swap all CellStoreEvent mdds event_func related.
+std::swap( mnBlkCountFormula, rCol.mnBlkCountFormula);
+
 // notes update caption
 UpdateNoteCaptions(0, MAXROW);
 rCol.UpdateNoteCaptions(0, MAXROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Christian Lohmaier

 cui/uiconfig/ui/gradientpage.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 57768926f344e516c039db9417d2cfd4c5e6b303
Author: Christian Lohmaier 
Date:   Wed Nov 22 13:32:13 2017 +0100

add missing context to translatable strings in .ui file

Change-Id: I52f01046ccc1da8aec483766371e12fe06c82b8a

diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index e6debc895853..1c278de00ce1 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -530,7 +530,7 @@
   
 True
 False
-Center 
X
+Center X
 True
 centerxmtr:%
   
@@ -544,7 +544,7 @@
   
 True
 False
-Center 
Y
+Center Y
 True
 centerymtr:%
   
@@ -558,7 +558,7 @@
   
 True
 False
-From color 
percentage
+From color percentage
 True
 colorfrommtr:%
   
@@ -572,7 +572,7 @@
   
 True
 False
-To color 
percentage
+To color percentage
 True
 colortomtr:%
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source emfio/source filter/source lotuswordpro/source sc/source sfx2/source svtools/source sw/source vcl/source

2017-11-22 Thread Caolán McNamara

 basic/source/classes/image.cxx  |2 -
 emfio/source/reader/wmfreader.cxx   |   12 --
 filter/source/graphicfilter/ipbm/ipbm.cxx   |   12 +-
 filter/source/graphicfilter/ipict/ipict.cxx |8 +++---
 lotuswordpro/source/filter/LotusWordProImportFilter.cxx |2 -
 sc/source/ui/dbgui/scuiasciiopt.cxx |8 +-
 sfx2/source/appl/xpackcreator.cxx   |2 -
 svtools/source/svrtf/svparser.cxx   |   19 +++-
 sw/source/core/edit/edtox.cxx   |2 -
 sw/source/core/layout/laycache.cxx  |3 --
 sw/source/ui/index/cnttab.cxx   |2 -
 vcl/source/filter/graphicfilter2.cxx|   13 +-
 vcl/source/gdi/impgraph.cxx |2 -
 vcl/source/gdi/pngread.cxx  |2 -
 14 files changed, 40 insertions(+), 49 deletions(-)

New commits:
commit df2e78f1a8a1dc628eb26c8173ba1f6bae0ca6f4
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 10:02:51 2017 +

replace check of eof and GetError with good

Change-Id: I7d9f04262ab5420e9a14813fa1274bb9d01e3291
Reviewed-on: https://gerrit.libreoffice.org/45076
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index a773acfb7d7c..6fc7a50b17d7 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -73,7 +73,7 @@ void SbiImage::Clear()
 
 bool SbiGood( SvStream const & r )
 {
-return !r.eof() && r.GetError() == ERRCODE_NONE;
+return r.good();
 }
 
 // Open Record
diff --git a/emfio/source/reader/wmfreader.cxx 
b/emfio/source/reader/wmfreader.cxx
index 9f13b78db0c2..6599e54f8b17 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -1362,13 +1362,11 @@ namespace emfio
 mnCurrentAction++;
 mpInputStream->ReadUInt32(mnRecSize).ReadUInt16( nFunction 
);
 
-if(  mpInputStream->GetError()
-  || (mnRecSize < 3 )
-  || (mnRecSize == 3
- && nFunction == 0
- )
-  || mpInputStream->eof()
-  )
+if (
+ !mpInputStream->good() ||
+ (mnRecSize < 3) ||
+ (mnRecSize == 3 && nFunction == 0)
+   )
 {
 if( mpInputStream->eof() )
 mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR 
);
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx 
b/filter/source/graphicfilter/ipbm/ipbm.cxx
index ca63bb570b3e..3228b0bdc3ee 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -281,7 +281,7 @@ bool PBMReader::ImplReadBody()
 case 0 :
 while ( nHeight != mnHeight )
 {
-if ( mrPBM.eof() || mrPBM.GetError() )
+if (!mrPBM.good())
 return false;
 
 if ( --nShift < 0 )
@@ -303,7 +303,7 @@ bool PBMReader::ImplReadBody()
 case 1 :
 while ( nHeight != mnHeight )
 {
-if ( mrPBM.eof() || mrPBM.GetError() )
+if (!mrPBM.good())
 return false;
 
 mrPBM.ReadUChar( nDat );
@@ -321,7 +321,7 @@ bool PBMReader::ImplReadBody()
 case 2 :
 while ( nHeight != mnHeight )
 {
-if ( mrPBM.eof() || mrPBM.GetError() )
+if (!mrPBM.good())
 return false;
 
 sal_uInt8   nR, nG, nB;
@@ -346,7 +346,7 @@ bool PBMReader::ImplReadBody()
 case 0 :
 while ( !bFinished )
 {
-if ( mrPBM.eof() || mrPBM.GetError() )
+if (!mrPBM.good())
 return false;
 
 mrPBM.ReadUChar( nDat );
@@ -405,7 +405,7 @@ bool PBMReader::ImplReadBody()
 continue;
 }
 
-if ( mrPBM.eof() || mrPBM.GetError() )
+if (!mrPBM.good())
 return false;
 
 mrPBM.ReadUChar( nDat );
@@ -478,7 +478,7 @@ bool PBMReader::ImplReadBody()
 continue;
 }
 
-if ( mrPBM.eof() || mrPBM.GetError() )
+if (!mrPBM.good())
 return false;
 
 mrPBM.ReadUChar( nDat );
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index b5d88979f7c8..67292c76a46b 100644
--- a

[Libreoffice-commits] core.git: basctl/source basic/source connectivity/source cui/source emfio/source filter/source idl/inc include/tools linguistic/source lotuswordpro/source sc/source sfx2/source s

2017-11-22 Thread Caolán McNamara

 basctl/source/basicide/bastypes.cxx |2 -
 basic/source/basmgr/basmgr.cxx  |2 -
 basic/source/classes/image.cxx  |2 -
 basic/source/runtime/iosys.cxx  |2 -
 basic/source/runtime/methods.cxx|   10 ++---
 basic/source/runtime/methods1.cxx   |2 -
 connectivity/source/commontools/dbtools.cxx |2 -
 connectivity/source/drivers/dbase/DTable.cxx|2 -
 connectivity/source/drivers/flat/ETable.cxx |4 +-
 cui/source/options/personalization.cxx  |2 -
 emfio/source/reader/wmfreader.cxx   |6 +--
 filter/source/graphicfilter/ios2met/ios2met.cxx |2 -
 filter/source/graphicfilter/ipbm/ipbm.cxx   |   12 +++---
 filter/source/graphicfilter/ipict/ipict.cxx |   10 ++---
 filter/source/graphicfilter/itiff/ccidecom.cxx  |2 -
 filter/source/graphicfilter/itiff/itiff.cxx |4 +-
 filter/source/msfilter/msdffimp.cxx |4 +-
 idl/inc/lex.hxx |2 -
 include/tools/stream.hxx|1 
 linguistic/source/dicimp.cxx|6 +--
 lotuswordpro/source/filter/LotusWordProImportFilter.cxx |2 -
 sc/source/filter/dif/difimp.cxx |4 +-
 sc/source/filter/lotus/lotread.cxx  |4 +-
 sc/source/filter/qpro/qpro.cxx  |2 -
 sc/source/ui/dbgui/scuiasciiopt.cxx |6 +--
 sc/source/ui/docshell/impex.cxx |   10 ++---
 sc/source/ui/unoobj/scdetect.cxx|2 -
 sfx2/source/appl/xpackcreator.cxx   |2 -
 sfx2/source/doc/docfile.cxx |2 -
 sot/source/base/filelist.cxx|4 +-
 sot/source/sdstor/storinfo.cxx  |2 -
 sot/source/sdstor/ucbstorage.cxx|2 -
 starmath/source/mathtype.cxx|2 -
 svtools/source/svhtml/parhtml.cxx   |   24 ++--
 svtools/source/svrtf/svparser.cxx   |   18 -
 svx/source/gallery2/galtheme.cxx|2 -
 sw/source/core/edit/edtox.cxx   |2 -
 sw/source/core/layout/laycache.cxx  |2 -
 sw/source/filter/ascii/parasc.cxx   |6 +--
 sw/source/filter/ww8/ww8graf2.cxx   |2 -
 sw/source/ui/index/cnttab.cxx   |2 -
 tools/source/zcodec/zcodec.cxx  |4 +-
 unotools/source/streaming/streamwrap.cxx|2 -
 unotools/source/ucbhelper/xtempfile.cxx |2 -
 vcl/source/filter/graphicfilter2.cxx|   10 ++---
 vcl/source/filter/igif/gifread.cxx  |8 ++--
 vcl/source/filter/ipdf/pdfdocument.cxx  |   30 
 vcl/source/gdi/gdimtf.cxx   |2 -
 vcl/source/gdi/impgraph.cxx |2 -
 vcl/source/gdi/pngread.cxx  |4 +-
 vcl/source/gdi/regionband.cxx   |2 -
 vcl/unx/generic/print/common_gfx.cxx|2 -
 vcl/unx/generic/printer/jobdata.cxx |2 -
 vcl/unx/generic/printer/ppdparser.cxx   |8 ++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |4 +-
 writerfilter/source/rtftok/rtflookahead.cxx |4 +-
 writerfilter/source/rtftok/rtftokenizer.cxx |   10 ++---
 writerperfect/qa/unit/EPUBExportTest.cxx|2 -
 58 files changed, 139 insertions(+), 140 deletions(-)

New commits:
commit 2161d04688be77112c281a1ada5263b963677c43
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 09:47:52 2017 +

drop duplicate method

Change-Id: Idadd0a64e41cd02f5167b275081c3576a6224b12
Reviewed-on: https://gerrit.libreoffice.org/45075
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 951c25287a86..5e6cf568f1dd 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -623,7 +623,7 @@ sal_uLong CalcLineCount( SvStream& rStream )
 
 rStream.Seek( 0 );
 rStream.ReadChar( c );
-while ( !rStream.IsEof() )
+while ( !rStream.eof() )
 {
 if ( c == '\n' )
 nLFs++;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 24120034aecd..8c9429324fe9 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -941,7 +941,7 @@ bool BasicManager::ImpLoadLibrary( Ba

Re: Copyright infringement and future of Hunspell

2017-11-22 Thread Димитриј Мијоски

Really appreciate we resolved this. I have learned greatly. My mistake was 
really unintentional, I was not aware of possible consequences. Still would you 
be interested in making short video call to clear all doubts. We are available 
to do this right now.

On 21.11.2017 13:57, Németh László wrote:
Hi,

2017-11-17 19:44 GMT+01:00 Димитриј Мијоски 
mailto:dm...@hotmail.com>>:
> Reverted.
> https://github.com/hunspell/hunspell/commit/58dfe79637982c5c49658c57c3b01d4f44c07c19
> I guess everybody should be happy now. Life goes on. I won't touch
> version 1 code any more.

Thanks for reverting.

2017-11-18 1:00 GMT+01:00 Димитриј Мијоски 
mailto:dm...@hotmail.com>>:

@ everyone in this thread

Ok, can we conclude now. V1 is tri-license back as it was, V2 will be
LGPLv3 only, for the time being. I did the change because I wanted to
link V2 into V1, to have full backward compatibility. But, I gave it an
additional though and there is a simple solution to link V1 into V2 and
keep the whole package backward compatible (including ABI).

Once V2 is finished, if you like it, put it in LibreOffice. If you don't
like it, don't do it. We are really trying hard to make a good product.

This is not an option, because Hunspell development is part of LibreOffice.
Authors and main contributors are all LibreOffice (OpenOffice.org) developers.
Caolán and me used GitHub only as a git repository for Hunspell, fixing
Hunspell problems mostly reported by LibreOffice users.
Driving force and main target of Hunspell development is still LibreOffice.

I apologize for any inconveniences I created.

Thanks.

To solve this unfortunate situation, please, separate your "hunspell2" project
under a different gitHub project and name, without using "Hunspell" or
"Hunspell v2" titles for it.

This will help me a lot to continue Hunspell developments for LibreOffice
in the next few weeks and later.

Best regards,
Laszlo

Cheers,
Dimitrij.
___
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 'private/thb/gpg4libre-win32' - 3 commits - external/gpgmepp RepositoryExternal.mk xmlsecurity/inc xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

2017-11-22 Thread Thorsten Behrens

Rebased ref, commits from common ancestor:
commit 1fa0705c2caf70626d0a947bf1f1648e48e19bd8
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:53:25 2017 +0100

fixup

Change-Id: Id6a915604791e0e3aa0b4629527b00faa5242629

diff --git a/external/gpgmepp/Library_gpgmepp.mk 
b/external/gpgmepp/Library_gpgmepp.mk
index ead5a16a835f..7649753fe748 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -16,9 +16,8 @@ $(eval $(call gb_Library_use_externals,gpgmepp,\
libassuan \
 ))
 
-$(eval $(call \
-  gb_LinkTarget_use_external_project,$(call \
- gb_Library_get_linktarget,gpgmepp),gpgmepp,full))
+$(eval $(call gb_LinkTarget_use_external_project,\
+   $(call gb_Library_get_linktarget,gpgmepp),gpgmepp,full))
 
 $(eval $(call gb_Library_set_warnings_not_errors,gpgmepp))
 
commit 053baebb1c3f787aaadf21280bdf2d3964adc9b6
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:51:42 2017 +0100

fixup xmlsec linker probs

Change-Id: I9394907f143d862f40c95672f4e3398b65b7bd2c

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 5f3649dc5ab9..5bb1828f61ea 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_NO_XSLT \
-DXSECXMLSEC_DLLIMPLEMENTATION \
+   -DXSECGPG_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call 
gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec))
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 0698e91f422f..494dc6e30d40 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -25,7 +25,7 @@ public:
 /// Returns the SHA-256 thumbprint.
 ///
 /// @throws css::uno::RuntimeException
-virtual css::uno::Sequence getSHA256Thumbprint() = 0;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() = 0;
 
 protected:
 ~Certificate() noexcept = default;
diff --git a/xmlsecurity/source/gpg/CertificateImpl.hxx 
b/xmlsecurity/source/gpg/CertificateImpl.hxx
index 9db3ab85de14..63cddc6dc7b9 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.hxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.hxx
@@ -78,8 +78,8 @@ public:
 static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
 /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-virtual css::uno::Sequence getSHA256Thumbprint() override;
-virtual css::security::CertificateKind getCertificateKind() override;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() 
override;
+virtual css::security::CertificateKind SAL_CALL getCertificateKind() 
override;
 
 // Helper methods
 void setCertificate(GpgME::Context* ctx, const GpgME::Key& key);
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index b36b1c3c5d8f..94d53529bf21 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -80,7 +80,7 @@ class X509Certificate_MSCryptImpl : public 
::cppu::WeakImplHelper<
 virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) override;
 
 /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-virtual css::uno::Sequence getSHA256Thumbprint() override;
+virtual css::uno::Sequence SAL_CALL getSHA256Thumbprint() 
override;
 
 static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
 static X509Certificate_MSCryptImpl* getImplementation( const 
css::uno::Reference< css::uno::XInterface >& rObj ) ;
commit eb850588c27956d805782cbaa0534bb27ce79ef0
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:13:13 2017 +0100

remove remaining gpgme mentions, fix library_gpgmepp deps

Change-Id: I12f07d50c70f8a56ac519570b127ab45ddde485c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58bdfaadc450..995a490214ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3514,8 +3514,8 @@ endef
 
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
$$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
@@ -3542,16 +3542,16 @@ define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_use_package,$(1),gpgmepp)
 
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+

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

2017-11-22 Thread Caolán McNamara

 sc/source/filter/lotus/op.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 041e1ba3185fd73930129c19739ee62ba88826cc
Author: CaolÃ¡n McNamara 
Date:   Tue Nov 21 20:42:21 2017 +

good() includes !IsEof() already

Change-Id: I6eddd347333638c0a8ea924e6062f8e4d379a20e
Reviewed-on: https://gerrit.libreoffice.org/45074
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 0b65d7ceee50..6491b0c08ae1 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -662,7 +662,7 @@ void OP_ApplyPatternArea123(LotusContext& rContext, 
SvStream& rStream)
 break;
 }
 }
-while( nLevel && !rStream.IsEof() && rStream.good() );
+while( nLevel && rStream.good() );
 
 rContext.aLotusPatternPool.clear();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre-win32' - external/gpgmepp RepositoryExternal.mk

2017-11-22 Thread Thorsten Behrens

Rebased ref, commits from common ancestor:
commit 96ec95a358442aeb5130dd68d785d8884fe65404
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:13:13 2017 +0100

remove remaining gpgme mentions, fix library_gpgmepp deps

Change-Id: I12f07d50c70f8a56ac519570b127ab45ddde485c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58bdfaadc450..995a490214ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3514,8 +3514,8 @@ endef
 
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
$$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
@@ -3542,16 +3542,16 @@ define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_use_package,$(1),gpgmepp)
 
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
$$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
+   -L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ 
-lgpgmepp \
 )
 
-endif
+endef
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
gpgmepp \
@@ -3561,6 +3561,8 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo,\
 
 endif
 
+endif
+
 define gb_LinkTarget__use_dconf
 $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
 $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
diff --git a/external/gpgmepp/Library_gpgmepp.mk 
b/external/gpgmepp/Library_gpgmepp.mk
index 08f1ec003be6..eca519743b57 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -14,10 +14,9 @@ $(eval $(call gb_Library_use_unpacked,gpgmepp,gpgmepp))
 $(eval $(call gb_Library_use_externals,gpgmepp,\
libgpg-error \
libassuan \
+   gpgmepp \
 ))
 
-$(eval $(call gb_Library_use_external_project,gpgmepp,gpgmepp))
-
 $(eval $(call gb_Library_set_warnings_not_errors,gpgmepp))
 
 $(eval $(call gb_Library_set_include,gpgmepp,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Noel Grandin

 svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx |   58 -
 svx/source/dialog/ClassificationDialog.cxx  |   76 -
 svx/source/dialog/connctrl.cxx  |  106 +-
 svx/source/dialog/framelink.cxx |  124 +-
 svx/source/dialog/imapwnd.cxx   |  124 +-
 svx/source/dialog/langbox.cxx   |  186 +--
 svx/source/engine3d/obj3d.cxx   |  154 +--
 svx/source/engine3d/view3d.cxx  |  418 
 svx/source/fmcomp/gridcell.cxx  |  533 +-
 svx/source/fmcomp/gridctrl.cxx  |  100 -
 svx/source/form/fmobjfac.cxx|   48 
 svx/source/form/fmshimp.cxx |  126 +-
 svx/source/form/tbxform.cxx |   38 
 svx/source/gallery2/galbrws1.cxx|   34 
 svx/source/gallery2/galctrl.cxx |   86 -
 svx/source/gallery2/galtheme.cxx|  264 ++---
 svx/source/mnuctrls/smarttagmenu.cxx|   62 -
 svx/source/sdr/overlay/overlaytools.cxx |  161 +--
 svx/source/sdr/properties/attributeproperties.cxx   |   66 -
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   80 -
 svx/source/svdraw/svddrgmt.cxx  |  418 
 svx/source/svdraw/svdedtv1.cxx  |  332 +++---
 svx/source/svdraw/svdedtv2.cxx  |  567 +--
 svx/source/svdraw/svdfmtf.cxx   |  336 +++---
 svx/source/svdraw/svdhdl.cxx|  162 +--
 svx/source/svdraw/svdmrkv.cxx   |  526 +-
 svx/source/svdraw/svdogrp.cxx   |   83 -
 svx/source/svdraw/svdopath.cxx  |   34 
 svx/source/svdraw/svdotext.cxx  |  124 +-
 svx/source/svdraw/svdotextdecomposition.cxx |  616 ++--
 svx/source/svdraw/svdotxed.cxx  |   35 
 svx/source/svdraw/svdpage.cxx   |   35 
 svx/source/svdraw/svdpagv.cxx   |  352 +++---
 svx/source/svdraw/svdpntv.cxx   |   76 -
 svx/source/svdraw/svdtext.cxx   |   72 -
 svx/source/table/tablecontroller.cxx|  145 +-
 svx/source/tbxctrls/colrctrl.cxx|   36 
 svx/source/tbxctrls/itemwin.cxx |   94 -
 svx/source/tbxctrls/layctrl.cxx |   58 -
 svx/source/tbxctrls/linectrl.cxx|   72 -
 svx/source/tbxctrls/tbcontrl.cxx|  130 +-
 svx/source/tbxctrls/tbunosearchcontrollers.cxx  |   80 -
 svx/source/tbxctrls/tbxcolorupdate.cxx  |  178 +--
 svx/source/unodraw/unoshape.cxx |   58 -
 svx/source/xoutdev/_xpoly.cxx   |   96 -
 45 files changed, 3783 insertions(+), 3776 deletions(-)

New commits:
commit 3fbbd74b7bc6aef4af5f0c4b23a73a6726b9afbf
Author: Noel Grandin 
Date:   Tue Nov 21 15:49:27 2017 +0200

loplugin:flatten in svx

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

diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx 
b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
index 01fb333104c0..1e0ca231c092 100644
--- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
+++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
@@ -40,40 +40,40 @@ void 
VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
 {
 VCLXAccessibleComponent::FillAccessibleRelationSet( rRelationSet );
 VclPtr pDlg = GetWindow();
-if ( pDlg )
+if ( !pDlg )
+return;
+
+SvxSearchDialog* pSrchDlg = static_cast( pDlg.get() );
+vcl::Window* pDocWin = pSrchDlg->GetDocWin();
+if ( !pDocWin )
 {
-SvxSearchDialog* pSrchDlg = static_cast( pDlg.get() 
);
-vcl::Window* pDocWin = pSrchDlg->GetDocWin();
-if ( !pDocWin )
-{
-return;
-}
-Reference < css::accessibility::XAccessible > xDocAcc = 
pDocWin->GetAccessible();
-if ( !xDocAcc.is() )
-{
-return;
-}
-Reference< css::accessibility::XAccessibleGetAccFlowTo > 
xGetAccFlowTo( xDocAcc, UNO_QUERY );
-if ( !xGetAccFlowTo.is() )
-{
-return;
-}
+return;
+}
+Reference < css::accessibility::XAccessible > xDocAcc = 
pDocWin->GetAccessible();
+if ( !xDocAcc.is() )
+

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

2017-11-22 Thread Tor Lillqvist

 vcl/osx/salprn.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a2be89620a56a658fe69638517cbacebeec7f30
Author: Tor Lillqvist 
Date:   Mon Nov 13 15:18:13 2017 +0200

Apparent fix for what seems like a copy-paste error by me in 2014

(in 5f27a6864420815d0d0abc409333fec963536faf.) Whether this has
anything to do with tdf#92190 is unclear. Some experimentation indeed
seems to indicate that it fixes the problem, but I am not 100% sure.
Reproducing the bug fully realistically would require using a printer
with actual Letter size paper.

Thanks to Telesto for noticing this copy-paste issue.

Change-Id: I853aaaf2b7a19380dce908f93349b001bf3feb92
Reviewed-on: https://gerrit.libreoffice.org/44679
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 9f8429d81c08cc40d5b1210cb6e4b383316cdc75)
Signed-off-by: Andras Timar 

diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 4eba68e093bd..07671bf6201f 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -65,7 +65,7 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const 
SalPrinterQueueInfo& i_rQueue ) :
 mpPrintInfo = [pShared copy];
 [mpPrintInfo setPrinter: mpPrinter];
 #if MACOSX_SDK_VERSION >= 1090
-mePageOrientation = ([mpPrintInfo orientation] == 
NSPaperOrientationPortrait) ? Orientation::Landscape : Orientation::Portrait;
+mePageOrientation = ([mpPrintInfo orientation] == 
NSPaperOrientationLandscape) ? Orientation::Landscape : Orientation::Portrait;
 [mpPrintInfo setOrientation: NSPaperOrientationPortrait];
 #else
 mePageOrientation = ([mpPrintInfo orientation] == 
NSLandscapeOrientation) ? Orientation::Landscape : Orientation::Portrait;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre-win32' - 2 commits - external/gpgmepp RepositoryExternal.mk

2017-11-22 Thread Thorsten Behrens

 RepositoryExternal.mk   |   43 
 external/gpgmepp/Library_gpgmepp.mk |3 --
 2 files changed, 26 insertions(+), 20 deletions(-)

New commits:
commit 8bab24efd3caa1805e192a7864ac3da6f46d87b9
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:13:13 2017 +0100

remove remaining gpgme mentions, fix library_gpgmepp deps

Change-Id: I12f07d50c70f8a56ac519570b127ab45ddde485c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58bdfaadc450..e95ba84e638f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3514,8 +3514,8 @@ endef
 
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
$$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
@@ -3542,13 +3542,13 @@ define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_use_package,$(1),gpgmepp)
 
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
$$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
+   -L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ 
-lgpgmepp \
 )
 
 endif
diff --git a/external/gpgmepp/Library_gpgmepp.mk 
b/external/gpgmepp/Library_gpgmepp.mk
index 08f1ec003be6..eca519743b57 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -14,10 +14,9 @@ $(eval $(call gb_Library_use_unpacked,gpgmepp,gpgmepp))
 $(eval $(call gb_Library_use_externals,gpgmepp,\
libgpg-error \
libassuan \
+   gpgmepp \
 ))
 
-$(eval $(call gb_Library_use_external_project,gpgmepp,gpgmepp))
-
 $(eval $(call gb_Library_set_warnings_not_errors,gpgmepp))
 
 $(eval $(call gb_Library_set_include,gpgmepp,\
commit 2e531eb9fde78fab2ccf9986d0d7c1f0b886d219
Author: Thorsten Behrens 
Date:   Wed Nov 22 12:06:20 2017 +0100

fixup external deps

Change-Id: I191435f005017c50e5ee6670edbd9deebf5f7280

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 78cff638ebaf..58bdfaadc450 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3512,8 +3512,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-endif
-
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
@@ -3521,37 +3519,46 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
+$(call gb_LinkTarget_use_libraries,$(1),\
+   gpgmepp \
 )
-$(call gb_LinkTarget_use_package,$(1),gpgme)
 
 endef
 
-ifneq ($(filter MACOSX LINUX,$(OS)),)
-
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   gpgmepp \
libassuan \
libgpg-error \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   gpgmepp \
+))
+
 endif
 
-ifneq ($(filter WNT,$(OS)),)
+ifneq ($(filter MACOSX LINUX,$(OS)),)
+
+define gb_LinkTarget__use_gpgmepp
+$(call gb_LinkTarget_use_package,$(1),gpgmepp)
+
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   $$(GPG_ERROR_CFLAGS) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
+)
+
+endif
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   gpgmepp \
libassuan \
libgpg-error \
 ))
 
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
-   gpgme \
-   gpgmepp \
-))
-
-endif
-
 endif
 
 define gb_LinkTarget__use_dconf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Yousuf Philips

 cui/uiconfig/ui/backgroundpage.ui |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4b7490fe49bb93f895e974602a2616fa80b74019
Author: Yousuf Philips 
Date:   Tue Nov 21 02:19:39 2017 +0400

tdf#113880 a11y: improve accessibility of table background tab

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

diff --git a/cui/uiconfig/ui/backgroundpage.ui 
b/cui/uiconfig/ui/backgroundpage.ui
index c29f179da611..0fd12039a476 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -44,6 +44,7 @@
 True
 A_s:
 True
+selectlb
   
   
 0
@@ -67,9 +68,10 @@
   
 False
 True
-0
 F_or:
 True
+tablelb
+0
   
   
 2
@@ -258,8 +260,8 @@
 False
 True
 True
-0
 
+0
   
   
 0
@@ -271,8 +273,8 @@
 True
 False
 True
-0
 Unlinked image
+0
   
   
 0
@@ -283,8 +285,8 @@
   
 False
 True
-0
 Find images
+0
   
   
 0
@@ -474,8 +476,6 @@
 1
   
 
-
-
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Muhammet Kara

 cui/source/customize/CommandCategoryListBox.cxx |   99 +++-
 cui/source/inc/CommandCategoryListBox.hxx   |5 +
 2 files changed, 102 insertions(+), 2 deletions(-)

New commits:
commit 3b4d2cfaaf2a6088304d65a608a9034df701537b
Author: Muhammet Kara 
Date:   Mon Nov 20 08:50:15 2017 +0300

tdf#112207: Allow assigning styles to ui elements

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

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index e307bd99f037..1763196db5ab 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -32,12 +32,14 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 
 CommandCategoryListBox::CommandCategoryListBox(vcl::Window* pParent)
 : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
+, pStylesInfo( nullptr )
 {
 SetDropDownLineCount(25);
 
@@ -64,6 +66,16 @@ void CommandCategoryListBox::dispose()
 void CommandCategoryListBox::ClearAll()
 {
 //TODO: Handle SfxCfgKind::GROUP_SCRIPTCONTAINER when it gets added to Init
+// Clear style info objects from m_aGroupInfo vector to avoid memory leak
+for (const auto & It : m_aGroupInfo)
+{
+if ( It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject )
+{
+SfxStyleInfo_Impl* pStyle = 
static_cast(It->pObject);
+delete pStyle;
+}
+}
+
 m_aGroupInfo.clear();
 Clear();
 }
@@ -84,6 +96,17 @@ void CommandCategoryListBox::Init(
 
m_xModuleCategoryInfo.set(m_xGlobalCategoryInfo->getByName(m_sModuleLongName), 
css::uno::UNO_QUERY_THROW);
 m_xUICmdDescription   = css::frame::theUICommandDescription::get( 
m_xContext );
 
+// Support style commands
+css::uno::Reference xController;
+css::uno::Reference xModel;
+if (xFrame.is())
+xController = xFrame->getController();
+if (xController.is())
+xModel = xController->getModel();
+
+m_aStylesInfo.init(sModuleLongName, xModel);
+SetStylesInfo(&m_aStylesInfo);
+
 / InitModule Start /
 try
 {
@@ -124,7 +147,12 @@ void CommandCategoryListBox::Init(
 SetEntryData( nEntryPos, m_aGroupInfo.back().get() );
 }
 
-
+// Add styles
+OUString sStyle( CuiResId(RID_SVXSTR_GROUP_STYLES) );
+nEntryPos = InsertEntry( sStyle );
+//TODO: last param should contain user data?
+m_aGroupInfo.push_back( o3tl::make_unique( 
SfxCfgKind::GROUP_STYLES, 0, nullptr ) );
+SetEntryData( nEntryPos, m_aGroupInfo.back().get() );
 }
 catch(const css::uno::RuntimeException&)
 { throw; }
@@ -250,7 +278,69 @@ void CommandCategoryListBox::categorySelected(  const 
VclPtr lStyleFamilies = 
pStylesInfo->getStyleFamilies();
+
+for ( const auto & pIt : lStyleFamilies )
+{
+if ( pIt.sLabel.isEmpty() )
+{
+continue;
+}
+
+SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(
+pIt.sLabel, // Name of the style family
+Image( BitmapEx(RID_CUIBMP_EXPANDED) ), Image( 
BitmapEx(RID_CUIBMP_COLLAPSED) ) );
+
+m_aGroupInfo.push_back( o3tl::make_unique( 
SfxCfgKind::GROUP_STYLES, 0 ) );
+SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get();
+pFuncEntry->SetUserData(pGrpInfo);
+pFuncEntry->EnableChildrenOnDemand();
+
+const std::vector< SfxStyleInfo_Impl > lStyles = 
pStylesInfo->getStyles(pIt.sFamily);
+
+// Setup search filter parameters
+m_searchOptions.searchString = filterTerm;
+utl::TextSearch textSearch( m_searchOptions );
+
+// Insert children (styles)
+for ( const auto & pStyleIt : lStyles )
+{
+OUString sUIName = pStyleIt.sLabel;
+sal_Int32 aStartPos = 0;
+sal_Int32 aEndPos = sUIName.getLength();
+
+// Apply the search filter
+if (!filterTerm.isEmpty()
+&& !textSearch.SearchForward( sUIName, &aStartPos, 
&aEndPos ) )
+{
+continue;
+}
+
+SfxStyleInfo_Impl* pStyle = new 
SfxStyleInfo_Impl(pStyleIt);
+
+SvTreeListEntry* pSubFuncEntry = 
pFunctionListBox->InsertEntry(
+sUIName, pFuncEntry );
+
+m_aGroupInfo.push_back(
+o3tl::make_unique(
+SfxCfgKind::GROUP_STYLES, 0, pStyle ) );
+
+m_aGroupInfo.back()->sCommand = pStyle->sCommand;
+

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

2017-11-22 Thread Noel Grandin

 compilerplugins/clang/flatten.cxx   |  247 +++-
 compilerplugins/clang/test/flatten.cxx  |   49 +
 svtools/source/brwbox/brwbox1.cxx   |  603 +---
 svtools/source/brwbox/brwbox2.cxx   |   86 +-
 svtools/source/brwbox/brwbox3.cxx   |   30 
 svtools/source/brwbox/brwhead.cxx   |   52 -
 svtools/source/brwbox/editbrowsebox.cxx |  183 +++---
 svtools/source/brwbox/editbrowsebox2.cxx|   94 +--
 svtools/source/config/apearcfg.cxx  |   46 -
 svtools/source/config/colorcfg.cxx  |   28 
 svtools/source/config/helpopt.cxx   |   98 +--
 svtools/source/config/htmlcfg.cxx   |  120 +--
 svtools/source/contnr/fileview.cxx  |   24 
 svtools/source/contnr/foldertree.cxx|   86 +-
 svtools/source/contnr/iconviewimpl.cxx  |   52 -
 svtools/source/contnr/imivctl1.cxx  |  194 +++---
 svtools/source/contnr/imivctl2.cxx  |   34 -
 svtools/source/contnr/ivctrl.cxx|   80 +-
 svtools/source/contnr/simptabl.cxx  |   46 -
 svtools/source/contnr/svimpbox.cxx  |  288 -
 svtools/source/contnr/svlbitm.cxx   |   46 -
 svtools/source/contnr/svtabbx.cxx   |   82 +-
 svtools/source/contnr/treelist.cxx  |   56 -
 svtools/source/contnr/treelistbox.cxx   |  316 +-
 svtools/source/control/accessibleruler.cxx  |   48 -
 svtools/source/control/autocmpledit.cxx |   20 
 svtools/source/control/calendar.cxx |  158 ++---
 svtools/source/control/ctrlbox.cxx  |  198 +++---
 svtools/source/control/headbar.cxx  |  320 +-
 svtools/source/control/inettbc.cxx  |   82 +-
 svtools/source/control/roadmap.cxx  |   52 -
 svtools/source/control/ruler.cxx|  508 
 svtools/source/control/tabbar.cxx   |  516 -
 svtools/source/control/toolbarmenu.cxx  |  102 +--
 svtools/source/control/toolbarmenuacc.cxx   |   60 -
 svtools/source/control/valueacc.cxx |  112 +--
 svtools/source/control/valueset.cxx |  526 -
 svtools/source/dialogs/PlaceEditDialog.cxx  |   40 -
 svtools/source/dialogs/addresstemplate.cxx  |   24 
 svtools/source/dialogs/wizdlg.cxx   |   80 +-
 svtools/source/edit/editsyntaxhighlighter.cxx   |   50 -
 svtools/source/filter/DocumentToGraphicRenderer.cxx |   36 -
 svtools/source/filter/SvFilterOptionsDialog.cxx |   46 -
 svtools/source/filter/exportdialog.cxx  |   77 +-
 svtools/source/graphic/descriptor.cxx   |   86 +-
 svtools/source/graphic/grfcache.cxx |   52 -
 svtools/source/graphic/grfmgr.cxx   |  102 +--
 svtools/source/graphic/grfmgr2.cxx  |  160 ++---
 svtools/source/graphic/provider.cxx |  266 
 svtools/source/hatchwindow/documentcloser.cxx   |   68 +-
 svtools/source/hatchwindow/hatchwindow.cxx  |   22 
 svtools/source/hatchwindow/ipwin.cxx|   75 +-
 svtools/source/misc/embedhlp.cxx|   30 
 svtools/source/misc/imap.cxx|   20 
 svtools/source/misc/imap2.cxx   |  122 ++--
 svtools/source/misc/imap3.cxx   |   56 -
 svtools/source/misc/templatefoldercache.cxx |   38 -
 svtools/source/misc/transfer.cxx|  180 ++---
 svtools/source/misc/transfer2.cxx   |   32 -
 svtools/source/svhtml/htmlsupp.cxx  |   46 -
 svtools/source/svrtf/svparser.cxx   |   84 +-
 svtools/source/uno/framestatuslistener.cxx  |   20 
 svtools/source/uno/generictoolboxcontroller.cxx |   88 +-
 svtools/source/uno/popupmenucontrollerbase.cxx  |   72 +-
 svtools/source/uno/statusbarcontroller.cxx  |   76 +-
 svtools/source/uno/svtxgridcontrol.cxx  |   32 -
 svtools/source/uno/toolboxcontroller.cxx|  250 
 svtools/source/uno/treecontrolpeer.cxx  |  282 -
 svtools/source/uno/unoevent.cxx |   24 
 svtools/source/uno/unoiface.cxx |  380 ++--
 70 files changed, 4456 insertions(+), 4202 deletions(-)

New commits:
commit 1ae61b0ac4187b2938647f3ca0289a070a5dc7d2
Author: Noel Grandin 
Date:   Wed Nov 22 11:26:08 2017 +0200

loplugin:flatten in svtools

almost completely automatically rewritten, only had to tweak
the indentation on a couple of lines.

Change-Id: Ieec92e5b602d180d7ec556e3421ce3c835c1f646
Reviewed-on: https://gerrit.libreoffice.org/45072
Reviewed-by: Noel Grandin 
Teste

[Libreoffice-commits] core.git: 5 commits - ios/CustomTarget_iOS.mk ios/LibreOfficeKit ios/LibreOfficeLight ios/loApp.xcconfig.in solenv/gbuild

2017-11-22 Thread jan Iversen

 ios/CustomTarget_iOS.mk
  |2 
 ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
  |4 
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
  |  168 --
 
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
   |   76 +++-
 
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
 |binary
 
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-180.png
 |binary
 
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
  |binary
 
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-60.png
  |binary
 
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-87.png
  |binary
 
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json
  |   49 --
 ios/LibreOfficeLight/LibreOfficeLight/Info.plist   
  |2 
 ios/loApp.xcconfig.in  
  |4 
 solenv/gbuild/platform/iOS.mk  
  |3 
 13 files changed, 210 insertions(+), 98 deletions(-)

New commits:
commit ede08b49c6336b220ef6e07f65935512537f7dc8
Author: jan Iversen 
Date:   Wed Nov 22 11:45:12 2017 +0100

iOS, update icons to support new models

Update of icons and start image (xib file not png)

Change-Id: I172c4e6eb0f27d6dd05b9eb28b2e352f29578279

diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
 
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
index c20b7bf1cb1f..b179c2c532c9 100644
--- 
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ 
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,10 +1,16 @@
 {
   "images" : [
 {
-  "size" : "29x29",
-  "idiom" : "ipad",
-  "filename" : "LibreOffice-29.png",
-  "scale" : "1x"
+  "idiom" : "iphone",
+  "size" : "20x20",
+  "filename" : "LibreOffice-40.png",
+  "scale" : "2x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "20x20",
+  "filename" : "LibreOffice-60.png",
+  "scale" : "3x"
 },
 {
   "size" : "29x29",
@@ -13,33 +19,69 @@
   "scale" : "2x"
 },
 {
+  "idiom" : "iphone",
   "size" : "29x29",
-  "idiom" : "ipad",
-  "filename" : "LibreOffice-58.png",
+  "filename" : "LibreOffice-87.png",
+  "scale" : "3x"
+},
+{
+  "size" : "40x40",
+  "idiom" : "iphone",
+  "filename" : "LibreOffice-80.png",
   "scale" : "2x"
 },
 {
+  "idiom" : "iphone",
   "size" : "40x40",
+  "filename" : "LibreOffice-120.png",
+  "scale" : "3x"
+},
+{
+  "size" : "60x60",
+  "idiom" : "iphone",
+  "filename" : "LibreOffice-120.png",
+  "scale" : "2x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "60x60",
+  "filename" : "LibreOffice-180.png",
+  "scale" : "3x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "20x20",
+  "filename" : "LibreOffice-20.png",
+  "scale" : "1x"
+},
+{
   "idiom" : "ipad",
+  "size" : "20x20",
   "filename" : "LibreOffice-40.png",
+  "scale" : "2x"
+},
+{
+  "size" : "29x29",
+  "idiom" : "ipad",
+  "filename" : "LibreOffice-29.png",
   "scale" : "1x"
 },
 {
-  "size" : "40x40",
+  "size" : "29x29",
   "idiom" : "ipad",
-  "filename" : "LibreOffice-80.png",
+  "filename" : "LibreOffice-58.png",
   "scale" : "2x"
 },
 {
   "size" : "40x40",
-  "idiom" : "iphone",
-  "filename" : "LibreOffice-80.png",
-  "scale" : "2x"
+  "idiom" : "ipad",
+  "filename" : "LibreOffice-40.png",
+  "scale" : "1x"
 },
 {
-  "size" : "60x60",
-  "idiom" : "iphone",
-  "filename" : "LibreOffice-120.png",
+  "size" : "40x40",
+  "idiom" : "ipad",
+  "filename" : "LibreOffice-80.png",
   "scale" : "2x"
 },
 {
@@ -55,6 +97,12 @@
   "scale" : "2x"
 },
 {
+  "idiom" : "ipad",
+  "size" : "83.5x83.5",
+  "filename" : "LibreOffice-167.png",
+  "scale" : "2x"
+},
+{
   "size" : "1024x1024",
   "idiom" : "ios-marketing",
   "filename" : "LibreOffice-1024.png",
diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
 
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
new file mode 100644
index ..ef0033f9a8c5
Binary files /dev/null and 
b/ios/LibreOfficeLight/LibreOfficeLi

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

2017-11-22 Thread Caolán McNamara

 external/cairo/UnpackedTarball_pixman.mk   |1 +
 external/cairo/pixman/pixman-ofz4372.patch |   16 
 2 files changed, 17 insertions(+)

New commits:
commit 67304b83a7933a75ed24dd41a311d0250f15a203
Author: CaolÃ¡n McNamara 
Date:   Wed Nov 22 10:37:20 2017 +

ofz#4372 Undefined-shift

upstreamed as https://bugs.freedesktop.org/show_bug.cgi?id=103845

Change-Id: I48430b2ab62991345863bceeaf3a6918f9dd1fda
Reviewed-on: https://gerrit.libreoffice.org/45078
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/external/cairo/UnpackedTarball_pixman.mk 
b/external/cairo/UnpackedTarball_pixman.mk
index 777a47cc30fd..6669a8f8be66 100644
--- a/external/cairo/UnpackedTarball_pixman.mk
+++ b/external/cairo/UnpackedTarball_pixman.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo))
 
 $(eval $(call gb_UnpackedTarball_add_patches,pixman,\
external/cairo/pixman/pixman-0.24.4.patch \
+   external/cairo/pixman/pixman-ofz4372.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/cairo/pixman/pixman-ofz4372.patch 
b/external/cairo/pixman/pixman-ofz4372.patch
new file mode 100644
index ..aaf83f11d414
--- /dev/null
+++ b/external/cairo/pixman/pixman-ofz4372.patch
@@ -0,0 +1,16 @@
+--- misc/pixman/pixman/pixman-solid-fill.c
 misc/build/pixman/pixman/pixman-solid-fill.c
+@@ -30,10 +30,10 @@ static uint32_t
+ color_to_uint32 (const pixman_color_t *color)
+ {
+ return
+-(color->alpha >> 8 << 24) |
+-(color->red >> 8 << 16) |
++((uint32_t)color->alpha >> 8 << 24) |
++((uint32_t)color->red >> 8 << 16) |
+ (color->green & 0xff00) |
+-(color->blue >> 8);
++((uint32_t)color->blue >> 8);
+ }
+ 
+ static argb_t
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Stephan Bergmann

 sw/source/core/unocore/unoframe.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0717f32de0fa96ccf353ac074d040df0f4e27751
Author: Stephan Bergmann 
Date:   Tue Nov 21 23:19:27 2017 +0100

Missing GraphicObject destruction, memory leak

...causes e.g. a leftover temp file like
_anonymous_namespace___WpftWriterFilterTest__test_9m9gdo.tmp in $TMPDIR 
during
CppunitTest_writerperfect_writer's processing of
writerperfect/qa/unit/data/writer/libwps/Write_3.1.wri.

The code lacking the delete was originally introduced with
e3911a61e60610d32d4f41ab0361ff495bbf3f95 "INTEGRATION: CWS fwk59: #i63867# 
let
the replacement image be imported", then heavily modified with
ec8258f3b78f6bc00a108fe0bef7656b86812b7d "INTEGRATION: CWS xmlfilter06".

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

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 8ae5042534d0..d9c508893107 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1667,6 +1667,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 aGraphic = pGrfObj->GetGraphic();
 bApply = true;
 }
+delete pGrfObj;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread tagezi

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

New commits:
commit 2f34bec2a7b939e24c3c5e884fdfe2057b732248
Author: tagezi 
Date:   Wed Nov 22 01:01:43 2017 +0200

tdf#39593 deduplicate code in ScOutputData

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

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 1e84d2920504..7abff2e541e2 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -250,6 +250,8 @@ private:
 bool Clip( DrawEditParam& rParam, const Size& aCellSize, OutputAreaParam& 
aAreaParam,
long nEngineHeight, bool bWrapFields);
 
+bool AdjustAreaParamClipRect(OutputAreaParam& aAreaParam);
+
 public:
 /**
  * @param nNewScrX: X-Offset in the output device for the table
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index a257c8f1a576..a3a0348a3dd5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1847,30 +1847,9 @@ tools::Rectangle ScOutputData::LayoutStrings(bool 
bPixelToLogic, bool bPaint, co
 long nOutHeight = aAreaParam.maAlignRect.GetHeight();
 
 bool bOutside = ( aAreaParam.maClipRect.Right() < nScrX || 
aAreaParam.maClipRect.Left() >= nScrX + nScrW );
-if ( aAreaParam.maClipRect.Left() < nScrX )
-{
-aAreaParam.maClipRect.Left() = nScrX;
-aAreaParam.mbLeftClip = true;
-}
-if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
-{
-aAreaParam.maClipRect.Right() = nScrX + nScrW; 
 //! minus one?
-aAreaParam.mbRightClip = true;
-}
-
+// Take adjusted values of aAreaParam.mbLeftClip and 
aAreaParam.mbRightClip
+bool bVClip = AdjustAreaParamClipRect(aAreaParam);
 bool bHClip = aAreaParam.mbLeftClip || 
aAreaParam.mbRightClip;
-bool bVClip = false;
-
-if ( aAreaParam.maClipRect.Top() < nScrY )
-{
-aAreaParam.maClipRect.Top() = nScrY;
-bVClip = true;
-}
-if ( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
-{
-aAreaParam.maClipRect.Bottom() = nScrY + nScrH;
 //! minus one?
-bVClip = true;
-}
 
 // check horizontal space
 
@@ -2740,6 +2719,35 @@ void 
ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, const
 lcl_DoHyperlinkResult(pDev, aURLRect, maCell);
 }
 
+// Returns true if the rect is clipped vertically
+bool ScOutputData::AdjustAreaParamClipRect(OutputAreaParam& aAreaParam)
+{
+if( aAreaParam.maClipRect.Left() < nScrX )
+{
+aAreaParam.maClipRect.Left() = nScrX;
+aAreaParam.mbLeftClip = true;
+}
+if( aAreaParam.maClipRect.Right() > nScrX + nScrW )
+{
+aAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
+aAreaParam.mbRightClip = true;
+}
+
+bool bVClip = false;
+
+if( aAreaParam.maClipRect.Top() < nScrY )
+{
+aAreaParam.maClipRect.Top() = nScrY;
+bVClip = true;
+}
+if( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
+{
+aAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one?
+bVClip = true;
+}
+return bVClip;
+}
+
 void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
 {
 OSL_ASSERT(rParam.meOrient == SvxCellOrientation::Standard);
@@ -2970,37 +2978,10 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 if (bOutside)
 return;
 
-if ( aAreaParam.maClipRect.Left() < nScrX )
-{
-aAreaParam.maClipRect.Left() = nScrX;
-aAreaParam.mbLeftClip = true;
-}
-if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
-{
-aAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
-aAreaParam.mbRightClip = true;
-}
-
-bool bClip = aAreaParam.mbLeftClip || aAreaParam.mbRightClip;
+// Also take fields in a cell with automatic breaks into account: clip to 
cell width
+bool bClip = AdjustAreaParamClipRect(aAreaParam) || aAreaParam.mbLeftClip 
|| aAreaParam.mbRightClip || bWrapFields;
 bool bSimClip = false;
 
-if ( bWrapFields )
-{
-//  Fields in a cell with automatic breaks: clip to cell width
-bClip = true;
-}
-
-if ( aAreaParam.maClipRect.Top() < nScrY )
-{
-aAreaParam.maClipRect.Top() = nScrY;
-bClip = true;
-}

[Libreoffice-commits] core.git: filter/source include/filter solenv/clang-format starmath/source sw/qa sw/source writerfilter/inc writerfilter/qa writerfilter/source

2017-11-22 Thread Miklos Vajna

 filter/source/msfilter/rtfutil.cxx|  129 
 include/filter/msfilter/rtfutil.hxx   |   17 
 solenv/clang-format/blacklist |   50 
 starmath/source/rtfexport.cxx |  334 -
 starmath/source/rtfexport.hxx |2 
 sw/qa/extras/rtfexport/rtfexport.cxx  |  586 +-
 sw/qa/extras/rtfexport/rtfexport2.cxx |  687 ++-
 sw/qa/extras/rtfexport/rtfexport3.cxx |   25 
 sw/qa/extras/rtfimport/rtfimport.cxx  |  454 +-
 sw/source/filter/rtf/swparrtf.cxx |   57 
 sw/source/filter/ww8/rtfattributeoutput.cxx   | 2533 ++--
 sw/source/filter/ww8/rtfattributeoutput.hxx   |   92 
 sw/source/filter/ww8/rtfexport.cxx|  502 +-
 sw/source/filter/ww8/rtfexport.hxx|   64 
 sw/source/filter/ww8/rtfexportfilter.cxx  |   25 
 sw/source/filter/ww8/rtfexportfilter.hxx  |   22 
 sw/source/filter/ww8/rtfsdrexport.cxx |  589 +-
 sw/source/filter/ww8/rtfsdrexport.hxx |6 
 sw/source/filter/ww8/rtfstringbuffer.cxx  |   22 
 sw/source/filter/ww8/rtfstringbuffer.hxx  |1 
 writerfilter/inc/rtftok/RTFDocument.hxx   |3 
 writerfilter/qa/cppunittests/rtftok/testrtftok.cxx|   28 
 writerfilter/source/rtftok/README |   11 
 writerfilter/source/rtftok/astyle.options |   11 
 writerfilter/source/rtftok/rtfcharsets.cxx|   66 
 writerfilter/source/rtftok/rtfcontrolwords.cxx| 3747 --
 writerfilter/source/rtftok/rtfcontrolwords.hxx|1 
 writerfilter/source/rtftok/rtfdispatchdestination.cxx | 1097 ++---
 writerfilter/source/rtftok/rtfdispatchflag.cxx| 1739 
 writerfilter/source/rtftok/rtfdispatchsymbol.cxx  |  650 +--
 writerfilter/source/rtftok/rtfdispatchvalue.cxx   | 2457 ++-
 writerfilter/source/rtftok/rtfdocumentfactory.cxx |   17 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx| 3621 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|  107 
 writerfilter/source/rtftok/rtffly.hxx |  104 
 writerfilter/source/rtftok/rtflookahead.cxx   |   52 
 writerfilter/source/rtftok/rtflookahead.hxx   |6 
 writerfilter/source/rtftok/rtfreferenceproperties.cxx |5 
 writerfilter/source/rtftok/rtfreferenceproperties.hxx |   14 
 writerfilter/source/rtftok/rtfreferencetable.cxx  |1 
 writerfilter/source/rtftok/rtfreferencetable.hxx  |4 
 writerfilter/source/rtftok/rtfsdrimport.cxx   |  484 +-
 writerfilter/source/rtftok/rtfsdrimport.hxx   |   42 
 writerfilter/source/rtftok/rtfskipdestination.cxx |   17 
 writerfilter/source/rtftok/rtfskipdestination.hxx |1 
 writerfilter/source/rtftok/rtfsprm.cxx|  111 
 writerfilter/source/rtftok/rtfsprm.hxx|   37 
 writerfilter/source/rtftok/rtftokenizer.cxx   |  205 
 writerfilter/source/rtftok/rtftokenizer.hxx   |   19 
 writerfilter/source/rtftok/rtfvalue.cxx   |  160 
 writerfilter/source/rtftok/rtfvalue.hxx   |8 
 51 files changed, 11006 insertions(+), 10016 deletions(-)

New commits:
commit fd6150915253e382a7e9f674fe23a72a9a801761
Author: Miklos Vajna 
Date:   Wed Nov 22 09:20:23 2017 +0100

RTF filter: drop now redundant astyle.options

I (tried to) keep the RTF filter style consistent locally with astyle in
the past, but now that's redundant when we have an enforcing
clang-format mechanism in place. So drop the astyle config and switch to
clang-format in the RTF filter case.

To minimize backport pain, do this shortly before the libreoffice-6-0
branch-off.

Change-Id: I708dbeb0b5ad2afacc90029ee5abba9495f4601f

diff --git a/filter/source/msfilter/rtfutil.cxx 
b/filter/source/msfilter/rtfutil.cxx
index ad1e9d13fbfa..279fe123e5b5 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -16,17 +16,16 @@ namespace msfilter
 {
 namespace rtfutil
 {
-
 OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
 {
 sal_Char aNToABuf[] = "";
 
 OSL_ENSURE(nLen < sizeof(aNToABuf), "nLen is too big");
 if (nLen >= sizeof(aNToABuf))
-nLen = (sizeof(aNToABuf)-1);
+nLen = (sizeof(aNToABuf) - 1);
 
 // Set pointer to the buffer end
-sal_Char* pStr = aNToABuf + (sizeof(aNToABuf)-1);
+sal_Char* pStr = aNToABuf + (sizeof(aNToABuf) - 1);
 for (sal_uInt8 n = 0; n < nLen; ++n)
 {
 *(--pStr) = (sal_Char)(nHex & 0xf) + 48;
@@ -48,7 +47,8 @@ OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
 // However the "Mathematics" section has an example that shows the code point
 // U+1D44E being encoded as UTF-16 surrogate pair "\u-10187?\u-9138?", so
 // sal_Unicode actually

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

2017-11-22 Thread Caolán McNamara

 sc/source/core/data/segmenttree.cxx |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 9ffa900cb4d0381587162e3deb9d910965b69d58
Author: CaolÃ¡n McNamara 
Date:   Tue Nov 21 17:20:11 2017 +

ofz#4361 Integer-overflow

Change-Id: I7b41a53622e2e87dc0998a4a181bb8e49ef8d277
Reviewed-on: https://gerrit.libreoffice.org/45046
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/core/data/segmenttree.cxx 
b/sc/source/core/data/segmenttree.cxx
index ed9937ba7424..c7fbcb547835 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -18,9 +18,8 @@
  */
 
 #include 
-
+#include 
 #include 
-
 #include 
 #include 
 
@@ -144,7 +143,13 @@ ScFlatSegmentsImpl::getSumValue(SCCOLROW nPos1, SCCOL
 SCROW nEndPos = aData.mnPos2;
 while (nEndPos <= nPos2)
 {
-nValue += aData.mnValue * (nEndPos - nCurPos + 1);
+sal_uInt32 nRes;
+if (o3tl::checked_multiply(aData.mnValue, nEndPos - 
nCurPos + 1, nRes))
+{
+SAL_WARN("sc.core", "row height overflow");
+nRes = SAL_MAX_INT32;
+}
+nValue = o3tl::saturating_add(nValue, nRes);
 nCurPos = nEndPos + 1;
 if (!getRangeData(nCurPos, aData))
 break;
@@ -154,7 +159,13 @@ ScFlatSegmentsImpl::getSumValue(SCCOLROW nPos1, SCCOL
 if (nCurPos <= nPos2)
 {
 nEndPos = ::std::min(nEndPos, nPos2);
-nValue += aData.mnValue * (nEndPos - nCurPos + 1);
+sal_uInt32 nRes;
+if (o3tl::checked_multiply(aData.mnValue, nEndPos - 
nCurPos + 1, nRes))
+{
+SAL_WARN("sc.core", "row height overflow");
+nRes = SAL_MAX_INT32;
+}
+nValue = o3tl::saturating_add(nValue, nRes);
 }
 return nValue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Miklos Vajna

 xmlsecurity/source/xmlsec/mscrypt/oid.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e8c20aafb1385585cdd005fb9b75b87fe6893599
Author: Miklos Vajna 
Date:   Wed Nov 22 09:03:31 2017 +0100

xmlsecurity mscrypt: use SAL_N_ELEMENTS()

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

diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx 
b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
index 94fa4c412558..26986aff762d 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_OID_HXX
 #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_OID_HXX
 
+#include 
+
 typedef struct {
 char const *oid;
 char const *desc;
@@ -147,7 +149,7 @@ OIDItem OIDs[] = {
 {"1.2.643.2.2.36.0", "GOST_R_34.10-2001_Sign_DH_PRO"}
 };
 
-int nOID = 119;
+const int nOID = SAL_N_ELEMENTS(OIDs);
 
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Gabor Kelemen

 wizards/com/sun/star/wizards/common/HelpIds.java |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 67fd1ea44506994d49833bd032bf0b07582e18c2
Author: Gabor Kelemen 
Date:   Tue Nov 21 23:12:36 2017 +0100

Fix Java wizard HID list

A still actively used HID was accidentally removed in commit:

https://cgit.freedesktop.org/libreoffice/core/commit/wizards/com/sun/star/wizards/common/HelpIds.java?id=82d863b4a410fa78120d2efc41bd2b3b61f21cee
This caused some HIDs in the Form wizard to slide off by one

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

diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java 
b/wizards/com/sun/star/wizards/common/HelpIds.java
index 82c220695c5a..de87206d2bac 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.java
+++ b/wizards/com/sun/star/wizards/common/HelpIds.java
@@ -266,6 +266,7 @@ public class HelpIds
 "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1",// HID:34442
 "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2",// HID:34443
 "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2",// HID:3
+"HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3", // HID:34445
 "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3",// HID:34446
 "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4",// HID:34447
 "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4",// HID:34448
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Szymon Kłos

 sw/source/uibase/wrtsh/wrtsh2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd51f01dbca1ddebe846ec9f56cbb13002f295c6
Author: Szymon KÅos 
Date:   Tue Nov 21 22:43:10 2017 +0100

tdf#86087 fix relative link open on linux

Change-Id: I6bf2d6bd50b9f1ed7a2c3f66fc18598aa7ffe3d6
Reviewed-on: https://gerrit.libreoffice.org/45053
Reviewed-by: Szymon KÅos 
Tested-by: Szymon KÅos 

diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx 
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index c40d80c3087d..f85206f4c656 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -528,7 +528,7 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, 
LoadUrlFlags nFilter,
 bCorrectURL &= aURL.insertName( sFileURL );
 
 if( bCorrectURL )
-sFileURL = aURL.getFSysPath( FSysStyle::Detect );
+sFileURL = aURL.GetMainURL( 
INetURLObject::DecodeMechanism::Unambiguous );
 }
 
 // We are doing tiledRendering, let the client handles the URL loading.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre-win32' - xmlsecurity/Library_xsec_xmlsec.mk

2017-11-22 Thread Thorsten Behrens

 xmlsecurity/Library_xsec_xmlsec.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 54e1827bd07b04f70211386a3b9cd2c506429186
Author: Thorsten Behrens 
Date:   Wed Nov 22 09:57:57 2017 +0100

gpg4libre: enable gpgme support for Windows and OSX

Change-Id: Ifa266e1c18a8a09cd5c815adc70d0236e00f72b5

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 51f0f2a0834f..5f3649dc5ab9 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -57,7 +57,7 @@ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
libxml2 \
xmlsec \
 ))
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
+ifneq ($(filter-out ANDROID IOS,$(OS)),)
 $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
gpgmepp \
 ))
@@ -80,7 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
+ifneq ($(filter-out ANDROID IOS,$(OS)),)
 $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/gpg/CertificateImpl \
xmlsecurity/source/gpg/CipherContext \
___
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' - sc/inc sc/source

2017-11-22 Thread Eike Rathke

 sc/inc/stringutil.hxx   |8 +++-
 sc/source/core/data/column3.cxx |   12 ++--
 sc/source/ui/undo/undocell.cxx  |4 +++-
 3 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit ad07d83af2a2b7df29223891bc028a4e7aedfe72
Author: Eike Rathke 
Date:   Tue Nov 21 15:33:58 2017 +0100

Resolves: tdf#103234 undo replacing text with formula

 This is a combination of 3 commits.

tdf#103234 undo replacing text with formula

if this isn't what we want, then presumably ScSetStringParam shouldn't
exist here at all

Reviewed-on: https://gerrit.libreoffice.org/45008
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 466c3564058aae4946cdd21eab9dfef529554d90)

Invert logic of ScSetStringParam::* enum value checks, tdf#103234 follow-up

In preparation for adding a new enum value to keep existing
formatting in any case.

(cherry picked from commit f2f0a7c5a9d8185fedef5c737d1b7479b9fc0c1e)

Keep number format on string cell content Undo, tdf#103234 follow-up

(cherry picked from commit ba9833a1d63747eaa5124271a1ac51cb926bce7a)

c15a900adba0281d1267d95f821e1e898f80f566
18c281211e6eeb4816da13972c360df85d577491

Change-Id: I17318c38948bc19b7148276935830f83356c7ed2
Reviewed-on: https://gerrit.libreoffice.org/45026
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 3f9b0dbccaa2..c208332b48f6 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -31,7 +31,7 @@ class SvNumberFormatter;
  * Store parameters used in the ScDocument::SetString() method.  Various
  * options for string-setting operation are specified herein.
  */
-struct SC_DLLPUBLIC ScSetStringParam
+struct SAL_WARN_UNUSED SC_DLLPUBLIC ScSetStringParam
 {
 enum TextFormatPolicy
 {
@@ -47,6 +47,12 @@ struct SC_DLLPUBLIC ScSetStringParam
 SpecialNumberOnly,
 
 /**
+ * Keep an existing number format, do not set Text number format and do
+ * not set another number format.
+ */
+Keep,
+
+/**
  * Never set Text number format.
  */
 Never
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 7942ad881bc0..28445f7c469a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1795,7 +1795,8 @@ bool ScColumn::ParseString(
 }
 }
 }
-else if (aParam.meSetTextNumFormat != ScSetStringParam::Always)
+else if (aParam.meSetTextNumFormat == ScSetStringParam::Never ||
+ aParam.meSetTextNumFormat == 
ScSetStringParam::SpecialNumberOnly)
 {
 // Only check if the string is a regular number.
 const LocaleDataWrapper* pLocale = 
aParam.mpNumFormatter->GetLocaleData();
@@ -1821,7 +1822,14 @@ bool ScColumn::ParseString(
 
 if (rCell.meType == CELLTYPE_NONE)
 {
-if (aParam.meSetTextNumFormat != ScSetStringParam::Never && 
aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
+// If we reach here with ScSetStringParam::SpecialNumberOnly it
+// means a simple number was not detected above, so test for
+// special numbers. In any case ScSetStringParam::Always does not
+// mean always, but only always for content that could be any
+// numeric.
+if ((aParam.meSetTextNumFormat == ScSetStringParam::Always ||
+ aParam.meSetTextNumFormat == 
ScSetStringParam::SpecialNumberOnly) &&
+aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, 
nVal))
 {
 // Set the cell format type to Text.
 applyTextNumFormat(*this, nRow, aParam.mpNumFormatter);
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index a087a20d79c1..c85e2d8aece1 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -459,7 +459,9 @@ void ScUndoSetCell::SetValue( const ScCellValue& rVal )
 {
 ScSetStringParam aParam;
 aParam.setTextInput();
-rDoc.SetString(maPos, rVal.mpString->getString());
+// Undo only cell content, without setting any number format.
+aParam.meSetTextNumFormat = ScSetStringParam::Keep;
+rDoc.SetString(maPos, rVal.mpString->getString(), &aParam);
 }
 break;
 case CELLTYPE_EDIT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-22 Thread Stephan Bergmann

 compilerplugins/clang/unnecessaryparen.cxx |   33 +
 sc/source/ui/view/gridwin.cxx  |2 -
 2 files changed, 12 insertions(+), 23 deletions(-)

New commits:
commit 5640ef110094f33cf678f4e3ef4f3fd4334a00c8
Author: Stephan Bergmann 
Date:   Wed Nov 22 09:54:10 2017 +0100

There appears to be no reason to ignore macros in these parts of...

...loplugin:unnecessaryparen

Change-Id: I473a1e16cf9f485a61af5477aca22798996253a3

diff --git a/compilerplugins/clang/unnecessaryparen.cxx 
b/compilerplugins/clang/unnecessaryparen.cxx
index 57c9cd9c65b4..fe3b0dd4b028 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -146,15 +146,16 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* 
parenExpr)
 }
 
 if (auto declRefExpr = dyn_cast(subExpr)) {
-if (declRefExpr->getLocStart().isMacroID())
-return true;
-
-// hack for BAD_CAST macro
-SourceManager& SM = compiler.getSourceManager();
-const char *p1 = SM.getCharacterData( 
declRefExpr->getLocStart().getLocWithOffset(-10) );
-const char *p2 = SM.getCharacterData( declRefExpr->getLocStart() );
-if ( std::string(p1, p2 - p1).find("BAD_CAST") != std::string::npos )
-return true;
+// hack for libxml2's BAD_CAST object-like macro (expanding to 
"(xmlChar *)"), which is
+// typically used as if it were a function-like macro, e.g., as 
"BAD_CAST(pName)" in
+// SwNode::dumpAsXml (sw/source/core/docnode/node.cxx)
+if (!declRefExpr->getLocStart().isMacroID()) {
+SourceManager& SM = compiler.getSourceManager();
+const char *p1 = SM.getCharacterData( 
declRefExpr->getLocStart().getLocWithOffset(-10) );
+const char *p2 = SM.getCharacterData( declRefExpr->getLocStart() );
+if ( std::string(p1, p2 - p1).find("BAD_CAST") != 
std::string::npos )
+return true;
+}
 
 report(
 DiagnosticsEngine::Warning, "unnecessary parentheses around 
identifier",
@@ -163,9 +164,7 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* 
parenExpr)
 }
 
 
-if (auto cxxNamedCastExpr = dyn_cast(subExpr)) {
-if (cxxNamedCastExpr->getLocStart().isMacroID())
-return true;
+if (isa(subExpr)) {
 report(
 DiagnosticsEngine::Warning, "unnecessary parentheses around cast",
 parenExpr->getLocStart())
@@ -209,8 +208,6 @@ bool UnnecessaryParen::VisitReturnStmt(const ReturnStmt* 
returnStmt)
 {
 if (ignoreLocation(returnStmt))
 return true;
-if (returnStmt->getLocStart().isMacroID())
-return true;
 
 if (!returnStmt->getRetValue())
 return true;
@@ -240,8 +237,6 @@ void UnnecessaryParen::VisitSomeStmt(const Stmt * stmt, 
const Expr* cond, String
 {
 if (ignoreLocation(stmt))
 return;
-if (stmt->getLocStart().isMacroID())
-return;
 
 auto parenExpr = dyn_cast(ignoreAllImplicit(cond));
 if (parenExpr) {
@@ -269,8 +264,6 @@ bool UnnecessaryParen::VisitCallExpr(const CallExpr* 
callExpr)
 {
 if (ignoreLocation(callExpr))
 return true;
-if (callExpr->getLocStart().isMacroID())
-return true;
 if (callExpr->getNumArgs() != 1 || isa(callExpr))
 return true;
 
@@ -294,8 +287,6 @@ bool UnnecessaryParen::VisitCXXOperatorCallExpr(const 
CXXOperatorCallExpr* callE
 {
 if (ignoreLocation(callExpr))
 return true;
-if (callExpr->getLocStart().isMacroID())
-return true;
 if (callExpr->getNumArgs() != 2)
 return true;
 
@@ -334,8 +325,6 @@ bool UnnecessaryParen::VisitVarDecl(const VarDecl* varDecl)
 {
 if (ignoreLocation(varDecl))
 return true;
-if (varDecl->getLocStart().isMacroID())
-return true;
 if (!varDecl->getInit())
 return true;
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 7dd772d5b2a1..3bc7ccbb9685 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3599,7 +3599,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& 
rEvt )
 
 // clear DND_ACTION_LINK when other actions are set. The usage 
below cannot handle
 // multiple set values
-if((nMyAction & DND_ACTION_LINK) && (nMyAction & 
(DND_ACTION_COPYMOVE)))
+if((nMyAction & DND_ACTION_LINK) && (nMyAction & 
DND_ACTION_COPYMOVE))
 {
 nMyAction &= ~DND_ACTION_LINK;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/thb/gpg4libre-win32'

2017-11-22 Thread Thorsten Behrens

New branch 'private/thb/gpg4libre-win32' available with the following commits:
commit b2e75ff652655367de6d57e5dce15ba5c785d38a
Author: Thorsten Behrens 
Date:   Wed Nov 15 21:31:07 2017 +0100

gpg4libre: cleanup gpgme & add gbuild lib for gpgmepp

This moves the external to gpgmepp, since that's what we _actually_
link against; plus tons of enablement for Windows build, mostly
related to linker probs integration.

There's still no good way to build a DLL with autotools, so we fall
back to gbuild manual make, see also tdf#91480

Change-Id: Ifd8217ef58536612d2389d48e343db133a13fb9c

commit ee49f6a17dce39c8181304005f55a11d4b24dbae
Author: David Ostrovsky 
Date:   Wed Sep 27 08:57:36 2017 +0200

gpg4libre: build gpgme natively on windows

Change-Id: I0b77ba0c1b8f84affa483181e26a26beaf39e878

commit 6edf2b4a06e020fefe181e010352bdb64351839c
Author: David Ostrovsky 
Date:   Sun Sep 24 10:28:05 2017 +0200

gpg4libre: build libassuan natively on windows

Change-Id: Id374ebc5ed70a1b4313dc74461524ac2b864b114

commit 3ab2109706fe39f263424e54dc040a0e2f774225
Author: Thorsten Behrens 
Date:   Wed Feb 22 01:47:15 2017 +0100

gpg4libre: build libgpg-error natively on windows

Change-Id: I479b79a7626469169af582dc79c4e99dc4620546

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

[Libreoffice-commits] core.git: offapi/com sc/source sw/source vcl/unx wizards/com

2017-11-22 Thread Andrea Gelmini

 offapi/com/sun/star/chart2/data/PivotTableFieldEntry.idl |2 +-
 sc/source/core/data/formulacell.cxx  |2 +-
 sw/source/core/bastyp/swcache.cxx|6 +++---
 sw/source/core/inc/UndoCore.hxx  |4 ++--
 sw/source/filter/html/htmlgrin.cxx   |2 +-
 vcl/unx/gtk/a11y/atkwrapper.cxx  |2 +-
 wizards/com/sun/star/wizards/agenda/TemplateConsts.py|2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1d9eed341db208f11de6f020538dfdb74a5c48dd
Author: Andrea Gelmini 
Date:   Tue Nov 21 23:39:07 2017 +0100

Fix typo

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

diff --git a/offapi/com/sun/star/chart2/data/PivotTableFieldEntry.idl 
b/offapi/com/sun/star/chart2/data/PivotTableFieldEntry.idl
index 4a9f7799a8e5..e14e1253d00e 100644
--- a/offapi/com/sun/star/chart2/data/PivotTableFieldEntry.idl
+++ b/offapi/com/sun/star/chart2/data/PivotTableFieldEntry.idl
@@ -44,7 +44,7 @@ struct PivotTableFieldEntry
 long DimensionPositionIndex;
 
 /**
- * Does it have some members that are hidded (filtered).
+ * Does it have some members that are hidden (filtered).
  */
 boolean HasHiddenMembers;
 };
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 987eed152f47..3aaf87a1e629 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4326,7 +4326,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
 
 static const bool bThreadingProhibited = 
std::getenv("SC_NO_THREADED_CALCULATION");
 
-// To temporary use threading for sc unit tests regardless of the size of 
the formula group,
+// To temporarily use threading for sc unit tests regardless of the size 
of the formula group,
 // add the condition !std::getenv("LO_TESTNAME") below (with &&)
 if (GetWeight() < 
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
 {
diff --git a/sw/source/core/bastyp/swcache.cxx 
b/sw/source/core/bastyp/swcache.cxx
index f75468219873..200c8f59f4ab 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -106,11 +106,11 @@ SwCache::~SwCache()
 m_aName << "; number of new entries: " << m_nAppend
 << "; number of insert on free places: " << m_nInsertFree
 << "; number of replacements: " << m_nReplace
-<< "; number of successful Get's: " << m_nGetSuccess
-<< "; number of failed Get's: " << m_nGetFail
+<< "; number of successful Gets: " << m_nGetSuccess
+<< "; number of failed Gets: " << m_nGetFail
 << "; number or reordering (LRU): " << m_nToTop
 << "; number of suppressions: " << m_nDelete
-<< "; number of Get's without Index: " << m_nGetSeek
+<< "; number of Gets without Index: " << m_nGetSeek
 << "; number of Seek for Get without Index: " << m_nAverageSeekCnt
 << "; number of Flush calls: " << m_nFlushCnt
 << "; number of flushed objects: " << m_nFlushedObjects
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 441320aa94cb..b1866dc3ad77 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -147,10 +147,10 @@ class SwUndoFormatColl : public SwUndo, private SwUndRng
 std::unique_ptr pHistory;
 SwFormatColl* pFormatColl;
 // for correct  and 
-// boolean, which indicates that the attributes are reseted at the nodes
+// boolean, which indicates that the attributes are reset at the nodes
 // before the format has been applied.
 const bool mbReset;
-// boolean, which indicates that the list attributes had been reseted at
+// boolean, which indicates that the list attributes had been reset at
 // the nodes before the format has been applied.
 const bool mbResetListAttrs;
 
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index e4749b248b12..6928b2ff0fce 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -438,7 +438,7 @@ IMAGE_SETEVENT:
 
 pTextNode->SetCountedInList( true );
 
-// It's necessary to invalide the rule, because between the reading
+// It's necessary to invalidate the rule, because between the 
reading
 // of LI and the graphic an EndAction could be called.
 if( GetNumInfo().GetNumRule() )
 GetNumInfo().GetNumRule()->SetInvalidRule( true );
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 52f92186c846..5d397b6ccc92 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -880,7 +880,7 @@ void atk_object_wrapper

85 matches

Mail list logo