[Libreoffice-commits] core.git: 6 commits - chart2/source compilerplugins/clang configmgr/source connectivity/source include/formula sc/inc sc/source

[Noel Grandin]

 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx |6 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx   |   14 -
 chart2/source/inc/StackMode.hxx   |   11 -
 chart2/source/model/template/BubbleChartTypeTemplate.cxx  |2 
 chart2/source/model/template/ChartTypeManager.cxx |   94 +-
 chart2/source/model/template/ChartTypeTemplate.cxx|   14 -
 chart2/source/model/template/ChartTypeTemplate.hxx|2 
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx  |2 
 chart2/source/model/template/ScatterChartTypeTemplate.cxx |4 
 chart2/source/tools/ChartTypeHelper.cxx   |6 
 chart2/source/tools/DataSeriesHelper.cxx  |   11 -
 chart2/source/tools/DiagramHelper.cxx |   27 +-
 chart2/source/view/charttypes/PieChart.cxx|9 
 chart2/source/view/charttypes/VSeriesPlotter.cxx  |   14 -
 chart2/source/view/inc/PlottingPositionHelper.hxx |   11 -
 chart2/source/view/inc/VLegendSymbolFactory.hxx   |   12 -
 chart2/source/view/main/PlottingPositionHelper.cxx|   40 
 chart2/source/view/main/VLegendSymbolFactory.cxx  |   24 --
 compilerplugins/clang/unusedenumconstants.py  |   11 -
 configmgr/source/valueparser.cxx  |   30 +--
 configmgr/source/valueparser.hxx  |2 
 connectivity/source/drivers/dbase/DResultSet.cxx  |5 
 connectivity/source/inc/TSortIndex.hxx|1 
 include/formula/errorcodes.hxx|   10 -
 sc/inc/globstr.hrc|2 
 sc/source/core/data/formulacell.cxx   |4 
 sc/source/core/data/global.cxx|6 
 sc/source/core/data/simpleformulacalc.cxx |4 
 sc/source/ui/src/globstr.src  |4 
 29 files changed, 153 insertions(+), 229 deletions(-)

New commits:
commit 1400cec1642039c2ff2021e574954d4b4576f5ac
Author: Noel Grandin 
Date:   Fri Feb 17 09:06:53 2017 +0200

remove unused formula ErrorCode enumerators

Change-Id: I0d81b43ba4e0a8734074651228743acaeae7aa97

diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index 2af9b11..bb970a9 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -34,8 +34,6 @@ enum class FormulaError : sal_uInt16
 IllegalArgument  = 502,
 IllegalFPOperation   = 503, // #NUM!
 IllegalParameter = 504,
-IllegalJump  = 505,
-Separator= 506,
 Pair = 507,
 PairExpected = 508,
 OperatorExpected = 509,
@@ -55,10 +53,6 @@ enum class FormulaError : sal_uInt16
 NoConvergence= 523,
 NoRef= 524, // #REF!
 NoName   = 525, // #NAME?
-DoubleRef= 526,
-// Not displayed, temporary for TrackFormulas,
-// Cell depends on another cell that has FormulaError::CircularReference
-TrackFromCircRef = 528,
 // ScInterpreter internal:  no numeric value but numeric queried. If this is
 // set as mnStringNoValueError no error is generated but 0 returned.
 CellNoValue  = 529,
@@ -137,8 +131,6 @@ inline bool isPublishedFormulaError( FormulaError nErr )
 case FormulaError::IllegalArgument:
 case FormulaError::IllegalFPOperation:
 case FormulaError::IllegalParameter:
-case FormulaError::IllegalJump:
-case FormulaError::Separator:
 case FormulaError::Pair:
 case FormulaError::PairExpected:
 case FormulaError::OperatorExpected:
@@ -158,10 +150,8 @@ inline bool isPublishedFormulaError( FormulaError nErr )
 case FormulaError::NoConvergence:
 case FormulaError::NoRef:
 case FormulaError::NoName:
-case FormulaError::DoubleRef:
 return true;
 
-case FormulaError::TrackFromCircRef:
 case FormulaError::CellNoValue:
 return false;
 
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index a4e8b22..21b1436 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -195,7 +195,7 @@
 #define STR_LONG_ERR_ILL_PAR134
 #define STR_LONG_ERR_ILL_FPO135
 #define STR_LONG_ERR_ILL_CHAR   136
-#define STR_LONG_ERR_ILL_SEP137
+// empty
 #define STR_LONG_ERR_PAIR   138
 #define STR_LONG_ERR_OP_EXP 139
 #define STR_LONG_ERR_VAR_EXP140
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index d41a9cf..f988de9 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2608,7 +2608,7 @@ bool ScFormulaCell::IsValueNoError() const
 double ScFormulaCell::GetValue()
 {
 MaybeInterpret()

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

[Noel Grandin]

 compilerplugins/clang/unusedenumconstants.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 72356f947b096fc4cc89f1b07ce5ee55047813b0
Author: Noel Grandin 
Date:   Fri Feb 17 09:35:02 2017 +0200

teach loplugin unusedenumconstants about CXXOperatorCallExpr

fixes some false+ in the write-only analysis

Change-Id: Ie7905c05c8012820c640064d451b33badb04c5fc

diff --git a/compilerplugins/clang/unusedenumconstants.cxx 
b/compilerplugins/clang/unusedenumconstants.cxx
index 2500451..8ba5d23 100644
--- a/compilerplugins/clang/unusedenumconstants.cxx
+++ b/compilerplugins/clang/unusedenumconstants.cxx
@@ -164,6 +164,13 @@ try_again:
 } else {
 bRead = true;
 }
+} else if (const CXXOperatorCallExpr * operatorCall = 
dyn_cast(parent))
+{
+if (operatorCall->isAssignmentOp()) {
+bWrite = true;
+} else {
+bRead = true;
+}
 } else if (isa(parent) || isa(parent)
 || isa(parent) || isa(parent)
 || isa(parent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/ssl.cpp net/ssl.hpp

[Ashod Nakashian]

 net/ssl.cpp |  167 ++--
 net/ssl.hpp |5 +
 2 files changed, 167 insertions(+), 5 deletions(-)

New commits:
commit cd1c868b86ffc48f08449220ac7495294810da01
Author: Ashod Nakashian 
Date:   Fri Feb 17 01:40:55 2017 -0500

nb: initialize the SSL Context

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

diff --git a/net/ssl.cpp b/net/ssl.cpp
index 35599d1..1d56f6a 100644
--- a/net/ssl.cpp
+++ b/net/ssl.cpp
@@ -23,10 +23,6 @@ SslContext::SslContext(const std::string& certFilePath,
const std::string& caFilePath) :
 _ctx(nullptr)
 {
-(void)certFilePath;
-(void)keyFilePath;
-(void)caFilePath;
-
 #if OPENSSL_VERSION_NUMBER >= 0x0907000L
 OPENSSL_config(nullptr);
 #endif
@@ -49,6 +45,66 @@ SslContext::SslContext(const std::string& certFilePath,
 CRYPTO_set_dynlock_create_callback(&SslContext::dynlockCreate);
 CRYPTO_set_dynlock_lock_callback(&SslContext::dynlock);
 CRYPTO_set_dynlock_destroy_callback(&SslContext::dynlockDestroy);
+
+// Create the Context. We only have one,
+// as we don't expect/support different servers in same process.
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+_ctx = SSL_CTX_new(TLS_server_method());
+#else
+_ctx = SSL_CTX_new(SSLv23_server_method());
+#endif
+
+// SSL_CTX_set_default_passwd_cb(_ctx, &privateKeyPassphraseCallback);
+ERR_clear_error();
+SSL_CTX_set_options(_ctx, SSL_OP_ALL);
+
+try
+{
+int errCode = 0;
+if (!caFilePath.empty())
+{
+errCode = SSL_CTX_load_verify_locations(_ctx, caFilePath.c_str(), 
0);
+if (errCode != 1)
+{
+std::string msg = getLastErrorMsg();
+throw std::runtime_error(std::string("Cannot load CA 
file/directory at ") + caFilePath + ": " + msg);
+}
+}
+
+if (!keyFilePath.empty())
+{
+errCode = SSL_CTX_use_PrivateKey_file(_ctx, keyFilePath.c_str(), 
SSL_FILETYPE_PEM);
+if (errCode != 1)
+{
+std::string msg = getLastErrorMsg();
+throw std::runtime_error(std::string("Error loading private 
key from file ") + keyFilePath + ": " + msg);
+}
+}
+
+if (!certFilePath.empty())
+{
+errCode = SSL_CTX_use_certificate_chain_file(_ctx, 
certFilePath.c_str());
+if (errCode != 1)
+{
+std::string errMsg = getLastErrorMsg();
+throw std::runtime_error(std::string("Error loading 
certificate from file ") + certFilePath + ": " + errMsg);
+}
+}
+
+SSL_CTX_set_verify(_ctx, SSL_VERIFY_NONE, nullptr 
/*&verifyServerCallback*/);
+SSL_CTX_set_cipher_list(_ctx, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
+SSL_CTX_set_verify_depth(_ctx, 9);
+SSL_CTX_set_mode(_ctx, SSL_MODE_AUTO_RETRY);
+SSL_CTX_set_session_cache_mode(_ctx, SSL_SESS_CACHE_OFF);
+
+initDH();
+initECDH();
+}
+catch (...)
+{
+SSL_CTX_free(_ctx);
+throw;
+}
 }
 
 SslContext::~SslContext()
@@ -83,7 +139,6 @@ CRYPTO_dynlock_value* SslContext::dynlockCreate(const char* 
/*file*/, int /*line
 return new CRYPTO_dynlock_value;
 }
 
-
 void SslContext::dynlock(int mode, struct CRYPTO_dynlock_value* lock, const 
char* /*file*/, int /*line*/)
 {
 if (mode & CRYPTO_LOCK)
@@ -101,4 +156,106 @@ void SslContext::dynlockDestroy(struct 
CRYPTO_dynlock_value* lock, const char* /
 delete lock;
 }
 
+void SslContext::initDH()
+{
+#ifndef OPENSSL_NO_DH
+// 1024-bit MODP Group with 160-bit prime order subgroup (RFC5114)
+// -BEGIN DH PARAMETERS-
+// MIIBDAKBgQCxC4+WoIDgHd6S3l6uXVTsUsmfvPsGo8aaap3KUtI7YWBz4oZ1oj0Y
+// mDjvHi7mUsAT7LSuqQYRIySXXDzUm4O/rMvdfZDEvXCYSI6cIZpzck7/1vrlZEc4
+// +qMaT/VbzMChUa9fDci0vUW/N982XBpl5oz9p21NpwjfH7K8LkpDcQKBgQCk0cvV
+// w/00EmdlpELvuZkF+BBN0lisUH/WQGz/FCZtMSZv6h5cQVZLd35pD1UE8hMWAhe0
+// sBuIal6RVH+eJ0n01/vX07mpLuGQnQ0iY/gKdqaiTAh6CR9THb8KAWm2oorWYqTR
+// jnOvoy13nVkY0IvIhY9Nzvl8KiSFXm7rIrOy5QICAKA=
+// -END DH PARAMETERS-
+//
+
+static const unsigned char dh1024_p[] =
+{
+0xB1,0x0B,0x8F,0x96,0xA0,0x80,0xE0,0x1D,0xDE,0x92,0xDE,0x5E,
+0xAE,0x5D,0x54,0xEC,0x52,0xC9,0x9F,0xBC,0xFB,0x06,0xA3,0xC6,
+0x9A,0x6A,0x9D,0xCA,0x52,0xD2,0x3B,0x61,0x60,0x73,0xE2,0x86,
+0x75,0xA2,0x3D,0x18,0x98,0x38,0xEF,0x1E,0x2E,0xE6,0x52,0xC0,
+0x13,0xEC,0xB4,0xAE,0xA9,0x06,0x11,0x23,0x24,0x97,0x5C,0x3C,
+0xD4,0x9B,0x83,0xBF,0xAC,0xCB,0xDD,0x7D,0x90,0xC4,0xBD,0x70,
+0x98,0x48,0x8E,0x9C,0x21,0x9A,0x73,0x72,0x4E,0xFF,0xD6,0xFA,
+0xE5,0x64,0x47,0x38,0xFA,0xA3,0x1A,0x4F,0xF5,0x5B,0xCC,0xC0,
+0xA1,0x51,0xAF,0x5F,0x0D,0xC8,0xB4

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - common/Util.hpp Makefile.am net/ssl.cpp net/ssl.hpp

[Ashod Nakashian]

 Makefile.am |4 ++-
 common/Util.hpp |3 ++
 net/ssl.cpp |   60 
 net/ssl.hpp |   21 +++
 4 files changed, 87 insertions(+), 1 deletion(-)

New commits:
commit 1cf7ea54a877f10d19890923755e8e53d0425667
Author: Ashod Nakashian 
Date:   Fri Feb 17 01:15:42 2017 -0500

nb: more SSL initialization

Multi-threading support.

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

diff --git a/Makefile.am b/Makefile.am
index 24032e5..d538593 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,9 @@ loolwsd_fuzzer_SOURCES = $(loolwsd_sources) \
  kit/DummyLibreOfficeKit.cpp
 
 loolnb_SOURCES = net/loolnb.cpp \
- net/ssl.cpp
+ net/ssl.cpp \
+ common/Log.cpp \
+ common/Util.cpp
 
 clientnb_SOURCES = net/clientnb.cpp
 
diff --git a/common/Util.hpp b/common/Util.hpp
index 9fae42b..57dc623 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -34,6 +34,9 @@ namespace Util
 void reseed();
 unsigned getNext();
 
+/// Generate an array of random characters.
+std::vector getBytes(const size_t length);
+
 /// Generates a random string suitable for
 /// file/directory names.
 std::string getFilename(const size_t length);
diff --git a/net/ssl.cpp b/net/ssl.cpp
index 111fbe3..35599d1 100644
--- a/net/ssl.cpp
+++ b/net/ssl.cpp
@@ -10,8 +10,13 @@
 #include "ssl.hpp"
 #include "config.h"
 
+#include 
+
+#include "Util.hpp"
+
 std::atomic SslContext::RefCount(0);
 std::unique_ptr SslContext::Instance;
+std::vector> SslContext::Mutexes;
 
 SslContext::SslContext(const std::string& certFilePath,
const std::string& keyFilePath,
@@ -29,6 +34,21 @@ SslContext::SslContext(const std::string& certFilePath,
 SSL_library_init();
 SSL_load_error_strings();
 OpenSSL_add_all_algorithms();
+
+const std::vector rand = Util::rng::getBytes(512);
+RAND_seed(&rand[0], rand.size());
+
+// Initialize multi-threading support.
+for (int x = 0; x < CRYPTO_num_locks(); ++x)
+{
+Mutexes.emplace_back(new std::mutex);
+}
+
+CRYPTO_set_locking_callback(&SslContext::lock);
+CRYPTO_set_id_callback(&SslContext::id);
+CRYPTO_set_dynlock_create_callback(&SslContext::dynlockCreate);
+CRYPTO_set_dynlock_lock_callback(&SslContext::dynlock);
+CRYPTO_set_dynlock_destroy_callback(&SslContext::dynlockDestroy);
 }
 
 SslContext::~SslContext()
@@ -41,4 +61,44 @@ SslContext::~SslContext()
 CONF_modules_free();
 }
 
+void SslContext::lock(int mode, int n, const char* /*file*/, int /*line*/)
+{
+if (mode & CRYPTO_LOCK)
+{
+Mutexes[n]->lock();
+}
+else
+{
+Mutexes[n]->unlock();
+}
+}
+
+unsigned long SslContext::id()
+{
+return syscall(SYS_gettid);
+}
+
+CRYPTO_dynlock_value* SslContext::dynlockCreate(const char* /*file*/, int 
/*line*/)
+{
+return new CRYPTO_dynlock_value;
+}
+
+
+void SslContext::dynlock(int mode, struct CRYPTO_dynlock_value* lock, const 
char* /*file*/, int /*line*/)
+{
+if (mode & CRYPTO_LOCK)
+{
+lock->Mutex.lock();
+}
+else
+{
+lock->Mutex.unlock();
+}
+}
+
+void SslContext::dynlockDestroy(struct CRYPTO_dynlock_value* lock, const char* 
/*file*/, int /*line*/)
+{
+delete lock;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/net/ssl.hpp b/net/ssl.hpp
index 458d2cf..90098a4 100644
--- a/net/ssl.hpp
+++ b/net/ssl.hpp
@@ -12,7 +12,9 @@
 
 #include 
 #include 
+#include 
 #include 
+#include 
 
 #include 
 #include 
@@ -22,6 +24,16 @@
 #include 
 #endif
 
+extern "C"
+{
+// Multithreading support for OpenSSL.
+// Not needed in recent (1.x?) versions.
+struct CRYPTO_dynlock_value
+{
+std::mutex Mutex;
+};
+}
+
 class SslContext
 {
 public:
@@ -55,9 +67,18 @@ private:
const std::string& keyFilePath,
const std::string& caFilePath);
 
+// Multithreading support for OpenSSL.
+// Not needed in recent (1.x?) versions.
+static void lock(int mode, int n, const char* file, int line);
+static unsigned long id();
+static struct CRYPTO_dynlock_value* dynlockCreate(const char* file, int 
line);
+static void dynlock(int mode, struct CRYPTO_dynlock_value* lock, const 
char* file, int line);
+static void dynlockDestroy(struct CRYPTO_dynlock_value* lock, const char* 
file, int line);
+
 private:
 static std::atomic RefCount;
 static std::unique_ptr Instance;
+static std::vector> Mutexes;
 
 SSL_CTX* _ctx;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - Makefile.am net/loolnb.cpp net/ssl.cpp net/ssl.hpp

[Ashod Nakashian]

 Makefile.am|4 ++-
 net/loolnb.cpp |7 +
 net/ssl.cpp|   44 +
 net/ssl.hpp|   67 +
 4 files changed, 121 insertions(+), 1 deletion(-)

New commits:
commit d75d0abd02373ced07bcb6ea6a03e17ec70a6729
Author: Ashod Nakashian 
Date:   Fri Feb 17 00:30:29 2017 -0500

nb: add OpenSSL dependency and initialization

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

diff --git a/Makefile.am b/Makefile.am
index 064d54e..24032e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = -pthread 
-DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' -DLOOLWSD_CONFIGD
 AM_LDFLAGS = -pthread -Wl,-E
 loolforkit_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib
 loolmount_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib
+loolnb_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib -lssl 
-lcrypto
 
 loolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 
-DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)
 
@@ -89,7 +90,8 @@ loolwsd_fuzzer_SOURCES = $(loolwsd_sources) \
  $(shared_sources) \
  kit/DummyLibreOfficeKit.cpp
 
-loolnb_SOURCES = net/loolnb.cpp
+loolnb_SOURCES = net/loolnb.cpp \
+ net/ssl.cpp
 
 clientnb_SOURCES = net/clientnb.cpp
 
diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index 742c883..17909cb 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -28,6 +28,7 @@
 using Poco::MemoryInputStream;
 using Poco::StringTokenizer;
 
+#include "ssl.hpp"
 #include "socket.hpp"
 
 constexpr int PortNumber = 9191;
@@ -373,6 +374,11 @@ void server(SocketPoll& clientPoller)
 
 int main(int, const char**)
 {
+// TODO: These would normally come from config.
+SslContext::initialize("/etc/loolwsd/cert.pem",
+   "/etc/loolwsd/key.pem",
+   "/etc/loolwsd/ca-chain.cert.pem");
+
 // Used to poll client sockets.
 SocketPoll poller;
 
@@ -392,6 +398,7 @@ int main(int, const char**)
 
 threadPoll.stop();
 
+SslContext::uninitialize();
 return 0;
 }
 
diff --git a/net/ssl.cpp b/net/ssl.cpp
new file mode 100644
index 000..111fbe3
--- /dev/null
+++ b/net/ssl.cpp
@@ -0,0 +1,44 @@
+/* -*- 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 "ssl.hpp"
+#include "config.h"
+
+std::atomic SslContext::RefCount(0);
+std::unique_ptr SslContext::Instance;
+
+SslContext::SslContext(const std::string& certFilePath,
+   const std::string& keyFilePath,
+   const std::string& caFilePath) :
+_ctx(nullptr)
+{
+(void)certFilePath;
+(void)keyFilePath;
+(void)caFilePath;
+
+#if OPENSSL_VERSION_NUMBER >= 0x0907000L
+OPENSSL_config(nullptr);
+#endif
+
+SSL_library_init();
+SSL_load_error_strings();
+OpenSSL_add_all_algorithms();
+}
+
+SslContext::~SslContext()
+{
+EVP_cleanup();
+ERR_free_strings();
+CRYPTO_set_locking_callback(0);
+CRYPTO_set_id_callback(0);
+
+CONF_modules_free();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/net/ssl.hpp b/net/ssl.hpp
new file mode 100644
index 000..458d2cf
--- /dev/null
+++ b/net/ssl.hpp
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SSL_HPP
+#define INCLUDED_SSL_HPP
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#if OPENSSL_VERSION_NUMBER >= 0x0907000L
+#include 
+#endif
+
+class SslContext
+{
+public:
+static void initialize(const std::string& certFilePath,
+   const std::string& keyFilePath,
+   const std::string& caFilePath)
+{
+if (++RefCount == 1)
+{
+Instance.reset(new SslContext(certFilePath, keyFilePath, 
caFilePath));
+}
+}
+
+static void uninitialize()
+{
+if (--RefCount == 0)
+{
+Instance.reset();
+}
+}
+
+static SSL* newSsl()
+{
+return SSL_new(Instance->_ctx);
+}
+
+~SslContext();
+
+private:
+SslContext(const std::string& certFilePath,
+   const std::string& keyFilePath,
+ 

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - common/UnitHTTP.cpp net/clientnb.cpp test/UnitTimeout.cpp

[Ashod Nakashian]

 common/UnitHTTP.cpp  |2 +-
 net/clientnb.cpp |   24 
 test/UnitTimeout.cpp |2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit e416c929c5a25e0c88842f8331f26d173be2c355
Author: Ashod Nakashian 
Date:   Thu Feb 16 22:04:45 2017 -0500

wsd: no tabs

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

diff --git a/common/UnitHTTP.cpp b/common/UnitHTTP.cpp
index 29f5e40..8e0c53e 100644
--- a/common/UnitHTTP.cpp
+++ b/common/UnitHTTP.cpp
@@ -20,7 +20,7 @@ Poco::Net::HTTPClientSession *UnitHTTP::createSession()
 UnitWebSocket::UnitWebSocket(const std::string &docURL)
 {
 try {
-   UnitHTTPServerResponse response;
+UnitHTTPServerResponse response;
 UnitHTTPServerRequest request(response, docURL);
 
 _session = UnitHTTP::createSession();
diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index de6576c..2ab1980 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -123,20 +123,20 @@ struct Session
 struct ThreadWorker : public Runnable
 {
 const char *_domain;
-   ThreadWorker (const char *domain = NULL)
-: _domain(domain)
+ThreadWorker(const char *domain = nullptr)
+: _domain(domain)
+{
+}
+virtual void run()
+{
+for (int i = 0; i < 100; ++i)
 {
+Session ping(_domain ? _domain : "init");
+ping.sendPing(i);
+int back = ping.getResponse();
+assert(back == i + 1);
 }
-   virtual void run()
-{
-for (int i = 0; i < 100; ++i)
-{
-Session ping(_domain ? _domain : "init");
-ping.sendPing(i);
-int back = ping.getResponse();
-assert(back == i + 1);
-}
-   }
+}
 };
 
 struct Client : public Poco::Util::Application
diff --git a/test/UnitTimeout.cpp b/test/UnitTimeout.cpp
index a5478b5..4b65d43 100644
--- a/test/UnitTimeout.cpp
+++ b/test/UnitTimeout.cpp
@@ -31,7 +31,7 @@ public:
 _timedOut = true;
 UnitBase::timeout();
 }
-   virtual void returnValue(int & retValue) override
+virtual void returnValue(int & retValue) override
 {
 if (!_timedOut)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/socket.hpp

[Ashod Nakashian]

 net/socket.hpp |   85 ++---
 1 file changed, 70 insertions(+), 15 deletions(-)

New commits:
commit 1dad5291aa5bd69dfcc17d9735e8106cd5418d34
Author: Ashod Nakashian 
Date:   Thu Feb 16 21:57:25 2017 -0500

nb: refactor buffer management into BufferingSocket

Now we have plain and ssl sockets based on
the BufferingSocket, each is responsible for
the socket IO only.

The SSL socket is only shell missing implementation.

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

diff --git a/net/socket.hpp b/net/socket.hpp
index 0ca0eb6..0f8345a 100644
--- a/net/socket.hpp
+++ b/net/socket.hpp
@@ -278,13 +278,11 @@ private:
 std::vector _pollFds;
 };
 
-
-/// A non-blocking, data streaming socket.
-/// Buffers and pumps data based on poll events.
-class StreamSocket : public Socket
+/// Abstract buffering socket.
+class BufferingSocket : public Socket
 {
 public:
-StreamSocket() :
+BufferingSocket() :
 Socket()
 {
 }
@@ -312,7 +310,43 @@ public:
  HandleResult::CONTINUE;
 }
 
-bool readIncomingData()
+/// Override to reading data from socket.
+virtual bool readIncomingData() = 0;
+
+/// Override to write data out to socket.
+virtual void writeOutgoingData() = 0;
+
+int getPollEvents() override
+{
+int pollFor = POLLIN;
+if (_outBuffer.size() > 0)
+pollFor |= POLLOUT;
+return pollFor;
+}
+
+/// Override to handle read data.
+/// Called after successful socket reads.
+virtual void handleIncomingMessage() = 0;
+
+protected:
+BufferingSocket(const int fd) :
+Socket(fd)
+{
+}
+};
+
+/// A plain, non-blocking, data streaming socket.
+class StreamSocket : public BufferingSocket
+{
+public:
+StreamSocket() :
+BufferingSocket()
+{
+}
+
+  public:
+
+bool readIncomingData() override
 {
 ssize_t len;
 char buf[4096];
@@ -330,7 +364,7 @@ public:
 return len != 0; // zero is eof / clean socket close.
 }
 
-void writeOutgoingData()
+void writeOutgoingData() override
 {
 assert (_outBuffer.size() > 0);
 ssize_t len;
@@ -345,19 +379,40 @@ public:
 // else poll will handle errors
 }
 
-int getPollEvents() override
+protected:
+StreamSocket(const int fd) :
+BufferingSocket(fd)
 {
-int pollFor = POLLIN;
-if (_outBuffer.size() > 0)
-pollFor |= POLLOUT;
-return pollFor;
 }
 
-virtual void handleIncomingMessage() = 0;
+friend class ServerSocket;
+};
+
+/// A SSL/TSL, non-blocking, data streaming socket.
+class SslStreamSocket : public BufferingSocket
+{
+public:
+SslStreamSocket() :
+BufferingSocket()
+{
+}
+
+  public:
+
+bool readIncomingData() override
+{
+//TODO:
+return true;
+}
+
+void writeOutgoingData() override
+{
+//TODO;
+}
 
 protected:
-StreamSocket(const int fd) :
-Socket(fd)
+SslStreamSocket(const int fd) :
+BufferingSocket(fd)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/loolnb.cpp net/socket.hpp

[Ashod Nakashian]

 net/loolnb.cpp |4 ++--
 net/socket.hpp |9 +
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 1ed042f9ca44f8dece80869b0c48156f4e84f71f
Author: Ashod Nakashian 
Date:   Thu Feb 16 21:34:54 2017 -0500

nb: ClientSocket -> StreamSocket

StreamSocket has nothing Client-side specific.

Indeed it could be used on the Server-side.

As such, it's data-streaming, rather than client,
hence the new name.

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

diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index dbbda3f..742c883 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -34,7 +34,7 @@ constexpr int PortNumber = 9191;
 
 static std::string computeAccept(const std::string &key);
 
-class SimpleResponseClient : public ClientSocket
+class SimpleResponseClient : public StreamSocket
 {
 int _wsVersion;
 std::string _wsKey;
@@ -44,7 +44,7 @@ class SimpleResponseClient : public ClientSocket
 
 public:
 SimpleResponseClient(const int fd) :
-ClientSocket(fd),
+StreamSocket(fd),
 _wsVersion(0),
 _wsState(HTTP)
 {
diff --git a/net/socket.hpp b/net/socket.hpp
index 2e23c7c..0ca0eb6 100644
--- a/net/socket.hpp
+++ b/net/socket.hpp
@@ -279,11 +279,12 @@ private:
 };
 
 
-/// A non-blocking, client socket.
-class ClientSocket : public Socket
+/// A non-blocking, data streaming socket.
+/// Buffers and pumps data based on poll events.
+class StreamSocket : public Socket
 {
 public:
-ClientSocket() :
+StreamSocket() :
 Socket()
 {
 }
@@ -355,7 +356,7 @@ public:
 virtual void handleIncomingMessage() = 0;
 
 protected:
-ClientSocket(const int fd) :
+StreamSocket(const int fd) :
 Socket(fd)
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/socket.hpp

[Ashod Nakashian]

 net/socket.hpp |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit d835d625187554e96436e3de83245bd673db86b9
Author: Ashod Nakashian 
Date:   Thu Feb 16 21:29:18 2017 -0500

nb: retry on EINTR

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

diff --git a/net/socket.hpp b/net/socket.hpp
index f41befc..2e23c7c 100644
--- a/net/socket.hpp
+++ b/net/socket.hpp
@@ -197,7 +197,7 @@ public:
 
 // Clear the data.
 int dump;
-if (::read(_wakeup[0], &dump, sizeof(dump)) == -1)
+while (::read(_wakeup[0], &dump, sizeof(dump)) == -1 && errno == 
EINTR)
 {
 // Nothing to do.
 }
@@ -213,9 +213,16 @@ public:
 _newSockets.emplace_back(newSocket);
 
 // wakeup the main-loop.
-if (::write(_wakeup[1], "w", 1) == -1)
+int rc;
+do
 {
 // wakeup pipe is already full.
+rc = ::write(_wakeup[1], "w", 1);
+}
+while (rc == -1 && errno == EINTR);
+
+if (rc == -1)
+{
 assert(errno == EAGAIN || errno == EWOULDBLOCK);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 10 commits - basctl/inc basctl/source basic/source canvas/source chart2/inc chart2/source

[Noel Grandin]

 basctl/inc/basidesh.hrc |  
  2 
 basctl/source/basicide/bastype2.cxx |  
 16 
 basctl/source/basicide/bastype3.cxx |  
  2 
 basctl/source/basicide/layout.cxx   |  
  8 
 basctl/source/basicide/macrodlg.cxx |  
  2 
 basctl/source/basicide/moduldl2.cxx |  
 11 
 basctl/source/basicide/moduldlg.cxx |  
 16 
 basctl/source/basicide/moduldlg.hxx |  
 22 
 basctl/source/inc/bastype2.hxx  |  
 25 
 basctl/source/inc/layout.hxx|  
  2 
 basic/source/classes/sbunoobj.cxx   |  
 18 
 basic/source/sbx/sbxdec.cxx |  
  2 
 basic/source/sbx/sbxdec.hxx |  
  3 
 basic/source/sbx/sbxvalue.cxx   |  
 12 
 canvas/source/cairo/cairo_canvashelper_text.cxx |  
 58 --
 canvas/source/vcl/canvashelper.cxx  |  
  4 
 canvas/source/vcl/canvashelper_texturefill.cxx  |  
  4 
 canvas/source/vcl/impltools.cxx |  
185 +--
 canvas/source/vcl/impltools.hxx |  
 10 
 canvas/source/vcl/spritehelper.cxx  |  
  4 
 chart2/inc/ChartView.hxx|  
 10 
 chart2/source/controller/accessibility/AccessibleBase.cxx   |  
 17 
 chart2/source/controller/accessibility/AccessibleChartView.cxx  |  
  4 
 chart2/source/controller/inc/AccessibleBase.hxx |  
  6 
 chart2/source/controller/inc/DataPointItemConverter.hxx |  
  3 
 chart2/source/controller/inc/GraphicPropertyItemConverter.hxx   |  
 21 
 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx   |  
  2 
 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx  |  
  2 
 chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx   |  
  2 
 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx|  
264 --
 chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx |  
  2 
 chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx |  
  4 
 chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx|  
  2 
 chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx |  
  2 
 chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx  |  
  2 
 chart2/source/controller/main/ChartController_Properties.cxx|  
 16 
 chart2/source/view/main/ChartView.cxx   |  
 10 
 37 files changed, 274 insertions(+), 501 deletions(-)

New commits:
commit 80dd757500eeca2ee899bcf8e6d972d867690de0
Author: Noel Grandin 
Date:   Fri Feb 17 07:57:15 2017 +0200

convert GraphicObjectType to scoped enum

and drop unused FILL_PROPERTIES enumerator

Change-Id: I302d9d1d997c4fc491f7950b220060740f831539

diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx 
b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 0a96b3e..1cf452b 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -44,8 +44,7 @@ public:
 SfxItemPool& rItemPool,
 SdrModel& rDrawModel,
 const css::uno::Reference& 
xNamedPropertyContainerFactory,
-GraphicPropertyItemConverter::eGraphicObjectType eMapTo =
-GraphicPropertyItemConverter::FILLED_DATA_POINT,
+GraphicObjectType eMapTo = GraphicObjectType::FilledDataPoint,
 const css::awt::Size* pRefSize = nullptr,
 bool bDataSeries = false,
 bool bUseSpecialFillColor = false,
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx 
b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 0fafd00..ceeb581 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -30,24 +30,23 @@ namespace chart
 namespace wrapper
 {
 
+enum class GraphicObjectType
+{
+FilledDataPoint,
+LineDataPoint,
+LineProperties,
+LineAndFillProperties
+};
+
 class GraphicPropertyItemConverter : public ItemConverter
 {
 public:
-enum eGraphicObjectType
-{
-FILLED_DATA_POINT,
-LINE_DATA_POINT,
-LINE_PROPERTIES,
-

[Libreoffice-commits] core.git: 5 commits - basic/source codemaker/source compilerplugins/clang connectivity/source dbaccess/source include/basic include/codemaker include/connectivity svx/source

[Noel Grandin]

 basic/source/sbx/sbxobj.cxx|4 +-
 basic/source/sbx/sbxvar.cxx|   38 ++---
 codemaker/source/commoncpp/commoncpp.cxx   |5 +-
 compilerplugins/clang/unusedenumconstants.py   |5 ++
 connectivity/source/commontools/dbexception.cxx|   13 ---
 connectivity/source/parse/sqlnode.cxx  |   18 -
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |3 -
 dbaccess/source/ui/querydesign/querycontroller.cxx |   11 --
 include/basic/sbxdef.hxx   |8 +---
 include/basic/sbxvar.hxx   |2 -
 include/codemaker/commoncpp.hxx|3 -
 include/connectivity/IParseContext.hxx |1 
 include/connectivity/sqlnode.hxx   |4 +-
 include/connectivity/standardsqlstate.hxx  |   11 --
 svx/source/form/ParseContext.cxx   |2 -
 15 files changed, 29 insertions(+), 99 deletions(-)

New commits:
commit f1421a3e12167fafc966d069b3a4f7eb84ffda05
Author: Noel Grandin 
Date:   Thu Feb 16 13:45:37 2017 +0200

convert SbxNameType to scoped enum

and drop unused enumerators

Change-Id: I2b47828b2146fcda335f1dc1c1f61a1139abbe19

diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 69533d9..7763e96 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -764,7 +764,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill )
 SbxVariable* pVar = r.get();
 if( pVar )
 {
-OUString aLine = aIndent + "  - " + pVar->GetName( 
SbxNAME_SHORT_TYPES );
+OUString aLine = aIndent + "  - " + pVar->GetName( 
SbxNameType::ShortTypes );
 OUString aAttrs2;
 if( CollectAttrs( pVar, aAttrs2 ) )
 {
@@ -801,7 +801,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill )
 SbxVariable* pVar = r.get();
 if( pVar )
 {
-OUString aLine = aIndent + "  - " + pVar->GetName( 
SbxNAME_SHORT_TYPES );
+OUString aLine = aIndent + "  - " + pVar->GetName( 
SbxNameType::ShortTypes );
 OUString aAttrs3;
 if( CollectAttrs( pVar, aAttrs3 ) )
 {
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 097b04c..dcd9694 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -232,7 +232,7 @@ void SbxVariable::SetName( const OUString& rName )
 const OUString& SbxVariable::GetName( SbxNameType t ) const
 {
 static const char cSuffixes[] = "  %&!#@ $";
-if( t == SbxNAME_NONE )
+if( t == SbxNameType::NONE )
 {
 return maName;
 }
@@ -247,7 +247,7 @@ const OUString& SbxVariable::GetName( SbxNameType t ) const
 OUString aTmp( maName );
 // short type? Then fetch it, possible this is 0.
 SbxDataType et = GetType();
-if( t == SbxNAME_SHORT_TYPES )
+if( t == SbxNameType::ShortTypes )
 {
 if( et <= SbxSTRING )
 {
@@ -279,7 +279,7 @@ const OUString& SbxVariable::GetName( SbxNameType t ) const
 aTmp += i->aName;
 cType = ' ';
 // short type? Then fetch it, possible this is 0.
-if( t == SbxNAME_SHORT_TYPES )
+if( t == SbxNameType::ShortTypes )
 {
 if( nt <= SbxSTRING )
 {
@@ -301,34 +301,18 @@ const OUString& SbxVariable::GetName( SbxNameType t ) 
const
 aTmp += "()";
 }
 // long type?
-if( t != SbxNAME_SHORT )
+aTmp += GetSbxRes( StringId::As );
+if( nt < 32 )
 {
-aTmp += GetSbxRes( StringId::As );
-if( nt < 32 )
-{
-aTmp += GetSbxRes( static_cast( 
static_cast( StringId::Types ) + nt ) );
-}
-else
-{
-aTmp += GetSbxRes( StringId::Any );
-}
+aTmp += GetSbxRes( static_cast( static_cast( 
StringId::Types ) + nt ) );
+}
+else
+{
+aTmp += GetSbxRes( StringId::Any );
 }
 }
 }
 aTmp += ")";
-// Long type? Then fetch it
-if( t == SbxNAME_LONG_TYPES && et != SbxEMPTY )
-{
-aTmp += GetSbxRes( StringId::As );
-if( et < 32 )
-{
-aTmp += GetSbxRes(  static_cast( static_cast( 
StringId::Types ) + et ) );
-}
-else
-{
-aTmp += GetSbxRes( StringId::Any );
-}
-}
 const_cast(this)->aToolString = aTmp;
 return aToolString;
 }
@@ -699,7 +683,7 @@ void SbxAlias::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 
 void SbxVariable::Dump( SvStream& rStrm, bool bFill )
 {
-OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), 
RTL_TEXTENCODING_ASCII_US));
+OString aBNameStr(OUStringToO

Re: minutes of ESC call ...

[slacka]

VS 2015 has much better support for Support For C++11/14 Features

https://msdn.microsoft.com/en-us/library/hh567368.aspx

When VS 2013 is depreciated, we can probably remove some ugly  IFDEFs. 

I really hope that hour search was a bad joke. Google "Download VS 2013" and
the first link is the download link for the installer. When I was bisecting
some old regressions, I had no issues finding or downloading VS 2012 either. 



--
View this message in context: 
http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4208111p4208180.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

How to Use rsc Compiler?

[jaeseok]

I want to convert the '.hrc/.src file' to the '.res file.' I know that using
rsc compiler.

I'd like to use compiler rsc separately. To use it, what kind of Make file
should be made?





--
View this message in context: 
http://nabble.documentfoundation.org/How-to-Use-rsc-Compiler-tp4208178.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 ...

[Thorsten Behrens]

Michael Meeks wrote:
> + online (Michael)
>   + online branch maintenance (Thorsten)
>  + wondering for 5.3 – what’s the policy ?
>  + not using gerrit much.
>  + customer wants to do stabilization & bug-fixing
>  - plan for one review in gerrit (Thorsten)
>
To expand a bit on that, very happy to say that Kopano
(https://kopano.com/) is sponsoring us to improve the stable TDF
branch of LibreOffice Online, which so far has not seen many
bugfixes.

We'll monitor bugzilla of course, but wouldn't mind a direct poke, if
you think some area needs particular attention.

All the best,

-- Thorsten


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

Re: Does anyone use windows

[Jan Iversen]

> On 16 Feb 2017, at 19:26, Abulfaz Ahmadov  wrote:
> 
> Hi guys!
> Does anyone of you use windows for libreoffice development?Do you have some 
> experience with Visual studio 2015?It's written on set up page that it 
> probabbly won't work,and it's recommended to use Visual studio 2013 with 
> updates

We had a discussion about exact this theme at todays ESC meeting.

Some of us test VS 2015, but do not use it for production. If you look in the 
ESC minutes you will see:
——
* Bump master baseline from MSVC 2013 to 2015? (Stephan)
   + see mail 
> 
“Support new and discontinue old compilers” from David O.
   + tried to contact all the buildbot / tinderbox owners
+ not contacted (Norbert)
 + installed 2015 on the box a year ago.
 + 64bit release worked, but all else failed.
+ Concerned that:
 + does release & dbgutil profiles build ?
 + VS 2013 parallel builds should work too – need to use 2013
+ bots using 2013 (Cloph, Thorsten)
+ failed try to build 2015 last week (Thorsten)
 + works for Stephan.
+ time to try it again.
   + Is 32bit tested ? - the concern here it seems.
+ otherwise eager to try again.
   + MSDN issue ? → solution to use Community Edition Visual Studio.
+ buy windows server licenses, scrape Office versions from here & there.
AI: + test build configuations (Norbert)
   + Is there any gain of functionality with 2015 ?
+ not that much (Stephan)
+ some unicode bits, some improved const_expr bits.
+ just avoiding technical debt.
+ de-duplicate python versions (Miklos)
   + Not aware of any loss of functionality (Stephan)
—

So right now VS 2013 is the recommend version, as I see it we are still a bit 
away from moving up to VS 2015. That being said you can work with VS2015, 
depending on your configuration.

rgds
jan I.

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

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

[Tamás Zolnai]

 chart2/qa/extras/chart2dump/chart2dump.cxx 
  |   69 +++---
 chart2/qa/extras/chart2dump/data/formated_chartwall.odp
  |binary
 
chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt
|   20 --
 
chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt
 |   20 --
 
chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt
 |   20 --
 chart2/qa/extras/chart2dump/reference/chartwalltest/formated_chartwall.txt 
  |   10 +
 dev/null   
  |binary
 7 files changed, 37 insertions(+), 102 deletions(-)

New commits:
commit 0866178f503152f468175865ebe7d971f083baa7
Author: Tamás Zolnai 
Date:   Fri Feb 17 00:10:11 2017 +0100

ChartDumpTest: Avoid random failures on windows machines

ChartWallTest used to be the most instable so don't
check position and size in this case.
AxisLabelTest also failing some times, so use a bigger
delta for it.

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

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index d51e972..52057b1 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -77,13 +77,13 @@
 CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + 
sTestFileName).getStr(), readExpected(#aActual), aActual.trim()); \
 }
 
-#define CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aActual) \
+#define CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aActual, EPS_) \
 if(isInDumpMode()) \
 writeActualTransformation(aActual, #aActual); \
 else \
 { \
 OUString expectedTransform; \
-if (!readAndCheckTransformation (aActual, #aActual, 
expectedTransform)) \
+if (!readAndCheckTransformation (aActual, #aActual, EPS_, 
expectedTransform)) \
 { \
 OString sTestFileName = OUStringToOString(getTestFileName(), 
RTL_TEXTENCODING_UTF8); \
 CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + 
sTestFileName).getStr(), expectedTransform, 
transformationToOneLineString(aActual)); \
@@ -201,7 +201,7 @@ protected:
 writeActual(transformationToOneLineString(rTransform), sCheck);
 }
 
-bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, 
const OUString& sCheck, OUString& rExpectedTranform)
+bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, 
const OUString& sCheck, const double fEPS, OUString& rExpectedTranform)
 {
 rExpectedTranform = readExpected(sCheck); // Reference transfromation 
string
 
@@ -218,15 +218,15 @@ protected:
 aExpectedTransform.Line3.Column3 = rExpectedTranform.getToken(8, 
';').toDouble();
 
 // Check the equality of the two transformation
-return (std::abs(aExpectedTransform.Line1.Column1 - 
rTransform.Line1.Column1) < INT_EPS &&
-std::abs(aExpectedTransform.Line1.Column2 - 
rTransform.Line1.Column2) < INT_EPS &&
-std::abs(aExpectedTransform.Line1.Column3 - 
rTransform.Line1.Column3) < INT_EPS &&
-std::abs(aExpectedTransform.Line2.Column1 - 
rTransform.Line2.Column1) < INT_EPS &&
-std::abs(aExpectedTransform.Line2.Column2 - 
rTransform.Line2.Column2) < INT_EPS &&
-std::abs(aExpectedTransform.Line2.Column3 - 
rTransform.Line2.Column3) < INT_EPS &&
-std::abs(aExpectedTransform.Line3.Column1 - 
rTransform.Line3.Column1) < INT_EPS &&
-std::abs(aExpectedTransform.Line3.Column2 - 
rTransform.Line3.Column2) < INT_EPS &&
-std::abs(aExpectedTransform.Line3.Column3 - 
rTransform.Line3.Column3) < INT_EPS);
+return (std::abs(aExpectedTransform.Line1.Column1 - 
rTransform.Line1.Column1) < fEPS &&
+std::abs(aExpectedTransform.Line1.Column2 - 
rTransform.Line1.Column2) < fEPS &&
+std::abs(aExpectedTransform.Line1.Column3 - 
rTransform.Line1.Column3) < fEPS &&
+std::abs(aExpectedTransform.Line2.Column1 - 
rTransform.Line2.Column1) < fEPS &&
+std::abs(aExpectedTransform.Line2.Column2 - 
rTransform.Line2.Column2) < fEPS &&
+std::abs(aExpectedTransform.Line2.Column3 - 
rTransform.Line2.Column3) < fEPS &&
+std::abs(aExpectedTransform.Line3.Column1 - 
rTransform.Line3.Column1) < fEPS &&
+std::abs(aExpectedTransform.Line3.Column2 - 
rTransform.Line3.Column2) < fEPS &&
+std::abs(aExpectedTransform.Line3.Column3 - 
rTransform.Line3.Column3) < fEPS);
 }
 
 OUString sequenceToOneLineString(uno::Sequence& rSeq)
@@ -457,7 +457,7 @@ DECLARE_DUMP_TEST(LegendTest, Chart2Dum

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

[Tamás Zolnai]

 chart2/qa/extras/chart2dump/chart2dump.cxx 
  |  120 +++
 chart2/qa/extras/chart2dump/data/normal_line_chart_lines_and_points.ods
  |binary
 chart2/qa/extras/chart2dump/data/normal_line_chart_lines_only.ods  
  |binary
 chart2/qa/extras/chart2dump/data/normal_line_chart_points_only.ods 
  |binary
 
chart2/qa/extras/chart2dump/data/percent_stacked_line_chart_lines_and_points.ods
 |binary
 chart2/qa/extras/chart2dump/data/percent_stacked_line_chart_lines_only.ods 
  |binary
 chart2/qa/extras/chart2dump/data/percent_stacked_line_chart_points_only.ods
  |binary
 chart2/qa/extras/chart2dump/data/scatter_chart_lines_and_points.ods
  |binary
 chart2/qa/extras/chart2dump/data/scatter_chart_lines_only.ods  
  |binary
 chart2/qa/extras/chart2dump/data/scatter_chart_points_only.ods 
  |binary
 chart2/qa/extras/chart2dump/data/stacked_line_chart_lines_and_points.ods   
  |binary
 chart2/qa/extras/chart2dump/data/stacked_line_chart_lines_only.ods 
  |binary
 chart2/qa/extras/chart2dump/data/stacked_line_chart_points_only.ods
  |binary
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/normal_line_chart_lines_and_points.txt
  |  250 
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/normal_line_chart_lines_only.txt
|   58 +
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/normal_line_chart_points_only.txt
   |  198 ++
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/percent_stacked_line_chart_lines_and_points.txt
 |  310 ++
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/percent_stacked_line_chart_lines_only.txt
   |   58 +
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/percent_stacked_line_chart_points_only.txt
  |  258 
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/scatter_chart_lines_and_points.txt
  |  310 ++
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/scatter_chart_lines_only.txt
|   58 +
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/scatter_chart_points_only.txt
   |  258 
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/stacked_line_chart_lines_and_points.txt
 |  310 ++
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/stacked_line_chart_lines_only.txt
   |   58 +
 
chart2/qa/extras/chart2dump/reference/pointlinecharttest/stacked_line_chart_points_only.txt
  |  258 
 25 files changed, 2501 insertions(+), 3 deletions(-)

New commits:
commit 9077f1f110a35ed223fb47e9eaa329dd19528e38
Author: Tamás Zolnai 
Date:   Thu Feb 16 23:16:30 2017 +0100

ChartDumpTest: Test line and scatter charts

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

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 0129423..d51e972 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -91,9 +92,9 @@
 
 #define CPPUNIT_DUMP_ASSERT_NOTE(Note) \
 if(isInDumpMode()) \
-writeNote(OUString(Note)); \
+writeNote(Note); \
 else \
-readNote(OUString(Note));\
+readNote(Note);\
 
 
 class Chart2DumpTest : public ChartTest, public XmlTestTools
@@ -974,7 +975,7 @@ DECLARE_DUMP_TEST(AreaChartTest, Chart2DumpTest, false)
 CPPUNIT_ASSERT(xSeries.is());
 CPPUNIT_DUMP_ASSERT_NOTE("Series " + OUString::number(nSeries));
 
-// One are for one series
+// One area for one series
 uno::Reference xIndexAccess(xSeries, 
UNO_QUERY_THROW);
 uno::Reference 
xIndexAccess2(xIndexAccess->getByIndex(0), UNO_QUERY_THROW); // Why this second 
group shape is here?
 uno::Reference 
xArea(xIndexAccess2->getByIndex(0), UNO_QUERY_THROW);
@@ -1006,6 +1007,119 @@ DECLARE_DUMP_TEST(AreaChartTest, Chart2DumpTest, false)
 }
 
 
+DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false)
+{
+const std::vector aTestFiles =
+{
+"normal_line_chart_lines_only.ods",
+"normal_line_chart_points_only.ods",
+"normal_line_chart_lines_and_points.ods",
+"stacked_line_chart_lines_only.ods",
+"stacked_line_chart_points_only.ods",
+"stacked_line_chart_

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

[Michael Stahl]

 sw/qa/extras/ww8export/ww8export.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d1a8ca4951c076c605a47aadf6bdcac79d2bee8e
Author: Michael Stahl 
Date:   Thu Feb 16 23:39:05 2017 +0100

sw: use the stupid line-ends for WNT

Change-Id: Ie054d48c7dc9220d25cd9282d1b15a8a695a516f

diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 1966a6a..14d3020 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -343,13 +343,13 @@ DECLARE_WW8EXPORT_TEST(testHeaderApoTable, 
"ooo92948-1.doc")
 //uno::Reference xFrame(getParagraphAnchoredObject(1, 
xPara));
 
 uno::Reference xTable(getParagraphOrTable(1, xFrame));
-getCell(xTable, "A1", "Aan\nRecipient\nRecipient\n");
-getCell(xTable, "A2", "Kopie aan\n");
-getCell(xTable, "A3", "Datum\n31 juli 2008");
-getCell(xTable, "A4", "Locatie\nLocationr");
-getCell(xTable, "A5", "Van\nSender  ");
-getCell(xTable, "A6", "Directie\nDepartment");
-getCell(xTable, "A7", "Telefoon\nPhone");
+getCell(xTable, "A1", "Aan" SAL_NEWLINE_STRING "Recipient" 
SAL_NEWLINE_STRING "Recipient" SAL_NEWLINE_STRING);
+getCell(xTable, "A2", "Kopie aan" SAL_NEWLINE_STRING);
+getCell(xTable, "A3", "Datum" SAL_NEWLINE_STRING "31 juli 2008");
+getCell(xTable, "A4", "Locatie" SAL_NEWLINE_STRING "Locationr");
+getCell(xTable, "A5", "Van" SAL_NEWLINE_STRING "Sender  ");
+getCell(xTable, "A6", "Directie" SAL_NEWLINE_STRING "Department");
+getCell(xTable, "A7", "Telefoon" SAL_NEWLINE_STRING "Phone");
 }
 
 DECLARE_WW8EXPORT_TEST(testBnc821208, "bnc821208.doc")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Typo textbodyjustfied

[Tomaž Vajngerl]

Hi,

On Thu, Feb 16, 2017 at 6:44 PM, Eike Rathke  wrote:
> Hi julien2412,
>
> It's a mistyped ODF attribute property name, so it's in the wild.

AFAICS it is a style name, and not a ODF attribute property name.

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

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

[Lukas Röllin]

 sw/source/filter/html/htmlbas.cxx   |   23 +++
 sw/source/filter/html/htmlnumreader.cxx |  101 +---
 2 files changed, 55 insertions(+), 69 deletions(-)

New commits:
commit 92387df38cca02de404b08a495d94cf3fe2181d3
Author: Lukas Röllin 
Date:   Wed Feb 15 18:22:28 2017 +0100

German comment translations

Change-Id: Ib6023348c9148671762229066e1dc5c2a9b7dcd8
Reviewed-on: https://gerrit.libreoffice.org/34317
Reviewed-by: Johnny_M 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/filter/html/htmlbas.cxx 
b/sw/source/filter/html/htmlbas.cxx
index c12203d..4259e91 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -65,7 +65,7 @@ void SwHTMLParser::NewScript()
 
 if( !m_aScriptURL.isEmpty() )
 {
-// Den Inhalt des Script-Tags ignorieren
+// Ignore the script tag
 m_bIgnoreRawData = true;
 }
 }
@@ -88,8 +88,7 @@ void SwHTMLParser::EndScript()
 m_bIgnoreRawData = false;
 m_aScriptSource = convertLineEnd(m_aScriptSource, GetSystemLineEnd());
 
-// Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
-// Modulnamen in einem Feld merken merken
+// Except for StarBasic and unused JavaScript, save each script or module 
name in a field
 if( bInsSrcIntoField && !m_bIgnoreHTMLComments )
 {
 SwScriptFieldType *pType =
@@ -105,8 +104,9 @@ void SwHTMLParser::EndScript()
 if( !m_aScriptSource.isEmpty() && pDocSh &&
 bInsIntoBasic && IsNewDoc() )
 {
-// Fuer JavaScript und StarBasic noch ein Basic-Modul anlegen
-// Das Basic entfernt natuerlich weiterhin keine SGML-Kommentare
+// Create a Basic module for javascript and StarBasic.
+
+// The Basic does still not remove SGML comments
 RemoveSGMLComment( m_aScriptSource, true );
 
 // get library name
@@ -182,7 +182,7 @@ void SwHTMLParser::EndScript()
 
 void SwHTMLParser::AddScriptSource()
 {
-// Hier merken wir und nur ein par Strings
+// We'll just remember a few strings here
 if( aToken.getLength() > 2 &&
 (HTML_SL_STARBASIC==m_eScriptLang && aToken[ 0 ] == '\'') )
 {
@@ -218,14 +218,14 @@ void SwHTMLParser::AddScriptSource()
 }
 else if( !m_aScriptSource.isEmpty() || !aToken.isEmpty() )
 {
-// Leerzeilen am Anfang werden ignoriert
+// Empty lines are ignored on the beginning
 if( !m_aScriptSource.isEmpty() )
 {
 m_aScriptSource += "\n";
 }
 else
 {
-// Wir stehen hinter dem CR/LF der Zeile davor
+// We're behind the CR/LF of the line before
 m_nScriptStartLineNr = GetLineNr() - 1;
 }
 m_aScriptSource += aToken;
@@ -262,15 +262,14 @@ void SwHTMLWriter::OutBasic()
 
 BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager();
 OSL_ENSURE( pBasicMan, "Wo ist der Basic-Manager?" );
-// nur das DocumentBasic schreiben
+// Only write DocumentBasic
 if( !pBasicMan || pBasicMan == SfxApplication::GetBasicManager() )
 {
 return;
 }
 
 bool bFirst=true;
-// und jetzt alle StarBasic-Module und alle unbenutzen JavaSrript-Module
-// ausgeben
+// Now write all StarBasic and unused Javascript modules
 for( sal_uInt16 i=0; iGetLibCount(); i++ )
 {
 StarBASIC *pBasic = pBasicMan->GetLib( i  );
@@ -298,7 +297,7 @@ void SwHTMLWriter::OutBasic()
 }
 
 const OUString& rModName = pModule->GetName();
-Strm().WriteCharPtr( SAL_NEWLINE_STRING );   // nicht einruecken!
+Strm().WriteCharPtr( SAL_NEWLINE_STRING );   // don't indent!
 HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), 
pModule->GetSource(),
  sLang, eType, aEmptyOUStr,
  &rLibName, &rModName,
diff --git a/sw/source/filter/html/htmlnumreader.cxx 
b/sw/source/filter/html/htmlnumreader.cxx
index 1b2eb29..cc7a608 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -56,31 +56,30 @@ void SwHTMLParser::NewNumBulList( int nToken )
 {
 SwHTMLNumRuleInfo& rInfo = GetNumInfo();
 
-// Erstmal einen neuen Absatz aufmachen
+// Create a new paragraph
 bool bSpace = (rInfo.GetDepth() + m_nDefListDeep) == 0;
 if( m_pPam->GetPoint()->nContent.GetIndex() )
 AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
 else if( bSpace )
 AddParSpace();
 
-// Die Numerierung-Ebene erhoehen
+// Increment the numbering depth
 rInfo.IncDepth();
 sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? 
rInfo.GetDepth()
 : MAXLEVEL) - 1 );
 
-// ggf. ein Regelwerk anlegen
+// Create rules if needed
 if( !rInfo.GetNumRule() )
 {
 sal_uInt16 nPos = m_xDoc->Ma

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/loolnb.cpp

[Michael Meeks]

 net/loolnb.cpp |   78 -
 1 file changed, 72 insertions(+), 6 deletions(-)

New commits:
commit 5b8042bd7b2ae5101ba201756cd96e70e7532a34
Author: Michael Meeks 
Date:   Thu Feb 16 21:57:18 2017 +

WS: initial masking implementation & better parsing.

diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index fe027fa..dbbda3f 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -133,14 +133,15 @@ public:
 
 // websocket fun !
 size_t len = _inBuffer.size();
-const char *p = &_inBuffer[0];
+char *p = &_inBuffer[0];
+char *data, *mask;
 if (len < 2) // partial read
 return;
 
 bool fin = *p & 0x80;
 WSOpCode code = static_cast(*p & 0x0f);
 p++;
-bool mask = *p & 0x80;
+bool hasMask = *p & 0x80;
 size_t payloadLen = *p & 0x7f;
 p++;
 
@@ -149,25 +150,90 @@ public:
 if (len < 2 + 2)
 return;
 std::cerr << "Implement me 2 byte\n";
+data = p + 2;
+len -= 2;
 }
 else if (payloadLen == 127) // 8 byte length
 {
 if (len < 2 + 8)
 return;
 std::cerr << "Implement me 8 byte\n";
+data = p + 8;
+len -= 8;
 }
 else
 {
-_wsPayload.insert(_wsPayload.end(), p, p + std::min(payloadLen, 
len));
+data = p;
 }
+
+if (hasMask)
+{
+mask = data;
+data += 4;
+len -= 4;
+for (size_t i = 0; i < len; ++i)
+data[i] = data[i] ^ mask[i % 4];
+
+// FIXME: copy and un-mask at the same time ...
+_wsPayload.insert(_wsPayload.end(), data, data + 
std::min(payloadLen, len));
+} else
+_wsPayload.insert(_wsPayload.end(), data, data + 
std::min(payloadLen, len));
 // FIXME: fin, aggregating payloads into _wsPayload etc.
-handleWSMessage(fin, code, mask, _wsPayload);
+handleWSMessage(fin, code, _wsPayload);
 _wsPayload.clear();
 }
 
-virtual void handleWSMessage( bool fin, WSOpCode code, bool mask, 
std::vector &data)
+virtual void queueWSMessage(const std::vector &data,
+WSOpCode code = WSOpCode::Binary)
+{
+size_t len = data.size();
+bool fin = false;
+bool mask = false;
+
+unsigned char header[2];
+header[0] = (fin ? 0x80 : 0) | static_cast(code);
+header[1] = mask ? 0x80 : 0;
+_outBuffer.push_back((char)header[0]);
+
+// no out-bound masking ...
+if (len < 126)
+{
+header[1] |= len;
+_outBuffer.push_back((char)header[1]);
+}
+else if (len <= 0x)
+{
+header[1] |= 126;
+_outBuffer.push_back((char)header[1]);
+std::cerr << "FIXME: length\n";
+}
+else
+{
+header[1] |= 127;
+_outBuffer.push_back((char)header[1]);
+std::cerr << "FIXME: length\n";
+}
+
+// FIXME: pick random number and mask in the outbuffer etc.
+assert (!mask);
+
+_outBuffer.insert(_outBuffer.end(), data.begin(), data.end());
+}
+
+virtual void handleWSMessage( bool fin, WSOpCode code, std::vector 
&data)
 {
-std::cerr << "Message: fin? " << fin << " code " << code << " mask? " 
<< mask << " data size " << data.size() << "\n";
+std::cerr << "Message: fin? " << fin << " code " << code << " data 
size " << data.size() << "\n";
+
+// ping pong test
+assert (data.size() >= sizeof(size_t));
+size_t *countPtr = reinterpret_cast(&data[0]);
+size_t count = *countPtr;
+count++;
+std::cerr << "count is " << count << "\n";
+std::vector reply;
+reply.insert(reply.end(), reinterpret_cast(&count),
+ reinterpret_cast(&count) + sizeof(count));
+queueWSMessage(reply);
 }
 
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] Re: Typo textbodyjustfied

[Julien Nabet]

On 16/02/2017 18:44, Eike Rathke wrote:

...

There's no specific context (no bugtracker, no request on Irc or forum,
), just encountered this typo when reading code.

Now either I can change the typo in locations indicated by Opengrok see
http://opengrok.libreoffice.org/search?q=textbodyjustfied&project=core&defs=&refs=&path=&hist=
or I let as it because it'd break some documents.

It's a mistyped ODF attribute property name, so it's in the wild. Simply
changing it would break existing documents, and also new documents
couldn't be loaded in older releases. The best approach is to be able to
read both names for two releases, and then switch to writing the new
name in the third release.

Since it's not just a simple replace, I won't be able to do this.
Thank you anyway for your feedback Eike.

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

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

[Michael Stahl]

 sw/qa/extras/inc/swmodeltestbase.hxx   |   13 +
 sw/qa/extras/ww8export/data/ooo92948-1.doc |binary
 sw/qa/extras/ww8export/ww8export.cxx   |   24 
 sw/source/filter/ww8/ww8par2.cxx   |1 +
 4 files changed, 38 insertions(+)

New commits:
commit d4620d535bd5a8e73bdb9d556933b9ae22800a7d
Author: Michael Stahl 
Date:   Thu Feb 16 18:17:53 2017 +0100

i#92948 sw: WW8 import: fix table in Apo in header

The document contains a table inside of a frame anchored in the header.

In WW8TabDesc::WW8TabDesc() the update to nOrigPos makes a mess of
things because the new nOrigPos value contains the value of nCpOfs (93)
already, so later on when SwWW8ImplReader::TestApo() calls
WW8PLCFxDesc::Save() / WW8PLCFxDesc::Restore(), the call to SeekPos()
positions it on CP 325 instead of 232 and the subsequent call to
GetSprms() finds nothing on the wrong position; thus TestApo() concludes
that the paragraph has different Apo properties than the previous one
and a new fly frame is created.

(regression from 4bd341e2c8a1f3a4f4677eb879a60a4ffc3369db)

Change-Id: I697c4526c7c3a12119947ff5659c11ea9ee7fff8

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 07b04ea..aad89d8 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -516,6 +516,19 @@ protected:
 return xParagraph;
 }
 
+/// get nth object/fly that is anchored AT paragraph
+uno::Reference getParagraphAnchoredObject(
+int const index, uno::Reference const & xPara) const
+{
+uno::Reference 
xContentEnumAccess(xPara, uno::UNO_QUERY);
+uno::Reference 
xContentEnum(xContentEnumAccess->createContentEnumeration("com.sun.star.text.TextContent"),
 uno::UNO_QUERY);
+for (int i = 1; i < index; ++i)
+{
+xContentEnum->nextElement();
+}
+return 
uno::Reference(xContentEnum->nextElement(), 
uno::UNO_QUERY);
+}
+
 /// Get run (counted from 1) of a paragraph, optionally check it contains 
the given text.
 uno::Reference getRun(uno::Reference 
const & xParagraph, int number, const OUString& content = OUString()) const
 {
diff --git a/sw/qa/extras/ww8export/data/ooo92948-1.doc 
b/sw/qa/extras/ww8export/data/ooo92948-1.doc
new file mode 100644
index 000..f355eaa
Binary files /dev/null and b/sw/qa/extras/ww8export/data/ooo92948-1.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index dd3f6b3..1966a6a 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -328,6 +328,30 @@ DECLARE_WW8EXPORT_TEST(testListNolevel, "list-nolevel.doc")
 CPPUNIT_ASSERT_EQUAL(OUString("1."), aText);
 }
 
+DECLARE_WW8EXPORT_TEST(testHeaderApoTable, "ooo92948-1.doc")
+{
+// the problem was that a table anchored in the header was split across
+// 3 text frames and quite messed up
+
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+uno::Reference xFrame(xIndexAccess->getByIndex(1), 
uno::UNO_QUERY);
+
+//uno::Reference xHeaderText = 
getProperty>(getStyles("PageStyles")->getByName("Standard"),
 "HeaderTextFirst");
+//uno::Reference xPara(getParagraphOfText(9, 
xHeaderText));
+//TODO why does this not work
+//uno::Reference xFrame(getParagraphAnchoredObject(1, 
xPara));
+
+uno::Reference xTable(getParagraphOrTable(1, xFrame));
+getCell(xTable, "A1", "Aan\nRecipient\nRecipient\n");
+getCell(xTable, "A2", "Kopie aan\n");
+getCell(xTable, "A3", "Datum\n31 juli 2008");
+getCell(xTable, "A4", "Locatie\nLocationr");
+getCell(xTable, "A5", "Van\nSender  ");
+getCell(xTable, "A6", "Directie\nDepartment");
+getCell(xTable, "A7", "Telefoon\nPhone");
+}
+
 DECLARE_WW8EXPORT_TEST(testBnc821208, "bnc821208.doc")
 {
 // WW8Num1z0 earned a Symbol font, turning numbers into rectangles.
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c1e1cb6..fabd439 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2020,6 +2020,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP 
nStartCp) :
 // PlcxMan currently points too far ahead so we need to bring
 // it back to where we are trying to make a table
 m_pIo->m_pPlcxMan->GetPap()->nOrigStartPos = aRes.nStartPos;
+m_pIo->m_pPlcxMan->GetPap()->nCpOfs = aRes.nCpOfs;
 if (!(pPap->SeekPos(aRes.nStartPos)))
 {
 aRes.nEndPos = WW8_CP_MAX;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf2.cxx |   27 ---
 1 file changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 94037ee2e6b85006373d1c4cecfcb32f4c82bb9e
Author: Caolán McNamara 
Date:   Wed Feb 15 14:28:55 2017 +

Resolves: tdf#101000 ensure unique image names in .docs

(cherry picked from commit 432f605e3287269d1a20383f4eeebf012ee3679d)

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

diff --git a/sw/source/filter/ww8/ww8graf2.cxx 
b/sw/source/filter/ww8/ww8graf2.cxx
index e4a5f38..5f8cabc 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -30,8 +30,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -454,6 +455,19 @@ void SwWW8ImplReader::PicRead(SvStream *pDataStream, 
WW8_PIC *pPic,
 pDataStream->SeekRel(2);  //cProps
 }
 
+namespace
+{
+sal_uInt8 GetNodeType(SwFrameFormat &rSource)
+{
+const SwNodeIndex* pNodeIndex = rSource.GetContent().GetContentIdx();
+if (!pNodeIndex)
+return 0;
+const SwNode& rCSttNd = pNodeIndex->GetNode();
+SwNodeRange aRg(rCSttNd, 1, *rCSttNd.EndOfSectionNode());
+return aRg.aStart.GetNode().GetNodeType();
+}
+}
+
 SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
 SwFrameFormat* pOldFlyFormat)
 {
@@ -670,12 +684,11 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* 
pTextObj,
 if (pRecord)
 SetAttributesAtGrfNode(pRecord, pRet, nullptr);
 
-// #i68101#
-// removed pObject->HasSetName() usage since always 
returned
-// true, also removed else-part and wrote an informing mail
-// to Henning Brinkmann about this to clarify.
-pRet->SetName(pObject->GetName());
-
+OUString aObjectName(pObject->GetName());
+if (aObjectName.isEmpty() || 
!m_rDoc.FindFlyByName(aObjectName, GetNodeType(*pRet)))
+pRet->SetName(aObjectName);
+else
+m_aGrfNameGenerator.SetUniqueGraphName(pRet, 
aObjectName);
 
 // determine the pointer to the new object and update
 // Z-order-list accordingly (or delete entry)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf2.cxx |   27 ---
 1 file changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 7b6bf8348f36e5b98c5a6d5ddc4815df07f4fbbc
Author: Caolán McNamara 
Date:   Wed Feb 15 14:28:55 2017 +

Resolves: tdf#101000 ensure unique image names in .docs

(cherry picked from commit 432f605e3287269d1a20383f4eeebf012ee3679d)

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

diff --git a/sw/source/filter/ww8/ww8graf2.cxx 
b/sw/source/filter/ww8/ww8graf2.cxx
index 90e6021..dbcfdc3 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -30,8 +30,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -454,6 +455,19 @@ void SwWW8ImplReader::PicRead(SvStream *pDataStream, 
WW8_PIC *pPic,
 pDataStream->SeekRel(2);  //cProps
 }
 
+namespace
+{
+sal_uInt8 GetNodeType(SwFrameFormat &rSource)
+{
+const SwNodeIndex* pNodeIndex = rSource.GetContent().GetContentIdx();
+if (!pNodeIndex)
+return 0;
+const SwNode& rCSttNd = pNodeIndex->GetNode();
+SwNodeRange aRg(rCSttNd, 1, *rCSttNd.EndOfSectionNode());
+return aRg.aStart.GetNode().GetNodeType();
+}
+}
+
 SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
 SwFrameFormat* pOldFlyFormat)
 {
@@ -670,12 +684,11 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* 
pTextObj,
 if (pRecord)
 SetAttributesAtGrfNode(pRecord, pRet, nullptr);
 
-// #i68101#
-// removed pObject->HasSetName() usage since always 
returned
-// true, also removed else-part and wrote an informing mail
-// to Henning Brinkmann about this to clarify.
-pRet->SetName(pObject->GetName());
-
+OUString aObjectName(pObject->GetName());
+if (aObjectName.isEmpty() || 
!m_rDoc.FindFlyByName(aObjectName, GetNodeType(*pRet)))
+pRet->SetName(aObjectName);
+else
+m_aGrfNameGenerator.SetUniqueGraphName(pRet, 
aObjectName);
 
 // determine the pointer to the new object and update
 // Z-order-list accordingly (or delete entry)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 sc/source/ui/unoobj/docuno.cxx |  113 +++--
 1 file changed, 55 insertions(+), 58 deletions(-)

New commits:
commit 4178f55bce696affd5074ebdcc32e84d00f7df09
Author: Katarina Behrens 
Date:   Thu Feb 16 21:22:05 2017 +0100

Translate some German comments in sc

and delete some nonsense ones

Change-Id: I7c9f39e1ce5a6ac67e0e10c0a99b59c3aea3436f

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 074b38b..848fb26 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -128,9 +128,9 @@ using namespace com::sun::star;
 // #i111553# provides the name of the VBA constant for this document type 
(e.g. 'ThisExcelDoc' for Calc)
 #define SC_UNO_VBAGLOBNAME "VBAGlobalConstantName"
 
-//  alles ohne Which-ID, Map nur fuer PropertySetInfo
+//  no Which-ID here, map only for PropertySetInfo
 
-//! umbenennen, sind nicht mehr nur Options
+//! rename this, those are no longer only options
 static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
 {
 static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
@@ -184,7 +184,7 @@ static const SfxItemPropertyMapEntry* 
lcl_GetDocOptPropertyMap()
 return aDocOptPropertyMap_Impl;
 }
 
-//! StandardDecimals als Property und vom NumberFormatter 
+//! StandardDecimals as property and from NumberFormatter 
 
 static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap()
 {
@@ -403,18 +403,18 @@ uno::Reference< uno::XAggregation> const & 
ScModelObj::GetFormatter()
 // pDocShell may be NULL if this is the base of a ScDocOptionsObj
 if ( !xNumberAgg.is() && pDocShell )
 {
-// setDelegator veraendert den RefCount, darum eine Referenz selber 
halten
-// (direkt am m_refCount, um sich beim release nicht selbst zu 
loeschen)
+// setDelegator changes RefCount, so we'd better hold the reference 
ourselves
+// (directly in m_refCount, so we don't delete ourselves with 
release())
 osl_atomic_increment( &m_refCount );
-// waehrend des queryInterface braucht man ein Ref auf das
-// SvNumberFormatsSupplierObj, sonst wird es geloescht.
+// we need a reference to SvNumberFormatsSupplierObj during 
queryInterface,
+// otherwise it'll be deleted
 uno::Reference xFormatter(new 
SvNumberFormatsSupplierObj(pDocShell->GetDocument().GetFormatTable() ));
 {
 xNumberAgg.set(uno::Reference( xFormatter, 
uno::UNO_QUERY ));
 // extra block to force deletion of the temporary before 
setDelegator
 }
 
-// beim setDelegator darf die zusaetzliche Ref nicht mehr existieren
+// during setDelegator no additional reference should exist
 xFormatter = nullptr;
 
 if (xNumberAgg.is())
@@ -1946,7 +1946,7 @@ void SAL_CALL ScModelObj::calculate()
 pDocShell->DoRecalc(true);
 else
 {
-OSL_FAIL("keine DocShell"); //! Exception oder so?
+OSL_FAIL("no DocShell"); //! throw exception?
 }
 }
 
@@ -1957,7 +1957,7 @@ void SAL_CALL ScModelObj::calculateAll()
 pDocShell->DoHardRecalc(true);
 else
 {
-OSL_FAIL("keine DocShell"); //! Exception oder so?
+OSL_FAIL("no DocShell"); //! throw exception?
 }
 }
 
@@ -1967,7 +1967,7 @@ sal_Bool SAL_CALL 
ScModelObj::isAutomaticCalculationEnabled()
 if (pDocShell)
 return pDocShell->GetDocument().GetAutoCalc();
 
-OSL_FAIL("keine DocShell"); //! Exception oder so?
+OSL_FAIL("no DocShell"); //! throw exception?
 return false;
 }
 
@@ -1986,7 +1986,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( 
sal_Bool bEnabledIn )
 }
 else
 {
-OSL_FAIL("keine DocShell"); //! Exception oder so?
+OSL_FAIL("no DocShell"); //! throw exception?
 }
 }
 
@@ -2019,7 +2019,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected()
 if (pDocShell)
 return pDocShell->GetDocument().IsDocProtected();
 
-OSL_FAIL("keine DocShell"); //! Exception oder so?
+OSL_FAIL("no DocShell"); //! throw exception?
 return false;
 }
 
@@ -2031,7 +2031,7 @@ uno::Reference SAL_CALL 
ScModelObj::getDrawPages()
 if (pDocShell)
 return new ScDrawPagesObj(pDocShell);
 
-OSL_FAIL("keine DocShell"); //! Exception oder so?
+OSL_FAIL("no DocShell"); //! throw exception?
 return nullptr;
 }
 
@@ -2044,7 +2044,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal(
 {
 SolarMutexGuard aGuard;
 sheet::GoalResult aResult;
-aResult.Divergence = DBL_MAX;   // nichts gefunden
+aResult.Divergence = DBL_MAX;   // not found
 if (pDocShell)
 {
 WaitObject aWait( ScDocShell::GetActiveDialogParent() );
@@ -2056,7 +2056,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal(
 aGoalValue, fValue );
 aResult.Result = fValue;
 if (bFound)
-aR

Does anyone use windows

[David Ostrovsky]

On Thu Feb 16 18:26:00 UTC 2017 Abulfaz Ahmadov wrote:

>Does anyone of you use windows for libreoffice development?

No.

>Do you have some
>experience with Visual studio 2015?It's written on set up page that it
>probabbly won't work,and it's recommended to use Visual studio 2013
>with updates

This statement on the wiki: "... 2013 the preferred compiler for new
developers" is stale and must be removed. This statement pre-dated
two major fixes for VS 2015 and VS 2017 compilers, that were merged
very recently: [1], [2].

Moreover, for developer builds with debug mode enabled, with this diff
pending for review: [3] applied, there should be significant
performance benefit to use VS 2015 (not to mention VS 2017) compared to
VS 2013.

It worth also noting that VS 2013 is slated for removal, see recent ESC minutes.

* [1] 
 
"Keep original CFLAGS etc. unmodified in configure.ac" will hopefully 
fix that.
* [2] https://gerrit.libreoffice.org/#/c/33366/
VC++ Runtime installed in wrong directory
* [3] https://gerrit.libreoffice.org/#/c/34330/
Use /debug:fastlink linker option to improve link performance

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

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

[Tamás Zolnai]

 chart2/qa/extras/chart2dump/chart2dump.cxx 
  |   43 -
 chart2/qa/extras/chart2dump/data/axis_special_positioning.odp  
  |binary
 chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.odp 
  |binary
 chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.odp  
  |binary
 chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.odp  
  |binary
 chart2/qa/extras/chart2dump/data/custom_legend_position.odp
  |binary
 chart2/qa/extras/chart2dump/data/default_formated_axis.odp 
  |binary
 chart2/qa/extras/chart2dump/data/formated_axis_labels.odp  
  |binary
 chart2/qa/extras/chart2dump/data/formated_axis_lines.odp   
  |binary
 chart2/qa/extras/chart2dump/data/legend_on_bottom.odp  
  |binary
 chart2/qa/extras/chart2dump/data/legend_on_left_side.odp   
  |binary
 chart2/qa/extras/chart2dump/data/legend_on_right_side.odp  
  |binary
 chart2/qa/extras/chart2dump/data/legend_on_top.odp 
  |binary
 chart2/qa/extras/chart2dump/data/many_legend_entries.odp   
  |binary
 chart2/qa/extras/chart2dump/data/multiple_categories.odp   
  |binary
 chart2/qa/extras/chart2dump/data/percent_stacked_column_chart.odp  
  |binary
 chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp   
  |binary
 
chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
  |   16 
 
chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
 |   16 
 chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt 
  |   16 
 chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt 
  |   16 
 chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt  
  |  134 +++--
 chart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt   
  |  234 ++
 
chart2/qa/extras/chart2dump/reference/axislabeltest/percent_stacked_column_chart.txt
 |  136 +++--
 chart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt
  |   64 +-
 
chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt
|   10 
 
chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt
 |   10 
 
chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt
 |   10 
 chart2/qa/extras/chart2dump/reference/legendtest/custom_legend_position.txt
  |   32 -
 chart2/qa/extras/chart2dump/reference/legendtest/legend_on_bottom.txt  
  |   28 -
 chart2/qa/extras/chart2dump/reference/legendtest/legend_on_left_side.txt   
  |   18 
 chart2/qa/extras/chart2dump/reference/legendtest/legend_on_right_side.txt  
  |   16 
 chart2/qa/extras/chart2dump/reference/legendtest/legend_on_top.txt 
  |   18 
 chart2/qa/extras/chart2dump/reference/legendtest/many_legend_entries.txt   
  |   62 +-
 chart2/qa/extras/chart2dump/reference/legendtest/multiple_categories.txt   
  |   56 +-
 dev/null   
  |binary
 36 files changed, 525 insertions(+), 410 deletions(-)

New commits:
commit becde82a91127ac57129e350f3e68081e1908e5e
Author: Tamás Zolnai 
Date:   Thu Feb 16 19:58:42 2017 +0100

ChartDumpTest: Convert failing tests' documents from ods to odp

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

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index db18512..0129423 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -28,7 +28,7 @@
 
 #if defined(MACOSX)
 #define INT_EPS 200.1
-#elif defined(UNX)
+#elif defined(X86)
 #define INT_EPS 2.1
 #else
 #define INT_EPS 0.1
@@ -398,20 +398,21 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
 {
 const std::vector aTestFiles =
 {
-"legend_on_right_side.ods",
-"legend_on_bottom.ods",
-"legend_on_left_side.ods",
-"legend_on_top.ods",
-"many_legend_entries.ods",
-"custom_legend_position.ods",
-"multiple_categories.ods"
+"legend_on_right_side.odp",
+"legend_on_bottom.odp

Re: Does anyone use windows

[slacka]

That is not what the wiki says. It says "Visual Studio 2013 is the preferred
compiler for new developers." It also goes on to say "Visual Studio 2015 is
known to work on current master."  If you are a new developer, I suggest you
follow the wiki's advice. The wiki contains everything you need to get
started and is full of useful tips. I suggest you try to read it before
asking for more help.



--
View this message in context: 
http://nabble.documentfoundation.org/Does-anyone-use-windows-tp4208152p4208156.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: Branch 'private/Ashod/nonblocking' - net/loolnb.cpp

[Michael Meeks]

 net/loolnb.cpp |   99 ++---
 1 file changed, 94 insertions(+), 5 deletions(-)

New commits:
commit b9d1721e46950bbfb960e9d975d616705265b293
Author: Michael Meeks 
Date:   Thu Feb 16 18:49:31 2017 +

WS - basic handshake / upgrade and start of read framing.

diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index 636a4d9..fe027fa 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -32,22 +32,25 @@ using Poco::StringTokenizer;
 
 constexpr int PortNumber = 9191;
 
+static std::string computeAccept(const std::string &key);
+
 class SimpleResponseClient : public ClientSocket
 {
 int _wsVersion;
 std::string _wsKey;
 std::string _wsProtocol;
+std::vector _wsPayload;
+enum { HTTP, WEBSOCKET } _wsState;
 
 public:
 SimpleResponseClient(const int fd) :
 ClientSocket(fd),
-_wsVersion(0)
+_wsVersion(0),
+_wsState(HTTP)
 {
 }
-virtual void handleIncomingMessage() override
+virtual void handleHTTP()
 {
-std::cerr << "message had size " << _inBuffer.size() << "\n";
-
 int number = 0;
 MemoryInputStream message(&_inBuffer[0], _inBuffer.size());
 Poco::Net::HTTPRequest req;
@@ -57,6 +60,7 @@ public:
 size_t consumed = std::min(_inBuffer.size(),
std::max((size_t)message.tellg(), 
size_t(0)));
 _inBuffer.erase(_inBuffer.begin(), _inBuffer.begin() + consumed);
+std::cerr << "_inBuffer has " << _inBuffer.size() << " remaining\n";
 
 StringTokenizer tokens(req.getURI(), "/?");
 if (tokens.count() == 4)
@@ -93,14 +97,79 @@ public:
 oss << "HTTP/1.1 101 Switching Protocols\r\n"
 << "Upgrade: websocket\r\n"
 << "Connection: Upgrade\r\n"
-<< "Sec-Websocket-Accept: " << _wsKey << "\r\n"
+<< "Sec-Websocket-Accept: " << computeAccept(_wsKey) << "\r\n"
 << "\r\n";
 std::string str = oss.str();
 _outBuffer.insert(_outBuffer.end(), str.begin(), str.end());
+_wsState = WEBSOCKET;
 }
 else
 std::cerr << " unknown tokens " << tokens.count() << std::endl;
 }
+
+enum WSOpCode {
+Continuation, // 0x0
+Text, // 0x1
+Binary,   // 0x2
+Reserved1,// 0x3
+Reserved2,// 0x4
+Reserved3,// 0x5
+Reserved4,// 0x6
+Reserved5,// 0x7
+Close,// 0x8
+Ping, // 0x9
+Pong  // 0xa
+// ... reserved
+};
+
+virtual void handleIncomingMessage() override
+{
+std::cerr << "incoming message with buffer size " << _inBuffer.size() 
<< "\n";
+if (_wsState == HTTP)
+{
+handleHTTP();
+return;
+}
+
+// websocket fun !
+size_t len = _inBuffer.size();
+const char *p = &_inBuffer[0];
+if (len < 2) // partial read
+return;
+
+bool fin = *p & 0x80;
+WSOpCode code = static_cast(*p & 0x0f);
+p++;
+bool mask = *p & 0x80;
+size_t payloadLen = *p & 0x7f;
+p++;
+
+if (payloadLen == 126) // 2 byte length
+{
+if (len < 2 + 2)
+return;
+std::cerr << "Implement me 2 byte\n";
+}
+else if (payloadLen == 127) // 8 byte length
+{
+if (len < 2 + 8)
+return;
+std::cerr << "Implement me 8 byte\n";
+}
+else
+{
+_wsPayload.insert(_wsPayload.end(), p, p + std::min(payloadLen, 
len));
+}
+// FIXME: fin, aggregating payloads into _wsPayload etc.
+handleWSMessage(fin, code, mask, _wsPayload);
+_wsPayload.clear();
+}
+
+virtual void handleWSMessage( bool fin, WSOpCode code, bool mask, 
std::vector &data)
+{
+std::cerr << "Message: fin? " << fin << " code " << code << " mask? " 
<< mask << " data size " << data.size() << "\n";
+}
+
 };
 
 // FIXME: use Poco Thread instead (?)
@@ -260,4 +329,24 @@ int main(int, const char**)
 return 0;
 }
 
+// Saves writing this ourselves:
+
+#include 
+
+namespace {
+#include 
+struct Puncture : private Poco::Net::WebSocket {
+static std::string doComputeAccept(const std::string &key)
+{
+return computeAccept(key);
+}
+};
+}
+
+static std::string computeAccept(const std::string &key)
+{
+return Puncture::doComputeAccept(key);
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[Khaled Hosny]

On Thu, Feb 16, 2017 at 03:43:18PM +, Michael Meeks wrote:
> AI: + test build configuations (Norbert)
> + Is there any gain of functionality with 2015 ?

Not a gain in functionality, but VS 2015 is much easier to find on MS
website than 2013, last time I hat to setup a Windows machine (a couple
of months ago or so) it took me probably an hour to find the 2013
installer.

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

Does anyone use windows

[Abulfaz Ahmadov]

Hi guys!
Does anyone of you use windows for libreoffice development?Do you have some
experience with Visual studio 2015?It's written on set up page that it
probabbly won't work,and it's recommended to use Visual studio 2013 with
updates
Thanks,
Abulfaz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/loolnb.cpp

[Michael Meeks]

 net/loolnb.cpp |   64 -
 1 file changed, 45 insertions(+), 19 deletions(-)

New commits:
commit 67a9ca928672d4ed5a013808586814c49b6c0006
Author: Michael Meeks 
Date:   Thu Feb 16 17:49:03 2017 +

More WS-ness.

diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index 01fc3c5..636a4d9 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -34,9 +34,14 @@ constexpr int PortNumber = 9191;
 
 class SimpleResponseClient : public ClientSocket
 {
+int _wsVersion;
+std::string _wsKey;
+std::string _wsProtocol;
+
 public:
 SimpleResponseClient(const int fd) :
-ClientSocket(fd)
+ClientSocket(fd),
+_wsVersion(0)
 {
 }
 virtual void handleIncomingMessage() override
@@ -48,32 +53,53 @@ public:
 Poco::Net::HTTPRequest req;
 req.read(message);
 
+// if we succeeded - remove that from our input buffer
+size_t consumed = std::min(_inBuffer.size(),
+   std::max((size_t)message.tellg(), 
size_t(0)));
+_inBuffer.erase(_inBuffer.begin(), _inBuffer.begin() + consumed);
+
 StringTokenizer tokens(req.getURI(), "/?");
 if (tokens.count() == 4)
 {
 std::string subpool = tokens[2];
 number = std::stoi(tokens[3]);
+
+// complex algorithmic core:
+number = number + 1;
+
+std::string numberString = std::to_string(number);
+std::ostringstream oss;
+oss << "HTTP/1.1 200 OK\r\n"
+<< "Date: Once, Upon a time GMT\r\n" // Mon, 27 Jul 2009 
12:28:53 GMT
+<< "Server: madeup string (Linux)\r\n"
+<< "Content-Length: " << numberString.size() << "\r\n"
+<< "Content-Type: text/plain\r\n"
+<< "Connection: Closed\r\n"
+<< "\r\n"
+<< numberString;
+;
+std::string str = oss.str();
+_outBuffer.insert(_outBuffer.end(), str.begin(), str.end());
+}
+else if (tokens.count() == 2 && tokens[1] == "ws")
+{ // create our websocket goodness ...
+_wsVersion = std::stoi(req.get("Sec-WebSocket-Version", "13"));
+_wsKey = req.get("Sec-WebSocket-Key", "");
+_wsProtocol = req.get("Sec-WebSocket-Protocol", "chat");
+std::cerr << "version " << _wsVersion << " key '" << _wsKey << 
"\n";
+// FIXME: other sanity checks ...
+
+std::ostringstream oss;
+oss << "HTTP/1.1 101 Switching Protocols\r\n"
+<< "Upgrade: websocket\r\n"
+<< "Connection: Upgrade\r\n"
+<< "Sec-Websocket-Accept: " << _wsKey << "\r\n"
+<< "\r\n";
+std::string str = oss.str();
+_outBuffer.insert(_outBuffer.end(), str.begin(), str.end());
 }
 else
 std::cerr << " unknown tokens " << tokens.count() << std::endl;
-
-// complex algorithmic core:
-number = number + 1;
-
-std::string numberString = std::to_string(number);
-std::ostringstream oss;
-oss << "HTTP/1.1 200 OK\r\n"
-<< "Date: Once, Upon a time GMT\r\n" // Mon, 27 Jul 2009 12:28:53 
GMT
-<< "Server: madeup string (Linux)\r\n"
-<< "Content-Length: " << numberString.size() << "\r\n"
-<< "Content-Type: text/plain\r\n"
-<< "Connection: Closed\r\n"
-<< "\r\n"
-<< numberString;
-;
-std::string str = oss.str();
-_outBuffer.insert(_outBuffer.end(), str.begin(), str.end());
-_inBuffer.clear();
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Typo textbodyjustfied

[Eike Rathke]

Hi julien2412,

On Wednesday, 2017-02-08 07:40:29 -0700, julien2412 wrote:

> sberg wrote
> > On 02/08/2017 12:09 PM, julien2412 wrote:
> >> is it ok to fix the missing "i" in "textbodyjustfied" or is it a typo
> >> we'll
> >> got to keep to preserve compatibility with existing docs?
> > 
> > ENOCONTEXT
> 
> There's no specific context (no bugtracker, no request on Irc or forum,
> ), just encountered this typo when reading code.
> 
> Now either I can change the typo in locations indicated by Opengrok see
> http://opengrok.libreoffice.org/search?q=textbodyjustfied&project=core&defs=&refs=&path=&hist=
> or I let as it because it'd break some documents.

It's a mistyped ODF attribute property name, so it's in the wild. Simply
changing it would break existing documents, and also new documents
couldn't be loaded in older releases. The best approach is to be able to
read both names for two releases, and then switch to writing the new
name in the third release.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Re: problem with vector and matrix tdf#89387

[Eike Rathke]

Hi,

On Thursday, 2017-02-09 17:58:03 +, Filippo giacchè wrote:

> I'm working on tdf#89387 for university assignment.. I'm trying to speed up
> matrix (ScMatrix) operations using mdds and I 'm changing
> ScInterpreter::ScGCD.
> The solution I have proposed here
> https://gerrit.libreoffice.org/#/c/32972/10/sc/source/core/tool/scmatrix.cxx
> work only for one array.
> For example when I'll insert "=GCD({3;6;9})" the result is correct , but if
> I'll insert "=GCD({6;6;6};{3;6;9})" the result is wrong (it return 6).
> Can someone tell me why this happens?

Just for completeness on the mailing list: this is not an issue anymore
with the patch of the change that obsoletes the one above
https://gerrit.libreoffice.org/34110
(you could btw have reused the same Change-Id to not create another
gerrit change with that patch set).

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[giacco]

 sc/inc/scmatrix.hxx  |6 +
 sc/qa/unit/ucalc_formula.cxx |   28 
 sc/source/core/inc/interpre.hxx  |3 
 sc/source/core/tool/interpr5.cxx |   43 +
 sc/source/core/tool/scmatrix.cxx |  125 +++
 5 files changed, 165 insertions(+), 40 deletions(-)

New commits:
commit c995531d8a7c97f684f2e65707c7b3f87a0ba372
Author: giacco 
Date:   Fri Feb 10 00:13:29 2017 +

tdf#89387 improve performance for some matrix operations

add method in scmatrix to get Gcd and lcm
modified function scinterpreter::ScGcd() and scinterpreter::ScLcm()
now should be ok

Change-Id: I1e41fa5707bc4b637a986f2fc0a2358ac0121af1
Reviewed-on: https://gerrit.libreoffice.org/34110
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 7fdcb1d..632205a 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -387,6 +387,8 @@ public:
 
 virtual double GetMaxValue( bool bTextAsZero ) const = 0;
 virtual double GetMinValue( bool bTextAsZero ) const = 0;
+virtual double GetGcd() const = 0;
+virtual double GetLcm() const = 0;
 
 virtual ScMatrixRef CompareMatrix(
 sc::Compare& rComp, size_t nMatPos, sc::CompareOptions* pOptions ) 
const = 0;
@@ -601,6 +603,8 @@ public:
 
 virtual double GetMaxValue( bool bTextAsZero ) const override;
 virtual double GetMinValue( bool bTextAsZero ) const override;
+virtual double GetGcd() const override;
+virtual double GetLcm() const override;
 
 virtual ScMatrixRef CompareMatrix(
 sc::Compare& rComp, size_t nMatPos, sc::CompareOptions* pOptions ) 
const override;
@@ -818,6 +822,8 @@ public:
 
 virtual double GetMaxValue(bool bTextAsZero) const override;
 virtual double GetMinValue(bool bTextAsZero) const override;
+virtual double GetGcd() const override;
+virtual double GetLcm() const override;
 
 virtual ScMatrixRef CompareMatrix(sc::Compare& rComp, size_t nMatPos, 
sc::CompareOptions* pOptions) const override;
 
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index cec64f1..1fde291 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -6976,6 +6976,20 @@ void Test::testFuncGCD()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("GCD should return Err:502 for a array with 
strings",
 OUString("Err:502"), aVal);
 
+//many inline array
+m_pDoc->SetString(aPos, "=GCD({6;6;6};{3;6;9})");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of GCD for failed", 3.0, 
m_pDoc->GetValue(aPos));
+m_pDoc->SetString(aPos, "=GCD({300;300;300};{150;0})");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of GCD for failed", 150.0, 
m_pDoc->GetValue(aPos));
+m_pDoc->SetString(aPos,"=GCD({3;6;9};{3;-6;9})");
+aVal = m_pDoc->GetString(aPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("GCD should return Err:502 for a array with 
values less then 0",
+OUString("Err:502"), aVal);
+m_pDoc->SetString(aPos, "=GCD({3;6;9};{\"a\";6;9})");
+aVal = m_pDoc->GetString(aPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("GCD should return Err:502 for a array with 
strings",
+OUString("Err:502"), aVal);
+
 // inline list of values
 m_pDoc->SetString(aPos, "=GCD(12;24;36;48;60)");
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of GCD for failed", 12.0, 
m_pDoc->GetValue(aPos));
@@ -7059,6 +7073,20 @@ void Test::testFuncLCM()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("LCM should return Err:502 for a array with 
strings",
 OUString("Err:502"), aVal);
 
+//many inline array
+m_pDoc->SetString(aPos, "=LCM({6;6;6};{3;6;9})");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of LCM for failed", 18.0, 
m_pDoc->GetValue(aPos));
+m_pDoc->SetString(aPos, "=LCM({300;300;300};{150;0})");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of LCM for failed", 0.0, 
m_pDoc->GetValue(aPos));
+m_pDoc->SetString(aPos,"=LCM({3;6;9};{3;-6;9})");
+aVal = m_pDoc->GetString(aPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("LCM should return Err:502 for a array with 
values less then 0",
+OUString("Err:502"), aVal);
+m_pDoc->SetString(aPos, "=LCM({3;6;9};{\"a\";6;9})");
+aVal = m_pDoc->GetString(aPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("LCM should return Err:502 for a array with 
strings",
+OUString("Err:502"), aVal);
+
 m_pDoc->SetString(aPos, "=LCM(12;24;36;48;60)");
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of LCM for failed", 720.0, 
m_pDoc->GetValue(aPos));
 m_pDoc->SetString(aPos, "=LCM(0;12;24;36;48;60)");
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 2a810ab..2004fd1 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -234,6 +234,7 @@ bool IsTableOpInRange( const ScRange& );
 sal_uLong GetCellNumberFormat( const ScAddress& rPos, ScRefCellValue& rCell );
 double ConvertStringToValue( const OUString& );
 

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=60270
Bug 60270 depends on bug 40788, which changed state.

Bug 40788 Summary: FORMATTING - Calc ignores manual breaks when "fit to number 
of pages" is chosen
https://bugs.documentfoundation.org/show_bug.cgi?id=40788

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/mysqlcppconn mysqlc/source

[Stephan Bergmann]

 external/mysqlcppconn/Library_mysqlcppconn.mk |9 +
 mysqlc/source/mysqlc_general.hxx  |7 +++
 2 files changed, 16 insertions(+)

New commits:
commit e16644fa1c042b56a1301f0476d7ddb71c8765ea
Author: Stephan Bergmann 
Date:   Thu Feb 16 18:11:24 2017 +0100

external/mysqlcppconn: Silence -Wdynamic-exception-spec errors

...with Clang in C++17 mode

Change-Id: If51c0788439688f6fbd77c1a05cb3295ac6e8cb4

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index e289482..70599b0 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -58,6 +58,15 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
 ))
 endif
 
+# Avoid -Wdynamic-exception-spec errors in Clang C++17 mode:
+ifeq ($(COM_IS_CLANG),TRUE)
+$(eval $(call gb_Library_add_cxxflags,mysqlcppconn, \
+$(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
+$(CXXFLAGS_CXX11)), \
+-Wno-error=dynamic-exception-spec) \
+))
+endif
+
 $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \
UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 5d0b828..d3e12ee 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -29,7 +29,14 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #endif
+#if defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
+#endif
 #include 
+#if defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
+#endif
 #if defined __GNUC__
 #pragma GCC diagnostic pop
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libcmis ucb/source

[Stephan Bergmann]

 external/libcmis/StaticLibrary_cmis.mk |4 
 ucb/source/ucp/cmis/auth_provider.hxx  |5 +
 ucb/source/ucp/cmis/certvalidation_handler.hxx |5 +
 ucb/source/ucp/cmis/cmis_content.hxx   |5 +
 ucb/source/ucp/cmis/cmis_url.cxx   |5 +
 5 files changed, 24 insertions(+)

New commits:
commit 14ed889c45eccb16647b4fe679db2deda53ddca5
Author: Stephan Bergmann 
Date:   Thu Feb 16 18:10:12 2017 +0100

external/libcmis: Silence -Wdynamic-exception-spec errors

...with Clang in C++17 mode

Change-Id: I50a0568c13e3e7a2d37ebd739d587985b2f9bc8a

diff --git a/external/libcmis/StaticLibrary_cmis.mk 
b/external/libcmis/StaticLibrary_cmis.mk
index eb5b4f5..4eb1c97 100644
--- a/external/libcmis/StaticLibrary_cmis.mk
+++ b/external/libcmis/StaticLibrary_cmis.mk
@@ -14,8 +14,12 @@ $(eval $(call 
gb_StaticLibrary_set_warnings_not_errors,cmislib))
 ifeq ($(COM_IS_CLANG),TRUE)
 # Avoid narrowing conversion error (even though the option is technically a 
warning)
 # caused by boost.
+# Also avoid -Wdynamic-exception-spec errors in C++17 mode.
 $(eval $(call gb_StaticLibrary_add_cxxflags,cmislib,\
 -Wno-error=c++11-narrowing \
+$(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
+$(CXXFLAGS_CXX11)), \
+-Wno-error=dynamic-exception-spec) \
 ))
 endif
 
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index 77fe436..6b80ec0 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -13,10 +13,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include 
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx 
b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 15547858..077b967 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -16,10 +16,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include 
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx 
b/ucb/source/ucp/cmis/cmis_content.hxx
index 366b1a4..acd45e8 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -28,10 +28,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include 
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 8f5f914..05351876 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -11,10 +11,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=60270
Bug 60270 depends on bug 40788, which changed state.

Bug 40788 Summary: FORMATTING - Calc ignores manual breaks when "fit to number 
of pages" is chosen
https://bugs.documentfoundation.org/show_bug.cgi?id=40788

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 compilerplugins/clang/redundantcast.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit be067003098c9a9537b713742d14d8f502a9c0b7
Author: Stephan Bergmann 
Date:   Thu Feb 16 17:56:08 2017 +0100

Silence loplugin:redundantcast false warning

...that is curiously only reported when building with clang -std=gnu++17:

> sc/qa/unit/ucalc_condformat.cxx:185:80: error: redundant const_cast from 
'ScConditionalFormat *' to 'const ScConditionalFormat *', result is implictly 
cast to 'const ScConditionalFormat *const' [loplugin:redundantcast]
> CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong conditional format instance.", 
pCheck, const_cast(pFormat));
> 
~~~^~~~
> workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:230:32: 
note: expanded from macro 'CPPUNIT_ASSERT_EQUAL_MESSAGE'
>   (actual),\
>   ~^~~
> 1 error generated.
> make[1]: *** [solenv/gbuild/LinkTarget.mk:270: 
workdir/CxxObject/sc/qa/unit/ucalc_condformat.o] Error 1

Change-Id: If2e8577bad4ec7454d584eb59106734d47f876ad

diff --git a/compilerplugins/clang/redundantcast.cxx 
b/compilerplugins/clang/redundantcast.cxx
index c7561a7..0525fa5 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -176,11 +176,13 @@ bool RedundantCast::VisitImplicitCastExpr(const 
ImplicitCastExpr * expr) {
 expr->getSubExpr()->IgnoreParenImpCasts());
 if (e != nullptr && !isRedundantConstCast(e)) {
 auto t1 = e->getSubExpr()->getType().getCanonicalType();
-auto t2 = expr->getType().getCanonicalType();
+auto t3 = expr->getType().getCanonicalType();
 bool ObjCLifetimeConversion;
-if (t1.getTypePtr() == t2.getTypePtr()
-|| compiler.getSema().IsQualificationConversion(
-t1, t2, false, ObjCLifetimeConversion))
+if (t1.getTypePtr() == t3.getTypePtr()
+|| (compiler.getSema().IsQualificationConversion(
+t1, t3, false, ObjCLifetimeConversion)
+&& (e->getType().getCanonicalType().getTypePtr()
+!= t3.getTypePtr(
 {
 report(
 DiagnosticsEngine::Warning,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 compilerplugins/clang/redundantcast.cxx  |   13 -
 compilerplugins/clang/test/redundantcast.cxx |4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 440720e14deb7020ba8d3158c3325c2d588664a1
Author: Stephan Bergmann 
Date:   Thu Feb 16 17:42:53 2017 +0100

loplugin:redundantcast: Avoid double warnings on some const_cast

Change-Id: I1e6140fef55054899dd32465726e804fc6006394

diff --git a/compilerplugins/clang/redundantcast.cxx 
b/compilerplugins/clang/redundantcast.cxx
index 6d18f2a..c7561a7 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -107,6 +107,12 @@ bool isVoidPointer(QualType type) {
 && type->getAs()->getPointeeType()->isVoidType();
 }
 
+bool isRedundantConstCast(CXXConstCastExpr const * expr) {
+return expr->getTypeAsWritten().getCanonicalType().getTypePtr()
+== (expr->getSubExprAsWritten()->getType().getCanonicalType()
+.getTypePtr());
+}
+
 class RedundantCast:
 public RecursiveASTVisitor, public loplugin::RewritePlugin
 {
@@ -168,7 +174,7 @@ bool RedundantCast::VisitImplicitCastExpr(const 
ImplicitCastExpr * expr) {
 {
 auto e = dyn_cast(
 expr->getSubExpr()->IgnoreParenImpCasts());
-if (e != nullptr) {
+if (e != nullptr && !isRedundantConstCast(e)) {
 auto t1 = e->getSubExpr()->getType().getCanonicalType();
 auto t2 = expr->getType().getCanonicalType();
 bool ObjCLifetimeConversion;
@@ -392,10 +398,7 @@ bool RedundantCast::VisitCXXConstCastExpr(CXXConstCastExpr 
const * expr) {
 if (ignoreLocation(expr)) {
 return true;
 }
-if (expr->getTypeAsWritten().getCanonicalType().getTypePtr()
-== (expr->getSubExprAsWritten()->getType().getCanonicalType()
-.getTypePtr()))
-{
+if (isRedundantConstCast(expr)) {
 report(
 DiagnosticsEngine::Warning, "redundant const_cast from %0 to %1",
 expr->getExprLoc())
diff --git a/compilerplugins/clang/test/redundantcast.cxx 
b/compilerplugins/clang/test/redundantcast.cxx
index 7af9716..e8be301 100644
--- a/compilerplugins/clang/test/redundantcast.cxx
+++ b/compilerplugins/clang/test/redundantcast.cxx
@@ -19,8 +19,8 @@ int main() {
 f1(const_cast(p1)); // expected-error {{redundant const_cast 
from 'char *' to 'char *const' [loplugin:redundantcast]}}
 f1(const_cast(p2));
 f1(const_cast(p2));
-f2(const_cast(p1)); // expected-error {{redundant const_cast from 
'char *' to 'char *', result is implictly cast to 'const char *' 
[loplugin:redundantcast]}} expected-error {{redundant const_cast from 'char *' 
to 'char *' [loplugin:redundantcast]}}
-f2(const_cast(p1)); // expected-error {{redundant const_cast 
from 'char *' to 'char *', result is implictly cast to 'const char *' 
[loplugin:redundantcast]}} expected-error {{redundant const_cast from 'char *' 
to 'char *const' [loplugin:redundantcast]}}
+f2(const_cast(p1)); // expected-error {{redundant const_cast from 
'char *' to 'char *' [loplugin:redundantcast]}}
+f2(const_cast(p1)); //  expected-error {{redundant 
const_cast from 'char *' to 'char *const' [loplugin:redundantcast]}}
 f2(const_cast(p1));
 f2(const_cast(p1));
 f2(const_cast(p2)); // expected-error {{redundant const_cast from 
'const char *' to 'char *', result is implictly cast to 'const char *' 
[loplugin:redundantcast]}}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf#50916 : Calc : Dynamic column container

[Eike Rathke]

Hi Dennis,

On Monday, 2017-02-06 17:57:32 +0530, Dennis Francis wrote:

> I have compiled a writeup @ https://niocs.github.io/LOBook/misc/16kcols.html 
> to
> help new contributors who want to work on this bug tdf#50916.
> I will try to keep it updated on new developments as more patches are added.

Thanks, but wouldn't the right place for that be our wiki instead?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[Stephan Bergmann]

 compilerplugins/clang/test/redundantcast.cxx |   32 +++
 solenv/CompilerTest_compilerplugins_clang.mk |1 
 2 files changed, 33 insertions(+)

New commits:
commit 6d3db33328fb2fec3539c828d062cad6d16d3195
Author: Stephan Bergmann 
Date:   Thu Feb 16 17:36:21 2017 +0100

Capture loplugin:redundantcast status-quo wrt const_cast

...including some double-warnings that'll get cleaned up shortly

Change-Id: I14e9796f2846a6bb61e4c93dfb23cba6488ea2e6

diff --git a/compilerplugins/clang/test/redundantcast.cxx 
b/compilerplugins/clang/test/redundantcast.cxx
new file mode 100644
index 000..7af9716
--- /dev/null
+++ b/compilerplugins/clang/test/redundantcast.cxx
@@ -0,0 +1,32 @@
+/* -*- 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/.
+ */
+
+void f1(char *) {}
+void f2(char const *) {}
+
+int main() {
+char * p1;
+char const * p2;
+p1 = nullptr;
+p2 = "";
+f1(const_cast(p1)); // expected-error {{redundant const_cast from 
'char *' to 'char *' [loplugin:redundantcast]}}
+f1(const_cast(p1)); // expected-error {{redundant const_cast 
from 'char *' to 'char *const' [loplugin:redundantcast]}}
+f1(const_cast(p2));
+f1(const_cast(p2));
+f2(const_cast(p1)); // expected-error {{redundant const_cast from 
'char *' to 'char *', result is implictly cast to 'const char *' 
[loplugin:redundantcast]}} expected-error {{redundant const_cast from 'char *' 
to 'char *' [loplugin:redundantcast]}}
+f2(const_cast(p1)); // expected-error {{redundant const_cast 
from 'char *' to 'char *', result is implictly cast to 'const char *' 
[loplugin:redundantcast]}} expected-error {{redundant const_cast from 'char *' 
to 'char *const' [loplugin:redundantcast]}}
+f2(const_cast(p1));
+f2(const_cast(p1));
+f2(const_cast(p2)); // expected-error {{redundant const_cast from 
'const char *' to 'char *', result is implictly cast to 'const char *' 
[loplugin:redundantcast]}}
+f2(const_cast(p2)); // expected-error {{redundant const_cast 
from 'const char *' to 'char *', result is implictly cast to 'const char *' 
[loplugin:redundantcast]}}
+f2(const_cast(p2)); // expected-error {{redundant const_cast 
from 'const char *' to 'const char *' [loplugin:redundantcast]}}
+f2(const_cast(p2)); // expected-error {{redundant 
const_cast from 'const char *' to 'const char *const' [loplugin:redundantcast]}}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/solenv/CompilerTest_compilerplugins_clang.mk 
b/solenv/CompilerTest_compilerplugins_clang.mk
index 7840b1e..85de035 100644
--- a/solenv/CompilerTest_compilerplugins_clang.mk
+++ b/solenv/CompilerTest_compilerplugins_clang.mk
@@ -17,6 +17,7 @@ $(eval $(call 
gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
 compilerplugins/clang/test/oslendian-1 \
 compilerplugins/clang/test/oslendian-2 \
 compilerplugins/clang/test/oslendian-3 \
+compilerplugins/clang/test/redundantcast \
 compilerplugins/clang/test/salbool \
 compilerplugins/clang/test/stringconstant \
 compilerplugins/clang/test/unnecessaryoverride-dtor \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: system-wide location for dictionary files and dictionary file name format

[Eike Rathke]

Hi Erik,

On Tuesday, 2017-02-14 22:28:45 +0100, Erik Quaeghebeur wrote:

> Hmm, it seems language tags such as ‘nl’ or ‘fr’ without a region
> component, and which are valid according to bcp47 are not recognized by
> LO. Is this a bug I should report?

See my earlier mail in reply to Khaled. It's probably a bug, and it
sounds like https://bugs.documentfoundation.org/show_bug.cgi?id=62738

> OK, but after reading through the bcp47 RFC, I have the impression that
> only private-use tags for the earlier French example could work:
> fr-x-classique, fr-x-moderne, fr-x-toutesvariantes, and fr-x-reforme1990
> then, with the possibility of registering fr-1990, it seems.

See Caolan's reply about length of subtag names.

> I've tried
> it, and they're not seen by LO. It seems nl-001 is picked up, but not
> recognized as ‘Worldwide’ Dutch, i.e., not listed as “Nederlands (001)”
> or something like it, but rather as “nl-001”.

Because there is no string resource for it. For tags without string
resource the plain tag is displayed. We might try to pull in
descriptions for languages, scripts and countries from various installed
packages, including ICU, liblangtag and iso-codes, but still may end up
with unknows, or, in some countries worse than not having any name at
all, with untranslated names.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[Kohei Yoshida]

 sc/source/ui/view/viewfunc.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3b24499324a149626a6b57ea8ec32bf2a5f84152
Author: Kohei Yoshida 
Date:   Fri Feb 10 22:48:41 2017 -0500

tdf#95306: Be sure to specify the entire range.

Especially in presence of multiple disjointed selections.

Change-Id: I8e7779824109c30e69fd43a2448ae900beaf28d3
Reviewed-on: https://gerrit.libreoffice.org/34140
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 
(cherry picked from commit 6d450aad0a8f82ee0320ffc3e76eefb43c16addb)
Reviewed-on: https://gerrit.libreoffice.org/34143
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ef317d7..0228541 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1871,8 +1871,8 @@ void ScViewFunc::SetWidthOrHeight(
 return;
 }
 
-SCCOLROW nStart = rRanges[0].mnStart;
-SCCOLROW nEnd = rRanges[0].mnEnd;
+SCCOLROW nStart = rRanges.front().mnStart;
+SCCOLROW nEnd = rRanges.back().mnEnd;
 
 bool bFormula = false;
 if ( eMode == SC_SIZE_OPTIMAL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - instsetoo_native/inc_common

[Andreas Kainz]

 instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico   
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico 
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico 
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico  
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico   
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico  
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico
|binary
 9 files changed

New commits:
commit 2e129c67dd220ca866c8e8a451d1a20b528ab6f9
Author: Andreas Kainz 
Date:   Thu Jan 12 15:23:21 2017 +0100

tdf#103677 Windows installer icons

Icons refreshed according Tango style

Change-Id: Ibb86ea0a7153f0ac7331d278b2dcd8f8c64835e7
Reviewed-on: https://gerrit.libreoffice.org/32998
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit a296a69c984b17cfbcd249cf6bdc191d08dff2a6)
Reviewed-on: https://gerrit.libreoffice.org/33943
Reviewed-by: Christian Lohmaier 

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico
index 1c6f14e..c57e3da 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico
index 324adbc..28506ef 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico
index ef88d2e..6ffe0b4 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico
index 3580448..8f7e900 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico
index 609276a..e15c79f 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico
index ac158ab..3d74e0d 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico 
differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico
index 2f4a24d..7224800 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico 
differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico
index f1cc808..7ee77b0 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico
index 5dc25fa..c976e38 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico 
and b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - writerperfect/CppunitTest_writerperfect_wpftimport.mk writerperfect/qa

[David Tardon]

 writerperfect/CppunitTest_writerperfect_wpftimport.mk |3 
 writerperfect/qa/unit/DrawImportTest.cxx  |  154 --
 writerperfect/qa/unit/DrawingImportTest.cxx   |  154 ++
 writerperfect/qa/unit/ImpressImportTest.cxx   |  154 --
 writerperfect/qa/unit/PresentationImportTest.cxx  |  154 ++
 writerperfect/qa/unit/SpreadsheetImportTest.cxx   |2 
 writerperfect/qa/unit/WpftFilterFixture.cxx   |7 
 writerperfect/qa/unit/WpftFilterFixture.hxx   |1 
 8 files changed, 312 insertions(+), 317 deletions(-)

New commits:
commit 463f764aa0bcf4930ac914e6ed367d95338c65b4
Author: David Tardon 
Date:   Thu Feb 16 17:09:01 2017 +0100

enable the other tests

Change-Id: I68a5435348a6a6362bc946c7eca18e29bd69724a

diff --git a/writerperfect/CppunitTest_writerperfect_wpftimport.mk 
b/writerperfect/CppunitTest_writerperfect_wpftimport.mk
index cb2c2c5..ed5187b 100644
--- a/writerperfect/CppunitTest_writerperfect_wpftimport.mk
+++ b/writerperfect/CppunitTest_writerperfect_wpftimport.mk
@@ -44,6 +44,9 @@ $(eval $(call 
gb_CppunitTest_use_rdbs,writerperfect_wpftimport,\
 $(eval $(call gb_CppunitTest_use_configuration,writerperfect_wpftimport))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,writerperfect_wpftimport,\
+   writerperfect/qa/unit/DrawingImportTest \
+   writerperfect/qa/unit/PresentationImportTest \
+   writerperfect/qa/unit/SpreadsheetImportTest \
writerperfect/qa/unit/TextImportTest \
writerperfect/qa/unit/wpftimport \
 ))
commit 4141483415745816050cb1e30b538d68792a
Author: David Tardon 
Date:   Wed Feb 15 15:50:08 2017 +0100

don't run terminate()

AFAICS no other import test is doing it either.

Change-Id: I8cbdc27fe60102067c6d09280b99a032ac44ba10

diff --git a/writerperfect/qa/unit/WpftFilterFixture.cxx 
b/writerperfect/qa/unit/WpftFilterFixture.cxx
index 106b28e..60708ce 100644
--- a/writerperfect/qa/unit/WpftFilterFixture.cxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.cxx
@@ -34,13 +34,6 @@ void WpftFilterFixture::setUp()
 m_xTypeMap.set(m_xTypeDetection, uno::UNO_QUERY_THROW);
 }
 
-void WpftFilterFixture::tearDown()
-{
-m_xDesktop->terminate();
-
-::test::BootstrapFixture::tearDown();
-}
-
 }
 }
 
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx 
b/writerperfect/qa/unit/WpftFilterFixture.hxx
index fde79c2..14ad4ea 100644
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
@@ -73,7 +73,6 @@ class WPFTQAHELPER_DLLPUBLIC WpftFilterFixture : public 
::test::BootstrapFixture
 {
 public:
 virtual void setUp() override;
-virtual void tearDown() override;
 
 protected:
 css::uno::Reference m_xDesktop;
commit 63c7f2b81e42a862803298cc3baeda01d816a19c
Author: David Tardon 
Date:   Thu Feb 16 16:49:47 2017 +0100

fix copypasta

Change-Id: Id3e33aec0a1c027d350408abb86a6a99da74ebb4

diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx 
b/writerperfect/qa/unit/DrawingImportTest.cxx
index 8b548c8..433c9a4 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -56,7 +56,7 @@ bool 
DrawingImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdgGen
 
 bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream &, 
rtl::OUString &rTypeName)
 {
-rTypeName = "WpftDummyText";
+rTypeName = "WpftDummyDrawing";
 return true;
 }
 
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx 
b/writerperfect/qa/unit/PresentationImportTest.cxx
index 091bc90..7c1154b 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -56,7 +56,7 @@ bool 
PresentationImportFilter::doImportDocument(librevenge::RVNGInputStream &, O
 
 bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &, 
rtl::OUString &rTypeName)
 {
-rTypeName = "WpftDummyText";
+rTypeName = "WpftDummyPresentation";
 return true;
 }
 
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx 
b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index d62e1e4..db78702 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -55,7 +55,7 @@ bool 
SpreadsheetImportFilter::doImportDocument(librevenge::RVNGInputStream &, Od
 
 bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream &, 
rtl::OUString &rTypeName)
 {
-rTypeName = "WpftDummyText";
+rTypeName = "WpftDummySpreadsheet";
 return true;
 }
 
commit 0f1a863c7542a121b006cff6b4151847b2a2ff95
Author: David Tardon 
Date:   Wed Feb 15 16:04:33 2017 +0100

rename to match text and spreadsheet tests

Change-Id: I614326cfe8ade8ea07822479cbc656db8e51c1b7

diff --git a/writerperfect/qa/unit/DrawImportTest.cxx 
b/writerperfect/qa/unit/DrawingImportTest.cxx
similarity index 

[Libreoffice-commits] core.git: 22 commits - include/svx sc/inc sc/sdi sc/source

[Caolán McNamara]

 include/svx/dialogs.hrc  |1 
 sc/inc/mid.hrc   |   30 
 sc/inc/sc.hrc|  573 
 sc/inc/scabstdlg.hxx |2 
 sc/inc/scfuncs.hrc   |2 
 sc/inc/scres.hrc |  553 
 sc/sdi/scslots.hrc   |1 
 sc/source/core/data/attrib.cxx   |1 
 sc/source/core/data/documen8.cxx |2 
 sc/source/core/data/dpoutput.cxx |2 
 sc/source/core/data/funcdesc.cxx |  111 
 sc/source/core/data/global.cxx   |2 
 sc/source/filter/html/htmlexp.cxx|4 
 sc/source/ui/Accessibility/AccessibleCellBase.cxx|2 
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx  |2 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|2 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |2 
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx  |2 
 sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx  |2 
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx   |2 
 sc/source/ui/Accessibility/AccessiblePreviewTable.cxx|2 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |2 
 sc/source/ui/Accessibility/AccessibleTableBase.cxx   |2 
 sc/source/ui/StatisticsDialogs/StatisticsDialogs.src |2 
 sc/source/ui/app/inputwin.cxx|2 
 sc/source/ui/app/scmod.cxx   |   94 
 sc/source/ui/app/typemap.cxx |1 
 sc/source/ui/attrdlg/scdlgfact.cxx   |   22 
 sc/source/ui/cctrl/checklistmenu.cxx |2 
 sc/source/ui/cctrl/checklistmenu.src |2 
 sc/source/ui/condformat/condformatdlgentry.cxx   |2 
 sc/source/ui/dbgui/asciiopt.hrc  |2 
 sc/source/ui/dbgui/consdlg.cxx   |2 
 sc/source/ui/dbgui/outline.src   |2 
 sc/source/ui/dbgui/pfiltdlg.cxx  |2 
 sc/source/ui/dbgui/pvfundlg.cxx  |2 
 sc/source/ui/dbgui/pvfundlg.src  |2 
 sc/source/ui/dbgui/scuiimoptdlg.cxx  |2 
 sc/source/ui/dbgui/tpsort.cxx|2 
 sc/source/ui/dbgui/tpsubt.cxx|2 
 sc/source/ui/dbgui/validate.cxx  |2 
 sc/source/ui/dialogs/searchresults.cxx   |2 
 sc/source/ui/docshell/docfunc.cxx|2 
 sc/source/ui/docshell/docsh.cxx  |4 
 sc/source/ui/docshell/docsh4.cxx |2 
 sc/source/ui/docshell/documentlinkmgr.cxx|2 
 sc/source/ui/drawfunc/drawsh.cxx |2 
 sc/source/ui/drawfunc/fuins1.cxx |2 
 sc/source/ui/drawfunc/graphsh.cxx|2 
 sc/source/ui/drawfunc/mediash.cxx|2 
 sc/source/ui/inc/acredlin.hrc|2 
 sc/source/ui/inc/condformatmgr.hxx   |2 
 sc/source/ui/inc/hfedtdlg.hxx|2 
 sc/source/ui/inc/miscdlgs.hrc|   24 
 sc/source/ui/inc/reffact.hxx |2 
 sc/source/ui/miscdlgs/autofmt.cxx|4 
 sc/source/ui/miscdlgs/conflictsdlg.cxx   |2 
 sc/source/ui/miscdlgs/conflictsdlg.src   |2 
 sc/source/ui/miscdlgs/crdlg.cxx  |2 
 sc/source/ui/miscdlgs/delcldlg.cxx   |2 
 sc/source/ui/miscdlgs/delcodlg.cxx   |2 
 sc/source/ui/miscdlgs/filldlg.cxx|2 
 sc/source/ui/miscdlgs/inscldlg.cxx   |2 
 sc/source/ui/miscdlgs/inscodlg.cxx   |2 
 sc/source/ui/miscdlgs/lbseldlg.cxx   |2 
 sc/source/ui/miscdlgs/mtrindlg.cxx   |2 
 sc/source/ui/miscdlgs/mvtabdlg.cxx   |2 
 sc/source/ui/miscdlgs/retypepassdlg.cxx  |2 
 sc/source/ui/miscdlgs/retypepassdlg.src  |2 
 sc/source/ui/miscdlgs/scuiautofmt.cxx|4 
 sc/source/ui/miscdlgs/shtabdlg.cxx   |2 
 sc/source/ui/miscdlgs/tabbgc

Re: system-wide location for dictionary files and dictionary file name format

[Eike Rathke]

Hi Khaled,

On Wednesday, 2017-02-15 15:35:59 +0200, Khaled Hosny wrote:

> On Wed, Feb 15, 2017 at 12:42:22PM +, Caolán McNamara wrote:
> > > Hmm, it seems language tags such as ‘nl’ or ‘fr’ without a region
> > > component, and which are valid according to bcp47 are not recognized
> > > by LO. Is this a bug I should report?
> > 
> > Only if you intend to work on solving it, is my opinion. It would be
> > nice to support a bare "language" dictionary and have it in use for all
> > variants unless there are more specific variants to use, but I don't
> > intend to do it myself, or think my way through hacking firefox,
> > enchant and the rest of the things that parse filenames in
> > /usr/share/myspell|hunspell to also support that.
> 
> Firefox has no problem using ar.{aff,dic} for Arabic, neither does
> gtkspell (or whatever GTK+ apps use). Only LibreOffice (and OpenOffice
> before it) has problem using such dictionaries, and it turn packagers
> duplicates the dictionary files to support LibreOffice e.g. the
> hunspell-ar package on Debian has tens of ar_XX.{aff,dic} symlinks just
> because of this.
> 
> This has long annoyed me, and I might give it a try if there are some
> code pointers.

Hum.. that might be related to how a language is mapped to a default
locale if there exists one with a country designator. It all happens in
i18nlangtag/source/languagetag/languagetag.cxx and
i18nlangtag/source/isolang/mslangid.cxx (where in the latter the tables
of known locales are).

However, there's LanguageTag::getFallbackStrings(), which using and
comparing against available dictionaries should work, and
LanguageTag::makeFallback() that returns a *known* *locale* (plus
getFallback() and getMatchingFallback() for different situations) which
currently may be used in the dictionary context but instead
getFallbackStrings() should be used. Try to grep for those.
If stuck ping me ;-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[David Tardon]

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

New commits:
commit 1a2feaf01cbd41e66c1d656276d072ca5c750b18
Author: David Tardon 
Date:   Thu Dec 15 10:36:18 2016 +0100

fix build with hunspell < 1.5

Change-Id: I66810d2bf9bbd08990dd8e995e34c50caa472ff8
(cherry picked from commit 64362ec119a4f38c98d2ff959a5651f4887ff942)
Reviewed-on: https://gerrit.libreoffice.org/34339
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index a47ab58..27b8f91 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

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Caolan, Heiko, JanI, Olivier, Norbert, Michael M, Xisco, Eike,
  Christian, Sophie, Stephan, Miklos, Thorsten, Michael S

* Completed Action Items:
+ add Mark Page  to committers (Norbert)

* Pending Action Items:
+ FOSDEM hack-fest attendees:
   + https://wiki.documentfoundation.org/Hackfest/FOSDEM2017#Achievements
   + so far - just two people added anything ...

* Release Engineering update (Christian)
+ 5.2.6 RC1
  + tagged 1 hour ago, we’re on track.
+ 5.3.1 RC1
  + prepared today – delayed by a week due to pootle
  + 1 fix wrt. Windows installer icons 
https://gerrit.libreoffice.org/#/c/33943/ 
  + no problem with docs impact (Olivier)
 => just merge it.
+ Android & iOS Remote
+ online (Michael)
  + online branch maintenance (Thorsten)
 + wondering for 5.3 – what’s the policy ?
 + not using gerrit much.
 + customer wants to do stabilization & bug-fixing
 - plan for one review in gerrit (Thorsten)
 + plan to do a 5.3.1 RC in a week (Michael)

* Bump master baseline from MSVC 2013 to 2015? (Stephan)
+ see mail 
 
“Support new and discontinue old compilers” from David O.
+ tried to contact all the buildbot / tinderbox owners
 + not contacted (Norbert)
  + installed 2015 on the box a year ago.
  + 64bit release worked, but all else failed.
 + Concerned that:
  + does release & dbgutil profiles build ?
  + VS 2013 parallel builds should work too – need to use 2013
 + bots using 2013 (Cloph, Thorsten)
 + failed try to build 2015 last week (Thorsten)
  + works for Stephan.
 + time to try it again.
+ Is 32bit tested ? - the concern here it seems.
 + otherwise eager to try again.
+ MSDN issue ? → solution to use Community Edition Visual Studio.
 + buy windows server licenses, scrape Office versions from here & 
there.
AI: + test build configuations (Norbert)
+ Is there any gain of functionality with 2015 ?
 + not that much (Stephan)
 + some unicode bits, some improved const_expr bits.
 + just avoiding technical debt.
 + de-duplicate python versions (Miklos)
+ Not aware of any loss of functionality (Stephan)

* Documentation (Olivier)
+ Release 5.3 has links to documentation site
   + Surge on the traffic from LO users: avg 300 unique visits/day
   + Most wanted Guide: Calc, 75 /week
   + Writer : 56 /week
   + Base: 52 / week
   + Draw: 38 / week
   + Getting started: 35/week
   + Countries (measured by locale of the UI)
  en-US: 794 entries
  de: 175 (redirected to wiki)
  fr: 172 (redirected to wiki)
  it: 146 
  ru: 136 (no entry page, NL team contacted)
  ja: 126 (no entry page, NL team contacted)
  es: 79
+ Help content modernization
   + meeting with bubli, kendy, cloph in Brussels
  + awaiting Pootle to come back to resume
  + Need some temporary reverts, to avois fuzzy state for translators
  + important patches to reorder images and objects in help pages 
(bubli, Gabor)
+ Next steps
   + resume HC modernization
   + Donate entry in Help menu tdf#105831
   + Finish Getting Started Guide 5.2 (“compile book”)
   + Start Calc Guide 5.x update (as per download rate above)

* UX Update (Heiko)
   + Bugzilla (topicUI) statistics
   252(252) (topicUI) bugs open, 478(478) (needsUXEval) needs to be 
evaluated by the UXteam
   + Updates:
   BZ changes   1 week   1 month3 months   12 months  
added  6(5) 17(3)  40(2)  499(5)  
commented 49(-5)   240(-16)   814(33)3787(27) 
  removed  0(0)  3(-2)  6(-1)  39(0)  
 resolved 32(26)48(16) 97(20) 190(5)  
   + top 10 contributors:
 Tietze, Heiko made 170 changes in 1 month, and 2098 changes in 1 year
 Faulí Tarazona, Xisco made 151 changes in 1 month, and 354 changes in 
1 year
 Buovjaga made 42 changes in 1 month, and 387 changes in 1 year
 Cor Nouws made 33 changes in 1 month, and 480 changes in 1 year
 Philips, Yousuf made 29 changes in 1 month, and 1641 changes in 1 year
 Foote, V Stuart made 27 changes in 1 month, and 672 changes in 1 year
 Iversen, Jan made 13 changes in 1 month, and 428 changes in 1 year
 Olivier R. made 11 changes in 1 month, and 15 changes in 1 year
 tommy27 made 10 changes in 1 month, and 91 changes in 1 year
 Mehrbrodt, Samuel made 10 changes in 1 month, and 211 changes in 1 year

  + donation link in help menu (assigned to Olivier)
  + discussed before wrt. changing the help menu
  + no-one disa

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - translations

[Christian Lohmaier]

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

New commits:
commit c574fe180cdc52df8cde5623a24aeb4a75ff5a1d
Author: Christian Lohmaier 
Date:   Thu Feb 16 16:14:59 2017 +0100

Updated core
Project: translations  ec0fc5710bf0de01ff618ba5e89458bce286961d

update translations for 5.3.1 rc1

and force-fix errors using pocheck

Change-Id: Iee1dc87c949d400b36b590d5dbcfc8b6434c3a46
(cherry picked from commit 83ab35b7b8dee968b2827220496920dbe84c3c16)

diff --git a/translations b/translations
index 694cb5b..ec0fc57 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 694cb5be945ceae5b8b51816fb92ee3e218a852f
+Subproject commit ec0fc5710bf0de01ff618ba5e89458bce286961d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit fd4dda1da2227ae23a2c991319083c214909fcdc
Author: Christian Lohmaier 
Date:   Thu Feb 16 16:14:59 2017 +0100

Updated core
Project: translations  83ab35b7b8dee968b2827220496920dbe84c3c16

update translations for 5.3.1 rc1

and force-fix errors using pocheck

Change-Id: Iee1dc87c949d400b36b590d5dbcfc8b6434c3a46

diff --git a/translations b/translations
index f6f8045..83ab35b7b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f6f80453277b09ee87688949dce31fb350d068c0
+Subproject commit 83ab35b7b8dee968b2827220496920dbe84c3c16
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: system-wide location for dictionary files and dictionary file name format

[Eike Rathke]

Hi,

On Wednesday, 2017-02-15 12:42:22 +, Caolán McNamara wrote:

> Yeah, "your mileage may vary" I guess kicks in there. The main "real-
> world" use case for BCP47 is to distinguish Cyrillic vs Latin Serbian.
> Couple of things. Firstly, you only get 8 letters for the part after x-
> so fr-x-moderne is valid bcp-47 while fr-x-classique is not (but fr-x-
> classiqu would be). If I add fr-x-classiqu.aff|dic then I see they are
> successfully added to the list of dictionaries available to
> LibreOffice.
> 
> Secondly, what the rest of LibreOffice does with this then is probably
> still a little unclear in parts. I see that in our format character
> dialog where we can directly enter bcp47 that I can successfully enter
> a tag like de-1996 but not fr-x-whatever so it appears the the private
> use tags are not allowed there for some additional reason I don't know
> (@erack?)

That's forced on purpose because it's unclear what should actually
happen with arbitrary invented privateuse tags. If those end up in
a document, loading them in another environment may likely be
unsupported or even map to a completely different thing, that's the
"private" in privateuse ... by definition of BCP47.

What we could do however is to check against already known on-the-fly
tags that were registered during loading dictionaries, and then *assume*
the system and user know what is done if it matches.

Best of course would be if someone registered proper French
classiq/moderne subtags with IANA instead of coming up with some x-...
mess. See http://www.langtag.net/register-new-subtag.html

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: .gitignore ios/CustomTarget_Lo_Xcconfig.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/experimental ios/.gitignore ios/lo.xcconfig.in

[jan Iversen]

 .gitignore 
|2 
 ios/.gitignore 
|3 
 ios/CustomTarget_Lo_Xcconfig.mk
|  138 
 ios/CustomTarget_TiledLibreOffice_app.mk   
|  100 
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj   
| 1861 --
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledLibreOffice-Info.plist 
|6 
 ios/lo.xcconfig.in 
|2 
 7 files changed, 1018 insertions(+), 1094 deletions(-)

New commits:
commit 7a8bfd1041179997269ca02ba156136cf8b622b5
Author: jan Iversen 
Date:   Sat Feb 11 19:31:45 2017 +0100

ios, prepare for multiple targets.

Moved common macros to CustomTarget_Lo_Xcconfig.mk
to simplify each real target

added link to workdir/ios (needed by xcodeproj)

moved creation of configuration files to LO_Xcconfig, since
they are identical for all ios projects

central part of moving non git files to workdir completed

changed relative path in project.pbxproj to be  instead of 

Change-Id: I6be51f4d8a07ea7da08c0e5f1458fccfc3831a1e
Reviewed-on: https://gerrit.libreoffice.org/34223
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/.gitignore b/.gitignore
index d3be78c..1b954b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,7 +127,6 @@ xcuserdata
 *.xccheckout
 *.moved-aside
 DerivedData
-*.xcodeproj
 *.xcworkspace
 
 # MSVS specific
@@ -136,7 +135,6 @@ DerivedData
 *.sln
 *.v11*
 *.v12*
-*.vcxproj*
 *.opensdf
 !windows/*.sln
 !windows/*.vcxproj*
diff --git a/ios/.gitignore b/ios/.gitignore
index 08c6a68..4c274d7 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -6,4 +6,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-/lo.xcconfig
+ioswork
+lo.xcconfig
diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk
index 8670355..75a6cb0 100644
--- a/ios/CustomTarget_Lo_Xcconfig.mk
+++ b/ios/CustomTarget_Lo_Xcconfig.mk
@@ -6,35 +6,135 @@
 # 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/.
 
+#- Env 
+IOSWORK := $(BUILDDIR)/workdir
+IOSDIR := $(IOSWORK)/ios
+IOSRESOURCE := $(IOSDIR)/resources
+IOSGENERATED := $(IOSDIR)/generated
+IOSLINK := $(SRCDIR)/ios/ioswork
+LO_XCCONFIG = $(IOSGENERATED)/lo.xcconfig
+
+
+#- Macros to be used, in each target --
+define IOSbuild
+   CC=; \
+   $(call gb_Helper_print_on_error, \
+   xcodebuild \
+   -project $(SRCDIR)/ios/experimental/$(1)/$(1).xcodeproj 
\
+   -target $(1) \
+   -sdk $(XCODEBUILD_SDK) \
+   -arch $(XCODE_ARCHS) \
+   -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
+   $(2) \
+   , $(IOSDIR)/$(1).log \
+)
+endef
+
+
 $(eval $(call gb_CustomTarget_CustomTarget,ios/Lo_Xcconfig))
 
-LO_XCCONFIG = $(BUILDDIR)/ios/lo.xcconfig
 
 $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig): $(LO_XCCONFIG)
 
 .PHONY : $(LO_XCCONFIG)
 
 $(LO_XCCONFIG) :
-# Edit the Xcode configuration file:
-# - the list of all our (static) libs
-# - compiler flags
-#
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+
+   # prepare work directories for all ios builds
+   rm -rf $(IOSRESOURCE) $(IOSLINK) 2>/dev/null;
+   mkdir -p $(IOSDIR) $(IOSGENERATED) $(IOSRESOURCE) 
$(IOSRESOURCE)/services;
+   ln -s $(IOSWORK) $(IOSLINK)
+
+   # generate file with call declarations
+   $(SRCDIR)/solenv/bin/native-code.py \
+   -g core -g writer -g calc -g draw -g edit \
+   > $(IOSGENERATED)/native-code.mm
+
+   # generate resource files used to start/run LibreOffice
+   # copy rdb files
+   cp $(INSTDIR)/program/types.rdb $(IOSRESOURCE)/udkapi.rdb
+   cp $(INSTDIR)/program/types/offapi.rdb  $(IOSRESOURCE)
+   cp $(INSTDIR)/program/types/oovbaapi.rdb$(IOSRESOURCE)
+   cp $(INSTDIR)/program/services/services.rdb $(IOSRESOURCE)/services
+   cp $(INSTDIR)/program/services.rdb  $(IOSRESOURCE)
+
+   # copy .res files
+   # program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,
+   # we could set STAR_RESOURCE_PATH instead. sigh...
+   mkdir -p $(IOSRESOURCE)/program/resource
+   cp $(INSTDIR)/program/resource/*en-US.res 
$(IOSRESOURCE)/program/resource
+
+   # soffice.cfg
+   mkdir -p $(IOSRESOURCE)/share/config
+   cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRESOURCE)/share/config
+
+   # Japanese and Chinese dict files
+   cp $(WORK

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

[Tor Lillqvist]

 include/xmloff/autolayout.hxx |   80 ++
 sd/inc/pres.hxx   |   58 ---
 sd/source/core/sdpage.cxx |2 
 sd/source/filter/ppt/pptin.cxx|6 -
 sd/source/ui/controller/slidelayoutcontroller.cxx |2 
 sd/source/ui/func/fuexpand.cxx|2 
 sd/source/ui/func/fusumry.cxx |2 
 sd/source/ui/sidebar/LayoutMenu.cxx   |2 
 sd/source/ui/view/outlview.cxx|4 -
 sd/source/ui/view/viewshe3.cxx|2 
 xmloff/source/draw/sdxmlexp.cxx   |3 
 xmloff/source/draw/ximpstyl.cxx   |3 
 12 files changed, 97 insertions(+), 69 deletions(-)

New commits:
commit 7ecbffb3e4879d2fbcf6b20e57d37b8eb1efa660
Author: Tor Lillqvist 
Date:   Thu Feb 16 16:20:18 2017 +0200

Move AutoLayout enum definition to its own file, and start de-duplicating it

The mysteriously named AUTOLAYOUT_ENUM had the same value as
AUTOLAYOUT_TITLE_CONTENT, and was marked as "deprecated", so just use
the latter instead. Use it also in xmloff instead of the magic number
1 in places where comments indicated that AUTOLAYOYT_ENUM was what the
1 meant.

Will continue with the other "deprecated" and duplicated enumerators
later. (Or you feel free.)

Change-Id: Id5d70e07d30b3bf0d62e5d8719edb784bd23f99d

diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
new file mode 100644
index 000..83c8c53
--- /dev/null
+++ b/include/xmloff/autolayout.hxx
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_XMLOFF_AUTOLAYOUT_HXX
+#define INCLUDED_XMLOFF_AUTOLAYOUT_HXX
+
+enum AutoLayout
+{
+// new layouts with enum/text/chart/org/clip merged to content
+AUTOLAYOUT_START = 0,
+AUTOLAYOUT_TITLE = 0,   ///< Title Slide
+AUTOLAYOUT_TITLE_CONTENT = 1,   ///< Title, Content
+AUTOLAYOUT_TITLE_2CONTENT = 3,  ///< Title and 2 Content
+AUTOLAYOUT_TITLE_ONLY = 19, ///< Title Only
+AUTOLAYOUT_NONE = 20,   ///< Blank Slide
+AUTOLAYOUT_ONLY_TEXT = 32,  ///< Centered Text
+AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12, ///< Title, Content and 2 
Content
+AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15, ///< Title, 2 Content and 
Content
+AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT = 16,///< Title, 2 Content over 
Content
+AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, ///< Title, Content over 
Content
+AUTOLAYOUT_TITLE_4CONTENT = 18, ///< Title, 4 Content
+AUTOLAYOUT_TITLE_6CONTENT = 34, ///< Title, 6 Content
+AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT = 27, ///< Vertical Title, 
Vertical Content over Vertical Content
+AUTOLAYOUT_VTITLE_VCONTENT = 28,///< Vertical Title, Vertical 
Content over Vertical Content
+AUTOLAYOUT_TITLE_VCONTENT = 29, ///< Title, Vertical Content
+AUTOLAYOUT_TITLE_2VTEXT = 30,   ///< Title, 2 Vertical Content
+
+// deprecated
+AUTOLAYOUT_CHART = 2,
+AUTOLAYOUT_2TEXT = 3,
+AUTOLAYOUT_TEXTCHART = 4,
+AUTOLAYOUT_ORG = 5,
+AUTOLAYOUT_TEXTCLIP = 6,
+AUTOLAYOUT_CHARTTEXT = 7,
+AUTOLAYOUT_TAB = 8,
+AUTOLAYOUT_CLIPTEXT = 9,
+AUTOLAYOUT_TEXTOBJ = 10,
+AUTOLAYOUT_OBJ = 11,
+AUTOLAYOUT_TEXT2OBJ = 12,
+AUTOLAYOUT_OBJTEXT = 13,
+AUTOLAYOUT_OBJOVERTEXT = 14,
+AUTOLAYOUT_2OBJTEXT = 15,
+AUTOLAYOUT_2OBJOVERTEXT = 16,
+AUTOLAYOUT_TEXTOVEROBJ = 17,
+AUTOLAYOUT_4OBJ = 18,
+AUTOLAYOUT_ONLY_TITLE = 19,
+AUTOLAYOUT_NOTES = 21,
+AUTOLAYOUT_HANDOUT1 = 22,
+AUTOLAYOUT_HANDOUT2 = 23,
+AUTOLAYOUT_HANDOUT3 = 24,
+AUTOLAYOUT_HANDOUT4 = 25,
+AUTOLAYOUT_HANDOUT6 = 26,
+AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART = 27,
+AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE = 28,
+AUTOLAYOUT_TITLE_VERTICAL_OUTLINE = 29,
+AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30,
+AU

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

[brainbreaker]

 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ba0f920cc141eb6ab896f650e9ac7b25ffe073a5
Author: brainbreaker 
Date:   Sun Feb 12 11:42:38 2017 +0530

Fixed the runtime crash of app by catching exception

Steps to reproduce crash: Click on remote server option in navigation menu, 
in case of invalid server URL it will show a toast. Then click on Storage 
Provider Settings once and press back, app will crash throwing runtime 
exception.
The exception is not catched anywhere so Java runtime exits the app

Change-Id: I2bccca633e62fec82c868661f14765596c4b83f1
Reviewed-on: https://gerrit.libreoffice.org/34166
Tested-by: Jenkins 
Reviewed-by: Aleksandar Stefanović 

diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 6921eeb..3393484 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -147,6 +147,8 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 recentFiles.add(documentProvider.createFromUri(new 
URI(recentFileString)));
 } catch (URISyntaxException e) {
 e.printStackTrace();
+} catch (RuntimeException e){
+e.printStackTrace();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/clientnb.cpp net/loolnb.cpp

[Michael Meeks]

 net/clientnb.cpp |   54 ++
 net/loolnb.cpp   |   14 --
 2 files changed, 46 insertions(+), 22 deletions(-)

New commits:
commit dc52b96aa756198e75d0fe85a7bbb8db1acf7496
Author: Michael Meeks 
Date:   Thu Feb 16 14:14:12 2017 +

Websocket client test with WS=1

diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index aa123e9..de6576c 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -39,6 +40,7 @@
 using Poco::Net::HTTPClientSession;
 using Poco::Net::HTTPRequest;
 using Poco::Net::HTTPResponse;
+using Poco::Net::WebSocket;
 using Poco::Runnable;
 using Poco::Thread;
 using Poco::URI;
@@ -107,6 +109,15 @@ struct Session
 }
 return number;
 }
+
+std::shared_ptr getWebSocket()
+{
+_session->setTimeout(Poco::Timespan(10, 0));
+HTTPRequest request(HTTPRequest::HTTP_GET, "/ws");
+HTTPResponse response;
+return std::shared_ptr(
+new WebSocket(*_session, request, response));
+}
 };
 
 struct ThreadWorker : public Runnable
@@ -151,25 +162,44 @@ struct Client : public Poco::Util::Application
 snakes[i].join();
 }
 
+void testWebsocket()
+{
+Session session("ws");
+std::shared_ptr ws = session.getWebSocket();
+for (size_t i = 0; i < 10; i++)
+{
+ws->sendFrame(&i, sizeof(i), WebSocket::SendFlags::FRAME_BINARY);
+size_t back[5];
+int flags = 0;
+int recvd = ws->receiveFrame((void *)back, sizeof(back), flags);
+assert(recvd == sizeof(size_t));
+assert(back[0] == i + 1);
+}
+}
+
 public:
 int main(const std::vector& /* args */) override
 {
-Session first("init");
-Session second("init");
-
-int count = 42, back;
-first.sendPing(count);
-second.sendPing(count + 1);
+if (getenv("WS"))
+testWebsocket();
+else
+{
+Session first("init");
+Session second("init");
 
-back = first.getResponse();
-assert (back == count + 1);
+int count = 42, back;
+first.sendPing(count);
+second.sendPing(count + 1);
 
-back = second.getResponse();
-assert (back == count + 2);
+back = first.getResponse();
+assert (back == count + 1);
 
-testLadder();
-testParallel();
+back = second.getResponse();
+assert (back == count + 2);
 
+testLadder();
+testParallel();
+}
 return 0;
 }
 };
diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index 5c61a78..01fc3c5 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -210,15 +210,6 @@ void server(SocketPoll& clientPoller)
 }
 }
 
-/// Poll client sockets and do IO.
-void pollAndComm(SocketPoll& poller, std::atomic& stop)
-{
-while (!stop)
-{
-poller.poll(5000);
-}
-}
-
 int main(int, const char**)
 {
 // Used to poll client sockets.
@@ -227,7 +218,10 @@ int main(int, const char**)
 // Start the client polling thread.
 Thread threadPoll([&poller](std::atomic& stop)
 {
-pollAndComm(poller, stop);
+while (!stop)
+{
+poller.poll(5000);
+}
 });
 
 // Start the server.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 chart2/qa/extras/chart2dump/chart2dump.cxx 
 |   11 ++---
 chart2/qa/extras/chart2dump/data/axis_special_positioning.odp  
 |binary
 chart2/qa/extras/chart2dump/data/default_formated_axis.odp 
 |binary
 chart2/qa/extras/chart2dump/data/formated_axis_lines.odp   
 |binary
 chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp   
 |binary
 
chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
 |   20 -
 
chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
|   20 -
 chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt 
 |   22 +-
 chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt 
 |   20 -
 dev/null   
 |binary
 10 files changed, 47 insertions(+), 46 deletions(-)

New commits:
commit 7bb3643c6da11c580f4db64e3f052e97e59cdbe1
Author: Tamás Zolnai 
Date:   Thu Feb 16 14:56:19 2017 +0100

ChartDumpTest: Convert some of the test documents from ods to odp

Let's see random test failures are related to calc.

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

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index ba1d83b..db18512 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -571,17 +571,18 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
 {
 const std::vector aTestFiles =
 {
-"default_formated_axis.ods",
-"axis_special_positioning.ods",
-"formated_axis_lines.ods",
-"rotated_axis_labels.ods"
+"default_formated_axis.odp",
+"axis_special_positioning.odp",
+"formated_axis_lines.odp",
+"rotated_axis_labels.odp"
 };
 
 for (const OUString& sTestFile : aTestFiles)
 {
 setTestFileName(sTestFile);
 load(getTestFileDirName(), getTestFileName());
-uno::Reference< chart::XChartDocument > 
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+uno::Reference< chart::XChartDocument > 
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xChartDoc.is());
 uno::Reference 
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
 uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
 uno::Reference xShapes(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
diff --git a/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp 
b/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp
new file mode 100755
index 000..568dd5c
Binary files /dev/null and 
b/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp differ
diff --git a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods 
b/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods
deleted file mode 100755
index 0dfa9f2..000
Binary files a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods 
and /dev/null differ
diff --git a/chart2/qa/extras/chart2dump/data/default_formated_axis.odp 
b/chart2/qa/extras/chart2dump/data/default_formated_axis.odp
new file mode 100755
index 000..869f7e3
Binary files /dev/null and 
b/chart2/qa/extras/chart2dump/data/default_formated_axis.odp differ
diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp 
b/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp
new file mode 100755
index 000..f6a1cc8
Binary files /dev/null and 
b/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp differ
diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods 
b/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods
deleted file mode 100755
index 02c317a..000
Binary files a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods and 
/dev/null differ
diff --git a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp 
b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp
new file mode 100755
index 000..4314c45
Binary files /dev/null and 
b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp differ
diff --git 
a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
 
b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
index 09eb0d7..4c444c9 100755
--- 
a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
+++ 
b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
@@ -1,16 +1,16 @@
 /// CID/D=0:CS=0:Axis=0,0
 // aAxisPosition.X
-4438
+3469
 // aAxisPosition.Y
-1092
+1303
 // aAxisSize.Height
-645
+300
 // aAxisSize.Width
-14869
+11625

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

[Henry Castro]

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

New commits:
commit d4570130fe368caa42442f2e635d5d8ac181266f
Author: Henry Castro 
Date:   Thu Feb 16 09:46:17 2017 -0400

loleaflet: fix annotation author name

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index 92ee3f6..26d0a76 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -273,7 +273,7 @@ L.Map.include({
this._docLayer._annotations.add({
text: '',
textrange: '',
-   author: _('You'),
+   author: this.getViewName(this._docLayer._viewId),
dateTime: new Date().toDateString(),
id: 'new',
anchorPos:  
this._docLayer._latLngToTwips(this._docLayer._visibleCursor.getNorthWest())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.2.6.1'

[Christian Lohmaier]

Tag 'libreoffice-5.2.6.1' created by Christian Lohmaier 
 at 2017-02-16 13:42 +

Tag libreoffice-5.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYpawrAAoJEPQ0oe+v7q6joH4P/1tiSxrTpTjpc3FZXLj3EK06
joMYe5/Uwd9upsCIiAcngwSUo3e/OGc8k+T3B8vemLz26E7usOz8Tc3S8YFVXrFk
8X75NS8vYLHMUevRcMz6f/xd4vI71gYSY+sDW5yqf0x9+kC2MpNRiC1WW6occW+y
WEcYAE23Jrv/rUzZfmGKNSYC/GogoBb3WkDalax/2MzzRYZnqmr/wydd37x5xN+V
LYgWgA9qKxjPOa4WGZNG67p5d9wwZUX4Jo7Q+vt/krCRK0SpOa++BrtbNiPCF+sU
PJFOCmaCXMxI/FyBJiyIcmWS0q6hSAuMsbujQvDcJXtM4aDRSu2enC69v0W41rMX
/gMS2eODbYtWtcre8Mg1/vDKBlj8l5it30SyTE4DH97wo12sX/uWTacDfSTb3n9b
iYfBdhauykz7Z8IIiVmZloIa2VKV1NBUWsxo1hUs/IgOklGpx6gN7RRt349lOTL7
QH9zADYU2DV0E9t8JPn2r7xlYBiCEQGwcjizZ/zRnFqlylIgW7zgf53pQjOkNxQR
L2wmqOTIV+oBVujHmbAQC2Vjm7btSD6lUsjAb9+1+u8S9vKzGlgrWC7AE5K4AC3F
lr+Yj5f/lIpVGsGM3HFebD9V4gT22JMhSKfghtWRRGL+/Jura8T4X77N8rZXGHt8
Va9zZmepep6A2m3ZfzVe
=oLe3
-END PGP SIGNATURE-

Changes since libreoffice-5-2-branch-point-20:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.2.6.1'

[Christian Lohmaier]

Tag 'libreoffice-5.2.6.1' created by Christian Lohmaier 
 at 2017-02-16 13:41 +

Tag libreoffice-5.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYpawnAAoJEPQ0oe+v7q6jGAcP/RO7AJxgRvlL7/mquKdZDF/l
KWvqm6DA2jEKE/FKKgZ/KjnT8Tfs/lpf1UacbpwXo//WuS6Bhad72jpqTj15XlGn
xyr0GI2Vn3K+HJXq9BaYOhlu1qs0RTTQniYitsIeG06fvSwfsx8utAT9JigBzEs3
CjUp14wpHLmTB1fn46aOG1Eh5Ib77xIAniPeSqFM6btdpNQZD8SwC5TzDprNs4jB
m1K/IytiC9I8H8frb/8srBvxh3GIcBzaFgHdGKvAtQDdhoSJuRQQ66j8kg4oC7Jo
B3yNLa+XuWV+VBcO2mKIdXlp5maDov23iGkSYI8kVyM2vDAKMoBMqYLpZU4aCqcE
yiU3ZekfwuUAE0MtQsWYILJ2RKOTYomDMcUVMSrlW2/4akuBQ0XMI9hTsFqp+n77
mz8H27sfuXzyob04J13neQydzn75YXpBY47QufuQyya5St+G3dWgYax6lsds3tWh
RsMCsZbaDJJE9J5/CXpYEen/CxyQ/g9RDpTJsYfwm0v3h9st5ng/Sz8hSBJwxxgN
44s1ZUOVBDdekoTWAelgSjO6nBIEH1DnFxhFQ0fCeJh4aI0V8k1TETpSemimdvXF
JAoIXftZQ+Ctdz65vRGFN7G9OdXGkmn6Ekq86F7eiK0VRApQqZcJTVLVM2pyJdgW
m4diyzrcP6e02zXvtc6m
=2jRM
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-8:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.2.6.1'

[Christian Lohmaier]

Tag 'libreoffice-5.2.6.1' created by Christian Lohmaier 
 at 2017-02-16 13:42 +

Tag libreoffice-5.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYpawuAAoJEPQ0oe+v7q6jTN4P/Ray1EYCO1xmwT07Nd690IE5
TDM8AWJSMgJComJwZnyCf/6yK47Kou6JtSzrTrtsGS2iv8CKpPsTunI7eu7sWamp
3RolPjEV2lRF9NVzWu1dBe6jzMTC/MDHU4QO3M1NMv9izGTMsZV/kohx+XzbHnfw
rBiPF1hVPWfRfnXsakHO9ZRnYUKcGfyhaR/LTaUtM6XfrEN+hzl4qBH9AfOz4WDm
iGiPpTrVb/O39gvWCVMrBZ7rCaIobcDZIvKkGhRda1N4yPK1lFZiaTp2ejYQye+S
JrVsVZuW41aptlxQLBskhySH8tsPWE9M8Bl+VuDQhyCuUAuSnLU+aGIHIyz940jm
QxrlXRJaeTpqkhdN9gPD+DSoOOkNynUCLgx4Ssb2yJoqujp48gN+d8dRgfc2tFyf
9YXUZ24DZS/NRXI4E0fIDmaW6KKjhn22DVBoa4en44dgJSTEID99/NYC6OhKIOi9
Cy54AkoyQ5Zfngtu434zp4fTmfXqVdlhXdWilYvwtC6ZugbCdTUcpQOK+DNhzXFb
EZedX2DIjtd5Fmzm00WET1oMOFoxfb+rvXEJQsplYgG5gODxKl/e/mW3HmN0xbIL
HMSfOWwpFARQOYsU3VAHwdhV+EnL98tu3oWx/PrOO+6wBj0OLGqeI74vA6a4EwQL
77U2unwJSbjmpdxFlAFG
=QFLS
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-25:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.2.6.1'

[Christian Lohmaier]

Tag 'libreoffice-5.2.6.1' created by Christian Lohmaier 
 at 2017-02-16 13:42 +

Tag libreoffice-5.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYpawxAAoJEPQ0oe+v7q6jkPEQAJ57YrL+KBhgpqiQUPIxN16j
MK8LVYUBYizpPUaNtukYOlAacocGZ/ruG1fWaZETUjQe6i4J/oRNeWWgzGb1u/uF
0uIXabdNtZRsCNOiSv3EnFr83tCXWqZSLJ9D+SogkFshQo21vwWo1Ge+UP9B2eJW
hYdyvuJ8zXfIoRP804esR+IktXfBs5uOML6QOn9mPSjnhHVMHM3DNHQKZfVT++IM
YXy4/0p8hm6mX/mvG15iYB6Ja0D6nFG44Pk6EgSX8tVZeD9xiTyX/kZ2Efe+pMAN
9H5ncq/xQx1wyEIR58c5T7X7JUVi1vtPCF70RTNS0nwN3rZotJhAtHC3gdPFcKIc
oyXob0EL0m1hPow5x+N2rqL8LShNA3G9eBnd4fRih4ux8k62YbBIm5MKAe0u+2X4
xl5IMBhFSb9q5ud0vFwjgFcQwAU2N0DpEZK8ujHD1p/hsPJGoNOzmdp5voqbI2dL
5e0zJzZ4bbhgp99MrpR8isHUDFvbaik/2YcXXCLr/kt0NU3SEjaeM8Jl+8QqIIjN
meDWLMyDl0RmdpitPyJfxI6fa49HoJk8YIT11xs1jRzrYe51fPSfoyOVqNgY+TZE
hYezYljLDuxvS/xOQn2PtFMbwE05Hx6u45GasIoV9zxptWDpzyuJ4o5gBdeImjti
2IZ6Wbh9daJAxF4SXrwx
=i7Ap
-END PGP SIGNATURE-

Changes since libreoffice-5-2-branch-point-1024:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-6' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a83313389f791c1f9c420cba7babd0dc59f46cd4
Author: Christian Lohmaier 
Date:   Thu Feb 16 14:42:42 2017 +0100

bump product version to 5.2.6.1.0+

Change-Id: I7b8f082c19ce9aa08e208810982af84057929db2

diff --git a/configure.ac b/configure.ac
index 5c12d1d..903f6ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.2.6.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.2.6.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 176b1bc9b78d8baebb8625052d652e08992bc48a
Author: Christian Lohmaier 
Date:   Thu Feb 16 14:40:42 2017 +0100

bump product version to 5.2.7.0.0+

Change-Id: Ib6041de6724961c2b981c5f82a961a414ae5cc93

diff --git a/configure.ac b/configure.ac
index 5c12d1d..f928d5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.2.6.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.2.7.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-5-2-6'

[Christian Lohmaier]

New branch 'libreoffice-5-2-6' available with the following commits:
commit 69b2457ae58285800ecce058fc5218dd9ebbe4c3
Author: Christian Lohmaier 
Date:   Thu Feb 16 14:38:51 2017 +0100

Branch libreoffice-5-2-6

This is 'libreoffice-5-2-6' - the stable branch for the 5.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic882804b6e14b78fa6a6065872864acffe574d48

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

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

[Stephan Bergmann]

 external/firebird/ExternalProject_firebird.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8ea07101c1613d213fd7cea17f094a947b14cd00
Author: Stephan Bergmann 
Date:   Thu Feb 16 14:25:15 2017 +0100

external/firebird: Work around operator new alignment violations

...causing problems at least when building with recent Clang trunk on
x86_64-unknown-linux-gnu:

> make[5]: Entering directory 'workdir/UnpackedTarball/firebird/gen'
> rm -f metadata.fdb
> core/workdir/UnpackedTarball/firebird/gen/Release/firebird/bin/isql -q -i 
workdir/UnpackedTarball/firebird/src/dbs/metadata.sql
> Makefile:325: recipe for target 'metadata.fdb' failed
> make[5]: *** [metadata.fdb] Segmentation fault (core dumped)

See the mail thread starting at


"[Firebird-devel] alloc.h global operator new replacement violating 
alignment
requirements".  With DEBUG_GDS_ALLOC defined, the allocation functions 
defined
in src/common/classes/alloc.h are no longer replacements of standard 
allocation
functions, so Clang happens to not make aggressive alignment assumptions, 
see
the mail thread starting at
 
"[cfe-dev]
operator new alignment assumptions".

(Instead of always defining DEBUG_GDS_ALLOC, I first tried to comment out 
the
definitions of global operator new/delete replacement functions in alloc.h,
falling back to the compiler-provided versions.  But many places in Firebird
allocate via Firebird-specific operator new placement overrides and 
deallocate
via delete expressions, which happens to work at runtime when the 
replaceable
operator delete is Firebird's, but not when it is the compiler-provided 
one.)

Change-Id: Ie02adb440fa959b723983d7f5b0246d3634dc06b

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index f76606d..762e94d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -54,6 +54,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
" \
&& export CXXFLAGS=" \
$(if $(filter MSC,$(COM)),$(if 
$(MSVC_USE_DEBUG_RUNTIME),-DMSVC_USE_DEBUG_RUNTIME)) \
+   $(if $(filter 
LINUX/X86_64/TRUE,$(OS)/$(CPUNAME)/$(COM_IS_CLANG)), \
+   -DDEBUG_GDS_ALLOC) \
$(if 
$(HAVE_GCC_FNO_SIZED_DEALLOCATION),-fno-sized-deallocation 
-fno-delete-null-pointer-checks) \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
$(BOOST_CPPFLAGS) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-5-2-6'

[Christian Lohmaier]

New branch 'libreoffice-5-2-6' available with the following commits:
commit e05d3d07763413578e0169aeec39c54b14d23e4a
Author: Christian Lohmaier 
Date:   Thu Feb 16 14:38:42 2017 +0100

Branch libreoffice-5-2-6

This is 'libreoffice-5-2-6' - the stable branch for the 5.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3b8f45144d01a296ebc6e785d958035564cb551f

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-2-6'

[Christian Lohmaier]

New branch 'libreoffice-5-2-6' available with the following commits:
commit be9990d1825a8c3782f4cdd8c0ccffd2b5d1157b
Author: Christian Lohmaier 
Date:   Thu Feb 16 14:38:42 2017 +0100

Branch libreoffice-5-2-6

This is 'libreoffice-5-2-6' - the stable branch for the 5.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ie3cd1af01eeb040243ecbb278cfd80c9ee4ac781

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-2-6'

[Christian Lohmaier]

New branch 'libreoffice-5-2-6' available with the following commits:
commit d02539e14f4e3bd2522c743af23f92953395281d
Author: Christian Lohmaier 
Date:   Thu Feb 16 14:38:42 2017 +0100

Branch libreoffice-5-2-6

This is 'libreoffice-5-2-6' - the stable branch for the 5.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I62e0a2d2ea41b58e868a75e757f813586decd540

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

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-2' - source/ar source/bg source/ca source/cy source/da source/de source/el source/es source/et source/gd source/gl source/he source/id sou

[Christian Lohmaier]

 source/ar/cui/source/options.po|   10 
 source/ar/extras/source/autocorr/emoji.po  |   10 
 source/ar/helpcontent2/source/text/sdraw.po|   10 
 source/ar/helpcontent2/source/text/shared/01.po|   13 
 source/ar/helpcontent2/source/text/shared/autokorr.po  |   10 
 source/ar/helpcontent2/source/text/simpress.po |   11 
 source/ar/helpcontent2/source/text/swriter.po  |   11 
 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po  |  146 
+++---
 source/ar/sc/source/ui/src.po  |   10 
 source/ar/sfx2/uiconfig/ui.po  |   10 
 source/bg/scp2/source/ooo.po   |   12 
 source/ca/wizards/source/formwizard.po |8 
 source/cy/basic/source/classes.po  |   20 -
 source/cy/chart2/uiconfig/ui.po|6 
 source/cy/cui/source/dialogs.po|   12 
 source/cy/cui/uiconfig/ui.po   |   10 
 source/cy/dbaccess/source/ui/dlg.po|   32 +-
 source/cy/dbaccess/source/ui/misc.po   |8 
 source/cy/dbaccess/uiconfig/ui.po  |   10 
 source/cy/extensions/source/dbpilots.po|   12 
 source/cy/extensions/source/propctrlr.po   |   12 
 source/cy/extensions/uiconfig/spropctrlr/ui.po |   12 
 source/cy/fpicker/source/office.po |8 
 source/cy/instsetoo_native/inc_openoffice/windows/msi_languages.po |6 
 source/cy/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/cy/reportdesign/source/ui/inspection.po |   14 
 source/cy/sc/source/ui/navipi.po   |8 
 source/cy/sc/source/ui/src.po  |   16 -
 source/cy/sd/source/ui/app.po  |   12 
 source/cy/sd/uiconfig/sdraw/ui.po  |6 
 source/cy/sd/uiconfig/simpress/ui.po   |   10 
 source/cy/sfx2/source/appl.po  |8 
 source/cy/sfx2/uiconfig/ui.po  |8 
 source/cy/svtools/source/dialogs.po|   30 +-
 source/cy/svtools/source/misc.po   |8 
 source/cy/svx/source/src.po|   14 
 source/cy/svx/source/svdraw.po |6 
 source/cy/svx/uiconfig/ui.po   |8 
 source/cy/sw/source/ui/app.po  |6 
 source/cy/sw/source/ui/dochdl.po   |   10 
 source/cy/sw/source/ui/utlui.po|   12 
 source/cy/sw/source/uibase/dialog.po   |   12 
 source/cy/sw/source/uibase/docvw.po|   16 -
 source/cy/sw/source/uibase/utlui.po|   14 
 source/cy/sw/source/uibase/wrtsh.po|   12 
 source/cy/sw/uiconfig/swriter/ui.po|   24 -
 source/da/helpcontent2/source/text/sbasic/shared.po|8 
 source/da/helpcontent2/source/text/shared/00.po|   10 
 source/da/scp2/source/ooo.po   |   12 
 source/de/filter/source/config/fragments/filters.po|   10 
 source/de/helpcontent2/source/auxiliary.po |   12 
 source/de/helpcontent2/source/text/sbasic/shared.po|   32 +-
 source/de/helpcontent2/source/text/scalc/01.po |   32 +-
 source/de/helpcontent2/source/text/scalc/04.po |   12 
 source/de/helpcontent2/source/text/sdraw/guide.po  |   14 
 source/de/helpcontent2/source/text/shared/00.po|   12 
 source/de/helpcontent2/source/text/shared/01.po|   14 
 source/de/helpcontent2/source/text/shared/02.po|   10 
 source/de/helpcontent2/source/text/shared/04.po|   10 
 source/de/helpcontent2/source/text/shared/explorer/database.po |   10 
 source/de/helpcontent2/source/text/shared/guide.po |   20 -
 source/de/helpcontent2/source/text/shared/optionen.po  |8 
 source/de/helpcontent2/source/text/smath.po|   16 -
 source/de/helpcontent2/source/text/swriter/guide.po|   12 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po  |   14 
 source/de/sc/source/core/src.po  

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - translations

[Christian Lohmaier]

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

New commits:
commit 20ece2b75b23449ce62a3c98a4212b00a2535f0c
Author: Christian Lohmaier 
Date:   Thu Feb 16 14:14:12 2017 +0100

Updated core
Project: translations  32afdd6686035642b40686437ce3baf9455dd244

update translations for 5.2.6 rc1

and force-fix errors using pocheck

Change-Id: I8123a9e714d657445f9a9ba792bc0555ac681e88

diff --git a/translations b/translations
index 82afb6e..32afdd6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 82afb6e52e019d26c110a745d68d5b882bb4bbe5
+Subproject commit 32afdd6686035642b40686437ce3baf9455dd244
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/experimental ios/lo.xcconfig.in

[jan Iversen]

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj   
 |2 -
 
ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
 |   15 ++
 ios/lo.xcconfig.in 
 |1 
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit b7ee370c8e9528f1a3891540165d6d1b49f48fb0
Author: jan Iversen 
Date:   Sat Feb 11 11:25:38 2017 +0100

ios BUILDDIR != SRCDIR now works

Added SYMROOT to xcconfig, and change project.pbxproj
to allow BUILDDIR != SRCDIR

moved part of build output to BUILDDIR

The contents.json change is done by Xcode.

Change-Id: I0594f862781d41b87429f020f059f12e76f7f7f9
Reviewed-on: https://gerrit.libreoffice.org/34147
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 057d4c7..6b4a78d 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; 
path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree 
= ""; };
-   BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat; sourceTree 
= ""; };
+   BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = 
../../../workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat; sourceTree = 
BUILT_PRODUCTS_DIR; };
BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; 
sourceTree = ""; };
BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; 
path = ../../../vcl/source/app/brand.cxx; sourceTree = ""; };
BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; 
path = ../../../vcl/source/app/dbggui.cxx; sourceTree = ""; };
diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
index a4645e6..abd908f 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -2,6 +2,16 @@
   "images" : [
 {
   "idiom" : "ipad",
+  "size" : "20x20",
+  "scale" : "1x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "20x20",
+  "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
   "size" : "29x29",
   "scale" : "1x"
 },
@@ -29,6 +39,11 @@
   "idiom" : "ipad",
   "size" : "76x76",
   "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "83.5x83.5",
+  "scale" : "2x"
 }
   ],
   "info" : {
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 21fdc15..6147789 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -29,3 +29,4 @@ DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
 LINK_LDFLAGS =
 OTHER_CFLAGS =
 OTHER_CPLUSPLUSFLAGS =
+SYMROOT = @BUILDDIR@/ios/TiledLibreOffice
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx |3 +++
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx |3 +++
 include/LibreOfficeKit/LibreOfficeKitInit.h  |5 -
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit dd18f8ae55901ca400cf99a804fda46e266588f1
Author: jan Iversen 
Date:   Fri Feb 10 21:13:56 2017 +0100

ios update to make TiledLibreOffice compile/link

changes needed to make TiledLibreOffice compile/link for ios-simulator.

Remark:
autogen.input need to have --disable-pdfium due to a missing


Change-Id: I3e1af26d99c35c3c552510f28e13a7e530fca09f
Reviewed-on: https://gerrit.libreoffice.org/34145
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
index 7189bd7..6a3689c 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
@@ -121,6 +121,7 @@ void cpp2uno_call(
 case typelib_TypeClass_UNSIGNED_HYPER:
 case typelib_TypeClass_DOUBLE:
 pCppStack += sizeof(sal_Int32); // extra long
+SAL_FALLTHROUGH;
 default:
 break;
 }
@@ -344,6 +345,7 @@ extern "C" void cpp_vtable_call(
 TYPELIB_DANGER_RELEASE( pTD );
 }
 } // else perform queryInterface()
+SAL_FALLTHROUGH;
 default:
 cpp2uno_call(
 pCppI, aMemberDescr.get(),
@@ -425,6 +427,7 @@ unsigned char * codeSnippet(
 break;
 }
 }
+SAL_FALLTHROUGH;
 case typelib_TypeClass_STRING:
 case typelib_TypeClass_TYPE:
 case typelib_TypeClass_SEQUENCE:
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
index 0102ea1..d7e60b5 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
@@ -115,6 +115,7 @@ void callVirtualMethod(
 case typelib_TypeClass_HYPER:
 case typelib_TypeClass_UNSIGNED_HYPER:
 ((long*)pRegisterReturn)[1] = edx;
+SAL_FALLTHROUGH;
 case typelib_TypeClass_LONG:
 case typelib_TypeClass_UNSIGNED_LONG:
 case typelib_TypeClass_CHAR:
@@ -221,6 +222,7 @@ static void cpp_call(
 case typelib_TypeClass_UNSIGNED_HYPER:
 case typelib_TypeClass_DOUBLE:
 pCppStack += sizeof(sal_Int32); // extra long
+SAL_FALLTHROUGH;
 default:
 break;
 }
@@ -453,6 +455,7 @@ void unoInterfaceProxyDispatch(
 TYPELIB_DANGER_RELEASE( pTD );
 }
 } // else perform queryInterface()
+SAL_FALLTHROUGH;
 default:
 // dependent dispatch
 cpp_call(
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 322ba8b..f4ab9cd 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -42,7 +42,10 @@ extern "C"
 #endif
 #define SEPARATOR '/'
 
-inline void *lok_loadlib(const char *pFN)
+#ifndef __OBJC__
+inline
+#endif
+void *lok_loadlib(const char *pFN)
 {
 return dlopen(pFN, RTLD_LAZY
 #if defined LOK_LOADLIB_GLOBAL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Katarina Behrens]

 RepositoryExternal.mk |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 55519a18be63be5a6ce955784f0d326fc6cabf9d
Author: Katarina Behrens 
Date:   Wed Feb 15 16:00:16 2017 +0100

gpg4libre: gbuild funcs for building with internal gpgme(pp)

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3871080..d1b2416 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3405,6 +3405,20 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+else # NON-SYSTEM_GPGME
+
+define gb_LinkTarget__use_gpgme
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/libgpgmepp$(gb_StaticLibrary_PLAINEXT)
  \
+)
+$(call gb_LinkTarget_use_external_project,$(1),gpgme)
+
+endef
+
 endif
 
 ifeq ($(ENABLE_GLTF),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/gpgme external/libassuan external/libgpg-error

[Katarina Behrens]

 config_host.mk.in |4 +
 configure.ac  |9 ++
 external/gpgme/ExternalProject_gpgme.mk   |   29 
 external/gpgme/Module_gpgme.mk|1 
 external/gpgme/UnpackedTarball_gpgme.mk   |5 +
 external/gpgme/find-libgpg-error-libassuan.patch  |   59 ++
 external/libassuan/ExternalProject_libassuan.mk   |   27 
 external/libassuan/Module_libassuan.mk|1 
 external/libassuan/UnpackedTarball_libassuan.mk   |6 +
 external/libassuan/find-libgpg-error.patch|   18 +
 external/libgpg-error/ExternalProject_libgpg-error.mk |   24 +++
 external/libgpg-error/Module_libgpg-error.mk  |1 
 12 files changed, 184 insertions(+)

New commits:
commit 4a53df9cd7e58230bbb5f5c46161861010ca220f
Author: Katarina Behrens 
Date:   Fri Feb 10 17:51:35 2017 +0100

gpg4libre: Build internal libgpg-error, libassuan and gpgme(pp)

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

diff --git a/config_host.mk.in b/config_host.mk.in
index c2d4298..f07cc04 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -202,6 +202,8 @@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
 export EPOXY_CFLAGS=$(gb_SPACE)@EPOXY_CFLAGS@
 export EPOXY_LIBS=$(gb_SPACE)@EPOXY_LIBS@
 export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
+export GPG_ERROR_CFLAGS=$(gb_SPACE)@GPG_ERROR_CFLAGS@
+export GPG_ERROR_LIBS=$(gb_SPACE)@GPG_ERROR_LIBS@
 export GPGME_CFLAGS=$(gb_SPACE)@GPGME_CFLAGS@
 export GPGME_LIBS=$(gb_SPACE)@GPGME_LIBS@
 export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
@@ -304,6 +306,8 @@ export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
 export LD_PLUGIN=@LD_PLUGIN@
 @x_LDFLAGS@ export LDFLAGS=@LDFLAGS@
 export LFS_CFLAGS=@LFS_CFLAGS@
+export LIBASSUAN_CFLAGS=$(gb_SPACE)@LIBASSUAN_CFLAGS@
+export LIBASSUAN_LIBS=$(gb_SPACE)@LIBASSUAN_LIBS@
 export LIBBASE_JAR=@LIBBASE_JAR@
 export LIBDIR=@LIBDIR@
 export LIBEOT_CFLAGS=$(gb_SPACE)@LIBEOT_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 5982240..1a484d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10480,9 +10480,18 @@ if test "$_os" = "Linux"; then
 # This is work in progress, please DO NOT MODIFY OR REMOVE
 AC_MSG_RESULT([internal])
 BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGME"
+
+GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
+GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs 
-lgpg-error"
+LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
+LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs 
-lassuan"
 fi
 fi
 AC_SUBST(SYSTEM_GPGME)
+AC_SUBST(GPG_ERROR_CFLAGS)
+AC_SUBST(GPG_ERROR_LIBS)
+AC_SUBST(LIBASSUAN_CFLAGS)
+AC_SUBST(LIBASSUAN_LIBS)
 AC_SUBST(GPGME_CFLAGS)
 AC_SUBST(GPGME_LIBS)
 
diff --git a/external/gpgme/ExternalProject_gpgme.mk 
b/external/gpgme/ExternalProject_gpgme.mk
new file mode 100644
index 000..e5ad642
--- /dev/null
+++ b/external/gpgme/ExternalProject_gpgme.mk
@@ -0,0 +1,29 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,gpgme))
+
+$(eval $(call gb_ExternalProject_register_targets,gpgme,\
+   build \
+))
+
+$(eval $(call gb_ExternalProject_use_autoconf,gpgme,build))
+
+$(call gb_ExternalProject_get_state_target,gpgme,build):
+   $(call gb_ExternalProject_run,build,\
+   autoreconf \
+   && ./configure \
+  GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
+  GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
+  LIBASSUAN_CFLAGS="$(LIBASSUAN_CFLAGS)" \
+  LIBASSUAN_LIBS="$(LIBASSUAN_LIBS)" \
+ && $(MAKE) \
+   )
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/Module_gpgme.mk b/external/gpgme/Module_gpgme.mk
index b0b9def..8c318a2 100644
--- a/external/gpgme/Module_gpgme.mk
+++ b/external/gpgme/Module_gpgme.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Module_Module,gpgme))
 
 $(eval $(call gb_Module_add_targets,gpgme,\
+   ExternalProject_gpgme \
UnpackedTarball_gpgme \
 ))
 
diff --git a/external/gpgme/UnpackedTarball_gpgme.mk 
b/external/gpgme/UnpackedTarball_gpgme.mk
index 22c52cd..a6b79c4 100644
--- a/external/gpgme/UnpackedTarball_gpgme.mk
+++ b/external/gpgme/UnpackedTarball_gpgme.mk
@@ -11,4 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,gpgme))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,gpgme,$(GPGME_TARBALL)))
 
+$(eval $(call 

Minutes of the Design Hangout: 2017-Feb-16

[Heiko Tietze]

Present: Thibaut, Jay, Heiko, Tomaz

Welcome back to the design team, Thibaut!

Organization

 * Release plan for 5.4?
   + https://wiki.documentfoundation.org/ReleasePlan/5.4 still missing

 * Sidebar Guidelines
   + Design Session: 
https://docs.google.com/document/d/1oKabPLLVe9s53i475W1-v0QA7cxc_0oT0qfVr68KWjM/edit?usp=sharing
   + Blog post: 
https://drive.google.com/open?id=1_JdBb6g1pxixXWqhSXXA06dnRdYkGk4AapuOE1JaZDM
   + fix issue with tab from last control to content panel title (should go to 
hamburger)
   + skim through it once again (Jay)
   + publish tomorrow

 * Have a special UX hackfest/meeting?
   + idea from Arnaud acknowledged by TDF
   + who would attend? (Jay)
 + me *g* (Heiko)

 * Use Git for guidelines?
   + pro: managed review process (Heiko)
   + allows linking with dev repo and to have a comparision of code state with 
guideline state (Thibaut)
   + formatting needs to be considered (Thibaut), maybe use a "markdown" tool, 
e.g. http://www.sphinx-doc.org/en/stable/
   + Similar solution is being considered at KDE as well (Heiko)

GSoC projects
(see also https://wiki.documentfoundation.org/Development/GSoC/Ideas)

 * Ideas are collected under http://pad.documentfoundation.org/p/UX-GSoC_Ideas
   + Added: 21 Revamp the Customization dialog, 22 Multi-color gradient
   + Found mentors for some projects but still room for more

Tickets

 * Add donate link to the help menu
   + help increase the access number significantly
   + suggestion by tdf team to do the same for donations
   + https://bugs.documentfoundation.org/show_bug.cgi?id=105831
   + idea was discussed during the rework on the help menu (Jay)
 + https://bugs.documentfoundation.org/show_bug.cgi?id=96015
   + no one voted against this solution so do it (Heiko)

 * Modify table styles 
   + https://bugs.documentfoundation.org/show_bug.cgi?id=101648
   + Backport to 5.3 (Xisco)
   + solved by hiding the menu items
   + will add a task to GSoC projects (Heiko)

 * Restore Clear Direct Formatting
   + https://bugs.documentfoundation.org/show_bug.cgi?id=102915
   + Cor will handle this (Jay)
   + Idea is to have the standard paragraph and character styles in a submenu 
 along with edit styles and clear direct formatting (Jay)
   + would be the same as in the main menu
   + should be improved to user-defined styles or styles used in the document 
(Heiko)

 * Gridline/Helpline gate
   + https://bugs.documentfoundation.org/show_bug.cgi?id=105560
   + https://bugs.documentfoundation.org/show_bug.cgi?id=105326
   + issue is that it's not clear where settings are stored, per account, 
session, or document (Heiko)
   + proposal is to make Tools > Options settings always account related, and 
to have
 menu setting should change the property per session or document (Heiko)
   + today we have various settings in the View menu for instance that are 
permanent,
 which would be needed to be non-permanent or link to the Tools>Options 
dialog (Thibaut)
   + alternatively have a clear separation of account vs. document/session 
related settings 
 in the options dialog (Jay)
 https://bugs.documentfoundation.org/show_bug.cgi?id=105751
   + View menu is rather a shortcut to Tools>Options and almost all functions 
are permanent (Jay)
   + while this usability issue is clear, that's how most other programs work 
(Thibaut)





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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - external/curl

[Michael Meeks]

 external/curl/curl-7.26.0_win-proxy.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b39a185c68075b64d5e9a1b024f7a6f901a36ba5
Author: Michael Meeks 
Date:   Mon Jan 9 15:41:53 2017 +

Fix strange whitespace related compiler warning.

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

diff --git a/external/curl/curl-7.26.0_win-proxy.patch 
b/external/curl/curl-7.26.0_win-proxy.patch
index 580479a..7aea9c0 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -27,7 +27,7 @@
  }
  
 +#ifdef WIN32
-+static char* wstrToCstr( LPWSTR wStr )
++static char* wstrToCstr(LPWSTR wStr)
 +{
 +  int bufSize;
 +  char* out = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/clientnb.cpp net/loolnb.cpp

[Michael Meeks]

 net/clientnb.cpp |   26 ++
 net/loolnb.cpp   |4 
 2 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 1a9941c23fa538f7d0e8e5622169f8186cc6d37f
Author: Michael Meeks 
Date:   Thu Feb 16 11:52:22 2017 +

Bang on the server with some threads.

diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index 822804d..aa123e9 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -64,6 +63,11 @@ struct Session
 else
 _session = new Poco::Net::HTTPClientSession(HostName, PortNumber);
 }
+~Session()
+{
+delete _session;
+}
+
 void sendPing(int i)
 {
 Poco::Net::HTTPRequest request(
@@ -108,7 +112,7 @@ struct Session
 struct ThreadWorker : public Runnable
 {
 const char *_domain;
-   ThreadWorker (const char *domain)
+   ThreadWorker (const char *domain = NULL)
 : _domain(domain)
 {
 }
@@ -116,7 +120,7 @@ struct ThreadWorker : public Runnable
 {
 for (int i = 0; i < 100; ++i)
 {
-Session ping(_domain);
+Session ping(_domain ? _domain : "init");
 ping.sendPing(i);
 int back = ping.getResponse();
 assert(back == i + 1);
@@ -128,12 +132,25 @@ struct Client : public Poco::Util::Application
 {
 void testLadder()
 {
-ThreadWorker ladder("init");
+ThreadWorker ladder;
 Thread thread;
 thread.start(ladder);
 thread.join();
 }
 
+void testParallel()
+{
+const int num = 10;
+Thread snakes[num];
+ThreadWorker ladders[num];
+
+for (size_t i = 0; i < num; i++)
+snakes[i].start(ladders[i]);
+
+for (int i = 0; i < num; i++)
+snakes[i].join();
+}
+
 public:
 int main(const std::vector& /* args */) override
 {
@@ -151,6 +168,7 @@ public:
 assert (back == count + 2);
 
 testLadder();
+testParallel();
 
 return 0;
 }
diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index 7c4f23f..5c61a78 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -22,6 +22,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using Poco::MemoryInputStream;
 using Poco::StringTokenizer;
@@ -75,6 +77,8 @@ public:
 }
 };
 
+// FIXME: use Poco Thread instead (?)
+
 /// Generic thread class.
 class Thread
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/clientnb.cpp

[Michael Meeks]

 net/clientnb.cpp |   35 +--
 1 file changed, 33 insertions(+), 2 deletions(-)

New commits:
commit 0c39cd017feb544f14acb253f6c3788ad435
Author: Michael Meeks 
Date:   Thu Feb 16 11:43:30 2017 +

Thread to poke server.

diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index 87ee8b5..822804d 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -34,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using Poco::Net::HTTPClientSession;
 using Poco::Net::HTTPRequest;
@@ -86,11 +88,11 @@ struct Session
 Poco::Net::HTTPResponse response;
 
 try {
-std::cerr << "try to get response\n";
+//std::cerr << "try to get response\n";
 std::istream& responseStream = _session->receiveResponse(response);
 
 std::string result(std::istreambuf_iterator(responseStream), 
{});
-std::cerr << "Got response '" << result << "'\n";
+//std::cerr << "Got response '" << result << "'\n";
 number = std::stoi(result);
 }
 catch (const Poco::Exception &e)
@@ -103,8 +105,35 @@ struct Session
 }
 };
 
+struct ThreadWorker : public Runnable
+{
+const char *_domain;
+   ThreadWorker (const char *domain)
+: _domain(domain)
+{
+}
+   virtual void run()
+{
+for (int i = 0; i < 100; ++i)
+{
+Session ping(_domain);
+ping.sendPing(i);
+int back = ping.getResponse();
+assert(back == i + 1);
+}
+   }
+};
+
 struct Client : public Poco::Util::Application
 {
+void testLadder()
+{
+ThreadWorker ladder("init");
+Thread thread;
+thread.start(ladder);
+thread.join();
+}
+
 public:
 int main(const std::vector& /* args */) override
 {
@@ -121,6 +150,8 @@ public:
 back = second.getResponse();
 assert (back == count + 2);
 
+testLadder();
+
 return 0;
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/clientnb.cpp net/loolnb.cpp

[Michael Meeks]

 net/clientnb.cpp |3 ++-
 net/loolnb.cpp   |7 +++
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit de41fffde6cfeaebdc85a060e2ed8ef92e539a85
Author: Michael Meeks 
Date:   Thu Feb 16 11:24:07 2017 +

Get number response / ping bits working.

diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index a8ec054..87ee8b5 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -91,6 +91,7 @@ struct Session
 
 std::string result(std::istreambuf_iterator(responseStream), 
{});
 std::cerr << "Got response '" << result << "'\n";
+number = std::stoi(result);
 }
 catch (const Poco::Exception &e)
 {
@@ -118,7 +119,7 @@ public:
 assert (back == count + 1);
 
 back = second.getResponse();
-assert (back == count + 1);
+assert (back == count + 2);
 
 return 0;
 }
diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index 963a631..7c4f23f 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -58,20 +58,19 @@ public:
 // complex algorithmic core:
 number = number + 1;
 
+std::string numberString = std::to_string(number);
 std::ostringstream oss;
 oss << "HTTP/1.1 200 OK\r\n"
 << "Date: Once, Upon a time GMT\r\n" // Mon, 27 Jul 2009 12:28:53 
GMT
 << "Server: madeup string (Linux)\r\n"
-<< "Content-Length: " << _inBuffer.size() << "\r\n"
+<< "Content-Length: " << numberString.size() << "\r\n"
 << "Content-Type: text/plain\r\n"
 << "Connection: Closed\r\n"
 << "\r\n"
+<< numberString;
 ;
 std::string str = oss.str();
 _outBuffer.insert(_outBuffer.end(), str.begin(), str.end());
-
-// append the content we got:
-_outBuffer.insert(_outBuffer.end(), _inBuffer.begin(), 
_inBuffer.end());
 _inBuffer.clear();
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/clientnb.cpp net/common.hpp net/loolnb.cpp net/socket.hpp

[Michael Meeks]

 net/clientnb.cpp |8 
 net/common.hpp   |   48 
 net/loolnb.cpp   |   30 --
 net/socket.hpp   |6 +++---
 4 files changed, 23 insertions(+), 69 deletions(-)

New commits:
commit 84094a1d6e582d8caa7946855bfb1b873ae7f593
Author: Michael Meeks 
Date:   Thu Feb 16 11:00:38 2017 +

Lean on Poco for request parsing.

diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index 99bda95..a8ec054 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -35,8 +35,6 @@
 #include 
 #include 
 
-#include "common.hpp"
-
 using Poco::Net::HTTPClientSession;
 using Poco::Net::HTTPRequest;
 using Poco::Net::HTTPResponse;
@@ -104,17 +102,11 @@ struct Session
 }
 };
 
-void testParseHTTP()
-{
-}
-
 struct Client : public Poco::Util::Application
 {
 public:
 int main(const std::vector& /* args */) override
 {
-testParseHTTP();
-
 Session first("init");
 Session second("init");
 
diff --git a/net/common.hpp b/net/common.hpp
deleted file mode 100644
index da1ca25..000
--- a/net/common.hpp
+++ /dev/null
@@ -1,48 +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/.
- */
-
-#ifndef NB_COMMON_HPP
-#define NB_COMMON_HPP
-
-typedef std::vector HeaderStrings;
-typedef std::vector Payload;
-
-// FIXME: lots of return conditions:
-//partial data, malicious/invalid data, complete data
-//does this belong in a separate method ?
-size_t parseHTTP(const std::vector data,
- HeaderStrings &headers, Payload & /* payload */)
-{
-size_t i, start;
-   for (i = start = 0; i < data.size(); ++i)
-{
-   unsigned char c = data[i];
-   if (c == 0)
-{   // someone doing something cute.
-return -1;
-}
-if (c == '\r' || c == '\n')
-{
-std::string header(reinterpret_cast(&data[start]), i 
- start);
-while (++i < data.size() &&
-   (data[i] == '\n' || data[i] == '\r'))
-{}
-start = i;
-// terminating \r\n
-if (header.size() == 0)
-break;
-headers.push_back(header);
-}
-}
-return i;
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/net/loolnb.cpp b/net/loolnb.cpp
index a6a94eb..963a631 100644
--- a/net/loolnb.cpp
+++ b/net/loolnb.cpp
@@ -18,10 +18,15 @@
 #include 
 #include 
 
+#include 
 #include 
+#include 
+#include 
+
+using Poco::MemoryInputStream;
+using Poco::StringTokenizer;
 
 #include "socket.hpp"
-#include "common.hpp"
 
 constexpr int PortNumber = 9191;
 
@@ -36,17 +41,22 @@ public:
 {
 std::cerr << "message had size " << _inBuffer.size() << "\n";
 
-HeaderStrings headers;
-Payload payload;
-size_t skip;
-if ((skip = parseHTTP(_inBuffer, headers, payload) > 0))
+int number = 0;
+MemoryInputStream message(&_inBuffer[0], _inBuffer.size());
+Poco::Net::HTTPRequest req;
+req.read(message);
+
+StringTokenizer tokens(req.getURI(), "/?");
+if (tokens.count() == 4)
 {
-for (auto i = headers.begin(); i != headers.end(); ++i)
-{
-std::cerr << "header '" << *i << "'\n";
-}
+std::string subpool = tokens[2];
+number = std::stoi(tokens[3]);
 }
-// else close socket ? ...
+else
+std::cerr << " unknown tokens " << tokens.count() << std::endl;
+
+// complex algorithmic core:
+number = number + 1;
 
 std::ostringstream oss;
 oss << "HTTP/1.1 200 OK\r\n"
diff --git a/net/socket.hpp b/net/socket.hpp
index 3b55405..f41befc 100644
--- a/net/socket.hpp
+++ b/net/socket.hpp
@@ -282,8 +282,8 @@ public:
 }
 
   protected:
-std::vector< unsigned char > _inBuffer;
-std::vector< unsigned char > _outBuffer;
+std::vector< char > _inBuffer;
+std::vector< char > _outBuffer;
   public:
 
 HandleResult handlePoll( int events ) override
@@ -307,7 +307,7 @@ public:
 bool readIncomingData()
 {
 ssize_t len;
-unsigned char buf[4096];
+char buf[4096];
 do {
 len = ::read(getFD(), buf, sizeof(buf));
 } while (len < 0 && errno == EINTR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svl/source

[Eike Rathke]

 svl/source/numbers/zformat.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 1e026b88662494df52e4c3eb372ee29e9f30c4f4
Author: Eike Rathke 
Date:   Wed Feb 15 22:01:51 2017 +0100

Resolves: tdf#105968 handle engineering notation rounded into next magnitude

Change-Id: Ie31ab88543994f0e8aeef8152c230c05e071ef8e
(cherry picked from commit 63bc2b13cb344cce99348496838d7d2c2f690211)
Reviewed-on: https://gerrit.libreoffice.org/34322
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 24ca0f9..6e740b3 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2347,11 +2347,22 @@ bool SvNumberformat::ImpGetScientificOutput(double 
fNumber,
 nExpSign = 1;
 }
 ExpStr = OUString::number( nExp );
+const sal_Unicode cFirstDigit = sStr[0];
 // rescale mantissa
 sStr = ::rtl::math::doubleToUString( fNumber,
  rtl_math_StringFormat_E,
  nRescale + rInfo.nCntPost, '.' );
+
+// sStr now may contain a rounded-up value shifted into the next
+// magnitude, for example 1.000E+02 (4 digits) for fNumber 99.995
+// (9.9995E+02 rounded to 3 decimals) but we want the final result
+// to be 100.00E+00 (5 digits), so for the following fill routines
+// below to work correctly append a zero decimal.
+/* TODO: this is awkward, could an engineering notation mode be
+ * introduced to rtl_math_doubleToUString()? */
 sStr.truncate( sStr.indexOf('E') );
+if (sStr[0] == '1' && cFirstDigit != '1')
+sStr.append('0');
 }
 
 // cut any decimal delimiter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svl/source/numbers/zformat.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 8e3ad5f11401a337910c6d63263811ca66ba456c
Author: Eike Rathke 
Date:   Wed Feb 15 22:01:51 2017 +0100

Resolves: tdf#105968 handle engineering notation rounded into next magnitude

Change-Id: Ie31ab88543994f0e8aeef8152c230c05e071ef8e
(cherry picked from commit 63bc2b13cb344cce99348496838d7d2c2f690211)
Reviewed-on: https://gerrit.libreoffice.org/34321
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 8178b7e..ac0c608 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2593,11 +2593,22 @@ bool SvNumberformat::ImpGetScientificOutput(double 
fNumber,
 nExpSign = 1;
 }
 ExpStr = OUString::number( nExp );
+const sal_Unicode cFirstDigit = sStr[0];
 // rescale mantissa
 sStr = ::rtl::math::doubleToUString( fNumber,
  rtl_math_StringFormat_E,
  nRescale + rInfo.nCntPost, '.' );
+
+// sStr now may contain a rounded-up value shifted into the next
+// magnitude, for example 1.000E+02 (4 digits) for fNumber 99.995
+// (9.9995E+02 rounded to 3 decimals) but we want the final result
+// to be 100.00E+00 (5 digits), so for the following fill routines
+// below to work correctly append a zero decimal.
+/* TODO: this is awkward, could an engineering notation mode be
+ * introduced to rtl_math_doubleToUString()? */
 sStr.truncate( sStr.indexOf('E') );
+if (sStr[0] == '1' && cFirstDigit != '1')
+sStr.append('0');
 }
 
 // cut any decimal delimiter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/accessibility/charmapacc.cxx |   29 ++---
 svx/source/inc/charmapacc.hxx   |1 +
 2 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit ba8ac3843790226385e55bdf222de0d3aecc281d
Author: Caolán McNamara 
Date:   Wed Feb 15 16:52:53 2017 +

Related: tdf#105712 inconsistency with num of a11y children in special char

with no visible scrollbar it claims 1 child, but trying to get child at
index 0 throws

(cherry picked from commit b3098d239f46c8d5965754f275bc62216dcb4f4f)

Change-Id: Icf1a0afc4a6f6090e3f14f30b4380db477955561
Reviewed-on: https://gerrit.libreoffice.org/34313
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/accessibility/charmapacc.cxx 
b/svx/source/accessibility/charmapacc.cxx
index 97f523c..f7c31bf 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -71,11 +71,16 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent(
 m_pTable->fireEvent(_nEventId,_rOldValue,_rNewValue);
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount(  ) throw 
(RuntimeException, std::exception)
+sal_Int32 SvxShowCharSetVirtualAcc::getImplAccessibleChildCount() const
+{
+return mpParent->getScrollBar().IsVisible() ? 2 : 1;
+}
+
+sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount() throw 
(RuntimeException, std::exception)
 {
 OExternalLockGuard aGuard( this );
 ensureAlive();
-return ( mpParent->getScrollBar().IsVisible() ) ? 2 : 1;
+return getImplAccessibleChildCount();
 }
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL 
SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint )
@@ -117,18 +122,20 @@ Reference< XAccessible > SAL_CALL 
SvxShowCharSetVirtualAcc::getAccessibleChild(
 {
 OExternalLockGuard aGuard( this );
 ensureAlive();
-if ( mpParent->getScrollBar().IsVisible() && i == 0 )
+
+sal_Int32 nCount = getImplAccessibleChildCount();
+if (i >= nCount)
+throw IndexOutOfBoundsException();
+
+if (i == 0 && mpParent->getScrollBar().IsVisible())
 return mpParent->getScrollBar().GetAccessible();
-else if ( i == 1 )
+
+if ( !m_xAcc.is() )
 {
-if ( !m_xAcc.is() )
-{
-m_pTable = new SvxShowCharSetAcc(this);
-m_xAcc = m_pTable;
-}
+m_pTable = new SvxShowCharSetAcc(this);
+m_xAcc = m_pTable;
 }
-else
-throw IndexOutOfBoundsException();
+
 return m_xAcc;
 }
 
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 73bc31e..2d1a098 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -44,6 +44,7 @@ namespace svx
 VclPtr mpParent; // the vcl control
 SvxShowCharSetAcc*  m_pTable; // the table, which holds the characters 
shown by the vcl control
 css::uno::Reference< css::accessibility::XAccessible > m_xAcc; // the 
ref to the table
+sal_Int32 getImplAccessibleChildCount() const;
 protected:
 virtual ~SvxShowCharSetVirtualAcc() override;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/accessibility/charmapacc.cxx |   29 ++---
 svx/source/inc/charmapacc.hxx   |1 +
 2 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit 2247313b0aec80306e7f67926810cf004d5b4d1d
Author: Caolán McNamara 
Date:   Wed Feb 15 16:52:53 2017 +

Related: tdf#105712 inconsistency with num of a11y children in special char

with no visible scrollbar it claims 1 child, but trying to get child at
index 0 throws

(cherry picked from commit b3098d239f46c8d5965754f275bc62216dcb4f4f)

Change-Id: Icf1a0afc4a6f6090e3f14f30b4380db477955561
Reviewed-on: https://gerrit.libreoffice.org/34314
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/accessibility/charmapacc.cxx 
b/svx/source/accessibility/charmapacc.cxx
index 80d0e51..c65d58c 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -71,11 +71,16 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent(
 m_pTable->fireEvent(_nEventId,_rOldValue,_rNewValue);
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount(  ) throw 
(RuntimeException, std::exception)
+sal_Int32 SvxShowCharSetVirtualAcc::getImplAccessibleChildCount() const
+{
+return mpParent->getScrollBar().IsVisible() ? 2 : 1;
+}
+
+sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount() throw 
(RuntimeException, std::exception)
 {
 OExternalLockGuard aGuard( this );
 ensureAlive();
-return ( mpParent->getScrollBar().IsVisible() ) ? 2 : 1;
+return getImplAccessibleChildCount();
 }
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL 
SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint )
@@ -117,18 +122,20 @@ Reference< XAccessible > SAL_CALL 
SvxShowCharSetVirtualAcc::getAccessibleChild(
 {
 OExternalLockGuard aGuard( this );
 ensureAlive();
-if ( mpParent->getScrollBar().IsVisible() && i == 0 )
+
+sal_Int32 nCount = getImplAccessibleChildCount();
+if (i >= nCount)
+throw IndexOutOfBoundsException();
+
+if (i == 0 && mpParent->getScrollBar().IsVisible())
 return mpParent->getScrollBar().GetAccessible();
-else if ( i == 1 )
+
+if ( !m_xAcc.is() )
 {
-if ( !m_xAcc.is() )
-{
-m_pTable = new SvxShowCharSetAcc(this);
-m_xAcc = m_pTable;
-}
+m_pTable = new SvxShowCharSetAcc(this);
+m_xAcc = m_pTable;
 }
-else
-throw IndexOutOfBoundsException();
+
 return m_xAcc;
 }
 
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 2169e96..bfb4fb7 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -44,6 +44,7 @@ namespace svx
 VclPtr mpParent; // the vcl control
 SvxShowCharSetAcc*  m_pTable; // the table, which holds the characters 
shown by the vcl control
 css::uno::Reference< css::accessibility::XAccessible > m_xAcc; // the 
ref to the table
+sal_Int32 getImplAccessibleChildCount() const;
 protected:
 virtual ~SvxShowCharSetVirtualAcc();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/Library_xsec_fw.mk |1 
 xmlsecurity/source/framework/decryptorimpl.cxx |  175 -
 xmlsecurity/source/framework/decryptorimpl.hxx |   92 -
 3 files changed, 268 deletions(-)

New commits:
commit 99263598bfb7911a18dae48e1d9fc01e11e0143c
Author: Miklos Vajna 
Date:   Thu Feb 16 09:11:32 2017 +0100

xmlsecurity: remove unused DecryptorImpl

No longer necessary since commit 50669de68785d61534c4c3fe101fd8e1d12fae65
(xmlsecurity: remove unused xsec_fw_component_getFactory(), 2017-02-02).

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

diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
index dfe832a..201fc71 100644
--- a/xmlsecurity/Library_xsec_fw.mk
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\
 
 $(eval $(call gb_Library_add_exception_objects,xsec_fw,\
xmlsecurity/source/framework/buffernode \
-   xmlsecurity/source/framework/decryptorimpl \
xmlsecurity/source/framework/elementcollector \
xmlsecurity/source/framework/elementmark \
xmlsecurity/source/framework/encryptionengine \
diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx 
b/xmlsecurity/source/framework/decryptorimpl.cxx
deleted file mode 100644
index 757b5d9..000
--- a/xmlsecurity/source/framework/decryptorimpl.cxx
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include "decryptorimpl.hxx"
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-using namespace com::sun::star::uno;
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxw = com::sun::star::xml::wrapper;
-
-#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.DecryptorImpl"
-
-DecryptorImpl::DecryptorImpl(const Reference< XComponentContext > & xContext) 
: DecryptorImpl_Base(xContext)
-{
-}
-
-DecryptorImpl::~DecryptorImpl()
-{
-}
-
-bool DecryptorImpl::checkReady() const
-/** DecryptorImpl/checkReady *
- *
- *   NAME
- *  checkReady -- checks the conditions for the decryption.
- *
- *   SYNOPSIS
- *  bReady = checkReady( );
- *
- *   FUNCTION
- *  checks whether all following conditions are satisfied:
- *  1. the result listener is ready;
- *  2. the EncryptionEngine is ready.
- *
- *   RESULT
- *  bReady - true if all conditions are satisfied, false otherwise
- 
**/
-{
-return (m_xResultListener.is() && EncryptionEngine::checkReady());
-}
-
-void DecryptorImpl::notifyResultListener() const
-/** DecryptorImpl/notifyResultListener ***
- *
- *   NAME
- *  notifyResultListener -- notifies the listener about the decryption
- *  result.
- 
**/
-{
-cssu::Reference< cssxc::sax::XDecryptionResultListener >
-xDecryptionResultListener ( m_xResultListener , cssu::UNO_QUERY ) ;
-
-xDecryptionResultListener->decrypted(m_nSecurityId,m_nStatus);
-}
-
-void DecryptorImpl::startEngine( const cssu::Reference<
-cssxc::XXMLEncryptionTemplate >&
-xEncryptionTemplate)
-/** DecryptorImpl/startEngine 
- *
- *   NAME
- *  startEngine -- decrypts the encryption.
- *
- *   FUNCTION
- *  decrypts the encryption element, then if succeeds, updates the link
- *  of old template element to the new encryption element in
- *  SAXEventKeeper.
- *
- *   INPUTS
- *  xEncryptionTemplate - the encryption template to be decrypted.
- 
**/
-{
-cssu::Reference< cssxc::XXMLEncryptionTemplate > xResultTemplate;
-try
-{
-xResultTemplate = m_xXMLEncryption->decrypt(xEncryptionTemplate, 
m_xXMLSecurityCon

[Libreoffice-commits] core.git: 15 commits - compilerplugins/clang dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source framework/inc framework/source idlc/inc idlc/sour

[Noel Grandin]

 compilerplugins/clang/unusedenumconstants.py   |   10 +
 dbaccess/source/ui/inc/QueryDesignView.hxx |2 
 dbaccess/source/ui/inc/dbu_qry.hrc |2 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |6 
 dbaccess/source/ui/querydesign/query.src   |5 
 desktop/source/splash/splash.cxx   |   27 ---
 drawinglayer/source/primitive2d/textbreakuphelper.cxx  |   18 --
 editeng/source/editeng/editeng.cxx |2 
 editeng/source/editeng/editview.cxx|4 
 editeng/source/editeng/impedit.cxx |4 
 editeng/source/editeng/impedit.hxx |4 
 editeng/source/editeng/impedit4.cxx|   14 -
 editeng/source/editeng/impedit5.cxx|8 -
 editeng/source/uno/unofored.cxx|7 
 editeng/source/uno/unoforou.cxx|   11 -
 editeng/source/uno/unotext.cxx |2 
 extensions/source/scanner/grid.cxx |   14 -
 extensions/source/scanner/grid.hxx |2 
 framework/inc/protocols.h  |4 
 framework/inc/uiconfiguration/globalsettings.hxx   |   11 -
 framework/source/dispatch/loaddispatcher.cxx   |2 
 framework/source/inc/loadenv/loadenv.hxx   |   53 +++
 framework/source/inc/loadenv/targethelper.hxx  |3 
 framework/source/layoutmanager/layoutmanager.cxx   |6 
 framework/source/loadenv/loadenv.cxx   |8 -
 framework/source/loadenv/targethelper.cxx  |   12 -
 framework/source/uiconfiguration/globalsettings.cxx|   24 +--
 idlc/inc/astexpression.hxx |   31 +---
 idlc/inc/errorhandler.hxx  |  100 +
 idlc/inc/idlctypes.hxx |1 
 idlc/source/astexpression.cxx  |  101 ++---
 idlc/source/astscope.cxx   |4 
 idlc/source/errorhandler.cxx   |  128 ++---
 idlc/source/parser.y   |  108 +++---
 include/drawinglayer/primitive2d/textbreakuphelper.hxx |3 
 include/editeng/editdata.hxx   |2 
 include/editeng/editeng.hxx|   11 -
 include/editeng/editview.hxx   |1 
 include/editeng/unoedprx.hxx   |2 
 include/editeng/unoedsrc.hxx   |2 
 include/editeng/unofored.hxx   |2 
 include/editeng/unoforou.hxx   |2 
 include/editeng/unotext.hxx|2 
 sc/inc/globstr.hrc |2 
 sc/source/core/tool/editutil.cxx   |2 
 sc/source/ui/src/globstr.src   |4 
 sc/source/ui/view/spelleng.cxx |   12 -
 sc/source/ui/view/viewfun4.cxx |4 
 sd/source/ui/app/strings.src   |4 
 sd/source/ui/func/futhes.cxx   |   14 -
 sd/source/ui/inc/strings.hrc   |2 
 sd/source/ui/view/Outliner.cxx |   12 -
 starmath/source/accessibility.cxx  |7 
 starmath/source/accessibility.hxx  |2 
 svx/source/accessibility/AccessibleEmptyEditSource.cxx |2 
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx   |2 
 56 files changed, 329 insertions(+), 505 deletions(-)

New commits:
commit c04f7de3d2b9fb490ce6ef425d147037cb1b5d8d
Author: Noel Grandin 
Date:   Thu Feb 16 12:34:41 2017 +0200

remove unused Sentence from BreakupUnit

Change-Id: I324d344a9e9154345b8bd7c8653415cfcbfc26cc

diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx 
b/drawinglayer/source/primitive2d/textbreakuphelper.cxx
index 91cde4f..fa6b213 100644
--- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx
+++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx
@@ -260,24 +260,6 @@ namespace drawinglayer
 }
 break;
 }
-case BreakupUnit::Sentence:
-{
-sal_Int32 
nNextSentenceBreak(xBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale));
-sal_Int32 a(nTextPosition);
-
-for(; a < nTextPosition + nTextLength; a++)
-{
-if(a == nNextSentenceBreak)
-{
-breakupPortion(aTempResult, nCurrent, a - 
nCurrent, false);
-nCurrent = a;
-nNextSentenceBreak = 
xBreakIterator->e

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - oox/source

[Tor Lillqvist]

 oox/source/export/drawingml.cxx |   28 
 1 file changed, 28 insertions(+)

New commits:
commit bc64dd416ecd022daacc049b5a2b898f30719471
Author: Tor Lillqvist 
Date:   Wed Feb 15 16:20:13 2017 +0200

tdf#106026: Export paragraph top and bottom margin to DrawingML

Change-Id: I8c60f86a1debe135c9172ff639aa5af93f03b99b
(cherry picked from commit d2b014edc0f466370023a35eb46548390ceb7fb2)
Reviewed-on: https://gerrit.libreoffice.org/34300
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2e12ad5..83e0e1a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1954,6 +1954,12 @@ void DrawingML::WriteParagraphProperties( const 
Reference< XTextContent >& rPara
 GET( nParaLeftMargin, ParaLeftMargin );
 GET( nParaFirstLineIndent,ParaFirstLineIndent);
 
+sal_Int32 nParaTopMargin = 0;
+sal_Int32 nParaBottomMargin = 0;
+
+GET( nParaTopMargin, ParaTopMargin );
+GET( nParaBottomMargin, ParaBottomMargin );
+
 sal_Int32 nLeftMargin =  getBulletMarginIndentation ( rXPropSet, 
nLevel,"LeftMargin");
 sal_Int32 nLineIndentation = getBulletMarginIndentation ( rXPropSet, 
nLevel,"FirstLineOffset");
 
@@ -1986,6 +1992,28 @@ void DrawingML::WriteParagraphProperties( const 
Reference< XTextContent >& rPara
 mpFS->endElementNS( XML_a, XML_lnSpc );
 }
 
+if( nParaTopMargin != 0 )
+{
+mpFS->startElementNS( XML_a, XML_spcBef, FSEND );
+{
+mpFS->singleElementNS( XML_a, XML_spcPts,
+   XML_val, I32S( std::lround( 
nParaTopMargin / 25.4 * 72 ) ),
+   FSEND );
+}
+mpFS->endElementNS( XML_a, XML_spcBef );
+}
+
+if( nParaBottomMargin != 0 )
+{
+mpFS->startElementNS( XML_a, XML_spcAft, FSEND );
+{
+mpFS->singleElementNS( XML_a, XML_spcPts,
+   XML_val, I32S( std::lround( 
nParaBottomMargin / 25.4 * 72 ) ),
+   FSEND );
+}
+mpFS->endElementNS( XML_a, XML_spcAft );
+}
+
 WriteParagraphNumbering( rXPropSet, nLevel );
 
 mpFS->endElementNS( XML_a, XML_pPr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 oox/source/export/drawingml.cxx |   28 
 1 file changed, 28 insertions(+)

New commits:
commit 48acd5c5793edfec5d6b168fa39dcebc4500effe
Author: Tor Lillqvist 
Date:   Wed Feb 15 16:20:13 2017 +0200

tdf#106026: Export paragraph top and bottom margin to DrawingML

Change-Id: I8c60f86a1debe135c9172ff639aa5af93f03b99b
(cherry picked from commit d2b014edc0f466370023a35eb46548390ceb7fb2)
Reviewed-on: https://gerrit.libreoffice.org/34299
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 73bf449..1f3b593 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1947,6 +1947,12 @@ void DrawingML::WriteParagraphProperties( const 
Reference< XTextContent >& rPara
 GET( nParaLeftMargin, ParaLeftMargin );
 GET( nParaFirstLineIndent,ParaFirstLineIndent);
 
+sal_Int32 nParaTopMargin = 0;
+sal_Int32 nParaBottomMargin = 0;
+
+GET( nParaTopMargin, ParaTopMargin );
+GET( nParaBottomMargin, ParaBottomMargin );
+
 sal_Int32 nLeftMargin =  getBulletMarginIndentation ( rXPropSet, 
nLevel,"LeftMargin");
 sal_Int32 nLineIndentation = getBulletMarginIndentation ( rXPropSet, 
nLevel,"FirstLineOffset");
 
@@ -1979,6 +1985,28 @@ void DrawingML::WriteParagraphProperties( const 
Reference< XTextContent >& rPara
 mpFS->endElementNS( XML_a, XML_lnSpc );
 }
 
+if( nParaTopMargin != 0 )
+{
+mpFS->startElementNS( XML_a, XML_spcBef, FSEND );
+{
+mpFS->singleElementNS( XML_a, XML_spcPts,
+   XML_val, I32S( std::lround( 
nParaTopMargin / 25.4 * 72 ) ),
+   FSEND );
+}
+mpFS->endElementNS( XML_a, XML_spcBef );
+}
+
+if( nParaBottomMargin != 0 )
+{
+mpFS->startElementNS( XML_a, XML_spcAft, FSEND );
+{
+mpFS->singleElementNS( XML_a, XML_spcPts,
+   XML_val, I32S( std::lround( 
nParaBottomMargin / 25.4 * 72 ) ),
+   FSEND );
+}
+mpFS->endElementNS( XML_a, XML_spcAft );
+}
+
 WriteParagraphNumbering( rXPropSet, nLevel );
 
 mpFS->endElementNS( XML_a, XML_pPr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 svx/source/dialog/SafeModeDialog.cxx |   21 -
 svx/source/dialog/SafeModeDialog.hxx |2 +-
 svx/uiconfig/ui/safemodedialog.ui|6 +++---
 3 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 2b60861a84b3e28cc110110e762fba5d6fbc43dd
Author: Katarina Behrens 
Date:   Fri Jan 13 23:17:52 2017 +0100

Resolves: tdf#105229 restart in normal mode instead of quitting

Change-Id: I546629656ada6c7a8a15b4dc77a042e1f1106924
Reviewed-on: https://gerrit.libreoffice.org/33059
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 
(cherry picked from commit 29b13a24cf5f0e6e58641d4a55cdfa03c83b68ac)
Reviewed-on: https://gerrit.libreoffice.org/34096
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index b77b83f..51de548 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -37,8 +37,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 :   Dialog(pParent, "SafeModeDialog", "svx/ui/safemodedialog.ui"),
 
 mpBtnContinue(),
-mpBtnQuit(),
 mpBtnRestart(),
+mpBtnApply(),
 
 mpBoxRestore(),
 mpBoxConfigure(),
@@ -63,8 +63,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 maBackupFileHelper()
 {
 get(mpBtnContinue, "btn_continue");
-get(mpBtnQuit, "btn_quit");
 get(mpBtnRestart, "btn_restart");
+get(mpBtnApply, "btn_apply");
 
 get(mpBoxRestore, "group_restore");
 get(mpBoxConfigure, "group_configure");
@@ -96,8 +96,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
 
 mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
-mpBtnQuit->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
 mpBtnRestart->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
+mpBtnApply->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
 
 mpCBCheckProfilesafeConfig->SetToggleHdl(LINK(this, SafeModeDialog, 
CheckBoxHdl));
 mpCBCheckProfilesafeExtensions->SetToggleHdl(LINK(this, SafeModeDialog, 
CheckBoxHdl));
@@ -112,7 +112,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 mpBtnCreateZip->SetClickHdl(LINK(this, SafeModeDialog, CreateZipBtnHdl));
 
 // Disable restart btn until some checkbox is active
-mpBtnRestart->Disable();
+mpBtnApply->Disable();
 
 // Check the first radio button and disable the other parts
 mpRadioRestore->Check();
@@ -146,8 +146,8 @@ void SafeModeDialog::dispose()
 mpBoxReset.clear();
 
 mpBtnContinue.clear();
-mpBtnQuit.clear();
 mpBtnRestart.clear();
+mpBtnApply.clear();
 
 mpCBCheckProfilesafeConfig.clear();
 mpCBCheckProfilesafeExtensions.clear();
@@ -319,12 +319,15 @@ IMPL_LINK(SafeModeDialog, DialogBtnHdl, Button*, pBtn, 
void)
 {
 Close();
 }
-else if (pBtn == mpBtnQuit.get())
+else if (pBtn == mpBtnRestart.get())
 {
+sfx2::SafeMode::putRestartFlag();
 Close();
-Application::Quit();
+uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
+css::task::OfficeRestartManager::get(xContext)->requestRestart(
+css::uno::Reference< css::task::XInteractionHandler >());
 }
-else if (pBtn == mpBtnRestart.get())
+else if (pBtn == mpBtnApply.get())
 {
 sfx2::SafeMode::putRestartFlag();
 Close();
@@ -395,7 +398,7 @@ IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, 
/*pCheckBox*/, void)
 mpCBResetCustomizations->IsChecked() ||
 mpCBResetWholeUserProfile->IsChecked());
 
-mpBtnRestart->Enable(bEnable);
+mpBtnApply->Enable(bEnable);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.hxx 
b/svx/source/dialog/SafeModeDialog.hxx
index aebbb8e..b70265d 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -34,8 +34,8 @@ public:
 private:
 
 VclPtr mpBtnContinue;
-VclPtr mpBtnQuit;
 VclPtr mpBtnRestart;
+VclPtr mpBtnApply;
 
 VclPtr mpBoxRestore;
 VclPtr mpBoxConfigure;
diff --git a/svx/uiconfig/ui/safemodedialog.ui 
b/svx/uiconfig/ui/safemodedialog.ui
index 01ae66b..cb86c62 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -48,8 +48,8 @@
   
 
 
-  
-_Quit
+  
+_Restart in Normal 
Mode
 True
 True
 True
@@ -62,7 +62,7 @@
   
 
 
-  
+  
 _Apply Changes and 
Restart
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.fr

Re: writing extensions in a functional language

[Stephan Bergmann]

On 02/15/2017 12:12 PM, Gergely Buday wrote:

I am interested in writing an extension to Libre Office, particularly Calc.

I would like to do it in a functional language.

My favourite is Standard ML and it is quite portable.

How much work, i.e. how many lines of code would it be to write an
interface for ML/LibreOffice?

Where in the Libre Office source tree I can find the glue code for
various extension languages?


There was a Google Summer of Code project in 2015 doing a UNO Haskell 
binding.  See 
 
for high-level code pointers.  See 
 for the 
results (though still quite rough).


There is still an open GSoC project for a UNO Rust binding, 
.



Another option is to use Scala as it is possible to write extensions in
Java and Scala can use Java libraries.

Did anybody write a Libre Office extension in Scala?


Not that I know of.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sw/inc/pagedesc.hxx|   13 -
 sw/source/core/layout/pagedesc.cxx |4 ++--
 sw/source/core/layout/paintfrm.cxx |4 ++--
 sw/source/ui/misc/pgfnote.cxx  |6 +++---
 sw/source/uibase/utlui/uiitems.cxx |2 +-
 5 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit 3a3f223f5a931680fb0543ee732dd5e800d6850b
Author: Caolán McNamara 
Date:   Thu Feb 16 10:19:58 2017 +

hazard a de->en translation

Change-Id: I82df46b8fa9d31b393bf3ddecbfb92128680b258

diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 6f27e4c..70e109c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -265,10 +265,10 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet)
 // Separator color
 rFootnoteInfo.SetLineColor( m_pLineColorBox->GetSelectEntryColor() );
 
-// Position
+// Position
 
rFootnoteInfo.SetAdj((css::text::HorizontalAdjust)m_pLinePosBox->GetSelectEntryPos());
 
-// Breite
+// Width
 rFootnoteInfo.SetWidth(Fraction( static_cast< long 
>(m_pLineLengthEdit->GetValue()), 100));
 
 const SfxPoolItem* pOldItem;
commit 0d9ad65f689a975747903b226baa0132d057f523
Author: Caolán McNamara 
Date:   Thu Feb 16 10:15:15 2017 +

replace SwFootnoteAdj with css::text::HorizontalAdjust

to ensure the retention of the values the code depends on

Change-Id: I3baafc1ee66481518aec5928585464c8a214be16

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 9b9378f..c259e37 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -42,12 +43,6 @@ class SwTextFormatColl;
 class SwNode;
 class SwPageDescs;
 
-/// Separator line adjustment.
-enum class SwFootnoteAdj
-{
-Left = 0, Center = 1, Right = 2
-};
-
 /// Footnote information.
 class SW_DLLPUBLIC SwPageFootnoteInfo
 {
@@ -57,7 +52,7 @@ private:
 editeng::SvxBorderStyle m_eLineStyle;  ///< Style of the separator line
 Color   m_LineColor;///< color of the separator line
 Fractionm_Width;///< percentage width of the separator line.
-SwFootnoteAdjm_eAdjust;  ///< line adjustment.
+css::text::HorizontalAdjust m_eAdjust;  ///< line adjustment.
 SwTwips m_nTopDist; ///< distance between body and separator.
 SwTwips m_nBottomDist;  ///< distance between separator and first 
footnote
 
@@ -67,7 +62,7 @@ public:
 const Color& GetLineColor() const   { return m_LineColor;}
 editeng::SvxBorderStyle  GetLineStyle() const { return m_eLineStyle; }
 const Fraction& GetWidth() const{ return m_Width; }
-SwFootnoteAdjGetAdj() const  { return m_eAdjust; }
+css::text::HorizontalAdjust GetAdj() const { return m_eAdjust; }
 SwTwips GetTopDist() const  { return m_nTopDist; }
 SwTwips GetBottomDist() const   { return m_nBottomDist; }
 
@@ -76,7 +71,7 @@ public:
 void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = 
eSet;}
 void SetLineColor(const Color& rCol){ m_LineColor = rCol;}
 void SetWidth(const Fraction & rNew){ m_Width = rNew; }
-void SetAdj(SwFootnoteAdj const eNew)   { m_eAdjust = eNew; }
+void SetAdj(css::text::HorizontalAdjust const eNew)   { m_eAdjust = eNew; }
 void SetTopDist   (SwTwips const nNew)  { m_nTopDist = nNew; }
 void SetBottomDist(SwTwips const nNew)  { m_nBottomDist = nNew; }
 
diff --git a/sw/source/core/layout/pagedesc.cxx 
b/sw/source/core/layout/pagedesc.cxx
index 556a382..14a0914 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -383,8 +383,8 @@ SwPageFootnoteInfo::SwPageFootnoteInfo()
 , m_nBottomDist( 57 )
 {
 m_eAdjust = FRMDIR_HORI_RIGHT_TOP == 
GetDefaultFrameDirection(GetAppLanguage()) ?
-   SwFootnoteAdj::Right :
-   SwFootnoteAdj::Left;
+   css::text::HorizontalAdjust_RIGHT :
+   css::text::HorizontalAdjust_LEFT;
 }
 
 SwPageFootnoteInfo::SwPageFootnoteInfo( const SwPageFootnoteInfo &rCpy )
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 51ed713..e11c009 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5573,9 +5573,9 @@ void SwFootnoteContFrame::PaintLine( const SwRect& rRect,
 SwTwips nX = aRectFnSet.GetPrtLeft(*this);
 switch ( rInf.GetAdj() )
 {
-case SwFootnoteAdj::Right:
+case css::text::HorizontalAdjust_RIGHT:
 nX += nPrtWidth - nWidth; break;
-case SwFootnoteAdj::Left:
+case css::text::HorizontalAdjust_LEFT:
 /* do nothing */; break;
 default:
 SAL_WARN("sw.core", "New adjustment for footnote lines?");
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 44f6d03..6f27e4c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/so

[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/clientnb.cpp net/common.hpp net/loolnb.cpp net/socket.hpp

[Michael Meeks]

 net/clientnb.cpp |   69 ++-
 net/common.hpp   |   48 ++
 net/loolnb.cpp   |   14 +++
 net/socket.hpp   |1 
 4 files changed, 116 insertions(+), 16 deletions(-)

New commits:
commit 6b3972153e1f5f831074b3e47b1dc0fed0ed883f
Author: Michael Meeks 
Date:   Thu Feb 16 10:14:08 2017 +

Initial http header parsing pieces.

diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index ec7c578..99bda95 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -35,6 +35,8 @@
 #include 
 #include 
 
+#include "common.hpp"
+
 using Poco::Net::HTTPClientSession;
 using Poco::Net::HTTPRequest;
 using Poco::Net::HTTPResponse;
@@ -46,41 +48,48 @@ using Poco::Util::HelpFormatter;
 using Poco::Util::Option;
 using Poco::Util::OptionSet;
 
+const char *HostName = "127.0.0.1";
 constexpr int PortNumber = 9191;
 
-Poco::Net::SocketAddress addr("127.0.0.1", PortNumber);
-
-struct Client : public Poco::Util::Application
+struct Session
 {
-public:
-int main(const std::vector& /* args */) override
+std::string _session_name;
+Poco::Net::HTTPClientSession *_session;
+
+Session(const char *session_name, bool https = false)
+: _session_name(session_name)
 {
-const char *hostname = "127.0.0.1";
-bool https = false;
-Poco::Net::HTTPClientSession *session;
 if (https)
-session = new Poco::Net::HTTPSClientSession(hostname, PortNumber);
+_session = new Poco::Net::HTTPSClientSession(HostName, PortNumber);
 else
-session = new Poco::Net::HTTPClientSession(hostname, PortNumber);
-Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/ping");
+_session = new Poco::Net::HTTPClientSession(HostName, PortNumber);
+}
+void sendPing(int i)
+{
+Poco::Net::HTTPRequest request(
+Poco::Net::HTTPRequest::HTTP_POST,
+"/ping/" + _session_name + "/" + std::to_string(i));
 try {
 Poco::Net::HTMLForm form;
 form.setEncoding(Poco::Net::HTMLForm::ENCODING_MULTIPART);
 form.prepareSubmit(request);
-form.write(session->sendRequest(request));
+form.write(_session->sendRequest(request));
 }
 catch (const Poco::Exception &e)
 {
 std::cerr << "Failed to write data: " << e.name() <<
   " " << e.message() << "\n";
-return -1;
+throw;
 }
-
+}
+int getResponse()
+{
+int number = 42;
 Poco::Net::HTTPResponse response;
 
 try {
 std::cerr << "try to get response\n";
-std::istream& responseStream = session->receiveResponse(response);
+std::istream& responseStream = _session->receiveResponse(response);
 
 std::string result(std::istreambuf_iterator(responseStream), 
{});
 std::cerr << "Got response '" << result << "'\n";
@@ -89,8 +98,36 @@ public:
 {
 std::cerr << "Exception converting: " << e.name() <<
   " " << e.message() << "\n";
-return -1;
+throw;
 }
+return number;
+}
+};
+
+void testParseHTTP()
+{
+}
+
+struct Client : public Poco::Util::Application
+{
+public:
+int main(const std::vector& /* args */) override
+{
+testParseHTTP();
+
+Session first("init");
+Session second("init");
+
+int count = 42, back;
+first.sendPing(count);
+second.sendPing(count + 1);
+
+back = first.getResponse();
+assert (back == count + 1);
+
+back = second.getResponse();
+assert (back == count + 1);
+
 return 0;
 }
 };
diff --git a/net/common.hpp b/net/common.hpp
new file mode 100644
index 000..da1ca25
--- /dev/null
+++ b/net/common.hpp
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef NB_COMMON_HPP
+#define NB_COMMON_HPP
+
+typedef std::vector HeaderStrings;
+typedef std::vector Payload;
+
+// FIXME: lots of return conditions:
+//partial data, malicious/invalid data, complete data
+//does this belong in a separate method ?
+size_t parseHTTP(const std::vector data,
+ HeaderStrings &headers, Payload & /* payload */)
+{
+size_t i, start;
+   for (i = start = 0; i < data.size(); ++i)
+{
+   unsigned char c = data[i];
+   if (c == 0)
+{   // someone doing something cute.
+return -1;
+}
+if (c == '\r' || c == '\n')
+{
+std::string header(re

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

[Caolán McNamara]

 sw/inc/pagedesc.hxx|4 ++--
 sw/source/core/layout/paintfrm.cxx |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a6afec6b004aaab3dd5c114bf92725b54d89b4c1
Author: Caolán McNamara 
Date:   Thu Feb 16 09:53:28 2017 +

crashtesting: enum values need to not change

in

SwPageFootnoteInfoItem::PutValue
(sw/source/uibase/utlui/uiitems.cxx)
aFootnoteInfo.SetAdj((SwFootnoteAdj)nSet);  
  │

MID_LINE_ADJUST takes a sal_Int16 and casts it to SwFootnoteAdj so
the implicit 0 and 2 for Left and Right needs to be retained

Change-Id: I87725550cd698df8155508c9976d6d2304af05be

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 2c62328..9b9378f 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -45,7 +45,7 @@ class SwPageDescs;
 /// Separator line adjustment.
 enum class SwFootnoteAdj
 {
-Left, Right
+Left = 0, Center = 1, Right = 2
 };
 
 /// Footnote information.
@@ -76,7 +76,7 @@ public:
 void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = 
eSet;}
 void SetLineColor(const Color& rCol){ m_LineColor = rCol;}
 void SetWidth(const Fraction & rNew){ m_Width = rNew; }
-void SetAdj(SwFootnoteAdj const eNew){ m_eAdjust = eNew; }
+void SetAdj(SwFootnoteAdj const eNew)   { m_eAdjust = eNew; }
 void SetTopDist   (SwTwips const nNew)  { m_nTopDist = nNew; }
 void SetBottomDist(SwTwips const nNew)  { m_nBottomDist = nNew; }
 
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index a1051bc..51ed713 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5578,6 +5578,7 @@ void SwFootnoteContFrame::PaintLine( const SwRect& rRect,
 case SwFootnoteAdj::Left:
 /* do nothing */; break;
 default:
+SAL_WARN("sw.core", "New adjustment for footnote lines?");
 assert(false);
 }
 SwTwips nLineWidth = rInf.GetLineWidth();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: writing extensions in a functional language

[Jiri Danek]

On Wed, Feb 15, 2017 at 12:12 PM, Gergely Buday <
buday.gerg...@uni-eszterhazy.hu> wrote:

> Where in the Libre Office source tree I can find the glue code for various
> extension languages?
>

I do not remember the code locations, but I once had a look at Java and
Python bindings. For python, some (most, almost all?) classes are generated
dynamically at runtime (so you get no code completion in IDE). For Java,
there is some hand-written glue code and the rest are generated jar files
(it directly generates jars from the IDL without intermediate Java sources;
method parameter names are not specified in the jars, so you get some code
completion, but it is not great.)

There are manual attempts to write nicer, more human friendly bindings, I
saw something e.g. for python when I searched Pypi. Not sure how
comprehensive they are; it possibly covers only what the original author
needed covered...


>
> Another option is to use Scala as it is possible to write extensions in
> Java and Scala can use Java libraries.
>
>
>
> Did anybody write a Libre Office extension in Scala?
>

I was looking into writing a macro[1] in Kotlin. It is not ML, but it has
some syntactic elements borrowed from that tradition... One nice thing you
can do in Kotlin (that you cannot in Java) is create extension function

fun  Any.query(anInterface: Class): T {
// TODO: taking KClass did not work for me
return UnoRuntime.queryInterface(anInterface, this)
}

and then you can do

val sheets = xScriptContext.document.query(com.sun.star.sheet.XSpreadshee
tDocument::class.java)

instead of

val sheets = UnoRuntime.queryInterface(com.sun.star.sheet.XSpreadsheetDoc
ument::class.java, xScriptContext.document)

Neither is spectacularly readable, but choosing from the two, the first is
IMO nicer.

Also, I have a gradle task to compile and push the macro to my libreoffice
directory, so I can recompile and redeploy it into running Calc in about 5
seconds. Not spectacular either, but it is as good as I was able to get
given I have to have a compilation step.

[1] https://github.com/msgqe/doccheck
-- 
Jiří Daněk
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 vcl/source/gdi/svmconverter.cxx |   49 
 1 file changed, 30 insertions(+), 19 deletions(-)

New commits:
commit d301dc1b2bdcc345fd8d91c0a973b1960a7e1d55
Author: Caolán McNamara 
Date:   Thu Feb 9 09:21:39 2017 +

Resolves: ofz#576 unexpected exception with invalid fraction

(cherry picked from commit cff6cdb2ee37e836b9bab39500d24fcedc360121)

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

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 73c62b0..de1cf5a 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -129,19 +129,26 @@ void ImplWriteColor( SvStream& rOStm, const Color& rColor 
)
 rOStm.WriteInt16( nVal );
 }
 
-void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode )
+bool ImplReadMapMode(SvStream& rIStm, MapMode& rMapMode)
 {
-Point   aOrg;
-sal_Int32   nXNum;
-sal_Int32   nXDenom;
-sal_Int32   nYNum;
-sal_Int32   nYDenom;
-sal_Int16   nUnit;
-
-rIStm.ReadInt16( nUnit );
-ReadPair( rIStm, aOrg );
-rIStm.ReadInt32( nXNum ).ReadInt32( nXDenom ).ReadInt32( nYNum 
).ReadInt32( nYDenom );
+sal_Int16 nUnit(0);
+rIStm.ReadInt16(nUnit);
+
+Point aOrg;
+ReadPair(rIStm, aOrg);
+
+sal_Int32 nXNum(0), nXDenom(0), nYNum(0), nYDenom(0);
+
rIStm.ReadInt32(nXNum).ReadInt32(nXDenom).ReadInt32(nYNum).ReadInt32(nYDenom);
+
+if (!rIStm.good() || nXDenom == 0 || nYDenom == 0)
+{
+SAL_WARN("vcl.gdi", "Parsing error: invalid mapmode fraction");
+return false;
+}
+
 rMapMode = MapMode( (MapUnit) nUnit, aOrg, Fraction( nXNum, nXDenom ), 
Fraction( nYNum, nYDenom ) );
+
+return true;
 }
 
 void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
@@ -506,7 +513,6 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 boolbFatLine = false;
 
 // TODO: fix reindentation below if you can accept being blamed by the SCM
-MapMode aMapMode;
 tools::Polygon aActionPoly;
 Rectangle   aRect;
 Point   aPt, aPt1;
@@ -516,7 +522,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 sal_uInt32  nUnicodeCommentStreamPos = 0;
 sal_Int32   nUnicodeCommentActionNumber = 0;
 
-ImplReadMapMode( rIStm, aMapMode ); // MapMode
+rMtf.SetPrefSize( aPrefSz );
+
+MapMode aMapMode;
+if (ImplReadMapMode(rIStm, aMapMode))   // MapMode
+rMtf.SetPrefMapMode(aMapMode);
+
 sal_Int32 nActions(0);
 rIStm.ReadInt32( nActions );// Action count
 if (nActions < 0)
@@ -533,8 +544,6 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 nActions = nMaxPossibleActions;
 }
 
-rMtf.SetPrefSize( aPrefSz );
-rMtf.SetPrefMapMode( aMapMode );
 size_t nLastPolygonAction(0);
 
 for (sal_Int32 i = 0; i < nActions && rIStm.good(); ++i)
@@ -1060,11 +1069,13 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& 
rIStm, GDIMetaFile& rMtf )
 
 case GDI_MAPMODE_ACTION:
 {
-ImplReadMapMode( rIStm, aMapMode );
-rMtf.AddAction( new MetaMapModeAction( aMapMode ) );
+if (ImplReadMapMode(rIStm, aMapMode))
+{
+rMtf.AddAction(new MetaMapModeAction(aMapMode));
 
-// #106172# Track font relevant data in shadow VDev
-aFontVDev->SetMapMode( aMapMode );
+// #106172# Track font relevant data in shadow VDev
+aFontVDev->SetMapMode(aMapMode);
+}
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - include/vcl sc/inc sc/source sw/source vcl/source

[Caolán McNamara]

 include/vcl/accel.hxx   |6 
 include/vcl/window.hxx  |3 
 sc/inc/sc.hrc   |4 
 sc/source/core/data/global.cxx  |   17 
 sc/source/ui/src/globstr.src| 4123 +---
 sw/source/uibase/inc/unotools.hxx   |   12 
 sw/source/uibase/utlui/unotools.cxx |   12 
 vcl/source/window/accel.cxx |5 
 8 files changed, 2073 insertions(+), 2109 deletions(-)

New commits:
commit d75e2358b2fa8d6ec8141dfd281d83557168a5ce
Author: Caolán McNamara 
Date:   Wed Feb 15 20:34:38 2017 +

MenuResource just wraps a ResStringArray, use ResStringArray directly

Change-Id: I1e263a8a17500f177a6aeb9bd0a12f4dd25298f2

diff --git a/sw/source/uibase/inc/unotools.hxx 
b/sw/source/uibase/inc/unotools.hxx
index c3c4870..96fc313 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -45,16 +45,6 @@ public:
 virtual void Resize() override;
 };
 
-class MenuResource : public Resource
-{
-ResStringArray  aMenuArray;
-
-public:
-MenuResource(const ResId& rResId);
-
-ResStringArray& GetMenuArray() {return aMenuArray;}
-};
-
 #define EX_SHOW_ONLINE_LAYOUT   0x001
 
 // hard zoom value
@@ -75,7 +65,7 @@ class SW_DLLPUBLIC SwOneExampleFrame
 IdleaLoadedIdle;
 Link aInitializedLink;
 
-MenuResourceaMenuRes;
+ResStringArray  aMenuRes;
 OUStringsArgumentURL;
 
 SwView* pModuleView;
diff --git a/sw/source/uibase/utlui/unotools.cxx 
b/sw/source/uibase/utlui/unotools.cxx
index 80c0f47..260a021 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -450,16 +450,15 @@ static const sal_Int16 nZoomValues[] =
 void SwOneExampleFrame::CreatePopup(const Point& rPt)
 {
 ScopedVclPtrInstance aPop;
-ResStringArray& rArr = aMenuRes.GetMenuArray();
 
-aPop->InsertItem(ITEM_UP,   rArr.GetString(rArr.FindIndex(ST_MENU_UP )));
-aPop->InsertItem(ITEM_DOWN, rArr.GetString(rArr.FindIndex(ST_MENU_DOWN )));
+aPop->InsertItem(ITEM_UP,   
aMenuRes.GetString(aMenuRes.FindIndex(ST_MENU_UP)));
+aPop->InsertItem(ITEM_DOWN, 
aMenuRes.GetString(aMenuRes.FindIndex(ST_MENU_DOWN)));
 
 Link aSelLk = LINK(this, SwOneExampleFrame, PopupHdl );
 aPop->SetSelectHdl(aSelLk);
 if(EX_SHOW_ONLINE_LAYOUT == nStyleFlags)
 {
-aPop->InsertItem(ITEM_ZOOM, rArr.GetString(rArr.FindIndex(ST_MENU_ZOOM 
  )));
+aPop->InsertItem(ITEM_ZOOM, 
aMenuRes.GetString(aMenuRes.FindIndex(ST_MENU_ZOOM)));
 
 uno::Reference< view::XViewSettingsSupplier >  xSettings(_xController, 
uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet >  xViewProps = 
xSettings->getViewSettings();
@@ -549,9 +548,4 @@ void SwFrameCtrlWindow::Resize()
 pExampleFrame->ClearDocument();
 }
 
-MenuResource::MenuResource(const ResId& rResId)
-: aMenuArray(rResId)
-{
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 30e81b8c7ee38f4ca938502f2bc61c7414129f1a
Author: Caolán McNamara 
Date:   Wed Feb 15 17:25:23 2017 +

unwind RID_GLOBSTR local resource

keep the GetRscString optimization and resource defines, but add
an offset to global space to their .src and .cxx fetching

Change-Id: I2156304aaaf6638f85cf0410e66aa8b1ed86e63b

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index cd375f8..37fc339 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -686,7 +686,7 @@
 #define RID_OBJECTBAR_PREVIEW   (SC_RESOURCE_START+6)
 #define RID_DRAW_WIN(SC_RESOURCE_START+13)
 #define RID_CNTRLR_WIN  (SC_RESOURCE_START+14)
-#define RID_GLOBSTR (SC_RESOURCE_START+15)
+// free
 #define RID_ALIGNMENT_WIN   (SC_RESOURCE_START+19)
 #define RID_ERRHDLSC(SC_RESOURCE_START+23)
 #define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35)
@@ -1255,6 +1255,8 @@
 
 #define SC_DIALOGS_END  (RID_SCPAGE_DEFAULTS + 1)
 
+#define RID_GLOBSTR_OFFSET  SC_DIALOGS_END
+
 #define MID_1   1
 #define MID_2   2
 #define MID_3   3
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 7ff840b..0df6b52 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -310,21 +310,6 @@ void ScGlobal::SetUserList( const ScUserList* pNewList )
 }
 }
 
-class ScRscStrLoader : public Resource
-{
-public:
-ScRscStrLoader( sal_uInt16 nRsc, sal_uInt16 nStrId ) :
-Resource( ScResId( nRsc ) ), theStr( ScResId( nStrId ) )
-{
-FreeResource();
-}
-
-const OUString& GetString() const { return theStr; }
-
-private:
-OUString theStr;
-};
-
 const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex )
 {
 assert( nIndex < SC_GLOBSTR_STR_COUNT);
@@ -361,7 +346,7 @@ const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex )
 if (eOp != ocNone)
 ppRscString[ nIndex ] = new 
OUString(ScCompiler::GetNativeSymbol(eOp));
 else
-ppRs