[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/source
vcl/source/app/salvtables.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7eefb0ffb8d7bde110a76f22c61f933663c4
Author: Caolán McNamara
AuthorDate: Fri Aug 16 08:54:45 2019 +0100
Commit: Xisco Faulí
CommitDate: Mon Aug 19 08:56:06 2019 +0200
Resolves: tdf#126951 crash in custom slide show
on selecting entry 0 which doesn't exist
Change-Id: I67656bed63f9055bc6c5dd5781e79f967996500d
Reviewed-on: https://gerrit.libreoffice.org/77560
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 5d3e9ababc0b3e049a7556b210bb6349e3e3322c)
Reviewed-on: https://gerrit.libreoffice.org/77695
Reviewed-by: Xisco Faulí
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index ceff007c408b..ee08923d8088 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3004,7 +3004,7 @@ public:
{
assert(m_xTreeView->IsUpdateMode() && "don't select when frozen");
disable_notify_events();
-if (pos == -1)
+if (pos == -1 || (pos == 0 && n_children() == 0))
m_xTreeView->SelectAll(false);
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/filter/ww8/docxsdrexport.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit c50033a000d85f967bd5300dea0f9fec3411e501
Author: Tamás Zolnai
AuthorDate: Tue Aug 13 14:27:05 2019 +0200
Commit: Xisco Faulí
CommitDate: Mon Aug 19 07:32:15 2019 +0200
Writer: Saving a damaged file as DOCX crashes
Reviewed-on: https://gerrit.libreoffice.org/77412
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit de8415ff5a730465258cd5f0ab7c0d989ba5518d)
Reviewed-on: https://gerrit.libreoffice.org/77444
Reviewed-by: Xisco Faulí
(cherry picked from commit 0f7eb072fdc2d5b4ee1690597dafc475a611f007)
Change-Id: I42de376c69d0b1caa0a03622506d1bf6385ca57e
Reviewed-on: https://gerrit.libreoffice.org/77670
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 50a1500c31b9..45c1d35f579b 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1371,14 +1371,17 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const*
pParentFrame, int nAncho
// We need to init padding to 0, if it's not set.
// In LO the default is 0 and so ins attributes are not set when padding
is 0
// but in MSO the default is 254 / 127, so we need to set 0 padding
explicitly
-if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_lIns))
-m_pImpl->m_pBodyPrAttrList->add(XML_lIns, OString::number(0));
-if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_tIns))
-m_pImpl->m_pBodyPrAttrList->add(XML_tIns, OString::number(0));
-if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_rIns))
-m_pImpl->m_pBodyPrAttrList->add(XML_rIns, OString::number(0));
-if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_bIns))
-m_pImpl->m_pBodyPrAttrList->add(XML_bIns, OString::number(0));
+if (m_pImpl->m_pBodyPrAttrList)
+{
+if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_lIns))
+m_pImpl->m_pBodyPrAttrList->add(XML_lIns, OString::number(0));
+if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_tIns))
+m_pImpl->m_pBodyPrAttrList->add(XML_tIns, OString::number(0));
+if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_rIns))
+m_pImpl->m_pBodyPrAttrList->add(XML_rIns, OString::number(0));
+if (!m_pImpl->m_pBodyPrAttrList->hasAttribute(XML_bIns))
+m_pImpl->m_pBodyPrAttrList->add(XML_bIns, OString::number(0));
+}
sax_fastparser::XFastAttributeListRef
xBodyPrAttrList(m_pImpl->m_pBodyPrAttrList);
m_pImpl->m_pBodyPrAttrList = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Infra call on Tue, Aug 20 at 16:30 UTC
Hi there, The next infra call will take place at `date -d "Tue Aug 20 16:30:00 UTC 2019"` (18:30:00 Berlin time). We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes to https://pad.documentfoundation.org/p/infra . Agenda TBA. See you there! Cheers, -- Guilhem. signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/loleaflet.css | 24 ++
loleaflet/images/table-column-resize-marker-hover.svg | 10 +++
loleaflet/images/table-row-resize-marker-hover.svg| 10 +++
loleaflet/src/dom/Draggable.js| 16
loleaflet/src/layer/marker/Marker.Drag.js | 10 +++
loleaflet/src/layer/tile/TileLayer.TableOverlay.js|5 +++
6 files changed, 75 insertions(+)
New commits:
commit 7467710dab48d30fc3dcee66fc5a2fdec46184ae
Author: Tomaž Vajngerl
AuthorDate: Sun Aug 18 10:22:21 2019 +0900
Commit: Tomaž Vajngerl
CommitDate: Mon Aug 19 01:03:20 2019 +0200
table handles: drag only in x/y axis, marker on hover, cursor
This adds:
- support to freeze movement to x or y axis when dragging the
marker (depends on the marker type - column or row marker)
- change marker on hover, which uses a different image, which is
solved in css
- change cursor to col-resize / row-resize when howering over the
marker
Change-Id: I63bf5e82860ef75f2dfde31ee2ab7ede6f61ce70
Reviewed-on: https://gerrit.libreoffice.org/77652
Reviewed-by: Tomaž Vajngerl
Tested-by: Tomaž Vajngerl
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 62cecafa9..08d172546 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -49,6 +49,18 @@
background-image: url('images/table-column-resize-marker.svg');
background-size: 100% 100%;
background-repeat: no-repeat;
+ cursor: col-resize;
+}
+
+.table-column-resize-marker:hover {
+ margin-left: 0px;
+ margin-top: 0px;
+ width: 24px;
+ height: 24px;
+ background-image: url('images/table-column-resize-marker-hover.svg');
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ cursor: col-resize;
}
.table-row-resize-marker {
@@ -59,6 +71,18 @@
background-image: url('images/table-row-resize-marker.svg');
background-size: 100% 100%;
background-repeat: no-repeat;
+ cursor: row-resize;
+}
+
+.table-row-resize-marker:hover {
+ margin-left: 0px;
+ margin-top: 0px;
+ width: 24px;
+ height: 24px;
+ background-image: url('images/table-row-resize-marker-hover.svg');
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ cursor: row-resize;
}
body {
diff --git a/loleaflet/images/table-column-resize-marker-hover.svg
b/loleaflet/images/table-column-resize-marker-hover.svg
new file mode 100644
index 0..a805d05ae
--- /dev/null
+++ b/loleaflet/images/table-column-resize-marker-hover.svg
@@ -0,0 +1,10 @@
+http://www.w3.org/2000/svg";>
+
+
+
+
+
+
+
+
+
diff --git a/loleaflet/images/table-row-resize-marker-hover.svg
b/loleaflet/images/table-row-resize-marker-hover.svg
new file mode 100644
index 0..7dab991ac
--- /dev/null
+++ b/loleaflet/images/table-row-resize-marker-hover.svg
@@ -0,0 +1,10 @@
+http://www.w3.org/2000/svg";>
+
+
+
+
+
+
+
+
+
diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js
index df22f3b11..d9f5485a8 100644
--- a/loleaflet/src/dom/Draggable.js
+++ b/loleaflet/src/dom/Draggable.js
@@ -25,6 +25,16 @@ L.Draggable = L.Evented.extend({
this._element = element;
this._dragStartTarget = dragStartTarget || element;
this._preventOutline = preventOutline;
+ this._freezeX = false;
+ this._freezeY = false;
+ },
+
+ freezeX: function (boolChoice) {
+ this._freezeX = boolChoice;
+ },
+
+ freezeY: function (boolChoice) {
+ this._freezeY = boolChoice;
},
enable: function () {
@@ -139,6 +149,12 @@ L.Draggable = L.Evented.extend({
}
this._newPos = this._startPos.add(offset);
+
+ if (this._freezeY)
+ this._newPos.y = this._startPos.y
+ if (this._freezeX)
+ this._newPos.x = this._startPos.x
+
this._moving = true;
L.Util.cancelAnimFrame(this._animRequest);
diff --git a/loleaflet/src/layer/marker/Marker.Drag.js
b/loleaflet/src/layer/marker/Marker.Drag.js
index 5b879cd2b..d9f789235 100644
--- a/loleaflet/src/layer/marker/Marker.Drag.js
+++ b/loleaflet/src/layer/marker/Marker.Drag.js
@@ -44,6 +44,16 @@ L.Handler.MarkerDrag = L.Handler.extend({
return this._draggable && this._draggable._moved;
},
+ freezeX: function (boolChoice) {
+ if (this._draggable)
+ this._draggable.freezeX(boolChoice);
+ },
+
+ freezeY: function (boolChoice) {
+ if (this._draggable)
+ this._draggable.freezeY(boolChoice);
+ },
+
_onDown: function (e) {
this._marker.fi
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbe9601e5972ec1c466311e0b148a9fbe8cda4d1 Author: Olivier Hallot AuthorDate: Sun Aug 18 17:44:45 2019 -0300 Commit: Gerrit Code Review CommitDate: Mon Aug 19 00:22:14 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Update Draw menus and Contents tree (part) Change-Id: I556a2cafdd66fc425aa67f821c1a5b676ef22c81 Reviewed-on: https://gerrit.libreoffice.org/77677 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1848284e83e6..6570689918de 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1848284e83e609f092f80c55dce108c22964699f +Subproject commit 6570689918de8fa9185c496808681b4612906164 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - AllLangHelp_sdraw.mk AllLangHelp_shared.mk AllLangHelp_simpress.mk Package_html_media.mk source/auxiliary source/media source/text
AllLangHelp_sdraw.mk|8 AllLangHelp_shared.mk |2 AllLangHelp_simpress.mk |2 Package_html_media.mk |6 source/auxiliary/sdraw.tree |9 source/media/helpimg/sc_cell_with_comment_displayed.png |binary source/media/helpimg/sd_drawing_with_comment.png|binary source/media/helpimg/si_presentation_with_comment.png |binary source/media/helpimg/sw_text_with_comment.png |binary source/text/sdraw/00/page_menu.xhp | 11 source/text/sdraw/01/delete_page.xhp| 30 + source/text/sdraw/01/duplicate_page.xhp | 28 + source/text/sdraw/01/insert_layer.xhp |5 source/text/sdraw/01/modify_layer.xhp |2 source/text/sdraw/01/navigate_page.xhp | 28 + source/text/sdraw/01/new_page.xhp |7 source/text/sdraw/01/rename_page.xhp| 31 ++ source/text/sdraw/main0100.xhp | 12 source/text/sdraw/main_format.xhp |4 source/text/sdraw/main_insert.xhp | 47 +-- source/text/sdraw/main_page.xhp | 31 +- source/text/sdraw/main_shape.xhp| 25 + source/text/shared/00/0404.xhp | 58 +-- source/text/shared/01/0405.xhp | 245 ++-- source/text/shared/02/0117.xhp |8 source/text/shared/guide/fontwork.xhp |2 source/text/shared/menu/insert_form_control.xhp | 64 +--- source/text/shared/menu/save_image.xhp | 37 ++ source/text/shared/menu/set_image_background.xhp| 36 ++ source/text/simpress/01/0211.xhp| 123 source/text/simpress/01/0411.xhp| 11 source/text/simpress/01/04110100.xhp|4 32 files changed, 608 insertions(+), 268 deletions(-) New commits: commit 6570689918de8fa9185c496808681b4612906164 Author: Olivier Hallot AuthorDate: Sun Aug 18 17:44:45 2019 -0300 Commit: Olivier Hallot CommitDate: Mon Aug 19 00:22:14 2019 +0200 Update Draw menus and Contents tree (part) Change-Id: I556a2cafdd66fc425aa67f821c1a5b676ef22c81 Reviewed-on: https://gerrit.libreoffice.org/77677 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk index 0df12b7ac..877ff7489 100644 --- a/AllLangHelp_sdraw.mk +++ b/AllLangHelp_sdraw.mk @@ -21,8 +21,14 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\ helpcontent2/source/text/sdraw/main_page \ helpcontent2/source/text/sdraw/00/0004 \ helpcontent2/source/text/sdraw/00/page_menu \ +helpcontent2/source/text/sdraw/01/delete_page \ +helpcontent2/source/text/sdraw/01/duplicate_page \ +helpcontent2/source/text/sdraw/01/insert_layer \ +helpcontent2/source/text/sdraw/01/modify_layer \ helpcontent2/source/text/sdraw/01/new_page \ +helpcontent2/source/text/sdraw/01/navigate_page \ helpcontent2/source/text/sdraw/01/page_properties \ +helpcontent2/source/text/sdraw/01/rename_page \ helpcontent2/source/text/sdraw/04/0102 \ helpcontent2/source/text/sdraw/guide/align_arrange \ helpcontent2/source/text/sdraw/guide/color_define \ @@ -51,6 +57,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\ helpcontent2/source/text/sdraw/main0103 \ helpcontent2/source/text/sdraw/main_insert \ helpcontent2/source/text/sdraw/main_format \ +helpcontent2/source/text/sdraw/main_page \ +helpcontent2/source/text/sdraw/main_shape \ helpcontent2/source/text/sdraw/main_tools \ helpcontent2/source/text/sdraw/main0200 \ helpcontent2/source/text/sdraw/main0202 \ diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index dcc2d4c21..46934ccb5 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -740,6 +740,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/menu/insert_chart \ helpcontent2/source/text/shared/menu/insert_form_control \ helpcontent2/source/text/shared/menu/insert_shape \ +helpcontent2/source/text/shared/menu/save_image \ +helpcontent2/source/text/shared/menu/set_image_background \ helpcontent2/source/text/shared/need_help \ helpcontent2/source/text/shared/optionen/0100 \ helpcontent2/source/text/shared/optionen/0101 \ diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk index 24de6ae0d..a80deaf34 100644 --- a/AllLangHelp_simpress.mk +++ b/AllLangHelp_simpress.mk @@ -56,7 +56,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\ helpcontent2/source/text/simpress/01/03152000 \ helpcon
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 985a7c0f6c2d4b37b6120449c5286cc968d8e8d1 Author: Olivier Hallot AuthorDate: Sat Aug 17 13:12:26 2019 -0300 Commit: Gerrit Code Review CommitDate: Mon Aug 19 00:21:40 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#43527 revisit Insert Comments Change-Id: I3cdf7f4672641718df7668e23e3d57187ed26d33 Reviewed-on: https://gerrit.libreoffice.org/77644 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 87ce3991074d..1848284e83e6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 87ce3991074ddd4c16e6b9568afa7d960725ef35 +Subproject commit 1848284e83e609f092f80c55dce108c22964699f commit a2680b2dd2001aa57f279d9a65ff6802f8ea532f Author: Olivier Hallot AuthorDate: Thu Aug 15 19:00:41 2019 -0300 Commit: Gerrit Code Review CommitDate: Mon Aug 19 00:20:56 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#123980 Review WORKDAYS function family Change-Id: I385f31b98b50762659c3319c0998a264213be23e Reviewed-on: https://gerrit.libreoffice.org/77554 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index fb8a37870859..87ce3991074d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fb8a37870859659ec44257a07dbd5d92bf93f845 +Subproject commit 87ce3991074ddd4c16e6b9568afa7d960725ef35 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 26220c06e62057b5a1231a5fad704497de7423ca Author: Olivier Hallot AuthorDate: Thu Aug 15 17:12:55 2019 -0300 Commit: Gerrit Code Review CommitDate: Mon Aug 19 00:20:36 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#124204 Changes in SMALL and LARGE functions Change-Id: I1d67dfd05419abc67b8039112c3fcd7bb0b15fbe Reviewed-on: https://gerrit.libreoffice.org/77552 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1e20b35158b2..fb8a37870859 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1e20b35158b23e9737ea3688531c8780ae481ee3 +Subproject commit fb8a37870859659ec44257a07dbd5d92bf93f845 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/func_networkdays.intl.xhp |8
source/text/scalc/01/func_networkdays.xhp | 10 +-
source/text/scalc/01/func_workday.intl.xhp | 12 ++--
source/text/scalc/01/func_workday.xhp | 10 +-
4 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 87ce3991074ddd4c16e6b9568afa7d960725ef35
Author: Olivier Hallot
AuthorDate: Thu Aug 15 19:00:41 2019 -0300
Commit: Olivier Hallot
CommitDate: Mon Aug 19 00:20:56 2019 +0200
tdf#123980 Review WORKDAYS function family
Change-Id: I385f31b98b50762659c3319c0998a264213be23e
Reviewed-on: https://gerrit.libreoffice.org/77554
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/scalc/01/func_networkdays.intl.xhp
b/source/text/scalc/01/func_networkdays.intl.xhp
index c081e400e..5df0a4556 100644
--- a/source/text/scalc/01/func_networkdays.intl.xhp
+++ b/source/text/scalc/01/func_networkdays.intl.xhp
@@ -31,7 +31,7 @@
NETWORKDAYS.INTL function
-NETWORKDAYS.INTL
+NETWORKDAYS.INTL
Returns the number of workdays between a start
date and an end date. There are options to define weekend days and holidays.
The optional weekend parameter (or a string) can be used to define the weekend
days (or the non-working days in each week). Also, optionally, the user can
define a holiday list. The weekend days and user-defined holidays are not
counted as working days.
@@ -51,9 +51,9 @@
The
function can be used without the two optional parameters – weekday and holidays
– by leaving them out:
=NETWORKDAYS.INTL(C3;D3) gives 22
working days.
-NETWORKDAYS
-WORKDAY.INTL
-WORKDAYS
+
+
+
Date
functions
diff --git a/source/text/scalc/01/func_networkdays.xhp
b/source/text/scalc/01/func_networkdays.xhp
index 7ad83da25..a1daadfee 100644
--- a/source/text/scalc/01/func_networkdays.xhp
+++ b/source/text/scalc/01/func_networkdays.xhp
@@ -33,8 +33,8 @@
-NETWORKDAYS
-Returns the number of workdays between a
start date and an end date. Holidays can be
deducted.
+NETWORKDAYS
+Returns the number of workdays between a
start date and an end date. Holidays can be
deducted.
NETWORKDAYS(StartDate; EndDate; Holidays; Workdays)
@@ -50,9 +50,9 @@
How
many workdays fall between September 12nd and 25th in 2016 if only Mondays,
Tuesdays and Wednesdays are considered as workdays?
=NETWORKDAYS(DATE(2016;9;12);
DATE(2016;9;25); ; {1;0;0;0;1;1;1}) returns 6 workdays.
-NETWORKDAYS.INTL
-WORKDAY.INTL
-WORKDAYS
+
+
+
Date
functions
diff --git a/source/text/scalc/01/func_workday.intl.xhp
b/source/text/scalc/01/func_workday.intl.xhp
index 58167a377..4f4a31ae9 100644
--- a/source/text/scalc/01/func_workday.intl.xhp
+++ b/source/text/scalc/01/func_workday.intl.xhp
@@ -32,13 +32,13 @@
-WORKDAY.INTL
-The result is a date number that can be
formatted as a date. User can see the date of a day that is a certain number of
workdays away from the start date (before or after). There are options to
define weekend days and holidays. The optional weekend parameter (or a string)
can be used to define the weekend days (or the non-working days in each week).
Also, optionally, the user can define a holiday list. The weekend days and
user-defined holidays are not counted as working days.
+WORKDAY.INTL
+Returns the date calculated from a start date
with a specific number of work days, before or after the start date. The
calculation can include week-ends and holidays as non-working
days.
WORKDAY.INTL(StartDate; Days; Weekend; Holidays)
-StartDate is the date from when the calculation
is carried out. If the start date is a workday, the day is included in the
calculation. This is required.
+StartDate: is the date from when the calculation
is carried out.
Days is the number of workdays. Positive value
for a result after the start date, negative value for a result before the start
date.
@@ -57,9 +57,9 @@
The
function can be used without the two optional parameters – Weekday and Holidays
– by leaving them out:
=WORKDAY.INTL(C3;D3) gives the
result: January 10, 2017.
-NETWORKDAYS
-NETWORKDAYS.INTL
-WORKDAY
+
+
+
Date
functions
diff --git a/source/text/scalc/01/func_workday.xhp
b/source/text/scalc/01/func_workday.xhp
index 7529a7aa3..21120d6e0 100644
--- a/source/text/scalc/01/func_workday.xhp
+++ b/source/text/scalc/01/func_workday.xhp
@@ -31,8 +31,8 @@
WORKDAY function
-WORKDAY
-
+
+WORKDAY
The result is a date number that can be formatted
as a date. You then see the date of a day that is a certain number of
workdays away from the start date.
WORKDAY(StartDate;
Days; Holidays)
@@ -48,9 +48,9 @@
What date came
17 workdays after 1 December 2001? Enter the start date "2001-12-01" in C3 and
the number of workdays in D3. Cells F3 to J3 contain the following Christmas
and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31",
"2002-01-01".
=W
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060183.xhp | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) New commits: commit fb8a37870859659ec44257a07dbd5d92bf93f845 Author: Olivier Hallot AuthorDate: Thu Aug 15 17:12:55 2019 -0300 Commit: Olivier Hallot CommitDate: Mon Aug 19 00:20:36 2019 +0200 tdf#124204 Changes in SMALL and LARGE functions Change-Id: I1d67dfd05419abc67b8039112c3fcd7bb0b15fbe Reviewed-on: https://gerrit.libreoffice.org/77552 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/04060183.xhp b/source/text/scalc/01/04060183.xhp index 24e1893dc..1232151f6 100644 --- a/source/text/scalc/01/04060183.xhp +++ b/source/text/scalc/01/04060183.xhp @@ -34,33 +34,31 @@ LARGE function -LARGE +LARGE Returns the Rank_c-th largest value in a data set. + LARGE(Data; RankC) - -Data is the cell range of data. - -RankC is the ranking of the value. +Data is the cell range of data. +RankC is the ranking of the value. If RankC is an array, the function becomes an array function. - -=LARGE(A1:C50;2) gives the second largest value in A1:C50. +=LARGE(A1:C50;2) gives the second largest value in A1:C50. +=LARGE(A1:C50;B1:B5) entered as an array function gives an array of the c-th largest value in A1:C50 with ranks defined in B1:B5. SMALL function -SMALL +SMALL Returns the Rank_c-th smallest value in a data set. + SMALL(Data; RankC) - -Data is the cell range of data. - -RankC is the rank of the value. +Data is the cell range of data. +RankC is the rank of the value. If RankC is an array, the function becomes an array function. - -=SMALL(A1:C50;2) gives the second smallest value in A1:C50. +=SMALL(A1:C50;2) gives the second smallest value in A1:C50. +=SMALL(A1:C50;B1:B5) entered as an array function gives an array of the c-th smallest value in A1:C50 with ranks defined in B1:B5. CONFIDENCE function ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Hackfest options for the rest of 2019? (was: ESC meeting 2019-08-15 minutes)
Hi, Jan Holesovsky wrote: > * Hackfests & Events (Sophie) > + Dresden Hackfest (Thorsten) > + most probably won’t happen, haven’t heard from the guys (Thorsten) > + tentatively end of October, talking to FSFE people there >+ not confirmed, working on that > Clarification (didn't see the minutes during the call) - this never went further than ideas stage, which is entirely my fault. I'll sort possible future dates out, but let's remove it from the agenda for the moment. With the GSoC mentor summit happening at exactly the planned time, I think it is better to simply postpone this. > + Google Mentor summit happening in Europe end of October >+ could be a fall-back for European meetup >+ Cafe Netzwerk / CIB office or something. >+ one slot for Mentor Summit available >+ call for Munich volunteers to organize something around this? > (Thorsten) > Michael M. and me being LibreOffice's delegates for the GSoC mentor summit this time, which will happen October 18th to 20th in Munich, Germany. This is now 2 months out, so anything like HackFest NG or travel preps for people coming from further away need to start soonish. So the call is out, for people either from the area, or interested to come to Munich during that week, to speak up! :) Cheers, -- Thorsten signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/pagedlg/tphfedit.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e306e487548dd78c4807820942dd2bf0c8f7fd21 Author: Caolán McNamara AuthorDate: Sun Aug 18 19:57:14 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Aug 18 22:21:50 2019 +0200 Resolves: tdf#127002 keystrokes in edit engine passed on to dialog when they should stop at the edit engine Change-Id: I4079af7ed53ab4036e99c129d9e58fa530cf566b Reviewed-on: https://gerrit.libreoffice.org/77674 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 1dd7c64e2bc9..9a41ffdd5476 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -221,7 +221,7 @@ bool ScEditWindow::KeyInput( const KeyEvent& rKEvt ) aObjectSelectLink.Call(*this); return true; } -return false; +return true; } void ScEditWindow::GetFocus() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx | 39 +++-
1 file changed, 34 insertions(+), 5 deletions(-)
New commits:
commit 931b63db1ce15b309eb6f879f1da992986bf974d
Author: Caolán McNamara
AuthorDate: Sat Aug 17 21:14:58 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 18 22:04:17 2019 +0200
Related: tdf#53029 escape backslash in username for 'domain\username'
Change-Id: I645623886396b55ccea273bfd697cf319b53f506
Reviewed-on: https://gerrit.libreoffice.org/77651
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 7d107de5724d..8d0c6528dbcd 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -745,6 +745,35 @@ namespace
}
}
+namespace
+{
+OString EscapeCupsOption(const OString& rIn)
+{
+OStringBuffer sRet;
+sal_Int32 nLen = rIn.getLength();
+for (sal_Int32 i = 0; i < nLen; ++i)
+{
+switch(rIn[i])
+{
+case '\\':
+case '\'':
+case '\"':
+case ',':
+case ' ':
+case '\f':
+case '\n':
+case '\r':
+case '\t':
+case '\v':
+sRet.append('\\');
+break;
+}
+sRet.append(rIn[i]);
+}
+return sRet.makeStringAndClear();
+}
+}
+
bool CUPSManager::endSpool( const OUString& rPrintername, const OUString&
rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const
OUString& rFaxNumber )
{
SAL_INFO( "vcl.unx.print", "endSpool: " << rPrintername << "," <<
rJobTitle << " copy count = " << rDocumentJobData.m_nCopies );
@@ -804,18 +833,18 @@ bool CUPSManager::endSpool( const OUString& rPrintername,
const OUString& rJobTi
{
OString sAuth;
if (bDomain)
-sAuth = aDialog.getDomain().replaceAll(",", "\\,");
+sAuth = EscapeCupsOption(aDialog.getDomain());
if (bUser)
{
-if (!sAuth.isEmpty())
+if (bDomain)
sAuth += ",";
-sAuth += aDialog.getUserName().replaceAll(",", "\\,");
+sAuth += EscapeCupsOption(aDialog.getUserName());
}
if (bPass)
{
-if (!sAuth.isEmpty())
+if (bUser || bDomain)
sAuth += ",";
-sAuth += aDialog.getPassword().replaceAll(",", "\\,");
+sAuth += EscapeCupsOption(aDialog.getPassword());
}
nNumOptions = cupsAddOption("auth-info", sAuth.getStr(),
nNumOptions, &pOptions);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit c4dd4d9a020db030b031e84677f7e857dce14b42
Author: Caolán McNamara
AuthorDate: Sat Aug 17 17:15:40 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 18 21:12:31 2019 +0200
Related: rhbz#1691287 fill in default domain and username
and grab focus to first entry entry
Change-Id: Icb50766948c77072eaab9faf89436c6ecbb49ecc
Reviewed-on: https://gerrit.libreoffice.org/77645
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 34da816abb28..7d107de5724d 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -718,7 +718,14 @@ namespace
OUString aText(m_xText->get_label());
aText = aText.replaceFirst("%s", OStringToOUString(rServer,
osl_getThreadTextEncoding()));
m_xText->set_label(aText);
-m_xUserEdit->set_text(OStringToOUString(rUserName,
osl_getThreadTextEncoding()));
+m_xDomainEdit->set_text("WORKGROUP");
+if (rUserName.isEmpty())
+m_xUserEdit->grab_focus();
+else
+{
+m_xUserEdit->set_text(OStringToOUString(rUserName,
osl_getThreadTextEncoding()));
+m_xPassEdit->grab_focus();
+}
}
bool AuthenticateQuery(const OString& rServer, OString& rUserName,
OString& rPassword)
@@ -786,8 +793,9 @@ bool CUPSManager::endSpool( const OUString& rPrintername,
const OUString& rJobTi
if (bDomain || bUser || bPass)
{
OString sPrinterName(OUStringToOString(rPrintername,
RTL_TEXTENCODING_UTF8));
+OString sUser = cupsUser();
vcl::Window* pWin = Application::GetDefDialogParent();
-RTSPWDialog aDialog(pWin ? pWin->GetFrameWeld() : nullptr,
sPrinterName, "");
+RTSPWDialog aDialog(pWin ? pWin->GetFrameWeld() : nullptr,
sPrinterName, sUser);
aDialog.SetDomainVisible(bDomain);
aDialog.SetUserVisible(bUser);
aDialog.SetPassVisible(bPass);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/app/docst.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 36ec19859c5a2e761649215d06e5d723b965faad
Author: Jim Raykowski
AuthorDate: Tue Aug 13 22:07:35 2019 -0800
Commit: Jim Raykowski
CommitDate: Sun Aug 18 21:03:02 2019 +0200
Save a couple lines of code by using ::sw::UndoGuard
Change-Id: Ib6a0406f8ae587902dcd61f865748bda458f642b
Reviewed-on: https://gerrit.libreoffice.org/77439
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 9101d131a3f9..562e71f7c7a6 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -683,10 +683,8 @@ void SwDocShell::Edit(
{
// Prevent undo append from being done during paragraph,
character, and frame style Make
// Do it after ok return from style dialog when derived from style
is known
-const bool bDoesUndo = GetDoc()->GetIDocumentUndoRedo().DoesUndo();
-GetDoc()->GetIDocumentUndoRedo().DoUndo( false );
+::sw::UndoGuard const undoGuard(GetDoc()->GetIDocumentUndoRedo());
pStyle = &m_xBasePool->Make( rName, nFamily, nMask );
-GetDoc()->GetIDocumentUndoRedo().DoUndo( bDoesUndo );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/EL-SHREIF/ui_logger' - uitest/ui_logger_dsl
uitest/ui_logger_dsl/dsl_core.py | 879 +--
1 file changed, 569 insertions(+), 310 deletions(-)
New commits:
commit ef62c15cd3e55f4788e7c5baeda6f6625b0483ff
Author: Ahmed ElShreif
AuthorDate: Sun Aug 18 13:00:28 2019 -0500
Commit: Ahmed ElShreif
CommitDate: Sun Aug 18 13:00:28 2019 -0500
uitest: Reformat the python script of the Compiler
Change-Id: Ifd3139b4dce984831a0e2d1b428928be11c79bee
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index b77a3449aa6e..424e191333a9 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -12,565 +12,824 @@ import argparse
import keyword
from textx.metamodel import metamodel_from_file
-tab=""
-double_tab=""
+tab = ""
+double_tab = ""
+
def parse_args():
"""
This function parses the command-line arguments
to get the input and output file details
"""
-parser = argparse.ArgumentParser(description = "Generate a UI test file
from log")
-parser.add_argument("input_address", type = str, help = "The log file
address")
-parser.add_argument("output_address", type = str, help = "The test file
address")
+parser = argparse.ArgumentParser(description="Generate a UI test file from
log")
+parser.add_argument("input_address", type=str, help="The log file address")
+parser.add_argument("output_address", type=str, help="The test file
address")
args = parser.parse_args()
return args
+
class ul_Compiler:
-prev_command=""
-variables=[]
+prev_command = ""
+variables = []
objects = dict()
-current_app=""
-parent_hierarchy_count=0
-last_parent=[]
-flag_for_QuerySaveDialog=False
+current_app = ""
+parent_hierarchy_count = 0
+last_parent = []
+flag_for_QuerySaveDialog = False
-def __init__(self , input_address , output_address):
-self.ui_dsl_mm = metamodel_from_file('ui_logger_dsl_grammar.tx')
-self.output_stream=self.initiate_test_generation(output_address)
-self.input_address=input_address
+def __init__(self, input_address, output_address):
+self.ui_dsl_mm = metamodel_from_file("ui_logger_dsl_grammar.tx")
+self.output_stream = self.initiate_test_generation(output_address)
+self.input_address = input_address
-def get_log_file(self , input_address):
+def get_log_file(self, input_address):
try:
# load the program
content = self.ui_dsl_mm.model_from_file(input_address)
except IOError as err:
print("IO error: {0}".format(err))
-print("Use " + os.path.basename(sys.argv[0]) + " -h to get usage
instructions")
+print(
+"Use " + os.path.basename(sys.argv[0]) + " -h to get usage
instructions"
+)
sys.exit(1)
return content
-def initiate_test_generation(self,output_address):
+def initiate_test_generation(self, output_address):
self.last_parent.append("MainWindow")
try:
-f = open(output_address,"w")
+f = open(output_address, "w")
except IOError as err:
print("IO error: {0}".format(err))
-print("Use " + os.path.basename(sys.argv[0]) + " -h to get usage
instructions")
+print(
+"Use " + os.path.basename(sys.argv[0]) + " -h to get usage
instructions"
+)
sys.exit(1)
-line="# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4
-*-\n\n" + \
-"from uitest.framework import UITestCase\n" + \
-"from libreoffice.uno.propertyvalue import mkPropertyValues\n" + \
-"import importlib\n\n" + \
-"class TestClass(UITestCase):\n" + \
-tab+"def test_function(self):\n"
+line = (
+"# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4
-*-\n\n"
++ "from uitest.framework import UITestCase\n"
++ "from libreoffice.uno.propertyvalue import mkPropertyValues\n"
++ "import importlib\n\n"
++ "class TestClass(UITestCase):\n"
++ tab
++ "def test_function(self):\n"
+)
self.variables.append(line)
return f
def compile(self):
-self.ui_dsl_mm.register_obj_processors({
-'UNOCommand': self.handle_uno,
-'StarterCommand': self.handle_start,
-'CloseDialog': self.handle_Dialog,
-'OpenModelessDialog': self.handle_Dialog,
-'OpenModalDialog':self.handle_Dialog,
-'ButtonUIObject':self.handle_button,
-'CheckBoxUIObject':self.handle_check_box,
-'TabControlUIObject':self.handle_tab,
-'ComboBoxUIObject':self.handle_Combo_box,
-'RadioButtonUIObject':self.handle_Radio_button,
-'ListBoxUIObject':self.handle_List_box,
-
[Libreoffice-commits] core.git: Branch 'private/EL-SHREIF/ui_logger' - sc/source sw/source vcl/source
sc/source/core/data/document.cxx |2 +-
sc/source/ui/view/viewdata.cxx |2 +-
sc/source/ui/view/viewfun2.cxx |2 +-
sc/source/ui/view/viewfun3.cxx |2 +-
sc/source/ui/view/viewfunc.cxx |2 +-
sw/source/core/edit/edtab.cxx|2 +-
sw/source/uibase/dochdl/swdtflvr.cxx |2 +-
sw/source/uibase/wrtsh/wrtsh1.cxx|2 +-
vcl/source/uitest/logger.cxx | 10 +-
vcl/source/uitest/uiobject.cxx | 20 ++--
10 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit fb4360cf8c18ab1c4d7e1631f7d5101342573739
Author: Ahmed ElShreif
AuthorDate: Sun Aug 18 12:24:08 2019 -0500
Commit: Ahmed ElShreif
CommitDate: Sun Aug 18 12:54:50 2019 -0500
uitest: Fix Jenkins errors while building
Change-Id: I51b849d39d541ac5af372d969de8c5d39edefc0a
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index d0a6043c7565..26e44b2a1784 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -109,7 +109,7 @@ using ::std::set;
namespace {
-void collectUIInformation(const std::map&
aParameters,const OUString action)
+void collectUIInformation(const std::map&
aParameters,const OUString& action)
{
EventDescription aDescription;
aDescription.aID = "grid_window";
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index d5b80a363cb9..9152d61b4a5e 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -97,7 +97,7 @@ void lcl_LOKRemoveWindow(ScTabViewShell* pTabViewShell,
ScSplitPos eWhich)
namespace {
-void collectUIInformation(const std::map&
aParameters,const OUString action)
+void collectUIInformation(const std::map&
aParameters,const OUString& action)
{
EventDescription aDescription;
aDescription.aID = "grid_window";
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index f01fbff2ccf6..eccd19f2b215 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -104,7 +104,7 @@ using ::editeng::SvxBorderLine;
namespace {
-void collectUIInformation(const std::map&
aParameters,const OUString action)
+void collectUIInformation(const std::map&
aParameters,const OUString& action)
{
EventDescription aDescription;
aDescription.aID = "grid_window";
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index d818f2389d60..0e3e8de2fba5 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -80,7 +80,7 @@ using namespace com::sun::star;
namespace {
-void collectUIInformation(const std::map&
aParameters,OUString action)
+void collectUIInformation(const std::map&
aParameters,OUString& action)
{
EventDescription aDescription;
aDescription.aID = "grid_window";
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index b664263aafdc..83cc4bc4f618 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -112,7 +112,7 @@ ScViewFunc::~ScViewFunc()
namespace {
-void collectUIInformation(const std::map&
aParameters,const OUString action)
+void collectUIInformation(const std::map&
aParameters,const OUString& action)
{
EventDescription aDescription;
aDescription.aID = "grid_window";
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 905b426f3d26..b4dfa6ce4bff 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
namespace {
-void collectUIInformation(const OUString action,const OUString aParameters)
+void collectUIInformation(const OUString& action,const OUString& aParameters)
{
EventDescription aDescription;
aDescription.aAction = action;
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index e97ca1523eff..abe92248c1d7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -164,7 +164,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::datatransfer;
namespace {
-void collectUIInformation(const OUString action,const OUString aParameters)
+void collectUIInformation(const OUString& action,const OUString& aParameters)
{
EventDescription aDescription;
aDescription.aAction = action;
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index b4e836b6dc35..42241f4c8b01 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -121,7 +121,7 @@ using namespace sw::mark;
using namespace com::sun::star;
namespace {
-void collectUIInformation(const OUString action,const OUString aParameters)
+void collectUIInformation(const OUString& action,const OUString& aParameters)
{
EventDescription aDescription;
aDescription.aAction = action;
d
[Libreoffice-commits] core.git: Branch 'feature/gsoc-uitest-2019' - include/vcl vcl/source
Rebased ref, commits from common ancestor:
commit 68973ed3d9d5e125fc7142e512c10d97dd41b865
Author: Markus Mohrhard
AuthorDate: Sun Aug 18 23:34:32 2019 +0800
Commit: Markus Mohrhard
CommitDate: Mon Aug 19 00:35:10 2019 +0800
uitest: fixed for formatting and plugin stringconstant
Change-Id: Id657c19223f20d1175f9a774357e8b1f11344fdf
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 6c8c5008541a..450285c5c247 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -15,10 +15,32 @@
#include
#include
-namespace com { namespace sun { namespace star {
-namespace beans { struct PropertyValue; }
-} } }
-namespace com { namespace sun { namespace star { namespace uno { template
class Sequence; } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template class Sequence;
+}
+}
+}
+}
struct EventDescription;
class Control;
@@ -27,7 +49,6 @@ class KeyEvent;
class UITEST_DLLPUBLIC UITestLogger
{
private:
-
SvFileStream maStream;
bool mbValid;
@@ -35,29 +56,24 @@ private:
OUString app_name;
public:
-
UITestLogger();
-void logCommand(const OUString& rAction, const
css::uno::Sequence& rArgs);
+void logCommand(const OUString& rAction,
+const css::uno::Sequence&
rArgs);
-void logAction(VclPtr const & xUIElement, VclEventId nEvent);
+void logAction(VclPtr const& xUIElement, VclEventId nEvent);
void log(const OUString& rString);
-void logKeyInput(VclPtr const & xUIElement, const KeyEvent&
rEvent);
+void logKeyInput(VclPtr const& xUIElement, const KeyEvent&
rEvent);
void logEvent(const EventDescription& rDescription);
static UITestLogger& getInstance();
-void setAppName(OUString name){
-app_name=name;
-}
-
-OUString getAppName(){
-return app_name;
-}
+void setAppName(OUString name) { app_name = name; }
+OUString getAppName() { return app_name; }
};
#endif
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 0ecd673f9879..03c439fcbd7c 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -20,9 +20,9 @@
#include
#include
-namespace{
-
-bool isDialogWindow(vcl::Window const * pWindow)
+namespace
+{
+bool isDialogWindow(vcl::Window const* pWindow)
{
WindowType nType = pWindow->GetType();
// DIALOG to MODALDIALOG
@@ -39,7 +39,7 @@ bool isDialogWindow(vcl::Window const * pWindow)
return false;
}
-bool isTopWindow(vcl::Window const * pWindow)
+bool isTopWindow(vcl::Window const* pWindow)
{
WindowType eType = pWindow->GetType();
if (eType == WindowType::FLOATINGWINDOW)
@@ -60,17 +60,16 @@ vcl::Window* get_top_parent(vcl::Window* pWindow)
return get_top_parent(pParent);
}
-
-
}
-UITestLogger::UITestLogger():
-maStream(),
-mbValid(false)
+UITestLogger::UITestLogger()
+: maStream()
+, mbValid(false)
{
static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
if (pFile)
{
-OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
+ "/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/uitest/");
rtl::Bootstrap::expandMacros(aDirPath);
osl::Directory::createPath(aDirPath);
OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
@@ -80,7 +79,8 @@ UITestLogger::UITestLogger():
}
}
-void UITestLogger::logCommand(const OUString& rAction, const
css::uno::Sequence< css::beans::PropertyValue >& rArgs)
+void UITestLogger::logCommand(const OUString& rAction,
+ const
css::uno::Sequence& rArgs)
{
if (!mbValid)
return;
@@ -126,10 +126,10 @@ void UITestLogger::logCommand(const OUString& rAction,
const css::uno::Sequence<
maStream.WriteLine(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8));
}
-namespace {
-
+namespace
+{
// most likely this should be recursive
-bool child_windows_have_focus(VclPtr const & xUIElement)
+bool child_windows_have_focus(VclPtr const& xUIElement)
{
sal_Int32 nCount = xUIElement->GetChildCount();
for (sal_Int32 i = 0; i < nCount; ++i)
@@ -144,10 +144,9 @@ bool child_windows_have_focus(VclPtr const &
xUIElement)
}
return false;
}
-
}
-void UITestLogger::logAction(VclPtr const & xUIElement, VclEventId
nEvent)
+void UITestLogger::logAction(VclPtr const& xUIElement, VclEventId
nEvent)
{
if (!mbValid)
return;
@@ -177,14 +176,14 @@ void UITestLogger::log(const OUString& rString)
maStream.WriteLine(OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
}
-void UITestLogger::logKeyInput(VclPtr const & xUIElement, const
KeyEvent& r
[Libreoffice-commits] core.git: Branch 'feature/gsoc-uitest-2019' - include/vcl vcl/source
Rebased ref, commits from common ancestor:
commit 94e98f8fae5283eecdb56dc84c56739fc9d7d75e
Author: Markus Mohrhard
AuthorDate: Sun Aug 18 23:34:32 2019 +0800
Commit: Markus Mohrhard
CommitDate: Mon Aug 19 00:16:37 2019 +0800
uitest: fixed for formatting and plugin stringconstant
Change-Id: Id657c19223f20d1175f9a774357e8b1f11344fdf
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 6c8c5008541a..450285c5c247 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -15,10 +15,32 @@
#include
#include
-namespace com { namespace sun { namespace star {
-namespace beans { struct PropertyValue; }
-} } }
-namespace com { namespace sun { namespace star { namespace uno { template
class Sequence; } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template class Sequence;
+}
+}
+}
+}
struct EventDescription;
class Control;
@@ -27,7 +49,6 @@ class KeyEvent;
class UITEST_DLLPUBLIC UITestLogger
{
private:
-
SvFileStream maStream;
bool mbValid;
@@ -35,29 +56,24 @@ private:
OUString app_name;
public:
-
UITestLogger();
-void logCommand(const OUString& rAction, const
css::uno::Sequence& rArgs);
+void logCommand(const OUString& rAction,
+const css::uno::Sequence&
rArgs);
-void logAction(VclPtr const & xUIElement, VclEventId nEvent);
+void logAction(VclPtr const& xUIElement, VclEventId nEvent);
void log(const OUString& rString);
-void logKeyInput(VclPtr const & xUIElement, const KeyEvent&
rEvent);
+void logKeyInput(VclPtr const& xUIElement, const KeyEvent&
rEvent);
void logEvent(const EventDescription& rDescription);
static UITestLogger& getInstance();
-void setAppName(OUString name){
-app_name=name;
-}
-
-OUString getAppName(){
-return app_name;
-}
+void setAppName(OUString name) { app_name = name; }
+OUString getAppName() { return app_name; }
};
#endif
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 0ecd673f9879..03c439fcbd7c 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -20,9 +20,9 @@
#include
#include
-namespace{
-
-bool isDialogWindow(vcl::Window const * pWindow)
+namespace
+{
+bool isDialogWindow(vcl::Window const* pWindow)
{
WindowType nType = pWindow->GetType();
// DIALOG to MODALDIALOG
@@ -39,7 +39,7 @@ bool isDialogWindow(vcl::Window const * pWindow)
return false;
}
-bool isTopWindow(vcl::Window const * pWindow)
+bool isTopWindow(vcl::Window const* pWindow)
{
WindowType eType = pWindow->GetType();
if (eType == WindowType::FLOATINGWINDOW)
@@ -60,17 +60,16 @@ vcl::Window* get_top_parent(vcl::Window* pWindow)
return get_top_parent(pParent);
}
-
-
}
-UITestLogger::UITestLogger():
-maStream(),
-mbValid(false)
+UITestLogger::UITestLogger()
+: maStream()
+, mbValid(false)
{
static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
if (pFile)
{
-OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
+ "/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/uitest/");
rtl::Bootstrap::expandMacros(aDirPath);
osl::Directory::createPath(aDirPath);
OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
@@ -80,7 +79,8 @@ UITestLogger::UITestLogger():
}
}
-void UITestLogger::logCommand(const OUString& rAction, const
css::uno::Sequence< css::beans::PropertyValue >& rArgs)
+void UITestLogger::logCommand(const OUString& rAction,
+ const
css::uno::Sequence& rArgs)
{
if (!mbValid)
return;
@@ -126,10 +126,10 @@ void UITestLogger::logCommand(const OUString& rAction,
const css::uno::Sequence<
maStream.WriteLine(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8));
}
-namespace {
-
+namespace
+{
// most likely this should be recursive
-bool child_windows_have_focus(VclPtr const & xUIElement)
+bool child_windows_have_focus(VclPtr const& xUIElement)
{
sal_Int32 nCount = xUIElement->GetChildCount();
for (sal_Int32 i = 0; i < nCount; ++i)
@@ -144,10 +144,9 @@ bool child_windows_have_focus(VclPtr const &
xUIElement)
}
return false;
}
-
}
-void UITestLogger::logAction(VclPtr const & xUIElement, VclEventId
nEvent)
+void UITestLogger::logAction(VclPtr const& xUIElement, VclEventId
nEvent)
{
if (!mbValid)
return;
@@ -177,14 +176,14 @@ void UITestLogger::log(const OUString& rString)
maStream.WriteLine(OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
}
-void UITestLogger::logKeyInput(VclPtr const & xUIElement, const
KeyEvent& r
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagram.cxx | 38 +++
oox/source/drawingml/diagram/diagram.hxx |4 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
New commits:
commit 8639ef9b70b8242651ef4d1a3b23b8c8eeeda52b
Author: Grzegorz Araminowicz
AuthorDate: Sun Aug 18 16:27:54 2019 +0200
Commit: Grzegorz Araminowicz
CommitDate: Sun Aug 18 18:09:28 2019 +0200
SmartArt: implement DiagramData::getString()
Allows to get data representation of diagram as text.
It will be useful as a starting point for displaying data on diagram dialog.
Change-Id: I9765d7de64a68224a6d36b7c3bc4862ce6610bdf
Reviewed-on: https://gerrit.libreoffice.org/77669
Tested-by: Jenkins
Reviewed-by: Grzegorz Araminowicz
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index 2c0c47899ffa..fb1fc916c349 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -100,6 +100,44 @@ void DiagramData::dump() const
rPoint.dump();
}
+void DiagramData::getChildrenString(OUStringBuffer& rBuf, const dgm::Point*
pPoint, sal_Int32 nLevel) const
+{
+if (!pPoint)
+return;
+
+if (nLevel > 0)
+{
+for (sal_Int32 i = 0; i < nLevel-1; i++)
+rBuf.append('\t');
+rBuf.append('+');
+rBuf.append(' ');
+
rBuf.append(pPoint->mpShape->getTextBody()->getParagraphs().front()->getRuns().front()->getText());
+rBuf.append('\n');
+}
+
+std::vector aChildren;
+for (const auto& rCxn : maConnections)
+if (rCxn.mnType == XML_parOf && rCxn.msSourceId == pPoint->msModelId)
+{
+if (rCxn.mnSourceOrder >= static_cast(aChildren.size()))
+aChildren.resize(rCxn.mnSourceOrder + 1);
+const auto pChild = maPointNameMap.find(rCxn.msDestId);
+if (pChild != maPointNameMap.end())
+aChildren[rCxn.mnSourceOrder] = pChild->second;
+}
+
+for (auto pChild : aChildren)
+getChildrenString(rBuf, pChild, nLevel + 1);
+}
+
+OUString DiagramData::getString() const
+{
+OUStringBuffer aBuf;
+const dgm::Point* pPoint = getRootPoint();
+getChildrenString(aBuf, pPoint, 0);
+return aBuf.makeStringAndClear();
+}
+
#ifdef DEBUG_OOX_DIAGRAM
OString normalizeDotName( const OUString& rStr )
{
diff --git a/oox/source/drawingml/diagram/diagram.hxx
b/oox/source/drawingml/diagram/diagram.hxx
index 656caacadb3a..62609b39fab1 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -192,9 +192,11 @@ public:
{ return maExtDrawings; }
const dgm::Point* getRootPoint() const;
void dump() const;
-OUString getString() const override { return OUString(); }
+OUString getString() const override;
private:
+void getChildrenString(OUStringBuffer& rBuf, const dgm::Point* pPoint,
sal_Int32 nLevel) const;
+
::std::vector maExtDrawings;
FillPropertiesPtr mpFillProperties;
dgm::Connections maConnections;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-uitest-2019' - include/vcl vcl/source
include/vcl/uitest/logger.hxx | 48 +++--
vcl/source/uitest/logger.cxx | 344 +++---
2 files changed, 227 insertions(+), 165 deletions(-)
New commits:
commit e30c3c783b5d610407e63fbfe991552289f732d5
Author: Markus Mohrhard
AuthorDate: Sun Aug 18 23:34:32 2019 +0800
Commit: Markus Mohrhard
CommitDate: Sun Aug 18 23:36:09 2019 +0800
uitest: fixed for formatting and plugin stringconstant
Change-Id: Id657c19223f20d1175f9a774357e8b1f11344fdf
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 6c8c5008541a..450285c5c247 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -15,10 +15,32 @@
#include
#include
-namespace com { namespace sun { namespace star {
-namespace beans { struct PropertyValue; }
-} } }
-namespace com { namespace sun { namespace star { namespace uno { template
class Sequence; } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template class Sequence;
+}
+}
+}
+}
struct EventDescription;
class Control;
@@ -27,7 +49,6 @@ class KeyEvent;
class UITEST_DLLPUBLIC UITestLogger
{
private:
-
SvFileStream maStream;
bool mbValid;
@@ -35,29 +56,24 @@ private:
OUString app_name;
public:
-
UITestLogger();
-void logCommand(const OUString& rAction, const
css::uno::Sequence& rArgs);
+void logCommand(const OUString& rAction,
+const css::uno::Sequence&
rArgs);
-void logAction(VclPtr const & xUIElement, VclEventId nEvent);
+void logAction(VclPtr const& xUIElement, VclEventId nEvent);
void log(const OUString& rString);
-void logKeyInput(VclPtr const & xUIElement, const KeyEvent&
rEvent);
+void logKeyInput(VclPtr const& xUIElement, const KeyEvent&
rEvent);
void logEvent(const EventDescription& rDescription);
static UITestLogger& getInstance();
-void setAppName(OUString name){
-app_name=name;
-}
-
-OUString getAppName(){
-return app_name;
-}
+void setAppName(OUString name) { app_name = name; }
+OUString getAppName() { return app_name; }
};
#endif
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 0ecd673f9879..5ea440216980 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -20,9 +20,9 @@
#include
#include
-namespace{
-
-bool isDialogWindow(vcl::Window const * pWindow)
+namespace
+{
+bool isDialogWindow(vcl::Window const* pWindow)
{
WindowType nType = pWindow->GetType();
// DIALOG to MODALDIALOG
@@ -39,7 +39,7 @@ bool isDialogWindow(vcl::Window const * pWindow)
return false;
}
-bool isTopWindow(vcl::Window const * pWindow)
+bool isTopWindow(vcl::Window const* pWindow)
{
WindowType eType = pWindow->GetType();
if (eType == WindowType::FLOATINGWINDOW)
@@ -60,17 +60,16 @@ vcl::Window* get_top_parent(vcl::Window* pWindow)
return get_top_parent(pParent);
}
-
-
}
-UITestLogger::UITestLogger():
-maStream(),
-mbValid(false)
+UITestLogger::UITestLogger()
+: maStream()
+, mbValid(false)
{
static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
if (pFile)
{
-OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
+ "/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/uitest/");
rtl::Bootstrap::expandMacros(aDirPath);
osl::Directory::createPath(aDirPath);
OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
@@ -80,7 +79,8 @@ UITestLogger::UITestLogger():
}
}
-void UITestLogger::logCommand(const OUString& rAction, const
css::uno::Sequence< css::beans::PropertyValue >& rArgs)
+void UITestLogger::logCommand(const OUString& rAction,
+ const
css::uno::Sequence& rArgs)
{
if (!mbValid)
return;
@@ -126,10 +126,10 @@ void UITestLogger::logCommand(const OUString& rAction,
const css::uno::Sequence<
maStream.WriteLine(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8));
}
-namespace {
-
+namespace
+{
// most likely this should be recursive
-bool child_windows_have_focus(VclPtr const & xUIElement)
+bool child_windows_have_focus(VclPtr const& xUIElement)
{
sal_Int32 nCount = xUIElement->GetChildCount();
for (sal_Int32 i = 0; i < nCount; ++i)
@@ -144,10 +144,9 @@ bool child_windows_have_focus(VclPtr const &
xUIElement)
}
return false;
}
-
}
-void UITestLogger::logAction(VclPtr const & xUIElement, VclEventId
nEvent)
+void UITestLogger::logAction(VclPtr const& xUIElement, VclEventId
nEvent)
{
if (!mbValid)
return;
@@ -177,14 +176,14 @@ void UITestLogger::log(const OUString& rString)
maS
[Libreoffice-commits] core.git: bridges/source sc/source svx/uiconfig
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |2 +-
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
svx/uiconfig/ui/sidebarstylespanel.ui |6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 935a2fa0f7ee5dbe6402e0d202a581c05a7b01a2
Author: Andrea Gelmini
AuthorDate: Sun Aug 18 14:39:29 2019 +0200
Commit: Andrea Gelmini
CommitDate: Sun Aug 18 17:21:40 2019 +0200
Fix typos
It passed "make check" on Linux
Change-Id: Ibda74a6c5bd50bac7af3b3af1f294817c3e406cc
Reviewed-on: https://gerrit.libreoffice.org/77667
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 477879f2f2a0..a07365a5943e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -198,7 +198,7 @@ StructKind getStructKind(typelib_CompoundTypeDescription
const * type) {
case STRUCT_KIND_EMPTY:
// this means an empty sub-object, which nevertheless obtains a
byte
// of storage (TODO: does it?), so the full object cannot be a
-// homogenous collection of float or double
+// homogeneous collection of float or double
case STRUCT_KIND_POD:
assert(k != STRUCT_KIND_DTOR);
k = STRUCT_KIND_POD;
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 27c981758b8a..8948160c4695 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -964,7 +964,7 @@ size_t DynamicKernelStringArgument::Marshal( cl_kernel k,
int argno, int, cl_pro
return 1;
}
-/// A mixed string/numberic vector
+/// A mixed string/numeric vector
class DynamicKernelMixedArgument : public VectorRef
{
public:
@@ -1212,7 +1212,7 @@ protected:
std::shared_ptr mpCodeGen;
};
-/// A mixed string/numberic vector
+/// A mixed string/numeric vector
class DynamicKernelMixedSlidingArgument : public VectorRef
{
public:
diff --git a/svx/uiconfig/ui/sidebarstylespanel.ui
b/svx/uiconfig/ui/sidebarstylespanel.ui
index afdc241ab750..a4955472f50d 100644
--- a/svx/uiconfig/ui/sidebarstylespanel.ui
+++ b/svx/uiconfig/ui/sidebarstylespanel.ui
@@ -33,7 +33,7 @@
True
-True
+True
@@ -67,7 +67,7 @@
True
-True
+True
@@ -90,7 +90,7 @@
True
-True
+True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc
framework/inc/dispatch/closedispatcher.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5f367bb7e66ca1f86557ee6770f9c50e298dba69 Author: Andrea Gelmini AuthorDate: Sun Aug 18 15:51:10 2019 +0200 Commit: Julien Nabet CommitDate: Sun Aug 18 16:54:52 2019 +0200 Fix typo Change-Id: Icb8ed2dcaecc718137646236274f3a5d3df47531 Reviewed-on: https://gerrit.libreoffice.org/73694 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 54224b7af9a0..d0ed8e8bbf87 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -86,8 +86,8 @@ class CloseDispatcher : public ::cppu::WeakImplHelper< css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame; /** @short used for asynchronous callbacks within the main thread. -@descr Internally we work asynchronous. Because our callis -are not aware, that her request can kill its own environment... */ +@descr Internally we work asynchronously. Because our callees +are not aware that their request can kill its own environment... */ std::unique_ptr m_aAsyncCallback; /** @short used inside asynchronous callback to decide, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/gsoc-uitest-2019'
New branch 'feature/gsoc-uitest-2019' available with the following commits: commit d4183e69c9988ce83f19b67972d0535a654a Author: Ahmed ElShreif Date: Sat Aug 17 21:37:21 2019 -0500 uitest: add the SideBar implementation Change-Id: I7de9bd97e868624476b5c39a5e37afc945206e4e commit fe39679b306129c2f3c06f27790146ecc30770a5 Author: Ahmed ElShreif Date: Fri Aug 16 21:56:42 2019 -0500 uitest: ignore the logging part of the QuerySaveDialog while closing the app Change-Id: I18fcc81fa54362dfaa574ec04125e66b37a5aad8 commit 1944bf8fb8e97a3c1b98a0bb71a9a7fe70579f54 Author: Ahmed ElShreif Date: Thu Aug 15 22:48:14 2019 -0500 uitest: use prefix for names that has conflict with python's keywords Change-Id: I01d044a96eeae60a070a5ca0fc8d6105d7333414 commit abce92813f2db94feb41c3d0f12ae7ad205eec6a Author: Ahmed ElShreif Date: Thu Aug 15 12:24:09 2019 -0500 uitest: replace tabs with spaces Change-Id: I40779dfdb65037838e1a1b7bed5d89a656047ce6 commit fe2237fb94f5f4f196f1efa157febd10221bfd7b Author: Ahmed ElShreif Date: Tue Aug 13 12:23:06 2019 -0500 uitest: add footer line support Change-Id: I740995d811be030f406f9d3ff53c56d28af2b786 commit 6c0dee555491f9624596c8c2ddd9463a9777d9be Author: Ahmed ElShreif Date: Fri Aug 9 23:23:11 2019 -0500 uitest: solve problem with un-named parents 1) Add recursively query for the parent until find an parent with a name. 2) Remove the parent part "from xx" from the log statment if there is un-named parent 3) Update the compiler to use the most top parent if there is command with no un-named parent Change-Id: Id7dd5092bc995312494b5536720141908e73af9a commit d3019d6d732e3072b0a71da05973107fc8cb5ae1 Author: Ahmed ElShreif Date: Sun Aug 4 13:42:09 2019 -0500 uitest: log more events in Calc: 1) Rename Tab 2) Insert Tab Change-Id: I7a653a4b274c0c8058672c5b0aa1645bb5a51e3a commit d340256bb2ac95367c68aad947a94f17a4796528 Author: Ahmed ElShreif Date: Sat Aug 3 11:51:11 2019 -0500 uitest: log more events Impress: 1) Delete Slide 2) Duplicate Slide 3) Rename Slide Draw: 1) Delte Page 2) Rename Page Change-Id: I124bdf96c58dfe00bdb039c5e93afc0dc6e7163d commit c37f0153c76f280ea893a9c9cf19cd491b81092e Author: Ahmed ElShreif Date: Fri Aug 2 22:16:31 2019 -0500 uitest: add more events to ui logger for Impress: add new Slide for Draw: add new Page Modify the UILogger System to save information about the name of the app Change-Id: I87fd98b2a11783e3410f1c0eba633631addf389b commit 5c638b0dd26d4dcd766b55bb8b7bccfd8b598566 Author: Ahmed ElShreif Date: Mon Jul 29 00:29:24 2019 -0500 uitest: start logging draw events Change-Id: I1b77b106db181a8cadc1ff0b2a5de6ad19fe6762 commit a41834c71a0a6f10c0b4beb879cce903ec63f01f Author: Ahmed ElShreif Date: Sun Jul 28 23:07:25 2019 -0500 uitest: update UI logger grammar 1) Make small changes in the UI logger Grammar 2) Add Comments to be more documented Change-Id: I5e68c33375870cf4a1f2537ee1a7eb997145f24f commit 0b64657a1c8149e89eea8ad8ed46818e6675bbb4 Author: Ahmed ElShreif Date: Thu Jul 18 13:53:08 2019 -0500 uitest: log more events for Calc: 1) Delete some Cells 2) Remove content from some cells 3) Insert Cells 4) Cut Cells 5) Copy Cells 6) Paste Cells 7) Merge Cells 8) Split Cell ( Delete Merge ) for Writer: 1) Insert Table 2) Copy Text 3) Cut Text 4) Paste Text 5) Inser Break Page Also, Solve some bugs in the UI logger and UNO Commands. Change-Id: Ic7cacbc20e1e400900a9760b61e8b45ae96c84ff commit dcceafbda6b998e4e9d4443f109b56e856290ca7 Author: Ahmed ElShreif Date: Thu Jul 18 12:25:05 2019 -0500 uitest: solve some bugs in the ui logger Change-Id: I39836423fad8cb361a8f007f648108618906be8a commit e6257cb6d6491c950095e52e60066d858569727b Author: Ahmed ElShreif Date: Sat Jul 13 15:09:25 2019 +0200 uitest: add general functions to remove redundunt lines 1) init_app 2) init_Object 3) write_line_without_parameters 4) write_line_with_one_parameters Then Rewrite the handlers again Change-Id: I8ceb01f4eaa48f1544ada8966c7585dcbd3e15aa commit fc32bf8919f28e5f9f82c94eeca604b5ba93397d Author: Ahmed ElShreif Date: Sat Jul 13 14:39:17 2019 +0200 uitest: add more DSL commands 1) Calc (calc_Type_command - calc_switch_sheet - calc_Select_cell - calc_AutoFill_filter) 2) impress (impress_Type_command) 3) math (math_element_selector - math_Type_command) 4) General Commands Compiler: (setZoom_command) Change-Id: Ifd2608c38474633b579a216356fe53c859c24975 commit a2145a52098882bc095761d7dbc50aec4d47662c Author: Ahmed ElShreif Date: Sun Jul 7 00:5
[Libreoffice-commits] core.git: uui/source xmlhelp/source
uui/source/interactionhandler.cxx | 10 --
xmlhelp/source/treeview/tvfactory.cxx |5 +
2 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 51a30d7daee8779ef51d8db58559e4fe15665d1b
Author: Julien Nabet
AuthorDate: Sun Aug 18 13:38:16 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 14:32:56 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in uui, xmlhelp
Change-Id: I588ed4154e6b21e178f2466c58abc08562eddf80
Reviewed-on: https://gerrit.libreoffice.org/77663
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/uui/source/interactionhandler.cxx
b/uui/source/interactionhandler.cxx
index 71286345a177..df06d4ea1d0e 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -91,13 +91,11 @@ UUIInteractionHandler::supportsService(OUString const &
rServiceName)
uno::Sequence< OUString > SAL_CALL
UUIInteractionHandler::getSupportedServiceNames()
{
-uno::Sequence< OUString > aNames(3);
-aNames[0] = "com.sun.star.task.InteractionHandler";
-// added to indicate support for configuration.backend.MergeRecoveryRequest
-aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
-aNames[2] = "com.sun.star.uui.InteractionHandler";
+return { "com.sun.star.task.InteractionHandler",
+ // added to indicate support for configuration.backend.MergeRecoveryRequest
+ "com.sun.star.configuration.backend.InteractionHandler",
// for backwards compatibility
-return aNames;
+ "com.sun.star.uui.InteractionHandler" };
}
void SAL_CALL
diff --git a/xmlhelp/source/treeview/tvfactory.cxx
b/xmlhelp/source/treeview/tvfactory.cxx
index 73adce6ae7b4..e4fc02c58e41 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -131,10 +131,7 @@ TVFactory::getImplementationName_static()
Sequence< OUString >
TVFactory::getSupportedServiceNames_static()
{
-Sequence< OUString > seq( 2 );
-seq[0] = "com.sun.star.help.TreeView";
-seq[1] = "com.sun.star.ucb.HiearchyDataSource";
-return seq;
+return { "com.sun.star.help.TreeView",
"com.sun.star.ucb.HiearchyDataSource" };
}
Reference< XSingleServiceFactory >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/scanner/twain32shim.cxx | 136 +++---
1 file changed, 69 insertions(+), 67 deletions(-)
New commits:
commit ed128e17e7f090af06dfe5776a238c40f3a68fc9
Author: Mike Kaganski
AuthorDate: Sun Aug 18 10:53:19 2019 +0200
Commit: Mike Kaganski
CommitDate: Sun Aug 18 13:41:43 2019 +0200
Use mnemonic TWAIN state names; some simplification
Change-Id: Ic3fc8a98b2ca7d4d699d08fdc1a653d4f44f71db
Reviewed-on: https://gerrit.libreoffice.org/77660
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/extensions/source/scanner/twain32shim.cxx
b/extensions/source/scanner/twain32shim.cxx
index f813ff83d4cb..8ccd2bd1b32d 100644
--- a/extensions/source/scanner/twain32shim.cxx
+++ b/extensions/source/scanner/twain32shim.cxx
@@ -49,13 +49,24 @@ public:
~ImpTwain();
private:
+enum class TWAINState
+{
+DSMunloaded = 1,
+DSMloaded = 2,
+DSMopened = 3,
+DSopened = 4,
+DSenabled = 5,
+DSreadyToXfer = 6,
+Xferring = 7,
+};
+
TW_IDENTITY m_aAppId;
TW_IDENTITY m_aSrcId;
DWORD m_nParentThreadId;
HANDLE m_hProc;
DSMENTRYPROC m_pDSM = nullptr;
HMODULE m_hMod = nullptr;
-ULONG_PTR m_nCurState = 1;
+TWAINState m_nCurState = TWAINState::DSMunloaded;
HWND m_hTwainWnd = nullptr;
HHOOK m_hTwainHook = nullptr;
HANDLE m_hMap = nullptr; // the *duplicated* handle
@@ -66,7 +77,7 @@ private:
static LRESULT CALLBACK WndProc(HWND hWnd, UINT nMsg, WPARAM wParam,
LPARAM lParam);
static LRESULT CALLBACK MsgHook(int nCode, WPARAM wParam, LPARAM lParam);
-void Destroy();
+void Destroy() { ImplFallback(TWAIN_EVENT_QUIT); }
bool SelectSource();
bool InitXfer();
@@ -199,15 +210,13 @@ ImpTwain::~ImpTwain()
UnhookWindowsHookEx(m_hTwainHook);
}
-void ImpTwain::Destroy() { ImplFallback(TWAIN_EVENT_QUIT); }
-
bool ImpTwain::SelectSource()
{
TW_UINT16 nRet = TWRC_FAILURE;
ImplOpenSourceManager();
-if (3 == m_nCurState)
+if (TWAINState::DSMopened == m_nCurState)
{
TW_IDENTITY aIdent;
@@ -217,8 +226,7 @@ bool ImpTwain::SelectSource()
nRet = m_pDSM(&m_aAppId, nullptr, DG_CONTROL, DAT_IDENTITY,
MSG_USERSELECT, &aIdent);
}
-ImplFallback(TWAIN_EVENT_QUIT);
-
+Destroy();
return (TWRC_SUCCESS == nRet);
}
@@ -228,34 +236,34 @@ bool ImpTwain::InitXfer()
ImplOpenSourceManager();
-if (3 == m_nCurState)
+if (TWAINState::DSMopened == m_nCurState)
{
ImplOpenSource();
-if (4 == m_nCurState)
+if (TWAINState::DSopened == m_nCurState)
bRet = ImplEnableSource();
}
if (!bRet)
-ImplFallback(TWAIN_EVENT_QUIT);
+Destroy();
return bRet;
}
void ImpTwain::ImplOpenSourceManager()
{
-if (1 == m_nCurState)
+if (TWAINState::DSMunloaded == m_nCurState)
{
if ((m_hMod = LoadLibraryW(L"TWAIN_32.DLL")))
{
-m_nCurState = 2;
+m_nCurState = TWAINState::DSMloaded;
m_pDSM = reinterpret_cast(GetProcAddress(m_hMod,
"DSM_Entry"));
if (m_pDSM
&& (m_pDSM(&m_aAppId, nullptr, DG_CONTROL, DAT_PARENT,
MSG_OPENDSM, &m_hTwainWnd)
== TWRC_SUCCESS))
{
-m_nCurState = 3;
+m_nCurState = TWAINState::DSMopened;
}
}
}
@@ -263,7 +271,7 @@ void ImpTwain::ImplOpenSourceManager()
void ImpTwain::ImplOpenSource()
{
-if (3 == m_nCurState)
+if (TWAINState::DSMopened == m_nCurState)
{
if ((m_pDSM(&m_aAppId, nullptr, DG_CONTROL, DAT_IDENTITY,
MSG_GETDEFAULT, &m_aSrcId)
== TWRC_SUCCESS)
@@ -279,7 +287,7 @@ void ImpTwain::ImplOpenSource()
GlobalUnlock(aCap.hContainer);
m_pDSM(&m_aAppId, &m_aSrcId, DG_CONTROL, DAT_CAPABILITY, MSG_SET,
&aCap);
GlobalFree(aCap.hContainer);
-m_nCurState = 4;
+m_nCurState = TWAINState::DSopened;
}
}
}
@@ -288,12 +296,12 @@ bool ImpTwain::ImplEnableSource()
{
bool bRet = false;
-if (4 == m_nCurState)
+if (TWAINState::DSopened == m_nCurState)
{
TW_USERINTERFACE aUI = { true, true, m_hTwainWnd };
NotifyParent(TWAIN_EVENT_SCANNING, 0);
-m_nCurState = 5;
+m_nCurState = TWAINState::DSenabled;
if (m_pDSM(&m_aAppId, &m_aSrcId, DG_CONTROL, DAT_USERINTERFACE,
MSG_ENABLEDS, &aUI)
== TWRC_SUCCESS)
@@ -303,7 +311,7 @@ bool ImpTwain::ImplEnableSource()
else
{
// dialog failed
-m_nCurState = 4;
+m_nCurState = TWAINState::DSopened;
}
}
@@ -317,58 +325,52 @@ void ImpTwain::NotifyParent(WPARAM nEvent, LPARAM lParam)
bool ImpTwain::ImplHandleMsg(MSG* pMsg)
{
-TW_UINT16 nRet;
-TW_EVENT aEvt = { pMsg, MSG_NULL };
+if (!m_pDSM)
+
[Libreoffice-commits] core.git: extensions/source
extensions/source/scanner/twain32shim.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 53e4d5fe73d98b109d79fc2c1f5032faea88afb9
Author: Mike Kaganski
AuthorDate: Sun Aug 18 10:43:51 2019 +0200
Commit: Mike Kaganski
CommitDate: Sun Aug 18 13:41:18 2019 +0200
tdf#126989: always terminate shim after fallback complete
It seems that DSM may not send MSG_CLOSEDSREQ (or we may already have
unloaded DSM), so don't rely on it.
Change-Id: I3ed2e0e70f4dc79c89b430b4bad6954bf9224c71
Reviewed-on: https://gerrit.libreoffice.org/77659
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/extensions/source/scanner/twain32shim.cxx
b/extensions/source/scanner/twain32shim.cxx
index 49d6787eb69f..f813ff83d4cb 100644
--- a/extensions/source/scanner/twain32shim.cxx
+++ b/extensions/source/scanner/twain32shim.cxx
@@ -511,8 +511,7 @@ void ImpTwain::ImplFallbackHdl(WPARAM nEvent)
{
if (nEvent > TWAIN_EVENT_NONE)
NotifyParent(nEvent, reinterpret_cast(m_hMap));
-if (nEvent == TWAIN_EVENT_QUIT)
-PostQuitMessage(0);
+PostQuitMessage(0);
bFallback = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/inc/apitools.hxx | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 9717d79beb5cb474717c111a5e7211b008e3031d
Author: Julien Nabet
AuthorDate: Sun Aug 18 11:28:43 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 13:33:38 2019 +0200
Simplify Sequence uses in dbaccess/source/inc/apitools.hxx
Change-Id: Iad57f019f020b1d37ff768d636322e2d0b32c695
Reviewed-on: https://gerrit.libreoffice.org/77662
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index a3e4228f9913..3271c35f6fba 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -95,8 +95,7 @@ public:
} \
css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static(
) \
{ \
-css::uno::Sequence< OUString > aSupported { serviceasciiname }; \
-return aSupported; \
+return { serviceasciiname }; \
} \
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname,
serviceasciiname1, serviceasciiname2)\
@@ -106,10 +105,7 @@ public:
} \
css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static(
) \
{ \
-css::uno::Sequence< OUString > aSupported(2); \
-aSupported[0] = serviceasciiname1;\
-aSupported[1] = serviceasciiname2;\
-return aSupported; \
+return { serviceasciiname1, serviceasciiname2 };\
} \
#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
@@ -117,7 +113,7 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
css::uno::Sequence< OUString > SAL_CALL
classname::getSupportedServiceNames( ) \
{ \
-return css::uno::Sequence< OUString > { serviceasciiname }; \
+return { serviceasciiname }; \
} \
@@ -126,7 +122,7 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
css::uno::Sequence< OUString > SAL_CALL
classname::getSupportedServiceNames( ) \
{ \
-return css::uno::Sequence< OUString > { serviceasciiname1,
serviceasciiname2 };\
+return { serviceasciiname1, serviceasciiname2 };\
}
@@ -146,7 +142,7 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
css::uno::Sequence< OUString > SAL_CALL
classname::getSupportedServiceNames( ) \
{ \
-return css::uno::Sequence< OUString > { serviceasciiname1,
serviceasciiname2, serviceasciiname3 }; \
+return { serviceasciiname1, serviceasciiname2, serviceasciiname3 }; \
} \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source include/oox include/sfx2 include/svtools include/svx include/vcl sd/inc sd/source svtools/source svx/source sw/source vcl/source
compilerplugins/clang/unusedmethods.results| 260 - compilerplugins/clang/unusedmethods.unused-returns.results | 58 +- dbaccess/source/ui/dlg/adminpages.hxx | 22 + include/oox/ole/axcontrol.hxx |2 include/sfx2/sidebar/Deck.hxx |1 include/svtools/simptabl.hxx |4 include/svx/colorbox.hxx |4 include/svx/fntctrl.hxx|8 include/svx/txencbox.hxx |5 include/vcl/button.hxx |4 include/vcl/svtabbx.hxx|2 sd/inc/sdabstdlg.hxx |1 sd/source/ui/dlg/sddlgfact.cxx |5 sd/source/ui/dlg/sddlgfact.hxx |1 svtools/source/contnr/simptabl.cxx | 15 svx/source/dialog/fntctrl.cxx | 38 + svx/source/dialog/txencbox.cxx |8 sw/source/uibase/inc/numfmtlb.hxx | 11 vcl/source/treelist/svtabbx.cxx| 21 + 19 files changed, 274 insertions(+), 196 deletions(-) New commits: commit 25cce7cd249379f0a98fddc63327b38bd2e48882 Author: Noel Grandin AuthorDate: Sun Aug 18 08:05:10 2019 +0200 Commit: Noel Grandin CommitDate: Sun Aug 18 12:35:08 2019 +0200 Revert "loplugin:unusedmethods" This reverts commit 7990680e92e4fba376ef4f9346d1bc53661bde30. screenshot build is failing Change-Id: Idfe4cac73edaf9be1e704c0bd734e858643defda Reviewed-on: https://gerrit.libreoffice.org/77654 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 1b40d0def1e2..b694a86f18fb 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -38,9 +38,9 @@ connectivity/source/drivers/firebird/Util.hxx:78 const class rtl::OUString & connectivity::firebird::ColumnTypeInfo::getCharacterSet() const connectivity/source/drivers/mork/mork_helper.cxx:37 int main(int,char **) -connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:96 +connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:95 type-parameter-?-? connectivity::mysqlc::OPreparedResultSet::safelyRetrieveValue(const int) -connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:97 +connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:96 type-parameter-?-? connectivity::mysqlc::OPreparedResultSet::retrieveValue(const int) connectivity/source/inc/dbase/dindexnode.hxx:70 _Bool connectivity::dbase::ONDXKey::operator<(const class connectivity::dbase::ONDXKey &) const @@ -64,54 +64,46 @@ connectivity/source/inc/OTypeInfo.hxx:46 _Bool connectivity::OTypeInfo::operator==(const struct connectivity::OTypeInfo &) const connectivity/source/inc/OTypeInfo.hxx:47 _Bool connectivity::OTypeInfo::operator!=(const struct connectivity::OTypeInfo &) const -cui/source/dialogs/SpellAttrib.hxx:73 +cui/source/dialogs/SpellAttrib.hxx:75 _Bool svx::SpellErrorDescription::operator==(const struct svx::SpellErrorDescription &) const -cui/source/inc/cfgutil.hxx:142 +cui/source/inc/cfgutil.hxx:143 _Bool CuiConfigFunctionListBox::get_iter_first(class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:144 +cui/source/inc/cfgutil.hxx:145 _Bool CuiConfigFunctionListBox::iter_next(class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:147 +cui/source/inc/cfgutil.hxx:148 class rtl::OUString CuiConfigFunctionListBox::get_text(const class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:150 +cui/source/inc/cfgutil.hxx:151 class rtl::OUString CuiConfigFunctionListBox::get_id(int) const -cui/source/inc/cfgutil.hxx:164 +cui/source/inc/cfgutil.hxx:165 int CuiConfigFunctionListBox::get_selected_index() const -cui/source/inc/CustomNotebookbarGenerator.hxx:31 +cui/source/inc/CustomNotebookbarGenerator.hxx:30 CustomNotebookbarGenerator::CustomNotebookbarGenerator() -cui/source/inc/hangulhanjadlg.hxx:244 +cui/source/inc/hangulhanjadlg.hxx:245 class rtl::OUString svx::SuggestionEdit::get_text() const -cui/source/inc/SvxNotebookbarConfigPage.hxx:40 +cui/source/inc/SvxNotebookbarConfigPage.hxx:51 void SvxNotebookbarConfigPage::SetElement() dbaccess/source/filter/hsqldb/fbalterparser.hxx:20 void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const dbaccess/source/filter/hsqldb/parseschema.hxx:82 const class std::__debug::map >, struct std::less, class std::allocator > > > > & dbahsql::SchemaParser::getPrimaryKeys() const -dbaccess/source/ui/dlg/adminpages.hxx:48 - dbaui::OSaveValueWrapper:
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/acccell.cxx|6 +-
sw/source/core/access/accdoc.cxx |6 +-
sw/source/core/access/accembedded.cxx|6 +-
sw/source/core/access/accfootnote.cxx| 10 ++
sw/source/core/access/accgraphic.cxx |6 +-
sw/source/core/access/accheaderfooter.cxx| 10 ++
sw/source/core/access/accpage.cxx|6 +-
sw/source/core/access/accpara.cxx|6 +-
sw/source/core/access/acctable.cxx |6 +-
sw/source/core/access/acctextframe.cxx |6 +-
sw/source/core/unocore/SwXTextDefaults.cxx | 17 +++--
sw/source/core/unocore/unofield.cxx |6 +-
sw/source/core/unocore/unoframe.cxx |6 +-
sw/source/core/unocore/unosett.cxx |6 +-
sw/source/core/unocore/unosrch.cxx |6 +-
sw/source/ui/uno/swdetect.cxx|6 +-
sw/source/uibase/uno/SwXDocumentSettings.cxx |6 +-
sw/source/uibase/uno/SwXFilterOptions.cxx|3 +--
sw/source/uibase/uno/unoatxt.cxx |4 +---
sw/source/uibase/uno/unomailmerge.cxx|6 +-
sw/source/uibase/uno/unomod.cxx |4 +---
sw/source/uibase/uno/unotxdoc.cxx| 17 +++--
sw/source/uibase/uno/unotxvw.cxx | 23 ---
23 files changed, 44 insertions(+), 134 deletions(-)
New commits:
commit b68f4ff85bc1d6e008facbc310ddbfb5d799b7a5
Author: Julien Nabet
AuthorDate: Sun Aug 18 10:17:45 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 11:28:03 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in sw
Change-Id: I40bae418b5cf966eb76ba130eb6cb5ceb29efff7
Reviewed-on: https://gerrit.libreoffice.org/77658
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/core/access/acccell.cxx
b/sw/source/core/access/acccell.cxx
index d979723a4894..12762fa4a5d5 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -250,11 +250,7 @@ sal_Bool SAL_CALL SwAccessibleCell::supportsService(const
OUString& sTestService
uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.table.AccessibleCellView";
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { "com.sun.star.table.AccessibleCellView", sAccessibleServiceName };
}
void SwAccessibleCell::Dispose(bool bRecursive, bool bCanSkipInvisible)
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 78b5c2757141..35b345d517f8 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -435,11 +435,7 @@ sal_Bool SAL_CALL
SwAccessibleDocument::supportsService(const OUString& sTestSer
uno::Sequence< OUString > SAL_CALL
SwAccessibleDocument::getSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = sServiceName;
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { sServiceName, sAccessibleServiceName };
}
// XInterface
diff --git a/sw/source/core/access/accembedded.cxx
b/sw/source/core/access/accembedded.cxx
index dccad7083e86..eb63f192f02c 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -84,11 +84,7 @@ sal_Bool SAL_CALL
SwAccessibleEmbeddedObject::supportsService(const OUString& sT
uno::Sequence< OUString > SAL_CALL
SwAccessibleEmbeddedObject::getSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.text.AccessibleTextEmbeddedObject";
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { "com.sun.star.text.AccessibleTextEmbeddedObject",
sAccessibleServiceName };
}
uno::Sequence< sal_Int8 > SAL_CALL
SwAccessibleEmbeddedObject::getImplementationId()
diff --git a/sw/source/core/access/accfootnote.cxx
b/sw/source/core/access/accfootnote.cxx
index 14fb78525736..876e8c278364 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -101,14 +101,8 @@ sal_Bool SAL_CALL
SwAccessibleFootnote::supportsService(const OUString& sTestSer
Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames()
{
-Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-if( AccessibleRole::END_NOTE == GetRole() )
-pArray[0] = "com.sun.star.text.AccessibleEndnoteView";
-else
-pArray[0] = "com.sun.star.text.AccessibleFootnoteView";
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { (AccessibleRole::END_NOTE ==
GetRole())?OUString("com.sun.star.text.AccessibleEndnoteView"):OUString("com.sun.star.text.
[Libreoffice-commits] core.git: sc/source sd/source
sc/source/filter/xml/xmlimprt.cxx | 15 -
sd/source/core/stlfamily.cxx|4 ---
sd/source/core/stlsheet.cxx | 25 -
sd/source/ui/slideshow/slideshow.cxx|4 ---
sd/source/ui/unoidl/SdUnoDrawView.cxx |4 ---
sd/source/ui/unoidl/SdUnoOutlineView.cxx|4 ---
sd/source/ui/unoidl/SdUnoSlideView.cxx |4 ---
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 14 +---
sd/source/ui/unoidl/randomnode.cxx |5
sd/source/ui/unoidl/unocpres.cxx|8 +--
sd/source/ui/unoidl/unodoc.cxx |6 -
sd/source/ui/unoidl/unolayer.cxx|4 ---
sd/source/ui/unoidl/unomodel.cxx| 32 +++-
sd/source/ui/unoidl/unopback.cxx|8 ---
14 files changed, 36 insertions(+), 101 deletions(-)
New commits:
commit 52e086c336cc52dcea410f0c3b8ada8439ebe969
Author: Julien Nabet
AuthorDate: Sun Aug 18 09:45:11 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 10:34:30 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in sc, sd
Change-Id: Id32e76ad3784b99781e87428ed2c23ef02a6
Reviewed-on: https://gerrit.libreoffice.org/77657
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 96c348d34f35..5475bd06df9a 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -116,8 +116,7 @@ OUString ScXMLImport_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_getSupportedServiceNames() throw()
{
-const OUString aServiceName( ScXMLImport_getImplementationName() );
-return uno::Sequence< OUString > ( &aServiceName, 1 );
+return { ScXMLImport_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_createInstance(
@@ -134,8 +133,7 @@ OUString ScXMLImport_Meta_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_Meta_getSupportedServiceNames() throw()
{
-const OUString aServiceName( ScXMLImport_Meta_getImplementationName() );
-return uno::Sequence< OUString > ( &aServiceName, 1 );
+return { ScXMLImport_Meta_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Meta_createInstance(
@@ -152,8 +150,7 @@ OUString ScXMLImport_Styles_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_Styles_getSupportedServiceNames() throw()
{
-const OUString aServiceName( ScXMLImport_Styles_getImplementationName() );
-return uno::Sequence< OUString > ( &aServiceName, 1 );
+return { ScXMLImport_Styles_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Styles_createInstance(
@@ -170,8 +167,7 @@ OUString ScXMLImport_Content_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_Content_getSupportedServiceNames()
throw()
{
-const OUString aServiceName( ScXMLImport_Content_getImplementationName() );
-return uno::Sequence< OUString > ( &aServiceName, 1 );
+return { ScXMLImport_Content_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Content_createInstance(
@@ -188,8 +184,7 @@ OUString ScXMLImport_Settings_getImplementationName()
throw()
uno::Sequence< OUString > ScXMLImport_Settings_getSupportedServiceNames()
throw()
{
-const OUString aServiceName( ScXMLImport_Settings_getImplementationName()
);
-return uno::Sequence< OUString > ( &aServiceName, 1 );
+return { ScXMLImport_Settings_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Settings_createInstance(
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 47ef8a93af51..bb332e7939ab 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -175,9 +175,7 @@ sal_Bool SAL_CALL SdStyleFamily::supportsService( const
OUString& ServiceName )
Sequence< OUString > SAL_CALL SdStyleFamily::getSupportedServiceNames()
{
-OUString aServiceName( "com.sun.star.style.StyleFamily" );
-Sequence< OUString > aSeq( &aServiceName, 1 );
-return aSeq;
+return { "com.sun.star.style.StyleFamily" };
}
// XNamed
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 91cb60028dff..020d28a257b7 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -842,21 +842,16 @@ sal_Bool SAL_CALL SdStyleSheet::supportsService( const
OUString& ServiceName )
Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames()
{
-Sequence< OUString > aNameSequence( 10 );
-OUString* pStrings = aNameSequence.getArray();
-
-*pStrings++ = "com.sun.star.style.Style";
-*pStrings++ = "com.sun.star.drawing.FillProperties";
-*pStrings++ = "com.sun.star.drawing.LineProperties";
-*pStrings++ = "com.sun.star.drawing.ShadowPropert
[Libreoffice-commits] core.git: 2 commits - unoxml/source vcl/qt5 vcl/source vcl/unx
unoxml/source/dom/documentbuilder.cxx | 15 ++-
unoxml/source/dom/saxbuilder.cxx | 15 ++-
unoxml/source/xpath/xpathapi.cxx | 15 ++-
vcl/qt5/Qt5DragAndDrop.cxx |6 ++
vcl/qt5/Qt5FilePicker.cxx |7 ++-
vcl/source/components/dtranscomp.cxx |4 ++--
vcl/source/uitest/uno/uiobject_uno.cxx |4 +---
vcl/source/uitest/uno/uitest_uno.cxx |4 +---
vcl/unx/generic/dtrans/X11_service.cxx |9 +++--
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |7 ++-
vcl/unx/kf5/KF5FilePicker.cxx |8 ++--
11 files changed, 21 insertions(+), 73 deletions(-)
New commits:
commit b49f189d9bfb0b5dca5ac259e6f56b49c2d0d08f
Author: Julien Nabet
AuthorDate: Sun Aug 18 09:29:27 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 10:17:36 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in vcl
Change-Id: Ibd66e5ed9064612b73d08fac179ee46dc5b0a4b6
Reviewed-on: https://gerrit.libreoffice.org/77656
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/Qt5DragAndDrop.cxx
index 2b674e5a8e4f..ea26d5aaeb6f 100644
--- a/vcl/qt5/Qt5DragAndDrop.cxx
+++ b/vcl/qt5/Qt5DragAndDrop.cxx
@@ -120,8 +120,7 @@ sal_Bool SAL_CALL Qt5DragSource::supportsService(OUString
const& ServiceName)
css::uno::Sequence SAL_CALL Qt5DragSource::getSupportedServiceNames()
{
-uno::Sequence aRet{
"com.sun.star.datatransfer.dnd.Qt5DragSource" };
-return aRet;
+return { "com.sun.star.datatransfer.dnd.Qt5DragSource" };
}
Qt5DropTarget::Qt5DropTarget()
@@ -144,8 +143,7 @@ sal_Bool SAL_CALL Qt5DropTarget::supportsService(OUString
const& ServiceName)
css::uno::Sequence SAL_CALL Qt5DropTarget::getSupportedServiceNames()
{
-uno::Sequence aRet{
"com.sun.star.datatransfer.dnd.Qt5DropTarget" };
-return aRet;
+return { "com.sun.star.datatransfer.dnd.Qt5DropTarget" };
}
Qt5DropTarget::~Qt5DropTarget()
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 602ee21569ee..1573f95dd6b5 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -70,11 +70,8 @@ namespace
{
uno::Sequence FilePicker_getSupportedServiceNames()
{
-uno::Sequence aRet(3);
-aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
-aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
-aRet[2] = "com.sun.star.ui.dialogs.Qt5FilePicker";
-return aRet;
+return { "com.sun.star.ui.dialogs.FilePicker",
"com.sun.star.ui.dialogs.SystemFilePicker",
+ "com.sun.star.ui.dialogs.Qt5FilePicker" };
}
}
diff --git a/vcl/source/components/dtranscomp.cxx
b/vcl/source/components/dtranscomp.cxx
index 2952eff97012..0b2245bbd2f0 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -405,9 +405,9 @@ void GenericDropTarget::setDefaultActions( sal_Int8)
Sequence< OUString > DropTarget_getSupportedServiceNames()
{
#if defined MACOSX
-return Sequence< OUString > {
"com.sun.star.datatransfer.dnd.OleDropTarget" };
+return { "com.sun.star.datatransfer.dnd.OleDropTarget" };
#elif defined UNX
-return Sequence< OUString > {
"com.sun.star.datatransfer.dnd.X11DropTarget" };
+return { "com.sun.star.datatransfer.dnd.X11DropTarget" };
#else
return GenericDropTarget::getSupportedServiceNames_static();
#endif
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx
b/vcl/source/uitest/uno/uiobject_uno.cxx
index 714f16a72dbc..5eaef4db584a 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -197,9 +197,7 @@ sal_Bool UIObjectUnoObj::supportsService(OUString const &
ServiceName)
css::uno::Sequence UIObjectUnoObj::getSupportedServiceNames()
{
-css::uno::Sequence aServiceNames(1);
-aServiceNames[0] = "com.sun.star.ui.test.UIObject";
-return aServiceNames;
+return { "com.sun.star.ui.test.UIObject" };
}
OUString SAL_CALL UIObjectUnoObj::getHierarchy()
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx
b/vcl/source/uitest/uno/uitest_uno.cxx
index 354b30585c69..8ae3b7e284a1 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -107,9 +107,7 @@ sal_Bool UITestUnoObj::supportsService(OUString const &
ServiceName)
css::uno::Sequence UITestUnoObj::getSupportedServiceNames()
{
-css::uno::Sequence aServiceNames(1);
-aServiceNames[0] = "com.sun.star.ui.test.UITest";
-return aServiceNames;
+return { "com.sun.star.ui.test.UITest" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx
b/vcl/unx/generic/dtrans/X11_service.cxx
index 8020b677017f..dc08d85e6099 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -37,20 +37,17 @@ using namespace x11;
Sequence< OUSt
