Re: benchmark of Excel, Calc, Google Docs

[Kohei Yoshida]

Hello there,

On 07.12.2019 13:05, Michael Meeks wrote:


is an MDDS cell store - which is fairly well optimized for the test
you're doing here jumping down rows. We're missing a final re-work 
there

to make it log(log(N)) lookup with an interpolating search but ...


Just FYI, I'm actively working on this re-work, and it's mostly 
finished.  I'm just running some benchmarks on this change and see what 
changes we should be expecting performance-wise.  I'll write something 
up and summarize my findings soon.



Of course we build on MDDS - which provides some nice building blocks
for speadsheet re-use:

https://gitlab.com/mdds/mdds


And just to get this out there, I am the primary maintainer of MDDS (for 
good or bad).  So, in case you have any questions, feel free to contact 
me.


Both Dennis and Lubos should also be fairly familiar with MDDS based on 
their past contribution history.


Best,

Kohei

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

Re: MSVC C2280 error with ranged for and deleted copy ctor

[Stephan Bergmann]

On 09/12/2019 17:48, Luboš Luňák wrote:

  The relevant code is [2]. "GrFragmentProcessor::PaintCRange" is a ctor call
for a range type [3], which has "return CIter(fT);" as its begin(). And CIter
indeed has a deleted copy ctor, but AFAICT it shouldn't be needed, C++17's
guaranteed copy ellision should take care of it.


Advertisement vs. support of guaranteed copy elision is known broken 
with MSVC, see 
 
"Already set MSVC's -std:c++17 during the configure.ac feature check".



  And it builds with GCC/Clang, and it builds even with MSVC here locally. So
to me it looks like a MSVC bug that's been fixed. How much of a problem would
it be to bump the minimal required MSVC version (not that I know which one it
would be exactly)?


We detect HAVE_CPP_GUARANTEED_COPY_ELISION (cf. commit mentioned above) 
for at least the (most recent anyway, I think) VS 2019 version 16.3.10, 
_MSC_VER == 1923 that I have locally.


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

Re: Linux daily builds failing

[Michael Weghorn]

Hi,

On 09/12/2019 20.01, Xisco Fauli wrote:
> Since that last successful build
> 
> tinderbox: buildname: Linux-rpm_deb-x86_64@86-TDF
> tinderbox: tree: MASTER
> tinderbox: pull time 2019-11-28 20:14:48
> tinderbox: git sha1s
> core:5030be4e85179147476b1e441eb618fb6ed58235
> 
> Linux daily builds are failing with this error:
> 
> [build CUT] services
> [build CUT] sc_ucalc
> [build LNK] CppunitTest/libtest_sc_filters_test.so
> [build LNK] CppunitTest/libtest_sc_tiledrendering.so
> [build CUT] sccomp_solver
> [build CUT] sccomp_swarmsolvertest
> /tinderbox/buildslave/build/instdir/program/libvclplug_qt5lo.so has 
> suspicious NEEDED: libxcb-icccm.so.4
> /tinderbox/buildslave/build/instdir/program/lo_kde5filepicker has suspicious 
> NEEDED: libxcb-icccm.so.4
> make[1]: *** 
> [/tinderbox/buildslave/source/libo-master/postprocess/CustomTarget_check_dynamic_objects.mk:22:
>  
> /tinderbox/buildslave/build/workdir/CustomTarget/postprocess/check_dynamic_objects/check.done]
>  Error 1
> make[1]: *** Waiting for unfinished jobs
> 
> Config used:  Running ./configure with '--with-system-dicts 
> --with-myspell-dicts --with-system-zlib --without-system-poppler 
> --without-system-openssl --without-system-libpng --without-system-libxml 
> --without-system-jpeg --without-system-jars --without-system-postgresql 
> --without-junit --with-help=html --without-helppack-integration 
> --with-linker-hash-style=both --with-fonts 
> --with-external-thes-dir=/usr/share/mythes 
> --with-external-hyph-dir=/usr/share/hyphen 
> --with-external-dict-dir=/usr/share/hunspell --enable-avahi --enable-dbus 
> --enable-extension-integration --enable-odk --enable-gtk3-kde5 --enable-kf5 
> --enable-gstreamer-1-0 --enable-evolution2 --enable-gio 
> --enable-scripting-beanshell --enable-scripting-javascript 
> --enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-epm 
> --enable-python=internal --enable-online-update --enable-breakpad 
> --disable-dconf --enable-mergelibs --with-vendor=The Document Foundation 
> --with-lang=ALL --with-package-format=rpm deb --enable-gtk3 --ena
 ble-qt5 --enable-kde5 --disable-dependency-tracking 
--with-external-tar=/home/buildslave/source/lo-externalsrc 
--with-export-validation --enable-python=fully-internal 
--srcdir=/tinderbox/buildslave/source/libo-master 
--enable-option-checking=fatal'
> 
> Any idea where the problem might be?

That particular failure is because libxcb-icccm is used since commit
fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca ("Qt5 fix missing
XCB_ICCCM_WM_HINT_WINDOW_GROUP"). [1]

I'll submit a patch to fix this.


[1]
https://gerrit.libreoffice.org/plugins/gitiles/core/+/fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca%5E%21
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: testtools/source uitest/packaging

[Jens Carl (via logerrit)]

 testtools/source/bridgetest/pyuno/samplecomponent.py |  122 +--
 uitest/packaging/setup.py|   46 +++
 2 files changed, 84 insertions(+), 84 deletions(-)

New commits:
commit de077efae8265661905a47abb63dbfd6a69e1563
Author: Jens Carl 
AuthorDate: Sat Nov 23 23:22:05 2019 -0800
Commit: Jens Carl 
CommitDate: Tue Dec 10 08:43:13 2019 +0100

Fix IdentationError and mixture of spaces and tabs

Fix IdentationError and mixture of spaces and tabs found by
python -m py_compile .

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

diff --git a/testtools/source/bridgetest/pyuno/samplecomponent.py 
b/testtools/source/bridgetest/pyuno/samplecomponent.py
index 736af9bee858..a434cd0b479c 100644
--- a/testtools/source/bridgetest/pyuno/samplecomponent.py
+++ b/testtools/source/bridgetest/pyuno/samplecomponent.py
@@ -28,10 +28,10 @@ g_implName = "org.openoffice.comp.pyuno.PythonTestObject"
 
 g_attribs = "RuntimeException", "Bool", "Char", "Byte", "Short", "UShort", \
 "Long", "ULong", "Hyper", "UHyper", "Float", "Double", "Enum", \
-   "String", "Interface", "Any" , "Sequence" , "Struct"
+"String", "Interface", "Any" , "Sequence" , "Struct"
 
 def assign( rData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, 
nHyper,\
- nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny  ):
+  nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny  ):
 rData.Bool = bBool;
 rData.Char = cChar;
 rData.Byte = nByte;
@@ -50,96 +50,96 @@ def assign( rData, bBool, cChar, nByte, nShort, nUShort, 
nLong, nULong, nHyper,\
 
 class MyRecursiveCall( XRecursiveCall, unohelper.Base ):
   def callRecursivly( xCall, nToCall ):
- if nToCall:
-xCall.callRecursivly( self, nToCall -1 ) 
-
+  if nToCall:
+ xCall.callRecursivly( self, nToCall -1 )
+
 class SampleUnoComponent( XBridgeTestBase,XServiceInfo ):
   def __init__(self,ctx):
- self.__dict__["callid"] = 0
- self.__dict__["sequenceBroken"] = 0
+  self.__dict__["callid"] = 0
+  self.__dict__["sequenceBroken"] = 0
 
   def transportAny( self, value ):
- return value
+  return value
 
   def raiseException( self, ArgumentPosition, Message, Context ):
- raise IllegalArgumentException( Message, Context, ArgumentPosition )
-   
+  raise IllegalArgumentException( Message, Context, ArgumentPosition )
+
   def raiseRuntimeExceptionOneway(self, Message, Context ):
- raise RuntimeException( Message, Context )
+  raise RuntimeException( Message, Context )
 
   def setValues( self, bBool, cChar, nByte, nShort, nUShort, nLong,\
-nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, \
-aString, xInterface, aAny, aSequence, aStruct ):
+ nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, \
+ aString, xInterface, aAny, aSequence, aStruct ):
  self.__dict__["data"] = TestDataElements( bBool, cChar, nByte, 
nShort, nUShort, nLong,
- nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, 
aStruct, xInterface,
- aAny, aSequence )
- self.__dict__["Struct"] = aStruct  
+  nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, 
aStruct, xInterface,
+  aAny, aSequence )
+ self.__dict__["Struct"] = aStruct
 
   def setValues2( self, bBool, cChar, nByte, nShort, nUShort, nLong, 
nULong,\
- nHyper, nUHyper, fFloat, fDouble, eEnum,  \
- aString, xInterface, aAny, aSequence, aStruct ):
+  nHyper, nUHyper, fFloat, fDouble, eEnum,  \
+  aString, xInterface, aAny, aSequence, aStruct ):
   self.__dict__["Struct"] = TestData( cChar, nByte, nShort, nUShort, 
nLong, nULong, nHyper,\
- nUHyper, fFloat, fDouble, eEnum, 
aStruct, xInterface,\
- aAny, aSequence )
+  nUHyper, fFloat, fDouble, eEnum, 
aStruct, xInterface,\
+  aAny, aSequence )
   self.__dict__["Struct"] = aStruct
- return bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, 
nUHyper, nULong, \
-nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface, 
aAny,   \
-(aSequence[1],aSequence[0]), aStruct
-
+  return bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, 
nUHyper, nULong, \
+ nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInter

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Ruler.js |   31 +++
 1 file changed, 11 insertions(+), 20 deletions(-)

New commits:
commit f1044b1daea45452e06e8b6213d6c53391253ded
Author: Tor Lillqvist 
AuthorDate: Tue Dec 3 13:20:40 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 08:34:44 2019 +0100

tdf#128468: Get rid of a bunch of pointless variables

No reason to make the code even harder to understand by using
variables that don't vary but hold a constant value. Especially when
the variable names don't match their constant value.

No changes in what the code does.

Change-Id: If98ef6cdd741e76e8b4e383d005486736bf227a3
Reviewed-on: https://gerrit.libreoffice.org/84763
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index b0e9103d8..ac26fa342 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -95,16 +95,7 @@ L.Control.Ruler = L.Control.extend({
|| !this.options.marginSet)
this.options.extraSize = 0;
 
-   var classMajorSep = 'loleaflet-ruler-maj',
-   classMargin = 'loleaflet-ruler-margin',
-   classDraggable = 'loleaflet-ruler-drag',
-   rightComp = 'loleaflet-ruler-right',
-   leftComp = 'loleaflet-ruler-left',
-   lToolTip = 'loleaflet-ruler-ltooltip',
-   rToolTip = 'loleaflet-ruler-rtooltip',
-   leftMarginStr = _('Left Margin'),
-   rightMarginStr = _('Right Margin'),
-   DraggableConvertRatio, lMargin, rMargin, wPixel, scale;
+   var DraggableConvertRatio, lMargin, rMargin, wPixel, scale;
 
lMargin = this.options.nullOffset;
rMargin = this.options.pageWidth - (this.options.nullOffset + 
this.options.margin2);
@@ -119,10 +110,10 @@ L.Control.Ruler = L.Control.extend({
 
var numCounter = -1 * parseInt(lMargin / 1000);
 
-   $('.' + classMajorSep).remove();
+   $('.loleaflet-ruler-maj').remove();
for (var num = 0; num <= (this.options.pageWidth / 1000) + 1; 
num++) {
 
-   var marker = L.DomUtil.create('div', classMajorSep, 
this._rBPContainer);
+   var marker = L.DomUtil.create('div', 
'loleaflet-ruler-maj', this._rBPContainer);
marker.style.width = DraggableConvertRatio*1000 - 2 + 
'px';
if (this.options.displayNumber) {
if (numCounter !== 0)
@@ -136,15 +127,15 @@ L.Control.Ruler = L.Control.extend({
 
this.options.marginSet = true;
 
-   this._lMarginMarker = L.DomUtil.create('div', 
classMargin + ' ' + leftComp, this._rFace);
-   this._rMarginMarker =  L.DomUtil.create('div', 
classMargin + ' ' + rightComp, this._rFace);
+   this._lMarginMarker = L.DomUtil.create('div', 
'loleaflet-ruler-margin loleaflet-ruler-left', this._rFace);
+   this._rMarginMarker =  L.DomUtil.create('div', 
'loleaflet-ruler-margin loleaflet-ruler-right', this._rFace);
 
-   this._lMarginDrag = L.DomUtil.create('div', 
classDraggable + ' ' + leftComp, this._rMarginWrapper);
-   this._lToolTip = L.DomUtil.create('div', lToolTip, 
this._lMarginDrag);
-   this._rMarginDrag = L.DomUtil.create('div', 
classDraggable + ' ' + rightComp, this._rMarginWrapper);
-   this._rToolTip = L.DomUtil.create('div', rToolTip, 
this._rMarginDrag);
-   this._lMarginDrag.title = leftMarginStr;
-   this._rMarginDrag.title = rightMarginStr;
+   this._lMarginDrag = L.DomUtil.create('div', 
'loleaflet-ruler-drag loleaflet-ruler-left', this._rMarginWrapper);
+   this._lToolTip = L.DomUtil.create('div', 
'loleaflet-ruler-ltooltip', this._lMarginDrag);
+   this._rMarginDrag = L.DomUtil.create('div', 
'loleaflet-ruler-drag loleaflet-ruler-right', this._rMarginWrapper);
+   this._rToolTip = L.DomUtil.create('div', 
'loleaflet-ruler-rtooltip', this._rMarginDrag);
+   this._lMarginDrag.title = _('Left Margin');
+   this._rMarginDrag.title = _('Right Margin');
 
if (window.ThisIsTheiOSApp) {
this.options.interactive = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Ruler.js |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit e8ee2aa06e654980248e0a7dbb599eb7738f8525
Author: Tor Lillqvist 
AuthorDate: Mon Dec 2 16:43:18 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 08:32:54 2019 +0100

tdf#128468: Make the margin handles in the ruler work better in the iOS app

There is too much state that isn't necessarily in sync. Get rid of
some of the coupling.

Instead of turning on the catching of touchstart events in the
_changeInteractions function, which does not work if you tap the
make-editable button before the document has been loaded completely,
start catching them right away after creation, but in the handler, the
_initiateDrag function, ignore the event if the "map" is not yet
marked as editable.

Change-Id: Ief7a98e9b6ffa4db9d41f558d1081687032c4bcc
Reviewed-on: https://gerrit.libreoffice.org/84235
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 4e42bae4a73fe8342921f4d695e9c84e723e3f33)
Reviewed-on: https://gerrit.libreoffice.org/84762
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index a67d69421..b0e9103d8 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -45,12 +45,7 @@ L.Control.Ruler = L.Control.extend({
this._lMarginDrag.style.cursor = 'e-resize';
this._rMarginDrag.style.cursor = 'w-resize';
 
-   if (window.ThisIsTheiOSApp) {
-   this.options.interactive = true;
-   L.DomEvent.on(this._rMarginDrag, 
'touchstart', this._initiateDrag, this);
-   L.DomEvent.on(this._lMarginDrag, 
'touchstart', this._initiateDrag, this);
-   }
-   else {
+   if (!window.ThisIsTheiOSApp) {
L.DomEvent.on(this._rMarginDrag, 
'mousedown', this._initiateDrag, this);
L.DomEvent.on(this._lMarginDrag, 
'mousedown', this._initiateDrag, this);
}
@@ -59,11 +54,7 @@ L.Control.Ruler = L.Control.extend({
this._lMarginDrag.style.cursor = 'default';
this._rMarginDrag.style.cursor = 'default';
 
-   if (window.ThisIsTheiOSApp) {
-   L.DomEvent.off(this._rMarginDrag, 
'touchstart', this._initiateDrag, this);
-   L.DomEvent.off(this._lMarginDrag, 
'touchstart', this._initiateDrag, this);
-   }
-   else {
+   if (!window.ThisIsTheiOSApp) {
L.DomEvent.off(this._rMarginDrag, 
'mousedown', this._initiateDrag, this);
L.DomEvent.off(this._lMarginDrag, 
'mousedown', this._initiateDrag, this);
}
@@ -154,6 +145,12 @@ L.Control.Ruler = L.Control.extend({
this._rToolTip = L.DomUtil.create('div', rToolTip, 
this._rMarginDrag);
this._lMarginDrag.title = leftMarginStr;
this._rMarginDrag.title = rightMarginStr;
+
+   if (window.ThisIsTheiOSApp) {
+   this.options.interactive = true;
+   L.DomEvent.on(this._rMarginDrag, 'touchstart', 
this._initiateDrag, this);
+   L.DomEvent.on(this._lMarginDrag, 'touchstart', 
this._initiateDrag, this);
+   }
}
 
this._lMarginMarker.style.width = 
(DraggableConvertRatio*lMargin) + 'px';
@@ -199,6 +196,9 @@ L.Control.Ruler = L.Control.extend({
e.clientX = e.touches[0].clientX;
}
 
+   if (window.ThisIsTheiOSApp && this._map._permission !== 'edit')
+   return;
+
this._map.rulerActive = true;
 
var dragableElem = e.srcElement || e.target;
___
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-6.2' - vcl/inc

[Tor Lillqvist (via logerrit)]

 vcl/inc/helpwin.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7a38270abd5c16af2a28055688d9998e958b127
Author: Tor Lillqvist 
AuthorDate: Tue Dec 10 07:11:30 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 08:31:26 2019 +0100

ImplSVHelpData is a struct

Avoid warning: class 'ImplSVHelpData' was previously declared as a
struct; this is valid, but may result in linker errors under the
Microsoft C++ ABI [-Wmismatched-tags].

Change-Id: I60cee7e5dad77dc8447acb7c333fb8f7c3919b3b
Reviewed-on: https://gerrit.libreoffice.org/84796
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 178a6edb8f63..c6977ea67ad5 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -24,7 +24,7 @@
 #include 
 
 enum class QuickHelpFlags;
-class ImplSVHelpData;
+struct ImplSVHelpData;
 
 class HelpTextWindow : public FloatingWindow
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - basic/source

[Mike Kaganski (via logerrit)]

 basic/source/sbx/sbxbase.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit bd0764d4d24f3a9f5fd279db888d12b55bd6b241
Author: Mike Kaganski 
AuthorDate: Fri Dec 6 12:25:15 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 10 08:16:31 2019 +0100

tdf#129227: this was always appending, not prepending

Regression after 0761f97525b3f3ce2cd73f8db28bf389a3c44f57
The change replaced

// From 1996-03-06: take the HandleLast-Flag into account
sal_uInt16 nPos = r.m_Factories.size(); // Insert position
if( !pFac->IsHandleLast() ) // Only if not self HandleLast
{
// Rank new factory in front of factories with HandleLast
while (nPos > 0 && r.m_Factories[ nPos-1 ]->IsHandleLast())
nPos--;
}
r.m_Factories.insert(r.m_Factories.begin() + nPos, 
std::unique_ptr(pFac));

with

r.m_Factories.insert(r.m_Factories.begin(), 
std::unique_ptr(pFac));

Before that commit condition in while was always false, so decrementing
nPos had never happened, and insertion to the end was always performed.
This change restores that.

Change-Id: I778d6fdc93e9078a541a9b98c9432b5cf88d9791
Reviewed-on: https://gerrit.libreoffice.org/84609
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit ffd319a7589e0e9fcb83681f7f1e7c26a383ae5d)
Reviewed-on: https://gerrit.libreoffice.org/84666
Tested-by: Jenkins
(cherry picked from commit 87b421d25ef79e197d344e6bd515f1eadd06bfc9)
Reviewed-on: https://gerrit.libreoffice.org/84743
Reviewed-by: Noel Grandin 

diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 22dbb951c145..ae653c651ce6 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -115,9 +115,7 @@ void SbxBase::ResetError()
 
 void SbxBase::AddFactory( SbxFactory* pFac )
 {
-SbxAppData& r = GetSbxData_Impl();
-
-r.m_Factories.insert(r.m_Factories.begin(), 
std::unique_ptr(pFac));
+GetSbxData_Impl().m_Factories.emplace_back(pFac);
 }
 
 void SbxBase::RemoveFactory( SbxFactory const * pFac )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Scroll.js |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 317afcecb4f5c691817c9675bb9711781ef81f9c
Author: Tor Lillqvist 
AuthorDate: Thu Nov 28 14:33:20 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 07:51:24 2019 +0100

Improve ruler behaviour when panning by dragging on a touch device

Fire the 'scrolloffset' event also in
L.Control.Scroll._onUpdateScrollOffset(), which gets called when
panning a text document on a touch device.

There are still glitches in updating the ruler when one uses a pinch
gesture to zoom the document. But usually after a short moment the
ruler snaps into correct state.

Change-Id: Ic8dd5139ff49f6fe7961096552f1c7e6cf35356c
Reviewed-on: https://gerrit.libreoffice.org/83996
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/84048
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/src/control/Control.Scroll.js 
b/loleaflet/src/control/Control.Scroll.js
index 043302004..91da67f41 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -241,16 +241,18 @@ L.Control.Scroll = L.Control.extend({
 
_onUpdateScrollOffset: function (e) {
// used on window resize
+   // also when dragging
+   var offset = new L.Point(e.x - this._prevScrollX, e.y - 
this._prevScrollY);
+   if (offset.x === 0) {
+   offset.x = 1;
+   }
+   if (offset.y === 0) {
+   offset.y = 1;
+   }
if (e.updateHeaders && this._map._docLayer._docType === 
'spreadsheet') {
-   var offset = new L.Point(e.x - this._prevScrollX, e.y - 
this._prevScrollY);
-   if (offset.x === 0) {
-   offset.x = 1;
-   }
-   if (offset.y === 0) {
-   offset.y = 1;
-   }
this._onUpdateRowColumnHeaders({x: e.x, y: e.y, offset: 
offset});
}
+   this._map.fire('scrolloffset', offset);
this._ignoreScroll = null;
$('.scroll-container').mCustomScrollbar('stop');
this._prevScrollY = e.y;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Ruler.js |   59 ++---
 1 file changed, 49 insertions(+), 10 deletions(-)

New commits:
commit 7585789456cc5e42d968a483d83cc6248b1f3862
Author: Tor Lillqvist 
AuthorDate: Tue Nov 26 18:44:26 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 05:45:30 2019 +0100

tdf#128468: Make dragging the margins in the ruler work better in iOS app

Note that in this branch it seems even harder to touch a margin handle
in the ruler exactly in the right spot to be able to drag it. You will
have to use your smallest finger and point very exactly. And still it
works only sometimes. (But I did get it to work once, honestly, so
ship it!) This obviously needs to be fixed, but cherry-picking this
commit as is for now.

Several changes:

On iOS, use touch events instead of mouse ones. One difference between
touch and mouse events is that the touchend event naturally does not
carry any position information (as the finger has been lifted from the
screen). So we need to keep track of where the last touchmove event
happened separately in _lastPosition.

Letting go of a margin handle after dragging it did not actually move
the coresponding margin in the document. The fix for this was to catch
the touchend event for the this._rFace element instead of for the
this._map element.

Once a margin had been moved, it could not be moved another time. The
reason for this was that because the document initially is readonly,
the this.options.interactive was set to false (see the
L.control.ruler() call in loleaflet/src/map/Map.js) and never changed
after that. This caused _updateBreakPoints() to pass {perm:'readonly'}
in the call to this._changeInteractions(). The fix was to set
this.options.interactive to true when turning on the interaction.

In theory this same problem probably would happen also in web-based
Online on "mobile" (i.e. phones), but we don't show the ruler there at
all, so the sitaution where a document would be initially read-only
and the ruler would show up doesn't happen.

Reviewed-on: https://gerrit.libreoffice.org/83807
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit caf37fb293a666b0a82ac8bd31df35b18b45fc01)

Change-Id: I0393704d02a2989b4ea3358dc4bee17e48c16ae6
Reviewed-on: https://gerrit.libreoffice.org/84047
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index f00522797..a67d69421 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -45,15 +45,28 @@ L.Control.Ruler = L.Control.extend({
this._lMarginDrag.style.cursor = 'e-resize';
this._rMarginDrag.style.cursor = 'w-resize';
 
-   L.DomEvent.on(this._rMarginDrag, 'mousedown', 
this._initiateDrag, this);
-   L.DomEvent.on(this._lMarginDrag, 'mousedown', 
this._initiateDrag, this);
+   if (window.ThisIsTheiOSApp) {
+   this.options.interactive = true;
+   L.DomEvent.on(this._rMarginDrag, 
'touchstart', this._initiateDrag, this);
+   L.DomEvent.on(this._lMarginDrag, 
'touchstart', this._initiateDrag, this);
+   }
+   else {
+   L.DomEvent.on(this._rMarginDrag, 
'mousedown', this._initiateDrag, this);
+   L.DomEvent.on(this._lMarginDrag, 
'mousedown', this._initiateDrag, this);
+   }
}
else {
this._lMarginDrag.style.cursor = 'default';
this._rMarginDrag.style.cursor = 'default';
 
-   L.DomEvent.off(this._rMarginDrag, 'mousedown', 
this._initiateDrag, this);
-   L.DomEvent.off(this._lMarginDrag, 'mousedown', 
this._initiateDrag, this);
+   if (window.ThisIsTheiOSApp) {
+   L.DomEvent.off(this._rMarginDrag, 
'touchstart', this._initiateDrag, this);
+   L.DomEvent.off(this._lMarginDrag, 
'touchstart', this._initiateDrag, this);
+   }
+   else {
+   L.DomEvent.off(this._rMarginDrag, 
'mousedown', this._initiateDrag, this);
+   L.DomEvent.off(this._lMarginDrag, 
'mousedown', this._initiateDrag, this);
+   }
}

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

[Tor Lillqvist (via logerrit)]

 sw/source/uibase/misc/swruler.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a3dcf498040111cf6f3fb96822c175d80f26d822
Author: Tor Lillqvist 
AuthorDate: Thu Dec 5 00:28:41 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 05:15:41 2019 +0100

tdf#128468: The RulerTab::nPos is in twips

Do pass that as actual mm100 then.

Change-Id: Ifc9608aeee838172a18cc07aa1dbe0d7f3f5fb6a
Reviewed-on: https://gerrit.libreoffice.org/84473
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit a69f5b1386fc7e3f7f9838c078e4078c555d)
Reviewed-on: https://gerrit.libreoffice.org/84761

diff --git a/sw/source/uibase/misc/swruler.cxx 
b/sw/source/uibase/misc/swruler.cxx
index ae3f35a8f2c8..76682e5468e9 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -276,14 +276,17 @@ const std::string SwCommentRuler::CreateJsonNotification()
 jsonNotif.put("pageOffset", convertTwipToMm100(GetPageOffset()));
 
 // GetPageWidth() on the other hand does return a value in twips.
+// So here convertTwipToMm100() really does produce actual mm100. Fun.
 jsonNotif.put("pageWidth", convertTwipToMm100(GetPageWidth()));
 
 boost::property_tree::ptree tabs;
 
+// The RulerTab array elements that GetTabs() returns have their nPos 
field in twips. So these
+// too are actual mm100.
 for (auto const& tab : GetTabs())
 {
 boost::property_tree::ptree element;
-element.put("position", tab.nPos);
+element.put("position", convertTwipToMm100(tab.nPos));
 element.put("style", tab.nStyle);
 tabs.push_back(std::make_pair("", element));
 }
___
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-6.2' - include/svtools svtools/source

[Tor Lillqvist (via logerrit)]

 include/svtools/ruler.hxx|2 ++
 svtools/source/control/ruler.cxx |5 +
 2 files changed, 7 insertions(+)

New commits:
commit dd2c3914515166542b075873575095032dfa0566
Author: Tor Lillqvist 
AuthorDate: Wed Dec 4 16:18:01 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 05:14:49 2019 +0100

tdf#128468: Add Ruler::GetTabs()

Change-Id: I785f8af1eec54f36721a354c4d3f82d8b86ceb86
Reviewed-on: https://gerrit.libreoffice.org/84419
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/84519
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/84759

diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 5a7c463aa3b5..597c4bf35494 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -784,6 +785,7 @@ public:
 voidSetIndents( sal_uInt32 n = 0, const RulerIndent* 
pIndentAry = nullptr );
 
 voidSetTabs( sal_uInt32 n = 0, const RulerTab* pTabAry = 
nullptr );
+const std::vector& GetTabs() const;
 
 static void DrawTab(vcl::RenderContext& rRenderContext, const Color 
&rFillColor,
 const Point& rPos, sal_uInt16 nStyle);
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 08ed80387231..a3ec691eea49 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2676,6 +2676,11 @@ void Ruler::SetTabs( sal_uInt32 aTabArraySize, const 
RulerTab* pTabArray )
 ImplUpdate();
 }
 
+const std::vector& Ruler::GetTabs() const
+{
+return mpData->pTabs;
+}
+
 void Ruler::SetStyle( WinBits nStyle )
 {
 if ( mnWinStyle != nStyle )
___
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-6.2' - sw/source

[Tor Lillqvist (via logerrit)]

 sw/source/uibase/misc/swruler.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 20c02c0f54618deb6b8c9af640f1e05e6a1168a2
Author: Tor Lillqvist 
AuthorDate: Wed Dec 4 16:19:24 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 10 05:15:09 2019 +0100

tdf#128468: Add tab stop information to LOK_CALLBACK_RULER_UPDATE

Change-Id: I7872cdc3aabf66bb6d1df09f503274c698b64a4e
Reviewed-on: https://gerrit.libreoffice.org/84420
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 8a840463fc8abbbc445fed91463a1e2eb42dc1aa)
Reviewed-on: https://gerrit.libreoffice.org/84760

diff --git a/sw/source/uibase/misc/swruler.cxx 
b/sw/source/uibase/misc/swruler.cxx
index 7dd10518dc34..ae3f35a8f2c8 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -278,6 +278,18 @@ const std::string SwCommentRuler::CreateJsonNotification()
 // GetPageWidth() on the other hand does return a value in twips.
 jsonNotif.put("pageWidth", convertTwipToMm100(GetPageWidth()));
 
+boost::property_tree::ptree tabs;
+
+for (auto const& tab : GetTabs())
+{
+boost::property_tree::ptree element;
+element.put("position", tab.nPos);
+element.put("style", tab.nStyle);
+tabs.push_back(std::make_pair("", element));
+}
+
+jsonNotif.add_child("tabs", tabs);
+
 RulerUnitData aUnitData = GetCurrentRulerUnit();
 jsonNotif.put("unit", aUnitData.aUnitStr);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GPU optimization feedback (I hope ;-)

[Drew Jensen]

Well, Wikisteff, on Twitter, with the "25th order Runge-kutta integrator in
Excel without using VB" (To be honest I don't really know what that is ;-/)
test file responded to the thank you with;

"I, for one, cannot wait for more multicore/GPU. Libre is a fantastic
product, and I would be happy to share my sheets, such as they are, with
them."

So, question for the list; Take him up on the offer?

If there is a use for another test file I'll let them know and IDK get it
to the QA group, I guess - ?

Thanks



On Mon, Dec 9, 2019 at 2:10 PM Drew Jensen 
wrote:

> Howdy,
>
> Thought I'd pass on a twitter exchange, to the list here, between myself
> and Wikisteff regarding another attempt to benchmark some of the changes to
> Calc recently.
>
> Wikisteff: "Oh, yeah!
> I wrote a 25th order Runge-Kutta integrator in Excel without using VB as
> well."
>
> Wikisteff: "Well, it *was* part of a head-to-head test to see how GPU
> parallel evaluation of floating-point code worked in practice on
> @LibreOffice  Calc.
> @MSExcel  was the control. ;)"
>
> Me: "I would love to see results from a GPU parallel evaluation of
> floating-point code comparison between Calc and Excel. Is that available
> somewhere?  thanks."
>
> Wikisteff: "I didn't publish my results, but they amounted to "if the
> calculation is simple, like a uniform linear transformation or a matrix
> multiplication, high speedup. If the calculation is nonroutine, like a
> nonlinear transform interwoven with large matrix products, no speedup."
>
> Anyway, I haven't replied on twitter yet, will in a minute or two and
> thank him for his time and that piece of feedback.
>
> Personally I don't know if any of that is useful as feedback, hope so.
>
> Best wishes,
>
> Drew
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 50211a1e14a4db933abf7aeebfc8529164a32987
Author: Ashod Nakashian 
AuthorDate: Mon Dec 9 21:06:43 2019 -0500
Commit: Ashod Nakashian 
CommitDate: Tue Dec 10 03:11:22 2019 +0100

leaflet: resize the document-content properly when toggling the sidebar

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

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 18efb9de4..997fb9aac 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -870,7 +870,8 @@ L.Control.LokDialog = L.Control.extend({
},
 
_onSidebarClose: function(dialogId) {
-   this._resizeSidebar(dialogId, 0);
+   var strId = this._toStrId(dialogId);
+   this._resizeSidebar(strId, 0);
delete this._dialogs[dialogId];
if (this._currentDeck) {
$('#' + this._currentDeck.strId).remove();
@@ -1059,6 +1060,7 @@ L.Control.LokDialog = L.Control.extend({
this._map.options.documentContainer.style.right = 
wrapper.offsetWidth + 'px';
else
this._map.options.documentContainer.style.right = 
(width - 15).toString() + 'px';
+
var spreadsheetRowColumnFrame = 
L.DomUtil.get('spreadsheet-row-column-frame');
if (spreadsheetRowColumnFrame)
spreadsheetRowColumnFrame.style.right = 
width.toString() + 'px';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fw: benchmark of Excel, Calc, Google Docs

[Wols Lists]

On 09/12/19 19:14, Aditya Parameswaran wrote:
>The idea of converting to SQL queries is an interesting one
> but I find
> it very hard to believe it would provide any performance advantage at
> the same memory footprint. Furthermore - I'd be interested to know how
> you do other spreadsheet operations: row & column insertion, addressing,
> and dependency work on top of a SQL database with any efficiency.
> 
> 
> We started by having the relational database be a simple persistent
> storage layer, when coupled with an index to retrieve data by position,
> can allow us to scroll through large datasets of billions of rows at
> ease. We developed a new positional index to handle insertions and
> deletions in O(log(n)) -- https://arxiv.org/pdf/1708.06712.pdf. I agree
> that pushing the computation to the relational database does have
> overheads; but at the same time, it allows for scaling to arbitrarily
> large datasets. 

"the quickest way to optimise database access is to ditch first normal
form".

A provocative statement I know, but I'm very much in the NoSQL camp. I
can hunt up the details of a face-off between Oracle and Cache, where
Oracle had to "cheat" to achieve 100K tpm (things like deferring index
updates) whereas Cache blasted through 250K barely breaking a sweat ...
(or it might well have been tps)

The maths supports this ...

That said, a spreadsheet is inherently first normal formal, so tying a
spreadsheet and a relational database together MAY make sense.

In general though, Einstein said "make things as simple as possible BUT
NO SIMPLER". Relational oversimplifies the database side, which means
the application side is over-complex in order to compensate. (Which is
why Cache blew Oracle out of the water.)

I'm quite happy to wax lyrical, but I'd rather not preach to an audience
who aren't at least interested. Feel free to ask me to continue on list,
or contact me privately, and I'll try to prove everything as
mathematically as I can :-)

> but at the same time, it allows for scaling to arbitrarily
> large datasets.

At the price of massive unnecessary complexity.

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

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

[Olivier Hallot (via logerrit)]

 help3/xhpeditor/ed_transform.xsl |   22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 17084948575e6e6f33fc7451d9614807ca7ef1c3
Author: Olivier Hallot 
AuthorDate: Mon Dec 9 18:20:19 2019 -0300
Commit: Olivier Hallot 
CommitDate: Tue Dec 10 01:01:33 2019 +0100

handle rendered images style

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

diff --git a/help3/xhpeditor/ed_transform.xsl b/help3/xhpeditor/ed_transform.xsl
index d4c742f..d97355e 100644
--- a/help3/xhpeditor/ed_transform.xsl
+++ b/help3/xhpeditor/ed_transform.xsl
@@ -963,6 +963,22 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -975,11 +991,7 @@
 
 
 Image href: 
-
-
-
-
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 04cb0674550e63fe2db8f0b0500f9364fb572e12
Author: Olivier Hallot 
AuthorDate: Mon Dec 9 13:45:00 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Dec 10 01:00:54 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Remove dup bookmark_value

Change-Id: I38342954ab76b978bafc49bccbd63631aeef5a3e
Reviewed-on: https://gerrit.libreoffice.org/84777
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 8a9eeb535a80..84390b65ef45 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8a9eeb535a80d07fa6f7b1d495544b95a045819c
+Subproject commit 84390b65ef45f7b3b8868abf03429acca09206d4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/swriter/guide/captions.xhp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 84390b65ef45f7b3b8868abf03429acca09206d4
Author: Olivier Hallot 
AuthorDate: Mon Dec 9 13:45:00 2019 -0300
Commit: Olivier Hallot 
CommitDate: Tue Dec 10 01:00:54 2019 +0100

Remove dup bookmark_value

Change-Id: I38342954ab76b978bafc49bccbd63631aeef5a3e
Reviewed-on: https://gerrit.libreoffice.org/84777
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/guide/captions.xhp 
b/source/text/swriter/guide/captions.xhp
index 2881a3e99..46047d24f 100644
--- a/source/text/swriter/guide/captions.xhp
+++ b/source/text/swriter/guide/captions.xhp
@@ -33,7 +33,6 @@
   editing;captions
   objects; captioning
   tables; labeling
-  frames; labeling
   charts; labeling
   frames; labeling
   draw objects; inserting captions
@@ -73,4 +72,4 @@
 
 
 
-
\ No newline at end of file
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sw/qa writerfilter/source

[brinzing (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf124986.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx|   22 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 ++--
 3 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit 701b5cfe9d908b346e95054b565d05747775ae79
Author: brinzing 
AuthorDate: Fri Nov 1 16:36:31 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 10 00:25:28 2019 +0100

tdf#124986: docx: remove trailing quotation marks and spaces from set fields

Reviewed-on: https://gerrit.libreoffice.org/81892
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf124986.docx 
b/sw/qa/extras/ooxmlexport/data/tdf124986.docx
new file mode 100755
index ..e5bb8f4966b8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf124986.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index d7d41b1d1e36..fc79b451ce39 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -771,6 +771,28 @@ DECLARE_OOXMLEXPORT_TEST(testTdf105444, "tdf105444.docx")
 assertXPath(pXmlComm, "/w:comments/w:comment/w:p", 1);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf124986, "tdf124986.docx")
+{
+// Load a document with SET fields, where the SET fields contain 
leading/trailing quotation marks and spaces.
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xFieldsAccess(
+xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+
+while (xFields->hasMoreElements())
+{
+uno::Reference 
xServiceInfo(xFields->nextElement(), uno::UNO_QUERY);
+uno::Reference xPropertySet(xServiceInfo, 
uno::UNO_QUERY);
+OUString aValue;
+if 
(xServiceInfo->supportsService("com.sun.star.text.TextField.SetExpression"))
+{
+xPropertySet->getPropertyValue("Content") >>= aValue;
+CPPUNIT_ASSERT_EQUAL(OUString("demo"), aValue);
+}
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ecb73bb038f4..2506a9609206 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3149,9 +3149,13 @@ void DomainMapper_Impl::handleFieldSet
 sVariable = lcl_ExctractVariableAndHint(pContext->GetCommand(), sHint);
 
 // remove surrounding "" if exists
-if( sHint.getLength() >= 2 && sHint.startsWith("\"") )
+if(sHint.getLength() >= 2)
 {
-sHint = sHint.trim().copy(1, sHint.getLength() - 2);
+OUString sTmp = sHint.trim();
+if (sTmp.startsWith("\"") && sTmp.endsWith("\""))
+{
+sHint = sTmp.copy(1, sTmp.getLength() - 2);
+}
 }
 
 // determine field master name
___
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-6.2' - sc/source

[Michael Meeks (via logerrit)]

 sc/source/ui/inc/gridwin.hxx   |1 +
 sc/source/ui/unoobj/docuno.cxx |3 ++-
 sc/source/ui/view/gridwin.cxx  |   38 +-
 3 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit ca2fdd792de5d6d208097b3049238865058c7cc1
Author: Michael Meeks 
AuthorDate: Mon Dec 9 15:40:24 2019 +
Commit: Michael Meeks 
CommitDate: Mon Dec 9 23:01:08 2019 +0100

lok: calc - update our version of the other view's selections on zoom.

Change-Id: I4d23bb77045b41d04109e7dd70a1f47bca8aaa56
Reviewed-on: https://gerrit.libreoffice.org/84767
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 39242ccd0c1a..70f0e267b8fa 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -438,6 +438,7 @@ public:
 void updateKitCellCursor(const SfxViewShell* pOtherShell) const;
 /// notify this view with new positions for other view's cursors (after 
zoom)
 void updateKitOtherCursors() const;
+void updateOtherKitSelections() const;
 
 /// Same as MouseButtonDown(), but coordinates are in logic unit.
 virtual void LogicMouseButtonDown(const MouseEvent& rMouseEvent) override;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0a80f7a7579b..eb6957a0a5c1 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -893,8 +893,9 @@ void ScModelObj::setClientZoom(int nTilePixelWidth_, int 
nTilePixelHeight_, int
 pViewData->SetZoom(Fraction(nTilePixelWidth_ * TWIPS_PER_PIXEL, 
nTileTwipWidth_),
Fraction(nTilePixelHeight_ * TWIPS_PER_PIXEL, 
nTileTwipHeight_), true);
 
-// refresh our view's take on other view's cursors
+// refresh our view's take on other view's cursors & selections
 pViewData->GetActiveWin()->updateKitOtherCursors();
+pViewData->GetActiveWin()->updateOtherKitSelections();
 }
 
 OUString ScModelObj::getRowColumnHeaders(const tools::Rectangle& rRectangle)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 702031677df4..638c8b645aa6 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5882,7 +5882,7 @@ static OString rectanglesToString(const 
std::vector &rLogicRec
 }
 
 /**
- * Turn the selection ranges rRectangles into the LibreOfficeKit selection, 
and call the callback.
+ * Turn the selection ranges rRectangles into the LibreOfficeKit selection, 
and send to other views.
  *
  * @param pLogicRects - if set then don't invoke the callback, just collect 
the rectangles in the pointed vector.
  */
@@ -5928,6 +5928,42 @@ void ScGridWindow::UpdateKitSelection(const 
std::vector& rRect
 }
 }
 
+/**
+ * Fetch the selection ranges for other views into the LibreOfficeKit 
selection,
+ * map them into our view co-ordinates and send to our view.
+ */
+void ScGridWindow::updateOtherKitSelections() const
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+
+for (SfxViewShell* it = SfxViewShell::GetFirst(); it;
+ it = SfxViewShell::GetNext(*it))
+{
+auto pOther = dynamic_cast(it);
+assert(pOther);
+if (!pOther)
+return;
+
+const ScGridWindow *pGrid = pOther->GetViewData().GetActiveWin();
+assert(pGrid);
+
+// Fetch pixels & convert for each view separately.
+tools::Rectangle aBoundingBox;
+std::vector aPixelRects;
+GetPixelRectsFor(pOther->GetViewData().GetMarkData() /* theirs */, 
aPixelRects);
+auto aOtherLogicRects = 
convertPixelToLogical(&pViewShell->GetViewData(), aPixelRects, aBoundingBox);
+OString aRectsString = rectanglesToString(aOtherLogicRects);
+if (it == pViewShell)
+{
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_SELECTION_AREA, 
aBoundingBox.toString().getStr());
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, 
aRectsString.getStr());
+}
+else
+SfxLokHelper::notifyOtherView(it, pViewShell, 
LOK_CALLBACK_TEXT_VIEW_SELECTION,
+  "selection", aRectsString.getStr());
+}
+}
+
 namespace
 {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/source/dialog/spacinglistbox.cxx |7 
 sw/source/uibase/sidebar/PageFooterPanel.cxx |   39 ---
 sw/source/uibase/sidebar/PageFooterPanel.hxx |6 
 sw/source/uibase/sidebar/PageFormatPanel.cxx |   11 +++
 sw/source/uibase/sidebar/PageFormatPanel.hxx |2 -
 sw/source/uibase/sidebar/PageHeaderPanel.cxx |   38 --
 sw/source/uibase/sidebar/PageHeaderPanel.hxx |6 
 7 files changed, 95 insertions(+), 14 deletions(-)

New commits:
commit fc280552a5ee0131a08aeea5ccfd8cb7b9a6225d
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 20:16:23 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 22:25:34 2019 +0100

Related: tdf#129267 change spacing unit when measurement unit changes

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

diff --git a/svx/source/dialog/spacinglistbox.cxx 
b/svx/source/dialog/spacinglistbox.cxx
index e0a508e9830a..85ebc624931c 100644
--- a/svx/source/dialog/spacinglistbox.cxx
+++ b/svx/source/dialog/spacinglistbox.cxx
@@ -29,6 +29,11 @@ SpacingListBox::SpacingListBox(vcl::Window* pParent)
 
 void SpacingListBox::Init(SpacingType eType)
 {
+auto nSelected = GetSelectedEntryPos();
+if (nSelected == LISTBOX_ENTRY_NOTFOUND)
+nSelected = 0;
+Clear();
+
 const std::pair* pResources;
 switch (eType)
 {
@@ -57,7 +62,7 @@ void SpacingListBox::Init(SpacingType eType)
 }
 
 SetDropDownLineCount(8);
-SelectEntryPos(0);
+SelectEntryPos(nSelected);
 }
 
 VCL_BUILDER_FACTORY(SpacingListBox);
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx 
b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index 08be58fa95c4..4cc0c62d0624 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -52,6 +52,12 @@ VclPtr PageFooterPanel::Create(
 return VclPtr::Create(pParent, rxFrame, pBindings);
 }
 
+void PageFooterPanel::SetMarginsAndSpacingFieldUnit()
+{
+mpFooterSpacingLB->Init(IsInch(meFUnit) ? SpacingType::SPACING_INCH : 
SpacingType::SPACING_CM);
+mpFooterMarginPresetLB->Init(IsInch(meFUnit) ? SpacingType::MARGINS_INCH : 
SpacingType::MARGINS_CM);
+}
+
 PageFooterPanel::PageFooterPanel(
 vcl::Window* pParent,
 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& 
rxFrame,
@@ -59,9 +65,11 @@ PageFooterPanel::PageFooterPanel(
 PanelLayout(pParent, "PageFooterPanel", 
"modules/swriter/ui/pagefooterpanel.ui", rxFrame),
 mpBindings( pBindings ),
 maHFToggleController(SID_ATTR_PAGE_FOOTER, *pBindings, *this),
+maMetricController(SID_ATTR_METRIC, *pBindings,*this),
 maFooterLRMarginController(SID_ATTR_PAGE_FOOTER_LRMARGIN, *pBindings, 
*this),
 maFooterSpacingController(SID_ATTR_PAGE_FOOTER_SPACING, *pBindings, *this),
 maFooterLayoutController(SID_ATTR_PAGE_FOOTER_LAYOUT, *pBindings, *this),
+meFUnit(GetModuleFieldUnit()),
 aCustomEntry(),
 mpFooterItem( new SfxBoolItem(SID_ATTR_PAGE_FOOTER) ),
 mpFooterLRMarginItem( new SvxLongLRSpaceItem(0, 0, 
SID_ATTR_PAGE_FOOTER_LRMARGIN)),
@@ -70,11 +78,8 @@ PageFooterPanel::PageFooterPanel(
 {
 get(mpFooterToggle, "footertoggle");
 get(mpFooterSpacingLB, "spacingpreset");
-FieldUnit eMetric = ::GetDfltMetric(false);
-mpFooterSpacingLB->Init(IsInch(eMetric) ? SpacingType::SPACING_INCH : 
SpacingType::SPACING_CM);
 get(mpFooterLayoutLB, "samecontentLB");
 get(mpFooterMarginPresetLB, "footermarginpreset");
-mpFooterMarginPresetLB->Init(IsInch(GetModuleFieldUnit()) ? 
SpacingType::MARGINS_INCH : SpacingType::MARGINS_CM);
 get(mpCustomEntry, "customlabel");
 
 Initialize();
@@ -88,6 +93,7 @@ PageFooterPanel::~PageFooterPanel()
 void PageFooterPanel::dispose()
 {
 mpFooterToggle.disposeAndClear();
+maMetricController.dispose();
 mpFooterSpacingLB.disposeAndClear();
 mpFooterLayoutLB.disposeAndClear();
 mpFooterMarginPresetLB.disposeAndClear();
@@ -96,14 +102,29 @@ void PageFooterPanel::dispose()
 PanelLayout::dispose();
 }
 
+FieldUnit PageFooterPanel::GetCurrentUnit(SfxItemState eState, const 
SfxPoolItem* pState)
+{
+FieldUnit eUnit;
+
+if (pState && eState >= SfxItemState::DEFAULT)
+eUnit = static_cast(static_cast(pState)->GetValue());
+else
+eUnit = GetModuleFieldUnit();
+
+return eUnit;
+}
+
 void PageFooterPanel::Initialize()
 {
+SetMarginsAndSpacingFieldUnit();
+
 aCustomEntry = mpCustomEntry->GetText();
 mpFooterToggle->SetClickHdl( LINK(this, PageFooterPanel, FooterToggleHdl) 
);
 mpFooterMarginPresetLB->SetSelectHdl( LINK(this, PageFooterPanel, 
FooterLRMarginHdl));
 mpFooterSpacingLB->SetSelectHdl( LINK(this, PageFooterPanel, 
FooterSpacingHdl));
 mpFooterLayoutLB->SetSelectHdl( LINK(this, PageFooterPanel, 
FooterLayoutHd

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

[Caolán McNamara (via logerrit)]

 sd/inc/pageformatpanel.hrc |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c902202ca0f8547d3fb35e6e729c6b1244c290e1
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 19:50:20 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 22:24:56 2019 +0100

separate cm from value in built-in en_US strings

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

diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
index b7309ee69748..ec01fd6ecdb3 100644
--- a/sd/inc/pageformatpanel.hrc
+++ b/sd/inc/pageformatpanel.hrc
@@ -33,9 +33,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9cm)"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54cm)"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9 cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54 cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18 cm)"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 17eb1d0f86a3f5aa6fdf154c244c20c73f3f64ad
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 13:32:38 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 21:50:37 2019 +0100

use HasChildPathFocus for SpinButton like ComboBox

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 5b0686a9f77e..8237dbae57e3 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5159,6 +5159,13 @@ public:
 m_xButton->SetDecimalDigits(digits);
 }
 
+// SpinButton may be comprised of multiple subwidgets, consider the lot as
+// one thing for focus
+virtual bool has_focus() const override
+{
+return m_xWidget->HasChildPathFocus();
+}
+
 //so with hh::mm::ss, incrementing mm will not reset ss
 void DisableRemainderFactor()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 vcl/headless/svpgdi.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e2eb3816794117b09496be58230ceb292bc547d
Author: Jan Holesovsky 
AuthorDate: Thu Dec 5 11:05:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 21:18:24 2019 +0100

drawPixel() should still get 'true' for bXorModeAllowed.

That part of 7b267be4b2c87b2c3987d4d751307977a7d3ad41 was not necessary.

Change-Id: Ie085f635d4adb6f574f3eca37976f9aded505524
Reviewed-on: https://gerrit.libreoffice.org/84536
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 0fd0ecd751e0..7b2286d6d9a5 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -718,7 +718,7 @@ void SvpSalGraphics::drawPixel( long nX, long nY )
 
 void SvpSalGraphics::drawPixel( long nX, long nY, Color aColor )
 {
-cairo_t* cr = getCairoContext(false);
+cairo_t* cr = getCairoContext(true);
 clipRegion(cr);
 
 cairo_rectangle(cr, nX, nY, 1, 1);
@@ -726,7 +726,7 @@ void SvpSalGraphics::drawPixel( long nX, long nY, Color 
aColor )
 cairo_fill(cr);
 
 basegfx::B2DRange extents = getClippedFillDamage(cr);
-releaseCairoContext(cr, false, extents);
+releaseCairoContext(cr, true, extents);
 }
 
 void SvpSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 extensions/source/propctrlr/fontdialog.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d58d1c59860078d225ce5226cae0acd678ef24b2
Author: Andrea Gelmini 
AuthorDate: Mon Dec 9 17:14:50 2019 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 9 21:07:47 2019 +0100

Removed duplicated include

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

diff --git a/extensions/source/propctrlr/fontdialog.cxx 
b/extensions/source/propctrlr/fontdialog.cxx
index 2319aa8e76d8..1afb4c8e861c 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -58,7 +58,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 namespace pcr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 extensions/source/propctrlr/commoncontrol.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78b2218e0e6b1b3af3611679637942c300e239ad
Author: Andrea Gelmini 
AuthorDate: Mon Dec 9 17:14:18 2019 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 9 21:01:09 2019 +0100

Fix typo

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

diff --git a/extensions/source/propctrlr/commoncontrol.hxx 
b/extensions/source/propctrlr/commoncontrol.hxx
index 2f304dce576e..5550435ff963 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -198,7 +198,7 @@ namespace pcr
 {
 if (bReadOnly)
 {
-// disable widget by default, entries will overide to enable the 
widget but set it non-editable
+// disable widget by default, entries will override to enable the 
widget but set it non-editable
 m_xControlWindow->set_sensitive(false);
 }
 }
___
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 (via logerrit)]

 sw/source/uibase/sidebar/PageFormatPanel.cxx |   31 +--
 sw/source/uibase/sidebar/PageFormatPanel.hxx |1 
 2 files changed, 21 insertions(+), 11 deletions(-)

New commits:
commit c1e2acd58e38d4d51285eb522f2dfbde10267f75
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 17:15:08 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 20:46:58 2019 +0100

Resolves: tdf#129267 change margin unit when measurement unit changes

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

diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx 
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 2f7e3cbf976c..459b7e5dd023 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -58,6 +58,23 @@ VclPtr PageFormatPanel::Create(
 return VclPtr::Create(pParent, rxFrame, pBindings);
 }
 
+void PageFormatPanel::SetMarginFieldUnit()
+{
+auto nSelected = mpMarginSelectBox->GetSelectedEntryPos();
+mpMarginSelectBox->Clear();
+if (IsInch(meFUnit))
+{
+for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
+
mpMarginSelectBox->InsertEntry(SwResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
+}
+else
+{
+for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); 
++i)
+
mpMarginSelectBox->InsertEntry(SwResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
+}
+mpMarginSelectBox->SelectEntryPos(nSelected);
+}
+
 PageFormatPanel::PageFormatPanel(
 vcl::Window* pParent,
 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& 
rxFrame,
@@ -82,17 +99,6 @@ PageFormatPanel::PageFormatPanel(
 get(mpPaperHeight, "paperheight");
 get(mpPaperOrientation, "paperorientation");
 get(mpMarginSelectBox, "marginLB");
-FieldUnit eMetric = ::GetDfltMetric(false);
-if (IsInch(eMetric))
-{
-for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
-
mpMarginSelectBox->InsertEntry(SwResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
-}
-else
-{
-for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); 
++i)
-
mpMarginSelectBox->InsertEntry(SwResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
-}
 get(mpCustomEntry, "customlabel");
 Initialize();
 }
@@ -130,6 +136,7 @@ void PageFormatPanel::Initialize()
 meUnit = maPaperSizeController.GetCoreMetric();
 SetFieldUnit( *mpPaperWidth, meFUnit );
 SetFieldUnit( *mpPaperHeight, meFUnit );
+SetMarginFieldUnit();
 aCustomEntry = mpCustomEntry->GetText();
 
 const SvtOptionsDrawinglayer aDrawinglayerOpt;
@@ -188,6 +195,8 @@ void PageFormatPanel::NotifyItemUpdate(
 {
 SetFieldUnit( *mpPaperHeight, meFUnit );
 SetFieldUnit( *mpPaperWidth, meFUnit );
+SetMarginFieldUnit();
+UpdateMarginBox();
 }
 meLastFUnit = meFUnit;
 }
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx 
b/sw/source/uibase/sidebar/PageFormatPanel.hxx
index d06b4e76a845..b6eaae68853e 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx
@@ -94,6 +94,7 @@ private:
 OUString aCustomEntry;
 
 void Initialize();
+void SetMarginFieldUnit();
 void UpdateMarginBox();
 void ExecuteMarginLRChange( const long nPageLeftMargin, const long 
nPageRightMargin );
 void ExecuteMarginULChange( const long nPageTopMargin, const long  
nPageBottomMargin);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/inc/spacing.hrc|   28 ++--
 sw/inc/pageformatpanel.hrc |6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 6552ce0f510da67be02a5102016bd14957a25a85
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 17:18:32 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 20:45:28 2019 +0100

Related: tdf#129267 separate cm from value in built-in en_US strings

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

diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 3d4e93dc02b3..445484248a07 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -31,13 +31,13 @@ const std::pair 
RID_SVXSTRARY_SPACING_INCH[] =
 const std::pair RID_SVXSTRARY_SPACING_CM[] =
 {
 { NC_("RID_SVXSTRARY_SPACING_CM", "None"),0 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16cm)"),   91 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32cm)"),181 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64cm)"), 363 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95cm)"),   539 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27cm)"), 720 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9cm)"),1077 },
-{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54cm)"), 1440 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16 cm)"),   91 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32 cm)"),181 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64 cm)"), 363 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95 cm)"),   539 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27 cm)"), 720 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9 cm)"),1077 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54 cm)"), 1440 },
 { nullptr, 0 }
 };
 
@@ -59,13 +59,13 @@ const std::pair 
RID_SVXSTRARY_MARGINS_INCH[] =
 const std::pair RID_SVXSTRARY_MARGINS_CM[] =
 {
 { NC_("RID_SVXSTRARY_MARGINS_CM", "None"),0 },
-{ NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Small (0.16cm)"),   91 },
-{ NC_("RID_SVXSTRARY_MARGINS_CM", "Small (0.32cm)"),181 },
-{ NC_("RID_SVXSTRARY_MARGINS_CM", "Small Medium (0.64cm)"), 363 },
-{ NC_("RID_SVXSTRARY_MARGINS_CM", "Medium (0.95cm)"),   539 },
-{ NC_("RID_SVXSTRARY_MARGINS_CM", "Medium Large (1.27cm)"), 720 },
-{ NC_("RID_SVXSTRARY_MARGINS_CM", "Large (1.9cm)"),1077 },
-{ NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Large (2.54cm)"), 1440 },
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Small (0.16 cm)"),   91 },
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "Small (0.32 cm)"),181 },
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "Small Medium (0.64 cm)"), 363 },
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "Medium (0.95 cm)"),   539 },
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "Medium Large (1.27 cm)"), 720 },
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "Large (1.9 cm)"),1077 },
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Large (2.54 cm)"), 1440 },
 { nullptr, 0 }
 };
 
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index 048ff93a8776..3d9e7727efca 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -34,9 +34,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9cm)"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54cm)"),
-NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9 cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54 cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18 cm)"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
 NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Mirrored")
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/core/dataaccess/databasedocument.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 23c024e7267510c09d89be934e526d56f76ec11b
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 16:52:54 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 20:46:06 2019 +0100

tdf#129210 don't assert with clear on already cleared mutex

reset it after load completes, seeing as the comment suggests
that's why the clear exists in the first place

Change-Id: I3af633c5a1f99b5d0dd754c21e220c6c94b66634
Reviewed-on: https://gerrit.libreoffice.org/84778
Reviewed-by: Mike Kaganski 
Tested-by: Xisco Faulí 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index c8a287cde253..2a3bc8e2a369 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -685,6 +685,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const 
OUString& i_SourceLocati
 
 aGuard.clear(); // (load has an own guarding scheme)
 load( aMediaDescriptor.getPropertyValues() );
+aGuard.reset();
 
 // Without a controller, we are unable to recover the sub components, 
as they're always tied to a controller.
 // So, everything else is done when the first controller is connected.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fw: benchmark of Excel, Calc, Google Docs

[Aditya Parameswaran]

Oops, for some reason I forgot to add Sajjadur to the email list!

Aditya

On Sun, Dec 8, 2019 at 3:14 PM Aditya Parameswaran 
wrote:

> Michael,
>
> Great to connect with you.  Sajjadur forwarded your email to me.
>
> Just a bit of context about the work that you're referring to --
>
> I'm Aditya Parameswaran, an assistant professor at UC Berkeley.  Along
> with Prof. Karrie Karahalios at the University of Illinois and many Ph.D.
> student researchers, we've been working on developing a scalable
> spreadsheet system, DataSpread (http://dataspread.github.io), for about
> half a decade now. We've published a number of papers on this topic as well
> as developed a prototype system.  Sajjadur led the effort on benchmarking
> that you referenced in your email and a navigation plugin (more on that in
> a bit), while Mangesh (also cc-ed, when he was at the University of
> Illinois) led the efforts to integrate spreadsheets and databases and to
> build a more interactive (asynchronous) formula execution engine when he
> was at Illinois.
>
> We'd be very keen to collaborate to see if some of the ideas that we've
> developed and opportunities we've identified would make sense in Calc.  Our
> ultimate aim is to percolate some of these ideas back into popular
> spreadsheet systems like Calc, so I'm excited to have this opportunity.
>
> Answers to some of your questions in-line below:
>
>>
>> I was interested in a number of things: particularly whether we
>> can get
>> your test sheets / macros so that we can run the tests under a profiler
>> & of course see what stupid things jump out that we can fix =)
>>
>
> Yes, of course. Sajjadur, with Kelly's help, is looking into packaging
> this and sending it your way.
>
>>
>> We do have a columnular layout; checkout:
>>
>>
>> https://gerrit.libreoffice.org/plugins/gitiles/core/+/master/sc/inc/column.hxx#111
>>
>> ... assuming you have reasonably uniform, contiguous data types down a
>> column your test shouldn't have concluded:
>>
>> "Takeaway: Spreadsheet systems do not employ a columnar
>> data layout to improve computational (e.g., aggregation) performance"
>>
>
> Looking at Figure 10 in our preprint,  Calc does seem to be somewhat
> faster for sequential read than random read at least on larger sizes.
>
> So I am not sure why we concluded outright that none of the spreadsheet
> systems employ a columnar layout -- this is a good catch; we will fix.
>
> That said, looking at Figure 10, it is surprising that the gains for the
> sequential read are not a lot more;  and the gains should increase
> proportionally.  So something funky is going on. Worth investigating.
>
>
>
>> For incremental updates - re-computation is frequently chosen
>> over more
>> smarts  since correctness is a far more dominating concern than
>> performance generally, and there are plenty of know performance
>> optimizations that can be done before we try to complicate things
>> further. Also the assumption that after deleting A100:
>>
>> SUM(A1:A100) - A100 === SUM(A1:A99)
>>
>> falls foul of potential precision problems.
>>
>
> Makes sense.
>
>
>>
>> The idea of converting to SQL queries is an interesting one but I
>> find
>> it very hard to believe it would provide any performance advantage at
>> the same memory footprint. Furthermore - I'd be interested to know how
>> you do other spreadsheet operations: row & column insertion, addressing,
>> and dependency work on top of a SQL database with any efficiency.
>>
>
> We started by having the relational database be a simple persistent
> storage layer, when coupled with an index to retrieve data by position, can
> allow us to scroll through large datasets of billions of rows at ease. We
> developed a new positional index to handle insertions and deletions in
> O(log(n)) -- https://arxiv.org/pdf/1708.06712.pdf. I agree that pushing
> the computation to the relational database does have overheads; but at the
> same time, it allows for scaling to arbitrarily large datasets.
>
> Happy to explain this on the phone.
>
>
>> It is also worth bearing in mind that dependency management and
>> tracking of what to update when something changes consumes a far larger
>> proportion of a spreadsheet than is commonly expected: what to
>> re-calculate having changed A1 is far from trivial for large, twisty
>> real-world sheets.
>>
>
> Ah, for this, we have a new asynchronous formula computation capability
> (led by Mangesh) that looks something like this:
> https://twitter.com/adityagp/status/1146105708024229888?s=20 (gif in
> tweet).  When a change is made, we use a compact dependency maintenance
> structure to identify dependent cells that are hidden away with a progress
> bar, and then compute them in the background.
>
>>
>> Anyhow - would be happy to have a chat with your team at some
>> stage if
>> you're interested in helping us to improving things here: a good start
>> would be just getting mor

GPU optimization feedback (I hope ;-)

[Drew Jensen]

Howdy,

Thought I'd pass on a twitter exchange, to the list here, between myself
and Wikisteff regarding another attempt to benchmark some of the changes to
Calc recently.

Wikisteff: "Oh, yeah!
I wrote a 25th order Runge-Kutta integrator in Excel without using VB as
well."

Wikisteff: "Well, it *was* part of a head-to-head test to see how GPU
parallel evaluation of floating-point code worked in practice on
@LibreOffice  Calc.
@MSExcel  was the control. ;)"

Me: "I would love to see results from a GPU parallel evaluation of
floating-point code comparison between Calc and Excel. Is that available
somewhere?  thanks."

Wikisteff: "I didn't publish my results, but they amounted to "if the
calculation is simple, like a uniform linear transformation or a matrix
multiplication, high speedup. If the calculation is nonroutine, like a
nonlinear transform interwoven with large matrix products, no speedup."

Anyway, I haven't replied on twitter yet, will in a minute or two and thank
him for his time and that piece of feedback.

Personally I don't know if any of that is useful as feedback, hope so.

Best wishes,

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

Linux daily builds failing

[Xisco Fauli]

Hello

Since that last successful build

tinderbox: buildname: Linux-rpm_deb-x86_64@86-TDF
tinderbox: tree: MASTER
tinderbox: pull time 2019-11-28 20:14:48
tinderbox: git sha1s
core:5030be4e85179147476b1e441eb618fb6ed58235

Linux daily builds are failing with this error:

[build CUT] services
[build CUT] sc_ucalc
[build LNK] CppunitTest/libtest_sc_filters_test.so
[build LNK] CppunitTest/libtest_sc_tiledrendering.so
[build CUT] sccomp_solver
[build CUT] sccomp_swarmsolvertest
/tinderbox/buildslave/build/instdir/program/libvclplug_qt5lo.so has suspicious 
NEEDED: libxcb-icccm.so.4
/tinderbox/buildslave/build/instdir/program/lo_kde5filepicker has suspicious 
NEEDED: libxcb-icccm.so.4
make[1]: *** 
[/tinderbox/buildslave/source/libo-master/postprocess/CustomTarget_check_dynamic_objects.mk:22:
 
/tinderbox/buildslave/build/workdir/CustomTarget/postprocess/check_dynamic_objects/check.done]
 Error 1
make[1]: *** Waiting for unfinished jobs

Config used:  Running ./configure with '--with-system-dicts 
--with-myspell-dicts --with-system-zlib --without-system-poppler 
--without-system-openssl --without-system-libpng --without-system-libxml 
--without-system-jpeg --without-system-jars --without-system-postgresql 
--without-junit --with-help=html --without-helppack-integration 
--with-linker-hash-style=both --with-fonts 
--with-external-thes-dir=/usr/share/mythes 
--with-external-hyph-dir=/usr/share/hyphen 
--with-external-dict-dir=/usr/share/hunspell --enable-avahi --enable-dbus 
--enable-extension-integration --enable-odk --enable-gtk3-kde5 --enable-kf5 
--enable-gstreamer-1-0 --enable-evolution2 --enable-gio 
--enable-scripting-beanshell --enable-scripting-javascript 
--enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-epm 
--enable-python=internal --enable-online-update --enable-breakpad 
--disable-dconf --enable-mergelibs --with-vendor=The Document Foundation 
--with-lang=ALL --with-package-format=rpm deb --enable-gtk3 --enable-qt5 
--enable-kde5 --disable-dependency-tracking 
--with-external-tar=/home/buildslave/source/lo-externalsrc 
--with-export-validation --enable-python=fully-internal 
--srcdir=/tinderbox/buildslave/source/libo-master 
--enable-option-checking=fatal'

Any idea where the problem might be?

Regards

-- 
Xisco Faulí
Libreoffice QA Team
IRC: x1sc0

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

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c50b4cb4b69597400a8325e0a200c95cf41c62f0
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 16:21:26 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 18:34:31 2019 +0100

Enable/Disable of children shouldn't be necessary

the builder counterpart to...

commit 1d69cf32a73c0720882731ebf3eb5d2f07fce246
Author: Caolán McNamara 
Date:   Fri Oct 18 19:23:40 2019 +0100

Enable/Disable of children shouldn't be necessary

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index fca79c624896..07e54d1340db 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2422,6 +2422,10 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 SAL_INFO_IF(!xWindow, "vcl.layout", "probably need to implement " << name 
<< " or add a make" << name << " function");
 if (xWindow)
 {
+// child windows of disabled windows are made disabled by vcl by 
default, we don't want that
+WindowImpl *pWindowImpl = xWindow->ImplGetWindowImpl();
+pWindowImpl->mbDisabled = false;
+
 xWindow->SetHelpId(m_sHelpRoot + id);
 SAL_INFO("vcl.layout", "for " << name <<
 ", created " << xWindow.get() << " child of " <<
___
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-6.2' - sc/qa svx/source

[Caolán McNamara (via logerrit)]

 sc/qa/unit/data/ods/keep-preview-missing-obj-link.ods |binary
 sc/qa/unit/helper/qahelper.cxx|   17 
 sc/qa/unit/helper/qahelper.hxx|2 +
 sc/qa/unit/subsequent_filters-test.cxx|   19 ++
 svx/source/svdraw/svdoole2.cxx|8 +++
 5 files changed, 42 insertions(+), 4 deletions(-)

New commits:
commit 15fbc2a7cf879a91c4b0d3853f043e7eba6b48fe
Author: Caolán McNamara 
AuthorDate: Wed Nov 20 14:54:16 2019 +
Commit: Andras Timar 
CommitDate: Mon Dec 9 18:21:10 2019 +0100

If a SdrOle2Obj object is missing/broken show the preview set for it

if the object isn't valid, e.g. link to something that doesn't exist, set 
the fallback
graphic as mxGraphic so SdrOle2Obj::GetGraphic will show the fallback, 
otherwise
the failing mxObjRef.is test in SdrOle2Obj::GetGraphic means it doesn't get 
used

Change-Id: I8f1aea6b25dc216e01a0f888a44d10876bb1bebd
Reviewed-on: https://gerrit.libreoffice.org/83329
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-on: https://gerrit.libreoffice.org/84750
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sc/qa/unit/data/ods/keep-preview-missing-obj-link.ods 
b/sc/qa/unit/data/ods/keep-preview-missing-obj-link.ods
new file mode 100644
index ..e7b15fd7688a
Binary files /dev/null and 
b/sc/qa/unit/data/ods/keep-preview-missing-obj-link.ods differ
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index dad65eb9d7c4..64f41b033ff0 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -280,7 +280,7 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument* 
pDoc, sal_Int32 nFormat)
 CPPUNIT_ASSERT_EQUAL(ScRangeList(ScRange(1,1,2,3,1,2)), rRange3);
 }
 
-const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, sal_uInt16 nPage)
+const SdrOle2Obj* getSingleOleObject(ScDocument& rDoc, sal_uInt16 nPage)
 {
 // Retrieve the chart object instance from the 2nd page (for the 2nd 
sheet).
 ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
@@ -316,14 +316,23 @@ const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, 
sal_uInt16 nPage)
 return nullptr;
 }
 
-const SdrOle2Obj& rOleObj = static_cast(*pObj);
-if (!rOleObj.IsChart())
+return static_cast(pObj);
+}
+
+const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, sal_uInt16 nPage)
+{
+const SdrOle2Obj* pObj = getSingleOleObject(rDoc, nPage);
+
+if (!pObj)
+return pObj;
+
+if (!pObj->IsChart())
 {
 cout << "This should be a chart object." << endl;
 return nullptr;
 }
 
-return &rOleObj;
+return pObj;
 }
 
 std::vector getChartRangeRepresentations(const SdrOle2Obj& rChartObj)
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index b360851e5f32..21a57002f1a6 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -126,6 +126,8 @@ SCQAHELPER_DLLPUBLIC void testFile(const OUString& 
aFileName, ScDocument& rDoc,
 //need own handler because conditional formatting strings must be generated
 SCQAHELPER_DLLPUBLIC void testCondFile(const OUString& aFileName, ScDocument* 
pDoc, SCTAB nTab);
 
+SCQAHELPER_DLLPUBLIC const SdrOle2Obj* getSingleOleObject(ScDocument& rDoc, 
sal_uInt16 nPage);
+
 SCQAHELPER_DLLPUBLIC const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, 
sal_uInt16 nPage);
 
 SCQAHELPER_DLLPUBLIC std::vector getChartRangeRepresentations(const 
SdrOle2Obj& rChartObj);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 7575a124ab90..b080cdf70698 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -254,6 +254,7 @@ public:
 void testCharacterSetXLSXML();
 void testTdf62268();
 void testVBAMacroFunctionODS();
+void testPreviewMissingObjLink();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -393,6 +394,7 @@ public:
 CPPUNIT_TEST(testCondFormatFormulaListenerXLSX);
 CPPUNIT_TEST(testTdf62268);
 CPPUNIT_TEST(testVBAMacroFunctionODS);
+CPPUNIT_TEST(testPreviewMissingObjLink);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4322,6 +4324,23 @@ void ScFiltersTest::testVBAMacroFunctionODS()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testPreviewMissingObjLink()
+{
+ScDocShellRef xDocSh = loadDoc("keep-preview-missing-obj-link.", 
FORMAT_ODS);
+CPPUNIT_ASSERT_MESSAGE("Failed to load 
keep-preview-missing-obj-link.ods.", xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Retrieve the ole object
+const SdrOle2Obj* pOleObj = getSingleOleObject(rDoc, 0);
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve an ole object from the 2nd 
sheet.", pOleObj);
+
+const Graphic* pGraphic = pOleObj->GetGraphic();
+CPPUNIT_ASSERT_MESSAGE("the ole objec

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - 2 commits - configure.ac debian/changelog debian/control debian/rules loolkitconfig.xcu loolwsd.spec.in

[Andras Timar (via logerrit)]

 configure.ac  |2 
 debian/changelog  |   25 --
 debian/control|   18 +++
 debian/rules  |4 -
 loolkitconfig.xcu |2 
 loolwsd.spec.in   |  123 +-
 6 files changed, 95 insertions(+), 79 deletions(-)

New commits:
commit 891ba909a24f5a9501de854e6839734fa6b6963b
Author: Andras Timar 
AuthorDate: Mon Dec 9 18:09:48 2019 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 9 18:09:48 2019 +0100

Bump package version to 4.2.0-1 and update deb/rpm package files

Change-Id: I935425f644f373acdd4bf8d073ec8be3f29313b8

diff --git a/configure.ac b/configure.ac
index 4109b14fc..b938c8ff6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 56cbc5563..e69de29bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +0,0 @@
-loolwsd (1.8.2-1) unstable; urgency=medium
-
-  * Fix crash in Impress.
-
- -- Jan Holesovsky   Thu, 11 Aug 2016 16:46:00 +0100
-
-loolwsd (1.8.0-1) unstable; urgency=medium
-
-  [ Tor Lillqvist ]
-  * Back to packaging this for Debian.
-
-  [ Jan Holesovsky ]
-  * Update to match Collabora Office 5.1
-
- -- Jan Holesovsky   Fri, 05 Aug 2016 16:51:54 +0100
-
-loolwsd (1.0.0-1) unstable; urgency=low
-
-  * Initial release
-
-  * Local Variables:
-  * Mode: fundamental
-  * End:
-
- -- Tor Lillqvist   Fri, 15 May 2015 11:10:20 +0300
diff --git a/debian/control b/debian/control
index 532367872..a4dc03ff6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,27 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Andras Timar 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python-polib, python-lxml, python3-polib, python3-lxml, fontconfig, libpam-dev, 
libcppunit-dev, pkg-config, devscripts, m4
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, 
pkg-config, devscripts, m4
 Standards-Version: 3.9.7
 
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libxrender1, libcairo2, libgl1-mesa-glx, 
libcups2, libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ locales-all, adduser, expat, fontconfig, cpio, libcap2-bin,
+ collaboraofficebasis6.2-calc,
+ collaboraofficebasis6.2-core,
+ collaboraofficebasis6.2-graphicfilter,
+ collaboraofficebasis6.2-images,
+ collaboraofficebasis6.2-impress,
+ collaboraofficebasis6.2-ooofonts,
+ collaboraofficebasis6.2-writer,
+ collaboraoffice6.2,
+ collaboraoffice6.2-ure,
+ collaboraofficebasis6.2-en-us,
+ collaboraofficebasis6.2-draw,
+ collaboraofficebasis6.2-extension-pdf-import,
+ collaboraofficebasis6.2-ooolinguistic
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/debian/rules b/debian/rules
index d675675c0..feb980c95 100644
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,3 @@ override_dh_auto_test:
 
 override_dh_installinit:
# no init.d scripts here, assume systemd
-
-override_dh_gencontrol:
-   # put package names of LibreOffice here
-   # dh_gencontrol -- -Vlo:Depends=""
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index d78760e82..26c598135 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -17,34 +17,40 @@ Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
-BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5 m4
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires:  libpcap kernel-headers
-%else
-%if 0%{?suse_version}
-BuildRequires:  libcap-progs linux-glibc-devel systemd-rpm-macros
+BuildRequires:  libcap-devel libpng-devel pam-devel gcc-c++ cppunit-devel 
pam-devel fontconfig make
+
+# Red Hat and CentOS
+%if 0%{?rhel} == 7
+BuildRequires:  libpcap kernel-headers python36-polib python36-lxml
+%endif
+
+%if 0%{?rhel} == 8
+BuildRequires:  libpcap kernel-headers python3-polib python3-lxml
 %endif
+
+# openSUSE Leap 15.x, SLES12, SLES15
+%if 0%{?suse_version}
+BuildRequires:  libcap-progs linux-glibc-devel systemd-rpm-macros 
python3-polib python3-lxml
 %endif
 
-Requires:   %{lo_rpm_list}
-Requires:   systemd
+Requires:   collaboraoffice6.2 collaboraoffice6.2-ure 
collaboraofficebasis6.2-core collaboraofficebasis6.2-writer 
collaboraoffic

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

[mert (via logerrit)]

 loleaflet/src/control/Control.ContextMenu.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba8efa4b328fc073b3e94a0af1a8c9f3d376bfc8
Author: mert 
AuthorDate: Mon Dec 9 16:33:33 2019 +0300
Commit: Michael Meeks 
CommitDate: Mon Dec 9 17:56:34 2019 +0100

Fix shape context menu brings dialogs on mobile

Change-Id: I0101242ebd2bf582093545e3f3abf88b01a043af
Reviewed-on: https://gerrit.libreoffice.org/84746
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.ContextMenu.js 
b/loleaflet/src/control/Control.ContextMenu.js
index 6109a7171..137300e13 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -60,7 +60,7 @@ L.Control.ContextMenu = L.Control.extend({
// This black list contains those menu items which should be 
disabled on mobile even if they
// are allowed in general. We need to have only those items 
here which are also part
// of the whitelist, otherwise the menu items are not visible 
anyway.
-   mobileBlackList: ['SpellingAndGrammarDialog', 'FontDialog', 
'FontDialogForParagraph']
+   mobileBlackList: ['SpellingAndGrammarDialog', 'FontDialog', 
'FontDialogForParagraph', 'TransformDialog', 'FormatLine', 'FormatArea']
},
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MSVC C2280 error with ranged for and deleted copy ctor

[Luboš Luňák]

 Hello,

 does somebody know why I'm getting "error 
C2280: 'GrFragmentProcessor::CIter::CIter(const GrFragmentProcessor::CIter 
&)': attempting to reference a deleted function" [1] in a ranged for?

 The relevant code is [2]. "GrFragmentProcessor::PaintCRange" is a ctor call  
for a range type [3], which has "return CIter(fT);" as its begin(). And CIter 
indeed has a deleted copy ctor, but AFAICT it shouldn't be needed, C++17's 
guaranteed copy ellision should take care of it.

 And it builds with GCC/Clang, and it builds even with MSVC here locally. So 
to me it looks like a MSVC bug that's been fixed. How much of a problem would 
it be to bump the minimal required MSVC version (not that I know which one it 
would be exactly)?

[1] 
https://ci.libreoffice.org/job/gerrit_windows/52000/consoleFull#410722581cbd6b0d4-2729-45f4-a019-828721d0af3e
[2] 
https://skia.googlesource.com/skia/+/refs/heads/chrome/m80/src/gpu/ccpr/GrCCDrawPathsOp.cpp#19
[3] 
https://skia.googlesource.com/skia/+/refs/heads/chrome/m80/src/gpu/GrFragmentProcessor.h#582


-- 
 Luboš Luňák
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js|5 
 loleaflet/src/layer/tile/GridLayer.js|   29 +++
 loleaflet/src/layer/tile/ImpressTileLayer.js |5 
 loleaflet/src/layer/tile/WriterTileLayer.js  |1 
 4 files changed, 17 insertions(+), 23 deletions(-)

New commits:
commit 9f5374103ba66274e70a48fea5aebcc9a7c419a5
Author: Michael Meeks 
AuthorDate: Mon Dec 9 16:37:23 2019 +
Commit: Michael Meeks 
CommitDate: Mon Dec 9 16:37:23 2019 +

prefetch: disable interval timer when we've pre-fetched everything.

Change-Id: I9d3b3819b3d9a960aa31f729686315e9e5d6d8e1

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index d9ff748a3..4db50a473 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -1278,6 +1278,9 @@ L.GridLayer = L.Layer.extend({
var fragment = document.createDocumentFragment();
this._addTiles(finalQueue, fragment);
this._level.el.appendChild(fragment);
+   } else {
+   clearInterval(this._tilesPreFetcher);
+   this._tilesPreFetcher = undefined;
}
},
 
@@ -1285,8 +1288,10 @@ L.GridLayer = L.Layer.extend({
if (!this._map) {
return;
}
-   clearInterval(this._tilesPreFetcher);
-   clearTimeout(this._preFetchIdle);
+   if (this._tilesPreFetcher)
+   clearInterval(this._tilesPreFetcher);
+   if (this._preFetchIdle)
+   clearTimeout(this._preFetchIdle);
if (resetBorder) {
this._preFetchBorder = null;
}
@@ -1295,6 +1300,7 @@ L.GridLayer = L.Layer.extend({
this._preFetchPart = this._selectedPart;
this._preFetchIdle = setTimeout(L.bind(function () {
this._tilesPreFetcher = 
setInterval(L.bind(this._preFetchTiles, this), interval);
+   this._prefetchIdle = undefined;
}, this), idleTime);
}
 });
commit a3319eef792c3db1ec04f2cf20f2183d6895fd68
Author: Michael Meeks 
AuthorDate: Mon Dec 9 16:14:26 2019 +
Commit: Michael Meeks 
CommitDate: Mon Dec 9 16:31:45 2019 +

prefetch: cleanup, and avoid constant growth of pre-loading area.

We were inadvertently mutating and growing our copy of the bounds
to fetch here, causing a chunk of un-necessary rendering load,
particularly for spreadsheets.

Change-Id: Ia01565c043d1cb0172cabbec16d941dd8b66dd05

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index abbcea8b3..511a5253e 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -528,7 +528,6 @@ L.CalcTileLayer = L.TileLayer.extend({
}
else {
// tile outside of the visible area, 
just remove it
-   this._preFetchBorder = null;
this._removeTile(key);
}
}
@@ -646,10 +645,6 @@ L.CalcTileLayer = L.TileLayer.extend({
});
this._resetPreFetching(true);
this._update();
-   if (this._preFetchPart !== this._selectedPart) {
-   this._preFetchPart = this._selectedPart;
-   this._preFetchBorder = null;
-   }
}
},
 
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 7623f7cd8..d9ff748a3 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -1185,6 +1185,7 @@ L.GridLayer = L.Layer.extend({
var zoom = this._map.getZoom();
var tilesToFetch = 10;
var maxBorderWidth = 5;
+   var tileBorderSrc;
 
if (this._map._permission === 'edit') {
tilesToFetch = 5;
@@ -1192,19 +1193,17 @@ L.GridLayer = L.Layer.extend({
}
 
if (!this._preFetchBorder) {
-   if (this._selectedPart !== this._preFetchPart) {
-   // all tiles from the new part have to be 
pre-fetched
-   var tileBorder = this._preFetchBorder = new 
L.Bounds(new L.Point(0, 0), new L.Point(0, 0));
-   }
-   else {
-   var pixelBounds = 
this._map.getPixelBounds(center, zoom);
-   tileBorder = 
this._pxBoundsToTileRange(pixelBounds);
-  

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

[Tor Lillqvist (via logerrit)]

 sw/source/uibase/misc/swruler.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 2f7653ea487fbf21891ef733ee72d85e0673009b
Author: Tor Lillqvist 
AuthorDate: Wed Dec 4 15:00:15 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 9 17:34:40 2019 +0100

Add comment about confusion in SwCommentRuler::CreateJsonNotification()

No code changes.

Change-Id: Ibc46b3e55038e84f2ad80ff12b277b2e2c77a4ce
(cherry picked from commit 5b6d23dcd0f2f779b4bbffe7f427a7c397f41c95)
Reviewed-on: https://gerrit.libreoffice.org/84755
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sw/source/uibase/misc/swruler.cxx 
b/sw/source/uibase/misc/swruler.cxx
index 86667e6b02d7..7dd10518dc34 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -254,10 +254,28 @@ const std::string SwCommentRuler::CreateJsonNotification()
 {
 boost::property_tree::ptree jsonNotif;
 
+// Note that GetMargin1(), GetMargin2(), GetNullOffset(), and 
GetPageOffset() return values in
+// pixels. Not twips. So "converting" the returned values with 
convertTwipToMm100() is quite
+// wrong. (Also, even if the return values actually were in twips, it is 
questionable why we
+// would want to pass them in mm100, as all other length values in the 
LOKit protocol apparently
+// are in twips.)
+
+// Anyway, as the consuming code in Online mostly seems to work anyway, it 
is likely that it
+// would work as well even if the values in pixels were passed without a 
bogus "conversion" to
+// mm100. But let's keep this as is for now.
+
+// Also note that in desktop LibreOffice, these pixel values for the rules 
of course change as
+// one changes the zoom level. (Can be seen if one temporarily modifies 
the NotifyKit() function
+// below to call this CreateJsonNotification() function and print its 
result in all cases even
+// without LibreOfficeKit::isActive().) But in both web-based Online and 
in the iOS app, the
+// zoom level from the point of view of this code here apparently does not 
change even if one
+// zooms from the Online code's point of view.
 jsonNotif.put("margin1", convertTwipToMm100(GetMargin1()));
 jsonNotif.put("margin2", convertTwipToMm100(GetMargin2()));
 jsonNotif.put("leftOffset", convertTwipToMm100(GetNullOffset()));
 jsonNotif.put("pageOffset", convertTwipToMm100(GetPageOffset()));
+
+// GetPageWidth() on the other hand does return a value in twips.
 jsonNotif.put("pageWidth", convertTwipToMm100(GetPageWidth()));
 
 RulerUnitData aUnitData = GetCurrentRulerUnit();
___
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-6.2' - svtools/source

[Tor Lillqvist (via logerrit)]

 svtools/source/control/ruler.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4ec7aab463b001195da6325d051659788a4230ec
Author: Tor Lillqvist 
AuthorDate: Tue Dec 3 18:44:45 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 9 17:34:18 2019 +0100

Add a comment telling what "frame margin" means here

Change-Id: Ie6d088217c066ec3091fb28925947175cf62634f
(cherry picked from commit 21b68c4cd7ce108cf334607ced0b20e7b5914c20)
Reviewed-on: https://gerrit.libreoffice.org/84754
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index fefc971c1077..08ed80387231 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -111,6 +111,7 @@ private:
 long   nNullOff;
 long   nMargin1;
 long   nMargin2;
+// In this context, "frame margin" means paragraph margins (indents)
 long   nLeftFrameMargin;
 long   nRightFrameMargin;
 RulerMarginStyle nMargin1Style;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/postgresql/pq_driver.hxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 0940261be357bfaa42d06444e91e7b3e6735e8d8
Author: Stephan Bergmann 
AuthorDate: Mon Dec 9 16:20:59 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 9 17:27:47 2019 +0100

Fix PQ_SDBC_DRIVER_VERSION

...which should expand to "0.8.2" rather than
"PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO"

Change-Id: I4dad1f895d6c1c4daead8d325fa35bfabe651419
Reviewed-on: https://gerrit.libreoffice.org/84766
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx 
b/connectivity/source/drivers/postgresql/pq_driver.hxx
index de41bc9ed38e..4cd0ee736a31 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.hxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.hxx
@@ -38,7 +38,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_DRIVER_HXX
 
 #include 
-
+#include 
 #include 
 
 #include 
@@ -51,11 +51,9 @@
 namespace pq_sdbc_driver
 {
 
-#define MY_STRINGIFY( x ) #x
-
-#define PQ_SDBC_DRIVER_VERSION MY_STRINGIFY(PQ_SDBC_MAJOR) "."  \
-   MY_STRINGIFY(PQ_SDBC_MINOR) "." \
-   MY_STRINGIFY(PQ_SDBC_MICRO)
+#define PQ_SDBC_DRIVER_VERSION SAL_STRINGIFY(PQ_SDBC_MAJOR) "."  \
+   SAL_STRINGIFY(PQ_SDBC_MINOR) "." \
+   SAL_STRINGIFY(PQ_SDBC_MICRO)
 
 struct MutexHolder { osl::Mutex m_mutex; };
 // use this to switch off sdbc support !
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'distro/collabora/co-4-2-0'

[Michael Meeks (via logerrit)]

New branch 'distro/collabora/co-4-2-0' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/co-4-2-0-branch-point'

[Michael Meeks (via logerrit)]

Tag 'co-4-2-0-branch-point' created by Andras Timar 
 at 2019-12-09 16:27 +

co-4-2-0-branch-point

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/inc vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5FilePicker.hxx |   21 ++---
 vcl/qt5/Qt5FilePicker.cxx |   89 --
 2 files changed, 82 insertions(+), 28 deletions(-)

New commits:
commit e756a570cc18427a4ad61af15c42e3d8d54beb13
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jun 5 14:04:24 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 9 17:17:56 2019 +0100

tdf#129071 Qt5 set file picker parent widget

If the XInitialization::initialize has a parent option, use that
system window ID to find the parent Qt5Frame and set this as the
parent of the file picker. This way the file picker doesn't show
up as a separate window in the KDE task bar and get the proper
icon. Just setting it transient to the parent is not enough.

This also includes the terminate listener handling, so an open
file picker won't prevent LO to shut down gracefully (which is
handled independent from the document modified state).

Change-Id: I62aef532e739e7fea9fe8a4b4e6c0e205faae1d9
Reviewed-on: https://gerrit.libreoffice.org/74544
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit d79a41a02cd46c50cab08ba1a5d5b213b6843251)
Reviewed-on: https://gerrit.libreoffice.org/84756

diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index f88395c6acce..5fef2aaeae43 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -23,8 +23,9 @@
 
 #include 
 
-#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -33,8 +34,6 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -48,9 +47,10 @@ class QGridLayout;
 class QLabel;
 class QWidget;
 
-typedef ::cppu::WeakComponentImplHelper<
-css::ui::dialogs::XFilePicker3, css::ui::dialogs::XFilePickerControlAccess,
-css::ui::dialogs::XFolderPicker2, css::lang::XInitialization, 
css::lang::XServiceInfo>
+typedef ::cppu::WeakComponentImplHelper
 Qt5FilePicker_Base;
 
 class VCLPLUG_QT5_PUBLIC Qt5FilePicker : public QObject, public 
Qt5FilePicker_Base
@@ -75,6 +75,8 @@ private:
 
 const bool m_bIsFolderPicker;
 
+QWidget* m_pParentWidget;
+
 protected:
 std::unique_ptr m_pFileDialog; ///< the file picker dialog
 QWidget* m_pExtraControls; ///< widget to contain extra custom controls
@@ -132,8 +134,7 @@ public:
 virtual void SAL_CALL initialize(const css::uno::Sequence& 
rArguments) override;
 
 // XEventListener
-/// @throws css::uno::RuntimeException
-virtual void disposing(const css::lang::EventObject& rEvent);
+void SAL_CALL disposing(const css::lang::EventObject& rEvent) override;
 using cppu::WeakComponentImplHelperBase::disposing;
 
 // XServiceInfo
@@ -145,6 +146,10 @@ public:
 virtual OUString SAL_CALL getDirectory() override;
 virtual void SAL_CALL setDescription(const OUString& rDescription) 
override;
 
+// XTerminateListener
+void SAL_CALL queryTermination(const css::lang::EventObject& aEvent) 
override;
+void SAL_CALL notifyTermination(const css::lang::EventObject& aEvent) 
override;
+
 protected:
 virtual void addCustomControl(sal_Int16 controlId);
 void setCustomControlWidgetLayout(QGridLayout* pLayout) { m_pLayout = 
pLayout; }
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 10c25052fd8a..d37c28b33c11 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -25,8 +25,15 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -36,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -80,6 +88,7 @@ 
Qt5FilePicker::Qt5FilePicker(css::uno::Reference co
 : Qt5FilePicker_Base(m_aHelperMutex)
 , m_context(context)
 , m_bIsFolderPicker(eMode == QFileDialog::Directory)
+, m_pParentWidget(nullptr)
 , m_pFileDialog(new QFileDialog(nullptr, {}, QDir::homePath()))
 , m_pExtraControls(new QWidget())
 {
@@ -155,17 +164,16 @@ sal_Int16 SAL_CALL Qt5FilePicker::execute()
 return ret;
 }
 
-vcl::Window* pWindow = ::Application::GetActiveTopWindow();
-QWidget* pTransientParent = nullptr;
-QWindow* pTransientWindow = nullptr;
-if (pWindow)
+QWidget* pTransientParent = m_pParentWidget;
+if (!pTransientParent)
 {
-Qt5Frame* pFrame = dynamic_cast(pWindow->ImplGetFrame());
-assert(pFrame);
-if (pFrame)
+vcl::Window* pWindow = ::Application::GetActiveTopWindow();
+if (pWindow)
 {
-pTransientParent = pFrame->GetQWidget();
-pTransientWindow = pTransientParent->window()->windowHandle();
+Qt5Frame* pFrame = 
dynamic_cast(pWindow->ImplGetFrame());
+assert(pFrame);
+if (pFrame)
+pTransientParent = pFrame->asChild();
 }
 }
 
@@ -174,16 +182,19 @@ sal_Int16 

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

[Olivier Hallot (via logerrit)]

 help3/xhpeditor/DisplayArea.js |   67 ++---
 help3/xhpeditor/index.php  |   16 ++---
 help3/xhpeditor/xhpeditor.css  |   13 ++-
 3 files changed, 84 insertions(+), 12 deletions(-)

New commits:
commit a8ca35cbeec21eec2b2eb9bab25b02a23b736f4d
Author: Olivier Hallot 
AuthorDate: Mon Dec 9 13:16:06 2019 -0300
Commit: Olivier Hallot 
CommitDate: Mon Dec 9 17:17:50 2019 +0100

Add appl switch selector

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

diff --git a/help3/xhpeditor/DisplayArea.js b/help3/xhpeditor/DisplayArea.js
index cd2d83f..c5ee48b 100644
--- a/help3/xhpeditor/DisplayArea.js
+++ b/help3/xhpeditor/DisplayArea.js
@@ -9,11 +9,10 @@
 
 // scripts for rendered DisplayArea
 
-// Used to set system in case, caseinline=SYSTEM
-
+// Used to set system in case, caseinline=sys
 function setSystemSpan(system) {
 hideSystemSpan();
-var spans = document.querySelectorAll("[class^=switch]");
+var spans = document.querySelectorAll("[class^=switch]");//this selector 
can be bounded to DisplayArea div
 for (z = 0; z < spans.length; z++) {
 var id = spans[z].getAttribute("id");
 if (id === null) {
@@ -47,7 +46,7 @@ function setSystemSpan(system) {
 }
 }
 function hideSystemSpan(){
-var spans = document.querySelectorAll("[class^=switch]");
+var spans = document.querySelectorAll("[class^=switch]");//this selector 
can be bounded to DisplayArea div
 for (z = 0; z < spans.length; z++) {
 var id = spans[z].getAttribute("id");
 if (id === null) {
@@ -67,3 +66,63 @@ function hideSystemSpan(){
 }
 }
 }
+// Used to set application in case, caseinline=appl
+function setApplSpan(appl) {
+hideApplSpan();
+var spans = document.querySelectorAll("[class^=switch]");//this selector 
can be bounded to DisplayArea div
+for (z = 0; z < spans.length; z++) {
+var id = spans[z].getAttribute("id");
+if (id === null) {
+continue;
+}
+else if (id.startsWith("swlnappl")) {
+var y = spans[z].getElementsByTagName("SPAN");
+var n = y.length;
+var foundSystem = false;
+// unhide selectively
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith(appl)){
+y[i].removeAttribute("hidden");
+foundSystem=true;
+}
+}
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith("default")){
+if(!foundSystem){
+y[i].removeAttribute("hidden");
+}
+}
+}
+}
+}
+}
+function hideApplSpan(){
+var spans = document.querySelectorAll("[class^=switch]"); //this selector 
can be bounded to DisplayArea div
+for (z = 0; z < spans.length; z++) {
+var id = spans[z].getAttribute("id");
+if (id === null) {
+continue;
+}else if(id.startsWith("swlnappl")) {
+var y = spans[z].getElementsByTagName("SPAN");
+var n = y.length;
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( 
y[i].getAttribute("id").startsWith("WRITER")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("CALC")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("IMPRESS")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("DRAW")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("BASE")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("MATH")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("default")){y[i].setAttribute("hidden","true");}
+}
+}
+}
+}
diff --git a/help3/xhpeditor/index.php b/help3/xhpeditor/index.php
index dd9e5bf..6be0b34 100644
--- a/help3/xhpeditor/index.php
+++ b/help3/xhpeditor/index.php
@@ -133,11 +133,17 @@ echo $xhp;
 Rendered page';
-echo 'MAC';
-echo 'WIN';
-echo 'UNIX';
-echo '';
+echo 'Rendered page';
+$opSys = array("MAC", "WIN", "UNIX");
+foreach ($opSys as $value) {
+   echo ''.$value.'';
+   }
+echo '';
+$appModule = ar

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

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/AnnotationManager.js |2 +-
 loleaflet/src/map/Map.js |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 21e4a62e3258b62f8ba5adf04984fffd41e98819
Author: Michael Meeks 
AuthorDate: Mon Dec 9 15:58:46 2019 +
Commit: Michael Meeks 
CommitDate: Mon Dec 9 15:59:45 2019 +

zoom: while we are in a zoom animation use the target zoom, follow-on.

addresses more cases missed by 9afbe35d0d30bbb20d1c2ed62af026d692301194
which affect selection rectangles among other items.

Change-Id: Ib4d93f765eb39f7acaa8bbf19a21a910b03e4bb3

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index 0a7c7a07b..35bb428b2 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -908,7 +908,7 @@ L.AnnotationManager = L.Class.extend({
},
 
_getScaleFactor: function () {
-   var scaleFactor = 1.0 / 
this._map.getZoomScale(this._map.options.zoom, this._map._zoom);
+   var scaleFactor = 1.0 / 
this._map.getZoomScale(this._map.options.zoom, this._map.getZoom());
if (scaleFactor < 0.4)
scaleFactor = 0.4;
else if (scaleFactor < 0.6)
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 908e1f1fc..1a26c4b2e 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -829,12 +829,12 @@ L.Map = L.Evented.extend({
 
getZoomScale: function (toZoom, fromZoom) {
var crs = this.options.crs;
-   fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
+   fromZoom = fromZoom === undefined ? this.getZoom() : fromZoom;
return crs.scale(toZoom) / crs.scale(fromZoom);
},
 
getScaleZoom: function (scale, fromZoom) {
-   fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
+   fromZoom = fromZoom === undefined ? this.getZoom() : fromZoom;
return fromZoom + (Math.log(scale) / Math.log(1.2));
},
 
@@ -842,13 +842,13 @@ L.Map = L.Evented.extend({
// conversion methods
 
project: function (latlng, zoom) { // (LatLng[, Number]) -> Point
-   zoom = zoom === undefined ? this._zoom : zoom;
+   zoom = zoom === undefined ? this.getZoom() : zoom;
var projectedPoint = 
this.options.crs.latLngToPoint(L.latLng(latlng), zoom);
return new L.Point(L.round(projectedPoint.x, 1e-6), 
L.round(projectedPoint.y, 1e-6));
},
 
unproject: function (point, zoom) { // (Point[, Number]) -> LatLng
-   zoom = zoom === undefined ? this._zoom : zoom;
+   zoom = zoom === undefined ? this.getZoom() : zoom;
return this.options.crs.pointToLatLng(L.point(point), zoom);
},
 
___
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-6.2' - include/sfx2 include/vcl sfx2/source vcl/inc vcl/source vcl/unx vcl/win

[Tamás Zolnai (via logerrit)]

 include/sfx2/viewfrm.hxx  |1 
 include/vcl/svapp.hxx |6 ++
 sfx2/source/view/viewfrm.cxx  |6 ++
 vcl/inc/helpwin.hxx   |2 
 vcl/inc/svdata.hxx|5 +-
 vcl/source/app/help.cxx   |   88 +-
 vcl/source/app/svdata.cxx |   81 ++
 vcl/source/window/window.cxx  |2 
 vcl/source/window/winproc.cxx |   60 ++--
 vcl/unx/gtk3/gtk3gtkinst.cxx  |8 +--
 vcl/win/window/salframe.cxx   |2 
 11 files changed, 182 insertions(+), 79 deletions(-)

New commits:
commit 53244fa6f15ffaa0baeb7f1fe0a8efe610879877
Author: Tamás Zolnai 
AuthorDate: Tue Jul 23 19:38:56 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Dec 9 16:52:44 2019 +0100

lok: Support per-view help data

Used for showing tooltip windows in LO online.

Change-Id: I8b6a7272c75025e717923c839fa8fd9f4cab2903
Reviewed-on: https://gerrit.libreoffice.org/84717
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 6d9ef75b8ffe..2335010a1b1e 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -68,6 +68,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public 
SfxListener
 SfxObjectShellRef   m_xObjSh;
 std::unique_ptr m_pDispatcher;
 SfxBindings*m_pBindings;
+ImplSVHelpData* m_pHelpData;
 sal_uInt16  m_nAdjustPosPixelLock;
 
 private:
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index dce6af76262f..5a3a18b80067 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1485,6 +1485,12 @@ VCL_DLLPUBLIC bool InitAccessBridge();
 VCL_DLLPUBLIC void CreateMainLoopThread( oslWorkerFunction pWorker, void * 
pThreadData );
 VCL_DLLPUBLIC void JoinMainLoopThread();
 
+/// The following are to manage per-view (frame) help data.
+struct ImplSVHelpData;
+VCL_DLLPUBLIC ImplSVHelpData* CreateSVHelpData();
+VCL_DLLPUBLIC void DestroySVHelpData(ImplSVHelpData*);
+VCL_DLLPUBLIC void SetSVHelpData(ImplSVHelpData*);
+
 inline void Application::EndYield()
 {
 PostUserEvent( Link() );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index e623ce9a6304..1f16a65973d3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1480,6 +1480,7 @@ SfxViewFrame::SfxViewFrame
 )
 : m_pImpl( new SfxViewFrame_Impl( rFrame ) )
 , m_pBindings( new SfxBindings )
+, m_pHelpData(CreateSVHelpData())
 , m_nAdjustPosPixelLock( 0 )
 {
 
@@ -1522,6 +1523,9 @@ SfxViewFrame::~SfxViewFrame()
 
 // Delete Member
 KillDispatcher_Impl();
+
+DestroySVHelpData(m_pHelpData);
+m_pHelpData = nullptr;
 }
 
 // Remove and delete the Dispatcher.
@@ -3159,6 +3163,8 @@ void SfxViewFrame::UpdateDocument_Impl()
 
 void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame )
 {
+if(pFrame)
+SetSVHelpData(pFrame->m_pHelpData);
 SfxGetpApp()->SetViewFrame_Impl( pFrame );
 }
 
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 765dac0508e5..178a6edb8f63 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -24,6 +24,7 @@
 #include 
 
 enum class QuickHelpFlags;
+class ImplSVHelpData;
 
 class HelpTextWindow : public FloatingWindow
 {
@@ -75,6 +76,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 
nHelpWinStyle, QuickHe
 const OUString& rHelpText, const OUString& rStatusText,
 const Point& rScreenPos, const tools::Rectangle& rHelpArea );
 VCL_DLLPUBLIC void ImplDestroyHelpWindow( bool bUpdateHideTime );
+VCL_DLLPUBLIC void ImplDestroyHelpWindow(ImplSVHelpData& rHelpData, bool 
bUpdateHideTime);
 void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle, 
QuickHelpFlags nStyle,
 const Point& rPos, const tools::Rectangle& 
rHelpArea );
 
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index fb189fea9a80..56912ae5bf5d 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -352,6 +352,7 @@ struct ImplSchedulerContext
 
 struct ImplSVData
 {
+ImplSVData();
 ~ImplSVData();
 SalData*mpSalData = nullptr;
 SalInstance*mpDefInst = nullptr;// Default 
SalInstance
@@ -367,7 +368,7 @@ struct ImplSVData
 ImplSVGDIData   maGDIData;  // indepen data 
for Output classes
 ImplSVWinData   maWinData;  // indepen data 
for Windows classes
 ImplSVCtrlData  maCtrlData; // indepen data 
for Control classes
-ImplSVHelpData  maHelpData; // indepen data 
for Help classes
+ImplSVHelpData* mpHelpData; // Data for Help 
classes
 ImplSVNWFData   maNWFData;
 UnoWrapperBase* mpUnoWrapper = nullptr;
 VclPtr mpIntroWindow;   

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

[Tamás Zolnai (via logerrit)]

 vcl/source/window/winproc.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 20db668fe98ed2a90387393dd1a965b80d5fdd9f
Author: Tamás Zolnai 
AuthorDate: Mon Jul 22 17:26:38 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Dec 9 16:37:15 2019 +0100

lok: don't show tooltip for popup menus inside dialogs

Check Character Properties dialog -> Font Effects -> Font Color
popup button. Moving the mouse above the colors, a tooltip is shown
with the color name. However when the tooltip window is displayed
LO online closes the popup window unexpectedly.

Change-Id: I4bb8611640e122fc8187271c8c843c9f29fc0ce0
Reviewed-on: https://gerrit.libreoffice.org/84716
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 56ffa108812d..26b0f5d33531 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -160,6 +160,16 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, 
const Point& rMousePo
 
 static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& 
rMousePos )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Ignore tooltips in popup color pallets
+// (e.g. Character Properties dialog -> Font Effects -> Font Color)
+if(pChild->GetType() == WindowType::CONTROL &&
+   pChild->GetParent() && pChild->GetParent()->GetParent() &&
+   pChild->GetParent()->GetParent()->GetType() == 
WindowType::DOCKINGWINDOW)
+return;
+}
+
 ImplSVData* pSVData = ImplGetSVData();
 if ( !pSVData->maHelpData.mpHelpWin ||
  !( pSVData->maHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||
___
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-6.2' - vcl/source

[Tamás Zolnai (via logerrit)]

 vcl/source/window/floatwin.cxx |6 +-
 vcl/source/window/winproc.cxx  |3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 5700f6173c3a7f30011b44d960b10a983726b3ec
Author: Tamás Zolnai 
AuthorDate: Sat Jul 20 19:17:39 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Dec 9 16:36:37 2019 +0100

lok: show tooltips on dialogs

Change-Id: I40fca6ff13cc41ec9e1ec6bba48dce207e364c79
Reviewed-on: https://gerrit.libreoffice.org/84715
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 77aca029ca29..72dff4985c34 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -651,7 +651,11 @@ void FloatingWindow::StateChanged( StateChangedType nType )
 SetLOKNotifier(pParent->GetLOKNotifier());
 aItems.emplace_back("type", "child");
 aItems.emplace_back("parentId", 
OString::number(pParent->GetLOKWindowId()));
-aItems.emplace_back("position", mpImplData->maPos.toString()); 
// pixels
+if (mbInPopupMode)
+aItems.emplace_back("position", 
mpImplData->maPos.toString()); // pixels
+else // mpImplData->maPos is not set
+aItems.emplace_back("position", GetPosPixel().toString());
+
 }
 aItems.emplace_back("size", GetSizePixel().toString());
 GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", 
aItems);
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 99fefdeece20..56ffa108812d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -160,9 +160,6 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, 
const Point& rMousePo
 
 static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& 
rMousePos )
 {
-if (comphelper::LibreOfficeKit::isActive())
-return;
-
 ImplSVData* pSVData = ImplGetSVData();
 if ( !pSVData->maHelpData.mpHelpWin ||
  !( pSVData->maHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 2476b7650680e58b3cb73c7a4722eb95b819735f
Author: Szymon Kłos 
AuthorDate: Mon Dec 9 16:00:04 2019 +0100
Commit: Szymon Kłos 
CommitDate: Mon Dec 9 16:00:04 2019 +0100

jsdialog: send gradient color porperties

Change-Id: I404f92c76402ede4b042e6d913900a7e1c453243

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 2bdb09b26..6d788bcac 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1247,6 +1247,22 @@ L.Control.JSDialogBuilder = L.Control.extend({
 return false;
},
 
+   _getColorCommandToSend: function(builder, data, color) {
+   var gradientItem;
+
+   if (data.id === 'fillgrad1') {
+   gradientItem = 
builder.map['stateChangeHandler'].getItemValue('.uno:FillGradient');
+   gradientItem.startcolor = color;
+   return '.uno:FillGradient?FillGradientJSON:string=' + 
JSON.stringify(gradientItem);
+   } else if (data.id === 'fillgrad2') {
+   gradientItem = 
builder.map['stateChangeHandler'].getItemValue('.uno:FillGradient');
+   gradientItem.endcolor = color;
+   return '.uno:FillGradient?FillGradientJSON:string=' + 
JSON.stringify(gradientItem);
+   }
+
+   return data.command + '?Color:string=' + color;
+   },
+
_getDefaultColorForCommand: function(command) {
if (command == '.uno:BackColor')
return '#';
@@ -1303,7 +1319,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var noColorControl = (data.command !== '.uno:FontColor' && 
data.command !== '.uno:Color');
 
var callback = function(color) {
-   var command = data.command + '?Color:string=' + color;
+   var command = builder._getColorCommandToSend(builder, 
data, color);
builder.map.sendUnoCommand(command);
};
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 desktop/source/lib/init.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7ba2d77dc2b920978f6084ae6223b6828f32bcd3
Author: Stephan Bergmann 
AuthorDate: Mon Dec 9 15:18:06 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 9 16:25:23 2019 +0100

Use o3tl::doAccess, prevent -Werror=maybe-uninitialized

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b527f2cdeb92..bd11c2ad6fc7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3488,17 +3489,16 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 int nLeft = OutputDevice::LogicToLogic(aChartBB.Left(), 
MapUnit::MapTwip, MapUnit::Map100thMM);
 int nTop = OutputDevice::LogicToLogic(aChartBB.Top(), 
MapUnit::MapTwip, MapUnit::Map100thMM);
 
-sal_Int32 value;
 for (beans::PropertyValue& rPropValue: aPropertyValuesVector)
 {
 if (rPropValue.Name == "TransformPosX" || rPropValue.Name 
== "TransformRotationX")
 {
-rPropValue.Value >>= value;
+auto const value = 
*o3tl::doAccess(rPropValue.Value);
 rPropValue.Value <<= value - nLeft;
 }
 else if (rPropValue.Name == "TransformPosY" || 
rPropValue.Name == "TransformRotationY")
 {
-rPropValue.Value >>= value;
+auto const value = 
*o3tl::doAccess(rPropValue.Value);
 rPropValue.Value <<= value - nTop;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9631f5d35d1870faf4ca2a19fe30b827a1f59905
Author: Stephan Bergmann 
AuthorDate: Mon Dec 9 15:13:59 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 9 16:25:00 2019 +0100

Prefer O3TL_UNREACHABLE over assert(false)

...so that -Werror=maybe-uninitialized is also silenced (cf.
281f3d5c418e50a2858619633ebca290bd626c03 "Silence 
-Werror=maybe-uninitialized")
with --disable-assert-always-abort

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

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
index 10b9de01d9a0..43037b5059f5 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
@@ -9,7 +9,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 
@@ -21,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace {
 
@@ -150,7 +150,7 @@ static bool gtv_calc_header_bar_draw_impl(GtkWidget* 
pWidget, cairo_t* pCairo)
 }
 else
 {
-assert(false); // should never happen
+O3TL_UNREACHABLE; // should never happen
 }
 
 gtv_calc_header_bar_draw_text(pCairo, aRectangle, rHeader.m_aText);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/inc/shellio.hxx|1 +
 sw/qa/extras/uiwriter/data2/ofz18563.docx |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx   |9 +
 3 files changed, 10 insertions(+)

New commits:
commit 34d5b03d8f323e6af33e2358b898a5843596f4ea
Author: Caolán McNamara 
AuthorDate: Thu Dec 5 12:03:56 2019 +
Commit: Michael Stahl 
CommitDate: Mon Dec 9 16:15:30 2019 +0100

ofz#18563 test case for assert/crash

Change-Id: Idb98b7fae03bc31fc050519a7b0720208adeb843
Reviewed-on: https://gerrit.libreoffice.org/84556
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit c29b89acc59f5913068f60d670e72918121e4e84)
Reviewed-on: https://gerrit.libreoffice.org/84728

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index b4004898ad77..82da722ac10d 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -190,6 +190,7 @@ namespace o3tl {
 };
 
 extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOC(SvStream &rStream, const 
OUString &rFltName);
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOCX(SvStream &rStream);
 extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportRTF(SvStream &rStream);
 extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportHTML(SvStream &rStream);
 SAL_DLLPUBLIC_EXPORT void FlushFontCache();
diff --git a/sw/qa/extras/uiwriter/data2/ofz18563.docx 
b/sw/qa/extras/uiwriter/data2/ofz18563.docx
new file mode 100644
index ..6733db44abb7
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/ofz18563.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 4a317d194ad5..79601dfddcd5 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -2412,4 +2413,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf128603)
 CPPUNIT_ASSERT_EQUAL(pIndex4->GetIndex(), pIndex5->GetIndex());
 }
 
+// only care that it doesn't assert/crash
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testOfz18563)
+{
+OUString 
sURL(m_directories.getURLFromSrc("/sw/qa/extras/uiwriter/data2/ofz18563.docx"));
+SvFileStream aFileStream(sURL, StreamMode::READ);
+TestImportDOCX(aFileStream);
+}
+
 /* 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] dev-tools.git: help3/xhpeditor

[Olivier Hallot (via logerrit)]

 help3/xhpeditor/DisplayArea.js   |   69 +
 help3/xhpeditor/ed_transform.xsl |  156 ---
 help3/xhpeditor/index.php|9 +-
 3 files changed, 141 insertions(+), 93 deletions(-)

New commits:
commit dc6fc0c304f1db83c6ab788191bdabf52a2d07d9
Author: Olivier Hallot 
AuthorDate: Mon Dec 9 11:42:37 2019 -0300
Commit: Olivier Hallot 
CommitDate: Mon Dec 9 15:58:46 2019 +0100

XHP Editor: add 'system' switches

* Add buttons to select computer system on rendered page
* Mute links to prevent clicking on href's
* cleanup on scripts

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

diff --git a/help3/xhpeditor/DisplayArea.js b/help3/xhpeditor/DisplayArea.js
new file mode 100644
index 000..cd2d83f
--- /dev/null
+++ b/help3/xhpeditor/DisplayArea.js
@@ -0,0 +1,69 @@
+/*
+ * 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/.
+ *
+ */
+
+// scripts for rendered DisplayArea
+
+// Used to set system in case, caseinline=SYSTEM
+
+function setSystemSpan(system) {
+hideSystemSpan();
+var spans = document.querySelectorAll("[class^=switch]");
+for (z = 0; z < spans.length; z++) {
+var id = spans[z].getAttribute("id");
+if (id === null) {
+continue;
+}
+else if (id.startsWith("swlnsys")) {
+var y = spans[z].getElementsByTagName("SPAN");
+var n = y.length;
+var foundSystem = false;
+// unhide selectively
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith(system)){
+y[i].removeAttribute("hidden");
+foundSystem=true;
+}
+}
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( y[i].getAttribute("id").startsWith("default")){
+if(!foundSystem){
+y[i].removeAttribute("hidden");
+}
+}
+}
+}
+}
+}
+function hideSystemSpan(){
+var spans = document.querySelectorAll("[class^=switch]");
+for (z = 0; z < spans.length; z++) {
+var id = spans[z].getAttribute("id");
+if (id === null) {
+continue;
+}else if(id.startsWith("swlnsys")) {
+var y = spans[z].getElementsByTagName("SPAN");
+var n = y.length;
+for (i = 0; i < n; i++) {
+if (y[i].getAttribute("id") === null){
+continue;
+}
+else if( 
y[i].getAttribute("id").startsWith("MAC")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("WIN")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("UNIX")){y[i].setAttribute("hidden","true");}
+else if( 
y[i].getAttribute("id").startsWith("default")){y[i].setAttribute("hidden","true");}
+}
+}
+}
+}
diff --git a/help3/xhpeditor/ed_transform.xsl b/help3/xhpeditor/ed_transform.xsl
index f07aed5..d4c742f 100644
--- a/help3/xhpeditor/ed_transform.xsl
+++ b/help3/xhpeditor/ed_transform.xsl
@@ -467,94 +467,82 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
 
-
-
-
-
-
+
+
+
+
+
 
-
-
-
+
+
+
+Unsupported switch condition.
+
+
 
 
-
-
-
-
+
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

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

[Mike Kaganski (via logerrit)]

 basctl/source/basicide/basobj2.cxx |4 ++--
 basic/source/classes/sbxmod.cxx|6 --
 include/basic/sbmod.hxx|1 -
 sw/source/filter/html/htmlbas.cxx  |2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 919375354c769ac9cc6a49ebfbfb84aa0f15df39
Author: Mike Kaganski 
AuthorDate: Mon Dec 9 14:39:59 2019 +0100
Commit: Mike Kaganski 
CommitDate: Mon Dec 9 15:34:38 2019 +0100

GetSource32 and GetSource are identical

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

diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 9a9656d0d160..77e9afe9f795 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -370,7 +370,7 @@ Sequence< OUString > GetMethodNames( const ScriptDocument& 
rDocument, const OUSt
 SbModuleRef xModule;
 // Only reparse modules if ScriptDocument source is out of sync
 // with basic's Module
-if ( !pMod || pMod->GetSource() != aOUSource )
+if ( !pMod || pMod->GetSource32() != aOUSource )
 {
 xModule = new SbModule( rModName );
 xModule->SetSource32( aOUSource );
@@ -420,7 +420,7 @@ bool HasMethod (
 SbModuleRef xModule;
 // Only reparse modules if ScriptDocument source is out of sync
 // with basic's Module
-if ( !pMod || pMod->GetSource() != aOUSource )
+if ( !pMod || pMod->GetSource32() != aOUSource )
 {
 xModule = new SbModule( rModName );
 xModule->SetSource32( aOUSource );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c1e34eb8b7b1..e0b85995b406 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -663,12 +663,6 @@ SbxVariable* SbModule::Find( const OUString& rName, 
SbxClassType t )
 return pRes;
 }
 
-
-const OUString& SbModule::GetSource() const
-{
-return aOUSource;
-}
-
 // Parent and BASIC are one!
 
 void SbModule::SetParent( SbxObject* p )
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index 8ba26e4568ae..cc9ab469d3a5 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -100,7 +100,6 @@ public:
 
 virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
 
-const OUString&  GetSource() const;
 const OUString&  GetSource32() const { return aOUSource;}
 void SetSource32( const OUString& r );
 
diff --git a/sw/source/filter/html/htmlbas.cxx 
b/sw/source/filter/html/htmlbas.cxx
index 7be428fe3957..0a105d95da8c 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -293,7 +293,7 @@ void SwHTMLWriter::OutBasic()
 
 const OUString& rModName = pModule->GetName();
 Strm().WriteCharPtr( SAL_NEWLINE_STRING );   // don't indent!
-HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), 
pModule->GetSource(),
+HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), 
pModule->GetSource32(),
  sLang, STARBASIC, OUString(),
  &rLibName, &rModName,
  m_eDestEnc, &m_aNonConvertableCharacters 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5FilePicker.hxx |   21 ++---
 vcl/qt5/Qt5FilePicker.cxx |   89 --
 2 files changed, 82 insertions(+), 28 deletions(-)

New commits:
commit d79a41a02cd46c50cab08ba1a5d5b213b6843251
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jun 5 14:04:24 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 9 15:32:17 2019 +0100

tdf#129071 Qt5 set file picker parent widget

If the XInitialization::initialize has a parent option, use that
system window ID to find the parent Qt5Frame and set this as the
parent of the file picker. This way the file picker doesn't show
up as a separate window in the KDE task bar and get the proper
icon. Just setting it transient to the parent is not enough.

This also includes the terminate listener handling, so an open
file picker won't prevent LO to shut down gracefully (which is
handled independent from the document modified state).

Change-Id: I62aef532e739e7fea9fe8a4b4e6c0e205faae1d9
Reviewed-on: https://gerrit.libreoffice.org/74544
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index f88395c6acce..5fef2aaeae43 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -23,8 +23,9 @@
 
 #include 
 
-#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -33,8 +34,6 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -48,9 +47,10 @@ class QGridLayout;
 class QLabel;
 class QWidget;
 
-typedef ::cppu::WeakComponentImplHelper<
-css::ui::dialogs::XFilePicker3, css::ui::dialogs::XFilePickerControlAccess,
-css::ui::dialogs::XFolderPicker2, css::lang::XInitialization, 
css::lang::XServiceInfo>
+typedef ::cppu::WeakComponentImplHelper
 Qt5FilePicker_Base;
 
 class VCLPLUG_QT5_PUBLIC Qt5FilePicker : public QObject, public 
Qt5FilePicker_Base
@@ -75,6 +75,8 @@ private:
 
 const bool m_bIsFolderPicker;
 
+QWidget* m_pParentWidget;
+
 protected:
 std::unique_ptr m_pFileDialog; ///< the file picker dialog
 QWidget* m_pExtraControls; ///< widget to contain extra custom controls
@@ -132,8 +134,7 @@ public:
 virtual void SAL_CALL initialize(const css::uno::Sequence& 
rArguments) override;
 
 // XEventListener
-/// @throws css::uno::RuntimeException
-virtual void disposing(const css::lang::EventObject& rEvent);
+void SAL_CALL disposing(const css::lang::EventObject& rEvent) override;
 using cppu::WeakComponentImplHelperBase::disposing;
 
 // XServiceInfo
@@ -145,6 +146,10 @@ public:
 virtual OUString SAL_CALL getDirectory() override;
 virtual void SAL_CALL setDescription(const OUString& rDescription) 
override;
 
+// XTerminateListener
+void SAL_CALL queryTermination(const css::lang::EventObject& aEvent) 
override;
+void SAL_CALL notifyTermination(const css::lang::EventObject& aEvent) 
override;
+
 protected:
 virtual void addCustomControl(sal_Int16 controlId);
 void setCustomControlWidgetLayout(QGridLayout* pLayout) { m_pLayout = 
pLayout; }
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 10c25052fd8a..d37c28b33c11 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -25,8 +25,15 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -36,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -80,6 +88,7 @@ 
Qt5FilePicker::Qt5FilePicker(css::uno::Reference co
 : Qt5FilePicker_Base(m_aHelperMutex)
 , m_context(context)
 , m_bIsFolderPicker(eMode == QFileDialog::Directory)
+, m_pParentWidget(nullptr)
 , m_pFileDialog(new QFileDialog(nullptr, {}, QDir::homePath()))
 , m_pExtraControls(new QWidget())
 {
@@ -155,17 +164,16 @@ sal_Int16 SAL_CALL Qt5FilePicker::execute()
 return ret;
 }
 
-vcl::Window* pWindow = ::Application::GetActiveTopWindow();
-QWidget* pTransientParent = nullptr;
-QWindow* pTransientWindow = nullptr;
-if (pWindow)
+QWidget* pTransientParent = m_pParentWidget;
+if (!pTransientParent)
 {
-Qt5Frame* pFrame = dynamic_cast(pWindow->ImplGetFrame());
-assert(pFrame);
-if (pFrame)
+vcl::Window* pWindow = ::Application::GetActiveTopWindow();
+if (pWindow)
 {
-pTransientParent = pFrame->GetQWidget();
-pTransientWindow = pTransientParent->window()->windowHandle();
+Qt5Frame* pFrame = 
dynamic_cast(pWindow->ImplGetFrame());
+assert(pFrame);
+if (pFrame)
+pTransientParent = pFrame->asChild();
 }
 }
 
@@ -174,16 +182,19 @@ sal_Int16 SAL_CALL Qt5FilePicker::execute()
 if (!m_aCurrentFilter.isEmpty())
 m_pFileDialog->selectNameFilter(m_aCurrentFilt

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

[Caolán McNamara (via logerrit)]

 include/vcl/treelistbox.hxx |4 ++--
 include/vcl/weld.hxx|3 ++-
 vcl/source/app/salvtables.cxx   |   18 +-
 vcl/source/treelist/treelistbox.cxx |   12 +---
 vcl/unx/gtk3/gtk3gtkinst.cxx|   14 +++---
 5 files changed, 33 insertions(+), 18 deletions(-)

New commits:
commit 8ae03b548e4b98d4740ab986c41fc24279734128
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 12:09:38 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 15:25:49 2019 +0100

only connect to tooltip query when we have to

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 54a72e80c32d..b7d86c9c7df9 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -734,8 +734,9 @@ protected:
 OUString signal_query_tooltip(const TreeIter& rIter) { return 
m_aQueryTooltipHdl.Call(rIter); }
 
 public:
-void connect_query_tooltip(const Link& rLink)
+virtual void connect_query_tooltip(const Link& 
rLink)
 {
+assert(!m_aQueryTooltipHdl.IsSet() || !rLink.IsSet());
 m_aQueryTooltipHdl = rLink;
 }
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c37cab6261e8..5b0686a9f77e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3491,7 +3491,6 @@ public:
 m_xTreeView->SetDoubleClickHdl(LINK(this, SalInstanceTreeView, 
DoubleClickHdl));
 m_xTreeView->SetExpandingHdl(LINK(this, SalInstanceTreeView, 
ExpandingHdl));
 m_xTreeView->SetPopupMenuHdl(LINK(this, SalInstanceTreeView, 
PopupMenuHdl));
-m_xTreeView->SetTooltipHdl(LINK(this, SalInstanceTreeView, 
TooltipHdl));
 const long aTabPositions[] = { 0 };
 m_xTreeView->SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions);
 LclHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
@@ -3520,6 +3519,12 @@ public:
 m_aRadioButtonData.SetLink(LINK(this, SalInstanceTreeView, ToggleHdl));
 }
 
+virtual void connect_query_tooltip(const Link& rLink) override
+{
+weld::TreeView::connect_query_tooltip(rLink);
+m_xTreeView->SetTooltipHdl(LINK(this, SalInstanceTreeView, 
TooltipHdl));
+}
+
 virtual void columns_autosize() override
 {
 std::vector aWidths;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 71a8489ffbd5..9fe5c2d289ad 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -8564,7 +8564,7 @@ public:
 , m_nDragDataDeleteignalId(0)
 , m_nDragGetSignalId(0)
 , m_nKeyPressSignalId(g_signal_connect(pTreeView, "key-press-event", 
G_CALLBACK(signalKeyPress), this))
-, m_nQueryTooltipSignalId(g_signal_connect(pTreeView, "query-tooltip", 
G_CALLBACK(signalQueryTooltip), this))
+, m_nQueryTooltipSignalId(0)
 , m_pChangeEvent(nullptr)
 {
 m_pColumns = gtk_tree_view_get_columns(m_pTreeView);
@@ -8625,6 +8625,12 @@ public:
 m_nRowInsertedSignalId = g_signal_connect(pModel, "row-inserted", 
G_CALLBACK(signalRowInserted), this);
 }
 
+virtual void connect_query_tooltip(const Link& rLink) override
+{
+weld::TreeView::connect_query_tooltip(rLink);
+m_nQueryTooltipSignalId = g_signal_connect(m_pTreeView, 
"query-tooltip", G_CALLBACK(signalQueryTooltip), this);
+}
+
 virtual void columns_autosize() override
 {
 gtk_tree_view_columns_autosize(m_pTreeView);
@@ -9998,6 +10004,8 @@ public:
 {
 if (m_pChangeEvent)
 Application::RemoveUserEvent(m_pChangeEvent);
+if (m_nQueryTooltipSignalId)
+g_signal_handler_disconnect(m_pTreeView, m_nQueryTooltipSignalId);
 g_signal_handler_disconnect(m_pTreeView, m_nKeyPressSignalId);
 g_signal_handler_disconnect(m_pTreeView, m_nDragEndSignalId);
 g_signal_handler_disconnect(m_pTreeView, m_nDragBeginSignalId);
@@ -10029,8 +10037,6 @@ public:
 m_aColumnSignalIds.pop_back();
 }
 g_list_free(m_pColumns);
-
-g_signal_handler_disconnect(m_pTreeView, m_nQueryTooltipSignalId);
 }
 };
 
commit c29fa13bd050134e751b01d0c4178538c4c20f69
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 11:56:01 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 15:25:38 2019 +0100

Related tdf#108458 if no TooltipHdl set use usual tooltip

also if the Tooltip was blank continue to use usual tooltip

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

diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index ba088cee8c6f..69bbdabfd411 100644
---

[Libreoffice-commits] core.git: helpcontent2

[LibreOfficiant (via logerrit)]

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

New commits:
commit 43c77cb8f6e4c13b457e76f3d27b41dfd06aa8a5
Author: LibreOfficiant 
AuthorDate: Mon Dec 9 09:56:40 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 9 14:55:58 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - extra warnings for isObject function

Change-Id: Ie566946cdd12359000db6fbb30d9dec49f8c73c5
Reviewed-on: https://gerrit.libreoffice.org/84729
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 32b00ca83457..8a9eeb535a80 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 32b00ca8345742e1070cad234f3f8f903465429d
+Subproject commit 8a9eeb535a80d07fa6f7b1d495544b95a045819c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[LibreOfficiant (via logerrit)]

 source/text/sbasic/shared/03102800.xhp |   28 +++-
 1 file changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 8a9eeb535a80d07fa6f7b1d495544b95a045819c
Author: LibreOfficiant 
AuthorDate: Mon Dec 9 09:56:40 2019 +0100
Commit: Olivier Hallot 
CommitDate: Mon Dec 9 14:55:58 2019 +0100

extra warnings for isObject function

Change-Id: Ie566946cdd12359000db6fbb30d9dec49f8c73c5
Reviewed-on: https://gerrit.libreoffice.org/84729
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/03102800.xhp 
b/source/text/sbasic/shared/03102800.xhp
index bc884e18a..650992598 100644
--- a/source/text/sbasic/shared/03102800.xhp
+++ b/source/text/sbasic/shared/03102800.xhp
@@ -1,5 +1,4 @@
 
-
 
-
 
 
 
@@ -33,18 +31,38 @@
 IsObject function
 
 IsObject 
Function
-Tests if a 
variable is an object, as opposed to primitive data types such as dates, 
numbers, texts. The function returns True if the variable is an object, 
otherwise it returns False.
+Tests if a 
variable is an object, as opposed to primitive data types such as dates, 
numbers, texts. The function returns True if the variable is 
an object, otherwise it returns False.
 
 Syntax:
 
-IsObject 
(var)
+IsObject(var)
 
 Return 
value:
 Boolean
 Parameters:
 
-var: Any variable that you want to test. If the var variable 
contains an extended type, object instance or OLE Object, the function returns 
True.
+var: Any variable that you want to test.
 
 
+The following objects 
return True:
+  
+OLE objects 
or UNO objects
+Class 
module object instances
+Extended 
types or enumerations  
+Routines 
or variables when defined as Object.
+%PRODUCTNAME Basic modules
+  
+  Data structures return 
True even when empty. Object defined variables return 
True even if uninitialized.
+  
+   Enum 
statement
+   
+   
+   
+   
+   
+   
+   Type 
statement
+   Using 
variables
+
 
 
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/toolbar-mobile.css |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 33af2f483d1c0b4e8d22d773f5bed3c20c8a57d9
Author: Pedro Pinto Silva 
AuthorDate: Mon Dec 9 14:42:23 2019 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Mon Dec 9 14:43:33 2019 +0100

Fix Insert Shape Palette scrolling issues

Change-Id: I98c141edbe88a74cf14453972494f29882aed23e
Reviewed-on: https://gerrit.libreoffice.org/84748
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/css/toolbar-mobile.css b/loleaflet/css/toolbar-mobile.css
index 823b43ca3..3bfcb6a79 100644
--- a/loleaflet/css/toolbar-mobile.css
+++ b/loleaflet/css/toolbar-mobile.css
@@ -11,6 +11,15 @@
}
 }
 @media (max-width: 767px), (max-device-height: 767px) {
+   .insertshape-grid {
+   box-sizing: content-box;
+   position: absolute;
+   padding: 2px 0px 2px 0px;
+   display: inline-block;
+   width: 100%;
+   height: 100%;
+   overflow-y: scroll;
+   }
#formulabar {
padding: 0px !important;
border-top: 1px solid #bb !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source basic/qa basic/source include/basic scripting/source sc/source sw/source

[Mike Kaganski (via logerrit)]

 basctl/source/basicide/baside2.cxx  |   12 
 basctl/source/basicide/baside2b.cxx |   59 +-
 basctl/source/basicide/basobj2.cxx  |   14 
 basctl/source/basicide/basobj3.cxx  |2 
 basctl/source/basicide/macrodlg.cxx |6 
 basic/qa/cppunit/basictest.cxx  |2 
 basic/source/basmgr/basmgr.cxx  |   12 
 basic/source/classes/eventatt.cxx   |   14 
 basic/source/classes/image.cxx  |   26 -
 basic/source/classes/propacc.cxx|6 
 basic/source/classes/sb.cxx |   58 +-
 basic/source/classes/sbunoobj.cxx   |  166 +++---
 basic/source/classes/sbxmod.cxx |  105 ++--
 basic/source/comp/codegen.cxx   |   12 
 basic/source/comp/dim.cxx   |   10 
 basic/source/comp/sbcomp.cxx|4 
 basic/source/runtime/dllmgr-none.cxx|4 
 basic/source/runtime/dllmgr-x64.cxx |   38 -
 basic/source/runtime/dllmgr-x86.cxx |   36 -
 basic/source/runtime/inputbox.cxx   |   18 
 basic/source/runtime/methods.cxx|  810 
 basic/source/runtime/methods1.cxx   |  650 -
 basic/source/runtime/props.cxx  |  194 +++
 basic/source/runtime/runtime.cxx|  170 +++---
 basic/source/runtime/stdobj.cxx |2 
 basic/source/runtime/stdobj1.cxx|   18 
 basic/source/sbx/sbxarray.cxx   |  157 --
 basic/source/sbx/sbxcoll.cxx|   24 
 basic/source/sbx/sbxexec.cxx|4 
 basic/source/sbx/sbxobj.cxx |   48 -
 basic/source/sbx/sbxstr.cxx |   10 
 basic/source/sbx/sbxvalue.cxx   |2 
 basic/source/sbx/sbxvar.cxx |6 
 include/basic/sbx.hxx   |   31 -
 include/basic/sbxobj.hxx|2 
 sc/source/core/data/validat.cxx |6 
 sc/source/core/tool/interpr4.cxx|6 
 sc/source/ui/vba/vbaapplication.cxx |2 
 scripting/source/basprov/basmodnode.cxx |   12 
 scripting/source/basprov/basscript.cxx  |9 
 sw/source/core/doc/docbasic.cxx |6 
 sw/source/uibase/docvw/edtwin.cxx   |   26 -
 42 files changed, 1332 insertions(+), 1467 deletions(-)

New commits:
commit 62f3f3d92aa204eaaa063b30d7ade44df501b997
Author: Mike Kaganski 
AuthorDate: Mon Dec 9 13:06:03 2019 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 9 14:18:25 2019 +0100

SbxArray: drop 16-bit indices

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

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 5cb16f8f1f58..5ac30b14432b 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -336,9 +336,9 @@ void ModulWindow::BasicExecute()
 const sal_uInt32 nCurMethodStart = aSel.GetStart().GetPara() + 1;
 SbMethod* pMethod = nullptr;
 // first Macro, else blind "Main" (ExtSearch?)
-for ( sal_uInt16 nMacro = 0; nMacro < 
m_xModule->GetMethods()->Count(); nMacro++ )
+for ( sal_uInt32 nMacro = 0; nMacro < 
m_xModule->GetMethods()->Count32(); nMacro++ )
 {
-SbMethod* pM = 
static_cast(m_xModule->GetMethods()->Get( nMacro ));
+SbMethod* pM = 
static_cast(m_xModule->GetMethods()->Get32( nMacro ));
 assert(pM && "Method?");
 pM->GetLineRange( nStart, nEnd );
 if (  nCurMethodStart >= nStart && nCurMethodStart <= nEnd )
@@ -526,9 +526,9 @@ void ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 GetBreakPoints().InsertSorted( BreakPoint( nLine ) );
 if ( StarBASIC::IsRunning() )
 {
-for ( sal_uInt16 nMethod = 0; nMethod < 
m_xModule->GetMethods()->Count(); nMethod++ )
+for ( sal_uInt32 nMethod = 0; nMethod < 
m_xModule->GetMethods()->Count32(); nMethod++ )
 {
-SbMethod* pMethod = 
static_cast(m_xModule->GetMethods()->Get( nMethod ));
+SbMethod* pMethod = 
static_cast(m_xModule->GetMethods()->Get32( nMethod ));
 assert(pMethod && "Method not found! (NULL)");
 pMethod->SetDebugFlags( pMethod->GetDebugFlags() | 
BasicDebugFlags::Break );
 }
@@ -1295,9 +1295,9 @@ void ModulWindow::BasicStarted()
 {
 rList.ResetHitCount();
 rList.SetBreakPointsInBasic( m_xModule.get() );
-for ( sal_uInt16 nMethod = 0; nMethod < 
m_xModule->GetMethods()->Count(); nMethod++ )
+for ( sal_uInt32 nMethod = 0; nMethod < 
m_xModule->GetMethods()->Count32(); nMethod++ )
 {
-SbMethod* pMethod = 
static_cast(m_xModule->GetMethods()->Get( nMethod ));
+SbMethod* pMethod = 
static_cast(m_xModule

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

[Kelemen Gábor (via logerrit)]

 vcl/source/window/printdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 327ffd94ef79d29233aac38d8965bc6e8557e8f4
Author: Kelemen Gábor 
AuthorDate: Fri Dec 6 14:33:20 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Dec 9 13:49:55 2019 +0100

tdf#122706 Fix built-in HID on Print dialogs Help button

to open the general Print page.

Reviewed-on: https://gerrit.libreoffice.org/84628
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 46a07f2042a812fc552e26736183c7d06fe6aa35)
Reviewed-on: https://gerrit.libreoffice.org/84735
Reviewed-by: Xisco Faulí 
Signed-off-by: Xisco Fauli 

Change-Id: I1ffee4a9d72bb6a4840dec3800a397a878ed2eca
Reviewed-on: https://gerrit.libreoffice.org/84738
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d0448f797927..270d4ca62a38 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1815,7 +1815,7 @@ IMPL_LINK ( PrintDialog, ClickHdl, Button*, pButton, void 
)
 Help* pHelp = Application::GetHelp();
 if( pHelp )
 {
-pHelp->Start( "vcl/ui/printdialog", mpOKButton );
+pHelp->Start("vcl/ui/printdialog/PrintDialog", mpOKButton );
 }
 }
 else if ( pButton == mpPreviewBox )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/tpline.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 524d3754bee2161c1caa01d5415b39726dd668c9
Author: Caolán McNamara 
AuthorDate: Fri Dec 6 14:43:35 2019 +
Commit: Xisco Faulí 
CommitDate: Mon Dec 9 13:43:50 2019 +0100

Resolves: tdf#128923 should be able to change attributes of multiple 
lines...

without changing color

Change-Id: I76cf21af4611afc11bf1861abe7d0b903362e798
Reviewed-on: https://gerrit.libreoffice.org/84639
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8dd8dc36f527..b8ddc16ed0e8 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -468,6 +468,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
 }
 
 // Line color
+if (m_xLbColor->IsValueChangedFromSaved())
 {
 NamedColor aColor = m_xLbColor->GetSelectedEntry();
 XLineColorItem aItem(aColor.second, aColor.first);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Balazs Varga (via logerrit)]

 chart2/source/controller/main/PositionAndSizeHelper.cxx |1 
 chart2/source/view/main/VLegend.cxx |   36 
 sw/qa/extras/layout/data/tdf115630.docx |binary
 sw/qa/extras/layout/layout.cxx  |   25 +++
 4 files changed, 43 insertions(+), 19 deletions(-)

New commits:
commit 8c39a4ea777c0afa1dbea9a3399436d22c2e6e70
Author: Balazs Varga 
AuthorDate: Thu Nov 21 14:56:43 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Dec 9 13:40:39 2019 +0100

tdf#115630 tdf#88922 Chart: fix custom legend position and size

Do not need to set the "AnchorPosition" value, when we move
the legend object. It is enough to set only the "Expansion" as
custom, so we keep the previously set "AnchorPosition" value
and we can use the lcl_calculatePositionAndRemainingSpace function
to calculate the remaining space of the inner chart area.

Change-Id: I7b577bc6acf2de9b6755329b92603ea5ba631d57
Reviewed-on: https://gerrit.libreoffice.org/83399
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 739ed2c29f49ea5e83bcd1352b2644c2e2d09f7b)
Reviewed-on: https://gerrit.libreoffice.org/83890
Reviewed-by: Xisco Faulí 
(cherry picked from commit 1903d0275b09d88eec6e57303a8a7d34246cb230)
Reviewed-on: https://gerrit.libreoffice.org/84241
Reviewed-by: Balazs Varga 

diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx 
b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 8f8b7109b8a5..177a605f820f 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -68,7 +68,6 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
 }
 else if(eObjectType==OBJECTTYPE_LEGEND)
 {
-xObjectProp->setPropertyValue( "AnchorPosition", 
uno::Any(LegendPosition_CUSTOM));
 xObjectProp->setPropertyValue( "Expansion", 
uno::Any(css::chart::ChartLegendExpansion_CUSTOM));
 chart2::RelativePosition aRelativePosition;
 chart2::RelativeSize aRelativeSize;
diff --git a/chart2/source/view/main/VLegend.cxx 
b/chart2/source/view/main/VLegend.cxx
index bbb0707f7a0f..315cb98b41ce 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -701,29 +701,29 @@ awt::Point lcl_calculatePositionAndRemainingSpace(
 switch( ePos )
 {
 case LegendPosition_LINE_START:
-{
-sal_Int32 nExtent = aLegendSize.Width;
-rRemainingSpace.Width -= ( nExtent + nXDistance );
-rRemainingSpace.X += ( nExtent + nXDistance );
-}
+{
+sal_Int32 nExtent = aLegendSize.Width;
+rRemainingSpace.Width -= ( nExtent + nXDistance );
+rRemainingSpace.X += ( nExtent + nXDistance );
+}
 break;
 case LegendPosition_LINE_END:
-{
-rRemainingSpace.Width -= ( aLegendSize.Width + nXDistance );
-}
-break;
+{
+rRemainingSpace.Width -= ( aLegendSize.Width + nXDistance );
+}
+break;
 case LegendPosition_PAGE_START:
-{
-sal_Int32 nExtent = aLegendSize.Height;
-rRemainingSpace.Height -= ( nExtent + nYDistance );
-rRemainingSpace.Y += ( nExtent + nYDistance );
-}
+{
+sal_Int32 nExtent = aLegendSize.Height;
+rRemainingSpace.Height -= ( nExtent + nYDistance );
+rRemainingSpace.Y += ( nExtent + nYDistance );
+}
 break;
 case LegendPosition_PAGE_END:
-{
-rRemainingSpace.Height -= ( aLegendSize.Height + nYDistance );
-}
-break;
+{
+rRemainingSpace.Height -= ( aLegendSize.Height + nYDistance );
+}
+break;
 
 default:
 // nothing
diff --git a/sw/qa/extras/layout/data/tdf115630.docx 
b/sw/qa/extras/layout/data/tdf115630.docx
new file mode 100644
index ..e9f6339a1242
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf115630.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 403ad46f43ef..fdd1d2ae125c 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2358,6 +2358,31 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf75659)
 // These failed, if the legend names are empty strings.
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf115630)
+{
+SwDoc* pDoc = createDoc("tdf115630.docx");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Test wide of 

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

[Jim Raykowski (via logerrit)]

 extensions/source/propctrlr/browserline.cxx |1 
 extensions/source/propctrlr/browserline.hxx |2 -
 extensions/source/propctrlr/browserlistbox.cxx  |1 
 extensions/source/propctrlr/browserlistbox.hxx  |2 -
 extensions/source/propctrlr/commoncontrol.cxx   |1 
 extensions/source/propctrlr/inspectorhelpwindow.hxx |2 -
 extensions/source/propctrlr/standardcontrol.cxx |3 --
 extensions/source/propctrlr/usercontrol.hxx |1 
 include/vcl/treelistbox.hxx |2 +
 include/vcl/weld.hxx|8 +++
 vcl/source/app/salvtables.cxx   |   19 +
 vcl/source/treelist/treelistbox.cxx |9 ++--
 vcl/unx/gtk3/gtk3gtkinst.cxx|   22 
 13 files changed, 58 insertions(+), 15 deletions(-)

New commits:
commit 6303f8ac291233b1f6888a8d71e769debe0f9fb0
Author: Jim Raykowski 
AuthorDate: Thu Dec 5 12:14:37 2019 -0900
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 13:29:32 2019 +0100

tdf#108458 related: Add tooltip handling to TreeView

Supports GtkInstanceTreeView and SalInstanceTreeView

Change-Id: I33984f78c26135319531eace2a3e2e2e28712af1
Reviewed-on: https://gerrit.libreoffice.org/84587
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index cb4945a96717..ba088cee8c6f 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -200,6 +200,7 @@ class VCL_DLLPUBLIC SvTreeListBox
 Link  aSelectHdl;
 Link  aDeselectHdl;
 Link aPopupMenuHdl;
+Link aTooltipHdl;
 
 Image   aPrevInsertedExpBmp;
 Image   aPrevInsertedColBmp;
@@ -433,6 +434,7 @@ public:
 voidSetExpandingHdl(const Link& 
rNewHdl){aExpandingHdl=rNewHdl;}
 voidSetExpandedHdl(const Link& 
rNewHdl){aExpandedHdl=rNewHdl;}
 void SetPopupMenuHdl(const Link& rLink) { 
aPopupMenuHdl = rLink; }
+void SetTooltipHdl(const Link& rLink) { 
aTooltipHdl = rLink; }
 
 virtual voidExpandedHdl();
 virtual boolExpandingHdl();
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index e68d46c420d6..54a72e80c32d 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -730,7 +730,15 @@ protected:
 return m_aEditingDoneHdl.Call(rIterText);
 }
 
+Link m_aQueryTooltipHdl;
+OUString signal_query_tooltip(const TreeIter& rIter) { return 
m_aQueryTooltipHdl.Call(rIter); }
+
 public:
+void connect_query_tooltip(const Link& rLink)
+{
+m_aQueryTooltipHdl = rLink;
+}
+
 virtual void insert(const TreeIter* pParent, int pos, const OUString* 
pStr, const OUString* pId,
 const OUString* pIconName, VirtualDevice* 
pImageSurface,
 const OUString* pExpanderName, bool bChildrenOnDemand, 
TreeIter* pRet)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 844281cb806e..e26a6a3713fe 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3469,6 +3469,7 @@ private:
 DECL_LINK(VisibleRangeChangedHdl, SvTreeListBox*, void);
 DECL_LINK(CompareHdl, const SvSortData&, sal_Int32);
 DECL_LINK(PopupMenuHdl, const CommandEvent&, bool);
+DECL_LINK(TooltipHdl, const HelpEvent&, void);
 
 bool IsDummyEntry(SvTreeListEntry* pEntry) const
 {
@@ -3490,6 +3491,7 @@ public:
 m_xTreeView->SetDoubleClickHdl(LINK(this, SalInstanceTreeView, 
DoubleClickHdl));
 m_xTreeView->SetExpandingHdl(LINK(this, SalInstanceTreeView, 
ExpandingHdl));
 m_xTreeView->SetPopupMenuHdl(LINK(this, SalInstanceTreeView, 
PopupMenuHdl));
+m_xTreeView->SetTooltipHdl(LINK(this, SalInstanceTreeView, 
TooltipHdl));
 const long aTabPositions[] = { 0 };
 m_xTreeView->SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions);
 LclHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
@@ -4625,9 +4627,26 @@ public:
 m_xTreeView->SetSelectHdl(Link());
 m_xTreeView->SetDeselectHdl(Link());
 m_xTreeView->SetScrolledHdl(Link());
+m_xTreeView->SetTooltipHdl(Link());
 }
 };
 
+IMPL_LINK(SalInstanceTreeView, TooltipHdl, const HelpEvent&, rHEvt, void)
+{
+if (notify_events_disabled())
+return;
+Point aPos(m_xTreeView->ScreenToOutputPixel(rHEvt.GetMousePosPixel()));
+SvTreeListEntry* pEntry = m_xTreeView->GetEntry(aPos);
+if (pEntry)
+{
+SalInstanceTreeIter aIter(pEntry);
+OUString aTooltip = signal_query_tooltip(aIter);
+Size aSize(m_xTreeView->GetOutputSizePixel().Width(), 
m_xTreeView->GetEntryHeight());
+tools::Rectangle 
aScreenRect(m_xTreeView->OutputToScreenPixel(m_xTreeView->GetEntryPosition(pEntry)

[Libreoffice-commits] core.git: 2 commits - basctl/source cui/inc cui/source dbaccess/source extensions/inc extensions/source extensions/uiconfig extensions/UIConfig_spropctrlr.mk include/sfx2 include

[Caolán McNamara (via logerrit)]

 basctl/source/dlged/propbrw.cxx   |   52 -
 basctl/source/inc/propbrw.hxx |5 
 cui/inc/pch/precompiled_cui.hxx   |4 
 cui/source/dialogs/cuicharmap.cxx |1 
 cui/source/inc/acccfg.hxx |1 
 cui/source/options/optgdlg.cxx|1 
 cui/source/tabpages/align.cxx |1 
 cui/source/tabpages/numfmt.cxx|1 
 cui/source/tabpages/tpbitmap.cxx  |1 
 dbaccess/source/ui/dlg/adminpages.cxx |1 
 dbaccess/source/ui/dlg/dbwiz.cxx  |1 
 extensions/UIConfig_spropctrlr.mk |   16 
 extensions/inc/strings.hrc|1 
 extensions/source/propctrlr/browserline.cxx   |  345 ++-
 extensions/source/propctrlr/browserline.hxx   |   64 -
 extensions/source/propctrlr/browserlistbox.cxx|  594 ++--
 extensions/source/propctrlr/browserlistbox.hxx|   45 
 extensions/source/propctrlr/browserpage.cxx   |   53 -
 extensions/source/propctrlr/browserpage.hxx   |   48 -
 extensions/source/propctrlr/browserview.cxx   |   78 -
 extensions/source/propctrlr/browserview.hxx   |   29 
 extensions/source/propctrlr/commoncontrol.cxx |   49 -
 extensions/source/propctrlr/commoncontrol.hxx |  137 +-
 extensions/source/propctrlr/eformspropertyhandler.cxx |2 
 extensions/source/propctrlr/fontdialog.cxx|2 
 extensions/source/propctrlr/formcomponenthandler.cxx  |   95 +
 extensions/source/propctrlr/handlerhelper.cxx |   66 -
 extensions/source/propctrlr/handlerhelper.hxx |   12 
 extensions/source/propctrlr/inspectorhelpwindow.cxx   |   95 -
 extensions/source/propctrlr/inspectorhelpwindow.hxx   |   29 
 extensions/source/propctrlr/linedescriptor.hxx|6 
 extensions/source/propctrlr/propcontroller.cxx|  219 ++--
 extensions/source/propctrlr/propcontroller.hxx|   18 
 extensions/source/propctrlr/propertyeditor.cxx|  428 +++-
 extensions/source/propctrlr/propertyeditor.hxx|   61 -
 extensions/source/propctrlr/propertyhandler.cxx   |5 
 extensions/source/propctrlr/propertyhandler.hxx   |1 
 extensions/source/propctrlr/standardcontrol.cxx   |  857 +++---
 extensions/source/propctrlr/standardcontrol.hxx   |  298 +++---
 extensions/source/propctrlr/usercontrol.cxx   |  176 +--
 extensions/source/propctrlr/usercontrol.hxx   |  106 --
 extensions/uiconfig/spropctrlr/ui/browserline.ui  |   50 +
 extensions/uiconfig/spropctrlr/ui/browserpage.ui  |   99 ++
 extensions/uiconfig/spropctrlr/ui/colorlistbox.ui |   17 
 extensions/uiconfig/spropctrlr/ui/combobox.ui |   16 
 extensions/uiconfig/spropctrlr/ui/datefield.ui|   16 
 extensions/uiconfig/spropctrlr/ui/datetimefield.ui|   47 
 extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui |   20 
 extensions/uiconfig/spropctrlr/ui/formattedsample.ui  |   44 
 extensions/uiconfig/spropctrlr/ui/formproperties.ui   |   40 
 extensions/uiconfig/spropctrlr/ui/hyperlinkfield.ui   |   37 
 extensions/uiconfig/spropctrlr/ui/listbox.ui  |   10 
 extensions/uiconfig/spropctrlr/ui/multiline.ui|   85 +
 extensions/uiconfig/spropctrlr/ui/numericfield.ui |   16 
 extensions/uiconfig/spropctrlr/ui/textfield.ui|   10 
 extensions/uiconfig/spropctrlr/ui/timefield.ui|   16 
 extensions/uiconfig/spropctrlr/ui/urlcontrol.ui   |   16 
 include/sfx2/basedlgs.hxx |   38 
 include/sfx2/childwin.hxx |8 
 include/sfx2/tabdlg.hxx   |1 
 include/svtools/ctrlbox.hxx   |5 
 include/svtools/inettbc.hxx   |8 
 include/svx/colorbox.hxx  |1 
 include/vcl/builderpage.hxx   |1 
 include/vcl/ivctrl.hxx|2 
 include/vcl/weld.hxx  |   19 
 reportdesign/source/ui/inc/propbrw.hxx|6 
 reportdesign/source/ui/misc/UITools.cxx   |3 
 reportdesign/source/ui/report/propbrw.cxx |   71 -
 sc/source/ui/Accessibility/AccessibleEditObject.cxx   |1 
 sc/source/ui/inc/olinewin.hxx |1 
 sc/source/ui/inc/tpsort.hxx   |3 
 sc/source/ui/view/viewutil.cxx|1 
 sd/source/ui/docshell/docshel4.cxx|1 
 sfx2/inc/pch/precompiled_sfx.hxx  |7 
 sfx2/source/appl/workwin.cxx  |2 
 sfx2/source/control/bindings.cxx  |1 
 sfx2/source/dialog/basedlgs.cxx   |  199 
 sfx

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/pagedlg/tphfedit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a0d7921dd1151427385e1b07398fffe1550c772
Author: Caolán McNamara 
AuthorDate: Thu Dec 5 10:19:19 2019 +
Commit: Xisco Faulí 
CommitDate: Mon Dec 9 13:06:57 2019 +0100

Resolves: tdf#129191 text properties in header/footer not set

EditEngine has a non-virtual void SetText( const EditTextObject& 
rTextObject );
ScEditEngineDefaulter inherits from EditEngine but does

using EditEngine::SetText
voidSetText( const EditTextObject& rTextObject );

so has another SetText with the same signature that does something 
different,
so calling via an EditEngine pointer gets the unwanted base version

Change-Id: I72e368e6698d5b9a205180cfd2c4f800be7846f8
Reviewed-on: https://gerrit.libreoffice.org/84545
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sc/source/ui/pagedlg/tphfedit.cxx 
b/sc/source/ui/pagedlg/tphfedit.cxx
index 9a41ffdd5476..01c10d080080 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -161,7 +161,7 @@ void ScEditWindow::SetFont( const ScPatternAttr& rPattern )
 
 void ScEditWindow::SetText( const EditTextObject& rTextObject )
 {
-m_xEditEngine->SetText( rTextObject );
+GetEditEngine()->SetText( rTextObject );
 }
 
 void ScEditWindow::InsertField( const SvxFieldItem& rFld )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756b' - configure.ac

[Thorsten Behrens (via logerrit)]

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

New commits:
commit cdabc86bbaec1d44cbfc8dd657265f0734a06527
Author: Thorsten Behrens 
AuthorDate: Mon Dec 9 12:48:08 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 9 12:48:08 2019 +0100

Release LibreOffice 6.3.0.4.1 with crypto changes

Builds are here:

https://download.cib.de/ShareSoft/anon/2019-12-09/CIB-RMS-Milestone-4/LibreOffice_6.3.0.4_Win_x64_en-US_it_de_es_ru_build-8.msi

https://download.cib.de/ShareSoft/anon/2019-12-09/CIB-RMS-Milestone-4/LibreOffice_6.3.0.4_Win_x86_en-US_it_de_es_ru_build-8.msi

https://download.cib.de/ShareSoft/anon/2019-12-09/CIB-RMS-Milestone-4/LibreOffice_6.3.0.4_Win_x64_sdk_build-8.msi

https://download.cib.de/ShareSoft/anon/2019-12-09/CIB-RMS-Milestone-4/LibreOffice_6.3.0.4_Win_x86_sdk_build-8.msi

Change-Id: I3c3cad95f810fa3c2cbcfe7fb2f425096eb752d1

diff --git a/configure.ac b/configure.ac
index 1511013e9bd7..98671a75b4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.0.4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.0.4.1],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kelemen Gábor (via logerrit)]

 vcl/source/window/printdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9b7e992b72c56e830e59af9fd512f257d75b0491
Author: Kelemen Gábor 
AuthorDate: Fri Dec 6 14:33:20 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Dec 9 12:33:41 2019 +0100

tdf#122706 Fix built-in HID on Print dialogs Help button

to open the general Print page.

Change-Id: I1ffee4a9d72bb6a4840dec3800a397a878ed2eca
Reviewed-on: https://gerrit.libreoffice.org/84628
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 46a07f2042a812fc552e26736183c7d06fe6aa35)
Reviewed-on: https://gerrit.libreoffice.org/84735
Reviewed-by: Xisco Faulí 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 4a7105a777c9..c50fb512dd92 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1778,7 +1778,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 Help* pHelp = Application::GetHelp();
 if( pHelp )
 {
-pHelp->Start("vcl/ui/printdialog", mxOKButton.get());
+pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
 }
 }
 else if ( &rButton == mxPreviewBox.get() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Unable to use JavaFX windows in LibreOffice Linux

[Harish Kumar]

Hello Team,

I have created an extension that internally uses JavaFX dialogs.
Though the dialogs work perfectly in Windows, they dont launch at all in
Linux machines.
Did anyone face a similar issue?
Please help.

-- 
Best Regards,
Harish Kumar.B
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: distro-configs/LibreOfficeCoverity.conf distro-configs/LibreOfficeOssFuzz.conf

[Caolán McNamara (via logerrit)]

 distro-configs/LibreOfficeCoverity.conf |1 +
 distro-configs/LibreOfficeOssFuzz.conf  |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 4da3e0a0e5b2260c26186890724978bfd00f796c
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 11:08:06 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 12:10:50 2019 +0100

ofz#19296 disable skia for oss-fuzz

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

diff --git a/distro-configs/LibreOfficeCoverity.conf 
b/distro-configs/LibreOfficeCoverity.conf
index e657f937fffe..68154cb9ccda 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -4,6 +4,7 @@
 --without-myspell-dicts
 --disable-ccache
 --disable-pdfium
+--disable-skia
 --enable-gstreamer-1-0
 --enable-option-checking=fatal
 --with-system-libs
diff --git a/distro-configs/LibreOfficeOssFuzz.conf 
b/distro-configs/LibreOfficeOssFuzz.conf
index ab9ec3b3b01e..77f021112dd7 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -6,6 +6,7 @@
 --disable-gui
 --disable-gtk3
 --disable-pdfium
+--disable-skia
 --disable-postgresql-sdbc
 --disable-firebird-sdbc
 --disable-coinmp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - basic/CppunitTest_basic_macros.mk basic/qa basic/source

[Mike Kaganski (via logerrit)]

 basic/CppunitTest_basic_macros.mk |1 +
 basic/qa/cppunit/basictest.cxx|3 +++
 basic/qa/cppunit/basictest.hxx|2 ++
 basic/qa/cppunit/test_complier_checks.cxx |   27 +++
 basic/source/comp/dim.cxx |5 +++--
 5 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit bcfe36586c6bd07cef3c2ba39abd38bc9b6ab097
Author: Mike Kaganski 
AuthorDate: Sat Dec 7 15:27:08 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Dec 9 12:04:46 2019 +0100

tdf#59327: DIM should fail in procedures when same-name argument is present

Change-Id: I0a6828bd0b0c27018dc02c36ee207b8666f88ec0
Reviewed-on: https://gerrit.libreoffice.org/84682
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 840c3a662012c77b5972c869587acd15ee5a3f03)
Reviewed-on: https://gerrit.libreoffice.org/84732
Reviewed-by: Xisco Faulí 

diff --git a/basic/CppunitTest_basic_macros.mk 
b/basic/CppunitTest_basic_macros.mk
index 0ca767e1ddba..2d9959c9b6c9 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -15,6 +15,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,basic_macros, \
basic/qa/cppunit/basictest \
basic/qa/cppunit/basic_coverage \
basic/qa/cppunit/test_append \
+   basic/qa/cppunit/test_complier_checks \
basic/qa/cppunit/test_language_conditionals \
basic/qa/cppunit/test_nested_struct \
basic/qa/cppunit/test_vba \
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index 9a414b7f5e1a..3a22c84e9007 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -108,12 +108,15 @@ bool MacroSnippet::Compile()
 
 bool MacroSnippet::HasError() const { return mbError; }
 
+const ErrCode& MacroSnippet::getError() const { return maErrCode; }
+
 IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
 fprintf(stderr,"(%d:%d)\n",
 StarBASIC::GetLine(), StarBASIC::GetCol1());
 fprintf(stderr,"Basic error: %s\n", OUStringToOString( 
StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
 mbError = true;
+maErrCode = StarBASIC::GetErrorCode();
 return false;
 }
 
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 8b92acf93d69..c8d262ee6def 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -24,6 +24,7 @@ class MacroSnippet
 {
 private:
 bool mbError;
+ErrCode maErrCode;
 BasicDLL maDll; // we need a dll instance for resource manager etc.
 SbModuleRef mpMod;
 StarBASICRef mpBasic;
@@ -46,6 +47,7 @@ public:
 DECL_LINK( BasicErrorHdl, StarBASIC *, bool );
 
 bool HasError() const;
+const ErrCode& getError() const;
 };
 
 #endif
diff --git a/basic/qa/cppunit/test_complier_checks.cxx 
b/basic/qa/cppunit/test_complier_checks.cxx
new file mode 100644
index ..aad058040c31
--- /dev/null
+++ b/basic/qa/cppunit/test_complier_checks.cxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include "basictest.hxx"
+#include 
+#include 
+
+CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testRedefineArgument)
+{
+MacroSnippet aMacro("Sub doUnitTest(argName)\n"
+"  If False Then\n"
+"Dim argName\n"
+"  End If\n"
+"End Sub\n");
+aMacro.Compile();
+CPPUNIT_ASSERT(aMacro.HasError());
+CPPUNIT_ASSERT_EQUAL(ERRCODE_BASIC_VAR_DEFINED, 
aMacro.getError().StripDynamic());
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index bfe8b3184b36..d6b2bff6ccc6 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -318,8 +318,9 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
 }
 if( pOld && !(eOp == SbiOpcode::REDIM_ || eOp == SbiOpcode::REDIMP_) )
 {
-if( pDef->GetScope() == SbLOCAL && pOld->GetScope() != SbLOCAL )
-pOld = nullptr;
+if( pDef->GetScope() == SbLOCAL )
+if (auto eOldScope = pOld->GetScope(); eOldScope != SbLOCAL && 
eOldScope != SbPARAM)
+pOld = nullptr;
 }
 if( pOld )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco A.G.Pinto (via logerrit)]

 extras/source/autocorr/lang/pt/DocumentList.xml |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 361b031f96815172743337aa17569d1e434ba344
Author: Marco A.G.Pinto 
AuthorDate: Sun Dec 8 21:45:43 2019 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 9 11:41:20 2019 +0100

[pt-PT] Added 20 autocorrect words

Change-Id: I40079dabe733a6b29a273f15cc8a32ec94ee1cfe
Reviewed-on: https://gerrit.libreoffice.org/84723
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml 
b/extras/source/autocorr/lang/pt/DocumentList.xml
index 1d9fd33149e2..a4eb286b9fee 100644
--- a/extras/source/autocorr/lang/pt/DocumentList.xml
+++ b/extras/source/autocorr/lang/pt/DocumentList.xml
@@ -103,6 +103,8 @@
 
 
 
+
+  
 
 
 
@@ -630,6 +632,8 @@
 
 
 
+
+  
 
 
 
@@ -644,6 +648,7 @@
 
 
 
+
 
 
 
@@ -690,6 +695,8 @@
 
 
 
+
+
 
 
 
@@ -728,6 +735,8 @@
 
 
 
+
+
 
 
 
@@ -944,6 +953,7 @@
 
 
 
+
 
 
 
@@ -1032,6 +1042,7 @@
 
 
 
+
 
 
 
@@ -1252,14 +1263,18 @@
 
 
 
+
 
 
 
 
 
 
+
 
 
+
+
 
 
 
@@ -1719,6 +1734,9 @@
 
 
 
+
+
+
 
 
 
@@ -2238,6 +2256,8 @@
 
 
 
+
+
 
 
 
___
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-6.2' - sc/source

[Marco Cecchetti (via logerrit)]

 sc/source/ui/view/gridwin3.cxx |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit cb33666811db8b3aa34f6587c50367117b8bbe30
Author: Marco Cecchetti 
AuthorDate: Mon Dec 9 10:48:15 2019 +0100
Commit: Marco Cecchetti 
CommitDate: Mon Dec 9 10:53:45 2019 +0100

lok: calc: zoom: object selection - is unreliable

Change-Id: Ic8e61c56bdf38bbb74f179fa36075bdd3a601249

diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index c2ea2346cb86..299ddeca376b 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -50,6 +50,11 @@ bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& 
rMEvt)
 FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
 if (pDraw && !pViewData->IsRefMode())
 {
+MapMode aDrawMode = GetDrawMapMode();
+MapMode aOldMode = GetMapMode();
+if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+SetMapMode( aDrawMode );
+
 pDraw->SetWindow( this );
 Point aLogicPos = PixelToLogic(rMEvt.GetPosPixel());
 if ( pDraw->IsDetectiveHit( aLogicPos ) )
@@ -63,6 +68,9 @@ bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& 
rMEvt)
 if ( bRet )
 UpdateStatusPosSize();
 }
+
+if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+SetMapMode( aOldMode );
 }
 
 // cancel draw with right key
@@ -82,6 +90,11 @@ bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
 FuPoor* pDraw = pView->GetDrawFuncPtr();
 if (pDraw && !pViewData->IsRefMode())
 {
+MapMode aDrawMode = GetDrawMapMode();
+MapMode aOldMode = GetMapMode();
+if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+SetMapMode( aDrawMode );
+
 pDraw->SetWindow( this );
 bRet = pDraw->MouseButtonUp( rMEvt );
 
@@ -98,6 +111,9 @@ bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
 if ( !pView->IsPaintBrushLocked() )
 pView->ResetBrushDocument(); // end paint brush mode if not 
locked
 }
+
+if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+SetMapMode( aOldMode );
 }
 
 return bRet;
@@ -108,10 +124,19 @@ bool ScGridWindow::DrawMouseMove(const MouseEvent& rMEvt)
 FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
 if (pDraw && !pViewData->IsRefMode())
 {
+MapMode aDrawMode = GetDrawMapMode();
+MapMode aOldMode = GetMapMode();
+if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+SetMapMode( aDrawMode );
+
 pDraw->SetWindow( this );
 bool bRet = pDraw->MouseMove( rMEvt );
 if ( bRet )
 UpdateStatusPosSize();
+
+if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+SetMapMode( aOldMode );
+
 return bRet;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/edit.hxx|5 +++--
 vcl/source/control/edit.cxx |   19 +++
 2 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 8f32509ee51a4985d17b65d6c6540081471951e7
Author: Caolán McNamara 
AuthorDate: Mon Dec 9 09:27:55 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 11:27:56 2019 +0100

no longer have to worry about intra-module compatibility

in 'the next minor update'

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

diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 5958f124ae51..3d4d8a790aa4 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -87,6 +87,7 @@ private:
 LinkmaActivateHdl;
 std::unique_ptr mpUIBuilder;
 
+css::uno::Reference mxBreakIterator;
 css::uno::Reference mxISC;
 
 SAL_DLLPRIVATE boolImplTruncateToMaxLen( OUString&, sal_Int32 
nSelectionLen ) const;
@@ -113,8 +114,8 @@ private:
 SAL_DLLPRIVATE void
ImplCopy(css::uno::Reference const & 
rxClipboard);
 SAL_DLLPRIVATE void
ImplPaste(css::uno::Reference const & 
rxClipboard);
 SAL_DLLPRIVATE longImplGetTextYPosition() const;
-SAL_DLLPRIVATE 
css::uno::Reference const & 
ImplGetInputSequenceChecker();
-SAL_DLLPRIVATE static css::uno::Reference 
ImplGetBreakIterator();
+SAL_DLLPRIVATE 
css::uno::Reference const& 
ImplGetInputSequenceChecker();
+SAL_DLLPRIVATE css::uno::Reference const& 
ImplGetBreakIterator();
 SAL_DLLPRIVATE voidfilterText();
 
 protected:
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6eb9e991a38b..0bd6273670e3 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -739,22 +739,17 @@ OUString Edit::ImplGetValidString( const OUString& 
rString )
 return aValidString;
 }
 
-uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator()
+uno::Reference  const& Edit::ImplGetBreakIterator()
 {
-//!! since we don't want to become incompatible in the next minor update
-//!! where this code will get integrated into, xISC will be a local
-//!! variable instead of a class member!
-uno::Reference< uno::XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
-return i18n::BreakIterator::create(xContext);
+if (!mxBreakIterator)
+mxBreakIterator = 
i18n::BreakIterator::create(::comphelper::getProcessComponentContext());
+return mxBreakIterator;
 }
 
-uno::Reference < i18n::XExtendedInputSequenceChecker > const & 
Edit::ImplGetInputSequenceChecker()
+uno::Reference  const& 
Edit::ImplGetInputSequenceChecker()
 {
-if ( !mxISC.is() )
-{
-mxISC = i18n::InputSequenceChecker::create(
-::comphelper::getProcessComponentContext() );
-}
+if (!mxISC.is())
+mxISC = 
i18n::InputSequenceChecker::create(::comphelper::getProcessComponentContext());
 return mxISC;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 48ee020d7626c6c2e83f4bbc56cfb4987e096b94
Author: Szymon Kłos 
AuthorDate: Fri Dec 6 19:01:19 2019 +0100
Commit: Szymon Kłos 
CommitDate: Mon Dec 9 11:13:17 2019 +0100

jsdialog: fix gradient angle spinfield

Change-Id: Ibe1008e8bf9081c7fccfa865574cb3bfcecb74ba

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 3ec85405d..2bdb09b26 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -582,6 +582,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
case 'gradientstyle':
case 'fillgrad1':
case 'fillgrad2':
+   case 'gradangle':
return '.uno:FillGradient';
 
case 'setbrightness':
@@ -606,14 +607,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
return '.uno:GrafGamma';
 
case 'selectwidth':
-   return '.uno:Size';
-
case 'selectheight':
return '.uno:Size';
 
case 'horizontalpos':
-   return '.uno:Position';
-
case 'verticalpos':
return '.uno:Position';
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |7 +++-
 loleaflet/src/control/Control.MobileWizard.js|   35 +--
 2 files changed, 37 insertions(+), 5 deletions(-)

New commits:
commit 3809b9ab6f2092589f9ffccdc46a3073d2ef3af9
Author: Szymon Kłos 
AuthorDate: Mon Dec 9 11:06:14 2019 +0100
Commit: Szymon Kłos 
CommitDate: Mon Dec 9 11:06:23 2019 +0100

jsdialog: remember last opened tab when rebuilding

Change-Id: Ia1c06275fade580c559cd4a96bf649a65c028af4

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index cde756651..3ec85405d 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -403,6 +403,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var title1 = builder._cleanText(data[0].text);
 
var tab1 = L.DomUtil.create('div', 'ui-tab mobile-wizard', 
tabsContainer);
+   tab1.id = title1;
 
var label = L.DomUtil.create('span', 'ui-tab-content 
mobile-wizard unolabel', tab1);
label.innerHTML = title1;
@@ -418,10 +419,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
$(contentDiv).hide();
 
+   var title2 = builder._cleanText(data[1].text);
 
var tab2 = L.DomUtil.create('div', 'ui-tab mobile-wizard', 
tabsContainer);
-
-   var title2 = builder._cleanText(data[1].text);
+   tab2.id = title2;
 
var label2 = L.DomUtil.create('span', 'ui-tab-content 
mobile-wizard unolabel', tab2);
label2.innerHTML = title2;
@@ -444,6 +445,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
$(tab2).removeClass('selected');
$(contentDiv).show();
$(contentDiv2).hide();
+   builder.wizard.selectedTab(label.innerHTML);
});
 
$(tab2).click(function() {
@@ -451,6 +453,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
$(tab1).removeClass('selected');
$(contentDiv).hide();
$(contentDiv2).show();
+   builder.wizard.selectedTab(label2.innerHTML);
});
} else {
console.debug('Builder used outside of mobile wizard: 
please implement the click handler');
diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index f9df62535..a66479c33 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -15,6 +15,7 @@ L.Control.MobileWizard = L.Control.extend({
_mainTitle: '',
_isTabMode: false,
_currentPath: [],
+   _tabs: [],
_currentScrollPosition: 0,
 
initialize: function (options) {
@@ -41,6 +42,8 @@ L.Control.MobileWizard = L.Control.extend({
$('#mobile-wizard').removeClass('menuwizard');
this._isTabMode = false;
this._currentPath = [];
+   this._tabs = [];
+   this._currentScrollPosition = 0;
},
 
_setupBackButton: function() {
@@ -87,6 +90,7 @@ L.Control.MobileWizard = L.Control.extend({
},
 
setTabs: function(tabs) {
+   this._tabs = tabs;
$('#mobile-wizard-tabs').show();
$('#mobile-wizard-tabs').empty();
$('#mobile-wizard-tabs').append(tabs);
@@ -178,16 +182,37 @@ L.Control.MobileWizard = L.Control.extend({
right.text(title);
},
 
-   _scrollToLastPosition: function() {
+   _scrollToPosition: function(position) {
if (this._currentScrollPosition) {
-   $('#mobile-wizard-content').animate({ scrollTop: 
this._currentScrollPosition }, 0);
+   $('#mobile-wizard-content').animate({ scrollTop: 
position }, 0);
+   }
+   },
+
+   selectedTab: function(tabText) {
+   if (this._currentPath && this._currentPath.length) {
+   this._currentPath[0] = tabText;
+   }
+   },
+
+   _selectTab: function(tabId) {
+   if (this._tabs && tabId) {
+   for (var index in this._tabs.children) {
+   if (this._tabs.children[index].id === tabId) {
+   
$(this._tabs.children[index]).trigger('click', {animate: false});
+   break;
+   }
+   }
}
},
 
_goToPath: function(path) {
+   if (this._tabs && path && path.length)
+   this._selectTab(path[0]);
+

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

[Marco Cecchetti (via logerrit)]

 loleaflet/src/map/handler/Map.FileInserter.js |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1683bd31de8d685e701cac57a8002f6cd9d4626d
Author: Marco Cecchetti 
AuthorDate: Mon Dec 9 10:35:36 2019 +0100
Commit: Marco Cecchetti 
CommitDate: Mon Dec 9 10:35:59 2019 +0100

loleaflet: insert local image inserts image twice

That was caused by a doubled code line due to a backporting merging
error

Change-Id: I32db4f44f2f36d9551aa7b65379a9864443c3c03

diff --git a/loleaflet/src/map/handler/Map.FileInserter.js 
b/loleaflet/src/map/handler/Map.FileInserter.js
index 5bf305ec0..e1575ec15 100644
--- a/loleaflet/src/map/handler/Map.FileInserter.js
+++ b/loleaflet/src/map/handler/Map.FileInserter.js
@@ -130,7 +130,6 @@ L.Map.FileInserter = L.Handler.extend({
xmlHttp.onreadystatechange = function () {
if (xmlHttp.readyState === 4) {
map.hideBusy();
-   socket.sendMessage('insertfile name=' + 
name + ' type=' + type);
if (xmlHttp.status === 200) {
socket.sendMessage('insertfile 
name=' + name + ' type=' + type);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kelemen Gábor (via logerrit)]

 vcl/source/window/printdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46a07f2042a812fc552e26736183c7d06fe6aa35
Author: Kelemen Gábor 
AuthorDate: Fri Dec 6 14:33:20 2019 +0100
Commit: Katarina Behrens 
CommitDate: Mon Dec 9 10:51:33 2019 +0100

tdf#122706 Fix built-in HID on Print dialogs Help button

to open the general Print page.

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

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 4a7105a777c9..c50fb512dd92 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1778,7 +1778,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 Help* pHelp = Application::GetHelp();
 if( pHelp )
 {
-pHelp->Start("vcl/ui/printdialog", mxOKButton.get());
+pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
 }
 }
 else if ( &rButton == mxPreviewBox.get() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - basic/source

[Mike Kaganski (via logerrit)]

 basic/source/sbx/sbxbase.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 87b421d25ef79e197d344e6bd515f1eadd06bfc9
Author: Mike Kaganski 
AuthorDate: Fri Dec 6 12:25:15 2019 +0200
Commit: Mike Kaganski 
CommitDate: Mon Dec 9 10:46:53 2019 +0100

tdf#129227: this was always appending, not prepending

Regression after 0761f97525b3f3ce2cd73f8db28bf389a3c44f57
The change replaced

// From 1996-03-06: take the HandleLast-Flag into account
sal_uInt16 nPos = r.m_Factories.size(); // Insert position
if( !pFac->IsHandleLast() ) // Only if not self HandleLast
{
// Rank new factory in front of factories with HandleLast
while (nPos > 0 && r.m_Factories[ nPos-1 ]->IsHandleLast())
nPos--;
}
r.m_Factories.insert(r.m_Factories.begin() + nPos, 
std::unique_ptr(pFac));

with

r.m_Factories.insert(r.m_Factories.begin(), 
std::unique_ptr(pFac));

Before that commit condition in while was always false, so decrementing
nPos had never happened, and insertion to the end was always performed.
This change restores that.

Change-Id: I778d6fdc93e9078a541a9b98c9432b5cf88d9791
Reviewed-on: https://gerrit.libreoffice.org/84609
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit ffd319a7589e0e9fcb83681f7f1e7c26a383ae5d)
Reviewed-on: https://gerrit.libreoffice.org/84666
Tested-by: Jenkins

diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 7f147e81e27f..d1b17d4fa288 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -114,9 +114,7 @@ void SbxBase::ResetError()
 
 void SbxBase::AddFactory( SbxFactory* pFac )
 {
-SbxAppData& r = GetSbxData_Impl();
-
-r.m_Factories.insert(r.m_Factories.begin(), 
std::unique_ptr(pFac));
+GetSbxData_Impl().m_Factories.emplace_back(pFac);
 }
 
 void SbxBase::RemoveFactory( SbxFactory const * pFac )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 sc/source/ui/inc/gridwin.hxx   |6 ++-
 sc/source/ui/unoobj/docuno.cxx |3 +
 sc/source/ui/view/gridwin.cxx  |   75 +++--
 sc/source/ui/view/tabvwshc.cxx |2 -
 4 files changed, 60 insertions(+), 26 deletions(-)

New commits:
commit 53a647afa68264422d556156b4e77e1b6f46a996
Author: Michael Meeks 
AuthorDate: Wed Dec 4 22:29:10 2019 +
Commit: Michael Meeks 
CommitDate: Mon Dec 9 10:42:14 2019 +0100

lok: calc - update our version of the other view's selections on zoom.

Change-Id: I8487f28d762c8bf5be4f00a331263218dc71d179
Reviewed-on: https://gerrit.libreoffice.org/84694
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit 2986620074d104611a6e78c98ee5a09941866125)
Reviewed-on: https://gerrit.libreoffice.org/84698
Tested-by: Jenkins

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index f64bfaa8d667..375e6e3cad2b 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -432,7 +432,11 @@ public:
 
 /// get Cell cursor in this view's co-ordinate system @see 
ScModelObj::getCellCursor().
 OString getCellCursor() const;
-void updateLibreOfficeKitCellCursor(const SfxViewShell* pOtherShell) const;
+void notifyKitCellCursor() const;
+void notifyKitCellViewCursor(const SfxViewShell* pForShell) const;
+void updateKitCellCursor(const SfxViewShell* pOtherShell) const;
+/// notify this view with new positions for other view's cursors (after 
zoom)
+void updateKitOtherCursors() const;
 
 /// Same as MouseButtonDown(), but coordinates are in logic unit.
 virtual void LogicMouseButtonDown(const MouseEvent& rMouseEvent) override;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 04c5bcbe400f..cae9343550f6 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -886,6 +886,9 @@ void ScModelObj::setClientZoom(int nTilePixelWidth_, int 
nTilePixelHeight_, int
 
 pViewData->SetZoom(Fraction(nTilePixelWidth_ * TWIPS_PER_PIXEL, 
nTileTwipWidth_),
Fraction(nTilePixelHeight_ * TWIPS_PER_PIXEL, 
nTileTwipHeight_), true);
+
+// refresh our view's take on other view's cursors
+pViewData->GetActiveWin()->updateKitOtherCursors();
 }
 
 OUString ScModelObj::getRowColumnHeaders(const tools::Rectangle& rRectangle)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 46c47bd46ecd..894f3d3f8e94 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5692,42 +5692,69 @@ OString ScGridWindow::getCellCursor() const
 return pViewData->describeCellCursor();
 }
 
-// Send our cursor details to a view described by @pOtherShell, or all views
-// if @pOtherShell is null. In each case send the current view a cell-cursor
+void ScGridWindow::notifyKitCellCursor() const
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR, 
getCellCursor().getStr());
+if (bListValButton && aListValPos == pViewData->GetCurPos())
+updateLOKValListButton(true, aListValPos);
+}
+
+void ScGridWindow::notifyKitCellViewCursor(const SfxViewShell* pForShell) const
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+
+OString aCursor("EMPTY");
+if (mpOOCursors) // cf. getCellCursor above
+{
+auto pForTabView = dynamic_cast(pForShell);
+assert(pForTabView);
+if (!pForTabView)
+return;
+aCursor = pForTabView->GetViewData().describeCellCursorAt(
+pViewData->GetCurX(), pViewData->GetCurY()); // our position.
+}
+SfxLokHelper::notifyOtherView(pViewShell, pForShell, 
LOK_CALLBACK_CELL_VIEW_CURSOR, "rectangle", aCursor);
+}
+
+// Send our cursor details to a view described by @pForShell, or all views
+// if @pForShell is null. In each case send the current view a cell-cursor
 // event, and others a cell_view_cursor event.
 //
 // NB. we need to re-construct the cursor details for each other view in their
 // own zoomed co-ordinate system.
-void ScGridWindow::updateLibreOfficeKitCellCursor(const SfxViewShell* 
pForShell) const
+void ScGridWindow::updateKitCellCursor(const SfxViewShell* pForShell) const
 {
-if (!pForShell) // recurse with it set
+if (!pForShell)
 {
 for (SfxViewShell* it = SfxViewShell::GetFirst(); it;
  it = SfxViewShell::GetNext(*it))
-updateLibreOfficeKitCellCursor(it);
+updateKitCellCursor(it);
 return;
 }
 
-ScTabViewShell* pViewShell = pViewData->GetViewShell();
-if (pForShell == pViewShell)
-{
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR, 
getCellCursor().getStr());
-if (bListValButton && aListValPos == pViewData->GetCurPos())
-updateLOKValListButton(true, aListValPos);
-}
+if (pForShe

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |2 --
 loleaflet/src/map/handler/Map.TouchGesture.js |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fdb8ef87e1e7bdfa85bf8e134a7359ee4fbf90d5
Author: Szymon Kłos 
AuthorDate: Mon Dec 9 10:28:53 2019 +0100
Commit: Szymon Kłos 
CommitDate: Mon Dec 9 10:28:57 2019 +0100

jsdialog: don't close on widget actions

It will be closed always on tap on the document instead
of on 'cursor change'. This will prevent us from hiding
mobile wizard when user performed some action (eg. bold)
and invalidatecursor message was received.

Change-Id: I18faedb2a6c6317c547c1ed149923380cce4aa52

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 7a62ff8d8..0120036ea 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -532,7 +532,6 @@ L.TileLayer = L.GridLayer.extend({
}
else if (textMsg.startsWith('cellcursor:')) {
this._onCellCursorMsg(textMsg);
-   this._closeMobileWizard();
}
else if (textMsg.startsWith('celladdress:')) {
this._onCellAddressMsg(textMsg);
@@ -551,7 +550,6 @@ L.TileLayer = L.GridLayer.extend({
}
else if (textMsg.startsWith('invalidatecursor:')) {
this._onInvalidateCursorMsg(textMsg);
-   this._closeMobileWizard();
}
else if (textMsg.startsWith('invalidatetiles:')) {
var payload = 
textMsg.substring('invalidatetiles:'.length + 1);
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index d406a2b3d..01544d5de 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -298,6 +298,8 @@ L.Map.TouchGesture = L.Handler.extend({
this._toolbar.remove();
 
this._map.fire('closepopups');
+   this._map.fire('closemobilewizard');
+
// unselect if anything is selected already
if (this._map._docLayer && this._map._docLayer._annotations && 
this._map._docLayer._annotations.unselect) {
this._map._docLayer._annotations.unselect();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/options/optcolor.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 79465546b7fe9af5efc320bfbef8d032042063c0
Author: Caolán McNamara 
AuthorDate: Sat Dec 7 20:11:53 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 9 09:52:35 2019 +0100

Resolves: tdf#129243 check return to see if results valid

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

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index b0e11d5ad72b..4d4cf2be55a8 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -876,8 +876,10 @@ IMPL_LINK_NOARG(SvxColorOptionsTabPage, AdjustHeaderBar, 
const Size&, void)
 {
 // horizontal positions
 int nX0 = 0, nX1, nX2, y, width, height;
-m_rWidget1.get_extents_relative_to(*m_xTable, nX1, y, width, height);
-m_rWidget2.get_extents_relative_to(*m_xTable, nX2, y, width, height);
+if (!m_rWidget1.get_extents_relative_to(*m_xTable, nX1, y, width, height))
+return;
+if (!m_rWidget2.get_extents_relative_to(*m_xTable, nX2, y, width, height))
+return;
 auto nTextWidth1 = nX1 - nX0;
 auto nTextWidth2 = nX2 - nX1;
 m_xOnFT->set_size_request(nTextWidth1, -1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits