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

[Mike Kaganski (via logerrit)]

 sw/source/core/unocore/unoobj.cxx |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 17eb2f4d403cdbbacb8fa2c14a006b25241815d4
Author: Mike Kaganski 
AuthorDate: Fri Aug 16 15:07:12 2019 +0200
Commit: Mike Kaganski 
CommitDate: Sat Aug 17 07:05:07 2019 +0200

Use a nice way of merging ranges

... which will ensure correct sorted order of the ranges.

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

diff --git a/sw/source/core/unocore/unoobj.cxx 
b/sw/source/core/unocore/unoobj.cxx
index 0b1b3c78b083..e47a0b11a904 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1783,7 +1783,8 @@ void SwUnoCursorHelper::SetPropertyValues(
 OUString aUnknownExMsg, aPropertyVetoExMsg;
 
 // Build set of attributes we want to fetch
-std::vector aWhichPairs;
+const sal_uInt16 zero = 0;
+SfxItemSet aItemSet(pDoc->GetAttrPool(), &zero);
 std::vector> 
aEntries;
 aEntries.reserve(rPropertyValues.getLength());
 for (const auto& rPropVal : rPropertyValues)
@@ -1803,19 +1804,13 @@ void SwUnoCursorHelper::SetPropertyValues(
 {
 aPropertyVetoExMsg += "Property is read-only: '" + rPropertyName + 
"' ";
 continue;
-} else {
-// FIXME: we should have some nice way of merging ranges surely ?
-aWhichPairs.push_back(pEntry->nWID);
-aWhichPairs.push_back(pEntry->nWID);
 }
+aItemSet.MergeRange(pEntry->nWID, pEntry->nWID);
 aEntries.emplace_back(pEntry, rPropVal.Value);
 }
 
-if (!aWhichPairs.empty())
+if (!aEntries.empty())
 {
-aWhichPairs.push_back(0); // terminate
-SfxItemSet aItemSet(pDoc->GetAttrPool(), aWhichPairs.data());
-
 // Fetch, overwrite, and re-set the attributes from the core
 
 bool bPreviousPropertyCausesSideEffectsInNodes = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - officecfg/registry

[Laurent BP (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   10 
+-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 97b6565f27acad7288de016530c753f27f9d55f9
Author: Laurent BP 
AuthorDate: Fri Aug 16 10:40:38 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 17 06:59:48 2019 +0200

tdf#126908 Add lang to Tooltiplabel

Addition to commit c3ca559841c857bf7b39f665433d71c89d220d0f

Change-Id: Ie51412b31239f6aaf3813dee5c226a21c7d9c79d
Reviewed-on: https://gerrit.libreoffice.org/77562
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 003369b6d76225761373d46754890dd7f3c296c3)
Reviewed-on: https://gerrit.libreoffice.org/77590
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 568a093e3ea4..37cbd22f5010 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1536,7 +1536,7 @@
   ~Rows
 
 
-  Delete selected rows
+  Delete selected rows
 
 
   1
@@ -1550,7 +1550,7 @@
   ~Columns
 
 
-  Delete selected columns
+  Delete selected columns
 
 
   1
@@ -1564,7 +1564,7 @@
   ~Table
 
 
-  Delete table
+  Delete table
 
 
   1
@@ -1655,7 +1655,7 @@
   C~ell
 
 
-  Select Cell
+  Select Cell
 
 
   1
@@ -1693,7 +1693,7 @@
   ~Table
 
 
-  Select Table
+  Select Table
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/EL-SHREIF/ui_logger' - uitest/ui_logger_dsl

[Ahmed ElShreif (via logerrit)]

 uitest/ui_logger_dsl/dsl_core.py |   88 +++
 1 file changed, 52 insertions(+), 36 deletions(-)

New commits:
commit 25fbad996379ca0b73a95268253828d73d2be6f9
Author: Ahmed ElShreif 
AuthorDate: Fri Aug 16 21:56:42 2019 -0500
Commit: Ahmed ElShreif 
CommitDate: Fri Aug 16 22:33:41 2019 -0500

Fix some Logger issues:

Ignore the logging part of the QuerySaveDialog while closing the app

Change-Id: I18fcc81fa54362dfaa574ec04125e66b37a5aad8

diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index b8e0b9b7269c..088fcf4a0d64 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -33,6 +33,7 @@ class ul_Compiler:
 current_app=""
 parent_hierarchy_count=0
 last_parent=[]
+flag_for_QuerySaveDialog=False
 
 def __init__(self , input_address , output_address):
 self.ui_dsl_mm = metamodel_from_file('ui_logger_dsl_grammar.tx')
@@ -190,21 +191,27 @@ class ul_Compiler:
 def handle_Dialog(self, DialogCommand):
 
 if (DialogCommand.__class__.__name__ == "OpenModalDialog"):
-old_line = self.variables.pop()
 
-if (self.prev_command.__class__.__name__ == "UNOCommand"):
-key_word=self.prev_command.uno_command_name[-6:]
-else:
-key_word=old_line[-9:-3]
+if( DialogCommand.dialog_name != "QuerySaveDialog" ):
+# This part is just to ignore saving the Save dialog while 
closing the app
 
-if ( key_word == "Dialog"):
-old_line= double_tab + 
"self.ui_test.execute_dialog_through_command(\""+\
-self.prev_command.uno_command_name+"\")\n"
-self.variables.append(old_line)
-line = double_tab + DialogCommand.dialog_name + " = 
self.xUITest.getTopFocusWindow()\n"
-self.variables.append(line)
-self.last_parent.append(DialogCommand.dialog_name)
-self.parent_hierarchy_count=self.parent_hierarchy_count+1
+old_line = self.variables.pop()
+if (self.prev_command.__class__.__name__ == "UNOCommand"):
+key_word=self.prev_command.uno_command_name[-6:]
+else:
+key_word=old_line[-9:-3]
+
+if ( key_word == "Dialog"):
+old_line= double_tab + 
"self.ui_test.execute_dialog_through_command(\""+\
+self.prev_command.uno_command_name+"\")\n"
+self.variables.append(old_line)
+line = double_tab + DialogCommand.dialog_name + " = 
self.xUITest.getTopFocusWindow()\n"
+self.variables.append(line)
+self.last_parent.append(DialogCommand.dialog_name)
+self.parent_hierarchy_count=self.parent_hierarchy_count+1
+
+else:
+self.flag_for_QuerySaveDialog=True
 
 elif (DialogCommand.__class__.__name__ == "OpenModelessDialog"):
 old_line = self.variables.pop()
@@ -223,37 +230,46 @@ class ul_Compiler:
 self.parent_hierarchy_count=self.parent_hierarchy_count+1
 
 elif (DialogCommand.__class__.__name__ == "CloseDialog"):
-if (self.prev_command.__class__.__name__ == "ButtonUIObject"):
-old_line = self.variables.pop()
-line=""
-if(keyword.iskeyword( self.prev_command.ui_button )):
-line= double_tab + 
"self.ui_test.close_dialog_through_button(x"+\
-self.prev_command.ui_button+")\n"
-else:
-line= double_tab + 
"self.ui_test.close_dialog_through_button("+\
-self.prev_command.ui_button+")\n"
-self.variables.append(line)
-self.last_parent.pop()
-self.parent_hierarchy_count=self.parent_hierarchy_count-1
+
+if( not ( self.flag_for_QuerySaveDialog ) ):
+# This part is just to ignore saving the Save dialog while 
closing the app
+
+if (self.prev_command.__class__.__name__ == "ButtonUIObject"):
+old_line = self.variables.pop()
+line=""
+if(keyword.iskeyword( self.prev_command.ui_button )):
+line= double_tab + 
"self.ui_test.close_dialog_through_button(x"+\
+self.prev_command.ui_button+")\n"
+else:
+line= double_tab + 
"self.ui_test.close_dialog_through_button("+\
+self.prev_command.ui_button+")\n"
+self.variables.append(line)
+self.last_parent.pop()
+self.parent_hierarchy_count=self.parent_hierarchy_count-1
+else:
+self.flag_for_QuerySaveDialog=False
 
 self.prev_command=DialogCommand
 
 def handle_button(self, ButtonUIObje

[Libreoffice-commits] online.git: wsd/ClientSession.cpp wsd/DocumentBroker.cpp

[Ashod Nakashian (via logerrit)]

 wsd/ClientSession.cpp  |   24 +++-
 wsd/DocumentBroker.cpp |1 -
 2 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 6d94b35c35bd30e10963bc64bea9ca4e1e253a81
Author: Ashod Nakashian 
AuthorDate: Tue Aug 13 20:03:40 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:44:51 2019 +0200

wsd: block save of read-only documents

WSD is responsible for checking permissions,
as we do with DisableCopy and DisablePrint,
but until now we allowed saving even on
read-only documents.

The reason, it seems, was that when we failed
to save a document due to disk space, we
set documents as read-only. So presumably
we still had to allow saving, so users
preserve their latest changes when the disk
has some free space. Meanwhile, we didn't
let users make further changes. At least
this seems to be a reasonable explanation.

Unfortunately this meant that we allowed
saving when the user had no permission,
or the document was loaded as read-only.

Now we no longer mark documents that fail
to save due to disk-space limitation as
read-only, and instead expect the client
to notify the user and (possibly) block
further edits. And read-only documents,
or users without write permission, are
no longer allowed to get saved.

This change makes sure that the ctrl+s
shortcut respects the read-only flag,
while we allow clients to disable
the default handler and decide what to
do (although now they cannot force saving
when the user has no permission, something
they could do previously).

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

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 5dbcaa7d0..56f2a3443 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -499,16 +499,23 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 }
 else if (tokens[0] == "save")
 {
-int dontTerminateEdit = 1;
-if (tokens.size() > 1)
-getTokenInteger(tokens[1], "dontTerminateEdit", dontTerminateEdit);
+if (isReadOnly())
+{
+LOG_WRN("The document is read-only, cannot save.");
+}
+else
+{
+int dontTerminateEdit = 1;
+if (tokens.size() > 1)
+getTokenInteger(tokens[1], "dontTerminateEdit", 
dontTerminateEdit);
 
-// Don't save unmodified docs by default, or when read-only.
-int dontSaveIfUnmodified = 1;
-if (!isReadOnly() && tokens.size() > 2)
-getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
+// Don't save unmodified docs by default.
+int dontSaveIfUnmodified = 1;
+if (tokens.size() > 2)
+getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
 
-docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, 
dontSaveIfUnmodified != 0);
+docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, 
dontSaveIfUnmodified != 0);
+}
 }
 else if (tokens[0] == "savetostorage")
 {
@@ -1003,7 +1010,6 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 #endif
 
 const auto& tokens = payload->tokens();
-
 if (tokens[0] == "unocommandresult:")
 {
 const std::string stringMsg(buffer, length);
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 5105e426d..026bdda08 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -975,7 +975,6 @@ bool DocumentBroker::saveToStorageInternal(const 
std::string& sessionId,
 // Make everyone readonly and tell everyone that storage is low on 
diskspace.
 for (const auto& sessionIt : _sessions)
 {
-sessionIt.second->setReadOnly();
 sessionIt.second->sendTextFrame("error: cmd=storage 
kind=savediskfull");
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/ChildSession.cpp

[Ashod Nakashian (via logerrit)]

 kit/ChildSession.cpp |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 64c5ec5bbc5e12e92499fdd50f192eea468ea54a
Author: Ashod Nakashian 
AuthorDate: Sun Jan 20 16:44:28 2019 -0500
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:44:29 2019 +0200

wsd: don't warn incorrectly when selecting current part

Change-Id: I3c872469911b1f232e40cc110859402fc0814f3a
Reviewed-on: https://gerrit.libreoffice.org/69640
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71104

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index b044adeba..fadbca1ea 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1956,14 +1956,17 @@ bool ChildSession::selectClientPart(const char* 
/*buffer*/, int /*length*/, cons
 
 getLOKitDocument()->setView(_viewId);
 
-if (getLOKitDocument()->getDocumentType() != LOK_DOCTYPE_TEXT && nPart != 
getLOKitDocument()->getPart())
+if (getLOKitDocument()->getDocumentType() != LOK_DOCTYPE_TEXT)
 {
-getLOKitDocument()->selectPart(nPart, nSelect);
+if (nPart != getLOKitDocument()->getPart())
+{
+getLOKitDocument()->selectPart(nPart, nSelect);
 
-// Notify the client of the selection update.
-const std::string status = 
LOKitHelper::documentStatus(getLOKitDocument()->get());
-if (!status.empty())
-return sendTextFrame("statusupdate: " + status);
+// Notify the client of the selection update.
+const std::string status = 
LOKitHelper::documentStatus(getLOKitDocument()->get());
+if (!status.empty())
+return sendTextFrame("statusupdate: " + status);
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.PartsPreview.js |8 
 loleaflet/src/control/Parts.js|1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 22d03720a22bd1749fce0c57117c7a36d965d9c0
Author: Ashod Nakashian 
AuthorDate: Wed Nov 28 22:07:33 2018 -0500
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:43:00 2019 +0200

leaflet: select the current slide and update previews after reordering

Change-Id: Iec1c41b257744e99d8447518be0b38eb9a28d715
Reviewed-on: https://gerrit.libreoffice.org/69639
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71103

diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 854fe21f0..b46d356c6 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -162,6 +162,7 @@ L.Control.PartsPreview = L.Control.extend({
console.log('shift');
} else {
this._map.setPart(partId);
+   this._map.selectPart(partId, 1, false); // And 
select.
}
}
},
@@ -343,6 +344,13 @@ L.Control.PartsPreview = L.Control.extend({
if (partId < 0)
partId = -1; // First item is -1.

this.partsPreview._map._socket.sendMessage('moveselectedclientparts position=' 
+ partId);
+   // Update previews, after a second, since we only get 
the dragged one invalidated.
+   var that = this.partsPreview;
+   setTimeout(function () {
+   for (var i = 0; i < that._previewTiles.length; 
++i) {
+   that._map.getPreview(i, i, 180, 180, 
{autoUpdate: that.options.autoUpdate, broadcast: true});
+   }
+   }, 1000);
}
 
this.classList.remove('preview-img-dropsite');
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 95e5bc2a0..c428408e7 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -63,7 +63,6 @@ L.Map.include({
// part is the part index/id
// how is 0 to deselect, 1 to select, and 2 to toggle selection
selectPart: function (part, how, external) {
-   //TODO: Update/track selected parts(?).
var docLayer = this._docLayer;
var index = docLayer._selectedParts.indexOf(part);
if (index >= 0 && how != 1) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian (via logerrit)]

 loleaflet/css/partsPreviewControl.css |2 +-
 loleaflet/src/control/Control.PartsPreview.js |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 11335b0e206aa6193f996062b203eda1d0e74bf8
Author: Ashod Nakashian 
AuthorDate: Fri Nov 23 01:50:30 2018 -0500
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:42:25 2019 +0200

leaflet: make the slide drop sites more visible

Change-Id: Idc8e2ee33fc61449300180e8200f5aa75b82f07e
Reviewed-on: https://gerrit.libreoffice.org/69638
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71102

diff --git a/loleaflet/css/partsPreviewControl.css 
b/loleaflet/css/partsPreviewControl.css
index 39bba0121..e5afa218a 100644
--- a/loleaflet/css/partsPreviewControl.css
+++ b/loleaflet/css/partsPreviewControl.css
@@ -41,5 +41,5 @@
 
 /* Highlight where a slide can be dropped when reordering by drag-and-drop. */
 .preview-img-dropsite {
-border-bottom: 2px solid red;
+border-bottom: 3px solid red;
 }
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 35c5e57cc..854fe21f0 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -67,7 +67,8 @@ L.Control.PartsPreview = L.Control.extend({
var frame = L.DomUtil.create('div', 
'preview-frame', this._scrollContainer);
this._addDnDHandlers(frame);
frame.setAttribute('draggable', false);
-   L.DomUtil.setStyle(frame, 'height', '12px');
+   L.DomUtil.setStyle(frame, 'height', '20px');
+   L.DomUtil.setStyle(frame, 'margin', '0em');
 
// Create the preview parts
for (var i = 0; i < parts; i++) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.PartsPreview.js |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 001dcac278ebbff58b4d8437e17ce81c4e824cbe
Author: Ashod Nakashian 
AuthorDate: Fri Nov 23 01:36:17 2018 -0500
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:41:59 2019 +0200

leaflet: support reordering slides to first position

Change-Id: I23fba5d7e10d861ec482974cf355c9fb1ae13a64
Reviewed-on: https://gerrit.libreoffice.org/69637
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71101

diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 25ffd099d..35c5e57cc 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -63,6 +63,13 @@ L.Control.PartsPreview = L.Control.extend({
});
this._scrollContainer = $('#slide-sorter 
.mCSB_container').get(0);
 
+   // Add a special frame just as a drop-site for 
reordering.
+   var frame = L.DomUtil.create('div', 
'preview-frame', this._scrollContainer);
+   this._addDnDHandlers(frame);
+   frame.setAttribute('draggable', false);
+   L.DomUtil.setStyle(frame, 'height', '12px');
+
+   // Create the preview parts
for (var i = 0; i < parts; i++) {

this._previewTiles.push(this._createPreview(i, e.partNames[i], bottomBound));
}
@@ -144,7 +151,7 @@ L.Control.PartsPreview = L.Control.extend({
_setPart: function (e) {
var part = $('#slide-sorter .mCSB_container 
.preview-frame').index(e.target.parentNode);
if (part !== null) {
-   var partId = parseInt(part);
+   var partId = parseInt(part) - 1; // The first part is 
just a drop-site for reordering.
 
if (e.ctrlKey) {
this._map.selectPart(partId, 2, false); // 
Toggle selection on ctrl+click.
@@ -331,7 +338,9 @@ L.Control.PartsPreview = L.Control.extend({
 
var part = $('#slide-sorter .mCSB_container 
.preview-frame').index(e.target.parentNode);
if (part !== null) {
-   var partId = parseInt(part);
+   var partId = parseInt(part) - 1; // First frame is a 
drop-site for reordering.
+   if (partId < 0)
+   partId = -1; // First item is -1.

this.partsPreview._map._socket.sendMessage('moveselectedclientparts position=' 
+ partId);
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/ChildSession.hpp kit/Kit.cpp loleaflet/css loleaflet/src test/WhiteBoxTests.cpp

[Ashod Nakashian (via logerrit)]

 kit/ChildSession.cpp  |9 +++--
 kit/ChildSession.hpp  |3 +++
 kit/Kit.cpp   |   10 --
 loleaflet/css/partsPreviewControl.css |   13 +++--
 loleaflet/src/control/Control.PartsPreview.js |   11 ---
 loleaflet/src/control/Parts.js|   23 +--
 loleaflet/src/core/Socket.js  |8 
 loleaflet/src/layer/tile/ImpressTileLayer.js  |2 ++
 test/WhiteBoxTests.cpp|5 +
 9 files changed, 65 insertions(+), 19 deletions(-)

New commits:
commit d45ecd586cc4490d219bf494d9de7b9aedcd2ed5
Author: Ashod Nakashian 
AuthorDate: Mon Sep 17 06:31:36 2018 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:41:36 2019 +0200

wsd: leaflet: track multi-selection

Change-Id: I17c092e950fb4d7a0cb4129c537d60a8e5edd06a
Reviewed-on: https://gerrit.libreoffice.org/69636
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71100

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index be169fc6f..b044adeba 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1959,6 +1959,11 @@ bool ChildSession::selectClientPart(const char* 
/*buffer*/, int /*length*/, cons
 if (getLOKitDocument()->getDocumentType() != LOK_DOCTYPE_TEXT && nPart != 
getLOKitDocument()->getPart())
 {
 getLOKitDocument()->selectPart(nPart, nSelect);
+
+// Notify the client of the selection update.
+const std::string status = 
LOKitHelper::documentStatus(getLOKitDocument()->get());
+if (!status.empty())
+return sendTextFrame("statusupdate: " + status);
 }
 else
 {
@@ -1984,10 +1989,10 @@ bool ChildSession::moveSelectedClientParts(const char* 
/*buffer*/, int /*length*
 {
 getLOKitDocument()->moveSelectedParts(nPosition, false); // Move, 
don't duplicate.
 
-// Get the status to recreate the previews and correctly order parts.
+// Get the status to notify clients of the reordering and selection 
change.
 const std::string status = 
LOKitHelper::documentStatus(getLOKitDocument()->get());
 if (!status.empty())
-return sendTextFrame("statusupdate: " + status);
+return _docManager->notifyAll("statusupdate: " + status);
 }
 else
 {
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 1d2cd3fdd..4880bc4dc 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -59,6 +59,9 @@ public:
 /// Access to the document instance.
 virtual std::shared_ptr getLOKitDocument() = 0;
 
+/// Send msg to all active sessions.
+virtual bool notifyAll(const std::string& msg) = 0;
+
 /// Send updated view info to all active sessions.
 virtual void notifyViewInfo() = 0;
 virtual void updateEditorSpeeds(int id, int speed) = 0;
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 75d208e64..40fe64ff9 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1594,6 +1594,13 @@ private:
 return _editorId;
 }
 
+/// Notify all views with the given message
+bool notifyAll(const std::string& msg) override
+{
+// Broadcast updated viewinfo to all clients.
+return sendTextFrame("client-all " + msg);
+}
+
 /// Notify all views of viewId and their associated usernames
 void notifyViewInfo() override
 {
@@ -1641,10 +1648,9 @@ private:
 
 oss.seekp(-1, std::ios_base::cur); // Remove last comma.
 oss << "]";
-const std::string msg = oss.str();
 
 // Broadcast updated viewinfo to all clients.
-sendTextFrame("client-all " + msg);
+notifyAll(oss.str());
 }
 
 void updateEditorSpeeds(int id, int speed) override
diff --git a/loleaflet/css/partsPreviewControl.css 
b/loleaflet/css/partsPreviewControl.css
index 66e47c9bb..39bba0121 100644
--- a/loleaflet/css/partsPreviewControl.css
+++ b/loleaflet/css/partsPreviewControl.css
@@ -27,10 +27,19 @@
border: 2px solid #dfdfdf;
}
 
-.preview-img-selected {
-   border-color: #00;
+/* The current part the user is on. */
+.preview-img-currentpart {
+border-color: #00;
+border-style: solid;
 }
 
+/* One of (potentially many) selected parts, but not the current. */
+.preview-img-selectedpart {
+border-color: #00;
+border-style: dotted;
+}
+
+/* Highlight where a slide can be dropped when reordering by drag-and-drop. */
 .preview-img-dropsite {
 border-bottom: 2px solid red;
 }
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 8f0629957..25ffd099d 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -25,6 +25,7 @@ L.Control.PartsPreview = L.Control.extend({
_updateDisabled: function (e) {
var part

[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/ChildSession.hpp loleaflet/css loleaflet/src wsd/ClientSession.cpp wsd/protocol.txt

[Ashod Nakashian (via logerrit)]

 kit/ChildSession.cpp  |   33 ++
 kit/ChildSession.hpp  |1 
 loleaflet/css/partsPreviewControl.css |6 ++
 loleaflet/src/control/Control.PartsPreview.js |   61 ++
 wsd/ClientSession.cpp |   18 +++
 wsd/protocol.txt  |4 +
 6 files changed, 122 insertions(+), 1 deletion(-)

New commits:
commit 2eab5cea763d037ed7d11f0ba88b8299edc592ff
Author: Ashod Nakashian 
AuthorDate: Mon Sep 17 07:17:31 2018 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:33:04 2019 +0200

wsd: leaflet: support reordering of slides via drag-and-drop

Change-Id: I1b471ba07dd0a1016a0759de729171ae968262cb
Reviewed-on: https://gerrit.libreoffice.org/69635
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71099

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index fc41597e5..be169fc6f 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -232,6 +232,10 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 {
 return selectClientPart(buffer, length, tokens);
 }
+else if (tokens[0] == "moveselectedclientparts")
+{
+return moveSelectedClientParts(buffer, length, tokens);
+}
 else if (tokens[0] == "setpage")
 {
 return setPage(buffer, length, tokens);
@@ -1964,6 +1968,35 @@ bool ChildSession::selectClientPart(const char* 
/*buffer*/, int /*length*/, cons
 return true;
 }
 
+bool ChildSession::moveSelectedClientParts(const char* /*buffer*/, int 
/*length*/, const std::vector& tokens)
+{
+int nPosition;
+if (tokens.size() < 2 ||
+!getTokenInteger(tokens[1], "position", nPosition))
+{
+sendTextFrame("error: cmd=moveselectedclientparts kind=invalid");
+return false;
+}
+
+getLOKitDocument()->setView(_viewId);
+
+if (getLOKitDocument()->getDocumentType() != LOK_DOCTYPE_TEXT)
+{
+getLOKitDocument()->moveSelectedParts(nPosition, false); // Move, 
don't duplicate.
+
+// Get the status to recreate the previews and correctly order parts.
+const std::string status = 
LOKitHelper::documentStatus(getLOKitDocument()->get());
+if (!status.empty())
+return sendTextFrame("statusupdate: " + status);
+}
+else
+{
+LOG_WRN("ChildSession::moveSelectedClientParts[" << getName() << "]: 
error moving parts on text documents.");
+}
+
+return true; // Non-fatal to fail.
+}
+
 bool ChildSession::setPage(const char* /*buffer*/, int /*length*/, const 
std::vector& tokens)
 {
 int page;
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index cc5ff6a15..1d2cd3fdd 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -269,6 +269,7 @@ private:
 bool saveAs(const char* buffer, int length, const 
std::vector& tokens);
 bool setClientPart(const char* buffer, int length, const 
std::vector& tokens);
 bool selectClientPart(const char* buffer, int length, const 
std::vector& tokens);
+bool moveSelectedClientParts(const char* buffer, int length, const 
std::vector& tokens);
 bool setPage(const char* buffer, int length, const 
std::vector& tokens);
 bool sendWindowCommand(const char* buffer, int length, const 
std::vector& tokens);
 bool signDocumentContent(const char* buffer, int length, const 
std::vector& tokens);
diff --git a/loleaflet/css/partsPreviewControl.css 
b/loleaflet/css/partsPreviewControl.css
index 438b137d3..66e47c9bb 100644
--- a/loleaflet/css/partsPreviewControl.css
+++ b/loleaflet/css/partsPreviewControl.css
@@ -20,7 +20,7 @@
 
 .preview-img {
/* In draw docs, the width of previews are small, but we want a min of 
180px to align it with document's left edge */
-min-width: 180px;
+   min-width: 180px;
vertical-align: middle;
max-width: 184px;
cursor: pointer;
@@ -30,3 +30,7 @@
 .preview-img-selected {
border-color: #00;
 }
+
+.preview-img-dropsite {
+border-bottom: 2px solid red;
+}
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 3ebe4baaa..8f0629957 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -85,6 +85,7 @@ L.Control.PartsPreview = L.Control.extend({
 
_createPreview: function (i, hashCode, bottomBound) {
var frame = L.DomUtil.create('div', 'preview-frame', 
this._scrollContainer);
+   this._addDnDHandlers(frame);
L.DomUtil.create('span', 'preview-helper', frame);
 
var imgClassName = 'preview-img';
@@ -209,6 +210,7 @@ L.Control.PartsPreview = L.Control.extend({
for (it = 0; it < parts; it++) {
if (this._previewTiles[it].hash !== 
e.partNames[it])

[Libreoffice-commits] online.git: loleaflet/src wsd/ClientSession.cpp wsd/protocol.txt

[Ashod Nakashian (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |2 +-
 wsd/ClientSession.cpp |4 +++-
 wsd/protocol.txt  |7 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 8e118889cbabc279d7cf6746576330816f0e562c
Author: Ashod Nakashian 
AuthorDate: Mon Sep 17 06:45:57 2018 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:32:09 2019 +0200

wsd: leaflet: support statusupdate: messages to sync clients

This new message is identical to status: except it doesn't
imply (re)connection. It's unfortunate that status: is
assumed to be sent only when establishing connection and
loading a document, so we need a different notification
that can be sent at any time, without triggering
initalization logic on the client-side.

Change-Id: I9c804119aec292b873aeed132cc32f13c030d845
Reviewed-on: https://gerrit.libreoffice.org/69634
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71098

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 87cf380f4..63a47d4bc 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -452,7 +452,7 @@ L.TileLayer = L.GridLayer.extend({
else if (textMsg.startsWith('statechanged:')) {
this._onStateChangedMsg(textMsg);
}
-   else if (textMsg.startsWith('status:')) {
+   else if (textMsg.startsWith('status:') || 
textMsg.startsWith('statusupdate:')) {
this._onStatusMsg(textMsg);
}
else if (textMsg.startsWith('textselection:')) {
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index e12f57a46..f10f08724 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -404,6 +404,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
  tokens[0] != "selectclientpart" &&
  tokens[0] != "setpage" &&
  tokens[0] != "status" &&
+ tokens[0] != "statusupdate" &&
  tokens[0] != "tile" &&
  tokens[0] != "tilecombine" &&
  tokens[0] != "uno" &&
@@ -419,6 +420,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
  tokens[0] != "removesession" &&
  tokens[0] != "renamefile")
 {
+LOG_ERR("Session [" << getId() << "] got unknown command [" << 
tokens[0] << "].");
 sendTextFrame("error: cmd=" + tokens[0] + " kind=unknown");
 return false;
 }
@@ -481,7 +483,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 {
 return sendFontRendering(buffer, length, tokens, docBroker);
 }
-else if (tokens[0] == "status")
+else if (tokens[0] == "status" || tokens[0] == "statusupdate")
 {
 assert(firstLine.size() == static_cast(length));
 return forwardToChild(firstLine, docBroker);
diff --git a/wsd/protocol.txt b/wsd/protocol.txt
index 0df5bdb9c..a1bdb39cb 100644
--- a/wsd/protocol.txt
+++ b/wsd/protocol.txt
@@ -373,11 +373,16 @@ saveas: url= name=
  is the resulting name (without path) that was created on the wopi
 host. It can differ from what was requested in case the file already 
existed.
 
-status: type= parts= current= 
width= height= viewid= [partNames]
+status: type= parts= current= 
width= height= viewid= hiddenparts= 
selectedparts= [partNames]
 
  is 'text, 'spreadsheet', 'presentation', 'drawing' or 'other. 
Others are numbers.
 if the document has multiple parts and those have names, part names follow 
separated by '\n'
 
+statusupdate: type= parts= 
current= width= height= viewid= 
hiddenparts= selectedparts= [partNames]
+
+Same as status: but issued whenever the document parts have updated 
significantly.
+status: implies document loading. statusupdate: is just an update.
+
 styles: {"styleFamily": ["styles in family"], etc. }
 
 statechanged: =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian (via logerrit)]

 kit/KitHelper.hpp  |   51 -
 loleaflet/src/control/Parts.js |1 
 loleaflet/src/core/Socket.js   |7 +
 3 files changed, 38 insertions(+), 21 deletions(-)

New commits:
commit 7d03d68e1ac9a483a48bc01ad00aa1af79561736
Author: Ashod Nakashian 
AuthorDate: Sun Sep 16 17:32:56 2018 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:30:42 2019 +0200

wsd: leaflet: status now includes selected parts

Change-Id: I3eeb2fbc52d28047dd0ab7e4318fa44d5c5c0a98
Reviewed-on: https://gerrit.libreoffice.org/69632
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71096

diff --git a/kit/KitHelper.hpp b/kit/KitHelper.hpp
index b0962276a..0c449262c 100644
--- a/kit/KitHelper.hpp
+++ b/kit/KitHelper.hpp
@@ -64,32 +64,41 @@ namespace LOKitHelper
 
 if (type == LOK_DOCTYPE_SPREADSHEET || type == 
LOK_DOCTYPE_PRESENTATION)
 {
-if (type == LOK_DOCTYPE_SPREADSHEET)
+std::ostringstream hposs;
+std::ostringstream sposs;
+for (int i = 0; i < parts; ++i)
 {
-std::ostringstream hposs;
-for (int i = 0; i < parts; ++i)
+ptrValue = loKitDocument->pClass->getPartInfo(loKitDocument, 
i);
+const std::string partinfo(ptrValue);
+std::free(ptrValue);
+for (const auto& prop : Util::JsonToMap(partinfo))
 {
-
-ptrValue = 
loKitDocument->pClass->getPartInfo(loKitDocument, i);
-std::string partinfo(ptrValue);
-std::free(ptrValue);
-const auto aPartInfo = Util::JsonToMap(partinfo);
-for (const auto& prop: aPartInfo)
+const std::string& name = prop.first;
+if (name == "visible")
 {
-const std::string& name = prop.first;
-if (name == "visible")
-{
-if (prop.second == "0")
-hposs << i << ",";
-}
+if (prop.second == "0")
+hposs << i << ',';
+}
+else if (name == "selected")
+{
+if (prop.second == "1")
+sposs << i << ',';
 }
 }
-std::string hiddenparts = hposs.str();
-if (!hiddenparts.empty())
-{
-hiddenparts.pop_back();
-oss << " hiddenparts=" << hiddenparts;
-}
+}
+
+std::string hiddenparts = hposs.str();
+if (!hiddenparts.empty())
+{
+hiddenparts.pop_back(); // Remove last ','
+oss << " hiddenparts=" << hiddenparts;
+}
+
+std::string selectedparts = sposs.str();
+if (!selectedparts.empty())
+{
+selectedparts.pop_back(); // Remove last ','
+oss << " selectedparts=" << selectedparts;
 }
 
 for (int i = 0; i < parts; ++i)
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 49a8de3ec..24e57ba55 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -57,6 +57,7 @@ L.Map.include({
// part is the part index/id
// how is 0 to deselect, 1 to select, and 2 to toggle selection
selectPart: function (part, how, external) {
+   //TODO: Update/track selected parts.
var docLayer = this._docLayer;
if (typeof (part) === 'number' && part >= 0 && part < 
docLayer._parts) {
var selectedPart = part;
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index e676b724a..5488697c9 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -976,6 +976,13 @@ L.Socket = L.Class.extend({

command.hiddenparts.push(parseInt(item));
});
}
+   else if (tokens[i].startsWith('selectedparts=')) {
+   var selectedparts = 
tokens[i].substring(14).split(',');
+   command.selectedparts = [];
+   selectedparts.forEach(function (item) {
+   
command.selectedparts.push(parseInt(item));
+   });
+   }
}
if (command.tileWidth && command.tileHeight && 
this._map._docLayer) {
var defaultZoom = this._map.options.zoom;
___

[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/ChildSession.hpp loleaflet/src wsd/ClientSession.cpp wsd/protocol.txt

[Ashod Nakashian (via logerrit)]

 kit/ChildSession.cpp  |   30 ++
 kit/ChildSession.hpp  |1 
 loleaflet/src/control/Control.PartsPreview.js |   12 +-
 loleaflet/src/control/Parts.js|   25 -
 wsd/ClientSession.cpp |   20 +
 wsd/protocol.txt  |9 +++
 6 files changed, 95 insertions(+), 2 deletions(-)

New commits:
commit eaed3615bb08b50a27592346e6e18aa8c438ff0f
Author: Ashod Nakashian 
AuthorDate: Tue Sep 11 19:30:55 2018 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:30:05 2019 +0200

wsd: loleaflet: select multiple parts

Primarily support for selecting multiple slides
to edit their properties together.

Change-Id: I96c7ec048668494b5b769677db6874df91cbb42d
Reviewed-on: https://gerrit.libreoffice.org/69631
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71095

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index c3dd0a3ae..fc41597e5 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -228,6 +228,10 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 {
 return setClientPart(buffer, length, tokens);
 }
+else if (tokens[0] == "selectclientpart")
+{
+return selectClientPart(buffer, length, tokens);
+}
 else if (tokens[0] == "setpage")
 {
 return setPage(buffer, length, tokens);
@@ -1934,6 +1938,32 @@ bool ChildSession::setClientPart(const char* /*buffer*/, 
int /*length*/, const s
 return true;
 }
 
+bool ChildSession::selectClientPart(const char* /*buffer*/, int /*length*/, 
const std::vector& tokens)
+{
+int nPart;
+int nSelect;
+if (tokens.size() < 3 ||
+!getTokenInteger(tokens[1], "part", nPart) ||
+!getTokenInteger(tokens[2], "how", nSelect))
+{
+sendTextFrame("error: cmd=selectclientpart kind=invalid");
+return false;
+}
+
+getLOKitDocument()->setView(_viewId);
+
+if (getLOKitDocument()->getDocumentType() != LOK_DOCTYPE_TEXT && nPart != 
getLOKitDocument()->getPart())
+{
+getLOKitDocument()->selectPart(nPart, nSelect);
+}
+else
+{
+LOG_WRN("ChildSession::selectClientPart[" << getName() << "]: error 
selecting part on text documents.");
+}
+
+return true;
+}
+
 bool ChildSession::setPage(const char* /*buffer*/, int /*length*/, const 
std::vector& tokens)
 {
 int page;
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 3a2f6b3cf..cc5ff6a15 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -268,6 +268,7 @@ private:
 bool resetSelection(const char* buffer, int length, const 
std::vector& tokens);
 bool saveAs(const char* buffer, int length, const 
std::vector& tokens);
 bool setClientPart(const char* buffer, int length, const 
std::vector& tokens);
+bool selectClientPart(const char* buffer, int length, const 
std::vector& tokens);
 bool setPage(const char* buffer, int length, const 
std::vector& tokens);
 bool sendWindowCommand(const char* buffer, int length, const 
std::vector& tokens);
 bool signDocumentContent(const char* buffer, int length, const 
std::vector& tokens);
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 82aa8af45..3ebe4baaa 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -138,7 +138,17 @@ L.Control.PartsPreview = L.Control.extend({
_setPart: function (e) {
var part = $('#slide-sorter .mCSB_container 
.preview-frame').index(e.target.parentNode);
if (part !== null) {
-   this._map.setPart(parseInt(part));
+   var partId = parseInt(part);
+
+   if (e.ctrlKey) {
+   this._map.selectPart(partId, 2, false); // 
Toggle selection on ctrl+click.
+   } else if (e.altKey) {
+   console.log('alt');
+   } else if (e.shiftKey) {
+   console.log('shift');
+   } else {
+   this._map.setPart(partId);
+   }
}
},
 
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 1b309146c..49a8de3ec 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -1,6 +1,6 @@
 /* -*- js-indent-level: 8 -*- */
 /*
- * Document parts switching handler
+ * Document parts switching and selecting handler
  */
 L.Map.include({
setPart: function (part, external, calledFromSetPartHandler) {
@@ -54,6 +54,29 @@ L.Map.include({
}
},
 
+   // part is the part index/id
+   // how is 0 to dese

[Libreoffice-commits] online.git: common/Util.cpp

[Ashod Nakashian (via logerrit)]

 common/Util.cpp |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f1aa98af75d75eb0a3ad43fdd1d2e2d0732bac56
Author: Ashod Nakashian 
AuthorDate: Sun Apr 14 14:14:12 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:28:07 2019 +0200

wsd: Use unordered map for anonymization

And simplify the trace-logging enablement check.

Change-Id: I4f5c9e08912b8dbc708b191b80032660ce4e1ba0
Reviewed-on: https://gerrit.libreoffice.org/70742
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71093

diff --git a/common/Util.cpp b/common/Util.cpp
index 774b522db..9cba4a24c 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -683,7 +684,7 @@ namespace Util
 return std::make_tuple(base, filename, ext, params);
 }
 
-static std::map AnonymizedStrings;
+static std::unordered_map AnonymizedStrings;
 static std::atomic AnonymizationCounter(0);
 static std::mutex AnonymizedMutex;
 
@@ -692,8 +693,7 @@ namespace Util
 if (plain.empty() || anonymized.empty())
 return;
 
-auto &log = Log::logger();
-if (log.trace() && plain != anonymized)
+if (Log::traceEnabled() && plain != anonymized)
 LOG_TRC("Anonymizing [" << plain << "] -> [" << anonymized << 
"].");
 
 std::unique_lock lock(AnonymizedMutex);
@@ -709,8 +709,7 @@ namespace Util
 const auto it = AnonymizedStrings.find(text);
 if (it != AnonymizedStrings.end())
 {
-auto &log = Log::logger();
-if (log.trace() && text != it->second)
+if (Log::traceEnabled() && text != it->second)
 LOG_TRC("Found anonymized [" << text << "] -> [" << 
it->second << "].");
 return it->second;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: tools/Config.cpp

[Ashod Nakashian (via logerrit)]

 tools/Config.cpp |   30 ++
 1 file changed, 30 insertions(+)

New commits:
commit 159e6d0f7288cb44b81ab72c9f3c99dfb69f4f4c
Author: Ashod Nakashian 
AuthorDate: Mon Apr 1 00:13:03 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:28:49 2019 +0200

looltool: support anonymizing strings

The user is able to override the salt,
or use the one from the config file.

Change-Id: Ida634374549fb490ec2437f557d46c44d4760c56
Reviewed-on: https://gerrit.libreoffice.org/70036
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71094

diff --git a/tools/Config.cpp b/tools/Config.cpp
index 3bffb0ddc..2cf45ac3f 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -74,6 +74,8 @@ public:
 static std::string ConfigFile;
 static std::string SupportKeyString;
 static bool SupportKeyStringProvided;
+static std::uint64_t AnonymizationSalt;
+static bool AnonymizationSaltProvided;
 
 protected:
 void defineOptions(OptionSet&) override;
@@ -91,6 +93,8 @@ std::string Config::ConfigFile =
 
 std::string Config::SupportKeyString;
 bool Config::SupportKeyStringProvided = false;
+std::uint64_t Config::AnonymizationSalt = 0;
+bool Config::AnonymizationSaltProvided = false;
 
 void Config::displayHelp()
 {
@@ -107,6 +111,7 @@ void Config::displayHelp()
 // Command list
 std::cout << std::endl
   << "Commands: " << std::endl
+  << "anonymize [string-1]...[string-n]" << std::endl
   << "set-admin-password" << std::endl
 #if ENABLE_SUPPORT_KEY
   << "set-support-key" << std::endl
@@ -146,6 +151,11 @@ void Config::defineOptions(OptionSet& optionSet)
 .repeatable(false)
 .argument("key"));
 #endif
+
+optionSet.addOption(Option("anonymization-salt", "", "Anonymize strings 
with the given 64-bit salt instead of the one in the config file.")
+.required(false)
+.repeatable(false)
+.argument("salt"));
 }
 
 void Config::handleOption(const std::string& optionName, const std::string& 
optionValue)
@@ -195,6 +205,12 @@ void Config::handleOption(const std::string& optionName, 
const std::string& opti
 SupportKeyString = optionValue;
 SupportKeyStringProvided = true;
 }
+else if (optionName == "anonymization-salt")
+{
+AnonymizationSalt = std::stoull(optionValue);
+AnonymizationSaltProvided = true;
+std::cout << "Anonymization Salt: [" << AnonymizationSalt << "]." << 
std::endl;
+}
 }
 
 int Config::main(const std::vector& args)
@@ -354,6 +370,20 @@ int Config::main(const std::vector& args)
 if (retval != 0)
 std::cerr << "Error when executing command." << std::endl;
 }
+else if (args[0] == "anonymize")
+{
+if (!AnonymizationSaltProvided)
+{
+const std::string val = 
_loolConfig.getString("logging.anonymize.anonymization_salt");
+AnonymizationSalt = std::stoull(val);
+std::cout << "Anonymization Salt: [" << AnonymizationSalt << "]." 
<< std::endl;
+}
+
+for (std::size_t i = 1; i < args.size(); ++i)
+{
+std::cout << "[" << args[i] << "]: " << 
Util::anonymizeUrl(args[i], AnonymizationSalt) << std::endl;
+}
+}
 else
 {
 std::cerr << "No such command, \"" << args[0]  << "\"" << std::endl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/WebSocketHandler.hpp

[Ashod Nakashian (via logerrit)]

 net/WebSocketHandler.hpp |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit fca12fc1ab45c4c215ffd05814a34bb8b9855c8e
Author: Ashod Nakashian 
AuthorDate: Sun Mar 31 23:30:05 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:27:26 2019 +0200

wsd: formatting

Change-Id: I07b91c494fe89395ebe1e91506baef46dc03aca8
Reviewed-on: https://gerrit.libreoffice.org/70035
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71092

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 30381a7ed..f37d459a2 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -227,7 +227,8 @@ public:
 
 if (payloadLen + headerLen > len)
 { // partial read wait for more data.
-LOG_TRC("#" << socket->getFD() << ": Still incomplete WebSocket 
frame, have " << len << " bytes, frame is " << payloadLen + headerLen << " 
bytes");
+LOG_TRC("#" << socket->getFD() << ": Still incomplete WebSocket 
frame, have " << len
+<< " bytes, frame is " << payloadLen + headerLen << " 
bytes");
 return false;
 }
 
@@ -238,7 +239,8 @@ public:
 return true;
 }
 
-LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket data of " << 
len << " bytes: " << Util::stringifyHexLine(socket->getInBuffer(), 0, 
std::min((size_t)32, len)));
+LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket data of " << 
len << " bytes: "
+<< Util::stringifyHexLine(socket->getInBuffer(), 0, 
std::min((size_t)32, len)));
 
 data = p + headerLen;
 
@@ -693,7 +695,8 @@ protected:
 {
 std::shared_ptr socket = _socket.lock();
 
-LOG_TRC("Incoming client websocket upgrade response: " << 
std::string(&socket->getInBuffer()[0], socket->getInBuffer().size()));
+LOG_TRC("Incoming client websocket upgrade response: "
+<< std::string(&socket->getInBuffer()[0], 
socket->getInBuffer().size()));
 
 bool bOk = false;
 StreamSocket::MessageMap map;
@@ -715,8 +718,9 @@ protected:
 map._headerSize = itBody - socket->getInBuffer().begin() + 
marker.size();
 }
 
-if (response.getStatus() == 
Poco::Net::HTTPResponse::HTTP_SWITCHING_PROTOCOLS &&
-response.has("Upgrade") && 
Poco::icompare(response.get("Upgrade"), "websocket") == 0)
+if (response.getStatus() == 
Poco::Net::HTTPResponse::HTTP_SWITCHING_PROTOCOLS
+&& response.has("Upgrade")
+&& Poco::icompare(response.get("Upgrade"), "websocket") == 0)
 {
 #if 0 // SAL_DEBUG ...
 const std::string wsKey = response.get("Sec-WebSocket-Accept", 
"");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Util.cpp common/Util.hpp kit/Kit.cpp loolwsd.xml.in test/WhiteBoxTests.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Ashod Nakashian (via logerrit)]

 common/Util.cpp|   37 -
 common/Util.hpp|8 ++---
 kit/Kit.cpp|   13 ++--
 loolwsd.xml.in |3 +-
 test/WhiteBoxTests.cpp |   72 +++--
 wsd/LOOLWSD.cpp|8 -
 wsd/LOOLWSD.hpp|6 ++--
 7 files changed, 103 insertions(+), 44 deletions(-)

New commits:
commit 919a93cd4b123f3757ce1ae454ed622019d1d02c
Author: Ashod Nakashian 
AuthorDate: Sun Apr 14 12:21:19 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 04:26:35 2019 +0200

wsd: improved anonymization algorithm

Better hashing algorithm based on FNV-1a.
Adds support for salting the hash, and
for providing salt via configuration.

More unit-tests added, and better formatting.

Change-Id: I2be42675d0cdbaa73c3d7faed99e07631a9c20fc
Reviewed-on: https://gerrit.libreoffice.org/70034
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71091

diff --git a/common/Util.cpp b/common/Util.cpp
index bb3983239..774b522db 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -304,16 +304,16 @@ namespace Util
 return true;
 }
 
-std::string encodeId(const unsigned number, const int padding)
+std::string encodeId(const std::uint64_t number, const int padding)
 {
 std::ostringstream oss;
 oss << std::hex << std::setw(padding) << std::setfill('0') << number;
 return oss.str();
 }
 
-unsigned decodeId(const std::string& str)
+std::uint64_t decodeId(const std::string& str)
 {
-unsigned id = 0;
+std::uint64_t id = 0;
 std::stringstream ss;
 ss << std::hex << str;
 ss >> id;
@@ -684,7 +684,7 @@ namespace Util
 }
 
 static std::map AnonymizedStrings;
-static std::atomic AnonymizationSalt(0);
+static std::atomic AnonymizationCounter(0);
 static std::mutex AnonymizedMutex;
 
 void mapAnonymized(const std::string& plain, const std::string& anonymized)
@@ -701,7 +701,7 @@ namespace Util
 AnonymizedStrings[plain] = anonymized;
 }
 
-std::string anonymize(const std::string& text)
+std::string anonymize(const std::string& text, const std::uint64_t 
nAnonymizationSalt)
 {
 {
 std::unique_lock lock(AnonymizedMutex);
@@ -716,15 +716,26 @@ namespace Util
 }
 }
 
-// We just need something irreversible, short, and
-// quite simple.
-std::size_t hash = 0;
+// Modified 64-bit FNV-1a to add salting.
+// For the algorithm and the magic numbers, see 
http://isthe.com/chongo/tech/comp/fnv/
+std::uint64_t hash = 0xCBF29CE484222325LL;
+hash ^= nAnonymizationSalt;
+hash *= 0x10001b3ULL;
 for (const char c : text)
-hash += c;
+{
+hash ^= static_cast(c);
+hash *= 0x10001b3ULL;
+}
+
+hash ^= nAnonymizationSalt;
+hash *= 0x10001b3ULL;
 
 // Generate the anonymized string. The '#' is to hint that it's 
anonymized.
-// Prepend with salt to make it unique, in case we get collisions 
(which we will, eventually).
-const std::string res = '#' + Util::encodeId(AnonymizationSalt++, 0) + 
'#' + Util::encodeId(hash, 0) + '#';
+// Prepend with count to make it unique within a single process 
instance,
+// in case we get collisions (which we will, eventually). N.B.: 
Identical
+// strings likely to have different prefixes when logged in WSD 
process vs. Kit.
+const std::string res
+= '#' + Util::encodeId(AnonymizationCounter++, 0) + '#' + 
Util::encodeId(hash, 0) + '#';
 mapAnonymized(text, res);
 return res;
 }
@@ -739,7 +750,7 @@ namespace Util
 return filename;
 }
 
-std::string anonymizeUrl(const std::string& url)
+std::string anonymizeUrl(const std::string& url, const std::uint64_t 
nAnonymizationSalt)
 {
 std::string base;
 std::string filename;
@@ -747,7 +758,7 @@ namespace Util
 std::string params;
 std::tie(base, filename, ext, params) = Util::splitUrl(url);
 
-return base + Util::anonymize(filename) + ext + params;
+return base + Util::anonymize(filename, nAnonymizationSalt) + ext + 
params;
 }
 
 std::string getHttpTimeNow()
diff --git a/common/Util.hpp b/common/Util.hpp
index 9e01181fa..e16479f68 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -74,9 +74,9 @@ namespace Util
 /// Hex to unsigned char
 bool dataFromHexString(const std::string& hexString, std::vector& data);
 /// Encode an integral ID into a string, with padding support.
-std::string encodeId(const unsigned number, const int padding = 5);
+std::string encodeId(const std::uint64_t number, const int padding = 5);
 /// Decode an integral ID from a string.
-u

[Libreoffice-commits] online.git: configure.ac kit/Kit.cpp loolwsd.xml.in wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp wsd/Storage.cpp

[Ashod Nakashian (via logerrit)]

 configure.ac   |   35 +-
 kit/Kit.cpp|   18 ++-
 loolwsd.xml.in |3 --
 wsd/ClientSession.cpp  |2 -
 wsd/DocumentBroker.cpp |2 -
 wsd/LOOLWSD.cpp|   57 +
 wsd/LOOLWSD.hpp|7 ++
 wsd/Storage.cpp|   20 ++---
 8 files changed, 66 insertions(+), 78 deletions(-)

New commits:
commit 226c2fe71c53f4c8e460bf13a30870aaa0ea7581
Author: Ashod Nakashian 
AuthorDate: Sun Apr 14 12:24:45 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 03:42:19 2019 +0200

wsd: unify anonymization flags under one

This simplifies the anonymization configuration
as virtually always they are all either enabled
together, or not at all.

Change-Id: I6fe60f5287fc5d71cd7a6ac3268eac67e5e6e9fb
Reviewed-on: https://gerrit.libreoffice.org/70033
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/71090

diff --git a/configure.ac b/configure.ac
index 681d5bdde..711de7d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,13 +59,9 @@ AC_ARG_ENABLE([browsersync],
   AS_HELP_STRING([--enable-browsersync],
  [Don't copy files to the target directory but 
create the symlink to allow browsersync usage]))
 
-AC_ARG_ENABLE([anonymize-usernames],
-  AS_HELP_STRING([--enable-anonymize-usernames],
- [Enable anonymization/obfuscation of usernames in 
logs]))
-
-AC_ARG_ENABLE([anonymize-filenames],
-  AS_HELP_STRING([--enable-anonymize-filenames],
- [Enable anonymization/obfuscation of filenames in 
logs]))
+AC_ARG_ENABLE([anonymization],
+  AS_HELP_STRING([--enable-anonymization],
+ [Enable anonymization/obfuscation of user-data in 
logs]))
 
 AC_ARG_ENABLE([iosapp],
   AS_HELP_STRING([--enable-iosapp],
@@ -213,8 +209,7 @@ ENABLE_DEBUG=
 LOOLWSD_LOGLEVEL="warning"
 LOOLWSD_LOG_TO_FILE="false"
 LOOLWSD_LOGFILE="/var/log/loolwsd.log"
-LOOLWSD_ANONYMIZE_FILENAMES=false
-LOOLWSD_ANONYMIZE_USERNAMES=false
+LOOLWSD_ANONYMIZE_USER_DATA=false
 LOLEAFLET_LOGGING="false"
 debug_msg="secure mode: product build"
 anonym_msg=""
@@ -224,8 +219,7 @@ if test "$enable_debug" = "yes"; then
LOOLWSD_LOGLEVEL="trace"
LOOLWSD_LOG_TO_FILE="true"
LOOLWSD_LOGFILE="/tmp/loolwsd.log"
-   LOOLWSD_ANONYMIZE_FILENAMES=false
-   LOOLWSD_ANONYMIZE_USERNAMES=false
+   LOOLWSD_ANONYMIZE_USER_DATA=false
LOLEAFLET_LOGGING="true"
debug_msg="low security debugging mode"
 else
@@ -252,22 +246,15 @@ if test -n "$with_logfile" ; then
 fi
 AC_SUBST(LOOLWSD_LOGFILE)
 
-if test "$enable_anonymize_filenames" = "yes" ; then
-   LOOLWSD_ANONYMIZE_FILENAMES=true
-   anonym_msg="filenames anonymized; "
-fi
-AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_FILENAMES],[$LOOLWSD_ANONYMIZE_FILENAMES],[Enable
 permanent filenames anonymization in logs])
-AC_SUBST(LOOLWSD_ANONYMIZE_FILENAMES)
-
-if test "$enable_anonymize_usernames" = "yes" ; then
-   LOOLWSD_ANONYMIZE_USERNAMES=true
-   anonym_msg="${anonym_msg}usernames anonymized; "
+if test "$enable_anonymization" = "yes" ; then
+   LOOLWSD_ANONYMIZE_USER_DATA=true
+   anonym_msg="anonymization of user-data is enabled"
 fi
-AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_USERNAMES],[$LOOLWSD_ANONYMIZE_USERNAMES],[Enable
 permanent usernames anonymization in logs])
-AC_SUBST(LOOLWSD_ANONYMIZE_USERNAMES)
+AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_USER_DATA],[$LOOLWSD_ANONYMIZE_USER_DATA],[Enable
 permanent anonymization in logs])
+AC_SUBST(LOOLWSD_ANONYMIZE_USER_DATA)
 
 if test -z "$anonym_msg";  then
-  anonym_msg="no anonymization of usernames or filenames"
+  anonym_msg="anonymization of user-data is disabled"
 fi
 
 # macOS: When configuring for building the app itself, on macOS, we need these.
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index c76e4cf50..425c0b5fb 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -112,8 +112,7 @@ using std::size_t;
 class Document;
 static std::shared_ptr document;
 #ifndef BUILDING_TESTS
-static bool AnonymizeFilenames = false;
-static bool AnonymizeUsernames = false;
+static bool AnonymizeUserData = false;
 static std::string ObfuscatedFileId;
 #endif
 
@@ -2236,7 +2235,7 @@ protected:
 logger << _socketName << ": recv [";
 for (const std::string& token : tokens)
 {
-// Don't log PII, there are anonymized versions that get 
logged instead.
+// Don't log user-data, there are anonymized versions that get 
logged instead.
 if (Util::startsWith(token, "jail") ||
 Util::startsWith(token, "author") ||
 Util::startsWith(token, "name") ||
@@ -2468,10 +2467,8 @@ void lokit_main(
 LOG_INF("Setting log-level to [trace] and delaying setting to 
configured [" << LogLevel 

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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/core/Socket.js |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 74e28ad711f6d18e9ccb96a6c35ab0dd7f19475b
Author: Ashod Nakashian 
AuthorDate: Sat Mar 30 12:15:09 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 03:39:32 2019 +0200

leaflet: suppress empty error messages

This also adds support to suppress errors
by setting their message to blank.

Change-Id: I2baabd121afb59c48e950b139f984c64d1720512
Reviewed-on: https://gerrit.libreoffice.org/70032
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/71089
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ddb23f24b..e676b724a 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -509,12 +509,15 @@ L.Socket = L.Class.extend({
return;
}
 
-   // Parse the storage url as link
-   var tmpLink = document.createElement('a');
-   tmpLink.href = this._map.options.doc;
-   // Insert the storage server address to be more friendly
-   storageError = storageError.replace('%storageserver', 
tmpLink.host);
-   this._map.fire('warn', {msg: storageError});
+   // Skip empty errors (and allow for suppressing errors 
by making them blank).
+   if (storageError != '') {
+   // Parse the storage url as link
+   var tmpLink = document.createElement('a');
+   tmpLink.href = this._map.options.doc;
+   // Insert the storage server address to be more 
friendly
+   storageError = 
storageError.replace('%storageserver', tmpLink.host);
+   this._map.fire('warn', {msg: storageError});
+   }
 
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Log.cpp

[Ashod Nakashian (via logerrit)]

 common/Log.cpp |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c6c673ed6fb5ff213fcd3030a38e221d28e6aa86
Author: Ashod Nakashian 
AuthorDate: Sun Mar 24 23:16:29 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 03:38:43 2019 +0200

wsd: cache the logger instance to avoid costly lookups

Change-Id: Idf9261d46b44afc42a960146886c180e37d8d51f
Reviewed-on: https://gerrit.libreoffice.org/69641
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/71085
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/common/Log.cpp b/common/Log.cpp
index 5a0c2655d..4441eb785 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -45,11 +45,13 @@ namespace Log
 struct StaticNameHelper
 {
 private:
-std::atomic _inited;
+Poco::Logger* _logger;
 std::string _name;
 std::string _id;
+std::atomic _inited;
 public:
 StaticNameHelper() :
+_logger(nullptr),
 _inited(true)
 {
 }
@@ -67,6 +69,9 @@ namespace Log
 void setName(const std::string& name) { _name = name; }
 
 const std::string& getName() const { return _name; }
+
+void setLogger(Poco::Logger* logger) { _logger = logger; };
+Poco::Logger* getLogger() { return _logger; }
 };
 static StaticNameHelper Source;
 
@@ -179,6 +184,7 @@ namespace Log
  * */
 channel->open();
 auto& logger = Poco::Logger::create(Source.getName(), channel, 
Poco::Message::PRIO_TRACE);
+Source.setLogger(&logger);
 
 logger.setLevel(logLevel.empty() ? std::string("trace") : logLevel);
 
@@ -201,7 +207,9 @@ namespace Log
 
 Poco::Logger& logger()
 {
-return Poco::Logger::get(Source.getInited() ? Source.getName() : 
std::string());
+Poco::Logger* pLogger = Source.getLogger();
+return pLogger ? *pLogger
+   : Poco::Logger::get(Source.getInited() ? 
Source.getName() : std::string());
 }
 
 #if !MOBILEAPP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: bundled/include kit/ChildSession.cpp kit/Kit.cpp kit/KitHelper.hpp tools/KitClient.cpp

[Ashod Nakashian (via logerrit)]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h  |   30 +
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx|   38 +-
 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |  112 +++
 kit/ChildSession.cpp |   23 +--
 kit/Kit.cpp  |8 -
 kit/KitHelper.hpp|  101 -
 tools/KitClient.cpp  |   54 -
 7 files changed, 193 insertions(+), 173 deletions(-)

New commits:
commit 32007cbb329f4d2bb1b44d0353ad141996d623f7
Author: Ashod Nakashian 
AuthorDate: Fri Aug 16 09:24:38 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 03:38:08 2019 +0200

Update LOK headers and reuse callback-type-to-string helper

Also, avoid repeatedly converting INT_MAX to string.
It's an arbitrary large number, so use 1 billion,
which is probably more easily recognizable as an
arbitrary large number.

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

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index e4e96483c..93b430f5d 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -378,6 +378,36 @@ struct _LibreOfficeKitDocumentClass
 /// @see lok::Document::createViewWithOptions().
 int (*createViewWithOptions) (LibreOfficeKitDocument* pThis, const char* 
pOptions);
 
+/// @see lok::Document::selectPart().
+void (*selectPart) (LibreOfficeKitDocument* pThis, int nPart, int nSelect);
+
+/// @see lok::Document::moveSelectedParts().
+void (*moveSelectedParts) (LibreOfficeKitDocument* pThis, int nPosition, 
bool bDuplicate);
+
+/// Resize window with given id.
+/// @see lok::Document::resizeWindow().
+void (*resizeWindow) (LibreOfficeKitDocument* pThis, unsigned nWindowId,
+  const int width, const int height);
+
+/// Pass a nullptr terminated array of mime-type strings
+/// @see lok::Document::getClipboard for more details
+int (*getClipboard) (LibreOfficeKitDocument* pThis,
+ const char **pMimeTypes,
+ size_t  *pOutCount,
+ char  ***pOutMimeTypes,
+ size_t **pOutSizes,
+ char  ***pOutStreams);
+
+/// @see lok::Document::setClipboard
+int (*setClipboard) (LibreOfficeKitDocument* pThis,
+ const size_t   nInCount,
+ const char   **pInMimeTypes,
+ const size_t  *pInSizes,
+ const char   **pInStreams);
+
+/// @see lok::Document::getSelectionType
+int (*getSelectionType) (LibreOfficeKitDocument* pThis);
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 0d1c6e94d..517a38a50 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -188,7 +188,7 @@ public:
  *
  * @param nWindowid
  */
-void postWindow(unsigned nWindowId, int nAction, const char* pData)
+void postWindow(unsigned nWindowId, int nAction, const char* pData = 
nullptr)
 {
 return mpDoc->pClass->postWindow(mpDoc, nWindowId, nAction, pData);
 }
@@ -436,7 +436,7 @@ public:
 /**
  * Returns a json mapping of the possible values for the given command
  * e.g. {commandName: ".uno:StyleApply", commandValues: {"familyName1" : 
["list of style names in the family1"], etc.}}
- * @param pCommand a uno command for which the possible values are 
requested
+ * @param pCommand a UNO command for which the possible values are 
requested
  * @return {commandName: unoCmd, commandValues: {possible_values}}
  */
 char* getCommandValues(const char* pCommand)
@@ -676,7 +676,7 @@ public:
 /**
  * Gets an image of the selected shapes.
  * @param pOutput contains the result; use free to deallocate.
- * @return the size ouf *pOutput in bytes.
+ * @return the size of *pOutput in bytes.
  */
 size_t renderShapeSelection(char** pOutput)
 {
@@ -698,6 +698,36 @@ public:
 {
 return mpDoc->pClass->postWindowGestureEvent(mpDoc, nWindowId, pType, 
nX, nY, nOffset);
 }
+
+/// Set a part's selection mode.
+/// nSelect is 0 to deselect, 1 to select, and 2 to toggle.
+void selectPart(int nPart, int nSelect)
+{
+mpDoc->pClass->selectPart(mpDoc, nPart, nSelect);
+}
+
+/// Moves the selected pages/slides to a new position.
+/// nPosition is the new position where the sele

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

[Ashod Nakashian (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |  103 ++
 libreofficekit/source/gtk/lokdocview.cxx |  105 ---
 2 files changed, 105 insertions(+), 103 deletions(-)

New commits:
commit 6c80baa5c2aa33aa39f65f6223bf380e9e4e3c94
Author: Ashod Nakashian 
AuthorDate: Fri Aug 16 09:08:10 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Sat Aug 17 00:28:50 2019 +0200

LOK: move LOK callback-type-to-string helper to header

This is a very common function that is used by clients
as well as LO Core, so makes sense to have it implemented
once and updated when new callback-types are added,
all in one place.

Change-Id: Id6a1d6bcf5585d7be440b62a0c3a9c993e46e5e0
Reviewed-on: https://gerrit.libreoffice.org/77587
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian 

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 43762cc54c48..44bf83eab205 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITENUMS_H
 #define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITENUMS_H
 
+#include 
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -706,6 +708,107 @@ typedef enum
 }
 LibreOfficeKitExtTextInputType;
 
+/// Returns the string representation of a LibreOfficeKitCallbackType 
enumeration element.
+static inline const char* lokCallbackTypeToString(int nType)
+{
+switch (static_cast(nType))
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+return "LOK_CALLBACK_INVALIDATE_TILES";
+case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
+return "LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR";
+case LOK_CALLBACK_TEXT_SELECTION:
+return "LOK_CALLBACK_TEXT_SELECTION";
+case LOK_CALLBACK_TEXT_SELECTION_START:
+return "LOK_CALLBACK_TEXT_SELECTION_START";
+case LOK_CALLBACK_TEXT_SELECTION_END:
+return "LOK_CALLBACK_TEXT_SELECTION_END";
+case LOK_CALLBACK_CURSOR_VISIBLE:
+return "LOK_CALLBACK_CURSOR_VISIBLE";
+case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
+return "LOK_CALLBACK_VIEW_CURSOR_VISIBLE";
+case LOK_CALLBACK_GRAPHIC_SELECTION:
+return "LOK_CALLBACK_GRAPHIC_SELECTION";
+case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
+return "LOK_CALLBACK_GRAPHIC_VIEW_SELECTION";
+case LOK_CALLBACK_CELL_CURSOR:
+return "LOK_CALLBACK_CELL_CURSOR";
+case LOK_CALLBACK_HYPERLINK_CLICKED:
+return "LOK_CALLBACK_HYPERLINK_CLICKED";
+case LOK_CALLBACK_MOUSE_POINTER:
+return "LOK_CALLBACK_MOUSE_POINTER";
+case LOK_CALLBACK_STATE_CHANGED:
+return "LOK_CALLBACK_STATE_CHANGED";
+case LOK_CALLBACK_STATUS_INDICATOR_START:
+return "LOK_CALLBACK_STATUS_INDICATOR_START";
+case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
+return "LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE";
+case LOK_CALLBACK_STATUS_INDICATOR_FINISH:
+return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
+case LOK_CALLBACK_SEARCH_NOT_FOUND:
+return "LOK_CALLBACK_SEARCH_NOT_FOUND";
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+return "LOK_CALLBACK_DOCUMENT_SIZE_CHANGED";
+case LOK_CALLBACK_SET_PART:
+return "LOK_CALLBACK_SET_PART";
+case LOK_CALLBACK_SEARCH_RESULT_SELECTION:
+return "LOK_CALLBACK_SEARCH_RESULT_SELECTION";
+case LOK_CALLBACK_DOCUMENT_PASSWORD:
+return "LOK_CALLBACK_DOCUMENT_PASSWORD";
+case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
+return "LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY";
+case LOK_CALLBACK_CONTEXT_MENU:
+return "LOK_CALLBACK_CONTEXT_MENU";
+case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
+return "LOK_CALLBACK_INVALIDATE_VIEW_CURSOR";
+case LOK_CALLBACK_TEXT_VIEW_SELECTION:
+return "LOK_CALLBACK_TEXT_VIEW_SELECTION";
+case LOK_CALLBACK_CELL_VIEW_CURSOR:
+return "LOK_CALLBACK_CELL_VIEW_CURSOR";
+case LOK_CALLBACK_CELL_ADDRESS:
+return "LOK_CALLBACK_CELL_ADDRESS";
+case LOK_CALLBACK_CELL_FORMULA:
+return "LOK_CALLBACK_CELL_FORMULA";
+case LOK_CALLBACK_UNO_COMMAND_RESULT:
+return "LOK_CALLBACK_UNO_COMMAND_RESULT";
+case LOK_CALLBACK_ERROR:
+return "LOK_CALLBACK_ERROR";
+case LOK_CALLBACK_VIEW_LOCK:
+return "LOK_CALLBACK_VIEW_LOCK";
+case LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED:
+return "LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED";
+case LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED:
+return "LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED";
+case LOK_CALLBACK_INVALIDATE_HEADER:
+return "LOK_CALLBACK_INVALIDATE_HEADER";
+case LOK_CALLBACK_COMMENT:
+return "LOK_CALLBACK_COMMENT";
+case LOK_CALLBACK_RULER_UPDATE:
+return "LOK_CALLBACK_RULER_UPDATE";
+case LOK_CALLBACK_WINDOW:
+return "LOK_CALLBACK_WINDOW";
+case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
+ 

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d658e1f5e88b82dbd9c0ba48e5b742a3872b0453
Author: Miklos Vajna 
AuthorDate: Fri Aug 16 16:56:15 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 16 23:35:30 2019 +0200

CppunitTest_sw_uiwriter: fix top/left confusion in testImageComment

This worked before as usually both are 1418, but in the case of
 the left
is a larger value (4194), while the top stays the same.

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index d2035512c393..e59f84a68c68 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1626,6 +1626,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment)
 CPPUNIT_ASSERT_GREATER(static_cast(0), rAnchored.size());
 SwAnchoredObject* pObject = rAnchored[0];
 long nFrameLeft = pObject->GetObjRect().Left();
+long nFrameTop = pObject->GetObjRect().Top();
 
 // Make sure that the anchor points to the bottom left corner of the image.
 // Without the accompanying fix in place, this test would have failed with:
@@ -1659,7 +1660,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment)
 OString aExpected;
 aExpected += OString::number(nFrameLeft);
 aExpected += ", ";
-aExpected += OString::number(nFrameLeft);
+aExpected += OString::number(nFrameTop);
 aExpected += ", 0, 0";
 CPPUNIT_ASSERT_EQUAL(aExpected, aAnchorPos);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |8 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |8 
 2 files changed, 16 deletions(-)

New commits:
commit f52d015b04779b8aaa3e353cbd9d0d5da3e73a16
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 08:21:01 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 16 22:32:19 2019 +0200

get_current_page_help_id is now tried first already

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 90481eaf0c7e..a5a8dc8c1592 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5590,14 +5590,6 @@ void SalInstanceWidget::help_hierarchy_foreach(const 
std::functionGetParent()))
 {
-if (m_pBuilder && pParent->IsDialog())
-{
-// tdf#122355 before trying dialog help, check to see if there is 
a notebook
-// called tabcontrol, and try the help for the current page of 
that first
-OString sPageHelpId(m_pBuilder->get_current_page_help_id());
-if (!sPageHelpId.isEmpty() && func(sPageHelpId))
-return;
-}
 if (func(pParent->GetHelpId()))
 return;
 }
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index aa831c1bfbb9..97069acbb568 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -10919,14 +10919,6 @@ void GtkInstanceWidget::help_hierarchy_foreach(const 
std::functionget_current_page_help_id());
-if (!sPageHelpId.isEmpty() && func(sPageHelpId))
-return;
-}
 if (func(::get_help_id(pParent)))
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source compilerplugins/clang dbaccess/source extensions/source include/svtools include/vcl solenv/clang-format svtools/Library_svt.mk svtools/source sw/source vc

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/dlg_CreationWizard.cxx |6 +--
 chart2/source/controller/dialogs/tp_ChartType.cxx   |4 +-
 chart2/source/controller/dialogs/tp_ChartType.hxx   |6 +--
 chart2/source/controller/dialogs/tp_DataSource.cxx  |   10 ++---
 chart2/source/controller/dialogs/tp_DataSource.hxx  |6 +--
 chart2/source/controller/dialogs/tp_RangeChooser.cxx|6 +--
 chart2/source/controller/dialogs/tp_RangeChooser.hxx|6 +--
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx |2 -
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |6 +--
 compilerplugins/clang/constantparam.numbers.results |8 ++--
 dbaccess/source/ext/macromigration/macromigrationpages.cxx  |4 +-
 dbaccess/source/ext/macromigration/macromigrationpages.hxx  |6 +--
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx  |2 -
 dbaccess/source/ui/dlg/ConnectionPageSetup.hxx  |2 -
 dbaccess/source/ui/dlg/adminpages.cxx   |2 -
 dbaccess/source/ui/dlg/adminpages.hxx   |6 +--
 dbaccess/source/ui/dlg/dbwiz.cxx|6 +--
 dbaccess/source/ui/dlg/dbwizsetup.cxx   |3 +
 dbaccess/source/ui/inc/dbwiz.hxx|6 +--
 dbaccess/source/ui/inc/dbwizsetup.hxx   |2 -
 extensions/source/abpilot/abpfinalpage.cxx  |4 +-
 extensions/source/abpilot/abpfinalpage.hxx  |2 -
 extensions/source/abpilot/abspage.hxx   |4 +-
 extensions/source/abpilot/tableselectionpage.cxx|2 -
 extensions/source/abpilot/tableselectionpage.hxx|2 -
 extensions/source/abpilot/typeselectionpage.cxx |2 -
 extensions/source/abpilot/typeselectionpage.hxx |2 -
 extensions/source/dbpilots/commonpagesdbp.cxx   |4 +-
 extensions/source/dbpilots/commonpagesdbp.hxx   |4 +-
 extensions/source/dbpilots/controlwizard.cxx|4 +-
 extensions/source/dbpilots/controlwizard.hxx|6 +--
 extensions/source/dbpilots/gridwizard.cxx   |7 +--
 extensions/source/dbpilots/gridwizard.hxx   |2 -
 extensions/source/dbpilots/groupboxwiz.cxx  |   18 
+-
 extensions/source/dbpilots/groupboxwiz.hxx  |   10 ++---
 extensions/source/dbpilots/listcombowizard.cxx  |   12 ++
 extensions/source/dbpilots/listcombowizard.hxx  |6 +--
 include/svtools/roadmapwizard.hxx   |6 +--
 include/svtools/strings.hrc |3 -
 include/vcl/wizardmachine.hxx   |   16 
 solenv/clang-format/blacklist   |4 +-
 svtools/Library_svt.mk  |1 
 svtools/source/dialogs/roadmapwizard.cxx|   18 
+-
 svtools/source/uno/wizard/wizardpagecontroller.cxx  |4 --
 svtools/source/uno/wizard/wizardpagecontroller.hxx  |6 +--
 svtools/source/uno/wizard/wizardshell.cxx   |8 ++--
 svtools/source/uno/wizard/wizardshell.hxx   |2 -
 sw/source/ui/dbui/mailmergewizard.cxx   |4 +-
 sw/source/ui/dbui/mmaddressblockpage.cxx|8 ++--
 sw/source/ui/dbui/mmaddressblockpage.hxx|6 +--
 sw/source/ui/dbui/mmdocselectpage.cxx   |   12 +++---
 sw/source/ui/dbui/mmdocselectpage.hxx   |6 +--
 sw/source/ui/dbui/mmgreetingspage.cxx   |6 +--
 sw/source/ui/dbui/mmgreetingspage.hxx   |6 +--
 sw/source/ui/dbui/mmlayoutpage.cxx  |8 ++--
 sw/source/ui/dbui/mmlayoutpage.hxx  |6 +--
 sw/source/ui/dbui/mmoutputtypepage.cxx  |4 +-
 sw/source/ui/dbui/mmoutputtypepage.hxx  |4 +-
 sw/source/ui/inc/mmresultdialogs.hxx|1 
 sw/source/uibase/inc/mailmergewizard.hxx|2 -
 vcl/Library_vcl.mk  |1 
 vcl/inc/strings.hrc |4 ++
 vcl/source/control/wizardmachine.cxx|   14 +++
 63 files changed, 173 insertions(+), 177 deletions(-)

New commits:
commit 4d450704d672dddf2c555fda5ff3140d8c537d02
Author: Caolán McNamara 
AuthorDate: Sat Aug 3 20:17:38 2019 +0100
Commit: Caolán McNamara 
CommitD

[Libreoffice-commits] core.git: sfx2/source solenv/doc svl/source sw/source

[Andrea Gelmini (via logerrit)]

 sfx2/source/doc/objmisc.cxx |2 +-
 sfx2/source/view/ipclient.cxx   |2 +-
 solenv/doc/gbuild/doxygen.cfg   |2 +-
 svl/source/items/itemset.cxx|2 +-
 sw/source/core/text/atrstck.cxx |4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit bf888e249079fa7bb791041e0699eb7bd41de327
Author: Andrea Gelmini 
AuthorDate: Fri Aug 16 21:40:44 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 22:23:08 2019 +0200

Fix typos

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

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6fc2027bc2df..df52c23c0b7c 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -361,7 +361,7 @@ void SfxObjectShell::SetReadOnlyUI( bool bReadOnly )
 
 /*  [Description]
 
-Turns the document in an r/o and r/w state respectively without reloading
+Turns the document in a r/o and r/w state respectively without reloading
 it and without changing the open mode of the medium.
 */
 
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 07fd91bbdd5c..2e50126df545 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -509,7 +509,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( 
const awt::Rectangle& aPo
 Size aNewObjSize( long( aNewLogicRect.GetWidth()  / m_aScaleWidth ),
   long( aNewLogicRect.GetHeight() / m_aScaleHeight ) );
 
-// now remove scaling from new placement and keep this a the new 
object area
+// now remove scaling from new placement and keep this at the new 
object area
 aNewLogicRect.SetSize( aNewObjSize );
 m_aObjArea = aNewLogicRect;
 
diff --git a/solenv/doc/gbuild/doxygen.cfg b/solenv/doc/gbuild/doxygen.cfg
index af0ba2171919..d66fe0cd1670 100644
--- a/solenv/doc/gbuild/doxygen.cfg
+++ b/solenv/doc/gbuild/doxygen.cfg
@@ -1422,7 +1422,7 @@ RTF_HYPERLINKS = NO
 
 RTF_STYLESHEET_FILE=
 
-# Set optional variables used in the generation of an rtf document.
+# Set optional variables used in the generation of an RTF document.
 # Syntax is similar to doxygen's config file.
 
 RTF_EXTENSIONS_FILE=
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 75709c3f4072..1faf57230a58 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -55,7 +55,7 @@ sal_uInt16 Count_Impl( const sal_uInt16 *pRanges )
 
 /**
  * Determines the total number of sal_uInt16s described in a 0-terminated
- * array of pairs of sal_uInt16s, each representing an range of sal_uInt16s.
+ * array of pairs of sal_uInt16s, each representing a range of sal_uInt16s.
  */
 sal_uInt16 Capacity_Impl( const sal_uInt16 *pRanges )
 {
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 3447e0e2b889..b195e2ddaafb 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -526,7 +526,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const 
sal_uInt16 nAttr )
 else if ( RES_TXTATR_CJK_RUBY == nAttr )
 {
 // ruby stack has no more attributes
-// check, if an rotation attribute has to be applied
+// check, if a rotation attribute has to be applied
 const sal_uInt16 nTwoLineStack = StackPos[ RES_CHRATR_TWO_LINES ];
 bool bTwoLineAct = false;
 const SwTextAttr* pTwoLineAttr = GetTop(nTwoLineStack);
@@ -543,7 +543,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const 
sal_uInt16 nAttr )
 if ( bTwoLineAct )
 return;
 
-// eventually, an rotate attribute has to be activated
+// eventually, a rotate attribute has to be activated
 const sal_uInt16 nRotateStack = StackPos[ RES_CHRATR_ROTATE ];
 const SwTextAttr* pRotateAttr = GetTop(nRotateStack);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/source/filter/xml/xmltbli.cxx|2 
+-
 writerfilter/inc/dmapper/resourcemodel.hxx  |2 
+-
 xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java |4 
++--
 xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java |6 
+++---
 xmloff/source/forms/propertyimport.hxx  |2 
+-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f8cb50799e34b0adb0c36c392502deb7baf556c5
Author: Andrea Gelmini 
AuthorDate: Fri Aug 16 21:40:46 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 22:21:50 2019 +0200

Fix typos

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

diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 4356945c11b6..d5fcebe1667c 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2375,7 +2375,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox )
 // All column that have absolute widths get relative widths;
 // these widths relate to each over like the original absolute
 // widths. The smallest column gets a width that has the same
-// value as the smallest column that has an relative width
+// value as the smallest column that has a relative width
 // already.
 if( 0 == nMinRelColWidth )
 nMinRelColWidth = nMinAbsColWidth;
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx 
b/writerfilter/inc/dmapper/resourcemodel.hxx
index cb6cae6cd4d5..728c6ed9a641 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -58,7 +58,7 @@ typedef sal_uInt32 Id;
 namespace writerfilter {
 
 /**
-Reference to an resource that generates events and sends them to a
+Reference to a resource that generates events and sends them to a
 handler.
 
 The reference can be resolved, i.e. the resource generates its
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
index 4347c70fc6f8..3ec19e7484be 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
@@ -33,7 +33,7 @@ package org.openoffice.xmerge;
  * utilizes to know how the "Office" {@code Document} tags are
  * supported in the "Device" format.
  *
- * The {@code DocumentMerger} object is created by a the
+ * The {@code DocumentMerger} object is created by the
  * {@code DocumentMergerFactory} {@link
  * org.openoffice.xmerge.DocumentMergerFactory#createDocumentMerger
  * createDocumenMerger} method.  When it is constructed, the "Original
@@ -71,4 +71,4 @@ public interface DocumentMerger {
  * @throws  MergeException  If any merge error occurs.
  */
 void merge(Document modifiedDoc) throws MergeException;
-}
\ No newline at end of file
+}
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
index c31e07c54ef1..87f5da1c2fe4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
@@ -25,10 +25,10 @@ import java.io.IOException;
  * "Office" {@code Document} to a "Device" {@code Document}
  * format.
  *
- * The {@code DocumentSerializer} object is created by a the
+ * The {@code DocumentSerializer} object is created by the
  * {@code PluginFactory} {@link
  * org.openoffice.xmerge.DocumentSerializerFactory#createDocumentSerializer
- * createDocumentSerializer} method.  When it is constructed, a
+ * createDocumentSerializer} method.  When it is constructed, an
  * "Office" {@code Document} object is passed in to be used as input.
  * 
  *
@@ -51,4 +51,4 @@ public interface DocumentSerializer {
  * @throws  IOException   If any I/O error occurs.
  */
 ConvertData serialize() throws ConvertException, IOException;
-}
\ No newline at end of file
+}
diff --git a/xmloff/source/forms/propertyimport.hxx 
b/xmloff/source/forms/propertyimport.hxx
index 2f95767a5721..a08727902dbb 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -123,7 +123,7 @@ namespace xmloff
 
 /** determine if the element imported by the object had a given 
attribute.
 Please be aware of the fact that the name given must be a local 
name, i.e. not contain a namespace.
-All form relevant attributes are in the same namespace, so this 
would be an redundant information.
+All form relevant attributes are in the same namespace, so this 
would be a redu

[Libreoffice-commits] core.git: include/svtools include/tools odk/examples offapi/com

[Andrea Gelmini (via logerrit)]

 include/svtools/templatefoldercache.hxx  | 
   2 +-
 include/tools/diagnose_ex.h  | 
   2 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java | 
   2 +-
 odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java| 
   2 +-
 offapi/com/sun/star/chart2/XRegressionCurveContainer.idl | 
   2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3681229b125238b02e03cf1bdf53b404f080f091
Author: Andrea Gelmini 
AuthorDate: Fri Aug 16 21:40:42 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 22:21:07 2019 +0200

Fix typos

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

diff --git a/include/svtools/templatefoldercache.hxx 
b/include/svtools/templatefoldercache.hxx
index 2bcba8e7ec65..abaa5ec99e7c 100644
--- a/include/svtools/templatefoldercache.hxx
+++ b/include/svtools/templatefoldercache.hxx
@@ -32,7 +32,7 @@ namespace svt
 
 class TemplateFolderCacheImpl;
 /** allows to cache the state of the template directories of OOo
-Usually, this class is used together with an instance of a the
+Usually, this class is used together with an instance of the
 DocumentTemplates 
service. It allows to scan the template folders
 of the Office, and updates the configuration so that it reflects the 
most recent state of the folders.
 As this is an expensive, the TemplateFolderCache has been introduced. 
It caches the state of the template
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 2d76241cadd0..fc814d91db40 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -91,7 +91,7 @@ inline css::uno::Any DbgGetCaughtException()
arg ); }
 
 /** This macro asserts the given condition (in debug mode), and throws
-an RuntimeException afterwards.
+a RuntimeException afterwards.
  */
 #define ENSURE_OR_THROW(c, m) \
 if( !(c) ){ \
diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
index 9388181f3b15..617e38047106 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
@@ -39,7 +39,7 @@
 // __ Implementation __
 
 /**
- * support ONE singleton uno connection to an running office installation!
+ * support ONE singleton uno connection to a running office installation!
  * Can be used to open/use/close connection to uno environment of an office. If
  * necessary a new office instance is started.
  * ctor isn't available from outside. You should call static function
diff --git a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java 
b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
index 0e9e5fadd273..d8db72aad323 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
@@ -40,7 +40,7 @@ import com.sun.star.uno.UnoRuntime;
 // __ Implementation __
 
 /**
- * support ONE singleton uno connection to an running office installation!
+ * support ONE singleton uno connection to a running office installation!
  * Can be used to open/use/close connection to uno environment of an already 
running office.
  * ctor isn't available from outside. You should call static function 
"getConnection()"
  * to open or use internal set connection which is created one times only.
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl 
b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
index db48fd9c680d..05b76365b3a8 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
@@ -35,7 +35,7 @@ module chart2
 
 interface XRegressionCurveContainer : com::sun::star::uno::XInterface
 {
-/** add an regression curve to the container
+/** add a regression curve to the container
 
 @throws IllegalArgumentException
 If the given regression curve is already contained in the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dtrans/source framework/source include/connectivity include/svtools

[Andrea Gelmini (via logerrit)]

 dtrans/source/win32/clipb/MtaOleClipb.hxx |2 +-
 dtrans/source/win32/dtobj/TxtCnvtHlp.cxx  |4 ++--
 framework/source/loadenv/loadenv.cxx  |4 ++--
 include/connectivity/dbmetadata.hxx   |2 +-
 include/svtools/ctrlbox.hxx   |2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit fdf032c366c6c8ba854a2e922dd25ff390be66e1
Author: Andrea Gelmini 
AuthorDate: Fri Aug 16 21:40:41 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 22:20:21 2019 +0200

Fix typos

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

diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx 
b/dtrans/source/win32/clipb/MtaOleClipb.hxx
index 58583ce6c7e5..bf71ac26e8f8 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx
@@ -56,7 +56,7 @@ public:
 private:
 unsigned int run( );
 
-// create a hidden window which serves as an request target; so we
+// create a hidden window which serves as a request target; so we
 // guarantee synchronization
 void createMtaOleReqWnd( );
 
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx 
b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
index 91f26ed9f0c0..1ea9f4c9f549 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
@@ -76,7 +76,7 @@ int MultiByteToWideCharEx( UINT cp_src,
 // setup a global memory pointer
 CRawHGlobalPtr ptrHGlob( refDTransHelper );
 
-// do the conversion an return
+// do the conversion and return
 return MultiByteToWideChar( cp_src,
 0,
 lpMultiByteString,
@@ -110,7 +110,7 @@ int WideCharToMultiByteEx( UINT cp_dest,
 // setup a global memory pointer
 CRawHGlobalPtr ptrHGlob( refDTransHelper );
 
-// do the conversion an return
+// do the conversion and return
 return WideCharToMultiByte( cp_dest,
 0,
 lpWideCharString,
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index ff19bdff0006..73180facd46a 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1190,8 +1190,8 @@ css::uno::Reference< css::uno::XInterface > 
LoadEnv::impl_searchLoader()
 throw LoadEnvException(LoadEnvException::ID_INVALID_ENVIRONMENT);
 }
 
-// Otherwise ...
-// We need this type information to locate an registered frame loader
+// Otherwise...
+// We need this type information to locate a registered frame loader
 // Without such information we can't work!
 OUString sType = 
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME(),
 OUString());
 if (sType.isEmpty())
diff --git a/include/connectivity/dbmetadata.hxx 
b/include/connectivity/dbmetadata.hxx
index 21c8d63013c6..085b30b52875 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -66,7 +66,7 @@ namespace dbtools
 @throws css::sdbc::SQLException
 if obtaining the meta data from the connection throws an 
SQLException
 @throws css::uno::RuntimeException
-if obtaining the meta data from the connection throws an 
RuntimeException
+if obtaining the meta data from the connection throws a 
RuntimeException
 */
 DatabaseMetaData(
 const css::uno::Reference< css::sdbc::XConnection >& _connection );
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 06c97e2ccff3..56b7f55026e8 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -175,7 +175,7 @@ All sizes are in 1/10 typographic point (pt).
 
 The passed FontList must be retained until the next fill call.
 
-Additionally it supports an relative mod, which allows entering
+Additionally it supports a relative mod, which allows entering
 percentage values. This, eg., can be useful for template dialogs.
 This mode can only be enabled, but not disabled again.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 canvas/source/directx/dx_textlayout_drawhelper.cxx  |2 +-
 cli_ure/source/uno_bridge/cli_data.cxx  |2 +-
 dbaccess/source/core/dataaccess/databasecontext.cxx |2 +-
 dbaccess/source/ui/control/tabletree.cxx|4 ++--
 dtrans/source/win32/clipb/MtaOleClipb.cxx   |2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit de6422b5f3a5e06fe1994442a0f1c277ebed2a45
Author: Andrea Gelmini 
AuthorDate: Fri Aug 16 21:40:40 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 22:19:34 2019 +0200

Fix typos

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

diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx 
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index cc3afab92c3a..c751b941e8b5 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -73,7 +73,7 @@ namespace dxcanvas
 {
 HDC hdc = rGraphics->GetHDC();
 
-// issue an ReleaseHDC() when leaving the scope
+// issue a ReleaseHDC() when leaving the scope
 const ::comphelper::ScopeGuard aGuard(
 [&rGraphics, &hdc]() mutable { rGraphics->ReleaseHDC(hdc); } );
 
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx 
b/cli_ure/source/uno_bridge/cli_data.cxx
index 16f7047a80dd..4545538a1f5b 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -80,7 +80,7 @@ System::Object^ Bridge::map_uno2cli(uno_Interface * pUnoI, 
typelib_InterfaceType
 retVal = CliEnvHolder::g_cli_env->getRegisteredInterface(sOid, 
ifaceType);
 if (retVal)
 {
-// There is already an registered object. It can either be a proxy
+// There is already a registered object. It can either be a proxy
 // for the UNO object or a real cli object. In the first case we
 // tell the proxy that it shall also represent the current UNO
 // interface. If it already does that, then it does nothing
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 0bcdb475c353..1c6cb283fe29 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -635,7 +635,7 @@ Any ODatabaseContext::getByName(const OUString& _rName)
 if ( xExistent.is() )
 return makeAny( xExistent );
 
-// see whether this is an registered name
+// see whether this is a registered name
 OUString sURL;
 if ( hasRegisteredDatabase( _rName ) )
 {
diff --git a/dbaccess/source/ui/control/tabletree.cxx 
b/dbaccess/source/ui/control/tabletree.cxx
index a0e126254062..19dd1429eefb 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -168,7 +168,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< 
XConnection >& _rxConn
 }
 catch(RuntimeException&)
 {
-OSL_FAIL("OTableTreeListBox::UpdateTableList : caught an 
RuntimeException!");
+OSL_FAIL("OTableTreeListBox::UpdateTableList : caught a 
RuntimeException!");
 }
 catch ( const SQLException& )
 {
@@ -210,7 +210,7 @@ void TableTreeListBox::UpdateTableList( const Reference< 
XConnection >& _rxConne
 }
 catch(RuntimeException&)
 {
-OSL_FAIL("OTableTreeListBox::UpdateTableList : caught an 
RuntimeException!");
+OSL_FAIL("OTableTreeListBox::UpdateTableList : caught a 
RuntimeException!");
 }
 catch ( const SQLException& )
 {
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx 
b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index ea9f6dfb380f..ae831cc76bb2 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -389,7 +389,7 @@ HRESULT CMtaOleClipboard::setClipboard( IDataObject* 
pIDataObject )
 // destroyed before the ole clipboard
 // can acquire it
 // remember: pIDataObject may be NULL
-// which is an request to clear the
+// which is a request to clear the
 // current clipboard content
 if ( pIDataObject )
 pIDataObject->AddRef( );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com reportbuilder/java sc/source

[Andrea Gelmini (via logerrit)]

 offapi/com/sun/star/document/XGraphicObjectResolver.idl
   |2 +-
 offapi/com/sun/star/form/validation/ValidatableControlModel.idl
   |2 +-
 offapi/com/sun/star/ucb/ListEvent.idl  
   |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
 |2 +-
 sc/source/filter/inc/stylesbuffer.hxx  
   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0650ffefe0ff680e0ef7de9cce724b0e47d8c359
Author: Andrea Gelmini 
AuthorDate: Fri Aug 16 21:40:43 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 22:19:01 2019 +0200

Fix typos

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

diff --git a/offapi/com/sun/star/document/XGraphicObjectResolver.idl 
b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
index ea8f5ea270b7..2296a0c2c6cb 100644
--- a/offapi/com/sun/star/document/XGraphicObjectResolver.idl
+++ b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
@@ -36,7 +36,7 @@ published interface XGraphicObjectResolver: 
com::sun::star::uno::XInterface
 /** converts the given URL from the source URL namespace to the destination
 URL space of this instance.
 
-@deprecated since LibreOffice 6.1 - throws an RuntimeException if 
called
+@deprecated since LibreOffice 6.1 - throws a RuntimeException if called
 */
 string resolveGraphicObjectURL( [in] string aURL );
 };
diff --git a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl 
b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
index 7af85a9282b5..cf5591e09bbb 100644
--- a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
@@ -49,7 +49,7 @@ service ValidatableControlModel
 
 /** enables support for validating the value of the control model
 
-Setting an retrieving the current validator of the control model is
+Setting and retrieving the current validator of the control model is
 possible via the XValidatable interface (which
 XValidatableFormComponent is derived from).
 
diff --git a/offapi/com/sun/star/ucb/ListEvent.idl 
b/offapi/com/sun/star/ucb/ListEvent.idl
index 3f465515c09f..84a4f663b5a9 100644
--- a/offapi/com/sun/star/ucb/ListEvent.idl
+++ b/offapi/com/sun/star/ucb/ListEvent.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module ucb {
 published struct ListEvent: com::sun::star::lang::EventObject
 {
 /** If you apply the given ListActions one after the other
-to the old version of an result set in given order, you will get the
+to the old version of a result set in given order, you will get the
 positions in the new version.
 */
 sequence Changes;
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
index 11a3693463a0..956a6928361a 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
@@ -35,7 +35,7 @@ import org.jfree.report.structure.Element;
 /**
  * This layoutcontroller simply checks, whether the parent layout controller
  * is an OfficeGroupLayoutController and whether this layout controller is
- * processing the normal flow or an repeating section. If a repeating section
+ * processing the normal flow or a repeating section. If a repeating section
  * is being processed, an marker attribute is added to the element's call
  * to OutputProcessor.startElement() and OutputProcessor.endElement().
  *
diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 61d438684761..897c7904156a 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -243,7 +243,7 @@ public:
 const css::awt::FontDescriptor& getFontDescriptor() const { return 
maApiData.maDesc;}
 /** Returns true, if the font requires rich text formatting in Calc.
 @descr  Example: Font escapement is a cell attribute in Excel, but Calc
-needs an rich text cell for this attribute. */
+needs a rich text cell for this attribute. */
 boolneedsRichTextFormat() const;
 
 voidfillToItemSet( SfxItemSet& rItemSet, bool 
bEditEngineText, bool bSkipPoolDefs = false ) const;
___
Libreoff

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

[Noel Grandin (via logerrit)]

 include/svx/pszctrl.hxx |2 ++
 include/svx/zoomctrl.hxx|2 ++
 sd/source/ui/app/tmplctrl.cxx   |1 -
 svx/source/stbctrls/insctrl.cxx |1 -
 svx/source/stbctrls/pszctrl.cxx |   31 +--
 svx/source/stbctrls/zoomctrl.cxx|   12 
 sw/source/uibase/utlui/bookctrl.cxx |1 -
 sw/source/uibase/utlui/tmplctrl.cxx |1 -
 sw/source/uibase/utlui/zoomctrl.cxx |6 +-
 9 files changed, 38 insertions(+), 19 deletions(-)

New commits:
commit c53f3f8f58f55d0978fb968446975856d72a52f8
Author: Noel Grandin 
AuthorDate: Fri Aug 16 15:33:15 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 16 21:40:17 2019 +0200

tdf#126819 Can't retrieve the mouse position written in the statusbar

regression from
commit 77e260f915e0c77ddb1e915e9fd27ab0bdccc763
Date:   Mon Jul 8 11:22:12 2019 +0200
tdf#121793 speedup VCLXAccessibleStatusBarItem::GetItemText

Make the custom StatusBarControls set better text on their parent
StatusBar. Also remove some unnecessary work being done in the Paint
methods, to reduce confusion.

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

diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index d22e0ba05d18..faf8923d94cc 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -39,6 +39,8 @@ public:
 virtual voidStateChanged( sal_uInt16 nSID, SfxItemState eState, const 
SfxPoolItem* pState ) override;
 virtual voidPaint( const UserDrawEvent& rEvt ) override;
 virtual voidCommand( const CommandEvent& rCEvt ) override;
+private:
+void ImplUpdateItemText();
 };
 
 #endif
diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index afd3130e2c20..e0daa4b971ca 100644
--- a/include/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
@@ -40,6 +40,8 @@ public:
 
 SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& 
rStb );
 
+private:
+void ImplUpdateItemText();
 };
 
 class SVX_DLLPUBLIC SvxZoomPageStatusBarControl : public SfxStatusBarControl
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 2c27db05bafb..c78f1a3ef126 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -89,7 +89,6 @@ void SdTemplateControl::StateChanged(
 
 void SdTemplateControl::Paint( const UserDrawEvent&  )
 {
-GetStatusBar().SetItemText( GetId(), msTemplate );
 }
 
 void SdTemplateControl::Command( const CommandEvent& rCEvt )
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 952f82332f8e..eaad418e4909 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -65,7 +65,6 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , 
SfxItemState eState,
 
 void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
 {
-DrawItemText_Impl();
 }
 
 void SvxInsertStatusBarControl::DrawItemText_Impl()
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 474ca2c81f0d..06877c8f06e4 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -231,6 +231,7 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( 
sal_uInt16 _nSlotId,
 addStatusListener( STR_POSITION); // SID_ATTR_POSITION
 addStatusListener( STR_TABLECELL);   // SID_TABLE_CELL
 addStatusListener( STR_FUNC);// SID_PSZ_FUNCTION
+ImplUpdateItemText();
 }
 
 /*  [Description]
@@ -334,12 +335,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 
nSID, SfxItemState eSt
 
 GetStatusBar().SetItemData( GetId(), nullptr );
 
-//  set only strings as text at the statusBar, so that the Help-Tips
-//  can work with the text, when it is too long for the statusBar
-OUString aText;
-if ( pImpl->bTable )
-aText = pImpl->aStr;
-GetStatusBar().SetItemText( GetId(), aText );
+ImplUpdateItemText();
 }
 
 
@@ -461,4 +457,27 @@ void SvxPosSizeStatusBarControl::Paint( const 
UserDrawEvent& rUsrEvt )
 pDev->SetFillColor( aOldFillColor );
 }
 
+void SvxPosSizeStatusBarControl::ImplUpdateItemText()
+{
+//  set only strings as text at the statusBar, so that the Help-Tips
+//  can work with the text, when it is too long for the statusBar
+OUString aText;
+if ( pImpl->bPos || pImpl->bSize )
+{
+aText = GetMetricStr_Impl( pImpl->aPos.X());
+aText += " / ";
+aText += GetMetricStr_Impl( pImpl->aPos.Y());
+if ( pImpl->bSize )
+{
+aText += " ";
+aText += GetMetricStr_Impl( pImpl->aSize.Width() );
+aText += " x ";
+aText += GetMetricStr_Impl( pImpl->aSize.Height() );
+}
+}
+else if ( pImpl->bTable )
+   aText = pImpl->aStr;
+
+GetStatusBar().SetItemText( GetId()

[Libreoffice-commits] core.git: stoc/test

[Stephan Bergmann (via logerrit)]

 stoc/test/uriproc/test_uriproc.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit db7701a3072117e9808e73bc3a071b236daacfc5
Author: Stephan Bergmann 
AuthorDate: Fri Aug 16 16:44:38 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 21:22:35 2019 +0200

Fix tests taken from RFC 2396

"/g" was missing, and "http:g" had an extra "." (consistently applied to all
three occurrences of "http", but for unclear reasons).

( claims that "?y" is an invalid
example that should be removed, but our algorithm does resolve it to the 
value
 originally given in RFC 2396, so lets keep it for now.)

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

diff --git a/stoc/test/uriproc/test_uriproc.cxx 
b/stoc/test/uriproc/test_uriproc.cxx
index 7b30dd84375f..dbf095a3bd04 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -300,6 +300,8 @@ void Test::testMakeAbsolute() {
   css::uri::RelativeUriExcessParentSegments_ERROR, "http://a/b/c/g"; },
 { "http://a/b/c/d;p?q";, "g/", true,
   css::uri::RelativeUriExcessParentSegments_ERROR, "http://a/b/c/g/"; },
+{ "http://a/b/c/d;p?q";, "/g", true,
+  css::uri::RelativeUriExcessParentSegments_ERROR, "http://a/g"; },
 { "http://a/b/c/d;p?q";, "//g", true,
   css::uri::RelativeUriExcessParentSegments_ERROR, "http://g"; },
 { "http://a/b/c/d;p?q";, "?y", true,
@@ -396,8 +398,8 @@ void Test::testMakeAbsolute() {
 { "http://a/b/c/d;p?q";, "g#s/../x", true,
   css::uri::RelativeUriExcessParentSegments_ERROR,
   "http://a/b/c/g#s/../x"; },
-{ "http.://a/b/c/d;p?q", "http.:g", true,
-  css::uri::RelativeUriExcessParentSegments_ERROR, "http.:g" },
+{ "http://a/b/c/d;p?q";, "http:g", true,
+  css::uri::RelativeUriExcessParentSegments_ERROR, "http:g" },
 
 { "scheme://a", "", true,
   css::uri::RelativeUriExcessParentSegments_ERROR, "scheme://a" },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 sc/source/ui/docshell/docsh.cxx  |   13 --
 sc/source/ui/docshell/docsh4.cxx |   67 ---
 sc/source/ui/docshell/externalrefmgr.cxx |8 +++
 sc/source/ui/inc/docsh.hxx   |2 
 4 files changed, 56 insertions(+), 34 deletions(-)

New commits:
commit 54bf84746a2a9a2e2aaf0df9e429b0cfd538f640
Author: Eike Rathke 
AuthorDate: Fri Aug 16 15:36:15 2019 +0200
Commit: Eike Rathke 
CommitDate: Fri Aug 16 21:00:26 2019 +0200

Resolves: tdf#126928 allow link updates in an intermediate linked document

... if link updates are allowed in the current document and that
intermediate document resides in a trusted location.

This works with both, the "Always (from trusted locations)" and
the "On request" settings under Tools -> Options -> Calc ->
General. It can't work with documents residing in a non-trusted
location as there is no way to allow updates on demand for a such
loaded document (hidden via formulas).

Change-Id: Ie483f7743db7c6d5cf947dc16a9c3660855f3423
Reviewed-on: https://gerrit.libreoffice.org/77588
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ad8d664dd690..6859942b79d4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -582,15 +582,22 @@ bool ScDocShell::Load( SfxMedium& rMedium )
 bool bRet = SfxObjectShell::Load(rMedium);
 if (bRet)
 {
-comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
getEmbeddedObjectContainer();
-rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);
-
 if (GetMedium())
 {
 const SfxUInt16Item* pUpdateDocItem = 
SfxItemSet::GetItem(rMedium.GetItemSet(), SID_UPDATEDOCMODE, 
false);
 m_nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : 
css::document::UpdateDocMode::NO_UPDATE;
 }
 
+// GetLinkUpdateModeState() evaluates m_nCanUpdate so that must have
+// been set first. Do not override an already forbidden LinkUpdate (the
+// default is allow).
+comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
getEmbeddedObjectContainer();
+if (rEmbeddedObjectContainer.getUserAllowsLinkUpdate())
+{
+// For anything else than LM_ALWAYS we need user confirmation.
+rEmbeddedObjectContainer.setUserAllowsLinkUpdate( 
GetLinkUpdateModeState() == LM_ALWAYS);
+}
+
 {
 //  prepare a valid document for XML filter
 //  (for ConvertFrom, InitNew is called before)
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index a46aac7147ba..c83a3f154f72 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -144,6 +144,41 @@ IMPL_LINK_NOARG( ScDocShell, ReloadAllLinksHdl, Button*, 
void )
 SAL_WARN_IF(!pViewFrame, "sc", "expected there to be a ViewFrame");
 }
 
+ScLkUpdMode ScDocShell::GetLinkUpdateModeState() const
+{
+const ScDocument& rDoc = GetDocument();
+
+ScLkUpdMode nSet = rDoc.GetLinkMode();
+
+if (nSet == LM_UNKNOWN)
+{
+ScAppOptions aAppOptions = SC_MOD()->GetAppOptions();
+nSet = aAppOptions.GetLinkMode();
+}
+
+if (m_nCanUpdate == css::document::UpdateDocMode::NO_UPDATE)
+nSet = LM_NEVER;
+else if (m_nCanUpdate == css::document::UpdateDocMode::FULL_UPDATE)
+nSet = LM_ALWAYS;
+
+if (nSet == LM_ALWAYS
+&& !(SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks(
+GetMedium() == nullptr ? OUString() : 
GetMedium()->GetName())
+|| (IsDocShared()
+&& 
SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks(
+GetSharedFileURL()
+{
+nSet = LM_ON_DEMAND;
+}
+if (m_nCanUpdate == css::document::UpdateDocMode::QUIET_UPDATE
+&& nSet == LM_ON_DEMAND)
+{
+nSet = LM_NEVER;
+}
+
+return nSet;
+}
+
 void ScDocShell::Execute( SfxRequest& rReq )
 {
 const SfxItemSet* pReqArgs = rReq.GetArgs();
@@ -441,37 +476,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 break;
 case SID_UPDATETABLINKS:
 {
-ScDocument& rDoc = GetDocument();
-
-ScLkUpdMode nSet = rDoc.GetLinkMode();
-
-if(nSet==LM_UNKNOWN)
-{
-ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
-nSet=aAppOptions.GetLinkMode();
-}
-
-if (m_nCanUpdate == css::document::UpdateDocMode::NO_UPDATE)
-nSet = LM_NEVER;
-else if (m_nCanUpdate == 
css::document::UpdateDocMode::FULL_UPDATE)
-nSet = LM_ALWAYS;
-
-if (nSet == LM_ALWAYS
-&& !(SvtSecurityOptions()
-  

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/unowriter/unowriter.cxx |   23 +++
 sw/source/core/unocore/unoobj.cxx|   12 ++--
 2 files changed, 29 insertions(+), 6 deletions(-)

New commits:
commit 6dc0f6b65e79ca4af69338411e3887d9aaef1cac
Author: Mike Kaganski 
AuthorDate: Fri Aug 16 15:04:15 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri Aug 16 20:46:06 2019 +0200

This was meant to be 'continue', not 'break'

... when commit ee0bf5d58bc59052923c4ced928a989956e71456 had introduced
SwUnoCursorHelper::SetPropertyValues, and the intent obviously was to
skip bad values, populating relevant error messages, and set all correct
values.

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

diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index e819cb9d7d7d..ffb57d836f48 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -621,6 +621,29 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testViewCursorPageStyle)
 CPPUNIT_ASSERT_EQUAL(OUString("Standard"), aActualPageStyleName);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testXTextCursor_setPropertyValues)
+{
+// Create a new document, type a character, pass a set of property/value 
pairs consisting of one
+// unknown property and CharStyleName, assert that it threw 
UnknownPropertyException (actually
+// wrapped into WrappedTargetException), and assert the style was set, not 
discarded.
+loadURL("private:factory/swriter", nullptr);
+
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xBodyText = xTextDocument->getText();
+xBodyText->insertString(xBodyText->getStart(), "x", false);
+
+uno::Reference xCursor(xBodyText->createTextCursor());
+xCursor->goLeft(1, true);
+
+uno::Reference xCursorProps(xCursor, 
uno::UNO_QUERY);
+uno::Sequence aPropNames = { "OneUnknownProperty", 
"CharStyleName" };
+uno::Sequence aPropValues = { uno::Any(), 
uno::Any(OUString("Emphasis")) };
+CPPUNIT_ASSERT_THROW(xCursorProps->setPropertyValues(aPropNames, 
aPropValues),
+ lang::WrappedTargetException);
+CPPUNIT_ASSERT_EQUAL(OUString("Emphasis"),
+ getProperty(xCursorProps, "CharStyleName"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unoobj.cxx 
b/sw/source/core/unocore/unoobj.cxx
index 7da731df197a..0b1b3c78b083 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1784,7 +1784,7 @@ void SwUnoCursorHelper::SetPropertyValues(
 
 // Build set of attributes we want to fetch
 std::vector aWhichPairs;
-std::vector aEntries;
+std::vector> 
aEntries;
 aEntries.reserve(rPropertyValues.getLength());
 for (const auto& rPropVal : rPropertyValues)
 {
@@ -1797,18 +1797,18 @@ void SwUnoCursorHelper::SetPropertyValues(
 if (!pEntry)
 {
 aUnknownExMsg += "Unknown property: '" + rPropertyName + "' ";
-break;
+continue;
 }
 else if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
 {
 aPropertyVetoExMsg += "Property is read-only: '" + rPropertyName + 
"' ";
-break;
+continue;
 } else {
 // FIXME: we should have some nice way of merging ranges surely ?
 aWhichPairs.push_back(pEntry->nWID);
 aWhichPairs.push_back(pEntry->nWID);
 }
-aEntries.push_back(pEntry);
+aEntries.emplace_back(pEntry, rPropVal.Value);
 }
 
 if (!aWhichPairs.empty())
@@ -1821,7 +1821,7 @@ void SwUnoCursorHelper::SetPropertyValues(
 bool bPreviousPropertyCausesSideEffectsInNodes = false;
 for (size_t i = 0; i < aEntries.size(); ++i)
 {
-SfxItemPropertySimpleEntry const*const pEntry = aEntries[i];
+SfxItemPropertySimpleEntry const*const pEntry = aEntries[i].first;
 bool bPropertyCausesSideEffectsInNodes =
 propertyCausesSideEffectsInNodes(pEntry->nWID);
 
@@ -1832,7 +1832,7 @@ void SwUnoCursorHelper::SetPropertyValues(
 SwUnoCursorHelper::GetCursorAttr(rPaM, aItemSet);
 }
 
-const uno::Any &rValue = rPropertyValues[i].Value;
+const uno::Any &rValue = aEntries[i].second;
 // this can set some attributes in nodes' mpAttrSet
 if (!SwUnoCursorHelper::SetCursorPropertyValue(*pEntry, rValue, 
rPaM, aItemSet))
 rPropSet.setPropertyValue(*pEntry, rValue, aItemSet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: We'd like to continue the production of the 32-bit deb packages

[dreamn...@gmail.com]

Finally sort of solved.

We were not able to get ‘make’ without cppunit errors. Tried numerous times
on VMs with Escuelas Linux and Bodhi Linux (both based on Ubuntu 18.04) and
on Debian 10 (on a VM and on a schroot environment).

What we did if after a ‘make’ with errors, we had to ran ‘make
build-nocheck’ to be able to bypass those errors on a Debian 10 schroot
environment. This time, the required debs files were produced. However,
when installing those debs and trying to run LibreOffice on Escuelas Linux
(the main target distribution) it does not work, as it complains about a
glibc mismatch version. So, it seems that the generated deb files are not
distribution-independent as the ones that were previously released by The
Document Foundation.

Under these circumstances, we then proceeded to create the deb files inside
a Escuelas Linux VM.

In Escuelas Linux (and I guess on any Ubuntu 18.04 system) the command

sudo apt-get build-dep libreoffice

does not install all the required packages to pass the autogen.sh phase, as
we found to be the case in Debian 10. It complains about missing KF5 stuff,
so we installed these (some packages might not be necessary, but at least
this worked)


sudo apt-get install \

 libkf5archive-dev libkf5bookmarks-dev libkf5coreaddons-dev libkf5config-dev \
 libkf5configwidgets-dev libkf5dbusaddons-dev libkf5kio-dev
libkf5widgetsaddons-dev \
 libkf5notifyconfig-dev libkf5newstuff-dev libkf5xmlgui-dev
libkf5declarative-dev \
 libkf5notifications-dev libkf5guiaddons-dev libkf5textwidgets-dev
libkf5iconthemes-dev \
 kdoctools-dev libkf5crash-dev libkf5filemetadata-dev extra-cmake-modules \
 libsm-dev cmake qtdeclarative5-dev kde-runtime kinit  kio \
 qml-module-qtquick-controls

We also had to install qt5-default and libqt5x11extras5-dev.

Just to be sure, we also installed IBM Java, as it is the one used in
Escuelas Linux. Other Java environments have an ugly effect specifically on
LibreOffice 32-bit, as we reported at the time on our blog:

https://sourceforge.net/p/escuelaslinux/blog/2019/03/how-to-fix-libreoffice-startup-crashes-in-escuelas-linux-62-32-bit/

However, switching our distribution to IBM Java solved those issues in a
better way than passing stack_guard_gap=1.

Our autogen.input is:

*--with-distro=LibreOfficeLinux**--disable-gstreamer-0-10**--with-lang=es**--with-myspell-dicts**--enable-release-build**--with-package-format=deb**--disable-dependency-tracking**--with-jdk-home=/usr/lib/jvm/**ibm-java90-jdk-i386**/*

Again, after we got a ‘make’ with errors, we had to ran ‘make
build-nocheck’ to be able to bypass those. The deb files were produced and
seem to be working fine when installed on Escuelas Linux.

As the resulting .deb files does not seem to be distribution independent,
we may not be offering then to download in our SourceForge site as we
planned. If as time passes somebody knows how to solve the make errors we
get, and how to release distro-independent deb packages, we might then
offer LibreOffice 32-bit binary deb builts available for download, for
parties that might be still interested on them.

For now, I’m happy to announce that our upcoming Escuelas Linux version
6.5, will include, among other things, LibreOffice 6.3.0.4 in both of our
editions, 32-bit and 64-bit.

Many thanks to all the folks that helped us in this thread. I owe you a big
beer ;-)

https://sourceforge.net/projects/escuelaslinux/

https://www.facebook.com/escuelas.linux



El vie., 26 jul. 2019 a las 10:01, dreamn...@gmail.com ()
escribió:

> Hi! Greetings from the Escuelas Linux team. We are small Linux
> distribution that can be downloaded from
> https://sourceforge.net/projects/escuelaslinux/.
> Some more references about our activity can be found by doing an Internet
> search, or on own Facebook account, escuelas.linux
>
> We still provide a 32-bit edition of our distro, because among our users
> there are a lot of low-income public schools, in which are still in use old
> computers with about 512 MB to a 1 GB of RAM. That amount of RAM would make
> running a Linux 64-bit system awfully slow, so we have to accommodate to
> the needs and possibilities of what is available in poor areas, those in
> which even having an old computer is still somehow a luxury.
>
> We perfectly understand that TDF releasing 32-bit Linux LibreOffice
> packages was not worth anymore, given the small amount of downloads.
> Certainly some of those downloads were made by us, as we only required one
> download of a given LibreOffice version to have it installed in our distro
> and be used in hundreds of computers. A lot of those computers could not
> even be traceable, since there are no Internet connection in poor or remote
> schools. But we believe that even if we reported who and where are those
> schools, that would be still a small amount to be worth the effort and
> resources required to match the bigger amounts of downloads that seems to
> be receiving the LibreOffice 32-bit Windows counterpart.
>
> G

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/nullptr.cxx|8 
 compilerplugins/clang/test/nullptr.cxx   |   23 +++
 solenv/CompilerTest_compilerplugins_clang.mk |1 +
 3 files changed, 32 insertions(+)

New commits:
commit e380e353485c3479abe645d3b6da9e007057a079
Author: Stephan Bergmann 
AuthorDate: Fri Aug 16 16:25:48 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 19:54:25 2019 +0200

Adapt loplugin:nullptr to RecursiveASTVisitior::TraverseInitListExpr change

... "[AST] Treat semantic form of
InitListExpr as implicit code in traversals"

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

diff --git a/compilerplugins/clang/nullptr.cxx 
b/compilerplugins/clang/nullptr.cxx
index bcdf606c13e3..30458d7f7f5a 100644
--- a/compilerplugins/clang/nullptr.cxx
+++ b/compilerplugins/clang/nullptr.cxx
@@ -75,6 +75,8 @@ public:
 
 bool TraverseLinkageSpecDecl(LinkageSpecDecl * decl);
 
+bool TraverseInitListExpr(InitListExpr * expr, DataRecursionQueue * queue 
= nullptr);
+
 // bool shouldVisitTemplateInstantiations() const { return true; }
 
 private:
@@ -231,6 +233,12 @@ bool Nullptr::TraverseLinkageSpecDecl(LinkageSpecDecl * 
decl) {
 return ret;
 }
 
+bool Nullptr::TraverseInitListExpr(InitListExpr * expr, DataRecursionQueue * 
queue) {
+return WalkUpFromInitListExpr(expr)
+&& TraverseSynOrSemInitListExpr(
+expr->isSemanticForm() ? expr : expr->getSemanticForm(), queue);
+}
+
 bool Nullptr::isInLokIncludeFile(SourceLocation spellingLocation) const {
 return loplugin::hasPathnamePrefix(
 getFileNameOfSpellingLoc(spellingLocation),
diff --git a/compilerplugins/clang/test/nullptr.cxx 
b/compilerplugins/clang/test/nullptr.cxx
new file mode 100644
index ..bf7376cb6562
--- /dev/null
+++ b/compilerplugins/clang/test/nullptr.cxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+struct S
+{
+void* p;
+};
+
+int main()
+{
+S s{
+0 // expected-error {{NullToPointer ValueDependentIsNotNull 
ZeroLiteral -> nullptr [loplugin:nullptr]}}
+};
+(void)s;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/solenv/CompilerTest_compilerplugins_clang.mk 
b/solenv/CompilerTest_compilerplugins_clang.mk
index 711137705ba3..caeee4333e78 100644
--- a/solenv/CompilerTest_compilerplugins_clang.mk
+++ b/solenv/CompilerTest_compilerplugins_clang.mk
@@ -36,6 +36,7 @@ $(eval $(call 
gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
 compilerplugins/clang/test/indentation \
 compilerplugins/clang/test/logexceptionnicely \
 compilerplugins/clang/test/loopvartoosmall \
+compilerplugins/clang/test/nullptr \
 compilerplugins/clang/test/mapindex \
 compilerplugins/clang/test/oncevar \
 compilerplugins/clang/test/oslendian-1 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: stoc/CppunitTest_stoc_uriproc.mk stoc/Module_stoc.mk stoc/test

[Stephan Bergmann (via logerrit)]

 stoc/CppunitTest_stoc_uriproc.mk   |   26 
 stoc/Module_stoc.mk|4 
 stoc/test/uriproc/test_uriproc.cxx |  217 ++---
 3 files changed, 139 insertions(+), 108 deletions(-)

New commits:
commit 91e213f58f264f110c6a94c1c18c00333e6fcdf6
Author: Stephan Bergmann 
AuthorDate: Fri Aug 16 14:10:51 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 19:44:33 2019 +0200

Re-enable stoc/test/uriproc/

...which had gone missing with d2097ad456b4626dd6972e015489ce3d22eb1872
"gbuildize stoc".  Required lots of loplugin warning fixes now.

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

diff --git a/stoc/CppunitTest_stoc_uriproc.mk b/stoc/CppunitTest_stoc_uriproc.mk
new file mode 100644
index ..6ca328edc39a
--- /dev/null
+++ b/stoc/CppunitTest_stoc_uriproc.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 
100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,stoc_uriproc))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,stoc_uriproc, \
+stoc/test/uriproc/test_uriproc \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,stoc_uriproc, \
+cppu \
+cppuhelper \
+sal \
+))
+
+$(eval $(call gb_CppunitTest_use_udk_api,stoc_uriproc))
+
+$(eval $(call gb_CppunitTest_use_ure,stoc_uriproc))
+
+# vim: set noet sw=4 ts=4:
diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk
index 7c77f6b3dc39..d05c53d55fd3 100644
--- a/stoc/Module_stoc.mk
+++ b/stoc/Module_stoc.mk
@@ -29,4 +29,8 @@ $(eval $(call gb_Module_add_targets,stoc,\
 
 endif
 
+$(eval $(call gb_Module_add_check_targets,stoc, \
+CppunitTest_stoc_uriproc \
+))
+
 # vim:set noet sw=4 ts=4:
diff --git a/stoc/test/uriproc/test_uriproc.cxx 
b/stoc/test/uriproc/test_uriproc.cxx
index fe8178d0d1d2..7b30dd84375f 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -32,10 +32,10 @@
 #include 
 #include 
 #include 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -49,11 +49,11 @@
 namespace {
 
 #define TEST_ASSERT_EQUAL(token1, token2, token3, expected, actual) \
-CPPUNIT_ASSERT_MESSAGE( \
+CPPUNIT_ASSERT_EQUAL_MESSAGE( \
 createTestAssertEqualMessage( \
 token1, token2, token3, #expected, #actual, expected, actual). \
 getStr(), \
-(actual) == (expected))
+(expected), (actual))
 
 template< typename T > void append(
 OUStringBuffer & buffer, T const & value)
@@ -62,7 +62,7 @@ template< typename T > void append(
 }
 
 template<> void append(OUStringBuffer & buffer, bool const & value) {
-buffer.append(static_cast< sal_Bool >(value));
+buffer.append(value);
 }
 
 template<> void append(OUStringBuffer & buffer, std::size_t const & value)
@@ -165,37 +165,37 @@ void Test::testParse() {
 char const * fragment;
 };
 Data data[] = {
-{ "", 0, "", true, 0,
-  "", true, 0, "", "", "", "", "", 0, 0 },
-{ "scheme:", 0, 0, false, 0,
-  0, false, 0, 0, 0, 0, 0, 0, 0, 0 },
-{ "scheme:/", "scheme", "/", true, 0,
-  "/", false, 1, "", "", "", "", "", 0, 0 },
+{ "", nullptr, "", true, nullptr,
+  "", true, 0, "", "", "", "", "", nullptr, nullptr },
+{ "scheme:", nullptr, nullptr, false, nullptr,
+  nullptr, false, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 
nullptr, nullptr },
+{ "scheme:/", "scheme", "/", true, nullptr,
+  "/", false, 1, "", "", "", "", "", nullptr, nullptr },
 { "scheme://", "scheme", "//", true, "",
-  "", false, 0, "", "", "", "", "", 0, 0 },
+  "", false, 0, "", "", "", "", "", nullptr, nullptr },
 { "scheme:///", "scheme", "///", true, "",
-  "/", false, 1, "", "", "", "", "", 0, 0 },
+  "/", false, 1, "", "", "", "", "", nullptr, nullptr },
 { "scheme:", "scheme", "", true, "",
-  "//", false, 2, "", "", "", "", "", 0, 0 },
+  "//", false, 2, "", "", "", "", "", nullptr, nullptr },
 { "scheme:", "scheme", "", true, "",
-  "//", false, 2, "", "", "", "", "", 0, 0 },
-{ "scheme:#", 0, 0, false, 0,
-  0, false, 0, 0, 0, 0, 0, 0, 0, 0 },
-{ "scheme:?", "scheme", "?", false, 0,
-  "?", false, 0, "", "", "", "", "", 0, 0 },
-{ "/", 0, "/", true, 0,
-  "/", false, 1, "", "", "", "", "", 0,

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

[Noel Grandin (via logerrit)]

 embeddedobj/source/commonembedding/embedobj.cxx |   31 +++-
 1 file changed, 25 insertions(+), 6 deletions(-)

New commits:
commit 23f60bbf283414bae6f649992c18253c9d0ac2ab
Author: Noel Grandin 
AuthorDate: Fri Aug 16 14:16:36 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 16 19:35:43 2019 +0200

tdf#126877 crash on inserting floating frame

regression from
commit 5043421fdc527d18d18121ec5fe2d4e009c8191a
Date:   Fri Jul 19 14:05:10 2019 +0200
loplugin:referencecasting in embeddedobj

OSpecialEmbeddedObject is playing games and effectively "unimplementing"
an interface it's superclass implements by doing custom stuff in
OSpecialEmbeddedObject::queryInterface.

So lets rather implement this in a more direct and obvious way.

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

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx 
b/embeddedobj/source/commonembedding/embedobj.cxx
index a34020d354e1..3370c273dc6a 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -50,6 +50,7 @@
 #include 
 #include 
 #include "embedobj.hxx"
+#include 
 
 using namespace ::com::sun::star;
 
@@ -174,13 +175,31 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 
nNextState )
 }
 else
 {
-// in case embedded object is in loaded state the contents must
-// be stored in the related storage and the storage
-// must be created already
-if ( !m_xObjectStorage.is() )
-   throw io::IOException(); //TODO: access denied
+if ( !dynamic_cast(this) )
+{
+// in case embedded object is in loaded state the contents 
must
+// be stored in the related storage and the storage
+// must be created already
+if ( !m_xObjectStorage.is() )
+throw io::IOException(); //TODO: access denied
 
-m_xDocHolder->SetComponent( LoadDocumentFromStorage_Impl(), 
m_bReadOnly );
+m_xDocHolder->SetComponent( 
LoadDocumentFromStorage_Impl(), m_bReadOnly );
+}
+else
+{
+// objects without persistence will be initialized 
internally
+uno::Sequence < uno::Any > aArgs(1);
+aArgs[0] <<= uno::Reference < embed::XEmbeddedObject >( 
this );
+uno::Reference< util::XCloseable > xDocument(
+
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( 
GetDocumentServiceName(), aArgs, m_xContext),
+uno::UNO_QUERY );
+
+uno::Reference < container::XChild > xChild( xDocument, 
uno::UNO_QUERY );
+if ( xChild.is() )
+xChild->setParent( m_xParent );
+
+m_xDocHolder->SetComponent( xDocument, m_bReadOnly );
+}
 }
 
 if ( !m_xDocHolder->GetComponent().is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 starmath/inc/node.hxx |8 
 starmath/source/accessibility.cxx |2 +-
 starmath/source/mathmlimport.cxx  |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0b42faf3d09cb4e63feebcd056c7c014c657d404
Author: Andrea Gelmini 
AuthorDate: Wed Jul 31 18:46:37 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 19:22:15 2019 +0200

Fix typos

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

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 73bfb17132c9..845da0a95fc0 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -117,7 +117,7 @@ public:
 virtual ~SmNode();
 
 /**
- * Returns true if this is a instance of SmVisibleNode's subclass, false 
otherwise.
+ * Returns true if this is an instance of SmVisibleNode's subclass, false 
otherwise.
  */
 virtual boolIsVisible() const = 0;
 
@@ -453,7 +453,7 @@ public:
  *
  * This node is used with commands: oper, uoper and boper.
  * E.g. in "A boper op B", "op" will be an instance of SmGlyphSpecialNode.
- * "boper" simply interprets "op", the following token, as an binary operator.
+ * "boper" simply interprets "op", the following token, as a binary operator.
  * The command "uoper" interprets the following token as unary operator.
  * For these commands an instance of SmGlyphSpecialNode is used for the
  * operator token, following the command.
@@ -560,7 +560,7 @@ public:
 
 /** Error node, for parsing errors
  *
- * This node is used for parsing errors and draws an questionmark turned upside
+ * This node is used for parsing errors and draws a questionmark turned upside
  * down (inverted question mark).
  */
 class SmErrorNode : public SmMathSymbolNode
@@ -582,7 +582,7 @@ public:
  *
  * This is the root node for the formula tree. This node is also used for the
  * STACK and BINOM commands. When used for root node, its
- * children are instances of SmLineNode, and in some obscure cases the a child
+ * children are instances of SmLineNode, and in some obscure cases the child
  * can be an instance of SmExpressionNode, mainly when errors occur.
  */
 class SmTableNode : public SmStructureNode
diff --git a/starmath/source/accessibility.cxx 
b/starmath/source/accessibility.cxx
index 2121f5da59e6..8fb20618c701 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1034,7 +1034,7 @@ static SfxItemState GetSvxEditEngineItemState( EditEngine 
const & rEditEngine, c
 rEditEngine.GetCharAttribs( nPara, aAttribs );
 
 bool bEmpty = true; // we found no item inside the selection of 
this paragraph
-bool bGaps  = false;// we found items but theire gaps between them
+bool bGaps  = false;// we found items but there are gaps between 
them
 sal_Int32 nLastEnd = nPos;
 
 const SfxPoolItem* pParaItem = nullptr;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index f49d88ca794b..48de32c3e0bd 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -890,7 +890,7 @@ public:
 };
 
 
-/*avert thy gaze from the proginator*/
+/*avert the gaze from the originator*/
 class SmXMLRowContext_Impl : public SmXMLDocContext_Impl
 {
 protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 starmath/inc/cursor.hxx  |4 ++--
 starmath/inc/visitors.hxx|2 +-
 starmath/source/cursor.cxx   |2 +-
 starmath/source/document.cxx |2 +-
 starmath/source/mathtype.cxx |2 +-
 starmath/source/parse.cxx|2 +-
 starmath/source/rect.cxx |2 +-
 starmath/source/visitors.cxx |6 +++---
 8 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 3db23609d368687dd2b3122160d450e4bc5bbb78
Author: Andrea Gelmini 
AuthorDate: Fri Aug 16 16:34:34 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 19:16:10 2019 +0200

Fix typos

Split from
https://gerrit.libreoffice.org/#/c/76764/

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

diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index b04b39748829..2ba17fb0a46c 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -62,7 +62,7 @@ class SmDocShell;
 /** Formula cursor
  *
  * This class is used to represent a cursor in a formula, which can be used to 
manipulate
- * an formula programmatically.
+ * a formula programmatically.
  * @remarks This class is a very intimate friend of SmDocShell.
  */
 class SmCursor{
@@ -140,7 +140,7 @@ public:
 
 /** Insert a new row or newline
  *
- * Inserts a new row if position is in an matrix or stack command.
+ * Inserts a new row if position is in a matrix or stack command.
  * Otherwise a newline is inserted if we're in a toplevel line.
  *
  * @returns True, if a new row/line could be inserted.
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 290f1bdeacb8..39f5c6323064 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -272,7 +272,7 @@ private:
  * denoted by | in "H|".
  *
  * Parameter variables:
- *  The following variables are used to transfer parameters in to calls and 
results out
+ *  The following variables are used to transfer parameters into calls and 
results out
  *  of calls.
  *  pRightMost : SmCaretPosGraphEntry*
  *
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 2d74d454a2f6..f7d127bd25e9 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1299,7 +1299,7 @@ void SmCursor::EndEdit(){
 //I think this notifies people around us that we've modified this 
document...
 mpDocShell->SetModified();
 //I think SmDocShell uses this value when it sends an update graphics event
-//Anyway comments elsewhere suggests it need to be updated...
+//Anyway comments elsewhere suggests it needs to be updated...
 mpDocShell->mnModifyCount++;
 
 //TODO: Consider copying the update accessibility code from 
SmDocShell::SetText in here...
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index b8222e2c0a02..c3373f5968c9 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -394,7 +394,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point 
&rPosition, bool bDrawSel
 rPosition.AdjustY(maFormat.GetDistance( DIS_TOPSPACE  ) );
 
 //! in case of high contrast-mode (accessibility option!)
-//! the draw mode needs to be set to default, because when imbedding
+//! the draw mode needs to be set to default, because when embedding
 //! Math for example in Calc in "a over b" the fraction bar may not
 //! be visible else. More generally: the FillColor may have been changed.
 DrawModeFlags nOldDrawMode = DrawModeFlags::Default;
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 65a7bb834009..da48da787fa5 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1817,7 +1817,7 @@ bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 
nDefSize, int &rSetSize)
 }
 else
 {
-/*sizetable should theoreticaly be filled with the default sizes
+/*sizetable should theoretically be filled with the default sizes
  *of the various font groupings matching starmaths equivalents
  in aTypeFaces, and a test would be done to see if the new font
  size would be the same as what starmath would have chosen for
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 102851120a22..663aa1c22361 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1954,7 +1954,7 @@ std::unique_ptr SmParser::DoFontSize()
 {
 aValue = fTmp;
 
-//!! keep the numerator and denominator from being to large
+//!! keep the numerator and denominator from being too large
 //!! otherwise ongoing multiplications may result in overflows
 //!! (for example in SmNode::SetFontSize the font size calculated
 //!! may become 0 because of this!!! Happens e.g. for ftmp = 2.9 
with Linux
diff --git a/starmath/source/rect.cxx b/s

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

[Miklos Vajna (via logerrit)]

 vcl/source/edit/texteng.cxx   |3 +++
 vcl/source/uitest/uiobject.cxx|5 +
 vcl/source/window/aboutdialog.cxx |2 ++
 3 files changed, 10 insertions(+)

New commits:
commit 0df3e9fd645e9613c4a852b4a0966ff2eea7e313
Author: Miklos Vajna 
AuthorDate: Mon Aug 12 11:35:51 2019 +0200
Commit: Caolán McNamara 
CommitDate: Fri Aug 16 18:12:28 2019 +0200

tdf#118856 vcl: avoid flicker in the about dialog

There were two problems here:

1) The flickering widget in question is VclMultiLineEdit, but it wasn't
like its own painting caused a flicker, rather the calling
vcl::Window::PushPaintHelper() already erased the widget and later the
widget painted itself. So the easy way with vcl::BufferDevice is not
enough here. VclMultiLineEdit seems to be working with double buffering
just fine, so enable that in the vcl::AboutDialog ctor.

2) Now that text did not flicker, its background was wrong. In case the
NWF determines some gray background, the background was white for most
text when there was no selection.

When there was selection, then the after-selection area (in a single
line) was fine, but nothing else.

It seems TextEngine::ImpPaint() assumes that no need to set a default
text fill color before drawing text, but the above shows that there is
difference between the starting state and after clearing away a custom
color with SetTextFillColor(). So fix this problem by always explicitly
calling SetTextFillColor() before text paint: either setting the
selection color or the default one.

This brings improvement for the Windows GDI backend; Windows GL, Linux
gen/gtk/gtk3 is unchanged in practice.

(cherry picked from commit 7eb37a422f2e66bc177d72404c53659a248661ca)

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

diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index b6835dbc07a2..cab426c8b001 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1964,6 +1964,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const 
Point& rStartPos, tools:
 {
 const sal_Int32 nL = 
pSelStart->GetIndex() - nTmpIndex;
 pOutDev->SetFont( aFont);
+
pOutDev->SetTextFillColor();
 aPos.setX( rStartPos.X() + 
ImpGetOutputOffset( nPara, &rLine, nTmpIndex, nTmpIndex+nL ) );
 pOutDev->DrawText( aPos, 
pPortion->GetNode()->GetText(), nTmpIndex, nL );
 nTmpIndex = nTmpIndex + nL;
@@ -1989,6 +1990,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const 
Point& rStartPos, tools:
 if ( nTmpIndex < nEnd )
 {
 nL = nEnd-nTmpIndex;
+
pOutDev->SetTextFillColor();
 aPos.setX( rStartPos.X() + 
ImpGetOutputOffset( nPara, &rLine, nTmpIndex, nTmpIndex+nL ) );
 pOutDev->DrawText( aPos, 
pPortion->GetNode()->GetText(), nTmpIndex, nEnd-nTmpIndex );
 }
@@ -1997,6 +1999,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const 
Point& rStartPos, tools:
 }
 if ( !bDone )
 {
+pOutDev->SetTextFillColor();
 aPos.setX( rStartPos.X() + 
ImpGetOutputOffset( nPara, &rLine, nTmpIndex, nEnd ) );
 pOutDev->DrawText( aPos, 
pPortion->GetNode()->GetText(), nTmpIndex, nEnd-nTmpIndex );
 }
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index b8932913cf53..2a86abcdd4ef 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -273,6 +273,11 @@ WindowUIObject::WindowUIObject(const VclPtr& 
xWindow):
 
 StringMap WindowUIObject::get_state()
 {
+// Double-buffering is not interesting for uitesting, but can result in 
direct paint for a
+// double-buffered widget, which is incorrect.
+if (mxWindow->SupportsDoubleBuffering())
+mxWindow->RequestDoubleBuffering(false);
+
 StringMap aMap;
 aMap["Visible"] = OUString::boolean(mxWindow->IsVisible());
 aMap["ReallyVis

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.1.1' created by Christian Lohmaier 
 at 2019-08-16 16:10 +

Tag libreoffice-6.3.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1W1VoACgkQ9DSh76/u
rqOgnA/+PmJb3sEkBMqYILg2gionVysnVmGedSpvE4POoDPl1SNwvFsIVWB3wI4q
5hH8odf+9OJzN6NP63d956mnrxi89ZsUGvMswcHRaM9fcSRw3FyctO1k09UG3/wR
fbQIULNU7QBmbAhzbl+2QD5YcKuv0ei1VUwlDVvBm+o7XWheuzPbTaoOnd9k1fh+
5QgVt26gvlcxUA8yBvcATsJzVBsGzj2Zw7PKyXB3KGKzcJ4CuzBf8elcwDtUfopJ
WzldRZV0KFzJTxbN3eg/RDRW3Gvql7ZoMeBhyDT/LZPe1wtAtcwunOFpPRHjLSHL
QdW7R1me97FBfMNU+rf2kE5aV5wMzGIDr29JJwWWYBD39bHAG0gEDvs8wX6BoWq3
T2EKkF4z2vlshSAFsif1FHKClOyyecfbzSCpo7MBaLJigtwycuwLLB79GKd/EGOH
j1e/EoygCP+cndh1NPFth2nOL1PsOzwOahD0PoKQgo5QZB4Ur+hAlXTaHdnKL8WT
JUPwPUt/E0teGHbLJhPrz8WFJc9ThO7RSShgI86Dlf5415Z8OviV3CuYl241SR99
T8a1XVSu0LARJiYcx3+IrAHrwbX9EREANo2McJ+hbAABpxSfyJaZ1pRPJcXn23Dw
cbUJUyTfT3fL4zwsmBfT6YsO78qE0691XxqaJiTakyDgCaLLJGs=
=8ffm
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-1' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 699f276e178249b3f2fc44fcb572bdf67c3f07ed
Author: Christian Lohmaier 
AuthorDate: Fri Aug 16 18:10:28 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Aug 16 18:10:28 2019 +0200

bump product version to 6.3.1.1.0+

Change-Id: If9d17681b3a1c22bd01481c6cb3cb1cddfd2e572

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.1.1' created by Christian Lohmaier 
 at 2019-08-16 16:10 +

Tag libreoffice-6.3.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1W1VoACgkQ9DSh76/u
rqMZdA//T2tSm23SHwFgTKdDr2LfcxAXGdUUlapjsmLRtyf2ppuJIVdtIawg+tn7
QhSRTbFdqSZxH3mW27O80N3DrzL+tbCWANy7SLHbyAWpfbxx5RZnPWmGTqm8lp5e
jn/HGfB7dn70KQwrZnpMDkUOl3jZmzj5amNLxC6cOBjapMeVmKC5FxVUuvE+UeqU
tIoVgdmong1M94chwozYFsqmSeHIGv0IWxpvLLgkXcF2vW7pvB/alP4Kd9rzvphT
CTbX3u68XVYIw1FYHYn2QjXIiaLdkKGsmhKfvoFoMBAjcHFf1yfddg0K0fFXB9CG
tkmKjtcbEtbPNJhBua5uBT/4tqnbpClem9T2ZXFuBNj/w/J2r2rX/Ow/oLp1Wj0D
TWOJRvZEU60InIRipBJJjunTlguoLKgeDcvSaIiPXhNJ3w2MlO/xgIVN0alXbWA1
IyBGWg3R2Q021Ll+MnRsOV4Z73We/QPXep2FIF4mGoHUQ94A3Bn8g1hJe9TWeeeM
oCmjba3Nw5iVTi1BIuXTce5GkDy7idd6X0fsbrVjoRvTAXVHioMXmSdL58i4hVzq
fMAwfgqpPO9WvaQUp8dFwGESPtIYY2jSnTvLaD3ScNjZPp2WUcI7VaVP4KqE6obE
h4Rlohox79cRFUEKbsMEhXOh8WA91XAasb3jpXGSxbV+bSHqPVI=
=x8Ne
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.1.1' created by Christian Lohmaier 
 at 2019-08-16 16:10 +

Tag libreoffice-6.3.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1W1VoACgkQ9DSh76/u
rqNbnQ/+PyzirxAa0n1P8Olo5fOcRkPZv6W3Sdt2qVvMfhviJnk4PLyu6ROsCgFC
GwMFp2wFtDeqQuvHxmuhP1wiGK5NkT8OZbq29AKu4Gs3Z/Z0rv/twGIEWM2yqXHv
LlJt6WZdZ/GNorods2h6SKrz9QJTiUk2G/7bj6QgcwjRVu5VRg/U4fm6JSD6W1SX
LCQRm8sSFg6Lb+c3LnnlSKWDoumXz1F2HY5nozdrZBshpp1y1ahC+LsXTv9YDg76
cIHV0EYhTMrGSNrdDClGqtNvkKdulJy5QME92sq4AnFCqXJ4J1+bhB0qX9Oq45D+
MmzEvxm3rxuIBrLLxJBBtpGPWWMqETXRIKZxSFKgm2Epmzi3WS2W4bI6COlnvQ1+
A7gGL4wA4Tph29fQn0+xRxMBrnJBLMFt9mm8hjfDcoX2GiLQ2U+k4R1oAYeRRE97
zMRoqMjIUmSNMwfn4tdZL8qAqCjSRMgH5sqcGWcH2aQvHMVHXGtOLWijBPzy2ReK
ex4S9rBMtmBSy3V76dhlFKR78h59z+H189lI5LKlelGXidFcmXsFj8dpi26si43O
XJ+2gLfSqrHzTm35EfPLaARzeSpZxmvXMCJFgdSp9bTanZcfgBv8MI4J33Q310Qr
tHQ2UP+FlQ2ywjKYQMpFA6nCvwlE1NG6C92C00REimgo14PfSRM=
=04t/
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.1.1' created by Christian Lohmaier 
 at 2019-08-16 16:09 +

Tag libreoffice-6.3.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1W1VYACgkQ9DSh76/u
rqNDrA//aLlrUXyqzFjvQc50x+7bSouLP5MDiH4lnysJrvVRyvDwpR5BjccyPWg1
M+J1sEOe7sIHXslvIvSXIxSUMycNJklHyhjxhz6cMKXPi3iqmIpf4S3HvNUPtEwb
BNACrT6WtsCsWarUEaN205fc7CkRxy7XdVMJncPnC/RlNCnPA9oh6/mr5VIoVQ1F
00kQtRm8M44MXiW7SXJluAjv4bfRffJq6BwyAECA9vgXvGmp3O9f9xgDpr8jpfVw
PVGoqVV4Okmujm3KoROYSsTjRazZLpducsZJ3EQAy0mH9tjkDR9kISEYMkrnLHNa
6aZdStyJmA80Zq0xHHvWWdLH3xj8nm641ixGMMb8dq/TXezNwT4Mxgvtum0n8Vyf
xmcZV0hQpN8Xe8cSTqMG5l63r+ab7uu4Fa/0jzWt6fyvElX1Qh1FUJkgfhipNgQD
BD43FC04TIs77BWRQ6ol102/451FEdV96qy6iamzVZNhT5vXPmEviRVpmtj7If0a
5Qjbjrq5NQ9Ek3LUtJbyjvxt36PL4V7eNrDi8w2zFrKV75YGXQM0aNTug+DZpgGe
h22fmYi2RXQZIlU54jbZNIhIC8I0pYE7t1m25oxzp+8pw+66cLfC28XXPfTHM5H/
4h4XQCUl7iASuaE54wYG8qevVgGGeb0Dc7YlGtZKZveQnGevsUo=
=65Jz
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 49135e78e31e376f8abacf657faa878711521a9e
Author: Christian Lohmaier 
AuthorDate: Fri Aug 16 18:08:00 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Aug 16 18:08:00 2019 +0200

bump product version to 6.3.2.0.0+

Change-Id: Ia376060b7da2774040f21828c4e38ff3fca06db7

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

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-3-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-1' available with the following commits:
commit 5e769c299c7336bc734aa25abb8184b8a7fdbd9c
Author: Christian Lohmaier 
Date:   Fri Aug 16 18:06:37 2019 +0200

Branch libreoffice-6-3-1

This is 'libreoffice-6-3-1' - the stable branch for the 6.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

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

Change-Id: I22d71b5e1bd57e5082197ceeea84740708e21e43

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-3-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-1' available with the following commits:
commit 7e5fb4f1b704a5bb4a412df70e8e55aefd6879ab
Author: Christian Lohmaier 
Date:   Fri Aug 16 18:05:29 2019 +0200

Branch libreoffice-6-3-1

This is 'libreoffice-6-3-1' - the stable branch for the 6.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

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

Change-Id: Id840ae1090ddef1156cb67be6bfdb58026c4c20c

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-3-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-1' available with the following commits:
commit 3749e18421f66241420fa56e685482a3536b4f95
Author: Christian Lohmaier 
Date:   Fri Aug 16 18:05:28 2019 +0200

Branch libreoffice-6-3-1

This is 'libreoffice-6-3-1' - the stable branch for the 6.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

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

Change-Id: If8be556c8b64c9df84ea0e396dcccbd60baa51de

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-3-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-1' available with the following commits:
commit dbbd9c3677ad910ed007b62105890bfb63676367
Author: Christian Lohmaier 
Date:   Fri Aug 16 18:05:28 2019 +0200

Branch libreoffice-6-3-1

This is 'libreoffice-6-3-1' - the stable branch for the 6.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

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

Change-Id: Ie68e730cfd00850c3694de91711f8b5f6c20a8d6

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

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/about.cxx  |   12 
 cui/uiconfig/ui/aboutdialog.ui|1 +
 include/vcl/weld.hxx  |4 ++--
 vcl/source/app/salvtables.cxx |8 
 vcl/source/window/aboutdialog.cxx |4 +---
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   38 +-
 6 files changed, 21 insertions(+), 46 deletions(-)

New commits:
commit a94f95d173e531fe7df0e8caebd6763253798b39
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 14:56:54 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 16 17:42:41 2019 +0200

tdf#126254 Help - About is black with Linux gen and gtk2

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

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a10fd4ecba9b..a9617f7a8381 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -178,10 +178,8 @@ void AboutDialog::SetLogo()
 m_xDialog->set_logo(nullptr);
 else
 {
-ScopedVclPtr 
xDevice(m_xDialog->create_virtual_device());
-xDevice->SetOutputSize(aLogoBitmap.GetSizePixel());
-xDevice->DrawBitmapEx(Point(), aLogoBitmap);
-m_xDialog->set_logo(xDevice.get());
+Graphic aGraphic(aLogoBitmap);
+m_xDialog->set_logo(aGraphic.GetXGraphic());
 }
 }
 
@@ -193,10 +191,8 @@ IMPL_LINK(AboutDialog, SizeAllocHdl, const Size&, rSize, 
void)
 if (!(Application::GetSettings().GetStyleSettings().GetHighContrastMode()))
 {
 SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, 
rSize.Width());
-ScopedVclPtr 
xDevice(m_xDialog->create_virtual_device());
-xDevice->SetOutputSize(aBackgroundBitmap.GetSizePixel());
-xDevice->DrawBitmapEx(Point(), aBackgroundBitmap);
-m_xDialog->set_background(xDevice.get());
+Graphic aGraphic(aBackgroundBitmap);
+m_xDialog->set_background(aGraphic.GetXGraphic());
 }
 }
 
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 07f2be7e3e06..b2ad949019c8 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -9,6 +9,7 @@
 0
 dialog
 About %PRODUCTNAME
+False
 %PRODUCTNAME
 %PRODUCTNAME is a modern, easy-to-use, open 
source productivity suite for word processing, spreadsheets, presentations and 
more.
 https://www.libreoffice.org/
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 9f781faf1c1c..198b7a72f0d6 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -453,8 +453,8 @@ public:
 virtual void set_website(const OUString& rURL) = 0;
 virtual void set_website_label(const OUString& rLabel) = 0;
 virtual OUString get_website_label() const = 0;
-virtual void set_logo(VirtualDevice* pDevice) = 0;
-virtual void set_background(VirtualDevice* pDevice) = 0;
+virtual void set_logo(const css::uno::Reference& 
rImage) = 0;
+virtual void set_background(const 
css::uno::Reference& rImage) = 0;
 };
 
 struct VCL_DLLPUBLIC ComboBoxEntry
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0ca121c0e8ac..90481eaf0c7e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1438,13 +1438,13 @@ public:
 {
 return m_xAboutDialog->GetWebsiteLabel();
 }
-virtual void set_logo(VirtualDevice* pDevice) override
+virtual void set_logo(const css::uno::Reference& 
rImage) override
 {
-m_xAboutDialog->SetLogo(createImage(*pDevice));
+m_xAboutDialog->SetLogo(Image(rImage));
 }
-virtual void set_background(VirtualDevice* pDevice) override
+virtual void set_background(const 
css::uno::Reference& rImage) override
 {
-m_xAboutDialog->SetBackground(createImage(*pDevice));
+m_xAboutDialog->SetBackground(Image(rImage));
 }
 };
 
diff --git a/vcl/source/window/aboutdialog.cxx 
b/vcl/source/window/aboutdialog.cxx
index 10074a1a3eac..483aec85017e 100644
--- a/vcl/source/window/aboutdialog.cxx
+++ b/vcl/source/window/aboutdialog.cxx
@@ -129,10 +129,8 @@ void AboutDialog::SetBackground(const Image& 
rBackgroundBitmap)
 Invalidate();
 }
 
-void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const 
::tools::Rectangle& rRect)
+void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const 
::tools::Rectangle& /*rRect*/)
 {
-rRenderContext.SetClipRegion(vcl::Region(rRect));
-
 Size aSize(GetOutputSizePixel());
 Point aPos(aSize.Width() - m_aBackgroundBitmap.GetSizePixel().Width(),
aSize.Height() - m_aBackgroundBitmap.GetSizePixel().Height());
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b015248a4acb..aa831c1bfbb9 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3514,9 +3514,9 @@ public:
  

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - scripting/source

[Caolán McNamara (via logerrit)]

 scripting/source/pyprov/pythonscript.py |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 5445f7ffd09e891b220dabb19cd013bcf591fc08
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 10:18:34 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 17:26:19 2019 +0200

an absolute uri is invalid input

Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc
Reviewed-on: https://gerrit.libreoffice.org/77564
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit 3c076e54f736980e208f5c27ecf179aa90aea103)
Reviewed-on: https://gerrit.libreoffice.org/77572
Tested-by: Jenkins

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 0f74852523b3..d8924f8dba8c 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -237,6 +237,11 @@ class MyUriHelper:
 log.debug( message )
 raise RuntimeException( message )
 
+if xFileUri.isAbsolute():
+message = "pythonscript: an absolute uri is invalid '" + 
sFileUri+ "'"
+log.debug( message )
+raise RuntimeException( message )
+
 # absolute path to the .py file
 xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, 
True, RETAIN)
 sAbsScriptUri = xAbsScriptUri.getUriReference()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - 2 commits - chart2/source offapi/com

[Markus Mohrhard (via logerrit)]

 chart2/source/inc/ChartStyle.hxx   |   14 -
 chart2/source/model/main/ChartModel.cxx|2 
 chart2/source/tools/ChartStyle.cxx |   77 +
 offapi/com/sun/star/chart2/XChartStyle.idl |7 ++
 4 files changed, 99 insertions(+), 1 deletion(-)

New commits:
commit 77792f9c9c0b92182a0855fae9dcf9274efa0730
Author: Markus Mohrhard 
AuthorDate: Fri Aug 16 23:13:30 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Fri Aug 16 23:13:30 2019 +0800

format file

Change-Id: I42c0069b63ced24eee99d43a7319cc50fd629e30

diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index fc1f06270f90..54cbc5fe243b 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -101,8 +101,8 @@ public:
 virtual void SAL_CALL
 applyStyleToTitle(const css::uno::Reference& xTitle) 
override;
 
-virtual void SAL_CALL
-applyStyleToBackground(const 
css::uno::Reference& xBackground) override;
+virtual void SAL_CALL applyStyleToBackground(
+const css::uno::Reference& xBackground) 
override;
 
 // XStyle
 virtual sal_Bool SAL_CALL isUserDefined() override;
@@ -124,7 +124,8 @@ private:
 
 void applyStyleToAxis(const css::uno::Reference& 
xAxis);
 
-void applyStyleToCoordinates(const 
css::uno::Reference& xCooSysCont);
+void applyStyleToCoordinates(
+const css::uno::Reference& 
xCooSysCont);
 };
 
 OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference 
getChartStyles();
commit 2e31f4ab53b77ebbb0932ced6cafe8e2c8af49a2
Author: Gagandeep Singh 
AuthorDate: Tue Aug 13 15:28:38 2019 +0530
Commit: Markus Mohrhard 
CommitDate: Fri Aug 16 19:40:46 2019 +0800

Add more methods to XChartStyle.idl for applying styles to title, axis,..

Change-Id: I6ce9b3da584671636830122ef9ac9f6b9f54d132

diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index c82611ee163c..fc1f06270f90 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -95,7 +96,13 @@ public:
 SAL_CALL getStyleForObject(const sal_Int16 nChartObjectType) override;
 
 virtual void SAL_CALL
-applyStyleToDiagram(const css::uno::Reference& 
xDiagram);
+applyStyleToDiagram(const css::uno::Reference& 
xDiagram) override;
+
+virtual void SAL_CALL
+applyStyleToTitle(const css::uno::Reference& xTitle) 
override;
+
+virtual void SAL_CALL
+applyStyleToBackground(const 
css::uno::Reference& xBackground) override;
 
 // XStyle
 virtual sal_Bool SAL_CALL isUserDefined() override;
@@ -114,6 +121,10 @@ private:
 std::map> 
m_xChartStyle;
 
 void register_styles();
+
+void applyStyleToAxis(const css::uno::Reference& 
xAxis);
+
+void applyStyleToCoordinates(const 
css::uno::Reference& xCooSysCont);
 };
 
 OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference 
getChartStyles();
diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index 7c500abd4a07..4cda0d5882fc 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -935,6 +935,8 @@ void SAL_CALL ChartModel::setTitleObject( const 
uno::Reference< chart2::XTitle >
 ModifyListenerHelper::addListener( m_xTitle, this );
 }
 setModified( true );
+
+m_xChartStyle->applyStyleToTitle( xTitle );
 }
 
 // _ XChartStyled _
diff --git a/chart2/source/tools/ChartStyle.cxx 
b/chart2/source/tools/ChartStyle.cxx
index cb172fa30be7..2847b3db7f7d 100644
--- a/chart2/source/tools/ChartStyle.cxx
+++ b/chart2/source/tools/ChartStyle.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -187,6 +188,56 @@ css::uno::Sequence SAL_CALL 
ChartStyle::getSupportedServiceNames()
 return { "com.sun.star.chart2.ChartStyle" };
 }
 
+void SAL_CALL ChartStyle::applyStyleToTitle(const 
css::uno::Reference& xTitle)
+{
+css::uno::Reference xTitleStyle(xTitle, 
css::uno::UNO_QUERY);
+if (xTitleStyle.is())
+{
+xTitleStyle->setStyle(css::uno::Reference(
+m_xChartStyle.find(css::chart2::ChartObjectType::TITLE)->second,
+css::uno::UNO_QUERY_THROW));
+}
+}
+
+void ChartStyle::applyStyleToAxis(const 
css::uno::Reference& xAxis)
+{
+css::uno::Reference xAxisStyle(xAxis, 
css::uno::UNO_QUERY);
+if (xAxisStyle.is())
+{
+xAxisStyle->setStyle(css::uno::Reference(
+m_xChartStyle.find(css::chart2::ChartObjectType::AXIS)->second,
+css::uno::UNO_QUERY_THROW));
+}
+
+css::uno::Reference xTitled(xAxis, 
css::uno::UNO_QUERY);
+if (xTitled.is())
+{
+css::uno::Reference xTitle = 
xTitled->getTitleObject();
+if (xTitle.is())
+applyStyleToTitle(xTitle);
+}
+}
+
+void ChartStyle::applyStyleToCoordinates(
+const css::uno::Referenc

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit f67e33bc6fdf552f10fff6b08b24745eabe83ce3
Author: Christian Lohmaier 
AuthorDate: Fri Aug 16 16:05:05 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Aug 16 17:06:54 2019 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-3'
  - update translations for 6.3.1 rc1

and force-fix errors using pocheck

Change-Id: I05d66c16174c18360182c88b86ecea4f9c5f8183

diff --git a/translations b/translations
index 855e27af7b0e..c85b9f992801 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 855e27af7b0e1b5f9a12f936b3dc953f01d4b822
+Subproject commit c85b9f992801d2d9de8c68c862b4b2d79ff5bc64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-3' - source/bn source/bo source/ca source/cs source/cy source/da source/de source/en-GB source/es source/et source/eu source/fi source/fr

[Christian Lohmaier (via logerrit)]

 source/bn/helpcontent2/source/text/scalc.po|   24 
 source/bn/helpcontent2/source/text/scalc/01.po |   10 
 source/bn/helpcontent2/source/text/sdraw/guide.po  |   10 
 source/bn/helpcontent2/source/text/shared.po   |   18 
 source/bn/helpcontent2/source/text/shared/autopi.po|   14 
 source/bn/helpcontent2/source/text/shared/explorer/database.po |   14 
 source/bn/helpcontent2/source/text/shared/guide.po |   12 
 source/bn/helpcontent2/source/text/shared/optionen.po  |   16 
 source/bn/helpcontent2/source/text/simpress/01.po  |   10 
 source/bo/helpcontent2/source/text/sbasic/shared.po|   10 
 source/bo/helpcontent2/source/text/sbasic/shared/02.po |   10 
 source/bo/helpcontent2/source/text/scalc/00.po |   16 
 source/bo/helpcontent2/source/text/scalc/01.po |   10 
 source/ca/extras/source/autocorr/emoji.po  |6 
 source/ca/helpcontent2/source/text/shared/01.po|   10 
 source/cs/cui/messages.po  |  134 -
 source/cs/helpcontent2/source/text/sbasic/guide.po |6 
 source/cs/helpcontent2/source/text/sbasic/python.po|   16 
 source/cs/helpcontent2/source/text/swriter/01.po   |   10 
 source/cs/helpcontent2/source/text/swriter/guide.po|   11 
 source/cs/sc/messages.po   |6 
 source/cs/svtools/messages.po  |8 
 source/cy/cui/messages.po  |  532 
+++---
 source/cy/dbaccess/messages.po |6 
 source/cy/filter/messages.po   |6 
 source/cy/officecfg/registry/data/org/openoffice/Office/UI.po  |   16 
 source/cy/reportdesign/messages.po |8 
 source/cy/sc/messages.po   |6 
 source/cy/sd/messages.po   |6 
 source/cy/sfx2/messages.po |6 
 source/cy/svx/messages.po  |   14 
 source/cy/sw/messages.po   |   12 
 source/cy/uui/messages.po  |6 
 source/da/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/de/helpcontent2/source/text/sbasic/python.po|8 
 source/de/helpcontent2/source/text/sbasic/shared.po|  482 ++---
 source/de/helpcontent2/source/text/sbasic/shared/02.po |   18 
 source/de/helpcontent2/source/text/sbasic/shared/03.po |   18 
 source/de/helpcontent2/source/text/scalc/01.po |   84 -
 source/de/helpcontent2/source/text/scalc/04.po |8 
 source/de/helpcontent2/source/text/scalc/05.po |6 
 source/de/helpcontent2/source/text/scalc/guide.po  |   14 
 source/de/helpcontent2/source/text/schart/01.po|6 
 source/de/helpcontent2/source/text/shared/01.po|   18 
 source/de/helpcontent2/source/text/shared/02.po|   12 
 source/de/helpcontent2/source/text/shared/04.po|8 
 source/de/helpcontent2/source/text/shared/explorer/database.po |   30 
 source/de/helpcontent2/source/text/shared/guide.po |   14 
 source/de/helpcontent2/source/text/shared/optionen.po  |   10 
 source/de/helpcontent2/source/text/simpress/01.po  |8 
 source/de/helpcontent2/source/text/smath/01.po |6 
 source/de/helpcontent2/source/text/swriter/01.po   |   10 
 source/de/helpcontent2/source/text/swriter/guide.po|   22 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po  |6 
 source/de/sc/messages.po   |6 
 source/en-GB/helpcontent2/source/text/sbasic/python.po |  196 +-
 source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po   |   10 
 source/es/cui/messages.po  |  170 +-
 source/es/desktop/messages.po  |   46 
 source/es/helpcontent2/source/text/sbasic/python.po|   10 
 source/es/helpcontent2/source/text/shared/guide.po |8 
 source/es/helpcontent2/source/text/swriter/01.po   |   10 
 source/es/helpcontent2/source/text/swriter/guide.po|   10 
 source/es/sc/messages.po   |   11 
 source/es/svx/messages.po  |8 
 source/et/helpcontent2/source/text/scalc

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit fe70fa98ef53e5dc054d86c7cb857e41d6c3e6d6
Author: Miklos Vajna 
AuthorDate: Fri Aug 16 14:52:14 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 16 16:49:45 2019 +0200

CppunitTest_sw_uiwriter: get rid of hardcoded 1418 in testImageComment

See a different value at
 and the
intention is to make sure the comment anchor and the fly frame position
matches, not to check the actual value.

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 6f314401f7e7..d2035512c393 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1616,6 +1616,17 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment)
 pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, 
SfxCallMode::SYNCHRON);
 
 #if !defined(MACOSX)
+// Calc the left edge of the as-char frame.
+SwRootFrame* pLayout = pWrtShell->GetLayout();
+SwFrame* pPage = pLayout->GetLower();
+SwFrame* pBody = pPage->GetLower();
+SwFrame* pTextFrame = pBody->GetLower();
+CPPUNIT_ASSERT(pTextFrame->GetDrawObjs());
+const SwSortedObjs& rAnchored = *pTextFrame->GetDrawObjs();
+CPPUNIT_ASSERT_GREATER(static_cast(0), rAnchored.size());
+SwAnchoredObject* pObject = rAnchored[0];
+long nFrameLeft = pObject->GetObjRect().Left();
+
 // Make sure that the anchor points to the bottom left corner of the image.
 // Without the accompanying fix in place, this test would have failed with:
 // - Expected less or equal than: 1418
@@ -1626,7 +1637,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment)
 for (const auto& pItem : *pPostItMgr)
 {
 const SwRect& rAnchor = pItem->pPostIt->GetAnchorRect();
-CPPUNIT_ASSERT_LESSEQUAL(static_cast(1418), rAnchor.Left());
+CPPUNIT_ASSERT_EQUAL(nFrameLeft, rAnchor.Left());
 }
 
 // Test the comment anchor we expose via the LOK API.
@@ -1645,7 +1656,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment)
 {
 const boost::property_tree::ptree& rComment = rValue.second;
 OString aAnchorPos(rComment.get("anchorPos").c_str());
-CPPUNIT_ASSERT_EQUAL(OString("1418, 1418, 0, 0"), aAnchorPos);
+OString aExpected;
+aExpected += OString::number(nFrameLeft);
+aExpected += ", ";
+aExpected += OString::number(nFrameLeft);
+aExpected += ", 0, 0";
+CPPUNIT_ASSERT_EQUAL(aExpected, aAnchorPos);
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 svl/source/items/itemset.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 336afaa77fa2b8d08871de7b90e27c0ada32a81e
Author: Mike Kaganski 
AuthorDate: Fri Aug 16 14:01:19 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri Aug 16 16:44:41 2019 +0200

Reorder to only get item state when necessary

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

diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 4841123eed0a..75709c3f4072 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -656,9 +656,10 @@ void SfxItemSet::PutExtended
 void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo )
 {
 // special case: exactly one sal_uInt16 which is already included?
-SfxItemState eItemState = GetItemState(nFrom, false);
-if ( nFrom == nTo && ( eItemState == SfxItemState::DEFAULT || eItemState 
== SfxItemState::SET ) )
-return;
+if (nFrom == nTo)
+if (SfxItemState eItemState = GetItemState(nFrom, false);
+eItemState == SfxItemState::DEFAULT || eItemState == 
SfxItemState::SET)
+return;
 
 #ifdef DBG_UTIL
 assert(nFrom <= nTo);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 i18npool/source/breakiterator/breakiteratorImpl.cxx |3 
+--
 i18npool/source/calendar/calendarImpl.cxx   |6 
++
 i18npool/source/characterclassification/cclass_unicode.cxx  |3 
+--
 i18npool/source/characterclassification/characterclassificationImpl.cxx |3 
+--
 i18npool/source/characterclassification/unoscripttypedetector.cxx   |3 
+--
 i18npool/source/collator/collatorImpl.cxx   |3 
+--
 i18npool/source/nativenumber/nativenumbersupplier.cxx   |3 
+--
 i18npool/source/numberformatcode/numberformatcode.cxx   |3 
+--
 i18npool/source/textconversion/textconversionImpl.cxx   |3 
+--
 i18npool/source/transliteration/transliterationImpl.cxx |7 
++-
 i18npool/source/transliteration/transliteration_commonclass.cxx |3 
+--
 11 files changed, 13 insertions(+), 27 deletions(-)

New commits:
commit 973424ab312bfe38caa486304f5d9dae2cd59069
Author: Julien Nabet 
AuthorDate: Fri Aug 16 14:54:28 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 16:03:47 2019 +0200

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

in i18npool

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

diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx 
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 0eb7737c9156..7fcd4a808c51 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -629,8 +629,7 @@ BreakIteratorImpl::supportsService(const OUString& 
rServiceName)
 Sequence< OUString > SAL_CALL
 BreakIteratorImpl::getSupportedServiceNames()
 {
-Sequence< OUString > aRet { "com.sun.star.i18n.BreakIterator" };
-return aRet;
+return Sequence< OUString > { "com.sun.star.i18n.BreakIterator" };
 }
 
 }
diff --git a/i18npool/source/calendar/calendarImpl.cxx 
b/i18npool/source/calendar/calendarImpl.cxx
index 35e70146c3f9..be07222a347f 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -365,10 +365,8 @@ CalendarImpl::supportsService(const OUString& rServiceName)
 Sequence< OUString > SAL_CALL
 CalendarImpl::getSupportedServiceNames()
 {
-Sequence< OUString > aRet(2);
-aRet[0] = "com.sun.star.i18n.LocaleCalendar";
-aRet[1] = "com.sun.star.i18n.LocaleCalendar2";
-return aRet;
+return Sequence< OUString > { "com.sun.star.i18n.LocaleCalendar",
+"com.sun.star.i18n.LocaleCalendar2" };
 }
 
 }
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx 
b/i18npool/source/characterclassification/cclass_unicode.cxx
index 05769bc65eb1..3a2ae64d598d 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -286,8 +286,7 @@ sal_Bool SAL_CALL cclass_Unicode::supportsService(const 
OUString& rServiceName)
 
 Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames()
 {
-Sequence< OUString > aRet { 
"com.sun.star.i18n.CharacterClassification_Unicode" };
-return aRet;
+return Sequence< OUString > { 
"com.sun.star.i18n.CharacterClassification_Unicode" };
 }
 
 }
diff --git 
a/i18npool/source/characterclassification/characterclassificationImpl.cxx 
b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index c7db5f0f9df4..5693788316a8 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -202,8 +202,7 @@ CharacterClassificationImpl::supportsService(const 
OUString& rServiceName)
 Sequence< OUString > SAL_CALL
 CharacterClassificationImpl::getSupportedServiceNames()
 {
-Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification" };
-return aRet;
+return Sequence< OUString > { "com.sun.star.i18n.CharacterClassification" 
};
 }
 
 }
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx 
b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index 78324ba85756..dd6847b82c0c 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -78,8 +78,7 @@ UnoScriptTypeDetector::supportsService(const OUString& 
ServiceName)
 css::uno::Sequence< OUString > SAL_CALL
 UnoScriptTypeDetector::getSupportedServiceNames()
 {
-css::uno::Sequence< OUString > aRet { 
"com.sun.star.i18n.ScriptTypeDetector" };
-return aRet;
+return css::uno::Sequence< OUString > { 
"com.sun.star.i18n.ScriptTypeDetector" };
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/i18npool/source/collator/collatorImpl.cxx 
b/

[Libreoffice-commits] core.git: officecfg/registry

[Laurent BP (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   10 
+-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 003369b6d76225761373d46754890dd7f3c296c3
Author: Laurent BP 
AuthorDate: Fri Aug 16 10:40:38 2019 +0200
Commit: Laurent BP 
CommitDate: Fri Aug 16 15:56:28 2019 +0200

tdf#126908 Add lang to Tooltiplabel

Addition to commit?id=c3ca559841c857bf7b39f665433d71c89d220d0f

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2251c361e5a3..3867e735dfd5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1509,7 +1509,7 @@
   ~Rows
 
 
-  Delete selected rows
+  Delete selected rows
 
 
   1
@@ -1523,7 +1523,7 @@
   ~Columns
 
 
-  Delete selected columns
+  Delete selected columns
 
 
   1
@@ -1537,7 +1537,7 @@
   ~Table
 
 
-  Delete table
+  Delete table
 
 
   1
@@ -1628,7 +1628,7 @@
   C~ell
 
 
-  Select Cell
+  Select Cell
 
 
   1
@@ -1666,7 +1666,7 @@
   ~Table
 
 
-  Select Table
+  Select Table
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - 6 commits - cui/source embeddedobj/CppunitTest_embeddedobj_general.mk embeddedobj/Library_embobj.mk embeddedobj/Module_embeddedobj.m

[Miklos Vajna (via logerrit)]

 cui/source/inc/cuires.hrc  |4 
 cui/source/options/optfltr.cxx |   55 
 cui/source/options/optfltr.hxx |4 
 cui/source/options/optfltr.src |8 
 embeddedobj/CppunitTest_embeddedobj_general.mk |   44 +++
 embeddedobj/Library_embobj.mk  |4 
 embeddedobj/Module_embeddedobj.mk  |6 
 embeddedobj/qa/cppunit/data/insert-file-config.doc |binary
 embeddedobj/qa/cppunit/data/insert-file-config.pdf |binary
 embeddedobj/qa/cppunit/data/insert-file-config.vsdx|binary
 embeddedobj/qa/cppunit/general.cxx |  156 +
 embeddedobj/source/general/xcreator.cxx|   53 
 include/unotest/bootstrapfixturebase.hxx   |   15 +
 include/unotools/fltrcfg.hxx   |3 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   24 ++
 sw/inc/ndole.hxx   |4 
 sw/source/core/docnode/node.cxx|4 
 sw/source/core/ole/ndole.cxx   |   26 ++
 unotools/source/config/fltrcfg.cxx |   21 +
 19 files changed, 422 insertions(+), 9 deletions(-)

New commits:
commit e810ec9a3ac8825f42ec7276de01a210e82c717f
Author: Miklos Vajna 
AuthorDate: Thu Aug 15 15:47:42 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 16 13:53:06 2019 +0200

embeddedobj: allow controlling if PDF documents are converted to Draw or not

This is a bit custom, since it's not a Microsoft filter.  At the moment
this affects only Insert -> Object -> OLE Object -> from file.

Reviewed-on: https://gerrit.libreoffice.org/77520
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit bdfa6b678bc0cc22f983a0c23187a8ba9d2e6730)

Conflicts:
cui/inc/strings.hrc
cui/source/options/optfltr.cxx
cui/source/options/optfltr.hxx

Change-Id: If79602742a533db1b04e11a90890f8768186046d

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 891468779f3f..2f105444aa60 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -363,6 +363,8 @@
 
 #define RID_SVXSTR_CHG_VISIO(RID_SVX_START + 
1257)
 
+#define RID_SVXSTR_CHG_PDF  (RID_SVX_START + 
1273)
+
 #define RID_SVXSTR_PPI  (RID_SVX_START + 
1252)
 #define RID_SVXSTR_SPELL(RID_SVX_START + 
1253)
 #define RID_SVXSTR_HYPH (RID_SVX_START + 
1254)
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 8f0da2dbbcaf..e09d6c41dd0e 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "optfltr.hxx"
 #include 
 #include "helpid.hrc"
@@ -35,6 +36,7 @@ enum MSFltrPg2_CheckBoxEntries {
 Impress,
 SmartArt,
 Visio,
+PDF,
 InvalidCBEntry
 };
 
@@ -152,6 +154,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* 
pParent, const SfxItemSet
 sChgToFromImpress(CuiResId(RID_SVXSTR_CHG_IMPRESS)),
 sChgToFromSmartArt(CuiResId(RID_SVXSTR_CHG_SMARTART)),
 sChgToFromVisio(CuiResId(RID_SVXSTR_CHG_VISIO)),
+sChgToFromPDF(CuiResId(RID_SVXSTR_CHG_PDF)),
 pCheckButtonData(nullptr)
 {
 get(m_pCheckLBContainer, "checklbcontainer");
@@ -255,6 +258,24 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
 }
 }
 }
+SvTreeListEntry* pPDFEntry = GetEntry4Type(MSFltrPg2_CheckBoxEntries::PDF);
+bool bPDFCheck = false;
+if (pPDFEntry)
+{
+SvLBoxButton& rItem = static_cast(pPDFEntry->GetItem( 1 
));
+if (rItem.GetType() == SvLBoxItemType::Button)
+{
+SvItemStateFlags nButtonFlags = rItem.GetButtonFlags();
+bPDFCheck = SvButtonState::Checked == 
SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
+}
+}
+if (bPDFCheck != 
officecfg::Office::Common::Filter::Adobe::Import::PDFToDraw::get())
+{
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Filter::Adobe::Import::PDFToDraw::set(bPDFCheck, 
pBatch);
+pBatch->commit();
+}
 
 if( aHighlightingRB->IsValueChangedFromSaved() )
 {
@@ -287,7 +308,10 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 InsertEntry( sChgToFromImpress, static_cast< sal_IntPtr >( Impress ) );
 InsertEntry( sChgToFromSmartArt, static_cast< sal_IntPtr >( SmartArt ), 
false );
 if (aModuleOpt.IsModuleInstalled(SvtModuleOptions::EModule::DRAW))
+{
 InsertEntry(sChgToFromVisio, static_cast< sal_Int

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

[Julien Nabet (via logerrit)]

 dbaccess/source/core/api/RowSet.cxx |   14 +++---
 dbaccess/source/core/api/callablestatement.cxx  |5 +
 dbaccess/source/core/api/datacolumn.cxx |7 ++-
 dbaccess/source/core/api/definitioncolumn.cxx   |   16 
 dbaccess/source/core/api/preparedstatement.cxx  |5 +
 dbaccess/source/core/api/querydescriptor.cxx|5 +
 dbaccess/source/core/api/resultcolumn.cxx   |5 +
 dbaccess/source/core/api/resultset.cxx  |5 +
 dbaccess/source/core/dataaccess/definitioncontainer.cxx |5 +
 dbaccess/source/core/dataaccess/documentcontainer.cxx   |4 +---
 dbaccess/source/core/misc/DatabaseDataProvider.cxx  |3 +--
 dbaccess/source/ui/browser/dbloader.cxx |5 +
 dbaccess/source/ui/browser/sbagrid.cxx  |7 ++-
 13 files changed, 20 insertions(+), 66 deletions(-)

New commits:
commit 2379f36bd809c3cf3be71315a85946e273023a8c
Author: Julien Nabet 
AuthorDate: Fri Aug 16 10:52:32 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 16 15:11:00 2019 +0200

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

in dbaccess

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

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index 919ece8761c9..1485d77dcdec 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -478,13 +478,8 @@ sal_Bool SAL_CALL ORowSet::supportsService( const 
OUString& _rServiceName )
 
 Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames()
 {
-Sequence< OUString > aSNS( 5 );
-aSNS[0] = SERVICE_SDBC_RESULTSET;
-aSNS[1] = SERVICE_SDBC_ROWSET;
-aSNS[2] = SERVICE_SDBCX_RESULTSET;
-aSNS[3] = SERVICE_SDB_RESULTSET;
-aSNS[4] = SERVICE_SDB_ROWSET;
-return aSNS;
+return Sequence< OUString >{ SERVICE_SDBC_RESULTSET, SERVICE_SDBC_ROWSET,
+SERVICE_SDBCX_RESULTSET, SERVICE_SDB_RESULTSET, 
SERVICE_SDB_ROWSET };
 }
 
 // OComponentHelper
@@ -2875,10 +2870,7 @@ sal_Bool ORowSetClone::supportsService( const OUString& 
_rServiceName )
 
 Sequence< OUString > ORowSetClone::getSupportedServiceNames(  )
 {
-Sequence< OUString > aSNS( 2 );
-aSNS[0] = SERVICE_SDBC_RESULTSET;
-aSNS[1] = SERVICE_SDB_RESULTSET;
-return aSNS;
+return Sequence< OUString > { SERVICE_SDBC_RESULTSET, 
SERVICE_SDB_RESULTSET };
 }
 
 // OComponentHelper
diff --git a/dbaccess/source/core/api/callablestatement.cxx 
b/dbaccess/source/core/api/callablestatement.cxx
index 542e7089098d..db0db3695e0d 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -78,10 +78,7 @@ OUString OCallableStatement::getImplementationName(  )
 
 Sequence< OUString > OCallableStatement::getSupportedServiceNames(  )
 {
-Sequence< OUString > aSNS( 2 );
-aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT;
-aSNS.getArray()[1] = SERVICE_SDB_CALLABLESTATEMENT;
-return aSNS;
+return Sequence< OUString > { SERVICE_SDBC_CALLABLESTATEMENT, 
SERVICE_SDB_CALLABLESTATEMENT };
 }
 
 // XOutParameters
diff --git a/dbaccess/source/core/api/datacolumn.cxx 
b/dbaccess/source/core/api/datacolumn.cxx
index bcf0f9450bfd..3ce0dbb9ccaf 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -89,11 +89,8 @@ OUString ODataColumn::getImplementationName(  )
 
 Sequence< OUString > ODataColumn::getSupportedServiceNames(  )
 {
-Sequence< OUString > aSNS( 3 );
-aSNS[0] = SERVICE_SDBCX_COLUMN;
-aSNS[1] = SERVICE_SDB_RESULTCOLUMN;
-aSNS[2] = SERVICE_SDB_DATACOLUMN;
-return aSNS;
+return Sequence< OUString > { SERVICE_SDBCX_COLUMN, 
SERVICE_SDB_RESULTCOLUMN,
+   SERVICE_SDB_DATACOLUMN };
 }
 
 // OComponentHelper
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx 
b/dbaccess/source/core/api/definitioncolumn.cxx
index 8ca2c6fd9a6f..2cd33cfbd2fc 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -92,10 +92,8 @@ OUString OTableColumnDescriptor::getImplementationName(  )
 
 Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames(  )
 {
-Sequence< OUString > aSNS( 2 );
-aSNS[0] = m_bActAsDescriptor ? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : 
OUString(SERVICE_SDBCX_COLUMN);
-aSNS[1] = SERVICE_SDB_COLUMNSETTINGS;
-return aSNS;
+return Sequence< OUString > { m_bActAsDescriptor? 
OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN),
+SERVICE_SDB_COLUMNSETTINGS };
 }
 
 // comphelper::OPropertyArrayUsageHelper
@@ -438,10 +436,7 @@ OUString 
OTableColumnDescriptorWrapper::getImplementationName(  )
 
 Sequence< 

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

[Caolán McNamara (via logerrit)]

 scripting/source/pyprov/pythonscript.py |5 +
 1 file changed, 5 insertions(+)

New commits:
commit c6f119c9b58a9793c68a76f12511ee393608b4f4
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 10:18:34 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 15:11:07 2019 +0200

an absolute uri is invalid input

Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc
Reviewed-on: https://gerrit.libreoffice.org/77564
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit 3c076e54f736980e208f5c27ecf179aa90aea103)
Reviewed-on: https://gerrit.libreoffice.org/77571
Tested-by: Jenkins

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 0f74852523b3..d8924f8dba8c 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -237,6 +237,11 @@ class MyUriHelper:
 log.debug( message )
 raise RuntimeException( message )
 
+if xFileUri.isAbsolute():
+message = "pythonscript: an absolute uri is invalid '" + 
sFileUri+ "'"
+log.debug( message )
+raise RuntimeException( message )
+
 # absolute path to the .py file
 xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, 
True, RETAIN)
 sAbsScriptUri = xAbsScriptUri.getUriReference()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sfx2/source/dialog/templdlg.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 9a03308fafee8f424eba399c1aae56af02beafb0
Author: Noel Grandin 
AuthorDate: Fri Aug 16 12:42:13 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 16 14:38:38 2019 +0200

tdf#126663 speed up styles display by sorting twice

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

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index c9e654afed45..cf2de5311f0e 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1187,6 +1187,12 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
 aStrings.push_back(pStyle->GetName());
 pStyle = pStyleSheetPool->Next();
 }
+
+// Paradoxically, with a list and non-Latin style names,
+// sorting twice is faster than sorting once.
+// The first sort has a cheap comparator, and gets the list into 
mostly-sorted order.
+// Then the second sort needs to call its (much more expensive) comparator 
less often.
+std::sort(aStrings.begin(), aStrings.end());
 std::sort(aStrings.begin(), aStrings.end(),
[&aSorter](const OUString& rLHS, const OUString& rRHS) {
return aSorter.compare(rLHS, rRHS) < 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c70b86588fe56f3e1077f3f904c379afda70c6be
Author: Jan-Marek Glogowski 
AuthorDate: Fri Aug 16 11:43:23 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Aug 16 14:36:35 2019 +0200

Gtk3 inform LO of drag leave

Actually the correct code was added in commit 0b354d18ccfc
("Related: tdf#93054 gtk3: implement enough dnd to be dragged
into.."), but never enabled and then removed in commit c3074cb57843
("vcl: remove dead code). It's at least needed, so D'n'D between
two LO Calc windows correctly removes the pre-drop cell rectangle,
when the mouse leaves the 2nd window without doing the drop.

Commit references:
* 0b354d18ccfc05e7c2582f851d9201e2aa353d7d
* c3074cb5784329eaf558c2f58d96a64085b42d48

Change-Id: I55461f0c87cdef7a03fc261b363dc82642a3933d
Reviewed-on: https://gerrit.libreoffice.org/77568
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index c4ed383798ef..53d492f4b8aa 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3610,6 +3610,10 @@ void GtkDropTarget::signalDragLeave(GtkWidget* pWidget, 
GdkDragContext* /*contex
 {
 m_bInDrag = false;
 gtk_drag_unhighlight(pWidget);
+
+css::datatransfer::dnd::DropTargetEvent aEvent;
+aEvent.Source = static_cast(this);
+fire_dragExit(aEvent);
 }
 
 void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 8 commits - download.lst external/nss include/sfx2 scripting/source sfx2/source shell/source

[Jan-Marek Glogowski (via logerrit)]

 download.lst|4 
 external/nss/UnpackedTarball_nss.mk |3 
 external/nss/clang-cl.patch.0   |   14 
 external/nss/nss-chromium-nss-static.patch  |  487 
 external/nss/nss-more-static.patch  |   39 -
 external/nss/nss.fix-freebl-add-lcc-support.patch.1 |   11 
 external/nss/nss.patch  |   13 
 include/sfx2/objsh.hxx  |2 
 scripting/source/protocolhandler/scripthandler.cxx  |9 
 scripting/source/pyprov/pythonscript.py |4 
 sfx2/source/doc/objmisc.cxx |   55 +-
 sfx2/source/notify/eventsupplier.cxx|   18 
 shell/source/win32/SysShExec.cxx|4 
 13 files changed, 89 insertions(+), 574 deletions(-)

New commits:
commit 62af58e4a0b479540ca5eeea88b6227689767d1c
Author: Jan-Marek Glogowski 
AuthorDate: Fri Jul 12 15:01:41 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Aug 16 13:55:10 2019 +0200

NSS fix lcc support patch

This hangs the build process with current MSVC cl.exe. It even
hangs when just calling "cl -? >/dev/null". Probably
a cl.exe bug to detect redirection properly?

This adds stdin redirection to /dev/null, like in configure.ac checks.

Reviewed-on: https://gerrit.libreoffice.org/75495
Reviewed-by: Jan-Marek Glogowski 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit b11ea5e9c37b19f0d60a4075146668954a7bf728)

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

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index a38e8cf1c52f..9c73fc696ce0 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.mingw.patch.3) \
 external/nss/ubsan.patch.0 \
 external/nss/clang-cl.patch.0 \
+external/nss/nss.fix-freebl-add-lcc-support.patch.1 \
 $(if $(filter IOS,$(OS)), \
 external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
diff --git a/external/nss/nss.fix-freebl-add-lcc-support.patch.1 
b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
new file mode 100644
index ..3e3c06327dde
--- /dev/null
+++ b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
@@ -0,0 +1,11 @@
+--- b/nss/lib/freebl/Makefile
 a/nss/lib/freebl/Makefile
+@@ -495,7 +495,7 @@
+ ifdef USE_64
+ # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
+ # NB: CC_NAME is not defined here
+-ifneq ($(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q'),lcc)
++ifneq ($(shell $(CC) -? 2>&1 >/dev/null 
AuthorDate: Wed Jul 10 12:20:00 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Aug 16 13:54:59 2019 +0200

nss: upgrade to release 3.45

Fixes CVE-2019-11729 CVE-2019-11719 CVE-2019-11727, and the less
important CVE-2018-12384 and CVE-2018-12404 from intermediate releases.

Since NSS 3.44 it's possible to build as static libraries and for iOS;
drop the nss-chromium-nss-static.patch and nss-more-static.patch and
hope that it works.

Drop one hunk from nss.patch that looks fixed upstream.

Change-Id: I7f37ac36f7f8dfd49d0bfb4a6185ca49d4f618a3
Reviewed-on: https://gerrit.libreoffice.org/75344
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 6efc8a33f69bc7f4be45b7b81f67cd74c163b99e)
Reviewed-on: https://gerrit.libreoffice.org/75411
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 761d5bf28abb..70d73e76f35a 100644
--- a/download.lst
+++ b/download.lst
@@ -112,8 +112,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 := cd649be8ee61fe15d64d7bef361b37ba
-export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
+export NSS_MD5SUM := 2f7dab8f5b85b1494f6bec2cc32a1f5c
+export NSS_TARBALL := nss-3.45-with-nspr-4.21.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/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 1a7ed1373230..a38e8cf1c52f 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -26,8 +26,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/ubsan.patch.0 \
 external/nss/

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 5d3e9ababc0b3e049a7556b210bb6349e3e3322c
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 08:54:45 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 16 14:24:27 2019 +0200

Resolves: tdf#126951 crash in custom slide show

on selecting entry 0 which doesn't exist

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 3dfe6b2bd7a9..0ca121c0e8ac 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3094,7 +3094,7 @@ public:
 {
 assert(m_xTreeView->IsUpdateMode() && "don't select when frozen");
 disable_notify_events();
-if (pos == -1)
+if (pos == -1 || (pos == 0 && n_children() == 0))
 m_xTreeView->SelectAll(false);
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/qa/cppunit/timer.cxx |   77 ---
 1 file changed, 77 deletions(-)

New commits:
commit 98fb1f98031dc6ef5d100bb2af7b504a77a52b2c
Author: Stephan Bergmann 
AuthorDate: Fri Aug 16 12:12:29 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 13:43:06 2019 +0200

Drop TimerTest::testStopwatch

(that had been added with 6e13585508ca3c9b66c6571ad1eb42bfcb66ef0b "Add a
TaskStopwatch to interrupt idle loops").  By the same reasoning as in
92e42a0fde32e3f2dbe2c786a0e41547e4912b4b "Drop bogus check from
TimerTest::testStopwatch", there is no guarantee that a StopwatchIdle would 
run
(close to) ten iterations of Invoke before calling Stop, so the two checks

CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, double(n1Iter), 1.1);
CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, double(n2Iter), 1.1);

are bogus, too.  And there are reports of failures like
:

> 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/vcl/qa/cppunit/timer.cxx:603:TimerTest::testStopwatch
> double equality assertion failed
> - Expected: 10
> - Actual  : 6
> - Delta   : 1.1

So remove those two bogus checks.  But with them gone, testStopwatch would 
be
rather pointless, so remove it completely.

Change-Id: Iec627de48d693665cde7b5eed445640fedee391c
Reviewed-on: https://gerrit.libreoffice.org/77570
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 1c5913d287de..90705d26ec19 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -15,7 +15,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -73,8 +72,6 @@ public:
 void testPriority();
 void testRoundRobin();
 
-void testStopwatch();
-
 CPPUNIT_TEST_SUITE(TimerTest);
 CPPUNIT_TEST(testIdle);
 CPPUNIT_TEST(testIdleMainloop);
@@ -94,8 +91,6 @@ public:
 CPPUNIT_TEST(testPriority);
 CPPUNIT_TEST(testRoundRobin);
 
-CPPUNIT_TEST(testStopwatch);
-
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -532,78 +527,6 @@ void TimerTest::testRoundRobin()
 CPPUNIT_ASSERT( 3 == nCount1 && 3 == nCount2 );
 }
 
-class StopwatchIdle : public AutoIdle
-{
-sal_uInt32 m_nIters;
-sal_uInt64 m_nBusyTicks;
-
-public:
-StopwatchIdle(sal_uInt64 nBusyTicks)
-: AutoIdle("StopwatchIdle")
-, m_nIters(0)
-, m_nBusyTicks(nBusyTicks)
-{
-if (m_nBusyTicks > 0)
-Start();
-}
-
-virtual void Invoke() override
-{
-TaskStopwatch aWatch;
-// ignore all system events
-aWatch.setInputStop(VclInputFlags::NONE);
-
-sal_uInt64 nStartTicks = tools::Time::GetSystemTicks();
-sal_uInt64 nCurTicks = nStartTicks;
-
-while (!aWatch.exceededRuntime())
-{
-nCurTicks = tools::Time::GetSystemTicks();
-if (nCurTicks - nStartTicks >= m_nBusyTicks)
-{
-nCurTicks = nStartTicks + m_nBusyTicks;
-break;
-}
-}
-
-assert(m_nBusyTicks >= (nCurTicks - nStartTicks));
-m_nBusyTicks -= (nCurTicks - nStartTicks);
-m_nIters++;
-
-if (m_nBusyTicks == 0)
-Stop();
-}
-
-bool isDone(sal_uInt32 &nIters)
-{
-nIters = m_nIters;
-return (m_nBusyTicks == 0);
-}
-};
-
-void TimerTest::testStopwatch()
-{
-TaskStopwatch::setTimeSlice(10);
-
-StopwatchIdle a1Idle(100);
-StopwatchIdle a2Idle(100);
-
-sal_uInt32 n1Iter, n2Iter;
-while (true)
-{
-Application::Reschedule();
-
-bool b1Done = a1Idle.isDone(n1Iter);
-bool b2Done = a2Idle.isDone(n2Iter);
-
-if (b1Done && b2Done)
-break;
-}
-
-CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, double(n1Iter), 1.1);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, double(n2Iter), 1.1);
-}
-
 CPPUNIT_TEST_SUITE_REGISTRATION(TimerTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 201143bf828dbe5e9545016ff0c968839d750692
Author: Jan Holesovsky 
AuthorDate: Thu Nov 15 11:51:42 2018 +0100
Commit: Noel Grandin 
CommitDate: Fri Aug 16 13:35:15 2019 +0200

lok sc: Fix the formula input bar and address bar notifications.

Apparently we did not have the pInputWin living in the background; but
now we have.  There is no reason to treat it in an 'else' branch, these
checks should be separate either way.

Change-Id: Ibb8d92fb1e2803942460d2063847917d082fcb2e
Reviewed-on: https://gerrit.libreoffice.org/71863
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
Reviewed-on: https://gerrit.libreoffice.org/76292
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 1d77ea8f3e64af4becff869474dd79c633dd0070)
Reviewed-on: https://gerrit.libreoffice.org/77507
Tested-by: Jenkins CollaboraOffice 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 36af4bd5979c..3d7029d3aa30 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3691,11 +3691,9 @@ void ScInputHandler::NotifyChange( const 
ScInputHdlState* pState,
 
 if ( pInputWin )
 pInputWin->SetTextString(aString);
-else if (comphelper::LibreOfficeKit::isActive())
-{
-if (pActiveViewSh)
-
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, 
aString.toUtf8().getStr());
-}
+
+if (comphelper::LibreOfficeKit::isActive() && 
pActiveViewSh)
+
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, 
aString.toUtf8().getStr());
 }
 
 if ( pInputWin || comphelper::LibreOfficeKit::isActive())  
  // Named range input
@@ -3733,10 +3731,9 @@ void ScInputHandler::NotifyChange( const 
ScInputHdlState* pState,
 
pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
 pInputWin->SetSumAssignMode();
 }
-else if (pActiveViewSh)
-{
+
+if (comphelper::LibreOfficeKit::isActive() && 
pActiveViewSh)
 
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, 
aPosStr.toUtf8().getStr());
-}
 }
 
 if (bStopEditing)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source canvas/source chart2/source connectivity/source cui/source dbaccess/source desktop/source editeng/source extensions/source fil

[Noel Grandin (via logerrit)]

 avmedia/source/framework/mediaitem.cxx   |3 
 basctl/source/basicide/scriptdocument.cxx|3 
 basic/source/classes/sbxmod.cxx  |3 
 basic/source/runtime/runtime.cxx |3 
 basic/source/uno/namecont.cxx|   20 -
 canvas/source/directx/dx_config.cxx  |4 
 chart2/source/tools/ErrorBar.cxx |3 
 connectivity/source/commontools/parameters.cxx   |   21 -
 connectivity/source/cpool/ZPoolCollection.cxx|3 
 connectivity/source/drivers/file/FDatabaseMetaData.cxx   |3 
 cui/source/customize/CommandCategoryListBox.cxx  |3 
 cui/source/customize/cfg.cxx |   12 
 cui/source/dialogs/scriptdlg.cxx |   12 
 cui/source/options/optjava.cxx   |3 
 cui/source/options/optlingu.cxx  |8 
 cui/source/options/optpath.cxx   |3 
 cui/source/options/optsave.cxx   |3 
 cui/source/options/optupdt.cxx   |6 
 cui/source/options/treeopt.cxx   |   12 
 dbaccess/source/core/api/RowSet.cxx  |3 
 dbaccess/source/core/dataaccess/databasedocument.cxx |3 
 dbaccess/source/core/dataaccess/datasource.cxx   |3 
 dbaccess/source/ui/misc/UITools.cxx  |3 
 desktop/source/app/app.cxx   |3 
 desktop/source/app/check_ext_deps.cxx|3 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx |6 
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx   |3 
 desktop/source/deployment/manager/dp_manager.cxx |6 
 desktop/source/deployment/registry/package/dp_package.cxx|   10 
 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx   |3 
 editeng/source/xml/xmltxtexp.cxx |3 
 extensions/source/bibliography/datman.cxx|3 
 extensions/source/config/ldap/ldapuserprofilebe.cxx  |3 
 extensions/source/dbpilots/listcombowizard.cxx   |3 
 extensions/source/propctrlr/eformspropertyhandler.cxx|5 
 extensions/source/update/check/updatecheck.cxx   |6 
 extensions/source/update/check/updatecheckjob.cxx|6 
 extensions/source/update/feed/test/updatefeedtest.cxx|2 
 filter/source/graphicfilter/icgm/cgm.cxx |3 
 filter/source/odfflatxml/OdfFlatXml.cxx  |3 
 filter/source/xsltfilter/XSLTFilter.cxx  |3 
 forms/source/component/ListBox.cxx   |3 
 forms/source/misc/InterfaceContainer.cxx |3 
 formula/source/ui/dlg/formula.cxx|6 
 io/source/stm/opump.cxx  |   15 
 linguistic/source/convdiclist.cxx|7 
 linguistic/source/gciterator.cxx |6 
 oox/source/drawingml/textfield.cxx   |3 
 oox/source/drawingml/textrun.cxx |3 
 oox/source/ole/axcontrol.cxx |   15 
 oox/source/ppt/presentationfragmenthandler.cxx   |6 
 oox/source/ppt/slidefragmenthandler.cxx  |3 
 oox/source/vml/vmldrawing.cxx|3 
 sc/source/core/data/dpsave.cxx   |3 
 sc/source/filter/oox/excelfilter.cxx |3 
 sc/source/filter/oox/pivotcachebuffer.cxx|6 
 sc/source/filter/xml/xmlwrap.cxx |9 
 sc/source/ui/Accessibility/DrawModelBroadcaster.cxx  |3 
 sd/source/core/CustomAnimationCloner.cxx |   11 
 sd/source/core/stlsheet.cxx  |3 
 sd/source/filter/html/htmlex.cxx |6 
 sd/source/filter/xml/sdxmlwrp.cxx|   12 
 sd/source/helper/simplereferencecomponent.cxx|3 
 sd/source/ui/accessibility/AccessiblePageShape.cxx   |3 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx|   21 -
 sd/source/ui/framework/module/ModuleController.cxx   |3 
 sd/source/ui/remotecontrol/Receiver.cxx  |   14 
 sd/source/ui/slideshow/slideshowimpl.cxx |   58 +--
 sd/source/ui/tools/ConfigurationAccess.cxx   |3 
 sd/source/ui/unoidl/DrawController.cxx   |3 
 sd/source/ui/unoidl/unomodel.cxx |3 
 sd/source/ui/view/drvi

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

[Caolán McNamara (via logerrit)]

 scripting/source/pyprov/pythonscript.py |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 9a97a26511584f41c3753fa9536e1c4a8dce637a
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 10:38:18 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 16 13:05:52 2019 +0200

member 'Context' of struct type 'uno.Exception' not given a value

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

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 67251e6ada61..bd2aa3e1670e 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -176,6 +176,7 @@ def toIniName( str ):
 class MyUriHelper:
 
 def __init__( self, ctx, location ):
+self.ctx = ctx
 self.s_UriMap = \
 { "share" : 
"vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python" , \
   "share:uno_packages" : 
"vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \
@@ -203,7 +204,7 @@ class MyUriHelper:
 if not storageURI.startswith( self.m_baseUri ):
 message = "pythonscript: storage uri '" + storageURI + "' not in 
base uri '" + self.m_baseUri + "'"
 log.debug( message )
-raise RuntimeException( message )
+raise RuntimeException( message, self.ctx )
 
 ret = "vnd.sun.star.script:" + \
   storageURI[len(self.m_baseUri)+1:].replace("/","|") + \
@@ -235,12 +236,12 @@ class MyUriHelper:
 if not xFileUri:
 message = "pythonscript: invalid relative uri '" + sFileUri+ 
"'"
 log.debug( message )
-raise RuntimeException( message )
+raise RuntimeException( message, self.ctx )
 
 if xFileUri.isAbsolute():
 message = "pythonscript: an absolute uri is invalid '" + 
sFileUri+ "'"
 log.debug( message )
-raise RuntimeException( message )
+raise RuntimeException( message, self.ctx )
 
 # absolute path to the .py file
 xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, 
True, RETAIN)
@@ -250,7 +251,7 @@ class MyUriHelper:
 if not sAbsScriptUri.startswith(sBaseUri):
 message = "pythonscript: storage uri '" + sAbsScriptUri + "' 
not in base uri '" + self.m_baseUri + "'"
 log.debug( message )
-raise RuntimeException( message )
+raise RuntimeException( message, self.ctx )
 
 ret = sAbsScriptUri
 if funcNameStart != -1:
@@ -259,10 +260,10 @@ class MyUriHelper:
 return ret
 except UnoException as e:
 log.error( "error during converting scriptURI="+scriptURI + ": " + 
e.Message)
-raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + 
e.Message, None )
+raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + 
e.Message, self.ctx )
 except Exception as e:
 log.error( "error during converting scriptURI="+scriptURI + ": " + 
str(e))
-raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + 
str(e), None )
+raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + 
str(e), self.ctx )
 
 
 class ModuleEntry:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 scripting/source/pyprov/pythonscript.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 700c8ec9782c3d81fef0e42146af6b69ecd84e2a
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 10:32:33 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 16 13:04:52 2019 +0200

AttributeError on getMessage

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

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index d8924f8dba8c..67251e6ada61 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -259,7 +259,7 @@ class MyUriHelper:
 return ret
 except UnoException as e:
 log.error( "error during converting scriptURI="+scriptURI + ": " + 
e.Message)
-raise RuntimeException( "pythonscript:scriptURI2StorageUri: " 
+e.getMessage(), None )
+raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + 
e.Message, None )
 except Exception as e:
 log.error( "error during converting scriptURI="+scriptURI + ": " + 
str(e))
 raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + 
str(e), None )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

[Samuel Mehrbrodt (via logerrit)]

 offapi/com/sun/star/frame/XDesktop.idl |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 61a60e545e774c768b0783218520c819ea6de631
Author: Samuel Mehrbrodt 
AuthorDate: Fri Aug 16 11:48:01 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Fri Aug 16 12:51:52 2019 +0200

Fix typos and formatting

Change-Id: I24f2b7138ef1efb9c981e24804819ad2779b1b4b
Reviewed-on: https://gerrit.libreoffice.org/77567
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/offapi/com/sun/star/frame/XDesktop.idl 
b/offapi/com/sun/star/frame/XDesktop.idl
index 4a338c80564d..b25fdcdafd77 100644
--- a/offapi/com/sun/star/frame/XDesktop.idl
+++ b/offapi/com/sun/star/frame/XDesktop.idl
@@ -54,9 +54,9 @@ published interface XDesktop: com::sun::star::uno::XInterface
 
 
 @return
-`TRUE`if all listener agree with this request
+`TRUE` If all listeners agree with this request
 
-`FALSE`otherwise
+`FALSE` Otherwise
 
 @see XTerminateListener
 @see TerminationVetoException
@@ -77,7 +77,7 @@ published interface XDesktop: com::sun::star::uno::XInterface
 /** unregisters an event listener for termination events.
 
 @param Listener
-listener which wish to be deregistered
+listener which wishes to be deregistered
 
 @see XDesktop::addTerminateListener()
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 scripting/source/pyprov/pythonscript.py |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 3c076e54f736980e208f5c27ecf179aa90aea103
Author: Caolán McNamara 
AuthorDate: Fri Aug 16 10:18:34 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 12:20:03 2019 +0200

an absolute uri is invalid input

Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc
Reviewed-on: https://gerrit.libreoffice.org/77564
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 0f74852523b3..d8924f8dba8c 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -237,6 +237,11 @@ class MyUriHelper:
 log.debug( message )
 raise RuntimeException( message )
 
+if xFileUri.isAbsolute():
+message = "pythonscript: an absolute uri is invalid '" + 
sFileUri+ "'"
+log.debug( message )
+raise RuntimeException( message )
+
 # absolute path to the .py file
 xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, 
True, RETAIN)
 sAbsScriptUri = xAbsScriptUri.getUriReference()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/qa/cppunit/timer.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 92e42a0fde32e3f2dbe2c786a0e41547e4912b4b
Author: Stephan Bergmann 
AuthorDate: Fri Aug 16 09:56:29 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 16 10:49:40 2019 +0200

Drop bogus check from TimerTest::testStopwatch

(that had been added with 6e13585508ca3c9b66c6571ad1eb42bfcb66ef0b "Add a
TaskStopwatch to interrupt idle loops").  For each StopwatchIdle, m_nIters
counts the calls to Invoke before it calls Stop (which it calls based on
tools::Time::GetSystemTicks calculations).  But the number of such
GetSystemTicks() spent in each Invoke is nondeterministic (it can e.g. be
affected by the overall system load), so a2Idle may Stop prior to a1Idle and
thus have a lower nIter2 than nIter1.

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

diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 39734ae18b85..1c5913d287de 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -595,7 +595,6 @@ void TimerTest::testStopwatch()
 
 bool b1Done = a1Idle.isDone(n1Iter);
 bool b2Done = a2Idle.isDone(n2Iter);
-CPPUNIT_ASSERT(n1Iter >= n2Iter);
 
 if (b1Done && b2Done)
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to handle a testing only python package dependency

[Miklos Vajna]

Hi Markus,

On Thu, Aug 15, 2019 at 03:24:19AM +0800, Markus Mohrhard 
 wrote:
> What is our policy about python packages that are actually not needed for
> an installed LibreOffice?

I think most build-time dependencies are simply mandated by configure,
and then either provided manually or via lode (think of doxygen, gperf,
etc.)

> My current solution would be to add an explicit ImportError check in the
> script and tell the person calling the script to install the package. As
> this is mostly something for a few selected QA team members this seems like
> an acceptable solution.
> 
> Any other solutions/opinions?

Sounds good to me. It's similar to e.g. bin/find-unneeded-includes,
where the few ones who actually use it will take care of installing the
underlying dependency and others are not forced to install it.

Regards,

Miklos


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

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |   86 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   62 +-
 2 files changed, 97 insertions(+), 51 deletions(-)

New commits:
commit 34e83dd95260d534464ff9a61eddefdde136013c
Author: Caolán McNamara 
AuthorDate: Thu Aug 15 20:29:40 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 16 09:17:36 2019 +0200

tdf#126007 tdf#122355 online help won't look into a dialog notebook

when the focus is on the help button, offline will through the help fallback
route, but online will just fire and forget and let the server side do a
fallback, which can't know what the current notebook page was.

so bodge it to look at the notebook page right from the start if there is 
one
and its the help button itself which starts the request

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 922828140e8c..3dfe6b2bd7a9 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1029,27 +1029,7 @@ public:
 return m_xWindow->GetText();
 }
 
-void help()
-{
-//show help for widget with keyboard focus
-vcl::Window* pWidget = ImplGetSVData()->maWinData.mpFocusWin;
-if (!pWidget)
-pWidget = m_xWindow;
-OString sHelpId = pWidget->GetHelpId();
-while (sHelpId.isEmpty())
-{
-pWidget = pWidget->GetParent();
-if (!pWidget)
-break;
-sHelpId = pWidget->GetHelpId();
-}
-std::unique_ptr xTemp(pWidget != m_xWindow ? new 
SalInstanceWidget(pWidget, m_pBuilder, false) : nullptr);
-weld::Widget* pSource = xTemp ? xTemp.get() : this;
-bool bRunNormalHelpRequest = !m_aHelpRequestHdl.IsSet() || 
m_aHelpRequestHdl.Call(*pSource);
-Help* pHelp = bRunNormalHelpRequest ? Application::GetHelp() : nullptr;
-if (pHelp)
-pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), 
pSource);
-}
+void help();
 
 virtual void set_busy_cursor(bool bBusy) override
 {
@@ -5526,6 +5506,17 @@ public:
 return std::make_unique();
 }
 
+OString get_current_page_help_id()
+{
+TabControl *pCtrl = get_builder().get("tabcontrol");
+TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : 
nullptr;
+vcl::Window *pTabChild = pTabPage ? 
pTabPage->GetWindow(GetWindowType::FirstChild) : nullptr;
+pTabChild = pTabChild ? 
pTabChild->GetWindow(GetWindowType::FirstChild) : nullptr;
+if (pTabChild)
+return pTabChild->GetHelpId();
+return OString();
+}
+
 virtual ~SalInstanceBuilder() override
 {
 if (VclBuilderContainer* pOwnedToplevel = 
dynamic_cast(m_aOwnedToplevel.get()))
@@ -,6 +5546,43 @@ weld::Builder* 
Application::CreateInterimBuilder(weld::Widget* pParent, const OU
 return Application::CreateInterimBuilder(pParentWidget, rUIFile);
 }
 
+void SalInstanceWindow::help()
+{
+//show help for widget with keyboard focus
+vcl::Window* pWidget = ImplGetSVData()->maWinData.mpFocusWin;
+if (!pWidget)
+pWidget = m_xWindow;
+OString sHelpId = pWidget->GetHelpId();
+while (sHelpId.isEmpty())
+{
+pWidget = pWidget->GetParent();
+if (!pWidget)
+break;
+sHelpId = pWidget->GetHelpId();
+}
+std::unique_ptr xTemp(pWidget != m_xWindow ? new 
SalInstanceWidget(pWidget, m_pBuilder, false) : nullptr);
+weld::Widget* pSource = xTemp ? xTemp.get() : this;
+bool bRunNormalHelpRequest = !m_aHelpRequestHdl.IsSet() || 
m_aHelpRequestHdl.Call(*pSource);
+Help* pHelp = bRunNormalHelpRequest ? Application::GetHelp() : nullptr;
+if (pHelp)
+{
+// tdf#126007, there's a nice fallback route for offline help where
+// the current page of a notebook will get checked when the help
+// button is pressed and there was no help for the dialog found.
+//
+// But for online help that route doesn't get taken, so bodge this here
+// by using the page help id if available and if the help button itself
+// was the original id
+if (m_pBuilder && sHelpId.endsWith("/help"))
+{
+OString sPageId = m_pBuilder->get_current_page_help_id();
+if (!sPageId.isEmpty())
+sHelpId = sPageId;
+}
+pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), 
pSource);
+}
+}
+
 //iterate upwards through the hierarchy from this widgets through its parents
 //calling func with their helpid until func returns true or we run out of 
parents
 void SalInstanceWidget::help_hierarchy_foreach(const std::function&

[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/ChildSession.hpp kit/Kit.cpp

[Miklos Vajna (via logerrit)]

 kit/ChildSession.cpp |   23 +--
 kit/ChildSession.hpp |   15 ++-
 kit/Kit.cpp  |5 +
 3 files changed, 28 insertions(+), 15 deletions(-)

New commits:
commit 85dbb4a9afcc144680718f77af00200adb5d60e5
Author: Miklos Vajna 
AuthorDate: Fri Aug 16 09:05:54 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 16 09:05:54 2019 +0200

kit: fix UB in ChildSession::disconnect()

Finally unit-copy-paste passes under sanitizers with this. Details:

==8988==ERROR: AddressSanitizer: heap-use-after-free on address 
0x60d0005e6de0 at pc 0x00988e85 bp 0x7fff753316d0 sp 0x7fff753316c8
READ of size 4 at 0x60d0005e6de0 thread T0 (loolkit)
#0 0x988e84 in std::pair::pair(std::pair const&) 
/home/vmiklos/git/libreoffice/lode/opt_private/gcc-7.3.0/lib64/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_pair.h:292:17
...
#12 0x9322af in Document::notifyViewInfo() 
/home/vmiklos/git/libreoffice/online-san/kit/Kit.cpp:1600:53
#13 0x9303f9 in Document::onUnload(ChildSession const&) 
/home/vmiklos/git/libreoffice/online-san/kit/Kit.cpp:1566:13
#14 0x616dcd in ChildSession::disconnect() 
/home/vmiklos/git/libreoffice/online-san/kit/ChildSession.cpp:96:25
#15 0x616535 in ChildSession::~ChildSession() 
/home/vmiklos/git/libreoffice/online-san/kit/ChildSession.cpp:85:5

freed by thread T0 (loolkit) here:
#0 0x60f9b0 in operator delete(void*) _asan_rtl_:0
...
#8 0x939292 in Document::~Document() 
/home/vmiklos/git/libreoffice/online-san/kit/Kit.cpp:913:5

I.e. when the Document dtor clears Document::_sessions, the ChildSession
dtor may be called. But ChildSession expected that it has a valid
Document during its lifetime, which is not a promise we can hold, see
the above trace.

Fix the problem by having a pointer (and not a reference) to a Document
in ChildSession and then:

1) Clear that Document pointer in ChildSessions at the end of the
Document dtor using a new resetDocManager()

2) Check if the Document is nullptr in ChildSession::disconnect()
instead of dereferencing it unconditionally.

Change-Id: I19d3d6bfe9e142a52c199f49aaa347d1a2edbf87

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 428808835..62566c7be 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -70,7 +70,7 @@ ChildSession::ChildSession(const std::string& id,
DocumentManagerInterface& docManager) :
 Session("ToMaster-" + id, id, false),
 _jailId(jailId),
-_docManager(docManager),
+_docManager(&docManager),
 _viewId(-1),
 _isDocLoaded(false),
 _copyToClipboard(false)
@@ -93,7 +93,10 @@ void ChildSession::disconnect()
 
 if (_viewId >= 0)
 {
-_docManager.onUnload(*this);
+if (_docManager)
+{
+_docManager->onUnload(*this);
+}
 }
 else
 {
@@ -132,7 +135,7 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 curPart = getLOKitDocument()->getPart();
 
 // Notify all views about updated view info
-_docManager.notifyViewInfo();
+_docManager->notifyViewInfo();
 
 if (getLOKitDocument()->getDocumentType() != LOK_DOCTYPE_TEXT)
 {
@@ -565,7 +568,7 @@ bool ChildSession::loadDocument(const char * /*buffer*/, 
int /*length*/, const s
 
 std::unique_lock lock(Mutex);
 
-const bool loaded = _docManager.onLoad(getId(), getJailedFilePath(), 
getJailedFilePathAnonym(),
+const bool loaded = _docManager->onLoad(getId(), getJailedFilePath(), 
getJailedFilePathAnonym(),
getUserName(), getUserNameAnonym(),
getDocPassword(), renderOpts, 
getHaveDocPassword(),
getLang(), getWatermarkText(), 
doctemplate);
@@ -607,8 +610,8 @@ bool ChildSession::loadDocument(const char * /*buffer*/, 
int /*length*/, const s
 }
 
 // Inform everyone (including this one) about updated view info
-_docManager.notifyViewInfo();
-sendTextFrame("editor: " + std::to_string(_docManager.getEditorId()));
+_docManager->notifyViewInfo();
+sendTextFrame("editor: " + std::to_string(_docManager->getEditorId()));
 
 
 LOG_INF("Loaded session " << getId());
@@ -750,7 +753,7 @@ bool ChildSession::getCommandValues(const char* /*buffer*/, 
int /*length*/, cons
 std::string(values == nullptr ? "" : 
values),
 std::string(undo == nullptr ? "" : 
undo));
 // json only contains view IDs, insert matching user names.
-std::map viewInfo = _docManager.getViewInfo();
+std::map viewInfo = _docManager->getViewInfo();
 insertUserNames(viewInfo, json);
 success = sendTextFrame

[Libreoffice-commits] core.git: compilerplugins/clang editeng/source filter/source lingucomponent/source solenv/CompilerTest_compilerplugins_clang.mk xmlscript/source xmlsecurity/qa xmlsecurity/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/sequenceloop.cxx  |   76 
 compilerplugins/clang/test/sequenceloop.cxx |   35 +
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |4 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx|4 
 filter/source/xsltdialog/xmlfiltertestdialog.cxx|4 
 lingucomponent/source/spellcheck/spell/sspellimp.cxx|8 -
 solenv/CompilerTest_compilerplugins_clang.mk|1 
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx  |6 
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx |2 
 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx|4 
 xmlsecurity/qa/unit/signing/signing.cxx |2 
 xmlsecurity/source/dialogs/certificatechooser.cxx   |2 
 xmlsecurity/source/dialogs/macrosecurity.cxx|2 
 xmlsecurity/source/helper/documentsignaturehelper.cxx   |4 
 xmlsecurity/source/helper/documentsignaturemanager.cxx  |4 
 xmlsecurity/source/helper/ooxmlsecexporter.cxx  |2 
 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx  |3 
 17 files changed, 138 insertions(+), 25 deletions(-)

New commits:
commit 7d7a7862a7dccb6764f80258f28685a0da3cbbcb
Author: Noel Grandin 
AuthorDate: Wed Aug 14 11:14:08 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 16 09:04:51 2019 +0200

new loplugin:sequenceloop

look for places we should be using std::as_const on for-range
loops over uno::Sequence, to avoid triggering a copy

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

diff --git a/compilerplugins/clang/sequenceloop.cxx 
b/compilerplugins/clang/sequenceloop.cxx
new file mode 100644
index ..340412a5137a
--- /dev/null
+++ b/compilerplugins/clang/sequenceloop.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include "plugin.hxx"
+#include "check.hxx"
+
+/**
+  When used in "for" loops, css::uno::Sequence objects tend to end up calling 
the non-const begin()/end(),
+  which is considerably more expensive than the const variants because it 
forces a local copy
+  of the internal ref-counted impl object.
+*/
+
+namespace
+{
+class SequenceLoop : public loplugin::FilteringPlugin
+{
+public:
+explicit SequenceLoop(loplugin::InstantiationData const& data)
+: FilteringPlugin(data)
+{
+}
+
+virtual void run() override
+{
+if (preRun())
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+
+bool VisitCXXForRangeStmt(CXXForRangeStmt const*);
+};
+
+bool SequenceLoop::VisitCXXForRangeStmt(CXXForRangeStmt const* forStmt)
+{
+if (ignoreLocation(forStmt))
+return true;
+
+auto tc = loplugin::TypeCheck(forStmt->getRangeInit()->getType());
+if (tc.Const())
+return true;
+if (!tc.Class("Sequence")
+ .Namespace("uno")
+ .Namespace("star")
+ .Namespace("sun")
+ .Namespace("com")
+ .GlobalNamespace())
+return true;
+const VarDecl* varDecl = forStmt->getLoopVariable();
+auto tc2 = loplugin::TypeCheck(varDecl->getType());
+if (!tc2.LvalueReference().Const())
+return true;
+
+report(DiagnosticsEngine::Warning,
+   "use std::as_const, or make range var const, to avoid creating a 
copy of the Sequence",
+   compat::getBeginLoc(forStmt))
+<< forStmt->getSourceRange();
+return true;
+}
+
+loplugin::Plugin::Registration X("sequenceloop");
+
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/test/sequenceloop.cxx 
b/compilerplugins/clang/test/sequenceloop.cxx
new file mode 100644
index ..113e8fd588fe
--- /dev/null
+++ b/compilerplugins/clang/test/sequenceloop.cxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+
+namespace test1
+{
+void foo(css::uno::Sequence>& aSeq)
+{
+// expected-error@+1 {{use std::as_const, or make range var const, to 
avoid creating a copy of the Sequence [loplugin:sequenceloop]}}
+f

[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util

[Miklos Vajna (via logerrit)]

 solenv/bin/native-code.py   |1 +
 xmloff/inc/facreg.hxx   |5 -
 xmloff/source/core/facreg.cxx   |1 -
 xmloff/source/draw/sdxmlexp.cxx |9 -
 xmloff/util/xo.component|3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit abeab40aeb2bf16c1438b5e5f0cd70b3e11f6b7a
Author: Miklos Vajna 
AuthorDate: Thu Aug 15 22:06:01 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 16 09:03:05 2019 +0200

xmloff: create XMLImpressMetaExportOOO instances with an uno constructor

See tdf#74608 for motivation.

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e3d6f5be6238..3df962855970 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -278,6 +278,7 @@ core_constructor_list = [
 "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
 "com_sun_star_comp_Impress_XMLStylesExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLContentExporter_get_implementation",
+"com_sun_star_comp_Impress_XMLMetaExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 83705cef2e65..69f45f0920af 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -39,11 +39,6 @@ css::uno::Sequence 
XMLImpressExportOOO_getSupportedServiceNames() thro
 /// @throws css::uno::Exception
 css::uno::Reference XMLImpressExportOOO_createInstance(
 css::uno::Reference const & rSMgr);
-OUString XMLImpressMetaExportOOO_getImplementationName() throw();
-css::uno::Sequence 
XMLImpressMetaExportOOO_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference 
XMLImpressMetaExportOOO_createInstance(
-css::uno::Reference const & rSMgr);
 OUString XMLImpressSettingsExportOOO_getImplementationName() throw();
 css::uno::Sequence 
XMLImpressSettingsExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 14f0764d5215..a7e1483df906 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -60,7 +60,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const 
sal_Char * pImplName, voi
 
 // impress OOo export
 else SINGLEFACTORY( XMLImpressExportOOO )
-else SINGLEFACTORY( XMLImpressMetaExportOOO )
 else SINGLEFACTORY( XMLImpressSettingsExportOOO )
 
 // draw oasis export
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index f6d4e938efeb..9e75edacafaa 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2677,8 +2677,15 @@ 
com_sun_star_comp_Impress_XMLContentExporter_get_implementation(
  | SvXMLExportFlags::FONTDECLS));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLMetaExporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(
+new SdXMLExport(pCtx, "XMLImpressMetaExportOOO", false, 
SvXMLExportFlags::META));
+}
+
 SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", 
"XMLImpressExportOOO", false, 
SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED
 );
-SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", 
"XMLImpressMetaExportOOO", false, SvXMLExportFlags::META );
 SERVICE( XMLImpressSettingsExportOOO, 
"com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", 
false, SvXMLExportFlags::SETTINGS );
 
 SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", 
"XMLDrawExportOasis", true, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED
 );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 3cf27c8c4753..7afbec76ea98 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -119,7 +119,8 @@
 
constructor="com_sun_star_comp_Impress_XMLOasisImporter_get_implementation">
 
   
-  
+  
 
   
   https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits