[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.PartsPreview.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 69c21d5bb4d084cb8abc38b4176c8b40f12c8490
Author: Szymon Kłos 
AuthorDate: Fri Jul 17 14:45:48 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 21 20:49:05 2020 +0200

Keep slide sorter in line on mobile devices

This prevents us from multi line slide sorter
on mobile devices after new slide was added.

Change-Id: Ibf0e7784e1f58f2706e1595f1cb0d66eb2373410
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98972
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99027
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index c7250de7f..ff510b7c2 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -116,6 +116,7 @@ L.Control.PartsPreview = L.Control.extend({
}, this);
 
this._scrollContainer = 
$(this._partsPreviewCont).find('.mCSB_container').get(0);
+   $(this._scrollContainer).css('display', 
'inline-table');
 
// Add a special frame just as a drop-site for 
reordering.
var frame = L.DomUtil.create('div', 
'preview-frame', this._scrollContainer);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source include/sfx2 include/vcl sc/source sd/source sfx2/sdi sfx2/source sw/source

[Yusuf Keten (via logerrit)]

 cui/inc/strings.hrc|2 +-
 cui/source/dialogs/AdditionsDialog.cxx |   26 --
 cui/source/factory/dlgfact.cxx |6 +++---
 cui/source/factory/dlgfact.hxx |2 +-
 cui/source/inc/AdditionsDialog.hxx |3 ++-
 include/sfx2/sfxsids.hrc   |1 +
 include/vcl/abstdlg.hxx|2 +-
 sc/source/ui/view/tabvwshb.cxx |   21 ++---
 sd/source/ui/view/drviews2.cxx |8 +++-
 sfx2/sdi/sfx.sdi   |2 +-
 sfx2/source/appl/appuno.cxx|1 +
 sw/source/uibase/uiview/viewdlg2.cxx   |   10 +-
 12 files changed, 61 insertions(+), 23 deletions(-)

New commits:
commit 6e50e03262aa12921f108b502d3c76ce983d54f1
Author: Yusuf Keten 
AuthorDate: Sun Jul 19 20:22:23 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jul 21 22:25:13 2020 +0200

tdf#133026: Additions - Parameter support to UNO Command

After this patch, parameter support to uno command(.uno:AdditionsDialog) 
will be available.
To use parameter, add "?AdditionsTag:string=YourParameter" to UNO command. 
Parameters are the tags of extensions on webpage.

Change-Id: I0072c7340bda14ee13c21c347e06a04545cba69a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99007
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index be9c3f7d3a3e..d1b39a67e541 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -398,7 +398,7 @@
 #define RID_SVXSTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
 #define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
 #define RID_SVXSTR_ADDITIONS_NORESULTS  
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
-
+#define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 73b0247b8b0a..975fa57415fd 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -207,7 +207,7 @@ void parseResponse(const std::string& rResponse, 
std::vector& aAdd
   RTL_TEXTENCODING_UTF8),
 
OStringToOUString(OString(arrayElement.child("author").string_value().get()),
   RTL_TEXTENCODING_UTF8),
-
OStringToOUString(OString(arrayElement.child("URL").string_value().get()),
+
OStringToOUString(OString(arrayElement.child("url").string_value().get()),
   RTL_TEXTENCODING_UTF8),
 
OStringToOUString(OString(arrayElement.child("screenshotURL").string_value().get()),
   RTL_TEXTENCODING_UTF8),
@@ -219,13 +219,13 @@ void parseResponse(const std::string& rResponse, 
std::vector& aAdd
 RTL_TEXTENCODING_UTF8),
 OStringToOUString(OString(arrayElement.child("releases")
   .child(0)
-  .child("compatibleVersion")
+  .child("compatibility")
   .string_value()
   .get()),
   RTL_TEXTENCODING_UTF8),
 OStringToOUString(OString(arrayElement.child("releases")
   .child(0)
-  .child("releaseNumber")
+  .child("releaseName")
   .string_value()
   .get()),
   RTL_TEXTENCODING_UTF8),
@@ -414,7 +414,7 @@ void SearchAndParseThread::execute()
 m_pAdditionsDialog->SetProgress(sProgress);
 }
 
-AdditionsDialog::AdditionsDialog(weld::Window* pParent)
+AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& 
sAdditionsTag)
 : GenericDialogController(pParent, "cui/ui/additionsdialog.ui", 
"AdditionsDialog")
 , m_aSearchDataTimer("SearchDataTimer")
 , m_xEntrySearch(m_xBuilder->weld_entry("entrySearch"))
@@ -430,8 +430,22 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent)
 m_xEntrySearch->connect_changed(LINK(this, AdditionsDialog, 
SearchUpdateHdl));
 m_xEntrySearch->connect_focus_out(LINK(this, AdditionsDialog, 
FocusOut_Impl));
 
-// TODO - Temporary URL
-OString rURL = "https://yusufketen.com/extensionTest.json;;
+m_sTag = OUStringToOString(sAdditionsTag, RTL_TEXTENCODING_UTF8);
+
+OUString titlePrefix = CuiResId(RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX);
+if 

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

[Tomaž Vajngerl (via logerrit)]

 loleaflet/src/control/Control.Scroll.js |4 -
 loleaflet/src/layer/AnnotationManagerImpress.js |   67 
 loleaflet/src/layer/marker/Annotation.js|4 +
 loleaflet/src/layer/tile/CalcTileLayer.js   |6 ++
 loleaflet/src/layer/tile/ImpressTileLayer.js|8 ++
 loleaflet/src/layer/tile/TileLayer.js   |8 ++
 loleaflet/src/layer/tile/WriterTileLayer.js |   10 +++
 loleaflet/src/map/Map.js|4 -
 8 files changed, 97 insertions(+), 14 deletions(-)

New commits:
commit 0e0d3b101246246593e391446ea8584617f822d3
Author: Tomaž Vajngerl 
AuthorDate: Mon Jul 20 07:59:27 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Jul 21 18:34:57 2020 +0200

show connector to annotation when hitting the annotation marker

This shows a connector from annotation to the annotation marker in
the document, so it is possible to identify which marker is being
used for which annotation.
Also adds the alternative implementation to show the annotation
next to the annotation marker.

Change-Id: I8af191fcc8a5e8af827dee0b1ac8ae3d7a50a552
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99021
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/loleaflet/src/layer/AnnotationManagerImpress.js 
b/loleaflet/src/layer/AnnotationManagerImpress.js
index bea853409..473adec06 100644
--- a/loleaflet/src/layer/AnnotationManagerImpress.js
+++ b/loleaflet/src/layer/AnnotationManagerImpress.js
@@ -10,10 +10,13 @@ L.AnnotationManagerImpress = 
L.AnnotationManagerBase.extend({
marginX: 40,
marginY: 10,
offset: 5,
-   extraSize: L.point(290, 0)
+   extraSize: L.point(290, 0),
+   popupOffset: 10,
+   showInline: false
},
_initializeSpecific: function () {
this._map.on('zoomend', this._onAnnotationZoom, this);
+   this._map.on('AnnotationSelect', this._onAnnotationSelect, 
this);
this._map.on('AnnotationCancel', this.onAnnotationCancel, this);
this._map.on('AnnotationClick', this.onAnnotationClick, this);
this._map.on('AnnotationSave', this.onAnnotationSave, this);
@@ -24,6 +27,8 @@ L.AnnotationManagerImpress = L.AnnotationManagerBase.extend({
this._topAnnotation = [];
this._topAnnotation[this.getSelectedPart()] = 0;
this._selectedAnnotation = undefined;
+   this._selectedForPopup = null;
+   this._selectionLine = L.polyline([], {color: 'darkblue', 
weight: 1.2});
this._draft = null;
},
getPartHashes: function() {
@@ -86,12 +91,17 @@ L.AnnotationManagerImpress = 
L.AnnotationManagerBase.extend({
}
},
unselectAnnotations: function() {
-   this._selection = null;
+   this._selectedForPopup = null;
+   this._map.removeLayer(this._selectionLine);
this.onAnnotationCancel();
},
_onAnnotationZoom: function () {
this.onAnnotationCancel();
},
+   _onAnnotationSelect: function (event) {
+   this._selectedForPopup = event.annotation;
+   this.onAnnotationCancel();
+   },
onAnnotationCancel: function () {
if (this._draft) {
this._map.removeLayer(this._draft);
@@ -239,11 +249,11 @@ L.AnnotationManagerImpress = 
L.AnnotationManagerBase.extend({
layoutAnnotations: function () {
var topAnnotation;
var annotations = this._annotations[this.getSelectedPartHash()];
-   var topRight = 
this._map.latLngToLayerPoint(this._map.options.docBounds.getNorthEast())
-   .add(L.point((this._selectedAnnotation ? 3 : 2) * 
this.options.marginX, this.options.marginY));
-   var bounds, annotation;
+   var diffPoint = L.point((this._selectedAnnotation ? 3 : 2) * 
this.options.marginX, this.options.marginY);
+   var topRight = 
this._map.latLngToLayerPoint(this._map.options.docBounds.getNorthEast()).add(diffPoint);
+   var bounds = null;
for (var index in annotations) {
-   annotation = annotations[index];
+   var annotation = annotations[index];
if (!this._topAnnotation[this.getSelectedPart()]) {
this._topAnnotation[this.getSelectedPart()] = 0;
}
@@ -262,19 +272,54 @@ L.AnnotationManagerImpress = 
L.AnnotationManagerBase.extend({
annotation.show();
bounds = annotation.getBounds();
bounds.extend(L.point(bounds.max.x, 
bounds.max.y + this.options.marginY));
-

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

[Tomaž Vajngerl (via logerrit)]

 loleaflet/src/layer/AnnotationManagerImpress.js |   11 +++
 loleaflet/src/layer/marker/Annotation.js|   16 +---
 2 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 701ee977ed8081d209b49f68e6cec592253cd45b
Author: Tomaž Vajngerl 
AuthorDate: Mon Jul 20 13:14:05 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Jul 21 18:35:10 2020 +0200

remove annotations properly not leaving lines or markers behind

Change-Id: I2de8620176724746e8fde0c190edba10109f057e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99120
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/loleaflet/src/layer/AnnotationManagerImpress.js 
b/loleaflet/src/layer/AnnotationManagerImpress.js
index 473adec06..ef92c665f 100644
--- a/loleaflet/src/layer/AnnotationManagerImpress.js
+++ b/loleaflet/src/layer/AnnotationManagerImpress.js
@@ -91,8 +91,6 @@ L.AnnotationManagerImpress = L.AnnotationManagerBase.extend({
}
},
unselectAnnotations: function() {
-   this._selectedForPopup = null;
-   this._map.removeLayer(this._selectionLine);
this.onAnnotationCancel();
},
_onAnnotationZoom: function () {
@@ -100,15 +98,20 @@ L.AnnotationManagerImpress = 
L.AnnotationManagerBase.extend({
},
_onAnnotationSelect: function (event) {
this._selectedForPopup = event.annotation;
-   this.onAnnotationCancel();
+   this._map.focus();
+   this.layoutAnnotations();
},
onAnnotationCancel: function () {
if (this._draft) {
this._map.removeLayer(this._draft);
this._draft = null;
}
-   this._map.focus();
this._selectedAnnotation = undefined;
+   if (this._selectedForPopup) {
+   this._map.removeLayer(this._selectionLine);
+   this._selectedForPopup = null;
+   }
+   this._map.focus();
this.layoutAnnotations();
},
onAnnotationModify: function (annotation) {
diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index 5f66d8f2a..f60b7b680 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -43,6 +43,8 @@ L.Annotation = L.Layer.extend({
this._data.textSelected.removeEventParent(map);
map.removeLayer(this._data.textSelected);
}
+   this.hideMarker();
+   this._annotationMarker = null;
this._map = null;
},
 
@@ -91,9 +93,7 @@ L.Annotation = L.Layer.extend({
if (this._data.textSelected && this._map.hasLayer && 
!this._map.hasLayer(this._data.textSelected)) {
this._map.addLayer(this._data.textSelected);
}
-   if (this._annotationMarker != null) {
-   this._map.addLayer(this._annotationMarker);
-   }
+   this.showMarker();
},
 
hide: function () {
@@ -104,6 +104,16 @@ L.Annotation = L.Layer.extend({
if (this._data.textSelected && 
this._map.hasLayer(this._data.textSelected)) {
this._map.removeLayer(this._data.textSelected);
}
+   this.hideMarker();
+   },
+
+   showMarker: function () {
+   if (this._annotationMarker != null) {
+   this._map.addLayer(this._annotationMarker);
+   }
+   },
+
+   hideMarker: function () {
if (this._annotationMarker != null) {
this._map.removeLayer(this._annotationMarker);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src wsd/DocumentBroker.cpp wsd/Storage.cpp wsd/Storage.hpp

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Control.DocumentNameInput.js |7 +++
 loleaflet/src/map/handler/Map.WOPI.js  |4 
 wsd/DocumentBroker.cpp |2 ++
 wsd/Storage.cpp|4 +++-
 wsd/Storage.hpp|6 ++
 5 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit be15790e24d628ccaf5dc722d432c1829d6767ba
Author: Michael Meeks 
AuthorDate: Tue Jun 9 17:43:58 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Jul 21 20:47:43 2020 +0200

Add support for BreadcrumbDocName.

Change-Id: I06c56e92dd3acf9269140ecefb0c8bc731191260
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95960
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98193
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.DocumentNameInput.js 
b/loleaflet/src/control/Control.DocumentNameInput.js
index 28db57f41..cfc4e5998 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -40,7 +40,7 @@ L.Control.DocumentNameInput = L.Control.extend({
},
 
documentNameCancel: function() {
-   $('#document-name-input').val(this.map['wopi'].BaseFileName);
+   
$('#document-name-input').val(this.map['wopi'].BreadcrumbDocName);
this.map._onGotFocus();
},
 
@@ -97,10 +97,9 @@ L.Control.DocumentNameInput = L.Control.extend({
},
 
onWopiProps: function(e) {
-   if (e.BaseFileName !== null) {
+   if (e.BaseFileName !== null)
// set the document name into the name field
-   $('#document-name-input').val(e.BaseFileName);
-   }
+   $('#document-name-input').val(e.BreadcrumbDocName !== 
undefined ? e.BreadcrumbDocName : e.BaseFileName);
 
if (e.UserCanNotWriteRelative === false) {
// Save As allowed
diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index da79219e8..3e41b7fae 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -10,6 +10,7 @@ L.Map.WOPI = L.Handler.extend({
// wouldn't be possible otherwise.
PostMessageOrigin: '*',
BaseFileName: '',
+   BreadcrumbDocName: '',
DocumentLoadedTime: false,
HidePrintOption: false,
HideSaveOption: false,
@@ -76,6 +77,9 @@ L.Map.WOPI = L.Handler.extend({
}
 
this.BaseFileName = wopiInfo['BaseFileName'];
+   this.BreadcrumbDocName = wopiInfo['BreadcrumbDocName'];
+   if (this.BreadcrumbDocName === undefined)
+   this.BreadcrumbDocName = this.BaseFileName;
this.HidePrintOption = !!wopiInfo['HidePrintOption'];
this.HideSaveOption = !!wopiInfo['HideSaveOption'];
this.HideExportOption = !!wopiInfo['HideExportOption'];
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2c0ec41c2..086ad1699 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -663,6 +663,8 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 wopifileinfo->setHideExportOption(true);
 
 wopiInfo->set("BaseFileName", 
wopiStorage->getFileInfo().getFilename());
+if (wopifileinfo->getBreadcrumbDocName().size())
+wopiInfo->set("BreadcrumbDocName", 
wopifileinfo->getBreadcrumbDocName());
 
 if (!wopifileinfo->getTemplateSaveAs().empty())
 wopiInfo->set("TemplateSaveAs", wopifileinfo->getTemplateSaveAs());
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index a27240bf1..3acbccbc4 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -613,6 +613,7 @@ std::unique_ptr 
WopiStorage::getWOPIFileInfo(const Au
 std::string watermarkText;
 std::string templateSaveAs;
 std::string templateSource;
+std::string breadcrumbDocName;
 bool canWrite = false;
 bool enableOwnerTermination = false;
 std::string postMessageOrigin;
@@ -719,6 +720,7 @@ std::unique_ptr 
WopiStorage::getWOPIFileInfo(const Au
 JsonUtil::findJSONValue(object, "SupportsLocks", supportsLocks);
 JsonUtil::findJSONValue(object, "SupportsRename", supportsRename);
 JsonUtil::findJSONValue(object, "UserCanRename", userCanRename);
+JsonUtil::findJSONValue(object, "BreadcrumbDocName", 
breadcrumbDocName);
 bool booleanFlag = false;
 if (JsonUtil::findJSONValue(object, "DisableChangeTrackingRecord", 
booleanFlag))
 disableChangeTrackingRecord = (booleanFlag ? 
WOPIFileInfo::TriState::True : WOPIFileInfo::TriState::False);
@@ -750,7 +752,7 @@ std::unique_ptr 
WopiStorage::getWOPIFileInfo(const Au
 

[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - configure.ac loleaflet/admin loleaflet/html loleaflet/src

[Andras Timar (via logerrit)]

 configure.ac  |2 +-
 loleaflet/admin/admin.strings.js  |2 +-
 loleaflet/html/loleaflet.html.m4  |1 -
 loleaflet/src/control/Toolbar.js  |7 ++-
 loleaflet/src/core/Socket.js  |4 ++--
 loleaflet/src/layer/marker/ProgressOverlay.js |2 +-
 loleaflet/src/map/Clipboard.js|2 +-
 7 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit be7b0919db52c86aa15ffd54989d9a96d1ad86a6
Author: Andras Timar 
AuthorDate: Tue Jul 21 16:10:38 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 21 20:46:19 2020 +0200

Revert "default product name: LibreOffice Online Personal"

This reverts commit 160d3f587e648d6c6782bcc17595a0b89a29a94a.

Reason for revert: 
https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/

Change-Id: I5a8c017035a3bc9841d302f41769f974361e4ede
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99150
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 8f3c21c51..00cb4ac02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,7 +509,7 @@ AC_SUBST(ENABLE_ANDROIDAPP)
 AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test "$ENABLE_ANDROIDAPP" = "true"])
 AC_SUBST(ANDROID_PACKAGE_NAME)
 
-APP_NAME="LibreOffice Online Personal"
+APP_NAME="LibreOffice Online"
 if test -n "$with_app_name"; then
APP_NAME="$with_app_name"
 fi
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index 7fb8590b7..7dea1cdd3 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -2,7 +2,7 @@
 /* Stringtable for Admin Console User Interface */
 var l10nstrings = {};
 
-l10nstrings.strProductName = 'LibreOffice Online Personal';
+l10nstrings.strProductName = 'LibreOffice Online';
 l10nstrings.strAdminConsole = _('Admin console');
 l10nstrings.strSettings = _('Settings');
 l10nstrings.strOverview = _('Overview');
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 8952571f5..41f3458d8 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -225,7 +225,6 @@ m4_ifelse(MOBILEAPP,[true],
   
   m4_ifelse(MOBILEAPP,[],[])
   
-  
   Copyright © _YEAR_, VENDOR.
 
 
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 43baf9509..6798c620a 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -220,7 +220,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
-   productName = (typeof brandProductName !== 
'undefined') ? brandProductName : 'LibreOffice Online Personal';
+   productName = (typeof brandProductName !== 
'undefined') ? brandProductName : 'LibreOffice Online';
}
vex.open({
unsafeContent: data,
@@ -476,7 +476,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
-   productName = (typeof brandProductName !== 'undefined') 
? brandProductName : 'LibreOffice Online Personal';
+   productName = (typeof brandProductName !== 'undefined') 
? brandProductName : 'LibreOffice Online';
}
var productURL = (typeof brandProductURL !== 'undefined') ? 
brandProductURL : 'https://libreoffice.org';
content.find('#product-name').text(productName);
@@ -492,9 +492,6 @@ L.Map.include({
if (window.socketProxy)
content.find('#slow-proxy').text(_('"Slow Proxy"'));
 
-   if (typeof brandProductName === 'undefined')
-   content.find('#personal').text(_('The Personal edition 
is supported by volunteers and intended for individual use.'));
-
var w;
var iw = window.innerWidth;
if (iw < 768) {
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index f6955ec76..9f48d3145 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -58,7 +58,7 @@ L.Socket = L.Class.extend({
if (isIE11)
msgHint = _('IE11 has reached its 
maximum number of connections. Please see this document to increase this limit 
if needed: 
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections');
 
-   this._map.fire('error', {msg: _('Oops, there is 
a problem connecting to 

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 44c16220d9ef4e252a7133fee91645b1d6f1b8b2
Author: Jan Holesovsky 
AuthorDate: Fri Jul 17 16:02:46 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 21 20:48:19 2020 +0200

android: Log when we disable editing for easier debugging.

Change-Id: I358b1a50be7f9f377e9376f8b1772ad92fd059ae
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98959
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 221c83174..24319e215 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -272,6 +272,7 @@ public class LOActivity extends AppCompatActivity {
 // is it read-only?
 if ((getIntent().getFlags() & 
Intent.FLAG_GRANT_WRITE_URI_PERMISSION) == 0) {
 isDocEditable = false;
+Log.d(TAG, "Disabled editing: Read-only");
 Toast.makeText(this, 
getResources().getString(R.string.temp_file_saving_disabled), 
Toast.LENGTH_SHORT).show();
 }
 
@@ -282,6 +283,7 @@ public class LOActivity extends AppCompatActivity {
 if (isDocEditable && 
(getIntent().getData().toString().startsWith("content://org.chromium.arc.chromecontentprovider/externalfile")
 ||
   
getIntent().getData().toString().startsWith("content://org.chromium.arc.volumeprovider/")))
 {
 isDocEditable = false;
+Log.d(TAG, "Disabled editing: Chrome OS unsupported 
content providers");
 Toast.makeText(this, 
getResources().getString(R.string.file_chromeos_read_only), 
Toast.LENGTH_LONG).show();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 external/skia/c++20.patch.0 |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 826edb304b2c429be534d85fb8244be767ea67cf
Author: Stephan Bergmann 
AuthorDate: Tue Jul 21 17:57:01 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 21 21:30:56 2020 +0200

external/skia: Fix previous std::result_of_t -> std::invoke_result_t change

...84c412cb8392d306ab87fc06855677612f9938a6 "external/skia: Deprecated
std::result_of_t has been removed from C++20"

Change-Id: I7d14306039dbcdbc9509471402299d8cbb9e48c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99168
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/skia/c++20.patch.0 b/external/skia/c++20.patch.0
index 71b384fcc2da..34edcb065735 100644
--- a/external/skia/c++20.patch.0
+++ b/external/skia/c++20.patch.0
@@ -5,13 +5,13 @@
  template
  constexpr auto SkMakeArrayFromIndexSequence(C c, std::index_sequence)
 --> std::array, sizeof...(Is)> {
-+-> std::array, sizeof...(Is)> {
++-> std::array, sizeof...(Is)> {
  return {{ c(Is)... }};
  }
  
  template constexpr auto SkMakeArray(C c)
 --> std::array, N> {
-+-> std::array, N> {
++-> std::array, N> {
  return SkMakeArrayFromIndexSequence(c, std::make_index_sequence{});
  }
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ayhan Yalçınsoy (via logerrit)]

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

New commits:
commit 28eb1488f3871028605675e94294d4540dcbf498
Author: Ayhan Yalçınsoy 
AuthorDate: Sun Jun 28 22:52:27 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jul 21 22:28:54 2020 +0200

tdf#130711: [tr] Extend Autocorrect list for Turkish language (Start with 
N-P)

Change-Id: I4532ca78fa91e5d2e4c2869a9f85d9331a3b8f37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97350
Tested-by: Jenkins
Reviewed-by: Hakan Bakacak 
Reviewed-by: Muhammet Kara 

diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index 1ff2c2a34ad7..eae0b45a2c98 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -519,27 +519,81 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
   
+  
+  
+  
+  
   
+  
+  
+  
+  
+  
+  
   
   
   
   
   
   
+  
+  
   
   
+  
+  
+  
+  
+  
+  
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
   
   
   
+  
+  
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -558,6 +612,8 @@
   
   
   
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source extensions/source include/comphelper tools/qa

[Stephan Bergmann (via logerrit)]

 basic/source/runtime/methods.cxx  |7 ---
 extensions/source/ole/unoobjw.cxx |2 +-
 include/comphelper/windowsdebugoutput.hxx |3 ++-
 tools/qa/cppunit/test_pathutils.cxx   |2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 0587c88e23b4d3d1a0504cd4c6cf1d51fa9ff498
Author: Stephan Bergmann 
AuthorDate: Tue Jul 21 18:03:44 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 21 21:32:10 2020 +0200

Fix uses of char16_t*/wchar_t* stream inserters

...that are helpfully deleted in C++20, as now implemented at least by VS 
2019
16.6.4 when using --with-latest-c++

Change-Id: Iaf80f793e73fc90768bb146c9cf3d300d6747c8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99170
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 106bfe806d0b..89ba081348c2 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -367,9 +367,10 @@ extern "C" void invalidParameterHandler(
 {
 SAL_INFO(
 "basic",
-"invalid parameter during _wgetdcwd; \"" << (expression ? 
o3tl::toU(expression) : u"???")
-<< "\" (" << (function ? o3tl::toU(function) : u"???") << ") at "
-<< (file ? o3tl::toU(file) : u"???") << ":" << line);
+"invalid parameter during _wgetdcwd; \""
+<< (expression ? OUString(o3tl::toU(expression)) : OUString("???"))
+<< "\" (" << (function ? OUString(o3tl::toU(function)) : 
OUString("???")) << ") at "
+<< (file ? OUString(o3tl::toU(file)) : OUString("???")) << ":" << 
line);
 }
 
 }
diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index b09f0cb19ce6..e878fddbb682 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1162,7 +1162,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
InterfaceOleWrapper::GetIDsOfNames(REFIID /*ri
 // Initialise returned rgdispid values.
 rgdispid[i] = DISPID_UNKNOWN;
 
-SAL_INFO("extensions.olebridge", " " << o3tl::toU(rgszNames[i]));
+SAL_INFO("extensions.olebridge", " " << 
OUString(o3tl::toU(rgszNames[i])));
 }
 
 HRESULT ret = DISP_E_UNKNOWNNAME;
diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
index 45a38d007bc3..a50fc2aa0c7e 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -487,7 +487,8 @@ inline std::basic_ostream& 
operator<<(std::basic_ostream, 
wchar_t>().to_bytes(
+rVariant.bstrVal);
 break;
 case VT_LPWSTR:
 stream << std::wstring_convert, 
wchar_t>().to_bytes(
diff --git a/tools/qa/cppunit/test_pathutils.cxx 
b/tools/qa/cppunit/test_pathutils.cxx
index 1b0c57c08afd..c0a1ea5078d0 100644
--- a/tools/qa/cppunit/test_pathutils.cxx
+++ b/tools/qa/cppunit/test_pathutils.cxx
@@ -33,7 +33,7 @@ void buildPath(
 wchar_t p[MAX_PATH];
 wchar_t * e = tools::buildPath(
 p, front, front + std::wcslen(front), back, std::wcslen(back));
-CPPUNIT_ASSERT_EQUAL(p + std::wcslen(path), e);
+CPPUNIT_ASSERT_EQUAL(static_cast(p + std::wcslen(path)), 
static_cast(e));
 CPPUNIT_ASSERT_EQUAL(0, std::wcscmp(path, p));
 #else
 (void) front;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 slideshow/source/engine/eventmultiplexer.cxx |2 +-
 slideshow/source/inc/listenercontainer.hxx   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f09c19d94ad97d03c64e318d153e93b53c099daf
Author: Stephan Bergmann 
AuthorDate: Tue Jul 21 18:00:25 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 21 22:50:32 2020 +0200

Deprecated std::result_of has been removed from C++20

...and is no longer provided at least by VS 2019 16.6.4 when using
--with-latest-c++

Change-Id: Iac68bd4eb74a1f805d30cca49da59f35d8af4240
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99169
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/slideshow/source/engine/eventmultiplexer.cxx 
b/slideshow/source/engine/eventmultiplexer.cxx
index 888f9039fd12..678c44e42e50 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -94,7 +94,7 @@ struct 
slideshow::internal::ListenerOperations
 std::shared_ptr pListener( rCurr.ptr.lock() );
 
 if( pListener.get() &&
-FunctionApply const&)>::type,
+FunctionApply const&>::type,
std::shared_ptr 
>::apply(func,pListener) )
 {
 bRet = true;
diff --git a/slideshow/source/inc/listenercontainer.hxx 
b/slideshow/source/inc/listenercontainer.hxx
index 6046f5f8efe4..8deb1be90617 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -84,7 +84,7 @@ template< typename ListenerT > struct ListenerOperations
 bool bRet(false);
 for( const auto& rCurr : rContainer )
 {
-if( FunctionApply< typename ::std::result_of< FuncT( const 
typename ContainerT::value_type& ) >::type,
+if( FunctionApply< typename ::std::invoke_result< FuncT, const 
typename ContainerT::value_type& >::type,
typename ContainerT::value_type >::apply(
func,
rCurr) )
@@ -135,7 +135,7 @@ struct ListenerOperations< std::weak_ptr >
 std::shared_ptr pListener( rCurr.lock() );
 
 if( pListener.get() &&
-FunctionApply const&)>::type,
+FunctionApply const&>::type,
std::shared_ptr 
>::apply(func,pListener) )
 {
 bRet = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 cui/uiconfig/ui/optsavepage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3cbb5180a1e0e6643eb682c9a6b30057353dc5e3
Author: Olivier Hallot 
AuthorDate: Tue Jul 21 18:37:11 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jul 21 18:43:26 2020 +0200

Remove markup in extended tip

Change-Id: Ifcf1ed97521d7a3d5c71dce9a8457d2bfbb7fd55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99069
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index aff2f862c82a..4aada6e212ee 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -489,7 +489,7 @@
 
 
   
-In the bGeneral/b section, you can select 
default settings for saving documents, and can select default file 
formats.
+In the General section, you can select default settings 
for saving documents, and can select default file formats.
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/colibre

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/intro.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |2 +-
 icon-themes/colibre/brand/shell/logo_inverted.svg |2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7af1aa901ec39aa193a70d158ad7725cc5a705ce
Author: Heiko Tietze 
AuthorDate: Tue Jul 21 14:38:30 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jul 21 19:07:31 2020 +0200

Remove tagline from brand image and splash screen


https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/
Change-Id: I84dd5a2c5b6d6b967299bd1c541995a07d7791ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99065
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/colibre/brand/intro-highres.png 
b/icon-themes/colibre/brand/intro-highres.png
index 44fcca26a248..16bf6e3656b6 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and 
b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/intro.png 
b/icon-themes/colibre/brand/intro.png
index 9f394337441b..2a1daf9074b9 100644
Binary files a/icon-themes/colibre/brand/intro.png and 
b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand/shell/logo.svg 
b/icon-themes/colibre/brand/shell/logo.svg
index e7381d3f6614..1c34be13a4a6 100644
--- a/icon-themes/colibre/brand/shell/logo.svg
+++ b/icon-themes/colibre/brand/shell/logo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
+http://www.w3.org/2000/svg; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg 
b/icon-themes/colibre/brand/shell/logo_inverted.svg
index 159a22a80d6c..71338f00b49a 100644
--- a/icon-themes/colibre/brand/shell/logo_inverted.svg
+++ b/icon-themes/colibre/brand/shell/logo_inverted.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
+http://www.w3.org/2000/svg; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 7b44eb2c3fa1920a4690de38f4df33a00d11f02d
Author: Olivier Hallot 
AuthorDate: Tue Jul 21 21:26:47 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Jul 22 02:26:47 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to ff89d81b75252cfb533e748ee2f46eaa3183e15e
  - Move Help page to new location

Change-Id: Ic5ebc94e84f1867c1699d9fddb2ce362e872ed37
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99182
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9e75afecf50e..ff89d81b7525 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9e75afecf50e19669649a0536a4641e423f78625
+Subproject commit ff89d81b75252cfb533e748ee2f46eaa3183e15e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 AllLangHelp_sdatabase.mk   |1 
 AllLangHelp_shared.mk  |1 
 source/text/sdatabase/main.xhp |2 -
 source/text/sdatabase/toolbars.xhp |   49 +
 4 files changed, 25 insertions(+), 28 deletions(-)

New commits:
commit ff89d81b75252cfb533e748ee2f46eaa3183e15e
Author: Olivier Hallot 
AuthorDate: Tue Jul 21 21:15:48 2020 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jul 22 02:26:47 2020 +0200

Move Help page to new location

Change-Id: Ic5ebc94e84f1867c1699d9fddb2ce362e872ed37
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99182
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 95b1c6b14..4065e5c30 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/main \
 helpcontent2/source/text/sdatabase/0200 \
 helpcontent2/source/text/sdatabase/0202 \
+helpcontent2/source/text/sdatabase/toolbars \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 81ccbb5e1..1f1439322 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -932,7 +932,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/tablewizard02 \
 helpcontent2/source/text/shared/explorer/database/tablewizard03 \
 helpcontent2/source/text/shared/explorer/database/tablewizard04 \
-helpcontent2/source/text/shared/explorer/database/toolbars \
 ,shared/explorer/database))
 
 # vim: set noet sw=4 ts=4:
diff --git a/source/text/sdatabase/main.xhp b/source/text/sdatabase/main.xhp
index bd68a21a0..98c7dedfd 100644
--- a/source/text/sdatabase/main.xhp
+++ b/source/text/sdatabase/main.xhp
@@ -94,7 +94,7 @@

 
 
-   
+   
 
 
 https://wiki.documentfoundation.org/Database; 
name="wiki.documentfoundation.org Database">Wiki page about 
Base
diff --git a/source/text/shared/explorer/database/toolbars.xhp 
b/source/text/sdatabase/toolbars.xhp
similarity index 71%
rename from source/text/shared/explorer/database/toolbars.xhp
rename to source/text/sdatabase/toolbars.xhp
index 119f3f225..a33981c4d 100644
--- a/source/text/shared/explorer/database/toolbars.xhp
+++ b/source/text/sdatabase/toolbars.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 Toolbars
-/text/shared/explorer/database/toolbars.xhp
+/text/sdatabase/toolbars.xhp
 
 
 database toolbars
 
 
 
-Toolbars
-
+Toolbars
+
 In a database 
file window, you can see the following toolbars.
-Table
+Table
 
-Open 
database object
+Open database object
 Opens the selected table so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected table so you can change the 
structure.
 
-Delete
+Delete
 Deletes the selected table.
 
-Rename
+Rename
 Renames the selected table.
-Query
+Query
 
-Open 
database object
+Open database object
 Opens the selected query so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected query so you can change the 
structure.
 
-Delete
+Delete
 Deletes the selected query.
 
-Rename
+Rename
 Renames the selected query.
-Form
+Form
 
-Open 
database object
+Open database object
 Opens the selected form so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected form so you can change the 
layout.
 
-Delete
+Delete
 Deletes the selected form.
 
-Rename
+Rename
 Renames the selected form.
-Report
+Report
 
-Open 
database object
+Open database object
 Opens the selected report so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected report so you can change the 
layout.
 
-Delete
+Delete
 Deletes the selected report.
 
-Rename
+Rename
 Renames the selected report.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/sbasic/shared/property.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4be1fc40b514baced320b3e27207ed35a0afcce3
Author: Olivier Hallot 
AuthorDate: Wed Jul 22 00:29:07 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jul 22 02:25:19 2020 +0200

fix typo

Change-Id: I167c43c2899f7c37817d0c297eb62939663fc93e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99191
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/property.xhp 
b/source/text/sbasic/shared/property.xhp
index 31a489715..919a8eeb1 100644
--- a/source/text/sbasic/shared/property.xhp
+++ b/source/text/sbasic/shared/property.xhp
@@ -29,7 +29,7 @@
   
 
   Property Statement
-  A property, also called field or 
attribute, characterizes a given object or piece of information. Properties can 
be used to control access to data. It is common use to include instructions at 
setting or reading time of properties. Code can vary from simple assignment to 
complex context dependant routines. Using Get, Let or 
Set accessers enforces properties consistency when 
necessary.
+  A property, also called field or 
attribute, characterizes a given object or piece of information. Properties can 
be used to control access to data. It is common use to include instructions at 
setting or reading time of properties. Code can vary from simple assignment to 
complex context dependant routines. Using Get, Let or 
Set accessors enforces properties consistency when 
necessary.
   This statement requires Option 
Compatible to be placed before the executable program code in a module. 

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

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

[Olivier Hallot (via logerrit)]

 source/text/sbasic/shared/03090302.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e75afecf50e19669649a0536a4641e423f78625
Author: Olivier Hallot 
AuthorDate: Wed Jul 22 00:33:26 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jul 22 02:25:41 2020 +0200

Fix typo

Change-Id: I33715e0a10c57f20a4d0e51109d5fe7899af2b2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99192
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/03090302.xhp 
b/source/text/sbasic/shared/03090302.xhp
index 720aa3fdc..4f9cd57f5 100644
--- a/source/text/sbasic/shared/03090302.xhp
+++ b/source/text/sbasic/shared/03090302.xhp
@@ -45,8 +45,8 @@
 
 
 Parameters:
-label: A 
line identifier indicating where to continue execution. The scope of a label in 
that of the routine it belongs to.
-  Use the 
GoTo statement to instruct $[officename] Basic to continue 
program execution at another place within the procedure. The position must be 
indicated by a label. To set a label, assign a name, and then and end it with a 
colon (":").
+label: A 
line identifier indicating where to continue execution. The scope of a label is 
that of the routine it belongs to.
+  Use the 
GoTo statement to instruct $[officename] Basic to continue 
program execution at another place within the procedure. The position must be 
indicated by a label. To set a label, assign a name, and end it with a colon 
(":").
   You cannot use 
the GoTo statement to jump out of a Sub 
or Function.
 Example:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 533ab1f4813a29845a0c0b6746e7deba73e74e87
Author: Olivier Hallot 
AuthorDate: Wed Jul 22 02:25:19 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jul 22 02:25:19 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 4be1fc40b514baced320b3e27207ed35a0afcce3
  - fix typo

Change-Id: I167c43c2899f7c37817d0c297eb62939663fc93e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99191
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 361825414d49..4be1fc40b514 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 361825414d49d1c6f3dc359fd43ebebe094f26e2
+Subproject commit 4be1fc40b514baced320b3e27207ed35a0afcce3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit b1c83b68bfbf3477fa6a8f4c79c53f6f9ab31f8e
Author: Olivier Hallot 
AuthorDate: Wed Jul 22 02:25:41 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jul 22 02:25:41 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9e75afecf50e19669649a0536a4641e423f78625
  - Fix typo

Change-Id: I33715e0a10c57f20a4d0e51109d5fe7899af2b2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99192
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 4be1fc40b514..9e75afecf50e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4be1fc40b514baced320b3e27207ed35a0afcce3
+Subproject commit 9e75afecf50e19669649a0536a4641e423f78625
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC "Extending the UITest framework" Week (7) Report

[ahmed El-Shreif]

Hello all,

here is my Week (7) report:
https://ahmedelshreifgsoc20.blogspot.com/2020/07/week-7-report.html

Sorry for sending the report late because I started my final exams this
week.

waiting for all your feedback.

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

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

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdiutils.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 0936710f750a24e732072484dd8576883fa9bedf
Author: Tor Lillqvist 
AuthorDate: Mon Jul 20 14:43:33 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jul 22 07:31:16 2020 +0200

This file is used for macOS only

Change-Id: I9500453c8964b774e4b0be41a7b2f1a8c28040b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99138
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99183
Tested-by: Jenkins

diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index 589bd2ae22e5..426aea29dc78 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -134,11 +134,7 @@ bool AquaSalGraphics::CheckContext()
 
 const int nBytesPerRow = (nBitmapDepth * nScaledWidth) / 8;
 void* pRawData = std::malloc(nBytesPerRow * nScaledHeight);
-#ifdef MACOSX
-const int nFlags = kCGImageAlphaNoneSkipFirst;
-#else
-const int nFlags = kCGImageAlphaNoneSkipFirst | 
kCGImageByteOrder32Little;
-#endif
+const int nFlags = kCGImageAlphaNoneSkipFirst;
 CGContextHolder aContextHolder(CGBitmapContextCreate(
 pRawData, nScaledWidth, nScaledHeight, 8, nBytesPerRow, 
GetSalData()->mxRGBSpace, nFlags));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Brochure mode signature size

[Ilmari Lauhakangas]

The process is to do create small patches that are easy to review and to 
analyse in case of future problems. Submit your first patch to gerrit 
and it will be easier to discuss: 
https://wiki.documentfoundation.org/Development/gerrit


Ilmari

On 22.7.2020 5.41, Matthew Ewer wrote:
For the record, I figured it out.  What I had modified was the right 
setting, for the wrong program.  (Some version of Draw, rather than 
Writer).  The correct file to modify was sw/source/core/doc/doc.cxx .  
My fix did what I wanted, but to be useful to others, I'd need to e.g. 
add a spinner to the print dialog.  Is there a recommended process for 
doing that; accessibility tables to not forget, string translation 
sheets to fill out?  What's the process for getting a change 
reviewed/accepted/merged?


On Mon, Jul 20, 2020 at 10:44 AM Matthew Ewer > wrote:


Hey, so you know the brochure printing mode? It normally prints a
single signature - one stack of pages, where if you fold the stack
down the middle, it forms a book. BUT, folding a stack of like 200
pages doesn't really work too well. I'd be preferable to specify a
signature size - e.g., single sheets of paper, each of which you
fold down the middle and stack. I thought I found where the code for
that lies - sd/source/ui/view/DocumentRenderer.cxx ,
PrepareBooklet(), at the end of the function. But 1. the behavior
I'd expect from that code doesn't quite match what I see in the
preview in the Print window, and 2. after I changed the code to do
what I wanted, and recompiled, the Print window behavior was
entirely unchanged. Does anybody know where the relevant code
actually is, or what's going on here?


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


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

Re: Brochure mode signature size

[Matthew Ewer]

For the record, I figured it out.  What I had modified was the right
setting, for the wrong program.  (Some version of Draw, rather than
Writer).  The correct file to modify was sw/source/core/doc/doc.cxx .  My
fix did what I wanted, but to be useful to others, I'd need to e.g. add a
spinner to the print dialog.  Is there a recommended process for doing
that; accessibility tables to not forget, string translation sheets to fill
out?  What's the process for getting a change reviewed/accepted/merged?

On Mon, Jul 20, 2020 at 10:44 AM Matthew Ewer  wrote:

> Hey, so you know the brochure printing mode? It normally prints a single
> signature - one stack of pages, where if you fold the stack down the
> middle, it forms a book. BUT, folding a stack of like 200 pages doesn't
> really work too well. I'd be preferable to specify a signature size - e.g.,
> single sheets of paper, each of which you fold down the middle and stack. I
> thought I found where the code for that lies -
> sd/source/ui/view/DocumentRenderer.cxx , PrepareBooklet(), at the end of
> the function. But 1. the behavior I'd expect from that code doesn't quite
> match what I see in the preview in the Print window, and 2. after I changed
> the code to do what I wanted, and recompiled, the Print window behavior was
> entirely unchanged. Does anybody know where the relevant code actually is,
> or what's going on here?
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/Module_writerfilter.mk writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 writerfilter/CppunitTest_writerfilter_rtftok.mk   |   49 ++
 writerfilter/Module_writerfilter.mk   |1 
 writerfilter/qa/cppunittests/rtftok/data/picture-in-textframe.rtf |   29 
 writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx  |   71 
++
 writerfilter/source/rtftok/rtfsdrimport.cxx   |5 
 5 files changed, 155 insertions(+)

New commits:
commit 5a083be34456e91427d0f2e2fea172f49f4502db
Author: Miklos Vajna 
AuthorDate: Mon Jul 20 21:22:14 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jul 21 08:52:38 2020 +0200

tdf#134400 RTF import: fix unexpected inner properties for 
picture-in-textframe

Regression from commit 4ab658b56f5c6ff0082d38d8ace1924d11e30e96 (RTF
import: implement support for tables inside text frames, 2013-06-16),
the problem was that both the outer "textbox" and the inner "picture
frame" object had a shapeType property, and the properties were stored
in a vector. So by the time RTFSdrImport::initShape() looked up the
shape type for the inner shape, it thought it's not a picture frame,
leading to data loss.

Change-Id: I4a536789371619d1d54afa8c8d41c7d273b0d21b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99111
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk 
b/writerfilter/CppunitTest_writerfilter_rtftok.mk
new file mode 100644
index ..4ca730b9d3fc
--- /dev/null
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_rtftok))
+
+$(eval $(call gb_CppunitTest_use_externals,writerfilter_rtftok,\
+   boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \
+writerfilter/qa/cppunittests/rtftok/rtfsdrimport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
+basegfx \
+comphelper \
+cppu \
+oox \
+sal \
+test \
+unotest \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_rtftok))
+
+$(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_use_vcl,writerfilter_rtftok))
+
+$(eval $(call gb_CppunitTest_use_rdb,writerfilter_rtftok,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_rtftok,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
+
+# we need to explicitly depend on library writerfilter because it is not 
implied
+# by a link relation
+$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call 
gb_Library_get_target,writerfilter)
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk 
b/writerfilter/Module_writerfilter.mk
index 34b75ee9d54d..46d7af0ff63a 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
 CppunitTest_writerfilter_filters_test \
 CppunitTest_writerfilter_misc \
 CppunitTest_writerfilter_dmapper \
+CppunitTest_writerfilter_rtftok \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/qa/cppunittests/rtftok/data/picture-in-textframe.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/picture-in-textframe.rtf
new file mode 100644
index ..ec0a07690bdf
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/picture-in-textframe.rtf
@@ -0,0 +1,29 @@
+{\rtf1
+\paperw10080\paperh12960\margl1066\margr1066\margt1642\margb1066
+\pard\plain
+{\shp
+{\*\shpinst\shpleft31\shptop105\shpright4108\shpbottom3887\shpfhdr0\shpwr2\shpwrk3\shpfblwtxt0
+{\sp
+{\sn shapeType}
+{\sv 202}
+}
+{\shptxt \pard\plain
+before
+{\*\shppict
+{\pict
+{\*\picprop\shplid1025
+{\sp
+{\sn shapeType}
+{\sv 75}
+}
+}
+\picscalex23\picscaley24\piccropl0\piccropr0\piccropt0\piccropb0\picw30372\pich22437\picwgoal17219\pichgoal12720\pngblip

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |2 -
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   10 +++---
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |4 --
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |1 
 writerfilter/source/dmapper/TableData.hxx|5 +++
 writerfilter/source/dmapper/TableManager.cxx |   23 +
 writerfilter/source/dmapper/TableManager.hxx |2 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|   25 ---
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx|3 +
 writerfilter/source/ooxml/factoryimpl_ns.py  |4 +-
 writerfilter/source/ooxml/model.xml  |6 ++-
 11 files changed, 59 insertions(+), 26 deletions(-)

New commits:
commit c3ca7e85ea27cb19475086e64b14e780c93910ca
Author: Justin Luth 
AuthorDate: Mon Jul 13 11:50:58 2020 +0300
Commit: Miklos Vajna 
CommitDate: Tue Jul 21 09:16:50 2020 +0200

tdf#134709 writerfilter: consider gridAfter for table borders

When the table itself defines borders, those borders should
apply to the last cell in each row - even if some grids
are skipped with gridAfter. (i.e. it won't be a straight line
on the right side).

This commit depends on an earlier commit doing this for gridBefore.
Prior to this, gridAfter was never actually sent to DomainMapper,
so it was always at its initialized value of zero, and it was
only handled in the ooxml handlers.

So the bulk of this patch is setting up the foundational
parts of gridAfter - duplicating what was recently changed
in LO 7.1 for gridBefore.

Change-Id: Ieaf965fecf618eeaf41c7e8403b536c396138804
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98692
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index f5f4b1657007..70addfd3c60b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -135,7 +135,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf134609_gridAfter, 
"tdf134609_gridAfter.docx")
 
 // Table borders (width 159) apply to edge cells, even in uneven cases 
caused by gridBefore/gridAfter,
 table::BorderLine2 aBorder = 
getProperty(xTable->getCellByName("A1"), "RightBorder");
-//CPPUNIT_ASSERT_MESSAGE("Right border before gridAfter cells", 
aBorder.LineWidth > 0);
+CPPUNIT_ASSERT_MESSAGE("Right border before gridAfter cells", 
aBorder.LineWidth > 0);
 aBorder = getProperty(xTable->getCellByName("E2"), 
"LeftBorder");
 CPPUNIT_ASSERT_MESSAGE("Left edge border after gridBefore cells", 
aBorder.LineWidth > 100);
 aBorder = getProperty(xTable->getCellByName("E2"), 
"TopBorder");
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index ac8c0f52eb71..ac667ddefd88 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -103,9 +103,10 @@ static void lcl_mergeBorder( PropertyIds nId, const 
PropertyMapPtr& pOrig, const
 }
 
 static void lcl_computeCellBorders( const PropertyMapPtr& pTableBorders, const 
PropertyMapPtr& pCellProps,
-sal_uInt32 nCell, sal_uInt32 nFirstCell, sal_Int32 nRow, bool 
bIsEndCol, bool bIsEndRow, bool bMergedVertically )
+sal_uInt32 nCell, sal_uInt32 nFirstCell, sal_uInt32 nLastCell, 
sal_Int32 nRow, bool bIsEndRow, bool bMergedVertically )
 {
 const bool bIsStartCol = nCell == nFirstCell;
+const bool bIsEndCol = nCell == nLastCell;
 std::optional pVerticalVal = 
pCellProps->getProperty(META_PROP_VERTICAL_BORDER);
 std::optional pHorizontalVal = 
pCellProps->getProperty(META_PROP_HORIZONTAL_BORDER);
 
@@ -147,7 +148,7 @@ static void lcl_computeCellBorders( const PropertyMapPtr& 
pTableBorders, const P
 {
 if ( !bIsEndCol && nCell >= nFirstCell )
 pCellProps->Insert( PROP_RIGHT_BORDER, aVertProp, false );
-if ( !bIsStartCol )
+if ( !bIsStartCol && nCell <= nLastCell )
 pCellProps->Insert( PROP_LEFT_BORDER, aVertProp, false );
 }
 
@@ -752,7 +753,7 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 
 // Note that this is intentionally called "cell" and not "column".
 // Don't make the mistake that all cell x's will be in the same column.
-// Merged cells (grid span) in a row will affect the actual column. 
(fake cells were added to handle gridBefore)
+// Merged cells (grid span) in a row will affect the actual column. 
(fake cells were added to handle gridBefore/After)
 sal_Int32 nCell = 0;
 pCellProperties[nRow].realloc( aRowOfCellsIterator->size() );
 beans::PropertyValues* 

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

[Miklos Vajna (via logerrit)]

 kit/Kit.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57959d6e865ccbe09fead3d96da866df52b3220e
Author: Miklos Vajna 
AuthorDate: Tue Jul 21 08:56:18 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jul 21 09:17:24 2020 +0200

Document::dumpState: fix isLoading typo

Change-Id: I21fdb82bcd9ff9348b8a08de9a55a64164ce47f4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99117
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 7c8f426d0..1853bed45 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1556,7 +1556,7 @@ public:
 {
 oss << "Kit Document:\n"
 << "\n\tstop: " << _stop
-<< "\n\tisLoading: " << _stop
+<< "\n\tisLoading: " << _isLoading
 << "\n\tjailId: " << _jailId
 << "\n\tdocKey: " << _docKey
 << "\n\tdocId: " << _docId
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 basic/qa/cppunit/test_nested_struct.cxx |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 23bfaf601d78ab2a80ec5493ef7eab1410975769
Author: Xisco Fauli 
AuthorDate: Tue Jul 21 00:14:14 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Jul 21 09:40:34 2020 +0200

tdf#134576: basic_macros: Add unittest

Change-Id: I6078e0712f7983159ea3b3f2060a1c4b69e9d5c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99114
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/basic/qa/cppunit/test_nested_struct.cxx 
b/basic/qa/cppunit/test_nested_struct.cxx
index 009d832b1ce6..daced48ba2bf 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -28,6 +28,7 @@ namespace
 void testFixedVarAssign();
 void testFixedVarAssignAlt(); // result is uno-ised and tested
 void testUnoAccess(); // fdo#60117 specific test
+void testTdf134576();
 
 // Adds code needed to register the test suite
 CPPUNIT_TEST_SUITE(Nested_Struct);
@@ -42,6 +43,7 @@ namespace
 CPPUNIT_TEST(testFixedVarAssign);
 CPPUNIT_TEST(testFixedVarAssignAlt);
 CPPUNIT_TEST(testUnoAccess);
+CPPUNIT_TEST(testTdf134576);
 
 // End of test suite definition
 CPPUNIT_TEST_SUITE_END();
@@ -296,6 +298,24 @@ void Nested_Struct::testUnoAccess()
 CPPUNIT_ASSERT_EQUAL(200, result );
 }
 
+void Nested_Struct::testTdf134576()
+{
+MacroSnippet myMacro("Function doUnitTest()\n"
+"  On Error Resume Next\n"
+"  For Each a In b\n"
+"c.d\n"
+"  Next\n"
+"  doUnitTest = 1\n"
+"End Function\n");
+
+myMacro.Compile();
+CPPUNIT_ASSERT(!myMacro.HasError());
+
+// Without the fix in place, it would have crashed here
+SbxVariableRef pNew = myMacro.Run();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pNew->GetInteger());
+}
+
   // Put the test suite in the registry
   CPPUNIT_TEST_SUITE_REGISTRATION(Nested_Struct);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/Library_comphelper.mk comphelper/source compilerplugins/clang include/vbahelper include/vcl vcl/source

[Noel Grandin (via logerrit)]

 comphelper/Library_comphelper.mk  |6 
 comphelper/source/container/enumerablemap.cxx |2 
 comphelper/source/inc/comphelper_module.hxx   |   47 ---
 comphelper/source/misc/comphelper_module.cxx  |   51 ---
 compilerplugins/clang/unusedmethods.results   |  382 +-
 include/vbahelper/helperdecl.hxx  |9 
 include/vcl/toolkit/longcurr.hxx  |   35 --
 vcl/source/control/longcurr.cxx   |  113 ---
 8 files changed, 206 insertions(+), 439 deletions(-)

New commits:
commit 363a25338e96f44ec01a7972bf46de884975ca06
Author: Noel Grandin 
AuthorDate: Mon Jul 20 21:02:52 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 21 08:31:20 2020 +0200

loplugin:unusedmethods

Change-Id: I3520c2e97bb5b1611dcce77ca9f8393b29e75a1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99110
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 9a814e17d5bf..d2878d1d69a9 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -25,11 +25,6 @@ $(eval $(call gb_Library_use_custom_headers,comphelper,\
 
 $(eval $(call 
gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
 
-$(eval $(call gb_Library_set_include,comphelper,\
--I$(SRCDIR)/comphelper/source/inc \
-$$(INCLUDE) \
-))
-
 $(eval $(call 
gb_Library_set_precompiled_header,comphelper,comphelper/inc/pch/precompiled_comphelper))
 
 $(eval $(call gb_Library_add_defs,comphelper,\
@@ -96,7 +91,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
 comphelper/source/misc/automationinvokedzone \
 comphelper/source/misc/backupfilehelper \
 comphelper/source/misc/base64 \
-comphelper/source/misc/comphelper_module \
 comphelper/source/misc/componentbase \
 comphelper/source/misc/componentmodule \
 comphelper/source/misc/configuration \
diff --git a/comphelper/source/container/enumerablemap.cxx 
b/comphelper/source/container/enumerablemap.cxx
index 55c2b9e28077..2add21d262b6 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include 
 #include 
 #include 
 #include 
@@ -30,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/comphelper/source/inc/comphelper_module.hxx 
b/comphelper/source/inc/comphelper_module.hxx
deleted file mode 100644
index aaa547649b8e..
--- a/comphelper/source/inc/comphelper_module.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX
-#define INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX
-
-#include 
-
-
-namespace comphelper::module
-{
-
-
-class ComphelperModule : public ::comphelper::OModule
-{
-friend struct ComphelperModuleCreator;
-typedef ::comphelper::OModule BaseClass;
-
-public:
-static ComphelperModule& getInstance();
-
-private:
-ComphelperModule();
-};
-
-} // namespace comphelper::module
-
-
-#endif // INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/misc/comphelper_module.cxx 
b/comphelper/source/misc/comphelper_module.cxx
deleted file mode 100644
index 9cf32546e1be..
--- a/comphelper/source/misc/comphelper_module.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work 

[Libreoffice-commits] core.git: compilerplugins/clang i18npool/source include/vcl sc/source vcl/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/constantparam.bitmask.results   |2 
 compilerplugins/clang/constantparam.booleans.results  |  502 
--
 compilerplugins/clang/constantparam.constructors.results  |  162 
+--
 compilerplugins/clang/constantparam.numbers.results   |  338 
+++---
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |8 
 include/vcl/outdev.hxx|4 
 sc/source/ui/unoobj/docuno.cxx|4 
 sc/source/ui/view/tabview.cxx |   17 
 vcl/source/outdev/text.cxx|   12 
 9 files changed, 535 insertions(+), 514 deletions(-)

New commits:
commit 751f4d4428339b508abb5ee3c1804e63f0cfd593
Author: Noel Grandin 
AuthorDate: Mon Jul 20 18:37:18 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 21 08:30:47 2020 +0200

loplugin:constantparam

Change-Id: Id5144e95ac0120b3125258cdde46e4f7f6e1690b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99109
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/constantparam.bitmask.results 
b/compilerplugins/clang/constantparam.bitmask.results
index f4bc0a96931b..e7e1e830fa2a 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -16,7 +16,7 @@ include/framework/framelistanalyzer.hxx:185
 include/sfx2/objsh.hxx:464
 void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
 enum SfxLoadedFlags nWhich setBits=0x1
-include/svtools/brwbox.hxx:430
+include/svtools/brwbox.hxx:511
 void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString 
&,long,enum HeaderBarItemBits,unsigned short)
 enum HeaderBarItemBits nBits setBits=0x400 clearBits=0x3ec
 include/vcl/wizardmachine.hxx:140
diff --git a/compilerplugins/clang/constantparam.booleans.results 
b/compilerplugins/clang/constantparam.booleans.results
index c93c2533270a..e8e813e4ce0f 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -22,11 +22,11 @@ basegfx/source/polygon/b3dpolygon.cxx:77
 void (anonymous 
namespace)::CoordinateDataArray3D::CoordinateDataArray3D(unsigned int)
 unsigned int nCount
 0
-basic/source/inc/runtime.hxx:323
+basic/source/inc/runtime.hxx:324
 void SbiRuntime::StepRESUME(unsigned int)
 unsigned int 
 1
-basic/source/inc/runtime.hxx:354
+basic/source/inc/runtime.hxx:355
 _Bool SbiRuntime::IsMissing(class SbxVariable *,unsigned short)
 unsigned short 
 1
@@ -74,7 +74,7 @@ chart2/qa/extras/chart2dump/chart2dump.cxx:98
 void Chart2DumpTest::Chart2DumpTest(_Bool)
 _Bool bDumpMode
 0
-chart2/qa/extras/chart2export.cxx:416
+chart2/qa/extras/chart2export.cxx:420
 void checkCommonTrendline(const class com::sun::star::uno::Reference 
&,double,double,_Bool,double,_Bool,_Bool)
 _Bool aExpectedShowEquation
 1
@@ -146,7 +146,7 @@ chart2/source/inc/AxisHelper.hxx:194
 class com::sun::star::uno::Reference 
chart::AxisHelper::getChartTypeByIndex(const class 
com::sun::star::uno::Reference 
&,int)
 int nIndex
 0
-chart2/source/inc/ChartTypeDialogController.hxx:101
+chart2/source/inc/ChartTypeDialogController.hxx:65
 void chart::ChartTypeParameter::ChartTypeParameter(int,_Bool,_Bool,enum 
chart::GlobalStackMode,_Bool,_Bool,enum com::sun::star::chart2::CurveStyle)
 enum com::sun::star::chart2::CurveStyle eCurveStyle
 0
@@ -182,7 +182,7 @@ chart2/source/view/inc/Stripe.hxx:53
 void chart::Stripe::InvertNormal(_Bool)
 _Bool bInvertNormal
 1
-chart2/source/view/main/ShapeFactory.cxx:703
+chart2/source/view/main/ShapeFactory.cxx:704
 void appendAndCloseBezierCoords(struct 
com::sun::star::drawing::PolyPolygonBezierCoords &,const struct 
com::sun::star::drawing::PolyPolygonBezierCoords &,_Bool)
 _Bool bAppendInverse
 1
@@ -198,31 +198,31 @@ comphelper/source/misc/backupfilehelper.cxx:57
 unsigned int createCrc32(const class std::shared_ptr 
&,unsigned int)
 unsigned int nOffset
 0
-connectivity/inc/sdbcx/VIndex.hxx:64
+connectivity/inc/sdbcx/VIndex.hxx:62
 void connectivity::sdbcx::OIndex::OIndex(_Bool)
 _Bool _bCase
 1
-connectivity/inc/sdbcx/VIndex.hxx:65
+connectivity/inc/sdbcx/VIndex.hxx:63
 void connectivity::sdbcx::OIndex::OIndex(const class rtl::OUString &,const 
class rtl::OUString &,_Bool,_Bool,_Bool,_Bool)
 _Bool _bCase
 1
-connectivity/inc/sdbcx/VKey.hxx:79
+connectivity/inc/sdbcx/VKey.hxx:77
 void connectivity::sdbcx::OKey::OKey(_Bool)
 _Bool _bCase
 1
-connectivity/inc/sdbcx/VKey.hxx:80
+connectivity/inc/sdbcx/VKey.hxx:78
 void connectivity::sdbcx::OKey::OKey(const class rtl::OUString &,const 
class std::shared_ptr &,_Bool)
 _Bool _bCase
 1

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

[Noel Grandin (via logerrit)]

 include/vcl/alpha.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit fa2afa041d9b1588bda9c1a7f1a3065af7175869
Author: Noel Grandin 
AuthorDate: Mon Jul 20 21:24:17 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 21 08:31:43 2020 +0200

remove unnecessary method overrides

Change-Id: I83687a29c0af8096bb0cd07ee0c4e115f96d9471
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99112
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 159c61243efa..c7ee2d715ce5 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -47,10 +47,6 @@ public:
 booloperator==( const AlphaMask& rAlphaMask ) const { return 
Bitmap::operator==(rAlphaMask); }
 booloperator!=( const AlphaMask& rAlphaMask ) const { return 
Bitmap::operator!=(rAlphaMask); }
 
-voidSetPrefMapMode( const MapMode& rMapMode ) { 
Bitmap::SetPrefMapMode( rMapMode ); }
-
-voidSetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize 
); }
-
 Bitmap const & GetBitmap() const;
 
 voidErase( sal_uInt8 cTransparency );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sal/osl/unx/nlsupport.cxx |6 +++---
 vcl/osx/DataFlavorMapping.cxx |2 +-
 vcl/quartz/salbmp.cxx |8 
 vcl/quartz/salgdicommon.cxx   |2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 4401f13a9e2d29503529c219f5f447c68b327007
Author: Stephan Bergmann 
AuthorDate: Tue Jul 21 08:09:59 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 21 09:19:33 2020 +0200

Improved oplugin:staticanonymous -> redundantstatic redux, macOS

Change-Id: I221351bdc43b48e714acca89bc84db007258299e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99115
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 3a0b1021e726..28d367c11ae9 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -650,7 +650,7 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
  * from the ISO language codes.
  */
 
-static const Pair full_locale_list[] = {
+const Pair full_locale_list[] = {
 { "ja_JP.eucJP",  RTL_TEXTENCODING_EUC_JP  },
 { "ja_JP.EUC",RTL_TEXTENCODING_EUC_JP  },
 { "ko_KR.EUC",RTL_TEXTENCODING_EUC_KR  },
@@ -658,7 +658,7 @@ static const Pair full_locale_list[] = {
 { "zh_TW.EUC",RTL_TEXTENCODING_EUC_TW  }
 };
 
-static const Pair locale_extension_list[] = {
+const Pair locale_extension_list[] = {
 { "big5", RTL_TEXTENCODING_BIG5},
 { "big5hk",   RTL_TEXTENCODING_BIG5_HKSCS  },
 { "gb18030",  RTL_TEXTENCODING_GB_18030},
@@ -687,7 +687,7 @@ static const Pair locale_extension_list[] = {
 { "utf-8",RTL_TEXTENCODING_UTF8}
 };
 
-static const Pair iso_language_list[] = {
+const Pair iso_language_list[] = {
 { "af",  RTL_TEXTENCODING_ISO_8859_1 },
 { "ar",  RTL_TEXTENCODING_ISO_8859_6 },
 { "az",  RTL_TEXTENCODING_ISO_8859_9 },
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index dfba27d20e31..07534d0c893b 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -109,7 +109,7 @@ namespace
 
   /* At the moment it appears as if only MS Office pastes "public.html" to the 
clipboard.
*/
-  static const FlavorMap flavorMap[] =
+  const FlavorMap flavorMap[] =
 {
   { NSPasteboardTypeString, "text/plain;charset=utf-16", "Unicode Text 
(UTF-16)", true },
   { NSPasteboardTypeRTF, "text/rtf", "Rich Text Format", false },
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 43c39e66ca23..aa932de1fc69 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -45,9 +45,9 @@
 #include "saldatabasic.hxx"
 #endif
 
-static const unsigned long k32BitRedColorMask   = 0x00ff;
-static const unsigned long k32BitGreenColorMask = 0xff00;
-static const unsigned long k32BitBlueColorMask  = 0x00ff;
+const unsigned long k32BitRedColorMask   = 0x00ff;
+const unsigned long k32BitGreenColorMask = 0xff00;
+const unsigned long k32BitBlueColorMask  = 0x00ff;
 
 static bool isValidBitCount( sal_uInt16 nBitCount )
 {
@@ -610,7 +610,7 @@ struct pal_entry
 
 }
 
-static pal_entry const aImplSalSysPalEntryAry[ 16 ] =
+pal_entry const aImplSalSysPalEntryAry[ 16 ] =
 {
 {0,0,0 },
 {0,0, 0x80 },
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 5acc4d4e4e77..c72e8ee5cabd 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -46,7 +46,7 @@
 
 using namespace vcl;
 
-static const basegfx::B2DPoint aHalfPointOfs ( 0.5, 0.5 );
+const basegfx::B2DPoint aHalfPointOfs ( 0.5, 0.5 );
 
 static void AddPolygonToPath( CGMutablePathRef xPath,
   const basegfx::B2DPolygon& rPolygon,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 external/libtommath/ExternalProject_libtommath.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dae5dc8d8992cbc5fa2ef3b1d5167847005491b4
Author: Stephan Bergmann 
AuthorDate: Tue Jul 21 08:10:34 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 21 09:20:01 2020 +0200

external/libtommath: Avoid -Wsystem-headers warnings/errors

NO_ADDTL_WARNINGS controls whether
workdir/UnpackedTarball/libtommath/makefile.include adds -Wsystem-headers 
(among
others) to CFLAGS, which has generally been harmless as we build that 
external
code with warnings not as errors.  But Clang 12 trunk 
 "[clang] 
Enable
errors for undefined TARGET_OS_ macros in Darwin driver" now unconditionally
added some -Werror=... on Darwin/macOS that would cause the build to fail 
with

> In file included from bncore.c:1:
> In file included from ./tommath_private.h:18:
> In file included from ./tommath.h:25:
> 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/stdio.h:220:5:
 error: 'TARGET_OS_EMBEDDED' is not defined, evaluates to 0 
[-Werror,-Wundef-prefix=TARGET_OS_]
> #if TARGET_OS_EMBEDDED
> ^

at least with Xcode 11.6.

Change-Id: I5465b9070ff60da85b9278b0e46dcf6c801fbda6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99116
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/libtommath/ExternalProject_libtommath.mk 
b/external/libtommath/ExternalProject_libtommath.mk
index 9169619943ce..2b4fb9fbdc76 100644
--- a/external/libtommath/ExternalProject_libtommath.mk
+++ b/external/libtommath/ExternalProject_libtommath.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libtommath,build) :
&& export CFLAGS=" \
-fPIC \
" \
-   && $(MAKE) $(if $(verbose),V=1) \
+   && $(MAKE) $(if $(verbose),V=1) NO_ADDTL_WARNINGS=1 \
)
$(call gb_Trace_EndRange,libtommath,EXTERNAL)
 endif
___
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.4' - vcl/Module_vcl.mk

[Tor Lillqvist (via logerrit)]

 vcl/Module_vcl.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e15c666b76339ad291205d50b2dfe66c00e0d90
Author: Tor Lillqvist 
AuthorDate: Tue Jul 21 10:11:48 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jul 21 09:39:02 2020 +0200

Bypass CppunitTest_vcl_pdfium_library_test unless we have PDFIUM

Change-Id: Ic93b2bf66ded948009a9d2d045d98a4bde9ee249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99119
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 8f4fa5adf6d6..ff1499aac2f9 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -204,7 +204,8 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_png_test \
CppunitTest_vcl_widget_definition_reader_test \
CppunitTest_vcl_backend_test \
-   CppunitTest_vcl_pdfium_library_test \
+   $(call gb_Helper_optional, PDFIUM \
+   CppunitTest_vcl_pdfium_library_test) \
 ))
 
 ifeq ($(USING_X11),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridcell.cxx |   22 +-
 svx/source/inc/gridcell.hxx|6 --
 2 files changed, 1 insertion(+), 27 deletions(-)

New commits:
commit 9d0d79ba59a4fb3b88d1757fc4b2916b9f161500
Author: Caolán McNamara 
AuthorDate: Mon Jul 20 16:29:54 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 21 10:26:03 2020 +0200

can now change base class to use FormattedFieldCellController

Change-Id: I1ea6a7fd88cfac21e7d6d2a1533db5363ea558c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99106
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 8e87c2dabfc6..4005c0d2a7d1 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1854,7 +1854,7 @@ void DbSpinField::Init(BrowserDataWin& _rParent, const 
Reference< XRowSet >& _rx
 
 CellControllerRef DbSpinField::CreateController() const
 {
-return new SpinCellController( static_cast< SpinField* >( m_pWindow.get() 
) );
+return new 
::svt::FormattedFieldCellController(static_cast(m_pWindow.get()));
 }
 
 DbNumericField::DbNumericField( DbGridColumn& _rColumn )
@@ -1868,11 +1868,6 @@ DbNumericField::DbNumericField( DbGridColumn& _rColumn )
 doPropertyListening( FM_PROP_SHOWTHOUSANDSEP );
 }
 
-CellControllerRef DbNumericField::CreateController() const
-{
-return new 
::svt::FormattedFieldCellController(static_cast(m_pWindow.get()));
-}
-
 void DbNumericField::implAdjustGenericFieldSetting( const Reference< 
XPropertySet >& _rxModel )
 {
 DBG_ASSERT( m_pWindow, "DbNumericField::implAdjustGenericFieldSetting: not 
to be called without window!" );
@@ -2013,11 +2008,6 @@ DbCurrencyField::DbCurrencyField(DbGridColumn& _rColumn)
 doPropertyListening( FM_PROP_CURRENCYSYMBOL );
 }
 
-CellControllerRef DbCurrencyField::CreateController() const
-{
-return new 
::svt::FormattedFieldCellController(static_cast(m_pWindow.get()));
-}
-
 void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< 
XPropertySet >& _rxModel )
 {
 DBG_ASSERT( m_pWindow, "DbCurrencyField::implAdjustGenericFieldSetting: 
not to be called without window!" );
@@ -2147,11 +2137,6 @@ VclPtr DbDateField::createField(BrowserDataWin* 
pParent, bool bSpinButt
 return VclPtr::Create(pParent, bSpinButton || bDropDown);
 }
 
-CellControllerRef DbDateField::CreateController() const
-{
-return new 
::svt::FormattedFieldCellController(static_cast(m_pWindow.get()));
-}
-
 void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet 
>& _rxModel )
 {
 DBG_ASSERT( m_pWindow, "DbDateField::implAdjustGenericFieldSetting: not to 
be called without window!" );
@@ -2272,11 +2257,6 @@ VclPtr DbTimeField::createField(BrowserDataWin* 
pParent, bool bSpinButt
 return VclPtr::Create(pParent, bSpinButton);
 }
 
-CellControllerRef DbTimeField::CreateController() const
-{
-return new 
::svt::FormattedFieldCellController(static_cast(m_pWindow.get()));
-}
-
 void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet 
>& _rxModel )
 {
 DBG_ASSERT( m_pWindow, "DbTimeField::implAdjustGenericFieldSetting: not to 
be called without window!" );
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index e4203d31819a..2f57874c779b 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -552,12 +552,10 @@ protected:
 ) = 0;
 };
 
-
 class DbDateField : public DbSpinField
 {
 public:
 DbDateField(DbGridColumn& _rColumn);
-virtual ::svt::CellControllerRef CreateController() const override;
 virtual OUString GetFormatText(const css::uno::Reference< 
css::sdb::XColumn >& _rxField, const css::uno::Reference< 
css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
 virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn 
>& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& 
xFormatter) override;
 
@@ -581,7 +579,6 @@ class DbTimeField : public DbSpinField
 {
 public:
 DbTimeField(DbGridColumn& _rColumn);
-virtual ::svt::CellControllerRef CreateController() const override;
 virtual OUString GetFormatText(const css::uno::Reference< 
css::sdb::XColumn >& _rxField, const css::uno::Reference< 
css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
 virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn 
>& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& 
xFormatter) override;
 
@@ -605,7 +602,6 @@ class DbCurrencyField : public DbSpinField
 {
 public:
 DbCurrencyField(DbGridColumn& _rColumn);
-virtual ::svt::CellControllerRef CreateController() const override;
 virtual OUString GetFormatText(const css::uno::Reference< 
css::sdb::XColumn >& _rxField, const css::uno::Reference< 
css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) 

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 299638cab15831d31e7906d557d4f95239be4df9
Author: Caolán McNamara 
AuthorDate: Mon Jul 20 16:23:08 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 21 10:25:21 2020 +0200

m_bLegacy is always false for dialog

Change-Id: I3cc208c1b7576dc47b6259a1a388f1aeaf65c435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e280c0ce655b..1a6546b689a1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1733,7 +1733,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 else
 xWindow = VclPtr::Create(pParent, nBits, eInit);
 #if HAVE_FEATURE_DESKTOP
-if (!m_bLegacy && !extractModal(rMap))
+if (!extractModal(rMap))
 xWindow->SetType(WindowType::MODELESSDIALOG);
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools include/vcl solenv/clang-format svtools/source svtools/uiconfig svx/source toolkit/source vcl/source

[Caolán McNamara (via logerrit)]

 include/svtools/editbrowsebox.hxx  |   21 ++
 include/vcl/field.hxx  |  107 
 include/vcl/toolkit/calendar.hxx   |6 
 include/vcl/toolkit/field.hxx  |  111 
 include/vcl/weldutils.hxx  |   32 +++
 solenv/clang-format/excludelist|2 
 svtools/source/brwbox/ebbcontrols.cxx  |   69 +++
 svtools/uiconfig/ui/datewindow.ui  |   54 ++
 svtools/uiconfig/ui/thineditcontrol.ui |   83 ++---
 svx/source/fmcomp/gridcell.cxx |  105 +--
 svx/source/inc/gridcell.hxx|1 
 toolkit/source/awt/vclxtoolkit.cxx |2 
 vcl/source/app/weldutils.cxx   |   24 ++
 vcl/source/control/calendar.cxx|2 
 vcl/source/control/field2.cxx  |  291 +++--
 15 files changed, 630 insertions(+), 280 deletions(-)

New commits:
commit 6e7e19d9c300dbdd279789b09f94781e946fad52
Author: Caolán McNamara 
AuthorDate: Wed Jul 15 12:10:32 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 21 10:25:42 2020 +0200

weld DateControl

replace SpinButton when WB_SPINBUTTON is set on a date field
to always use a popover with a calendar in it to make it
possible to integrate this with native widgets

Change-Id: I36a26599a154bddf9aec9b50b6570e13477a1f63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98858
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index b5ffad460555..4dc3381d5aaa 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -750,6 +750,27 @@ namespace svt
 TimeControl(BrowserDataWin* pParent, bool bSpinVariant);
 };
 
+class SVT_DLLPUBLIC DateControl : public FormattedControlBase
+{
+public:
+DateControl(BrowserDataWin* pParent, bool bDropDown);
+
+void SetDate(const Date& rDate);
+
+virtual void dispose() override;
+private:
+std::unique_ptr m_xMenuButton;
+std::unique_ptr m_xCalendarBuilder;
+std::unique_ptr m_xTopLevel;
+std::unique_ptr m_xCalendar;
+std::unique_ptr m_xTodayBtn;
+std::unique_ptr m_xNoneBtn;
+
+DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+DECL_LINK(ActivateHdl, weld::Calendar&, void);
+DECL_LINK(ImplClickHdl, weld::Button&, void);
+};
+
 //= FormattedFieldCellController
 class SVT_DLLPUBLIC FormattedFieldCellController final : public 
EditCellController
 {
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 1cb4974bfd08..36a786061bdb 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -186,83 +186,6 @@ private:
 
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) DateFormatter : public FormatterBase
-{
-private:
-std::unique_ptr mxCalendarWrapper;
-DatemaFieldDate;
-DatemaLastDate;
-DatemaMin;
-DatemaMax;
-boolmbLongFormat;
-boolmbShowDateCentury;
-ExtDateFieldFormat  mnExtDateFormat;
-boolmbEnforceValidValue;
-
-protected:
-DateFormatter(Edit* pEdit);
-
-SAL_DLLPRIVATE const Date& ImplGetFieldDate() const{ return 
maFieldDate; }
-SAL_DLLPRIVATE void ImplDateReformat( const OUString& rStr, OUString& 
rOutStr );
-SAL_DLLPRIVATE void ImplSetUserDate( const Date& rNewDate,
- Selection const * pNewSelection = 
nullptr );
-SAL_DLLPRIVATE OUString ImplGetDateAsText( const Date& rDate ) const;
-SAL_DLLPRIVATE void ImplNewFieldValue( const Date& rDate );
-CalendarWrapper&GetCalendarWrapper() const;
-
-SAL_DLLPRIVATE bool ImplAllowMalformedInput() const;
-
-public:
-virtual ~DateFormatter() override;
-
-virtual voidReformat() override;
-virtual voidReformatAll() override;
-
-voidSetExtDateFormat( ExtDateFieldFormat eFormat );
-ExtDateFieldFormat  GetExtDateFormat( bool bResolveSystemFormat = 
false ) const;
-
-voidSetMin( const Date& rNewMin );
-const Date& GetMin() const { return maMin; }
-
-voidSetMax( const Date& rNewMax );
-const Date& GetMax() const { return maMax; }
-
-
-// MT: Remove these methods too, ExtDateFormat should be enough!
-// What should happen if using DDMM, but ShowCentury=false?
-
-voidSetLongFormat( bool bLong );
-boolIsLongFormat() const { return mbLongFormat; }
-voidSetShowDateCentury( bool bShowCentury );
-boolIsShowDateCentury() const { return 
mbShowDateCentury; }
-
-
-voidSetDate( const 

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

[Miklos Vajna (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit c91a8faaf6b03bde165894d6d35ce5f71a39c7c4
Author: Miklos Vajna 
AuthorDate: Mon Jul 20 11:36:13 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jul 21 08:45:03 2020 +0200

tdf#50879 PDF export: ensure only built-in fonts are used for forms

Alternative would be to embed the whole font, which is unusual: PDF
typically just embeds the used subset.

(cherry picked from commit 6294ecd7b4da38de98b24ddfb9f201cef98c1f41)

[ Backport is missing the testcase, pdfium on this branch is too old. ]

Change-Id: Ic0b7e121b3ae38804c1a396ea36104ebcc0b9588
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99070
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 60be24294217..e44edd1fe8a9 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4066,6 +4066,13 @@ Font PDFWriterImpl::replaceFont( const vcl::Font& 
rControlFont, const vcl::Font&
 sal_Int32 PDFWriterImpl::getBestBuildinFont( const vcl::Font& rFont )
 {
 sal_Int32 nBest = 4; // default to Helvetica
+
+if (rFont.GetFamilyType() == FAMILY_ROMAN)
+{
+// Serif: default to Times-Roman.
+nBest = 8;
+}
+
 OUString aFontName( rFont.GetFamilyName() );
 aFontName = aFontName.toAsciiLowerCase();
 
@@ -4212,14 +4219,14 @@ void PDFWriterImpl::createDefaultEditAppearance( 
PDFWidget& rEdit, const PDFWrit
 
 // prepare font to use, draw field border
 Font aFont = drawFieldBorder( rEdit, rWidget, rSettings );
-sal_Int32 nBest = getSystemFont( aFont );
+// Get the built-in font which is closest to aFont.
+sal_Int32 nBest = getBestBuildinFont(aFont);
 
 // prepare DA string
 OStringBuffer aDA( 32 );
 appendNonStrokingColor( replaceColor( rWidget.TextColor, 
rSettings.GetFieldTextColor() ), aDA );
 aDA.append( ' ' );
-aDA.append( "/F" );
-aDA.append( nBest );
+aDA.append(pdf::BuildinFontFace::Get(nBest).getNameObject());
 
 OStringBuffer aDR( 32 );
 aDR.append( "/Font " );
___
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.4' - vcl/Module_vcl.mk

[Tor Lillqvist (via logerrit)]

 vcl/Module_vcl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0ea5472de50589706ae5b46ea7bb78ef71cafc7
Author: Tor Lillqvist 
AuthorDate: Tue Jul 21 10:43:40 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jul 21 10:43:40 2020 +0300

Fix typo

Change-Id: Icf532e47badd96a84f2f774a14af0274e336bfc5

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index ff1499aac2f9..a98662fb2881 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -204,7 +204,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_png_test \
CppunitTest_vcl_widget_definition_reader_test \
CppunitTest_vcl_backend_test \
-   $(call gb_Helper_optional, PDFIUM \
+   $(call gb_Helper_optional, PDFIUM, \
CppunitTest_vcl_pdfium_library_test) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  106 
+++---
 compilerplugins/clang/unusedfields.readonly.results |   86 
++---
 compilerplugins/clang/unusedfields.untouched.results|   68 +---
 compilerplugins/clang/unusedfields.writeonly.results|  168 
+-
 include/vcl/edit.hxx|4 
 include/vcl/toolkit/button.hxx  |6 
 vcl/source/control/button.cxx   |   10 
 vcl/source/control/edit.cxx |   41 --
 8 files changed, 230 insertions(+), 259 deletions(-)

New commits:
commit bb7b0511bbb6d2237b7b765c31727324b4183a85
Author: Noel Grandin 
AuthorDate: Mon Jul 20 15:28:36 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 21 08:30:34 2020 +0200

loplugin:unusedfields

Change-Id: I933d9a82bb6ad5f5b946e28abcc2dae30126c720
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99108
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 65ba46ffa01d..620901b860b1 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -1,6 +1,6 @@
-avmedia/source/vlc/vlcframegrabber.hxx:35
+avmedia/source/vlc/vlcframegrabber.hxx:34
 avmedia::vlc::VLCFrameGrabber mInstance wrapper::Instance
-avmedia/source/vlc/vlcframegrabber.hxx:36
+avmedia/source/vlc/vlcframegrabber.hxx:35
 avmedia::vlc::VLCFrameGrabber mMedia wrapper::Media
 avmedia/source/vlc/wrapper/Types.hxx:38
 libvlc_event_t p_obj void *
@@ -52,31 +52,31 @@ connectivity/source/drivers/evoab2/EApi.h:122
 (anonymous) address_format char *
 connectivity/source/drivers/evoab2/EApi.h:126
 (anonymous) ext char *
-connectivity/source/drivers/evoab2/NStatement.hxx:57
+connectivity/source/drivers/evoab2/NStatement.hxx:55
 connectivity::evoab::FieldSort bAscending _Bool
-connectivity/source/inc/component/CResultSet.hxx:44
+connectivity/source/inc/component/CResultSet.hxx:42
 connectivity::component::OComponentResultSet m_bBookmarkable _Bool
-connectivity/source/inc/dbase/DResultSet.hxx:43
+connectivity/source/inc/dbase/DResultSet.hxx:41
 connectivity::dbase::ODbaseResultSet m_bBookmarkable _Bool
-connectivity/source/inc/file/FStatement.hxx:87
+connectivity/source/inc/file/FStatement.hxx:85
 connectivity::file::OStatement_Base m_aCursorName class rtl::OUString
-connectivity/source/inc/file/FStatement.hxx:88
+connectivity/source/inc/file/FStatement.hxx:86
 connectivity::file::OStatement_Base m_nMaxFieldSize sal_Int32
-connectivity/source/inc/file/FStatement.hxx:89
+connectivity/source/inc/file/FStatement.hxx:87
 connectivity::file::OStatement_Base m_nMaxRows sal_Int32
-connectivity/source/inc/file/FStatement.hxx:90
+connectivity/source/inc/file/FStatement.hxx:88
 connectivity::file::OStatement_Base m_nQueryTimeOut sal_Int32
-connectivity/source/inc/file/FStatement.hxx:91
+connectivity/source/inc/file/FStatement.hxx:89
 connectivity::file::OStatement_Base m_nFetchSize sal_Int32
-connectivity/source/inc/file/FStatement.hxx:92
+connectivity/source/inc/file/FStatement.hxx:90
 connectivity::file::OStatement_Base m_nResultSetType sal_Int32
-connectivity/source/inc/file/FStatement.hxx:93
+connectivity/source/inc/file/FStatement.hxx:91
 connectivity::file::OStatement_Base m_nFetchDirection sal_Int32
-connectivity/source/inc/file/FStatement.hxx:94
+connectivity/source/inc/file/FStatement.hxx:92
 connectivity::file::OStatement_Base m_nResultSetConcurrency sal_Int32
-connectivity/source/inc/file/FStatement.hxx:95
+connectivity/source/inc/file/FStatement.hxx:93
 connectivity::file::OStatement_Base m_bEscapeProcessing _Bool
-connectivity/source/inc/flat/EResultSet.hxx:42
+connectivity/source/inc/flat/EResultSet.hxx:40
 connectivity::flat::OFlatResultSet m_bBookmarkable _Bool
 connectivity/source/inc/java/lang/Object.hxx:38
 connectivity::SDBThreadAttach m_aGuard jvmaccess::class 
VirtualMachine::AttachGuard
@@ -128,17 +128,17 @@ cppu/source/uno/check.cxx:134
 (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:138
 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/dialogs/AdditionsDialog.cxx:53
+cui/source/dialogs/AdditionsDialog.cxx:82
 (anonymous namespace)::AdditionInfo sDescription class rtl::OUString
-cui/source/dialogs/AdditionsDialog.cxx:55
+cui/source/dialogs/AdditionsDialog.cxx:84
 (anonymous namespace)::AdditionInfo sReleaseVersion class rtl::OUString
-cui/source/dialogs/AdditionsDialog.cxx:59
+cui/source/dialogs/AdditionsDialog.cxx:88
 (anonymous namespace)::AdditionInfo sRating class rtl::OUString

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/notebookbar.css|5 ++
 loleaflet/images/lc_sidebar.svg  |1 
 loleaflet/src/control/Control.Notebookbar.js |   55 ++-
 3 files changed, 59 insertions(+), 2 deletions(-)

New commits:
commit 0d57bb2872326daf1f23b6998699f89a111baa50
Author: Szymon Kłos 
AuthorDate: Tue Jul 21 09:30:04 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jul 21 10:23:55 2020 +0200

notebookbar: add sidebar switch

Change-Id: Ib64f0d99d428896680eae8ce5ae9109563ec5b76
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99121
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index d46b2f1dd..88c889986 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -68,6 +68,11 @@
margin-bottom: 3px;
 }
 
+/* options section */
+.notebookbar-options-section {
+   margin-left: 10px;
+}
+
 /* root container */
 
 .notebookbar-scroll-wrapper {
diff --git a/loleaflet/images/lc_sidebar.svg b/loleaflet/images/lc_sidebar.svg
new file mode 100644
index 0..75c2b7b52
--- /dev/null
+++ b/loleaflet/images/lc_sidebar.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
 
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.Notebookbar.js 
b/loleaflet/src/control/Control.Notebookbar.js
index 146888230..b1612cb06 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -3,9 +3,10 @@
  * L.Control.Notebookbar
  */
 
-/* global $ _ */
+/* global $ _ _UNO */
 L.Control.Notebookbar = L.Control.extend({
 
+   _optionsSectionWidth: 50,
_currentScrollPosition: 0,
_showNotebookbar: false,
 
@@ -79,6 +80,9 @@ L.Control.Notebookbar = L.Control.extend({
if (this._showNotebookbar === false)
this.hideTabs();
 
+   if (window.mode.isDesktop())
+   this.createOptionsSection();
+
this.scrollToLastPositionIfNeeded();
},
 
@@ -151,6 +155,8 @@ L.Control.Notebookbar = L.Control.extend({
 
$(left).css({'height': '80px'});
$(right).css({'height': '80px'});
+   if (window.mode.isDesktop())
+   $(right).css({'right':  this._optionsSectionWidth + 
'px'});
 
$(left).click(function () {
var scroll = 
$('.notebookbar-scroll-wrapper').scrollLeft() - 300;
@@ -203,5 +209,50 @@ L.Control.Notebookbar = L.Control.extend({
}
}
}
-   }
+   },
+
+   getOptionsSectionData: function() {
+   return [
+   {
+   'id': 'optionscontainer',
+   'type': 'container',
+   'vertical': 'true',
+   'children': [
+   {
+   'id': 'optionstoolboxdown',
+   'type': 'toolbox',
+   'children': [
+   {
+   'type': 
'toolitem',
+   'text': 
_UNO('.uno:Sidebar', '', true),
+   'command': 
'.uno:Sidebar'
+   },
+   {
+   'type': 
'toolitem',
+   // dummy node 
to avoid creating labels
+   }
+   ]
+   }
+   ]
+   }
+   ];
+   },
+
+   createOptionsSection: function() {
+   $('.notebookbar-options-td').remove();
+   var optionsTd = L.DomUtil.create('td', 
'notebookbar-options-td');
+   $(optionsTd).css('width', this._optionsSectionWidth + 'px');
+
+   var optionsSection = L.DomUtil.create('div', 
'notebookbar-options-section', optionsTd);
+   $('#toolbar-up').parent().append(optionsTd);
+
+   var builderOptions = {
+   mobileWizard: this,
+   map: this.map,
+   cssClass: 'notebookbar',
+   };
+
+   var builder = new L.control.notebookbarBuilder(builderOptions);
+   builder.build(optionsSection, this.getOptionsSectionData());
+   },
 });
___
Libreoffice-commits mailing 

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

[Stephan Bergmann (via logerrit)]

 external/libtommath/ExternalProject_libtommath.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a8a2602066b110f19b1e24630ce8cb8908b93652
Author: Stephan Bergmann 
AuthorDate: Mon Jul 20 22:00:05 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 21 08:06:29 2020 +0200

Pass $(verbose) into ExternalProject_libtommath

Change-Id: I8b317c05bf31e3d835cb9d847ea7b7486da62199
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99113
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/libtommath/ExternalProject_libtommath.mk 
b/external/libtommath/ExternalProject_libtommath.mk
index ba2089eb82a5..9169619943ce 100644
--- a/external/libtommath/ExternalProject_libtommath.mk
+++ b/external/libtommath/ExternalProject_libtommath.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libtommath,build) :
&& export CFLAGS=" \
-fPIC \
" \
-   && $(MAKE) \
+   && $(MAKE) $(if $(verbose),V=1) \
)
$(call gb_Trace_EndRange,libtommath,EXTERNAL)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/core/Socket.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 91dc50696655a56c312f08f7fbf06eb57ce0f258
Author: Pranam Lashkari 
AuthorDate: Mon Jul 20 22:53:52 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Tue Jul 21 09:26:48 2020 +0200

leaflet: resolved Formula bar disappears after session timeout

calcinputbar used to disappear because of no proper initialization after
sassion timeout and that set the wrong width which caused this problem

this makes sure that when reconnecting after session timeout,
first inputbar is unloaded and reloaded properly like first time
(when doc was opened)

Change-Id: Ifbf856d0e565e14b2ef697f342ef6d8e63a5fbd2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96953
Reviewed-by: Ashod Nakashian 
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 5c9f61382..08e82af1c 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -493,6 +493,8 @@ L.Socket = L.Class.extend({
{
console.debug('idleness: 
reactivating');
map._documentIdle = false;
+   // force reinitialization of 
calcInputBar(formulabar)
+   map.dialog._calcInputBar.id = 
null;
return map._activate();
}
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC week 7 Styles Inspector Report

[Shivam Kumar Singh]

Hi,
Work done last week :-
* Solved tdf#134555 Show Direct Formatting at the Inspector MERGED
* Solved tdf#134816 Crash when using a parentless style MERGED
* Added support for showing and hiding Asian and Complex fonts MERGED
* Cleanup patch MERGED
* Improve hierarchy viewing in Inspector UNDER REVIEW

Work to be done this week.
* The Inspector is fully functional now, it just does not look very good,
The main job now is to make it informative for a common user, I am working
on pretty printing patches now.
* Make property names human readable
* Manually Hide some defaultly appearing properties from DF.
* Grey out disabled properties (Under Review)
* Add color box (not sure if this is possible)

Thanks to my mentors for all the help, special thanks to Caolan for always
guiding me in ui related stuff.

sincerely,
Shivam Kumar Singh
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/map/Clipboard.js |   57 +
 1 file changed, 36 insertions(+), 21 deletions(-)

New commits:
commit f144cad3cb44fed108da0ccbfb153cb759b5cc8b
Author: Szymon Kłos 
AuthorDate: Thu Jul 16 10:29:39 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 21 10:40:22 2020 +0200

clipboard: when disabled use only internal commands

When external copy/paste is disabled:
- always use internal copy/paste
- don't ask user to use keyboard shortcut
  (it's possible to paste from menu)
- content of a system clipboard is not modified at all

Change-Id: I5645ad68bbf9364124ae721ea0e889d877a4ed23
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98876
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99057
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 3e03f973b..18678b389 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -139,16 +139,6 @@ L.Clipboard = L.Class.extend({
));
},
 
-   // put in the clipboard if copy is disabled
-   _getCopyDisabledHtml: function() {
-   var lang = 'en_US'; // FIXME: l10n
-   return this._substProductName(this._originWrapBody(
-   '  \n' +
-   '\n' +
-   '  \n', false
-   ));
-   },
-
_getMetaOrigin: function (html) {
var match = 'https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Szymon Kłos (via logerrit)]

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

New commits:
commit f7741910a487869cfa1c76b6c7884b2a645a9ea8
Author: Szymon Kłos 
AuthorDate: Mon Jul 13 10:39:54 2020 +0200
Commit: Aron Budea 
CommitDate: Tue Jul 21 10:40:31 2020 +0200

When copy disabled use empty content in clipboard

Don't use 'Stub HTML Message' title...

Change-Id: I24953f1513fb5432e614958787b9d127ffa531a7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98620
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 073efadc16d1f27809b119c9b261fabce85d1cac)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98750
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit dbc1d87699e04f03890d45d7ee8a7e73027976bf)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98751
Reviewed-by: Aron Budea 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 160b664f4..3e03f973b 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -145,7 +145,7 @@ L.Clipboard = L.Class.extend({
return this._substProductName(this._originWrapBody(
'  \n' +
'\n' +
-   '  \n', true
+   '  \n', false
));
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - 2 commits - debian/changelog loleaflet/css loleaflet/src loolwsd.spec.in

[Andras Timar (via logerrit)]

 debian/changelog |6 ++
 loleaflet/css/toolbar.css|1 -
 loleaflet/src/control/Control.Menubar.js |2 +-
 loleaflet/src/control/Control.Toolbar.js |5 +++--
 loolwsd.spec.in  |2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 6337c60137688bdcf5c95cbadf21cdd25a23fc89
Author: Andras Timar 
AuthorDate: Tue Jul 21 10:41:03 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 21 10:41:07 2020 +0200

Bump package version to 4.2.4-10

Change-Id: I351495accc53a14b0e127ddbbba6870598730a21

diff --git a/debian/changelog b/debian/changelog
index 5409a6d4d..d05525cb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-10) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-10
+
+ -- Andras Timar   Tue, 21 Jul 2020 10:36:00 +0200
+
 loolwsd (4.2.4-9) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-9
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 7b9291a24..fe80462e1 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:9%{?dist}
+Release:10%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:EULA
commit 815f657a932bcf8e73057935401288d26b1337cb
Author: Henry Castro 
AuthorDate: Thu Jul 9 10:53:48 2020 -0400
Commit: Andras Timar 
CommitDate: Tue Jul 21 10:41:07 2020 +0200

loleaflet: fix the show/hide close button

Explicit show/hide the close button if the page is loaded by
a WOPI Integrator.

Change-Id: I13d58bbbff03f283ed033a12a4489b610839748e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98443
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98798

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0a795e187..ff228e7eb 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -230,7 +230,6 @@ td[id^=tb_editbar_item_sidebar]{
 }
 
 .closebuttonimage {
-   display: none;
background: url('images/closedoc.svg') no-repeat center 
!important;
 }
 
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 3eea9a713..e1b76779a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1360,7 +1360,7 @@ L.Control.Menubar = L.Control.extend({
 
if (menuItem.type === 'action') {
if ((menuItem.id === 'rev-history' && 
!L.Params.revHistoryEnabled) ||
-   (menuItem.id === 'closedocument' && 
!window.closebutton) ||
+   (menuItem.id === 'closedocument' && 
!L.Params.closeButtonEnabled) ||
(menuItem.id === 'latest-updates' && 
!window.enableWelcomeMessage)) {
return false;
}
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 500ca36b5..6a52c4ec1 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1058,11 +1058,12 @@ function setupToolbar(e) {
map.on('commandresult', onCommandResult);
map.on('updateparts pagenumberchanged', onUpdateParts);
 
-   if (!L.Params.closeButtonEnabled) {
+   if (map.options.wopi && L.Params.closeButtonEnabled) {
+   $('#closebuttonwrapper').show();
+   } else if (!L.Params.closeButtonEnabled) {
$('#closebuttonwrapper').hide();
} else if (L.Params.closeButtonEnabled && !window.mode.isMobile()) {
$('#closebuttonwrapper').show();
-   $('.closebuttonimage').show();
}
 
$('#closebutton').click(function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/map/Clipboard.js |   57 +
 1 file changed, 36 insertions(+), 21 deletions(-)

New commits:
commit 4a0676f16f030bae7a39e02f5defd422d666b06f
Author: Szymon Kłos 
AuthorDate: Thu Jul 16 10:29:39 2020 +0200
Commit: Aron Budea 
CommitDate: Tue Jul 21 10:41:00 2020 +0200

clipboard: when disabled use only internal commands

When external copy/paste is disabled:
- always use internal copy/paste
- don't ask user to use keyboard shortcut
  (it's possible to paste from menu)
- content of a system clipboard is not modified at all

Change-Id: I5645ad68bbf9364124ae721ea0e889d877a4ed23
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98876
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98941
Reviewed-by: Aron Budea 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 3e03f973b..18678b389 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -139,16 +139,6 @@ L.Clipboard = L.Class.extend({
));
},
 
-   // put in the clipboard if copy is disabled
-   _getCopyDisabledHtml: function() {
-   var lang = 'en_US'; // FIXME: l10n
-   return this._substProductName(this._originWrapBody(
-   '  \n' +
-   '\n' +
-   '  \n', false
-   ));
-   },
-
_getMetaOrigin: function (html) {
var match = 'https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_buildid.h.in configure.ac cui/source framework/source icon-themes/colibre include/sfx2 sfx2/source sfx2/uiconfig

[Heiko Tietze (via logerrit)]

 config_host/config_buildid.h.in   |1 -
 configure.ac  |   16 +---
 cui/source/dialogs/about.cxx  |9 -
 cui/source/inc/about.hxx  |1 -
 framework/source/fwe/helper/titlehelper.cxx   |7 ---
 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/intro.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |2 +-
 icon-themes/colibre/brand/shell/logo_flavor.svg   |1 -
 icon-themes/colibre/brand/shell/logo_inverted.svg |2 +-
 include/sfx2/strings.hrc  |1 -
 sfx2/source/dialog/backingwindow.cxx  |   12 
 sfx2/source/dialog/backingwindow.hxx  |2 --
 sfx2/uiconfig/ui/startcenter.ui   |   17 -
 14 files changed, 3 insertions(+), 68 deletions(-)

New commits:
commit bb47ca165959f73929211a736aa8d810fe110e43
Author: Heiko Tietze 
AuthorDate: Tue Jul 21 08:17:05 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jul 21 13:24:16 2020 +0200

Revert "configure: add a --with-product-flavor switch"

This reverts commit c540483134482d437ea6e02390ff429f4300cbb0.

Reason for revert: 
https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/

Conflicts:
icon-themes/colibre/brand/shell/logo_flavor.svg

Change-Id: If435d4c4c16fb1b52635fae2d966151970729daa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99053
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in
index d9663cb3f8f0..04f03b83543a 100644
--- a/config_host/config_buildid.h.in
+++ b/config_host/config_buildid.h.in
@@ -6,6 +6,5 @@ Optional Build ID displayed in the about dialog
 #define CONFIG_BUILDID_H
 
 #undef EXTRA_BUILDID
-#undef PRODUCTFLAVOR
 
 #endif
diff --git a/configure.ac b/configure.ac
index 9e206cc303d0..be09b10a74a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1509,11 +1509,6 @@ AC_ARG_WITH(product-name,
 [Define the product name. Default is AC_PACKAGE_NAME.]),
 ,with_product_name=$PRODUCTNAME)
 
-AC_ARG_WITH(product-flavor,
-AS_HELP_STRING([--with-product-flavor='My Own Personal Flavor'],
-[Define the product flavor. Default is Personal.]),
-,with_product_flavor=Personal)
-
 AC_ARG_WITH(package-version,
 AS_HELP_STRING([--with-package-version='3.1.4.5'],
 [Define the package version. Default is AC_PACKAGE_VERSION. Use only 
if you distribute an own build for macOS.]),
@@ -2386,15 +2381,6 @@ fi
 AC_SUBST(ENABLE_RELEASE_BUILD)
 AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT)
 
-AC_MSG_CHECKING([for product flavor])
-if test "$with_product_flavor" = "no"; then
-PRODUCTFLAVOR=""
-elif test -n "$with_product_flavor"; then
-PRODUCTFLAVOR="$with_product_flavor"
-fi
-AC_MSG_RESULT([$PRODUCTFLAVOR])
-AC_DEFINE_UNQUOTED([PRODUCTFLAVOR], ["$PRODUCTFLAVOR"])
-
 dnl ===
 dnl Test whether to sign Windows Build
 dnl ===
@@ -12921,7 +12907,7 @@ dnl 
===
 AC_MSG_CHECKING([for alternative branding images directory])
 # initialize mapped arrays
 BRAND_INTRO_IMAGES="intro.png intro-highres.png"
-brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo_flavor.svg 
about.svg"
+brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg about.svg"
 
 if test -z "$with_branding" -o "$with_branding" = "no"; then
 AC_MSG_RESULT([none])
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c4e88e37dd73..53f05d52b2e1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -32,8 +32,6 @@
 #include   //CuiResId
 #include 
 #include  //SfxApplication::loadBrandSvg
-#include 
-#include 
 #include 
 #include 
 #include  //utl::Bootstrap::getBuildVersion
@@ -67,7 +65,6 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pUILabel(m_xBuilder->weld_label("lbUIString")),
   m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")),
   m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")),
-  m_pAboutLabel(m_xBuilder->weld_label("lbAbout")),
   m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) {
 
   // Labels
@@ -90,12 +87,6 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pUILabel->set_label(Application::GetHWOSConfInfo(2));
   m_pLocaleLabel->set_label(GetLocaleString());
   m_pMiscLabel->set_label(GetMiscString());
-
-  if (std::string_view(PRODUCTFLAVOR) == "Personal")
-  {
-  m_pAboutLabel->set_label(SfxResId(STR_PERSONALDESC));
-  }
-
   m_pCopyrightLabel->set_label(GetCopyrightString());
 
   // Images
diff --git a/cui/source/inc/about.hxx 

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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |   86 +++---
 1 file changed, 50 insertions(+), 36 deletions(-)

New commits:
commit 82121cb783e330d27141eaf933c965fd78fc2164
Author: Pranam Lashkari 
AuthorDate: Tue Jul 21 13:59:27 2020 +0530
Commit: Tamás Zolnai 
CommitDate: Tue Jul 21 13:25:04 2020 +0200

leaflet: fixed selection handler lagging behind

Change-Id: Ic89a6827bac4511a8f9cd9afbcc2594cdc2046f3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97897
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 2bbfd3c8f..c4a18db31 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1837,6 +1837,7 @@ L.TileLayer = L.GridLayer.extend({

this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
 
this._updateScrollOnCellSelection(oldSelection, 
this._textSelectionEnd);
+   this._updateMarkers();
}
else {
this._textSelectionEnd = null;
@@ -3169,42 +3170,7 @@ L.TileLayer = L.GridLayer.extend({

this._isEmptyRectangle(this._textSelectionEnd)) {
return;
}
-
-   var startPos = 
this._map.project(this._textSelectionStart.getSouthWest());
-   var endPos = 
this._map.project(this._textSelectionEnd.getSouthWest());
-   var startMarkerPos = 
this._map.project(startMarker.getLatLng());
-   if (startMarkerPos.distanceTo(endPos) < 
startMarkerPos.distanceTo(startPos) && startMarker._icon && endMarker._icon) {
-   // if the start marker is actually closer to 
the end of the selection
-   // reverse icons and markers
-   L.DomUtil.removeClass(startMarker._icon, 
'leaflet-selection-marker-start');
-   L.DomUtil.removeClass(endMarker._icon, 
'leaflet-selection-marker-end');
-   L.DomUtil.addClass(startMarker._icon, 
'leaflet-selection-marker-end');
-   L.DomUtil.addClass(endMarker._icon, 
'leaflet-selection-marker-start');
-   var tmp = startMarker;
-   startMarker = endMarker;
-   endMarker = tmp;
-   }
-   else if (startMarker._icon && endMarker._icon) {
-   // normal markers and normal icons
-   L.DomUtil.removeClass(startMarker._icon, 
'leaflet-selection-marker-end');
-   L.DomUtil.removeClass(endMarker._icon, 
'leaflet-selection-marker-start');
-   L.DomUtil.addClass(startMarker._icon, 
'leaflet-selection-marker-start');
-   L.DomUtil.addClass(endMarker._icon, 
'leaflet-selection-marker-end');
-   }
-
-   if (!startMarker.isDragged) {
-   var pos = 
this._map.project(this._textSelectionStart.getSouthWest());
-   pos = this._map.unproject(pos);
-   startMarker.setLatLng(pos);
-   this._map.addLayer(startMarker);
-   }
-
-   if (!endMarker.isDragged) {
-   pos = 
this._map.project(this._textSelectionEnd.getSouthEast());
-   pos = this._map.unproject(pos);
-   endMarker.setLatLng(pos);
-   this._map.addLayer(endMarker);
-   }
+   this._updateMarkers();
}
else {
this._textSelectionStart = null;
@@ -3217,6 +3183,54 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   _updateMarkers: function() {
+   var startMarker, endMarker;
+   for (var key in this._selectionHandles) {
+   if (key === 'start') {
+   startMarker = this._selectionHandles[key];
+   }
+   else if (key === 'end') {
+   endMarker = this._selectionHandles[key];
+   }
+   }
+
+   var startPos = 
this._map.project(this._textSelectionStart.getSouthWest());
+   var endPos = 
this._map.project(this._textSelectionEnd.getSouthWest());
+   var startMarkerPos = this._map.project(startMarker.getLatLng());
+   if 

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/notebookbar.css|   10 +++--
 loleaflet/css/toolbar.css|   28 +--
 loleaflet/src/control/Control.Notebookbar.js |   15 ++
 3 files changed, 29 insertions(+), 24 deletions(-)

New commits:
commit b56d6a542396cc96b3d392144a217eff5618a4ab
Author: Pedro Pinto Silva 
AuthorDate: Tue Jul 21 11:37:10 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Jul 21 14:45:05 2020 +0200

Notebookbar: reposition sidebar icon

Since it's a trigger that it's not dependent on a specific tab content but 
rather a top control that activates the sidebar I repositioned it up top. This 
will also avoid problems in the future in the case we add a "collapse tab 
content"

- Also optative close button got some improvements in position and size
Change-Id: I541a3683529e5744714394b64a57105a3407b13f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99126
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 42aea041f..5c4843424 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -65,12 +65,14 @@
width: 16px !important;
height: 16px !important;
margin-right: 0px;
-   margin-bottom: 3px;
+   margin-top: 3px;
 }
 
 /* options section */
 .notebookbar-options-section {
-   margin-left: 10px;
+   display: inline;
+   position: fixed;
+   right: 0px;
 }
 
 /* root container */
@@ -91,6 +93,10 @@
 height: 0;
 }
 
+#toolbar-wrapper.hasnotebookbar {
+   position: fixed;
+}
+
 /* unobuttons */
 
 div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookbar, #ObjectBackOne.notebookbar, 
#ObjectForwardOne.notebookbar, #BringToFront.notebookbar, 
#SetObjectToBackground.notebookbar, #SetObjectToForeground.notebookbar, 
#FlipVertical.notebookbar, #FlipHorizontal.notebookbar, #Bold.notebookbar, 
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar, 
#StyleApply.notebookbar, #StyleUpdateByExample.notebookbar, 
#StyleNewByExample.notebookbar, #Shadowed.notebookbar, #Grow.notebookbar, 
#Shrink.notebookbar, #Spacing.notebookbar, #SuperScript.notebookbar, 
#SubScript.notebookbar,#AlignLeft.notebookbar, #AlignRight.notebookbar, 
#AlignHorizontalCenter.notebookbar, #AlignBlock.notebookbar, 
#ParaRightToLeft.notebookbar, #ParaLeftToRight.notebookbar, 
#AlignTop.notebookbar, #AlignVCenter.notebookbar, #AlignBottom.notebookbar, 
#IncrementIndent.notebookbar, #DecrementIndent.notebookbar, 
#LeftPara.notebookbar, #RightPara.notebookbar, #CenterPara.notebookbar, #Justif
 yPara.notebookbar, #DefaultBullet.notebookbar, #DefaultNumbering.notebookbar, 
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar, 
#LineSpacing.notebookbar, #HangingIndent.notebookbar, #CellVertTop.notebookbar, 
#CellVertCenter.notebookbar, #CellVertBottom.notebookbar, 
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar, 
#DeleteTable.notebookbar, #MergeCells.notebookbar{
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 880f48053..0f11a2b34 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -216,23 +216,23 @@ td[id^=tb_editbar_item_sidebar]{
 }
 
 #closebuttonwrapper {
-   position: fixed;
-   z-index: 1050;
-   right: 4px;
-   top: 3px;
-   width: 28px;
-   height: 28px;
-   background-color: white;
-   display: none;
+   position: fixed;
+   z-index: 1050;
+   right: 4px;
+   top: 0px;
+   width: 32px;
+   height: 32px;
+   background-color: white;
+   display: none;
 }
 
 #closebutton {
-   width: 18px;
-   height: 18px;
-   border: 1px solid;
-   border-color: transparent;
-   border-radius: 5px;
-   margin: 5px;
+   width: 18px;
+   height: 18px;
+   border: 1px solid;
+   border-color: transparent;
+   border-radius: 5px;
+   margin: 8px;
 }
 
 #closebutton:hover {
diff --git a/loleaflet/src/control/Control.Notebookbar.js 
b/loleaflet/src/control/Control.Notebookbar.js
index b1612cb06..b2c4ac54e 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -6,7 +6,6 @@
 /* global $ _ _UNO */
 L.Control.Notebookbar = L.Control.extend({
 
-   _optionsSectionWidth: 50,
_currentScrollPosition: 0,
_showNotebookbar: false,
 
@@ -23,6 +22,7 @@ L.Control.Notebookbar = L.Control.extend({
this.map.on('notebookbar', this.onNotebookbar, this);
this.map.on('updatepermission', this.onUpdatePermission, this);
 
+   $('#toolbar-wrapper').addClass('hasnotebookbar');
$('.main-nav').addClass('hasnotebookbar');

Re: cannot access opengrok.libreoffice.org (but ping works)

[himajin100000]

Hi,

Seemed I had a network trouble on my side, not the opengrok side.

I noticed that when I connect to the server with my smartphone, and I 
was able to do so. I restarted the ONU and router device, and confirmed 
that I can connect to the server now!


In such circumstances it is advised to just use git grep or whichever 
grepping tool you like best against your local clone of the source code.


Thank you for the information!

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

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - i18npool/source sw/qa

[Michael Stahl (via logerrit)]

 i18npool/source/breakiterator/breakiterator_unicode.cxx |5 +
 sw/qa/extras/layout/data/no-line-break-at-slash.fodt|   50 
 sw/qa/extras/layout/layout.cxx  |   40 
 3 files changed, 94 insertions(+), 1 deletion(-)

New commits:
commit ba4ffef2c9b97dbbc97d8783589ef798a5d7682e
Author: Michael Stahl 
AuthorDate: Mon Jul 20 20:22:55 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 21 13:27:15 2020 +0200

i18npool: don't break line at slash '/'

If sw text formatting gets the result of the special-case code added to
the "word boundary break" condition, it may call again the next time
with the preceding index, and fall into the "Line boundary break"
condition, which hence also needs to special case '/'.

(regression from ICU 60, 9206a08ada00e8762c4a634f242bd566028964bb)

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99104
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a916e2253df2bf1415c25fb7f974e0d16b615d03)

Change-Id: I2aaefbc7b25af157e0a6ef15fabaa71bff1e8d9a

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 398bdd7326c0..ff889e87e72d 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -498,7 +498,10 @@ LineBreakResults SAL_CALL 
BreakIterator_Unicode::getLineBreak(
 icu::BreakIterator* pLineBI = line.mpValue->mpBreakIterator.get();
 bool GlueSpace=true;
 while (GlueSpace) {
-if (pLineBI->preceding(nStartPos + 1) == nStartPos) { //Line boundary 
break
+// don't break with Slash U+002F SOLIDUS at end of line; see "else" 
below!
+if (pLineBI->preceding(nStartPos + 1) == nStartPos
+&& (nStartPos == 0 || Text[nStartPos - 1] != '/'))
+{ //Line boundary break
 lbr.breakIndex = nStartPos;
 lbr.breakType = BreakType::WORDBOUNDARY;
 } else if (hOptions.rHyphenator.is()) { //Hyphenation break
diff --git a/sw/qa/extras/layout/data/no-line-break-at-slash.fodt 
b/sw/qa/extras/layout/data/no-line-break-at-slash.fodt
new file mode 100644
index ..e900594fa0c8
--- /dev/null
+++ b/sw/qa/extras/layout/data/no-line-break-at-slash.fodt
@@ -0,0 +1,50 @@
+
+
+http://openoffice.org/2009/office; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:dc="http://purl.org/dc/eleme
 nts/1.1/" xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0
 " xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+   Blah blah bla bla bla Foostrasse 13/c/2, 
etc.
+  
+ 
+
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 22e51db58447..8760640d86bf 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ 

Re: cannot access opengrok.libreoffice.org (but ping works)

[Ilmari Lauhakangas]

himajin10 kirjoitti 21.7.2020 klo 14.36:

Hi,

I currently have difficulty accessing opengrok.libreoffice.org
Can anyone reproduce this issue?


The machine was restarted 45 minutes ago and it works again.

In such circumstances it is advised to just use git grep or whichever 
grepping tool you like best against your local clone of the source code.


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

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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |   24 +---
 1 file changed, 5 insertions(+), 19 deletions(-)

New commits:
commit e86007a4c89cbb181796da78fda8839db66f5891
Author: Tamás Zolnai 
AuthorDate: Tue Jul 21 13:30:47 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Jul 21 14:08:31 2020 +0200

Simplify code.

Change-Id: I74340aba3e82810599c2da60001e87aaf58cae7d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99133
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index c4a18db31..c348a9517 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3154,15 +3154,8 @@ L.TileLayer = L.GridLayer.extend({
_onUpdateTextSelection: function () {
this._onUpdateCellResizeMarkers();
 
-   var startMarker, endMarker;
-   for (var key in this._selectionHandles) {
-   if (key === 'start') {
-   startMarker = this._selectionHandles[key];
-   }
-   else if (key === 'end') {
-   endMarker = this._selectionHandles[key];
-   }
-   }
+   var startMarker = this._selectionHandles['start'];
+   var endMarker = this._selectionHandles['end'];
 
if (this._map.editorHasFocus() && 
(this._selections.getLayers().length !== 0 || startMarker.isDragged || 
endMarker.isDragged)) {
if (!startMarker || !endMarker ||
@@ -3176,7 +3169,7 @@ L.TileLayer = L.GridLayer.extend({
this._textSelectionStart = null;
this._textSelectionEnd = null;
this._selectedTextContent = '';
-   for (key in this._selectionHandles) {
+   for (var key in this._selectionHandles) {

this._map.removeLayer(this._selectionHandles[key]);
this._selectionHandles[key].isDragged = false;
}
@@ -3184,15 +3177,8 @@ L.TileLayer = L.GridLayer.extend({
},
 
_updateMarkers: function() {
-   var startMarker, endMarker;
-   for (var key in this._selectionHandles) {
-   if (key === 'start') {
-   startMarker = this._selectionHandles[key];
-   }
-   else if (key === 'end') {
-   endMarker = this._selectionHandles[key];
-   }
-   }
+   var startMarker = this._selectionHandles['start'];
+   var endMarker = this._selectionHandles['end'];
 
var startPos = 
this._map.project(this._textSelectionStart.getSouthWest());
var endPos = 
this._map.project(this._textSelectionEnd.getSouthWest());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 6592afdd7d6e8a56e1450131a2d0a2b652eb6f82
Author: Caolán McNamara 
AuthorDate: Tue Jul 21 12:38:32 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 21 15:05:05 2020 +0200

Related: tdf#121191 check what filter was used for export

Change-Id: Ibf7fd1f1ba0d21f63933c7f6a57daaca9502c71b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99136
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 6e26bacd8078..2eadf26ed64d 100755
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1609,7 +1609,7 @@ bool SfxStoringHelper::GUIStoreModel( const 
uno::Reference< frame::XModel >& xMo
 {
 bDialogUsed = true;
 // check if the file is a pdf or not and change the storing mode 
at convenience
-if ( aURL.GetFileExtension().equalsIgnoreAsciiCase( "pdf" ) )
+if (aFilterName.endsWith("pdf_Export"))
 nStoreMode = EXPORT_REQUESTED | PDFEXPORT_REQUESTED;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 i18npool/source/breakiterator/breakiterator_unicode.cxx |5 +
 sw/qa/extras/layout/data/no-line-break-at-slash.fodt|   50 
 sw/qa/extras/layout/layout.cxx  |   40 
 3 files changed, 94 insertions(+), 1 deletion(-)

New commits:
commit a916e2253df2bf1415c25fb7f974e0d16b615d03
Author: Michael Stahl 
AuthorDate: Mon Jul 20 20:22:55 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 21 13:17:47 2020 +0200

i18npool: don't break line at slash '/'

If sw text formatting gets the result of the special-case code added to
the "word boundary break" condition, it may call again the next time
with the preceding index, and fall into the "Line boundary break"
condition, which hence also needs to special case '/'.

(regression from ICU 60, 9206a08ada00e8762c4a634f242bd566028964bb)

Change-Id: I2aaefbc7b25af157e0a6ef15fabaa71bff1e8d9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99104
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 2d2ac437b430..7c79b99ec028 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -499,7 +499,10 @@ LineBreakResults SAL_CALL 
BreakIterator_Unicode::getLineBreak(
 icu::BreakIterator* pLineBI = line.mpValue->mpBreakIterator.get();
 bool GlueSpace=true;
 while (GlueSpace) {
-if (pLineBI->preceding(nStartPos + 1) == nStartPos) { //Line boundary 
break
+// don't break with Slash U+002F SOLIDUS at end of line; see "else" 
below!
+if (pLineBI->preceding(nStartPos + 1) == nStartPos
+&& (nStartPos == 0 || Text[nStartPos - 1] != '/'))
+{ //Line boundary break
 lbr.breakIndex = nStartPos;
 lbr.breakType = BreakType::WORDBOUNDARY;
 } else if (hOptions.rHyphenator.is()) { //Hyphenation break
diff --git a/sw/qa/extras/layout/data/no-line-break-at-slash.fodt 
b/sw/qa/extras/layout/data/no-line-break-at-slash.fodt
new file mode 100644
index ..e900594fa0c8
--- /dev/null
+++ b/sw/qa/extras/layout/data/no-line-break-at-slash.fodt
@@ -0,0 +1,50 @@
+
+
+http://openoffice.org/2009/office; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:dc="http://purl.org/dc/eleme
 nts/1.1/" xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0
 " xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+   Blah blah bla bla bla Foostrasse 13/c/2, 
etc.
+  
+ 
+
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 5d70eec259b2..06bef3c37a10 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1163,6 +1163,46 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 

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

[Pierre MARTY (via logerrit)]

 sfx2/source/doc/guisaveas.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit fef72302dac39674103c8cf66f1a5e27b9f3d7ab
Author: Pierre MARTY 
AuthorDate: Fri Apr 17 19:01:41 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Jul 21 13:33:20 2020 +0200

tdf#121191 Fix PDF viewer after "Export..."

* Add '.pdf' file extension detection:
| if the file is actually a PDF then modify the 
'nStoreMode' value
| to 'EXPORT_REQUESTED | PDFEXPORT_REQUESTED'

Change-Id: I2c950dc424fd62f004bb3eb6860621561669f547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92715
Tested-by: Jenkins
Reviewed-by: Pierre Marty 
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
old mode 100644
new mode 100755
index c47d18a5710d..6e26bacd8078
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1600,12 +1600,18 @@ bool SfxStoringHelper::GUIStoreModel( const 
uno::Reference< frame::XModel >& xMo
 aModelData.GetMediaDescr().find( 
OUString("FilterFlags") );
 bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() );
 
+// check if the filter Dialog has not been called before
 if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !( nStoreMode & 
EPUBEXPORT_REQUESTED ) && !bFilterFlagsSet
 && ( ( nStoreMode & EXPORT_REQUESTED ) || bUseFilterOptions ) )
 {
 // execute filter options dialog
 if ( aModelData.ExecuteFilterDialog_Impl( aFilterName ) )
+{
 bDialogUsed = true;
+// check if the file is a pdf or not and change the storing mode 
at convenience
+if ( aURL.GetFileExtension().equalsIgnoreAsciiCase( "pdf" ) )
+nStoreMode = EXPORT_REQUESTED | PDFEXPORT_REQUESTED;
+}
 }
 
 // so the arguments will not change any more and can be stored to the main 
location
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

cannot access opengrok.libreoffice.org (but ping works)

[himajin100000]

Hi,

I currently have difficulty accessing opengrok.libreoffice.org
Can anyone reproduce this issue?

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - fpicker/source sfx2/Library_sfx.mk sfx2/source

[Tor Lillqvist (via logerrit)]

 fpicker/source/aqua/SalAquaFilePicker.mm |3 -
 sfx2/Library_sfx.mk  |3 -
 sfx2/source/appl/sfxhelp.cxx |   47 +--
 sfx2/source/appl/shutdowniconaqua.mm |6 +--
 4 files changed, 6 insertions(+), 53 deletions(-)

New commits:
commit 6850d15eb8affeb9206da452fbd46e6a3682fdf6
Author: Tor Lillqvist 
AuthorDate: Tue Jul 21 13:30:42 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jul 21 13:54:02 2020 +0200

Revert "tdf#125578 force webhelp as workaround for Safari sandboxing..."

That change also prevented local help from being displayed in the
built-in viewer on macOS. But we do want local help in Collabora
Office on macOS from this branch. at least for now.

Also: Revert "loplugin:nullptr (macOS)", revert "loplugin:cstylecast 
(macOS)".

This reverts commit ffed2de3e412ff35979ecea92c3d49eefe0fcc5d.
This reverts commit d2d6b2d785ccdfb67473c5b97bcac9bd25d3407b.
This reverts commit 44893662d510c4173e55ba27af02d0258a697a5d.

Change-Id: I98805b4c39dc01c7d8e9d7f8f09abc61a103480c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99134
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm 
b/fpicker/source/aqua/SalAquaFilePicker.mm
index ac54fca0cc98..3ddad83529c4 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -160,8 +160,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
 // So instead of:
 // [m_pDialog setDelegate:m_pDelegate];
 // do:
-reinterpret_cast(objc_msgSend)(
-m_pDialog, @selector(setDelegate:), m_pDelegate);
+((id (*)(id, SEL, ...))objc_msgSend)(m_pDialog, @selector(setDelegate:), 
m_pDelegate);
 
 int nStatus = runandwaitforresult();
 
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index cc2386fe5f82..4aa4d1727d11 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -325,9 +325,6 @@ $(eval $(call gb_Library_add_defs,sfx,\
 endif
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_cxxflags,sfx,\
-$(gb_OBJCXXFLAGS) \
-))
 $(eval $(call gb_Library_add_objcxxobjects,sfx,\
 sfx2/source/appl/shutdowniconaqua \
 ))
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6e8c4b20151b..3df45642a5df 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -24,13 +24,6 @@
 #include 
 #include 
 #include 
-#ifdef MACOSX
-#include 
-#include 
-#include 
-#include 
-#include 
-#endif
 
 #include 
 #include 
@@ -734,16 +727,7 @@ static bool impl_showOnlineHelp( const OUString& rURL )
 
 try
 {
-#ifdef MACOSX
-LSOpenCFURLRef(CFURLCreateWithString(kCFAllocatorDefault,
-   CFStringCreateWithCString(kCFAllocatorDefault,
-   aHelpLink.toUtf8().getStr(),
-   kCFStringEncodingUTF8),
-   nullptr),
-nullptr);
-#else
 sfx2::openUriExternally(aHelpLink, false);
-#endif
 return true;
 }
 catch (const Exception&)
@@ -922,11 +906,10 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
 }
 
 #define SHTML1 ""
-#define SHTML2 " window.location.href = 
\""
+#define SHTML2 "