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

[David Tardon]

 external/libqxp/0001-WaE-narrowing-conversion.patch.1 |   28 ++
 external/libqxp/UnpackedTarball_libqxp.mk |1 
 2 files changed, 29 insertions(+)

New commits:
commit 2539d5b39a41d80d2cafed12a66044e9b029263a
Author: David Tardon 
Date:   Mon Aug 28 09:00:14 2017 +0200

blind attempt to fix windows build error

Change-Id: I88b32543af58dc6f917348b19a0d0d3d50fc8ffe

diff --git a/external/libqxp/0001-WaE-narrowing-conversion.patch.1 
b/external/libqxp/0001-WaE-narrowing-conversion.patch.1
new file mode 100644
index ..0c73c0501f3c
--- /dev/null
+++ b/external/libqxp/0001-WaE-narrowing-conversion.patch.1
@@ -0,0 +1,28 @@
+From 3d0b78eb855dc3797e614a72019afbebbebc536a Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Mon, 28 Aug 2017 08:58:10 +0200
+Subject: [PATCH] WaE: narrowing conversion
+
+error C2398: Element '3': conversion from 'unsigned __int64' to 'unsigned 
long' requires a narrowing conversion
+---
+ src/lib/QXPContentCollector.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/QXPContentCollector.cpp b/src/lib/QXPContentCollector.cpp
+index 6a227a6..9c3076d 100644
+--- a/src/lib/QXPContentCollector.cpp
 b/src/lib/QXPContentCollector.cpp
+@@ -943,7 +943,9 @@ void QXPContentCollector::drawText(const 
std::shared_ptr &text, const Link
+ break;
+   }
+ 
+-  const unsigned long spanTextEnd = std::min({ 
charFormat.afterEndIndex(), paragraph.afterEndIndex(), text->text.length(), 
textEnd });
++  const auto spanTextEnd = static_cast(
++ std::min({ 
charFormat.afterEndIndex(), paragraph.afterEndIndex(), text->text.length(), 
textEnd })
++   );
+ 
+   if (charFormat.format->isControlChars)
+   {
+-- 
+2.13.0
+
diff --git a/external/libqxp/UnpackedTarball_libqxp.mk 
b/external/libqxp/UnpackedTarball_libqxp.mk
index e20b7f94ecee..340fc9397964 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -24,6 +24,7 @@ endif
 $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1 
\
external/libqxp/0001-add-missing-includes.patch.1 \
+   external/libqxp/0001-WaE-narrowing-conversion.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: no parameter values for "[in] sequence >" [equivalent for hasValue() for "[in] any"?]

[Miklos Vajna]

Hi,

On Fri, Aug 25, 2017 at 08:13:07PM +0200, Lars Callenbach  
wrote:
> is it possible to have leave the parameter empty in Calc function if
> the input is of type "[in] sequence >" in the IDL-file?

What is the context, calling this function from Basic? I think Basic
provides "optional" parameters when the last X parameter of a function
is of type Any. In that case you're allowed to omit the parameter, and
the Basic interpreter will synthesize empty Any values for those
parameters.

I believe the same doesn't work for sequences.

Regards,

Miklos


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

Re: Problems building LibreOffice on macOS with Lode

[Stephan Bergmann]

On 08/25/2017 11:21 AM, Telesto wrote:
I'm having some issues building LibO Master on MacOS 
(Build6e090b4272b8fa12d2032ff0c0ea4bfb24c0d2d2) using LODE.

1. The unit test is failing (Test name: testTdf106974_int32Crop::Import)
2. LibreOffice won't run at all; it's crashing when launching 
(terminating with uncaught exception of type 
com::sun::star::uno::DeploymentException)


If 'make' failed (even only during a unit test), the resulting instset/ 
installation is not necessarily functional.  Sometimes such unit tests 
fail sporadically, so a second 'make' might succeed.  If not, a 
workaround for a failing test can be 'make build-nocheck' (don't build 
nor run any tests) or 'make gb_SUPPRESS_TESTS=x' (build the tests, but 
don't run them).


3. Autogen reports: WARNING : no suitable nasm (Netwide Assembler) found 
for internal jpeg-turbo


That should be a harmless warning.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg officecfg/registry

[andreas kainz]

 icon-themes/breeze/links.txt  |5 +
 icon-themes/breeze_dark/links.txt |5 +
 icon-themes/breeze_svg/links.txt  |5 +
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |6 ++
 4 files changed, 21 insertions(+)

New commits:
commit 722e3cee97555ad0ace78f9feb80a137e8498099
Author: andreas kainz 
Date:   Sun Aug 27 01:08:53 2017 +0200

add icons to calc functions needed for grouped notebookbar

Change-Id: Iabfa0cd633570ff6a6f3116e73844e0c7badfc52
Reviewed-on: https://gerrit.libreoffice.org/41597
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 5cf3f1c6dc01..212fe3957050 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -112,6 +112,8 @@ cmd/sc_insertspreadsheet.png cmd/sc_togglesheetgrid.png
 cmd/sc_inserttimefield.png cmd/sc_timefield.png
 cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
 cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
+cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
+cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
 
 # Zoom
 cmd/lc_previewzoom.png cmd/lc_zoomprevious.png
@@ -556,10 +558,13 @@ cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
 
 # calc menu entries
+cmd/lc_functionbox.png cmd/lc_dbviewfunctions.png
 cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
 cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
 cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
 cmd/sc_functiondialog.png cmd/sc_dbviewfunctions.png
+cmd/lc_functiondialog.png cmd/lc_dbviewfunctions.png
+cmd/sc_functionbox.png cmd/sc_dbviewfunctions.png
 cmd/sc_sheetcommentmenu.png cmd/sc_showannotations.png
 
 # Shapes
diff --git a/icon-themes/breeze_dark/links.txt 
b/icon-themes/breeze_dark/links.txt
index 5cf3f1c6dc01..212fe3957050 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -112,6 +112,8 @@ cmd/sc_insertspreadsheet.png cmd/sc_togglesheetgrid.png
 cmd/sc_inserttimefield.png cmd/sc_timefield.png
 cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
 cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
+cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
+cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
 
 # Zoom
 cmd/lc_previewzoom.png cmd/lc_zoomprevious.png
@@ -556,10 +558,13 @@ cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
 
 # calc menu entries
+cmd/lc_functionbox.png cmd/lc_dbviewfunctions.png
 cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
 cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
 cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
 cmd/sc_functiondialog.png cmd/sc_dbviewfunctions.png
+cmd/lc_functiondialog.png cmd/lc_dbviewfunctions.png
+cmd/sc_functionbox.png cmd/sc_dbviewfunctions.png
 cmd/sc_sheetcommentmenu.png cmd/sc_showannotations.png
 
 # Shapes
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index 5cf3f1c6dc01..212fe3957050 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -112,6 +112,8 @@ cmd/sc_insertspreadsheet.png cmd/sc_togglesheetgrid.png
 cmd/sc_inserttimefield.png cmd/sc_timefield.png
 cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
 cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
+cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
+cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
 
 # Zoom
 cmd/lc_previewzoom.png cmd/lc_zoomprevious.png
@@ -556,10 +558,13 @@ cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
 
 # calc menu entries
+cmd/lc_functionbox.png cmd/lc_dbviewfunctions.png
 cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
 cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
 cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
 cmd/sc_functiondialog.png cmd/sc_dbviewfunctions.png
+cmd/lc_functiondialog.png cmd/lc_dbviewfunctions.png
+cmd/sc_functionbox.png cmd/sc_dbviewfunctions.png
 cmd/sc_sheetcommentmenu.png cmd/sc_showannotations.png
 
 # Shapes
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index adf23030cec8..aa0fafd17c5c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -416,6 +416,9 @@
 
   ~Function...
 
+
+  1
+
   
   
 
@@ -1032,6 +1035,9 @@
 
   F~unction List
 
+
+  1
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sal/osl/unx/socket.cxx |4 ++--
 sal/osl/w32/socket.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8b63825dc2e2c271b9109c32a27e1ea246f7d87e
Author: Stephan Bergmann 
Date:   Mon Aug 28 10:17:35 2017 +0200

Fix type of errno/WSAGetLastError()

...as got broken with 3d5be8cd31bcf6fce8772133298d2ae076361362 "osl: give
warning on socket error (win32), move Flag definition (unx)"

Change-Id: Ib68540596b0bc2cda3e809e765c7d41ca45dda71

diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index b3ca2bb83191..f7a98efafc82 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -1153,7 +1153,7 @@ oslSocket SAL_CALL osl_createSocket(
 /* creation failed => free memory */
 if(pSocket->m_Socket == OSL_INVALID_SOCKET)
 {
-sal_Int32 nErrno = errno;
+int nErrno = errno;
 SAL_WARN( "sal.osl", "socket creation failed: (" << nErrno << ") " << 
strerror(nErrno) );
 
 destroySocketImpl(pSocket);
@@ -1169,7 +1169,7 @@ oslSocket SAL_CALL osl_createSocket(
 if (fcntl(pSocket->m_Socket, F_SETFD, nFlags) == -1)
 {
 pSocket->m_nLastError=errno;
-sal_uInt32 nErrno = errno;
+int nErrno = errno;
 SAL_WARN( "sal.osl", "failed changing socket flags: (" << 
nErrno << ") " << strerror(nErrno) );
 }
 }
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 6ae42e557515..b1d8af3a9970 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -790,7 +790,7 @@ oslSocket SAL_CALL osl_createSocket(
 /* creation failed => free memory */
 if(pSocket->m_Socket == OSL_INVALID_SOCKET)
 {
-sal_uInt32 nErrno = WSAGetLastError();
+int nErrno = WSAGetLastError();
 wchar_t *sErr = nullptr;
 FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, nErrno,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: To get some help - Bug 38835

[Shinnok]

Hi Gayan,

You first step would be to setup a LibreOffice core build of current master and 
start working from there.  Platform specific instructions on how to setup a 
build as well as other useful starter info can be found on the Wiki:
https://wiki.documentfoundation.org/Development 


Then you need to register on Bugzilla and assign issue 38835 to yourself using 
the (take) action next to Assignee label. As soon as you have a workable patch 
for us you need to register on Gerrit and submit it for review:
https://gerrit.libreoffice.org/#/q/status:open 


Let us know of your progress and if you get stuck, need help or anything in 
between please e-mail the dev list or hop on to irc at freenode.net on channel 
#libreoffice-dev.

https://lists.freedesktop.org/mailman/listinfo/libreoffice 


Regards,
Shinnok


> On Aug 25, 2017, at 12:07 PM, Gayan Thejawansha  
> wrote:
> 
> Hello there,
> 
> I hope to working on the bug of Bug 38835 - strip out non-trivial globals 
> before main
>  which is shown in here. ( 
> https://bugs.documentfoundation.org/show_bug.cgi?id=38835 
>  ) 
>  I understood the problem there but I don't have any idea of how to start the 
> bug fixing. Since I have the average
>  programming skills, if anyone can guide me how to start the process, it will 
> be a great help.
> 
> Thank in advance,
> Gayan
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

[Miklos Vajna]

 external/libqxp/UnpackedTarball_libqxp.mk  |1 
 external/libqxp/android-workaround.patch.1 |   49 +
 2 files changed, 50 insertions(+)

New commits:
commit c6c6a7091f9f3fe18eb7deaff00d47ba27c295af
Author: Miklos Vajna 
Date:   Mon Aug 28 10:24:47 2017 +0200

libqxp: work around Android build

Till we can't switch to a proper standard C++ library there.

Change-Id: Ida62af07d9f843426d875f93c6795dc6cdecc303

diff --git a/external/libqxp/UnpackedTarball_libqxp.mk 
b/external/libqxp/UnpackedTarball_libqxp.mk
index 340fc9397964..028ae73a0e1b 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1 
\
external/libqxp/0001-add-missing-includes.patch.1 \
external/libqxp/0001-WaE-narrowing-conversion.patch.1 \
+   external/libqxp/android-workaround.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libqxp/android-workaround.patch.1 
b/external/libqxp/android-workaround.patch.1
new file mode 100644
index ..5c7529c20b79
--- /dev/null
+++ b/external/libqxp/android-workaround.patch.1
@@ -0,0 +1,49 @@
+--- libqxp.orig/src/lib/QXP4Parser.cpp 2017-08-28 10:12:26.009868397 +0200
 libqxp/src/lib/QXP4Parser.cpp  2017-08-28 10:12:39.577681705 +0200
+@@ -16,6 +16,7 @@
+ #include "QXP4Header.h"
+ #include "QXPCollector.h"
+ #include "QXPMemoryStream.h"
++#include "android-compat.h"
+ 
+ namespace libqxp
+ {
+--- libqxp.orig/src/lib/QXPParser.cpp  2017-08-28 10:11:14.074858068 +0200
 libqxp/src/lib/QXPParser.cpp   2017-08-28 10:18:04.849203430 +0200
+@@ -14,6 +14,7 @@
+ 
+ #include 
+ #include 
++#include "android-compat.h"
+ 
+ namespace libqxp
+ {
+--- libqxp.orig/src/lib/QXPTypes.cpp   2017-08-26 08:38:40.0 +0200
 libqxp/src/lib/QXPTypes.cpp2017-08-28 10:18:37.784749714 +0200
+@@ -11,6 +11,7 @@
+ 
+ #include 
+ #include 
++#include "android-compat.h"
+ 
+ namespace libqxp
+ {
+--- libqxp.orig/src/lib/android-compat.h   1970-01-01 01:00:00.0 
+0100
 libqxp/src/lib/android-compat.h2017-08-28 10:21:36.766283262 +0200
+@@ -0,0 +1,16 @@
++#if defined(__ANDROID__)
++namespace std
++{
++template
++T round(T x)
++{
++  return ::round(x);
++}
++
++template
++T hypot(T x, T y)
++{
++  return ::hypot(x, y);
++}
++}
++#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 scp2/source/ooo/windowscustomaction_ooo.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4b88947e5a56f39e80f8edf85b2b384a4f22bb3
Author: Juergen Funk 
Date:   Thu Jun 29 09:43:20 2017 +0200

tdf#106931 - LibreOffice 5.3 installer doesn't honor UI_LANGS property

The patch 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155 disable the CustomAction
"SelectLanguage" when the MSI-Property ADDLOCAL is set,
This patch set the the CustomAction when the Property
"UI_LANGS" is set, then the CustomAction execute

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

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index dfafc1611a53..39a0d52cbd54 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -189,8 +189,8 @@ WindowsCustomAction gid_Customaction_SelectLanguage
 Source = "sellangmsi.dll";
 Target = "SelectLanguage";
 Inbinarytable = 1;
-Assignment1 = ("InstallExecuteSequence", "NOT Installed And 
ADDLOCAL=\"\"", "MigrateFeatureStates");
-Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", 
"MigrateFeatureStates");
+Assignment1 = ("InstallExecuteSequence", "NOT Installed And (ADDLOCAL=\"\" 
Or NOT UI_LANGS=\"\")", "MigrateFeatureStates");
+Assignment2 = ("InstallUISequence", "NOT Installed And (ADDLOCAL=\"\" Or 
NOT UI_LANGS=\"\")", "MigrateFeatureStates");
 End
 
 WindowsCustomAction gid_Customaction_SortTree
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis]

 chart2/source/view/charttypes/PieChart.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8c8edfabdee656ac5a9a0b1106f90baf315f1dd4
Author: Dennis Francis 
Date:   Mon Aug 21 13:59:41 2017 +0530

tdf#62363: When pie chart sector is too small do "Outside" placement

...of its label when "Best fit" label placement setting is used.

Change-Id: Id201d922505de0e134286f4772abe282bb0722bc
Reviewed-on: https://gerrit.libreoffice.org/41572
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index 35f1d84bc006..d5d9b6e97c98 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -280,14 +280,23 @@ void PieChart::createTextLabelShape(
 ///the label position is allowed; the `createTextLabelShape` treats the
 ///`AVOID_OVERLAP` as if it was of `CENTER` type;
 
+double nVal = rSeries.getYValue(nPointIndex);
 //AVOID_OVERLAP is in fact "Best fit" in the UI.
 bool bMovementAllowed = ( nLabelPlacement == 
css::chart::DataLabelPlacement::AVOID_OVERLAP );
 if( bMovementAllowed )
+{
 // Use center for "Best fit" for now. In the future we
 // may want to implement a real best fit algorithm.
 // But center is good enough, and close to what Excel
 // does.
-nLabelPlacement = css::chart::DataLabelPlacement::CENTER;
+
+// Place the label outside if the sector is too small
+// The threshold is set to 2%, but can be improved by making it a 
function of
+// label width and radius too ?
+double fFrac = fabs( nVal / rParam.mfLogicYSum );
+nLabelPlacement = ( fFrac <= 0.02 ) ? 
css::chart::DataLabelPlacement::OUTSIDE :
+css::chart::DataLabelPlacement::CENTER;
+}
 
 ///for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in 
the
 ///radius direction, is added to the final screen position of the label
@@ -346,7 +355,6 @@ void PieChart::createTextLabelShape(
 sal_Int32 nTextMaximumFrameWidth = ceil(fTextMaximumFrameWidth);
 
 ///the text shape for the label is created
-double nVal = rSeries.getYValue(nPointIndex);
 aPieLabelInfo.xTextShape = createDataLabel(
 xTextTarget, rSeries, nPointIndex, nVal, rParam.mfLogicYSum,
 aScreenPosition2D, eAlignment, 0, nTextMaximumFrameWidth);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 4 commits - kit/ChildSession.cpp loleaflet/build loleaflet/dist loleaflet/src

[Aditya Dewan]

 kit/ChildSession.cpp|3 
 loleaflet/build/deps.js |5 
 loleaflet/dist/leaflet.css  |  104 +
 loleaflet/src/control/Ruler.js  |  220 
 loleaflet/src/layer/tile/GridLayer.js   |9 -
 loleaflet/src/layer/tile/TileLayer.js   |   10 +
 loleaflet/src/layer/tile/WriterTileLayer.js |4 
 loleaflet/src/map/Map.js|3 
 8 files changed, 353 insertions(+), 5 deletions(-)

New commits:
commit c61db390c9741fd7deee426089bdfd72d89077a6
Author: Aditya Dewan 
Date:   Fri Aug 25 16:34:43 2017 +0530

Ruler now compatible with comments and zoom

Change-Id: Ic5e99eb3a280ce5f5f4621b20d0e44250ea30621
Reviewed-on: https://gerrit.libreoffice.org/41562
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index 57a8f8fe..c324ebfd 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -776,7 +776,6 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header 
{
 .loleaflet-ruler-breakcontainer {
height: 100%;
position: absolute;
-   width: 100vw;
}
 
 .loleaflet-ruler-marginwrapper {
@@ -795,9 +794,8 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header 
{
}
 
 .loleaflet-ruler-face {
-   margin:0px auto;
height: 100%;
-   transition: width .2s;
+   background-color: white;
}
 
 .loleaflet-ruler-maj {
@@ -815,7 +813,6 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header 
{
 .loleaflet-ruler-margin {
height: 100%;
background-color: #efefef;
-   transition: width .1s;
}
 
 .loleaflet-ruler-left {
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index c23ce16d..22453cee 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -8,22 +8,33 @@ L.Control.Ruler = L.Control.extend({
interactive: true,
marginSet: false,
displayNumber: true,
+   tileMargin: 18,
+   extraSize: 0,
margin1: null,
margin2: null,
nullOffset: null,
pageOffset: null,
pageWidth: null,
unit: null,
-   convertRatioDrag: null
+   DraggableConvertRatio: null,
+   timer: null
},
 
onAdd: function(map) {
map.on('rulerupdate', this._updateOptions, this);
-   map.on('docsize', this._updateBreakPoints, this);
+   map.on('docsize', this._updatePaintTimer, this);
+   map.on('scrolloffset resize', this._fixOffset, this);
+   this._map = map;
 
return this._initLayout();
},
 
+   _updatePaintTimer: function() {
+   clearTimeout(this.options.timer);
+   this.options.timer = setTimeout(L.bind(this._updateBreakPoints, 
this), 300);
+   },
+
+
_initLayout: function() {
this._rWrapper = L.DomUtil.create('div', 'loleaflet-ruler 
leaflet-bar leaflet-control leaflet-control-custom');
this._rFace = L.DomUtil.create('div', 'loleaflet-ruler-face', 
this._rWrapper);
@@ -51,6 +62,12 @@ L.Control.Ruler = L.Control.extend({
if (this.options.margin1 == null || this.options.margin2 == 
null)
return;
 
+   if (this._map._docLayer._annotations._items.length === 0)
+   this.options.extraSize = 0;
+   else
+   this.options.extraSize = 290;
+   /// as used for the size of actual comments
+
var classMajorSep = 'loleaflet-ruler-maj',
classMargin = 'loleaflet-ruler-margin',
classDraggable = 'loleaflet-ruler-drag',
@@ -60,30 +77,26 @@ L.Control.Ruler = L.Control.extend({
rToolTip = 'loleaflet-ruler-rtooltip',
leftMarginStr = _('Left Margin'),
rightMarginStr = _('Right Margin'),
-   convertRatioDrag, lMargin, rMargin, wPixel, hPixel;
+   DraggableConvertRatio, lMargin, rMargin, wPixel, scale;
 
lMargin = this.options.nullOffset;
rMargin = this.options.pageWidth - (this.options.nullOffset + 
this.options.margin2);
+   scale = this._map.getZoomScale(this._map.getZoom(), 10);
+   wPixel = this._map._docLayer._docPixelSize.x - 
(this.options.extraSize + this.options.tileMargin * 2) * scale;
 
-   // Multiplication with this facor is temporary,
-   // I think, we need to find the margin in the left tiles
-   // and subtract here accordingly
-   wPixel = .958*this._map._docLayer._docPixelSize.x;
-   hPixel = this._map._docLayer._docPixelSize.y;
-
-   convertRatioDr

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/60c5955cb9f75a066cde0be3a3e39de83845279b/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

[Tor Lillqvist]

 comphelper/source/misc/profilezone.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5921306259625996f8647c1138d310b0cdbe3d7e
Author: Tor Lillqvist 
Date:   Mon Aug 28 12:04:05 2017 +0300

Log also the elapsed time of each zone, in milliseconds

Why not let the computer do it, instead of having to do it by eyeball?
It is not fun to look at numbers like 1503910660.06171 and
1503910665.5169 and try to see whether their difference is larger than
that of 1503910824.20391 and 1503910828.43125.

Change-Id: If20882e97959e65b8518b66c4ae965e1b3cc3b51

diff --git a/comphelper/source/misc/profilezone.cxx 
b/comphelper/source/misc/profilezone.cxx
index dacd098442a9..44a1be0f44a8 100644
--- a/comphelper/source/misc/profilezone.cxx
+++ b/comphelper/source/misc/profilezone.cxx
@@ -52,7 +52,8 @@ long long addRecording(const char * aProfileId, long long 
aCreateTime)
 g_aRecording.push_back(
 OUString::number(osl_getThreadIdentifier(nullptr)) + " " +
 OUString::number(aTime/100.0) + " " + aString + ": " +
-(aCreateTime == 0 ? OUString("start") : OUString("stop"))
+(aCreateTime == 0 ? OUString("start") : OUString("stop")) +
+(aCreateTime != 0 ? (" " + OUString::number((aTime - 
aCreateTime)/1000.0) + " ms") : OUString(""))
 );
 if (aCreateTime == 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 svtools/source/contnr/svimpbox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e298b48d5822acf626d2f664181efdc601b8cd4
Author: Stephan Bergmann 
Date:   Mon Aug 28 11:16:27 2017 +0200

Consistently use oslInterlockedCount for SvImpLBox::s_nImageRefCount

Change-Id: I40eb4a09a8b5461fca4ac01662cb88156d2ff37d

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 5e36b36f385d..0fde08e46f6b 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -45,7 +45,7 @@
 // #i27063# (pl), #i32300# (pb) never access VCL after DeInitVCL - also no 
destructors
 Image*  SvImpLBox::s_pDefCollapsed  = nullptr;
 Image*  SvImpLBox::s_pDefExpanded   = nullptr;
-sal_Int32 SvImpLBox::s_nImageRefCount   = 0;
+oslInterlockedCount SvImpLBox::s_nImageRefCount   = 0;
 
 SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits 
nWinStyle)
 : aHorSBar(VclPtr::Create(pLBView, WB_DRAG | WB_HSCROLL))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/headless/svpgdi.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9bd3482c933a611f428fce76a0d1a10dd0d4353a
Author: Caolán McNamara 
Date:   Mon Aug 28 08:53:11 2017 +0100

ofz#3092 Direct-leak

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

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 98af7f417062..ce01c4e89230 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1349,9 +1349,16 @@ cairo_user_data_key_t* SvpSalGraphics::getDamageKey()
 
 void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, 
const basegfx::B2DRange& rExtents) const
 {
+const bool bXoring = (m_ePaintMode == PaintMode::Xor && bXorModeAllowed);
+
 if (rExtents.isEmpty())
 {
 //nothing changed, return early
+if (bXoring)
+{
+cairo_surface_t* surface = cairo_get_target(cr);
+cairo_surface_destroy(surface);
+}
 cairo_destroy(cr);
 return;
 }
@@ -1371,7 +1378,7 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr, 
bool bXorModeAllowed, cons
 //For the most part we avoid the use of XOR these days, but there
 //are some edge cases where legacy stuff still supports it, so
 //emulate it (slowly) here.
-if (m_ePaintMode == PaintMode::Xor && bXorModeAllowed)
+if (bXoring)
 {
 cairo_surface_t* target_surface = m_pSurface;
 if (cairo_surface_get_type(target_surface) != CAIRO_SURFACE_TYPE_IMAGE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportdesign/source starmath/source stoc/source stoc/test svtools/source sw/inc sw/sdi sw/source

[Johnny_M]

 reportdesign/source/ui/report/StartMarker.cxx |2 -
 starmath/source/dialog.cxx|2 -
 stoc/source/javavm/javavm.cxx |2 -
 stoc/test/testiadapter.cxx|   14 ++--
 stoc/test/testintrosp.cxx |2 -
 stoc/test/testintrosp.idl |4 +--
 stoc/test/testregistry.cxx|   30 +-
 svtools/source/contnr/treelist.cxx|2 -
 svtools/source/control/ctrlbox.cxx|4 +--
 svtools/source/control/ruler.cxx  |4 +--
 svtools/source/dialogs/prnsetup.cxx   |2 -
 svtools/source/misc/unitconv.cxx  |2 -
 svtools/source/svhtml/htmlout.cxx |4 +--
 svtools/source/svhtml/parhtml.cxx |4 +--
 svtools/source/svrtf/rtfout.cxx   |2 -
 sw/inc/IDocumentLinksAdministration.hxx   |2 -
 sw/inc/IDocumentTimerAccess.hxx   |2 -
 sw/inc/cmdid.h|2 -
 sw/inc/doc.hxx|2 -
 sw/inc/htmltbl.hxx|2 -
 sw/inc/swtable.hxx|1 
 sw/inc/swtypes.hxx|2 -
 sw/sdi/_basesh.sdi|   10 
 sw/sdi/_frmsh.sdi |6 ++---
 sw/sdi/_textsh.sdi|2 -
 sw/sdi/wbasesh.sdi|3 --
 sw/source/core/crsr/crsrsh.cxx|2 -
 sw/source/core/crsr/crstrvl.cxx   |4 +--
 sw/source/core/crsr/pam.cxx   |2 -
 sw/source/core/doc/docredln.cxx   |2 -
 sw/source/core/docnode/nodes.cxx  |6 ++---
 sw/source/core/edit/editsh.cxx|2 -
 sw/source/core/fields/docufld.cxx |2 -
 sw/source/core/frmedt/fefly1.cxx  |2 -
 sw/source/core/frmedt/feshview.cxx|8 +++---
 sw/source/core/frmedt/tblsel.cxx  |2 -
 sw/source/core/inc/swblocks.hxx   |2 -
 sw/source/core/inc/tblrwcl.hxx|2 -
 sw/source/core/layout/pagechg.cxx |4 +--
 sw/source/core/layout/paintfrm.cxx|2 -
 sw/source/core/layout/tabfrm.cxx  |2 -
 sw/source/core/table/swtable.cxx  |2 -
 sw/source/core/text/itrtxt.cxx|2 -
 sw/source/core/text/portxt.cxx|2 -
 sw/source/core/text/txtdrop.cxx   |2 -
 sw/source/core/text/txtfly.cxx|2 -
 sw/source/core/txtnode/txtedt.cxx |2 -
 sw/source/core/unocore/unosect.cxx|2 -
 sw/source/core/unocore/unotext.cxx|2 -
 sw/source/core/view/viewsh.cxx|2 -
 sw/source/core/view/vprint.cxx|2 -
 sw/source/filter/basflt/fltshell.cxx  |2 -
 sw/source/filter/html/htmlcss1.cxx|2 -
 sw/source/filter/html/htmlctxt.cxx|2 -
 sw/source/filter/html/htmlgrin.cxx|4 +--
 sw/source/filter/html/htmlsect.cxx|2 -
 sw/source/filter/html/htmltab.cxx |2 -
 sw/source/filter/html/swhtml.cxx  |2 -
 sw/source/filter/ww8/wrtw8sty.cxx |6 ++---
 sw/source/filter/ww8/wrtww8.cxx   |4 +--
 sw/source/filter/ww8/ww8atr.cxx   |2 -
 sw/source/filter/ww8/ww8par.cxx   |2 -
 sw/source/filter/ww8/ww8par.hxx   |2 -
 sw/source/filter/ww8/ww8par3.cxx  |2 -
 sw/source/filter/ww8/ww8par5.cxx  |4 +--
 sw/source/filter/ww8/ww8par6.cxx  |2 -
 sw/source/filter/ww8/ww8scan.cxx  |6 ++---
 sw/source/filter/ww8/ww8struc.hxx |2 -
 sw/source/filter/xml/xmlimp.cxx   |2 -
 sw/source/filter/xml/xmltbli.cxx  |6 ++---
 sw/source/ui/frmdlg/column.cxx|2 -
 sw/source/uibase/config/viewopt.cxx   |4 +--
 sw/source/uibase/dochdl/swdtflvr.cxx  |2 -
 sw/source/uibase/docvw/edtwin2.cxx|2 -
 sw/source/uibase/frmdlg/colmgr.cxx|8 +++---
 sw/source/uibase/frmdlg/frmmgr.cxx|4 +--
 sw/source/uibase/ribbar/inputwin.cxx  |4 +--
 sw/source/uibase/uiview/scroll.cxx|2 -
 78 files changed, 130 insertions(+), 132 deletions(-)

New commits:
commit 06c07c0dc15348c23fe432e7f1c0243486d1e6bf
Author: Johnny_M 
Date:   Sat Aug 26 01:03:43 2017 +0200

Translate German comments/debug strings (leftovers in dirs starmath to 
sysui)

Translates leftovers found using a custom regex.

Additionally translated:
- One randomly found comment in /reportdesign
- Test strings in /stoc/test (let's see if it works)

Change-Id: I5f893c194c4b56b5365700928a3b8b63936d03e2
Reviewed-

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

[Caolán McNamara]

 vcl/headless/svpgdi.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 3210d265415bd61a318d619e5098028384c469da
Author: Caolán McNamara 
Date:   Mon Aug 28 08:53:11 2017 +0100

ofz#3092 Direct-leak

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

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 033389e53aeb..52326084126b 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1328,9 +1328,16 @@ cairo_user_data_key_t* SvpSalGraphics::getDamageKey()
 
 void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, 
const basegfx::B2DRange& rExtents) const
 {
+const bool bXoring = (m_ePaintMode == PaintMode::Xor && bXorModeAllowed);
+
 if (rExtents.isEmpty())
 {
 //nothing changed, return early
+if (bXoring)
+{
+cairo_surface_t* surface = cairo_get_target(cr);
+cairo_surface_destroy(surface);
+}
 cairo_destroy(cr);
 return;
 }
@@ -1350,7 +1357,7 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr, 
bool bXorModeAllowed, cons
 //For the most part we avoid the use of XOR these days, but there
 //are some edge cases where legacy stuff still supports it, so
 //emulate it (slowly) here.
-if (m_ePaintMode == PaintMode::Xor && bXorModeAllowed)
+if (bXoring)
 {
 cairo_surface_t* target_surface = m_pSurface;
 if (cairo_surface_get_type(target_surface) != CAIRO_SURFACE_TYPE_IMAGE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf#109097 - mdds accelerating random lookups

[Michael Meeks]

Hi there,

On 27/08/17 07:28, Noel Grandin wrote:
> One relatively simple thing that might be worth trying is simply moving
> the block_size member out of the block and into it's own std::vector.

Multi-type-vector has:

struct block
{
size_type m_size;
element_block_type* mp_data; ...
}

typedef std::vector blocks_type;

Which is interesting;

> That will make the search vastly more friendly to the cache and memory
> subsystem, and will probably give you between 4x and 10x speedup on
> large spreadsheets, depending on the CPU in use.

Not entirely convinced here - -but- I expect that dropping one
indirection eg.

typedef std::vector blocks_type;

rather than that extra indirection should significantly improve cache
locality for iteration.

Kohei - does having that extra indirection help with the implementation
of iterators ? I assume that transferring the mp_data pointer as well as
the size is much the same as transferring a block* ?

Also from a perf. perspective - if we have to shuffle, move chunks of
the pointer vector down, and we remove the pointer chasing / scattered
accesses there - I suspect we can get the re-numbering almost for free
at the same time for insert/delete.

Regards,

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin]

 sc/inc/scwarngs.hxx |   28 
 1 file changed, 28 deletions(-)

New commits:
commit d23f1c38465903742381060dd2793d3785092cac
Author: Noel Grandin 
Date:   Sun Aug 27 17:51:24 2017 +0200

remove unused header file

ever since

commit 678dbe8f8197815919d7179c2eba17679942fdaa
Date:   Thu Oct 13 09:50:03 2016 +0100
unused src file

Change-Id: I648f5b22d6d717404ec14f7775dfa0502295c2eb
Reviewed-on: https://gerrit.libreoffice.org/41616
Tested-by: Jenkins 
Reviewed-by: Jochen Nitschke 

diff --git a/sc/inc/scwarngs.hxx b/sc/inc/scwarngs.hxx
deleted file mode 100644
index e3dbfe16d351..
--- a/sc/inc/scwarngs.hxx
+++ /dev/null
@@ -1,28 +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_SC_INC_SCWARNGS_HXX
-#define INCLUDED_SC_INC_SCWARNGS_HXX
-
-#define ERRCODE_SC_EXPORT_WRN_ASCII   ErrCode(WarningFlag::Yes, 
ErrCodeArea::Sc, ErrCodeClass::Write, 1)
-#define ERRCODE_SC_IMPORT_WRN_RNGOVRFLW   ErrCode(WarningFlag::Yes, 
ErrCodeArea::Sc, ErrCodeClass::Read, 1)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 35c07f69a28c24a8561f86ff82387f11a85d368a
Author: Caolán McNamara 
Date:   Mon Aug 28 10:17:56 2017 +0100

ofz#3110 GeneratePLCF only generated word6 sized missing entries

BTE was 2 bytes in word 7- but 4 bytes in word 8+

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

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 0026ade52132..1d51c27a5623 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2162,7 +2162,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, 
sal_Int32 ncpN)
 
 if (!failure)
 {
-size_t nSiz = 6 * nIMax + 4;
+size_t nSiz = (4 + nStru) * nIMax + 4;
 size_t nElems = ( nSiz + 3 ) / 4;
 pPLCF_PosArray = new sal_Int32[ nElems ]; // Pointer to Pos-array
 
@@ -2217,7 +2217,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, 
sal_Int32 ncpN)
 for (sal_Int32 i = 0; i < ncpN; ++i) // construct PNs
 {
 ShortToSVBT16(static_cast(nPN + i), p);
-p+=2;
+p += nStru;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f0c2ca843bd63160ad958d6af135ca875ff2988
Author: Caolán McNamara 
Date:   Mon Aug 28 10:17:56 2017 +0100

ofz#3110 GeneratePLCF only generated word6 sized missing entries

BTE was 2 bytes in word 7- but 4 bytes in word 8+

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

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 897fccb5ea90..e80ed34d4d13 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2149,7 +2149,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, 
sal_Int32 ncpN)
 
 if (!failure)
 {
-size_t nSiz = 6 * nIMax + 4;
+size_t nSiz = (4 + nStru) * nIMax + 4;
 size_t nElems = ( nSiz + 3 ) / 4;
 pPLCF_PosArray.reset( new sal_Int32[ nElems ] ); // Pointer to 
Pos-array
 
@@ -2204,7 +2204,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, 
sal_Int32 ncpN)
 for (sal_Int32 i = 0; i < ncpN; ++i) // construct PNs
 {
 ShortToSVBT16(static_cast(nPN + i), p);
-p+=2;
+p += nStru;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Help Libreoffice build problems, with custom Linux distro

[Dimitrije Dinic]

Hello everyone,
since I am posting for the first time, I would like to say official
"Thanks" to all of you who employ enthusiasm to maintain this valuable
piece of software.

I am trying to build Libreoffice form sources, on a custom linux distro,
and ran into few problems, so I would try to extract only important
information:

   - building form tarball: libreoffice-5.3.2.2.tar.gz
   - Linux disto I am using is based on musl libc, and I applied alipne
   Linux pathches (libreoffice builds on alpine linux, just a note)
   - environment is set up by the way it is described on your wiki
   documentation about Linux builds, plus I set up some additional tweaks to
   be able to run build at all. These details perhaps are so not important in
   this initial message.

Builds goes pretty far (around 45 mins on my i7 laptop), and at one point i
get linker errors, which I will post only a portion:

[DEP] LNK:Library/liblocaledata_es.so
[LNK] Library/liblocaledata_es.so
[DEP] LNK:Library/liblocaledata_euro.so
[LNK] Library/liblocaledata_euro.so
[DEP] LNK:Library/liblocaledata_others.so
[LNK] Library/liblocaledata_others.so
/mnt/userfs/home/builddir/libreoffice-5.3.2.2/workdir/GenCxxObject/CustomTarget/i18npool/localedata/localedata_es_AR.o:
In function `getCollatorImplementation_es_AR':
localedata_es_AR.cxx:(.text+0xa0): undefined reference to
`getCollatorImplementation_en_US'
/mnt/userfs/home/builddir/libreoffice-5.3.2.2/workdir/GenCxxObject/CustomTarget/i18npool/localedata/localedata_es_AR.o:
In function `getCollationOptions_es_AR':
localedata_es_AR.cxx:(.text+0xba): undefined reference to
`getCollationOptions_en_US'
/mnt/userfs/home/builddir/libreoffice-5.3.2.2/workdir/GenCxxObject/CustomTarget/i18npool/localedata/localedata_es_AR.o:
In function `getSearchOptions_es_AR':
localedata_es_AR.cxx:(.text+0xd4): undefined reference to
`getSearchOptions_en_US'
I noticed that it has to do with: i18npool/source/localedata/
genstaticheader.pl, but my question is "Am I missing something obvious,
like a configure switch that I shall apply", or "Do you have any idea what
may cause this error"

Thanks in advance
Dimitrije Dinic
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: tdf#109097 - mdds accelerating random lookups

[Kohei Yoshida]

> On August 28, 2017 at 7:26 AM Michael Meeks  
> wrote:

>   Not entirely convinced here - -but- I expect that dropping one
> indirection eg.
> 
>   typedef std::vector blocks_type;
> 
>   rather than that extra indirection should significantly improve cache
> locality for iteration.

Funny you should mention that, because I was thinking of exactly the same thing 
after I posted my reply earlier.

>   Kohei - does having that extra indirection help with the implementation
> of iterators ?

No, not really.  I believe I initially did that to make the block movement 
operation as cheap as just moving the pointer value.  I was especially thinking 
of moving blocks from one container to another.  But since that struct is so 
small, making it a non-pointer and storing their states directly in std::vector 
will (as you say) improve the locality of whatever is stored therein without 
sacrificing the block swapping operations, and it should in theory give us 
better runtime performance in all the other operations.

> I assume that transferring the mp_data pointer as well as
> the size is much the same as transferring a block* ?

Yup.  You and I are in agreement here.  But if I can propose one thing, let's 
do that change separately (or maybe do that first before the other change) just 
to make things easier to track.

Kohei

--
Kohei Yoshida, LibreOffice Calc hacker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerperfect/Module_writerperfect.mk

[David Tardon]

 writerperfect/Module_writerperfect.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f33cf53c289daf51c2de429fde16f91b7df42031
Author: David Tardon 
Date:   Mon Aug 28 14:48:15 2017 +0200

disable EPUB export test with system libepubgen

... because it tests mainly stuff that is not in any released version
yet.

Change-Id: I39503061e6d5b5116a83a5e299fb2de77a5e7e33

diff --git a/writerperfect/Module_writerperfect.mk 
b/writerperfect/Module_writerperfect.mk
index 859f0cbe2507..015c3fdda44b 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_check_targets,writerperfect,\
 $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
CppunitTest_writerperfect_calc \
CppunitTest_writerperfect_draw \
-   CppunitTest_writerperfect_epubexport \
+   $(if $(SYSTEM_EPUBGEN),,CppunitTest_writerperfect_epubexport) \
CppunitTest_writerperfect_import \
CppunitTest_writerperfect_impress \
CppunitTest_writerperfect_writer \
___
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' - filter/source

[Caolán McNamara]

 filter/source/graphicfilter/icgm/class4.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2f252e0cc62b7cf9d35ba1a427a3c0b4606cd0d1
Author: Caolán McNamara 
Date:   Mon Aug 28 10:53:42 2017 +0100

ofz#3121 check bounds better

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

diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index 617f88aa7307..dc92f79cf560 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -186,7 +186,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16();
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[mnParaSize + nSize] = 0;
@@ -224,7 +224,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16();
 sal_uInt32 nSize = ImplGetUI(1);
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
@@ -242,7 +242,7 @@ void CGM::ImplDoClass4()
 (void)ImplGetUI16(); // nType
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/icgm/class4.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b72dee386ac15a7fd6098503772e606c5f059a20
Author: Caolán McNamara 
Date:   Mon Aug 28 10:53:42 2017 +0100

ofz#3121 check bounds better

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

diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index ff574c4eece4..e97781d314e7 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -186,7 +186,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[mnParaSize + nSize] = 0;
@@ -224,7 +224,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16(4);
 sal_uInt32 nSize = ImplGetUI(1);
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
@@ -242,7 +242,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 3 commits - filter/source sw/qa sw/source xmloff/source

[Caolán McNamara]

 filter/source/graphicfilter/icgm/class4.cxx   |6 +++---
 sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt |binary
 sw/source/filter/ww8/ww8scan.cxx  |4 ++--
 xmloff/source/style/xmlnumfi.cxx  |5 +
 4 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 7d524cf4f4a656b46973fe5f248444c631dbf7cf
Author: Caolán McNamara 
Date:   Mon Aug 28 10:53:42 2017 +0100

ofz#3121 check bounds better

Change-Id: Ib1eacda7e4cdf1d0238532f4e38059a9c30556ac
Reviewed-on: https://gerrit.libreoffice.org/41628
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit b72dee386ac15a7fd6098503772e606c5f059a20)

diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index ff574c4eece4..e97781d314e7 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -186,7 +186,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[mnParaSize + nSize] = 0;
@@ -224,7 +224,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16(4);
 sal_uInt32 nSize = ImplGetUI(1);
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
@@ -242,7 +242,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
commit 5377233d145df2e158c44090032ea19b02566827
Author: Caolán McNamara 
Date:   Mon Aug 28 10:17:56 2017 +0100

ofz#3110 GeneratePLCF only generated word6 sized missing entries

BTE was 2 bytes in word 7- but 4 bytes in word 8+

Change-Id: I24007d26fccc5edc104320bd2eb8f9c62399c988
Reviewed-on: https://gerrit.libreoffice.org/41625
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 35c07f69a28c24a8561f86ff82387f11a85d368a)

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 0026ade52132..1d51c27a5623 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2162,7 +2162,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, 
sal_Int32 ncpN)
 
 if (!failure)
 {
-size_t nSiz = 6 * nIMax + 4;
+size_t nSiz = (4 + nStru) * nIMax + 4;
 size_t nElems = ( nSiz + 3 ) / 4;
 pPLCF_PosArray = new sal_Int32[ nElems ]; // Pointer to Pos-array
 
@@ -2217,7 +2217,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, 
sal_Int32 ncpN)
 for (sal_Int32 i = 0; i < ncpN; ++i) // construct PNs
 {
 ShortToSVBT16(static_cast(nPN + i), p);
-p+=2;
+p += nStru;
 }
 }
 
commit 2c410a04c15c21eb025ae5df0f70f63df9757cca
Author: Michael Stahl 
Date:   Thu Aug 24 13:56:35 2017 +0200

tdf#111934 xmloff: ODF import: self-referential conditional style crash

It's invalid input and also causes stack overflow.

(cherry picked from commit 9fe857b7bd126ff4856fc4689d375881653b97a2)

tdf#111934: add document for filters-tests
Thanks to infostu...@gmail.com for the document; unfortunately git
tells me that i can't set the commit author to just an email address.
(cherry picked from commit 6e090b4272b8fa12d2032ff0c0ea4bfb24c0d2d2)

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

diff --git a/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt 
b/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt
new file mode 100644
index ..7d823df75213
Binary files /dev/null and 
b/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt differ
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/sourc

[Libreoffice-commits] core.git: jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |3 ++-
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |7 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 52ffad9bb7be800790de6d918154dbeade88cadd
Author: Stephan Bergmann 
Date:   Mon Aug 28 15:35:43 2017 +0200

tdf#100501: Adapt to Java 9 (at least on Linux x86-64)

Checking with both jdk-9+181_linux-x64_bin.tar.gz and
jre-9+181_linux-x64_bin.tar.gz as currently available at
 "JDK 9 Early-Access Builds":

For one, make SunVersion::init understand 
"JEP 223: New Version-String Scheme" at least insofar as to accept strings 
like
"9" with less than three dot-separated segments (where the missing segments 
are
treated like "0").

For another, at least for Linux x86-64, libjvm.so is now apparently located 
in a
path without an "amd64" architecture segment, "lib/server/libjvm.so".  (But
could that also be "client"?)  Other platforms may need further adjustments.

Change-Id: Idcebc833472c81a1dc74dcdd481b0a37274a8713

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 7f7c4943c8be..7543f497eb83 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -68,7 +68,8 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
 "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
-"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
+"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
+"/lib/server/libjvm.so"
 #endif
 };
 *size = SAL_N_ELEMENTS(ar);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 9646ba3a6f87..23c5983dcbc4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -88,7 +88,7 @@ bool SunVersion::init(const char *szVersion)
 ! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with 
digit
 && (
 //separators after maintenance (1.4.1_01, 1.4.1-beta, or 1.4.1)
-((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 
))
+(pCur == pEnd || *pCur == '_' || *pCur == '-')
 ||
 //separators between major-minor and minor-maintenance
 (nPart < 2 && *pCur == '.') )
@@ -97,6 +97,8 @@ bool SunVersion::init(const char *szVersion)
 pCur + 1 != pEnd
 || rtl::isAsciiDigit(static_cast(*pCur))) )
 {
+bool afterMaint = pCur != pEnd && (*pCur == '_' || *pCur == '-');
+
 int len = pCur - pLast;
 if (len >= 127)
 return false;
@@ -107,6 +109,9 @@ bool SunVersion::init(const char *szVersion)
 pLast = pCur;
 
 m_arVersionParts[nPart] = atoi(buf);
+
+if (afterMaint)
+nPart = 2;
 nPart ++;
 nPartPos = 0;
 if (nPart == 3)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 bridges/inc/bridge.hxx  |8 ++--
 bridges/inc/cppinterfaceproxy.hxx   |8 ++--
 bridges/inc/unointerfaceproxy.hxx   |8 ++--
 bridges/source/cpp_uno/shared/bridge.cxx|5 ++---
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx |5 ++---
 bridges/source/cpp_uno/shared/unointerfaceproxy.cxx |7 ++-
 bridges/source/jni_uno/jni_bridge.cxx   |4 ++--
 bridges/source/jni_uno/jni_bridge.h |8 ++--
 bridges/source/jni_uno/jni_uno2java.cxx |8 +---
 9 files changed, 37 insertions(+), 24 deletions(-)

New commits:
commit 4ecc6555878027f1cc0f853e1aa023f12167f96f
Author: Stephan Bergmann 
Date:   Mon Aug 28 15:47:32 2017 +0200

Replace use of oslInterlockedCount with std::atomic in bridges

Change-Id: Iad47a01fd283345a2461eaaea50633bf840e5201

diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx
index 5e3b146217b0..a01bb42bc163 100644
--- a/bridges/inc/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX
 #define INCLUDED_BRIDGES_INC_BRIDGE_HXX
 
-#include "osl/interlck.h"
+#include 
+
+#include 
+#include 
+
 #include "sal/types.h"
 #include "typelib/typedescription.h"
 #include "uno/environment.h"
@@ -90,7 +94,7 @@ private:
 Bridge * pBridge;
 };
 
-oslInterlockedCount nRef;
+std::atomic nRef;
 
 uno_ExtEnvironment * pCppEnv;
 uno_ExtEnvironment * pUnoEnv;
diff --git a/bridges/inc/cppinterfaceproxy.hxx 
b/bridges/inc/cppinterfaceproxy.hxx
index ccd83660059a..00972829a53c 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
 #define INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
 
-#include "osl/interlck.h"
+#include 
+
+#include 
+#include 
+
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -84,7 +88,7 @@ private:
 static com::sun::star::uno::XInterface * castProxyToInterface(
 CppInterfaceProxy * pProxy);
 
-oslInterlockedCount nRef;
+std::atomic nRef;
 Bridge * pBridge;
 
 // mapping information
diff --git a/bridges/inc/unointerfaceproxy.hxx 
b/bridges/inc/unointerfaceproxy.hxx
index c9697d3491a8..c76b62dd28b0 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
 #define INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
 
-#include "osl/interlck.h"
+#include 
+
+#include 
+#include 
+
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -83,7 +87,7 @@ private:
 
 ~UnoInterfaceProxy();
 
-oslInterlockedCount nRef;
+std::atomic nRef;
 Bridge * pBridge;
 
 // mapping information
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx 
b/bridges/source/cpp_uno/shared/bridge.cxx
index f752c626d253..805e56968482 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -24,7 +24,6 @@
 #include "unointerfaceproxy.hxx"
 
 #include "com/sun/star/uno/XInterface.hpp"
-#include "osl/interlck.h"
 #include "rtl/ustring.h"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -151,7 +150,7 @@ uno_Mapping * Bridge::createMapping(
 
 void Bridge::acquire()
 {
-if (osl_atomic_increment( &nRef ) == 1)
+if (++nRef == 1)
 {
 if (bExportCpp2Uno)
 {
@@ -172,7 +171,7 @@ void Bridge::acquire()
 
 void Bridge::release()
 {
-if (! osl_atomic_decrement( &nRef ))
+if (! --nRef )
 {
 ::uno_revokeMapping( bExportCpp2Uno ? &aCpp2Uno : &aUno2Cpp );
 }
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx 
b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 3fe7d98ea452..4a87eb389146 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -26,7 +26,6 @@
 
 #include "com/sun/star/uno/XInterface.hpp"
 #include "osl/getglobalmutex.hxx"
-#include "osl/interlck.h"
 #include "osl/mutex.hxx"
 #include "rtl/instance.hxx"
 #include "typelib/typedescription.h"
@@ -120,7 +119,7 @@ com::sun::star::uno::XInterface * CppInterfaceProxy::create(
 
 void CppInterfaceProxy::acquireProxy()
 {
-if (osl_atomic_increment( &nRef ) == 1)
+if (++nRef == 1)
 {
 // rebirth of proxy zombie
 // register at cpp env
@@ -134,7 +133,7 @@ void CppInterfaceProxy::acquireProxy()
 
 void CppInterfaceProxy::releaseProxy()
 {
-if (! osl_atomic_decrement( &nRef )) // last release
+if (! --nRef ) // last release
 {
 // revoke from cpp env
 (*pBridge->getCppEnv()->revokeInterface)(
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx 
b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 698624ea49b0..b2c608403f34 100644
--- a/bridges/source/c

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

[Stephan Bergmann]

 dbaccess/source/core/api/FilteredContainer.cxx |2 +-
 dbaccess/source/core/api/RowSet.hxx|7 ++-
 dbaccess/source/core/api/tablecontainer.cxx|2 +-
 dbaccess/source/core/api/viewcontainer.cxx |2 +-
 dbaccess/source/core/dataaccess/connection.hxx |4 +++-
 dbaccess/source/core/inc/FilteredContainer.hxx |   17 +++--
 dbaccess/source/core/inc/tablecontainer.hxx|7 ++-
 dbaccess/source/core/inc/viewcontainer.hxx |7 ++-
 8 files changed, 35 insertions(+), 13 deletions(-)

New commits:
commit 32e07ada197fb135ae78ee2b7c0c598a356bfabe
Author: Stephan Bergmann 
Date:   Mon Aug 28 15:49:36 2017 +0200

Replace use of oslInterlockedCount with std::atomic, ORowSet::m_nInAppend

Change-Id: I9040034d358e1f32ab052b70185a77da82f29ee4

diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index 43038b7274a7..49a36fdf12e3 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -240,7 +240,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, std::vector<
  const Reference< XConnection >& _xCon,
  bool _bCase,
  IRefreshListener*  _pRefreshListener,
- oslInterlockedCount& _nInAppend)
+ std::atomic& _nInAppend)
 :OCollection(_rParent,_bCase,_rMutex,std::vector< OUString>())
 ,m_bConstructed(false)
 ,m_pRefreshListener(_pRefreshListener)
diff --git a/dbaccess/source/core/api/RowSet.hxx 
b/dbaccess/source/core/api/RowSet.hxx
index b4dc3e067837..ad3024d661df 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -20,6 +20,11 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSET_HXX
 #define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSET_HXX
 
+#include 
+
+#include 
+#include 
+
 #include "apitools.hxx"
 #include "RowSetBase.hxx"
 
@@ -124,7 +129,7 @@ namespace dbaccess
 sal_Int32   m_nTransactionIsolation;
 sal_Int32   m_nPrivileges;
 sal_Int32   m_nLastKnownRowCount;
-oslInterlockedCount m_nInAppend;
+std::atomicm_nInAppend;
 boolm_bInsertingRow;
 boolm_bLastKnownRowCountFinal;
 boolm_bUseEscapeProcessing ;
diff --git a/dbaccess/source/core/api/tablecontainer.cxx 
b/dbaccess/source/core/api/tablecontainer.cxx
index cd03ff639e2a..c900a5e4ec0e 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -101,7 +101,7 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& 
_rParent,
  bool _bCase,
  const Reference< XNameContainer >& 
_xTableDefinitions,
  IRefreshListener*  _pRefreshListener,
- oslInterlockedCount& _nInAppend)
+ std::atomic& _nInAppend)
 
:OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_nInAppend)
 ,m_xTableDefinitions(_xTableDefinitions)
 ,m_pTableMediator( nullptr )
diff --git a/dbaccess/source/core/api/viewcontainer.cxx 
b/dbaccess/source/core/api/viewcontainer.cxx
index 111089ebac9a..ca2e9aac69cc 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -62,7 +62,7 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
  ,const Reference< XConnection >& _xCon
  ,bool _bCase
  ,IRefreshListener* _pRefreshListener
- ,oslInterlockedCount& _nInAppend)
+ ,std::atomic& _nInAppend)
 
:OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_nInAppend)
 ,m_bInElementRemoved(false)
 {
diff --git a/dbaccess/source/core/dataaccess/connection.hxx 
b/dbaccess/source/core/dataaccess/connection.hxx
index a1c3eb0acfac..449fb54d7252 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -21,6 +21,8 @@
 
 #include 
 
+#include 
+#include 
 #include 
 
 #include "apitools.hxx"
@@ -98,7 +100,7 @@ protected:
 OTableContainer*m_pTables;
 OViewContainer* m_pViews;
 ::dbtools::WarningsContainerm_aWarnings;
-oslInterlockedCount m_nInAppend;
+std::atomicm_nInAppend;
 boolm_bSupportsViews;   // true when the 
getTableTypes return "VIEW" as type
 boolm_bSupportsUsers;
 boolm_bSupportsGroups;
diff --git a/dba

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 0d6550f0fee06732d663b9763e18231dad4e42c5
Author: Caolán McNamara 
Date:   Mon Aug 28 12:13:41 2017 +0100

ofz#3154 check bounds of special sprm

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

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index e80ed34d4d13..ce322e6c0571 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7953,8 +7953,17 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, 
const sal_uInt8* pSprm,
 }
 break;
 case 0xD608:
-nL = SVBT16ToShort( &pSprm[1 + mnDelta] );
+{
+sal_uInt8 nIndex = 1 + mnDelta;
+if (nIndex + 1 >= nRemLen)
+{
+SAL_WARN("sw.ww8", "sprm longer than remaining bytes, doc or 
parser is wrong");
+nL = 0;
+}
+else
+nL = SVBT16ToShort(&pSprm[nIndex]);
 break;
+}
 default:
 switch (aSprm.nVari)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 hwpfilter/qa/cppunit/data/fail/header-in-header.hwp |binary
 hwpfilter/source/hpara.cxx  |   15 ---
 hwpfilter/source/hwpfile.h  |   10 ++
 3 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 474178acd10a87727ff63f9f5c0bc73d71520af7
Author: Caolán McNamara 
Date:   Mon Aug 28 13:04:03 2017 +0100

ofz#3174 disallow header in header

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

diff --git a/hwpfilter/qa/cppunit/data/fail/header-in-header.hwp 
b/hwpfilter/qa/cppunit/data/fail/header-in-header.hwp
new file mode 100644
index ..ef9d8da72e50
Binary files /dev/null and 
b/hwpfilter/qa/cppunit/data/fail/header-in-header.hwp differ
diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx
index 6b43c3bbf827..7739b9cd0a85 100644
--- a/hwpfilter/source/hpara.cxx
+++ b/hwpfilter/source/hpara.cxx
@@ -229,7 +229,8 @@ std::unique_ptr HWPPara::readHBox(HWPFile & hwpf)
 hbox.reset(new Hidden);
 break;
 case CH_HEADER_FOOTER:// 16
-hbox.reset(new HeaderFooter);
+if (!hwpf.already_importing_type(CH_HEADER_FOOTER))
+hbox.reset(new HeaderFooter);
 break;
 case CH_FOOTNOTE: // 17
 hbox.reset(new Footnote);
@@ -274,11 +275,19 @@ std::unique_ptr HWPPara::readHBox(HWPFile & hwpf)
 break;
 }
 }
-if (!hbox || !hbox->Read(hwpf))
+
+if (!hbox)
+return nullptr;
+
+hwpf.push_hpara_type(scflag);
+bool bRead = hbox->Read(hwpf);
+hwpf.pop_hpara_type();
+if (!bRead)
 {
 hbox.reset();
-return hbox;
+return nullptr;
 }
+
 if( hh == CH_TEXT_BOX || hh == CH_PICTURE || hh == CH_LINE )
 {
 FBox *fbox = static_cast(hbox.get());
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 75f17d19a448..9b002e8abbee 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -25,6 +25,7 @@
 #ifndef INCLUDED_HWPFILTER_SOURCE_HWPFILE_H
 #define INCLUDED_HWPFILTER_SOURCE_HWPFILE_H
 
+#include 
 #include 
 #include 
 #include 
@@ -252,6 +253,13 @@ class DLLEXPORT HWPFile
   int getMaxSettedPage(){ return m_nMaxSettedPage; }
   void setMaxSettedPage(){ m_nMaxSettedPage = m_nCurrentPage; }
 
+void push_hpara_type(unsigned char scflag) { 
element_import_stack.push_back(scflag); }
+bool already_importing_type(unsigned char scflag) const
+{
+return std::find(element_import_stack.begin(), 
element_import_stack.end(), scflag) != element_import_stack.end();
+}
+void pop_hpara_type() { element_import_stack.pop_back(); }
+
 private:
 int compareCharShape(CharShape const *shape);
 int compareParaShape(ParaShape const *shape);
@@ -290,6 +298,8 @@ class DLLEXPORT HWPFile
 std::vector headerfooters;
 std::vector pagenumbers;
 std::vector tables;
+//track the stack of HParas types we're currently importing
+std::vector element_import_stack;
 
 // for global document handling
 static HWPFile *cur_doc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 hwpfilter/source/hwpread.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit efa8e32389ddd1db4e7b5b88856436fdc7061733
Author: Caolán McNamara 
Date:   Mon Aug 28 12:28:22 2017 +0100

ofz#3160 Direct-leak

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

diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 8b0c877c1f98..826272f8eb74 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -21,6 +21,7 @@
 
 #include 
 
+#include 
 #include 
 
 #include "hwpfile.h"
@@ -459,12 +460,14 @@ bool Picture::Read(HWPFile & hwpf)
 
 if (pictype == PICTYPE_DRAW)
 {
-hmem = new HMemIODev(reinterpret_cast(follow.data()), 
follow_block_size);
+HMemIODev* pOldMem = hmem;
+HMemIODev* pNewMem = new HMemIODev(reinterpret_cast(follow.data()), follow_block_size);
+hmem = pNewMem;
 LoadDrawingObjectBlock(this);
 style.cell = picinfo.picdraw.hdo;
-delete hmem;
-
-hmem = nullptr;
+assert(hmem == pNewMem);
+delete pNewMem;
+hmem = pOldMem;
 }
 else if (follow_block_size >= 4)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Caolán McNamara]

On Mon, 2017-08-28 at 09:07 +, Crashtest VM wrote:
> New crashtest update available at http://dev-builds.libreoffice.org/c
> rashtest/60c5955cb9f75a066cde0be3a3e39de83845279b/

at least some of these new ones, e.g. loading of ooo71406-2.odt, are
asserting from...

commit bc9a2ba677ce3fcd46c2bbef6e8faeacb14292c1
Date:   Thu Aug 10 10:39:59 2017 +0200

assert on duplicate listener in SfxListener
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Crash test update

[Michael Stahl]

On 28.08.2017 17:28, Caolán McNamara wrote:
> On Mon, 2017-08-28 at 09:07 +, Crashtest VM wrote:
>> New crashtest update available at http://dev-builds.libreoffice.org/c
>> rashtest/60c5955cb9f75a066cde0be3a3e39de83845279b/
> 
> at least some of these new ones, e.g. loading of ooo71406-2.odt, are
> asserting from...
> 
> commit bc9a2ba677ce3fcd46c2bbef6e8faeacb14292c1
> Date:   Thu Aug 10 10:39:59 2017 +0200
> 
> assert on duplicate listener in SfxListener

just fixed one of these with commit
90b42251633db498505bc8906aefe5d08edbb5c6, which was a SdrEdgeObj, hope
the other ones are the same thing.

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

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

[Michael Stahl]

 svx/source/svdraw/svdobj.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 90b42251633db498505bc8906aefe5d08edbb5c6
Author: Michael Stahl 
Date:   Mon Aug 28 17:09:06 2017 +0200

svx: fix assert in SdrEdgeObj::ConnectToNode()

When loading ooo68143-1.sxw we get an assert:

Assertion `!(bListeningAlready && !bPreventDuplicates) && "duplicate
listener, try building with DBG_UTIL to find the other insert site."'

The connector is connected to the same SdrObject on both ends:



Change-Id: Ia0dd140b7c2ca948ace3fbf93d8c4abd4331399d

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 947f70a29f4e..e1257be84517 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -585,7 +585,11 @@ void SdrObject::AddListener(SfxListener& rListener)
 {
 ImpForcePlusData();
 if (pPlusData->pBroadcast==nullptr) pPlusData->pBroadcast=new 
SfxBroadcaster;
-rListener.StartListening(*pPlusData->pBroadcast);
+
+// SdrEdgeObj may be connected to same SdrObject on both ends so allow it
+// to listen twice
+SdrEdgeObj const*const pEdge(dynamic_cast(&rListener));
+rListener.StartListening(*pPlusData->pBroadcast, pEdge != nullptr);
 }
 
 void SdrObject::RemoveListener(SfxListener& rListener)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/inc/ftnfrm.hxx|   38 +++---
 sw/source/core/layout/ftnfrm.cxx |   28 ++--
 2 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 4b8214414b8713e8a969655494a244d117cb14af
Author: Miklos Vajna 
Date:   Mon Aug 28 08:05:54 2017 +0200

sw: prefix members of SwFootnoteFrame

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

diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 15d8c78ea432..3d3fbb38171b 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -55,13 +55,13 @@ class SwFootnoteFrame: public SwLayoutFrame
 //  - 0 no following existent
 //  - this  for the last one
 //  - otherwise the following FootnoteFrame
-SwFootnoteFrame *pFollow;
-SwFootnoteFrame *pMaster;  // FootnoteFrame from which I am the 
following
-SwContentFrame   *pRef; // in this ContentFrame is the footnote 
reference
-SwTextFootnote *pAttr;// footnote attribute (for recognition)
+SwFootnoteFrame *mpFollow;
+SwFootnoteFrame *mpMaster;  // FootnoteFrame from which I am the 
following
+SwContentFrame   *mpReference; // in this ContentFrame is the 
footnote reference
+SwTextFootnote *mpAttribute;// footnote attribute (for 
recognition)
 
 // if true paragraphs in this footnote are NOT permitted to flow backwards
-bool bBackMoveLocked : 1;
+bool mbBackMoveLocked : 1;
 // #i49383# - control unlock of position of lower anchored objects.
 bool mbUnlockPosOfLowerObjs : 1;
 
@@ -79,30 +79,30 @@ public:
 const SwContentFrame *GetRef() const;
  SwContentFrame  *GetRef();
 #else
-const SwContentFrame *GetRef() const{ return pRef; }
- SwContentFrame  *GetRef()  { return pRef; }
+const SwContentFrame *GetRef() const{ return mpReference; }
+ SwContentFrame  *GetRef()  { return mpReference; }
 #endif
 const SwContentFrame *GetRefFromAttr()  const;
   SwContentFrame *GetRefFromAttr();
 
-const SwFootnoteFrame *GetFollow() const   { return pFollow; }
-  SwFootnoteFrame *GetFollow() { return pFollow; }
+const SwFootnoteFrame *GetFollow() const   { return mpFollow; }
+  SwFootnoteFrame *GetFollow() { return mpFollow; }
 
-const SwFootnoteFrame *GetMaster() const   { return pMaster; }
-  SwFootnoteFrame *GetMaster() { return pMaster; }
+const SwFootnoteFrame *GetMaster() const   { return mpMaster; }
+  SwFootnoteFrame *GetMaster() { return mpMaster; }
 
-const SwTextFootnote   *GetAttr() const   { return pAttr; }
-  SwTextFootnote   *GetAttr() { return pAttr; }
+const SwTextFootnote   *GetAttr() const   { return mpAttribute; }
+  SwTextFootnote   *GetAttr() { return mpAttribute; }
 
-void SetFollow( SwFootnoteFrame *pNew ) { pFollow = pNew; }
-void SetMaster( SwFootnoteFrame *pNew ) { pMaster = pNew; }
-void SetRef   ( SwContentFrame *pNew ) { pRef = pNew; }
+void SetFollow( SwFootnoteFrame *pNew ) { mpFollow = pNew; }
+void SetMaster( SwFootnoteFrame *pNew ) { mpMaster = pNew; }
+void SetRef   ( SwContentFrame *pNew ) { mpReference = pNew; }
 
 void InvalidateNxtFootnoteCnts( SwPageFrame const * pPage );
 
-void LockBackMove() { bBackMoveLocked = true; }
-void UnlockBackMove()   { bBackMoveLocked = false;}
-bool IsBackMoveLocked() { return bBackMoveLocked; }
+void LockBackMove() { mbBackMoveLocked = true; }
+void UnlockBackMove()   { mbBackMoveLocked = false;}
+bool IsBackMoveLocked() { return mbBackMoveLocked; }
 
 // prevents that the last content deletes the SwFootnoteFrame as well 
(Cut())
 void ColLock()   { mbColLocked = true; }
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 79750ef898bf..ab84d11e1a34 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -418,11 +418,11 @@ SwTwips SwFootnoteContFrame::ShrinkFrame( SwTwips nDiff, 
bool bTst, bool bInfo )
 
 SwFootnoteFrame::SwFootnoteFrame( SwFrameFormat *pFormat, SwFrame* pSib, 
SwContentFrame *pCnt, SwTextFootnote *pAt ):
 SwLayoutFrame( pFormat, pSib ),
-pFollow( nullptr ),
-pMaster( nullptr ),
-pRef( pCnt ),
-pAttr( pAt ),
-bBackMoveLocked( false ),
+mpFollow( nullptr ),
+mpMaster( nullptr ),
+mpReference( pCnt ),
+mpAttribute( pAt ),
+mbBackMoveLocked( false ),
 // #i49383#
 mbUnlockPosOfLowerObjs( true )
 {
@@ -2758,19 +2758,19 @@ SwSaveFootnoteHeight::~SwSaveFootnoteHeight()
 const SwContentFrame* SwFootnoteFrame::GetRef() const
 {
 const SwContentFrame* pRefAttr = GetRefFromAttr();
-SAL_WARN_IF( pRef !

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape.docx  |binary
 sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape2.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   16 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |5 +++
 writerfilter/source/dmapper/DomainMapper.hxx  |1 
 writerfilter/source/dmapper/GraphicImport.cxx |   16 +-
 6 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit d21f67fa7fd0360688e083eeb2bbcd57f5414d71
Author: Justin Luth 
Date:   Wed Aug 23 19:02:12 2017 -0400

tdf#111895 writerfilter: avoid hiding shapes behind background

In MSO, page background is "in hell" zOrder, however
in LO, page background is at the same zOrder as the text,
so avoid hiding shapes behind the page background unless
doing so would hide text.

When importing gradients/pattern/hatch backgrounds are supported,
HasPageBackground will need to be expanded to include those as well.

Change-Id: I4496fd3f4c644ac9ac1854090658017078ce3e88
Reviewed-on: https://gerrit.libreoffice.org/41486
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape.docx 
b/sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape.docx
new file mode 100644
index ..b282059b1097
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape2.docx 
b/sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape2.docx
new file mode 100644
index ..ae2e3c7573db
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf111895_foregroundShape2.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index a8abe8489c57..3867f468649b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -229,6 +229,22 @@ DECLARE_OOXMLEXPORT_TEST(testTdf98700_keepWithNext, 
"tdf98700_keepWithNext.odt")
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Text Body style toggled off keep with next", 
false, getProperty(getParagraph(5), "ParaKeepTogether"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf111895_foregroundShape, 
"tdf111895_foregroundShape.docx")
+{
+uno::Reference 
xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Light yellow background", 
sal_Int32(0x66), getProperty(xPageStyle, "BackColor"));
+// despite a behindDoc==1, put shape in foreground since the page 
background would have hidden it otherwise.
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Shape is in front of page background", true, 
getProperty(getShape(1), "Opaque"));
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf111895_foregroundShape2, 
"tdf111895_foregroundShape2.docx")
+{
+uno::Reference 
xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Light yellow background", 
sal_Int32(0x66), getProperty(xPageStyle, "BackColor"));
+// despite a page background, don't show behindDoc==1 shape in front since 
it would have hidden wrap_THROUGH text.
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Shape is in front of page background", 
false, getProperty(getShape(1), "Opaque"));
+}
+
 // base class to supply a helper method for testHFLinkToPrev
 class testHFBase : public Test
 {
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 05a3e0ed16bf..5b52d1c5348f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3775,6 +3775,11 @@ bool DomainMapper::IsStyleSheetImport() const
 return m_pImpl->IsStyleSheetImport();
 }
 
+bool DomainMapper::HasPageBackground() const
+{
+return (bool)m_pImpl->m_oBackgroundColor;
+}
+
 void DomainMapper::enableInteropGrabBag(const OUString& aName)
 {
 m_pImpl->m_aInteropGrabBagName = aName;
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx 
b/writerfilter/source/dmapper/DomainMapper.hxx
index b2b89f1776c1..35a18b445c13 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -110,6 +110,7 @@ public:
 bool IsInHeaderFooter() const;
 bool IsInTable() const;
 bool IsStyleSheetImport() const;
+bool HasPageBackground() const;
 /**
  @see DomainMapper_Impl::processDeferredCharacterProperties()
 */
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 65a20747c38f..68d7ac4a1738 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -197,6 +197,7 @@ public:
 text::WrapTextMode nWrap;
 bool  bLayoutInCell;
 bool  bOpaque;
+bool  bBehindDoc;

[Libreoffice-commits] core.git: jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cda4cea7cdfc9a8de814b901b3b957f029d36aaf
Author: Stephan Bergmann 
Date:   Mon Aug 28 18:18:12 2017 +0200

tdf#100501: Fix thinko

...in previous 52ffad9bb7be800790de6d918154dbeade88cadd "tdf#100501: Adapt 
to
Java 9 (at least on Linux x86-64)"

Change-Id: I4d6bc31e0a7051a2657bb3d1ffc20c7a03d69038

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 23c5983dcbc4..f5b60e6702d4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -97,7 +97,7 @@ bool SunVersion::init(const char *szVersion)
 pCur + 1 != pEnd
 || rtl::isAsciiDigit(static_cast(*pCur))) )
 {
-bool afterMaint = pCur != pEnd && (*pCur == '_' || *pCur == '-');
+bool afterMaint = pCur == pEnd || *pCur == '_' || *pCur == '-';
 
 int len = pCur - pLast;
 if (len >= 127)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sw/source/filter/ascii/parasc.cxx|4 +++-
 sw/source/filter/basflt/iodetect.cxx |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 48da72b25b41614efd0689c20ef51ce420d53a70
Author: Maxim Monastirsky 
Date:   Sun Jan 22 20:24:02 2017 +0200

tdf#63673 Never ignore detected BOM

SwIoSystem::IsDetectableText was returning false only
because the detected line end isn't the same as the system
default one. Instead return true whenever there is a known
BOM or at least there is no 0x0, and actually use the
detected line end.

Change-Id: I20cc1642e7ad2e6e13dfb48c325a00c44f818f15
Reviewed-on: https://gerrit.libreoffice.org/33404
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index f6ed774a3c63..e3045b0edee8 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -269,11 +269,13 @@ sal_uLong SwASCIIParser::ReadChars()
 sal_uLong nLen, nOrig;
 nOrig = nLen = rInput.ReadBytes(pArr, ASC_BUFFLEN);
 rtl_TextEncoding eCharSet;
-bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, 
&bSwapUnicode);
+LineEnd eLineEnd;
+bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, 
&bSwapUnicode, &eLineEnd);
 OSL_ENSURE(bRet, "Autodetect of text import without nag dialog must 
have failed");
 if (bRet && eCharSet != RTL_TEXTENCODING_DONTKNOW)
 {
 aEmpty.SetCharSet(eCharSet);
+aEmpty.SetParaFlags(eLineEnd);
 rInput.SeekRel(-(long(nLen)));
 }
 else
diff --git a/sw/source/filter/basflt/iodetect.cxx 
b/sw/source/filter/basflt/iodetect.cxx
index 10c41162fbfc..4409dbfa70d4 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -370,7 +370,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, 
sal_uLong &rLen,
 if (pLineEnd)
 *pLineEnd = eLineEnd;
 
-return bEncodedFilter || (!bIsBareUnicode && eSysLE == eLineEnd);
+return bEncodedFilter || !bIsBareUnicode;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] QuarkXPress import, Week 12

[Alex P]

During the final GSoC week I implement parsing and output of paragraph
rules (using fo:border-top/bottom, which seem to be not supported in LO
Draw) and handling of document charsets (only for English because we don't
have sample docs in other languages and don't know their identifiers and
charsets).

Also the first version of libqxp was finally released and integrated into
LibreOffice.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Christian Lohmaier]

 android/source/res/layout/toolbar_color_picker.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a7857211c91fd7045877644aa18f29d5856efa3
Author: Christian Lohmaier 
Date:   Mon Aug 28 18:09:47 2017 +0200

need to use app:srcCompat when using VectorDrawableCompat

instead of plain android:src

Change-Id: I202f5564ad4bb94a4d7bcf788a7173a9c217990d

diff --git a/android/source/res/layout/toolbar_color_picker.xml 
b/android/source/res/layout/toolbar_color_picker.xml
index 2e2aed41abf9..e34b6c6a5d72 100644
--- a/android/source/res/layout/toolbar_color_picker.xml
+++ b/android/source/res/layout/toolbar_color_picker.xml
@@ -26,7 +26,7 @@
 android:id="@+id/button_go_back_color_picker"
 android:layout_width="wrap_content"
 android:layout_height="wrap_content"
-android:src="@drawable/ic_arrow_back_black_24dp"
+app:srcCompat="@drawable/ic_arrow_back_black_24dp"
 android:background="@drawable/image_button_background"
 android:layout_marginBottom="10dp"/>
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sw/source/filter/ascii/parasc.cxx|4 +++-
 sw/source/filter/basflt/iodetect.cxx |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5bbd829d75573e9a0e6b4346342e839480bf770a
Author: Maxim Monastirsky 
Date:   Sun Jan 22 20:24:02 2017 +0200

tdf#63673 Never ignore detected BOM

SwIoSystem::IsDetectableText was returning false only
because the detected line end isn't the same as the system
default one. Instead return true whenever there is a known
BOM or at least there is no 0x0, and actually use the
detected line end.

Change-Id: I20cc1642e7ad2e6e13dfb48c325a00c44f818f15
Reviewed-on: https://gerrit.libreoffice.org/33404
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit 48da72b25b41614efd0689c20ef51ce420d53a70)
Signed-off-by: Andras Timar 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index f6ed774a3c63..e3045b0edee8 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -269,11 +269,13 @@ sal_uLong SwASCIIParser::ReadChars()
 sal_uLong nLen, nOrig;
 nOrig = nLen = rInput.ReadBytes(pArr, ASC_BUFFLEN);
 rtl_TextEncoding eCharSet;
-bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, 
&bSwapUnicode);
+LineEnd eLineEnd;
+bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, 
&bSwapUnicode, &eLineEnd);
 OSL_ENSURE(bRet, "Autodetect of text import without nag dialog must 
have failed");
 if (bRet && eCharSet != RTL_TEXTENCODING_DONTKNOW)
 {
 aEmpty.SetCharSet(eCharSet);
+aEmpty.SetParaFlags(eLineEnd);
 rInput.SeekRel(-(long(nLen)));
 }
 else
diff --git a/sw/source/filter/basflt/iodetect.cxx 
b/sw/source/filter/basflt/iodetect.cxx
index 10c41162fbfc..4409dbfa70d4 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -370,7 +370,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, 
sal_uLong &rLen,
 if (pLineEnd)
 *pLineEnd = eLineEnd;
 
-return bEncodedFilter || (!bIsBareUnicode && eSysLE == eLineEnd);
+return bEncodedFilter || !bIsBareUnicode;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 android/source/src/java/org/libreoffice/ColorPaletteAdapter.java |4 ++--
 android/source/src/java/org/libreoffice/ColorPickerAdapter.java  |8 
+++-
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 16be82790aa2b55efbf5788260c88c373402bafb
Author: Christian Lohmaier 
Date:   Mon Aug 28 19:13:17 2017 +0200

android: position in RecyclerView must not be treated as fixed

Change-Id: Id7f88b2b1b9913a006b0b73ceb4421b47fccc495

diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java 
b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
index d126ef1ed1a5..e5e078934c71 100644
--- a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
+++ b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
@@ -38,7 +38,7 @@ public class ColorPaletteAdapter extends 
RecyclerView.Adapterhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 android/source/res/layout/fragment_directory_browser.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 750105742ebb7e212074abd6830fad02f8dd2d2b
Author: Christian Lohmaier 
Date:   Mon Aug 28 19:20:56 2017 +0200

android:singleLine is deprecated, use maxLines=1 instead

Change-Id: I32c7d000848f10a40a2b7b0038463c31ddade6f8

diff --git a/android/source/res/layout/fragment_directory_browser.xml 
b/android/source/res/layout/fragment_directory_browser.xml
index fcf7fc6c9b47..37a61fa3518c 100644
--- a/android/source/res/layout/fragment_directory_browser.xml
+++ b/android/source/res/layout/fragment_directory_browser.xml
@@ -24,7 +24,7 @@
 android:layout_width="0dp"
 android:layout_height="wrap_content"
 android:layout_weight="1"
-android:singleLine="true"
+android:maxLines="1"
 android:scrollHorizontally="true"
 android:textAppearance="?android:attr/textAppearanceMedium"
 android:inputType="text"/>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-21'

[Jan Holesovsky]

Tag 'cd-5.3-21' created by Andras Timar  at 
2017-08-28 18:23 +

cd-5.3-21

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

[GSoC] Migrating from legacy Parser to FastParser - Final Report

[Mohammed Abdul Azeem]

Hi,

After more than 12 weeks of coding, I think we've achieved what we set out
to do.

We started with an aim to move existing legacy parser contexts in sc/ and
other modules to fast contexts and to offload unzipping and reading into a
different thread. I've covered most of the details in weekly reports. I'll
just brief what we did, what we couldn't, just so that I can use this as a
link to my project submission.

*Done*:
- Moved unzipping into a new thread.
- Moved all the independent contexts to use fast tokens (rest of them
requires touching other modules)
- Lots of optimizations and refactoring.
- Fixed some bugs.

*In progress*:
- Moving XSAXDocumentBuilder2 to use XFastDocumentHandler. It involved
multiple modules(sc, sw, starmath, sd, etc.) and resulted in failing lots
of test cases. I'm still working on this, which will help anybody following
this up easy to do the rest of the conversions.

*Not done*:
- I observed lots of small issues, which I could write test cases for.
Hopefully, I will do this whenever I get time in future.
- Conversions of the rest of the legacy contexts.

*Patches*:
https://gerrit.libreoffice.org/38135
https://gerrit.libreoffice.org/38563
https://gerrit.libreoffice.org/38661
https://gerrit.libreoffice.org/38708
https://gerrit.libreoffice.org/38784
https://gerrit.libreoffice.org/38881
https://gerrit.libreoffice.org/38964
https://gerrit.libreoffice.org/39275
https://gerrit.libreoffice.org/39374
https://gerrit.libreoffice.org/39380
https://gerrit.libreoffice.org/39370
https://gerrit.libreoffice.org/39397
https://gerrit.libreoffice.org/39665
https://gerrit.libreoffice.org/39730
https://gerrit.libreoffice.org/39723
https://gerrit.libreoffice.org/39927
https://gerrit.libreoffice.org/40012
https://gerrit.libreoffice.org/40160
https://gerrit.libreoffice.org/40246
https://gerrit.libreoffice.org/40320
https://gerrit.libreoffice.org/40326
https://gerrit.libreoffice.org/40540
https://gerrit.libreoffice.org/40553
https://gerrit.libreoffice.org/40561
https://gerrit.libreoffice.org/40791
https://gerrit.libreoffice.org/40846
https://gerrit.libreoffice.org/41063
https://gerrit.libreoffice.org/41364
https://gerrit.libreoffice.org/40928
https://gerrit.libreoffice.org/41178 (not merged)


I would like to thank all people who helped me during the project and
special thanks to my mentors Michael Meeks and Markus Mohrhard for
supporting me and giving me ample time to work at my own pace. It's been a
great time working with LibreOffice.

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

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

[Dennis Francis]

 chart2/source/view/charttypes/PieChart.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 03add51224dff65d2238832d3e1b8abfa5ebcc02
Author: Dennis Francis 
Date:   Mon Aug 21 13:59:41 2017 +0530

tdf#62363: When pie chart sector is too small do "Outside" placement

...of its label when "Best fit" label placement setting is used.

Change-Id: Id201d922505de0e134286f4772abe282bb0722bc
Reviewed-on: https://gerrit.libreoffice.org/41572
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 8c8edfabdee656ac5a9a0b1106f90baf315f1dd4)
Reviewed-on: https://gerrit.libreoffice.org/41621

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index de8a2375fe3c..b0361c743ae1 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -281,14 +281,23 @@ void PieChart::createTextLabelShape(
 ///the label position is allowed; the `createTextLabelShape` treats the
 ///`AVOID_OVERLAP` as if it was of `CENTER` type;
 
+double nVal = rSeries.getYValue(nPointIndex);
 //AVOID_OVERLAP is in fact "Best fit" in the UI.
 bool bMovementAllowed = ( nLabelPlacement == 
css::chart::DataLabelPlacement::AVOID_OVERLAP );
 if( bMovementAllowed )
+{
 // Use center for "Best fit" for now. In the future we
 // may want to implement a real best fit algorithm.
 // But center is good enough, and close to what Excel
 // does.
-nLabelPlacement = css::chart::DataLabelPlacement::CENTER;
+
+// Place the label outside if the sector is too small
+// The threshold is set to 2%, but can be improved by making it a 
function of
+// label width and radius too ?
+double fFrac = fabs( nVal / rParam.mfLogicYSum );
+nLabelPlacement = ( fFrac <= 0.02 ) ? 
css::chart::DataLabelPlacement::OUTSIDE :
+css::chart::DataLabelPlacement::CENTER;
+}
 
 ///for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in 
the
 ///radius direction, is added to the final screen position of the label
@@ -347,7 +356,6 @@ void PieChart::createTextLabelShape(
 sal_Int32 nTextMaximumFrameWidth = ceil(fTextMaximumFrameWidth);
 
 ///the text shape for the label is created
-double nVal = rSeries.getYValue(nPointIndex);
 aPieLabelInfo.xTextShape = createDataLabel(
 xTextTarget, rSeries, nPointIndex, nVal, rParam.mfLogicYSum,
 aScreenPosition2D, eAlignment, 0, nTextMaximumFrameWidth);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis]

 chart2/source/view/charttypes/PieChart.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit d44e12f1f77514059375e6da3f981a992ff7de7e
Author: Dennis Francis 
Date:   Mon Aug 21 13:59:41 2017 +0530

tdf#62363: When pie chart sector is too small do "Outside" placement

...of its label when "Best fit" label placement setting is used.

Change-Id: Id201d922505de0e134286f4772abe282bb0722bc
Reviewed-on: https://gerrit.libreoffice.org/41572
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 8c8edfabdee656ac5a9a0b1106f90baf315f1dd4)
Reviewed-on: https://gerrit.libreoffice.org/41622

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index f3b854ee8707..98fffc60e430 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -288,14 +288,23 @@ void PieChart::createTextLabelShape(
 ///the label position is allowed; the `createTextLabelShape` treats the
 ///`AVOID_OVERLAP` as if it was of `CENTER` type;
 
+double nVal = rSeries.getYValue(nPointIndex);
 //AVOID_OVERLAP is in fact "Best fit" in the UI.
 bool bMovementAllowed = ( nLabelPlacement == 
css::chart::DataLabelPlacement::AVOID_OVERLAP );
 if( bMovementAllowed )
+{
 // Use center for "Best fit" for now. In the future we
 // may want to implement a real best fit algorithm.
 // But center is good enough, and close to what Excel
 // does.
-nLabelPlacement = css::chart::DataLabelPlacement::CENTER;
+
+// Place the label outside if the sector is too small
+// The threshold is set to 2%, but can be improved by making it a 
function of
+// label width and radius too ?
+double fFrac = fabs( nVal / rParam.mfLogicYSum );
+nLabelPlacement = ( fFrac <= 0.02 ) ? 
css::chart::DataLabelPlacement::OUTSIDE :
+css::chart::DataLabelPlacement::CENTER;
+}
 
 ///for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in 
the
 ///radius direction, is added to the final screen position of the label
@@ -354,7 +363,6 @@ void PieChart::createTextLabelShape(
 sal_Int32 nTextMaximumFrameWidth = ceil(fTextMaximumFrameWidth);
 
 ///the text shape for the label is created
-double nVal = rSeries.getYValue(nPointIndex);
 aPieLabelInfo.xTextShape = createDataLabel(
 xTextTarget, rSeries, nPointIndex, nVal, rParam.mfLogicYSum,
 aScreenPosition2D, eAlignment, 0, nTextMaximumFrameWidth);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/msfilter/eschesdo.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 317e3d43c937e7d3bff61b100c08f04c837c4d25
Author: Caolán McNamara 
Date:   Mon Aug 28 17:09:06 2017 +0100

crashtesting: failure on exporting tdf95568-1.ots to xlsx

since...

commit c0cc02e2934aeb12dda44818955e5964496c186a
Date:   Thu Aug 17 21:47:22 2017 +0200

tdf#50097: DOCX: export form controls as MSO ActiveX controls

Change-Id: I55f1dcbe454e696df71a7656c796e36e91c42762
Reviewed-on: https://gerrit.libreoffice.org/41651
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 1348c38bfe7e..5ed8d3892125 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -425,9 +425,13 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 const Reference< XPropertySet > xPropSet(rObj.mXPropSet, 
UNO_QUERY);
 if(xPropSet.is())
 {
-text::TextContentAnchorType eAnchorType;
-xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
-bInline = eAnchorType == 
text::TextContentAnchorType_AS_CHARACTER;
+const Reference xPropInfo = 
xPropSet->getPropertySetInfo();
+if (xPropInfo.is() && 
xPropInfo->hasPropertyByName("AnchorType"))
+{
+text::TextContentAnchorType eAnchorType;
+xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
+bInline = eAnchorType == 
text::TextContentAnchorType_AS_CHARACTER;
+}
 }
 
 if(bInline)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/osx/salframeview.mm |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ec92fc01fe3500fb82b1e99cc6ff59dc146cfc5c
Author: Stephan Bergmann 
Date:   Mon Aug 28 21:11:55 2017 +0200

loplugin:implicitboolconversion

Change-Id: Ie6c9b4c98d1fab26f79e7549ebeb03aa81a1dd1d

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index a20f3b7a6e5a..35f55c6e2f17 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1523,7 +1523,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 {
 SolarMutexGuard aGuard;
 
-long nRet = 0;
+bool nRet = false;
 if( AquaSalFrame::isAlive( mpFrame ) )
 {
 SalKeyEvent aEvent;
@@ -1533,11 +1533,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 nRet = mpFrame->CallCallback( SalEvent::KeyInput, &aEvent );
 std::map< NSEvent*, bool >::iterator it = 
GetSalData()->maKeyEventAnswer.find( mpLastEvent );
 if( it != GetSalData()->maKeyEventAnswer.end() )
-it->second = nRet != 0;
+it->second = nRet;
 if( AquaSalFrame::isAlive( mpFrame ) )
 mpFrame->CallCallback( SalEvent::KeyUp, &aEvent );
 }
-return nRet ? YES : NO;
+return nRet;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/msfilter/eschesdo.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 21a6cb83a421aa80fbb90040742bac66ef00edb5
Author: Caolán McNamara 
Date:   Mon Aug 28 17:09:06 2017 +0100

crashtesting: failure on exporting tdf95568-1.ots to xlsx

since...

commit c0cc02e2934aeb12dda44818955e5964496c186a
Date:   Thu Aug 17 21:47:22 2017 +0200

tdf#50097: DOCX: export form controls as MSO ActiveX controls

Change-Id: I55f1dcbe454e696df71a7656c796e36e91c42762
Reviewed-on: https://gerrit.libreoffice.org/41651
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit 317e3d43c937e7d3bff61b100c08f04c837c4d25)

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index ba28dbfa48d5..d7be855f911b 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -429,9 +429,13 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 const Reference< XPropertySet > xPropSet(rObj.mXPropSet, 
UNO_QUERY);
 if(xPropSet.is())
 {
-text::TextContentAnchorType eAnchorType;
-xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
-bInline = eAnchorType == 
text::TextContentAnchorType_AS_CHARACTER;
+const Reference xPropInfo = 
xPropSet->getPropertySetInfo();
+if (xPropInfo.is() && 
xPropInfo->hasPropertyByName("AnchorType"))
+{
+text::TextContentAnchorType eAnchorType;
+xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
+bInline = eAnchorType == 
text::TextContentAnchorType_AS_CHARACTER;
+}
 }
 
 if(bInline)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx  |   44 +++---
 sw/source/filter/ww8/ww8graf2.cxx |   22 +--
 sw/source/filter/ww8/ww8par.cxx   |   22 +++
 sw/source/filter/ww8/ww8par.hxx   |   10 +++-
 sw/source/filter/ww8/ww8par3.cxx  |   12 ++
 sw/source/filter/ww8/ww8par4.cxx  |4 +--
 sw/source/filter/ww8/ww8par6.cxx  |2 -
 7 files changed, 52 insertions(+), 64 deletions(-)

New commits:
commit 1877c2edd4af4f8a415f5324358da72493075201
Author: Caolán McNamara 
Date:   Mon Aug 28 16:45:00 2017 +0100

ofz#3189 Direct-leak

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

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e9796306d1af..4b7a47f307dc 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1428,7 +1428,7 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* 
pPF, long nGrafAnchorCp )
 SfxAllItemSet aSet( m_pDrawModel->GetItemPool() );
 if (SdrObject *pObject = ReadGrafPrimitive(nLeft, aSet))
 {
-m_pWWZOrder->InsertDrawingObject(pObject, SVBT16ToShort(aDo.dhgt));
+m_xWWZOrder->InsertDrawingObject(pObject, SVBT16ToShort(aDo.dhgt));
 
 tools::Rectangle aRect(pObject->GetSnapRect());
 
@@ -2482,8 +2482,8 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long 
nGrafAnchorCp )
 return nullptr;
 }
 
-if (!m_pMSDffManager->GetModel())
- m_pMSDffManager->SetModel(m_pDrawModel, 1440);
+if (!m_xMSDffManager->GetModel())
+ m_xMSDffManager->SetModel(m_pDrawModel, 1440);
 
 tools::Rectangle aRect(pF->nXaLeft,  pF->nYaTop, pF->nXaRight, 
pF->nYaBottom);
 SvxMSDffImportData aData( aRect );
@@ -2497,7 +2497,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long 
nGrafAnchorCp )
 m_rDoc.SetDocShell(nullptr); // #i20540# Persist guard
 
 SdrObject* pObject = nullptr;
-bool bOk = (m_pMSDffManager->GetShape(pF->nSpId, pObject, aData) && 
pObject);
+bool bOk = (m_xMSDffManager->GetShape(pF->nSpId, pObject, aData) && 
pObject);
 
 m_rDoc.SetDocShell(pPersist);  // #i20540# Persist guard
 
@@ -2703,12 +2703,12 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long 
nGrafAnchorCp )
 {
 /* Need to make sure that the correct layer ordering is 
applied. */
 //  pass information, if object is in page header|footer to 
method.
-m_pWWZOrder->InsertEscherObject( pObject, pF->nSpId,
+m_xWWZOrder->InsertEscherObject( pObject, pF->nSpId,
m_bIsHeader || m_bIsFooter );
 }
 else
 {
-m_pWWZOrder->InsertTextLayerObject(pObject);
+m_xWWZOrder->InsertTextLayerObject(pObject);
 }
 
 pRetFrameFormat = 
m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pObject, aFlySet 
);
@@ -2817,7 +2817,7 @@ SwFrameFormat* 
SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
 if (pSdrTextObj != pNewObj)
 {
 // Replace object in the Z-Order-List
-m_pMSDffManager->ExchangeInShapeOrder(pSdrTextObj, 0, 
pNewObj);
+m_xMSDffManager->ExchangeInShapeOrder(pSdrTextObj, 0, 
pNewObj);
 // now delete object
 SdrObject::Free( pRecord->pObj );
 // and save the new object.
@@ -2827,7 +2827,7 @@ SwFrameFormat* 
SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
 else
 {
 // remove the object from Z-Order list
-m_pMSDffManager->RemoveFromShapeOrder( pSdrTextObj );
+m_xMSDffManager->RemoveFromShapeOrder( pSdrTextObj );
 // take the object from the drawing page
 if( pSdrTextObj->GetPage() )
 m_pDrawPg->RemoveObject( pSdrTextObj->GetOrdNum() );
@@ -2894,7 +2894,7 @@ SwFlyFrameFormat* 
SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
 rpOurNewObject = CreateContactObject(pRetFrameFormat);
 
 // remove old object from the Z-Order list
-m_pMSDffManager->RemoveFromShapeOrder( rpObject );
+m_xMSDffManager->RemoveFromShapeOrder( rpObject );
 
 // and delete the object
 SdrObject::Free( rpObject );
@@ -2915,7 +2915,7 @@ SwFlyFrameFormat* 
SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
 contact object, while a raw rpOutNewObject stored here becomes
 deleted and useless.
 */
-m_pMSDffManager->StoreShapeOrder(pF->nSpId,
+m_xMSDffManager->StoreShapeOrder(pF->nSpId,
 (((sal_uLong)pRecord->aTextId.nTxBxS) << 16

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

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/xpm/pass/tdf111925-1.xpm |  306 +
 vcl/source/filter/ixpm/xpmread.cxx |2 
 2 files changed, 307 insertions(+), 1 deletion(-)

New commits:
commit bcbada5d9f2411739c83610f2e9fd2acb112c3e9
Author: Caolán McNamara 
Date:   Mon Aug 28 15:33:27 2017 +0100

Resolves: tdf#111925 we need to take the buffered data len into account

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

diff --git a/vcl/qa/cppunit/graphicfilter/data/xpm/pass/tdf111925-1.xpm 
b/vcl/qa/cppunit/graphicfilter/data/xpm/pass/tdf111925-1.xpm
new file mode 100644
index ..b5eab3e33b9c
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/xpm/pass/tdf111925-1.xpm
@@ -0,0 +1,306 @@
+/* XPM */
+static char * example_xpm[] = {
+"150 100 203 2",
+"  c #E6DECA",
+". c #E5DDC9",
+"+ c #E4DCC8",
+"@ c #E3DBC7",
+"# c #E3DAC5",
+"$ c #E2D9C4",
+"% c #E1D8C3",
+"& c #E1D7C1",
+"* c #DFD6C1",
+"= c #DFD5BF",
+"- c #DED4BE",
+"; c #DDD3BD",
+"> c #DDD2BB",
+", c #DCD1BA",
+"' c #DBCFB9",
+") c #DACFB8",
+"! c #D9CDB7",
+"~ c #D8CDB6",
+"{ c #D6CAB2",
+"] c #D7CBB3",
+"^ c #D7CCB5",
+"/ c #D5C9B1",
+"( c #D4C8B0",
+"_ c #D3C7AF",
+": c #D3C6AD",
+"< c #D2C5AC",
+"[ c #D1C3AB",
+"} c #D0C2AA",
+"| c #CFC1A9",
+"1 c #CEC0A8",
+"2 c #CDBFA7",
+"3 c #CBBDA5",
+"4 c #CCBEA6",
+"5 c #CABBA2",
+"6 c #C9BAA1",
+"7 c #CBBCA3",
+"8 c #C8B9A0",
+"9 c #C7B89F",
+"0 c #C6B79E",
+"a c #C5B69D",
+"b c #C5B59B",
+"c c #C4B49A",
+"d c #C3B399",
+"e c #C2B298",
+"f c #C1B197",
+"g c #C0B096",
+"h c #BFAF95",
+"i c #BEAE94",
+"j c #BDAD93",
+"k c #BDAC91",
+"l c #BCAB90",
+"m c #BBAA8F",
+"n c #BAA98E",
+"o c #B9A88D",
+"p c #B2A186",
+"q c #B3A287",
+"r c #B8A78C",
+"s c #B6A58A",
+"t c #B2A084",
+"u c #B09E82",
+"v c #AF9D81",
+"w c #B5A489",
+"x c #7F6B4B",
+"y c #5F4E2D",
+"z c #5E4D2C",
+"A c #614F2D",
+"B c #A39175",
+"C c #9D8B6F",
+"D c #978265",
+"E c #927E5E",
+"F c #8C7858",
+"G c #857151",
+"H c #7A6746",
+"I c #776443",
+"J c #887454",
+"K c #E7DFCB",
+"L c #1E1800",
+"M c #161100",
+"N c #221B00",
+"O c #AB997D",
+"P c #9A876A",
+"Q c #948060",
+"R c #8A7656",
+"S c #816D4D",
+"T c #796645",
+"U c #715E3D",
+"V c #685534",
+"W c #584826",
+"X c #725F3E",
+"Y c #B19F83",
+"Z c #E8E0CC",
+"` c #B7A68B",
+" .c #120F00",
+"..c #00",
+"+.c #AC9A7E",
+"@.c #937F5F",
+"#.c #826E4E",
+"$.c #6F5D3D",
+"%.c #E9E1CD",
+"&.c #AD9B7F",
+"*.c #9B896D",
+"=.c #847050",
+"-.c #7A6848",
+";.c #6A5838",
+">.c #61502F",
+",.c #5B4A29",
+"'.c #746140",
+").c #AE9C80",
+"!.c #968164",
+"~.c #8E7A5A",
+"{.c #897555",
+"].c #8B7757",
+"^.c #836F4F",
+"/.c #7D6949",
+"(.c #9F8D71",
+"_.c #907C5C",
+":.c #A9977B",
+"<.c #A08E72",
+"[.c #9A8568",
+"}.c #988366",
+"|.c #A29074",
+"1.c #9B886B",
+"2.c #958161",
+"3.c #695635",
+"4.c #665534",
+"5.c #756241",
+"6.c #9C8A6E",
+"7.c #625130",
+"8.c #766342",
+"9.c #6B5939",
+"0.c #7E6A4A",
+"a.c #6A5736",
+"b.c #786544",
+"c.c #A79579",
+"d.c #998467",
+"e.c #B4A388",
+"f.c #A59377",
+"g.c #493A13",
+"h.c #3A2D00",
+"i.c #413509",
+"j.c #362B00",
+"k.c #6D5B3B",
+"l.c #52431E",
+"m.c #382D00",
+"n.c #282000",
+"o.c #403306",
+"p.c #5D4C2B",
+"q.c #73603F",
+"r.c #4A3B14",
+"s.c #1A1500",
+"t.c #544422",
+"u.c #8F7B5B",
+"v.c #7C6948",
+"w.c #51421D",
+"x.c #3C3000",
+"y.c #534321",
+"z.c #241C00",
+"A.c #3E3202",
+"B.c #655433",
+"C.c #574725",
+"D.c #50411C",
+"E.c #53441F",
+"F.c #6E5C3C",
+"G.c #554523",
+"H.c #4D3F19",
+"I.c #4F3F19",
+"J.c #A49276",
+"K.c #A8967A",
+"L.c #302600",
+"M.c #473911",
+"N.c #0E0B00",
+"O.c #3F3203",
+"P.c #080600",
+"Q.c #42340A",
+"R.c #4B3C15",
+"S.c #43350B",
+"T.c #877353",
+"U.c #5C4B2A",
+"V.c #46370E",
+"W.c #4C3E18",
+"X.c #322700",
+"Y.c #50401A",
+"Z.c #645332",
+"`.c #2A2100",
+" +c #2E2500",
+".+c #645230",
+"++c #A69478",
+"@+c #867252",
+"#+c #5A4826",
+"$+c #463810",
+"%+c #A18F73",
+"&+c #806C4C",
+"*+c #403204",
+"=+c #413407",
+"-+c #9E8C70",
+";+c #958263",
+">+c #AA987C",
+",+c #5A4928",
+"'+c #564624",
+")+c #4C3D16",
+"!+c #483912",
+"~+c #6C5A3A",
+"{+c #8D7959",
+" 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sal/textenc

[Caolán McNamara]

 sal/textenc/tcvtkr6.tab |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f982fb4f6ec635f8f900431761a55ab7d5cac2a
Author: Caolán McNamara 
Date:   Mon Aug 28 14:34:16 2017 +0100

ofz#3186: wrong starting offset for JOHAB 0x6D block

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

diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index e03f3405e811..fab6c6131a5f 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -1033,7 +1033,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] =
 { 0x02, 0xFB, aImplUniToDBCSTab_JOHAB_6A }, /* 0x6A */
 { 0x04, 0xEC, aImplUniToDBCSTab_JOHAB_6B }, /* 0x6B */
 { 0x08, 0xF3, aImplUniToDBCSTab_JOHAB_6C }, /* 0x6C */
-{ 0x03, 0xFB, aImplUniToDBCSTab_JOHAB_6D }, /* 0x6D */
+{ 0x0B, 0xFB, aImplUniToDBCSTab_JOHAB_6D }, /* 0x6D */
 { 0x17, 0xFF, aImplUniToDBCSTab_JOHAB_6E }, /* 0x6E */
 { 0x01, 0xFE, aImplUniToDBCSTab_JOHAB_6F }, /* 0x6F */
 { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_70 }, /* 0x70 */
___
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' - sal/textenc

[Caolán McNamara]

 sal/textenc/tcvtkr6.tab |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c96390e45af2b1f27c9c17a4b37b9b15d01552c
Author: Caolán McNamara 
Date:   Mon Aug 28 14:34:16 2017 +0100

ofz#3186: wrong starting offset for JOHAB 0x6D block

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

diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index e03f3405e811..fab6c6131a5f 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -1033,7 +1033,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] =
 { 0x02, 0xFB, aImplUniToDBCSTab_JOHAB_6A }, /* 0x6A */
 { 0x04, 0xEC, aImplUniToDBCSTab_JOHAB_6B }, /* 0x6B */
 { 0x08, 0xF3, aImplUniToDBCSTab_JOHAB_6C }, /* 0x6C */
-{ 0x03, 0xFB, aImplUniToDBCSTab_JOHAB_6D }, /* 0x6D */
+{ 0x0B, 0xFB, aImplUniToDBCSTab_JOHAB_6D }, /* 0x6D */
 { 0x17, 0xFF, aImplUniToDBCSTab_JOHAB_6E }, /* 0x6E */
 { 0x01, 0xFE, aImplUniToDBCSTab_JOHAB_6F }, /* 0x6F */
 { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_70 }, /* 0x70 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Migrating from legacy Parser to FastParser - Final Report

[Michael Meeks]

Hi Mohammed,

On 28/08/17 19:26, Mohammed Abdul Azeem wrote:
> After more than 12 weeks of coding, I think we've achieved what we set
> out to do.

Its some great work that moved us far forward - thanks for that!

> We started with an aim to move existing legacy parser contexts in sc/
> and other modules to fast contexts and to offload unzipping and reading
> into a different thread.

I think one key achievement was avoiding us needing to unzip the whole
package/ streams before we parsed them - which nailed a nasty
performance regression (caused by a previous correctness fix =).

Overall, I'm really pleased to see the improvements in performance
we've got here - and to see your increasing confidence with the
optimization work.

> /In progress/:
> - Moving XSAXDocumentBuilder2 to use XFastDocumentHandler. It involved
> multiple modules(sc, sw, starmath, sd, etc.) and resulted in failing
> lots of test cases. I'm still working on this, which will help anybody
> following this up easy to do the rest of the conversions.

That's greatly appreciated =)

Good stuff,

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Julien Nabet]

 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   30 ++---
 1 file changed, 13 insertions(+), 17 deletions(-)

New commits:
commit 97cd8e4d64632bb65445cb2f395b1385a0a2a13b
Author: Julien Nabet 
Date:   Mon Aug 28 18:42:50 2017 +0200

tdf#111818: add SearchItem.AlgorithmType2 option

and use InitPropertySequence

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

diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 98f27571585e..f39b57373ce9 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -28,6 +28,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -111,14 +112,6 @@ void impl_executeSearch( const css::uno::Reference< 
css::uno::XComponentContext
 }
 }
 
-css::uno::Sequence< css::beans::PropertyValue > lArgs(7);
-lArgs[0].Name = "SearchItem.SearchString";
-lArgs[0].Value <<= sFindText;
-lArgs[1].Name = "SearchItem.Backward";
-lArgs[1].Value <<= aSearchBackwards;
-lArgs[2].Name = "SearchItem.SearchFlags";
-lArgs[2].Value <<= (sal_Int32)0;
-lArgs[3].Name = "SearchItem.TransliterateFlags";
 SvtCTLOptions aCTLOptions;
 TransliterationFlags nFlags = TransliterationFlags::NONE;
 if (!aMatchCase)
@@ -127,21 +120,24 @@ void impl_executeSearch( const css::uno::Reference< 
css::uno::XComponentContext
 nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
 if (aCTLOptions.IsCTLFontEnabled())
 nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL;
-lArgs[3].Value <<= (sal_Int32)nFlags;
-lArgs[4].Name = "SearchItem.Command";
-lArgs[4].Value <<= (sal_Int16)(aFindAll ?
-SvxSearchCmd::FIND_ALL : SvxSearchCmd::FIND );
-lArgs[5].Name = "SearchItem.AlgorithmType";
-lArgs[5].Value <<= (sal_Int16)0;  // 0 == SearchAlgorithms_ABSOLUTE
-lArgs[6].Name = "SearchItem.SearchFormatted";
-lArgs[6].Value <<= bSearchFormatted;
+
+auto aArgs( comphelper::InitPropertySequence( {
+{ "SearchItem.SearchString", css::uno::makeAny( sFindText ) },
+{ "SearchItem.Backward", css::uno::makeAny( aSearchBackwards ) },
+{ "SearchItem.SearchFlags", css::uno::makeAny( (sal_Int32)0 ) },
+{ "SearchItem.TransliterateFlags", css::uno::makeAny( 
(sal_Int32)nFlags ) },
+{ "SearchItem.Command", css::uno::makeAny( (sal_Int16)(aFindAll 
?SvxSearchCmd::FIND_ALL : SvxSearchCmd::FIND ) ) },
+{ "SearchItem.AlgorithmType", css::uno::makeAny( (sal_Int16)0 ) }, // 
0 == SearchAlgorithms_ABSOLUTE
+{ "SearchItem.AlgorithmType2", css::uno::makeAny( (sal_Int16)1 ) }, // 
1 == SearchAlgorithms2_ABSOLUTE
+{ "SearchItem.SearchFormatted", css::uno::makeAny( bSearchFormatted ) }
+} ) );
 
 css::uno::Reference< css::frame::XDispatchProvider > 
xDispatchProvider(xFrame, css::uno::UNO_QUERY);
 if ( xDispatchProvider.is() )
 {
 css::uno::Reference< css::frame::XDispatch > xDispatch = 
xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 if ( xDispatch.is() && !aURL.Complete.isEmpty() )
-xDispatch->dispatch( aURL, lArgs );
+xDispatch->dispatch( aURL, aArgs );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 filter/source/msfilter/eschesdo.cxx |   30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

New commits:
commit dada5958c1a5565e9d7e098c75c90f60e575ab62
Author: Tamás Zolnai 
Date:   Mon Aug 28 19:15:25 2017 +0200

Follow up changes related to DOCX form control export

These lines are expected to be called only for DOCX format.
AnchorType is a Writer specific attribute so it can be used
to decide on the file format.

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

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 5ed8d3892125..d203e7827c5b 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -420,28 +420,26 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 }
 else if ( rObj.GetType() == "drawing.Control" )
 {
-mpEscherEx->OpenContainer( ESCHER_SpContainer );
-bool bInline = false;
 const Reference< XPropertySet > xPropSet(rObj.mXPropSet, 
UNO_QUERY);
-if(xPropSet.is())
+const Reference xPropInfo = xPropSet.is() ? 
xPropSet->getPropertySetInfo() : Reference();
+// This code is expected to be called only for DOCX format.
+if (xPropInfo.is() && xPropInfo->hasPropertyByName("AnchorType") 
&& bOOxmlExport)
 {
-const Reference xPropInfo = 
xPropSet->getPropertySetInfo();
-if (xPropInfo.is() && 
xPropInfo->hasPropertyByName("AnchorType"))
+text::TextContentAnchorType eAnchorType;
+xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
+bool bInline = eAnchorType == 
text::TextContentAnchorType_AS_CHARACTER;
+mpEscherEx->OpenContainer( ESCHER_SpContainer );
+if(bInline)
 {
-text::TextContentAnchorType eAnchorType;
-xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
-bInline = eAnchorType == 
text::TextContentAnchorType_AS_CHARACTER;
+ADD_SHAPE( ESCHER_ShpInst_PictureFrame, SHAPEFLAG_HAVESPT 
| SHAPEFLAG_HAVEANCHOR );
+}
+else
+{
+ADD_SHAPE( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVESPT | 
SHAPEFLAG_HAVEANCHOR );
 }
-}
-
-if(bInline)
-{
-ADD_SHAPE( ESCHER_ShpInst_PictureFrame, SHAPEFLAG_HAVESPT | 
SHAPEFLAG_HAVEANCHOR );
 }
 else
-{
-ADD_SHAPE( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVESPT | 
SHAPEFLAG_HAVEANCHOR );
-}
+break;
 }
 else if ( rObj.GetType() == "drawing.Connector" )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 onlineupdate/source/update/updater/updater.ico |binary
 onlineupdate/source/update/updater/updater.png |binary
 onlineupdate/source/update/updater/updater.svg |  649 +
 3 files changed, 649 insertions(+)

New commits:
commit c220f42d4d91a8903ceec302d718b5f30365e98e
Author: andreas kainz 
Date:   Mon Aug 28 22:40:25 2017 +0200

update updater icon

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

diff --git a/onlineupdate/source/update/updater/updater.ico 
b/onlineupdate/source/update/updater/updater.ico
index 48457029d6aa..7b20ba3ec3ce 100644
Binary files a/onlineupdate/source/update/updater/updater.ico and 
b/onlineupdate/source/update/updater/updater.ico differ
diff --git a/onlineupdate/source/update/updater/updater.png 
b/onlineupdate/source/update/updater/updater.png
index 7b5e78907785..030dd60afc37 100644
Binary files a/onlineupdate/source/update/updater/updater.png and 
b/onlineupdate/source/update/updater/updater.png differ
diff --git a/onlineupdate/source/update/updater/updater.svg 
b/onlineupdate/source/update/updater/updater.svg
new file mode 100644
index ..700294ab9621
--- /dev/null
+++ b/onlineupdate/source/update/updater/updater.svg
@@ -0,0 +1,649 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="32"
+   height="32"
+   viewBox="0 0 32 32.01"
+   id="svg6548"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="updater.svg"
+   inkscape:export-filename="./updater.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  
+
+  
+  
+
+
+
+  
+  
+
+
+  
+
+
+
+  
+  
+
+
+
+  
+  
+
+
+
+  
+  
+  
+
+
+
+  
+  
+
+
+
+
+
+  
+  
+
+
+
+
+  
+  
+
+
+
+
+
+  
+
+
+
+
+  
+
+
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+
+  
+  
+  
+  
+
+
+
+  
+  
+  
+  
+
+  
+
+
+  
+
+
+  
+  
+  
+
+  
+
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 53587dc7969b023416d865b516b7e800fc5de33a
Author: Michael Stahl 
Date:   Mon Aug 28 23:10:18 2017 +0200

sd: AccessibleSlideSorterView: don't register twice at ViewShell

Triggers assert in SfxListener::StartListening()

Change-Id: I17f165d600fa789d7ce8d7b2296988064c5d5844

diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx 
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index b530e3ee8471..8268c5506643 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -796,8 +796,11 @@ void 
AccessibleSlideSorterView::Implementation::ReleaseListeners()
 
 if (mbListeningToDocument)
 {
-if (mrSlideSorter.GetViewShell() != nullptr)
+if (mrSlideSorter.GetViewShell() != nullptr && 
!IsListening(*mrSlideSorter.GetViewShell()))
+{   // ??? is it even possible that ConnectListeners is called with no
+// view shell and this one with a view shell?
 StartListening(*mrSlideSorter.GetViewShell());
+}
 EndListening (*mrSlideSorter.GetModel().GetDocument());
 mbListeningToDocument = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 svx/source/dialog/langbox.cxx   |3 +++
 svx/source/sidebar/nbdtmg.cxx   |6 +-
 svx/source/svdraw/svdedxv.cxx   |4 
 svx/source/tbxctrls/Palette.cxx |4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 9420391cc9f6af2a16c1db72596f277439df29e9
Author: Takeshi Abe 
Date:   Mon Aug 28 22:59:42 2017 +0900

svx: Mark functions as local

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

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index d36c93db7d7c..bc7ac82bee9a 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -177,6 +177,7 @@ SvxLanguageBoxBase::~SvxLanguageBoxBase()
 {
 }
 
+namespace {
 
 bool lcl_isPrerequisite( LanguageType nLangType, SvxLanguageListFlags 
nLangList )
 {
@@ -201,6 +202,8 @@ bool lcl_isScriptTypeRequested( LanguageType nLangType, 
SvxLanguageListFlags nLa
  (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == 
SvtScriptType::ASIAN));
 }
 
+}
+
 void SvxLanguageBoxBase::AddLanguages( const std::vector< LanguageType >& 
rLanguageTypes,
 SvxLanguageListFlags nLangList )
 {
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index e21778be3705..0b97abe3bbb6 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -63,6 +63,8 @@ using namespace com::sun::star::style;
 
 namespace svx { namespace sidebar {
 
+namespace {
+
 const vcl::Font& lcl_GetDefaultBulletFont()
 {
 static bool bInit = false;
@@ -79,7 +81,7 @@ const vcl::Font& lcl_GetDefaultBulletFont()
 return aDefBulletFont;
 }
 
-static const sal_Unicode aDefaultBulletTypes[] =
+const sal_Unicode aDefaultBulletTypes[] =
 {
 0x2022,
 0x25cf,
@@ -121,6 +123,8 @@ NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const 
Sequence&
 return pNew;
 }
 
+}
+
 sal_uInt16 NBOTypeMgrBase:: IsSingleLevel(sal_uInt16 nCurLevel)
 {
 sal_uInt16 nLv = (sal_uInt16)0x;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index ab28ff0c69c0..2f25d6afc23f 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -166,6 +166,8 @@ SdrPageView* SdrObjEditView::ShowSdrPage(SdrPage* pPage)
 return pPageView;
 }
 
+namespace {
+
 /// Removes outliner views registered in other draw views that use 
pOutputDevice.
 void lcl_RemoveTextEditOutlinerViews(SdrObjEditView const * pThis, SdrPageView 
const * pPageView, OutputDevice const * pOutputDevice)
 {
@@ -197,6 +199,8 @@ void lcl_RemoveTextEditOutlinerViews(SdrObjEditView const * 
pThis, SdrPageView c
 }
 }
 
+}
+
 void SdrObjEditView::HideSdrPage()
 {
 lcl_RemoveTextEditOutlinerViews(this, GetSdrPageView(), 
GetFirstOutputDevice());
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index 348079cec815..b7fd0dc075a7 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -172,7 +172,7 @@ void PaletteASE::LoadPalette()
 
 // PaletteGPL 
--
 
-OString lcl_getToken(const OString& rStr, sal_Int32& index);
+static OString lcl_getToken(const OString& rStr, sal_Int32& index);
 
 PaletteGPL::PaletteGPL( const OUString &rFPath, const OUString &rFName ) :
 mbLoadedPalette( false ),
@@ -287,7 +287,7 @@ void PaletteGPL::LoadPalette()
 
 // finds first token in rStr from index, separated by whitespace
 // returns position of next token in index
-OString lcl_getToken(const OString& rStr, sal_Int32& index)
+static OString lcl_getToken(const OString& rStr, sal_Int32& index)
 {
 sal_Int32 substart, toklen = 0;
 OUString aWhitespaceChars( " \n\t" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

??liyf??license statement

[????-VII]

Hey! Here is my licence statement: All of my past & future contributions to 
LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards,liyf___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sal/osl/w32/socket.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 52403e5087d68748f58eb4bf2b94eba7fbf21540
Author: Stephan Bergmann 
Date:   Tue Aug 29 08:32:43 2017 +0200

loplugin:cstylecast/nullptr (clang-cl)

Change-Id: I04be0f4fe8c98909b37586080096ee05341f956f

diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index b1d8af3a9970..97c8ffee2987 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -793,9 +793,9 @@ oslSocket SAL_CALL osl_createSocket(
 int nErrno = WSAGetLastError();
 wchar_t *sErr = nullptr;
 FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-   NULL, nErrno,
+   nullptr, nErrno,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-   (LPWSTR)&sErr, 0, NULL);
+   reinterpret_cast(&sErr), 0, nullptr);
 SAL_WARN("sal.osl", "socket creation failed: (" << nErrno << ") " << 
sErr);
 LocalFree(sErr);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/debug loleaflet/dist loleaflet/src wsd/Admin.cpp wsd/Admin.hpp wsd/protocol.txt

[Pranav Kant]

 loleaflet/debug/document/admin.html|2 +-
 loleaflet/dist/admin/admin.html|2 +-
 loleaflet/src/admin/AdminSocketOverview.js |6 +++---
 wsd/Admin.cpp  |   14 --
 wsd/Admin.hpp  |4 
 wsd/protocol.txt   |   12 +---
 6 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit 29db4b447fda62913e25d66d5f6079bcb6c67ad7
Author: Pranav Kant 
Date:   Tue Aug 29 11:31:36 2017 +0530

admin protocol: 'total_mem' -> 'mem_consumed'

total_mem can be confused with total system memory or total memory
availabe to loolwsd process. Change the API to say what it actually
returns.

Change-Id: I55c246b8a1d0c5c52767520150e55616266a6d4f

diff --git a/loleaflet/debug/document/admin.html 
b/loleaflet/debug/document/admin.html
index 362864ff..947fdc40 100644
--- a/loleaflet/debug/document/admin.html
+++ b/loleaflet/debug/document/admin.html
@@ -87,7 +87,7 @@
  Documents opened


- 0
+ 0
  Memory consumed

  
diff --git a/loleaflet/dist/admin/admin.html b/loleaflet/dist/admin/admin.html
index 366d2cfb..306da27f 100644
--- a/loleaflet/dist/admin/admin.html
+++ b/loleaflet/dist/admin/admin.html
@@ -74,7 +74,7 @@
  
document.write(l10nstrings.strDocumentsOpened)


- 0
+ 0
  
document.write(l10nstrings.strMemoryConsumed)


diff --git a/loleaflet/src/admin/AdminSocketOverview.js 
b/loleaflet/src/admin/AdminSocketOverview.js
index da6f9a50..5e791c7a 100644
--- a/loleaflet/src/admin/AdminSocketOverview.js
+++ b/loleaflet/src/admin/AdminSocketOverview.js
@@ -13,7 +13,7 @@ var AdminSocketOverview = AdminSocketBase.extend({
_docElapsedTimeIntervalId: 0,
 
_getBasicStats: function() {
-   this.socket.send('total_mem');
+   this.socket.send('mem_consumed');
this.socket.send('active_docs_count');
this.socket.send('active_users_count');
this.socket.send('sent_bytes');
@@ -339,7 +339,7 @@ var AdminSocketOverview = AdminSocketBase.extend({
$(document.getElementById('docListContainer_' + 
encodedUId)).append($docentry);
}
}
-   else if (textMsg.startsWith('total_mem') ||
+   else if (textMsg.startsWith('mem_consumed') ||
textMsg.startsWith('active_docs_count') ||
textMsg.startsWith('active_users_count') ||
textMsg.startsWith('sent_bytes') ||
@@ -349,7 +349,7 @@ var AdminSocketOverview = AdminSocketBase.extend({
var sCommand = textMsg[0];
var nData = parseInt(textMsg[1]);
 
-   if (sCommand === 'total_mem' ||
+   if (sCommand === 'mem_consumed' ||
sCommand === 'sent_bytes' ||
sCommand === 'recv_bytes') {
nData = Util.humanizeMem(nData);
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index c574aa61..206062cb 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -142,8 +142,8 @@ void AdminSocketHandler::handleMessage(bool /* fin */, 
WSOpCode /* code */,
 model.unsubscribe(_sessionId, tokens[i + 1]);
 }
 }
-else if (tokens[0] == "total_mem")
-sendTextFrame("total_mem " + 
std::to_string(_admin->getTotalMemoryUsage()));
+else if (tokens[0] == "mem_consumed")
+sendTextFrame("mem_consumed " + 
std::to_string(_admin->getTotalMemoryUsage()));
 
 else if (tokens[0] == "total_avail_mem")
 sendTextFrame("total_avail_mem " + 
std::to_string(_admin->getTotalAvailableMemory()));
diff --git a/wsd/protocol.txt b/wsd/protocol.txt
index b75afe7d..4bd4258d 100644
--- a/wsd/protocol.txt
+++ b/wsd/protocol.txt
@@ -568,12 +568,12 @@ history
 }
 }
 
-total_mem
+mem_consumed
 sent_bytes
 recv_bytes
 
 Queries for total memory or bandwidth being consumed by the server
-in kilobytes. For total_mem this includes processes - loolwsd,
+in kilobytes. For mem_consumed this includes processes - loolwsd,
 loolforkit, and child processes hosting various documents. For
 sent/recv_bytes this includes only external traffic.
 
@@ -668,7 +668,13 @@ documents  
+mem_consumed 
+Total memory being consumed by LibreOffice Online.
+total_avail_mem 
+Total memory available to whole LibreOffice Online. This takes into account
+the memproportion setting, if set by the user, when calculating the amount
+of memory available to the process.
+
 sent_bytes 
 recv_bytes 
 
commit 65e3f7c7df67eb89ea575752fe0890c98dc29f13
Author: Pranav Kant 
Date:   Tue Aug 29 11:17:39 2017 +0530

admin: expose total available