date:20161215

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

2016-12-15 Thread Khaled Hosny

 vcl/win/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fbfe5cbc288ead6bba9d30ddb849dcb41a0d5e0
Author: Khaled Hosny 
Date:   Fri Dec 16 08:54:45 2016 +0200

Fix typo from 6c436ba09cb35235ce6f4065cf74c9a6ff14a4bd

This broke OpenGL glyph caching since we were using a different DC
than the one we selected the font on.

Change-Id: I43218891aa1bc75599700ce6e0b582a5e73ff210

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 1f31cfa..57ac16f 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -57,7 +57,7 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT hFont, 
int nGlyphIndex, S
 SAL_WARN("vcl.gdi", "CreateCompatibleDC failed: " << 
WindowsErrorString(GetLastError()));
 return false;
 }
-HFONT hOrigFont = static_cast(SelectObject(hDC, hFont));
+HFONT hOrigFont = static_cast(SelectObject(hNewDC, hFont));
 if (hOrigFont == nullptr)
 {
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - bridges/source external/python3 include/vcl

2016-12-15 Thread Stephan Bergmann

 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx |9 ++
 external/python3/ubsan.patch.0|   60 +++---
 include/vcl/menu.hxx  |2 
 3 files changed, 47 insertions(+), 24 deletions(-)

New commits:
commit 3024e891b2ce85059069e599e411db457e4bccd1
Author: Stephan Bergmann 
Date:   Sat Nov 12 10:16:38 2016 +0100

Fix undefined misaligned writes

same as 26cf118247855bb5caeac3d8e68906fbcfcdc837 for gcc_linux_x86-64

Change-Id: Ieb7a4c0497ea485e832da937786226f09feeff31

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index dccb9da..e16b2f1 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -414,11 +414,16 @@ unsigned char * codeSnippet( unsigned char * code,
 
 // movq $, %r10
 *reinterpret_cast( code ) = 0xba49;
-*reinterpret_cast( code + 2 ) = nOffsetAndIndex;
+*reinterpret_cast( code + 2 ) = nOffsetAndIndex & 0x;
+*reinterpret_cast( code + 4 ) = nOffsetAndIndex >> 16;
+*reinterpret_cast( code + 8 ) = nOffsetAndIndex >> 48;
 
 // movq $, %r11
 *reinterpret_cast( code + 10 ) = 0xbb49;
-*reinterpret_cast( code + 12 ) = 
reinterpret_cast( privateSnippetExecutor );
+*reinterpret_cast( code + 12 )
+= reinterpret_cast(privateSnippetExecutor);
+*reinterpret_cast( code + 16 )
+= reinterpret_cast(privateSnippetExecutor) >> 32;
 
 // jmpq *%r11
 *reinterpret_cast( code + 20 ) = 0x00e3ff49;
commit 291c0b8fafd4c2cb1086bb321526f951768692a5
Author: Stephan Bergmann 
Date:   Sat Nov 12 09:56:21 2016 +0100

Typo "pStaredFrom" -> "pStartedFrom"?

But function definition uses "pSFrom" instead anyway, so consistently use 
param
names from definition in declaration.

Change-Id: I03fb8dd0fbab5c84f89c7276849d62f9a17cbfea

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 4a119a0..f2202d1 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -495,7 +495,7 @@ private:
 SAL_DLLPRIVATE MenuFloatingWindow * ImplGetFloatingWindow() const;
 
 protected:
-SAL_DLLPRIVATE sal_uInt16 ImplExecute( const VclPtr& xWindow, 
const Rectangle& rRect, FloatWinPopupFlags nPopupFlags, Menu* pStaredFrom, bool 
bPreSelectFirst );
+SAL_DLLPRIVATE sal_uInt16 ImplExecute( const VclPtr& pW, 
const Rectangle& rRect, FloatWinPopupFlags nPopupModeFlags, Menu* pSFrom, bool 
bPreSelectFirst );
 SAL_DLLPRIVATE void ImplFlushPendingSelect();
 SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const;
 SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 
nStartEntry, sal_uInt16* pLastVisible = nullptr ) const;
commit 9b92834fa4ee27b0dccdd52962edb3fdbee7a340
Author: Stephan Bergmann 
Date:   Fri Nov 11 23:35:15 2016 +0100

external/python3: Work around -fsanitize=alignment

Change-Id: I26b927345594368f426ae89bfd5b645561d44c10

diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0
index 639e85f..ab2acd3 100644
--- a/external/python3/ubsan.patch.0
+++ b/external/python3/ubsan.patch.0
@@ -35,6 +35,26 @@
  
/* Set the carry bit iff the function uses any sse registers.
   This is clc or stc, together with the first byte of the jmp.  */
+--- Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
 Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
+@@ -599,9 +599,15 @@
+   tramp = (volatile unsigned short*)&closure->tramp[0];
+ 
+   tramp[0] = 0xbb49;  /* mov , %r11 */
+-  *(void* volatile*)&tramp[1] = ffi_closure_unix64;
++  tramp[1] = (unsigned short) ffi_closure_unix64;
++  tramp[2] = (unsigned short) (ffi_closure_unix64 >> 16);
++  tramp[3] = (unsigned short) (ffi_closure_unix64 >> 32);
++  tramp[4] = (unsigned short) (ffi_closure_unix64 >> 48);
+   tramp[5] = 0xba49;  /* mov , %r10 */
+-  *(void* volatile*)&tramp[6] = closure;
++  tramp[6] = (unsigned short) closure;
++  tramp[7] = (unsigned short) (closure >> 16);
++  tramp[8] = (unsigned short) (closure >> 32);
++  tramp[9] = (unsigned short) (closure >> 48);
+ 
+   /*  Set the carry bit if the function uses any sse registers.
+   This is clc or stc, together with the first byte of the jmp.  */
 --- Objects/listobject.c
 +++ Objects/listobject.c
 @@ -641,7 +641,7 @@
commit 6928b045f09b5d983083607d63fcb2a547446d0a
Author: Stephan Bergmann 
Date:   Fri Nov 11 23:34:39 2016 +0100

Clean up patch

Change-Id: I2aa51435d0a15e507d0bf95f98d69fa4cde00b05

diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0
index 700f43b..639e85f 100644
--- a/external/python3/ubsan.patch.0
+++ b/external/python3/ubsan.patch.0
@@ -1,6 +1,20 @@
-diff -ru python3.orig/Modules/_ctypes/libffi/src/x86/ffi64.c 
python3/Modules/_ctypes/libffi/src/x86/ffi64.c
 Modules

[Libreoffice-commits] online.git: 2 commits - test/Makefile.am test/UnitRequests.cpp wsd/LOOLWebSocket.hpp

2016-12-15 Thread Pranav Kant

 test/Makefile.am  |6 +--
 test/UnitRequests.cpp |   99 --
 wsd/LOOLWebSocket.hpp |2 +
 3 files changed, 4 insertions(+), 103 deletions(-)

New commits:
commit 9b37eed7274398a539cd5151fd0b6aa174228bd4
Author: Pranav Kant 
Date:   Fri Dec 16 11:32:16 2016 +0530

Add missing config.h

Change-Id: Ib63c0bdfc8126fea211c5311c957985de6b00129

diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
index bc51321..28d74ae 100644
--- a/wsd/LOOLWebSocket.hpp
+++ b/wsd/LOOLWebSocket.hpp
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_LOOLWEBSOCKET_HPP
 #define INCLUDED_LOOLWEBSOCKET_HPP
 
+#include "config.h"
+
 #include 
 #include 
 #include 
commit dd498ed0791032d35fdcdacc2d8ce0568f29d6d3
Author: Pranav Kant 
Date:   Thu Dec 15 22:58:21 2016 +0530

Bin this unit test

This was added while debugging some problem with forward slashes
in docurl in websocket endpoint automatically being decoded on
some machines. But it turned out it was due to the apache server
setting. So, this test serves no purpose now and tests something
really obvious.

Change-Id: I4658354d53c481cf7554804383892f501bc408cd

diff --git a/test/Makefile.am b/test/Makefile.am
index 992830e..2a285bc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,8 +16,7 @@ noinst_LTLIBRARIES = \
 unit-timeout.la unit-prefork.la \
 unit-storage.la unit-fonts.la \
 unit-admin.la unit-tilecache.la \
-   unit-fuzz.la unit-requests.la \
-   unit-oob.la
+   unit-fuzz.la unit-oob.la
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
 AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION)
@@ -51,7 +50,6 @@ unittest_SOURCES = TileQueueTests.cpp WhiteBoxTests.cpp 
test.cpp $(wsd_sources)
 unittest_LDADD = $(CPPUNIT_LIBS)
 
 # unit test modules:
-unit_requests_la_SOURCES = UnitRequests.cpp
 unit_oob_la_SOURCES = UnitOOB.cpp
 unit_fuzz_la_SOURCES = UnitFuzz.cpp
 unit_admin_la_SOURCES = UnitAdmin.cpp
@@ -72,7 +70,7 @@ if HAVE_LO_PATH
 check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME unit-fonts.la is unstable, disabled for now.
-TESTS = unit-oob.la unit-tilecache.la unit-storage.la unit-timeout.la 
unit-prefork.la unit-admin.la unit-requests.la
+TESTS = unit-oob.la unit-tilecache.la unit-storage.la unit-timeout.la 
unit-prefork.la unit-admin.la
 else
 TESTS = ${top_builddir}/test/test
 endif
diff --git a/test/UnitRequests.cpp b/test/UnitRequests.cpp
deleted file mode 100644
index 2bb7b6f..000
--- a/test/UnitRequests.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- 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/.
- */
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "helpers.hpp"
-
-using namespace helpers;
-
-// Inside the WSD process
-class UnitRequests : public UnitWSD
-{
-enum {
-PHASE_LOAD,
-PHASE_FILTER,
-PHASE_FILTERED
-} _phase;
-
-TestResult _testResult;
-std::unique_ptr _ws;
-public:
-UnitRequests() :
-_phase(PHASE_LOAD)
-{
-std::cerr << "UnitRequests startup\n";
-}
-
-virtual bool filterHandleRequest(
-TestRequest type,
-   Poco::Net::HTTPServerRequest& request,
-   Poco::Net::HTTPServerResponse& /*response*/) override
-{
-if (_phase == PHASE_FILTER && type == 
UnitWSD::TestRequest::TEST_REQ_CLIENT)
-{
-std::string uri = request.getURI();
-// Get the embedded document URL: '/lool/docUrl/ws/'
-uri = uri.substr(uri.find("lool/") + std::string("lool/").size());
-uri = uri.substr(0, uri.find("/ws"));
-Poco::URI requestUri(uri);
-_testResult = TestResult::TEST_OK;
-// If this is a simple encoded string, it would be treated as
-// relative, otherwise non-relative.
-// We require this embedded url to be encoded as otherwise it would
-// be treated as a resource on the server due to the presence of
-// un-encoded '/'
-if (!requestUri.isRelative())
-{
-_testResult = TestResult::TEST_FAILED;
-}
-
-_phase = PHASE_FILTERED;
-}
-return false;
-}
-
-void loadDocument()
-{
-std::string docPath;
-std::string docURL;
-getDocumentPathAndURL("empty.odt", docPath, docURL);
-_ws = std::unique_ptr(new UnitWebSocket(docURL));
-assert(_ws.get());
-}
-
-virtual void invokeTest() override
-{
-switch(_phase)
-{
-case PH

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

2016-12-15 Thread Khaled Hosny

 vcl/inc/CommonSalLayout.hxx|3 +
 vcl/inc/win/salgdi.h   |3 +
 vcl/inc/win/winlayout.hxx  |2 
 vcl/source/gdi/CommonSalLayout.cxx |1 
 vcl/win/gdi/winlayout.cxx  |   95 +++--
 5 files changed, 90 insertions(+), 14 deletions(-)

New commits:
commit d85003a8af8b454b34eea0ac67c8dd9184a0b6d3
Author: Khaled Hosny 
Date:   Thu Dec 15 02:47:13 2016 +0200

tdf#104159: Re-enable OpenGL glyph caching on Windows

Reviewed-on: https://gerrit.libreoffice.org/32026
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 
(cherry picked from commit 9cf20b5f0473db0b4dd2dcf607b7884f40762995)

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

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index e5345d7..e2f3a11 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -45,6 +45,7 @@ class CommonSalLayout : public GenericSalLayout
 #ifdef _WIN32
 HDC mhDC;
 HFONT   mhFont;
+WinFontInstance&mrWinFontInstance;
 double  mnAveWidthFactor;
 #elif defined(MACOSX) || defined(IOS)
 const CoreTextStyle&mrCoreTextStyle;
@@ -65,6 +66,8 @@ public:
 #if defined(_WIN32)
 explicitCommonSalLayout(HDC, WinFontInstance&, const 
WinFontFace&);
 const FontSelectPattern& getFontSelData() const { return mrFontSelData; };
+HFONT   getHFONT() const { return mhFont; }
+WinFontInstance&getWinFontInstance() const { return 
mrWinFontInstance; }
 #elif defined(MACOSX) || defined(IOS)
 explicitCommonSalLayout(const CoreTextStyle&);
 const CoreTextStyle&getFontData() const { return mrCoreTextStyle; };
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 3050055..14310f9 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -236,6 +236,9 @@ private:
 
 LogicalFontInstance* GetWinFontEntry(int nFallbackLevel);
 
+bool CacheGlyphs(const CommonSalLayout& rLayout);
+bool DrawCachedGlyphs(const CommonSalLayout& rLayout);
+
 public:
 HDC getHDC() const { return mhLocalDC; }
 void setHDC(HDC aNew) { mhLocalDC = aNew; }
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index 7b15e7e..8ceebea 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -193,7 +193,7 @@ public:
 private:
 GlyphCache maGlyphCache;
 public:
-bool CacheGlyphToAtlas(bool bRealGlyphIndices, int nGlyphIndex, const 
WinLayout& rLayout, SalGraphics& rGraphics);
+bool CacheGlyphToAtlas(bool bRealGlyphIndices, HDC hDC, HFONT hFont, int 
nGlyphIndex, SalGraphics& rGraphics);
 
 GlyphCache& GetGlyphCache()
 {
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index dbc3fa8..8ab8eb3 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -181,6 +181,7 @@ CommonSalLayout::CommonSalLayout(HDC hDC, WinFontInstance& 
rWinFontInstance, con
 :   mrFontSelData(rWinFontInstance.maFontSelData)
 ,   mhDC(hDC)
 ,   mhFont(static_cast(GetCurrentObject(hDC, OBJ_FONT)))
+,   mrWinFontInstance(rWinFontInstance)
 ,   mnAveWidthFactor(1.0f)
 ,   mpVertGlyphs(nullptr)
 {
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index c693b31..2d35175 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -66,7 +66,7 @@ inline int WinFontInstance::GetCachedGlyphWidth( int 
nCharCode ) const
 return it->second;
 }
 
-bool WinFontInstance::CacheGlyphToAtlas(bool bRealGlyphIndices, int 
nGlyphIndex, const WinLayout& rLayout, SalGraphics& rGraphics)
+bool WinFontInstance::CacheGlyphToAtlas(bool bRealGlyphIndices, HDC hDC, HFONT 
hFont, int nGlyphIndex, SalGraphics& rGraphics)
 {
 if (nGlyphIndex == DROPPED_OUTGLYPH)
 return true;
@@ -77,17 +77,17 @@ bool WinFontInstance::CacheGlyphToAtlas(bool 
bRealGlyphIndices, int nGlyphIndex,
 std::vector aCodePointsOrGlyphIndices(1);
 aCodePointsOrGlyphIndices[0] = nGlyphIndex;
 
-HDC hDC = CreateCompatibleDC(rLayout.mhDC);
-if (hDC == nullptr)
+HDC hNewDC = CreateCompatibleDC(hDC);
+if (hNewDC == nullptr)
 {
 SAL_WARN("vcl.gdi", "CreateCompatibleDC failed: " << 
WindowsErrorString(GetLastError()));
 return false;
 }
-HFONT hOrigFont = static_cast(SelectObject(hDC, rLayout.mhFont));
+HFONT hOrigFont = static_cast(SelectObject(hNewDC, hFont));
 if (hOrigFont == nullptr)
 {
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
-DeleteDC(hDC);
+DeleteDC(hNewDC);
 return false;
 }
 
@@ -96,26 +96,26 @@ bool WinFontInstance::CacheGlyphToAtlas(bool 
bRealGlyphIndices, int nGlyphIndex,
 if (!pTxt)
 return false;
 
-if

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

2016-12-15 Thread Khaled Hosny

 vcl/inc/CommonSalLayout.hxx|3 +
 vcl/inc/win/salgdi.h   |3 +
 vcl/source/gdi/CommonSalLayout.cxx |1 
 vcl/win/gdi/winlayout.cxx  |   69 +
 4 files changed, 76 insertions(+)

New commits:
commit 9cf20b5f0473db0b4dd2dcf607b7884f40762995
Author: Khaled Hosny 
Date:   Thu Dec 15 02:47:13 2016 +0200

tdf#104159: Re-enable OpenGL glyph caching on Windows

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

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 05ea342..b0c9381 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -45,6 +45,7 @@ class CommonSalLayout : public GenericSalLayout
 #ifdef _WIN32
 HDC mhDC;
 HFONT   mhFont;
+WinFontInstance&mrWinFontInstance;
 double  mnAveWidthFactor;
 #elif defined(MACOSX) || defined(IOS)
 const CoreTextStyle&mrCoreTextStyle;
@@ -67,6 +68,8 @@ public:
 #if defined(_WIN32)
 explicitCommonSalLayout(HDC, WinFontInstance&, const 
WinFontFace&);
 const FontSelectPattern& getFontSelData() const { return mrFontSelData; };
+HFONT   getHFONT() const { return mhFont; }
+WinFontInstance&getWinFontInstance() const { return 
mrWinFontInstance; }
 #elif defined(MACOSX) || defined(IOS)
 explicitCommonSalLayout(const CoreTextStyle&);
 const CoreTextStyle&getFontData() const { return mrCoreTextStyle; };
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 8a493d7..65cf06f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -180,6 +180,9 @@ private:
 
 LogicalFontInstance* GetWinFontEntry(int nFallbackLevel);
 
+bool CacheGlyphs(const CommonSalLayout& rLayout);
+bool DrawCachedGlyphs(const CommonSalLayout& rLayout);
+
 public:
 HDC getHDC() const { return mhLocalDC; }
 void setHDC(HDC aNew) { mhLocalDC = aNew; }
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 2c059ef..d68534f 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -181,6 +181,7 @@ CommonSalLayout::CommonSalLayout(HDC hDC, WinFontInstance& 
rWinFontInstance, con
 :   mrFontSelData(rWinFontInstance.maFontSelData)
 ,   mhDC(hDC)
 ,   mhFont(static_cast(GetCurrentObject(hDC, OBJ_FONT)))
+,   mrWinFontInstance(rWinFontInstance)
 ,   mnAveWidthFactor(1.0f)
 ,   mpVertGlyphs(nullptr)
 {
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index d0d9615..1f31cfa 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -666,6 +666,70 @@ LogicalFontInstance* WinFontFace::CreateFontInstance( 
FontSelectPattern& rFSD )
 return pFontInstance;
 }
 
+bool WinSalGraphics::CacheGlyphs(const CommonSalLayout& rLayout)
+{
+static bool bDoGlyphCaching = (std::getenv("SAL_DISABLE_GLYPH_CACHING") == 
nullptr);
+if (!bDoGlyphCaching)
+return false;
+
+HDC hDC = getHDC();
+HFONT hFONT = rLayout.getHFONT();
+WinFontInstance& rFont = rLayout.getWinFontInstance();
+
+int nStart = 0;
+Point aPos(0, 0);
+const GlyphItem* pGlyph;
+while (rLayout.GetNextGlyphs(1, &pGlyph, aPos, nStart))
+{
+if (!rFont.GetGlyphCache().IsGlyphCached(pGlyph->maGlyphId))
+{
+if (!rFont.CacheGlyphToAtlas(hDC, hFONT, pGlyph->maGlyphId, *this))
+return false;
+}
+}
+
+return true;
+}
+
+bool WinSalGraphics::DrawCachedGlyphs(const CommonSalLayout& rLayout)
+{
+HDC hDC = getHDC();
+
+Rectangle aRect;
+rLayout.GetBoundRect(*this, aRect);
+
+COLORREF color = GetTextColor(hDC);
+SalColor salColor = MAKE_SALCOLOR(GetRValue(color), GetGValue(color), 
GetBValue(color));
+
+WinOpenGLSalGraphicsImpl *pImpl = 
dynamic_cast(mpImpl.get());
+if (!pImpl)
+return false;
+
+WinFontInstance& rFont = rLayout.getWinFontInstance();
+
+int nStart = 0;
+Point aPos(0, 0);
+const GlyphItem* pGlyph;
+while (rLayout.GetNextGlyphs(1, &pGlyph, aPos, nStart))
+{
+OpenGLGlyphDrawElement& 
rElement(rFont.GetGlyphCache().GetDrawElement(pGlyph->maGlyphId));
+OpenGLTexture& rTexture = rElement.maTexture;
+
+if (!rTexture)
+return false;
+
+SalTwoRect a2Rects(0, 0,
+   rTexture.GetWidth(), rTexture.GetHeight(),
+   aPos.X() - rElement.getExtraOffset() + 
rElement.maLeftOverhangs,
+   aPos.Y() - rElement.mnBaselineOffset - 
rElement.getExtraOffset(),
+   rTexture.GetWidth(), rTexture.GetHeight());
+
+pImpl->DeferredTextDraw(rTexture, salColor, a2Rects);
+}
+
+return true;
+}
+
 void WinSalGraphics::DrawTextLayout(const CommonSalLay

[Libreoffice-commits] core.git: 5 commits - cui/source sc/source sfx2/source sw/source

2016-12-15 Thread Caolán McNamara

 cui/source/options/optlingu.cxx  |2 +-
 sc/source/filter/xml/xmlcondformat.cxx   |4 ++--
 sc/source/ui/docshell/dataprovider.cxx   |4 ++--
 sfx2/source/appl/appmisc.cxx |2 +-
 sw/source/core/draw/dcontact.cxx |4 ++--
 sw/source/core/layout/anchoreddrawobject.cxx |2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit a7bd6830e26d798068970684754fa23894d9f7c2
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 21:27:42 2016 +

coverity#1397206 Resource leak

Change-Id: I497388a353425811ff18d9b1937ca536b562ddfc

diff --git a/sc/source/ui/docshell/dataprovider.cxx 
b/sc/source/ui/docshell/dataprovider.cxx
index 7df702c..76f3776 100644
--- a/sc/source/ui/docshell/dataprovider.cxx
+++ b/sc/source/ui/docshell/dataprovider.cxx
@@ -106,10 +106,10 @@ void CSVFetchThread::EndThread()
 
 void CSVFetchThread::execute()
 {
-LinesType* pLines = new LinesType(10);
+LinesType aLines(10);
 
 // Read & store new lines from stream.
-for (Line & rLine : *pLines)
+for (Line & rLine : aLines)
 {
 rLine.maCells.clear();
 mpStream->ReadLine(rLine.maLine);
commit 932719a8c5e53eabe7586a7ac845ff2aaa11e46a
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 21:25:52 2016 +

coverity#1397203 Dereference after null check

Change-Id: Icd03b10226025bae28574e695ed6416f70d0f54a

diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index c806f3f..1c95425 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -115,7 +115,7 @@ SwPosNotify::~SwPosNotify()
 }
 }
 // tdf#101464 notify SwAccessibleMap about new drawing object position
-if (mpOldPageFrame->getRootFrame()->IsAnyShellAccessible())
+if (mpOldPageFrame && 
mpOldPageFrame->getRootFrame()->IsAnyShellAccessible())
 {
 mpOldPageFrame->getRootFrame()->GetCurrShell()->Imp()->MoveAccessible(
 nullptr, mpAnchoredDrawObj->GetDrawObj(), maOldObjRect);
commit 7a9d5485a815af26c63790e3165477c68e164117
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 21:21:38 2016 +

coverity#1397207 Dereference before null check

Change-Id: I2578d59e98a2b1b040d9284b0ad0f68fd331d0df

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 73d2b38..0ef9fca 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -411,9 +411,9 @@ const SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj( 
const SdrObject* _pSdr
 
 const SwAnchoredObject* pRetAnchoredObj = nullptr;
 
-if ( _pSdrObj && dynamic_cast( _pSdrObj) !=  
nullptr )
+if (const SwVirtFlyDrawObj* pFlyDrawObj = dynamic_cast(_pSdrObj))
 {
-pRetAnchoredObj = static_cast(_pSdrObj)->GetFlyFrame();
+pRetAnchoredObj = pFlyDrawObj->GetFlyFrame();
 }
 
 return pRetAnchoredObj;
commit f74cad45681cc0ea5706a112a0e17f14a3197e39
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 21:17:58 2016 +

coverity#1397204 Dereference null return value

Change-Id: Ief4b455b316b55ebf012a8650c96da037df0135c

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a982606..cd32265 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -222,7 +222,7 @@ static void lcl_SetCheckButton( SvTreeListEntry* pEntry, 
bool bCheck )
 SvLBoxButton* pItem = 
static_cast(pEntry->GetFirstItem(SvLBoxItemType::Button));
 
 DBG_ASSERT(pItem,"SetCheckButton:Item not found");
-if (pItem->GetType() == SvLBoxItemType::Button)
+if (pItem && pItem->GetType() == SvLBoxItemType::Button)
 {
 if (bCheck)
 pItem->SetStateChecked();
commit eb0e2dabde9d96892929f6902d8d10d722b83c3e
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 21:15:29 2016 +

coverity#1397200 Unchecked return value

and

coverity#1397201 Unchecked return value
coverity#1397202 Unchecked return value

Change-Id: I73cc6e3b08e6a44b27be2093ba568d46ebe0659a

diff --git a/sc/source/filter/xml/xmlcondformat.cxx 
b/sc/source/filter/xml/xmlcondformat.cxx
index 6479f1b..d34c27c 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -266,7 +266,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( 
ScXMLImport& rImport, sal_
 if(!sShowValue.isEmpty())
 {
 bool bShowValue = true;
-sax::Converter::convertBool( bShowValue, sShowValue );
+(void)sax::Converter::convertBool( bShowValue, sShowValue );
 mpFormatData->mbOnlyBar = !bShowValue;
 }
 
@@ -366,7 +366,7 @@ 
ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u
 if(!sShowValue.isEmpty())
 {
 bool bShowValue = true;
-sax::Converter::convertBool( bShowValue, sShowValue );
+(void)sax::Converter::convertBool

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

2016-12-15 Thread Eike Rathke

 sc/source/core/data/drwlayer.cxx  |7 +
 sc/source/ui/Accessibility/AccessibleDocument.cxx |   13 ++---
 svx/source/svdraw/svdedxv.cxx |   30 +++---
 3 files changed, 27 insertions(+), 23 deletions(-)

New commits:
commit 0c565095983b0cc8b96a78012c611b7a03962204
Author: Eike Rathke 
Date:   Fri Dec 16 00:36:00 2016 +0100

remove superfluous this->Init() call

Init() does exactly the same, just that it didn't because it was already 
done ...
Went in with IAccessible2 integration.

Change-Id: Ib29bd000e283bbb500689914f1ceb692dd0ab380

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index cbdc599b..e34f666 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1555,17 +1555,12 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, 
const SfxHint& rHint )
 mpAccessibleSpreadsheet.is())
 {
 FreeAccessibleSpreadsheet();
+
+// Shapes / form controls after reload not accessible, rebuild the
+// mpChildrenShapes variable.
 if (mpChildrenShapes)
 DELETEZ(mpChildrenShapes);
-
-// Accessibility: Shapes / form controls after reload not 
accessible
-if ( !mpChildrenShapes )
-{
-mpChildrenShapes = new ScChildrenShapes( this, mpViewShell, 
meSplitPos );
-}
-
-//Invoke Init() to rebuild the mpChildrenShapes variable
-this->Init();
+mpChildrenShapes = new ScChildrenShapes( this, mpViewShell, 
meSplitPos );
 
 AccessibleEventObject aEvent;
 aEvent.EventId = AccessibleEventId::INVALIDATE_ALL_CHILDREN;
commit 6a334757082be4915e7e731ce4c1b0bd4641050d
Author: Eike Rathke 
Date:   Fri Dec 16 00:18:52 2016 +0100

Resolves: tdf#103543 disable mass broadcasts from drawing objects' changes

Specifically the a11y listeners are nasty bottle necks. A11y will get
updated on paint/view. We're touching all objects on that drawing page
to reposition so interdependencies that need to be broadcasted should
not happen.

Change-Id: Ic80446e22422a3097281ba20eecf0a078ac6a7cb

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 1deb958..3689aab 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -587,6 +587,9 @@ void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const 
Size& rSize, bool bUpda
 
 bool bNegativePage = pDoc && pDoc->IsNegativePage( 
static_cast(nPageNo) );
 
+// Disable mass broadcasts from drawing objects' position changes.
+bool bWasLocked = isLocked();
+setLock(true);
 const size_t nCount = pPage->GetObjCount();
 for ( size_t i = 0; i < nCount; ++i )
 {
@@ -595,6 +598,7 @@ void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const 
Size& rSize, bool bUpda
 if( pData )
 RecalcPos( pObj, *pData, bNegativePage, bUpdateNoteCaptionPos 
);
 }
+setLock(bWasLocked);
 }
 }
 
commit b954f1427a9549d89d8b0800259af9374b4767df
Author: Eike Rathke 
Date:   Thu Dec 15 21:34:17 2016 +0100

prevent mutiple broadcasts during the series of changes on one drawing 
object

Change-Id: I3a26d3589cbbcb8359242f7e1709fa7c34bd2900

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index f2e93dd..1deb958 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -821,6 +821,9 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData& rData, bool bNegati
 }
 else
 {
+// Prevent mutiple broadcasts during the series of changes.
+SdrDelayBroadcastObjectChange aDelayBroadcastObjectChange(*pObj);
+
 bool bCanResize = bValid2 && !pObj->IsResizeProtect();
 
 //First time positioning, must be able to at least move it
commit ba53b2d28274ad4e36ef57084b48c4ed73d15e63
Author: Eike Rathke 
Date:   Thu Dec 15 19:54:15 2016 +0100

avoid dynamic_cast

Change-Id: I9f64eac95b39adc649b2e63cd5abdd6e7a448ee6

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 512bc34..1fe56c8 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -216,21 +216,23 @@ void SdrObjEditView::TakeActionRect(Rectangle& rRect) 
const
 void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
 SdrGlueEditView::Notify(rBC,rHint);
-// change of printer while editing
-const SdrHint* pSdrHint = dynamic_cast(&rHint);
-if (pSdrHint!=nullptr && pTextEditOutliner!=nullptr) {
-SdrHintKind eKind=pSdrHint->GetKind();
-if (eKind==SdrHintKind::RefDeviceChange) {
-pTextEditOutliner->SetRefDevice(mpModel->GetRefDevice());
-}
-if (e

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/win

2016-12-15 Thread Khaled Hosny

 vcl/win/gdi/salfont.cxx |   48 ++--
 1 file changed, 42 insertions(+), 6 deletions(-)

New commits:
commit 641b3461dd57b73807f7f55fa2d9b08fb777ed20
Author: Khaled Hosny 
Date:   Thu Dec 15 17:17:17 2016 +0200

tdf#104533: Fix font metrics for non-SFNT fonts

They can still be used with the old layout engine, so fallback to old
code when we encounter one of them. Not needed on master as the old
layout engine is gone there.

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

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 10ec674..fd207a5 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1252,14 +1252,17 @@ void WinSalGraphics::GetFontMetric( 
ImplFontMetricDataRef& rxFontMetric, int nFa
 
 // get the font metric
 OUTLINETEXTMETRICW aOutlineMetric;
-const bool bOK = GetOutlineTextMetricsW(getHDC(), 
sizeof(OUTLINETEXTMETRICW), &aOutlineMetric);
+TEXTMETRICW aWinMetric;
+bool bOK = GetOutlineTextMetricsW(getHDC(), sizeof(OUTLINETEXTMETRICW), 
&aOutlineMetric);
+if (bOK)
+aWinMetric = aOutlineMetric.otmTextMetrics;
+else
+bOK = GetTextMetricsW(getHDC(), &aWinMetric);
 // restore the HDC to the font in the base level
 SelectFont( getHDC(), hOldFont );
 if( !bOK )
 return;
 
-TEXTMETRICW aWinMetric = aOutlineMetric.otmTextMetrics;
-
 // device independent font attributes
 rxFontMetric->SetFamilyType(ImplFamilyToSal( aWinMetric.tmPitchAndFamily 
));
 rxFontMetric->SetSymbolFlag(aWinMetric.tmCharSet == SYMBOL_CHARSET);
@@ -1290,9 +1293,42 @@ void WinSalGraphics::GetFontMetric( 
ImplFontMetricDataRef& rxFontMetric, int nFa
 // transformation dependent font metrics
 rxFontMetric->SetWidth( static_cast( mfFontScale[nFallbackLevel] * 
aWinMetric.tmAveCharWidth ) );
 
-const std::vector rHhea(aHheaRawData.get(), aHheaRawData.get() + 
aHheaRawData.size());
-const std::vector rOS2(aOS2RawData.get(), aOS2RawData.get() + 
aOS2RawData.size());
-rxFontMetric->ImplCalcLineSpacing(rHhea, rOS2, aOutlineMetric.otmEMSquare);
+if (aHheaRawData.size() > 0 || aOS2RawData.size() > 0)
+{
+const std::vector rHhea(aHheaRawData.get(), 
aHheaRawData.get() + aHheaRawData.size());
+const std::vector rOS2(aOS2RawData.get(), aOS2RawData.get() + 
aOS2RawData.size());
+rxFontMetric->ImplCalcLineSpacing(rHhea, rOS2, 
aOutlineMetric.otmEMSquare);
+}
+else
+{
+// Falback to GDI code, can only happen with non-SFNT fonts
+rxFontMetric->SetInternalLeading( static_cast( 
mfFontScale[nFallbackLevel] * aWinMetric.tmInternalLeading ) );
+rxFontMetric->SetExternalLeading( static_cast( 
mfFontScale[nFallbackLevel] * aWinMetric.tmExternalLeading ) );
+rxFontMetric->SetAscent( static_cast( mfFontScale[nFallbackLevel] 
* aWinMetric.tmAscent ) );
+rxFontMetric->SetDescent( static_cast( 
mfFontScale[nFallbackLevel] * aWinMetric.tmDescent ) );
+// #107888# improved metric compatibility for Asian fonts...
+// TODO: assess workaround below for CWS >= extleading
+// TODO: evaluate use of aWinMetric.sTypo* members for CJK
+if( mpWinFontData[nFallbackLevel] && 
mpWinFontData[nFallbackLevel]->SupportsCJK() )
+{
+rxFontMetric->SetInternalLeading( 
rxFontMetric->GetInternalLeading() + rxFontMetric->GetExternalLeading() );
+
+// #109280# The line height for Asian fonts is too small.
+// Therefore we add half of the external leading to the
+// ascent, the other half is added to the descent.
+const long nHalfTmpExtLeading = rxFontMetric->GetExternalLeading() 
/ 2;
+const long nOtherHalfTmpExtLeading = 
rxFontMetric->GetExternalLeading() - nHalfTmpExtLeading;
+
+// #110641# external leading for Asian fonts.
+// The factor 0.3 has been confirmed with experiments.
+long nCJKExtLeading = static_cast(0.30 * 
(rxFontMetric->GetAscent() + rxFontMetric->GetDescent()));
+nCJKExtLeading -= rxFontMetric->GetExternalLeading();
+rxFontMetric->SetExternalLeading( (nCJKExtLeading > 0) ? 
nCJKExtLeading : 0 );
+
+rxFontMetric->SetAscent( rxFontMetric->GetAscent() + 
nHalfTmpExtLeading );
+rxFontMetric->SetDescent(  rxFontMetric->GetDescent() + 
nOtherHalfTmpExtLeading );
+}
+}
 
 rxFontMetric->SetMinKashida( GetMinKashidaWidth() );
 }
___
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

2016-12-15 Thread scan-admin


Hi,

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

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


** CID 1397207:  Null pointer dereferences  (REVERSE_INULL)
/sw/source/core/draw/dcontact.cxx: 414 in 
SwFlyDrawContact::GetAnchoredObj(const SdrObject *) const()



*** CID 1397207:  Null pointer dereferences  (REVERSE_INULL)
/sw/source/core/draw/dcontact.cxx: 414 in 
SwFlyDrawContact::GetAnchoredObj(const SdrObject *) const()
408 " - wrong object type 
object provided" );
409 assert(GetUserCall(_pSdrObj) == this &&
410 " - provided object 
doesn't belong to this contact");
411 
412 const SwAnchoredObject* pRetAnchoredObj = nullptr;
413 
>>> CID 1397207:  Null pointer dereferences  (REVERSE_INULL)
>>> Null-checking "_pSdrObj" suggests that it may be null, but it has 
>>> already been dereferenced on all paths leading to the check.
414 if ( _pSdrObj && dynamic_cast( _pSdrObj) 
!=  nullptr )
415 {
416 pRetAnchoredObj = static_cast(_pSdrObj)->GetFlyFrame();
417 }
418 
419 return pRetAnchoredObj;

** CID 1397206:  Resource leaks  (RESOURCE_LEAK)
/sc/source/ui/docshell/dataprovider.cxx: 123 in sc::CSVFetchThread::execute()()



*** CID 1397206:  Resource leaks  (RESOURCE_LEAK)
/sc/source/ui/docshell/dataprovider.cxx: 123 in sc::CSVFetchThread::execute()()
117 orcus::csv_parser parser(rLine.maLine.getStr(), 
rLine.maLine.getLength(), aHdl, maConfig);
118 parser.parse();
119 }
120 
121 if (!mpStream->good())
122 RequestTerminate();
>>> CID 1397206:  Resource leaks  (RESOURCE_LEAK)
>>> Variable "pLines" going out of scope leaks the storage it points to.
123 }
124 
125 CSVDataProvider::CSVDataProvider(const OUString& rURL, const ScRange& 
rRange):
126 maURL(rURL),
127 mrRange(rRange),
128 mbImportUnderway(false)

** CID 1397205:  Memory - corruptions  (OVERRUN)



*** CID 1397205:  Memory - corruptions  (OVERRUN)
/ucb/source/ucp/file/filtask.cxx: 694 in fileaccess::TaskManager::page(int, 
const rtl::OUString &, const 
com::sun::star::uno::Reference &)()
688 
689 do
690 {
691 err = aFile.read( static_cast(BFF),bfz,nrc );
692 if(  err == osl::FileBase::E_None )
693 {
>>> CID 1397205:  Memory - corruptions  (OVERRUN)
>>> Overrunning array "BFF" of 512 8-byte elements by passing it to a 
>>> function which accesses it at element index 4095 (byte offset 32760) using 
>>> argument "(sal_uInt32)nrc" (which evaluates to 4096).
694 uno::Sequence< sal_Int8 > seq( BFF, (sal_uInt32)nrc );
695 try
696 {
697 xOutputStream->writeBytes( seq );
698 }
699 catch (const io::NotConnectedException&)

** CID 1397204:  Null pointer dereferences  (NULL_RETURNS)
/cui/source/options/optlingu.cxx: 225 in lcl_SetCheckButton(SvTreeListEntry *, 
bool)()



*** CID 1397204:  Null pointer dereferences  (NULL_RETURNS)
/cui/source/options/optlingu.cxx: 225 in lcl_SetCheckButton(SvTreeListEntry *, 
bool)()
219 
220 static void lcl_SetCheckButton( SvTreeListEntry* pEntry, bool bCheck )
221 {
222 SvLBoxButton* pItem = 
static_cast(pEntry->GetFirstItem(SvLBoxItemType::Button));
223 
224 DBG_ASSERT(pItem,"SetCheckButton:Item not found");
>>> CID 1397204:  Null pointer dereferences  (NULL_RETURNS)
>>> Dereferencing a pointer that might be null "pItem" when calling 
>>> "GetType". (The dereference happens because this is a virtual function 
>>> call.)
225 if (pItem->GetType() == SvLBoxItemType::Button)
226 {
227 if (bCheck)
228 pItem->SetStateChecked();
229 else
230 pItem->SetStateUnchecked();

** CID 1397203:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/core/layout/anchoreddrawobject.cxx: 66 in 
SwPosNotify::~SwPosNotify()()



*** CID 1397203:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/core/layout/anchoreddrawobject.cxx: 66 in 
SwPosNotify::~SwPosNotify()()
60 }
61 
62 SwPosNotify::

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

2016-12-15 Thread Gabor Kelemen

 source/text/scalc/01/0510.xhp   |2 +-
 source/text/swriter/01/0514.xhp |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2234be96c0865090b2e1c47e5138f011b566512c
Author: Gabor Kelemen 
Date:   Thu Dec 15 20:19:02 2016 +0100

tdf#104569 Fix icon paths on Style and Formatting pages

Change-Id: Ida5a3a066946c8d195023bfd182bae0a703bbb5c
Reviewed-on: https://gerrit.libreoffice.org/32052
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/source/text/scalc/01/0510.xhp 
b/source/text/scalc/01/0510.xhp
index 10eb59e..7ce51e5 100644
--- a/source/text/scalc/01/0510.xhp
+++ b/source/text/scalc/01/0510.xhp
@@ -81,7 +81,7 @@
 
   
 
-   Icon
+   Icon
 
 
   Page 
Styles
diff --git a/source/text/swriter/01/0514.xhp 
b/source/text/swriter/01/0514.xhp
index 48e1f80..06a70db 100644
--- a/source/text/swriter/01/0514.xhp
+++ b/source/text/swriter/01/0514.xhp
@@ -96,7 +96,7 @@
 
   
 
-   Icon
+   Icon
 
 
   Frame 
Styles
@@ -110,7 +110,7 @@
 
   
 
-   Icon
+   Icon
 
 
   Page 
Styles
@@ -124,7 +124,7 @@
 
   
 
-   Icon
+   Icon
 
 
   List 
Styles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-12-15 Thread Gabor Kelemen

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

New commits:
commit 4dae0f055cddb52d2be0bbf0a37281ece8486968
Author: Gabor Kelemen 
Date:   Thu Dec 15 20:19:02 2016 +0100

Updated core
Project: help  2234be96c0865090b2e1c47e5138f011b566512c

tdf#104569 Fix icon paths on Style and Formatting pages

Change-Id: Ida5a3a066946c8d195023bfd182bae0a703bbb5c
Reviewed-on: https://gerrit.libreoffice.org/32052
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/helpcontent2 b/helpcontent2
index 7d62908..2234be9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7d62908799da6b9ec1f4c2749fbbef9d7093effd
+Subproject commit 2234be96c0865090b2e1c47e5138f011b566512c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Katarina Behrens

 cui/source/tabpages/tparea.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 4c5079791f5d985151ebc090c5a07705e76a728e
Author: Katarina Behrens 
Date:   Thu Dec 15 16:36:00 2016 +0100

tdf#104221: Make up for non-existent FillItemSet

for fill:none option

Change-Id: I12ada9276a613f157976650148f2389126d16f08
Reviewed-on: https://gerrit.libreoffice.org/32050
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index db7cd3f..0032e28 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -205,6 +205,14 @@ DeactivateRC SvxAreaTabPage::DeactivatePage( SfxItemSet* 
_pSet )
 FillType eFillType = static_cast(maBox.GetCurrentButtonPos());
 switch( eFillType )
 {
+case TRANSPARENT:
+{
+// Fill: None doesn't have its own tabpage and thus
+// implementation of FillItemSet, so we supply it here
+XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
+_pSet->Put( aStyleItem );
+break;
+}
 case SOLID:
 return DeactivatePage_Impl(_pSet);
 case GRADIENT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Justin Luth

 sw/source/filter/ww8/ww8par6.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 426215ca6fedd13ece07463ee95dd33bdb1a9a28
Author: Justin Luth 
Date:   Thu Dec 15 20:24:46 2016 +0300

tdf#75856 SwTwips: replace with unambiguous sal_Int32

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

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 59112cb..68b017e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -599,7 +599,7 @@ void wwSectionManager::SetPageULSpaceItems(SwFrameFormat 
&rFormat,
 else
 {
 // #i48832# - set correct spacing between header and body.
-const SwTwips nHdLowerSpace( std::abs(rSection.maSep.dyaTop) - 
rData.nSwUp - rData.nSwHLo );
+const sal_Int32 nHdLowerSpace( std::abs(rSection.maSep.dyaTop) 
- rData.nSwUp - rData.nSwHLo );
 pHdFormat->SetFormatAttr(SwFormatFrameSize(ATT_FIX_SIZE, 0, 
rData.nSwHLo + nHdLowerSpace));
 aHdUL.SetLower( static_cast< sal_uInt16 >(nHdLowerSpace) );
 pHdFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenCL enabled by default after OS reinstall causing Unit Test Failure

2016-12-15 Thread slacka

If someone wants to dig deeper, I’d be glad to run special debug builds like
I did for Ashod’s failing Unit tests.

Or, should we just blacklist my driver? What info do you need for that?

-Luke




--
View this message in context: 
http://nabble.documentfoundation.org/OpenCL-enabled-by-default-after-OS-reinstall-causing-Unit-Test-Failure-tp4202419p4202823.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] minutes of ESC call ...

2016-12-15 Thread Cor Nouws

Hi Bjoern,

Bjoern Michaelsen wrote on 15-12-16 19:10:

> Yes, but the rationale was the extraordinary number of MM regressions we had
> during the cleanup of the old (really horrible) code. That major cleanup is
> finishe for the most part now, activity in the area is back to normal, so no
> justification anymore to highlight MM regressions over regressions elsewhere.

Ah, sure makes sense.
Thanks for explaining,

Ciao - Cor


-- 
Cor Nouws
GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28  A038 E49D 7365 B134 80A6
- vrijwilliger http://nl.libreoffice.org
- volunteer http://www.libreoffice.org
- The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] minutes of ESC call ...

2016-12-15 Thread Bjoern Michaelsen

Hi,
On Thu, Dec 15, 2016 at 12:19:54PM +0100, Cor Nouws wrote:
> Michael Meeks wrote on 08-12-16 17:56:
> > + Mail merge regressions: http://tdf.io/mmregressions
> > + 4 open; 4 open last meeting (2 OSX, 1 Linux, 1 generic but hard 
> > repro)
> >   => drop from the QA section from now - always four.
> 
> Counting 5 at the moment.

Yes, but the rationale was the extraordinary number of MM regressions we had
during the cleanup of the old (really horrible) code. That major cleanup is
finishe for the most part now, activity in the area is back to normal, so no
justification anymore to highlight MM regressions over regressions elsewhere.

Best,

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

Re: [Libreoffice-qa] minutes of ESC call ...

2016-12-15 Thread Cor Nouws

Michael Meeks wrote on 08-12-16 17:56:
> + Mail merge regressions: http://tdf.io/mmregressions
> + 4 open; 4 open last meeting (2 OSX, 1 Linux, 1 generic but hard 
> repro)
>   => drop from the QA section from now - always four.

Counting 5 at the moment.


-- 
Cor Nouws
GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28  A038 E49D 7365 B134 80A6
- vrijwilliger http://nl.libreoffice.org
- volunteer http://www.libreoffice.org
- The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] libvisio.git: Branch 'zf.com' - build/win32 src/conv src/lib

2016-12-15 Thread Ji??? Posp???il

 build/win32/libvisio.vcxproj  |   26 +
 src/conv/svg/vsd2xhtml.cpp|  276 +--
 src/lib/VSDContentCollector.cpp   |  494 
 src/lib/VSDContentCollector.h |7 
 src/lib/VSDMetaData.cpp   |2 
 src/lib/VSDOutputElementList.cpp  |  282 ---
 src/lib/VSDOutputElementList.h|  317 +
 src/lib/preprocess/SvgDC.cpp  |1 
 src/lib/preprocess/SvgDC.h|   32 +
 src/lib/preprocess/SvgFont.cpp|   61 ++
 src/lib/preprocess/SvgFont.h  |   38 +
 src/lib/preprocess/SvgParagraph.cpp   |  152 ++
 src/lib/preprocess/SvgParagraph.h |   69 ++
 src/lib/preprocess/SvgSpan.cpp|   74 +++
 src/lib/preprocess/SvgSpan.h  |   51 ++
 src/lib/preprocess/SvgTextObject.cpp  |  473 +++
 src/lib/preprocess/SvgTextObject.h|  109 
 src/lib/preprocess/SvgUtils.cpp   |   61 ++
 src/lib/preprocess/SvgUtils.h |   28 +
 src/lib/preprocess/VsdElementListPreprocessor.cpp |  521 ++
 src/lib/preprocess/VsdElementListPreprocessor.h   |   71 ++
 src/lib/preprocess/windows/WindowsSvgDC.cpp   |  188 +++
 src/lib/preprocess/windows/WindowsSvgDC.h |   61 ++
 src/lib/preprocess/windows/WindowsSvgFont.cpp |   54 ++
 src/lib/preprocess/windows/WindowsSvgFont.h   |   30 +
 25 files changed, 2964 insertions(+), 514 deletions(-)

New commits:
commit 80720108347665f6051795f3fbb7d8d0f262513a
Author: Ji???Â Posp?Â??il 
Date:   Wed Dec 14 14:46:02 2016 +0100

SVG generation fixes

- text wrapping
- text decoration
- line connectors
- path filling
- unordered item lists

diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index c8cad9f..4a96a9f 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -111,6 +111,16 @@
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
 
+
+
+
+
+
+
+
+
+
+
 
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
@@ -165,6 +175,8 @@
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
 
+
+
 
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
@@ -249,6 +261,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -261,6 +283,8 @@
 
 
 
+
+
 
 
 
@@ -290,4 +314,4 @@
   
   
   
-
+
\ No newline at end of file
diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp
index cc91c85..dc1b7cc 100644
--- a/src/conv/svg/vsd2xhtml.cpp
+++ b/src/conv/svg/vsd2xhtml.cpp
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * This file is part of the libvisio project.
  *
@@ -11,108 +10,275 @@
 #include "config.h"
 #endif
 
+#include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
+
+#include 
 #include 
 #include 
 #include 
 #include 
 
+using namespace librevenge;
+using namespace libvisio;
+using namespace std;
+
+
 #ifndef VERSION
 #define VERSION "UNKNOWN VERSION"
 #endif
 
+
 namespace
 {
 
+string UnquoteString(const string &str)
+{
+  unsigned int strSize = str.size();
+  unsigned int pos1 = strSize > 0 && str[0] == '"' ? 1 : 0;
+  unsigned int pos2 = strSize > 1 && str[strSize - 1] == '"' ? strSize - 1 : 
strSize;
+  return str.substr(pos1, pos2 - pos1);
+}
+
+bool ExpandFileNameList(const string &listFileName, vector &fileNames)
+{
+  if (listFileName.find(".lst") == listFileName.size() - 4)
+  {
+ifstream in(listFileName);
+
+if (in.is_open())
+{
+  while (in && !in.eof())
+  {
+string line;
+getline(in, line);
+
+if (in)
+{
+  fileNames.push_back(UnquoteString(line));
+}
+  }
+
+  return true;
+}
+  }
+
+  return false;
+}
+
+void WriteXhtmlHeader(ostream &out)
+{
+  out << "" << endl;
+  out << "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>" << endl;
+  out << "http://www.w3.org/1999/xhtml\"; 
xmlns:svg=\"http://www.w3.org/2000/svg\"; 
xmlns:xlink=\"http://www.w3.org/1999/xlink\";>" << endl;
+  out << "" << endl;
+  out << "http://www.w3.org/2000/svg\";?>" << 
endl;
+}
+
+void WriteXhtmlFooter(ostream &out)
+{
+  out << "" << endl;
+  out << "" << endl;
+}
+
+void WriteSvg(const char *svgStr, ostream &out)
+{
+  out << ""  << endl;
+  out << svgStr << endl;
+}
+
 int printUsage()
 {
-  printf("`vsd2xhtml' converts Microsoft Visio documents to SVG.\n");
-  printf("\n");
-  printf("Usage: vsd2xhtml [OPTION] INPUT\n");
-  printf("\n");
-  printf("Options:\n");
-  printf("\t--helpshow this help mes

[Libreoffice-commits] libvisio.git: Branch 'zf.com' - build/win32

2016-12-15 Thread Jiří Pospíšil

 build/win32/libvisio.vcxproj  |   68 +++---
 build/win32/vsd2raw.vcxproj   |   40 
 build/win32/vsd2xhtml.vcxproj |   66 
 3 files changed, 97 insertions(+), 77 deletions(-)

New commits:
commit ef4ae42ce738fc2450bfc5dc205a65003c04455b
Author: JiÅÃ PospÃÅ¡il 
Date:   Thu Dec 15 12:58:46 2016 +0100

Project build fixes

diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index 0413aff..c8cad9f 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -35,24 +35,24 @@
   
   
 <_ProjectFileVersion>10.0.40219.1
-.\Debug\
-.\Debug\
-.\Release\
-.\Release\
+.\Debug\lib\
+.\Debug\lib\
+.\Release\lib\
+.\Release\lib\
   
   
 
   Disabled
-  
..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)
+  
..\..\inc;..\..\src\lib;..\..\src\lib\preprocess;..\..\src\lib\preprocess\windows;$(BOOST_DIR);$(ICONV_DIR)\include;$(ICU_DIR)\include;$(LIBRVNG_DIR)\inc;$(LIBXML_DIR)\include;$(ZLIB_DIR)\include
   
_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
   EnableFastChecks
   MultiThreadedDebugDLL
   false
   true
-  
.\Debug/libvisio.pch
-  .\Debug/
-  .\Debug/
-  .\Debug/
+  
$(TargetDir)/libvisio.pch
+  $(TargetDir)
+  $(TargetDir)
+  $(TargetDir)
   Level3
   true
   EditAndContinue
@@ -62,8 +62,10 @@
   0x0409
 
 
-  Debug\lib\libvisio-0.0.lib
+  $(TargetPath)
   true
+  
$(ICU_DIR)\lib\icuuc.lib;$(LIBXML_DIR)\lib\libxml2.lib;%(AdditionalDependencies)
+  true
 
 
   true
@@ -74,17 +76,17 @@
 
   MaxSpeed
   OnlyExplicitInline
-  
..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)
+  
..\..\inc;..\..\src\lib;..\..\src\lib\preprocess;..\..\src\lib\preprocess\windows;$(BOOST_DIR);$(ICONV_DIR)\include;$(ICU_DIR)\include;$(LIBRVNG_DIR)\inc;$(LIBXML_DIR)\include;$(ZLIB_DIR)\include
   
NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
   true
   MultiThreadedDLL
   true
   false
   true
-  
.\Release/libvisio.pch
-  .\Release/
-  .\Release/
-  .\Release/
+  
$(TargetDir)/libvisio.pch
+  $(TargetDir)
+  $(TargetDir)
+  $(TargetDir)
   Level3
   true
 
@@ -93,8 +95,9 @@
   0x0409
 
 
-  Release\lib\libvisio-0.0.lib
+  $(TargetPath)
   true
+  
$(ICU_DIR)\lib\icuuc.lib;$(LIBXML_DIR)\lib\libxml2.lib;%(AdditionalDependencies)
 
 
   true
@@ -198,12 +201,6 @@
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
 
-
-  %(AdditionalIncludeDirectories)
-  %(PreprocessorDefinitions)
-  %(AdditionalIncludeDirectories)
-  %(PreprocessorDefinitions)
-
 
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
@@ -216,12 +213,7 @@
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
 
-
-  %(AdditionalIncludeDirectories)
-  %(PreprocessorDefinitions)
-  %(AdditionalIncludeDirectories)
-  %(PreprocessorDefinitions)
-
+
 
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
@@ -252,17 +244,10 @@
   %(AdditionalIncludeDirectories)
   %(PreprocessorDefinitions)
 
-
-  %(AdditionalIncludeDirectories)
-  %(PreprocessorDefinitions)
-  %(AdditionalIncludeDirectories)
-  %(PreprocessorDefinitions)
-
   
   
 
 
-
 
 
 
@@ -284,14 +269,23 @@
 
 
 
-
 
+
 
 
 
 
 
-
+  
+  
+
+  {740f0d46-431f-11e3-b75a-d067e5eab6e3}
+  true
+  false
+  false
+  false
+  false
+
   
   
   
diff --git a/build/win32/vsd2raw.vcxproj b/build/win32/vsd2raw.vcxproj
index 4669ef0..26cb047 100644
--- a/build/win32/vsd2raw.vcxproj
+++ b/build/win32/vsd2raw.vcxproj
@@ -52,30 +52,30 @@
 
 
   Disabled
-  
..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)
+  
..\..\inc;$(LIBRVNG_DIR)\inc;%(AdditionalIncludeDirectories)
   
_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)
   EnableFastChecks
   MultiThreadedDebugDLL
   false
-  
.\Debug/vsd2raw.pch
-  .\Debug/
-  .\Debug/
-  .\Debug/
+  
$(TargetDir)/vsd2raw.pch
+  $(TargetDir)
+  $(TargetDir)
+  $(TargetDir)
   Level3
   true
-  EditAndContinue
+  ProgramDatabase
 
 
   
_DEBUG;%(PreprocessorDefinitions)
   0x0409
 
 
-  
libvisio-0.0.lib;libreveng

[Libreoffice-commits] libvisio.git: Changes to 'zf.com'

2016-12-15 Thread David Tardon

New branch 'zf.com' available with the following commits:
___
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.1' - bin/pack-debug

2016-12-15 Thread László Németh

 bin/pack-debug |  321 +
 1 file changed, 321 insertions(+)

New commits:
commit 0c19de75b26a4b0c9d6607496fc8867d1a0117a1
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Dec 15 17:33:17 2016 +0100

script for generating debug packages

Change-Id: I89be53e5fea3b9928d960604d050db47383baae3

diff --git a/bin/pack-debug b/bin/pack-debug
new file mode 100755
index 000..f5a31ac
--- /dev/null
+++ b/bin/pack-debug
@@ -0,0 +1,321 @@
+#!/bin/sh
+# create debuginfo and debugsource packages from LO rpm & deb files
+# (generated by using --enable-symbols)
+#
+# Usage:
+#
+# cd /opt/lo_installation_path
+# dbg_pkg
+# # or
+# # PACKAGENAME=collaboraoffice5.1 dbg_pkg # if building in a different path
+
+# build path
+export BUILD_PATH=$PWD
+
+# set package base name, eg. collaboraoffice5.1
+# based on the actual directory, eg. /opt/collaboraoffice5.1,
+# or checking the PACKAGENAME environmental variable
+
+if [ -z "$PACKAGENAME" ]
+then
+DEBUGSRC_PACKAGENAME=$(basename $BUILD_PATH)
+else
+DEBUGSRC_PACKAGENAME=$PACKAGENAME
+fi
+echo PACKAGE NAME: $DEBUGSRC_PACKAGENAME
+
+# set install dirname and product version
+eval $(grep ^INSTALLDIRNAME config.log)
+eval $(grep ^PRODUCTVERSION config.log)
+
+#
+# Function for re-build RPM files
+#
+function repack_rpm {
+
+# set environment based on config.log
+# for find-requires-x11.sh used by rpm __find_requires
+eval $(grep ^PLATFORMID config.log)
+export PLATFORMID
+eval $(grep ^build_cpu config.log)
+export build_cpu
+
+#
+# create source package
+# (use PACKAGENAME environmental variable
+# to find "$PACKAGENAME".spec.log)
+#
+
+DEBUGSRC="$(find workdir -name ${DEBUGSRC_PACKAGENAME}.spec.log)"
+
+echo Base spec file: $DEBUGSRC
+
+if [ -z "$DEBUGSRC" ]
+then
+ echo "Missing ${DEBUGSRC_PACKAGENAME}.spec.log in workdir/, specify spec.log 
file name in PACKAGENAME"
+ echo "For example: PACKAGENAME=collaboraoffice5.1 dbg_pkg"
+ exit 1
+fi
+
+# create spec file, based on the spec file of the brand package
+
+cat $DEBUGSRC | awk '
+   /^Name:/ { print "Summary: Debug source for package "$2; print 
$0"-debugsource";next }
+   /^Group:/ { print $1" Development/Debug";next }
+   /^Brand module/ { print gensub("Brand module", "Source files", "");next 
}
+   /^%attr/ || /^Summary:/ { next }
+   {print}
+   END { 
+   print "%defattr(-,root,root)" 
+   }
+ ' > ${DEBUGSRC}-debugsource
+ buildroot=$(cat $DEBUGSRC-debugsource | awk '/^BuildRoot/{print$2}')
+ topdir=$(dirname $(dirname $buildroot))
+ mkdir -p $buildroot $topdir/RPMS/BUILD $topdir/RPMS/RPMS
+ rm -rf $buildroot
+
+ # create source file list
+
+ find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev 
'/(workdir|qa|DEBS)/' | grep -E '/(source|inc)/' |
+
+ # list all directories for complete rpm remove
+
+ awk -v home=$BUILD_PATH '
+   {
+   split($0, a, home "/")
+   n=split(a[2], b, "/")
+   c=home
+   for(i=1;i> ${DEBUGSRC}-debugsource
+
+ echo Spec file of debug source package: ${DEBUGSRC}-debugsource
+
+ echo Start rpmbuild for debug source package...
+
+ ln -s / $buildroot
+
+ # debug build source package
+
+ rpmbuild -bb --define "_unpackaged_files_terminate_build  0" 
${DEBUGSRC}-debugsource --target $build_cpu --buildroot=$buildroot
+
+#
+# create rpm debug info packages
+# by processing logged spec files
+#
+
+for i in 
$BUILD_PATH/workdir/installation/CollaboraOffice/rpm/logging/*/*.spec.log
+do
+
+ # repackage only rpm packages with non-stripped so files
+
+ if grep -q '^%attr.*[.]\(so\|bin\)\([.].*\)\?\"' $i
+ then
+   echo  $i 
+   pack=$(cat $i | awk '/^Name/{print$2}')
+   buildroot=$(cat $i | awk '/^BuildRoot/{print$2}')
+   topdir=$(dirname $(dirname $buildroot))
+   rpmdir=$(echo $topdir | sed 's/_inprogress$//')
+   echo $rpmdir
+
+   # create empty buildroot directory
+
+   rm -rf $buildroot
+   mkdir -p $buildroot $topdir/RPMS/BUILD $topdir/RPMS/RPMS
+   cd $buildroot
+
+   echo REBUILD: $rpmdir/RPMS/${pack}-[0-9]*.rpm
+
+   # extract rpm package
+
+   rpm2cpio $rpmdir/RPMS/${pack}-[0-9]*.rpm | cpio -idmv
+
+   # create stripped libraries and linked debug info files
+
+   for j in $(cat $i | awk '/^%attr.*[.](so|bin)([.].*)?"$/{print$2}')
+   do
+   so=$(echo $j | tr -d '"')
+   cd ./$(dirname $so)
+   so=$(basename $so)
+   objcopy --only-keep-debug $so $so.dbg
+   objcopy --strip-debug $so
+   objcopy --add-gnu-debuglink=$so.dbg $so
+   cd -
+   done
+
+   # copy files for double package generation (using hard links)
+
+   cp -rl $buildroot $buildroot.co

minutes of ESC call ...

2016-12-15 Thread Michael Meeks

* Present:
  + Andras, Caolan, Heiko, Stephan, Kendy, JanI, Thorsten, Sophie,
Xisco, Cloph, Michael S, Bubli, Michael M, Bjoern (lurking), Miklos

* Completed Action Items:
+ create & publish wiki page for ranking (JanI)
https://wiki.documentfoundation.org/Development/Budget2017
[ people need to expand their items – to be actionable / tenderable ]
+ improve QA Stats in the ESC minutes (Xisco)
+ provide information for cloph on what the large Help change is (Bubli)
+ need a diff of the kind of string change, so Cloph can write a script.
[ outcome in IRC – will be postponed; packaging of help-packs also
  changes → should not be part of 5.3 (Cloph, Olivier, Bubli) ]
 
* Pending Action Items:
+ poke at MSDN licenses (Michael)
+ move gitdm-config to gerrit (Norbert)
+ investigate https://beta.opendocumentformat.org/testsets/all/en (Xisco)
+ come up an IDE integration / easy setup compromise proposal (JanI)
[ work in progress, ETA next week, summarizing mailing-list (janI) ]
+ file a 'make clean ; make screenshot' bug report ? (Norbert)
   [ expected to be fixed (Thorsten) ]
+ poke Florian to encourage posting of Macs (Cloph)
 
* Release Engineering update (Christian)
+ 5.3.0 B2 on mirrors & available for download
+ 5.3.0 RC1 – next week – and string freeze too ...
+ pootle upgrade is happening now.
+ tag will be done on Wed. evening to match pootle.
+ Late features:
+ separating images and icons for help modules (Olivier, Bubli)
→ abandoned for 5.3.
+ Android & iOS Remote (Cloph)
+ master is green now.
+ will prepare a new build based on the branch-off tag
+ online (Michael)
+ branched for -5-3 ... will create source tarballs.
+ 5.2.4 RC2 (janI)
+ sources uploaded, but build problem with 32bit Linux
+ with a BadAlloc / MESA / EGL bits for master ?
+ trying to build RC1 on the same machine to check.
+ if so - suggest postponing 1 week to avoid RC3
 
* Documentation (Olivier)
  + Next: Will test screenshots make enabled by bubli
   ( https://wiki.documentfoundation.org/Documentation/Screenshots )
  + will screenshots have operating-system information ?
   + under discussion
+ continuing to test screenshots.
  + on Mac screenshots are reversed (Bubli)
   + but has no mac.
   + happy to test things on a Mac (JanI)
   + rendering to VirtualDevice (Thorsten)
 
* UX Update (Heiko)
   + Bugzilla (topicUI) statistics
   256(256) (topicUI) bugs open, 496(496) (needsUXEval) needs to be 
evaluated by the UXteam
   + Updates:
   BZ changes   1 week   1 month   3 months   12 months  
added  1(-1)15(-1)57(-4) 490(1)  
commented 87(73)   254(67)   877(-49)   2707(-86)
  removed  0(0)  0(-1)18(-6)  30(0)  
 resolved  8(2) 22(5)113(-2) 135(2)  
   + top 10 contributors:
 Heiko Tietze made 41 changes in 1 month, and 518 changes in 1 year
 *UNKNOWN* made 18 changes in 1 month, and 18 changes in 1 year
 Samuel Mehrbrodt made 17 changes in 1 month, and 54 changes in 1 year
 V Stuart Foote made 15 changes in 1 month, and 198 changes in 1 year
 *UNKNOWN* made 14 changes in 1 month, and 25 changes in 1 year
 Yousuf Philips made 14 changes in 1 month, and 409 changes in 1 year
 *UNKNOWN* made 13 changes in 1 month, and 99 changes in 1 year
 Rene Engelhard made 10 changes in 1 month, and 10 changes in 1 year
 Khaled Hosny made 9 changes in 1 month, and 10 changes in 1 year
 Tor Lillqvist made 8 changes in 1 month, and 9 changes in 1 year

+ Tooltips (tdf#104413)
+ have ‘simple’ tooltips for all controls by default?
  Additionally to extended tt with help installed
+ pro: support for beginners, good ux, postive a11y side effect
+ con: huge overhead to enter good tips and to translate
 + terrible startup performance problems from XPATH nonsense (?)
 + Markus had a prototype to extract & mirror these tooltips (Kendy)
 + with plan to keep XHP as help files; consider it again.
+ should we add a tooltip on an individual item ?
 + good usability to have tooltips consistently everywhere
 + student hasn’t finished the help on this topic.
+ happy to add simple tooltips to .ui files (Sophie)
 + adding five word tooltips to everywhere is ok with translators
 + there are 111k labels on widgets in .ui files (Michael)
$ git ls-files | grep '\.ui' | xargs cat | grep label | grep -v 'gtk-' | nl
 + 500k new words, 100 langs -> 50Mb of extra install
AI: + come up with a clear proposal with input from l10n (Sophie, Heiko)

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py

2016-12-15 Thread jan Iversen

 esc-reporting/esc-analyze.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 72ce9b4a4daf10953fe0b4808b97c40b11236f67
Author: jan Iversen 
Date:   Thu Dec 15 17:15:57 2016 +0100

update to esc-analyze based on request from Xisco.

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 04e6742..7d600a9 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -74,6 +74,8 @@ def util_load_csv(fileName, split):
   fp.readline()
   for line in fp:
 line = line[:-1]
+if len(line) == 0:
+  continue
 x = line.split(split)
 if split == ';' and len(x) != 3:
   raise Exception('misformed entry ' + line + ' in filename ' + 
fileName)
@@ -118,14 +120,12 @@ def util_build_period_stat(xDate, email, base, 
peopleTarget=None, dataTarget=Non
 if dataTarget:
   statList['data'][base][xType]['total'] += 1
 
-nextDate = {'1year': cfg['3monthDate'], '3month': cfg['1monthDate'], 
'1month': cfg['1weekDate'], '1week': cfg['nowDate']}
-for i, oDate in nextDate.items():
-  if xDate >= cfg[i + 'Date'] and xDate < oDate:
+for i in '1year', '3month', '1month', '1week':
+  if xDate >= cfg[i + 'Date']:
 if peopleTarget:
   statList['people'][email][base][i][peopleTarget] += 1
 if dataTarget:
   statList['data'][base][xType][i][dataTarget] += 1
-break
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/canvas slideshow/source stoc/test

2016-12-15 Thread Noel Grandin

 include/canvas/canvastools.hxx   |2 --
 slideshow/source/engine/animationfactory.cxx |4 
 stoc/test/javavm/testjavavm.cxx  |1 -
 stoc/test/testconv.cxx   |1 -
 stoc/test/testcorefl.cxx |1 -
 stoc/test/testintrosp.cxx|1 -
 6 files changed, 10 deletions(-)

New commits:
commit 690cf2a5ac87d3d05c45a86944e7f6b0adf12cf2
Author: Noel Grandin 
Date:   Thu Dec 15 12:26:28 2016 +0200

no point in having both SAL_WARN and OSL_FAIL for the same thing

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

diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index 261a490..df97d3f 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -461,7 +461,6 @@ namespace canvas
 aStr != aStr.toAsciiLowerCase() )
 {
 SAL_WARN("canvas", "ValueMap::ValueMap(): Key is not 
lowercase " << pMap->maKey);
-OSL_FAIL( "ValueMap::ValueMap(): Key is not lowercase" );
 }
 
 if( mnEntries > 1 )
@@ -481,7 +480,6 @@ namespace canvas
 aStr2 != aStr2.toAsciiLowerCase() )
 {
 SAL_WARN("canvas", "ValueMap::ValueMap(): Key is 
not lowercase" << pMap[1].maKey);
-OSL_FAIL( "ValueMap::ValueMap(): Key is not 
lowercase" );
 }
 }
 }
diff --git a/slideshow/source/engine/animationfactory.cxx 
b/slideshow/source/engine/animationfactory.cxx
index 0d04f04..c27f7d5 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -678,7 +678,6 @@ namespace slideshow
 
 if( !rAny.hasValue() )
 {
-OSL_FAIL( "getDefault(): cannot get requested shape 
property" );
 SAL_WARN("slideshow", "getDefault(): cannot get shape 
property " <<  rPropertyName );
 return ValueType();
 }
@@ -688,7 +687,6 @@ namespace slideshow
 
 if( !(rAny >>= aValue) )
 {
-OSL_FAIL( "getDefault(): cannot extract requested 
shape property" );
 SAL_WARN("slideshow", "getDefault(): cannot extract 
shape property " << rPropertyName);
 return ValueType();
 }
@@ -705,7 +703,6 @@ namespace slideshow
 
 if( !rAny.hasValue() )
 {
-OSL_FAIL( "getDefault(): cannot get requested shape color 
property" );
 SAL_WARN("slideshow", "getDefault(): cannot get shape 
color property " << rPropertyName);
 return RGBColor();
 }
@@ -715,7 +712,6 @@ namespace slideshow
 
 if( !(rAny >>= nValue) )
 {
-OSL_FAIL( "getDefault(): cannot extract requested 
shape color property" );
 SAL_INFO("slideshow", "getDefault(): cannot extract 
shape color property " << rPropertyName);
 return RGBColor();
 }
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index f856f76..e7d0c4d 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -138,7 +138,6 @@ SAL_IMPLEMENT_MAIN()
 }
 catch (const Exception & rExc)
 {
-OSL_FAIL( "### exception occurred!" );
 SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
 }
 
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 2eebdef..1e9aae1 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -671,7 +671,6 @@ SAL_IMPLEMENT_MAIN()
 }
 catch (const Exception & rExc)
 {
-OSL_FAIL( "### exception occurred!" );
 SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
 }
 
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 7aa06a9..3b2a02c 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -367,7 +367,6 @@ SAL_IMPLEMENT_MAIN()
 }
 catch (const Exception & rExc)
 {
-OSL_FAIL( "### exception occurred!" );
 SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
 }
 
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index caff133..2d5a682 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1195,7 +1195,6 @@ SAL_IMPLEMENT_MAIN()
 }
 catch (const Exception & rExc)
 {
-OSL_FAIL( "### exception occurred!" );
 SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
 }
 
___
Libre

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Bjoern Michaelsen

Hi,

On Thu, Dec 15, 2016 at 03:41:15PM +0100, Jan Iversen wrote:
> Not a bad idea at all, but who pays the price for running such an 
> environment, that would be a rather interesting challenge for a non-profit 
> org.

This is not the place to discuss that, which is a different topic. However, its
not an issue anyway:

 https://redmine.documentfoundation.org/issues/742

Best,

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

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

2016-12-15 Thread Tor Lillqvist

 external/epoxy/Library_epoxy.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f0804905ec38cdf3a5af1ebe5b087809d2850ccd
Author: Tor Lillqvist 
Date:   Thu Dec 15 17:09:21 2016 +0200

Typo

Change-Id: Ib1d4d3f88c1cc11ba440b1d8f7208575b5bbb42d

diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk
index 16c19e2..1b1d28b 100644
--- a/external/epoxy/Library_epoxy.mk
+++ b/external/epoxy/Library_epoxy.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_generated_cobjects,epoxy,\
UnpackedTarball/epoxy/src/dispatch_wgl \
UnpackedTarball/epoxy/src/wgl_generated_dispatch \
 ))
-else ifneq ($(filter IOS MAXOSX,$(OS)),)
+else ifneq ($(filter IOS MACOSX,$(OS)),)
 # nothing
 else ifeq ($(OS),ANDROID)
 $(eval $(call gb_Library_add_generated_cobjects,epoxy,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Request For Comments: Hebrew numbering in Libreoffice

2016-12-15 Thread Yossi Zahn


Hi Eike,

On 13/12/2016 09:41 PM, Eike Rathke wrote:

Hi Yossi,

On Tuesday, 2016-12-13 08:22:15 +0200, Yossi Zahn wrote:


It seems that the numbering options that appear in 
numberingoptionspage.ui

will always be higher up in the list than those that are added dynamically
in cui/source/tabpages/numpages.cxx. The dynamically added numbering options
seem to appear in the order that they are defined in aSupportedTypes[] in
defaultnumberingprovider.cxx. I'm wondering if it should be that way?

The not explicitly defined types are currently added to the predefined
list, yes, but that could probably be rearranged somehow. Just in what
order? My suggestion would be to have the aSupportedTypes[] array in
a sensible order and add entries to the UI list in that order while
taking the UI visible string from the dialog or resource if defined.
Should I open a bug for this, I don't feel qualified enough to make this 
change. (I don't know what a sensible order would be and wouldn't know 
how to pull in UI strings dynamically).


thanks, yossi

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

Re: Request For Comments: Hebrew numbering in Libreoffice

2016-12-15 Thread Yossi Zahn


Hi Eike,

On 13/12/2016 09:41 PM, Eike Rathke wrote:

Hi Yossi,

On Tuesday, 2016-12-13 08:22:15 +0200, Yossi Zahn wrote:


It seems that the numbering options that appear in 
numberingoptionspage.ui

will always be higher up in the list than those that are added dynamically
in cui/source/tabpages/numpages.cxx. The dynamically added numbering options
seem to appear in the order that they are defined in aSupportedTypes[] in
defaultnumberingprovider.cxx. I'm wondering if it should be that way?

The not explicitly defined types are currently added to the predefined
list, yes, but that could probably be rearranged somehow. Just in what
order? My suggestion would be to have the aSupportedTypes[] array in
a sensible order and add entries to the UI list in that order while
taking the UI visible string from the dialog or resource if defined.
Should I open a bug for this, I don't feel qualified enough to make this 
change. (I don't know what a sensible order would be and wouldn't know 
how to pull in UI strings dynamically).


thanks, yossi

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

[Libreoffice-commits] core.git: 6 commits - basctl/Module_basctl.mk external/epoxy external/harfbuzz ios/experimental postprocess/Rdb_services.mk sd/Library_sd.mk solenv/bin xmlsecurity/Module_xmlsecu

2016-12-15 Thread Tor Lillqvist

 basctl/Module_basctl.mk  | 
   4 +--
 external/epoxy/Library_epoxy.mk  | 
   2 -
 external/harfbuzz/ExternalProject_harfbuzz.mk| 
   2 -
 external/harfbuzz/UnpackedTarball_harfbuzz.mk| 
   4 +++
 external/harfbuzz/harfbuzz-ios.patch | 
  11 +
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
  12 +-
 postprocess/Rdb_services.mk  | 
   4 +--
 sd/Library_sd.mk | 
   2 -
 solenv/bin/native-code.py| 
   2 -
 xmlsecurity/Module_xmlsecurity.mk| 
   6 -
 10 files changed, 34 insertions(+), 15 deletions(-)

New commits:
commit 48e956e506b056eefcbf5c24a706b6152e7ea8b3
Author: Tor Lillqvist 
Date:   Thu Dec 15 16:43:43 2016 +0200

Try to fix Android and iOS build

Fix what probably is fallout from
a7c35729e00f18f79156b3f8f57472506f786074.

Just bypass all of xmlsecurity for Android and iOS. At least the iOS
demo app, TiledLibreOffice, builds then.

Change-Id: Ibc9486c0d67d1aeafa08932809b23ceeb9b5c2f3

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index cd95213..0c1614c 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -109,9 +109,9 @@ $(eval $(call gb_Rdb_add_components,services,\
xmloff/source/transform/xof \
xmloff/util/xo \
xmlscript/util/xmlscript \
-   xmlsecurity/util/xmlsecurity \
-   xmlsecurity/util/xsec_fw \
$(if $(filter-out ANDROID IOS,$(OS)), \
+   xmlsecurity/util/xmlsecurity \
+   xmlsecurity/util/xsec_fw \
xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) 
\
$(if $(ENABLE_COINMP), \
sccomp/source/solver/coinmpsolver \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 7b3beea2..ae4bed4 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -94,7 +94,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
ucbhelper \
utl \
vcl \
-   xmlsecurity \
+   $(if $(filter-out ANDROID IOS,$(OS)),xmlsecurity) \
$(gb_UWINAPI) \
 ))
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ef527e7..e2c7b69 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -48,7 +48,7 @@ core_factory_list = [
 ("libunordflo.a", "unordf_component_getFactory"),
 ("libunoxmllo.a", "unoxml_component_getFactory"),
 ("libutllo.a", "utl_component_getFactory"),
-("libxmlsecurity.a", "xmlsecurity_component_getFactory"),
+("libxmlsecurity.a", "xmlsecurity_component_getFactory", "#if !defined 
ANDROID && !defined IOS"),
 ("libxoflo.a", "xof_component_getFactory"),
 ("libxolo.a", "xo_component_getFactory"),
 ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#if !defined 
ANDROID && !defined IOS"),
diff --git a/xmlsecurity/Module_xmlsecurity.mk 
b/xmlsecurity/Module_xmlsecurity.mk
index 6fdc86e..4f00c22 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -9,10 +9,12 @@
 
 $(eval $(call gb_Module_Module,xmlsecurity))
 
+ifneq (,$(filter-out ANDROID IOS,$(OS)))
+
 $(eval $(call gb_Module_add_targets,xmlsecurity,\
Library_xmlsecurity \
Library_xsec_fw \
-   $(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \
+   Library_xsec_xmlsec \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
@@ -45,4 +47,6 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
 
 endif
 
+endif
+
 # vim: set noet sw=4 ts=4:
commit 86a553753170b20a03ac1038798c910ece95cbaf
Author: Tor Lillqvist 
Date:   Thu Dec 15 13:20:39 2016 +0200

Bump iOS version here, too

Change-Id: I60bf7a31e5a92a0b140404a7ad84c581ba1267e3

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 860299c..057d4c7 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -2387,7 +2387,7 @@

"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",

"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
-   IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+   IPHONEOS_DEPLOYMENT_TARGET = 9.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT =

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Jan Iversen


> Note this is _NOT_ limited to Linux only, see e.g.:
> 
> http://www.macincloud.com/
> http://www.cloudshare.com/solutions/cloud-based-development-and-test-environments
>  
> 

Not a bad idea at all, but who pays the price for running such an environment, 
that would be a rather interesting challenge for a non-profit org.

rgds
jan I


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

Re: Request For Comments: Hebrew numbering in Libreoffice

2016-12-15 Thread Yossi Zahn


Hi Eike,

On 14/12/2016 01:08 AM, Eike Rathke wrote:

Hi Yossi,

On Tuesday, 2016-12-13 20:41:04 +0100, Eike Rathke wrote:


Btw, there's a second UI string list in
svx/source/dialog/numberingtype.src (new file renamed from
svx/source/dialog/pagenumbering.src), so if the Hebrew numbering types
are used also in page numbering they likely should go in there as well.

I added those there and also removed the string definitions from
cui/uiconfig/ui/numberingoptionspage.ui so that now we have one central
place where the strings are defined and translated.


I eliminated yet a third place where UI strings were defined just today,
sw/source/ui/misc/numberingtypelistbox.src

You may want to update your worktree to current master or at least
cherry-pick the related work. Commits in order:

1141f178382be0add06ba182cc02c2adb7e96324
b845be872cd3fc6b4dc0e6175675a9b31ef7fc42
97490635ef1b383b8c9759653edb4836015ba6d2
a9a5b95de8cf0005476a375b0e4038283f03b818

Additionally needed:

3b4712c3969c705edcfc756492da6db7c0d2e018
3bd6a8c21ff325b77fb2805158115145edf5ffb5
5965a4ae5eacb874102af6c4ebdb5147e1544ef6
b8ae49a315923eecf11b1186924fbccdae78fe78

   Eike
Have I understood correctly that all necessary changes have been made to 
include NUMBER_HEBREW and the new UI string for CHARS_HEBREW in all 
places where there is a numbering-type list-box?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Bjoern Michaelsen

Hi,

On Thu, Dec 15, 2016 at 03:27:33PM +0100, Bjoern Michaelsen wrote:
> Yes, and since, as you so eloquently pointed out, setup is still the most
> tricky part of this -- at least on Windows -- I wonder if the solution is
> possibly rather to double down on having properly preconfigured VMs with IDE,
> debugging and code completion available and ready to spin up at a minutes
> notice ...

Note this is _NOT_ limited to Linux only, see e.g.:

 http://www.macincloud.com/
 
http://www.cloudshare.com/solutions/cloud-based-development-and-test-environments

Best,

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

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

2016-12-15 Thread Michael Stahl

 Makefile.in |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 646b8b69710d046af980016e49f6c5485783f2fb
Author: Michael Stahl 
Date:   Thu Dec 15 14:11:05 2016 +0100

Makefile: try to get gbuild-to-ide running on the internal python3

Or we could just hold our breath until Apple adds python3 to macOS.

Change-Id: I94dd054be8a28490fd86b72092a4389194ca785f
Reviewed-on: https://gerrit.libreoffice.org/32047
Reviewed-by: jan iversen 
Tested-by: jan iversen 
Reviewed-by: BjÃ¶rn Michaelsen 

diff --git a/Makefile.in b/Makefile.in
index 9b933f8..9b04965 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -405,8 +405,10 @@ dump-deps-sort:
@$(SRCDIR)/bin/module-deps.pl -t $(MAKE) $(SRCDIR)/Makefile.gbuild
 
 define gb_Top_GbuildToIdeIntegration
-$(1)-ide-integration: gbuildtojson
-   cd $(SRCDIR) && $(SRCDIR)/bin/gbuild-to-ide --ide $(1) --make $(MAKE)
+$(1)-ide-integration: gbuildtojson $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),python3.all)
+   cd $(SRCDIR) && \
+   $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),PATH="$(INSTROOT_FOR_BUILD)/Frameworks/LibreOfficePython.framework/Versions/Current/bin:$(PATH)")
 \
+   $(SRCDIR)/bin/gbuild-to-ide --ide $(1) --make $(MAKE)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Bjoern Michaelsen

Hi,

On Thu, Dec 15, 2016 at 02:58:29PM +0100, Markus Mohrhard wrote:
> At least from what I can see currently the two big problems that we have are
> some unreliable tests, e.g. the OpenCL ones, and the brittle setup on
> windows. So I think focusing on these two issues for now would help new
> people much more.

Agreed.

> Additionally I don't believe that we will ever be able to cover every single
> part of the LibreOffice build process in an IDE so it might make more sense
> to use the IDE integration for the normal C++ source file hacking and leave
> the rest to make, so basically going with the old 80/20 rule.

Yup.

> If the build would be less brittle, mostly on windows, calling make once
> should not be such a big problem. Actually at least I would most likely not
> want to mentor a person that considers calling make once in a command line a
> reason not to contribute to the project.

Yes, but also plumbing whatever build button there is in an IDE to call make is
trivial. The non-trivial part is with LibreOffice -- because of its size -- the
strategy of 'eh, lets just build everything all of the time' is somewhat more
painful than for trivial projects. While it is the safe default for newcomers,
regulars usually dont want to spent their time triggering full build everytime.
This problem (that we have all 'module build', 'full build', 'unitcheck',
'slowcheck', 'subsequentcheck' being useful and needed build scenarios) wont go
away by any tweaks in IDEs and or using any build system. There simply cant be
a one-size-fits-all button in the IDE for this.

> Increasing the difference between these groups would make the mentoring even
> more complicated. From this perspective a reliable and well tested IDE
> integration that supports the common task, hacking the source files with auto
> completion and maybe debugging of LibreOffice and tests, without the
> additional complexity of a complete build in the IDE seems like a less
> painful solution. It surely would be easier to maintain and support people
> using such an IDE integration.

Yes, and since, as you so eloquently pointed out, setup is still the most
tricky part of this -- at least on Windows -- I wonder if the solution is
possibly rather to double down on having properly preconfigured VMs with IDE,
debugging and code completion available and ready to spin up at a minutes
notice ...

Best,

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

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Michael Stahl

On 12/15/2016 02:58 PM, Markus Mohrhard wrote:
> On Thu, Dec 15, 2016 at 1:33 PM, Bjoern Michaelsen
>  > wrote:
> 
> Hi,
> 
> On Thu, Dec 15, 2016 at 01:02:05PM +0100, Jan Iversen wrote:
> > since you have already made the ball rolling by making gbuildtojson in 
> C++
> > the logical consequence would be to port the script to C++.
> 
> My fear with that was it (using C++ instead of Python) would
> discourage people
> to contribute for other IDEs. But now that we have at least a wireframe
> implementation for most popular IDEs going straight to C++ might
> indeed be our
> best option[1] bootstrapping-wise. Although parsing JSON in C++ is
> rather 
> meh, but we certainly dont want an external dependency for that.
> 
> Probably needs an iterative approach: first parse the JSON stuff in
> some C++
> objects and create output for the first IDE. Other IDEs move over
> from Python
> to C++ one by one later.
> 
> 
> 
> I'm not really sure if switching to C++ will really help us long term.
> It might solve the python3 problem on OSX short term but would make
> hacking the IDE generator quite painful. Actually at least I don't see
> huge problem with letting the script depend on the python that we use
> for the build, whether internal or external, and therefore just build
> the python on OSX when we run the script. At least for the case that we
> pre-generate IDE solutions (which is what I read to make it apparently
> possible for really everyone to open a LibreOffice source file) I think
> it would not be an issue. 

i'm rather unconvinced of yet another c++ rewrite so here's my patch to
use the internal python3 on macOS:

https://gerrit.libreoffice.org/#/c/32047/



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

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Markus Mohrhard

Hey,

so with the experience of writing one of the ide integrations and helping
people especially during the night some comments.

On Thu, Dec 15, 2016 at 1:33 PM, Bjoern Michaelsen <
bjoern.michael...@canonical.com> wrote:

> Hi,
>
> On Thu, Dec 15, 2016 at 01:02:05PM +0100, Jan Iversen wrote:
> > since you have already made the ball rolling by making gbuildtojson in
> C++
> > the logical consequence would be to port the script to C++.
>
> My fear with that was it (using C++ instead of Python) would discourage
> people
> to contribute for other IDEs. But now that we have at least a wireframe
> implementation for most popular IDEs going straight to C++ might indeed be
> our
> best option[1] bootstrapping-wise. Although parsing JSON in C++ is rather
> ...
> meh, but we certainly dont want an external dependency for that.
>
> Probably needs an iterative approach: first parse the JSON stuff in some
> C++
> objects and create output for the first IDE. Other IDEs move over from
> Python
> to C++ one by one later.
>
>

I'm not really sure if switching to C++ will really help us long term. It
might solve the python3 problem on OSX short term but would make hacking
the IDE generator quite painful. Actually at least I don't see huge problem
with letting the script depend on the python that we use for the build,
whether internal or external, and therefore just build the python on OSX
when we run the script. At least for the case that we pre-generate IDE
solutions (which is what I read to make it apparently possible for really
everyone to open a LibreOffice source file) I think it would not be an
issue. And for anyone who actually still would use the command line to
build LibreOffice it should make even less of a difference.

Also a few comments for the general discussion.

In general my experience from mentoring people and helping out during the
European night is that at least currently our problem is not really the
missing IDE integration. At least from what I can see currently the two big
problems that we have are some unreliable tests, e.g. the OpenCL ones, and
the brittle setup on windows. So I think focusing on these two issues for
now would help new people much more. Additionally I don't believe that we
will ever be able to cover every single part of the LibreOffice build
process in an IDE so it might make more sense to use the IDE integration
for the normal C++ source file hacking and leave the rest to make, so
basically going with the old 80/20 rule. If the build would be less
brittle, mostly on windows, calling make once should not be such a big
problem. Actually at least I would most likely not want to mentor a person
that considers calling make once in a command line a reason not to
contribute to the project.
Besides that I see a problem with having a second way of building
LibreOffice especially from the mentoring perspective. We already have the
huge problem that experienced developers often don't use the setup that we
suggest to new developers. Increasing the difference between these groups
would make the mentoring even more complicated. From this perspective a
reliable and well tested IDE integration that supports the common task,
hacking the source files with auto completion and maybe debugging of
LibreOffice and tests, without the additional complexity of a complete
build in the IDE seems like a less painful solution. It surely would be
easier to maintain and support people using such an IDE integration.

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

[Libreoffice-commits] online.git: wsd/LOOLWebSocket.hpp

2016-12-15 Thread Michael Meeks

 wsd/LOOLWebSocket.hpp |   15 +++
 1 file changed, 3 insertions(+), 12 deletions(-)

New commits:
commit e24dfb9616194fdaf113b86a0db0d7289f79d57f
Author: Michael Meeks 
Date:   Thu Dec 15 13:51:07 2016 +

Use a blocking write rather than failing when no space in write buffer.

Also avoid a poll syscall for an error state we'll get from the write.

diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
index 972d895..bc51321 100644
--- a/wsd/LOOLWebSocket.hpp
+++ b/wsd/LOOLWebSocket.hpp
@@ -108,9 +108,7 @@ public:
 if ((flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_PING)
 {
 // Echo back the ping message.
-if (poll(waitZero, Socket::SelectMode::SELECT_ERROR) ||
-!poll(waitZero, Socket::SelectMode::SELECT_WRITE) ||
-Poco::Net::WebSocket::sendFrame(buffer, n, 
WebSocket::FRAME_FLAG_FIN | WebSocket::FRAME_OP_PONG) != n)
+if (Poco::Net::WebSocket::sendFrame(buffer, n, 
WebSocket::FRAME_FLAG_FIN | WebSocket::FRAME_OP_PONG) != n)
 {
 LOG_WRN("Sending Pong failed.");
 return -1;
@@ -145,9 +143,7 @@ public:
 const std::string nextmessage = "nextmessage: size=" + 
std::to_string(length);
 const int size = nextmessage.size();
 
-if (!poll(waitZero, Socket::SelectMode::SELECT_ERROR) &&
-poll(waitZero, Socket::SelectMode::SELECT_WRITE) &&
-Poco::Net::WebSocket::sendFrame(nextmessage.data(), size) == 
size)
+if (Poco::Net::WebSocket::sendFrame(nextmessage.data(), size) == 
size)
 {
 LOG_TRC("Sent long message preample: " + nextmessage);
 }
@@ -158,12 +154,7 @@ public:
 }
 }
 
-int result = -1;
-if (!poll(waitZero, Socket::SelectMode::SELECT_ERROR) &&
-poll(waitZero, Socket::SelectMode::SELECT_WRITE))
-{
-result = Poco::Net::WebSocket::sendFrame(buffer, length, flags);
-}
+int result = Poco::Net::WebSocket::sendFrame(buffer, length, flags);
 
 lock.unlock();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Gabor Kelemen

 source/text/swriter/01/05040600.xhp |   90 
 1 file changed, 50 insertions(+), 40 deletions(-)

New commits:
commit 7d62908799da6b9ec1f4c2749fbbef9d7093effd
Author: Gabor Kelemen 
Date:   Wed Dec 14 23:01:27 2016 +0100

tdf#76488 (partial) Update footnote properties page

Document changes and reconnect with the UI

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

diff --git a/source/text/swriter/01/05040600.xhp 
b/source/text/swriter/01/05040600.xhp
index ae3f068..95d8572 100644
--- a/source/text/swriter/01/05040600.xhp
+++ b/source/text/swriter/01/05040600.xhp
@@ -28,47 +28,57 @@


   
-
-Footnote
- Specifies the layout options 
for footnotes, including the line that separates the footnote from the main 
body of document.
+
+Footnote
+ Specifies the layout 
options for footnotes, including the line that separates the footnote from the 
main body of document.
   
   
  
-  removed a note
-Footnote area
-  Set the height of the footnote area.
-
-Not larger than page area
-  Automatically adjusts 
the height of the footnote area depending on the number of 
footnotes.
-
-Maximum Footnote Height
-  Sets a maximum height for the footnote area. Enable 
this option, then enter the height.
-
-  Enter the 
maximum height for the footnote area.
-
-Distance from text
-  Enter the 
amount of space to leave between the bottom page margin and the first line of 
text in the footnote area.
-  Separator Line
-  Specifies the position and length of the separator line.
-
-Position
-  Select the 
horizontal alignment for the line that separates the main text from the 
footnote area.
-
-Length
-  Enter the 
length of the separator line as a percentage of the page width 
area.
-
-Weight
-  Select the 
formatting style for the separator line. If you do not want a separator line, 
choose "0.0 pt".
-
-Spacing
-  Enter the 
amount of space to leave between the separator line and the first line of the 
footnote area.
-  To specify the spacing between two footnotes, choose Format - Paragraph, and then click the Indents 
& Spacing tab.
-  
+  
+Footnote area
+  Set the 
height of the footnote area.
+
+
+Not 
larger than page area
+  Automatically adjusts 
the height of the footnote area depending on the number of 
footnotes.
+
+
+Maximum 
footnote height
+  Sets a maximum height for 
the footnote area. Enable this option, then enter the 
height.
+
+
+  Enter the maximum height 
for the footnote area.
+
+
+Space 
to text
+  Enter the amount of space 
to leave between the bottom page margin and the first line of text in the 
footnote area.
+
+  Separator Line
+  Specifies the position and other properties of the separator 
line.
+
+Position
+  Select the horizontal 
alignment for the line that separates the main text from the footnote 
area.
+
+
+Style
+  Select the formatting style for 
the separator line. If you do not want a separator line, choose 
"None".
+
+
+Thickness
+  Select the thickness of the 
separator line.
+
+
+Color
+  Select the color of the 
separator line.
+
+
+
+Length
+  Enter the length of the 
separator line as a percentage of the page width area.
+
+
+Spacing 
to footnote contents
+  Enter the amount of 
space to leave between the separator line and the first line of the footnote 
area.
+  To specify the 
spacing between two footnotes, choose Format - 
Paragraph, and then click the Indents & Spacing 
tab.

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-12-15 Thread Gabor Kelemen

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

New commits:
commit a8b06ac11e4c93592f21a10aafcb7a34a2c2d4c4
Author: Gabor Kelemen 
Date:   Wed Dec 14 23:01:27 2016 +0100

Updated core
Project: help  7d62908799da6b9ec1f4c2749fbbef9d7093effd

tdf#76488 (partial) Update footnote properties page

Document changes and reconnect with the UI

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

diff --git a/helpcontent2 b/helpcontent2
index 612e430..7d62908 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 612e430cec8a3298855f5642b4b589b74f7282ad
+Subproject commit 7d62908799da6b9ec1f4c2749fbbef9d7093effd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Gabor Kelemen

 AllLangHelp_shared.mk|7 -
 source/text/shared/explorer/database/0502.xhp|   49 --
 source/text/shared/explorer/database/11150200.xhp|   51 --
 source/text/shared/explorer/database/1117.xhp|   49 --
 source/text/shared/explorer/database/11170100.xhp|   49 --
 source/text/shared/explorer/database/3000.xhp|   50 --
 source/text/shared/explorer/database/3010.xhp|   71 ---
 source/text/shared/explorer/database/dabapropadd.xhp |   12 --
 source/text/shared/explorer/database/dabawiz00.xhp   |1 
 source/text/shared/explorer/database/dabawiz02adabas.xhp |   46 -
 10 files changed, 385 deletions(-)

New commits:
commit 612e430cec8a3298855f5642b4b589b74f7282ad
Author: Gabor Kelemen 
Date:   Wed Dec 14 23:50:41 2016 +0100

Remove documentation for Adabas database in Base

Support for Adabas was dropped in commit
af9709c3cba8c386a30553c43a620320b15c65f4
i.e. in 2012. Time for the help to go too.

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

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 0b046c0..661ecb9 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -601,7 +601,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/0403 \
 helpcontent2/source/text/shared/explorer/database/0500 \
 helpcontent2/source/text/shared/explorer/database/0501 \
-helpcontent2/source/text/shared/explorer/database/0502 \
 helpcontent2/source/text/shared/explorer/database/0503 \
 helpcontent2/source/text/shared/explorer/database/0501 \
 helpcontent2/source/text/shared/explorer/database/05010100 \
@@ -621,11 +620,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/11030100 \
 helpcontent2/source/text/shared/explorer/database/1108 \
 helpcontent2/source/text/shared/explorer/database/1109 \
-helpcontent2/source/text/shared/explorer/database/11150200 \
-helpcontent2/source/text/shared/explorer/database/1117 \
-helpcontent2/source/text/shared/explorer/database/11170100 \
-helpcontent2/source/text/shared/explorer/database/3000 \
-helpcontent2/source/text/shared/explorer/database/3010 \
 helpcontent2/source/text/shared/explorer/database/dabaadvprop \
 helpcontent2/source/text/shared/explorer/database/dabaadvpropdat \
 helpcontent2/source/text/shared/explorer/database/dabaadvpropgen \
@@ -638,7 +632,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/dabawiz01 \
 helpcontent2/source/text/shared/explorer/database/dabawiz02 \
 helpcontent2/source/text/shared/explorer/database/dabawiz02access \
-helpcontent2/source/text/shared/explorer/database/dabawiz02adabas \
 helpcontent2/source/text/shared/explorer/database/dabawiz02ado \
 helpcontent2/source/text/shared/explorer/database/dabawiz02dbase \
 helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc \
diff --git a/source/text/shared/explorer/database/0502.xhp 
b/source/text/shared/explorer/database/0502.xhp
deleted file mode 100644
index 2007772..000
--- a/source/text/shared/explorer/database/0502.xhp
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-   
-
-
-User Settings
-/text/shared/explorer/database/0502.xhp
-
-
-removed all OOo/SO switchesUser 
Settings
-Use this dialog to define the user settings for an Adabas 
table.
-
-  
-
-User Selection
-Allows you to select the user, define a new user, delete a user, and 
change a password.
-User
-Specifies the user, whose settings you want to 
edit.
-New user
-Creates a new user. The Enter 
Password dialog appears.
-Change password
-Changes the password for the selected user. 
The Change Password dialog appears.
-Delete user
-Deletes the selected user.
-Access rights for user selected
-Allows you to view and assign access rights for the selected 
user.
-
-
diff --git a/source/text/shared/explorer/database/11150200.xhp 
b/source/text/shared/explorer/database/11150200.xhp
deleted file mode 100644
index c026784..000
--- a/source/text/shared/explorer/database/11150200.xhp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-   
-
-
-User settings
-/text/shared/explorer/database/11150200.xhp
-
-
-
-
-User settings
-Manages user data for accessing Adabas or ADO 
databases.
-
-User selection
-User
-Select the user whose 
settings you want to modify.
-Add user
-Adds a new user for 
accessing the selected database.
-Change password
-Changes the 
current user password for accessing the database.
-Delete user
-Removes the selected 
user.
-Access rights for selecte

[Libreoffice-commits] core.git: helpcontent2

2016-12-15 Thread Gabor Kelemen

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

New commits:
commit b035edfe5c09e16cde2bc18cf6c3096154271914
Author: Gabor Kelemen 
Date:   Wed Dec 14 23:50:41 2016 +0100

Updated core
Project: help  612e430cec8a3298855f5642b4b589b74f7282ad

Remove documentation for Adabas database in Base

Support for Adabas was dropped in commit
af9709c3cba8c386a30553c43a620320b15c65f4
i.e. in 2012. Time for the help to go too.

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

diff --git a/helpcontent2 b/helpcontent2
index 6b12e05..612e430 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6b12e054bde038fae6a6ee03c52b3c6664ab4300
+Subproject commit 612e430cec8a3298855f5642b4b589b74f7282ad
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Gabor Kelemen

 AllLangHelp_shared.mk  |1 
 source/text/shared/00/0210.xhp |   43 -
 2 files changed, 44 deletions(-)

New commits:
commit 6b12e054bde038fae6a6ee03c52b3c6664ab4300
Author: Gabor Kelemen 
Date:   Thu Dec 15 01:05:34 2016 +0100

Drop 'Warning Print Options' page

Can't find this feature in core anymore.

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

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 413100a..0b046c0 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/00/0206 \
 helpcontent2/source/text/shared/00/0207 \
 helpcontent2/source/text/shared/00/0208 \
-helpcontent2/source/text/shared/00/0210 \
 helpcontent2/source/text/shared/00/0215 \
 helpcontent2/source/text/shared/00/0401 \
 helpcontent2/source/text/shared/00/0402 \
diff --git a/source/text/shared/00/0210.xhp 
b/source/text/shared/00/0210.xhp
deleted file mode 100644
index 70ed454..000
--- a/source/text/shared/00/0210.xhp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-   
-
-
-Warning Print Options
-/text/shared/00/0210.xhp
-
-
-
-Warning Print Options
-The Warning 
Print Options dialog appears when the page setup does not match the 
defined print range. This is the case, for example, if you draw a 
rectangle that is larger than the current page format.
-Print options
-Fit page to print range
-
-If you select the Fit page to print range option, the 
Warning Print Options dialog will not appear in subsequent print 
runs of this document.
-Print on multiple 
pagesi78245
-Specifies 
whether to distribute the printout on multiple pages. The print range 
will be printed on multiple pages.
-Trim
-Specifies 
that anything extending beyond the maximum print range will be cut off and not 
included in the printing.
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-12-15 Thread Gabor Kelemen

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

New commits:
commit 857e191c5e9c7c9e19f3294da65febe07ab5007c
Author: Gabor Kelemen 
Date:   Thu Dec 15 01:05:34 2016 +0100

Updated core
Project: help  6b12e054bde038fae6a6ee03c52b3c6664ab4300

Drop 'Warning Print Options' page

Can't find this feature in core anymore.

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

diff --git a/helpcontent2 b/helpcontent2
index b57f991..6b12e05 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b57f991c21f157f79e12b18664972d51ab7f3fbc
+Subproject commit 6b12e054bde038fae6a6ee03c52b3c6664ab4300
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Gabor Kelemen

 source/text/shared/optionen/01030300.xhp |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit b57f991c21f157f79e12b18664972d51ab7f3fbc
Author: Gabor Kelemen 
Date:   Wed Dec 14 22:06:57 2016 +0100

tdf#100096 Document security option for link blocking

Also fix the nonsensical ahids of that page

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

diff --git a/source/text/shared/optionen/01030300.xhp 
b/source/text/shared/optionen/01030300.xhp
index 747fe87..7a451d4 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -46,24 +46,29 @@
 The Security options and 
warnings dialog contains the following controls:
 
 When saving or sending
-Select to see a warning dialog when you try 
to save or send a document that contains recorded changes, versions, or 
comments.
+Select to see 
a warning dialog when you try to save or send a document that contains recorded 
changes, versions, or comments.
 
 When printing
-Select to see a warning dialog when you try 
to print a document that contains recorded changes or 
comments.
+Select to see 
a warning dialog when you try to print a document that contains recorded 
changes or comments.
 
 When signing
-Select to see a warning dialog when you try 
to sign a document that contains recorded changes, versions, fields, references 
to other sources (for example linked sections or linked pictures), or 
comments.
+Select to see 
a warning dialog when you try to sign a document that contains recorded 
changes, versions, fields, references to other sources (for example linked 
sections or linked pictures), or comments.
 
 When creating PDF files
-Select to see a warning dialog when you try 
to export a document to PDF format that displays recorded changes in Writer, or 
that displays comments.
+Select to see a 
warning dialog when you try to export a document to PDF format that displays 
recorded changes in Writer, or that displays comments.
 
 Remove personal information on saving
-Select to always remove user data from the 
file properties. If this option is not selected, you can still remove the 
personal information for the current document with the Reset 
Properties button on File - Properties - 
General.
+Select to 
always remove user data from the file properties. If this option is not 
selected, you can still remove the personal information for the current 
document with the Reset Properties button on File - 
Properties - General.
 
 Recommend password protection on 
saving
-Select to always enable the Save with 
password option in the file save dialogs. Deselect the option to save 
files by default without password.
+Select to always 
enable the Save with password option in the file save dialogs. 
Deselect the option to save files by default without 
password.
+
 Ctrl-click required to follow 
hyperlinks
-If enabled, you must hold down the Ctrl key while 
clicking a hyperlink to follow that link. If not enabled, a click opens the 
hyperlink.
+If enabled, you 
must hold down the Ctrl key while clicking a hyperlink to follow that link. If 
not enabled, a click opens the hyperlink.
+
+Block any links from documents not among the trusted locations (see 
Macro Security)
+Blocks the use of links 
pointing to images not in the trusted locations defined on the Trusted 
Sources tab of the Macro Security dialog. This can increase 
security in case you work with documents from untrusted sources (e.g. the 
internet) and are worried about vulnerabilities in image processing software 
components. Blocking the use of links means that images are not loaded in 
documents, only a placeholder frame is visible.
+
 Passwords for web connections
 You 
can enter a master password to enable easy access to sites that require a user 
name and password.
 Persistently save passwords protected by 
a master password
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-12-15 Thread Gabor Kelemen

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

New commits:
commit db2892b1efccb7a0d5977e1cda1ea3c0d893c771
Author: Gabor Kelemen 
Date:   Wed Dec 14 22:06:57 2016 +0100

Updated core
Project: help  b57f991c21f157f79e12b18664972d51ab7f3fbc

tdf#100096 Document security option for link blocking

Also fix the nonsensical ahids of that page

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

diff --git a/helpcontent2 b/helpcontent2
index ad3d97a..b57f991 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ad3d97a39a7f420365ed0ae186981cad6a887da3
+Subproject commit b57f991c21f157f79e12b18664972d51ab7f3fbc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Gabor Kelemen

 source/text/shared/01/02210101.xhp |   93 +++--
 1 file changed, 49 insertions(+), 44 deletions(-)

New commits:
commit ad3d97a39a7f420365ed0ae186981cad6a887da3
Author: Gabor Kelemen 
Date:   Thu Dec 15 00:50:57 2016 +0100

Restore connection between the 'Floating Frame' dialog and UI

With minimal updates to the content.

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

diff --git a/source/text/shared/01/02210101.xhp 
b/source/text/shared/01/02210101.xhp
index e70b329..4d5facb 100644
--- a/source/text/shared/01/02210101.xhp
+++ b/source/text/shared/01/02210101.xhp
@@ -29,58 +29,63 @@
 
 
 
-Floating 
Frame Properties
-Changes the properties 
of the selected floating frame. Floating frames work best when they contain an 
html document, and when they are inserted in another html 
document.
+
+Floating 
Frame Properties
+Changes the 
properties of the selected floating frame. Floating frames work best when they 
contain an html document, and when they are inserted in another html 
document.
 
   
 
-
-Name
-Enter a name 
for the floating frame. The name cannot contain spaces, special characters, or 
begin with an underscore ( _ ).
-
-Contents
-Enter the path and the name of the 
file that you want to display in the floating frame. You can also click the 
Browse button and locate the file that you want to 
display. For example, you can enter:
+
+Name
+Enter a name for the floating frame. 
The name cannot contain spaces, special characters, or begin with an underscore 
( _ ).
+
+Contents
+Enter the path and the name of the file 
that you want to display in the floating frame. You can also click the 
Browse button and locate the file that you want to 
display. For example, you can enter:
 
 
-http://www.example.com
+http://www.example.com
 
 
-file:///c|/Readme.txt 
+file:///c|/Readme.txt 
 
 
-
-Browse
-Locate 
the file that you want to display in the selected floating frame, and then 
click Open.
-Scrollbar
-Add or remove a scrollbar from the selected floating 
frame.
-
-On
-Displays the scrollbar 
for the floating frame.
-
-Off
-Hides the scrollbar 
for the floating frame.
-
-Automatic
-Mark this option if 
the currently active floating frame can have a scrollbar when 
needed.
-Border
-Displays or hides the border of the floating frame.
-
-On
-Displays the border 
of the floating frame.
-
-Off
-Hides the border of 
the floating frame.
-Spacing to contents
-Define the amount of space that is left between the border of the 
floating frame and the contents of the floating frame provided that both 
documents inside and outside the floating frame are HTML documents.
-
-Width
-Enter the amount of 
horizontal space that you want to leave between the right and the left edges of 
the floating frame and the contents of the frame. Both documents inside and 
outside the floating frame must be HTML documents.
-
-Height
-Enter the amount of 
vertical space that you want to leave between the top and bottom edges of the 
floating frame and the contents of the frame. Both documents inside and outside 
the floating frame must be HTML documents.
-
-
-Default
-Applies the 
default spacing.
+
+Browse
+Locate the file that you want to 
display in the selected floating frame, and then click 
Open.
+Scroll 
Bar
+Add or remove 
a scrollbar from the selected floating frame.
+
+On
+Displays the scrollbar for the 
floating frame.
+
+Off
+Hides the scrollbar for the 
floating frame.
+
+Automatic
+Mark this option if the 
currently active floating frame can have a scrollbar when 
needed.
+Border
+Displays or 
hides the border of the floating frame.
+
+On
+Displays the border of the floating 
frame.
+
+Off
+Hides the border of the floating 
frame.
+Spacing 
to Contents
+Define the 
amount of space that is left between the border of the floating frame and the 
contents of the floating frame provided that both documents inside and outside 
the floating frame are HTML documents.
+
+Width
+Enter the amount of horizontal space 
that you want to leave between the right and the left edges of the floating 
frame and the contents of the frame. Both documents inside and outside the 
floating frame must be HTML documents.
+
+
+Default
+Applies the default horizontal 
spacing.
+
+Height
+Enter the amount of vertical space that 
you want to leave between the top and bottom edges of the floating frame and 
the contents of the frame. Both documents inside and outside the floating frame 
must be HTML documents.
+
+
+Default
+Applies the default vertical 
spacing.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-12-15 Thread Gabor Kelemen

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

New commits:
commit 08d6478d39a74f2954e45c77e3b9e367decb16e6
Author: Gabor Kelemen 
Date:   Thu Dec 15 00:50:57 2016 +0100

Updated core
Project: help  ad3d97a39a7f420365ed0ae186981cad6a887da3

Restore connection between the 'Floating Frame' dialog and UI

With minimal updates to the content.

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

diff --git a/helpcontent2 b/helpcontent2
index cb54cfe..ad3d97a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cb54cfefe42d115a08e3c368a028b3f0b30485d4
+Subproject commit ad3d97a39a7f420365ed0ae186981cad6a887da3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Tor Lillqvist

 loleaflet/src/map/Map.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba765ddeba0f76b20972fe957bee4fa7b64d9d60
Author: Tor Lillqvist 
Date:   Thu Dec 15 15:04:19 2016 +0200

Fix accidentally pushed local debugging change, 1 instead of 10 min

Change-Id: I6b4fc6bff76d83442b17ee6ebf6c8fa718b80684

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index c22a9df..5e6665a 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -813,7 +813,7 @@ L.Map = L.Evented.extend({
 
_dimIfInactive: function () {
console.debug('_dimIfInactive: diff=' + (Date.now() - 
this.lastActiveTime));
-   if ((Date.now() - this.lastActiveTime) >= 1 * 60 * 1000) { // 
Dim 10 minutes after last user activity
+   if ((Date.now() - this.lastActiveTime) >= 10 * 60 * 1000) { // 
Dim 10 minutes after last user activity
this._dim();
} else {
this._startInactiveTimer();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes of the Design Hangout: 2016-Dec-15

2016-12-15 Thread Heiko Tietze

Present: Jay, Samuel, Heiko, Tomaz, Akshay

Tickets 

 * Dialog control tooltips (Heiko)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=104413
 + Consistency of every control to have a tooltip (Heiko)
 + Lots of translation work to add tooltips to .ui files (Jay, Heiko)
 + Tooltips already provided by help (Jay)
 -> decision needed by ESC whether or not to have 'simple' tooltips by 
default

 * Area tab heavily increases size of dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=103225
   + Bubli increased the size of the tab to work with gtk3, but it makes it 
ugly elsewhere (Jay)
 + https://bug-attachments.documentfoundation.org/attachment.cgi?id=128580 
(gtk2, windows)
 + http://i.imgur.com/PmCHOzv.png (gtk3)
   -> AI: Revert Bubli's patch if gtk3 build looks like the screenshot
   -> decision needed by ESC if gtk3 should be pushed even in the current state 
of controls

 * 'Chart' and 'Chart Wall' entries appear in chart elements selector drop down
   + https://bugs.documentfoundation.org/show_bug.cgi?id=90489
   + AI: trust Regina's input, so close bug

 * Modification to image properties
   + https://bugs.documentfoundation.org/show_bug.cgi?id=103272
   + layout of simple image properties
   + workflow similar to area fill style with presets
   + combination with filters
   -> Keep the change small and do redesign later

Tasks

 * Custom xml format for Notebookbar (Samuel)
   + https://wiki.documentfoundation.org/Development/GSoC/Ideas#Notebookbar
   + Agree (Jay)
   + Postpone discussion (Heiko)

 * Color palettes
   + Add Windows colors? (according ECMA OpenXML)
 + http://imgur.com/f32YmQT
 + close https://bugs.documentfoundation.org/show_bug.cgi?id=87541 ?
 + leave it open for the community
   + How to go ahead with standard.soc
 + https://bugs.documentfoundation.org/show_bug.cgi?id=87538 - new default
   + palettes used in other apps - 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=111091
   + suggestion to use these (8x12) - 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=111095
 and then row of black to white
 -> AI: Make a proposal (Heiko)
   + LibreColor HLC
 + https://bugs.documentfoundation.org/show_bug.cgi?id=104052
 + work in progress as extension or factory palette
   + Blog post draft
 + 
https://docs.google.com/document/d/1faOPqiJFmaj_9HJJqJKnEMg8biQj1bBEyOoTs5k3qes





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

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

2016-12-15 Thread Michael Stahl

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit d266cb32c3c982a60cd68650dd7ae8983744134e
Author: Michael Stahl 
Date:   Thu Dec 15 13:04:00 2016 +0100

tdf#104621 framework: Redo commit 84f2ff67a7e404febf710b1dc7f66d06745c503f

The fix was silly and wrong, need to check m_xUIElement, not m_aName,
which may be set independently, see the confusing code in
ToolbarLayoutManager::requestToolbar().

Change-Id: I279088cb2516b0a19619b5647f15f738a2624edf

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index f870b40..38a36046 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -506,7 +506,7 @@ bool ToolbarLayoutManager::createToolbar( const OUString& 
rResourceURL )
 SolarMutexClearableGuard aWriteLock;
 
 UIElement& rElement = impl_findToolbar( rResourceURL );
-if ( !rElement.m_aName.isEmpty() )
+if (rElement.m_xUIElement.is())
 {
 // somebody else must have created it while we released
 // the SolarMutex - just dispose our new instance and
@@ -517,6 +517,15 @@ bool ToolbarLayoutManager::createToolbar( const OUString& 
rResourceURL )
 xC->dispose();
 return false;
 }
+if ( !rElement.m_aName.isEmpty() )
+{
+// Reuse a local entry so we are able to use the latest
+// UI changes for this document.
+implts_setElementData( rElement, xDockWindow );
+rElement.m_xUIElement = xUIElement;
+bVisible = rElement.m_bVisible;
+bFloating = rElement.m_bFloating;
+}
 else
 {
 // Create new UI element and try to read its state data
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Bjoern Michaelsen

Hi,

On Thu, Dec 15, 2016 at 01:02:05PM +0100, Jan Iversen wrote:
> since you have already made the ball rolling by making gbuildtojson in C++
> the logical consequence would be to port the script to C++.

My fear with that was it (using C++ instead of Python) would discourage people
to contribute for other IDEs. But now that we have at least a wireframe
implementation for most popular IDEs going straight to C++ might indeed be our
best option[1] bootstrapping-wise. Although parsing JSON in C++ is rather ...
meh, but we certainly dont want an external dependency for that.

Probably needs an iterative approach: first parse the JSON stuff in some C++
objects and create output for the first IDE. Other IDEs move over from Python
to C++ one by one later.

Best,

Bjoern

[1] tsss, the irony of that.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/win

2016-12-15 Thread Khaled Hosny

 vcl/win/gdi/salfont.cxx |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit fcbbd6089da7e60bf616041517a2aee3017ae448
Author: Khaled Hosny 
Date:   Thu Dec 15 09:59:59 2016 +0200

tdf#103514: Try harder to ignore non-SFNT fonts

It seems that Script (and probably other bitmap fonts) have zero
nFontType, so instead if checking for RASTER_FONTTYPE, check for not
TRUTYPE_FONTTYPE (which seems to cover both TrueType and CFF-based SFNT
fonts).

Reviewed-on: https://gerrit.libreoffice.org/32031
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 
(cherry picked from commit ef4b9032de55e6b1b182e4ead1bbe6e590df296e)

Change-Id: Ie39ed99b219b756885b13b3ecbf3616556a277db
Reviewed-on: https://gerrit.libreoffice.org/32040
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index d2d964d..10ec674 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1370,19 +1370,15 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* 
lpelfe,
 }
 else
 {
+// Only SFNT fonts are supported, ignore anything else.
+if (SalLayout::UseCommonLayout() || 
OpenGLWrapper::isVCLOpenGLEnabled())
+if (!(nFontType & TRUETYPE_FONTTYPE))
+return 1;
+
 // Ignore non-device font on printer.
 if (pInfo->mbPrinter && !(nFontType & DEVICE_FONTTYPE))
 return 1;
 
-// Ignore non-scalable fonts.
-if (nFontType & RASTER_FONTTYPE)
-return 1;
-
-// Ignore font formats not supported by CommonSalLayout.
-if (SalLayout::UseCommonLayout())
-if ((pMetric->ntmTm.ntmFlags & NTM_TYPE1) || 
(pMetric->ntmTm.ntmFlags & NTM_MULTIPLEMASTER))
-return 1;
-
 WinFontFace* pData = ImplLogMetricToDevFontDataW( pLogFont, 
&(pMetric->ntmTm), nFontType );
 pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Noel Grandin

 compilerplugins/clang/sallogareas.cxx |3 +++
 compilerplugins/clang/sallogareas.hxx |2 ++
 2 files changed, 5 insertions(+)

New commits:
commit bd6723fd539bb63d230a2f985ac98ff7daafcbff
Author: Noel Grandin 
Date:   Thu Dec 15 14:11:16 2016 +0200

disable the 'two different log areas in the same file' loplugin check

too many false+ to leave it alive by default

Change-Id: I6d8f92b630c351c1ac788fad79f8d7c435ba4963

diff --git a/compilerplugins/clang/sallogareas.cxx 
b/compilerplugins/clang/sallogareas.cxx
index 85f90e3..d549187 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -110,6 +110,8 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation 
location )
 checkAreaSyntax(area, location);
 return;
 }
+// don't leave this alive by default, generates too many false+
+#if 0
 if (compiler.getSourceManager().isInMainFile(location))
 {
 auto matchpair = [this,area](StringRef p1, StringRef p2) {
@@ -166,6 +168,7 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation 
location )
 firstSeenLocation );
 }
 }
+#endif
 }
 
 void SalLogAreas::checkAreaSyntax(StringRef area, SourceLocation location) {
diff --git a/compilerplugins/clang/sallogareas.hxx 
b/compilerplugins/clang/sallogareas.hxx
index a689ce9..9133ed6 100644
--- a/compilerplugins/clang/sallogareas.hxx
+++ b/compilerplugins/clang/sallogareas.hxx
@@ -35,8 +35,10 @@ class SalLogAreas
 const FunctionDecl* inFunction;
 SourceLocation lastSalDetailLogStreamMacro;
 set< string > logAreas;
+#if 0
 string firstSeenLogArea;
 SourceLocation firstSeenLocation;
+#endif
 };
 
 } // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Jan Iversen

> - let go of that requirement on OSX where getting python3 is a hassle
>  (its no issue on Linux, neither on Windows as long as we need cygwin anyway)
> - use something different than Python3 for bootstrapping the env
>  (then again: What? Python is probably the bestsuited tool crossplatform tool
>  available for this task -- even with the Python2/3 mess).
> - sprinkle some fairy dust on OSX to make them ship an Python that was 
> releases
>  8 years ago …

since you have already made the ball rolling by making gbuildtojson in C++ the 
logical consequence would be to port the script to C++.

rgds
jan I.


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

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

2016-12-15 Thread Jochen Nitschke

 filter/source/graphicfilter/icgm/cgm.hxx|1 +
 filter/source/graphicfilter/icgm/classx.cxx |   26 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 8ad521d9147df325b7aee27d8e5c670a02e6afcf
Author: Jochen Nitschke 
Date:   Thu Dec 15 10:48:16 2016 +0100

convert macro to member function

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

diff --git a/filter/source/graphicfilter/icgm/cgm.hxx 
b/filter/source/graphicfilter/icgm/cgm.hxx
index e9651d1..0f3d686 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -101,6 +101,7 @@ class CGM
 double  ImplGetFloat( RealPrecision, sal_uInt32 nRealSize 
);
 sal_uInt32  ImplGetBitmapColor( bool bDirectColor = false );
 voidImplSetMapMode();
+voidImplSetUnderlineMode();
 voidImplMapDouble( double& );
 voidImplMapX( double& );
 voidImplMapY( double& );
diff --git a/filter/source/graphicfilter/icgm/classx.cxx 
b/filter/source/graphicfilter/icgm/classx.cxx
index 4864f99..cfcff128 100644
--- a/filter/source/graphicfilter/icgm/classx.cxx
+++ b/filter/source/graphicfilter/icgm/classx.cxx
@@ -22,19 +22,19 @@
 #include 
 
 
-#define ImplSetUnderlineMode()  \
-\
-sal_uInt32 nMode = ImplGetUI16();   \
-switch ( nMode )\
-{   \
-case 1 : pElement->eUnderlineMode = UM_LOW; break;  \
-case 2 : pElement->eUnderlineMode = UM_HIGH; break; \
-case 4 : pElement->eUnderlineMode = UM_STRIKEOUT; break;\
-case 8 : pElement->eUnderlineMode = UM_OVERSCORE; break;\
-default: pElement->eUnderlineMode = UM_OFF; break;  \
-}   \
+void CGM::ImplSetUnderlineMode()
+{
+sal_uInt32 nMode = ImplGetUI16();
+switch ( nMode )
+{
+case 1 : pElement->eUnderlineMode = UM_LOW; break;
+case 2 : pElement->eUnderlineMode = UM_HIGH; break;
+case 4 : pElement->eUnderlineMode = UM_STRIKEOUT; break;
+case 8 : pElement->eUnderlineMode = UM_OVERSCORE; break;
+default: pElement->eUnderlineMode = UM_OFF; break;
+}
 pElement->nUnderlineColor = ImplGetBitmapColor();
-
+}
 
 void CGM::ImplDoClass6()
 {
@@ -48,7 +48,7 @@ void CGM::ImplDoClass6()
 case 0 : /*inquire function support */break;
 case -1 : /*set underline mode*/
 {
-ImplSetUnderlineMode()
+ImplSetUnderlineMode();
 }
 break;
 case -2 : /*set script mode */break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Andras Timar

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

New commits:
commit 73f2c278aa224ffcd8d07bad162c720a90294f39
Author: Andras Timar 
Date:   Thu Dec 15 12:54:37 2016 +0100

loleaflet: put link to git hashes beginning with 0 in About box

Change-Id: I3e981e72f69af45776f7ecccb10a0beda56f7c1f

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 8ef38ec..4937a35 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -166,7 +166,7 @@ L.Socket = L.Class.extend({
// This must be the first message, unless we reconnect.
var loolwsdVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
-   if (parseInt(h,16).toString(16) === h.toLowerCase()) {
+   if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
h = 'https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' + 
h + '';

$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h + 
')');
}
@@ -182,7 +182,7 @@ L.Socket = L.Class.extend({
else if (textMsg.startsWith('lokitversion ')) {
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
-   if (parseInt(h,16).toString(16) === h.toLowerCase()) {
+   if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
h = 'https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h 
+ '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Bjoern Michaelsen

Hi,

On Thu, Dec 15, 2016 at 12:05:38PM +0100, Michael Stahl wrote:
> but we build python3 anyway, why don't we just use that to run the
> bin/gbuild-to-ide script, then it'll run even on macOS?

right, doing python2 (only) scripts these days is foolish as it is phasing out.
FWIW, this has nothing to do with what configure finds, but with:

 #! /usr/bin/env python3

in the first line of gbuild-to-ide looking for whatever python3 interpreter is
on the system. I would oppose porting gbuild-to-ide back to python2 -- for the
reasons noted above. I would not oppose to make gbuild-to-ide work with python2
too, if someone is enthusiastic about it.

As for using the python3 that LibreOffice bundles anyway: That is nice ... in
theory. In practice, the bootstrapping makes this a bit tricky: gbuild-to-ide
is supposed to work before a full build is there. So we either have to:

- let go of that requirement on OSX where getting python3 is a hassle
  (its no issue on Linux, neither on Windows as long as we need cygwin anyway)
- use something different than Python3 for bootstrapping the env
  (then again: What? Python is probably the bestsuited tool crossplatform tool
  available for this task -- even with the Python2/3 mess).
- sprinkle some fairy dust on OSX to make them ship an Python that was releases
  8 years ago ...

Best,

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

Re: OpenCL enabled by default after OS reinstall causing Unit Test Failure

2016-12-15 Thread Markus Mohrhard

Hey,

On Thu, Dec 15, 2016 at 12:35 PM, slacka  wrote:

> Niklas Johansson wrote
> Is it the only OpenCL test that fails for you?
>
> Yes, Build finishes without error after I comment the
> testFinancialXirrFormula out. Afterwards when I open:
> core\sc\qa\unit\data\ods\opencl\financial\XIRR.ods The actual results
> seem to match the expected results. -Luke
> --
>
>

Note that the tests run with a special configuration. If you open the file
later the file most likely does not use OpenCL as can be seen line 360 and
following in sc/source/core/tool/formulagroup.cxx.

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

Re: OpenCL enabled by default after OS reinstall causing Unit Test Failure

2016-12-15 Thread slacka

Niklas Johansson wrote
> Is it the only OpenCL test that fails for you?

Yes, Build finishes without error after I comment the
testFinancialXirrFormula out.Afterwards when I
open:core\sc\qa\unit\data\ods\opencl\financial\XIRR.odsThe actual results
seem to match the expected results. -Luke



--
View this message in context: 
http://nabble.documentfoundation.org/OpenCL-enabled-by-default-after-OS-reinstall-causing-Unit-Test-Failure-tp4202419p4202785.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 2 commits - configure.ac loleaflet/dist loleaflet/main.js loleaflet/src loolwsd.xml.in wsd/FileServer.cpp wsd/LOOLWSD.cpp

2016-12-15 Thread Pranav Kant

 configure.ac  |4 +++-
 loleaflet/dist/loleaflet.html |1 +
 loleaflet/main.js |8 
 loleaflet/src/map/Map.js  |   22 ++
 loolwsd.xml.in|2 ++
 wsd/FileServer.cpp|4 
 wsd/LOOLWSD.cpp   |1 +
 7 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit 73842dd307d0f7579ef5f456e380ab703d6e2c0d
Author: Pranav Kant 
Date:   Thu Dec 15 15:30:16 2016 +0530

Uncomment these console output statements

... as these are now printed only when compiled with
--enable-debug, so they shouldn't be polluting the release build.

Change-Id: I3169fb39cea298b001a4d576632a1634ff35e004

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index aebefe0..c22a9df 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -740,13 +740,13 @@ L.Map = L.Evented.extend({
},
 
_activate: function () {
-   // console.log('_activate:');
+   console.debug('_activate:');
clearTimeout(vex.timer);
 
if (!this._active) {
// Only activate when we are connected.
if (this._socket.connected()) {
-   // console.log('  sending useractive');
+   console.debug('sending useractive');
this._socket.sendMessage('useractive');
this._active = true;
this._docLayer._onMessage('invalidatetiles: 
EMPTY', null);
@@ -766,12 +766,11 @@ L.Map = L.Evented.extend({
},
 
_dim: function() {
-   // console.log('_dim:');
+   console.debug('_dim:');
if (!this._socket.connected()) {
return;
}
 
-   // console.log('  cont');
this._active = false;
clearTimeout(vex.timer);
 
@@ -794,7 +793,7 @@ L.Map = L.Evented.extend({
 
var map = this;
options.$vex.bind('click.vex', function(e) {
-   // console.log('click.vex function');
+   console.debug('_dim: click.vex function');
return map._activate();
});
options.$vex.append(options.$vexOverlay);
@@ -808,12 +807,12 @@ L.Map = L.Evented.extend({
vex.setupBodyClassName(options.$vex);
 
this._doclayer && this._docLayer._onMessage('textselection:', 
null);
-   // console.log('  sending userinactive');
+   console.debug('_dim: sending userinactive');
this._socket.sendMessage('userinactive');
},
 
_dimIfInactive: function () {
-   // console.log('_dimIfInactive: diff=' + (Date.now() - 
map.lastActiveTime));
+   console.debug('_dimIfInactive: diff=' + (Date.now() - 
this.lastActiveTime));
if ((Date.now() - this.lastActiveTime) >= 1 * 60 * 1000) { // 
Dim 10 minutes after last user activity
this._dim();
} else {
@@ -822,7 +821,7 @@ L.Map = L.Evented.extend({
},
 
_startInactiveTimer: function () {
-   // console.log('_startInactiveTimer:');
+   console.debug('_startInactiveTimer:');
clearTimeout(vex.timer);
var map = this;
vex.timer = setTimeout(function() {
@@ -831,7 +830,7 @@ L.Map = L.Evented.extend({
},
 
_deactivate: function () {
-   // console.log('_deactivate:');
+   console.debug('_deactivate:');
clearTimeout(vex.timer);
 
if (!this._active || vex.dialogID > 0) {
@@ -840,7 +839,7 @@ L.Map = L.Evented.extend({
this._active = false;
this._docLayer && 
this._docLayer._onMessage('textselection:', null);
if (this._socket.connected()) {
-   // console.log('  sending userinactive');
+   console.debug('_deactivate: sending 
userinactive');
this._socket.sendMessage('userinactive');
}
 
@@ -873,10 +872,9 @@ L.Map = L.Evented.extend({
},
 
_onGotFocus: function () {
-   // console.log('_onGotFocus:');
+   console.debug('_onGotFocus:');
if (!this._loaded) { return; }
 
-   // console.log('  cont');
var doclayer = this._docLayer;
if (doclayer) {
// we restore the old cursor position by a small delay, 
so that if the user clicks
commit 39dd5018e255ad529b409218cff983690700d70d
Author: Pranav Kant 
Date:   Thu Dec 15 15:26:54 2016 +0530

browser console logging depending on loleaflet_logging prop.

lol

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Jan Iversen


> On 15 Dec 2016, at 12:32, Alexander Thurgood  wrote:
> 
> Le 15/12/2016 à 12:11, Alexander Thurgood a écrit :
> 
> And surely the whole aim of the foo-ide-integration thing is to allow
> the default to be built from within the target IDE and not to require
> setting ENVs for frameworks that are not the default ?
In my mind the target is actually to supply the solutions, and run “make 
whatever” on our tinderboxes to do the generation.

But this is still something being discussed, right now, we are at the level of 
getting it to work first.

rgds
jan I.

> 
> 
> 
> Alex
> 
> ___
> 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

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Alexander Thurgood

Le 15/12/2016 à 12:11, Alexander Thurgood a écrit :

And surely the whole aim of the foo-ide-integration thing is to allow
the default to be built from within the target IDE and not to require
setting ENVs for frameworks that are not the default ?



Alex

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

[Libreoffice-commits] core.git: config_host/config_global.h.in configure.ac oox/source xmlsecurity/source

2016-12-15 Thread Stephan Bergmann

 config_host/config_global.h.in |1 -
 configure.ac   |2 +-
 oox/source/export/shapes.cxx   |   10 ++
 xmlsecurity/source/helper/ooxmlsecexporter.cxx |   10 ++
 4 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 721116c7ade10d76e3ed6832e3988c91427ba431
Author: Stephan Bergmann 
Date:   Thu Dec 15 08:54:08 2016 +0100

Phase out support for HAVE_BROKEN_STATIC_INITIALIZER_LIST

...I'm pondering a change that would make that a hard requirement, and from 
the
comment in configure.ac it looks like only old Clang < 3.4 were affected.

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

diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 1e68f4a..5bb9992 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -22,7 +22,6 @@ Any change in this header will cause a rebuild of almost 
everything.
 #define HAVE_GCC_DEPRECATED_MESSAGE 0
 #define HAVE_THREADSAFE_STATICS 0
 #define HAVE_BROKEN_CONST_ITERATORS 0
-#define HAVE_BROKEN_STATIC_INITIALIZER_LIST 0
 #define HAVE_SYSLOG_H 0
 /* Compiler supports __attribute__((warn_unused)). */
 #define HAVE_GCC_ATTRIBUTE_WARN_UNUSED 0
diff --git a/configure.ac b/configure.ac
index 9c55fe8..eb2dd83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12573,7 +12573,7 @@ LIBS=$save_LIBS
 CXXFLAGS=$save_CXXFLAGS
 AC_MSG_RESULT([$broken])
 if test "$broken" = yes; then
-AC_DEFINE([HAVE_BROKEN_STATIC_INITIALIZER_LIST])
+AC_MSG_ERROR([working support for static initializer_list needed])
 fi
 
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 6e6fc5e..cd139b8 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -532,10 +532,7 @@ ShapeExport& ShapeExport::WriteGroupShape(const 
uno::Reference&
 
 static bool lcl_IsOnBlacklist(OUString& rShapeType)
 {
-#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST
-static
-#endif
-const std::initializer_list vBlacklist = {
+static const std::initializer_list vBlacklist = {
 OUStringLiteral("block-arc"),
 OUStringLiteral("rectangle"),
 OUStringLiteral("ellipse"),
@@ -601,10 +598,7 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType)
 
 static bool lcl_IsOnWhitelist(OUString& rShapeType)
 {
-#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST
-static
-#endif
-const std::initializer_list vWhitelist = {
+static const std::initializer_list vWhitelist = {
 OUStringLiteral("forbidden"),
 OUStringLiteral("heart"),
 OUStringLiteral("puzzle")
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx 
b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 34843a5..df35dee 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -73,10 +73,7 @@ struct OOXMLSecExporter::Impl
 
 bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName)
 {
-#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST
-static
-#endif
-const std::initializer_list vBlacklist =
+static const std::initializer_list vBlacklist =
 {
 OUStringLiteral("/%5BContent_Types%5D.xml"),
 OUStringLiteral("/docProps/app.xml"),
@@ -93,10 +90,7 @@ bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const 
OUString& rStreamName)
 
 bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& 
rRelationName)
 {
-#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST
-static
-#endif
-const std::initializer_list vBlacklist =
+static const std::initializer_list vBlacklist =
 {
 
OUStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";),
 
OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Jan Iversen

> 
> but we build python3 anyway, why don't we just use that to run the
> bin/gbuild-to-ide script, then it'll run even on macOS?
I can only look at my configuration, where tml_ helped me, and I needed to have 
--enable-python=fully-internal in autogen.input to make a full build work.

Since foo-ide-integration and gbuildtojson runs with a build (directly after a 
make clean), that will not work.

Maybe there are other ways to get python3 working with our build, but I had a 
mess of 2.7 header files (from apple) and 3.0 header files from an official 
python3 installation, and the solution seemed to be the above option.

rgds
jan I.

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

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Alexander Thurgood

Le 15/12/2016 à 11:50, Jan Iversen a écrit :
> 

> 
> If your make does not fail with a python backtrace, then you have another 
> problem, like missing python3.
> 

Did I misunderstand something, as I don't recall python3 becoming a
requirement for building LO ?
The default python framework on OSX 10.12.1 is python2.7 and this is
what appears in the shell.

The gbuildtojson script looks in workdir/GeneratedPackage directory for
python3 but this isn't built by default in an OSX build because a
top-level make finds python2.7 :

checking for a Python interpreter with version >= 2.6...python
checking for python version...2.7
checking for python platform...Darwin
...
checking which Python to use for Pyuno...
checking for a python interpreter with version >= 3.3...none




Alex



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

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Michael Stahl

On 12/15/2016 12:02 PM, Jan Iversen wrote:
> 
>> env: python3: No such file or directory
> As is says no python3, that is needed for make foo-ide-integration
> 
> but even if you install python3, you will (at least on sierra) still have a 
> problem, because of a json file being generated with wrong information.

but we build python3 anyway, why don't we just use that to run the
bin/gbuild-to-ide script, then it'll run even on macOS?


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

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Jan Iversen


> env: python3: No such file or directory
As is says no python3, that is needed for make foo-ide-integration

but even if you install python3, you will (at least on sierra) still have a 
problem, because of a json file being generated with wrong information.

rgds
jan I

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

[Libreoffice-commits] cppunit.git: examples/cppunittest examples/msvc6 examples/qt include/cppunit src/cppunit

2016-12-15 Thread Markus Mohrhard

 examples/cppunittest/ExceptionTest.cpp |5 +++--
 examples/cppunittest/HelperMacrosTest.cpp  |   18 +-
 examples/msvc6/HostApp/ExampleTestCase.cpp |6 +++---
 examples/qt/ExampleTestCases.cpp   |6 +++---
 include/cppunit/portability/Makefile.am|1 -
 include/cppunit/portability/SmartPtr.h |6 --
 src/cppunit/Protector.cpp  |5 ++---
 7 files changed, 20 insertions(+), 27 deletions(-)

New commits:
commit ff6ce1d7c00be2279f905b2f08cbbd67fa239ae7
Author: Markus Mohrhard 
Date:   Thu Dec 15 12:01:36 2016 +0100

we no longer need a wrapper for the smart pointer case

diff --git a/examples/cppunittest/ExceptionTest.cpp 
b/examples/cppunittest/ExceptionTest.cpp
index 856f561..c11a8de 100644
--- a/examples/cppunittest/ExceptionTest.cpp
+++ b/examples/cppunittest/ExceptionTest.cpp
@@ -1,8 +1,9 @@
 #include "CoreSuite.h"
 #include "ExceptionTest.h"
-#include 
 #include 
 
+#include 
+
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExceptionTest,
coreSuiteName() );
@@ -79,7 +80,7 @@ ExceptionTest::testClone()
 {
   CPPUNIT_NS::SourceLine sourceLine( "fileName.cpp", 123 );
   CPPUNIT_NS::Exception e( CPPUNIT_NS::Message("message"), sourceLine  );
-  CppUnitSmartPtr other( e.clone() );
+  std::unique_ptr other( e.clone() );
   checkIsSame( e, *other.get() );
 }
 
diff --git a/examples/cppunittest/HelperMacrosTest.cpp 
b/examples/cppunittest/HelperMacrosTest.cpp
index 0e2a8b8..4e83b81 100644
--- a/examples/cppunittest/HelperMacrosTest.cpp
+++ b/examples/cppunittest/HelperMacrosTest.cpp
@@ -5,7 +5,7 @@
 #include "MockTestCase.h"
 #include "SubclassedTestCase.h"
 #include 
-#include 
+#include 
 
 /* Note:
  - no unit test for CPPUNIT_TEST_SUITE_REGISTRATION...
@@ -132,7 +132,7 @@ HelperMacrosTest::tearDown()
 void 
 HelperMacrosTest::testNoSubclassing()
 {
-  CppUnitSmartPtr suite( BaseTestCase::suite() );
+  std::unique_ptr suite( BaseTestCase::suite() );
   CPPUNIT_ASSERT_EQUAL( 1, suite->countTestCases() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectNoFailure();
@@ -145,7 +145,7 @@ HelperMacrosTest::testNoSubclassing()
 void 
 HelperMacrosTest::testSubclassing()
 {
-  CppUnitSmartPtr suite( SubclassedTestCase::suite() );
+  std::unique_ptr suite( SubclassedTestCase::suite() );
   CPPUNIT_ASSERT_EQUAL( 2, suite->countTestCases() );
   m_testListener->setExpectedStartTestCall( 2 );
   m_testListener->setExpectedAddFailureCall( 1 );
@@ -158,7 +158,7 @@ HelperMacrosTest::testSubclassing()
 void 
 HelperMacrosTest::testFail()
 {
-  CppUnitSmartPtr suite( FailTestFixture::suite() );
+  std::unique_ptr suite( FailTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectNoFailure();
 
@@ -170,7 +170,7 @@ HelperMacrosTest::testFail()
 void 
 HelperMacrosTest::testFailToFail()
 {
-  CppUnitSmartPtr suite( FailToFailTestFixture::suite() 
);
+  std::unique_ptr suite( FailToFailTestFixture::suite() 
);
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectedAddFailureCall( 1 );
 
@@ -182,7 +182,7 @@ HelperMacrosTest::testFailToFail()
 void 
 HelperMacrosTest::testException()
 {
-  CppUnitSmartPtr suite( ExceptionTestFixture::suite() 
);
+  std::unique_ptr suite( ExceptionTestFixture::suite() 
);
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectNoFailure();
   
@@ -194,7 +194,7 @@ HelperMacrosTest::testException()
 void 
 HelperMacrosTest::testExceptionNotCaught()
 {
-  CppUnitSmartPtr suite( 
ExceptionNotCaughtTestFixture::suite() );
+  std::unique_ptr suite( 
ExceptionNotCaughtTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectedAddFailureCall( 1 );
 
@@ -206,7 +206,7 @@ HelperMacrosTest::testExceptionNotCaught()
 void 
 HelperMacrosTest::testCustomTests()
 {
-  CppUnitSmartPtr suite( 
CustomsTestTestFixture::suite() );
+  std::unique_ptr suite( 
CustomsTestTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 2 );
   m_testListener->setExpectedAddFailureCall( 1 );
 
@@ -218,7 +218,7 @@ HelperMacrosTest::testCustomTests()
 void 
 HelperMacrosTest::testAddTest()
 {
-  CppUnitSmartPtr suite( AddTestTestFixture::suite() );
+  std::unique_ptr suite( AddTestTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 7 );
   m_testListener->setExpectedAddFailureCall( 0 );
 
diff --git a/examples/msvc6/HostApp/ExampleTestCase.cpp 
b/examples/msvc6/HostApp/ExampleTestCase.cpp
index 727fd30..85aa468 100644
--- a/examples/msvc6/HostApp/ExampleTestCase.cpp
+++ b/examples/msvc6/HostApp/ExampleTestCase.cpp
@@ -1,5 +1,5 @@
 #include "ExampleTestCase.h"
-#include 
+#include 
 
 CPPUNIT_TEST_SUITE_REGISTRATION( ExampleTestCase );
 
@@ -32,8 +32,8 @@ void ExampleTestCase::testAdd ()
 
 void ExampleTestCase::testEquals ()
 {
-CppUnitSmartPtr l1 (new long (12));
-CppUnitSmartPtr l2 (new long (12));
+std::unique_ptr l1

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Alexander Thurgood

Le 15/12/2016 à 11:50, Jan Iversen a écrit :
> 

The error message is :


env: python3: No such file or directory

Alex

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

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Jan Iversen


> FWIW, the xcode-ide-integration still fails for me for what appears to
> be a lack of a python3 environment - OSX 10.12 default is python2.7,
> which is what make finds, so I'm assuming that something in the
> gbuildtojson script requires python3 ?
two different things.

try to run 
make gbuildtojson
that does not require python3.

make Xcode-ide-integration (and all other ones still fails with python claiming 
that a .group statement does not work.

If your make does not fail with a python backtrace, then you have another 
problem, like missing python3.

rgds
jan I.

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

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

2016-12-15 Thread Pranav Kant

 loleaflet/dist/toolbar/toolbar.js |   32 +---
 1 file changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 6c4472de1d056bdb1a5463d7402e006ecec6880f
Author: Pranav Kant 
Date:   Thu Dec 15 16:11:59 2016 +0530

This code conditional to presentations only

Change-Id: If7caef1ec78e26960a4dd91edd3c798190d2fdc4

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 4f63c0d..89a7ecf 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -427,21 +427,23 @@ $(function () {
$('#backColorPicker').on('change.color', 
onColorPick);
}
 
-   // Fill the style select box if not yet filled
-   if ($('.styles-select')[0] && 
$('.styles-select')[0].length === 0) {
-   var data = [''];
-   // Inserts a separator element
-   data = data.concat({text: 
'\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true});
-
-   L.Styles.impressLayout.forEach(function(layout) 
{
-   data = data.concat({id: layout.id, 
text: _(layout.text)});
-   }, this);
-
-   $('.styles-select').select2({
-   data: data,
-   placeholder: _('Layout')
-   });
-   $('.styles-select').on('select2:select', 
onStyleSelect);
+   if (map.getDocType() === 'presentation') {
+   // Fill the style select box if not yet filled
+   if ($('.styles-select')[0] && 
$('.styles-select')[0].length === 0) {
+   var data = [''];
+   // Inserts a separator element
+   data = data.concat({text: 
'\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true});
+
+   
L.Styles.impressLayout.forEach(function(layout) {
+   data = data.concat({id: 
layout.id, text: _(layout.text)});
+   }, this);
+
+   $('.styles-select').select2({
+   data: data,
+   placeholder: _('Layout')
+   });
+   
$('.styles-select').on('select2:select', onStyleSelect);
+   }
}
 
insertTable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make gbuildtojson and make xx-ide-integration problems.

2016-12-15 Thread Alexander Thurgood

Le 15/12/2016 à 08:56, Matúš Kukan a écrit :

FWIW, the xcode-ide-integration still fails for me for what appears to
be a lack of a python3 environment - OSX 10.12 default is python2.7,
which is what make finds, so I'm assuming that something in the
gbuildtojson script requires python3 ?

Alex




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

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

2016-12-15 Thread Khaled Hosny

 vcl/win/gdi/salfont.cxx |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit ef4b9032de55e6b1b182e4ead1bbe6e590df296e
Author: Khaled Hosny 
Date:   Thu Dec 15 09:59:59 2016 +0200

tdf#103514: Try harder to ignore non-SFNT fonts

It seems that Script (and probably other bitmap fonts) have zero
nFontType, so instead if checking for RASTER_FONTTYPE, check for not
TRUTYPE_FONTTYPE (which seems to cover both TrueType and CFF-based SFNT
fonts).

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

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 65c909f..8bf8c54 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1054,16 +1054,8 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
 }
 else
 {
-// Ignore non-device font on printer.
-if (pInfo->mbPrinter && !(nFontType & DEVICE_FONTTYPE))
-return 1;
-
-// Ignore non-scalable fonts.
-if (nFontType & RASTER_FONTTYPE)
-return 1;
-
-// Ignore font formats we donât support.
-if ((pMetric->ntmTm.ntmFlags & NTM_TYPE1) || (pMetric->ntmTm.ntmFlags 
& NTM_MULTIPLEMASTER))
+// Only SFNT fonts are supported, ignore anything else.
+if (!(nFontType & TRUETYPE_FONTTYPE))
 return 1;
 
 WinFontFace* pData = ImplLogMetricToDevFontDataW( pLogFont, 
&(pMetric->ntmTm), nFontType );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Sandeep Dubey license statement

2016-12-15 Thread Jan Iversen

WELCOME
Thanks for your license statement.

We suggest you add yourself to our wiki (remark this is not a demand)
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

Re: LibreOffice for Android

2016-12-15 Thread Jan Iversen


> It's not clear yet if LibreOffice will be accepted next year in GSoC, so
> don't assume that will be definitely the case.
However given our history, it is safe to say, that we have a good chance of 
being accepted.

> Anyway, see  in
> general, and
>  in
> particular.
And please be aware last year we had 80+ applicants and GSoC only gave us 
around 10 slots, so the election process was quite tough. One of the most 
important parameters in the election was (apart from judging the proposal as 
such) was to look at the work the student had done for LibreOffice before GSoC, 
so making gerrit patches is a real good thing.

In general the android version is not receiving a lot of attention, so there 
are plenty of work to be done.

you might also take a look at:
https://wiki.documentfoundation.org/Development/GetInvolved 

which gives you a step by step guide.

have fun.
rgds
jan I.

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

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

2016-12-15 Thread Caolán McNamara

 lingucomponent/source/spellcheck/spell/sspellimp.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 484370526ddf1ae94a62439d879f8ef592180d19
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 09:45:33 2016 +

fix collision

Change-Id: I73371e19877a8b192b188c1c6367ba0d391530df

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index c09f7a4..a01d23d 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
 // XML-header of SPELLML queries
-#if defined SPELL_XML
+#if !defined SPELL_XML
 #define SPELL_XML ""
 #endif
 
@@ -277,10 +277,6 @@ sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& 
rLocale)
 return bRes;
 }
 
-#ifndef MAXWORDLEN
-#   define MAXWORDLEN 176
-#endif
-
 sal_Int16 SpellChecker::GetSpellFailure(const OUString &rWord, const Locale 
&rLocale)
 {
 if (rWord.getLength() > MAXWORDLEN)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread David Tardon

 lingucomponent/source/spellcheck/spell/sspellimp.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 043c1886d559b58cc8948b0543b656a9039c8197
Author: David Tardon 
Date:   Thu Dec 15 10:37:03 2016 +0100

hunspell defines this for some time now

Change-Id: I5cd3cd11f24bee87266822ec13e64132ee470d6a

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 41e6e8d..c09f7a4 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -58,7 +58,9 @@ using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
 // XML-header of SPELLML queries
-#define SPELLML_HEADER ""
+#if defined SPELL_XML
+#define SPELL_XML ""
+#endif
 
 // only available in hunspell >= 1.5
 #if !defined MAXWORDLEN
@@ -422,7 +424,7 @@ sal_Bool SAL_CALL SpellChecker::isValid( const OUString& 
rWord, const Locale& rL
 return true;
 
 // return sal_False to process SPELLML requests (they are longer than the 
header)
-if (rWord.match(SPELLML_HEADER, 0) && (rWord.getLength() > 10)) return 
false;
+if (rWord.match(SPELL_XML, 0) && (rWord.getLength() > 10)) return false;
 
 // Get property values to be used.
 // These are be the default values set in the SN_LINGU_PROPERTIES
@@ -434,7 +436,7 @@ sal_Bool SAL_CALL SpellChecker::isValid( const OUString& 
rWord, const Locale& rL
 rHelper.SetTmpPropVals( rProperties );
 
 sal_Int16 nFailure = GetSpellFailure( rWord, rLocale );
-if (nFailure != -1 && !rWord.match(SPELLML_HEADER, 0))
+if (nFailure != -1 && !rWord.match(SPELL_XML, 0))
 {
 sal_Int16 nLang = LinguLocaleToLanguage( rLocale );
 // postprocess result for errors that should be ignored
commit 64362ec119a4f38c98d2ff959a5651f4887ff942
Author: David Tardon 
Date:   Thu Dec 15 10:36:18 2016 +0100

fix build with hunspell < 1.5

Change-Id: I66810d2bf9bbd08990dd8e995e34c50caa472ff8

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 5a1abd7..41e6e8d 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -60,6 +60,11 @@ using namespace linguistic;
 // XML-header of SPELLML queries
 #define SPELLML_HEADER ""
 
+// only available in hunspell >= 1.5
+#if !defined MAXWORDLEN
+#define MAXWORDLEN 176
+#endif
+
 SpellChecker::SpellChecker() :
 aDicts(nullptr),
 aDEncs(nullptr),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac external/fontconfig external/freetype extras/source RepositoryExternal.mk

2016-12-15 Thread Caolán McNamara

 RepositoryExternal.mk |8 +---
 configure.ac  |9 -
 external/fontconfig/ExternalProject_fontconfig.mk |2 +-
 external/fontconfig/Module_fontconfig.mk  |4 
 external/freetype/Module_freetype.mk  |4 
 extras/source/glade/libreoffice-catalog.xml.in|2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 5bd30fea44e544d072ff94b3812464cefd250feb
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 09:31:46 2016 +

fix svxlo-ColorListBox->svxcorelo-SvxColorListBox glade catalog

Change-Id: Ia007045c71e85fcca2afeacec6ef77d5f0b633f1

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 84a0558..82f9ab4 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -94,7 +94,7 @@
   
 
 
-
 
commit f2fae3684f35bfb03c4921adc4ecbddcff36374b
Author: CaolÃ¡n McNamara 
Date:   Tue Dec 13 16:30:58 2016 +

build our own fontconfig and freetype under oss-fuzz

Change-Id: I7141aabd64c3f42545176fa8c907d8326e25e9ff

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dcc47a6..3d5c5aa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1273,7 +1273,7 @@ endef
 
 gb_ExternalProject__use_freetype :=
 
-else ifeq ($(OS),ANDROID)
+else
 
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_use_external_project,$(1),freetype)
@@ -1286,7 +1286,7 @@ endef
 
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),-lfreetype)
 
 endef
 
@@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
 
 endef
 
-else ifeq ($(OS),ANDROID)
+else
 
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
@@ -1318,6 +1318,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
+$(call gb_LinkTarget_add_libs,$(1),-lfontconfig)
+
 endef
 
 endif # SYSTEM_FONTCONFIG
diff --git a/configure.ac b/configure.ac
index 3808f6e..9c55fe8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,7 +665,14 @@ linux-gnu*|k*bsd*-gnu*)
 build_gstreamer_0_10=yes
 test_tde=yes
 test_kde4=yes
-test_freetype=yes
+if test "$enable_fuzzers" != yes; then
+test_freetype=yes
+test_fontconfig=yes
+else
+test_freetype=no
+test_fontconfig=no
+BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
+fi
 _os=Linux
 ;;
 
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk 
b/external/fontconfig/ExternalProject_fontconfig.mk
index e4de004..83387e3 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter 
ANDROID,$(OS)),LIBS="-lm") \
./configure \
--disable-shared \
-   --with-arch=arm \
+   $(if $(filter ANDROID,$(OS)),--with-arch=arm) \
--with-expat-includes=$(call 
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
--with-freetype-config=$(call 
gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
diff --git a/external/fontconfig/Module_fontconfig.mk 
b/external/fontconfig/Module_fontconfig.mk
index 764af35..e755f86 100644
--- a/external/fontconfig/Module_fontconfig.mk
+++ b/external/fontconfig/Module_fontconfig.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,fontconfig))
 
-ifeq ($(OS),ANDROID)
-
 $(eval $(call gb_Module_add_targets,fontconfig,\
ExternalProject_fontconfig \
UnpackedTarball_fontconfig \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/freetype/Module_freetype.mk 
b/external/freetype/Module_freetype.mk
index f6e316d..290014c 100644
--- a/external/freetype/Module_freetype.mk
+++ b/external/freetype/Module_freetype.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,freetype))
 
-ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF)))
-
 $(eval $(call gb_Module_add_targets,freetype,\
ExternalProject_freetype \
UnpackedTarball_freetype \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Caolán McNamara

 lingucomponent/source/spellcheck/spell/sspellimp.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 7f9a389b45e2452d859e17cf51acd27dc7355af6
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 15 09:25:22 2016 +

if building against system hunspell < 1.5.4 > 1.4.0

Change-Id: I9ba1b9c3c0e3efb00538b2f3ed4fcffc29f9e931

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 173426f..5a1abd7 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -270,6 +270,10 @@ sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& 
rLocale)
 return bRes;
 }
 
+#ifndef MAXWORDLEN
+#   define MAXWORDLEN 176
+#endif
+
 sal_Int16 SpellChecker::GetSpellFailure(const OUString &rWord, const Locale 
&rLocale)
 {
 if (rWord.getLength() > MAXWORDLEN)
___
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_xmlsecurity.mk xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

2016-12-15 Thread Miklos Vajna

 xmlsecurity/Library_xmlsecurity.mk  |4 
 xmlsecurity/Library_xsec_xmlsec.mk  |1 
 xmlsecurity/inc/xmlsec/saxhelper.hxx|   78 +++
 xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx|  258 
++
 xmlsecurity/inc/xsecctl.hxx |4 
 xmlsecurity/inc/xsecxmlsecdllapi.h  |   23 
 xmlsecurity/source/helper/xsecctl.cxx   |9 
 xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx |2 
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx  |2 
 xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx |2 
 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx  |2 
 xmlsecurity/source/xmlsec/saxhelper.cxx |2 
 xmlsecurity/source/xmlsec/saxhelper.hxx |   78 ---
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |2 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx |  258 
--
 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx   |2 
 16 files changed, 377 insertions(+), 350 deletions(-)

New commits:
commit a7c35729e00f18f79156b3f8f57472506f786074
Author: Miklos Vajna 
Date:   Thu Dec 15 09:09:35 2016 +0100

xmlsecurity: hold XMLDocumentWrapper by rtl::Reference in XSecController

Going via UNO for a class in the same module is an overkill.

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

diff --git a/xmlsecurity/Library_xmlsecurity.mk 
b/xmlsecurity/Library_xmlsecurity.mk
index aee3bcb..868c3f8 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\
xo \
i18nlangtag \
xsec_fw \
+   xsec_xmlsec \
$(gb_UWINAPI) \
 ))
 
@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\
xmlsecurity/source/pdfio/pdfdocument \
 ))
 
+$(eval $(call gb_Library_use_externals,xmlsecurity,\
+libxml2 \
+))
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_Library_add_defs,xmlsecurity,\
 -DXMLSEC_CRYPTO_MSCRYPTO \
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 978f7ad..af7bca2 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_NO_XSLT \
+   -DXSECXMLSEC_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call 
gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec))
diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx 
b/xmlsecurity/inc/xmlsec/saxhelper.hxx
similarity index 96%
rename from xmlsecurity/source/xmlsec/saxhelper.hxx
rename to xmlsecurity/inc/xmlsec/saxhelper.hxx
index 58b2cb3..8068d8b 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.hxx
+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SAXHELPER_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SAXHELPER_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_SAXHELPER_HXX
+#define INCLUDED_XMLSECURITY_INC_XMLSEC_SAXHELPER_HXX
 
 #include "libxml/tree.h"
 
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx 
b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
similarity index 97%
rename from xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
rename to xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index a48278b..bc8471e 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX
+#define INCLUDED_XMLSECURITY_INC_XMLSEC_XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX
 
 #include 
 #include 
@@ -26,7 +26,8 @@
 #include 
 #include 
 
-#include "saxhelper.hxx"
+#include "xmlsec/saxhelper.hxx"
+#include "xsecxmlsecdllapi.h"
 
 #define NODEPOSITION_NORMAL1
 #define NODEPOSITION_STARTELEMENT  2
@@ -38,15 +39,14 @@ namespace com { namespace sun { namespace star { namespace 
uno {
 class XComponentContext;
 } } } }
 
-class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper
+class XSECXMLSEC_DLLPUBLIC XMLDocumentWrapper_XmlSecImpl : public 
cppu::WeakImplHelper
 <
 css::xml::wrapper::XXMLDocumentWrapper,
 css::xml

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

2016-12-15 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/statistical/fods/hypgeom.dist.fods | 5064 +++
 1 file changed, 5064 insertions(+)

New commits:
commit 5c73299cdb5f3f2c87c0c87a826e27211e7338ee
Author: ZdenÄk Crhonek 
Date:   Tue Dec 13 16:46:15 2016 +0100

add HYPGEOM.DIST test case

Change-Id: I6236428f8cfd17e52b5eac8c3747dcba6f83a440
Reviewed-on: https://gerrit.libreoffice.org/31964
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/statistical/fods/hypgeom.dist.fods 
b/sc/qa/unit/data/functions/statistical/fods/hypgeom.dist.fods
new file mode 100644
index 000..392a93c
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/hypgeom.dist.fods
@@ -0,0 +1,5064 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-12-13T16:45:12.715871917P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/08fa2e9307c9e4a49e18ecb0b4e9461492122fe3
+ 
+  
+   0
+   0
+   96879
+   18919
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+  
+   4
+   3
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 75
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   -
+   
+
+   KÄ
+

[Libreoffice-commits] core.git: bin/gbuild-to-ide

2016-12-15 Thread Edmund Wong

 bin/gbuild-to-ide |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 15aa0fbb706067d936edac7fdf64f60d07f95e6d
Author: Edmund Wong 
Date:   Wed Dec 14 12:59:23 2016 +0800

Move get options to a separate function.

Change-Id: I014f49b8239b0165ab696398b5ef0a2af5e0ae8c
Reviewed-on: https://gerrit.libreoffice.org/31990
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 8ee2d13..e18f3bd 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1607,14 +1607,18 @@ SUBDIRS = %(subdirs)s
 """
 
 
-if __name__ == '__main__':
+def get_options():
 parser = argparse.ArgumentParser(
 description='LibreOffice gbuild IDE project generator')
 parser.add_argument('--ide', dest='ide', required=True,
 help='the IDE to generate project files for')
 parser.add_argument('--make', dest='makecmd', required=True,
 help='the command to execute make')
-args = parser.parse_args()
+return parser.parse_args()
+
+
+if __name__ == '__main__':
+args = get_options()
 # FIXME: Hack
 if args.makecmd == 'make':
 args.makecmd = '/usr/bin/make'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Vinodkumar license statement

2016-12-15 Thread Jan Iversen

WELCOME
Thanks for your license statement.

We suggest you add yourself to our wiki (remark this is not a demand)
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

[Libreoffice-commits] online.git: loleaflet/main.js loleaflet/node_shrinkwrap loleaflet/npm-shrinkwrap.json loleaflet/package.json

2016-12-15 Thread Pranav Kant

 dev/null  |binary
 loleaflet/main.js |1 
 loleaflet/npm-shrinkwrap.json |  883 --
 loleaflet/package.json|1 
 4 files changed, 439 insertions(+), 446 deletions(-)

New commits:
commit 774a9a6e16a64851e9ff35f2468945f55fb269fc
Author: Pranav Kant 
Date:   Thu Dec 15 14:12:45 2016 +0530

Remove devtools-detect as one of the dependencies

Usage of this module was removed in
2bbab9bf943723c77498229676b93e9aba0185c7

Change-Id: I7fdde32cdf52fa0d33859fc4cda58d4daed40254

diff --git a/loleaflet/main.js b/loleaflet/main.js
index bd9dd1d..d9f8da1 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -28,7 +28,6 @@ vex.dialog = require('vex-js/js/vex.dialog.js');
 vex.defaultOptions.className = 'vex-theme-plain';
 global.vex = vex;
 
-global.devtools = require('devtools-detect');
 var errorMessages = require('./dist/errormessages');
 
 function getParameterByName(name) {
diff --git a/loleaflet/node_shrinkwrap/devtools-detect-2.1.1.tgz 
b/loleaflet/node_shrinkwrap/devtools-detect-2.1.1.tgz
deleted file mode 100644
index 2e18f40..000
Binary files a/loleaflet/node_shrinkwrap/devtools-detect-2.1.1.tgz and 
/dev/null differ
diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json
index 2e889cf..4e7f71d 100644
--- a/loleaflet/npm-shrinkwrap.json
+++ b/loleaflet/npm-shrinkwrap.json
@@ -4,147 +4,147 @@
   "dependencies": {
 "bootstrap": {
   "version": "3.3.6",
-  "from": "bootstrap@3.3.6",
+  "from": "node_shrinkwrap/bootstrap-3.3.6.tgz",
   "resolved": "./node_shrinkwrap/bootstrap-3.3.6.tgz"
 },
 "browserify": {
   "version": "13.1.0",
-  "from": "browserify@>=13.1.0 <14.0.0",
+  "from": "node_shrinkwrap/browserify-13.1.0.tgz",
   "resolved": "./node_shrinkwrap/browserify-13.1.0.tgz",
   "dependencies": {
 "JSONStream": {
   "version": "1.1.4",
-  "from": "JSONStream@>=1.0.3 <2.0.0",
+  "from": "node_shrinkwrap/JSONStream-1.1.4.tgz",
   "resolved": "./node_shrinkwrap/JSONStream-1.1.4.tgz",
   "dependencies": {
 "jsonparse": {
   "version": "1.2.0",
-  "from": "jsonparse@>=1.2.0 <2.0.0",
+  "from": "node_shrinkwrap/jsonparse-1.2.0.tgz",
   "resolved": "./node_shrinkwrap/jsonparse-1.2.0.tgz"
 },
 "through": {
   "version": "2.3.8",
-  "from": "through@>=2.2.7 <3.0.0",
+  "from": "node_shrinkwrap/through-2.3.8.tgz",
   "resolved": "./node_shrinkwrap/through-2.3.8.tgz"
 }
   }
 },
 "assert": {
   "version": "1.3.0",
-  "from": "assert@>=1.3.0 <1.4.0",
+  "from": "node_shrinkwrap/assert-1.3.0.tgz",
   "resolved": "./node_shrinkwrap/assert-1.3.0.tgz"
 },
 "browser-pack": {
   "version": "6.0.1",
-  "from": "browser-pack@>=6.0.1 <7.0.0",
+  "from": "node_shrinkwrap/browser-pack-6.0.1.tgz",
   "resolved": "./node_shrinkwrap/browser-pack-6.0.1.tgz",
   "dependencies": {
 "combine-source-map": {
   "version": "0.7.2",
-  "from": "combine-source-map@>=0.7.1 <0.8.0",
+  "from": "node_shrinkwrap/combine-source-map-0.7.2.tgz",
   "resolved": "./node_shrinkwrap/combine-source-map-0.7.2.tgz",
   "dependencies": {
 "convert-source-map": {
   "version": "1.1.3",
-  "from": "convert-source-map@>=1.1.0 <1.2.0",
+  "from": "node_shrinkwrap/convert-source-map-1.1.3.tgz",
   "resolved": "./node_shrinkwrap/convert-source-map-1.1.3.tgz"
 },
 "inline-source-map": {
   "version": "0.6.2",
-  "from": "inline-source-map@>=0.6.0 <0.7.0",
+  "from": "node_shrinkwrap/inline-source-map-0.6.2.tgz",
   "resolved": "./node_shrinkwrap/inline-source-map-0.6.2.tgz"
 },
 "lodash.memoize": {
   "version": "3.0.4",
-  "from": "lodash.memoize@>=3.0.3 <3.1.0",
+  "from": "node_shrinkwrap/lodash.memoize-3.0.4.tgz",
   "resolved": "./node_shrinkwrap/lodash.memoize-3.0.4.tgz"
 },
 "source-map": {
   "version": "0.5.6",
-  "from": "source-map@>=0.5.3 <0.6.0",
+  "from": "node_shrinkwrap/source-map-0.5.6.tgz",
   "resolved": "./node_shrinkwrap/source-map-0.5.6.tgz"
 }
   }
 },
 "umd": {
   "version": "3.0.1",
-  "from": "umd@>=3.0.0 <4.0.0",
+  "from": "node_shrinkwrap/umd-3.0.1.tgz",
   "resolved": "./node_shrinkwrap/umd-3.0.1.tgz"
 }
   }

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

2016-12-15 Thread Pranav Kant

 loleaflet/src/map/Map.js |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 1fa03a7c981ce45ea1469925c62fda5813fe2388
Author: Pranav Kant 
Date:   Thu Dec 15 14:09:46 2016 +0530

Lets avoid using global variable, map for consistency

Change-Id: I81157ea54ace6ff04d0730244f4ff8fdb893a3c3

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 71d2ee3..aebefe0 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -767,12 +767,12 @@ L.Map = L.Evented.extend({
 
_dim: function() {
// console.log('_dim:');
-   if (!map._socket.connected()) {
+   if (!this._socket.connected()) {
return;
}
 
// console.log('  cont');
-   map._active = false;
+   this._active = false;
clearTimeout(vex.timer);
 
var options = $.extend({}, vex.defaultOptions, {
@@ -792,6 +792,7 @@ L.Map = L.Evented.extend({
vex: options
});
 
+   var map = this;
options.$vex.bind('click.vex', function(e) {
// console.log('click.vex function');
return map._activate();
@@ -806,17 +807,17 @@ L.Map = L.Evented.extend({
$(options.appendLocation).append(options.$vex);
vex.setupBodyClassName(options.$vex);
 
-   map._doclayer && map._docLayer._onMessage('textselection:', 
null);
+   this._doclayer && this._docLayer._onMessage('textselection:', 
null);
// console.log('  sending userinactive');
-   map._socket.sendMessage('userinactive');
+   this._socket.sendMessage('userinactive');
},
 
_dimIfInactive: function () {
// console.log('_dimIfInactive: diff=' + (Date.now() - 
map.lastActiveTime));
-   if ((Date.now() - map.lastActiveTime) >= 10 * 60 * 1000) { // 
Dim 10 minutes after last user activity
-   map._dim();
+   if ((Date.now() - this.lastActiveTime) >= 1 * 60 * 1000) { // 
Dim 10 minutes after last user activity
+   this._dim();
} else {
-   map._startInactiveTimer();
+   this._startInactiveTimer();
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Samuel Mehrbrodt

 vcl/win/gdi/salnativewidgets-luna.cxx |   25 -
 1 file changed, 25 deletions(-)

New commits:
commit cd5b872632311b6c9fa6c5e89f23b8c5aedd62ca
Author: Samuel Mehrbrodt 
Date:   Thu Dec 15 08:14:25 2016 +

Revert "tdf#54169 Don't show acclerators by default on Windows"

Reverted because of issues mentioned in the bug report.

This reverts commit 64889c9fb6c3e8e7b7a7349833f7a10236104168.

Change-Id: I10fa0d0e55fd4c7c3624d9eb8a97e8c068b9db17
Reviewed-on: https://gerrit.libreoffice.org/32032
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx 
b/vcl/win/gdi/salnativewidgets-luna.cxx
index bb053c6..23fa61a 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -188,31 +188,6 @@ BOOL VisualStylesAPI::IsThemeActive()
 void SalData::initNWF()
 {
 ImplSVData* pSVData = ImplGetSVData();
-pSVData->maNWFData.mbEnableAccel = false; // Don't show accelerators all 
the time
-pSVData->maNWFData.mbAutoAccel = true;// Show accelerators only when 
alt is pressed
-
-HKEY hkey;
-
-if (ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER, "Control 
Panel\\Accessibility\\Keyboard Preference", &hkey))
-{
-DWORD dwType = 0;
-sal_uInt8 Data[2]; // possible values: "1", "0"
-DWORD cbData = sizeof(Data);
-
-if (ERROR_SUCCESS == RegQueryValueEx(hkey, "On", nullptr, &dwType, 
Data, &cbData)) // Check whether "make keyboard easier to use" is turned on
-{
-if (dwType == REG_SZ)
-{
-bool bValue = ((0 == stricmp(reinterpret_cast(Data), "1")));
-if(bValue)
-{
-pSVData->maNWFData.mbEnableAccel = true; // Always show 
accelerators
-pSVData->maNWFData.mbAutoAccel = false;
-}
-}
-}
-RegCloseKey(hkey);
-}
 
 // the menu bar and the top docking area should have a common background 
(gradient)
 pSVData->maNWFData.mbMenuBarDockingAreaCommonBG = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-15 Thread Pranav Kant

 loleaflet/src/map/Map.js |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 1b690898f90643407d39d5e65f280764a0b0319d
Author: Pranav Kant 
Date:   Thu Dec 15 13:42:45 2016 +0530

Clicking on content layer now also activates the map

Change-Id: Idd9343ab58e83ee1a710e82c649f2876c8b225bd

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 784ded6..71d2ee3 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -792,13 +792,8 @@ L.Map = L.Evented.extend({
vex: options
});
 
-   options.$vexOverlay.bind('click.vex', function(e) {
+   options.$vex.bind('click.vex', function(e) {
// console.log('click.vex function');
-   if (e.target !== this) {
-   // console.log('  early return');
-   return 0;
-   }
-   // console.log('  calling _activate');
return map._activate();
});
options.$vex.append(options.$vexOverlay);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenCL enabled by default after OS reinstall causing Unit Test Failure

2016-12-15 Thread Niklas Johansson


Hi

On 2016-12-15 01:14, slacka wrote:

the build still failed on Test name: ScOpenCLTest::testFinancialXirrFormula


Is it the only OpenCL test that fails for you?

The specific test you refer to has been failing for me for a long time 
(months), though I'm sorry to say that I haven't  had the time to build 
LO for quite some time. It is the only OpenCL test that fails for me (at 
least it was the last time I built LibreOffice).


If you open the test file
core\sc\qa\unit\data\ods\opencl\financial\XIRR.ods
you'll notice that Excel and Calc sometimes return quite different 
results. This is one of the reasons I haven't put any more time into 
trying to figure out what to do about it. Another aspect is that when I 
open the file, in a build were I disabled the specific test, it returns 
the correct value. From what I remember I checked that OpenCL was being 
used and forced a recalculation. When I ran the test in the debugger the 
value that failed was somewhere in between the result that Excel returns 
and what Calc returns.


My setup was *not* done with LODE.

/Niklas

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

88 matches

Mail list logo