Re: converting _XFootnote.java to cpp

[Jens Carl]

Hello,

On 08/08/2018 07:03 AM, Rahul Gurung wrote:

Hi,

I have almost converted ifc/text/_XFootnote.java into cpp but I am 
confused with the sc/qa/extra part which file should be changed or 
created and why? I checked old commits and think it depends on the test 
but what should it be, in the case of _XFootnote.java?


Here is my step-by-step approach to convert Java UnitTest to C++. From 
what I read you are currently at step 3.


As mentioned in this comment 
https://bugs.documentfoundation.org/show_bug.cgi?id=45904#c4 the code is 
divided in two parts:


One parts set ups the test and you will find them under 
qadevOOo/tests/java/mod/ (e.g for calc/sheet they're here 
qadevOOo/tests/java/mod/_sc/). They mostly called *Obj.java. (I will 
referrer to them as obj in the rest of the email).


The second part are the actual tests and they're under 
qadevOOo/tests/java/ifc/ (e.g. for calc/sheet/ you will find them here 
qadevOOo/tests/java/ifc/sheet).


You also will find two types of tests in the interface directory 
(.../ifc). One tests services and their properties and the other one 
tests interfaces and the function they provide. The later ones start 
with an X and the first one don't start with a X in their file name (you 
can ignore the underscore "_").


The obj and the tests are tied together by CSV files, you will find them 
under qadevOOo/objdsc/ (e.g qadevOOo/objdsc/sc/).


The service/property tests are special kind of tests. All the logic is 
moved to this file 
https://opengrok.libreoffice.org/xref/core/qadevOOo/runner/lib/MultiPropertyTest.java. 
This class extracts the information from the corresponding CSV file and 
the information of the interface.
Then decides what kind of type the property has and runs the test 
against it by getting the property value and the changing the property 
value (that's done in 
https://opengrok.libreoffice.org/xref/core/qadevOOo/runner/util/ValueChanger.java).


To every test file you can find an IDL file. That file contains 
information about the functions or the properties. You can look at them 
under https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/ or

https://api.libreoffice.org/docs/idl/ref/index.html.

Next I will describe how I transformed the tests from Java to C++ with 
an example of SheetFilterDescriptor: 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=5a0acced8988a54d8aaf0328d2696dae21727c6a


I do all my coding under Linux, so some of the steps include CLI commands.

1. I looked at the Java code of 
qadevOOo/tests/java/ifc/sheet/_SheetFilterDescriptor.java


 Because the class was empty I knew the tests of the properties is done
 with 
https://opengrok.libreoffice.org/xref/core/qadevOOo/runner/lib/MultiPropertyTest.java 
and I don't have to create special cases.


2. Next I looked at the IDL file 
(https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl) 
to understand, what properties the services has, what type they are, and 
if some of them are read-only.


3. Now I searched for the obj which is used to test the interface.

 I normally use grep like # grep "sheet::SheetFilterDescriptor" 
core/qadevOOo/objdsc/sc/*. This will list the file or files which uses 
the tests. From the file name I can extract the obj. It's the last part 
of the filename before the file extension. The filename was 
"com.sun.star.comp.office.ScFilterDescriptorBase.csv" so the obj is 
"ScFilterDescriptorBase".


4. Now I looked at the Java code for the obj 
(https://opengrok.libreoffice.org/xref/core/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java) 
just to get feel what is created to run the test.


5. Now I look at the C++ code for the obj, if it exists. It did 
https://opengrok.libreoffice.org/xref/core/sc/qa/extras/scfilterdescriptorbaseobj.cxx.


  If not you have to create the object from the Java code.

6. Now I started coding.

 This included creating a new header file, adding the test to the C++
 obj file, creating the source file and enabling it in the Makefile.

 You can run only the specific tests of the obj by make 
CppunitTest_sc_filterdescriptorbaseobj


7. Clean up the old Java stuff.

8. Check that everything is still working with "make check"

9. Push changes to gerrit and wait for the tests to finish.

I hope that will help you to get started. Should you have more question 
try to get a hold off me in IRC (it's not always possible to answer 
right away, because I'm working) or send an email.


Cheers,

 Jens

P.S. All the remaining tests under qadevOOo/tests/java/ifc/sheet/ are 
the hardest to transfer, because some of them have bugs. You can find a 
list in 
https://opengrok.libreoffice.org/xref/core/sc/qa/unoapi/knownissues.xcl.

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sysui/desktop

[Libreoffice Gerrit user]

 sysui/desktop/menus/startcenter.desktop |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e66a3de8be24920d4ea17036f5a13ed21efd1a07
Author: Matthias Seidel 
AuthorDate: Wed Aug 8 22:48:35 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Aug 8 22:48:35 2018 +

Adding entry for StartupWMClass to desktop file.

(My thanks go to Josef Latt for that tip)

diff --git a/sysui/desktop/menus/startcenter.desktop 
b/sysui/desktop/menus/startcenter.desktop
index 1eff811df300..2518a8dba853 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -26,7 +26,8 @@ Type=Application
 
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
 Exec=openoffice %U
 MimeType=application/vnd.openofficeorg.extension;
-Name=%PRODUCTNAME 
-GenericName=Office 
+Name=%PRODUCTNAME
+GenericName=Office
 Comment=The office productivity suite compatible to the open and standardized 
ODF document format.
 StartupNotify=true
+StartupWMClass=%PRODUCTNAME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Windows Debug builds failure: 'DbgGUIInitSolarMutexCheck': identifier not found

[Kaganski Mike]

Hi!

On 8/8/2018 3:56 PM, Stephan Bergmann wrote:
> On 07/08/18 18:14, Stephan Bergmann wrote:
>> As we speak, I happen to run into your CppunitTest_cppuhelper_qa_misc 
>> failure with my MSVC build (with latest Visual Studio 2017, see above) 
>> too, will investigate.  (The test currently only runs (late) during 
>> `make check`, see  "No need 
>> for CppunitTest_cppuhelper_qa_misc to be a subsequentcheck".)
> 
> Mike is working on a fix at  
> "Don't break __CxxDetectRethrow contract"

I seem to be unable to come with a solution, so I decided to summarize 
my findings here.

So, with commit 6ddecf61ecada646fbd6f8809270d47289727e8a, Caolán has 
uncovered a hidden bug that must have been there for some time. Function 
cpp_call() in bridges/source/cpp_uno/msvc_win32_*/uno2cpp.cxx uses SEH 
(__try-__except statement) to guard the called method; 
CPPU_CURRENT_NAMESPACE::mscx_filterCppException() is used there as the 
__except expression; and the latter uses CRT's *internal* 
__CxxDetectRethrow() function to check if the handled C++ exception is 
being re-thrown. __CxxDetectRethrow() checks the opaque exception 
descriptor passed by pointer (which has internal EHExceptionRecord* 
type), and basically detects if two conditions are true: the exception 
is C++ exception (using PER_IS_MSVC_EH macro), and that it has no 
exception information (using PER_PTHROW macro); see comment in 
ExFilterRethrow in MSVCRT's crt/src/vcruntime/frame.cpp for the same check.

Unfortunately, the function __CxxDetectRethrow() modifies global state: 
it increments an internal variable (__ProcessingThrow++), which is used 
throughout CRT's exception handling code to detect that unwinding is in 
progress when its value is non-zero (one comment says "we are 
unwinding... possibly called from a dtor()"). In that case, e.g., 
std::current_exception() returns empty exception_ptr (related code is in 
CRT's __ExceptionPtr::_CurrentException() method). As documented in the 
beginning of the crt/src/vcruntime/mgdframe.cpp, where 
__CxxDetectRethrow() is defined, the function is used internally when 
C++ exceptions are handled in COM+. It is designed to be used in 
specific conditions, and after some other companion functions have been 
called (specifically, __CxxExceptionFilter and 
__CxxRegisterExceptionObject); finally, __CxxUnregisterExceptionObject 
must be called. All the mentioned functions also modify 
__ProcessingThrow; they also modify other internal variables (global 
state), allocate and release memory; and __CxxUnregisterExceptionObject 
also destructs the exception object.

All of the described complexity made me unable to come with a proper way 
to call those functions: they expect some state of SEH; they modify the 
state; not calling __CxxExceptionFilter leads to still unpaired 
decrements of __ProcessingThrow; trying to finally call 
__CxxUnregisterExceptionObject destroys the object that we tested in our 
mscx_filterCppException, which leads to use-after-delete. So the problem 
now remains: it's not enough to just revert the Caolán's commit 
mentioned above, since we obviously break CRT state now and then, and 
the revert would just hide this, not solve.

The related code (using __CxxDetectRethrow to check for the exception 
being rethrown) was introduced with commit 
37d3cdd8d280f509ffa37e47c4706213f4dcda7c from 2003; but I don't know if 
the function already had current behaviour back then.

Just for reference, I paste here the reference code given in 
crt/src/vcruntime/mgdframe.cpp as the example of how the functions work 
together:


// Model of C++ eh in COM+
//
// void func()
// {
// try {
// TryBody();
// } catch (cpp_object o)
// {
// CatchOBody();
// } catch (...)
// {
// CatchAllBody();
// }
// }
//
// Turns into this:
//
//
// void func()
// {
// int rethrow;
// // One per try block
// int isCxxException;
// // One per catch(...)
// __try {
// TryBody();
// }
// __except(__CxxExceptionFilter(exception,
//   typeinfo(cpp_object),
//   flags,
//   &o))
// // This is how it's done already
// {
// // Begin catch(object) prefix
// char *storage = _alloca(__CxxQueryExceptionSize());
// rethrow = false;
// __CxxRegisterExceptionObject(exception,
//  storage);
// __try {
// __try {
// // End catch(object) prefix
// CatchOBody();
// // Begin catch(object) suffix
// } __except(rethrow = __CxxDetectRethrow(exception),
//EXCEPTION_CONTINUE_SEARCH)
// {}
// }
// __finally
// {
// __CxxUnregisterExceptionObject(storage,
//   

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

[Libreoffice Gerrit user]

 sd/source/ui/view/drtxtob.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0a1a4ffb4f87adff7fbbbc60202b6a0e42fedd0c
Author: Maxim Monastirsky 
AuthorDate: Wed Aug 8 01:16:40 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Wed Aug 8 22:47:37 2018 +0200

tdf#83659 Enable outline commands for text boxes and tables

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

diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 43e1c4f808f6..80344d76b1d9 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -268,8 +268,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 
 bool bOutlineViewSh = dynamic_cast< const OutlineViewShell 
*>( mpViewShell ) !=  nullptr;
 
-if (pOLV &&
-( pOLV->GetOutliner()->GetMode() == 
OutlinerMode::OutlineObject || bOutlineViewSh ) )
+if (pOLV)
 {
 // Outliner at outline-mode
 ::Outliner* pOutl = pOLV->GetOutliner();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/export/shapes.cxx   |7 ++-
 sd/qa/unit/export-tests-ooxml2.cxx |1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f536bff1dc0e80c6ef23d132edf471ea75ffb05e
Author: Szymon Kłos 
AuthorDate: Wed Aug 8 17:57:51 2018 +0200
Commit: Szymon Kłos 
CommitDate: Wed Aug 8 22:39:09 2018 +0200

tdf#116350 Fix export of fontwork

Change-Id: Icf3a07c6b79296feb233bbe08a6d69ab21a41414
Reviewed-on: https://gerrit.libreoffice.org/58746
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 6d6b8a24c6fa..a4e43f03c9e3 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -743,6 +743,9 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 bool bFlipH = false;
 bool bFlipV = false;
 
+// Avoid interference of preset type to the next shape
+m_presetWarp = "";
+
 if( GETA( CustomShapeGeometry ) ) {
 SAL_INFO("oox.shape", "got custom shape geometry");
 if( mAny >>= aGeometrySeq ) {
@@ -1006,7 +1009,9 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 }
 if( rXPropSet.is() )
 {
-WriteFill( rXPropSet );
+// Preset shape with text has no fill
+if( sShapeType.isEmpty() || !sShapeType.startsWith( "fontwork" ) )
+WriteFill( rXPropSet );
 WriteOutline( rXPropSet );
 WriteShapeEffects( rXPropSet );
 WriteShape3DEffects( rXPropSet );
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index fe2be051603e..fdbcc65d7778 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1884,6 +1884,7 @@ void SdOOXMLExportTest2::testTdf116350TextEffects()
 xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
 assertXPath(pXmlDocContent, "//p:sp[1]/p:txBody/a:bodyPr/a:prstTxWarp", 
"prst", "textArchUp");
 assertXPath(pXmlDocContent, "//p:sp[14]/p:txBody/a:bodyPr/a:prstTxWarp", 
"prst", "textCircle");
+assertXPath(pXmlDocContent, "//p:sp[14]/p:spPr/a:solidFill/a:srgbClr", 0);
 
 xDocShRef->DoClose();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit be167de3e8c3dba1f45ce9365f069c42706539d6
Author: Henry Castro 
AuthorDate: Wed Aug 8 16:34:33 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:35:56 2018 -0400

loleaflet: mobile: hide TextWrap toolbar item

Change-Id: Ib0f05ab619729b614e0f04eae3ad79eb61df3214

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index b2c4bd234..98e7d6f5b 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -584,7 +584,7 @@ function createToolbar() {
name: 'toolbar-up',
tooltip: 'bottom',
items: [
-   {type: 'menu', id: 'menu-wrap', caption: _('Textwrap'), 
items: [
+   {type: 'menu', id: 'menu-wrap', caption: _('Textwrap'), 
mobile: false, items: [
{ text: _('No wrap'), id: 'wrap-WrapOff' },
{ text: _('Page wrap'), id: 'wrap-WrapOn' },
{ text: _('Wrap anchor only'), id: 
'wrap-WrapAnchorOnly' },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit f4a87c63b9d1d433f12b3a871cb17b33971b99f6
Author: Henry Castro 
AuthorDate: Wed Aug 8 15:08:09 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:18:22 2018 -0400

loleaflet: mobile: remove invalid input focus

Change-Id: Ieb29394daac95a7a0666a852e7e375ab6d665429

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 4b78babe8..66493ec2e 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -830,7 +830,6 @@ L.Map = L.Evented.extend({
 
vex.dialogID = -1;
this._startInactiveTimer();
-   this.focus();
return vex.close(id);
}
} else {
@@ -839,7 +838,6 @@ L.Map = L.Evented.extend({
}
 
this._startInactiveTimer();
-   this.focus();
return false;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |   44 
 1 file changed, 8 insertions(+), 36 deletions(-)

New commits:
commit c738beea870c3b697db7715d10b5e77562b85f55
Author: Henry Castro 
AuthorDate: Wed Aug 8 09:05:50 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:17:31 2018 -0400

loleaflet: mobile: fix the status bar that loses the input focus

Change-Id: Ia39a33295e3a1c153636e2dd33a232cbe2b399b7

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 5f3279c97..b2c4bd234 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -8,7 +8,6 @@
 (function(global) {
 
 var map;
-var mobileWidth = 768;
 
 function onDelete(e) {
if (e !== false) {
@@ -42,42 +41,13 @@ function _mobilify() {
$('#document-name-input').hide();
 }
 
-function _unmobilify() {
-   var toolbarUp = w2ui['toolbar-up'];
-   var statusbar = w2ui['toolbar-down'];
-
-   toolbarUp.items.forEach(function(item) {
-   if (item.mobile === false && item.hidden) {
-   toolbarUp.show(item.id);
-   }
-   });
-
-   statusbar.items.forEach(function(item) {
-   if (item.mobile === false && item.hidden) {
-   statusbar.show(item.id);
-   }
-   });
-
-   nUsers = _('%n users');
-   oneUser = _('1 user');
-   noUser = _('0 users');
-   updateUserListCount();
-
-   $('#document-name-input').show();
-}
-
 function resizeToolbar() {
-   var toolbarUp = w2ui['toolbar-up'];
-   var statusbar = w2ui['toolbar-down'];
-
-   if ($(window).width() < mobileWidth) {
-   _mobilify();
-   } else {
-   _unmobilify();
+   if ($(window).width() !== map.getSize().x) {
+   var toolbarUp = w2ui['toolbar-up'];
+   var statusbar = w2ui['toolbar-down'];
+   toolbarUp.resize();
+   statusbar.resize();
}
-
-   toolbarUp.resize();
-   statusbar.resize();
 }
 
 function _cancelSearch() {
@@ -1272,7 +1242,9 @@ function onDocLayerInit() {
}
toolbarUp.refresh();
statusbar.refresh();
-   resizeToolbar();
+   if (L.Browser.mobile) {
+   _mobilify();
+   }
 }
 
 function onCommandStateChanged(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/map/Map.js |   35 +++
 1 file changed, 3 insertions(+), 32 deletions(-)

New commits:
commit 42047a3b8f314ccefbfac296cae2b14795c6f150
Author: Henry Castro 
AuthorDate: Tue Aug 7 21:10:19 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:16:47 2018 -0400

loleaflet: mobile: fix invalidate size

Change-Id: Ic4d06f2cf9a945bef4e8b81acd483238bf4e2bdb

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index f29dbe4cb..4b78babe8 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -351,41 +351,12 @@ L.Map = L.Evented.extend({
return this.panTo(newCenter, options);
},
 
-   invalidateSize: function (options) {
+   invalidateSize: function () {
if (!this._loaded) { return this; }
 
-   options = L.extend({
-   animate: false,
-   pan: true
-   }, options === true ? {animate: true} : options);
-
var oldSize = this.getSize();
this._sizeChanged = true;
-
-   var newSize = this.getSize(),
-   oldCenter = oldSize.divideBy(2).round(),
-   newCenter = newSize.divideBy(2).round(),
-   offset = oldCenter.subtract(newCenter);
-
-   if (!offset.x && !offset.y) { return this; }
-
-   if (options.animate && options.pan) {
-   this.panBy(offset);
-
-   } else {
-   if (options.pan) {
-   this._rawPanBy(offset);
-   }
-
-   this.fire('move');
-
-   if (options.debounceMoveend) {
-   clearTimeout(this._sizeTimer);
-   this._sizeTimer = setTimeout(L.bind(this.fire, 
this, 'moveend'), 200);
-   } else {
-   this.fire('moveend');
-   }
-   }
+   var newSize = this.getSize();
 
return this.fire('resize', {
oldSize: oldSize,
@@ -829,7 +800,7 @@ L.Map = L.Evented.extend({
_onResize: function () {
L.Util.cancelAnimFrame(this._resizeRequest);
this._resizeRequest = L.Util.requestAnimFrame(
-   function () { this.invalidateSize({debounceMoveend: 
true}); }, this, false, this._container);
+   function () { this.invalidateSize(); }, this, false, 
this._container);
},
 
_activate: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/layer/marker/ClipboardContainer.js |   20 --
 loleaflet/src/layer/tile/TileLayer.js|   32 ---
 2 files changed, 36 insertions(+), 16 deletions(-)

New commits:
commit 6a70fe02c6db3570dc4c5650fc046a25814c4806
Author: Henry Castro 
AuthorDate: Sun Aug 5 18:30:16 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:15:39 2018 -0400

loleaflet: mobile: show the cursor only if clipContainer is focused

Change-Id: I209952df810d23b244e8b963304115fd81e30a81

diff --git a/loleaflet/src/layer/marker/ClipboardContainer.js 
b/loleaflet/src/layer/marker/ClipboardContainer.js
index aa6d42a99..cb7b74a9a 100644
--- a/loleaflet/src/layer/marker/ClipboardContainer.js
+++ b/loleaflet/src/layer/marker/ClipboardContainer.js
@@ -18,7 +18,9 @@ L.ClipboardContainer = L.Layer.extend({
L.DomEvent.on(this._textArea, 'copy cut paste ' +
  'keydown keypress keyup ' +
  'compositionstart compositionupdate 
compositionend textInput',
- this._map._handleDOMEvent, this._map);
+ this._map._handleDOMEvent, this._map)
+ .on(this._textArea, 'focus', this.onGotFocus, this)
+ .on(this._textArea, 'blur', this.onLostFocus, this);
},
 
onRemove: function () {
@@ -29,10 +31,24 @@ L.ClipboardContainer = L.Layer.extend({
L.DomEvent.off(this._textArea, 'copy cut paste ' +
   'keydown keypress keyup ' +
   'compositionstart compositionupdate 
compositionend textInput',
-  this._map._handleDOMEvent, this._map);
+  this._map._handleDOMEvent, this._map)
+ .off(this._textArea, 'focus', this.onGotFocus, this)
+ .off(this._textArea, 'blur', this.onLostFocus, this);
+   },
+
+   onGotFocus: function () {
+   this.setLatLng(this._map._docLayer._updateCursorPos());
+   },
+
+   onLostFocus: function () {
+   this._map.removeLayer(this._map._docLayer._cursorMarker);
},
 
focus: function(focus) {
+   if (this._map._permission !== 'edit') {
+   return;
+   }
+
if (focus === false) {
this._textArea.blur();
} else {
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 2d2a25fb6..15292feda 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1538,6 +1538,22 @@ L.TileLayer = L.GridLayer.extend({
this._onUpdateCursor();
},
 
+   _updateCursorPos: function () {
+   var pixBounds = 
L.bounds(this._map.latLngToLayerPoint(this._visibleCursor.getSouthWest()),
+   
this._map.latLngToLayerPoint(this._visibleCursor.getNorthEast()));
+   var cursorPos = this._visibleCursor.getNorthWest();
+
+   if (!this._cursorMarker) {
+   this._cursorMarker = L.cursor(cursorPos, 
pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom())), 
{blink: true});
+   }
+   else {
+   this._cursorMarker.setLatLng(cursorPos, 
pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom(;
+   }
+
+   this._map.addLayer(this._cursorMarker);
+   return this._visibleCursor.getNorthWest();
+   },
+
// Update cursor layer (blinking cursor).
_onUpdateCursor: function (scroll) {
var cursorPos = this._visibleCursor.getNorthWest();
@@ -1570,23 +1586,11 @@ L.TileLayer = L.GridLayer.extend({
// the state of the document (if the falgs are set)
_updateCursorAndOverlay: function (/*update*/) {
if (this._map._permission === 'edit'
+   && this._map._clipboardContainer._textArea === 
document.activeElement
&& this._isCursorVisible
&& this._isCursorOverlayVisible
&& !this._isEmptyRectangle(this._visibleCursor)) {
-
-   var pixBounds = 
L.bounds(this._map.latLngToLayerPoint(this._visibleCursor.getSouthWest()),
-
this._map.latLngToLayerPoint(this._visibleCursor.getNorthEast()));
-
-   var cursorPos = this._visibleCursor.getNorthWest();
-
-   if (!this._cursorMarker) {
-   this._cursorMarker = L.cursor(cursorPos, 
pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom())), 
{blink: true});
-   }
-   else {
-   this._cursorMarker.setLatLng(cursorPos, 
pixBounds

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.DocumentRepair.js |2 +-
 loleaflet/src/control/Control.Layers.js |2 +-
 loleaflet/src/control/Control.PartsPreview.js   |2 +-
 loleaflet/src/control/Control.Permission.js |2 +-
 loleaflet/src/control/Control.Selection.js  |2 +-
 loleaflet/src/control/Control.Tabs.js   |2 +-
 loleaflet/src/control/Control.js|4 
 7 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 4dbec80ffdc3c3f81b52e434e1c6e611a976b104
Author: Henry Castro 
AuthorDate: Sun Aug 5 16:50:25 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:14:52 2018 -0400

loleaflet: mobile: replace refocusOnMap with map focus

Change-Id: I271ea3a3ed22320b1184e1bfc348ecb69f681fd8

diff --git a/loleaflet/src/control/Control.DocumentRepair.js 
b/loleaflet/src/control/Control.DocumentRepair.js
index 6ed2d8bda..9d67e031a 100644
--- a/loleaflet/src/control/Control.DocumentRepair.js
+++ b/loleaflet/src/control/Control.DocumentRepair.js
@@ -119,7 +119,7 @@ L.Control.DocumentRepair = L.Control.extend({
 
_onCloseClick: function () {
this._map.enable(true);
-   this._refocusOnMap();
+   this._map.focus();
this.remove();
},
 
diff --git a/loleaflet/src/control/Control.Layers.js 
b/loleaflet/src/control/Control.Layers.js
index 1686b80c8..3963976a4 100644
--- a/loleaflet/src/control/Control.Layers.js
+++ b/loleaflet/src/control/Control.Layers.js
@@ -239,7 +239,7 @@ L.Control.Layers = L.Control.extend({
 
this._handlingClick = false;
 
-   this._refocusOnMap();
+   this._map.focus();
},
 
_expand: function () {
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index c9dd0dc80..c5b24729c 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -77,7 +77,7 @@ L.Control.PartsPreview = L.Control.extend({
.on(img, 'click', L.DomEvent.stopPropagation)
.on(img, 'click', L.DomEvent.stop)
.on(img, 'click', this._setPart, this)
-   .on(img, 'click', this._refocusOnMap, this);
+   .on(img, 'click', this._map.focus, this._map);
 
var topBound = this._previewContTop;
var previewFrameTop = 0;
diff --git a/loleaflet/src/control/Control.Permission.js 
b/loleaflet/src/control/Control.Permission.js
index 96c59de7a..3900c5b43 100644
--- a/loleaflet/src/control/Control.Permission.js
+++ b/loleaflet/src/control/Control.Permission.js
@@ -27,7 +27,7 @@ L.Control.PermissionSwitch = L.Control.extend({
else {
this._map.setPermission('view');
}
-   this._refocusOnMap();
+   this._map.focus();
},
 
_onUpdatePermission: function (e) {
diff --git a/loleaflet/src/control/Control.Selection.js 
b/loleaflet/src/control/Control.Selection.js
index 766455f65..fccd83f43 100644
--- a/loleaflet/src/control/Control.Selection.js
+++ b/loleaflet/src/control/Control.Selection.js
@@ -27,7 +27,7 @@ L.Control.Selection = L.Control.extend({
else {
this._map.disableSelection();
}
-   this._refocusOnMap();
+   this._map.focus();
},
 
_onUpdatePermission: function (e) {
diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 6d53bff86..73e43b8d6 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -128,7 +128,7 @@ L.Control.Tabs = L.Control.extend({
.on(tab, 'click', 
L.DomEvent.stopPropagation)
.on(tab, 'click', 
L.DomEvent.stop)
.on(tab, 'click', 
this._setPart, this)
-   .on(tab, 'click', 
this._refocusOnMap, this);
+   .on(tab, 'click', 
this._map.focus, this._map);
this._spreadsheetTabs[id] = tab;
}
}
diff --git a/loleaflet/src/control/Control.js b/loleaflet/src/control/Control.js
index 466689d31..af8df09d8 100644
--- a/loleaflet/src/control/Control.js
+++ b/loleaflet/src/control/Control.js
@@ -78,10 +78,6 @@ L.Control = L.Class.extend({
}
var corner = this._map._controlCorners[this.options.position];
return corner.hasChildNodes();
-   },
-
-   _refocusOnMap: function () {
-   this._map.focus();
}
 });
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedeskto

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

[Libreoffice Gerrit user]

 loleaflet/src/layer/marker/ClipboardContainer.js |6 +++---
 loleaflet/src/layer/tile/TileLayer.js|4 ++--
 loleaflet/src/map/Map.js |5 ++---
 loleaflet/src/map/handler/Map.Keyboard.js|4 ++--
 loleaflet/src/map/handler/Map.Mouse.js   |2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit a3284d92c609c0310e166c22ed6086637d8dcd92
Author: Henry Castro 
AuthorDate: Sun Aug 5 16:39:03 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:14:16 2018 -0400

loleaflet: mobile: replace clipboardContainer with map focus

Change-Id: I616e5b8417522ec06d7311f335d3c60888a32b82

diff --git a/loleaflet/src/layer/marker/ClipboardContainer.js 
b/loleaflet/src/layer/marker/ClipboardContainer.js
index a6b2b159f..aa6d42a99 100644
--- a/loleaflet/src/layer/marker/ClipboardContainer.js
+++ b/loleaflet/src/layer/marker/ClipboardContainer.js
@@ -33,10 +33,10 @@ L.ClipboardContainer = L.Layer.extend({
},
 
focus: function(focus) {
-   if (focus) {
-   this._textArea.focus();
-   } else {
+   if (focus === false) {
this._textArea.blur();
+   } else {
+   this._textArea.focus();
}
},
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index e90459e43..2d2a25fb6 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -282,7 +282,7 @@ L.TileLayer = L.GridLayer.extend({
for (var key in this._selectionHandles) {
this._selectionHandles[key].on('drag dragend', 
this._onSelectionHandleDrag, this);
}
-   this._map._clipboardContainer.focus(true);
+   this._map.focus();
 
map.setPermission(this.options.permission);
 
@@ -1770,7 +1770,7 @@ L.TileLayer = L.GridLayer.extend({
}
if (e.type === 'dragend') {
e.target.isDragged = false;
-   this._map._clipboardContainer.focus(true);
+   this._map.focus();
this._map.fire('scrollvelocity', {vx: 0, vy: 0});
}
 
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 547915181..f29dbe4cb 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -661,7 +661,7 @@ L.Map = L.Evented.extend({
console.debug('focus:');
if (this._docLayer) {
console.debug('focus: focussing');
-   this._clipboardContainer.focus(true);
+   this._clipboardContainer.focus();
}
},
 
@@ -1064,8 +1064,7 @@ L.Map = L.Evented.extend({
// Calling from some other place with no real 'click' event 
doesn't work
if (type === 'click') {
if (this._permission === 'edit') {
-   this._clipboardContainer.focus(false);
-   this._clipboardContainer.focus(true);
+   this.focus();
}
 
// unselect if anything is selected already
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index 4ccd5e7dc..18e49ad4e 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -230,7 +230,7 @@ L.Map.Keyboard = L.Handler.extend({
if (this._map._permission === 'edit') {
return;
}
-   this._map._container.focus();
+   this._map.focus();
},
 
// Convert javascript key codes to UNO key codes.
@@ -514,7 +514,7 @@ L.Map.Keyboard = L.Handler.extend({
case 93: // Right Cmd (Safari)
// we prepare for a copy or cut event

this._map._clipboardContainer.setValue(window.getSelection().toString());
-   this._map._clipboardContainer.focus(true);
+   this._map.focus();
this._map._clipboardContainer.select();
return true;
case 80: // p
diff --git a/loleaflet/src/map/handler/Map.Mouse.js 
b/loleaflet/src/map/handler/Map.Mouse.js
index b369497f6..a461d997a 100644
--- a/loleaflet/src/map/handler/Map.Mouse.js
+++ b/loleaflet/src/map/handler/Map.Mouse.js
@@ -151,7 +151,7 @@ L.Map.Mouse = L.Handler.extend({
var docLayer = this._map._docLayer;
this._mouseEventsQueue = [];
docLayer._postMouseEvent('buttonup', 
mousePos.x, mousePos.y, 1, buttons, modifier);
-   
this._map._clipboa

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

[Libreoffice Gerrit user]

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

New commits:
commit 1907678197929f25b3fc4d50f7c99ac80e64a735
Author: Henry Castro 
AuthorDate: Tue Aug 7 09:11:20 2018 -0400
Commit: Henry Castro 
CommitDate: Wed Aug 8 16:13:16 2018 -0400

loleaflet: mobile: use setValue

Change-Id: Ica14c95e2aec31423a47d904c3c499b706261370

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index 9e1bad2ca..4ccd5e7dc 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -393,7 +393,7 @@ L.Map.Keyboard = L.Handler.extend({
// get the composited char codes
// clear the input now - best to do this ASAP so the 
input
// is clear for the next word
-   this._map._clipboardContainer._textArea.value = '';
+   this._map._clipboardContainer.setValue('');
// Set all keycodes to zero
this._map._docLayer._postCompositionEvent(0, 'end', '');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Regarding libreoffice android error

[Tushar Koshti]

Hello,

I am facing one problem while building and running Android version of
LibreOffice. Here is the stack trace.

- beginning of the crash
08-07 07:53:49.913 25702-25702/? E/AndroidRuntime: FATAL EXCEPTION: main
Process: org.documentfoundation.libreoffice, PID: 25702
java.lang.UnsatisfiedLinkError:
dalvik.system.PathClassLoader[DexPathList[[zip file
"/data/app/org.documentfoundation.libreoffice-1/base.apk"],nativeLibraryDirectories=[/data/app/org.documentfoundation.libreoffice-1/lib/arm64,
/system/lib64, /vendor/lib64]]] couldn't find "libnspr4.so"
at java.lang.Runtime.loadLibrary0(Runtime.java:984)
at java.lang.System.loadLibrary(System.java:1562)
at org.libreoffice.kit.NativeLibLoader.load(LibreOfficeKit.java:110)
at
org.libreoffice.kit.LibreOfficeKit.(LibreOfficeKit.java:100)
at
org.libreoffice.kit.LibreOfficeKit.initializeLibrary(LibreOfficeKit.java:35)
at
org.libreoffice.TileProviderFactory.initialize(TileProviderFactory.java:23)
at org.libreoffice.LOKitThread.(LOKitThread.java:40)
at
org.libreoffice.LibreOfficeMainActivity.onCreate(LibreOfficeMainActivity.java:151)
at android.app.Activity.performCreate(Activity.java:6738)
at
android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1119)
at
android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2652)
at
android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2766)
at android.app.ActivityThread.-wrap12(ActivityThread.java)
at
android.app.ActivityThread$H.handleMessage(ActivityThread.java:1507)
at android.os.Handler.dispatchMessage(Handler.java:102)
at android.os.Looper.loop(Looper.java:154)
at android.app.ActivityThread.main(ActivityThread.java:6236)
at java.lang.reflect.Method.invoke(Native Method)
at
com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:891)
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:781)


It would be great if you can help me out with this.

Waiting for your reply.

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

Re: Minutes of ESC call: 2018-08-02

[Noel Grandin]

On 2018/08/06 11:06 AM, Michael Stahl wrote:

On 02.08.2018 20:25, Jan Holesovsky wrote:

    + tests that failed more than twice in last 7 days:
   3 CppunitTest_sw_filters_test
   3 CppunitTest_sw_htmlimport
   3 CppunitTest_vcl_complextext
   3 CppunitTest_vcl_fontfeature
   4 CppunitTest_sw_uiwriter
   5 CppunitTest_vcl_pdfexport


i've enabled some verbose logging code in WNT font initialisation to track down the CppunitTest_vcl_fontfeature 
failures; can this logging be disabled again now?


i'm unable to find one of these 3 failed build logs now to see if they are perhaps all based on some ancient master, but 
probably it is available somewhere inside Jenkins if one knows where to look ...



My apologies, I did not realise you were actually looking at solving that, I have been steadily trimming the vcl font 
feature unit test until it stopped causing jenkins issues, see commits


   415436ad27b4522102d3fbbb6003935871029fc6

   fadd8727cd050c00af4f0986626b99a9e84f1ddd

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

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

[Libreoffice Gerrit user]

 sc/source/ui/app/inputhdl.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c9f9641c4654e7b867c604a347a568c0a6e97ce8
Author: Maxim Monastirsky 
AuthorDate: Mon Aug 6 23:50:21 2018 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Aug 8 20:41:46 2018 +0200

tdf#119128 toggle INSERT/OVERWRITE is broken

Regression of 632bc11ce8fab1c4046ab24810b90a7ce9ac5914
("tdf#117017 Pasting into the formula bar shouldn't
retain formatting"). Toggling the overwrite mode sets
the EVControlBits::OVERWRITE bit from inside the editeng
keyboard handler, so make sure to not override it.

Change-Id: I2b5e3fe9cb885ed20e7528fdfe2fd59f5ef05f42
Reviewed-on: https://gerrit.libreoffice.org/58658
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit 92a4e4eac7520541a433e40836cafa4e29edf47f)
Reviewed-on: https://gerrit.libreoffice.org/58709
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index adb1c2437cac..b572b9ac06dc 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3414,15 +3414,14 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, 
bool bStartEdit /* = false
 {
 if (pTableView)
 {
-EVControlBits nControl = pTableView->GetControlWord();
 if (pTopView)
-pTableView->SetControlWord(nControl | 
EVControlBits::SINGLELINEPASTE);
+
pTableView->SetControlWord(pTableView->GetControlWord() | 
EVControlBits::SINGLELINEPASTE);
 
 vcl::Window* pFrameWin = pActiveViewSh ? 
pActiveViewSh->GetFrameWin() : nullptr;
 if ( pTableView->PostKeyEvent( rKEvt, pFrameWin ) )
 bUsed = true;
 
-pTableView->SetControlWord(nControl);
+
pTableView->SetControlWord(pTableView->GetControlWord() & 
~EVControlBits::SINGLELINEPASTE);
 }
 if (pTopView)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/tabpages/transfrm.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 18a8285433ec2f94d0ca523af8dd769ff46fd5a1
Author: Caolán McNamara 
AuthorDate: Wed Aug 8 09:28:27 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Aug 8 20:38:04 2018 +0200

Resolves: tdf#118281 control positions always in cm

Change-Id: I7803f673e835bd4575616d4e4b465ca144e282c8
Reviewed-on: https://gerrit.libreoffice.org/58727
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 134ac9b3e988..bfc5017e3705 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -437,6 +437,11 @@ void SvxSlantTabPage::Construct()
 DBG_ASSERT(pView, "no valid view (!)");
 eDlgUnit = GetModuleFieldUnit(GetItemSet());
 SetFieldUnit(*m_xMtrRadius, eDlgUnit, true);
+for (int i = 0; i < 2; ++i)
+{
+SetFieldUnit(*m_aControlX[i], eDlgUnit, true);
+SetFieldUnit(*m_aControlY[i], eDlgUnit, true);
+}
 
 { // #i75273#
 ::tools::Rectangle aTempRect(pView->GetAllMarkedRect());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 compilerplugins/clang/singlevalfields.results |   83 +-
 include/svx/dialcontrol.hxx   |1 
 include/svx/svdograf.hxx  |6 -
 svx/source/dialog/dialcontrol.cxx |   20 +-
 svx/source/svdraw/svdograf.cxx|   29 -
 5 files changed, 49 insertions(+), 90 deletions(-)

New commits:
commit 8536b96ab71bff7c996ad01063c5b514aaf4726f
Author: Noel Grandin 
AuthorDate: Wed Aug 8 10:48:23 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 8 19:57:01 2018 +0200

loplugin:singlevalfields

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

diff --git a/compilerplugins/clang/singlevalfields.results 
b/compilerplugins/clang/singlevalfields.results
index 6647455fd247..34b3d39416e8 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -1,4 +1,4 @@
-chart2/source/model/main/DataPoint.hxx:107
+chart2/source/model/main/DataPoint.hxx:108
 chart::DataPoint m_bNoParentPropAllowed
 0
 connectivity/source/inc/dbase/DIndexIter.hxx:37
@@ -13,6 +13,9 @@ include/basic/sbxvar.hxx:70
 include/editeng/charsetcoloritem.hxx:35
 SvxCharSetColorItem eFrom
 0
+include/editeng/swafopt.hxx:58
+editeng::SortedAutoCompleteStrings owning_
+1
 include/filter/msfilter/dffpropset.hxx:33
 DffPropFlags bSet
 0
@@ -22,7 +25,7 @@ include/filter/msfilter/dffpropset.hxx:35
 include/o3tl/vector_pool.hxx:93
 o3tl::detail::struct_from_value::type nextFree
 -1
-include/oox/dump/dumperbase.hxx:1661
+include/oox/dump/dumperbase.hxx:1683
 oox::dump::RecordObjectBase mbBinaryOnly
 0
 include/oox/ole/axcontrol.hxx:427
@@ -37,7 +40,13 @@ include/svtools/svparser.hxx:74
 include/svtools/svparser.hxx:75
 SvParser::TokenStackType bTokenHasValue
 0
-include/vcl/filter/pdfdocument.hxx:188
+include/svx/dialcontrol.hxx:212
+svx::SvxDialControl::DialControl_Impl mbNoRot
+0
+include/svx/svdograf.hxx:106
+SdrGrafObj mbInsidePaint
+0
+include/vcl/filter/pdfdocument.hxx:200
 vcl::filter::PDFNameElement m_nLength
 0
 libreofficekit/source/gtk/lokdocview.cxx:84
@@ -55,7 +64,7 @@ pyuno/source/module/pyuno_impl.hxx:312
 sax/source/tools/fastserializer.hxx:231
 sax_fastparser::FastSaxSerializer mbXescape
 1
-sc/inc/compiler.hxx:111
+sc/inc/compiler.hxx:112
 ScRawToken::(anonymous union)::(anonymous) eInForceArray
 0
 sc/qa/unit/ucalc.hxx:41
@@ -73,10 +82,10 @@ sfx2/source/appl/lnkbase2.cxx:77
 sfx2/source/appl/lnkbase2.cxx:82
 sfx2::ImplBaseLinkData::(anonymous) DDEType
 0
-sfx2/source/doc/doctemplates.cxx:136
+sfx2/source/doc/doctemplates.cxx:137
 (anonymous namespace)::WaitWindow_Impl mnTextStyle
 12576
-sfx2/source/view/ipclient.cxx:81
+sfx2/source/view/ipclient.cxx:82
 SfxBooleanFlagGuard m_bLifeValue
 1
 soltools/cpp/cpp.h:120
@@ -91,24 +100,18 @@ soltools/mkdepend/def.h:132
 stoc/source/inspect/introspection.cxx:1530
 (anonymous namespace)::Cache::Data hits
 1
-svtools/source/control/valueimp.hxx:81
-SvtValueSetItem mpData
-0
-svx/source/svdraw/svdpdf.hxx:168
+svx/source/svdraw/svdpdf.hxx:173
 ImpSdrPdfImport maLineJoin
 0
-svx/source/svdraw/svdpdf.hxx:169
+svx/source/svdraw/svdpdf.hxx:174
 ImpSdrPdfImport maLineCap
 0
 sw/inc/hints.hxx:199
 SwAttrSetChg m_bDelSet
 0
-sw/inc/pagepreviewlayout.hxx:49
+sw/inc/pagepreviewlayout.hxx:46
 SwPagePreviewLayout mnYFree
 568
-sw/inc/swbaslnk.hxx:32
-SwBaseLink m_bIgnoreDataChanged
-0
 sw/source/core/inc/frmtool.hxx:260
 SwBorderAttrs m_bBorderDist
 1
@@ -124,24 +127,18 @@ sw/source/filter/html/htmlcss1.cxx:78
 sw/source/filter/html/htmlcss1.cxx:79
 SwCSS1ItemIds nFormatKeep
 109
-sw/source/filter/html/svxcss1.hxx:201
+sw/source/filter/html/svxcss1.hxx:202
 SvxCSS1Parser nMinFixLineSpace
 141
 sw/source/filter/inc/rtf.hxx:30
 RTFSurround::(anonymous union)::(anonymous) nJunk
 0
-sw/source/filter/ww8/ww8par.hxx:655
+sw/source/filter/ww8/ww8par.hxx:660
 WW8FormulaControl mfUnknown
 0
-sw/source/filter/ww8/ww8par.hxx:664
+sw/source/filter/ww8/ww8par.hxx:669
 WW8FormulaControl mhpsCheckBox
 20
-sw/source/uibase/inc/envlop.hxx:76
-SwEnvDlg pAddresseeSet
-0
-sw/source/uibase/inc/envlop.hxx:77
-SwEnvDlg pSenderSet
-0
 unotools/source/config/saveopt.cxx:77
 SvtSaveOptions_Impl bROUserAutoSave
 0
@@ -175,51 +172,57 @@ vcl/source/filter/jpeg/transupp.h:131
 vcl/source/font/font.cxx:539
 (anonymous namespace)::WeightSearchEntry weight
 5
-vcl/source/gdi/dibtools.cxx:50
+vcl/source/gdi/dibtools.cxx:51
 (anonymous namespace)::CIEXYZ aXyzX
 0
-vcl/source/gdi/dibtools.cxx:51
+vcl/source/gdi/dibtools.cxx:52
 (anonymous namespace)::CIEXYZ aXyzY
 0
-vcl/source/gdi/dibtools.cxx:52
+vcl/source/gdi/dib

[Libreoffice-commits] core.git: sc/CppunitTest_sc_annotationobj.mk

[Libreoffice Gerrit user]

 sc/CppunitTest_sc_annotationobj.mk |   41 +
 1 file changed, 6 insertions(+), 35 deletions(-)

New commits:
commit a6c9228fd1cf02eb9de5647ee00f6f60680bf44d
Author: Jens Carl 
AuthorDate: Wed Aug 8 03:42:15 2018 +
Commit: Jens Carl 
CommitDate: Wed Aug 8 19:20:29 2018 +0200

Remove obsolete (cargo-cult copied) dependencies

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

diff --git a/sc/CppunitTest_sc_annotationobj.mk 
b/sc/CppunitTest_sc_annotationobj.mk
index f43a8c8bc8b4..ce4bd3009be1 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -14,48 +14,19 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_annotationobj))
 $(eval $(call gb_CppunitTest_use_external,sc_annotationobj,boost_headers))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \
-sc/qa/extras/scannotationobj \
+   sc/qa/extras/scannotationobj \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \
-basegfx \
-comphelper \
-cppu \
-cppuhelper \
-drawinglayer \
-editeng \
-for \
-forui \
-i18nlangtag \
-msfilter \
-oox \
-sal \
-salhelper \
-sax \
-sb \
-sc \
-sfx \
-sot \
-subsequenttest \
-svl \
-svt \
-svx \
-svxcore \
+   cppu \
+   sal \
+   subsequenttest \
test \
-tk \
-tl \
-ucbhelper \
unotest \
-utl \
-vbahelper \
-vcl \
-xo \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_annotationobj,\
--I$(SRCDIR)/sc/source/ui/inc \
--I$(SRCDIR)/sc/inc \
-$$(INCLUDE) \
+   $$(INCLUDE) \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,sc_annotationobj))
@@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_annotationobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_annotationobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
-$(sc_unoapi_common_components) \
+   $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/unowriter/unowriter.cxx |   33 +
 sw/source/core/unocore/unoframe.cxx  |7 +++
 sw/source/core/unocore/unomap1.cxx   |2 +-
 3 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 587803ba46055d43b5b108be744fdde17aeabc7c
Author: Miklos Vajna 
AuthorDate: Wed Aug 8 17:58:20 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 8 19:18:19 2018 +0200

sw TextGraphicObject: handle XBitmap for GraphicURL

This restores compatibility for API users who called getByName() on the
bitmap table and expected that the result can be set as a value for the
GraphicURL property.

Changing the property type to cppu::UnoType::get() is
necessary, otherwise scripting languages figure out (via reflection)
that the type doesn't match, and SwXFrame::setPropertyValue() is not
called.

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

diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index cde8b9b9c47d..96945d25a40f 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -22,10 +22,12 @@ class SwUnoWriter : public SwModelTestBase
 public:
 void testDefaultCharStyle();
 void testGraphicDesciptorURL();
+void testGraphicDesciptorURLBitmap();
 
 CPPUNIT_TEST_SUITE(SwUnoWriter);
 CPPUNIT_TEST(testDefaultCharStyle);
 CPPUNIT_TEST(testGraphicDesciptorURL);
+CPPUNIT_TEST(testGraphicDesciptorURLBitmap);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -82,6 +84,37 @@ void SwUnoWriter::testGraphicDesciptorURL()
 CPPUNIT_ASSERT(xGraphic.is());
 }
 
+void SwUnoWriter::testGraphicDesciptorURLBitmap()
+{
+loadURL("private:factory/swriter", nullptr);
+
+// Load a bitmap into the bitmap table.
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xBitmaps(
+xFactory->createInstance("com.sun.star.drawing.BitmapTable"), 
uno::UNO_QUERY);
+OUString aGraphicURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"test.jpg";
+xBitmaps->insertByName("test", uno::makeAny(aGraphicURL));
+
+// Create a graphic.
+uno::Reference xTextGraphic(
+xFactory->createInstance("com.sun.star.text.TextGraphicObject"), 
uno::UNO_QUERY);
+xTextGraphic->setPropertyValue("GraphicURL", xBitmaps->getByName("test"));
+xTextGraphic->setPropertyValue("AnchorType",
+   
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+
+// Insert it.
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xBodyText(xTextDocument->getText(), 
uno::UNO_QUERY);
+uno::Reference xCursor(xBodyText->createTextCursor());
+uno::Reference xTextContent(xTextGraphic, 
uno::UNO_QUERY);
+xBodyText->insertTextContent(xCursor, xTextContent, false);
+
+// This failed: setting GraphicURL to the result of getByName() did not
+// work anymore.
+auto xGraphic = 
getProperty>(getShape(1), "Graphic");
+CPPUNIT_ASSERT(xGraphic.is());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUnoWriter);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index c16f1b301b20..15f4b88b01f8 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2754,8 +2754,15 @@ void SwXFrame::attachToRange(const uno::Reference< 
text::XTextRange > & xTextRan
 if (m_pProps->GetProperty(FN_UNO_GRAPHIC_URL, 0, pGraphicURL))
 {
 OUString sGraphicURL;
+uno::Reference xBitmap;
 if (((*pGraphicURL) >>= sGraphicURL) && !sGraphicURL.isEmpty())
 aGraphic = vcl::graphic::loadFromURL(sGraphicURL);
+else if ((*pGraphicURL) >>= xBitmap)
+{
+uno::Reference xGraphic(xBitmap, 
uno::UNO_QUERY);
+if (xGraphic.is())
+aGraphic = xGraphic;
+}
 }
 
 const ::uno::Any* pGraphicAny;
diff --git a/sw/source/core/unocore/unomap1.cxx 
b/sw/source/core/unocore/unomap1.cxx
index 6716483ea1a8..de331a18cbf8 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -850,7 +850,7 @@ const SfxItemPropertyMapEntry*  
SwUnoPropertyMapProvider::GetGraphicPropertyMap(
 { OUString(UNO_NAME_REPLACEMENT_GRAPHIC), FN_UNO_REPLACEMENT_GRAPHIC, 
cppu::UnoType::get(), 0, 0 },
 { OUString(UNO_NAME_GRAPHIC_FILTER), FN_UNO_GRAPHIC_FILTER,  
cppu::UnoType::get(), 0, 0 },
 { OUString(UNO_NAME_GRAPHIC), FN_UNO_GRAPHIC, 
cppu::UnoType::get(), 0, 0 },
-{ OUString(UNO_NAME_GRAPHIC_URL), FN_UNO_GRAPHIC_URL, 
cppu::UnoType::get(), 0, 0 },
+{ OUString(UNO_NAME_GRAPHIC_URL), FN_UNO_GRAPHIC_URL, 
cppu::UnoType::get(), 0, 0 },
 { OUString(UNO_NAME_ACTUAL_SI

Minutes of ESC call: 2018-08-08

[Jan Holesovsky]

* Present:
+  Heiko, Cloph, Olivier, Xisco, Michael W., Stephan, Kendy, Thorsten

* Completed Action Items:

* Pending Action Items:
+ get download numbers for 32bit Linux (Christian)
+ default bitergia filter for master + libreoffice-* (Christian)

* Release Engineering update (Christian) 
+ 6.0.7 - in October
+ we might consider 6.0.8 too, between the 6.0.7 and 6.2.0 (?)
+ 6.1.0 RC3 update
+ created as final today
+ Remotes
+ Android viewer
+ building a new release – to be released on weekend (Christian) 
+ Online

* Documentation (Olivier)
+ New Help
 + Online New features video updated to 6.1 (ohallot)
 + redirections and sitemaps for 6.1 (online) (ohallot)
 + some patches still in 6-1 branches to approve
 + do not affect the translations
+ Online help editor
 + Initial upload to git dev-tools (M. Saunders)
 + based on CodeMirror (M. Saunders)
 + Added ~20 XHP snippets for ease of content insert (ohallot)
 + for creating paragraphs including the unique ID etc.
 + very encouraging! (Kendy)
+ Help Content
 + Fix contents, typos (M. Kaganski, A. Gelmini, fitoshido)
+ Guides
 + writer Guide 6.0 released (Jean Weber)
 + Getting Started 6.0 still under review/assembling

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
247(247) (topicUI) bugs open, 280(280) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months  
 added  4(3)  10(1) 18(0)   86(0)  
 commented 32(-17)   145(-3)   279(-3)1698(11) 
   removed  0(0)   0(-1) 1(0)9(-1) 
  resolved  4(-4) 16(3) 26(2)  154(-3) 
+ top 10 contributors:
  Tietze, Heiko made 53 changes in 1 month, and 650 changes in 1 year
  Foote, V Stuart made 52 changes in 1 month, and 277 changes in 1 year
  Xisco Faulí made 22 changes in 1 month, and 316 changes in 1 year
  Buovjaga made 21 changes in 1 month, and 192 changes in 1 year
  Kaganski, Mike made 20 changes in 1 month, and 64 changes in 1 year
  Timur made 16 changes in 1 month, and 60 changes in 1 year
  Nabet, Julien made 12 changes in 1 month, and 23 changes in 1 year
  Telesto made 11 changes in 1 month, and 90 changes in 1 year
  Faure, Jean-Baptiste made 10 changes in 1 month, and 50 changes in 1 
year
  Kainz, Andreas made 9 changes in 1 month, and 42 changes in 1 year
+ 119088 - Calc should show overwrite warning on clipboard paste to cell 
with text
+ 119085 – Bundling a new Garamond font
+ 2.5M, by Google
+ 119065 – Last bullet of the bullet list is disappearing
+ 119063 - wontfix

* Crash Reporting (Caolan)
+ 9(+6) import failure, 11(+3) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now
  
* Crash Reporting (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 547 (last 7 days) (+27)
+ http://crashreport.libreoffice.org/stats/version/6.0.4.2
 + 758 (last 7 days) (+38)
+ http://crashreport.libreoffice.org/stats/version/6.0.5.2
 + 1287 (last 7 days) (-113)
+ http://crashreport.libreoffice.org/stats/version/6.0.6.2
 + 307 (last 7 days) (+307)

* GSoC schedule (Heiko)
+ Coding: May 14 - August 6
+ Students Submit Code and Final Evaluations: August 6 – 14
+ 1 URL that is not modifiable, with all the artifacts
+ push your student to do that!!!
+ Mentors Submit Final Evaluations: August 14 - 21
+ Results Announced: August 22
+ https://wiki.documentfoundation.org/Development/GSoC/2018

* Hackfests & Events
+ Akademy in Vienna Aug 11-17th
+ maybe Bubli… (Thorsten)
+ FrOScon in Bonn: Aug 25
+ Bubli, Thorsten, perhaps Cloph.
+ maybe Munich (Thorsten)
+ Conference – September
+ potentially one in Bern / Switzerland - October 19th.
+ working on a Munich event October 26-28th (Thorsten)
+ an Open Gov’t meeting from the City of Munich
+ good to have a hack-fest back-to-back there.
+ moving slowly here …

* mentoring/easyhack update
  committer...   1 week   1 month  3 months 12 months   
  open  109(1)   190(41)   190(40)  201(41) 
   reviews 1279(-374)   5185(-580)   10986(401)   24632(506)
merged  231(-197)   1237(-83) 3759(-28)   14253(12) 
 abandoned8(-2)   43(-9)   259(-2)  966(-4) 
   own commits  206(-162)   1073(-38) 3529(-76)   15485(181)
review commits   95(31)  322(12)   957(16) 3736(84) 
contributor...   1 week1 month3 months 12 months
  open  

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 3 commits - sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/ndgrf.hxx|1 
 sw/inc/ndole.hxx|2 
 sw/inc/ndtxt.hxx|4 +
 sw/inc/node.hxx |2 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   30 +++-
 sw/source/core/docnode/ndtbl.cxx|   14 -
 sw/source/core/docnode/nodes.cxx|4 -
 sw/source/core/draw/dcontact.cxx|8 ++-
 sw/source/core/graphic/ndgrf.cxx|5 --
 sw/source/core/inc/frmtool.hxx  |2 
 sw/source/core/layout/atrfrm.cxx|   20 +++-
 sw/source/core/layout/frmtool.cxx   |   40 
 sw/source/core/ole/ndole.cxx|7 --
 sw/source/core/txtnode/ndtxt.cxx|   13 -
 sw/source/core/undo/untbl.cxx   |   15 --
 sw/source/filter/xml/wrtxml.cxx |   13 -
 16 files changed, 136 insertions(+), 44 deletions(-)

New commits:
commit 4a1f2476610ba7b04048bb27436d4a2655a37dcb
Author: Michael Stahl 
AuthorDate: Wed Aug 8 16:13:58 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Aug 8 16:13:58 2018 +0200

sw_redlinehide_2: fix ordering of SplitNode usage of ContentIdxStore

The problem is that now the ctor of SwTextFrame will check the redline
positions, but the call to MakeFramesForAdjacentContentNode()
happens before the call to ContentIdxStore::Restore() that updates
the SwPositions of the redlines, hence they point to the wrong node.

Try to fix this by not calling Restore directly but pass in a closure
to SwTextNode::SplitContentNode() so that it can call
ContentIdxStore::Restore() before frames are created and redline positions
are checked.

Also remove the useless SwContentNode::SplitContentNode() - only the
SwTextNode override actually did anything.

Change-Id: I2088fd124d04cf354f4f0f691a50ff5217d778d7

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index a5e4e0cc2969..74c46f20b238 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -80,7 +80,6 @@ public:
 const Graphic&  GetGrf(bool bWait = false) const;
 const GraphicObject&GetGrfObj(bool bWait = false) const;
 const GraphicObject* GetReplacementGrfObj() const;
-virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
 
 /// isolated only way to set GraphicObject to allow more actions when 
doing so
 void SetGraphic(const Graphic& rGraphic);
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 4f6f4596736d..93139c986526 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -111,8 +111,6 @@ public:
   SwOLEObj& GetOLEObj()   { return maOLEObj; }
 virtual ~SwOLENode() override;
 
-virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
-
 /// Is in ndcopy.cxx.
 virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const 
override;
 
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index d1a8801eb9c7..a32ea79c310a 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class SfxHint;
 class SwNumRule;
@@ -347,7 +348,8 @@ public:
 
 /// Virtual methods from ContentNode.
 virtual SwContentFrame *MakeFrame( SwFrame* ) override;
-virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
+SwTextNode * SplitContentNode(const SwPosition &,
+std::function const* pContentIndexRestore);
 virtual SwContentNode *JoinNext() override;
 void JoinPrev();
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 0c5ee9a9f309..2257446b2f9e 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -387,8 +387,6 @@ public:
pSib is another SwFrame of the same layout (e.g. the SwRootFrame 
itself, a sibling, the parent) */
 virtual SwContentFrame *MakeFrame( SwFrame* pSib ) = 0;
 
-virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0;
-
 virtual SwContentNode *JoinNext();
 /** Is it possible to join two nodes?
In pIdx the second position can be returned. */
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 256fce7bbe4d..acca6b19c0e2 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1991,7 +1991,15 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& 
rPaM, SwPosition& rPos,
 assert(aSavePam.GetPoint()->nNode == rPos.nNode.GetIndex());
 assert(rPos.nNode.GetIndex() == pOrigNode->GetIndex());
 
-pTNd = pTNd->SplitContentNode( rPos )->GetTextNode();
+std::function restoreFunc(
+[&](SwTextNode *const)
+   

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

[Libreoffice Gerrit user]

 chart2/IwyuFilter_chart2.yaml  |   51 
++
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx  |1 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx|1 
 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx  |1 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx|1 
 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx  |2 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |1 
 chart2/source/controller/main/ChartController.cxx  |1 
 chart2/source/controller/main/ChartController_Properties.cxx   |1 
 chart2/source/controller/main/ChartModelClone.cxx  |1 
 chart2/source/controller/main/ObjectHierarchy.cxx  |1 
 chart2/source/controller/main/ShapeController.cxx  |1 
 chart2/source/inc/DataSeriesHelper.hxx |   21 
++--
 chart2/source/inc/DataSourceHelper.hxx |   23 
++--
 chart2/source/inc/DiagramHelper.hxx|   24 
++--
 chart2/source/inc/DisposeHelper.hxx|2 
 chart2/source/inc/ErrorBar.hxx |2 
 chart2/source/inc/EventListenerHelper.hxx  |3 
 chart2/source/inc/ExplicitCategoriesProvider.hxx   |   12 
+-
 chart2/source/inc/FillProperties.hxx   |3 
 chart2/source/inc/FormattedStringHelper.hxx|9 +
 chart2/source/inc/InternalDataProvider.hxx |7 -
 chart2/source/inc/LifeTime.hxx |   11 
+-
 chart2/source/inc/LinePropertiesHelper.hxx |6 -
 chart2/source/inc/chartview/DataPointSymbolSupplier.hxx|8 -
 chart2/source/inc/chartview/DrawModelWrapper.hxx   |   13 
+-
 chart2/source/inc/chartview/ExplicitScaleValues.hxx|5 
 chart2/source/model/main/ChartModel.cxx|1 
 chart2/source/model/main/Diagram.cxx   |2 
 chart2/source/model/template/AreaChartTypeTemplate.cxx |1 
 chart2/source/model/template/BarChartTypeTemplate.cxx  |1 
 chart2/source/model/template/BubbleChartTypeTemplate.cxx   |1 
 chart2/source/model/template/ChartTypeTemplate.cxx |1 
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx   |1 
 chart2/source/model/template/LineChartTypeTemplate.cxx |1 
 chart2/source/model/template/NetChartTypeTemplate.cxx  |2 
 chart2/source/model/template/PieChartTypeTemplate.cxx  |1 
 chart2/source/model/template/ScatterChartTypeTemplate.cxx  |1 
 chart2/source/model/template/StockChartTypeTemplate.cxx|1 
 chart2/source/tools/AxisHelper.cxx |2 
 chart2/source/tools/ChartTypeHelper.cxx|1 
 chart2/source/tools/DataSourceHelper.cxx   |1 
 chart2/source/tools/DiagramHelper.cxx  |2 
 chart2/source/tools/ExplicitCategoriesProvider.cxx |1 
 chart2/source/tools/InternalDataProvider.cxx   |1 
 chart2/source/tools/LifeTime.cxx   |2 
 chart2/source/tools/LinePropertiesHelper.cxx   |1 
 chart2/source/view/axes/Tickmarks.cxx  |1 
 chart2/source/view/axes/Tickmarks_Dates.cxx|2 
 chart2/source/view/axes/Tickmarks_Equidistant.cxx  |1 
 chart2/source/view/axes/VAxisBase.cxx  |2 
 chart2/source/view/axes/VCartesianCoordinateSystem.cxx |2 
 chart2/source/view/axes/VCoordinateSystem.cxx  |1 
 chart2/source/view/axes/VPolarCoordinateSystem.cxx |2 
 chart2/source/view/main/ChartView.cxx  |2 
 55 files changed, 148 insertions(+), 102 deletions(-)

New commits:
commit 47db30bdb35a86bf34d2574c9af3f06b1d2a8bd7
Author: Gabor Kelemen 
AuthorDate: Sun Aug 5 16:09:23 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 8 17:20:58 2018 +0200

tdf#42949 Fix IWYU warnings in chart2/source/inc/[d-l]*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Try harder to use fw declarations, and a few newly analyzed files

Change-Id: I50299e9115ced60468c7bc5e63013addbaec48c0
Reviewed-on

[Libreoffice-commits] core.git: distro-configs/Jenkins

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit d1ffda89c59a11a00f9d846d540fc6502a5cb289
Author: Stephan Bergmann 
AuthorDate: Wed Aug 8 14:40:32 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 8 16:50:21 2018 +0200

Remove presumably unused distro-configs/Jenkins/*_libreoffice-5-0.conf

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

diff --git a/distro-configs/Jenkins/Linux_libreoffice-5-0.conf 
b/distro-configs/Jenkins/Linux_libreoffice-5-0.conf
deleted file mode 100644
index e69de29bb2d1..
diff --git a/distro-configs/Jenkins/MacOSX_libreoffice-5-0.conf 
b/distro-configs/Jenkins/MacOSX_libreoffice-5-0.conf
deleted file mode 100644
index e69de29bb2d1..
diff --git a/distro-configs/Jenkins/Win32_libreoffice-5-0.conf 
b/distro-configs/Jenkins/Win32_libreoffice-5-0.conf
deleted file mode 100644
index e69de29bb2d1..
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

converting _XFootnote.java to cpp

[Rahul Gurung]

Hi,

I have almost converted ifc/text/_XFootnote.java into cpp but I am confused
with the sc/qa/extra part which file should be changed or created and why?
I checked old commits and think it depends on the test but what should it
be, in the case of _XFootnote.java?

Thanks,
R. Gurung
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 oox/source/drawingml/shape.cxx  |   11 +
 sd/qa/unit/export-tests-ooxml2.cxx  |   42 
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |  148 
 3 files changed, 167 insertions(+), 34 deletions(-)

New commits:
commit e1d6ed941590a771abfc73f9eef4a98346eca762
Author: Szymon Kłos 
AuthorDate: Tue Aug 7 10:44:21 2018 +0200
Commit: Szymon Kłos 
CommitDate: Wed Aug 8 15:58:24 2018 +0200

tdf#116350 Correctly display text on arc

Change-Id: Ice8c141db20d43ccc8d6e2b56004a4a28d2b257a
Reviewed-on: https://gerrit.libreoffice.org/58729
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f49f506eda9d..4f11186254f0 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -548,13 +548,22 @@ static inline void lcl_createPresetShape( 
uno::Reference& xShap
 lcl_resetPropertyValue( aGeomPropVec, sEquations );
 lcl_resetPropertyValue( aGeomPropVec, sPath );
 
+// Some shapes don't need scaling
+bool bScale = true;
+if ( rPresetType == "textRingInside"
+|| rPresetType == "textRingOutside"
+|| rPresetType == "textCirclePour" )
+{
+bScale = false;
+}
+
 // Apply geometry properties
 uno::Sequence aPropertyValues(
 comphelper::InitPropertySequence(
 { { sTextPath, uno::makeAny( true ) },
 { "TextPathMode",
 uno::Any( drawing::EnhancedCustomShapeTextPathMode_PATH ) },
-{ "ScaleX", uno::Any( false ) } } ) );
+{ "ScaleX", uno::Any( bScale ) } } ) );
 
 lcl_setPropertyValue( aGeomPropVec, sTextPath,
 comphelper::makePropertyValue( sTextPath, aPropertyValues ) );
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 06a4c343b28e..fe2be051603e 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1816,6 +1816,39 @@ static inline double getAdjustmentValue( 
uno::Reference& xS
 return -1.0;
 }
 
+static inline bool getScaleXValue(uno::Reference& xSet)
+{
+bool bScaleX = false;
+
+auto aGeomPropSeq = xSet->getPropertyValue("CustomShapeGeometry")
+.get>();
+auto aGeomPropVec
+= comphelper::sequenceToContainer>(
+aGeomPropSeq);
+
+const OUString sName = "TextPath";
+auto aIterator = std::find_if(
+aGeomPropVec.begin(), aGeomPropVec.end(),
+[sName](const beans::PropertyValue& rValue) { return rValue.Name == 
sName; });
+
+if (aIterator != aGeomPropVec.end())
+{
+uno::Sequence aTextPathProperties;
+aIterator->Value >>= aTextPathProperties;
+const OUString sScaleX = "ScaleX";
+auto aIterator2 = std::find_if(
+aTextPathProperties.begin(), aTextPathProperties.end(),
+[sScaleX](const beans::PropertyValue& rValue) { return rValue.Name 
== sScaleX; });
+
+if (aIterator2 != aTextPathProperties.end())
+{
+aIterator2->Value >>= bScaleX;
+}
+}
+
+return bScaleX;
+}
+
 void SdOOXMLExportTest2::testTdf116350TextEffects()
 {
 ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( 
"sd/qa/unit/data/pptx/tdf116350-texteffects.pptx" ), PPTX );
@@ -1825,16 +1858,25 @@ void SdOOXMLExportTest2::testTdf116350TextEffects()
 double fAdjust = getAdjustmentValue( xShape0 );
 CPPUNIT_ASSERT_EQUAL( 180.0, fAdjust );
 
+bool bScaleX = getScaleXValue( xShape0 );
+CPPUNIT_ASSERT_EQUAL( true, bScaleX );
+
 // Default angle for ArchDown
 uno::Reference xShape14( getShapeFromPage( 14, 0, 
xDocShRef ) );
 fAdjust = getAdjustmentValue( xShape14 );
 CPPUNIT_ASSERT_EQUAL( 0.0, fAdjust );
 
+bScaleX = getScaleXValue( xShape14 );
+CPPUNIT_ASSERT_EQUAL( true, bScaleX );
+
 // Angle directly set
 uno::Reference xShape1( getShapeFromPage( 1, 0, 
xDocShRef ) );
 fAdjust = getAdjustmentValue( xShape1 );
 CPPUNIT_ASSERT_EQUAL( 213.25, fAdjust );
 
+bScaleX = getScaleXValue( xShape1 );
+CPPUNIT_ASSERT_EQUAL( true, bScaleX );
+
 // Export
 utl::TempFile tempFile;
 xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile );
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 9c02499a7a9b..5ce861bc0407 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -80,9 +81,11 @@ struct FWData   // representing the 
whole text
 {
 std::vector< FWTextArea >   vTextAreas;
 double  fHorizontalTextScaling;
+double  fVerticalTextScaling;
 sal_u

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

[Libreoffice Gerrit user]

 sw/inc/tblafmt.hxx |6 
 sw/qa/extras/htmlimport/data/reqif-table.xhtml |   33 +
 sw/qa/extras/htmlimport/htmlimport.cxx |   15 +++
 sw/source/core/doc/tblafmt.cxx |   10 +++
 sw/source/core/docnode/ndtbl.cxx   |5 ---
 sw/source/filter/html/htmltab.cxx  |   31 +++
 sw/source/filter/html/swhtml.cxx   |5 +++
 sw/source/filter/html/swhtml.hxx   |5 +++
 8 files changed, 105 insertions(+), 5 deletions(-)

New commits:
commit 63c91b9cb3f73b66a915875721b0efd65b8aebac
Author: Miklos Vajna 
AuthorDate: Wed Aug 8 14:15:23 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 8 15:52:54 2018 +0200

sw HTML import: apply default table autoformat on cells in reqif mode

The reqif xhtml subset doesn't allow formatting of cells, which means
that the tables created with the UI and imported tables look different,
e.g. the later ones have no borders.

Fix this inconsistency by applying the default table autoformat during
import (in reqif mode). The import result looks better this way, and the
export will ignore it anyway.

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

diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index c12db612b11f..f1bc805fee84 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -333,6 +333,12 @@ public:
 OUString GetTableTemplateCellSubName(const SwBoxAutoFormat& rBoxFormat) 
const;
 /// Returns a vector of indexes in aBoxAutoFormat array. Returned indexes 
points to cells which are mapped to a table-template.
 static const std::vector& GetTableTemplateMap();
+
+/**
+ * Calculates the relevant position in the table autoformat for a given
+ * cell in a given table.
+ */
+static sal_uInt8 CountPos(sal_uInt32 nCol, sal_uInt32 nCols, sal_uInt32 
nRow, sal_uInt32 nRows);
 };
 
 class SW_DLLPUBLIC SwTableAutoFormatTable
diff --git a/sw/qa/extras/htmlimport/data/reqif-table.xhtml 
b/sw/qa/extras/htmlimport/data/reqif-table.xhtml
new file mode 100644
index ..242201de817d
--- /dev/null
+++ b/sw/qa/extras/htmlimport/data/reqif-table.xhtml
@@ -0,0 +1,33 @@
+Before.
+
+   
+
+   
+
+   
+   
+   
+
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+
+   
+   
+   
+
+After.
+
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index fecd3c53b5b6..ad404d7e4f3a 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -321,6 +321,21 @@ DECLARE_HTMLIMPORT_TEST(testReqIfBr, "reqif-br.xhtml")
 CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("aaa\nbbb"));
 }
 
+DECLARE_HTMLIMPORT_TEST(testReqIfTable, "reqif-table.xhtml")
+{
+// Load a table with xhtmlns=reqif-xhtml filter param.
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xTables->getCount());
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+auto aBorder = getProperty(xCell, "TopBorder");
+// This was 0, tables had no borders, even if the default autoformat has
+// borders and the markup allows no custom borders.
+CPPUNIT_ASSERT_EQUAL(static_cast(18), aBorder.LineWidth);
+}
+
 DECLARE_HTMLIMPORT_TEST(testImageSize, "image-size.html")
 {
 awt::Size aSize = getShape(1)->getSize();
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 5d30ed5e1809..4cca119a6729 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1138,6 +1138,16 @@ const std::vector& 
SwTableAutoFormat::GetTableTemplateMap()
 return *pTableTemplateMap;
 }
 
+sal_uInt8 SwTableAutoFormat::CountPos(sal_uInt32 nCol, sal_uInt32 nCols, 
sal_uInt32 nRow,
+  sal_uInt32 nRows)
+{
+sal_uInt8 nRet = static_cast(
+!nRow ? 0 : ((nRow + 1 == nRows) ? 12 : (4 * (1 + ((nRow - 1) & 1);
+nRet = nRet
+   + static_cast(!nCol ? 0 : (nCol + 1 == nCols ? 3 : (1 + 
((nCol - 1) & 1;
+return nRet;
+}
+
 struct SwTableAutoFormatTable::Impl
 {
 std::vector> m_AutoFormats;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 15a04fd1c8d6..7d05eb88177b 100644
--- a/sw/sou

Re: Windows Debug builds failure: 'DbgGUIInitSolarMutexCheck': identifier not found

[Stephan Bergmann]

On 07/08/18 18:14, Stephan Bergmann wrote:
As we speak, I happen to run into your CppunitTest_cppuhelper_qa_misc 
failure with my MSVC build (with latest Visual Studio 2017, see above) 
too, will investigate.  (The test currently only runs (late) during 
`make check`, see  "No need 
for CppunitTest_cppuhelper_qa_misc to be a subsequentcheck".)


Mike is working on a fix at  
"Don't break __CxxDetectRethrow contract"

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit f67b2270770e28ed794e0682d40da566b1e4e51c
Author: Jan Holesovsky 
AuthorDate: Wed Aug 8 13:18:49 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Aug 8 14:46:51 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'distro/collabora/cp-6.0'
  - Some images are not present in this branch.

Change-Id: If7c5a15afe1392b0715983866d4ce7967d618aa1

  - No spreadsheet files in this branch.

Change-Id: I814d93e0a298b140287df1b81cf4343c462f2906

  - Some dialog screenshots are missing in this branch.

Change-Id: Ia1ab427186adcd5fe24d1d93dc53f46d56b21d90

  - Revert the .xhp parts of "Deploy videos in New Help (WIP)"

Partially reverts commit 93ebf037016819613322ef1c39951a3de893ec14.

  - Revert the .xhp parts of "Add vnd.oasis.opendocument.* objects in new 
help"

Partially reverts commit 73bf8469d4a443617935dae6a245d9b327e74a95.

  - Fix  case for icon replacement

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

  - Restore 'GLOBAL' label in Index

GLOBAL is the external nam of the SHARED bookmarks.

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

  - tdf#118844 Add missing icons in Help pages

Apply strategy #1 described in tdf#118844 comment #3

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

  - tdf#115524 Some branch bookmarks are not working 1

With .ui dialogs, the Help system sends specific URL
associated to the higlighted widget in the .ui dislog.

Not every help page associated to the dialog has

for all widgets of the dialog. As consequence, some URLs
were not addressed and the default module entry page
was displayed, instead of the dialog help page.

The solution is to define a dumy bookmark '@@nowidget@@' to the
help page associated to the dialog, and if the widget bookmark
is missing in the help page then use the dummy target,
thus offering a help page with the right contents anyway.

This patch covers help pages for smath.

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

  - Also add that here…

Change-Id: Ia31ace1a2f844dbd707839a44ec131f424513924

  - Helponline: Fix alignment of TOC in sidebar

It was too close to the window border in Edge, Chrome and Firefox 
Nightly.

Change-Id: I29a7b17c6abc240baa1f75cba879942810ebee07

  - tdf#118430 Three column layout with 1440px width

Contents will now stay collapsed until 1440px width, when
it will move to the right side of the screen.
Removed useless and harmful float:left from .index-label.

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

  - Helponline: Improve a few colors some more

Change-Id: I3d9db610057119cdb08b1f31152700ed18d6ea16

  - Add mode="embed" for bascode

Embeded  was not properly rendered because it had
no embed mode

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

  - Helponline: New .howtoget, small tweaks to other boxes, tiny changes to 
colors

Change-Id: I3d7d396482df4143b09776230c571c0c69ab0b5a
Reviewed-on: https://gerrit.libreoffice.org/56040
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

  - Fix  rendering for paragraphs

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

  - Add back fonts for complex scripts

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

  - Helponline: Allow for system typeface to be used

Change-Id: Ic3868b0bcdbb978f450666b4f98e53587b5e7f85
Reviewed-on: https://gerrit.libreoffice.org/55728
   

[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-6.0' - 109 commits - AllLangHelp_shared.mk AllLangPackage_html_lang.mk AllLangPackage_html_media_lang.mk CustomTarget_html.mk GeneratedPacka

[Libreoffice Gerrit user]

 AllLangHelp_shared.mk|1 
 AllLangPackage_html_lang.mk  |   21 
 AllLangPackage_html_media_lang.mk|  228 
 CustomTarget_html.mk |  209 +++
 GeneratedPackage_html_icon-themes.mk |   16 
 GeneratedPackage_html_lang_generated.mk  |   18 
 Module_helpcontent2.mk   |   18 
 Package_html_dynamic.mk  |   18 
 Package_html_media.mk|  315 +
 Package_html_static.mk   |   28 
 help3xsl/convert2html.sh |4 
 help3xsl/default.css |  738 -
 help3xsl/fuse.js |  997 +
 help3xsl/get_bookmark.xsl|   20 
 help3xsl/get_hid2file.sh |3 
 help3xsl/get_media.sh|9 
 help3xsl/get_tree.sh |   35 
 help3xsl/get_tree.xsl|   33 
 help3xsl/get_url.sh  |   32 
 help3xsl/get_url.xsl |   18 
 help3xsl/help-to-html.sh |   99 -
 help3xsl/help.html   |3 
 help3xsl/help.js |  204 ++-
 help3xsl/help2.js|  123 ++
 help3xsl/index.html  |1 
 help3xsl/index2.html |   97 -
 help3xsl/jquery-3.1.1.min.js |4 
 help3xsl/link.txt.xsl| 1724 +++
 help3xsl/localized.xsl   |  165 --
 help3xsl/makehelp.sh |   25 
 help3xsl/makelocal.sh|   24 
 help3xsl/normalize.css   |  161 --
 help3xsl/online_transform.xsl| 1031 +++---
 help3xsl/paginathing.js  |  267 
 help3xsl/xhp2html.sh |   40 
 helpers/find-invalid-help-images.sh  |8 
 helpers/help_hid.lst |2 
 source/index.html|   50 
 source/text/shared/01/06150210.xhp   |2 
 source/text/shared/help/browserhelp.xhp  |  224 
 source/text/shared/optionen/01090100.xhp |   10 
 source/text/smath/01/0501.xhp|1 
 source/text/smath/01/05010100.xhp|7 
 source/text/smath/01/0502.xhp|1 
 source/text/smath/01/0503.xhp|1 
 source/text/smath/01/0504.xhp|7 
 source/text/smath/01/0601.xhp|1 
 source/text/smath/01/06010100.xhp|1 
 48 files changed, 5608 insertions(+), 1436 deletions(-)

New commits:
commit 70ea38c53437f42e7e966e5411b5db75e8a5fa48
Author: Jan Holesovsky 
AuthorDate: Wed Aug 8 13:18:49 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Aug 8 13:19:36 2018 +0200

Some images are not present in this branch.

Change-Id: If7c5a15afe1392b0715983866d4ce7967d618aa1

diff --git a/Package_html_media.mk b/Package_html_media.mk
index 8120902f3..89e4198a4 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -72,7 +72,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/right.png \
 helpimg/right2.png \
 helpimg/rotieren.png \
-helpimg/sc_PivotChartButtons.png \
 helpimg/sc_data_form01.png \
 helpimg/sc_func_imcot.png \
 helpimg/sc_func_imcsc.png \
@@ -280,9 +279,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/starmath/un21214.png \
 helpimg/starmath/un21215.png \
 helpimg/starmath/un21221.png \
-helpimg/sw_paste_range.png \
-helpimg/sw_signatureline01.png \
-helpimg/sw_signatureline02.png \
 helpimg/swh00055.png \
 helpimg/swh00056.png \
 helpimg/swh00117.png \
commit 727b85efe8d26c1fe921c1dffa383314a52a651b
Author: Jan Holesovsky 
AuthorDate: Wed Aug 8 13:12:56 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Aug 8 13:14:42 2018 +0200

No spreadsheet files in this branch.

Change-Id: I814d93e0a298b140287df1b81cf4343c462f2906

diff --git a/AllLangPackage_html_media_lang.mk 
b/AllLangPackage_html_media_lang.mk
index aff362b8d..60b430949 100644
--- a/AllLangPackage_html_media_lang.mk
+++ b/AllLangPackage_html_media_lang.mk
@@ -74,7 +74,6 @@ $(eval $(call 
gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,
 ))
 
 $(eval $(call 
gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,fr,$(LIBO_SHARE_HELP_FOLDER)$(if
 $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
-files/scalc/fr/pivot.ods \
 helpimg/fr/feldalle.png \
 helpimg/fr/feldbrei.png \
 helpimg/fr/feldcolo.png \
@@ -155,7 +154,6 @@ $(eval $(call 
gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,
 ))
 
 $(eval $(call 
gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,pt-BR,$(LIBO_SHARE_HELP_FOLDER)$(if
 $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
-files/scalc/pt-BR/pivot.ods \
 helpimg/pt-BR/feldalle.png \
 helpimg/pt-BR/feldb

LibreOffice ESC call, Wed - 18:00 central European (local) time

[Jan Holesovsky]

Hi,

I believe this week the ESC is really on Wednesday - ie. today!  Sorry
for sending the agenda this late.

Prototype agenda below, bug metrics also at the link below; extra items
appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

Let's use the new TDF jitsi goodness this week at:

http://jitsi.documentfoundation.org/esc

All the best,
Kendy


* Pending Action Items:
+ get download numbers for 32bit Linux (Christian)
+ default bitergia filter for master + libreoffice-* (Christian)

* Release Engineering update (Christian) 
+ 6.0.7 - in October
+ 6.1.0 RC3 update
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
247(247) (topicUI) bugs open, 280(280) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months  
 added  4(3)  10(1) 18(0)   86(0)  
 commented 32(-17)   145(-3)   279(-3)1698(11) 
   removed  0(0)   0(-1) 1(0)9(-1) 
  resolved  4(-4) 16(3) 26(2)  154(-3) 
+ top 10 contributors:
  Tietze, Heiko made 53 changes in 1 month, and 650 changes in 1 year
  Foote, V Stuart made 52 changes in 1 month, and 277 changes in 1 year
  Xisco Faulí made 22 changes in 1 month, and 316 changes in 1 year
  Buovjaga made 21 changes in 1 month, and 192 changes in 1 year
  Kaganski, Mike made 20 changes in 1 month, and 64 changes in 1 year
  Timur made 16 changes in 1 month, and 60 changes in 1 year
  Nabet, Julien made 12 changes in 1 month, and 23 changes in 1 year
  Telesto made 11 changes in 1 month, and 90 changes in 1 year
  Faure, Jean-Baptiste made 10 changes in 1 month, and 50 changes in 1 
year
  Kainz, Andreas made 9 changes in 1 month, and 42 changes in 1 year

* Crash Reporting (Caolan)
+ 9(+6) import failure, 11(+3) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now
  
* Crash Reporting (Xisco)

* GSoC schedule (Heiko)
   + Coding: May 14 - August 6
   + Students Submit Code and Final Evaluations: August 6 - 14
   + Mentors Submit Final Evaluations: August 14 - 21
   + Results Announced: August 22
   + https://wiki.documentfoundation.org/Development/GSoC/2018

* Hackfests & Events
   + Akademy in Vienna Aug 11-17th
  + Thorsten?
   + FrOScon in Bonn: Aug 25
  + Bubli, Thorsten, perhaps Cloph.
   + Conference – September
   + potentially one in Bern / Switzerland - October 19th.
   + working on a Munich event October 26-28th (Thorsten)
  + an Open Gov’t meeting from the City of Munich
  + good to have a hack-fest back-to-back there.
  + moving slowly here …

* mentoring/easyhack update
  committer...   1 week   1 month  3 months 12 months   
  open  109(1)   190(41)   190(40)  201(41) 
   reviews 1279(-374)   5185(-580)   10986(401)   24632(506)
merged  231(-197)   1237(-83) 3759(-28)   14253(12) 
 abandoned8(-2)   43(-9)   259(-2)  966(-4) 
   own commits  206(-162)   1073(-38) 3529(-76)   15485(181)
review commits   95(31)  322(12)   957(16) 3736(84) 
contributor...   1 week1 month3 months 12 months
  open 27(9)  58(-18) 62(-15)   65(-16) 
   reviews 51(-30)   255(-48)   3118(-577)   27801(-382)
merged 45(26)156(-17)396(15)  1750(28)  
 abandoned  3(0)  23(-10) 83(-5)   344(1)   
   own commits 71(49)184(17) 447(42)  1492(68)  
review commits  0(0)   0(0)0(0)  0(0)   
+ easyHack statistics:
   needsDevEval 53(53)   needsUXEval 2(2)   cleanup_comments 217(217)   
   total 266(266)   assigned 26(26)   open 184(184)   
+ top 5 contributors:
  Gelmini, Andrea made 58 patches in 1 month, and 465 patches in 1 year
  Sophia Schröder made 52 patches in 1 month, and 137 patches in 1 year
  Tümer, Mert made 9 patches in 1 month, and 11 patches in 1 year
  Vikas Mahato made 8 patches in 1 month, and 14 patches in 1 year
  Rizal Muttaqin made 7 patches in 1 month, and 16 patches in 1 year
+ top 5 reviewers:
  Pootle bot made 2955 review comments in 1 month, and 5453 in 1 year
  Rathke, Eike made 179 review comments in 1 month, and 1121 in 1 year
  Pootle bot made 177 review comments in 1 month, and 1936 in 1 year
  Adolfo Jayme Barrientos made 164 review comments in 1 month, and 908 
in 1 year
  Holešovský, Jan made 163 review comments in 1 month, and 1231 in 1 
year
+ big CONGRATULATIONS to contributors who have at least 1

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

[Libreoffice Gerrit user]

 cui/source/tabpages/transfrm.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 98e2b6de4741c672e4249119c7619aa9cbffef85
Author: Caolán McNamara 
AuthorDate: Wed Aug 8 09:28:27 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 8 14:30:19 2018 +0200

Resolves: tdf#118281 control positions always in cm

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

diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 134ac9b3e988..bfc5017e3705 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -437,6 +437,11 @@ void SvxSlantTabPage::Construct()
 DBG_ASSERT(pView, "no valid view (!)");
 eDlgUnit = GetModuleFieldUnit(GetItemSet());
 SetFieldUnit(*m_xMtrRadius, eDlgUnit, true);
+for (int i = 0; i < 2; ++i)
+{
+SetFieldUnit(*m_aControlX[i], eDlgUnit, true);
+SetFieldUnit(*m_aControlY[i], eDlgUnit, true);
+}
 
 { // #i75273#
 ::tools::Rectangle aTempRect(pView->GetAllMarkedRect());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - 11 commits - download.lst embeddedobj/source external/nss include/vcl oox/source sal/textenc sc/source sw/source vcl/source

[Libreoffice Gerrit user]

 download.lst  |4 
 embeddedobj/source/msole/oleembed.cxx |2 
 external/nss/ExternalProject_nss.mk   |   71 ---
 external/nss/Module_nss.mk|2 
 external/nss/UnpackedTarball_nss.mk   |   12 --
 external/nss/asan.patch.1 |8 -
 external/nss/clang-cl.patch.0 |   37 
 external/nss/nss.patch|  116 +++---
 external/nss/nss.vs2015.patch |   10 ++
 include/vcl/filter/pdfdocument.hxx|   12 ++
 oox/source/drawingml/chart/chartconverter.cxx |   40 +++-
 sal/textenc/tcvtkr6.tab   |2 
 sc/source/filter/rtf/eeimpars.cxx |2 
 sw/source/core/unocore/unoportenum.cxx|   28 +++---
 sw/source/filter/ww8/ww8par.cxx   |1 
 sw/source/filter/ww8/ww8par.hxx   |2 
 sw/source/filter/ww8/ww8par5.cxx  |9 --
 vcl/source/filter/ipdf/pdfdocument.cxx|   28 +-
 vcl/source/gdi/CommonSalLayout.cxx|9 +-
 19 files changed, 212 insertions(+), 183 deletions(-)

New commits:
commit f4e5941700de1f71f5bf04a03407e24fc25ec5d6
Author: Andras Timar 
AuthorDate: Wed Aug 8 13:00:11 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 8 14:06:36 2018 +0200

nss: upgrade to release 3.38

Fixes CVE-2018-0495 and "the ASN.1 code".

Change-Id: I96ec90aaee7e4a803ebde1508951c55db4577e9e
(cherry picked from commit b01ee1682286a52cda1ee14597257e1f862d4e16)

diff --git a/download.lst b/download.lst
index 088b4f0f8280..d857917a5e2b 100644
--- a/download.lst
+++ b/download.lst
@@ -131,8 +131,8 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-export NSS_MD5SUM := e55ee06b22687df68fafc6a30c0554b2
-export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz
+export NSS_MD5SUM := cd649be8ee61fe15d64d7bef361b37ba
+export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
 export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b7bdf4b26ac9..8ce10b0a4ee9 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -9,25 +9,14 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,nss))
 
+# nss build calls configure for nspr itself - if for some reason the configure 
step should be split out,
+# make sure to create config.status (aka run configure) in dir specified with 
OBJDIR_NAME (nspr/out)
 $(eval $(call gb_ExternalProject_register_targets,nss,\
-   configure \
build \
 ))
 
-$(call gb_ExternalProject_get_state_target,nss,configure):
-   $(call gb_ExternalProject_run,configure,\
-   $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 
LIB="$(ILIB)") \
-   $(if $(CROSS_COMPILING),\
-   NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
-   nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
-   $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
-   $(if $(filter 
MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
-   ,,nss_configure.log)
-
 ifeq ($(OS),WNT)
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
@@ -38,28 +27,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,nss)
 
-
-else
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
-   $(call gb_ExternalProject_run,build,\
-   $(MAKE) -j1 nss_build_all \
-   NS_USE_GCC=1 \
-   CC="$(CC) $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
-   CXX="$(CXX) $(if 

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

[Libreoffice Gerrit user]

 sw/qa/uitest/writer_tests/tdf79569.py |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit 88d82b7da7f3b362c62494875ad359158be964d8
Author: Stephan Bergmann 
AuthorDate: Wed Aug 8 11:34:21 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 8 13:54:51 2018 +0200

Temporarily sprinkle test code with debug print statements

...to hopefully find out why  still fails in
UITest_writer_tests after c57191e0c45f9735a33953d6b95d54b0e10c876f "Try to 
make
test_tdf81457_table_merge_undo deterministic".

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

diff --git a/sw/qa/uitest/writer_tests/tdf79569.py 
b/sw/qa/uitest/writer_tests/tdf79569.py
index 631933977ce1..c4acbd50b9c4 100644
--- a/sw/qa/uitest/writer_tests/tdf79569.py
+++ b/sw/qa/uitest/writer_tests/tdf79569.py
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+from sys import stderr
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.debug import sleep
@@ -22,26 +23,47 @@ class tdf79569(UITestCase):
 document = self.ui_test.get_component()
 toolkit_ex = self.xContext.ServiceManager.createInstanceWithContext(
 "com.sun.star.awt.Toolkit", self.xContext) # supports 
css.awt.XToolkitExperimental
+print("DEBUG.1", file=stderr);
 self.xUITest.executeCommand(".uno:GoDown")
+print("DEBUG.2", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.3", file=stderr);
 self.xUITest.executeCommand(".uno:GoDown")
+print("DEBUG.4", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.5", file=stderr);
 xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"CTRL+END"}))
+print("DEBUG.6", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.7", file=stderr);
 self.xUITest.executeCommand(".uno:GoRight")
+print("DEBUG.8", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.9", file=stderr);
 xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"CTRL+END"}))
+print("DEBUG.10", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.11", file=stderr);
 xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"SHIFT+RIGHT"}))
+print("DEBUG.12", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.13", file=stderr);
 self.xUITest.executeCommand(".uno:MergeCells")
+print("DEBUG.14", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.15", file=stderr);
 self.xUITest.executeCommand(".uno:Undo")
+print("DEBUG.16", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.17", file=stderr);
 self.xUITest.executeCommand(".uno:Redo")
+print("DEBUG.18", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.19", file=stderr);
 self.xUITest.executeCommand(".uno:Undo")
+print("DEBUG.20", file=stderr);
 toolkit_ex.processEventsToIdle()
+print("DEBUG.21", file=stderr);
 
 self.assertEqual(document.TextTables.getCount(), 1)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 configure.ac   
 |2 
 download.lst   
 |4 
 
external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 
|   56 --
 external/libwps/Library_wps.mk 
 |6 +
 external/libwps/UnpackedTarball_libwps.mk  
 |4 
 solenv/flatpak-manifest.in 
 |6 -
 6 files changed, 12 insertions(+), 66 deletions(-)

New commits:
commit ca8d5f5478b02fd9ef6f2c80479c381af841e269
Author: David Tardon 
AuthorDate: Tue Aug 7 20:59:52 2018 +0200
Commit: David Tardon 
CommitDate: Wed Aug 8 13:11:29 2018 +0200

upload libwps 0.4.10

Change-Id: Ib29c429a34a3895fa0747a54194dcd60ad41e45d
Reviewed-on: https://gerrit.libreoffice.org/58704
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index abbd9b8975b0..fbb74238379b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7884,7 +7884,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.9])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.10])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 04a70ea84e0c..ca63722e90d4 100644
--- a/download.lst
+++ b/download.lst
@@ -244,8 +244,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
 export WPG_VERSION_MICRO := 2
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 
13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922
-export WPS_VERSION_MICRO := 9
+export WPS_SHA256SUM := 
1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca
+export WPS_VERSION_MICRO := 10
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git 
a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
 
b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
deleted file mode 100644
index 46983dd9eed2..
--- 
a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9181ad021cf1c200bc80edb9f5a6df5b780be046 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Thu, 26 Apr 2018 14:24:55 +0200
-Subject: [PATCH] avoid name clash with MultiplanParser from libmwaw
-

- src/lib/Multiplan.cpp | 5 -
- src/lib/Multiplan.h   | 5 +
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
-index 278f699..26ceca3 100644
 a/src/lib/Multiplan.cpp
-+++ b/src/lib/Multiplan.cpp
-@@ -44,7 +44,8 @@
- 
- #include "Multiplan.h"
- 
--using namespace libwps;
-+namespace libwps
-+{
- 
- //! Internal: namespace to define internal class of MultiplanParser
- namespace MultiplanParserInternal
-@@ -2912,4 +2913,6 @@ RVNGInputStreamPtr 
MultiplanParser::decodeStream(RVNGInputStreamPtr input)
-   return res;
- }
- 
-+}
-+
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
-diff --git a/src/lib/Multiplan.h b/src/lib/Multiplan.h
-index 87e0565..83c83f2 100644
 a/src/lib/Multiplan.h
-+++ b/src/lib/Multiplan.h
-@@ -34,6 +34,9 @@
- 
- #include "WKSParser.h"
- 
-+namespace libwps
-+{
-+
- namespace MultiplanParserInternal
- {
- struct State;
-@@ -127,5 +130,7 @@ protected:
-   std::shared_ptr m_state;
- };
- 
-+}
-+
- #endif /* WPS4_H */
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- 
-2.14.3
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 60709ab77603..9c4f5330fd69 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -40,9 +40,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/MSWrite \
UnpackedTarball/libwps/src/lib/Multiplan \
UnpackedTarball/libwps/src/lib/Quattro \
+   UnpackedTarball/libwps/src/lib/Quattro9 \
+   UnpackedTarball/libwps/src/lib/Quattro9Graph \
+   UnpackedTarball/libwps/src/lib/Quattro9Spreadsheet \
UnpackedTarball/libwps/src/lib/QuattroDos \
UnpackedTarball/libwps/src/lib/QuattroDosChart \
UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \
+   UnpackedTarball/libwps/src/lib/QuattroFormula \
UnpackedTarball/libwps/src/lib/QuattroGraph \
UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
UnpackedTarball/libwps/src

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - 12 commits - download.lst embeddedobj/source external/nss include/vcl oox/source sal/textenc sc/source sw/source vcl/source v

[Libreoffice Gerrit user]

 download.lst  |4 
 embeddedobj/source/msole/oleembed.cxx |2 
 external/nss/ExternalProject_nss.mk   |   71 ---
 external/nss/Module_nss.mk|2 
 external/nss/UnpackedTarball_nss.mk   |   12 --
 external/nss/asan.patch.1 |8 -
 external/nss/clang-cl.patch.0 |   37 
 external/nss/nss.patch|  116 +++---
 external/nss/nss.vs2015.patch |   10 ++
 include/vcl/filter/pdfdocument.hxx|   12 ++
 include/vcl/ppdparser.hxx |2 
 oox/source/drawingml/chart/chartconverter.cxx |   40 +++-
 sal/textenc/tcvtkr6.tab   |2 
 sc/source/filter/rtf/eeimpars.cxx |2 
 sw/source/core/unocore/unoportenum.cxx|   28 +++---
 sw/source/filter/ww8/ww8par.cxx   |1 
 sw/source/filter/ww8/ww8par.hxx   |2 
 sw/source/filter/ww8/ww8par5.cxx  |9 --
 vcl/source/filter/ipdf/pdfdocument.cxx|   28 +-
 vcl/source/gdi/CommonSalLayout.cxx|9 +-
 vcl/unx/generic/printer/jobdata.cxx   |3 
 vcl/unx/generic/printer/ppdparser.cxx |   12 +-
 22 files changed, 221 insertions(+), 191 deletions(-)

New commits:
commit 906a406fb3df739fa3592879a75a49d3d417c41e
Author: Andras Timar 
AuthorDate: Wed Aug 8 13:00:11 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 8 13:07:43 2018 +0200

nss: upgrade to release 3.38

Fixes CVE-2018-0495 and "the ASN.1 code".

Change-Id: I96ec90aaee7e4a803ebde1508951c55db4577e9e
(cherry picked from commit b01ee1682286a52cda1ee14597257e1f862d4e16)

diff --git a/download.lst b/download.lst
index 633841df48a2..dd646e72cf54 100644
--- a/download.lst
+++ b/download.lst
@@ -115,8 +115,8 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-export NSS_MD5SUM := e55ee06b22687df68fafc6a30c0554b2
-export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz
+export NSS_MD5SUM := cd649be8ee61fe15d64d7bef361b37ba
+export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
 export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b7bdf4b26ac9..8ce10b0a4ee9 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -9,25 +9,14 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,nss))
 
+# nss build calls configure for nspr itself - if for some reason the configure 
step should be split out,
+# make sure to create config.status (aka run configure) in dir specified with 
OBJDIR_NAME (nspr/out)
 $(eval $(call gb_ExternalProject_register_targets,nss,\
-   configure \
build \
 ))
 
-$(call gb_ExternalProject_get_state_target,nss,configure):
-   $(call gb_ExternalProject_run,configure,\
-   $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 
LIB="$(ILIB)") \
-   $(if $(CROSS_COMPILING),\
-   NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
-   nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
-   $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
-   $(if $(filter 
MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
-   ,,nss_configure.log)
-
 ifeq ($(OS),WNT)
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
@@ -38,28 +27,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,nss)
 
-
-else
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
-   $(call gb_ExternalProject_run,build,\
-   $(MAKE) -j1 nss_build_

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

[Libreoffice Gerrit user]

 external/nss/nss-android.patch.1 |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6ab702312d424deb9cdc8ec6b594c79ef9607c1e
Author: Michael Stahl 
AuthorDate: Wed Aug 8 10:33:59 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Aug 8 13:02:51 2018 +0200

nss: remove inline patch message from nss-android.patch.1

forgot to remove this in the 3.38 upgrade

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

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index d37c70f16ace..50c549303604 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -47,4 +47,3 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
 --with-android-version=$(OS_TARGET_RELEASE) \
 --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
 --with-android-platform=$(ANDROID_SYSROOT)
-unified headers / ndk16 does have it in it's support module
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 12 commits - download.lst embeddedobj/source external/nss include/vcl oox/source sal/textenc sc/source sw/source vcl/source vcl/unx

[Libreoffice Gerrit user]

 download.lst  |4 
 embeddedobj/source/msole/oleembed.cxx |2 
 external/nss/ExternalProject_nss.mk   |   71 ---
 external/nss/Module_nss.mk|2 
 external/nss/UnpackedTarball_nss.mk   |   12 --
 external/nss/asan.patch.1 |8 -
 external/nss/clang-cl.patch.0 |   37 
 external/nss/nss.patch|  116 +++---
 external/nss/nss.vs2015.patch |   10 ++
 include/vcl/filter/pdfdocument.hxx|   12 ++
 include/vcl/ppdparser.hxx |2 
 oox/source/drawingml/chart/chartconverter.cxx |   40 +++-
 sal/textenc/tcvtkr6.tab   |2 
 sc/source/filter/rtf/eeimpars.cxx |2 
 sw/source/core/unocore/unoportenum.cxx|   28 +++---
 sw/source/filter/ww8/ww8par.cxx   |1 
 sw/source/filter/ww8/ww8par.hxx   |2 
 sw/source/filter/ww8/ww8par5.cxx  |9 --
 vcl/source/filter/ipdf/pdfdocument.cxx|   28 +-
 vcl/source/gdi/CommonSalLayout.cxx|9 +-
 vcl/unx/generic/printer/jobdata.cxx   |3 
 vcl/unx/generic/printer/ppdparser.cxx |   12 +-
 22 files changed, 221 insertions(+), 191 deletions(-)

New commits:
commit b01ee1682286a52cda1ee14597257e1f862d4e16
Author: Andras Timar 
AuthorDate: Wed Aug 8 13:00:11 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 8 13:00:11 2018 +0200

nss: upgrade to release 3.38

Fixes CVE-2018-0495 and "the ASN.1 code".

Change-Id: I96ec90aaee7e4a803ebde1508951c55db4577e9e

diff --git a/download.lst b/download.lst
index 4fbd2eec9fe7..ec1e63812185 100644
--- a/download.lst
+++ b/download.lst
@@ -132,8 +132,8 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-export NSS_MD5SUM := e55ee06b22687df68fafc6a30c0554b2
-export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz
+export NSS_MD5SUM := cd649be8ee61fe15d64d7bef361b37ba
+export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
 export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b7bdf4b26ac9..8ce10b0a4ee9 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -9,25 +9,14 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,nss))
 
+# nss build calls configure for nspr itself - if for some reason the configure 
step should be split out,
+# make sure to create config.status (aka run configure) in dir specified with 
OBJDIR_NAME (nspr/out)
 $(eval $(call gb_ExternalProject_register_targets,nss,\
-   configure \
build \
 ))
 
-$(call gb_ExternalProject_get_state_target,nss,configure):
-   $(call gb_ExternalProject_run,configure,\
-   $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 
LIB="$(ILIB)") \
-   $(if $(CROSS_COMPILING),\
-   NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
-   nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
-   $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
-   $(if $(filter 
MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
-   ,,nss_configure.log)
-
 ifeq ($(OS),WNT)
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
@@ -38,28 +27,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,nss)
 
-
-else
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
-   $(call gb_ExternalProject_run,build,\
-   $(MAKE) -j1 nss_build_all \
-   NS_USE_GCC=1 \
-   CC="

[Libreoffice-commits] core.git: config_host/config_dbus.h.in config_host.mk.in configure.ac RepositoryExternal.mk sd/Library_sd.mk sd/source

[Libreoffice Gerrit user]

 RepositoryExternal.mk  |2 +-
 config_host.mk.in  |3 +++
 config_host/config_dbus.h.in   |1 +
 configure.ac   |   20 ++--
 sd/Library_sd.mk   |   11 ++-
 sd/source/ui/remotecontrol/BluetoothServer.hxx |2 +-
 6 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit 02addb3618f026acd72ece76fc726b9473cc5940
Author: Arkadiy Illarionov 
AuthorDate: Sun Jul 8 16:33:32 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Aug 8 12:45:12 2018 +0200

tdf#112343 Change dependency from dbus-glib to dbus

Add check for GLib support for modules which depends on
dbus and glib separately.
Also fix copy-paste typo.

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d70b1f051968..54a71fb38ef4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2676,7 +2676,7 @@ define gb_LinkTarget__use_cups
 
 endef
 
-endif # ENABLE_DBUS
+endif # ENABLE_CUPS
 
 ifeq ($(ENABLE_DBUS),TRUE)
 
diff --git a/config_host.mk.in b/config_host.mk.in
index 00aed9521bf5..b5eef155d524 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -92,6 +92,9 @@ export CXXFLAGS_CXX11=@CXXFLAGS_CXX11@
 export DATADIR=@DATADIR@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
+export DBUS_GLIB_CFLAGS=$(gb_SPACE)@DBUS_GLIB_CFLAGS@
+export DBUS_GLIB_LIBS=$(gb_SPACE)@DBUS_GLIB_LIBS@
+export DBUS_HAVE_GLIB=@DBUS_HAVE_GLIB@
 export DCONF_CFLAGS=@DCONF_CFLAGS@
 export DCONF_LIBS=@DCONF_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
diff --git a/config_host/config_dbus.h.in b/config_host/config_dbus.h.in
index 44cbf8a63919..4ac5c32faf56 100644
--- a/config_host/config_dbus.h.in
+++ b/config_host/config_dbus.h.in
@@ -11,6 +11,7 @@
 #define INCLUDED_CONFIG_DBUS_H
 
 #define ENABLE_DBUS 0
+#define DBUS_HAVE_GLIB 0
 
 #endif
 
diff --git a/configure.ac b/configure.ac
index 9a0c2c3083e3..abbd9b8975b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10041,6 +10041,9 @@ dnl 
===
 ENABLE_DBUS=""
 DBUS_CFLAGS=""
 DBUS_LIBS=""
+DBUS_GLIB_CFLAGS=""
+DBUS_GLIB_LIBS=""
+DBUS_HAVE_GLIB=""
 
 if test "$enable_dbus" = "no"; then
 test_dbus=no
@@ -10050,11 +10053,21 @@ AC_MSG_CHECKING([whether to enable DBUS support])
 if test "$test_dbus" = "yes"; then
 ENABLE_DBUS="TRUE"
 AC_MSG_RESULT([yes])
-PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.70)
+PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.60)
 AC_DEFINE(ENABLE_DBUS)
 DBUS_CFLAGS=$(printf '%s' "$DBUS_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 FilterLibs "${DBUS_LIBS}"
 DBUS_LIBS="${filteredlibs}"
+
+# Glib is needed for BluetoothServer
+# Sets also DBUS_GLIB_CFLAGS/DBUS_GLIB_LIBS if successful.
+PKG_CHECK_MODULES(DBUS_GLIB,[glib-2.0 >= 2.4],
+[
+DBUS_HAVE_GLIB="TRUE"
+AC_DEFINE(DBUS_HAVE_GLIB,1)
+],
+AC_MSG_WARN([[No Glib found, Bluetooth support will be disabled]])
+)
 else
 AC_MSG_RESULT([no])
 fi
@@ -10062,6 +10075,9 @@ fi
 AC_SUBST(ENABLE_DBUS)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
+AC_SUBST(DBUS_GLIB_CFLAGS)
+AC_SUBST(DBUS_GLIB_LIBS)
+AC_SUBST(DBUS_HAVE_GLIB)
 
 AC_MSG_CHECKING([whether to enable Impress remote control])
 if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
@@ -10086,7 +10102,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 
 if test "$enable_sdremote_bluetooth" != "no"; then
 if test "$OS" = "LINUX"; then
-if test "$ENABLE_DBUS" = "TRUE"; then
+if test "$ENABLE_DBUS" = "TRUE" -a "$DBUS_HAVE_GLIB" = "TRUE"; then
 AC_MSG_RESULT([yes])
 ENABLE_SDREMOTE_BLUETOOTH=TRUE
 dnl 
===
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 563f0d833ee8..67109b97c960 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -108,6 +108,15 @@ $(eval $(call gb_Library_use_externals,sd,\
icu_headers \
 ))
 
+ifneq ($(DBUS_HAVE_GLIB),)
+$(eval $(call gb_Library_add_defs,sd,\
+   $(DBUS_GLIB_CFLAGS) \
+))
+$(eval $(call gb_Library_add_libs,sd,\
+   $(DBUS_GLIB_LIBS) \
+))
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,sd,\
uuid \
@@ -172,7 +181,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/accessibility/AccessibleSlideSorterView \
sd/source/ui/accessibility/AccessibleViewForwarder \
sd/source/ui/accessibility/SdShapeTypes \
-sd/source/ui/animations/CategoryListBox \
+   sd/source/ui/animations/CategoryListBox \
sd/source/ui/ani

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/wrtw8sty.cxx   |3 ++-
 writerfilter/source/dmapper/StyleSheetTable.cxx |3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2c00f5c896bee61033b93ddb9f32d959b0b01e94
Author: Justin Luth 
AuthorDate: Fri Jul 27 13:29:39 2018 +0300
Commit: Miklos Vajna 
CommitDate: Wed Aug 8 12:33:46 2018 +0200

tdf#103961: delay merge of default props until export

Until now, during docx import the pPrDefault properties have been
directly added to the parentless styles. However, things like
table styles are supposed to over-ride these document defaults, but
not style defaults. Since the docDefaults are merged into the style,
table-styles were unable detect if they could override them.

Exporting doesn't export pPrDefaults well, so the
properties still need to be merged into the style when
round-tripping.

Almost every existing unit test document is a proof test.
It effectively ought to act as a non-functional change.
Plus, this basically reverts 7f697ec27b1175ed94228155935d9ccd3cd5606c
so that unit test still covers bug 103961.

Change-Id: I4948299ddd610c07d828f2bd57c58734f1b94c49
Reviewed-on: https://gerrit.libreoffice.org/58203
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index e0a8e7ba9dce..ef4b2c21d6f9 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -460,7 +460,8 @@ void MSWordStyles::SetStyleDefaults( const SwFormat& 
rFormat, bool bPap )
 // dynamic defaults
 const SfxItemPool& rPool = *rFormat.GetAttrSet().GetPool();
 for( n = nStt; n < nEnd; ++n )
-aFlags[ n - RES_CHRATR_BEGIN ] = nullptr != rPool.GetPoolDefaultItem( 
n );
+aFlags[ n - RES_CHRATR_BEGIN ] = nullptr != rPool.GetPoolDefaultItem( 
n )
+|| SfxItemState::SET == 
m_rExport.m_pDoc->GetDfltTextFormatColl()->GetItemState( n, false );
 
 // static defaults, that differs between WinWord and SO
 if( bPap )
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 2e1a2732063f..63659ffbc8ff 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1021,9 +1021,6 @@ void StyleSheetTable::ApplyStyleSheets( const 
FontTablePtr& rFontTable )
 }
 else if( bParaStyle )
 {
-// Paragraph styles that don't inherit from some 
parent need to apply the DocDefaults
-pEntry->pProperties->InsertProps( 
m_pImpl->m_pDefaultParaProps, /*bAllowOverwrite=*/false );
-
 //now it's time to set the default parameters - for 
paragraph styles
 //Fonts: Western first entry in font table
 //CJK: second entry
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/vcl/menu.hxx   |2 +-
 sc/source/ui/navipi/content.cxx|2 +-
 vcl/source/window/menu.cxx |6 ++
 vcl/source/window/menuitemlist.cxx |   11 +++
 vcl/source/window/menuitemlist.hxx |1 +
 5 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 4eb27c796350d041675cfc963ed88bc08cd34b82
Author: SalimHabchi 
AuthorDate: Wed Jul 11 11:53:03 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 8 12:19:56 2018 +0200

tdf#118453 Reactivate navitagor submenu drag mode and display

I add a function to get the data from the submenu

Change-Id: If8aedc72abfc7ca967377f0e588167f9f62fe137
Reviewed-on: https://gerrit.libreoffice.org/57269
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 7cc85bfd54645d3786828816972a2f039cb134e9)
Reviewed-on: https://gerrit.libreoffice.org/58685
Tested-by: Xisco Faulí 
Reviewed-by: Thorsten Behrens 

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 6c73d802802f..f7875f936014 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -263,7 +263,7 @@ public:
 MenuItemType GetItemType( sal_uInt16 nPos ) const;
 sal_uInt16 GetCurItemId() const { return nSelectedId;}
 OString GetCurItemIdent() const;
-
+OString GetItemIdentFromSubMenu(sal_uInt16 nItemId) const;
 void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits );
 MenuItemBits GetItemBits( sal_uInt16 nItemId ) const;
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 4cd69244142f..6f71bd92434e 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -668,7 +668,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
 aPop->SetPopupMenu( 2, aDocMenu.get() );
 
 sal_uInt16 nSelected = aPop->Execute(this, 
rCEvt.GetMousePosPixel());
-OString sIdent = aPop->GetItemIdent(nSelected);
+OString sIdent = aPop->GetItemIdentFromSubMenu(nSelected);
 
 if (sIdent.startsWith("document"))
 {
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a0cdd3b7f3de..62739890e3aa 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -702,6 +702,12 @@ OString Menu::GetItemIdent(sal_uInt16 nId) const
 return pData ? pData->sIdent : OString();
 }
 
+OString Menu::GetItemIdentFromSubMenu(sal_uInt16 nId) const
+{
+const MenuItemData* pData = pItemList->GetDataFromSubMenu(nId);
+return pData ? pData->sIdent : OString();
+}
+
 void Menu::SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits )
 {
 MenuItemData* pData = pItemList->GetData( nItemId );
diff --git a/vcl/source/window/menuitemlist.cxx 
b/vcl/source/window/menuitemlist.cxx
index f9306c864249..bfe8a381df1b 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -141,6 +141,17 @@ MenuItemData* MenuItemList::GetData( sal_uInt16 nSVId, 
size_t& rPos ) const
 return nullptr;
 }
 
+MenuItemData* MenuItemList::GetDataFromSubMenu(sal_uInt16 nSVId) const
+{
+for ( size_t i = 0, n = maItemList.size(); i < n; ++i )
+{
+if ( maItemList[i]->pSubMenu
+&& maItemList[i]->pSubMenu->GetCurItemId() != 0 ) // if something 
is selected
+return 
maItemList[i].get()->pSubMenu->GetItemList()->GetDataFromPos(nSVId - 1);
+}
+return nullptr;
+}
+
 MenuItemData* MenuItemList::SearchItem(
 sal_Unicode cSelectChar,
 KeyCode aKeyCode,
diff --git a/vcl/source/window/menuitemlist.hxx 
b/vcl/source/window/menuitemlist.hxx
index 300908eee447..73c36980172c 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -118,6 +118,7 @@ public:
 voidClear();
 
 MenuItemData*   GetData( sal_uInt16 nSVId, size_t& rPos ) const;
+MenuItemData*   GetDataFromSubMenu( sal_uInt16 nSVId ) const;
 MenuItemData*   GetData( sal_uInt16 nSVId ) const
 {
 size_t nTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/layout/frmtool.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 8d14c10639a4ff161e31156348c9928498df71ef
Author: Michael Stahl 
AuthorDate: Mon Aug 6 19:03:22 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 8 12:18:02 2018 +0200

sw: fix ignored frames in AppendAllObjs()

The problem is that AppendAllObjs() doesn't check if MakeFrames()
actually created frames, it just assumes success.

If there are frames anchored in frames, then it could go through
the circular_buffer, find a dependent frame before its anchor frame,
unsuccessfully call MakeFrames(), then call MakeFrames() on the anchor
frame, and then the vector is empty.

A surprising aspect is that push_back on a boost::circular_buffer will
silently pop the first element if it's already "full".  Possibly this
is what caused tdf#112447.

1. insert section
2. in paragraph in section, insert frame
3. repeat 2
4. drag anchor of frame 1 into body of frame 2
5. edit section, click hide
6. edit section, un-click hide
7. only one frame is displayed

(regression from 575e222a1742918be052f2b716ddf57ce0008404 and/or
 ce2fce9a41729774689080c8b5552b60c2e6ee2d)

Change-Id: Ie782252ac388524dfb083f655320a50e95239b24
Reviewed-on: https://gerrit.libreoffice.org/58676
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 31e66bd07c1082bb375be8aaf7835f019351d9bb)
Reviewed-on: https://gerrit.libreoffice.org/58680
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 936c4e02dc40..3f9267d73422 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1098,18 +1098,24 @@ void AppendAllObjs(const SwFrameFormats* pTable, const 
SwFrame* pSib)
 if(!isConnected)
 {
 pFormat->MakeFrames();
-pFirstRequeued = nullptr;
+
pFormat->CallSwClientNotify(sw::GetObjectConnectedHint(isConnected, pRoot));
 }
-else
+// do this *before* push_back! the circular_buffer can be "full"!
+vFormatsToConnect.pop_front();
+if (!isConnected)
 {
 if(pFirstRequeued == pFormat)
 // If nothing happens anymore we can stop.
 break;
 if(!pFirstRequeued)
 pFirstRequeued = pFormat;
+assert(!vFormatsToConnect.full());
 vFormatsToConnect.push_back(pFormat);
 }
-vFormatsToConnect.pop_front();
+else
+{
+pFirstRequeued = nullptr;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/tabpages/tpline.cxx |4 ++--
 include/svx/svdmodel.hxx   |   11 ---
 svx/source/dialog/dlgctrl.cxx  |4 ++--
 svx/source/dialog/graphctl.cxx |2 +-
 svx/source/dialog/measctrl.cxx |2 +-
 svx/source/svdraw/svdmodel.cxx |   14 --
 6 files changed, 22 insertions(+), 15 deletions(-)

New commits:
commit 674416a2f16dfa050a23f2b1f0b749214ea1f2a6
Author: Caolán McNamara 
AuthorDate: Tue Aug 7 16:21:23 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 8 11:26:11 2018 +0200

tdf#118731 delay on showing dialogs that create SdrModels

for their preview widgets. since...

commit 4be44a7a6f2f480e55255d7cdd119f3d6577d085
Date:   Thu May 24 19:09:44 2018 +0200

SOSAW080: Cleanup of SdrModel

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

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 5a633ac06dd1..f8c8a8b8fa8e 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -335,7 +335,7 @@ void SvxLineTabPage::InitSymbols(MenuButton const * pButton)
 ScopedVclPtrInstance< VirtualDevice > pVDev;
 pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
 std::unique_ptr pModel(
-new SdrModel());
+new SdrModel(nullptr, nullptr, true));
 pModel->GetItemPool().FreezeIdRanges();
 // Page
 SdrPage* pPage = new SdrPage( *pModel, false );
@@ -1112,7 +1112,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
 pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
 
 std::unique_ptr pModel(
-new SdrModel());
+new SdrModel(nullptr, nullptr, true));
 pModel->GetItemPool().FreezeIdRanges();
 SdrPage* pPage = new SdrPage( *pModel, false );
 pPage->SetSize(Size(1000,1000));
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 127bf4ed985f..62bb9dd51533 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -270,11 +270,12 @@ private:
 SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool 
bInit = false );
 SVX_DLLPRIVATE void ImpReformatAllTextObjects();
 SVX_DLLPRIVATE void ImpReformatAllEdgeObjects();
-SVX_DLLPRIVATE void ImpCreateTables();
+SVX_DLLPRIVATE void ImpCreateTables(bool bDisablePropertyFiles);
 
 SVX_DLLPRIVATE void ImpCtor(
 SfxItemPool* pPool,
-::comphelper::IEmbeddedHelper* pPers);
+::comphelper::IEmbeddedHelper* pPers,
+bool bDisablePropertyFiles);
 
 // this is a weak reference to a possible living api wrapper for this model
 css::uno::Reference< css::uno::XInterface > mxUnoModel;
@@ -293,9 +294,13 @@ public:
 // if you want to use symbol objects inherited from SdrAttrObj.
 // If, however, you use objects inheriting from SdrObject you are free
 // to chose a pool of your liking.
+//
+// tdf#118731 a bDisablePropertyFiles of true will disable ability to load
+// XPropertyFiles describing defaults. Useful for UI preview widgets
 explicit SdrModel(
 SfxItemPool* pPool = nullptr,
-::comphelper::IEmbeddedHelper* pPers = nullptr);
+::comphelper::IEmbeddedHelper* pPers = nullptr,
+bool bDisablePropertyFiles = false);
 virtual ~SdrModel() override;
 void ClearModel(bool bCalledFromDestructor);
 
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index e482f1f0a494..6f757f1ec62b 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1786,7 +1786,7 @@ void SvxPreviewBase::InitSettings(bool bForeground, bool 
bBackground)
 
 SvxPreviewBase::SvxPreviewBase(vcl::Window* pParent)
 : Control(pParent, WB_BORDER)
-, mpModel(new SdrModel())
+, mpModel(new SdrModel(nullptr, nullptr, true))
 , mpBufferDevice(VclPtr::Create(*this))
 {
 //  Draw the control's border as a flat thin black line.
@@ -2189,7 +2189,7 @@ void PreviewBase::InitSettings()
 }
 
 PreviewBase::PreviewBase()
-: mpModel(new SdrModel())
+: mpModel(new SdrModel(nullptr, nullptr, true))
 {
 // init model
 mpModel->GetItemPool().FreezeIdRanges();
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 0f9325232f01..17d416d3ad94 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -120,7 +120,7 @@ void GraphCtrl::InitSdrModel()
 pModel.reset();
 
 // Creating a Model
-pModel.reset(new SdrModel());
+pModel.reset(new SdrModel(nullptr, nullptr, true));
 pModel->GetItemPool().FreezeIdRanges();
 pModel->SetScaleUnit( aMap100.GetMapUnit() );
 pModel->SetScaleFraction( Fraction( 1, 1 ) );
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 2aa183ecaa1a..578a49ceb6e3 100644
--- a/svx/source/dialog/

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

[Libreoffice Gerrit user]

 sw/source/uibase/uiview/viewmdi.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit bb43add6896e9689c08c191f6ab6d87c420b0584
Author: Jim Raykowski 
AuthorDate: Sun May 13 08:30:15 2018 -0800
Commit: Miklos Vajna 
CommitDate: Wed Aug 8 11:07:56 2018 +0200

tdf#117553 Change navigate behavior when in footnote frame

This patch changes navigate behavior to move to prev/next footnote text
when in footnote frame.

Change-Id: If206098d8817b74ab484a1039371c058d321fda2
Reviewed-on: https://gerrit.libreoffice.org/54195
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
(cherry picked from commit 215e5adf4977a175bb8cc89dcbd48ef443ac8f10)
Reviewed-on: https://gerrit.libreoffice.org/58304
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index 08af720f9e4a..bc76c064adeb 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -389,10 +389,26 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
 bNext ? rSh.GoNextCursor() : rSh.GoPrevCursor();
 break;
 case NID_FTN:
+{
+bool bFrameTypeFootnote(rSh.GetFrameType(nullptr, false) & 
FrameTypeFlags::FOOTNOTE);
+
+if (bFrameTypeFootnote)
+{
+rSh.LockView(true);
+rSh.GotoFootnoteAnchor();
+}
+
 rSh.EnterStdMode();
 bNext ?
 rSh.GotoNextFootnoteAnchor() :
 rSh.GotoPrevFootnoteAnchor();
+
+if (bFrameTypeFootnote)
+{
+rSh.LockView(false);
+rSh.GotoFootnoteText();
+}
+}
 break;
 case NID_MARK:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/nss

[Libreoffice Gerrit user]

 download.lst |4 ++--
 external/nss/nss-android.patch.1 |   25 -
 2 files changed, 2 insertions(+), 27 deletions(-)

New commits:
commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903
Author: Michael Stahl 
AuthorDate: Tue Aug 7 18:11:41 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Aug 8 10:20:31 2018 +0200

nss: upgrade to release 3.38

Fixes CVE-2018-0495 and "the ASN.1 code".

Remove one hunk of nss-android.patch.1 that should be obsolete with the
current Android toolchain baseline.

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

diff --git a/download.lst b/download.lst
index 4ca0f5399c8a..04a70ea84e0c 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4
-export NSS_TARBALL := nss-3.33-with-nspr-4.17.tar.gz
+export NSS_SHA256SUM := 
f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9
+export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 6dc43c1b4ffe..d37c70f16ace 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -48,28 +48,3 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
 --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
 --with-android-platform=$(ANDROID_SYSROOT)
 unified headers / ndk16 does have it in it's support module
-diff -ur nss.org/nspr/pr/src/md/unix/unix.c nss/nspr/pr/src/md/unix/unix.c
 nss.org/nspr/pr/src/md/unix/unix.c 2017-11-22 01:19:16.098553361 +0100
-+++ nss/nspr/pr/src/md/unix/unix.c 2017-11-22 01:20:03.794550181 +0100
-@@ -2714,21 +2714,6 @@
- #endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */
- 
- /* Android <= 19 doesn't have mmap64. */
--#if defined(ANDROID) && __ANDROID_API__ <= 19
--PR_IMPORT(void) *__mmap2(void *, size_t, int, int, int, size_t);
--
--#define ANDROID_PAGE_SIZE 4096
--
--static void *
--mmap64(void *addr, size_t len, int prot, int flags, int fd, loff_t offset)
--{
--if (offset & (ANDROID_PAGE_SIZE - 1)) {
--errno = EINVAL;
--return MAP_FAILED;
--}
--return __mmap2(addr, len, prot, flags, fd, offset / ANDROID_PAGE_SIZE);
--}
--#endif
- 
- #if defined(OSF1) && defined(__GNUC__)
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/IwyuFilter_include.yaml include/rtl

[Libreoffice Gerrit user]

 include/IwyuFilter_include.yaml |6 ++
 include/rtl/byteseq.h   |1 -
 include/rtl/strbuf.hxx  |1 -
 include/rtl/string.hxx  |3 ---
 include/rtl/ustrbuf.hxx |1 -
 include/rtl/ustring.hxx |3 ---
 6 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 55ca35ab99fb1164cb2095384ed0937a533d9d3c
Author: Gabor Kelemen 
AuthorDate: Thu Jul 12 06:53:38 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 8 09:58:34 2018 +0200

tdf#42949 Fix IWYU warnings in include/rtl/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 5e9a818b379d..bdd2774b4e81 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -34,3 +34,9 @@ blacklist:
 include/osl/thread.hxx:
 # ODK API test would fail with fw decl here
 - osl/time.h
+include/rtl/instance.hxx:
+# Needed for template functions
+- osl/getglobalmutex.hxx
+include/rtl/math.hxx:
+# TODO MSVC does not compile basegfx/numeric/ftools.hxx when this is 
replaced
+- math.h
diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h
index 640a4e06253a..75bd40210c72 100644
--- a/include/rtl/byteseq.h
+++ b/include/rtl/byteseq.h
@@ -22,7 +22,6 @@
 #include "sal/config.h"
 
 #include "rtl/alloc.h"
-#include "rtl/ustring.h"
 #include "sal/saldllapi.h"
 #include "sal/types.h"
 
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 0c3b53d8e8b4..c674f34d997c 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -23,7 +23,6 @@
 #include "sal/config.h"
 
 #include 
-#include 
 #include 
 
 #include "rtl/strbuf.h"
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 24b57a91b025..f19d8713eaae 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "rtl/textenc.h"
@@ -37,8 +36,6 @@
 #include "rtl/stringconcat.hxx"
 #endif
 
-#include "sal/log.hxx"
-
 #ifdef RTL_STRING_UNITTEST
 extern bool rtl_string_unittest_const_literal;
 extern bool rtl_string_unittest_const_literal_function;
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 5f696bff906d..6958093e71c8 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -23,7 +23,6 @@
 #include "sal/config.h"
 
 #include 
-#include 
 #include 
 
 #include "rtl/ustrbuf.h"
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 24005b22333d..1795f486162b 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -26,14 +26,11 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include "rtl/ustring.h"
 #include "rtl/string.hxx"
 #include "rtl/stringutils.hxx"
 #include "rtl/textenc.h"
-#include "sal/log.hxx"
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
 #include "config_global.h"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sc/source sd/qa sd/source sfx2/source

[Libreoffice Gerrit user]

 include/sfx2/app.hxx  |2 +-
 include/sfx2/docfile.hxx  |6 +++---
 sc/source/ui/docshell/docsh4.cxx  |4 ++--
 sc/source/ui/docshell/externalrefmgr.cxx  |4 ++--
 sc/source/ui/docshell/tablink.cxx |8 
 sd/qa/unit/sdmodeltestbase.hxx|4 ++--
 sd/source/ui/app/sdmod1.cxx   |4 ++--
 sd/source/ui/sidebar/MasterPageContainerProviders.cxx |4 ++--
 sfx2/source/appl/appopen.cxx  |8 ++--
 sfx2/source/doc/docfile.cxx   |8 
 sfx2/source/doc/docinsert.cxx |4 ++--
 sfx2/source/doc/new.cxx   |4 ++--
 sfx2/source/doc/objstor.cxx   |   15 ---
 13 files changed, 36 insertions(+), 39 deletions(-)

New commits:
commit 6a6774cc4b22aceaca4441318420bb9dfb1cacab
Author: Noel Grandin 
AuthorDate: Mon Aug 6 17:17:20 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 8 09:31:02 2018 +0200

loplugin:useuniqueptr in SfxApplication::LoadTemplate and SfxMedium

pass SfxItemSet around by std::unique_ptr

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

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index a3299e9cde73..c5ed9b880bd0 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -151,7 +151,7 @@ public:
 /**
 * @param pArgs Takes ownership
 */
-ErrCode LoadTemplate( SfxObjectShellLock& xDoc, const 
OUString& rFileName, SfxItemSet* pArgs );
+ErrCode LoadTemplate( SfxObjectShellLock& xDoc, const 
OUString& rFileName, std::unique_ptr pArgs );
 vcl::Window*GetTopWindow() const;
 
 // members
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index d136aa85e6e0..0fa8fbbae69c 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -55,7 +56,6 @@ class INetURLObject;
 class SfxObjectShell;
 class SfxFrame;
 class Timer;
-class SfxItemSet;
 class DateTime;
 
 class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
@@ -78,7 +78,7 @@ public:
 SfxMedium( const OUString &rName,
StreamMode nOpenMode,
std::shared_ptr pFilter = 
nullptr,
-   SfxItemSet *pSet = nullptr );
+   std::unique_ptr pSet = nullptr 
);
 /**
  * @param pSet Takes ownership
  */
@@ -86,7 +86,7 @@ public:
const OUString &rReferer,
StreamMode nOpenMode,
std::shared_ptr pFilter = 
nullptr,
-   SfxItemSet *pSet = nullptr );
+   std::unique_ptr pSet = nullptr 
);
 
 /**
  * @param pSet does NOT take ownership
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index c1139561817e..3d7b30aec367 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -750,12 +750,12 @@ void ScDocShell::Execute( SfxRequest& rReq )
 ScDocumentLoader::RemoveAppPrefix( aFilterName );
 
 std::shared_ptr pFilter = 
ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName( aFilterName );
-SfxItemSet* pSet = new SfxAllItemSet( pApp->GetPool() );
+std::unique_ptr pSet(new SfxAllItemSet( 
pApp->GetPool() ));
 if (!aOptions.isEmpty())
 pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, 
aOptions ) );
 if ( nVersion != 0 )
 pSet->Put( SfxInt16Item( SID_VERSION, nVersion ) );
-pMed = new SfxMedium( aFileName, StreamMode::STD_READ, 
pFilter, pSet );
+pMed = new SfxMedium( aFileName, StreamMode::STD_READ, 
pFilter, std::move(pSet) );
 }
 else
 {
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index a70d2019a69d..f274fd5d657a 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2502,7 +2502,7 @@ SfxObjectShellRef 
ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt
 setRelativeFileName(nFileId, aStr);
 }
 
-SfxItemSet* pSet = new SfxAllItemSet(SfxGetpApp()->GetPool());
+std::unique_ptr pSet(new 
SfxAllItemSet(S

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/svl include/svtools include/svx sc/source sd/source svx/source

[Libreoffice Gerrit user]

 compilerplugins/clang/unnecessaryvirtual-dead.results |   10 -
 compilerplugins/clang/unnecessaryvirtual.results  |  156 +++---
 include/svl/undo.hxx  |   42 ++--
 include/svtools/treelistbox.hxx   |2 
 include/svx/sdr/contact/objectcontact.hxx |   14 -
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx  |2 
 sd/source/ui/framework/module/SlideSorterModule.hxx   |2 
 svx/source/inc/eventhandler.hxx   |   62 ---
 svx/source/sdr/contact/objectcontact.cxx  |   24 --
 svx/source/sdr/contact/objectcontactofpageview.cxx|   13 -
 svx/source/sdr/event/eventhandler.cxx |   93 --
 11 files changed, 125 insertions(+), 295 deletions(-)

New commits:
commit 1444bd72006fec7ebcd3c5df2399da26ad3b1466
Author: Noel Grandin 
AuthorDate: Tue Aug 7 21:44:48 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 8 09:30:45 2018 +0200

loplugin:unnecessaryvirtual

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

diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results 
b/compilerplugins/clang/unnecessaryvirtual-dead.results
index 6c9fef9d3ab8..32e9137f6fcf 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -8,18 +8,14 @@ include/canvas/base/graphicdevicebase.hxx:302
 void canvas::GraphicDeviceBase::removePropertyChangeListener(const class 
rtl::OUString &,const class com::sun::star::uno::Reference &,)
 include/canvas/base/graphicdevicebase.hxx:315
 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class 
rtl::OUString &,const class com::sun::star::uno::Reference &,)
-include/svtools/valueset.hxx:498
-void SvtValueSet::UserDraw(const class UserDrawEvent &,)
-slideshow/source/engine/animationfactory.cxx:442
+slideshow/source/engine/animationfactory.cxx:443
 void slideshow::internal::(anonymous 
namespace)::GenericAnimation::prefetch(const class std::shared_ptr &,const class std::shared_ptr &,)
 vcl/inc/salframe.hxx:135
 void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
 vcl/inc/salmenu.hxx:80
 void SalMenu::RemoveMenuBarButton(unsigned short,)
-vcl/inc/salobj.hxx:46
+vcl/inc/salobj.hxx:48
 void SalObject::Enable(_Bool,)
-vcl/inc/unx/saldata.hxx:68
-void X11SalData::initNWF()
 vcl/inc/unx/saldata.hxx:69
 void X11SalData::deInitNWF()
 writerfilter/source/ooxml/OOXMLFactory.hxx:71
@@ -29,4 +25,4 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:72
 writerfilter/source/ooxml/OOXMLFactory.hxx:73
 void writerfilter::ooxml::OOXMLFactory_ns::endAction(class 
writerfilter::ooxml::OOXMLFastContextHandler *,)
 writerfilter/source/ooxml/OOXMLFactory.hxx:74
-void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class 
writerfilter::ooxml::OOXMLFastContextHandler *,int,const class 
std::shared_ptr &,)
+void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class 
writerfilter::ooxml::OOXMLFastContextHandler *,int,const class 
tools::SvRef &,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.results 
b/compilerplugins/clang/unnecessaryvirtual.results
index 04c9dbad7855..8cf7943f5d66 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -64,6 +64,8 @@ include/comphelper/servicedecl.hxx:168
 unsigned char 
comphelper::service_decl::detail::OwnServiceImpl::supportsService(const class 
rtl::OUString &,)
 include/comphelper/servicedecl.hxx:172
 class com::sun::star::uno::Sequence 
comphelper::service_decl::detail::OwnServiceImpl::getSupportedServiceNames()
+include/comphelper/solarmutex.hxx:53
+_Bool comphelper::SolarMutex::tryToAcquire()
 include/comphelper/unique_disposing_ptr.hxx:169
 void 
comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-0-0 *,)
 include/comphelper/weakeventlistener.hxx:118
@@ -114,16 +116,52 @@ include/svl/svdde.hxx:251
 _Bool DdeTopic::StartAdviseLoop()
 include/svl/svdde.hxx:307
 void DdeService::~DdeService()
-include/svtools/treelistbox.hxx:722
+include/svl/undo.hxx:202
+void SfxUndoManager::SetMaxUndoActionCount(unsigned long,)
+include/svl/undo.hxx:205
+class rtl::OUString SfxUndoManager::GetUndoActionComment(unsigned 
long,const _Bool,)const
+include/svl/undo.hxx:206
+class SfxUndoAction * SfxUndoManager::GetUndoAction(unsigned long,)const
+include/svl/undo.hxx:210
+class rtl::OUString SfxUndoManager::GetRedoActionComment(unsigned 
long,const _Bool,)const
+include/svl/undo.hxx:211
+class SfxUndoAction * SfxUndoManager::GetRedoAction()const
+include/svl/undo.hxx:231
+void SfxUndoManager::Reset()
+include/svl/undo.hxx:234
+_Bool SfxUndoManager::IsDoing()const
+include/svl/undo.hxx:235
+unsigned long SfxUndoManager::GetRep

[Libreoffice-commits] core.git: 2 commits - codemaker/source compilerplugins/clang include/svx sc/source svl/source svx/source sw/source

[Libreoffice Gerrit user]

 codemaker/source/cppumaker/dependencies.cxx |7 
 codemaker/source/cppumaker/dependencies.hxx |2 
 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  144 

 compilerplugins/clang/unusedfields.readonly.results |  162 
+++---
 compilerplugins/clang/unusedfields.untouched.results|   74 ++--
 compilerplugins/clang/unusedfields.writeonly.results|   98 
++
 include/svx/paraprev.hxx|1 
 include/svx/relfld.hxx  |3 
 sc/source/filter/xml/xmltransformationi.hxx |2 
 svl/source/misc/sharedstringpool.cxx|   97 
+
 svx/source/dialog/paraprev.cxx  |2 
 svx/source/dialog/relfld.cxx|3 
 sw/source/uibase/docvw/romenu.cxx   |7 
 sw/source/uibase/docvw/romenu.hxx   |1 
 14 files changed, 250 insertions(+), 353 deletions(-)

New commits:
commit c83a8071666af2f8e96a4b1808d7650ba112f931
Author: Noel Grandin 
AuthorDate: Tue Aug 7 18:47:36 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 8 09:30:23 2018 +0200

loplugin:unusedfields

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

diff --git a/codemaker/source/cppumaker/dependencies.cxx 
b/codemaker/source/cppumaker/dependencies.cxx
index aed0df3d944b..d32ac98396a0 100644
--- a/codemaker/source/cppumaker/dependencies.cxx
+++ b/codemaker/source/cppumaker/dependencies.cxx
@@ -43,8 +43,7 @@ Dependencies::Dependencies(
 m_byteDependency(false), m_shortDependency(false),
 m_unsignedShortDependency(false), m_longDependency(false),
 m_unsignedLongDependency(false), m_hyperDependency(false),
-m_unsignedHyperDependency(false), m_floatDependency(false),
-m_doubleDependency(false), m_charDependency(false),
+m_unsignedHyperDependency(false), m_charDependency(false),
 m_stringDependency(false), m_typeDependency(false), m_anyDependency(false),
 m_sequenceDependency(false)
 {
@@ -168,10 +167,8 @@ Dependencies::Dependencies(
 m_unsignedHyperDependency = true;
 break;
 case unoidl::ConstantValue::TYPE_FLOAT:
-m_floatDependency = true;
 break;
 case unoidl::ConstantValue::TYPE_DOUBLE:
-m_doubleDependency = true;
 break;
 }
 }
@@ -251,10 +248,8 @@ void Dependencies::insert(OUString const & name, Kind 
kind) {
 m_unsignedHyperDependency = true;
 break;
 case UnoType::Sort::Float:
-m_floatDependency = true;
 break;
 case UnoType::Sort::Double:
-m_doubleDependency = true;
 break;
 case UnoType::Sort::Char:
 m_charDependency = true;
diff --git a/codemaker/source/cppumaker/dependencies.hxx 
b/codemaker/source/cppumaker/dependencies.hxx
index c7eae1dfc6b6..5e7adb442024 100644
--- a/codemaker/source/cppumaker/dependencies.hxx
+++ b/codemaker/source/cppumaker/dependencies.hxx
@@ -114,8 +114,6 @@ private:
 bool m_unsignedLongDependency;
 bool m_hyperDependency;
 bool m_unsignedHyperDependency;
-bool m_floatDependency;
-bool m_doubleDependency;
 bool m_charDependency;
 bool m_stringDependency;
 bool m_typeDependency;
diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 21e02d81160d..b90e7a4dffed 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-libvlc_event_t u union (anonymous union at 
/media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+libvlc_event_t u union (anonymous union at 
/home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
 libvlc_track_description_t psz_name char *
 basegfx/source/polygon/b2dtrapezoid.cxx:201
@@ -176,11 +176,11 @@ include/drawinglayer/texture/texture3d.hxx:62
 drawinglayer::texture::GeoTexSvxBitmapE

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

[Libreoffice Gerrit user]

 sc/qa/unit/screenshots/screenshots.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 62775630afc80d1da0dc345e8ec10123a8e05463
Author: Stephan Bergmann 
AuthorDate: Wed Aug 8 09:24:12 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 8 09:24:12 2018 +0200

Missing include (incomplete SfxAbstractTabDialog)

Change-Id: Iba9facc39f26a22f07de5372e0eebf9a4544c077

diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index f67580c3e9a6..7b9a2d8cc2ff 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
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-0' - 36 commits - chart2/qa cui/source desktop/source editeng/source embeddedobj/source g icon-themes/galaxy include/oox include/vcl in

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit c423c598c2b84825be7237bcb9498cafa2ba40e2
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jan 12 16:46:45 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Aug 8 09:22:15 2018 +0200

Disable crash reporter UI

Change-Id: I8106ec674080ede7072581dab2e6700040de5828
(cherry picked from commit b981aa30c3eb5ddd0cf6c35e4c37ab687667f71b)

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 583ea189165f..3b5947751671 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -919,7 +919,8 @@ bool crashReportInfoExists()
 #if HAVE_FEATURE_BREAKPAD
 void handleCrashReport()
 {
-static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
 
 css::uno::Reference< css::uno::XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
 
@@ -933,7 +934,7 @@ void handleCrashReport()
 css::util::URL aURL;
 css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL, 
css::uno::Sequence< css::beans::PropertyValue >());
 bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
 }
 #endif
 
commit 31d3894f6061e2917f9182589625cc51b4ffa4d7
Author: Thorsten Behrens 
AuthorDate: Mon Jul 2 18:11:47 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 8 09:22:15 2018 +0200

./g: don't exit early on ./g checkout -f

Reviewed-on: https://gerrit.libreoffice.org/56822
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 5fce97a58b8f764e35bf98128591c9a89537da05)

Change-Id: I33f54c365bce64feb1c58fc8e4faddb7ad77
Reviewed-on: https://gerrit.libreoffice.org/56916
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit dca20728ebe798ada1045ea3dabcb981166e2b9d)

diff --git a/g b/g
index 49ece9ff6880..649ccf3611de 100755
--- a/g
+++ b/g
@@ -209,7 +209,7 @@ local module
 git checkout "$@" || return $?
 for cmd in "$@" ; do
if [ "$cmd" = "-f" ]; then
-   return 0
+   continue
elif [ "$cmd" = "-b" ] ; then
create_branch=1
elif [ "$create_branch" = "1" ] ; then
commit a58064109c33fcec8ce6418967bf14a21ed453d9
Author: Katarina Behrens 
AuthorDate: Wed Feb 10 14:42:18 2016 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Aug 8 09:22:15 2018 +0200

Branded images for msi installer

The sizes are 122 x 234, 374 x 44 installed units respectively, according to

http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx

it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still 
looks pixelated,
but it's as good as it gets.

For better results, we need different graphics, with less fine details 
given the very limited
space

Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 5a163cf86c23..471eea4c22e6 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index b4210d131ba2..2703670952bd 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
commit 148013559e92c4cddd3d96bc051564fbb6674e85
Author: Katarina Behrens 
AuthorDate: Tue Feb 9 11:09:30 2016 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Aug 8 09:22:14 2018 +0200

Branded application icons

sadly, this doesn't replace Windows taskbar icon, that must be living 
somewhere
else. It works on Linux though.

 Conflicts:
icon-themes/galaxy/res/main128.png
icon-themes/galaxy/res/mainapp_16.png
icon-themes/galaxy/res/mainapp_16_8.png
icon-themes/galaxy/res/mainapp_32.png
icon-themes/galaxy/res/mainapp_32_8.png
icon-themes/galaxy/res/mainapp_48_8.png

Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b

diff --git a/icon-themes/galaxy/res/main128.png 
b/icon-themes/galaxy/res/main128.png
index 2779337e7b0a..818b7330c25b 100644
Binary files a/icon-themes/galaxy/res/main128.png and 
b/icon-themes/galaxy/res/main128.png differ
diff --git a/icon-themes/galaxy/res/mainapp_16.png 
b/icon-themes/galaxy/res/mainapp_16.png
old mode 100755
new mode 100644
index 4a96735b6bb6..13945eeadfd4
Binary files a/icon-themes/galaxy/res/mainapp_16.png and 
b/ic

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

[Libreoffice Gerrit user]

 external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1   |   77 
++
 external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2   |6 
 external/pdfium/0010-svx-support-importing-forms-from-PDFs.patch.2  |   30 
---
 external/pdfium/0012-svx-import-processed-PDF-text.patch.2  |8 
-
 external/pdfium/0015-svx-set-the-font-name-of-imported-PDF-text.patch.2 |6 
 external/pdfium/UnpackedTarball_pdfium.mk   |2 
 svx/source/svdraw/svdpdf.cxx|2 
 7 files changed, 94 insertions(+), 37 deletions(-)

New commits:
commit 3820aff0a577f72d63446a62f0e614a1408ab114
Author: Miklos Vajna 
AuthorDate: Tue Aug 7 22:52:39 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 8 09:03:34 2018 +0200

pdfium: replace FPDFFormObj_CountSubObjects() with backport

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

diff --git a/external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1 
b/external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1
new file mode 100644
index ..190fc6b2c9b6
--- /dev/null
+++ b/external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1
@@ -0,0 +1,77 @@
+From b66077d3ef7ba594f2a831840783549f4dd70d86 Mon Sep 17 00:00:00 2001
+Date: Wed, 11 Jul 2018 13:25:02 +
+Subject: [PATCH] Add FPDFFormObj_CountObjects() API
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To find out the number of sub-objects a form object has, similar to how
+FPDFPage_CountObjects() does it for page objects.
+
+Change-Id: I7e5775dece42b74fd5b71b1d9622a1aa37bf64ac
+Reviewed-on: https://pdfium-review.googlesource.com/37316
+Commit-Queue: Nicolás Peña Moreno 
+Reviewed-by: Nicolás Peña Moreno 
+---
+ fpdfsdk/fpdf_edit_embeddertest.cpp | 14 ++
+ fpdfsdk/fpdf_editpage.cpp  | 21 +
+ fpdfsdk/fpdf_view_c_api_test.c |  1 +
+ public/fpdf_edit.h |  9 
+ testing/resources/form_object.in   | 80 +
+ testing/resources/form_object.pdf  | 91 ++
+ 6 files changed, 216 insertions(+)
+ create mode 100644 testing/resources/form_object.in
+ create mode 100644 testing/resources/form_object.pdf
+
+diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
+index 8a1200885..4151de5df 100644
+--- a/fpdfsdk/fpdf_editpage.cpp
 b/fpdfsdk/fpdf_editpage.cpp
+@@ -751,3 +751,24 @@ FPDFPageObj_SetLineCap(FPDF_PAGEOBJECT page_object, int 
line_cap) {
+   pPageObj->SetDirty(true);
+   return true;
+ }
++
++FPDF_EXPORT int FPDF_CALLCONV
++FPDFFormObj_CountObjects(FPDF_PAGEOBJECT page_object) {
++  auto* pPageObj = CPDFPageObjectFromFPDFPageObject(page_object);
++  if (!pPageObj)
++return -1;
++
++  CPDF_FormObject* pFormObject = pPageObj->AsForm();
++  if (!pFormObject)
++return -1;
++
++  const CPDF_Form* pForm = pFormObject->form();
++  if (!pForm)
++return -1;
++
++  const CPDF_PageObjectList* pObjectList = pForm->GetPageObjectList();
++  if (!pObjectList)
++return -1;
++
++  return pObjectList->size();
++}
+diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
+index b85537d0b..e6f193a37 100644
+--- a/public/fpdf_edit.h
 b/public/fpdf_edit.h
+@@ -1226,6 +1226,15 @@ FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document,
+ // Returns one of the FPDF_TEXTRENDERMODE_* flags on success, -1 on error.
+ FPDF_EXPORT int FPDF_CALLCONV FPDFText_GetTextRenderMode(FPDF_PAGEOBJECT 
text);
+ 
++// Experimental API.
++// Get number of page objects inside |form_object|.
++//
++//   form_object - handle to a form object.
++//
++// Returns the number of objects in |form_object| on success, -1 on error.
++FPDF_EXPORT int FPDF_CALLCONV
++FPDFFormObj_CountObjects(FPDF_PAGEOBJECT form_object);
++
+ #ifdef __cplusplus
+ }  // extern "C"
+ #endif  // __cplusplus
+-- 
+2.16.4
+
diff --git a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2 
b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
index d4f8de52b3ec..896e676bf287 100644
--- a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
+++ b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
@@ -40,9 +40,9 @@ index 912df63..3244943 100644
 diff --git a/pdfium/public/fpdf_edit.h b/pdfium/public/fpdf_edit.h
 --- a/pdfium/public/fpdf_edit.h
 +++ b/pdfium/public/fpdf_edit.h
-@@ -1133,6 +1133,15 @@ FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document,
- // Returns one of the FPDF_TEXTRENDERMODE_* flags on success, -1 on error.
- FPDF_EXPORT int FPDF_CALLCONV FPDFText_GetTextRenderMode(FPDF_PAGEOBJECT 
text);
+@@ -1142,6 +1142,15 @@ FPDF_EXPORT int FPDF_CALLCONV 
FPDFText_GetTextRenderMode(FPDF_PAGEOBJECT text);
+ FPDF_EXPORT int FPDF_CALLCONV
+ FPDFFormObj_CountObjects(FPDF_PAGEOBJECT form_object);
  
 +// Get the nu

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

[Libreoffice Gerrit user]

 sw/qa/core/data/ooxml/pass/tdf119136.docx |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b9a739e0d3909e0fa4b76d5c0087d92a505e95fa
Author: Justin Luth 
AuthorDate: Tue Aug 7 21:10:59 2018 +0300
Commit: Justin Luth 
CommitDate: Wed Aug 8 09:02:00 2018 +0200

tdf#119136 GetPropertyFromStyleSheet infinite loop

So, apparently we accept a style that has no styleId and
define it as such. Due to some reworkings, this function
was called instead. Since we can "find" a style without a
name, now every parentless style thought it inherited from
this nameless style.

Change-Id: I47b4119abd37ece94a39e636ddb7798b809ccb04
Reviewed-on: https://gerrit.libreoffice.org/58705
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/qa/core/data/ooxml/pass/tdf119136.docx 
b/sw/qa/core/data/ooxml/pass/tdf119136.docx
new file mode 100644
index ..2baa624bbb53
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/tdf119136.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 636153e8633f..48b43aa52849 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -713,7 +713,9 @@ uno::Any 
DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId)
 }
 }
 //search until the property is set or no parent is available
-StyleSheetEntryPtr pNewEntry = 
GetStyleSheetTable()->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier);
+StyleSheetEntryPtr pNewEntry;
+if ( !pEntry->sBaseStyleIdentifier.isEmpty() )
+pNewEntry = 
GetStyleSheetTable()->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier);
 
 SAL_WARN_IF( pEntry == pNewEntry, "writerfilter.dmapper", "circular 
loop in style hierarchy?");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits