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

[Tomaž Vajngerl (via logerrit)]

 sd/source/core/annotations/Annotation.cxx |6 ++
 sd/source/ui/unoidl/unomodel.cxx  |   13 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit f008bd0277001226f2dd695836a019c9b9c84799
Author: Tomaž Vajngerl 
AuthorDate: Fri Jun 26 09:06:18 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 28 08:51:59 2020 +0200

sd: send annotation position for LOKit, fix multiple annotations

This adds support to send annotation position in the document when
sending the available annotations using LOKit.

It also fixes an issue with the json structure for the annotations,
which sends multiple annotation objects with the same (empty) key,
that after parsing reduces to only one (so only one of the many
annotations is present). This fix changes that so annotation
objects have each its own unique key.

Change-Id: I9d994383d6ee322f27f1426be5bd96ac81e8e609
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97329
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/sd/source/core/annotations/Annotation.cxx 
b/sd/source/core/annotations/Annotation.cxx
index bd0feacf8a68..bff000a229cd 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -433,6 +433,12 @@ std::string 
lcl_LOKGetCommentPayload(CommentNotificationType nType, ReferencegetString());
 const SdPage* pPage = sd::getAnnotationPage(rxAnnotation);
 aAnnotation.put("parthash", pPage ? 
OString::number(pPage->GetHashCode()) : OString());
+geometry::RealPoint2D const & rPoint = rxAnnotation->getPosition();
+geometry::RealSize2D const & rSize = rxAnnotation->getSize();
+::tools::Rectangle aRectangle(Point(rPoint.X * 100.0, rPoint.Y * 
100.0), Size(rSize.Width * 100.0, rSize.Height * 100.0));
+aRectangle = OutputDevice::LogicToLogic(aRectangle, 
MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
+OString sRectangle = aRectangle.toString();
+aAnnotation.put("rectangle", sRectangle.getStr());
 }
 
 boost::property_tree::ptree aTree;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c72ef5725b89..ad460509dda0 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -118,6 +118,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2407,13 +2408,21 @@ void 
SdXImpressDocument::getPostIts(::tools::JsonWriter& rJsonWriter)
 
 for (const uno::Reference& xAnnotation : 
aPageAnnotations)
 {
-auto commentNode = rJsonWriter.startNode("");
-rJsonWriter.put("id", sd::getAnnotationId(xAnnotation));
+sal_uInt32 nID = sd::getAnnotationId(xAnnotation);
+OString nodeName = "comment" + OString::number(nID);
+auto commentNode = rJsonWriter.startNode(nodeName.getStr());
+rJsonWriter.put("id", nID);
 rJsonWriter.put("author", xAnnotation->getAuthor());
 rJsonWriter.put("dateTime", 
utl::toISO8601(xAnnotation->getDateTime()));
 uno::Reference xText(xAnnotation->getTextRange());
 rJsonWriter.put("text", xText->getString());
 rJsonWriter.put("parthash", pPage->GetHashCode());
+geometry::RealPoint2D const & rPoint = xAnnotation->getPosition();
+geometry::RealSize2D const & rSize = xAnnotation->getSize();
+::tools::Rectangle aRectangle(Point(rPoint.X * 100.0, rPoint.Y * 
100.0), Size(rSize.Width * 100.0, rSize.Height * 100.0));
+aRectangle = OutputDevice::LogicToLogic(aRectangle, 
MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
+OString sRectangle = aRectangle.toString();
+rJsonWriter.put("rectangle", sRectangle.getStr());
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 09c01a8d6f5dc072991450d215558555152764a8
Author: Tomaž Vajngerl 
AuthorDate: Fri Jun 26 09:18:47 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 28 08:52:14 2020 +0200

pdf: fix text annotation (note) modification date

The modification date wasn't encolsed in brackets, which is
required for the modification date.

Change-Id: Icf91516436b095a8577d3ab10b2a708d10d58cb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97330
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index c7c6b5cccfbc..de1cea050f04 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3483,8 +3483,9 @@ void PDFWriterImpl::emitTextAnnotationLine(OStringBuffer 
& aLine, PDFNoteEntry c
 
 auto & rDateTime = rNote.m_aContents.maModificationDate;
 
-aLine.append("/M ");
+aLine.append("/M (");
 appendPdfTimeDate(aLine, rDateTime.Year, rDateTime.Month, rDateTime.Day, 
rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds, 0);
+aLine.append(") ");
 
 // contents of the note (type text string)
 aLine.append("/Contents ");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 loleaflet/css/loleaflet.css  |   11 ++
 loleaflet/src/layer/marker/Annotation.js |   32 +++
 2 files changed, 43 insertions(+)

New commits:
commit 552462cecd225b5d12f40fea410686a2f3a40ba0
Author: Tomaž Vajngerl 
AuthorDate: Fri Jun 26 09:04:35 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 28 08:51:15 2020 +0200

Add support to show annotation marker for draw/impress

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

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 41e9459fc..dccd4b4b5 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -236,6 +236,17 @@ body {
margin-right: 10px;
 }
 
+.annotation-marker {
+   margin-left: 0px;
+   margin-top: 0px;
+   width: 24px;
+   height: 24px;
+   background-image: url('images/note.svg');
+   background-size: 100% 100%;
+   background-repeat: no-repeat;
+   outline: none;
+}
+
 .loleaflet-scrolled {
overflow: auto;
 }
diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index 6224007f8..730396ab9 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -19,6 +19,7 @@ L.Annotation = L.Layer.extend({
this._latlng = L.latLng(latlng);
this._data = data;
this._skipCheckBounds = false;
+   this._annotationMarker = null;
},
 
onAdd: function (map) {
@@ -51,6 +52,7 @@ L.Annotation = L.Layer.extend({
this._updateContent();
this._updateLayout();
this._updatePosition();
+   this._updateAnnotationMarker();
},
 
setData: function (data) {
@@ -89,6 +91,9 @@ 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);
+   }
},
 
hide: function () {
@@ -99,6 +104,9 @@ L.Annotation = L.Layer.extend({
if (this._data.textSelected && 
this._map.hasLayer(this._data.textSelected)) {
this._map.removeLayer(this._data.textSelected);
}
+   if (this._annotationMarker != null) {
+   this._map.removeLayer(this._annotationMarker);
+   }
},
 
isVisible: function () {
@@ -441,6 +449,30 @@ L.Annotation = L.Layer.extend({
var authorImageHeight = Math.round(this.options.imgSize.y * 
scaleFactor);
this._authorAvatarImg.setAttribute('width', authorImageWidth);
this._authorAvatarImg.setAttribute('height', authorImageHeight);
+   },
+
+   _updateAnnotationMarker: function () {
+   if (this._data == null)
+   return;
+
+   if (this._annotationMarker == null) {
+   this._annotationMarker = L.marker(new L.LatLng(0, 0), {
+   icon: L.divIcon({
+   className: 'annotation-marker',
+   iconSize: null
+   }),
+   draggable: true
+   });
+   this._map.addLayer(this._annotationMarker);
+   }
+   var stringTwips = this._data.rectangle.match(/\d+/g);
+   var topLeftTwips = new L.Point(parseInt(stringTwips[0]), 
parseInt(stringTwips[1]));
+   var offset = new L.Point(parseInt(stringTwips[2]), 
parseInt(stringTwips[3]));
+   var bottomRightTwips = topLeftTwips.add(offset);
+   var bounds = new L.LatLngBounds(
+   this._map._docLayer._twipsToLatLng(topLeftTwips, 
this._map.getZoom()),
+   this._map._docLayer._twipsToLatLng(bottomRightTwips, 
this._map.getZoom()));
+   this._annotationMarker.setLatLng(bounds.getSouthWest());
}
 });
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Srijan Bhatia (via logerrit)]

 sdext/source/presenter/PresenterToolBar.cxx |   25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit d53a4f126e9d3ec0a63684d4c7af3108f352791c
Author: Srijan Bhatia 
AuthorDate: Thu Jun 25 20:21:48 2020 +0530
Commit: Heiko Tietze 
CommitDate: Sun Jun 28 08:20:48 2020 +0200

tdf#128964 fix shifting of icons when the pause/resume button changes

Added a property that specifies width of the button in the presenter 
toolbar.

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

diff --git a/sdext/source/presenter/PresenterToolBar.cxx 
b/sdext/source/presenter/PresenterToolBar.cxx
index a0a57c6d8b44..bd69a262ee59 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1459,9 +1459,24 @@ awt::Size Button::CreateBoundingSize (
 return awt::Size();
 
 geometry::RealRectangle2D aTextBBox 
(mpMode->maText.GetBoundingBox(rxCanvas));
+
+// tdf#128964 This ensures that if the text of a button changes due to a 
change in
+// the state of the button the other buttons of the toolbar do not move. 
The button is
+// allotted the maximum size so that it doesn't resize during a change of 
state.
+geometry::RealRectangle2D aTextBBoxNormal 
(mpNormal->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxMouseOver 
(mpMouseOver->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxSelected 
(mpSelected->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxDisabled 
(mpDisabled->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxMouseOverSelected 
(mpMouseOverSelected->maText.GetBoundingBox(rxCanvas));
+std::vector widths;
+widths.push_back(sal::static_int_cast(0.5 + aTextBBoxNormal.X2 
- aTextBBoxNormal.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxMouseOver.X2 - aTextBBoxMouseOver.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxSelected.X2 - aTextBBoxSelected.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxDisabled.X2 - aTextBBoxDisabled.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxMouseOverSelected.X2 - aTextBBoxMouseOverSelected.X1));
+
 const sal_Int32 nGap (5);
 sal_Int32 nTextHeight (sal::static_int_cast(0.5 + aTextBBox.Y2 
- aTextBBox.Y1));
-sal_Int32 nTextWidth (sal::static_int_cast(0.5 + aTextBBox.X2 - 
aTextBBox.X1));
 Reference xBitmap;
 if (mpMode->mpIcon)
 xBitmap = mpMode->mpIcon->GetNormalBitmap();
@@ -1469,11 +1484,13 @@ awt::Size Button::CreateBoundingSize (
 {
 geometry::IntegerSize2D aSize (xBitmap->getSize());
 return awt::Size(
-::std::max(aSize.Width, sal_Int32(0.5 + aTextBBox.X2 - 
aTextBBox.X1)),
-aSize.Height+ nGap + nTextHeight);
+::std::max(aSize.Width, *std::max_element(widths.begin(), 
widths.end())),
+aSize.Height + nGap + nTextHeight);
 }
 else
-return awt::Size(nTextWidth,nTextHeight);
+{
+return awt::Size(*std::max_element(widths.begin(), widths.end()), 
nTextHeight);
+}
 }
 
 void Button::PaintIcon (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/links.txt |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ab7fa407979bb5bc46201b28090e57dbd3e2c79e
Author: Rizal Muttaqin 
AuthorDate: Sun Jun 28 05:36:32 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jun 28 07:53:59 2020 +0200

Colibre: Fix inverted Promote and Demote icons in links.txt

Change-Id: I806fb983b3b8249ebe7dc3daddef3062afcf9c84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97337
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 162c8c984fd2..fb2a2e9e89f3 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1618,18 +1618,18 @@ cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
 
 # Outline
 cmd/32/outlinedown.png cmd/32/movedown.png
-cmd/32/outlineleft.png cmd/32/decrementlevel.png
-cmd/32/outlineright.png cmd/32/incrementlevel.png
+cmd/32/outlineleft.png cmd/32/incrementlevel.png
+cmd/32/outlineright.png cmd/32/decrementlevel.png
 cmd/32/outlineup.png cmd/32/moveup.png
 
 cmd/lc_outlinedown.png cmd/lc_movedown.png
-cmd/lc_outlineleft.png cmd/lc_decrementlevel.png
-cmd/lc_outlineright.png cmd/lc_incrementlevel.png
+cmd/lc_outlineleft.png cmd/lc_incrementlevel.png
+cmd/lc_outlineright.png cmd/lc_decrementlevel.png
 cmd/lc_outlineup.png cmd/lc_moveup.png
 
 cmd/sc_outlinedown.png cmd/sc_movedown.png
-cmd/sc_outlineleft.png cmd/sc_decrementlevel.png
-cmd/sc_outlineright.png cmd/sc_incrementlevel.png
+cmd/sc_outlineleft.png cmd/sc_incrementlevel.png
+cmd/sc_outlineright.png cmd/sc_decrementlevel.png
 cmd/sc_outlineup.png cmd/sc_moveup.png
 
 # Index
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/README.vars

[Jan-Marek Glogowski (via logerrit)]

 vcl/README.vars |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b9c90430e27aef7645b1b5b1669c09943128a469
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 28 00:49:24 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Sun Jun 28 03:22:17 2020 +0200

Qt5 document some VCL (env) variables

Change-Id: I86260975c8a68318d984b768dfc8d1323fc5a06c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97339
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/README.vars b/vcl/README.vars
index 029ee1ad4842..35ad1ffe353e 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -21,9 +21,9 @@ VCL_DEBUG_DISABLE_PDFCOMPRESSION - disable compression in the 
PDF writer
 
 Gtk+
 
-
 VCL_GTK3_PAINTDEBUG - in debug builds, if set to 1 then holding down shift+0 
forces a redraw event, shift+1 repaints everything, and
 shift+2 dumps cairo frames to pngs as /tmp/frame.png
+GDK_SCALE=2 - for HiDPI scaling (just supports integers)
 
 Bitmap
 --
@@ -50,3 +50,10 @@ SAL_DISABLE_SKIA_CACHE=1 - disable caching of complex images
 OpenGL,Skia
 ---
 SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget textures
+
+Qt
+-
+QT_SCALE_FACTOR=2 - for HiDPI testing (also supports float)
+SAL_VCL_QT5_NO_FONTCONFIG - ignore fontconfig provided font substitutions
+SAL_VCL_QT5_NO_NATIVE - disable QStyle'd controls
+SAL_VCL_QT5_USE_CAIRO - use cairo for text rendering and fonts (default for 
kf5, but not qt5)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sifr/cmd/32/filldown.png|binary
 icon-themes/sifr/cmd/32/fillleft.png|binary
 icon-themes/sifr/cmd/32/fillright.png   |binary
 icon-themes/sifr/cmd/32/fillup.png  |binary
 icon-themes/sifr/cmd/32/showwhitespace.png  |binary
 icon-themes/sifr/cmd/lc_filldown.png|binary
 icon-themes/sifr/cmd/lc_fillleft.png|binary
 icon-themes/sifr/cmd/lc_fillright.png   |binary
 icon-themes/sifr/cmd/lc_fillup.png  |binary
 icon-themes/sifr/cmd/lc_showwhitespace.png  |binary
 icon-themes/sifr/cmd/sc_filldown.png|binary
 icon-themes/sifr/cmd/sc_fillleft.png|binary
 icon-themes/sifr/cmd/sc_fillright.png   |binary
 icon-themes/sifr/cmd/sc_fillup.png  |binary
 icon-themes/sifr/cmd/sc_showwhitespace.png  |binary
 icon-themes/sifr_dark/cmd/32/filldown.png   |binary
 icon-themes/sifr_dark/cmd/32/fillleft.png   |binary
 icon-themes/sifr_dark/cmd/32/fillright.png  |binary
 icon-themes/sifr_dark/cmd/32/fillup.png |binary
 icon-themes/sifr_dark/cmd/32/showwhitespace.png |binary
 icon-themes/sifr_dark/cmd/lc_filldown.png   |binary
 icon-themes/sifr_dark/cmd/lc_fillleft.png   |binary
 icon-themes/sifr_dark/cmd/lc_fillright.png  |binary
 icon-themes/sifr_dark/cmd/lc_fillup.png |binary
 icon-themes/sifr_dark/cmd/lc_showwhitespace.png |binary
 icon-themes/sifr_dark/cmd/sc_filldown.png   |binary
 icon-themes/sifr_dark/cmd/sc_fillleft.png   |binary
 icon-themes/sifr_dark/cmd/sc_fillright.png  |binary
 icon-themes/sifr_dark/cmd/sc_fillup.png |binary
 icon-themes/sifr_dark/cmd/sc_showwhitespace.png |binary
 icon-themes/sifr_dark_svg/cmd/32/filldown.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/32/fillleft.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/32/fillright.svg  |1 +
 icon-themes/sifr_dark_svg/cmd/32/fillup.svg |1 +
 icon-themes/sifr_dark_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/sifr_dark_svg/cmd/lc_filldown.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/lc_fillleft.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/lc_fillright.svg  |1 +
 icon-themes/sifr_dark_svg/cmd/lc_fillup.svg |1 +
 icon-themes/sifr_dark_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/sifr_dark_svg/cmd/sc_filldown.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/sc_fillleft.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/sc_fillright.svg  |1 +
 icon-themes/sifr_dark_svg/cmd/sc_fillup.svg |1 +
 icon-themes/sifr_dark_svg/cmd/sc_showwhitespace.svg |1 +
 icon-themes/sifr_svg/cmd/32/filldown.svg|1 +
 icon-themes/sifr_svg/cmd/32/fillleft.svg|1 +
 icon-themes/sifr_svg/cmd/32/fillright.svg   |1 +
 icon-themes/sifr_svg/cmd/32/fillup.svg  |1 +
 icon-themes/sifr_svg/cmd/32/showwhitespace.svg  |1 +
 icon-themes/sifr_svg/cmd/lc_filldown.svg|1 +
 icon-themes/sifr_svg/cmd/lc_fillleft.svg|1 +
 icon-themes/sifr_svg/cmd/lc_fillright.svg   |1 +
 icon-themes/sifr_svg/cmd/lc_fillup.svg  |1 +
 icon-themes/sifr_svg/cmd/lc_showwhitespace.svg  |1 +
 icon-themes/sifr_svg/cmd/sc_filldown.svg|1 +
 icon-themes/sifr_svg/cmd/sc_fillleft.svg|1 +
 icon-themes/sifr_svg/cmd/sc_fillright.svg   |1 +
 icon-themes/sifr_svg/cmd/sc_fillup.svg  |1 +
 icon-themes/sifr_svg/cmd/sc_showwhitespace.svg  |1 +
 60 files changed, 30 insertions(+)

New commits:
commit ee383f47c67eb817e0a149d8453e0caa3244f638
Author: Rizal Muttaqin 
AuthorDate: Sun Jun 28 06:26:08 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jun 28 03:17:35 2020 +0200

Sifr: tdf#133538 add Show White Space icons

- Add Calc's Fill icons

Change-Id: I0587e45970ea6c3381297d133114aab632d6e84e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97340
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sifr/cmd/32/filldown.png 
b/icon-themes/sifr/cmd/32/filldown.png
new file mode 100644
index ..9217f979bb91
Binary files /dev/null and b/icon-themes/sifr/cmd/32/filldown.png differ
diff --git a/icon-themes/sifr/cmd/32/fillleft.png 
b/icon-themes/sifr/cmd/32/fillleft.png
new file mode 100644
index ..c3a60e3a57e4
Binary files /dev/null and b/icon-themes/sifr/cmd/32/fillleft.png differ
diff --git a/icon-themes/sifr/cmd/32/fillright.png 
b/icon-themes/sifr/cmd/32/fillright.png
new file mode 100644
index ..51a4bea32705
Binary files /dev/null and b/icon-themes/sifr/cmd/32/fillright.png differ
diff --git a/icon-themes/sifr/cmd/32/fillup.png 
b/icon-themes/sifr/cmd/32/fillup.png
new file mode 100644
index ..57967dddee08
Binary file

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

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/links.txt |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9303060ea34bec4a13bfac0562e821b7bd144b65
Author: Rizal Muttaqin 
AuthorDate: Sun Jun 28 05:36:32 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jun 28 03:15:21 2020 +0200

Colibre: Fix inverted Promote and Demote icons in links.txt

Change-Id: I806fb983b3b8249ebe7dc3daddef3062afcf9c84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97303
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index c112f4bf62bd..5d9189a2 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1618,18 +1618,18 @@ cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
 
 # Outline
 cmd/32/outlinedown.png cmd/32/movedown.png
-cmd/32/outlineleft.png cmd/32/decrementlevel.png
-cmd/32/outlineright.png cmd/32/incrementlevel.png
+cmd/32/outlineleft.png cmd/32/incrementlevel.png
+cmd/32/outlineright.png cmd/32/decrementlevel.png
 cmd/32/outlineup.png cmd/32/moveup.png
 
 cmd/lc_outlinedown.png cmd/lc_movedown.png
-cmd/lc_outlineleft.png cmd/lc_decrementlevel.png
-cmd/lc_outlineright.png cmd/lc_incrementlevel.png
+cmd/lc_outlineleft.png cmd/lc_incrementlevel.png
+cmd/lc_outlineright.png cmd/lc_decrementlevel.png
 cmd/lc_outlineup.png cmd/lc_moveup.png
 
 cmd/sc_outlinedown.png cmd/sc_movedown.png
-cmd/sc_outlineleft.png cmd/sc_decrementlevel.png
-cmd/sc_outlineright.png cmd/sc_incrementlevel.png
+cmd/sc_outlineleft.png cmd/sc_incrementlevel.png
+cmd/sc_outlineright.png cmd/sc_decrementlevel.png
 cmd/sc_outlineup.png cmd/sc_moveup.png
 
 # Index
___
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/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sifr/cmd/32/filldown.png|binary
 icon-themes/sifr/cmd/32/fillleft.png|binary
 icon-themes/sifr/cmd/32/fillright.png   |binary
 icon-themes/sifr/cmd/32/fillup.png  |binary
 icon-themes/sifr/cmd/32/showwhitespace.png  |binary
 icon-themes/sifr/cmd/lc_filldown.png|binary
 icon-themes/sifr/cmd/lc_fillleft.png|binary
 icon-themes/sifr/cmd/lc_fillright.png   |binary
 icon-themes/sifr/cmd/lc_fillup.png  |binary
 icon-themes/sifr/cmd/lc_showwhitespace.png  |binary
 icon-themes/sifr/cmd/sc_filldown.png|binary
 icon-themes/sifr/cmd/sc_fillleft.png|binary
 icon-themes/sifr/cmd/sc_fillright.png   |binary
 icon-themes/sifr/cmd/sc_fillup.png  |binary
 icon-themes/sifr/cmd/sc_showwhitespace.png  |binary
 icon-themes/sifr_dark/cmd/32/filldown.png   |binary
 icon-themes/sifr_dark/cmd/32/fillleft.png   |binary
 icon-themes/sifr_dark/cmd/32/fillright.png  |binary
 icon-themes/sifr_dark/cmd/32/fillup.png |binary
 icon-themes/sifr_dark/cmd/32/showwhitespace.png |binary
 icon-themes/sifr_dark/cmd/lc_filldown.png   |binary
 icon-themes/sifr_dark/cmd/lc_fillleft.png   |binary
 icon-themes/sifr_dark/cmd/lc_fillright.png  |binary
 icon-themes/sifr_dark/cmd/lc_fillup.png |binary
 icon-themes/sifr_dark/cmd/lc_showwhitespace.png |binary
 icon-themes/sifr_dark/cmd/sc_filldown.png   |binary
 icon-themes/sifr_dark/cmd/sc_fillleft.png   |binary
 icon-themes/sifr_dark/cmd/sc_fillright.png  |binary
 icon-themes/sifr_dark/cmd/sc_fillup.png |binary
 icon-themes/sifr_dark/cmd/sc_showwhitespace.png |binary
 icon-themes/sifr_dark_svg/cmd/32/filldown.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/32/fillleft.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/32/fillright.svg  |1 +
 icon-themes/sifr_dark_svg/cmd/32/fillup.svg |1 +
 icon-themes/sifr_dark_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/sifr_dark_svg/cmd/lc_filldown.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/lc_fillleft.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/lc_fillright.svg  |1 +
 icon-themes/sifr_dark_svg/cmd/lc_fillup.svg |1 +
 icon-themes/sifr_dark_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/sifr_dark_svg/cmd/sc_filldown.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/sc_fillleft.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/sc_fillright.svg  |1 +
 icon-themes/sifr_dark_svg/cmd/sc_fillup.svg |1 +
 icon-themes/sifr_dark_svg/cmd/sc_showwhitespace.svg |1 +
 icon-themes/sifr_svg/cmd/32/filldown.svg|1 +
 icon-themes/sifr_svg/cmd/32/fillleft.svg|1 +
 icon-themes/sifr_svg/cmd/32/fillright.svg   |1 +
 icon-themes/sifr_svg/cmd/32/fillup.svg  |1 +
 icon-themes/sifr_svg/cmd/32/showwhitespace.svg  |1 +
 icon-themes/sifr_svg/cmd/lc_filldown.svg|1 +
 icon-themes/sifr_svg/cmd/lc_fillleft.svg|1 +
 icon-themes/sifr_svg/cmd/lc_fillright.svg   |1 +
 icon-themes/sifr_svg/cmd/lc_fillup.svg  |1 +
 icon-themes/sifr_svg/cmd/lc_showwhitespace.svg  |1 +
 icon-themes/sifr_svg/cmd/sc_filldown.svg|1 +
 icon-themes/sifr_svg/cmd/sc_fillleft.svg|1 +
 icon-themes/sifr_svg/cmd/sc_fillright.svg   |1 +
 icon-themes/sifr_svg/cmd/sc_fillup.svg  |1 +
 icon-themes/sifr_svg/cmd/sc_showwhitespace.svg  |1 +
 60 files changed, 30 insertions(+)

New commits:
commit a780bf505932b2722601f1a1b1de22ccefb01b2e
Author: Rizal Muttaqin 
AuthorDate: Sun Jun 28 06:26:08 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jun 28 03:14:37 2020 +0200

Sifr: tdf#133538 add Show White Space icons

- Add Calc's Fill icons

Change-Id: I0587e45970ea6c3381297d133114aab632d6e84e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97305
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sifr/cmd/32/filldown.png 
b/icon-themes/sifr/cmd/32/filldown.png
new file mode 100644
index ..9217f979bb91
Binary files /dev/null and b/icon-themes/sifr/cmd/32/filldown.png differ
diff --git a/icon-themes/sifr/cmd/32/fillleft.png 
b/icon-themes/sifr/cmd/32/fillleft.png
new file mode 100644
index ..c3a60e3a57e4
Binary files /dev/null and b/icon-themes/sifr/cmd/32/fillleft.png differ
diff --git a/icon-themes/sifr/cmd/32/fillright.png 
b/icon-themes/sifr/cmd/32/fillright.png
new file mode 100644
index ..51a4bea32705
Binary files /dev/null and b/icon-themes/sifr/cmd/32/fillright.png differ
diff --git a/icon-themes/sifr/cmd/32/fillup.png 
b/icon-themes/sifr/cmd/32/fillup.png
new file mode 100644
index ..57967dddee08
Binary file

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Widget.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9eda78fd53fe3c76eb9d4b63add68f266f551b10
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 28 00:48:01 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Sun Jun 28 03:10:32 2020 +0200

tdf#131991 Qt5 RTL mirror mouse wheel X position

Just like all the other events, the mouse wheels X position must
be mirrord in LO RTL mode.

Change-Id: I28e8da0455d941f42f869b08edcdbe570de366c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97338
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 1c7a130aabe4..0ef305f42949 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -192,7 +192,9 @@ void Qt5Widget::wheelEvent(QWheelEvent* pEvent)
 const Point aPos = toPoint(pEvent->pos() * m_rFrame.devicePixelRatioF());
 
 SalWheelMouseEvent aEvent;
-aEvent.mnX = aPos.X();
+aEvent.mnX = QGuiApplication::isLeftToRight()
+ ? aPos.X()
+ : round(width() * m_rFrame.devicePixelRatioF()) - 
aPos.X();
 aEvent.mnY = aPos.Y();
 aEvent.mnTime = pEvent->timestamp();
 aEvent.mnCode = GetKeyModCode(pEvent->modifiers()) | 
GetMouseModCode(pEvent->buttons());
___
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/sukapura icon-themes/sukapura_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sukapura/cmd/32/hidewhitespace.png |binary
 icon-themes/sukapura/cmd/32/showwhitespace.png |binary
 icon-themes/sukapura/cmd/lc_hidewhitespace.png |binary
 icon-themes/sukapura/cmd/lc_showwhitespace.png |binary
 icon-themes/sukapura/cmd/sc_hidewhitespace.png |binary
 icon-themes/sukapura/cmd/sc_showwhitespace.png |binary
 icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg |2 +-
 icon-themes/sukapura_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg |2 +-
 icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg |3 ++-
 icon-themes/sukapura_svg/cmd/sc_showwhitespace.svg |2 ++
 12 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 751249a40fc55cf7fa801bf36f5752db0e8c6bd6
Author: Rizal Muttaqin 
AuthorDate: Sun Jun 28 05:25:06 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jun 28 02:25:45 2020 +0200

Sukapura: tdf#133538 add Show White Space icons

- update Hide White Space icons

Change-Id: I0de99d35ab8e9a164944c45c4e7f2c11ee7d4870
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97304
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sukapura/cmd/32/hidewhitespace.png 
b/icon-themes/sukapura/cmd/32/hidewhitespace.png
index 0854fb50aa07..a9f09b2fde33 100644
Binary files a/icon-themes/sukapura/cmd/32/hidewhitespace.png and 
b/icon-themes/sukapura/cmd/32/hidewhitespace.png differ
diff --git a/icon-themes/sukapura/cmd/32/showwhitespace.png 
b/icon-themes/sukapura/cmd/32/showwhitespace.png
new file mode 100644
index ..9af9d64d519a
Binary files /dev/null and b/icon-themes/sukapura/cmd/32/showwhitespace.png 
differ
diff --git a/icon-themes/sukapura/cmd/lc_hidewhitespace.png 
b/icon-themes/sukapura/cmd/lc_hidewhitespace.png
index 4fa8adc48af4..efdabfe7354e 100644
Binary files a/icon-themes/sukapura/cmd/lc_hidewhitespace.png and 
b/icon-themes/sukapura/cmd/lc_hidewhitespace.png differ
diff --git a/icon-themes/sukapura/cmd/lc_showwhitespace.png 
b/icon-themes/sukapura/cmd/lc_showwhitespace.png
new file mode 100644
index ..96d7580aa180
Binary files /dev/null and b/icon-themes/sukapura/cmd/lc_showwhitespace.png 
differ
diff --git a/icon-themes/sukapura/cmd/sc_hidewhitespace.png 
b/icon-themes/sukapura/cmd/sc_hidewhitespace.png
index e7b64599ba2b..a47ca8467b9d 100644
Binary files a/icon-themes/sukapura/cmd/sc_hidewhitespace.png and 
b/icon-themes/sukapura/cmd/sc_hidewhitespace.png differ
diff --git a/icon-themes/sukapura/cmd/sc_showwhitespace.png 
b/icon-themes/sukapura/cmd/sc_showwhitespace.png
new file mode 100644
index ..072fa4818494
Binary files /dev/null and b/icon-themes/sukapura/cmd/sc_showwhitespace.png 
differ
diff --git a/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg 
b/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg
index fd4287e4fa86..38931712e04c 100644
--- a/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg
+++ b/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/32/showwhitespace.svg 
b/icon-themes/sukapura_svg/cmd/32/showwhitespace.svg
new file mode 100644
index ..8ef88e63bd70
--- /dev/null
+++ b/icon-themes/sukapura_svg/cmd/32/showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg 
b/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg
index 47c887fc7bf6..76494bc4d344 100644
--- a/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg
+++ b/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg 
b/icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg
new file mode 100644
index ..80596a801aa4
--- /dev/null
+++ b/icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg 
b/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg
index f409ce0262ba..1b4f66fb868c 100644
--- a/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg
+++ b/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg
@@ -1 +1,2 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+/>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/sc_showwhitespace.svg 
b/icon-themes/sukapura_svg/c

[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sukapura/cmd/32/hidewhitespace.png |binary
 icon-themes/sukapura/cmd/32/showwhitespace.png |binary
 icon-themes/sukapura/cmd/lc_hidewhitespace.png |binary
 icon-themes/sukapura/cmd/lc_showwhitespace.png |binary
 icon-themes/sukapura/cmd/sc_hidewhitespace.png |binary
 icon-themes/sukapura/cmd/sc_showwhitespace.png |binary
 icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg |2 +-
 icon-themes/sukapura_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg |2 +-
 icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg |3 ++-
 icon-themes/sukapura_svg/cmd/sc_showwhitespace.svg |2 ++
 12 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 8ed11b7289533bd609fbcb2adfb7b2982ef6fe22
Author: Rizal Muttaqin 
AuthorDate: Sun Jun 28 05:25:06 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jun 28 01:32:01 2020 +0200

Sukapura: tdf#133538 add Show White Space icons

- update Hide White Space icons

Change-Id: I0de99d35ab8e9a164944c45c4e7f2c11ee7d4870
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97336
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sukapura/cmd/32/hidewhitespace.png 
b/icon-themes/sukapura/cmd/32/hidewhitespace.png
index 0854fb50aa07..a9f09b2fde33 100644
Binary files a/icon-themes/sukapura/cmd/32/hidewhitespace.png and 
b/icon-themes/sukapura/cmd/32/hidewhitespace.png differ
diff --git a/icon-themes/sukapura/cmd/32/showwhitespace.png 
b/icon-themes/sukapura/cmd/32/showwhitespace.png
new file mode 100644
index ..9af9d64d519a
Binary files /dev/null and b/icon-themes/sukapura/cmd/32/showwhitespace.png 
differ
diff --git a/icon-themes/sukapura/cmd/lc_hidewhitespace.png 
b/icon-themes/sukapura/cmd/lc_hidewhitespace.png
index 4fa8adc48af4..efdabfe7354e 100644
Binary files a/icon-themes/sukapura/cmd/lc_hidewhitespace.png and 
b/icon-themes/sukapura/cmd/lc_hidewhitespace.png differ
diff --git a/icon-themes/sukapura/cmd/lc_showwhitespace.png 
b/icon-themes/sukapura/cmd/lc_showwhitespace.png
new file mode 100644
index ..96d7580aa180
Binary files /dev/null and b/icon-themes/sukapura/cmd/lc_showwhitespace.png 
differ
diff --git a/icon-themes/sukapura/cmd/sc_hidewhitespace.png 
b/icon-themes/sukapura/cmd/sc_hidewhitespace.png
index e7b64599ba2b..a47ca8467b9d 100644
Binary files a/icon-themes/sukapura/cmd/sc_hidewhitespace.png and 
b/icon-themes/sukapura/cmd/sc_hidewhitespace.png differ
diff --git a/icon-themes/sukapura/cmd/sc_showwhitespace.png 
b/icon-themes/sukapura/cmd/sc_showwhitespace.png
new file mode 100644
index ..072fa4818494
Binary files /dev/null and b/icon-themes/sukapura/cmd/sc_showwhitespace.png 
differ
diff --git a/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg 
b/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg
index fd4287e4fa86..38931712e04c 100644
--- a/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg
+++ b/icon-themes/sukapura_svg/cmd/32/hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/32/showwhitespace.svg 
b/icon-themes/sukapura_svg/cmd/32/showwhitespace.svg
new file mode 100644
index ..8ef88e63bd70
--- /dev/null
+++ b/icon-themes/sukapura_svg/cmd/32/showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg 
b/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg
index 47c887fc7bf6..76494bc4d344 100644
--- a/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg
+++ b/icon-themes/sukapura_svg/cmd/lc_hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg 
b/icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg
new file mode 100644
index ..80596a801aa4
--- /dev/null
+++ b/icon-themes/sukapura_svg/cmd/lc_showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg 
b/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg
index f409ce0262ba..1b4f66fb868c 100644
--- a/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg
+++ b/icon-themes/sukapura_svg/cmd/sc_hidewhitespace.svg
@@ -1 +1,2 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+/>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/sc_showwhitespace.svg 
b/icon-themes/sukapura_svg/c

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

[Tomaž Vajngerl (via logerrit)]

 loleaflet/src/layer/marker/Annotation.js |2 
 loleaflet/src/layer/tile/ImpressTileLayer.js |   86 ++-
 2 files changed, 48 insertions(+), 40 deletions(-)

New commits:
commit 02e4f26bbb24c9891e01b55e0196b996e4de5a91
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 24 21:31:28 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 28 00:38:16 2020 +0200

move handling of comments/annotations into own functions

This isn't a functional change, only making code more readable
and easiert to search.

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

diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js 
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index cc02e444d..b24ee5ccf 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -405,57 +405,65 @@ L.ImpressTileLayer = L.TileLayer.extend({
}
 
if (values.comments) {
-   this.clearAnnotations();
-   for (var index in values.comments) {
-   var comment = values.comments[index];
-   if (!this._annotations[comment.parthash]) {
-   this._annotations[comment.parthash] = 
[];
-   }
-   
this._annotations[comment.parthash].push(L.annotation(this._map.options.maxBounds.getSouthEast(),
 comment).addTo(this._map));
-   }
-   if (!this._topAnnotation) {
-   this._topAnnotation = [];
-   }
-   this._topAnnotation[this._selectedPart] = 0;
-   if (this.hasAnnotations(this._selectedPart)) {
-   this._map._docLayer._updateMaxBounds(true);
-   }
-   this.layoutAnnotations();
+   this._addCommentsFromCommandValues(values.comments);
} else {
L.TileLayer.prototype._onCommandValuesMsg.call(this, 
textMsg);
}
},
 
+   _addCommentsFromCommandValues: function (comments) {
+   this.clearAnnotations();
+   for (var index in comments) {
+   var comment = comments[index];
+   if (!this._annotations[comment.parthash]) {
+   this._annotations[comment.parthash] = [];
+   }
+   
this._annotations[comment.parthash].push(L.annotation(this._map.options.maxBounds.getSouthEast(),
 comment).addTo(this._map));
+   }
+   if (!this._topAnnotation) {
+   this._topAnnotation = [];
+   }
+   this._topAnnotation[this._selectedPart] = 0;
+   if (this.hasAnnotations(this._selectedPart)) {
+   this._map._docLayer._updateMaxBounds(true);
+   }
+   this.layoutAnnotations();
+   },
+
_onMessage: function (textMsg, img) {
if (textMsg.startsWith('comment:')) {
-   var obj = 
JSON.parse(textMsg.substring('comment:'.length + 1));
-   if (obj.comment.action === 'Add') {
-   if (!this._annotations[obj.comment.parthash]) {
-   this._annotations[obj.comment.parthash] 
= [];
-   }
-   
this._annotations[obj.comment.parthash].push(L.annotation(this._map.options.maxBounds.getSouthEast(),
 obj.comment).addTo(this._map));
-   this._topAnnotation[this._selectedPart] = 
Math.min(this._topAnnotation[this._selectedPart], 
this._annotations[this._partHashes[this._selectedPart]].length - 1);
-   this.updateDocBounds(1, this.extraSize);
-   this.layoutAnnotations();
-   } else if (obj.comment.action === 'Remove') {
-   this.removeAnnotation(obj.comment.id);
-   this._topAnnotation[this._selectedPart] = 
Math.min(this._topAnnotation[this._selectedPart], 
this._annotations[this._partHashes[this._selectedPart]].length - 1);
-   this.updateDocBounds(0);
-   this.layoutAnnotations();
-   } else if (obj.comment.action === 'Modify') {
-   var modified = 
this.getAnnotation(obj.comment.id);
-   if (modified) {
-   modified._data = obj.comment;
-   modified.update();
- 

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

[Tomaž Vajngerl (via logerrit)]

 kit/KitHelper.hpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab1fc4c7b3d7a27abe1909e54f51de0e998b4dad
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 24 21:25:12 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 28 00:37:24 2020 +0200

Also send parthash info when using draw (in case of PDF)

Parts hashes were only sent for impress but we also need it for
draw (PDF) so that the annostions/comments start to work.

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

diff --git a/kit/KitHelper.hpp b/kit/KitHelper.hpp
index 2c8db05ba..07b33750b 100644
--- a/kit/KitHelper.hpp
+++ b/kit/KitHelper.hpp
@@ -61,7 +61,7 @@ namespace LOKitHelper
 << " height=" << height
 << " viewid=" << loKitDocument->pClass->getView(loKitDocument);
 
-if (type == LOK_DOCTYPE_SPREADSHEET || type == 
LOK_DOCTYPE_PRESENTATION)
+if (type == LOK_DOCTYPE_SPREADSHEET || type == 
LOK_DOCTYPE_PRESENTATION || type == LOK_DOCTYPE_DRAWING)
 {
 std::ostringstream hposs;
 std::ostringstream sposs;
@@ -108,7 +108,7 @@ namespace LOKitHelper
 std::free(ptrValue);
 }
 
-if (type == LOK_DOCTYPE_PRESENTATION)
+if (type == LOK_DOCTYPE_PRESENTATION || type == 
LOK_DOCTYPE_DRAWING)
 {
 for (int i = 0; i < parts; ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 loleaflet/src/control/Permission.js |9 +
 loleaflet/src/core/Socket.js|2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 21b6e15c03b4c7fd33d58e6523b90e06f35fd820
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 24 16:00:58 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 28 00:37:08 2020 +0200

Wrong "perm" value when setting permission, works by accident

When "perm:" message is sent, in case of PDF we send the payload
"perm: readonly", which is then parsed as " readonly" (with extra
space). If a proper "readonly" value would be parsed, JS would
get stuck, because the code assumes that "doclayer" is available,
which is not the case. So this fixes that the command is correctly
parsed and that it doesn't get stuck by not running the code that
assumes doclayer is available.

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

diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index e8fe959ca..3c1f5e172 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -62,10 +62,11 @@ L.Map.include({
 
this.dragging.enable();
// disable all user interaction, will need to add keyboard too
-   this._docLayer._onUpdateCursor();
-   this._docLayer._clearSelections();
-   this._docLayer._onUpdateTextSelection();
-
+   if (this._docLayer) {
+   this._docLayer._onUpdateCursor();
+   this._docLayer._clearSelections();
+   this._docLayer._onUpdateTextSelection();
+   }
this.fire('updatepermission', {perm : perm});
},
 
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 80decbee2..5a5568424 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -322,7 +322,7 @@ L.Socket = L.Class.extend({
this._map._clip.setKey(key);
}
else if (textMsg.startsWith('perm:')) {
-   var perm = textMsg.substring('perm:'.length);
+   var perm = textMsg.substring('perm:'.length).trim();
 
// This message is often received very early before 
doclayer is initialized
// Change options.permission so that when docLayer is 
initialized, it
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/drawinglayer solenv/clang-format

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/primitive2d/textprimitive2d.hxx |  275 +--
 solenv/clang-format/blacklist|1 
 2 files changed, 137 insertions(+), 139 deletions(-)

New commits:
commit 47f4ec51665c7b5f7682dece127ae1888fe73e72
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 17:00:47 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 28 00:34:56 2020 +0200

drawinglayer: remove textprimitive2d.hxx from clang-format blacklist

Change-Id: I6fa692bb3e4a16400ee2ae847a1f97201493f53a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97287
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx 
b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index 9aeaa96fc15e..6bbc14aa498a 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -33,152 +33,151 @@
 
 namespace drawinglayer::primitive2d
 {
-/** TextSimplePortionPrimitive2D class
+/** TextSimplePortionPrimitive2D class
 
-This is the basic primitive for representing a text portion. It 
contains
-all needed information. If it is not handled by a renderer, its 
decomposition
-will provide the text tools::PolyPolygon outlines as filled 
polygons, correctly
-transformed.
+This is the basic primitive for representing a text portion. It contains
+all needed information. If it is not handled by a renderer, its 
decomposition
+will provide the text tools::PolyPolygon outlines as filled polygons, 
correctly
+transformed.
 
-To get better text quality, it is suggested to handle this 
primitive directly
-in a renderer. In that case, e.g. hintings on the system can be 
supported.
+To get better text quality, it is suggested to handle this primitive 
directly
+in a renderer. In that case, e.g. hintings on the system can be supported.
 
-@param maTextTransform
-The text transformation contains the text start position (always 
baselined)
-as translation, the FontSize as scale (where width relative to 
height defines
-font scaling and width == height means no font scaling) and the 
font rotation
-and shear.
-When shear is used and a renderer does not support it, it may be 
better to use
-the decomposition which will do everything correctly. Same is true 
for mirroring
-which would be expressed as negative scalings.
+@param maTextTransform
+The text transformation contains the text start position (always baselined)
+as translation, the FontSize as scale (where width relative to height 
defines
+font scaling and width == height means no font scaling) and the font 
rotation
+and shear.
+When shear is used and a renderer does not support it, it may be better to 
use
+the decomposition which will do everything correctly. Same is true for 
mirroring
+which would be expressed as negative scalings.
 
-@param rText
-The text to be used. Only a part may be used, but a bigger part of 
the string
-may be necessary for correct layouting (e.g. international)
-
-@param aTextPosition
-The index to the first character to use from rText
-
-@param aTextLength
-The number of characters to use from rText
-
-@param rDXArray
-The distances between the characters. This parameter may be empty, 
in that case
-the renderer is responsible to do something useful. If it is 
given, it has to be of
-the size aTextLength. Its values are in logical coordinates and 
describe the
-distance for each character to use. This is independent from the 
font width which
-is given with maTextTransform. The first value is the offset to 
use from the start
-point in FontCoordinateSystem X-Direction (given by 
maTextTransform) to the start
-point of the second character
-
-@param rFontAttribute
-The font definition
-
-@param rLocale
-The locale to use
-
-@param rFontColor
-The font color to use
-
-@param bFilled
-
-@param nWidthToFill
-
-@param rTextFillColor
-Text background color (has nothing to do with bFilled and 
nWidthToFill)
-
- */
-class DRAWINGLAYER_DLLPUBLIC TextSimplePortionPrimitive2D : public 
BufferedDecompositionPrimitive2D
-{
-private:
-/// text transformation (FontCoordinateSystem)
-basegfx::B2DHomMatrix   maTextTransform;
-
-/// The text, used from maTextPosition up to maTextPosition + 
maTextLength
-OUStringmaText;
-
-/// The index from where on m

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

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/filldown.png   |binary
 icon-themes/elementary/cmd/32/fillleft.png   |binary
 icon-themes/elementary/cmd/32/fillright.png  |binary
 icon-themes/elementary/cmd/32/fillup.png |binary
 icon-themes/elementary/cmd/32/showwhitespace.png |binary
 icon-themes/elementary/cmd/lc_filldown.png   |binary
 icon-themes/elementary/cmd/lc_fillleft.png   |binary
 icon-themes/elementary/cmd/lc_fillright.png  |binary
 icon-themes/elementary/cmd/lc_fillup.png |binary
 icon-themes/elementary/cmd/lc_insertrows.png |binary
 icon-themes/elementary/cmd/lc_showwhitespace.png |binary
 icon-themes/elementary/cmd/sc_filldown.png   |binary
 icon-themes/elementary/cmd/sc_fillleft.png   |binary
 icon-themes/elementary/cmd/sc_fillright.png  |binary
 icon-themes/elementary/cmd/sc_fillup.png |binary
 icon-themes/elementary/cmd/sc_showwhitespace.png |binary
 icon-themes/elementary_svg/cmd/32/filldown.svg   |1 +
 icon-themes/elementary_svg/cmd/32/fillleft.svg   |1 +
 icon-themes/elementary_svg/cmd/32/fillright.svg  |1 +
 icon-themes/elementary_svg/cmd/32/fillup.svg |1 +
 icon-themes/elementary_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/elementary_svg/cmd/lc_filldown.svg   |1 +
 icon-themes/elementary_svg/cmd/lc_fillleft.svg   |1 +
 icon-themes/elementary_svg/cmd/lc_fillright.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_fillup.svg |1 +
 icon-themes/elementary_svg/cmd/lc_insertrows.svg |2 +-
 icon-themes/elementary_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/elementary_svg/cmd/sc_filldown.svg   |1 +
 icon-themes/elementary_svg/cmd/sc_fillleft.svg   |1 +
 icon-themes/elementary_svg/cmd/sc_fillright.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_fillup.svg |1 +
 icon-themes/elementary_svg/cmd/sc_showwhitespace.svg |1 +
 32 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 86efe8c468b6b49ac8e6e0ccfd7a743c144b05fe
Author: Rizal Muttaqin 
AuthorDate: Sat Jun 27 22:06:11 2020 +0700
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jun 27 22:56:06 2020 +0200

elementary: tdf#133538 add White Space icons

- Add Calc's Fill icons

Change-Id: I4b099359f2dfd1a90be77b5eb03e4f3a932d99a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97316
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit f0195929a056a0785cb811804801d8fcc9abe389)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97301
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/elementary/cmd/32/filldown.png 
b/icon-themes/elementary/cmd/32/filldown.png
new file mode 100644
index ..f9df8b0b736c
Binary files /dev/null and b/icon-themes/elementary/cmd/32/filldown.png differ
diff --git a/icon-themes/elementary/cmd/32/fillleft.png 
b/icon-themes/elementary/cmd/32/fillleft.png
new file mode 100644
index ..745a8cce58d9
Binary files /dev/null and b/icon-themes/elementary/cmd/32/fillleft.png differ
diff --git a/icon-themes/elementary/cmd/32/fillright.png 
b/icon-themes/elementary/cmd/32/fillright.png
new file mode 100644
index ..7abef15287b6
Binary files /dev/null and b/icon-themes/elementary/cmd/32/fillright.png differ
diff --git a/icon-themes/elementary/cmd/32/fillup.png 
b/icon-themes/elementary/cmd/32/fillup.png
new file mode 100644
index ..2c633958db4d
Binary files /dev/null and b/icon-themes/elementary/cmd/32/fillup.png differ
diff --git a/icon-themes/elementary/cmd/32/showwhitespace.png 
b/icon-themes/elementary/cmd/32/showwhitespace.png
new file mode 100644
index ..8de42a7fac6d
Binary files /dev/null and b/icon-themes/elementary/cmd/32/showwhitespace.png 
differ
diff --git a/icon-themes/elementary/cmd/lc_filldown.png 
b/icon-themes/elementary/cmd/lc_filldown.png
new file mode 100644
index ..32098bf1bbcb
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_filldown.png differ
diff --git a/icon-themes/elementary/cmd/lc_fillleft.png 
b/icon-themes/elementary/cmd/lc_fillleft.png
new file mode 100644
index ..9553b0dfdc55
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_fillleft.png differ
diff --git a/icon-themes/elementary/cmd/lc_fillright.png 
b/icon-themes/elementary/cmd/lc_fillright.png
new file mode 100644
index ..330ff2b90b3c
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_fillright.png differ
diff --git a/icon-themes/elementary/cmd/lc_fillup.png 
b/icon-themes/elementary/cmd/lc_fillup.png
new file mode 100644
index ..d795d4cbddbe
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_fillup.png differ
diff --git a/icon-themes/elementary/cmd/lc_insertrows.png 
b/icon-themes/elementary/cmd/lc_insertrows.png
index f54f237601cb..1148c60f90c6 100644
Binary files a/ic

[Libreoffice-commits] core.git: 2 commits - include/drawinglayer solenv/clang-format

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/attribute/fontattribute.hxx |   91 ---
 include/drawinglayer/primitive2d/textprimitive2d.hxx |7 -
 solenv/clang-format/blacklist|1 
 3 files changed, 43 insertions(+), 56 deletions(-)

New commits:
commit a9ace8428b7919e68f01fa60dc1a9d2b095610e3
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 16:58:33 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat Jun 27 22:42:54 2020 +0200

organise includes in textprimitive2d.hxx

Change-Id: I6f822707520688cb3b5b501094e238f02e90ce56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97286
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx 
b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index 22ff79a69d6e..9aeaa96fc15e 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -22,15 +22,14 @@
 #include 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-
+#include 
 
 namespace drawinglayer::primitive2d
 {
commit 065798497d5f1c49c1501e2f73079e424231a892
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 16:55:35 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat Jun 27 22:42:38 2020 +0200

drawinglayer: remove fontattribute.hxx from clang-format blacklist

Change-Id: I58ef867586bdd2c8c9f4eb249f10610860c9568a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97285
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/drawinglayer/attribute/fontattribute.hxx 
b/include/drawinglayer/attribute/fontattribute.hxx
index 5972000443a5..1a7250170b6e 100644
--- a/include/drawinglayer/attribute/fontattribute.hxx
+++ b/include/drawinglayer/attribute/fontattribute.hxx
@@ -21,67 +21,56 @@
 
 #include 
 #include 
+#include 
 
-
-namespace rtl {
-   class OUString;
-}
-
-namespace drawinglayer::attribute {
-class ImpFontAttribute;
+namespace drawinglayer::attribute
+{
+class ImpFontAttribute;
 }
 
 namespace drawinglayer::attribute
 {
-/** FontAttribute class
+/** FontAttribute class
 
-This attribute class is able to hold all parameters needed/used
-to completely define the parametrisation of a text portion.
- */
-class DRAWINGLAYER_DLLPUBLIC FontAttribute
-{
-public:
-typedef o3tl::cow_wrapper< ImpFontAttribute > ImplType;
+This attribute class is able to hold all parameters needed/used
+to completely define the parametrisation of a text portion.
+ */
+class DRAWINGLAYER_DLLPUBLIC FontAttribute
+{
+public:
+typedef o3tl::cow_wrapper ImplType;
 
-private:
-ImplType mpFontAttribute;
+private:
+ImplType mpFontAttribute;
 
-public:
-/// constructors/assignmentoperator/destructor
-/// TODO: pair kerning and CJK kerning
-FontAttribute(
-const rtl::OUString& rFamilyName,
-const rtl::OUString& rStyleName,
-sal_uInt16 nWeight,
-bool bSymbol = false,
-bool bVertical = false,
-bool bItalic = false,
-bool bMonospaced = false,
-bool bOutline = false,
-bool bRTL = false,
-bool bBiDiStrong = false);
-FontAttribute();
-FontAttribute(const FontAttribute&);
-FontAttribute(FontAttribute&&);
-FontAttribute& operator=(const FontAttribute&);
-FontAttribute& operator=(FontAttribute&&);
-~FontAttribute();
+public:
+/// TODO: pair kerning and CJK kerning
+FontAttribute(const OUString& rFamilyName, const OUString& rStyleName, 
sal_uInt16 nWeight,
+  bool bSymbol = false, bool bVertical = false, bool bItalic = 
false,
+  bool bMonospaced = false, bool bOutline = false, bool bRTL = 
false,
+  bool bBiDiStrong = false);
+FontAttribute();
+FontAttribute(const FontAttribute&);
+FontAttribute(FontAttribute&&);
+FontAttribute& operator=(const FontAttribute&);
+FontAttribute& operator=(FontAttribute&&);
+~FontAttribute();
 
-// compare operator
-bool operator==(const FontAttribute& rCandidate) const;
+// compare operator
+bool operator==(const FontAttribute& rCandidate) const;
 
-/// data read access
-const rtl::OUString& getFamilyName() const;
-const rtl::OUString& getStyleName() const;
-sal_uInt16 getWeight() const;
-bool getSymbol() const;
-bool getVertical() const;
-bool getItalic() const;
-bool getOutline() const;
-bool getRTL() const;
-bool getBiDiStrong() const;
-bool getMonospaced() const;
-};
+/// data read acce

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/textgridpage.ui |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 4c26e797aa7ed1c136b63008727d6c97d7bfb9cf
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 19:48:05 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 21:47:49 2020 +0200

tdf#134326 allow 2 decimal places for asian grid point sizes

possibly a regression since...

commit 1f622157d10b15c7d9496e3887f493de0f0f94c8
Date:   Sun Apr 7 18:04:11 2013 -0300

Convert Writer asian text grid page to Widget UI

and use the same step increments found before that conversion

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

diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui 
b/sw/uiconfig/swriter/ui/textgridpage.ui
index 933d1fbdde66..221a793ea888 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -19,22 +19,22 @@
 1
 5600
 10
-1
-10
+0.05
+1
   
   
 1
 5600
 10
-1
-10
+0.05
+1
   
   
 1
 5600
 10
-1
-10
+0.05
+1
   
   
 True
@@ -299,6 +299,7 @@
 True
 True
 adjustmentMetric2
+2
   
   
 1
@@ -339,6 +340,7 @@
 True
 True
 adjustmentMetric1
+2
   
   
 1
@@ -365,6 +367,7 @@
 True
 True
 adjustmentMetric
+2
   
   
 1
@@ -449,7 +452,7 @@
 False
 start
 True
-0.1400059604645
+0
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: fpicker/source include/o3tl sc/source sw/qa vcl/source

[Caolán McNamara (via logerrit)]

 fpicker/source/office/OfficeFilePicker.cxx   |3 ++-
 fpicker/source/office/OfficeFolderPicker.cxx |3 ++-
 include/o3tl/make_shared.hxx |   15 +++
 sc/source/ui/view/cellsh2.cxx|3 ++-
 sc/source/ui/view/tabvwshc.cxx   |3 ++-
 sw/qa/extras/uiwriter/uiwriter.cxx   |4 ++--
 vcl/source/gdi/impgraph.cxx  |4 ++--
 7 files changed, 27 insertions(+), 8 deletions(-)

New commits:
commit d1069a583dc1bcf4f1cf9b4bed12cb48bc757951
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:47:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 21:47:11 2020 +0200

cid#1401342 Uncaught exception

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

diff --git a/fpicker/source/office/OfficeFilePicker.cxx 
b/fpicker/source/office/OfficeFilePicker.cxx
index d849326119f4..2c813d64c013 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star::container;
@@ -435,7 +436,7 @@ std::shared_ptr 
SvtFilePicker::implCreateDialog( weld::Windo
 {
 PickerFlags nBits = getPickerFlags();
 
-auto dialog = std::make_shared(pParent, nBits);
+auto dialog = o3tl::make_shared(pParent, nBits);
 
 // Set StandardDir if present
 if ( !m_aStandardDir.isEmpty())
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx 
b/fpicker/source/office/OfficeFolderPicker.cxx
index 424bf708cdb0..8413020df96f 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star::container;
@@ -70,7 +71,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const 
Reference< css::ui::dial
 
 std::shared_ptr SvtFolderPicker::implCreateDialog( 
weld::Window* pParent )
 {
-return std::make_shared(pParent, PickerFlags::PathDialog);
+return o3tl::make_shared(pParent, PickerFlags::PathDialog);
 }
 
 sal_Int16 SvtFolderPicker::implExecutePicker( )
diff --git a/include/o3tl/make_shared.hxx b/include/o3tl/make_shared.hxx
index d42783c301fa..9d7998fd5a36 100644
--- a/include/o3tl/make_shared.hxx
+++ b/include/o3tl/make_shared.hxx
@@ -10,6 +10,7 @@
 #ifndef INCLUDED_O3TL_MAKE_SHARED_HXX
 #define INCLUDED_O3TL_MAKE_SHARED_HXX
 
+#include 
 #include 
 #include 
 
@@ -26,6 +27,20 @@ std::shared_ptr make_shared_array(size_t const size)
 return std::shared_ptr(new T[size], std::default_delete());
 }
 
+/** To markup std::shared_ptr that coverity warns might throw exceptions
+which won't throw in practice, or where std::terminate is
+an acceptable response if they do
+*/
+template
+std::shared_ptr make_shared(Args&&... args)
+{
+#if defined(__COVERITY__)
+return std::shared_ptr(new T(std::forward(args)...), 
o3tl::default_delete());
+#else
+return std::make_shared(std::forward(args)...);
+#endif
+}
+
 } // namespace o3tl
 
 #endif // INCLUDED_O3TL_MAKE_SHARED_HXX
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 3083cf0fd18a..75f5b463a58c 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -66,6 +66,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -793,7 +794,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 break;
 case SID_DATA_PROVIDER:
 {
-std::shared_ptr xDoc(new ScDocument, 
o3tl::default_delete());
+auto xDoc = o3tl::make_shared();
 xDoc->InsertTab(0, "test");
 ScDocument* pDoc = GetViewData()->GetDocument();
 ScDataProviderDlg aDialog(pTabViewShell->GetDialogParent(), xDoc, 
pDoc);
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 432bbb670675..19b99ec93aa8 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -71,6 +71,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew )
@@ -397,7 +398,7 @@ std::shared_ptr 
ScTabViewShell::CreateRefDialogCont
 if (!isLOKMobilePhone())
 {
 // dialog checks, what is in the cell
-xResult = std::make_shared(pB, pCW, pParent, 
&GetViewData(),ScGlobal::GetStarCalcFunctionMgr());
+xResult = o3tl::make_shared(pB, pCW, pParent, 
&GetViewData(),ScGlobal::GetStarCalcFunctionMgr());
 }
 break;
 }
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 68ad3415a08a..05e78a46c332 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -99,7 +99,7 @@
 #include 
 #include 
 #inclu

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/filldown.png   |binary
 icon-themes/elementary/cmd/32/fillleft.png   |binary
 icon-themes/elementary/cmd/32/fillright.png  |binary
 icon-themes/elementary/cmd/32/fillup.png |binary
 icon-themes/elementary/cmd/32/showwhitespace.png |binary
 icon-themes/elementary/cmd/lc_filldown.png   |binary
 icon-themes/elementary/cmd/lc_fillleft.png   |binary
 icon-themes/elementary/cmd/lc_fillright.png  |binary
 icon-themes/elementary/cmd/lc_fillup.png |binary
 icon-themes/elementary/cmd/lc_insertrows.png |binary
 icon-themes/elementary/cmd/lc_showwhitespace.png |binary
 icon-themes/elementary/cmd/sc_filldown.png   |binary
 icon-themes/elementary/cmd/sc_fillleft.png   |binary
 icon-themes/elementary/cmd/sc_fillright.png  |binary
 icon-themes/elementary/cmd/sc_fillup.png |binary
 icon-themes/elementary/cmd/sc_showwhitespace.png |binary
 icon-themes/elementary_svg/cmd/32/filldown.svg   |1 +
 icon-themes/elementary_svg/cmd/32/fillleft.svg   |1 +
 icon-themes/elementary_svg/cmd/32/fillright.svg  |1 +
 icon-themes/elementary_svg/cmd/32/fillup.svg |1 +
 icon-themes/elementary_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/elementary_svg/cmd/lc_filldown.svg   |1 +
 icon-themes/elementary_svg/cmd/lc_fillleft.svg   |1 +
 icon-themes/elementary_svg/cmd/lc_fillright.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_fillup.svg |1 +
 icon-themes/elementary_svg/cmd/lc_insertrows.svg |2 +-
 icon-themes/elementary_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/elementary_svg/cmd/sc_filldown.svg   |1 +
 icon-themes/elementary_svg/cmd/sc_fillleft.svg   |1 +
 icon-themes/elementary_svg/cmd/sc_fillright.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_fillup.svg |1 +
 icon-themes/elementary_svg/cmd/sc_showwhitespace.svg |1 +
 32 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 22bacc8205e2a1ee5134dbbddbb75414ab5d12af
Author: Rizal Muttaqin 
AuthorDate: Sat Jun 27 22:06:11 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sat Jun 27 21:45:46 2020 +0200

elementary: tdf#133538 add White Space icons

- Add Calc's Fill icons

Change-Id: I4b099359f2dfd1a90be77b5eb03e4f3a932d99a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97316
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/filldown.png 
b/icon-themes/elementary/cmd/32/filldown.png
new file mode 100644
index ..f9df8b0b736c
Binary files /dev/null and b/icon-themes/elementary/cmd/32/filldown.png differ
diff --git a/icon-themes/elementary/cmd/32/fillleft.png 
b/icon-themes/elementary/cmd/32/fillleft.png
new file mode 100644
index ..745a8cce58d9
Binary files /dev/null and b/icon-themes/elementary/cmd/32/fillleft.png differ
diff --git a/icon-themes/elementary/cmd/32/fillright.png 
b/icon-themes/elementary/cmd/32/fillright.png
new file mode 100644
index ..7abef15287b6
Binary files /dev/null and b/icon-themes/elementary/cmd/32/fillright.png differ
diff --git a/icon-themes/elementary/cmd/32/fillup.png 
b/icon-themes/elementary/cmd/32/fillup.png
new file mode 100644
index ..2c633958db4d
Binary files /dev/null and b/icon-themes/elementary/cmd/32/fillup.png differ
diff --git a/icon-themes/elementary/cmd/32/showwhitespace.png 
b/icon-themes/elementary/cmd/32/showwhitespace.png
new file mode 100644
index ..8de42a7fac6d
Binary files /dev/null and b/icon-themes/elementary/cmd/32/showwhitespace.png 
differ
diff --git a/icon-themes/elementary/cmd/lc_filldown.png 
b/icon-themes/elementary/cmd/lc_filldown.png
new file mode 100644
index ..32098bf1bbcb
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_filldown.png differ
diff --git a/icon-themes/elementary/cmd/lc_fillleft.png 
b/icon-themes/elementary/cmd/lc_fillleft.png
new file mode 100644
index ..9553b0dfdc55
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_fillleft.png differ
diff --git a/icon-themes/elementary/cmd/lc_fillright.png 
b/icon-themes/elementary/cmd/lc_fillright.png
new file mode 100644
index ..330ff2b90b3c
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_fillright.png differ
diff --git a/icon-themes/elementary/cmd/lc_fillup.png 
b/icon-themes/elementary/cmd/lc_fillup.png
new file mode 100644
index ..d795d4cbddbe
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_fillup.png differ
diff --git a/icon-themes/elementary/cmd/lc_insertrows.png 
b/icon-themes/elementary/cmd/lc_insertrows.png
index f54f237601cb..1148c60f90c6 100644
Binary files a/icon-themes/elementary/cmd/lc_insertrows.png and 
b/icon-themes/elementary/cmd/lc_insertrows.png differ
diff --git a/icon-themes/elementary/cmd/lc_showwhitespace.png 
b/icon-themes/elementa

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/excel.cxx |6 +++---
 sd/source/filter/sdpptwrp.cxx|6 +++---
 sw/source/filter/ww8/wrtww8.cxx  |2 +-
 sw/source/filter/ww8/ww8par.cxx  |4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 81c7702865551e2f8a5bbcde2c8e37e4446c387c
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:18:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 21:33:24 2020 +0200

cid#1464973 & cid#1464975 Resource leak

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

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 34dd49a81c8b..1e2c61233a2c 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -59,8 +59,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(), aStreamsData, 
sStreamFullName);
 }
 else
 {
@@ -371,7 +371,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, 
ScDocument *pDocument,
 break;
 }
 
-SotStorageStream* pStream = pStorage->OpenSotStream(sFileName);
+tools::SvRef pStream = 
pStorage->OpenSotStream(sFileName);
 if (!pStream)
 {
 eRet = ERRCODE_IO_GENERAL;
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 68b0b1886fd2..8fac3b162263 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -83,8 +83,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(), aStreamsData, 
sStreamFullName);
 }
 else
 {
@@ -307,7 +307,7 @@ bool SdPPTFilter::Export()
 {
 // To avoid long paths split and open substorages 
recursively
 // Splitting paths manually, since 
comphelper::string::split is trimming special characters like \0x01, \0x09
-SotStorage * pStorage = xEncryptedRootStrg.get();
+tools::SvRef pStorage = 
xEncryptedRootStrg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 do
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 5fedd5bb39b7..9b5980f3e5e1 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3724,7 +3724,7 @@ ErrCode SwWW8Writer::WriteStorage()
 {
 // To avoid long paths split and open substorages recursively
 // Splitting paths manually, since comphelper::string::split is 
trimming special characters like \0x01, \0x09
-SotStorage * pStorage = m_pStg.get();
+tools::SvRef pStorage = m_pStg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 do
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f58506ec5268..054b0a98e9ee 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6343,8 +6343,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(), aStreamsDat

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/excel.cxx |6 +++---
 sd/source/filter/sdpptwrp.cxx|6 +++---
 sw/source/filter/ww8/wrtww8.cxx  |2 +-
 sw/source/filter/ww8/ww8par.cxx  |4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ae1b0875b2d65513ff013054d6e04aa7f715eaa4
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:18:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:25:10 2020 +0200

cid#1464973 & cid#1464975 Resource leak

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

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 34dd49a81c8b..1e2c61233a2c 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -59,8 +59,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(), aStreamsData, 
sStreamFullName);
 }
 else
 {
@@ -371,7 +371,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, 
ScDocument *pDocument,
 break;
 }
 
-SotStorageStream* pStream = pStorage->OpenSotStream(sFileName);
+tools::SvRef pStream = 
pStorage->OpenSotStream(sFileName);
 if (!pStream)
 {
 eRet = ERRCODE_IO_GENERAL;
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 3fbbcea1b772..7b6876af7535 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -83,8 +83,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(), aStreamsData, 
sStreamFullName);
 }
 else
 {
@@ -306,7 +306,7 @@ bool SdPPTFilter::Export()
 {
 // To avoid long paths split and open substorages 
recursively
 // Splitting paths manually, since 
comphelper::string::split is trimming special characters like \0x01, \0x09
-SotStorage * pStorage = xEncryptedRootStrg.get();
+tools::SvRef pStorage = 
xEncryptedRootStrg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 do
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 58d423d3b9a5..bd71f59d7357 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3722,7 +3722,7 @@ ErrCode SwWW8Writer::WriteStorage()
 {
 // To avoid long paths split and open substorages recursively
 // Splitting paths manually, since comphelper::string::split is 
trimming special characters like \0x01, \0x09
-SotStorage * pStorage = m_pStg.get();
+tools::SvRef pStorage = m_pStg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 while (pStorage && idx >= 0)
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 546689fc065a..adbd5f6c9e26 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6343,8 +6343,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSub

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

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit acb71f8382004595778ba3f265c40dd46d72d125
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:14:11 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:24:05 2020 +0200

cid#1464972 Unchecked dynamic_cast

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

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e27bc81cb39f..28eecea4d713 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -56,12 +56,18 @@ void JSDialogNotifyIdle::Invoke()
 
 void JSDialogSender::notifyDialogState() { mpIdleNotify->Start(); }
 
+namespace
+{
+vcl::Window* extract_sal_widget(weld::Widget* pParent)
+{
+SalInstanceWidget* pInstanceWidget = 
dynamic_cast(pParent);
+return pInstanceWidget ? pInstanceWidget->getWidget() : nullptr;
+}
+}
+
 JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& 
rUIRoot,
  const OUString& rUIFile)
-: SalInstanceBuilder(dynamic_cast(pParent)
- ? 
dynamic_cast(pParent)->getWidget()
- : nullptr,
- rUIRoot, rUIFile)
+: SalInstanceBuilder(extract_sal_widget(pParent), rUIRoot, rUIFile)
 , m_nWindowId(0)
 , m_aParentDialog(nullptr)
 , m_bHasTopLevelDialog(false)
___
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' - sc/source

[Julien Nabet (via logerrit)]

 sc/source/filter/excel/excel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbafd0b0e84463a27ac88a380d88348a7449468c
Author: Julien Nabet 
AuthorDate: Sat Jun 27 10:24:06 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:24:26 2020 +0200

cid#1464973: RESOURCE_LEAK (sc/excel)

Change-Id: I923788f57e022c99a89a6406cf3ed02066efd022
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97279
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 8407daed1ddab1cc754f72d9f7d140a649abf1f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97299

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 2c3a885029d0..34dd49a81c8b 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -346,7 +346,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, 
ScDocument *pDocument,
 {
 // To avoid long paths split and open substorages recursively
 // Splitting paths manually, since comphelper::string::split is 
trimming special characters like \0x01, \0x09
-SotStorage * pStorage = xEncryptedRootStrg.get();
+tools::SvRef pStorage = xEncryptedRootStrg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/xmldump.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 877ca303e675ae586caf2787d42756f1e1b22c98
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:10:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:23:32 2020 +0200

cid#1464971 Dereference null return value

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

diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 8ad45ec09eb7..b246006d885a 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -468,7 +468,7 @@ void SwFrame::dumpAsXmlAttributes( xmlTextWriterPtr writer 
) const
 {
 SwSectionFrame const*const pFrame(static_cast(this));
 SwSectionNode const*const 
pNode(pFrame->GetSection()->GetFormat()->GetSectionNode());
-xmlTextWriterWriteFormatAttribute(writer, 
BAD_CAST("sectionNodeIndex"), TMP_FORMAT, pNode->GetIndex());
+xmlTextWriterWriteFormatAttribute(writer, 
BAD_CAST("sectionNodeIndex"), TMP_FORMAT, pNode ? pNode->GetIndex() : -1);
 }
 if ( IsTextFrame(  ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/wrtww8.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 122ce7b0907ae4705dca2f445444d812e9eeb9f1
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 15:58:02 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:23:11 2020 +0200

cid#1464968 Logically dead code

added in...

commit 99c4fefdbb6129a58421b9c7f4a005f868a0e701
Date:   Wed Apr 22 11:43:22 2020 +0300

tdf#98409 doc export: export (non-default) cell margins

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

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index a60852f752b4..58d423d3b9a5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2598,9 +2598,6 @@ void WW8AttributeOutput::TableCellBorders(
 pLastBox = pBox;
 else if( !pBox || *pLastBox != *pBox )
 {
-if ( !pLastBox )
-break;
-
 // This cell has different borders than the previous cell,
 // so output the borders for the preceding cell range.
 m_rWW8Export.Out_CellRangeBorders(pLastBox, nSeqStart, n);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/shapeexport.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 2a87fbc2f645e8d607c235147d7a00293cdabafc
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 15:55:23 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:22:11 2020 +0200

cid#1464966 Logically dead code

since...

commit d6c7fbe28aca170e804c4ebe7c1101bb3345c2c2
Date:   Wed May 20 14:23:51 2020 +0200

[API CHANGE] officecfg,xmloff: remove SaveBackwardCompatibleODF

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

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 597a71d2b2b2..418bb7662513 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2867,7 +2867,6 @@ void XMLShapeExport::ImpExportOLE2Shape(
 bool bInternal = false;
 xPropSet->getPropertyValue("IsInternal") >>= bInternal;
 
-if( !bIsEmptyPresObj )
 {
 
 if ( bInternal )
@@ -2909,14 +2908,6 @@ void XMLShapeExport::ImpExportOLE2Shape(
 }
 }
 }
-else
-{
-// export empty href for empty placeholders to be valid ODF
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, "" );
-mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
-mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
-mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD );
-}
 
 enum XMLTokenEnum eElem = sClassId.isEmpty() ? XML_OBJECT : 
XML_OBJECT_OLE ;
 SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, true, 
true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/inputwin.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bd02918f77636f54b13b796e205ead77ca853ed9
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:08:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:22:45 2020 +0200

cid#1464970 Unchecked dynamic_cast

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

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5bdf3a4480a9..ebca73d2f9f8 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -196,8 +196,10 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const 
SfxBindings* pBind ) :
 InsertItem  (SID_INPUT_FUNCTION, Image(StockImage::Yes, 
RID_BMP_INPUT_FUNCTION), ToolBoxItemBits::NONE, 2);
 }
 
+const bool bIsLOKMobilePhone = mpViewShell && 
mpViewShell->isLOKMobilePhone();
+
 // sigma and equal buttons
-if (!mpViewShell->isLOKMobilePhone())
+if (!bIsLOKMobilePhone)
 {
 InsertItem  (SID_INPUT_SUM,  Image(StockImage::Yes, 
RID_BMP_INPUT_SUM), ToolBoxItemBits::DROPDOWNONLY, 3);
 InsertItem  (SID_INPUT_EQUAL,Image(StockImage::Yes, 
RID_BMP_INPUT_EQUAL), ToolBoxItemBits::NONE, 4);
@@ -224,7 +226,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const 
SfxBindings* pBind ) :
 }
 
 // sigma and equal buttons
-if (!mpViewShell->isLOKMobilePhone())
+if (!bIsLOKMobilePhone)
 {
 SetItemText (SID_INPUT_SUM, ScResId( SCSTR_QHELP_BTNSUM ) );
 SetHelpId   (SID_INPUT_SUM, HID_INSWIN_SUMME);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/treelist/iconviewimpl.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a211032bf9893daeee6ce7acb89f1190258a2067
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:04:01 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 18:03:44 2020 +0200

cid#1464969 Unchecked return value

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

diff --git a/vcl/source/treelist/iconviewimpl.cxx 
b/vcl/source/treelist/iconviewimpl.cxx
index c2640dfc0ccd..b0818e94eea1 100644
--- a/vcl/source/treelist/iconviewimpl.cxx
+++ b/vcl/source/treelist/iconviewimpl.cxx
@@ -605,9 +605,7 @@ bool IconViewImpl::KeyInput( const KeyEvent& rKEvt )
 
 case KEY_RETURN:
 {
-m_pView->aDoubleClickHdl.Call( m_pView );
-bHandled = true;
-
+bHandled = !m_pView->aDoubleClickHdl.Call(m_pView);
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/shapeexport.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 91c97cbcd553a524224d3f89d6ea17d9864c85dc
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 15:53:59 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 17:54:44 2020 +0200

cid#1464965 Logically dead code

since...

commit d6c7fbe28aca170e804c4ebe7c1101bb3345c2c2
Date:   Wed May 20 14:23:51 2020 +0200

[API CHANGE] officecfg,xmloff: remove SaveBackwardCompatibleODF

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

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 533032482b45..597a71d2b2b2 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2356,7 +2356,6 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
 uno::Reference xGraphic;
 OUString sOutMimeType;
 
-if (!bIsEmptyPresObj)
 {
 OUString aStreamURL;
 xPropSet->getPropertyValue("GraphicStreamURL") >>= aStreamURL;
@@ -2396,13 +2395,6 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
 mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD);
 }
 }
-else
-{
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, OUString());
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE);
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED);
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD);
-}
 
 {
 if (GetExport().getSaneDefaultVersion() > 
SvtSaveOptions::ODFSVER_012)
___
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' - sw/source

[Julien Nabet (via logerrit)]

 sw/source/filter/ww8/wrtww8.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39fd223cd65c8b6405fa3b33a9f6be680c745713
Author: Julien Nabet 
AuthorDate: Sat Jun 27 10:34:24 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 17:32:01 2020 +0200

cid#1464967: RESOURCE_LEAK (sw/wrtww8)

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

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c3fe9c0a36f9..5fedd5bb39b7 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3751,7 +3751,7 @@ ErrCode SwWW8Writer::WriteStorage()
 break;
 }
 
-SotStorageStream* pStream = pStorage->OpenSotStream(sFileName);
+tools::SvRef pStream = 
pStorage->OpenSotStream(sFileName);
 if (!pStream)
 {
 nErrorCode = ERRCODE_IO_GENERAL;
___
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' - sw/source

[Julien Nabet (via logerrit)]

 sw/source/core/unocore/unosett.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2838868784825ad99141454829c711c5c36e75fd
Author: Julien Nabet 
AuthorDate: Sat Jun 27 09:27:50 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 17:17:05 2020 +0200

cid#1464974: Null pointer dereferences (sw/unosett)

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

diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 817938749bf7..81f1a6a2e33a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1771,8 +1771,8 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
 {
 OUString sBulletFontName;
 rProp.Value >>= sBulletFontName;
-SwDocShell* pLclDocShell = pDoc->GetDocShell();
-if( !sBulletFontName.isEmpty() && pLclDocShell )
+SwDocShell* pLclDocShell = nullptr;
+if( !sBulletFontName.isEmpty() && pDoc && (pLclDocShell = 
pDoc->GetDocShell()) )
 {
 const SvxFontListItem* pFontListItem =
 static_cast(pLclDocShell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 sc/source/filter/excel/excel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d9438b8d007c8bb7f2cf100e37f2adf739a20501
Author: Julien Nabet 
AuthorDate: Sat Jun 27 10:24:06 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 17:16:12 2020 +0200

cid#1464973: RESOURCE_LEAK (sc/excel)

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

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 2c3a885029d0..34dd49a81c8b 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -346,7 +346,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, 
ScDocument *pDocument,
 {
 // To avoid long paths split and open substorages recursively
 // Splitting paths manually, since comphelper::string::split is 
trimming special characters like \0x01, \0x09
-SotStorage * pStorage = xEncryptedRootStrg.get();
+tools::SvRef pStorage = xEncryptedRootStrg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 do
___
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' - sd/source

[Julien Nabet (via logerrit)]

 sd/source/filter/sdpptwrp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8c80f5f1f0d1bee6fef8ebf978ed12b06f26e5e
Author: Julien Nabet 
AuthorDate: Sat Jun 27 09:23:09 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 17:07:28 2020 +0200

cid#1464975: RESOURCE_LEAK (sd/sdpptwrp)

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

diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 2374c69f280d..68b0b1886fd2 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -332,7 +332,7 @@ bool SdPPTFilter::Export()
 break;
 }
 
-SotStorageStream* pStream = 
pStorage->OpenSotStream(sFileName);
+tools::SvRef pStream = 
pStorage->OpenSotStream(sFileName);
 if (!pStream)
 {
 bRet = false;
___
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/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/breeze/cmd/32/ar/decrementlevel.png  |binary
 icon-themes/breeze/cmd/32/ar/decrementsublevels.png  |binary
 icon-themes/breeze/cmd/32/ar/incrementlevel.png  |binary
 icon-themes/breeze/cmd/32/ar/incrementsublevels.png  |binary
 icon-themes/breeze/cmd/32/ar/movedown.png|binary
 icon-themes/breeze/cmd/32/ar/movedownsubitems.png|binary
 icon-themes/breeze/cmd/32/ar/moveup.png  |binary
 icon-themes/breeze/cmd/32/ar/moveupsubitems.png  |binary
 icon-themes/breeze/cmd/32/decrementlevel.png |binary
 icon-themes/breeze/cmd/32/decrementsublevels.png |binary
 icon-themes/breeze/cmd/32/filldown.png   |binary
 icon-themes/breeze/cmd/32/fillleft.png   |binary
 icon-themes/breeze/cmd/32/fillright.png  |binary
 icon-themes/breeze/cmd/32/fillup.png |binary
 icon-themes/breeze/cmd/32/hidewhitespace.png |binary
 icon-themes/breeze/cmd/32/incrementlevel.png |binary
 icon-themes/breeze/cmd/32/incrementsublevels.png |binary
 icon-themes/breeze/cmd/32/movedown.png   |binary
 icon-themes/breeze/cmd/32/movedownsubitems.png   |binary
 icon-themes/breeze/cmd/32/moveup.png |binary
 icon-themes/breeze/cmd/32/moveupsubitems.png |binary
 icon-themes/breeze/cmd/32/showwhitespace.png |binary
 icon-themes/breeze/cmd/ar/lc_decrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/lc_decrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/lc_incrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/lc_incrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/lc_movedown.png|binary
 icon-themes/breeze/cmd/ar/lc_movedownsubitems.png|binary
 icon-themes/breeze/cmd/ar/lc_moveup.png  |binary
 icon-themes/breeze/cmd/ar/lc_moveupsubitems.png  |binary
 icon-themes/breeze/cmd/ar/sc_decrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/sc_decrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/sc_incrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/sc_incrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/sc_movedown.png|binary
 icon-themes/breeze/cmd/ar/sc_movedownsubitems.png|binary
 icon-themes/breeze/cmd/ar/sc_moveup.png  |binary
 icon-themes/breeze/cmd/ar/sc_moveupsubitems.png  |binary
 icon-themes/breeze/cmd/lc_decrementlevel.png |binary
 icon-themes/breeze/cmd/lc_decrementsublevels.png |binary
 icon-themes/breeze/cmd/lc_filldown.png   |binary
 icon-themes/breeze/cmd/lc_fillleft.png   |binary
 icon-themes/breeze/cmd/lc_fillright.png  |binary
 icon-themes/breeze/cmd/lc_fillup.png |binary
 icon-themes/breeze/cmd/lc_hidewhitespace.png |binary
 icon-themes/breeze/cmd/lc_incrementlevel.png |binary
 icon-themes/breeze/cmd/lc_incrementsublevels.png |binary
 icon-themes/breeze/cmd/lc_movedown.png   |binary
 icon-themes/breeze/cmd/lc_movedownsubitems.png   |binary
 icon-themes/breeze/cmd/lc_moveup.png |binary
 icon-themes/breeze/cmd/lc_moveupsubitems.png |binary
 icon-themes/breeze/cmd/lc_showwhitespace.png |binary
 icon-themes/breeze/cmd/sc_decrementlevel.png |binary
 icon-themes/breeze/cmd/sc_decrementsublevels.png |binary
 icon-themes/breeze/cmd/sc_filldown.png   |binary
 icon-themes/breeze/cmd/sc_fillleft.png   |binary
 icon-themes/breeze/cmd/sc_fillright.png  |binary
 icon-themes/breeze/cmd/sc_fillup.png |binary
 icon-themes/breeze/cmd/sc_hidewhitespace.png |binary
 icon-themes/breeze/cmd/sc_incrementlevel.png |binary
 icon-themes/breeze/cmd/sc_incrementsublevels.png |binary
 icon-themes/breeze/cmd/sc_movedown.png   |binary
 icon-themes/breeze/cmd/sc_movedownsubitems.png   |binary
 icon-themes/breeze/cmd/sc_moveup.png |binary
 icon-themes/breeze/cmd/sc_moveupsubitems.png |binary
 icon-themes/breeze/cmd/sc_showwhitespace.png |binary
 icon-themes/breeze/links.txt |  100 ---
 icon-themes/breeze_dark/cmd/32/ar/decrementlevel.png |binary
 icon-themes/breeze_dark/cmd/32/ar/decrementsublevels.png |binary
 icon-themes/breeze_dark/cmd/32/ar/incrementlevel.png |binary
 icon-themes/breeze_dark/cmd/32/ar/incrementsublevels.png |binary
 icon-themes/breez

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

[Julien Nabet (via logerrit)]

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

New commits:
commit d072f33fd6492ce10f696ae9e10793d814771c81
Author: Julien Nabet 
AuthorDate: Sat Jun 27 10:43:26 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 16:34:43 2020 +0200

cid#1464963: Null pointer dereferences (sw/wrtww8)

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

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index a34f4cfe1ebc..a60852f752b4 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3728,7 +3728,7 @@ ErrCode SwWW8Writer::WriteStorage()
 SotStorage * pStorage = m_pStg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
-do
+while (pStorage && idx >= 0)
 {
 OUString sPathElem = aStreamData.Name.getToken(0, L'/', idx);
 if (!sPathElem.isEmpty())
@@ -3744,7 +3744,7 @@ ErrCode SwWW8Writer::WriteStorage()
 break;
 }
 }
-} while (pStorage && idx >= 0);
+};
 
 if (!pStorage)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 sw/source/filter/ww8/wrtww8.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a81bc97c2b3a197d0521d5af3d9f255912533788
Author: Julien Nabet 
AuthorDate: Sat Jun 27 10:34:24 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 16:33:23 2020 +0200

cid#1464967: RESOURCE_LEAK (sw/wrtww8)

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

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 0dcc81d6cf2e..a34f4cfe1ebc 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3752,7 +3752,7 @@ ErrCode SwWW8Writer::WriteStorage()
 break;
 }
 
-SotStorageStream* pStream = pStorage->OpenSotStream(sFileName);
+tools::SvRef pStream = 
pStorage->OpenSotStream(sFileName);
 if (!pStream)
 {
 nErrorCode = ERRCODE_IO_GENERAL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 sw/source/core/unocore/unosett.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 04ca5efc800c6b7a6e98e4278eb8be6ac6737fe9
Author: Julien Nabet 
AuthorDate: Sat Jun 27 09:27:50 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 16:27:13 2020 +0200

cid#1464974: Null pointer dereferences (sw/unosett)

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

diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 817938749bf7..81f1a6a2e33a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1771,8 +1771,8 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
 {
 OUString sBulletFontName;
 rProp.Value >>= sBulletFontName;
-SwDocShell* pLclDocShell = pDoc->GetDocShell();
-if( !sBulletFontName.isEmpty() && pLclDocShell )
+SwDocShell* pLclDocShell = nullptr;
+if( !sBulletFontName.isEmpty() && pDoc && (pLclDocShell = 
pDoc->GetDocShell()) )
 {
 const SvxFontListItem* pFontListItem =
 static_cast(pLclDocShell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 sd/source/filter/sdpptwrp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e8e53bb6ad01afe3315697915f2228ed5e07146
Author: Julien Nabet 
AuthorDate: Sat Jun 27 09:23:09 2020 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 16:24:36 2020 +0200

cid#1464975: RESOURCE_LEAK (sd/sdpptwrp)

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

diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index f40ccb7bcecb..3fbbcea1b772 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -331,7 +331,7 @@ bool SdPPTFilter::Export()
 break;
 }
 
-SotStorageStream* pStream = 
pStorage->OpenSotStream(sFileName);
+tools::SvRef pStream = 
pStorage->OpenSotStream(sFileName);
 if (!pStream)
 {
 bRet = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 76df547f1790b3bd7cca013b7002575c8c766384
Author: Caolán McNamara 
AuthorDate: Fri Jun 26 20:55:53 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 16:18:28 2020 +0200

map has-frame to WB_BORDER

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d88c98528394..f718f1659b4b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -897,6 +897,18 @@ void VclBuilder::disposeBuilder()
 
 namespace
 {
+bool extractHasFrame(VclBuilder::stringmap& rMap)
+{
+bool bHasFrame = true;
+VclBuilder::stringmap::iterator aFind = rMap.find("has-frame");
+if (aFind != rMap.end())
+{
+bHasFrame = toBool(aFind->second);
+rMap.erase(aFind);
+}
+return bHasFrame;
+}
+
 bool extractDrawValue(VclBuilder::stringmap& rMap)
 {
 bool bDrawValue = true;
@@ -2142,7 +2154,10 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 }
 else if (name == "GtkEntry")
 {
-xWindow = VclPtr::Create(pParent, 
WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
+WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK;
+if (extractHasFrame(rMap))
+nWinStyle |= WB_BORDER;
+xWindow = VclPtr::Create(pParent, nWinStyle);
 BuilderUtils::ensureDefaultWidthChars(rMap);
 }
 else if (name == "GtkNotebook")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit ca9b3ace07d2093d7c0bfcc8bffd74e5b1381478
Author: Caolán McNamara 
AuthorDate: Fri Jun 26 20:56:15 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 16:17:03 2020 +0200

those properties should use - not _

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 663eb7a40bcb..d88c98528394 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -900,7 +900,7 @@ namespace
 bool extractDrawValue(VclBuilder::stringmap& rMap)
 {
 bool bDrawValue = true;
-VclBuilder::stringmap::iterator aFind = rMap.find("draw_value");
+VclBuilder::stringmap::iterator aFind = rMap.find("draw-value");
 if (aFind != rMap.end())
 {
 bDrawValue = toBool(aFind->second);
@@ -924,7 +924,7 @@ namespace
 OUString extractValuePos(VclBuilder::stringmap& rMap)
 {
 OUString sRet("top");
-VclBuilder::stringmap::iterator aFind = rMap.find("value_pos");
+VclBuilder::stringmap::iterator aFind = rMap.find("value-pos");
 if (aFind != rMap.end())
 {
 sRet = aFind->second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/attribute/fontattribute.hxx |   16 +++-
 1 file changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 1bb9280d0e4207f5e33d6492905e96557f7649f4
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 16:50:33 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat Jun 27 16:00:22 2020 +0200

drawinglayer: pragma once for fontattribute.hxx

Change-Id: I1d257a34b15a65d9b988a791e154ee64e781e0ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97284
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/drawinglayer/attribute/fontattribute.hxx 
b/include/drawinglayer/attribute/fontattribute.hxx
index a12ffb405001..5972000443a5 100644
--- a/include/drawinglayer/attribute/fontattribute.hxx
+++ b/include/drawinglayer/attribute/fontattribute.hxx
@@ -17,15 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX
+#pragma once
 
 #include 
 #include 
 
 
-// predefines
-
 namespace rtl {
class OUString;
 }
@@ -34,11 +31,8 @@ namespace drawinglayer::attribute {
 class ImpFontAttribute;
 }
 
-
-namespace drawinglayer
+namespace drawinglayer::attribute
 {
-namespace attribute
-{
 /** FontAttribute class
 
 This attribute class is able to hold all parameters needed/used
@@ -88,10 +82,6 @@ namespace drawinglayer
 bool getBiDiStrong() const;
 bool getMonospaced() const;
 };
-} // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX
+} // end of namespace drawinglayer::attribute
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rizal Muttaqin (via logerrit)]

 icon-themes/breeze/cmd/32/ar/decrementlevel.png  |binary
 icon-themes/breeze/cmd/32/ar/decrementsublevels.png  |binary
 icon-themes/breeze/cmd/32/ar/incrementlevel.png  |binary
 icon-themes/breeze/cmd/32/ar/incrementsublevels.png  |binary
 icon-themes/breeze/cmd/32/ar/movedown.png|binary
 icon-themes/breeze/cmd/32/ar/movedownsubitems.png|binary
 icon-themes/breeze/cmd/32/ar/moveup.png  |binary
 icon-themes/breeze/cmd/32/ar/moveupsubitems.png  |binary
 icon-themes/breeze/cmd/32/decrementlevel.png |binary
 icon-themes/breeze/cmd/32/decrementsublevels.png |binary
 icon-themes/breeze/cmd/32/filldown.png   |binary
 icon-themes/breeze/cmd/32/fillleft.png   |binary
 icon-themes/breeze/cmd/32/fillright.png  |binary
 icon-themes/breeze/cmd/32/fillup.png |binary
 icon-themes/breeze/cmd/32/hidewhitespace.png |binary
 icon-themes/breeze/cmd/32/incrementlevel.png |binary
 icon-themes/breeze/cmd/32/incrementsublevels.png |binary
 icon-themes/breeze/cmd/32/movedown.png   |binary
 icon-themes/breeze/cmd/32/movedownsubitems.png   |binary
 icon-themes/breeze/cmd/32/moveup.png |binary
 icon-themes/breeze/cmd/32/moveupsubitems.png |binary
 icon-themes/breeze/cmd/32/showwhitespace.png |binary
 icon-themes/breeze/cmd/ar/lc_decrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/lc_decrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/lc_incrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/lc_incrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/lc_movedown.png|binary
 icon-themes/breeze/cmd/ar/lc_movedownsubitems.png|binary
 icon-themes/breeze/cmd/ar/lc_moveup.png  |binary
 icon-themes/breeze/cmd/ar/lc_moveupsubitems.png  |binary
 icon-themes/breeze/cmd/ar/sc_decrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/sc_decrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/sc_incrementlevel.png  |binary
 icon-themes/breeze/cmd/ar/sc_incrementsublevels.png  |binary
 icon-themes/breeze/cmd/ar/sc_movedown.png|binary
 icon-themes/breeze/cmd/ar/sc_movedownsubitems.png|binary
 icon-themes/breeze/cmd/ar/sc_moveup.png  |binary
 icon-themes/breeze/cmd/ar/sc_moveupsubitems.png  |binary
 icon-themes/breeze/cmd/lc_decrementlevel.png |binary
 icon-themes/breeze/cmd/lc_decrementsublevels.png |binary
 icon-themes/breeze/cmd/lc_filldown.png   |binary
 icon-themes/breeze/cmd/lc_fillleft.png   |binary
 icon-themes/breeze/cmd/lc_fillright.png  |binary
 icon-themes/breeze/cmd/lc_fillup.png |binary
 icon-themes/breeze/cmd/lc_hidewhitespace.png |binary
 icon-themes/breeze/cmd/lc_incrementlevel.png |binary
 icon-themes/breeze/cmd/lc_incrementsublevels.png |binary
 icon-themes/breeze/cmd/lc_movedown.png   |binary
 icon-themes/breeze/cmd/lc_movedownsubitems.png   |binary
 icon-themes/breeze/cmd/lc_moveup.png |binary
 icon-themes/breeze/cmd/lc_moveupsubitems.png |binary
 icon-themes/breeze/cmd/lc_showwhitespace.png |binary
 icon-themes/breeze/cmd/sc_decrementlevel.png |binary
 icon-themes/breeze/cmd/sc_decrementsublevels.png |binary
 icon-themes/breeze/cmd/sc_filldown.png   |binary
 icon-themes/breeze/cmd/sc_fillleft.png   |binary
 icon-themes/breeze/cmd/sc_fillright.png  |binary
 icon-themes/breeze/cmd/sc_fillup.png |binary
 icon-themes/breeze/cmd/sc_hidewhitespace.png |binary
 icon-themes/breeze/cmd/sc_incrementlevel.png |binary
 icon-themes/breeze/cmd/sc_incrementsublevels.png |binary
 icon-themes/breeze/cmd/sc_movedown.png   |binary
 icon-themes/breeze/cmd/sc_movedownsubitems.png   |binary
 icon-themes/breeze/cmd/sc_moveup.png |binary
 icon-themes/breeze/cmd/sc_moveupsubitems.png |binary
 icon-themes/breeze/cmd/sc_showwhitespace.png |binary
 icon-themes/breeze/links.txt |  100 ---
 icon-themes/breeze_dark/cmd/32/ar/decrementlevel.png |binary
 icon-themes/breeze_dark/cmd/32/ar/decrementsublevels.png |binary
 icon-themes/breeze_dark/cmd/32/ar/incrementlevel.png |binary
 icon-themes/breeze_dark/cmd/32/ar/incrementsublevels.png |binary
 icon-themes/breez

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 93 commits - basctl/source basic/source binaryurp/source chart2/source compilerplugins/clang configure.ac connectivity/source cppu/s

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit 7b48f76273149cb545424c046c0a93e8cb18d110
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 15 19:39:35 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat Jun 27 14:59:25 2020 +0200

vcl: add a Bitmap interface to basegfx, BitmapEx implementing it

Change-Id: I758f421d545191883e615f5016e9fc643459556e

diff --git a/include/basegfx/bitmap/Bitmap.hxx 
b/include/basegfx/bitmap/Bitmap.hxx
new file mode 100644
index ..b91b702aa212
--- /dev/null
+++ b/include/basegfx/bitmap/Bitmap.hxx
@@ -0,0 +1,23 @@
+/* -*- 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/.
+ *
+ */
+
+#pragma once
+
+#include 
+
+namespace basegfx
+{
+class BASEGFX_DLLPUBLIC IBitmap
+{
+};
+
+} // end of namespace basegfx
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 4dac473bb2f5..774afe981d07 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 namespace com::sun::star::rendering {
@@ -40,7 +42,7 @@ enum class TransparentType
 Bitmap
 };
 
-class SAL_WARN_UNUSED VCL_DLLPUBLIC BitmapEx
+class SAL_WARN_UNUSED VCL_DLLPUBLIC BitmapEx : basegfx::IBitmap
 {
 public:
 
commit 9f2ba8d046d61f8c0165891ed96aa2b31cab0525
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 17:00:47 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat Jun 27 14:59:24 2020 +0200

drawinglayer: remove textprimitive2d.hxx from clang-format blacklist

Change-Id: I6fa692bb3e4a16400ee2ae847a1f97201493f53a

diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx 
b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index 9aeaa96fc15e..6bbc14aa498a 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -33,152 +33,151 @@
 
 namespace drawinglayer::primitive2d
 {
-/** TextSimplePortionPrimitive2D class
+/** TextSimplePortionPrimitive2D class
 
-This is the basic primitive for representing a text portion. It 
contains
-all needed information. If it is not handled by a renderer, its 
decomposition
-will provide the text tools::PolyPolygon outlines as filled 
polygons, correctly
-transformed.
+This is the basic primitive for representing a text portion. It contains
+all needed information. If it is not handled by a renderer, its 
decomposition
+will provide the text tools::PolyPolygon outlines as filled polygons, 
correctly
+transformed.
 
-To get better text quality, it is suggested to handle this 
primitive directly
-in a renderer. In that case, e.g. hintings on the system can be 
supported.
+To get better text quality, it is suggested to handle this primitive 
directly
+in a renderer. In that case, e.g. hintings on the system can be supported.
 
-@param maTextTransform
-The text transformation contains the text start position (always 
baselined)
-as translation, the FontSize as scale (where width relative to 
height defines
-font scaling and width == height means no font scaling) and the 
font rotation
-and shear.
-When shear is used and a renderer does not support it, it may be 
better to use
-the decomposition which will do everything correctly. Same is true 
for mirroring
-which would be expressed as negative scalings.
+@param maTextTransform
+The text transformation contains the text start position (always baselined)
+as translation, the FontSize as scale (where width relative to height 
defines
+font scaling and width == height means no font scaling) and the font 
rotation
+and shear.
+When shear is used and a renderer does not support it, it may be better to 
use
+the decomposition which will do everything correctly. Same is true for 
mirroring
+which would be expressed as negative scalings.
 
-@param rText
-The text to be used. Only a part may be used, but a bigger part of 
the string
-may be necessary for correct layouting (e.g. international)
-
-@param aTextPosition
-The index to the first character to use from rText
-
-@param aTextLength
-The number of characters to use from rText
-
-@param rDXArray
-The distances between the characters. This parameter may be empty, 
in that case
-the renderer is responsible to do something useful. If it is 
given, it has to be of
-the size aTextLength. Its values are

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

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/cmd/32/hidewhitespace.png |binary
 icon-themes/colibre/cmd/32/showwhitespace.png |binary
 icon-themes/colibre/cmd/lc_hidewhitespace.png |binary
 icon-themes/colibre/cmd/lc_showwhitespace.png |binary
 icon-themes/colibre/cmd/sc_hidewhitespace.png |binary
 icon-themes/colibre/cmd/sc_showwhitespace.png |binary
 icon-themes/colibre_svg/cmd/32/hidewhitespace.svg |2 +-
 icon-themes/colibre_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg |3 ++-
 icon-themes/colibre_svg/cmd/sc_showwhitespace.svg |2 ++
 sw/uiconfig/sglobal/menubar/menubar.xml   |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml   |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml   |2 +-
 15 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 3676a63b3d9da59a8cf337d536ce5beaedbc2e65
Author: Rizal Muttaqin 
AuthorDate: Sat Jun 27 13:26:45 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sat Jun 27 13:00:15 2020 +0200

Colibre: tdf#133538: icons for Show White Space

Change-Id: I757696ece0b06cdd91358ea8944ba5cc49a644d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97274
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 4bfd67d4f6c6955dc7fc354af814b17af24442fb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97149

diff --git a/icon-themes/colibre/cmd/32/hidewhitespace.png 
b/icon-themes/colibre/cmd/32/hidewhitespace.png
index 8497c053cb4b..a0469c6d1820 100644
Binary files a/icon-themes/colibre/cmd/32/hidewhitespace.png and 
b/icon-themes/colibre/cmd/32/hidewhitespace.png differ
diff --git a/icon-themes/colibre/cmd/32/showwhitespace.png 
b/icon-themes/colibre/cmd/32/showwhitespace.png
new file mode 100644
index ..6846278fb509
Binary files /dev/null and b/icon-themes/colibre/cmd/32/showwhitespace.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_hidewhitespace.png 
b/icon-themes/colibre/cmd/lc_hidewhitespace.png
index 04c948aec0c2..1ba7243dac2c 100644
Binary files a/icon-themes/colibre/cmd/lc_hidewhitespace.png and 
b/icon-themes/colibre/cmd/lc_hidewhitespace.png differ
diff --git a/icon-themes/colibre/cmd/lc_showwhitespace.png 
b/icon-themes/colibre/cmd/lc_showwhitespace.png
new file mode 100644
index ..abeb730f0a10
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_showwhitespace.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_hidewhitespace.png 
b/icon-themes/colibre/cmd/sc_hidewhitespace.png
index f930c7621f84..1a1df83dc440 100644
Binary files a/icon-themes/colibre/cmd/sc_hidewhitespace.png and 
b/icon-themes/colibre/cmd/sc_hidewhitespace.png differ
diff --git a/icon-themes/colibre/cmd/sc_showwhitespace.png 
b/icon-themes/colibre/cmd/sc_showwhitespace.png
new file mode 100644
index ..7d108c1b72a1
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_showwhitespace.png 
differ
diff --git a/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg 
b/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg
index 7923e2adda73..77f8af0ea77c 100644
--- a/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg
+++ b/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/showwhitespace.svg 
b/icon-themes/colibre_svg/cmd/32/showwhitespace.svg
new file mode 100644
index ..db459c66b3aa
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/32/showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg 
b/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg
index f6fbd41a724b..b711a9212b9a 100644
--- a/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg
+++ b/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_showwhitespace.svg 
b/icon-themes/colibre_svg/cmd/lc_showwhitespace.svg
new file mode 100644
index ..a29021ff956e
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/lc_showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg 
b/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg
index 1a9e4deb22db..8ccd482a334c 100644
--- a/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg
+++ b/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg
@@ -1 +1,2 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+/>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_showwhitespace.svg 
b/icon-themes/colibre_svg/

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg officecfg/registry sdext/source sd/inc sd/source

[Srijan Bhatia (via logerrit)]

 icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png
 |binary
 icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png   
 |binary
 
icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg 
|1 
 icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg   
 |1 
 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu  
 |   59 ++
 sd/inc/bitmaps.hlst
 |2 
 sd/source/ui/presenter/PresenterHelper.cxx 
 |4 
 sdext/source/presenter/PresenterController.cxx 
 |   14 ++
 sdext/source/presenter/PresenterController.hxx 
 |1 
 sdext/source/presenter/PresenterProtocolHandler.cxx
 |   26 
 10 files changed, 108 insertions(+)

New commits:
commit e13ba48c7ff428ee0da29ee3bbb29ee3a1063540
Author: Srijan Bhatia 
AuthorDate: Wed Jun 24 20:35:00 2020 +0530
Commit: Heiko Tietze 
CommitDate: Sat Jun 27 12:01:23 2020 +0200

tdf#90978 add exit button to impress presenter console

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

diff --git 
a/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png
new file mode 100644
index ..8abf67288d8a
Binary files /dev/null and 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png 
differ
diff --git 
a/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png
new file mode 100644
index ..bccf5e20b4ea
Binary files /dev/null and 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png 
differ
diff --git 
a/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg
 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg
new file mode 100644
index ..97f1804fc32f
--- /dev/null
+++ 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git 
a/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg
new file mode 100644
index ..33321a959164
--- /dev/null
+++ 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index d5d3bc2e10eb..c60645af20d3 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -618,6 +618,65 @@
   
 
   
+  
+
+  VerticalSeparator
+
+
+  
+
+  76797C
+
+  
+
+  
+  
+
+  ExitPresenter
+
+
+  Button
+
+
+  
+Exit
+  
+  
+
+  bitmaps/ButtonExitPresenterNormal.png
+
+  
+  
+
vnd.org.libreoffice.presenterscreen:ExitPresenter
+  
+  
+
+  12
+
+
+  Bold
+
+
+  B3B7BC
+
+
+  Center
+
+  
+
+
+  
+
+  bitmaps/ButtonExitPresenterMouseOver.png
+
+  
+  
+
+  FF
+
+  
+
+  
 
   
   
diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 69248b4759ba..748ea562efa1 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -103,6 +103,7 @@
 #define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP  
"sd/res/presenterscreen-BorderToolbarTop.png"
 #define BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT  
"sd/res/presenterscreen-BorderActiveLeft.png"
 #define BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL  
"sd/res/presenterscreen-ButtonHelpNormal.png"
+#define BMP_PR

Re: Implementation of mathbb and script

[Dante Doménech]

There were two ways of implementing mathbb and script (mathcal).
First way: using additional font, faking the double stroke and sacript
characters (easy way). LO gains a default font for double stroke and script.
Second way: analyze the code in the brackets and apply to TVARIABLE and
TTEXT nodes a transformation table of symbols (find and replace all of them
until the next font change, probably the best point to implement are the
nodes). This option requires more processing, and also may be difficult
since LO utf chasers are int16 and some chars as U+1D54F 𝕏 may be a little
problematic. As well there are missing symbols on open symbol such as
U+1D54F which would need to be implemented.
Pros of first way: easy and fast, no additional computing required.
Everything goes on double stroke.
Pros second way: allows to choose, possibility of latex imitations and does
not close the door to that simple latex editor there's proposed on the wiki.
Those changes will also be an opportunity to update mathml, since there are
TODOs in this matter and debug it a bit (already working on it).

For the answers I get it's the second way we are taking and will mark
gerrit 97084  as abandoned
in the near future. But this will take time, so I ask for patience. The
other point is I have no idea of making fonts, I will code everything as if
the font was updated, but I'm gonna need help with the open symbol stuff.
And also, if you know how to deal with the overflow with unicode chars with
chars like U+1D54F, please let me know.

El sáb., 27 jun. 2020 a las 0:26, Thorsten Behrens ()
escribió:

> Hi *,
>
> Rene Engelhard wrote:
> > Please do not make math rely on them. They are not available in Linux
> > distributions and I will definitely not ship them in my LO packages.
> >
> In principle, those fonts would be SIL OFL, so not a blocker for
> Debian.
>
> Extra size matters of course, so just to close this discussion here
> for the moment: Regina & Dante are working on extending OpenSymbol
> instead.
>
> Cheers,
>
> -- Thorsten
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Luboš Luňák (via logerrit)]

 vcl/inc/skia/salbmp.hxx |1 
 vcl/skia/salbmp.cxx |   54 +++-
 2 files changed, 13 insertions(+), 42 deletions(-)

New commits:
commit e318e4cea37f6adb20cffc913655c0e6dbabe45a
Author: Luboš Luňák 
AuthorDate: Sat Jun 27 09:39:56 2020 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jun 27 10:43:54 2020 +0200

do not use VCL scaling algorithm from Skia

The only threaded one is "Super" (i.e. the default one), and Skia
at a comparable quality seems to perform better. And the code is
simpler too.

Change-Id: I366197fe1a033c1f7a5f5c7f9fdcc00bff74dc11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97278
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index 2bd729683bde..d5491e367700 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -126,7 +126,6 @@ private:
 // data in mBuffer, if it differs from mSize, then there is a scaling 
operation pending.
 Size mPixelsSize;
 SkFilterQuality mScaleQuality = kHigh_SkFilterQuality; // quality for 
on-demand scaling
-bool mDisableScale = false; // used to block our scale()
 #ifdef DBG_UTIL
 int mWriteAccessCount = 0; // number of write AcquireAccess() that have 
not been released
 #endif
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 428592f44808..2ac221fdba19 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -279,7 +279,7 @@ bool SkiaSalBitmap::GetSystemData(BitmapSystemData&)
 return false;
 }
 
-bool SkiaSalBitmap::ScalingSupported() const { return !mDisableScale; }
+bool SkiaSalBitmap::ScalingSupported() const { return true; }
 
 bool SkiaSalBitmap::Scale(const double& rScaleX, const double& rScaleY, 
BmpScaleFlag nScaleFlag)
 {
@@ -618,46 +618,18 @@ void SkiaSalBitmap::EnsureBitmapData()
 {
 if (mBuffer)
 {
-if (mSize != mPixelsSize) // pending scaling?
-{
-// This will be pixel->pixel scaling, use VCL algorithm, it should 
be faster than Skia
-// (no need to possibly convert bpp, it's multithreaded,...).
-std::shared_ptr src = 
std::make_shared();
-if (!src->Create(*this))
-abort();
-// force 'src' to use VCL's scaling
-src->mDisableScale = true;
-src->mSize = src->mPixelsSize;
-Bitmap bitmap(src);
-BmpScaleFlag scaleFlag;
-switch (mScaleQuality)
-{
-case kNone_SkFilterQuality:
-scaleFlag = BmpScaleFlag::Fast;
-break;
-case kMedium_SkFilterQuality:
-scaleFlag = BmpScaleFlag::Default;
-break;
-case kHigh_SkFilterQuality:
-scaleFlag = BmpScaleFlag::BestQuality;
-break;
-default:
-abort();
-}
-bitmap.Scale(mSize, scaleFlag);
-assert(dynamic_cast(bitmap.ImplGetSalBitmap().get()));
-const SkiaSalBitmap* dest
-= static_cast(bitmap.ImplGetSalBitmap().get());
-assert(dest->mSize == dest->mPixelsSize);
-assert(dest->mSize == mSize);
-SAL_INFO("vcl.skia.trace", "ensurebitmapdata(" << this << "): 
pixels scaled "
-   << mPixelsSize << 
"->" << mSize << ":"
-   << 
static_cast(mScaleQuality));
-Destroy();
-Create(*dest);
-mDisableScale = false;
-}
-return;
+if (mSize == mPixelsSize)
+return;
+// Pending scaling. Create raster SkImage from the bitmap data
+// at the pixel size and then the code below will scale at the correct
+// bpp from the image.
+SAL_INFO("vcl.skia.trace", "ensurebitmapdata(" << this << "): pixels 
to be scaled "
+   << mPixelsSize << "->" 
<< mSize << ":"
+   << 
static_cast(mScaleQuality));
+Size savedSize = mSize;
+mSize = mPixelsSize;
+ResetToSkImage(SkImage::MakeFromBitmap(GetAsSkBitmap()));
+mSize = savedSize;
 }
 // Try to fill mBuffer from mImage.
 if (!mImage)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/skia/salbmp.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0a890e9cbd2289475455db52c2481c5a50204f28
Author: Luboš Luňák 
AuthorDate: Sat Jun 27 09:22:18 2020 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jun 27 10:43:16 2020 +0200

properly copy pending scale quality in SkiaSalBitmap

EnsureBitmapData() was using Create() to make a copy of the bitmap
to scale, but the quality was not copied, so it was usually
at the default (and slowest) high quality.

Change-Id: I7100304a935db420e2d55c2a9450016be1195965
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97277
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 5006f2cc824e..428592f44808 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -147,6 +147,7 @@ bool SkiaSalBitmap::Create(const SalBitmap& rSalBmp, 
sal_uInt16 nNewBitCount)
 mSize = src.mSize;
 mPixelsSize = src.mPixelsSize;
 mScanlineSize = src.mScanlineSize;
+mScaleQuality = src.mScaleQuality;
 #ifdef DBG_UTIL
 mWriteAccessCount = 0;
 #endif
@@ -685,7 +686,7 @@ void SkiaSalBitmap::EnsureBitmapData()
<< "->" << mSize << ":"
<< 
static_cast(mScaleQuality));
 mPixelsSize = mSize;
-mScaleQuality = kNone_SkFilterQuality;
+mScaleQuality = kHigh_SkFilterQuality;
 // Information about the pending scaling has been discarded, so make 
sure we do not
 // keep around any cached images that would still need scaling.
 ResetCachedDataBySize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 172b9142194699d0e847703b0e0cfcabcb1de1ef
Author: Luboš Luňák 
AuthorDate: Sat Jun 27 08:09:52 2020 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jun 27 10:16:08 2020 +0200

cache raster scaling also in Skia's drawAlphaBitmap()

Change-Id: I52849097267326cb362b113241179a766d286a6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97273
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 9304246e439e..b00b74d24647 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1329,11 +1329,23 @@ bool SkiaSalGraphicsImpl::drawAlphaBitmap(const 
SalTwoRect& rPosAry, const SalBi
 assert(dynamic_cast(&rAlphaBitmap));
 // In raster mode use mergeCacheBitmaps(), which will cache the result, 
avoiding repeated
 // alpha blending or scaling. In GPU mode it is simpler to just use 
SkShader.
-sk_sp image = mergeCacheBitmaps(static_cast(rSourceBitmap),
- static_cast(&rAlphaBitmap),
- rSourceBitmap.GetSize());
+SalTwoRect imagePosAry(rPosAry);
+Size imageSize = rSourceBitmap.GetSize();
+// If the bitmap will be scaled, prefer to do it in mergeCacheBitmaps(), 
if possible.
+if ((rPosAry.mnSrcWidth != rPosAry.mnDestWidth || rPosAry.mnSrcHeight != 
rPosAry.mnDestHeight)
+&& rPosAry.mnSrcX == 0 && rPosAry.mnSrcY == 0
+&& rPosAry.mnSrcWidth == rSourceBitmap.GetSize().Width()
+&& rPosAry.mnSrcHeight == rSourceBitmap.GetSize().Height())
+{
+imagePosAry.mnSrcWidth = imagePosAry.mnDestWidth;
+imagePosAry.mnSrcHeight = imagePosAry.mnDestHeight;
+imageSize = Size(imagePosAry.mnSrcWidth, imagePosAry.mnSrcHeight);
+}
+sk_sp image
+= mergeCacheBitmaps(static_cast(rSourceBitmap),
+static_cast(&rAlphaBitmap), 
imageSize);
 if (image)
-drawImage(rPosAry, image);
+drawImage(imagePosAry, image);
 else
 drawShader(
 rPosAry,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

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

New commits:
commit 92de6c794e6033ced0c6273f70b7d425a4c4e495
Author: Luboš Luňák 
AuthorDate: Fri Jun 26 22:41:20 2020 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jun 27 10:15:32 2020 +0200

use boost::make_shared_noinit()

The unnecessary initialization of all elements with plain
boost::make_shared() actually shows up in the profiler.

Change-Id: I054b13ac74362aca7f2dfa7dc746d3a80c7f1042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97267
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 0474b4859405..5006f2cc824e 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -114,7 +114,7 @@ bool SkiaSalBitmap::CreateBitmapData()
 #ifdef DBG_UTIL
 allocate += sizeof(CANARY);
 #endif
-mBuffer = boost::make_shared(allocate);
+mBuffer = boost::make_shared_noinit(allocate);
 #ifdef DBG_UTIL
 // fill with random garbage
 sal_uInt8* buffer = mBuffer.get();
@@ -763,7 +763,7 @@ void SkiaSalBitmap::EnsureBitmapUniqueData()
 assert(memcmp(mBuffer.get() + allocate, CANARY, sizeof(CANARY)) == 0);
 allocate += sizeof(CANARY);
 #endif
-boost::shared_ptr newBuffer = 
boost::make_shared(allocate);
+boost::shared_ptr newBuffer = 
boost::make_shared_noinit(allocate);
 memcpy(newBuffer.get(), mBuffer.get(), allocate);
 mBuffer = newBuffer;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg sw/uiconfig

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/cmd/32/hidewhitespace.png |binary
 icon-themes/colibre/cmd/32/showwhitespace.png |binary
 icon-themes/colibre/cmd/lc_hidewhitespace.png |binary
 icon-themes/colibre/cmd/lc_showwhitespace.png |binary
 icon-themes/colibre/cmd/sc_hidewhitespace.png |binary
 icon-themes/colibre/cmd/sc_showwhitespace.png |binary
 icon-themes/colibre_svg/cmd/32/hidewhitespace.svg |2 +-
 icon-themes/colibre_svg/cmd/32/showwhitespace.svg |1 +
 icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_showwhitespace.svg |1 +
 icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg |3 ++-
 icon-themes/colibre_svg/cmd/sc_showwhitespace.svg |2 ++
 sw/uiconfig/sglobal/menubar/menubar.xml   |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml   |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml   |2 +-
 15 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 2b7861dd234163bfef360a803348b54f6619a89a
Author: Rizal Muttaqin 
AuthorDate: Sat Jun 27 13:26:45 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Sat Jun 27 09:49:57 2020 +0200

Colibre: tdf#133538: icons for Show White Space

Change-Id: I757696ece0b06cdd91358ea8944ba5cc49a644d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97274
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/cmd/32/hidewhitespace.png 
b/icon-themes/colibre/cmd/32/hidewhitespace.png
index 8497c053cb4b..a0469c6d1820 100644
Binary files a/icon-themes/colibre/cmd/32/hidewhitespace.png and 
b/icon-themes/colibre/cmd/32/hidewhitespace.png differ
diff --git a/icon-themes/colibre/cmd/32/showwhitespace.png 
b/icon-themes/colibre/cmd/32/showwhitespace.png
new file mode 100644
index ..6846278fb509
Binary files /dev/null and b/icon-themes/colibre/cmd/32/showwhitespace.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_hidewhitespace.png 
b/icon-themes/colibre/cmd/lc_hidewhitespace.png
index 04c948aec0c2..1ba7243dac2c 100644
Binary files a/icon-themes/colibre/cmd/lc_hidewhitespace.png and 
b/icon-themes/colibre/cmd/lc_hidewhitespace.png differ
diff --git a/icon-themes/colibre/cmd/lc_showwhitespace.png 
b/icon-themes/colibre/cmd/lc_showwhitespace.png
new file mode 100644
index ..abeb730f0a10
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_showwhitespace.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_hidewhitespace.png 
b/icon-themes/colibre/cmd/sc_hidewhitespace.png
index f930c7621f84..1a1df83dc440 100644
Binary files a/icon-themes/colibre/cmd/sc_hidewhitespace.png and 
b/icon-themes/colibre/cmd/sc_hidewhitespace.png differ
diff --git a/icon-themes/colibre/cmd/sc_showwhitespace.png 
b/icon-themes/colibre/cmd/sc_showwhitespace.png
new file mode 100644
index ..7d108c1b72a1
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_showwhitespace.png 
differ
diff --git a/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg 
b/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg
index 7923e2adda73..77f8af0ea77c 100644
--- a/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg
+++ b/icon-themes/colibre_svg/cmd/32/hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/showwhitespace.svg 
b/icon-themes/colibre_svg/cmd/32/showwhitespace.svg
new file mode 100644
index ..db459c66b3aa
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/32/showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg 
b/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg
index f6fbd41a724b..b711a9212b9a 100644
--- a/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg
+++ b/icon-themes/colibre_svg/cmd/lc_hidewhitespace.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_showwhitespace.svg 
b/icon-themes/colibre_svg/cmd/lc_showwhitespace.svg
new file mode 100644
index ..a29021ff956e
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/lc_showwhitespace.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg 
b/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg
index 1a9e4deb22db..8ccd482a334c 100644
--- a/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg
+++ b/icon-themes/colibre_svg/cmd/sc_hidewhitespace.svg
@@ -1 +1,2 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+/>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_showwhitespace.svg 
b/icon-themes/colibre_svg/cmd/sc_showwhitespace.svg
new file mode 100644
index ..ca56186a5ed4
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/sc_showw

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

[László Németh (via logerrit)]

 editeng/source/misc/acorrcfg.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 076c95b27bf0e9be1fa1c077674cf974b22210fd
Author: László Németh 
AuthorDate: Fri Jun 26 22:13:26 2020 +0200
Commit: László Németh 
CommitDate: Sat Jun 27 09:11:42 2020 +0200

AutoCorrect: fix redundant loading

of new localized options added by
commit da64ec8c8a91db6a6ec9657898f081d5ee67e739
(tdf#133589 AutoCorrect: transliterate to Old Hungarian)
and commit 77b213890a96d144d9cfacdfd35ac0bba68b9f7a
(tdf#133524 add option to angle quote AutoCorrect)

Change-Id: I39f97cfc5a9deb7cbe92d175b2e59ba2ab8a2707
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97266
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 03d238953b10..aa08f4196664 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -340,10 +340,8 @@ Sequence  SvxSwAutoCorrCfg::GetPropertyNames()
 "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",//44
 "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",   //45
 "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", //46
-"Format/Option/TransliterateRTL",   //47
-"Format/Option/ChangeAngleQuotes"   //48
 };
-const int nCount = 49;
+const int nCount = 47;
 Sequence aNames(nCount);
 OUString* pNames = aNames.getArray();
 for(int i = 0; i < nCount; i++)
@@ -493,8 +491,6 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
 rSwFlags.aByInputBulletFont.SetPitch(FontPitch(nVal));
 }
 break;// 
"Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
-case 47 : rSwFlags.bTransliterateRTL = 
*o3tl::doAccess(pValues[nProp]); break; // 
"Format/Option/TransliterateRTL",
-case 48 : rSwFlags.bChgAngleQuotes = 
*o3tl::doAccess(pValues[nProp]); break; // 
"Format/Option/ChangeAngleQuotes",
 }
 }
 }
@@ -596,11 +592,8 @@ void SvxSwAutoCorrCfg::ImplCommit()
 // "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily"
  css::uno::Any(sal_Int32(rSwFlags.aByInputBulletFont.GetCharSet())),
 // "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset"
- css::uno::Any(sal_Int32(rSwFlags.aByInputBulletFont.GetPitch())),
+ css::uno::Any(sal_Int32(rSwFlags.aByInputBulletFont.GetPitch()))});
 // "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch"
- css::uno::Any(rSwFlags.bTransliterateRTL)});
-// "Format/Option/TransliterateRTL"
-
 }
 
 void SvxSwAutoCorrCfg::Notify( const Sequence& /* aPropertyNames */ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits