[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 8 commits - avmedia/source download.lst external/python3 hwpfilter/source sc/source sd/source svx/source sw/source

[Julien Nabet]

 avmedia/source/gstreamer/gstplayer.cxx |2 
 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 hwpfilter/source/drawing.h |2 
 hwpfilter/source/hiodev.cxx|3 
 sc/source/core/tool/interpr7.cxx   |9 ++
 sd/source/ui/dlg/prltempl.cxx  |1 
 svx/source/table/svdotable.cxx |1 
 sw/source/core/txtnode/ndtxt.cxx   |4 +
 sw/source/ui/index/swuiidxmrk.cxx  |4 -
 12 files changed, 72 insertions(+), 52 deletions(-)

New commits:
commit dfc0f39d32665051d9010ff25b686e88215925b0
Author: Julien Nabet 
Date:   Sat Aug 12 12:34:46 2017 +0200

tdf#109104: respect RFC3986 for newlines in ScEncodeURL

Quotation of RFC3986:
A percent-encoded octet is encoded as a character
triplet, consisting of the percent character "%" followed by the two
hexadecimal digits representing that octet's numeric value
So test the length of the return of OString::number and add "0" if needed

ScEncodeURL was added with:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=25434372bf56e0ebdb7e7d47ab3c14c68211509f

Thank you to Bele (the bugtracker reporter) for code pointer!

Change-Id: I8df102eb38b31933c6ebb15bb25c125b423f722b
Reviewed-on: https://gerrit.libreoffice.org/41086
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit dabba2e3368c2e2ae4ab03ddcfc667e13f89841d)
Reviewed-on: https://gerrit.libreoffice.org/41279
(cherry picked from commit fdaee404f3216441d6b78636c0defae580f26034)

diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index b226717c2935..48a34b3ece36 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -325,7 +325,14 @@ void ScInterpreter::ScEncodeURL()
 else
 {
 aUrlBuf.append( '%' );
-aUrlBuf.append( OString::number( static_cast( c 
), 16 ).toAsciiUpperCase() );
+OString convertedChar = OString::number( static_cast( c ), 16 ).toAsciiUpperCase();
+// RFC 3986 indicates:
+// "A percent-encoded octet is encoded as a character triplet,
+// consisting of the percent character "%" followed by the two 
hexadecimal digits
+// representing that octet's numeric value"
+if (convertedChar.getLength() == 1)
+aUrlBuf.append("0");
+aUrlBuf.append(convertedChar);
 }
 }
 PushString( OUString::fromUtf8( aUrlBuf.makeStringAndClear() ) );
commit f8440ce333c5055ddac3ae3dffb2a5b107c4ead1
Author: Tamás Zolnai 
Date:   Sun Aug 13 17:31:20 2017 +0200

tdf#85909: EDITING: Native tables visualization not refreshed

... after changes to borders

Regression from:
26b06662ebc3e5d664400bc95c39d6220de03136
"avoid repeated table layouting (fdo#75622)"

It was a performance change, but it was a bad idea to avoid
table layout refresh on this way

Anyway I added a call for border update even if not all
the table layouting is done. I tested with the test
document attached to fdo#75622, import time seems similar
so it does not cause perfromance issue to do that.

Change-Id: I7c6fcf105c89233512390dc2ecbd111a32f6779a
Reviewed-on: https://gerrit.libreoffice.org/41116
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit 3f72879a8e54e18f3ad587f7284b84db592c8d1a)
Reviewed-on: https://gerrit.libreoffice.org/41120
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 296a15773bec15c6aedec1a6be7b938fb60adc58)

diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 99b9a4c9f941..1120dca3faa8 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -725,6 +725,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool 
bFitWidth, bool bFitHe
 else
 {
 rArea = lastLayoutResultRectangle;
+mpLayouter->UpdateBorderLayout();
 }
 }
 }
commit bbb66d863416b48d452b3b2cb99c6f886bb41c99
Author: Caolán McNamara 
Date:   Wed Jul 19 09:54:20 2017 +0100

gtk3: make video playback fill playback window

Change-Id: I43f2f77889856dc6a3b0c3a3775826dbb000be7a
Reviewed-on: https://gerrit.libreoffice.org/40169
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit ed6c78abb8445cff51cc05118ce1f6311ed5a535)
Reviewed-on: https://gerrit.libreoffice.org/40366
Reviewed-by: Christian Lohmaier 
(cherry picked from commit

[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre' - 2 commits - comphelper/Library_comphelper.mk comphelper/source package/source xmlsecurity/source

[Thorsten Behrens]

 comphelper/Library_comphelper.mk   |1 
 comphelper/source/misc/storagehelper.cxx   |   63 -
 package/source/manifest/ManifestExport.cxx |  118 +
 xmlsecurity/source/gpg/SecurityEnvironment.cxx |6 -
 4 files changed, 126 insertions(+), 62 deletions(-)

New commits:
commit 4a270c8931169fdd8d1f1dcffecc2c061b198f41
Author: Thorsten Behrens 
Date:   Mon Aug 21 09:24:32 2017 +0200

demo hack: list all certificates

Change-Id: Ibc678cf9c0c8a0a8e8198516b8cbdebcc977c185

diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx 
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 367fa35e76a3..ed498a4d424b 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -70,8 +70,8 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironmentGpg::getPersonalCertif
 std::list< GpgME::Key > keyList;
 std::list< CertificateImpl* > certsList;
 
-m_ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
-GpgME::Error err = m_ctx->startKeyListing("", true);
+m_ctx->addKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
+GpgME::Error err = m_ctx->startKeyListing("", false);
 while (!err) {
 GpgME::Key k = m_ctx->nextKey(err);
 if (err)
@@ -109,7 +109,7 @@ Reference< XCertificate > 
SecurityEnvironmentGpg::getCertificate( const OUString
 if(xmlSecBase64Decode(strKeyId, const_cast(strKeyId), 
xmlStrlen(strKeyId)) < 0)
 throw RuntimeException("Base64 decode failed");
 
-m_ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
+m_ctx->addKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
 GpgME::Error err = m_ctx->startKeyListing("", false);
 while (!err) {
 GpgME::Key k = m_ctx->nextKey(err);
commit 61f3957cf48eacbbce2a2d0829e471b1e4c5457e
Author: Thorsten Behrens 
Date:   Mon Aug 21 09:22:49 2017 +0200

Make encrypt manifest writing actually work

Change-Id: I65c05c62d507c0ba781520885f4d36a9b6313f8e

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index ec5ac9d3240c..25449f09d919 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
 cppuhelper \
 sal \
 salhelper \
+   sax \
 ucbhelper \
i18nlangtag \
 ))
diff --git a/comphelper/source/misc/storagehelper.cxx 
b/comphelper/source/misc/storagehelper.cxx
index 7df94b276e8a..5f3defa34bf1 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -35,6 +35,8 @@
 #include 
 #include 
 #include 
+#include "com/sun/star/security/DocumentDigitalSignatures.hpp"
+#include "com/sun/star/security/XCertificate.hpp"
 
 #include 
 
@@ -42,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -50,6 +53,11 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+
 using namespace ::com::sun::star;
 
 namespace comphelper {
@@ -437,13 +445,58 @@ uno::Sequence< beans::NamedValue > 
OStorageHelper::CreateGpgPackageEncryptionDat
 uno::Sequence< beans::NamedValue > aGpgEncryptionData(3);
 uno::Sequence< beans::NamedValue > aEncryptionData(1);
 
+// TODO fire certificate chooser dialog
+uno::Reference< security::XDocumentDigitalSignatures > xSigner(
+security::DocumentDigitalSignatures::createWithVersion(
+comphelper::getProcessComponentContext(), "1.2" ) );
+
+// The use may provide a description while choosing a certificate.
+OUString aDescription;
+uno::Reference< security::XCertificate > xSignCertificate=
+xSigner->chooseCertificate(aDescription);
+
+uno::Sequence < sal_Int8 > aKeyID;
+if (xSignCertificate.is())
+{
+aKeyID = xSignCertificate->getSHA1Thumbprint();
+}
+
+std::unique_ptr ctx;
+GpgME::Error err = GpgME::checkEngine(GpgME::OpenPGP);
+if (err)
+throw RuntimeException("The GpgME library failed to initialize for the 
OpenPGP protocol.");
+
+ctx.reset( GpgME::Context::createForProtocol(GpgME::OpenPGP) );
+if (ctx == nullptr)
+throw RuntimeException("The GpgME library failed to initialize for the 
OpenPGP protocol.");
+ctx->setArmor(false);
+ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
+std::vector keys;
+keys.push_back(
+ctx->key(
+"0x909BE2575CEDBEA3", err, true));
+
+// good, ctx is setup now, let's sign the lot
+GpgME::Data data_in(
+
reinterpret_cast(xmlSecBufferGetData(pDsigCtx->transformCtx.result)),
+xmlSecBufferGetSize(pDsigCtx->transformCtx.result), false);
+GpgME::Data data_out;
+
+ctx->encrypt(keys, plain, cipher, GpgME::Context::NoCompress);
+
+SAL_INFO("xmlsecurity.xmlsec.gpg", "Generating signature for: " << 
xmlSecBufferGetData(pDsigCtx->transformCtx.result));
+
 // TODO perhaps rename that one - bit misleading name ...
 aGpgEncryptionData[0].Name = "KeyId";

[GSoC] QuarkXPress import, Week 11

[Alex P]

During this week I was less active because I am away from home, but still I
tried to do as much as I could: added test documents to libqxp-test
covering all currently supported features in 3.3-4.0 Win/Mac and
implemented parsing and output of paragraph/document leading (as line
height).

Also when preparing the test documents I discovered some missing format
details about documents with text loaded from files, and implemented it, so
libqxp now can handle such documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: onlineupdate/Executable_test_updater_dialog.mk onlineupdate/Module_onlineupdate.mk onlineupdate/workben Repository.mk

[Markus Mohrhard]

 Repository.mk  |4 +
 onlineupdate/Executable_test_updater_dialog.mk |   72 +
 onlineupdate/Module_onlineupdate.mk|1 
 onlineupdate/workben/test_dialog.cxx   |   34 +++
 4 files changed, 111 insertions(+)

New commits:
commit 12b3725aeff5d016d11853c9c8d5077f7e8f7b71
Author: Markus Mohrhard 
Date:   Mon Aug 21 09:32:02 2017 +0200

updater: add a way to test the dialog code of the updater

Change-Id: I7436edc85f87d1f68b50d39bf29564ff498c9ab9

diff --git a/Repository.mk b/Repository.mk
index d133131551a0..736e13370503 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -56,6 +56,10 @@ $(eval $(call gb_Helper_register_executables,NONE, \
sp2bv \
svg2odf \
svidl \
+   $(if $(ENABLE_ONLINE_UPDATE_MAR),\
+   $(if $(filter WNT,$(OS)), \
+   test_updater_dialog \
+   )) \
treex \
ulfex \
unoidl-read \
diff --git a/onlineupdate/Executable_test_updater_dialog.mk 
b/onlineupdate/Executable_test_updater_dialog.mk
new file mode 100644
index ..92e70dfae337
--- /dev/null
+++ b/onlineupdate/Executable_test_updater_dialog.mk
@@ -0,0 +1,72 @@
+# -*- 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_Executable_Executable,test_updater_dialog))
+
+$(eval $(call gb_Executable_set_include,test_updater_dialog,\
+   -I$(SRCDIR)/onlineupdate/inc \
+   -I$(SRCDIR)/onlineupdate/source/update/common \
+   -I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \
+   -I$(SRCDIR)/onlineupdate/source/update/updater \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,test_updater_dialog,\
+updatehelper \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_libs,test_updater_dialog,\
+   Ws2_32.lib \
+   Gdi32.lib \
+   Comctl32.lib \
+   Shell32.lib \
+   Shlwapi.lib \
+   Crypt32.lib \
+))
+
+$(eval $(call gb_Executable_set_targettype_gui,test_updater_dialog,YES))
+
+$(eval $(call gb_Executable_add_nativeres,test_updater_dialog,updaterres))
+
+$(eval $(call gb_Executable_add_ldflags,test_updater_dialog,\
+   /ENTRY:wmainCRTStartup \
+))
+
+$(eval $(call gb_Executable_add_defs,test_updater_dialog,\
+   -DUNICODE \
+))
+
+else
+
+$(eval $(call gb_Executable_add_defs,test_updater_dialog,\
+   -DVERIFY_MAR_SIGNATURE \
+   -DNSS3 \
+))
+
+$(eval $(call gb_Executable_use_externals,test_updater_dialog,\
+   nss3 \
+   gtk \
+))
+
+$(eval $(call gb_Executable_add_libs,test_updater_dialog,\
+   -lX11 \
+   -lXext \
+   -lXrender \
+   -lSM \
+   -lICE \
+   -lpthread \
+))
+endif
+
+$(eval $(call gb_Executable_add_exception_objects,test_updater_dialog,\
+   onlineupdate/workben/test_dialog \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/Module_onlineupdate.mk 
b/onlineupdate/Module_onlineupdate.mk
index a900e631a877..a343506e351d 100644
--- a/onlineupdate/Module_onlineupdate.mk
+++ b/onlineupdate/Module_onlineupdate.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
StaticLibrary_updatehelper \
$(if $(filter WNT,$(OS)),\
Executable_update_service \
+   Executable_test_updater_dialog \
WinResTarget_updater )\
Executable_mar \
Executable_updater \
diff --git a/onlineupdate/workben/test_dialog.cxx 
b/onlineupdate/workben/test_dialog.cxx
new file mode 100644
index ..113ec07eebbd
--- /dev/null
+++ b/onlineupdate/workben/test_dialog.cxx
@@ -0,0 +1,34 @@
+#include "progressui.h"
+#include "progressui_win.cxx"
+
+#include 
+#include 
+#include 
+
+void func()
+{
+for (int i = 0; i <= 100; ++i)
+{
+std::this_thread::sleep_for(std::chrono::milliseconds(200));
+UpdateProgressUI(i);
+}
+QuitProgressUI();
+}
+
+int wmain(int argc, wchar_t** argv)
+{
+InitProgressUI(&argc, &argv);
+std::thread a(func);
+/*
+volatile bool b = false;
+do
+{
+std::this_thread::sleep_for(std::chrono::seconds(1));
+}
+while (!b);
+*/
+int result = ShowProgressUI();
+std::cout << result << std::endl;
+a.join();
+return 0;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 desktop/source/app/cmdlinehelp.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 7766135f1ca11f942eb5b9ccc7828d55acfbe28f
Author: Mike Kaganski 
Date:   Mon Aug 21 09:51:16 2017 +0300

tdf#111908: only freopen if we try to use another console

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

diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index 043f7b2a2f5e..58583f71e45c 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -211,18 +211,18 @@ namespace desktop
 SetConsoleScreenBufferSize(hOut, cinfo.dwSize);
 }
 }
-}
 
-freopen("CON", "r", stdin);
-freopen("CON", "w", stdout);
-freopen("CON", "w", stderr);
+freopen("CON", "r", stdin);
+freopen("CON", "w", stdout);
+freopen("CON", "w", stderr);
 
-std::ios::sync_with_stdio(true);
+std::ios::sync_with_stdio(true);
 
-// In case we use parent's console, emit an empty string
-// to avoid output on a line with command prompt
-if (mConsoleMode == attached)
-fprintf(stdout, "\n");
+// In case we use parent's console, emit an empty string
+// to avoid output on a line with command prompt
+if (mConsoleMode == attached)
+fprintf(stdout, "\n");
+}
 }
 
 ~lcl_Console()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/inc/error.hrc|   49 +++
 sw/inc/swerror.h|   81 
 sw/source/filter/ascii/parasc.cxx   |2 
 sw/source/filter/html/css1atr.cxx   |2 
 sw/source/filter/html/htmlflywriter.cxx |8 +--
 sw/source/filter/html/htmlplug.cxx  |2 
 sw/source/filter/html/wrthtml.cxx   |2 
 7 files changed, 48 insertions(+), 98 deletions(-)

New commits:
commit 25f65b23840a424991027067ae48d0a1de682380
Author: Noel Grandin 
Date:   Mon Aug 21 07:14:58 2017 +0200

remove dead sw error codes

and inline some macros

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

diff --git a/sw/inc/error.hrc b/sw/inc/error.hrc
index c89b11abd505..77d6baa5ae64 100644
--- a/sw/inc/error.hrc
+++ b/sw/inc/error.hrc
@@ -25,47 +25,36 @@
 #define NC_(Context, String) (Context "\004" u8##String)
 
 #define ERR_CODE( class, err )  ErrCode(class | (sal_uInt32(err) - 
ERRCODE_AREA_SW))
-#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - 
WARN_SW_BASE))
+#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - 
(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK)))
 
 const ErrMsgCode RID_SW_ERRHDL[] =
 {
 // Import-Errors
-{ NC_("RID_SW_ERRHDL", "File format error found.") , ERR_CODE ( 
ERRCODE_CLASS_READ , ERR_SWG_FILE_FORMAT_ERROR ) },
-{ NC_("RID_SW_ERRHDL", "Error reading file.") , ERR_CODE ( 
ERRCODE_CLASS_READ , ERR_SWG_READ_ERROR ) },
-{ NC_("RID_SW_ERRHDL", "Input file error.") , ERR_CODE ( 
ERRCODE_CLASS_READ , ERR_SW6_INPUT_FILE ) },
-{ NC_("RID_SW_ERRHDL", "This is not a %PRODUCTNAME Writer file.") , 
ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_NOWRITER_FILE ) },
-{ NC_("RID_SW_ERRHDL", "Unexpected end of file.") , ERR_CODE ( 
ERRCODE_CLASS_READ , ERR_SW6_UNEXPECTED_EOF ) },
-{ NC_("RID_SW_ERRHDL", "Password-protected files cannot be opened.") , 
ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_PASSWD ) },
-{ NC_("RID_SW_ERRHDL", "This is not a valid WinWord6 file.") , ERR_CODE ( 
ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR ) },
-{ NC_("RID_SW_ERRHDL", "This file was saved with WinWord in 'Fast Save' 
mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file 
again.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_FASTSAVE_ERR ) },
-{ NC_("RID_SW_ERRHDL", "File format error found at $(ARG1)(row,col).") , 
ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) },
-{ NC_("RID_SW_ERRHDL", "File has been written in a newer version.") , 
ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) },
-{ NC_("RID_SW_ERRHDL", "This is not a valid WinWord97 file."), ERR_CODE ( 
ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR ) },
-{ NC_("RID_SW_ERRHDL", "Format error discovered in the file in 
sub-document $(ARG1) at $(ARG2)(row,col)."), ERR_CODE ( ERRCODE_CLASS_READ , 
ERR_FORMAT_FILE_ROWCOL ) },
+{ NC_("RID_SW_ERRHDL", "File format error found.") , 
ERR_SWG_FILE_FORMAT_ERROR },
+{ NC_("RID_SW_ERRHDL", "Error reading file.") , ERR_SWG_READ_ERROR },
+{ NC_("RID_SW_ERRHDL", "This is not a valid WinWord6 file.") , 
ERR_WW6_NO_WW6_FILE_ERR },
+{ NC_("RID_SW_ERRHDL", "File format error found at $(ARG1)(row,col).") , 
ERR_FORMAT_ROWCOL },
+{ NC_("RID_SW_ERRHDL", "This is not a valid WinWord97 file."), 
ERR_WW8_NO_WW8_FILE_ERR },
+{ NC_("RID_SW_ERRHDL", "Format error discovered in the file in 
sub-document $(ARG1) at $(ARG2)(row,col)."), ERR_FORMAT_FILE_ROWCOL },
 // Export-Errors
-{ NC_("RID_SW_ERRHDL", "Error writing file.") , ERR_CODE ( 
ERRCODE_CLASS_WRITE , ERR_SWG_WRITE_ERROR ) },
-{ NC_("RID_SW_ERRHDL", "Wrong AutoText document version.") , ERR_CODE ( 
ERRCODE_CLASS_WRITE , ERR_SWG_OLD_GLOSSARY ) },
-{ NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), ERR_CODE 
( ERRCODE_CLASS_WRITE , ERR_WRITE_ERROR_FILE ) },
+{ NC_("RID_SW_ERRHDL", "Error writing file.") , ERR_SWG_WRITE_ERROR },
+{ NC_("RID_SW_ERRHDL", "Wrong AutoText document version.") , 
ERR_SWG_OLD_GLOSSARY },
+{ NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), 
ERR_WRITE_ERROR_FILE },
 // Import-/Export-Errors
 { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file 
format.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) },
 { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file 
format.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) },
-{ NC_("RID_SW_ERRHDL", "$(ARG1) has changed.") , ERR_CODE ( 
ERRCODE_CLASS_LOCKING , ERR_TXTBLOCK_NEWFILE_ERROR ) },
-{ NC_("RID_SW_ERRHDL", "$(ARG1) does not exist.") , ERR_CODE ( 
ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) },
-{ NC_("RID_SW_ERRHDL", "Cells cannot be further split.") , ERR_CODE ( 
ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) },
-{ NC_("RID_SW_ERRHDL", "Additional columns cannot be

Weekly QA Report (W33-2017)

[Xisco Fauli]

Hello,

What have happened in QA in the last 7 days?

  * 140 have been created, of which, 41 are still unconfirmed ( Total
Unconfirmed bugs: 451 )
Link: http://tinyurl.com/y8s8hqbd

  * 1048 comments have been written.

== STATUS CHANGED ==
  * 20 bugs have been changed to 'ASSIGNED'.
Link: http://tinyurl.com/ycwj9b9j
Done by: Xisco Faulí ( 7 ), Dennis Francis ( 3 ), Justin L ( 2 ),
Miklos Vajna ( 1 ), Vasily Melenchuk (CIB) ( 1 ), Heiko Tietze ( 1 ),
Taylor Lee ( 1 ), Julien Nabet ( 1 ), Paul Trojahn ( 1 ), Gabor Kelemen
( 1 ), Eike Rathke ( 1 )

  * 2 bugs have been changed to 'CLOSED'.
Link: http://tinyurl.com/y8a8c26y
Done by: V Stuart Foote ( 1 ), Adolfo Jayme ( 1 )

  * 36 bugs have been changed to 'NEEDINFO'.
Link: http://tinyurl.com/y7e3c722
Done by: Xisco Faulí ( 20 ), m.a.riosv ( 3 ), Jean-Baptiste Faure (
3 ), Buovjaga ( 2 ), Heiko Tietze ( 1 ), Thomas Woltjer ( 1 ), Regina
Henschel ( 1 ), raal ( 1 ), Michael Stahl ( 1 ), Timur ( 1 ), Caolán
McNamara ( 1 ), admin ( 1 )

  * 103 bugs have been changed to 'NEW'.
Link: http://tinyurl.com/yaezfjhz
Done by: Xisco Faulí ( 30 ), raal ( 16 ), Buovjaga ( 13 ), Telesto (
9 ), Jacques Guilleron ( 5 ), Aron Budea ( 5 ), V Stuart Foote ( 4 ),
Tamás Zolnai ( 2 ), Regina Henschel ( 2 ), Yousuf Philips (jay) ( 2 ),
Jean-Baptiste Faure ( 2 ), Alex Thurgood ( 2 ), Julien Nabet ( 1 ),
robert ( 1 ), Olivier Hallot ( 1 ), Michael Stahl ( 1 ), Mike Kaganski (
1 ), m.a.riosv ( 1 ), Luke ( 1 ), Jan Holesovsky ( 1 ), Timur ( 1 ),
sophie ( 1 ), Cor Nouws ( 1 )

  * 6 bugs have been changed to 'REOPENED'.
Link: http://tinyurl.com/y7octksn
Done by: Cor Nouws ( 2 ), Rpnpif ( 1 ), Robert McClure ( 1 ), Jan P.
( 1 ), Evgen ( 1 )

  * 26 bugs have been changed to 'RESOLVED DUPLICATE'.
Link: http://tinyurl.com/yb9xygtd
Done by: Xisco Faulí ( 9 ), Yousuf Philips (jay) ( 3 ), Alex
Thurgood ( 3 ), raal ( 2 ), Jean-Baptiste Faure ( 2 ), Adolfo Jayme ( 2
), Telesto ( 1 ), Michael Stahl ( 1 ), Justin L ( 1 ), Caolán McNamara (
1 ), Aron Budea ( 1 )

  * 35 bugs have been changed to 'RESOLVED FIXED'.
Link: http://tinyurl.com/y8rddzo8
Done by: Heiko Tietze ( 5 ), Tamás Zolnai ( 4 ), Szymon Kłos ( 4 ),
Adolfo Jayme ( 4 ), Julien Nabet ( 3 ), V Stuart Foote ( 2 ), Justin L (
2 ), Miklos Vajna ( 1 ), Ximeng Zu ( 1 ), Yousuf Philips (jay) ( 1 ),
Olivier Hallot ( 1 ), Muhammet Kara ( 1 ), Michael Stahl ( 1 ), Khaled
Hosny ( 1 ), Gabor Kelemen ( 1 ), Jean-Baptiste Faure ( 1 ), Caolán
McNamara ( 1 ), Aron Budea ( 1 )

  * 2 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'.
Link: http://tinyurl.com/y7thraab
Done by: Julien Nabet ( 1 ), Jean-Baptiste Faure ( 1 )

  * 1 bug has been changed to 'RESOLVED INVALID'.
Link: http://tinyurl.com/yc8j75k8
Done by: Tamás Zolnai ( 1 )

  * 9 bugs have been changed to 'RESOLVED NOTABUG'.
Link: http://tinyurl.com/y85w2xwx
Done by: Xisco Faulí ( 6 ), Jean-Baptiste Faure ( 2 ), Buovjaga ( 1 )

  * 5 bugs have been changed to 'RESOLVED NOTOURBUG'.
Link: http://tinyurl.com/yczxet8u
Done by: Heiko Tietze ( 2 ), Timur ( 2 ), Mark Watford ( 1 )

  * 8 bugs have been changed to 'RESOLVED WONTFIX'.
Link: http://tinyurl.com/yabwovkf
Done by: Xisco Faulí ( 2 ), Buovjaga ( 1 ), Stephan Bergmann ( 1 ),
Michael Stahl ( 1 ), Jean-Baptiste Faure ( 1 ), grofaty ( 1 ), Cor Nouws
( 1 )

  * 26 bugs have been changed to 'RESOLVED WORKSFORME'.
Link: http://tinyurl.com/ybw4wevj
Done by: Cor Nouws ( 7 ), Jean-Baptiste Faure ( 4 ), Xisco Faulí ( 2
), Heiko Tietze ( 2 ), Yan Pas ( 1 ), V Stuart Foote ( 1 ), Buovjaga ( 1
), Thomas Woltjer ( 1 ), Telesto ( 1 ), Olivier Hallot ( 1 ), nshani.ca
( 1 ), Alex Thurgood ( 1 ), Timur ( 1 ), Aron Budea ( 1 ), Antonio
Riccobon ( 1 )

  * 19 bugs have been changed to 'UNCONFIRMED'.
Link: http://tinyurl.com/y98wdg9o
Done by: Xisco Faulí ( 2 ), krishna [:kr1shna] ( 2 ), Yan Pas ( 1 ),
V Stuart Foote ( 1 ), Julien Nabet ( 1 ), sergio.callegari ( 1 ), Robert
McClure ( 1 ), Mohith Manoj ( 1 ), Luis ( 1 ), Kevin Holloway ( 1 ),
Jens Bornschein ( 1 ), Timur ( 1 ), gemikro1 ( 1 ), Fabien ( 1 ),
Alberto Salvia Novella ( 1 ), Edward ( 1 ), Darrell ( 1 )

  * 15 bugs have been changed to 'VERIFIED FIXED'.
Link: http://tinyurl.com/y9kzcfar
Done by: Cor Nouws ( 5 ), Aron Budea ( 3 ), Xisco Faulí ( 2 ), Alex
Thurgood ( 2 ), Heiko Tietze ( 1 ), Julien Nabet ( 1 ), Timur ( 1 )

== KEYWORDS ADDED ==
  * 'bibisectRequest' has been added to 5 bugs.
Link: http://tinyurl.com/y9h46lnv
Done by: Buovjaga ( 3 ), Xisco Faulí ( 1 ), Aron Budea ( 1 )

  * 'bibisected' has been added to 12 bugs.
Link: http://tinyurl.com/ya9sxn8y
Done by: Xisco Faulí ( 7 ), raal ( 2 ), Mike Kaganski ( 1 ),
Terrence Enger ( 1 ), Aron Budea ( 1 )

  * 'bisected' has been added to 9 bugs.
Link: http://tinyurl.com/y9m8vskp
Done by: Xisco Faulí ( 5 ), raal ( 3 ), Aron Budea ( 1 )

  * 'easyHack' has been added to 16 bugs.
Link: http://tinyur

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

[Noel Grandin]

 sd/inc/errhdl.hrc  |9 +++--
 sd/inc/sderror.hxx |   17 -
 2 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 60dc8572e677b6c29f73d8848d9d6036d8d1ff05
Author: Noel Grandin 
Date:   Mon Aug 21 08:51:40 2017 +0200

simplify sd error macros

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

diff --git a/sd/inc/errhdl.hrc b/sd/inc/errhdl.hrc
index bcaa2a0a5328..f568a0292f62 100644
--- a/sd/inc/errhdl.hrc
+++ b/sd/inc/errhdl.hrc
@@ -24,17 +24,14 @@
 
 #include "sderror.hxx"
 
-#define ERR_CODE( class, err )  ErrCode(class | (sal_uInt32(err) - 
ERROR_SD_BASE))
-#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - 
WARN_SD_BASE))
-
 const ErrMsgCode RID_SD_ERRHDL[] =
 {
 { NC_("RID_SD_ERRHDL", "File format error found at $(ARG1)(row,col)."),
-  ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) },
+  ERR_FORMAT_ROWCOL },
 { NC_("RID_SD_ERRHDL", "Format error discovered in the file in 
sub-document $(ARG1) at position $(ARG2)(row,col)."),
-  ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) },
+  ERR_FORMAT_FILE_ROWCOL },
 { NC_("RID_SD_ERRHDL", "Format error discovered in the file in 
sub-document $(ARG1) at position $(ARG2)(row,col)."),
-  ERR_CODE ( ERRCODE_CLASS_READ , WARN_FORMAT_FILE_ROWCOL ) },
+  WARN_FORMAT_FILE_ROWCOL },
 { nullptr, ERRCODE_NONE }
 };
 
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index 4f52035a13c0..2be4c8c634b3 100644
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -22,21 +22,12 @@
 
 #include 
 
-#define ERROR_SD_BASE   (ERRCODE_AREA_SD)
-#define ERROR_SD_READ_BASE  (ERROR_SD_BASE | ERRCODE_CLASS_READ)
-#define ERROR_SD_WRITE_BASE (ERROR_SD_BASE | ERRCODE_CLASS_WRITE)
-
-#define WARN_SD_BASE(ERRCODE_AREA_SD | ERRCODE_WARNING_MASK)
-#define WARN_SD_READ_BASE   (WARN_SD_BASE | ERRCODE_CLASS_READ )
-#define WARN_SD_WRITE_BASE  (WARN_SD_BASE | ERRCODE_CLASS_WRITE )
-
 // Import errors
-#define ERR_FORMAT_ROWCOL   ErrCode(ERROR_SD_READ_BASE | 1)
-#define ERR_FORMAT_FILE_ROWCOL  ErrCode(ERROR_SD_READ_BASE | 2)
-
-// - Warnings ---
+#define ERR_FORMAT_ROWCOL   ErrCode(ERRCODE_AREA_SD | 
ERRCODE_CLASS_READ | 1)
+#define ERR_FORMAT_FILE_ROWCOL  ErrCode(ERRCODE_AREA_SD | 
ERRCODE_CLASS_READ | 2)
 
-#define WARN_FORMAT_FILE_ROWCOL ErrCode(WARN_SD_READ_BASE | 100)
+// Warnings
+#define WARN_FORMAT_FILE_ROWCOL ErrCode(ERRCODE_AREA_SD | 
ERRCODE_WARNING_MASK | ERRCODE_CLASS_READ | 100)
 
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 svx/inc/sxonitm.hxx   |   31 ---
 svx/inc/sxraitm.hxx   |   31 ---
 svx/source/svdraw/svdattr.cxx |2 --
 svx/source/svdraw/svdobj.cxx  |6 ++
 4 files changed, 2 insertions(+), 68 deletions(-)

New commits:
commit 8f412d7445c3e8b7277757f454a97b84341e55e9
Author: Jochen Nitschke 
Date:   Sun Aug 20 22:25:23 2017 +0200

drop pointless headers

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

diff --git a/svx/inc/sxonitm.hxx b/svx/inc/sxonitm.hxx
deleted file mode 100644
index 820e398130a0..
--- a/svx/inc/sxonitm.hxx
+++ /dev/null
@@ -1,31 +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 .
- */
-#ifndef INCLUDED_SVX_INC_SXONITM_HXX
-#define INCLUDED_SVX_INC_SXONITM_HXX
-
-#include 
-#include 
-
-inline SfxStringItem makeSdrObjectNameItem(const OUString& rStr) {
-return SfxStringItem(SDRATTR_OBJECTNAME,rStr);
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sxraitm.hxx b/svx/inc/sxraitm.hxx
deleted file mode 100644
index e6b44c1d0d86..
--- a/svx/inc/sxraitm.hxx
+++ /dev/null
@@ -1,31 +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 .
- */
-#ifndef INCLUDED_SVX_INC_SXRAITM_HXX
-#define INCLUDED_SVX_INC_SXRAITM_HXX
-
-#include 
-#include 
-
-inline SdrAngleItem makeSdrRotateAngleItem(long nAngle) {
-return SdrAngleItem(SDRATTR_ROTATEANGLE, nAngle);
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index d38a8e6bf5be..0a6d5a791472 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -86,9 +86,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index c41aae438575..947f70a29f4e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -98,9 +98,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -2135,7 +2133,7 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr) 
const
 lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, 
IsResizeProtect()));
 lcl_SetItem(rAttr,false,SdrObjPrintableItem(IsPrintable()));
 lcl_SetItem(rAttr,false,SdrObjVisibleItem(IsVisible()));
-lcl_SetItem(rAttr,false,makeSdrRotateAngleItem(GetRotateAngle()));
+lcl_SetItem(rAttr,false,SdrAngleItem(SDRATTR_ROTATEANGLE, 
GetRotateAngle()));
 lcl_SetItem(rAttr,false,SdrShearAngleItem(GetShearAngle()));
 lcl_SetItem(rAttr,false,SdrOneSizeWidthItem(rSnap.GetWidth()-1));
 lcl_SetItem(rAttr,false,SdrOneSizeHeightItem(rSnap.GetHeight()-1));
@@ -2151,7 +2149,7 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr) 
const
 
 if (!aName.isEmpty())
 {
-lcl_SetItem(rAttr, false, makeSdrObjectNameItem(aName));
+lcl_SetItem(rAttr, false, SfxStringItem(SDRATTR_OBJECTNAME, aName));
 }
 
 lcl_SetItem(rAttr,false,SdrLayerIdItem(GetLayer()));
___
Libre

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

[Adolfo Jayme Barrientos]

 source/text/sbasic/shared/05060700.xhp |   52 -
 1 file changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 8bece13f73046ebebfb5c18d02d857a961a4cdab
Author: Adolfo Jayme Barrientos 
Date:   Mon Aug 21 04:04:24 2017 -0500

These lame ASCII x’s didn’t need to be translatable

The table looks cooler with U+2713 and localizers
don’t need to waste time with superfluous strings.
Double win!

Change-Id: Ie5b308e451a7877ebfe8a393b00be11d09d8f7cc

diff --git a/source/text/sbasic/shared/05060700.xhp 
b/source/text/sbasic/shared/05060700.xhp
index 7f6f51bcc..36431748a 100644
--- a/source/text/sbasic/shared/05060700.xhp
+++ b/source/text/sbasic/shared/05060700.xhp
@@ -74,13 +74,13 @@
 Object is 
selected.
 
 
-x
+✓
 
 
-x
+✓
 
 
-x
+✓
 
 
 
@@ -97,21 +97,21 @@
 Mouse moves 
over the object.
 
 
-x
+✓
 
 
-x
+✓
 
 
-x
+✓
 
 
 
 
-x
+✓
 
 
-x
+✓
 
 
 
@@ -122,20 +122,20 @@
 Hyperlink 
assigned to the object is clicked.
 
 
-x
+✓
 
 
-x
+✓
 
 
-x
+✓
 
 
 
 
 
 
-x
+✓
 
 
 
@@ -146,21 +146,21 @@
 Mouse moves 
off of the object.
 
 
-x
+✓
 
 
-x
+✓
 
 
-x
+✓
 
 
 
 
-x
+✓
 
 
-x
+✓
 
 
 
@@ -173,7 +173,7 @@
 
 
 
-x
+✓
 
 
 
@@ -194,7 +194,7 @@
 
 
 
-x
+✓
 
 
 
@@ -215,7 +215,7 @@
 
 
 
-x
+✓
 
 
 
@@ -238,7 +238,7 @@
 
 
 
-x
+✓
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-x
+✓
 
 
 
@@ -280,7 +280,7 @@
 
 
 
-x
+✓
 
 
 
@@ -301,7 +301,7 @@
 
 
 
-x
+✓
 
 
 
@@ -324,7 +324,7 @@
 
 
 
-x
+✓
 
 
 
@@ -345,7 +345,7 @@
 
 
 
-x
+✓
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit ca13faa5dd06ccb3906c337ffdff8be77dfca56f
Author: Adolfo Jayme Barrientos 
Date:   Mon Aug 21 04:04:24 2017 -0500

Updated core
Project: help  8bece13f73046ebebfb5c18d02d857a961a4cdab

These lame ASCII x’s didn’t need to be translatable

The table looks cooler with U+2713 and localizers
don’t need to waste time with superfluous strings.
Double win!

Change-Id: Ie5b308e451a7877ebfe8a393b00be11d09d8f7cc

diff --git a/helpcontent2 b/helpcontent2
index c399dc47d92d..8bece13f7304 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c399dc47d92de039391f4962df355f632ce10d05
+Subproject commit 8bece13f73046ebebfb5c18d02d857a961a4cdab
___
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/test/convertuintptr.cxx |4 ++--
 compilerplugins/clang/test/droplong.cxx   |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4eaaa812cebe7c8ec729616e35794dfee64c338a
Author: Stephan Bergmann 
Date:   Mon Aug 21 11:11:26 2017 +0200

Adapt tests to Windows

Change-Id: I8d33234196060f96ad47c9d0fead4f31218f8bdd

diff --git a/compilerplugins/clang/test/convertuintptr.cxx 
b/compilerplugins/clang/test/convertuintptr.cxx
index 8789394c541f..f1c484d8f730 100644
--- a/compilerplugins/clang/test/convertuintptr.cxx
+++ b/compilerplugins/clang/test/convertuintptr.cxx
@@ -12,8 +12,8 @@
 int main()
 {
 sal_uIntPtr x = 1;
-sal_uInt32 y = x; // expected-error {{cast from 'sal_uIntPtr' (aka 
'unsigned long') to 'sal_uInt32' (aka 'unsigned int') 
[loplugin:convertuintptr]}}
-y = x; // expected-error {{cast from 'sal_uIntPtr' (aka 'unsigned long') 
to 'sal_uInt32' (aka 'unsigned int') [loplugin:convertuintptr]}}
+sal_uInt32 y = x; // expected-error-re {{cast from 'sal_uIntPtr' (aka 
'unsigned {{.+}}') to 'sal_uInt32' (aka 'unsigned {{.+}}') 
[loplugin:convertuintptr]}}
+y = x; // expected-error-re {{cast from 'sal_uIntPtr' (aka 'unsigned 
{{.+}}') to 'sal_uInt32' (aka 'unsigned {{.+}}') [loplugin:convertuintptr]}}
 (void)y;
 }
 
diff --git a/compilerplugins/clang/test/droplong.cxx 
b/compilerplugins/clang/test/droplong.cxx
index d90c31945cd5..6b9271a20103 100644
--- a/compilerplugins/clang/test/droplong.cxx
+++ b/compilerplugins/clang/test/droplong.cxx
@@ -17,10 +17,10 @@ int main()
 (void)tmp;
 tmp = x + y; // expected-error {{rather replace 'long' with 'int' 
[loplugin:droplong]}}
 
-sal_uLong tmp1 = x + y; // expected-error {{rather replace 'sal_uLong' 
(aka 'unsigned long') with 'int' [loplugin:droplong]}}
+sal_uLong tmp1 = x + y; // expected-error-re {{rather replace 'sal_uLong' 
(aka 'unsigned {{.+}}') with 'int' [loplugin:droplong]}}
 (void)tmp1;
 
-int tmp2 = (sal_uLong)1; // expected-error {{sal_uLong cast from 
'sal_uLong' (aka 'unsigned long') [loplugin:droplong]}}
+int tmp2 = (sal_uLong)1; // expected-error-re {{sal_uLong cast from 
'sal_uLong' (aka 'unsigned {{.+}}') [loplugin:droplong]}}
 tmp2 = (long)1; // expected-error {{long cast from 'long' 
[loplugin:droplong]}}
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 embedserv/source/embed/servprov.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 19efa825090f1b41bcbc2f6d84ee0102cf4bb259
Author: Stephan Bergmann 
Date:   Mon Aug 21 11:12:02 2017 +0200

loplugin:unnecessaryparen (clang-cl)

Change-Id: I11a535a5271ec15965877986f15adc0804c00a4f

diff --git a/embedserv/source/embed/servprov.cxx 
b/embedserv/source/embed/servprov.cxx
index 407dc1e2e8ff..d44ee2e161da 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -71,13 +71,13 @@ CurThreadData::~CurThreadData()
 bool CurThreadData::setData(void *pData)
 {
 OSL_ENSURE( m_hKey, "No thread key!" );
-return (osl_setThreadKeyData(m_hKey, pData));
+return osl_setThreadKeyData(m_hKey, pData);
 }
 
 void *CurThreadData::getData()
 {
 OSL_ENSURE( m_hKey, "No thread key!" );
-return (osl_getThreadKeyData(m_hKey));
+return osl_getThreadKeyData(m_hKey);
 }
 
 void o2u_attachCurrentThread()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit 6abaa9b1696e25bbb90c98264bcb88d0661b38a6
Author: Andras Timar 
Date:   Mon Aug 21 11:23:52 2017 +0200

Updated core
Project: translations  26412391078511f68986b8e3ad4a94229cf7c52d

Updated Slovenian translation

Change-Id: I44b1d0ff387f34ec2f2c2131d079b80cdb76e365

diff --git a/translations b/translations
index b15cfdea86ec..264123910785 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b15cfdea86ec3e5ddfcf3714c37da75e42012a93
+Subproject commit 26412391078511f68986b8e3ad4a94229cf7c52d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4' - source/sl

[Andras Timar]

 source/sl/basic/source/classes.po |  536 -
 source/sl/sc/source/ui/src.po |15430 +++---
 source/sl/scaddins/source/analysis.po | 4173 -
 source/sl/sd/source/core.po   |  126 
 source/sl/svtools/source/misc.po  |1 
 source/sl/svx/source/dialog.po| 2611 ++---
 source/sl/svx/source/src.po   |  668 -
 source/sl/svx/uiconfig/ui.po  |8 
 source/sl/sw/source/ui/utlui.po   |  138 
 9 files changed, 10617 insertions(+), 13074 deletions(-)

New commits:
commit 26412391078511f68986b8e3ad4a94229cf7c52d
Author: Andras Timar 
Date:   Mon Aug 21 11:23:52 2017 +0200

Updated Slovenian translation

Change-Id: I44b1d0ff387f34ec2f2c2131d079b80cdb76e365

diff --git a/source/sl/basic/source/classes.po 
b/source/sl/basic/source/classes.po
index 8f84e911ef3..5b9ff862454 100644
--- a/source/sl/basic/source/classes.po
+++ b/source/sl/basic/source/classes.po
@@ -1,16 +1,15 @@
-#. extracted from basic/source/classes
 msgid ""
 msgstr ""
-"Project-Id-Version: LibreOffice 5.1\n"
+"Project-Id-Version: LibreOffice 5.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-10-04 10:08+0200\n"
-"PO-Revision-Date: 2015-09-13 14:53+0200\n"
+"POT-Creation-Date: 2017-07-07 11:30+0200\n"
+"PO-Revision-Date: 2017-08-19 11:32+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -21,8 +20,8 @@ msgstr ""
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_SYNTAX & ERRCODE_RES_MASK\n"
-"string.text"
+"Syntax error.\n"
+"itemlist.text"
 msgid "Syntax error."
 msgstr "Napaka v skladnji."
 
@@ -30,8 +29,8 @@ msgstr "Napaka v skladnji."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_GOSUB & ERRCODE_RES_MASK\n"
-"string.text"
+"Return without Gosub.\n"
+"itemlist.text"
 msgid "Return without Gosub."
 msgstr "Return brez Gosub."
 
@@ -39,8 +38,8 @@ msgstr "Return brez Gosub."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_REDO_FROM_START & ERRCODE_RES_MASK\n"
-"string.text"
+"Incorrect entry; please retry.\n"
+"itemlist.text"
 msgid "Incorrect entry; please retry."
 msgstr "Napačen vnos; poskusite znova."
 
@@ -48,8 +47,8 @@ msgstr "Napačen vnos; poskusite znova."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_ARGUMENT & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid procedure call.\n"
+"itemlist.text"
 msgid "Invalid procedure call."
 msgstr "Neveljaven klic procedure."
 
@@ -57,8 +56,8 @@ msgstr "Neveljaven klic procedure."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_MATH_OVERFLOW & ERRCODE_RES_MASK\n"
-"string.text"
+"Overflow.\n"
+"itemlist.text"
 msgid "Overflow."
 msgstr "Prekoračitev."
 
@@ -66,8 +65,8 @@ msgstr "Prekoračitev."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_MEMORY & ERRCODE_RES_MASK\n"
-"string.text"
+"Not enough memory.\n"
+"itemlist.text"
 msgid "Not enough memory."
 msgstr "Ni dovolj pomnilnika."
 
@@ -75,8 +74,8 @@ msgstr "Ni dovolj pomnilnika."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ALREADY_DIM & ERRCODE_RES_MASK\n"
-"string.text"
+"Array already dimensioned.\n"
+"itemlist.text"
 msgid "Array already dimensioned."
 msgstr "Dimenzije polja so že določene."
 
@@ -84,8 +83,8 @@ msgstr "Dimenzije polja so že določene."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_OUT_OF_RANGE & ERRCODE_RES_MASK\n"
-"string.text"
+"Index out of defined range.\n"
+"itemlist.text"
 msgid "Index out of defined range."
 msgstr "Kazalo je izven določenega obsega."
 
@@ -93,8 +92,8 @@ msgstr "Kazalo je izven določenega obsega."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DUPLICATE_DEF & ERRCODE_RES_MASK\n"
-"string.text"
+"Duplicate definition.\n"
+"itemlist.text"
 msgid "Duplicate definition."
 msgstr "Podvojena definicija."
 
@@ -102,8 +101,8 @@ msgstr "Podvojena definicija."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ZERODIV & ERRCODE_RES_MASK\n"
-"string.text"
+"Division by zero.\n"
+"itemlist.text"
 msgid "Division by zero."
 msgstr "Deljenje z nič."
 
@@ -111,8 +110,8 @@ msgstr "Deljenje z nič."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_VAR_UNDEFINED & ERRCODE_RES_MASK\n"
-"string.text"
+"Variable not defined.\n"
+"itemlist.text"
 msgid "Variable not defined."
 msgstr "Spremenljivka ni definirana."
 
@@ -120,8 +119,8 @@ msgstr "Spremenljivka ni definirana."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_CONVERSION & ERRCODE_RES_MASK\n"
-"string.text"
+"Data type mismatch.\n"
+"itemlist.text"
 msgid "Da

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

[Jochen Nitschke]

 sd/inc/sdattr.hrc |7 +++
 sd/source/ui/app/optsitem.cxx |   24 
 sd/source/ui/app/sdmod2.cxx   |3 ---
 sd/source/ui/inc/optsitem.hxx |   13 -
 4 files changed, 3 insertions(+), 44 deletions(-)

New commits:
commit fabafcfc1861646c7e39810d262777010200dbd1
Author: Jochen Nitschke 
Date:   Mon Aug 21 08:48:43 2017 +0200

drop unused SdOptionsContentsItem

unused since commit e933538779d29a472c92252f14660c245aa8622e
Date:   Mon Nov 26 13:34:57 2007 +
INTEGRATION: CWS aw053 (1.23.124); FILE MERGED

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

diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index dc1131a43f40..8c7629460a4c 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -94,10 +94,9 @@
 
 #define ATTR_OPTIONS_START  ATTR_SNAPLINE_END + 1
 #define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1
-#define ATTR_OPTIONS_CONTENTS   ATTR_OPTIONS_START + 2
-#define ATTR_OPTIONS_MISC   ATTR_OPTIONS_START + 3
-#define ATTR_OPTIONS_SNAP   ATTR_OPTIONS_START + 4
-#define ATTR_OPTIONS_PRINT  ATTR_OPTIONS_START + 5
+#define ATTR_OPTIONS_MISC   ATTR_OPTIONS_START + 2
+#define ATTR_OPTIONS_SNAP   ATTR_OPTIONS_START + 3
+#define ATTR_OPTIONS_PRINT  ATTR_OPTIONS_START + 4
 #define ATTR_OPTIONS_ENDATTR_OPTIONS_PRINT
 
 #define ATTR_OPTIONS_SCALE_STARTATTR_OPTIONS_END + 1
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 3e38c6e963a8..0f67b818113d 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -382,30 +382,6 @@ bool SdOptionsContents::WriteData( Any* pValues ) const
 
 return true;
 }
-
-/*
-|*
-|* SdOptionsContentsItem
-|*
-\/
-
-SdOptionsContentsItem::SdOptionsContentsItem()
-:   SfxPoolItem ( ATTR_OPTIONS_CONTENTS )
-,   maOptionsContents   ( false, false )
-{
-}
-
-SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const
-{
-return new SdOptionsContentsItem( *this );
-}
-
-bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
-{
-assert(SfxPoolItem::operator==(rAttr));
-return maOptionsContents == static_cast(rAttr).maOptionsContents;
-}
-
 /*
 |*
 |* SdOptionsMisc
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 1e95727d4a64..3f025fec1f8d 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -470,9 +470,6 @@ std::unique_ptr SdModule::CreateItemSet( 
sal_uInt16 nSlot )
 
 pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nMetric ) );
 
-// TP_OPTIONS_CONTENTS:
-pRet->Put( SdOptionsContentsItem() );
-
 // TP_OPTIONS_MISC:
 SdOptionsMiscItem aSdOptionsMiscItem( pOptions, pFrameView );
 if ( pFrameView )
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index bf1e3aabd903..1eb581b6f65c 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -176,19 +176,6 @@ public:
 booloperator==( const SdOptionsContents& rOpt ) const;
 };
 
-class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem
-{
-public:
-
-SdOptionsContentsItem();
-
-virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
-virtual booloperator==( const SfxPoolItem& ) const override;
-
-private:
-SdOptionsContents   maOptionsContents;
-};
-
 class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric
 {
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aditya Dewan]

 loleaflet/dist/admin/bootstrap/dashboard.css |   12 
 loleaflet/src/admin/AdminSocketAnalytics.js  |   66 ---
 2 files changed, 62 insertions(+), 16 deletions(-)

New commits:
commit 0cf9c8791f7b40db4f04f3946fa067fed63d44bf
Author: Aditya Dewan 
Date:   Sat Aug 19 03:38:59 2017 +0530

tdf#107278 Beautification of graphs
- better looking axis
- smooth transition for axis and data path

Change-Id: I419a1e9a0691fc4b6a396a970a438431aa724d9c
Reviewed-on: https://gerrit.libreoffice.org/41313
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/admin/bootstrap/dashboard.css 
b/loleaflet/dist/admin/bootstrap/dashboard.css
index 82fb2f5f..1f627f0e 100644
--- a/loleaflet/dist/admin/bootstrap/dashboard.css
+++ b/loleaflet/dist/admin/bootstrap/dashboard.css
@@ -140,10 +140,20 @@ tr:hover .userContainer .dropdown-menu, td:hover 
.docContainer .dropdown-menu{
 /*
  * Graph view buttons
  */
-
 .nav-tabs > li.active > a{
   background-color: #f5f5f5;
 }
 .graph-content {
   background-color: #f5f5f5;
+}
+
+.axis path, .axis line{
+  fill: none;
+  stroke: grey;
+  stroke-width: 1;
+  shape-rendering: crispEdges;
+}
+
+path {
+  stroke-width: 1;
 }
\ No newline at end of file
diff --git a/loleaflet/src/admin/AdminSocketAnalytics.js 
b/loleaflet/src/admin/AdminSocketAnalytics.js
index 72d5f275..f2286596 100644
--- a/loleaflet/src/admin/AdminSocketAnalytics.js
+++ b/loleaflet/src/admin/AdminSocketAnalytics.js
@@ -120,12 +120,17 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
d3XAxis = d3.svg.axis()
.scale(xScale)
.tickFormat(function(d) {
-   d = Math.abs(d / 1000);
+   var d = Math.abs(d / 1000), sUnit;
var units = ['s', 'min', 'hr'];
for (var i = 0; i < units.length && Math.abs(d) 
>= 60; i++) {
+   sUnit = parseInt(d % 60);
d = parseInt(d / 60);
}
-   return parseInt(d) + units[i] + ' ago';
+   if (i !== 0 && sUnit !== 0) {
+   return d + units[i][0] + ' ' + sUnit + 
units[i-1][0];
+   }
+   else
+   return d + units[i];
});
 
d3Line = d3.svg.line()
@@ -236,12 +241,12 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
}
 
vis.append('svg:g')
-   .attr('class', 'x-axis')
+   .attr('class', 'x-axis axis')
.attr('transform', 'translate(0,' + (this._graphHeight - 
this._graphMargins.bottom) + ')')
.call(xAxis);
 
vis.append('svg:g')
-   .attr('class', 'y-axis')
+   .attr('class', 'y-axis axis')
.attr('transform', 'translate(' + this._graphMargins.left + 
',0)')
.call(yAxis);
 
@@ -251,7 +256,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
.attr('d', line(data))
.attr('class', 'line')
.attr('stroke', 'blue')
-   .attr('stroke-width', 2)
+   .attr('stroke-width', 1)
.attr('fill', 'none');
}
else if (option === 'net') {
@@ -260,29 +265,54 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
.attr('d', 
this._d3NetSentLine(this._sentAvgStats))
.attr('class', 'lineSent')
.attr('stroke', 'red')
-   .attr('stroke-width', 2)
+   .attr('stroke-width', 1)
.attr('fill', 'none');
 
vis.append('svg:path')
.attr('d', 
this._d3NetRecvLine(this._recvAvgStats))
.attr('class', 'lineRecv')
.attr('stroke', 'green')
-   .attr('stroke-width', 2)
+   .attr('stroke-width', 1)
.attr('fill', 'none');
}
 
},
 
_addNewData: function(oldData, newData, option) {
-   var size;
-   if (option === 'mem')
+   var size, graphName, line, elemSize;
+   elemSize = this._graphWidth - this._graphMargins['left'] - 
this._graphMargins['right'];
+
+   if (option === 'mem') {
size = this._memStatsSize;
-   else if (option === 'cpu')
+   graphName = '#MemVisualisati

Build: Unit test ScFiltersTest::testUnicodeFileNameGnumeric() fails when LANG=en_US.iso88591

[Ulrich Gemkow]

Hello,

when building current master in Ubuntu 16.04 in a console 
where LANG is set to US.iso88591 the unit test
ScFiltersTest::testUnicodeFileNameGnumeric()
in sc/qa/unit/subsequent_filters-test.cxx fails with the
following assertion:

===

assertion failed
- Expression: xDocSh.is()

ScFiltersTest::testUnicodeFileNameGnumeric finished in: 10ms
subsequent_filters-test.cxx:3937:Assertion
Test name: ScFiltersTest::testUnicodeFileNameGnumeric
assertion failed
- Expression: xDocSh.is()

===

The test passes when setting LANG to en_US.utf8.

I cannot judge whether this is acceptable behavior - today
it is IMHO not very common to set LANG to something other
than utf8.

Best regards

-Ulrich

-- 
Ulrich Gemkow
Institute of Communication Networks and Computer Engineering (IKR)
University of Stuttgart, Germany
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Aditya Dewan]

 loleaflet/src/admin/AdminSocketAnalytics.js |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4f775788b2958053f5ec7d066b3caad5f12bc924
Author: Aditya Dewan 
Date:   Sat Aug 19 20:05:35 2017 +0530

tdf#107278 bug fix | misinterpratation of units related to network usage

Change-Id: I22bccfe1970b11a0284d0e7ecee9e71f4b0522f7
Reviewed-on: https://gerrit.libreoffice.org/41327
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/admin/AdminSocketAnalytics.js 
b/loleaflet/src/admin/AdminSocketAnalytics.js
index f2286596..7652d4b6 100644
--- a/loleaflet/src/admin/AdminSocketAnalytics.js
+++ b/loleaflet/src/admin/AdminSocketAnalytics.js
@@ -173,7 +173,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
this._d3NetYAxis = d3.svg.axis()
.scale(this._yNetScale)
.tickFormat(function (d) {
-   return Util.humanizeMem(d) + '/sec';
+   return Util.humanizeMem(d/1000) + 
'/sec';
})
.orient('left');
this._d3NetSentLine = d3Line;
@@ -534,7 +534,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
data = textMsg.substring(0, textMsg.length - 
1).split(',');
 
for (i = this._sentStatsData.length - 1, j = 
data.length - 1; i >= 0 && j >= 0; i--, j--) {
-   this._sentStatsData[i].value = 
parseInt(data[j]) / this._netStatsInterval;
+   this._sentStatsData[i].value = 
parseInt(data[j]);
}
this._updateAverage('sent', true);
 
@@ -544,7 +544,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
else {
// this is a notification data; append to 
_sentStatsData
data = textMsg.trim();
-   this._addNewData(this._sentStatsData, 
parseInt(data) / this._netStatsInterval, 'sent');
+   this._addNewData(this._sentStatsData, 
parseInt(data), 'sent');
this._updateAverage('sent', false);
this._updateNetGraph();
}
@@ -556,7 +556,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
data = textMsg.substring(0, textMsg.length - 
1).split(',');
 
for (i = this._recvStatsData.length - 1, j = 
data.length - 1; i >= 0 && j >= 0; i--, j--) {
-   this._recvStatsData[i].value = 
parseInt(data[j]) / this._netStatsInterval;
+   this._recvStatsData[i].value = 
parseInt(data[j]);
}
this._updateAverage('recv', true);
 
@@ -566,7 +566,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
else {
// this is a notification data; append to 
_recvStatsData
data = textMsg.trim();
-   this._addNewData(this._recvStatsData, 
parseInt(data) / this._netStatsInterval, 'recv');
+   this._addNewData(this._recvStatsData, 
parseInt(data), 'recv');
this._updateAverage('recv', false);
this._updateNetGraph();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

On 21.08.2017 04:37, Ashod Nakashian wrote:
> These don't seem to give us what we need, and I couldn't find an
> obvious/easy way to extend them. GetExpandText uses ModelToViewHelper,
> so I tried using ModelToViewHelper with Replace but (though it should've
> worked) since it depends on the hints to be up-to-date, it's failing (at
> least in some scenarios hints are empty, which means it returns the
> display text as default, which includes all fields).

but if there are no hints, there can't be any fields in the text?

... except for "field-marks" which have infested writer documents for
some years now but the implementation is still incomplete... it looks
like ModelToViewHelper can only replace "DropDown" field-marks, which is
not all of them...

but i think only the WW8 import creates these.

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

[Libreoffice-commits] core.git: config_host/config_libepubgen.h.in configure.ac writerperfect/source

[David Tardon]

 config_host/config_libepubgen.h.in   |   16 
 configure.ac |   19 +++
 writerperfect/source/writer/EPUBExportFilter.cxx |8 +++-
 3 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit bf7d2ef17aece06e835b092bc75884b15aa697e7
Author: David Tardon 
Date:   Mon Aug 21 12:46:26 2017 +0200

allow to build with released libepubgen

Change-Id: I12d297e8a3e57a3b24d85e4c537996cad0106125

diff --git a/config_host/config_libepubgen.h.in 
b/config_host/config_libepubgen.h.in
new file mode 100644
index ..7219082449c6
--- /dev/null
+++ b/config_host/config_libepubgen.h.in
@@ -0,0 +1,16 @@
+/* -*- 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/.
+ */
+
+/* Configuration for libepubgen.
+ */
+
+// Defined if libepubgen supports setting EPUB version (devel. only)
+#undef LIBEPUBGEN_VERSION_SUPPORT
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 222932ec7815..fa0635647ae7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7724,6 +7724,24 @@ 
libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${
 libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libepubgen],[EPUBGEN],[libepubgen-0.0])
+AS_IF([test "$SYSTEM_EPUBGEN" = "TRUE"], [
+AC_MSG_CHECKING([whether libepubgen supports setting EPUB version])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#include 
+], [
+const libepubgen::EPUBTextGenerator generator(nullptr, 
EPUB_SPLIT_METHOD_NONE, 30);
+])],
+[
+AC_MSG_RESULT([yes])
+AC_DEFINE([LIBEPUBGEN_VERSION_SUPPORT])
+],
+[
+AC_MSG_RESULT([no])
+]
+)
+], [
+AC_DEFINE([LIBEPUBGEN_VERSION_SUPPORT])
+])
 
 AS_IF([test "$COM" = "MSC"],
   [libwpd_libdir="${WORKDIR}/LinkTarget/Library"],
@@ -12414,6 +12432,7 @@ AC_CONFIG_HEADERS([config_host/config_gio.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_java.h])
 AC_CONFIG_HEADERS([config_host/config_lgpl.h])
+AC_CONFIG_HEADERS([config_host/config_libepubgen.h])
 AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
 AC_CONFIG_HEADERS([config_host/config_locales.h])
 AC_CONFIG_HEADERS([config_host/config_mpl.h])
diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx 
b/writerperfect/source/writer/EPUBExportFilter.cxx
index 8a8e14c72ce8..2cc5c6479aa8 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "config_libepubgen.h"
+
 #include "EPUBExportFilter.hxx"
 
 #include 
@@ -36,7 +38,11 @@ sal_Bool EPUBExportFilter::filter(const 
uno::Sequence &rDe
 // file, the flat ODF filter has access to the doc model, everything else
 // is in-between.
 EPUBPackage aPackage(mxContext, rDescriptor);
-libepubgen::EPUBTextGenerator aGenerator(&aPackage, 
libepubgen::EPUB_SPLIT_METHOD_HEADING, /*version=*/30);
+libepubgen::EPUBTextGenerator aGenerator(&aPackage, 
libepubgen::EPUB_SPLIT_METHOD_HEADING
+#if defined(LIBEPUBGEN_VERSION_SUPPORT)
+ , /*version=*/30
+#endif
+);
 uno::Reference xExportHandler(new 
exp::XMLImport(aGenerator));
 
 uno::Reference 
xInitialization(mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.comp.Writer.XMLOasisExporter",
 mxContext), uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 writerperfect/source/writer/EPUBExportFilter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7c26cbf73f961fbe82e0331779b935e9e1ff9ef
Author: Stephan Bergmann 
Date:   Mon Aug 21 13:15:51 2017 +0200

loplugin:checkconfigmacros

Change-Id: Ic9ffe0af9e32b45c304c1edee92ed4b185b4ed19

diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx 
b/writerperfect/source/writer/EPUBExportFilter.cxx
index 2cc5c6479aa8..a3e490428143 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -39,7 +39,7 @@ sal_Bool EPUBExportFilter::filter(const 
uno::Sequence &rDe
 // is in-between.
 EPUBPackage aPackage(mxContext, rDescriptor);
 libepubgen::EPUBTextGenerator aGenerator(&aPackage, 
libepubgen::EPUB_SPLIT_METHOD_HEADING
-#if defined(LIBEPUBGEN_VERSION_SUPPORT)
+#if LIBEPUBGEN_VERSION_SUPPORT
  , /*version=*/30
 #endif
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: soltools/cpp

[Stephan Bergmann]

 soltools/cpp/cpp.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dac11d8d504351644cf914b0f3f3689148b36e1b
Author: Stephan Bergmann 
Date:   Mon Aug 21 13:52:47 2017 +0200

Make cpp cope with long source lines

under --with-lang=ALL it had started to crash during e.g.

> 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}".../instdir/program:.../instdir/program"
 .../workdir/LinkTarget/Executable/cpp -+ -P -DWITH_POSTGRESQL_SDBC 
-DWITH_FIREBIRD_SDBC -DWITHOUT_EXTENSION_MEDIAWIKI 
-DWITHOUT_SCRIPTING_BEANSHELL -DWITHOUT_SCRIPTING_JAVASCRIPT 
-DWITH_HELPPACK_INTEGRATION -DWITH_EXTENSION_INTEGRATION 
-DENABLE_EXTENSION_UPDATE -DX86_64 -DLINUX -D_PTHREADS -DUNIX -DUNX 
-DCOMID=gcc3 -D_gcc3 -DWITH_LPSOLVER -I.../scp2/inc -I.../workdir 
-I.../config_host -I.../workdir/CustomTarget/scp2/macros 
-I.../workdir/ScpTemplateTarget/scp2/source/templates 
.../scp2/source/calc/file_calc.scp > 
.../workdir/ScpPreprocessTarget/scp2/source/calc/file_calc.pre

because of

> Syscall param read(buf) points to unaddressable byte(s)
>at 0x4F31A80: __read_nocancel (syscall-template.S:84)
>by 0x404F98: fillbuf (_lex.c:631)
>by 0x404CCF: gettokens (_lex.c:479)
>by 0x400F0A: process (_cpp.c:77)
>by 0x400E80: main (_cpp.c:60)
>  Address 0x5278494 is 0 bytes after a block of size 32,772 alloc'd
>at 0x4C2DB9D: malloc (vg_replace_malloc.c:299)
>by 0x402034: domalloc (_cpp.c:321)
>by 0x40554F: setsource (_lex.c:679)
>by 0x403E38: doinclude (_include.c:130)
>by 0x401F9D: control (_cpp.c:297)
>by 0x401002: process (_cpp.c:101)
>by 0x400E80: main (_cpp.c:60)

There appears to be no other check that fillbuf doesn't overflow the 
Source's
input buffer, other than gettokens checking that the buffer isn't more than
three quarters full ("if (ip >= s->inb + (3 * INS / 4)) ...").  That smells 
like
cpp assumes input lines to be shorter than some maximum number of characters
(like the C99 standard setting a minimum limit of "4095 characters in 
logical
source lines"), and

> #define README_TXT_ALL_LANG(key, name, ext) \
>   key (af) = READMETXTFILENAME(name,_af,ext); \
>   Name (am) = CONFIGLANGFILENAME(name,am,ext); \
>   Name (ar) = CONFIGLANGFILENAME(name,ar,ext); \
[...]
>   Name (zh-CN) = CONFIGLANGFILENAME(name,zh-CN,ext); \
>   Name (zh-TW) = CONFIGLANGFILENAME(name,zh-TW,ext); \
>   key (zu) = READMETXTFILENAME(name,_zu,ext)

in workdir/CustomTarget/scp2/macros/langmacros.inc (which appears to be the
culprit here) exceeding that limit under --with-lang=ALL.

So just bump the input buffer size.

Change-Id: I5d863050fb772dc7e691a604009ff8702dc718e3

diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index e09ea7db86f2..36b867679d15 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -20,7 +20,7 @@
 #include 
 #include 
 
-#define INS 32768   /* input buffer */
+#define INS 327680  /* input buffer */
 #define OBS 8092/* output buffer*/
 #define NARG32  /* Max number arguments to a macro  */
 #define NINCLUDE48  /* Max number of include directories (-I)   */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/tools/wintypes.hxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 86486d0a915a5d5e706088366d61cc47a76c2737
Author: Noel Grandin 
Date:   Mon Aug 21 10:36:23 2017 +0200

WB_PATH,WB_OPEN are dead

since

commit c2f912b51efa458ba9bd1601a8676ab119aca1bd
convert FilePicker flags to scoped enum

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

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index cd1e5750d5a0..fe236e895a23 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -262,11 +262,6 @@ WinBits const WB_FORCE_MAKEVISIBLE =
SAL_CONST_INT64(0x0040);
 // DO NOT USE: 0x0080, that's WB_SYSTEMCHILDWINDOW
 WinBits const WB_QUICK_SEARCH = SAL_CONST_INT64(0x0100);
 
-// For FileOpen Dialog
-WinBits const WB_PATH = 0x0010;
-WinBits const WB_OPEN = 0x0020;
-
-
 
 enum class WindowAlign { Left, Top, Right, Bottom };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit 4bb141db84098572e12a3d45f60c428e280a4d49
Author: Andras Timar 
Date:   Mon Aug 21 11:23:52 2017 +0200

Updated core
Project: translations  b55ddde65dfb9374b2c861fa5dcb38bf85087b49

Updated Slovenian translation

Change-Id: I44b1d0ff387f34ec2f2c2131d079b80cdb76e365
(cherry picked from commit 26412391078511f68986b8e3ad4a94229cf7c52d)
Signed-off-by: Andras Timar 

diff --git a/translations b/translations
index 0171cb5b65ed..b55ddde65dfb 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0171cb5b65edbdcfdc72b1e8d88d173eba5e1c34
+Subproject commit b55ddde65dfb9374b2c861fa5dcb38bf85087b49
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4-1' - source/sl

[Andras Timar]

 source/sl/basic/source/classes.po |  536 -
 source/sl/sc/source/ui/src.po |15430 +++---
 source/sl/scaddins/source/analysis.po | 4173 -
 source/sl/sd/source/core.po   |  126 
 source/sl/svtools/source/misc.po  |1 
 source/sl/svx/source/dialog.po| 2611 ++---
 source/sl/svx/source/src.po   |  668 -
 source/sl/svx/uiconfig/ui.po  |8 
 source/sl/sw/source/ui/utlui.po   |  138 
 9 files changed, 10617 insertions(+), 13074 deletions(-)

New commits:
commit b55ddde65dfb9374b2c861fa5dcb38bf85087b49
Author: Andras Timar 
Date:   Mon Aug 21 11:23:52 2017 +0200

Updated Slovenian translation

Change-Id: I44b1d0ff387f34ec2f2c2131d079b80cdb76e365
(cherry picked from commit 26412391078511f68986b8e3ad4a94229cf7c52d)
Signed-off-by: Andras Timar 

diff --git a/source/sl/basic/source/classes.po 
b/source/sl/basic/source/classes.po
index 8f84e911ef3..5b9ff862454 100644
--- a/source/sl/basic/source/classes.po
+++ b/source/sl/basic/source/classes.po
@@ -1,16 +1,15 @@
-#. extracted from basic/source/classes
 msgid ""
 msgstr ""
-"Project-Id-Version: LibreOffice 5.1\n"
+"Project-Id-Version: LibreOffice 5.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-10-04 10:08+0200\n"
-"PO-Revision-Date: 2015-09-13 14:53+0200\n"
+"POT-Creation-Date: 2017-07-07 11:30+0200\n"
+"PO-Revision-Date: 2017-08-19 11:32+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -21,8 +20,8 @@ msgstr ""
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_SYNTAX & ERRCODE_RES_MASK\n"
-"string.text"
+"Syntax error.\n"
+"itemlist.text"
 msgid "Syntax error."
 msgstr "Napaka v skladnji."
 
@@ -30,8 +29,8 @@ msgstr "Napaka v skladnji."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_GOSUB & ERRCODE_RES_MASK\n"
-"string.text"
+"Return without Gosub.\n"
+"itemlist.text"
 msgid "Return without Gosub."
 msgstr "Return brez Gosub."
 
@@ -39,8 +38,8 @@ msgstr "Return brez Gosub."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_REDO_FROM_START & ERRCODE_RES_MASK\n"
-"string.text"
+"Incorrect entry; please retry.\n"
+"itemlist.text"
 msgid "Incorrect entry; please retry."
 msgstr "Napačen vnos; poskusite znova."
 
@@ -48,8 +47,8 @@ msgstr "Napačen vnos; poskusite znova."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_ARGUMENT & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid procedure call.\n"
+"itemlist.text"
 msgid "Invalid procedure call."
 msgstr "Neveljaven klic procedure."
 
@@ -57,8 +56,8 @@ msgstr "Neveljaven klic procedure."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_MATH_OVERFLOW & ERRCODE_RES_MASK\n"
-"string.text"
+"Overflow.\n"
+"itemlist.text"
 msgid "Overflow."
 msgstr "Prekoračitev."
 
@@ -66,8 +65,8 @@ msgstr "Prekoračitev."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_MEMORY & ERRCODE_RES_MASK\n"
-"string.text"
+"Not enough memory.\n"
+"itemlist.text"
 msgid "Not enough memory."
 msgstr "Ni dovolj pomnilnika."
 
@@ -75,8 +74,8 @@ msgstr "Ni dovolj pomnilnika."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ALREADY_DIM & ERRCODE_RES_MASK\n"
-"string.text"
+"Array already dimensioned.\n"
+"itemlist.text"
 msgid "Array already dimensioned."
 msgstr "Dimenzije polja so že določene."
 
@@ -84,8 +83,8 @@ msgstr "Dimenzije polja so že določene."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_OUT_OF_RANGE & ERRCODE_RES_MASK\n"
-"string.text"
+"Index out of defined range.\n"
+"itemlist.text"
 msgid "Index out of defined range."
 msgstr "Kazalo je izven določenega obsega."
 
@@ -93,8 +92,8 @@ msgstr "Kazalo je izven določenega obsega."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DUPLICATE_DEF & ERRCODE_RES_MASK\n"
-"string.text"
+"Duplicate definition.\n"
+"itemlist.text"
 msgid "Duplicate definition."
 msgstr "Podvojena definicija."
 
@@ -102,8 +101,8 @@ msgstr "Podvojena definicija."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ZERODIV & ERRCODE_RES_MASK\n"
-"string.text"
+"Division by zero.\n"
+"itemlist.text"
 msgid "Division by zero."
 msgstr "Deljenje z nič."
 
@@ -111,8 +110,8 @@ msgstr "Deljenje z nič."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_VAR_UNDEFINED & ERRCODE_RES_MASK\n"
-"string.text"
+"Variable not defined.\n"
+"itemlist.text"
 msgid "Variable not defined."
 msgstr "Spremenljivka ni definirana."
 
@@ -120,8 +119,8 @@ msgstr "Spremenljivka ni definirana."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_

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

[Noel Grandin]

 include/tools/wintypes.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 42ec7e8831e956ed134af62ac129bc365887fd8c
Author: Noel Grandin 
Date:   Mon Aug 21 10:39:14 2017 +0200

WB_TOPIMAGE is dead

since

commit a6ff21250bbc960cbcff026e8eeb72be032f56b2
drop window related stuff from rsc

Change-Id: If9e0ccd75e7c4807b6c06697139d0f2142d46ce5
Reviewed-on: https://gerrit.libreoffice.org/41382
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index fe236e895a23..844f82d94e20 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -177,7 +177,6 @@ WinBits const WB_POPUP =
SAL_CONST_INT64(0x2000);
 
 WinBits const WB_HSCROLL =  WB_HORZ;
 WinBits const WB_VSCROLL =  WB_VERT;
-WinBits const WB_TOPIMAGE = WB_TOP;
 
 // Window-Bits for PushButtons
 WinBits const WB_DEFBUTTON =0x1000;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/tools/wintypes.hxx   |2 --
 vcl/source/control/fixed.cxx |8 
 2 files changed, 10 deletions(-)

New commits:
commit d56439981b82a1b1335d7a62e8066906ca62f767
Author: Noel Grandin 
Date:   Mon Aug 21 10:54:50 2017 +0200

WB_FAST/WB_TOPLEFTVISIBLE are dead

since

commit 2235846149e89dd9fe83cd4fbaf32908983aa571
Date:   Tue Nov 23 18:50:48 2010 +0100
vcl117: reduce duplication of enums

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

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 844f82d94e20..85fb52ace63a 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -209,9 +209,7 @@ WinBits const WB_IGNORETAB =0x2000;
 WinBits const WB_SIMPLEMODE =   0x2000;
 
 // Window-Bits for FixedBitmap
-WinBits const WB_FAST = 0x0400;
 WinBits const WB_SCALE =0x0800;
-WinBits const WB_TOPLEFTVISIBLE =   0x1000;
 
 // Window-Bits for ToolBox
 WinBits const WB_LINESPACING =  0x0100;
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 23f06b7f03ca..13c69e2edb19 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -66,14 +66,6 @@ static Point ImplCalcPos( WinBits nStyle, const Point& rPos,
 else
 nY = (rWinSize.Height()-rObjSize.Height())/2;
 
-if ( nStyle & WB_TOPLEFTVISIBLE )
-{
-if ( nX < 0 )
-nX = 0;
-if ( nY < 0 )
-nY = 0;
-}
-
 Point aPos( nX+rPos.X(), nY+rPos.Y() );
 return aPos;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/tools/wintypes.hxx|1 -
 vcl/source/control/button.cxx |   20 
 2 files changed, 21 deletions(-)

New commits:
commit e86def1f3f86731230a27926d61d525653f62c72
Author: Noel Grandin 
Date:   Mon Aug 21 10:46:22 2017 +0200

WB_CBLINESTYLE is dead

since

commit 51e6fc0c9e401162036913a943708b7cca1b2598
Date:   Wed Oct 1 13:31:44 2008 +
CWS-TOOLING: integrate CWS vcl92

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

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 85fb52ace63a..c8b4083c88bb 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -193,7 +193,6 @@ WinBits const WB_EXTRAOFFSET =  0x0200;
 WinBits const WB_NOMULTILINE =  0x1000;
 
 // Window-Bits for CheckBox
-WinBits const WB_CBLINESTYLE =  SAL_CONST_INT64(0x20);
 WinBits const WB_EARLYTOGGLE =  SAL_CONST_INT64(0x40);
 
 // Window-Bits for Edit
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b97809572d62..e2b62b4a4a2e 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3026,7 +3026,6 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags 
nDrawFlags,
 pDev->Push( PushFlags::CLIPREGION | PushFlags::LINECOLOR );
 pDev->IntersectClipRegion( tools::Rectangle( rPos, rSize ) );
 
-long nLineY = rPos.Y() + (rSize.Height()-1)/2;
 if ( ( !aText.isEmpty() && ! (ImplGetButtonState() & 
DrawButtonFlags::NoText) ) ||
  ( HasImage() && !  (ImplGetButtonState() & DrawButtonFlags::NoImage) 
) )
 {
@@ -3049,7 +3048,6 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags 
nDrawFlags,
 }
 
 ImplDrawAlignedImage( pDev, aPos, aSize, 1, nDrawFlags, nTextStyle );
-nLineY = aPos.Y() + aSize.Height()/2;
 
 rMouseRect  = tools::Rectangle( aPos, aSize );
 rMouseRect.Left()   = rPos.X();
@@ -3096,24 +3094,6 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags 
nDrawFlags,
 ImplSetFocusRect( rStateRect );
 }
 
-const int nLineSpace = 4;
-if( (GetStyle() & WB_CBLINESTYLE) != 0 &&
-rMouseRect.Right()-1-nLineSpace < rPos.X()+rSize.Width() )
-{
-const StyleSettings&rStyleSettings = 
GetSettings().GetStyleSettings();
-if ( rStyleSettings.GetOptions() & StyleSettingsOptions::Mono )
-SetLineColor( Color( COL_BLACK ) );
-else
-SetLineColor( rStyleSettings.GetShadowColor() );
-long nLineX = rMouseRect.Right()+nLineSpace;
-DrawLine( Point( nLineX, nLineY ), Point( rPos.X() + rSize.Width()-1, 
nLineY ) );
-if ( !(rStyleSettings.GetOptions() & StyleSettingsOptions::Mono) )
-{
-SetLineColor( rStyleSettings.GetLightColor() );
-DrawLine( Point( nLineX, nLineY+1 ), Point( rPos.X() + 
rSize.Width()-1, nLineY+1 ) );
-}
-}
-
 pDev->Pop();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - cui/source sc/source svx/source sw/source ucb/source vcl/win

[Eike Rathke]

 cui/source/tabpages/tppattern.cxx   |2 
 sc/source/core/tool/scmatrix.cxx|   17 +++
 svx/source/unodraw/unopage.cxx  |2 
 svx/source/xoutdev/xtable.cxx   |8 +--
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   37 +++-
 sw/source/core/txtnode/ndtxt.cxx|   10 ++--
 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx   |2 
 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx  |2 
 vcl/win/app/salinst.cxx |2 
 9 files changed, 59 insertions(+), 23 deletions(-)

New commits:
commit 25b3806ac509006573e669acc33643af3bd77380
Author: Eike Rathke 
Date:   Mon Aug 21 15:49:41 2017 +0200

WalkAndMatchElements: really really limit the match, tdf#108292 follow-up

getRemainingCount() could deliver a wrapped around overflow value if mnIndex
was already greater than the end index, which could happen if when/for
non-matching larger block sizes were added, and if then a match was found
behind those blocks a non-requested/unexpected index was returned, which in
turn led to the assert() being hit in ScInterpreter::CalculateLookup(). In
non-debug could result in an invalid block position access.

This happened with the bug case document of tdf#111943 which in master can 
be
loaded.

Also, the start and end index are not dynamic and don't have to be 
recalculated
each time, so make them const; column argument values are unused after.

Change-Id: Ic294cade4e8e7828bee394e5ade61d7127be6bbb

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 670041ffe275..8bea64987705 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1266,24 +1266,25 @@ template
 class WalkAndMatchElements
 {
 Type maMatchValue;
-MatrixImplType::size_pair_type maSize;
-size_t mnCol1;
-size_t mnCol2;
+const size_t mnStartIndex;
+const size_t mnStopIndex;
 size_t mnResult;
 size_t mnIndex;
 
 public:
 WalkAndMatchElements(Type aMatchValue, const 
MatrixImplType::size_pair_type& aSize, size_t nCol1, size_t nCol2) :
 maMatchValue(aMatchValue),
-maSize(aSize),
-mnCol1(nCol1),
-mnCol2(nCol2),
+mnStartIndex( nCol1 * aSize.row ),
+mnStopIndex( (nCol2 + 1) * aSize.row ),
 mnResult(ResultNotSet),
 mnIndex(0) {}
 
 size_t getMatching() const { return mnResult; }
 
-size_t getRemainingCount() const { return ((mnCol2 + 1) * maSize.row) - 
mnIndex; }
+size_t getRemainingCount() const
+{
+return mnIndex < mnStopIndex ? mnStopIndex - mnIndex : 0;
+}
 
 size_t compare(const MatrixImplType::element_block_node_type& node) const;
 
@@ -1294,7 +1295,7 @@ public:
 return;
 
 // limit lookup to the requested columns
-if ((mnCol1 * maSize.row) <= mnIndex && getRemainingCount() > 0)
+if (mnStartIndex <= mnIndex && getRemainingCount() > 0)
 {
 mnResult = compare(node);
 }
commit 811081ad06661de798e83b7b227b8a0c43370c6b
Author: Michael Stahl 
Date:   Mon Aug 21 15:31:42 2017 +0200

sw: check the target text node, not the source

Change-Id: I386f4ded70cc3deffc2f2e43709edf16eba94c63

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index f7e0acb4f9e3..5d0e74955bc0 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2079,14 +2079,14 @@ void SwTextNode::CutImpl( SwTextNode * const pDest, 
const SwIndex & rDestStart,
 sal_Int32 nDestStart = rDestStart.GetIndex();  // remember old Pos
 const sal_Int32 nInitSize = pDest->m_Text.getLength();
 
-pDest->m_Text = pDest->m_Text.replaceAt(nDestStart, 0,
-m_Text.copy(nTextStartIdx, nLen));
-m_Text = m_Text.replaceAt(nTextStartIdx, nLen, "");
-if (GetSpaceLeft() < 0)
+if (pDest->GetSpaceLeft() < nLen)
 {   // FIXME: could only happen when called from SwRangeRedline::Show.
 // unfortunately can't really do anything here to handle that...
 abort();
 }
+pDest->m_Text = pDest->m_Text.replaceAt(nDestStart, 0,
+m_Text.copy(nTextStartIdx, nLen));
+m_Text = m_Text.replaceAt(nTextStartIdx, nLen, "");
 nLen = pDest->m_Text.getLength() - nInitSize; // update w/ current size!
 if (!nLen) // String didn't grow?
 return;
commit f821865d7e3a58f4690d02728852c6c910249e86
Author: Michael Stahl 
Date:   Mon Aug 21 15:19:03 2017 +0200

tdf#111524 sw: don't expand annotation mark when showing redline...

... at a position directly behind the annotation mark.

This happens with the the annotation "__Annotation__5847_848227920" in
the bugdoc, followed by .

When the redline is shown, the annotation m

[Libreoffice-commits] dev-tools.git: flatpak/build.sh

[Stephan Bergmann]

 flatpak/build.sh |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8ea47acc0ee524c1142db46c21db5556ad815dc8
Author: Stephan Bergmann 
Date:   Mon Aug 21 16:00:49 2017 +0200

Move branch specification out of the manifest file

...in order to harmonize this manifest file with the one in
ramcq/libreoffice-flatpak on github.com

diff --git a/flatpak/build.sh b/flatpak/build.sh
index 62b9ce0..6ddfc7f 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -50,7 +50,6 @@ rm -f "${my_dir?}"/manifest.json
 cat > "${my_dir?}"/manifest.json < "${my_dir?}"/manifest.json 

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

[Mark Hung]

 sw/source/core/text/itrpaint.cxx |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit cd65bae41c52c4d2f40589776a645e224ee222cd
Author: Mark Hung 
Date:   Sat Aug 12 23:33:57 2017 +0800

tdf#111626 switch underline color.

Switch underline font color if it is from the underline color
of the portion. If the underline color is auto, take the font
color into consideration.

Change-Id: I81a0e100cd024add603b574f07e10b5e3a785d0b
Reviewed-on: https://gerrit.libreoffice.org/41090
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index cd76aa2a0b13..7bd3ce8e549e 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -70,6 +70,12 @@ bool IsUnderlineBreak( const SwLinePortion& rPor, const 
SwFont& rFnt )
SvxCaseMap::SmallCaps == rFnt.GetCaseMap();
 }
 
+const Color GetUnderColor( const SwFont *pFont )
+{
+return pFont->GetUnderColor() == Color( COL_AUTO ) ?
+pFont->GetColor() : pFont->GetUnderColor();
+}
+
 void SwTextPainter::CtorInitTextPainter( SwTextFrame *pNewFrame, 
SwTextPaintInfo *pNewInf )
 {
 CtorInitTextCursor( pNewFrame, pNewInf );
@@ -486,10 +492,15 @@ void SwTextPainter::CheckSpecialUnderline( const 
SwLinePortion* pPor,
 GetInfo().SetUnderFnt( nullptr );
 return;
 }
-
 // Reuse calculated underline font as much as possible.
-if ( GetInfo().GetUnderFnt() && GetInfo().GetIdx() + pPor->GetLen() <= 
GetInfo().GetUnderFnt()->GetEnd() + 1)
+if ( GetInfo().GetUnderFnt() && GetInfo().GetIdx() + pPor->GetLen() <= 
GetInfo().GetUnderFnt()->GetEnd() + 1 )
+{
+SwFont &rFont = GetInfo().GetUnderFnt()->GetFont();
+const Color aColor = GetUnderColor( GetInfo().GetFont() );
+if ( GetUnderColor( &rFont ) != aColor )
+rFont.SetColor( aColor );
 return;
+}
 
 // If current underline matches the common underline font, we continue
 // to use the common underline font.
@@ -578,7 +589,6 @@ void SwTextPainter::CheckSpecialUnderline( const 
SwLinePortion* pPor,
 break;
 
 aIter.Seek( nTmpIdx );
-
 if ( aIter.GetFnt()->GetEscapement() < 0 || 
m_pFont->IsWordLineMode() ||
  SvxCaseMap::SmallCaps == m_pFont->GetCaseMap() )
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - wsd/Admin.cpp wsd/Admin.hpp wsd/LOOLWSD.cpp

[Pranav Kant]

 wsd/Admin.cpp   |8 ++--
 wsd/Admin.hpp   |5 +++--
 wsd/LOOLWSD.cpp |2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit a9522f38aa1e71d130e0185a9efb0fe917628e81
Author: Pranav Kant 
Date:   Mon Aug 21 20:01:42 2017 +0530

wsd: Notify forkit conditionally about rlimits

No need to notify the forkit very early when loolwsd is initializing and
forkit pipes are not set. Forkit is notified of rlimits anyway
explicitly in the URL when it is initialized; no need to try to
initialize it again.

Change-Id: I9fde13e42f6e6393da7cf245ed979538d715319a

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index b4377d8d..343c841e 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -253,7 +253,7 @@ void AdminSocketHandler::handleMessage(bool /* fin */, 
WSOpCode /* code */,
 LOG_ERR("Unknown limit: " << settingName);
 
 model.notify("settings " + settingName + '=' + 
std::to_string(settingVal));
-_admin->setDefDocProcSettings(docProcSettings);
+_admin->setDefDocProcSettings(docProcSettings, true);
 }
 }
 }
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 54b9a8e7..16dc3363 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -108,10 +108,11 @@ public:
 void dumpState(std::ostream& os) override;
 
 const DocProcSettings& getDefDocProcSettings() const { return 
_defDocProcSettings; }
-void setDefDocProcSettings(const DocProcSettings& docProcSettings)
+void setDefDocProcSettings(const DocProcSettings& docProcSettings, bool 
notifyKit)
 {
 _defDocProcSettings = docProcSettings;
-notifyForkit();
+if (notifyKit)
+notifyForkit();
 }
 
 private:
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 720fc709..37e56dd2 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -819,7 +819,7 @@ void LOOLWSD::initialize(Application& self)
 docProcSettings.LimitVirtMemMb = 
getConfigValue("per_document.limit_virt_mem_mb", 0);
 docProcSettings.LimitStackMemKb = 
getConfigValue("per_document.limit_stack_mem_kb", 0);
 docProcSettings.LimitFileSizeMb = 
getConfigValue("per_document.limit_file_size_mb", 0);
-Admin::instance().setDefDocProcSettings(docProcSettings);
+Admin::instance().setDefDocProcSettings(docProcSettings, false);
 
 #if ENABLE_DEBUG
 std::cerr << "\nLaunch this in your browser:\n\n"
commit b0ad8874dcb98b45bb6d30ef2ce6c98e98c1aecf
Author: Pranav Kant 
Date:   Mon Aug 21 19:56:19 2017 +0530

wsd: don't write until forkit write pipe is ready

Change-Id: I95439e8e77dc308d993b07ccbd273228f755ce14

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 5102ff33..b4377d8d 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -529,7 +529,11 @@ void Admin::notifyForkit()
 oss << "setconfig limit_virt_mem_mb " << 
_defDocProcSettings.LimitVirtMemMb << '\n'
 << "setconfig limit_stack_mem_kb " << 
_defDocProcSettings.LimitStackMemKb << '\n'
 << "setconfig limit_file_size_mb " << 
_defDocProcSettings.LimitFileSizeMb << '\n';
-IoUtil::writeToPipe(_forKitWritePipe, oss.str());
+
+if (_forKitWritePipe != -1)
+IoUtil::writeToPipe(_forKitWritePipe, oss.str());
+else
+LOG_INF("Forkit write pipe not set (yet).");
 }
 
 void Admin::triggerMemoryCleanup(size_t totalMem)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/source cui/uiconfig

[Muhammet Kara]

 cui/source/customize/CommandCategoryListBox.cxx |   37 
 cui/source/customize/SvxMenuConfigPage.cxx  |4 +-
 cui/source/customize/SvxToolbarConfigPage.cxx   |4 +-
 cui/source/customize/cfg.cxx|   12 +++
 cui/source/inc/CommandCategoryListBox.hxx   |   10 +-
 cui/source/inc/cfg.hxx  |2 +
 cui/uiconfig/ui/menuassignpage.ui   |3 +
 7 files changed, 62 insertions(+), 10 deletions(-)

New commits:
commit ce7db1fa9a1d1f2e9ef6ab535449353805887a24
Author: Muhammet Kara 
Date:   Fri Aug 18 16:22:31 2017 +0300

Implement Search/Filter feature in the Customize dialog

Now commands in the list (left box) are filtered/updated
in the Menu, Context Menu, and the Toolbar tabs as you type.

Instead of filling the box, and then removing non-matching
items (as in the current search feature in the keyboard tab),
we filter out items during the Fill process, and don't add them
to the sequence att all. This should give a performance boost
to the filter operations.

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

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index c1abd3fe7d05..50542739c82e 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -25,15 +25,27 @@
 #include 
 #include 
 
+// include search util
+#include 
+#include 
+#include 
+
 #include "dialmgr.hxx"
 #include "strings.hrc"
 #include 
 #include 
+#include 
 
 CommandCategoryListBox::CommandCategoryListBox(vcl::Window* pParent, WinBits 
nStyle)
 : ListBox( pParent, nStyle)
 {
 SetDropDownLineCount(25);
+
+//Initialize search util
+m_searchOptions.AlgorithmType2 = css::util::SearchAlgorithms2::ABSOLUTE;
+m_searchOptions.transliterateFlags |= TransliterationFlags::IGNORE_CASE;
+m_searchOptions.searchFlag |= (css::util::SearchFlags::REG_NOT_BEGINOFLINE
+| css::util::SearchFlags::REG_NOT_ENDOFLINE);
 }
 
 VCL_BUILDER_FACTORY(CommandCategoryListBox);
@@ -126,11 +138,25 @@ void CommandCategoryListBox::Init(
 
 void CommandCategoryListBox::FillFunctionsList(
 const css::uno::Sequence& xCommands,
-const VclPtr&  pFunctionListBox)
+const VclPtr&  pFunctionListBox,
+const OUString& filterTerm )
 {
+// Setup search filter parameters
+m_searchOptions.searchString = filterTerm;
+utl::TextSearch textSearch( m_searchOptions );
+
 for (const auto & rInfo : xCommands)
 {
-OUString sUIName = MapCommand2UIName(rInfo.Command);
+OUString sUIName= MapCommand2UIName(rInfo.Command);
+sal_Int32 aStartPos = 0;
+sal_Int32 aEndPos   = sUIName.getLength();
+
+// Apply the search filter
+if (!filterTerm.isEmpty()
+&& !textSearch.SearchForward( sUIName, &aStartPos, &aEndPos ) )
+{
+continue;
+}
 
 SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName );
 
@@ -169,7 +195,8 @@ OUString CommandCategoryListBox::MapCommand2UIName(const 
OUString& sCommand)
 return sUIName;
 }
 
-void CommandCategoryListBox::categorySelected( const 
VclPtr&  pFunctionListBox )
+void CommandCategoryListBox::categorySelected(  const 
VclPtr&  pFunctionListBox,
+const OUString& filterTerm )
 {
 SfxGroupInfo_Impl *pInfo = 
static_cast(GetSelectEntryData());
 pFunctionListBox->SetUpdateMode(false);
@@ -195,7 +222,7 @@ void CommandCategoryListBox::categorySelected( const 
VclPtrgetConfigurableDispatchInformation(
 pCurrentInfo->nUniqueID );
-FillFunctionsList( lCommands, pFunctionListBox );
+FillFunctionsList( lCommands, pFunctionListBox, 
filterTerm );
 }
 catch( css::container::NoSuchElementException& )
 {
@@ -213,7 +240,7 @@ void CommandCategoryListBox::categorySelected( const 
VclPtr lCommands =
 xProvider->getConfigurableDispatchInformation(nGroup);
-FillFunctionsList( lCommands, pFunctionListBox );
+FillFunctionsList( lCommands, pFunctionListBox, filterTerm );
 break;
 }
 case SfxCfgKind::GROUP_SCRIPTCONTAINER:
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index 336a769cea5e..3031973dbe12 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -289,7 +289,9 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, SelectMenu, ListBox&, 
void )
 
 IMPL_LINK_NOARG( SvxMenuConfigPage, SelectCategory, ListBox&, void )
 {
-m_pCommandCategoryListBox->categoryS

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=32664

g4827...@trbvm.com changed:

   What|Removed |Added

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

--- Comment #64 from g4827...@trbvm.com ---
THIS BUG ISN'T FIXED

At my Manjaro laptop and Win7 Desktop, LO is still capturing
XF86AudioLowerVolume and XF86AudioRaiseVolume for its own media player which I
don't use nor have in the bars.

Also those hotkeys can't be configured in LO's settings.

A diplomatic solution is to make those hotkeys configurable. Everyone happy. 

Otherwise. Please get rid of the media player. There is better software like
VLC out there.

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

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=32664

--- Comment #65 from g4827...@trbvm.com ---
LO version 5.3.5.2 that is.

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

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=32664

--- Comment #66 from g4827...@trbvm.com ---
Another fix would be that LO only listens to keystrokes configured to and do
nothing at misc keystrokes.

-- 
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: Branch 'libreoffice-5-3' - translations

[Christian Lohmaier]

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

New commits:
commit 03111b8d7725b9dd2d72f5d44900336aa3e38073
Author: Christian Lohmaier 
Date:   Mon Aug 21 18:07:34 2017 +0200

Updated core
Project: translations  48680064c47bf583b39b67fdea25fccdadf7cb70

another set of translation updated for 5.3.6 rc1

force-fixed using pocheck as always

Change-Id: I4184f1ca93c1e25b64f24dafd1439a6e420f593b
(cherry picked from commit 445e3e0fe94e23c0d5e0a1e5c47c47c27d3022ec)

diff --git a/translations b/translations
index 0a2e64ea3977..48680064c47b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0a2e64ea3977dc166681dc26ffc8ecbd5811a897
+Subproject commit 48680064c47bf583b39b67fdea25fccdadf7cb70
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-3' - source/bg source/es source/fr source/id source/lt source/sv source/uk

[Christian Lohmaier]

 source/bg/helpcontent2/source/text/shared/01.po|8 
 source/bg/scp2/source/ooo.po   |   12 
 source/bg/svtools/source/misc.po   |6 
 source/bg/svx/source/dialog.po |   10 
 source/es/dbaccess/uiconfig/ui.po  |8 
 source/es/filter/source/config/fragments/filters.po|   20 -
 source/es/filter/source/config/fragments/types.po  |   20 -
 source/es/helpcontent2/source/text/scalc/01.po |  106 +++---
 source/es/helpcontent2/source/text/scalc/guide.po  |   12 
 source/es/helpcontent2/source/text/shared/00.po|8 
 source/es/helpcontent2/source/text/shared/01.po|8 
 source/es/helpcontent2/source/text/shared/explorer/database.po |6 
 source/es/helpcontent2/source/text/shared/optionen.po  |   28 -
 source/es/helpcontent2/source/text/swriter/01.po   |6 
 source/es/svx/source/dialog.po |   56 +--
 source/es/sw/uiconfig/swriter/ui.po|8 
 source/fr/sc/uiconfig/scalc/ui.po  |8 
 source/id/helpcontent2/source/text/swriter/01.po   |   18 -
 source/id/sc/source/ui/src.po  |6 
 source/id/svtools/uiconfig/ui.po   |8 
 source/id/sw/uiconfig/swriter/ui.po|   14 
 source/lt/sc/uiconfig/scalc/ui.po  |   80 ++--
 source/sv/starmath/source.po   |   14 
 source/sv/svx/source/dialog.po |  166 
+-
 source/sv/uui/uiconfig/ui.po   |8 
 source/uk/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 26 files changed, 326 insertions(+), 326 deletions(-)

New commits:
commit 48680064c47bf583b39b67fdea25fccdadf7cb70
Author: Christian Lohmaier 
Date:   Mon Aug 21 18:07:34 2017 +0200

another set of translation updated for 5.3.6 rc1

force-fixed using pocheck as always

Change-Id: I4184f1ca93c1e25b64f24dafd1439a6e420f593b
(cherry picked from commit 445e3e0fe94e23c0d5e0a1e5c47c47c27d3022ec)

diff --git a/source/bg/helpcontent2/source/text/shared/01.po 
b/source/bg/helpcontent2/source/text/shared/01.po
index 8c2d27eda79..6fbea42ffa9 100644
--- a/source/bg/helpcontent2/source/text/shared/01.po
+++ b/source/bg/helpcontent2/source/text/shared/01.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2016-12-27 21:50+0100\n"
-"PO-Revision-Date: 2017-08-04 14:57+\n"
+"PO-Revision-Date: 2017-08-19 13:24+\n"
 "Last-Translator: Mihail Balabanov \n"
 "Language-Team: .\n"
 "Language: bg\n"
@@ -15,7 +15,7 @@ msgstr ""
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
 "X-Project-Style: openoffice\n"
-"X-POOTLE-MTIME: 1501858673.00\n"
+"X-POOTLE-MTIME: 1503149051.00\n"
 
 #: 0101.xhp
 msgctxt ""
@@ -17602,7 +17602,7 @@ msgctxt ""
 "par_id180820161926256261\n"
 "help.text"
 msgid "Punjabi"
-msgstr "пенджабски"
+msgstr "панджабски"
 
 #: 05020301.xhp
 msgctxt ""
@@ -17610,7 +17610,7 @@ msgctxt ""
 "par_id180820161926257295\n"
 "help.text"
 msgid "Punjabi (Gurmukhi) characters"
-msgstr "пенджабски знаци (гурмукхи)"
+msgstr "панджабски знаци (гурмукхи)"
 
 #: 05020301.xhp
 msgctxt ""
diff --git a/source/bg/scp2/source/ooo.po b/source/bg/scp2/source/ooo.po
index 3d3b871fa09..208fb579994 100644
--- a/source/bg/scp2/source/ooo.po
+++ b/source/bg/scp2/source/ooo.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2016-12-01 12:11+0100\n"
-"PO-Revision-Date: 2016-12-29 23:57+\n"
+"PO-Revision-Date: 2017-08-19 13:24+\n"
 "Last-Translator: Mihail Balabanov \n"
 "Language-Team: LANGUAGE \n"
 "Language: bg\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1483055876.00\n"
+"X-POOTLE-MTIME: 1503149075.00\n"
 
 #: folderitem_ooo.ulf
 msgctxt ""
@@ -478,7 +478,7 @@ msgctxt ""
 "STR_NAME_MODULE_HELPPACK_PA_IN\n"
 "LngText.text"
 msgid "Punjabi"
-msgstr "Пенджабски"
+msgstr "Панджабски"
 
 #: module_helppack.ulf
 msgctxt ""
@@ -486,7 +486,7 @@ msgctxt ""
 "STR_DESC_MODULE_HELPPACK_PA_IN\n"
 "LngText.text"
 msgid "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
-msgstr "Инсталира помощ на пенджабски в 
%PRODUCTNAME %PRODUCTVERSION"
+msgstr "Инсталира пÐ

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

[Caolán McNamara]

 canvas/source/cairo/cairo_textlayout.cxx |2 +-
 canvas/source/vcl/textlayout.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72b66ad4505803caaf154cd224fb00e27b6b0156
Author: Caolán McNamara 
Date:   Mon Jul 24 13:11:33 2017 +0100

cairo_canvas: shape clipping box doesn't match where its text is rendered

since (I believe)

commit 34d7602954d4483b3bc9db700e7df2c15348947a
Date:   Wed Nov 9 15:22:43 2016 +0200

tdf#55469 Consistent line spacing across platforms

the point of that was to have the same line spacing on all platforms
to fix the cairo text layout bounds to use the same algorithm as
the generic text layout

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

diff --git a/canvas/source/cairo/cairo_textlayout.cxx 
b/canvas/source/cairo/cairo_textlayout.cxx
index 7ace9c75229b..678deb7369f2 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -168,7 +168,7 @@ namespace cairocanvas
 
 setupLayoutMode( *pVDev.get(), mnTextDirection );
 
-const sal_Int32 nAboveBaseline( -aMetric.GetInternalLeading() - 
aMetric.GetAscent() );
+const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
 const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
 
 if( maLogicalAdvancements.getLength() )
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index d179ba33a63d..e19a95fe10d4 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -246,7 +246,7 @@ namespace vclcanvas
 
 setupLayoutMode( *pVDev.get(), mnTextDirection );
 
-const sal_Int32 nAboveBaseline( /*-aMetric.GetIntLeading()*/ - 
aMetric.GetAscent() );
+const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
 const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
 
 if( maLogicalAdvancements.getLength() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=32664

Stephan Bergmann  changed:

   What|Removed |Added

 CC|libreoffice@lists.freedeskt |
   |op.org  |

-- 
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: Branch 'libreoffice-5-3' - sw/qa sw/source

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf98700_keepWithNext.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |9 +
 sw/source/filter/ww8/docxattributeoutput.cxx|6 --
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 067746290351c62b502425713360019a9863519a
Author: Justin Luth 
Date:   Fri Aug 18 14:18:35 2017 -0400

tdf#98700 docxexport: don't force on ParaKeepTogether

The mere presence of SvxFormatKeepItem was ENABLING it during export,
without checking to see if it was actually turned on or off.
Both DOC and RTF check the value, and set accordingly, so do the
same for DOCX.

Merely toggling the setting on and off is enough to create the
property, so this is a nasty bug that only affects inquisitive
people.

Change-Id: I02d83a255f5b4ff8c5124302a52a3126dad40b67
Reviewed-on: https://gerrit.libreoffice.org/41318
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-on: https://gerrit.libreoffice.org/41324
Reviewed-by: Christian Lohmaier 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf98700_keepWithNext.odt 
b/sw/qa/extras/ooxmlexport/data/tdf98700_keepWithNext.odt
new file mode 100644
index ..4ed96da554a5
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf98700_keepWithNext.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 73392c03cea2..1925600de5e9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -95,6 +95,15 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf46940_dontEquallyDistributeColumns, "tdf46940_do
 CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextSections->getByIndex(3), 
"DontBalanceTextColumns"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf98700_keepWithNext, 
"tdf98700_keepWithNext.odt")
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Heading style keeps with next", true, 
getProperty(getParagraph(1), "ParaKeepTogether"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Default style doesn't keep with next", 
false, getProperty(getParagraph(2), "ParaKeepTogether"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Heading 1 style inherits keeps with next", 
true, getProperty(getParagraph(3), "ParaKeepTogether"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Heading 2 style disabled keep with next", 
false, getProperty(getParagraph(4), "ParaKeepTogether"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Text Body style toggled off keep with next", 
false, getProperty(getParagraph(5), "ParaKeepTogether"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testRhbz988516, "rhbz988516.docx")
 {
 // The problem was that the list properties of the footer leaked into body
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9a6d0d05218f..86200257f6d6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8011,9 +8011,11 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 
nCols, const SwFormatCo
 m_pSerializer->endElementNS( XML_w, XML_cols );
 }
 
-void DocxAttributeOutput::FormatKeep( const SvxFormatKeepItem& )
+void DocxAttributeOutput::FormatKeep( const SvxFormatKeepItem& rItem )
 {
-m_pSerializer->singleElementNS( XML_w, XML_keepNext, FSEND );
+m_pSerializer->singleElementNS( XML_w, XML_keepNext,
+FSNS( XML_w, XML_val ), OString::boolean( rItem.GetValue() ),
+FSEND );
 }
 
 void DocxAttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: flatpak/build.sh

[Stephan Bergmann]

 flatpak/build.sh |  371 ++-
 1 file changed, 366 insertions(+), 5 deletions(-)

New commits:
commit b696672f49b7bebff4c2a57116537bf93c320fd5
Author: Stephan Bergmann 
Date:   Mon Aug 21 18:44:03 2017 +0200

Explicitly list 3rd-party dependencies in the manifest file

...instead of relying on 'make fetch' during the build (which allows to drop
the --share=network build-options override).  The list is based on the work
done at ramcq/libreoffice-flatpak on github.com, but adapted to current LO
master.  The plan is to ultimately move the manifest into the core LO git 
repo
and share it between this flatpak/build.sh and Flathub builds (for which not
downloading stuff during the build itself is a prerequisite).

diff --git a/flatpak/build.sh b/flatpak/build.sh
index 6ddfc7f..6815bc5 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -64,14 +64,375 @@ cat > "${my_dir?}"/manifest.json 

Re: Minutes of ESC call 2017-08-17

[Xisco Fauli]

Hello,
> + build a write-up of the differences cross-platform (Xisco)
>   [ almost done, will send to the ML ]
>
Basically the line spacing differences across platforms has been reduced
after this commit[1] ( visual example of an issue fixed by the mentioned
commit: Windows [2] and Linux [3] ) although there are still some bugs
showing differences between Linux and Windows [4][5]
Besides, it seems some documents look different before and after the
commit now.
These are the problems I could find in Bugzilla related to the commit:

1. Some fonts with bad metrics ( [6],[7] ) were displayed better before,
however the problem needs to be fixed in the fonts, not in LibreOffice,
thus, NOTOURBUG.
Note: Khaled also fixed it for OpenSymbol fonts [9].

2. UI: Some dialogs labels are slightly cropped and vertically cramped
[9]. Differences look bigger on Linux/Mac than on Windows. This bug [10]
seems similar.

3. Web view: Line spacing is smaller than before [11]. This really looks
like a bug to me.

4. Calc/PDF: line spacing looks smaller when using line breaks [12].

As a solution, this bug [13] has been suggested.

Regards

[1]
https://cgit.freedesktop.org/libreoffice/core/commit/?id=34d7602954d4483b3bc9db700e7df2c15348947a
[2] https://bug-attachments.documentfoundation.org/attachment.cgi?id=128520
[3] https://bug-attachments.documentfoundation.org/attachment.cgi?id=128521
[4] https://bugs.documentfoundation.org/show_bug.cgi?id=92502
[5] https://bugs.documentfoundation.org/show_bug.cgi?id=104932
[6] https://bugs.documentfoundation.org/show_bug.cgi?id=107605
[7] https://bugs.documentfoundation.org/show_bug.cgi?id=107888
[8] https://bugs.documentfoundation.org/show_bug.cgi?id=106994#c7
[9] https://bugs.documentfoundation.org/show_bug.cgi?id=107249
[10] https://bugs.documentfoundation.org/show_bug.cgi?id=105860
[11] https://bugs.documentfoundation.org/show_bug.cgi?id=108710
[12] https://bugs.documentfoundation.org/show_bug.cgi?id=106111
[13] https://bugs.documentfoundation.org/show_bug.cgi?id=108891

-- 
Xisco Faulí
Libreoffice QA Team
IRC: x1sc0


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

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

[Armin Le Grand]

 vcl/source/filter/wmf/wmf.cxx |   21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

New commits:
commit b5f2402e023fb438341895ad0f81020571c5ec5a
Author: Armin Le Grand 
Date:   Mon Aug 21 18:34:32 2017 +0200

emfplus: Corrected ReadWindowMetafile

There are two places which do hand over not a
complete SvStream staring at pos zero, but pass
a seek position indirectly in that stream. Thus
this needs to be used. There is one usage in sc
that copies the data to a MemStream to avoid that,
so this hints that this 'trap/feature' was not
known to everyone using it

Change-Id: I94139b86c8bdd82879124c574bc3014e02d9ab5f
Reviewed-on: https://gerrit.libreoffice.org/41399
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index fe9a9f4429ca..ac56c74810f4 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -25,12 +25,25 @@
 
 bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF )
 {
-// Use new method to import Metafile. First, read binary data to mem array
-const sal_uInt32 nStreamLength(rStream.Seek(STREAM_SEEK_TO_END));
+// tdf#111484 Use new method to import Metafile. Take curent StreamPos
+// into account (used by SwWW8ImplReader::ReadGrafFile and by
+// SwWw6ReadMetaStream, so do *not* ignore. OTOH XclImpDrawing::ReadWmf
+// is nice enough to copy to an own MemStream to avoid that indirect
+// parameter passing...)
+const sal_uInt32 nStreamStart(rStream.Tell());
+const sal_uInt32 nStreamEnd(rStream.Seek(STREAM_SEEK_TO_END));
+
+if (nStreamStart >= nStreamEnd)
+{
+return false;
+}
+
+// Read binary data to mem array
+const sal_uInt32 nStreamLength(nStreamEnd - nStreamStart);
 VectorGraphicDataArray aNewData(nStreamLength);
-rStream.Seek(0);
+rStream.Seek(nStreamStart);
 rStream.ReadBytes(aNewData.begin(), nStreamLength);
-rStream.Seek(0);
+rStream.Seek(nStreamStart);
 
 if (rStream.good())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/scalc/01/04060106.xhp |  185 +++---
 1 file changed, 155 insertions(+), 30 deletions(-)

New commits:
commit 12f5fcacd219532e748c24b96c3be143e1fec99f
Author: Olivier Hallot 
Date:   Sun Aug 20 08:23:59 2017 -0300

tdf#107040 Calc: help for SUBTOTAL indexes 101-111

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

diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index 8c30ead07..f89d93a11 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -495,7 +495,7 @@
 
 
 GCD_EXCEL2003
- The result is the greatest common divisor of a list of 
numbers.
+The result is the greatest common divisor of a list of 
numbers.
 
 
 Syntax
@@ -534,7 +534,7 @@
 
 
 LCM_EXCEL2003
- The result is the lowest common multiple of a list of 
numbers.
+The result is the lowest common multiple of a list of 
numbers.
 
 
 Syntax
@@ -551,8 +551,8 @@
   number of combinations
 
 mw added one entry
-
-should be statistical-->add a link there
+should be statistical-->add a 
link there
+
 COMBIN
 Returns the number of combinations for elements 
without repetition.
 
@@ -573,8 +573,8 @@
   number of combinations with repetitions
 
 mw added one entry
-
-should be statistical-->add a link there
+should be statistical-->add a 
link there
+
 COMBINA
 Returns the number of combinations of a subset of 
items including repetitions.
 
@@ -604,7 +604,7 @@
 TRUNC(Number; 
Count)
 Returns 
Number with at most Count decimal places. Excess 
decimal places are simply removed, irrespective of sign.
 TRUNC(Number; 0) behaves as INT(Number) for positive numbers, but effectively rounds 
towards zero for negative numbers.
-The 
visible decimal places of the result are specified in 
%PRODUCTNAME - Preferences
+The 
visible decimal places of the result are specified in 
%PRODUCTNAME - Preferences 
 Tools - Options - 
%PRODUCTNAME Calc - 
Calculate.
 
 Example
@@ -761,7 +761,7 @@
 
 
 MULTINOMIAL
- Returns the factorial of the sum of the 
arguments divided by the product of the factorials of the 
arguments.
+Returns the factorial of the sum of the 
arguments divided by the product of the factorials of the 
arguments.
 
 Syntax
 MULTINOMIAL(Number(s))
@@ -913,8 +913,9 @@
 
 
 
-
+
 
+
 
 
   ROUND function
@@ -1081,7 +1082,8 @@
 Example 
assumption: You have entered invoices into a table. Column A contains the date 
value of the invoice, column B the amounts. You want to find a formula that you 
can use to return the total of all amounts only for a specific month, e.g. only 
the amount for the period >=2008-01-01 to <2008-02-01. The range with the 
date values covers A1:A40, the range containing the amounts to be totaled is 
B1:B40. C1 contains the start date, 2008-01-01, of 
the invoices to be included and C2 the date, 2008-02-01, that is no longer included.
 Enter the 
following formula as an array formula:
 =SUM((A1:A40>=C1)*(A1:A40=C1)*(A1:A40

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit 5197ced50a44f31c4ec387819b70056a64c57967
Author: Olivier Hallot 
Date:   Sun Aug 20 08:23:59 2017 -0300

Updated core
Project: help  12f5fcacd219532e748c24b96c3be143e1fec99f

tdf#107040 Calc: help for SUBTOTAL indexes 101-111

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

diff --git a/helpcontent2 b/helpcontent2
index 8bece13f7304..12f5fcacd219 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8bece13f73046ebebfb5c18d02d857a961a4cdab
+Subproject commit 12f5fcacd219532e748c24b96c3be143e1fec99f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sw/qa/core/uwriter.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5a55bef38b047b9c60d1b219c572287938265610
Author: Tor Lillqvist 
Date:   Mon Aug 21 21:19:26 2017 +0300

Temporary fix for Clang on F26

I get a mysterious linking error: sw/qa/core/uwriter.cxx:1416:
undefined reference to `SfxEnumItem::operator==(SfxPoolItem
const&) const'

Change-Id: I2363ebf84784d17b8aea2f37cece191f48a1b717

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index b48c06195526..e3bddb2d887d 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1412,8 +1412,10 @@ void SwDocTest::testTableAutoFormats()
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aLinebreak == aLBreak ) );
 //Get m_aRotateAngle
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aRotateAngle == aRAngle ) 
);
+#if !(defined(__clang__) && __clang_major__ == 4 && __clang_minor__ == 0) // 
Temporary fix for mysterious problem with Clang on F26
 //Get m_aRotateMode
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aRotateMode == aRMode ) );
+#endif
 //Get m_sNumFormatString
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_sNumFormatString == 
aNFString ) );
 //Get m_eSysLanguage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 8638951d73bdaed7f8a9052c94a9463a6779e909
Author: Gabor Kelemen 
Date:   Sun Jul 16 22:45:23 2017 +0200

Updated core
Project: help  8ecf172a2713f691ac63908676446fd86eefb2c1

Fix help pages after translator review


http://nabble.documentfoundation.org/libreoffice-l10n-Errors-in-help-found-in-Pootle-td4218288.html

Change-Id: I41a1ea18c9039e002135ac425ff21c296d65755b
Reviewed-on: https://gerrit.libreoffice.org/40014
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 12f5fcacd219..8ecf172a2713 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 12f5fcacd219532e748c24b96c3be143e1fec99f
+Subproject commit 8ecf172a2713f691ac63908676446fd86eefb2c1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/swriter/01/05060700.xhp  |2 +-
 source/text/swriter/guide/protection.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8ecf172a2713f691ac63908676446fd86eefb2c1
Author: Gabor Kelemen 
Date:   Sun Jul 16 22:45:23 2017 +0200

Fix help pages after translator review


http://nabble.documentfoundation.org/libreoffice-l10n-Errors-in-help-found-in-Pootle-td4218288.html

Change-Id: I41a1ea18c9039e002135ac425ff21c296d65755b
Reviewed-on: https://gerrit.libreoffice.org/40014
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/05060700.xhp 
b/source/text/swriter/01/05060700.xhp
index 52ed1b90e..6b4e1a4df 100644
--- a/source/text/swriter/01/05060700.xhp
+++ b/source/text/swriter/01/05060700.xhp
@@ -363,7 +363,7 @@
 Frames allow 
you to link certain events to a function that then decides if the event is 
handled by $[officename] Writer or by the function. See the $[officename] Basic 
Help for more information.
 
 Macro 
From
-Lists the $[officename] program and any 
open $[officename] document. Within this list, select the location 
where you want to save the macros.
+Lists the $[officename] program and any 
open $[officename] document. Within this list, select the location 
where you want to pick the macro from.
 
 Existing Macros
 Lists the available macros. Select the 
macro that you want to assign to the selected event, and then click 
Assign.
diff --git a/source/text/swriter/guide/protection.xhp 
b/source/text/swriter/guide/protection.xhp
index a60c2f8b1..7163741e4 100644
--- a/source/text/swriter/guide/protection.xhp
+++ b/source/text/swriter/guide/protection.xhp
@@ -119,7 +119,7 @@
 Place the cursor in the cell or in the selected cells and 
choose the Table - Unprotect Cells in menu 
bar.
   
   
-For whole 
table, right-click on the table in the Navigator, and choose Table - 
Unprotect in the context menu or select the whole table and choose Tools - Unprotect Cells in menu bar.
+For whole 
table, right-click on the table in the Navigator, and choose Table - 
Unprotect in the context menu or select the whole table and choose Table - Unprotect Cells in menu bar.
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/tools/wintypes.hxx |2 --
 vcl/source/window/splitwin.cxx |   38 +++---
 vcl/source/window/toolbox.cxx  |2 +-
 3 files changed, 12 insertions(+), 30 deletions(-)

New commits:
commit 128282219cab1e94f092276067a40ee5a34b59ff
Author: Noel Grandin 
Date:   Mon Aug 21 11:13:53 2017 +0200

WB_FLATSPLITDRAW is dead

since

commit 2235846149e89dd9fe83cd4fbaf32908983aa571
Date:   Tue Nov 23 18:50:48 2010 +0100
vcl117: reduce duplication of enums

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

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 1fb95291e028..a6b3826698fa 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -219,7 +219,6 @@ WinBits const WB_DOCKBORDER =   0x1000;
 
 // Window-Bits for SplitWindow
 WinBits const WB_NOSPLITDRAW =  0x0100;
-WinBits const WB_FLATSPLITDRAW =0x0200;
 
 // Window-Bits for MessageBoxen
 WinBits const WB_OK =   0x0010;
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 4314a48d53b6..10854d9767bf 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1009,7 +1009,7 @@ void SplitWindow::ImplDrawBack(vcl::RenderContext& 
rRenderContext, ImplSplitSet*
 }
 }
 
-static void ImplDrawSplit(vcl::RenderContext& rRenderContext, ImplSplitSet* 
pSet, bool bRows, bool bFlat, bool bDown = true)
+static void ImplDrawSplit(vcl::RenderContext& rRenderContext, ImplSplitSet* 
pSet, bool bRows, bool bDown)
 {
 if (pSet->mpItems.empty())
 return;
@@ -1034,31 +1034,23 @@ static void ImplDrawSplit(vcl::RenderContext& 
rRenderContext, ImplSplitSet* pSet
 nTop= rItems[i]->mnLeft;
 nBottom = rItems[i]->mnLeft+rItems[i]->mnWidth-1;
 
-if (bFlat)
-nPos--;
-
 if (bDown || (nItemSplitSize >= nSplitSize))
 {
 
rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
 rRenderContext.DrawLine(Point(nTop, nPos + 1), 
Point(nBottom, nPos + 1));
 }
 nPos += nSplitSize-2;
-if (bFlat)
-nPos+=2;
 if ((!bDown && (nItemSplitSize >= 2)) ||
 (bDown  && (nItemSplitSize >= nSplitSize - 1)))
 {
 
rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
 rRenderContext.DrawLine(Point(nTop, nPos), Point(nBottom, 
nPos));
 }
-if (!bFlat)
+nPos++;
+if (!bDown || (nItemSplitSize >= nSplitSize))
 {
-nPos++;
-if (!bDown || (nItemSplitSize >= nSplitSize))
-{
-
rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor());
-rRenderContext.DrawLine(Point(nTop, nPos), 
Point(nBottom, nPos));
-}
+
rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor());
+rRenderContext.DrawLine(Point(nTop, nPos), Point(nBottom, 
nPos));
 }
 }
 else
@@ -1066,30 +1058,23 @@ static void ImplDrawSplit(vcl::RenderContext& 
rRenderContext, ImplSplitSet* pSet
 nTop= rItems[i]->mnTop;
 nBottom = rItems[i]->mnTop+pSet->mpItems[i]->mnHeight-1;
 
-if (bFlat)
-nPos--;
 if (bDown || (nItemSplitSize >= nSplitSize))
 {
 
rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
 rRenderContext.DrawLine(Point(nPos + 1, nTop), 
Point(nPos+1, nBottom));
 }
 nPos += pSet->mnSplitSize - 2;
-if (bFlat)
-nPos += 2;
 if ((!bDown && (nItemSplitSize >= 2)) ||
 (bDown  && (nItemSplitSize >= nSplitSize - 1)))
 {
 
rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
 rRenderContext.DrawLine(Point(nPos, nTop), Point(nPos, 
nBottom));
 }
-if( !bFlat )
+nPos++;
+if (!bDown || (nItemSplitSize >= nSplitSize))
 {
-nPos++;
-if (!bDown || (nItemSplitSize >= nSplitSize))
-{
-
rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor());
-rRenderContext.DrawLine(Point(nPos, nTop), Point(nPos, 
nBottom));
-}
+
rRenderContext.SetLineColor(rStyleSettings.GetDark

GSoC weekly report - Solving MABs for Android Viewer - Ximeng Zu

[Ximeng Zu]

Hello,

 

I spent my last week working on zooming for Calc on Android Viewer. In
short, I didn't succeed. Since I implemented headers and the headers need to
be synced with the main GL content, and there is a syncing problem, we have
decided to fix the zoom and fix DPI = 96 to ensure headers and main GL
content sync. We thought if we do DPI = integer * 96 it also can work and I
succeeded in some cases, but turned out it's not stable and only 96 can work
all times. So, I pushed my patch to Gerrit for record, but noted "don't
merge". I also fixed minor bugs and did some code cleaning.

 

Ximeng

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

Re: Build: Unit test ScFiltersTest::testUnicodeFileNameGnumeric() fails when LANG=en_US.iso88591

[Michael Stahl]

On 20.08.2017 17:59, Ulrich Gemkow wrote:
> Hello,
> 
> when building current master in Ubuntu 16.04 in a console 
> where LANG is set to US.iso88591 the unit test
> ScFiltersTest::testUnicodeFileNameGnumeric()
> in sc/qa/unit/subsequent_filters-test.cxx fails with the
> following assertion:
> 
> ===
> 
> assertion failed
> - Expression: xDocSh.is()
> 
> ScFiltersTest::testUnicodeFileNameGnumeric finished in: 10ms
> subsequent_filters-test.cxx:3937:Assertion
> Test name: ScFiltersTest::testUnicodeFileNameGnumeric
> assertion failed
> - Expression: xDocSh.is()
> 
> ===
> 
> The test passes when setting LANG to en_US.utf8.
> 
> I cannot judge whether this is acceptable behavior - today
> it is IMHO not very common to set LANG to something other
> than utf8.

quite frankly, if you set your build to a non-Unicode locale, it's a
case of "doctor, it hurts when i do this - well don't do that then".

it's bad enough that we had to deal with this nonsense on Windows, where
there OS doesn't allow setting a Unicode locale, but since MSVC 2015
added the "-utf-8" command line flag even that problem has gone away.

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

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

[heiko tietze]

 sfx2/source/dialog/infobar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4438849e400ecef3cdf2f267dc75a76d4b11aba1
Author: heiko tietze 
Date:   Mon Aug 21 21:13:22 2017 +0200

tdf#111844 infobar icons on high dpi

scaling factor added

Change-Id: Iccfc76832ccfaaffb9950d4b591b379dfb0d9eca
Reviewed-on: https://gerrit.libreoffice.org/41401
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index ec6814edce9c..a7db83925b74 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -289,7 +289,7 @@ void SfxInfoBarWindow::Resize()
 nX -= nButtonGap;
 }
 
-m_pImage->SetPosSizePixel(Point(4,4), Size(32, 32));
+m_pImage->SetPosSizePixel(Point(4,4), Size(32* fScaleFactor, 32* 
fScaleFactor));
 
 Point aMessagePosition(32 + 10 * fScaleFactor, 10 * fScaleFactor);
 Size aMessageSize(nX - 20 * fScaleFactor, 20 * fScaleFactor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 sw/source/filter/html/wrthtml.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cfa3a1c39ded1365d2cae78a15d5126e0c96a343
Author: Andrea Gelmini 
Date:   Mon Aug 21 22:05:24 2017 +0200

Fix typo in code

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

diff --git a/sw/source/filter/html/wrthtml.hxx 
b/sw/source/filter/html/wrthtml.hxx
index a081cd1a8d7b..e42b877eee10 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -236,7 +236,7 @@ struct SwHTMLFormatInfo
 {}
 
 // ctor for creating of the format information
-SwHTMLFormatInfo( const SwFormat *pFormat, SwDoc *pDoc, SwDoc *pTemlate,
+SwHTMLFormatInfo( const SwFormat *pFormat, SwDoc *pDoc, SwDoc *pTemplate,
bool bOutStyles, LanguageType eDfltLang=LANGUAGE_DONTKNOW,
sal_uInt16 nScript=CSS1_OUTMODE_ANY_SCRIPT );
 ~SwHTMLFormatInfo();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 include/tools/wintypes.hxx|1 -
 vcl/source/filter/wmf/wmf.cxx |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7462288deca02b8a9054ff657bad970246c352fa
Author: Andrea Gelmini 
Date:   Mon Aug 21 22:18:52 2017 +0200

WB_STDTABDIALOG no more used

Since commit 6df2c90c08b6

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

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index a6b3826698fa..5e2e6b5cf8c7 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -241,7 +241,6 @@ WinBits const WB_STDFLOATWIN =  WB_SIZEMOVE | 
WB_CLOSEABLE | WB_ROLLABLE
 WinBits const WB_STDDIALOG =WB_MOVEABLE | WB_CLOSEABLE;
 WinBits const WB_STDMODELESS =  WB_STDDIALOG;
 WinBits const WB_STDMODAL = WB_STDDIALOG;
-WinBits const WB_STDTABDIALOG = WB_STDDIALOG;
 WinBits const WB_STDTABCONTROL =0;
 WinBits const WB_STDPOPUP = WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW 
| WB_3DLOOK | WB_DIALOGCONTROL;
 
commit ad6756527cd1272523536ec41f3a6cb74b7b673f
Author: Andrea Gelmini 
Date:   Mon Aug 21 22:06:22 2017 +0200

Fix typo

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

diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index ac56c74810f4..4bc8d11a6a01 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -25,7 +25,7 @@
 
 bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF )
 {
-// tdf#111484 Use new method to import Metafile. Take curent StreamPos
+// tdf#111484 Use new method to import Metafile. Take current StreamPos
 // into account (used by SwWW8ImplReader::ReadGrafFile and by
 // SwWw6ReadMetaStream, so do *not* ignore. OTOH XclImpDrawing::ReadWmf
 // is nice enough to copy to an own MemStream to avoid that indirect
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - cppuhelper/source stoc/source

[Michael Stahl]

 cppuhelper/source/implbase_ex.cxx  |5 +
 stoc/source/proxy_factory/proxyfac.cxx |7 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit eda41a271ed319560f0ab111cd9566266ab1bb29
Author: Michael Stahl 
Date:   Mon Aug 21 23:05:09 2017 +0200

cppuhelper: fix double checked locking in getTypeEntries()

Change-Id: I73674f0293a57ed7c4d54aa6b68ff64d5ca4e7bd

diff --git a/cppuhelper/source/implbase_ex.cxx 
b/cppuhelper/source/implbase_ex.cxx
index 2b7b792e718a..d01f61983a91 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -105,9 +105,14 @@ static inline type_entry * getTypeEntries( class_data * cd 
)
 // ref is statically held by getCppuType()
 pEntry->m_type.typeRef = rType.getTypeLibType();
 }
+OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
 cd->m_storedTypeRefs = true;
 }
 }
+else
+{
+OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+}
 return pEntries;
 }
 
commit 20a7ffd848ee9d9007ae1c9464713f9d1d125bce
Author: Michael Stahl 
Date:   Mon Aug 21 22:54:33 2017 +0200

stoc: remove extra braces

Change-Id: I3b6b77ba58832d7bfc350eeb5e589513b716a081

diff --git a/stoc/source/proxy_factory/proxyfac.cxx 
b/stoc/source/proxy_factory/proxyfac.cxx
index 49f380e86d0d..ae2c94f3c426 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -432,7 +432,6 @@ Reference< XInterface > SAL_CALL proxyfac_create(
 SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
 {
 Reference< XInterface > xRet;
-{
 static osl::Mutex s_mutex;
 // note: don't use ::osl::Mutex::getGlobalMutex() here, it deadlocks
 //   with getImplHelperInitMutex()
@@ -445,7 +444,6 @@ Reference< XInterface > SAL_CALL proxyfac_create(
 xRet = static_cast< ::cppu::OWeakObject * >(new FactoryImpl);
 rwInstance = xRet;
 }
-}
 return xRet;
 }
 
commit 7936368f9e7d0c50f7e3ebb987778029d0dcc22c
Author: Michael Stahl 
Date:   Mon Aug 21 22:40:57 2017 +0200

stoc: deadlock osl::Mutex::getGlobalMutex() vs getImplHelperInitMutex()

As found in a clang/ASAN build running UITest_writer_demo.

cppu::getTypeEntries locks getImplHelperInitMutex().

Let's try to replace the usage of getGlobalMutex() in proxyfac_create()
with a new static Mutex that is only used in that function.

{1: 7, 6: 1, 7: 1}
Thread 1 is waiting for 7
Thread 7 is waiting for 1

Thread 7 (Thread 0x7f34a147a700 (LWP 2530)):
2  osl_acquireMutex(oslMutexImpl*) (pMutex=0x7f34f620a3e0 
) at sal/osl/unx/mutex.cxx:97
3  osl::Mutex::acquire() (this=0x7f34f61f7da0 
) at include/osl/mutex.hxx:56
4  osl::Guard::Guard(osl::Mutex*) (this=0x7f349f6dc420, 
pT_=0x7f34f61f7da0 ) at 
include/osl/mutex.hxx:122
5  
com::sun::star::lang::cppu_detail_getUnoType(com::sun::star::lang::XSingleComponentFactory
 const*) () at 
workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/lang/XSingleComponentFactory.hpp:69
6  cppu::UnoType::get() () 
at include/cppu/unotype.hxx:296
7  com::sun::star::lang::XSingleComponentFactory::static_type(void*) () at 
workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/lang/XSingleComponentFactory.hpp:146
8  cppu::getTypeEntries(cppu::class_data*) (cd=0x7f34bddacb40 
, 
com::sun::star::lang::XSingleComponentFactory, 
com::sun::star::lang::XServiceInfo>::operator()()::s_cd>) at 
cppuhelper/source/implbase_ex.cxx:96
9  cppu::queryDeepNoXInterface(_typelib_TypeDescriptionReference const*, 
cppu::class_data*, void*) (pDemandedTDR=0x60f42940, cd=0x7f34bddacb40 
, 
com::sun::star::lang::XSingleComponentFactory, 
com::sun::star::lang::XServiceInfo>::operator()()::s_cd>, that=0x606000d3d3c0) 
at cppuhelper/source/implbase_ex.cxx:168
10 cppu::WeakImplHelper_query(com::sun::star::uno::Type const&, 
cppu::class_data*, void*, cppu::OWeakObject*) (rType=invalid uno::Type, 
cd=0x7f34bddacb40 
, 
com::sun::star::lang::XSingleComponentFactory, 
com::sun::star::lang::XServiceInfo>::operator()()::s_cd>, that=0x606000d3d3c0, 
pBase=0x606000d3d3c0) at cppuhelper/source/implbase_ex.cxx:296
11 cppu::WeakImplHelper::queryInterface(com::sun::star::uno::Type 
const&) (this=0x606000d3d3c0, aType=invalid uno::Type) at 
include/cppuhelper/implbase.hxx:108
12 non-virtual thunk to 
cppu::WeakImplHelper::queryInterface(com::sun::star::uno::Type 
const&) () at include/cppuhelper/implbase.hxx:107
13 
com::sun::star::uno::BaseReference::iquery(com::sun::star::uno::XInterface*, 
com::sun::star::uno::Type const&) (pInterface=0x606000d3d3e8, rType=invalid 
uno::Type) at include/com/sun/star/uno/Reference.hxx:55
14 
com::sun::star::uno::Reference::iquery(com::sun::star::uno::XInterface*)
 (pInterface=0x606000d3d3e8) at include/com/sun/star/uno/Reference.hxx:70
15 
com::sun::star::uno::Reference::set(com::sun::star::u

[Libreoffice-commits] core.git: onlineupdate/StaticLibrary_libmarverify.mk

[Markus Mohrhard]

 onlineupdate/StaticLibrary_libmarverify.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e531818579c27ab2e505f1ae960f8a0b9c1c0797
Author: Markus Mohrhard 
Date:   Tue Aug 22 00:20:12 2017 +0200

updater: fix error in linux part of updater makefiles

Change-Id: I2d32159364d34fb4154b7f88590045dc3a442bc3

diff --git a/onlineupdate/StaticLibrary_libmarverify.mk 
b/onlineupdate/StaticLibrary_libmarverify.mk
index d95aeb44f79c..fe866204f4ee 100644
--- a/onlineupdate/StaticLibrary_libmarverify.mk
+++ b/onlineupdate/StaticLibrary_libmarverify.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
-DUNICODE \
 ))
 else
-$(eval $(call gb_StaticLibrary_add_defs,libmar,\
+$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
-DMAR_NSS \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 ucb/source/ucp/webdav/DAVSessionFactory.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e35b7738d9f276c0566df0f2cc0f1eed7900d6c
Author: Markus Mohrhard 
Date:   Tue Aug 22 00:24:08 2017 +0200

fix build regression from d347c2403605c5aa3ddd98fb605366914acab79f

Change-Id: Ia9e017732814d3f5b1f2efdaef45d96aa22daa46

diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx 
b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index 0809252bb5f2..24f7a54580e9 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -57,7 +57,7 @@ rtl::Reference< DAVSession > 
DAVSessionFactory::createDAVSession(
 std::unique_ptr< DAVSession > xElement(
 new SerfSession( this, inUri, *m_xProxyDecider.get() ) );
 
-aIt = m_aMap.emplace(  inUri, xElement.get() ) ).first;
+aIt = m_aMap.emplace(  inUri, xElement.get() ).first;
 aIt->second->m_aContainerIt = aIt;
 xElement.release();
 return aIt->second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sc/source/filter/xml/xmlwrap.cxx  |4 +++-
 sd/inc/strings.hrc|1 -
 sd/source/filter/xml/sdxmlwrp.cxx |4 +++-
 starmath/inc/strings.hrc  |1 -
 starmath/source/mathmlimport.cxx  |5 +++--
 sw/inc/strings.hrc|1 -
 sw/source/filter/xml/swxml.cxx|5 +++--
 7 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 508957dbf49be577188fb4c112405717957b2734
Author: Takeshi Abe 
Date:   Sat Aug 19 23:58:53 2017 +0900

tdf#108706 Unify loading document progress bar label

This also reduces the number of strings to be translated.

Change-Id: I032ba12c1e762ee3851658d439dfe2c81c6bd34f
Reviewed-on: https://gerrit.libreoffice.org/41329
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 392f420ca8a6..530f08b5ab0e 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -342,7 +344,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, 
ErrCode& rError )
 if (xStatusIndicator.is())
 {
 sal_Int32 nProgressRange(100);
-xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), 
nProgressRange);
+xStatusIndicator->start(SvxResId(RID_SVXSTR_DOC_LOAD), nProgressRange);
 xInfoSet->setPropertyValue("ProgressRange", 
uno::makeAny(nProgressRange));
 }
 
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 7d049670373f..a47b808609e3 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -334,7 +334,6 @@
 #define STR_PSEUDOSHEET_BACKGROUND  
NC_("STR_PSEUDOSHEET_BACKGROUND", "Background" )
 #define STR_PSEUDOSHEET_NOTES   
NC_("STR_PSEUDOSHEET_NOTES", "Notes" )
 #define STR_POWERPOINT_IMPORT   
NC_("STR_POWERPOINT_IMPORT", "PowerPoint Import")
-#define STR_LOAD_DOCNC_("STR_LOAD_DOC", 
"Load Document" )
 #define STR_SAVE_DOCNC_("STR_SAVE_DOC", 
"Save Document" )
 #define STR_POOLSHEET_BANDED_CELL   
NC_("STR_POOLSHEET_BANDED_CELL", "Banding cell" )
 #define STR_POOLSHEET_HEADER
NC_("STR_POOLSHEET_HEADER", "Header" )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index 56a1368d78aa..fa3bcfa10cdf 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -30,6 +30,8 @@
 #include "drawdoc.hxx"
 #include "Outliner.hxx"
 #include 
+#include 
+#include 
 #include 
 
 #include "DrawDocShell.hxx"
@@ -524,7 +526,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
 if(mxStatusIndicator.is())
 {
 sal_Int32 nProgressRange(100);
-OUString aMsg(SdResId(STR_LOAD_DOC));
+OUString aMsg(SvxResId(RID_SVXSTR_DOC_LOAD));
 mxStatusIndicator->start(aMsg, nProgressRange);
 
 // set ProgressRange
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index b000bfe62ca9..8ef050ec8a56 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -308,7 +308,6 @@
 #define STR_ALIGN_RIGHT NC_("STR_ALIGN_RIGHT", "right" )
 #define STR_CMDBOXWINDOWNC_("STR_CMDBOXWINDOW", "Commands" 
)
 #define RID_DOCUMENTSTR NC_("RID_DOCUMENTSTR", "Formula" )
-#define STR_STATSTR_READING NC_("STR_STATSTR_READING", 
"Loading document..." )
 #define STR_STATSTR_WRITING NC_("STR_STATSTR_WRITING", "Saving 
document..." )
 #define STR_MATH_DOCUMENT_FULLTYPE_CURRENT  
NC_("STR_MATH_DOCUMENT_FULLTYPE_CURRENT", "%PRODUCTNAME %PRODUCTVERSION 
Formula")
 #define RID_ERR_IDENT   NC_("RID_ERR_IDENT", "ERROR : " )
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 5eac14f28977..97193e119172 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -54,13 +54,14 @@ one go*/
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
 #include "mathmlattr.hxx"
 #include "mathmlimport.hxx"
 #include "register.hxx"
-#include 
 #include 
 #include 
 #include 
@@ -161,7 +162,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium &rMedium)
 sal_Int32 nProgressRange(nSteps);
 if (xStatusIndicator.is())
 {
-xStatusIndicator->start(SmResId(STR_STATSTR_READING), nProgressRange);
+xStatusIndicator->start(SvxResId(RID_SVXSTR_DOC_LOAD), nProgressRange);
 }
 
 nSteps=0;
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index bbd31e3318f5..9c42670f24e0 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -262,7 +262,6 @@
 // Statusbar-titles
 #define STR_STATSTR_W4WREAD NC_("STR_STATSTR_W4WREAD", 
"Importing document...")
 #def

how to make

[Ken. A Sandoval Ruiz]

data validation.
I need help please with creating a dropdown which allows me to select som
data from it.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tamás Zolnai]

 include/filter/msfilter/escherex.hxx|2 
 include/oox/export/vmlexport.hxx|   21 -
 oox/source/export/vmlexport.cxx |   27 ++
 oox/source/vml/vmlshape.cxx |2 
 sw/qa/extras/ooxmlexport/data/activex_control_align.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |   62 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   11 +-
 sw/source/filter/ww8/docxattributeoutput.cxx|9 +-
 8 files changed, 120 insertions(+), 14 deletions(-)

New commits:
commit 2d1fe7fb67ec1ff1b96912c0945d17d54aecb12e
Author: Tamás Zolnai 
Date:   Tue Aug 22 02:02:07 2017 +0200

Fix two issues in ActiveX DOCX import / export code

* Inline anchored VML shape had wrong vertical position
** In MSO inline shapes are positioned to the top of the baseline
* During export all shape ids were the same (shape_0)
** VML shapes used to be exported only as fallback,
   I guess that's why it did not cause any issue before.
** Override the shapeid generator with a new one, which
   actually generates unique shapeids.

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

diff --git a/include/filter/msfilter/escherex.hxx 
b/include/filter/msfilter/escherex.hxx
index 14e1d69d5aab..f1468ef7f5df 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1052,7 +1052,7 @@ public:
 
 /** Creates and returns a new shape identifier, updates the internal shape
 counters and registers the identifier in the DGG cluster table. */
-sal_uInt32   GenerateShapeId() { return mxGlobal->GenerateShapeId( 
mnCurrentDg, mbEscherSpgr ); }
+virtual sal_uInt32   GenerateShapeId() { return mxGlobal->GenerateShapeId( 
mnCurrentDg, mbEscherSpgr ); }
 
 /** Returns the graphic provider from the global object that has been
 passed to the constructor.
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index c098ace13cb7..ee40b933deaa 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -111,6 +111,17 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx
 /// Use '#' mark for type attribute (check Type Attribute of VML shape in 
OOXML documentation)
 bool m_bUseHashMarkForType;
 
+/** There is a shapeid generation mechanism in EscherEx, but it does not 
seem to work
+*   so override the existing behavior to get actually unique ids.
+*/
+bool m_bOverrideShapeIdGeneration;
+
+/// Prefix for overriden shape id generation (used if 
m_bOverrideShapeIdGeneration is true)
+OString m_sShapeIDPrefix;
+
+/// Counter for generating shape ids (used if m_bOverrideShapeIdGeneration 
is true)
+sal_uInt64 m_nShapeIDCounter;
+
 public:
 VMLExport( ::sax_fastparser::FSHelperPtr const & 
pSerializer, VMLTextExport* pTextExport = nullptr);
 virtual ~VMLExport() override;
@@ -130,8 +141,9 @@ public:
 virtual void  AddSdrObjectVMLObject( const SdrObject& rObj) override;
 static bool IsWaterMarkShape(const OUString& rStr);
 
-voidSetSkipwzName() { m_bSkipwzName = true; }
-voidSetHashMarkForType() { m_bUseHashMarkForType = true; }
+voidSetSkipwzName(bool bSkipwzName) { m_bSkipwzName = bSkipwzName; }
+voidSetHashMarkForType(bool bUseHashMarkForType) { 
m_bUseHashMarkForType = bUseHashMarkForType; }
+voidOverrideShapeIDGen(bool bOverrideShapeIdGeneration, const OString 
sShapeIDPrefix = OString());
 protected:
 /// Add an attribute to the generated  element.
 ///
@@ -142,6 +154,9 @@ protected:
 using EscherEx::StartShape;
 using EscherEx::EndShape;
 
+/// Override shape ID generation when m_bOverrideShapeIdGeneration is set 
to true
+virtual sal_uInt32   GenerateShapeId() override;
+
 /// Start the shape for which we just collected the information.
 ///
 /// Returns the element's tag number, -1 means we wrote nothing.
@@ -165,7 +180,7 @@ private:
 
 private:
 /// Create an OString representing the id from a numerical id.
-static OString ShapeIdString( sal_uInt32 nId );
+OString ShapeIdString( sal_uInt32 nId );
 
 /// Add flip X and\or flip Y
 void AddFlipXY( );
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index a401c3c44465..f45edde6cc86 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -68,6 +68,8 @@ VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr const & 
pSerializer, VMLText
 , m_aShapeTypeWritten( ESCHER_ShpInst_COUNT )
 , m_bSkipwzName( false )
 , m_bUseHashMarkForType( false )
+, m_bOverrideShapeIdGeneration( false )
+, m_nShapeIDCounter( 0 )
 {
 mnGroupLevel = 1;
 }

[Libreoffice-commits] core.git: cui/source dbaccess/source include/svtools include/tools sc/source sd/source sfx2/source svtools/source sw/source

[Noel Grandin]

 cui/source/dialogs/hangulhanjadlg.cxx   |3 ++-
 cui/source/dialogs/thesdlg.cxx  |3 ++-
 cui/source/options/optlingu.cxx |   12 
 cui/source/options/treeopt.cxx  |4 +++-
 dbaccess/source/ui/control/dbtreelistbox.cxx|2 +-
 dbaccess/source/ui/misc/WNameMatch.cxx  |4 ++--
 include/svtools/treelistbox.hxx |8 ++--
 include/tools/wintypes.hxx  |2 --
 sc/source/ui/cctrl/checklistmenu.cxx|7 ---
 sc/source/ui/dbgui/PivotLayoutTreeList.cxx  |7 ---
 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx  |7 ---
 sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx |4 ++--
 sc/source/ui/miscdlgs/solveroptions.cxx |3 ++-
 sc/source/ui/navipi/content.cxx |3 ++-
 sd/source/ui/dlg/sdtreelb.cxx   |4 ++--
 sfx2/source/dialog/templdlg.cxx |7 ---
 svtools/source/contnr/svimpbox.cxx  |5 +++--
 svtools/source/contnr/treelistbox.cxx   |8 +++-
 svtools/source/inc/svimpbox.hxx |3 ++-
 sw/source/uibase/utlui/content.cxx  |2 +-
 sw/source/uibase/utlui/navipi.cxx   |3 ++-
 21 files changed, 63 insertions(+), 38 deletions(-)

New commits:
commit a2736303fea5ad2305ca8d38b90f5a21a8ab6a67
Author: Noel Grandin 
Date:   Mon Aug 21 09:31:14 2017 +0200

convert WB_QUICK_SEARCH/WB_FORCE_MAKEVISIBLE to bool fields

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

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx 
b/cui/source/dialogs/hangulhanjadlg.cxx
index ab6578f40d8e..bdb39041ea75 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1109,7 +1109,8 @@ namespace svx
 
 m_pDictsLB->set_height_request(m_pDictsLB->GetTextHeight() * 5);
 m_pDictsLB->set_width_request(m_pDictsLB->approximate_char_width() * 
32);
-m_pDictsLB->SetStyle( m_pDictsLB->GetStyle() | WB_CLIPCHILDREN | 
WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
+m_pDictsLB->SetStyle( m_pDictsLB->GetStyle() | WB_CLIPCHILDREN | 
WB_HSCROLL );
+m_pDictsLB->SetForceMakeVisible(true);
 m_pDictsLB->SetSelectionMode( SelectionMode::Single );
 m_pDictsLB->SetHighlightRange();
 m_pDictsLB->SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, 
DictsLB_SelectHdl ) );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 5299fbde0d44..4fce88395494 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -167,7 +167,8 @@ 
ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(vcl::Window* pParent)
 : SvxCheckListBox(pParent)
 , m_pDialog(nullptr)
 {
-SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE 
);
+SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL );
+SetForceMakeVisible(true);
 SetHighlightRange();
 }
 
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 76609fa4413e..c0c96f5c5ca6 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1013,7 +1013,8 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, 
const SfxItemSet& rSet )
 
 pCheckButtonData = nullptr;
 
-m_pLinguModulesCLB->SetStyle( 
m_pLinguModulesCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE 
);
+m_pLinguModulesCLB->SetStyle( 
m_pLinguModulesCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL );
+m_pLinguModulesCLB->SetForceMakeVisible(true);
 m_pLinguModulesCLB->SetHighlightRange();
 m_pLinguModulesCLB->SetSelectHdl( LINK( this, SvxLinguTabPage, 
SelectHdl_Impl ));
 m_pLinguModulesCLB->SetDoubleClickHdl(LINK(this, SvxLinguTabPage, 
BoxDoubleClickHdl_Impl));
@@ -1022,7 +1023,8 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, 
const SfxItemSet& rSet )
 m_pLinguModulesEditPB->SetClickHdl( LINK( this, SvxLinguTabPage, 
ClickHdl_Impl ));
 m_pLinguOptionsEditPB->SetClickHdl( LINK( this, SvxLinguTabPage, 
ClickHdl_Impl ));
 
-m_pLinguDicsCLB->SetStyle( 
m_pLinguDicsCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+m_pLinguDicsCLB->SetStyle( 
m_pLinguDicsCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL );
+m_pLinguDicsCLB->SetForceMakeVisible(true);
 m_pLinguDicsCLB->SetHighlightRange();
 m_pLinguDicsCLB->SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl 
));
 m_pLinguDicsCLB->SetCheckButtonHdl(LINK(this, SvxLinguTabPage, 
BoxCheckButtonHdl_Impl));
@@ -1031,7 +1033,8 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, 
const SfxItemSet& rSet )
 m_pLinguDicsEditPB->SetClickHdl( LINK( this, SvxLinguTabPage, 
ClickHdl_Impl ));
 m_pLinguDicsDelPB->SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl 

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

[Stephan Bergmann]

 dtrans/source/win32/dtobj/DataFmtTransl.cxx |2 +-
 sal/osl/w32/interlck.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 186eda28ffbcd9ed918b2cf7f3d7bd294575
Author: Stephan Bergmann 
Date:   Tue Aug 22 08:38:48 2017 +0200

loplugin:unnecessaryparen (clang-cl)

Change-Id: I61b006051e708636f0bba83b16de36f4571b8da7

diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx 
b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index a498e9d4471e..c35cc42f43a6 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -231,7 +231,7 @@ bool SAL_CALL CDataFormatTranslator::isHTMLFormat( 
CLIPFORMAT cf )
 bool SAL_CALL CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf )
 {
 OUString clipFormatName = getClipboardFormatName( cf );
-return ( clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE ) 
);
+return clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE );
 }
 
 OUString SAL_CALL CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, 
CLIPFORMAT aClipformat )
diff --git a/sal/osl/w32/interlck.cxx b/sal/osl/w32/interlck.cxx
index 3866062d75c2..b9ecf6d78eef 100644
--- a/sal/osl/w32/interlck.cxx
+++ b/sal/osl/w32/interlck.cxx
@@ -23,12 +23,12 @@
 
 oslInterlockedCount SAL_CALL 
osl_incrementInterlockedCount(oslInterlockedCount* pCount)
 {
-return (InterlockedIncrement(pCount));
+return InterlockedIncrement(pCount);
 }
 
 oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInterlockedCount* pCount)
 {
-return (InterlockedDecrement(pCount));
+return InterlockedDecrement(pCount);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits