New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
8 new defect(s) introduced to LibreOffice found with Coverity Scan.
10 defect(s), reported by Coverity Scan earlier, were marked fixed in the
recent build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 8 of 8 defect(s)
** CID 1455328: Uninitialized members (UNINIT_CTOR)
/include/basegfx/DrawCommands.hxx: 70 in
gfx::LinearGradientInfo::LinearGradientInfo()()
*** CID 1455328: Uninitialized members (UNINIT_CTOR)
/include/basegfx/DrawCommands.hxx: 70 in
gfx::LinearGradientInfo::LinearGradientInfo()()
64 class LinearGradientInfo : public GradientInfo
65 {
66 public:
67 LinearGradientInfo()
68 : GradientInfo(GradientType::Linear)
69 {
>>> CID 1455328: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "y2" is not initialized in this constructor nor
>>> in any functions that it calls.
70 }
71
72 double x1;
73 double y1;
74 double x2;
75 double y2;
** CID 1455327: Null pointer dereferences (NULL_RETURNS)
*** CID 1455327: Null pointer dereferences (NULL_RETURNS)
/sc/source/ui/navipi/navcitem.cxx: 53 in
ScNavigatorControllerItem::StateChanged(unsigned short, SfxItemState, const
SfxPoolItem *)()
47 OSL_ENSURE( pCellPosItem, "SfxStringItem expected!" );
48
49 if ( pCellPosItem )
50 {
51 const OUString& aAddress( pCellPosItem->GetValue()
);
52 ScAddress aScAddress;
>>> CID 1455327: Null pointer dereferences (NULL_RETURNS)
>>> Dereferencing a pointer that might be "nullptr"
>>> "this->rNavigatorDlg->GetViewData()" when calling "GetDocument".
53 aScAddress.Parse( aAddress,
rNavigatorDlg.GetViewData()->GetDocument() );
54
55 SCCOL nCol = aScAddress.Col()+1;
56 SCROW nRow = aScAddress.Row()+1;
57
58 rNavigatorDlg.UpdateColumn( &nCol );
** CID 1455326:(FORWARD_NULL)
*** CID 1455326:(FORWARD_NULL)
/sc/source/core/tool/address.cxx: 2381 in ScRange::MoveSticky(const ScDocument
*, short, int, short, ScRange&)()
2375 dy = 0; // Entire column not to be moved.
2376 if (dx && aStart.Col() == 0 && aEnd.Col() == nMaxCol)
2377 dx = 0; // Entire row not to be moved.
2378 bool b1 = aStart.Move( dx, dy, dz, rErrorRange.aStart );
2379 if (dx && bColRange && aEnd.Col() == nMaxCol)
2380 dx = 0; // End column sticky.
>>> CID 1455326:(FORWARD_NULL)
>>> Passing null pointer "pDoc" to "MaxRow", which dereferences it.
2381 if (dy && bRowRange && aEnd.Row() == pDoc->MaxRow())
2382 dy = 0; // End row sticky.
2383 SCTAB nOldTab = aEnd.Tab();
2384 bool b2 = aEnd.Move( dx, dy, dz, rErrorRange.aEnd );
2385 if (!b2)
2386 {
/sc/source/core/tool/address.cxx: 2374 in ScRange::MoveSticky(const ScDocument
*, short, int, short, ScRange&)()
2368
2369 bool ScRange::MoveSticky( const ScDocument* pDoc, SCCOL dx, SCROW dy,
SCTAB dz, ScRange& rErrorRange )
2370 {
2371 const SCCOL nMaxCol = (pDoc ? pDoc->MaxCol() : MAXCOL);
2372 bool bColRange = (aStart.Col() < aEnd.Col());
2373 bool bRowRange = (aStart.Row() < aEnd.Row());
>>> CID 1455326:(FORWARD_NULL)
>>> Passing null pointer "pDoc" to "MaxRow", which dereferences it.
2374 if (dy && aStart.Row() == 0 && aEnd.Row() == pDoc->MaxRow())
2375 dy = 0; // Entire column not to be moved.
2376 if (dx && aStart.Col() == 0 && aEnd.Col() == nMaxCol)
2377 dx = 0; // Entire row not to be moved.
2378 bool b1 = aStart.Move( dx, dy, dz, rErrorRange.aStart );
2379 if (dx && bColRange && aEnd.Col() == nMaxCol)
** CID 1455325:(FORWARD_NULL)
*** CID 1455325:(FORWARD_NULL)
/sc/source/core/tool/address.cxx: 2282 in ScRange::Format(ScRefFlags, const
ScDocument *, const ScAddress::Details &, bool) const()
2276 if( aStart.Row() != aEnd.Row() ||
2277 lcl_RowAbsFlagDiffer( nFlags ) ) {
2278 r.append(":");
2279 lcl_r1c1_append_r( r, aEnd.Row(), (nFlags &
ScRefFlags::ROW2_ABS) != ScRefFlags::ZERO, rDetails );
2280 }
2281 }
>>> CID 1455325:(FORWARD_NULL)
>>>
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-10-11 04:09:42 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source
vcl/source/window/dialog.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 264d0e7cb5385a8c3c2b8ce10b739e107775d8f8
Author: Caolán McNamara
AuthorDate: Fri May 10 10:22:27 2019 +0100
Commit: Aron Budea
CommitDate: Sun Nov 10 00:20:34 2019 +0100
Resolves: tdf#125198 modeless dialog not appearing in online
Change-Id: I01916000ba2300a3905fe606301abd8ddadd3770
Reviewed-on: https://gerrit.libreoffice.org/72113
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 9a78a4a16ff7b9a9d8f22809c5127f6389ec4805)
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b5d1b013b97e..a8e5240ec68c 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -883,16 +883,19 @@ bool Dialog::ImplStartExecute()
ImplSVData* pSVData = ImplGetSVData();
const bool bKitActive = comphelper::LibreOfficeKit::isActive();
-if (bKitActive && !GetLOKNotifier())
-{
-if (vcl::ILibreOfficeKitNotifier* pViewShell =
mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr))
-SetLOKNotifier(pViewShell);
-}
const bool bModal = GetType() != WindowType::MODELESSDIALOG;
if (bModal)
{
+if (bKitActive && !GetLOKNotifier())
+{
+if (vcl::ILibreOfficeKitNotifier* pViewShell =
mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr))
+{
+SetLOKNotifier(pViewShell);
+}
+}
+
switch ( Application::GetDialogCancelMode() )
{
case Application::DialogCancelMode::Off:
___
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 13ac239daa4e40413b02892f5d70a12066f1f731 Author: Olivier Hallot AuthorDate: Fri Nov 8 16:07:20 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Nov 10 01:25:53 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Follow-up patch of 82094 Removed reference of Criterion Change-Id: I8dd11b0a6d44bad183447a344a2e37067fa66c44 Reviewed-on: https://gerrit.libreoffice.org/82322 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 2991e4aee30f..b5047e08bba1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2991e4aee30ffb095601812744fe16720290cc62 +Subproject commit b5047e08bba168d3c05213a27138ec41bdea ___ 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_averageif.xhp |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b5047e08bba168d3c05213a27138ec41bdea
Author: Olivier Hallot
AuthorDate: Fri Nov 8 16:07:20 2019 -0300
Commit: Olivier Hallot
CommitDate: Sun Nov 10 01:25:53 2019 +0100
Follow-up patch of 82094
Removed reference of Criterion
Change-Id: I8dd11b0a6d44bad183447a344a2e37067fa66c44
Reviewed-on: https://gerrit.libreoffice.org/82322
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/scalc/01/func_averageif.xhp
b/source/text/scalc/01/func_averageif.xhp
index b9e78bcfd..00b9db3a1 100644
--- a/source/text/scalc/01/func_averageif.xhp
+++ b/source/text/scalc/01/func_averageif.xhp
@@ -33,8 +33,8 @@
Criterion – required argument. A condition in the
form of expression or a cell reference with expression that defines what cells
should be used to calculate the mean. The expression can contain text, numbers,
regular expressions (if enabled in calculation options) or wildcards (if
enabled in calculation options).
Average_Range – optional. It is a range of values
for calculating the mean.
-Note that if the Average_Range is
not specified, Range is used for both, the calculation of the mean
and the search according to the condition. If the Average_Range is
specified, the Range is used only for the condition test, while
Average_Range is used for the mean calculation.
-The Criterion needs to be a string expression, in particular, the
Criterion needs to be enclosed in quotation marks ("Criterion")
with the exception of the names of functions, cell references and an operation
of a string concatenation (&).
+If the Average_Range is not
specified, Range is used for both, the calculation of the mean and
the search according to the condition. If Average_Range is
specified, the Range is used only for the condition test, while
Average_Range is used for the average calculation.
+
If a cell in a range of values for
calculating the mean is empty or contains text, function AVERAGEIF ignores this
cell.
If the whole range is empty, contains only text or all values of the range do
not satisfy the condition (or any combination of those), the function returns
the #DIV/0! error.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b33b6849139728b44a90feb82ad691d6156f4375 Author: Olivier Hallot AuthorDate: Sat Nov 9 21:22:20 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Nov 10 01:25:17 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Mute L10n of some Basic code Change-Id: If1e98008ad0534d4d9c0466b9df35b908d31ea77 Reviewed-on: https://gerrit.libreoffice.org/82370 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6cf5cabf98da..2991e4aee30f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6cf5cabf98dad9b6c8dcbeafe4b8b646dd2abf10 +Subproject commit 2991e4aee30ffb095601812744fe16720290cc62 commit dfe2682e285cc873854acea38c4dbc9a3f8b85fc Author: Olivier Hallot AuthorDate: Sat Nov 9 20:37:31 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Nov 10 01:24:46 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Mute L10N in Basic lbound function Change-Id: I3b88a89caa2c782fd0aedb85cb50d74e36448c07 Reviewed-on: https://gerrit.libreoffice.org/82368 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5f2c2633a528..6cf5cabf98da 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5f2c2633a528566736b2887846959a6a02de7940 +Subproject commit 6cf5cabf98dad9b6c8dcbeafe4b8b646dd2abf10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/sbasic/shared/03102900.xhp | 37 +++-- source/text/sbasic/shared/03103000.xhp | 20 - 2 files changed, 27 insertions(+), 30 deletions(-) New commits: commit 2991e4aee30ffb095601812744fe16720290cc62 Author: Olivier Hallot AuthorDate: Sat Nov 9 21:22:20 2019 -0300 Commit: Olivier Hallot CommitDate: Sun Nov 10 01:25:17 2019 +0100 Mute L10n of some Basic code Change-Id: If1e98008ad0534d4d9c0466b9df35b908d31ea77 Reviewed-on: https://gerrit.libreoffice.org/82370 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03103000.xhp b/source/text/sbasic/shared/03103000.xhp index a997d5558..05cc3c862 100644 --- a/source/text/sbasic/shared/03103000.xhp +++ b/source/text/sbasic/shared/03103000.xhp @@ -34,39 +34,39 @@ -UBound Function +UBound Function Returns the upper boundary of an array. -Syntax: + -UBound (ArrayName [, Dimension]) +UBound (ArrayName [, Dimension]) -Return value: + Long -Parameters: + ArrayName: Name of the array for which you want to determine the upper (Ubound) or the lower (LBound) boundary. [Dimension]: Integer that specifies which dimension to return the upper(Ubound) or lower (LBound) boundary for. If no value is specified, the boundary of the first dimension is returned. -Example: + -Sub VectorBounds +Sub VectorBounds Dim v(10 To 20) As String Print LBound(v()) ' returns 10 Print UBound(v) ' returns 20 -End Sub ' VectorBounds +End Sub ' VectorBounds -Sub TableBounds +Sub TableBounds Dim t(10 To 20,-5 To 70) As Currency Print LBound(t), UBound(t()) ' returns 10 20 Print LBound(t(),2) ' returns - 5 Print UBound(t,2) ' returns 70 -End Sub ' TableBounds +End Sub ' TableBounds commit 6cf5cabf98dad9b6c8dcbeafe4b8b646dd2abf10 Author: Olivier Hallot AuthorDate: Sat Nov 9 20:37:31 2019 -0300 Commit: Olivier Hallot CommitDate: Sun Nov 10 01:24:46 2019 +0100 Mute L10N in Basic lbound function Change-Id: I3b88a89caa2c782fd0aedb85cb50d74e36448c07 Reviewed-on: https://gerrit.libreoffice.org/82368 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03102900.xhp b/source/text/sbasic/shared/03102900.xhp index e237b3800..957e589c4 100644 --- a/source/text/sbasic/shared/03102900.xhp +++ b/source/text/sbasic/shared/03102900.xhp @@ -27,47 +27,44 @@ - LBound function - -LBound Function +LBound Function Returns the lower boundary of an array. -Syntax: + -LBound (ArrayName [, Dimension]) +LBound (ArrayName [, Dimension]) -Return value: -Long + +Long -Parameters: + ArrayName: Name of the array for which you want to return the upper (Ubound) or the lower (LBound) boundary of the array dimension. [Dimension]: Integer that specifies which dimension to return the upper (Ubound) or the lower (LBound) boundary for. If a value is not specified, the first dimension is assumed. -Example: + -Sub VectorBounds +Sub VectorBounds Dim v(10 To 20) As String -Print LBound(v()) ' returns 10 -Print UBound(v) ' returns 20 -End Sub ' VectorBounds +Print LBound(v()) ' returns 10 +Print UBound(v) ' returns 20 +End Sub ' VectorBounds -Sub TableBounds +Sub TableBounds Dim t(10 To 20,-5 To 70) As Currency -Print LBound(t), UBound(t()) ' returns 10 20 -Print LBound(t(),2) ' returns - 5 -Print UBound(t,2) ' returns 70 -End Sub ' TableBounds +Print LBound(t), UBound(t()) ' returns 10 20 +Print LBound(t(),2) ' returns - 5 +Print UBound(t,2) ' returns 70 +End Sub ' TableBounds - - \ No newline at end of file + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2b8a2477e09a9ec2194678e218736300b38ff176 Author: Olivier Hallot AuthorDate: Sat Nov 9 19:43:20 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Nov 10 01:24:17 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Mute L10n on debug params for Linux Change-Id: Ief4bb2679ee238ee56c82a9b853d4abf86243226 Reviewed-on: https://gerrit.libreoffice.org/82366 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d034a998ce69..5f2c2633a528 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d034a998ce691d67778bc5f499c04de7544e0af9 +Subproject commit 5f2c2633a528566736b2887846959a6a02de7940 ___ 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/shared/guide/start_parameters.xhp |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 5f2c2633a528566736b2887846959a6a02de7940 Author: Olivier Hallot AuthorDate: Sat Nov 9 19:43:20 2019 -0300 Commit: Olivier Hallot CommitDate: Sun Nov 10 01:24:17 2019 +0100 Mute L10n on debug params for Linux Change-Id: Ief4bb2679ee238ee56c82a9b853d4abf86243226 Reviewed-on: https://gerrit.libreoffice.org/82366 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/guide/start_parameters.xhp b/source/text/shared/guide/start_parameters.xhp index 6f767eaca..b87cc0c47 100644 --- a/source/text/shared/guide/start_parameters.xhp +++ b/source/text/shared/guide/start_parameters.xhp @@ -355,7 +355,7 @@ ---record +--record An enhanced debugger. @@ -363,7 +363,7 @@ ---backtrace +--backtrace Prints the backtrace of the entire stack. @@ -371,7 +371,7 @@ ---strace +--strace strace is a diagnostic, debugging and instructional userspace utility for Linux. @@ -379,7 +379,7 @@ ---valgrind +--valgrind Automatically detect many memory management and threading bugs, and profile the program in detail. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Need help for unit test about undo
Hi all, Miklos Vajna schrieb am 08-Nov-19 um 09:33: Hi, On Thu, Nov 07, 2019 at 11:01:33PM +0100, Regina Henschel wrote: Ok, that contains how to use an UndoManager. Yes, that was the intention I assume -- tiledrendering is just a suite that happened to contain that example code. :-) But how can I act with the shape, so that an undo-entry is generated? UI actions, that produce the error are: changing line or fill attributes, switching extrusion on/off, setting "Autofit text" on. I think the general concept is that if you manipulate the doc model directly (SdrModel), then you don't get undo/redo. In contrast, if you manipulate the doc model via UNO or the UI shells, then you get it. I first tried with comphelper::dispatchCommand(), which I had seen in tiledrendering, but that did not know the needed SID. Now I have used pViewShell->GetViewFrame()->GetDispatcher()->Execute, which I have seen in uiimpress, and that works. And would it be correct to add my test to that file? My topic is different from 'tiledrendering'. If you want to test Impress undo/redo, my first guess would be sd/qa/unit/uiimpress.cxx. Yes, that is suitable. It has already some undo parts. My patch is finished now. Find it in https://gerrit.libreoffice.org/#/c/82367/2 Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/aboutdialog.ui |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit ee2317b0c88a2b7349a06a1f41f044e1885d8d5d Author: andreas kainz AuthorDate: Sat Nov 9 21:51:12 2019 +0100 Commit: andreas_kainz CommitDate: Sun Nov 10 00:34:44 2019 +0100 About Dialog add 6px border as everywhere else Change-Id: Ic1cd5006bdaeb4e057aab145e9c511aabceda9a4 Reviewed-on: https://gerrit.libreoffice.org/82361 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index b2ad949019c8..21d9725b11bb 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -4,12 +4,13 @@ False +6 +About %PRODUCTNAME +False True 0 0 dialog -About %PRODUCTNAME -False %PRODUCTNAME %PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more. https://www.libreoffice.org/ @@ -22,7 +23,7 @@ False vertical -12 +6 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/uiconfig
filter/uiconfig/ui/pdfsignpage.ui | 70 +- 1 file changed, 40 insertions(+), 30 deletions(-) New commits: commit b3f2791b9072b39a64b22c9f21b8f6daf8c87029 Author: andreas kainz AuthorDate: Sat Nov 9 23:30:41 2019 +0100 Commit: andreas_kainz CommitDate: Sun Nov 10 00:28:38 2019 +0100 PDF Signature Dialog update Change-Id: Ie015c2647d52a88c48bb20604f44be03c4bce911 Reviewed-on: https://gerrit.libreoffice.org/82365 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/filter/uiconfig/ui/pdfsignpage.ui b/filter/uiconfig/ui/pdfsignpage.ui index 40bbeb1770e1..115e0389f777 100644 --- a/filter/uiconfig/ui/pdfsignpage.ui +++ b/filter/uiconfig/ui/pdfsignpage.ui @@ -27,14 +27,12 @@ True False -True 6 12 True False -True Use this certificate to digitally sign PDF documents: True cert @@ -43,6 +41,7 @@ 0 0 +2 @@ -53,43 +52,50 @@ True -0 -1 - - - - -Select... -True -True -True -center - - 1 1 - -gtk-clear + True -True -True -center -True +False +6 + + +Select... +True +True +True +center + + +False +True +0 + + + + +gtk-clear +True +True +True +center +True + + +False +True +1 + + -2 +0 1 - - - - - - 0 @@ -259,8 +265,12 @@ - - + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/templatedlg.ui | 17 + 1 file changed, 5 insertions(+), 12 deletions(-) New commits: commit 6637a922e2044cd480abe3f6e295587c7b0d6d27 Author: andreas kainz AuthorDate: Sat Nov 9 22:36:26 2019 +0100 Commit: andreas_kainz CommitDate: Sat Nov 9 23:37:24 2019 +0100 Template dialog update Change-Id: I76ee82ad3a80dac0bd3693e411fe1f55a26f34ed Reviewed-on: https://gerrit.libreoffice.org/82364 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index 6fc6ff48a671..4008332ca4a4 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -54,8 +54,8 @@ -800 -600 +740 +500 False 6 Templates @@ -133,13 +133,12 @@ True False vertical +6 True False -6 -6 -36 +12 True @@ -213,9 +212,6 @@ True False Filter - - - False @@ -251,8 +247,6 @@ True False -6 -6 True True vertical @@ -338,8 +332,6 @@ True False -6 -6 True @@ -350,6 +342,7 @@ False Settings image7 +none True menu1 False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/drawfunc/drtxtob.cxx | 14 --
sc/source/ui/view/editsh.cxx | 14 --
sc/source/ui/view/formatsh.cxx| 14 --
3 files changed, 12 insertions(+), 30 deletions(-)
New commits:
commit 2eb56f0fee54e25c2c194d6801861f18240a37be
Author: Caolán McNamara
AuthorDate: Sat Nov 9 20:39:02 2019 +
Commit: Caolán McNamara
CommitDate: Sat Nov 9 22:40:33 2019 +0100
tdf#121239 set double underline status to false when not double underlined
Change-Id: I0d609b8e6cd205e4d0c530d4a9111c0640f89b2c
Reviewed-on: https://gerrit.libreoffice.org/82360
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index 17f8321d58e2..60e12b1c93fe 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -1115,16 +1115,10 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet&
rDestSet )
else
{
FontLineStyle eUnderline =
aAttrSet.Get(EE_CHAR_UNDERLINE).GetLineStyle();
-sal_uInt16 nId = SID_ULINE_VAL_NONE;
-switch (eUnderline)
-{
-case LINESTYLE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
-case LINESTYLE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
-case LINESTYLE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
-default:
-break;
-}
-rDestSet.Put( SfxBoolItem( nId, true ) );
+rDestSet.Put(SfxBoolItem(SID_ULINE_VAL_SINGLE, eUnderline ==
LINESTYLE_SINGLE));
+rDestSet.Put(SfxBoolItem(SID_ULINE_VAL_DOUBLE, eUnderline ==
LINESTYLE_DOUBLE));
+rDestSet.Put(SfxBoolItem(SID_ULINE_VAL_DOTTED, eUnderline ==
LINESTYLE_DOTTED));
+rDestSet.Put(SfxBoolItem(SID_ULINE_VAL_NONE, eUnderline ==
LINESTYLE_NONE));
}
// horizontal / vertical
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 8c1638c2ff62..8724e3631276 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -1205,16 +1205,10 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
else
{
FontLineStyle eUnderline =
aAttribs.Get(EE_CHAR_UNDERLINE).GetLineStyle();
-sal_uInt16 nId = SID_ULINE_VAL_NONE;
-switch (eUnderline)
-{
-case LINESTYLE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
-case LINESTYLE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
-case LINESTYLE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
-default:
-break;
-}
-rSet.Put( SfxBoolItem( nId, true ) );
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_SINGLE, eUnderline ==
LINESTYLE_SINGLE));
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_DOUBLE, eUnderline ==
LINESTYLE_DOUBLE));
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_DOTTED, eUnderline ==
LINESTYLE_DOTTED));
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_NONE, eUnderline ==
LINESTYLE_NONE));
}
//! Testing whether brace highlighting is active
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index f92273b7caf1..e9f849e07380 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2280,16 +2280,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
{
FontLineStyle eUnderline =
rAttrSet.Get(ATTR_FONT_UNDERLINE).GetLineStyle();
-sal_uInt16 nId = SID_ULINE_VAL_NONE;
-switch (eUnderline)
-{
-case LINESTYLE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
-case LINESTYLE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
-case LINESTYLE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
-default:
-break;
-}
-rSet.Put( SfxBoolItem( nId, true ) );
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_SINGLE, eUnderline ==
LINESTYLE_SINGLE));
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_DOUBLE, eUnderline ==
LINESTYLE_DOUBLE));
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_DOTTED, eUnderline ==
LINESTYLE_DOTTED));
+rSet.Put(SfxBoolItem(SID_ULINE_VAL_NONE, eUnderline ==
LINESTYLE_NONE));
}
// horizontal alignment
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
0 files changed New commits: commit 72f1f04bb62bbe66105ce00228e1713bb0703cab Author: Andrea Gelmini AuthorDate: Sat Nov 9 18:52:57 2019 +0100 Commit: Julien Nabet CommitDate: Sat Nov 9 22:39:44 2019 +0100 Removed executable bit on source file Change-Id: I22e35d5d5797f94496bd6dbf90ead252db851c71 Reviewed-on: https://gerrit.libreoffice.org/82359 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build errors on Catalina
I'm experiencing a few build errors while building LO on Catalina/Xcode 11. They're all equality assertions that fail. Anyone able to advise if it's my setup, or some new features brought in with Catalina? Relevant lines from the build log here: /Users/builduser/libreoffice/core/chart2/qa/extras/chart2import.cxx:1533: Assertion Test name: Chart2ImportTest::testAxisTitlePositionDOCX equality assertion failed - Expected: 7157 - Actual : 7159 /Users/builduser/libreoffice/core/sd/qa/unit/export-tests-ooxml2.cxx:1631: Assertion Test name: SdOOXMLExportTest2::testFontScale equality assertion failed - Expected: 73000 - Actual : 55000 /Users/builduser/libreoffice/core/sw/qa/extras/ooxmlimport/ooxmlimport.cxx:572: Assertion Test name: testGroupshapeChildRotation::Import equality assertion failed - Expected: 686 - Actual : 688 /Users/builduser/libreoffice/core/vcl/qa/cppunit/gen/gen.cxx:76: Assertion Test name: testTdf121120::TestBody equality assertion failed - Expected: 255 - Actual : 1 /Users/builduser/libreoffice/core/chart2/qa/extras/chart2export.cxx:1977: Assertion Test name: Chart2ExportTest::testAxisTitlePositionDOCX assertion failed - Expression: nY > 0.805152 && nY < 0.805153 0xEA44D68354B54D7F.asc Description: application/pgp-keys signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/data/join/calc-object-offset.ods |binary
libreofficekit/qa/tilebench/tilebench.cxx | 63 +++--
2 files changed, 46 insertions(+), 17 deletions(-)
New commits:
commit 658925635262d21f93bedcc6dfeaa934cbcef1cf
Author: Michael Meeks
AuthorDate: Sat Nov 9 17:47:28 2019 +
Commit: Michael Meeks
CommitDate: Sat Nov 9 21:12:49 2019 +0100
lok: tilebench: slightly sloppy pixel comparison & larger area.
Change-Id: Ief9d4bc5ce0e83a9eb9564cb94f773a3ff6048ba
Reviewed-on: https://gerrit.libreoffice.org/82357
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/libreofficekit/qa/data/join/calc-object-offset.ods
b/libreofficekit/qa/data/join/calc-object-offset.ods
new file mode 100644
index ..b86ef3107449
Binary files /dev/null and b/libreofficekit/qa/data/join/calc-object-offset.ods
differ
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx
b/libreofficekit/qa/tilebench/tilebench.cxx
index f5dccf81affa..2a8142de9a7c 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -259,6 +259,31 @@ static uint32_t fade(uint32_t col)
return (a<<24) + (grey<<16) + (grey<<8) + grey;
}
+static bool sloppyEqual(uint32_t pixA, uint32_t pixB)
+{
+uint8_t a[4], b[4];
+
+a[0] = (pixA >> 24) & 0xff;
+a[1] = (pixA >> 16) & 0xff;
+a[2] = (pixA >> 8) & 0xff;
+a[3] = (pixA >> 0) & 0xff;
+
+b[0] = (pixB >> 24) & 0xff;
+b[1] = (pixB >> 16) & 0xff;
+b[2] = (pixB >> 8) & 0xff;
+b[3] = (pixB >> 0) & 0xff;
+
+for (int i = 0; i < 4; ++i)
+{
+int delta = a[i];
+delta -= b[i];
+// tolerate small differences
+if (delta < -4 || delta > 4)
+return false;
+}
+return true;
+}
+
// Count and build a picture of any differences into rDiff
static int diffTiles( const std::vector &vBase,
long nBaseRowPixelWidth,
@@ -283,7 +308,7 @@ static int diffTiles( const std::vector
&vBase,
pDiff[nDiffRowStart + left + x] = pBase[nBaseOffset + x];
pDiff[nDiffRowStart + mid + x] = pCompare[nCompareOffset + x];
pDiff[nDiffRowStart + right + x] = fade(pBase[nBaseOffset + x]);
-if (pBase[nBaseOffset + x] != pCompare[nCompareOffset + x])
+if (!sloppyEqual(pBase[nBaseOffset + x], pCompare[nCompareOffset +
x]))
{
pDiff[nDiffRowStart + right + x] = 0x00ff;
if (!nDifferent)
@@ -310,9 +335,9 @@ static std::vector paintTile( Document
*pDocument,
return vData;
}
-static bool testJoinsAt( Document *pDocument, long nX, long nY,
- long const nTilePixelSize,
- long const nTileTwipSize )
+static int testJoinsAt( Document *pDocument, long nX, long nY,
+long const nTilePixelSize,
+long const nTileTwipSize )
{
const int mode = pDocument->getTileMode();
@@ -352,6 +377,7 @@ static bool testJoinsAt( Document *pDocument, long nX, long
nY,
{ 1, 1 }
};
+int nDifferences = 0;
// Compare each of the 4x tiles with a sub-tile of the larger image
for( auto &rPos : aCompare )
{
@@ -363,15 +389,15 @@ static bool testJoinsAt( Document *pDocument, long nX,
long nY,
nTileTwipWidth, nTileTwipHeight));
std::vector vDiff( nTilePixelWidth * 3 *
nTilePixelHeight * 4 );
-int nDifferences = diffTiles( vBase, nTilePixelWidth * 2,
- vCompare, nTilePixelWidth,
- nTilePixelHeight,
- rPos.X, rPos.Y * nTilePixelHeight,
- vDiff );
-if ( nDifferences > 0 )
+int nDiffs = diffTiles( vBase, nTilePixelWidth * 2,
+vCompare, nTilePixelWidth,
+nTilePixelHeight,
+rPos.X, rPos.Y * nTilePixelHeight,
+vDiff );
+if ( nDiffs > 0 )
{
fprintf( stderr, " %d differences in sub-tile pixel mismatch at
%ld, %ld at offset %ld, %ld (twips) size %ld\n",
- nDifferences, rPos.X, rPos.Y, initPosX, initPosY,
+ nDiffs, rPos.X, rPos.Y, initPosX, initPosY,
nTileTwipWidth);
dumpTile("_base", nTilePixelWidth * 2, nTilePixelHeight * 2,
mode, vBase.data());
@@ -382,11 +408,11 @@ static bool testJoinsAt( Document *pDocument, long nX,
long nY,
dumpTile("_compare", nTilePixelWidth, nTilePixelHeight,
mode, vCompare.data());*/
dumpTile("_diff", nTilePixelWidth * 3, nTilePixelHeight, mode,
vDiff.data());
-return false;
}
+nDifferences += nDiffs;
}
-return true;
+return nD
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - icon-themes/colibre icon-themes/colibre_svg
dev/null|binary icon-themes/colibre/cmd/32/calloutshapes.png|binary icon-themes/colibre/cmd/32/closepreview.png |binary icon-themes/colibre/cmd/32/dbsortingandgrouping.png |binary icon-themes/colibre/cmd/32/ko/bold.png |binary icon-themes/colibre/cmd/32/ko/charfontname.png |binary icon-themes/colibre/cmd/32/ko/color.png |binary icon-themes/colibre/cmd/32/ko/italic.png|binary icon-themes/colibre/cmd/32/ko/outlinefont.png |binary icon-themes/colibre/cmd/32/ko/outlineformat.png |binary icon-themes/colibre/cmd/32/ko/overline.png |binary icon-themes/colibre/cmd/32/ko/scaletext.png |binary icon-themes/colibre/cmd/32/ko/shadowed.png |binary icon-themes/colibre/cmd/32/ko/sortascending.png |binary icon-themes/colibre/cmd/32/ko/sortdescending.png|binary icon-themes/colibre/cmd/32/ko/strikeout.png |binary icon-themes/colibre/cmd/32/ko/text.png |binary icon-themes/colibre/cmd/32/ko/text_marquee.png |binary icon-themes/colibre/cmd/32/ko/textdirectionlefttoright.png |binary icon-themes/colibre/cmd/32/ko/textdirectiontoptobottom.png |binary icon-themes/colibre/cmd/32/ko/underline.png |binary icon-themes/colibre/cmd/32/ko/underlinedouble.png |binary icon-themes/colibre/cmd/32/ko/verticaltext.png |binary icon-themes/colibre/cmd/32/ko/verticaltextfittosizetool.png |binary icon-themes/colibre/cmd/32/verticaltextfittosizetool.png|binary icon-themes/colibre/cmd/ko/lc_verticaltextfittosizetool.png |binary icon-themes/colibre/cmd/ko/sc_verticaltextfittosizetool.png |binary icon-themes/colibre/cmd/lc_dbsortingandgrouping.png |binary icon-themes/colibre/cmd/lc_verticaltextfittosizetool.png|binary icon-themes/colibre/cmd/sc_dbsortingandgrouping.png |binary icon-themes/colibre/cmd/sc_verticaltextfittosizetool.png|binary icon-themes/colibre/links.txt |1 + icon-themes/colibre_svg/cmd/32/calloutshapes.svg|2 +- icon-themes/colibre_svg/cmd/32/closepreview.svg |1 + icon-themes/colibre_svg/cmd/32/dbsortingandgrouping.svg |2 +- icon-themes/colibre_svg/cmd/32/ko/bold.svg |1 + icon-themes/colibre_svg/cmd/32/ko/charfontname.svg |1 + icon-themes/colibre_svg/cmd/32/ko/color.svg |1 + icon-themes/colibre_svg/cmd/32/ko/italic.svg|1 + icon-themes/colibre_svg/cmd/32/ko/outlinefont.svg |1 + icon-themes/colibre_svg/cmd/32/ko/outlineformat.svg |1 + icon-themes/colibre_svg/cmd/32/ko/overline.svg |1 + icon-themes/colibre_svg/cmd/32/ko/scaletext.svg |1 + icon-themes/colibre_svg/cmd/32/ko/shadowed.svg |1 + icon-themes/colibre_svg/cmd/32/ko/sortascending.svg |1 + icon-themes/colibre_svg/cmd/32/ko/sortdescending.svg|1 + icon-themes/colibre_svg/cmd/32/ko/strikeout.svg |1 + icon-themes/colibre_svg/cmd/32/ko/text.svg |1 + icon-themes/colibre_svg/cmd/32/ko/text_marquee.svg |1 + icon-themes/colibre_svg/cmd/32/ko/textdirectionlefttoright.svg |1 + icon-themes/colibre_svg/cmd/32/ko/textdirectiontoptobottom.svg |1 + icon-themes/colibre_svg/cmd/32/ko/underline.svg |1 + icon-themes/colibre_svg/cmd/32/ko/underlinedouble.svg |1 + icon-themes/colibre_svg/cmd/32/ko/verticaltext.svg |1 + icon-themes/colibre_svg/cmd/32/ko/verticaltextfittosizetool.svg |1 + icon-themes/colibre_svg/cmd/32/verticaltextfittosizetool.svg|2 +- icon-themes/colibre_svg/cmd/ko/lc_dbsortingandgrouping.svg |1 - icon-themes/colibre_svg/cmd/ko/lc_verticaltextfittosizetool.svg |2 +- icon-themes/colibre_svg/cmd/ko/sc_dbsortingandgrouping.svg |1 - icon-themes/colibre_svg/cmd/ko/sc_verticaltextfittosizetool.svg |2 +- icon-themes/colibre_svg/cmd/lc_dbsortingandgrouping.svg |2 +- icon-themes/colibre_svg/cmd/lc_verticaltextfittosizetool.svg|2 +- icon-themes/colibre_svg/cmd/sc_dbsortingandgrouping.svg |2 +- icon-themes/colibre_svg/cmd/sc_verticaltextfittosizetool.svg|2 +- 64 files changed, 31 insertions(+), 11 deletions(-) New commits: commit c3b462286fd9d6e898129eba2cd1722c6289ce2d Author: Rizal Muttaqin AuthorDate: Sat Nov 9 13:16:05 2019 +0700 Commit: Rizal Muttaqin CommitDate: Sat Nov 9 21:03:11 2019 +0100 Colibre: tdf#128679 Add e
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/app/docst.cxx | 85 -
1 file changed, 84 insertions(+), 1 deletion(-)
New commits:
commit c927ea4c5d8a9ede979e17c09c2303854ccdebec
Author: Muhammet Kara
AuthorDate: Mon Jun 24 01:46:42 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 20:02:37 2019 +0100
Sync page orientation of Endnote page
Description:
When changing the default page style to have a different orientation,
end-notes are placed on a page with a custom ‘Endnote’ page style.
This style does not inherit its orientation from the default style.
Repro:
Create a blank document, insert→End Note, Format→Page in the first page,
select the Page tab, and alter the Orientation to Landscape, ‘Ok’.
The End-note page should update its orientation too.
NB. If the Endnote page style is manually set to a different value
in a document template it will remain in the selected orientation.
After this patch, Default style and the Endnote style have their
orientations synced after each run of the Format > Page dialog.
Ideally, this should be solved by resolving tdf#41316 on master:
Page styles should support hierarchical parent-child relationships
(like paragraph or character styles)
Change-Id: I255b470d1aebb897f50a4a74b8678b771ffbab28
Reviewed-on: https://gerrit.libreoffice.org/79869
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/82173
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index d413e4fe8e4c..cb580785e8a8 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -646,6 +647,70 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void)
pWrtShell->EndAllAction();
}
+namespace
+{
+/// Checks if there is an Endnote page style in use, and makes sure it has the
same orientation
+/// with the Default (Standard) page style.
+void syncEndnoteOrientation(const uno::Reference<
style::XStyleFamiliesSupplier >& xStyleFamSupp)
+{
+if (!xStyleFamSupp.is())
+{
+SAL_WARN("sw.ui", "Ref to XStyleFamiliesSupplier is null.");
+return;
+}
+uno::Reference xStyleFamilies =
xStyleFamSupp->getStyleFamilies();
+
+if (!xStyleFamilies.is())
+return;
+
+uno::Reference
xPageStyles(xStyleFamilies->getByName("PageStyles"),
+ uno::UNO_QUERY);
+
+if (!xPageStyles.is())
+return;
+
+uno::Reference
xEndnotePageStyle(xPageStyles->getByName("Endnote"),
+ uno::UNO_QUERY);
+
+if (!xEndnotePageStyle.is())
+return;
+
+// Language-independent name of the "Default Style" is "Standard"
+uno::Reference
xDefaultPageStyle(xPageStyles->getByName("Standard"),
+ uno::UNO_QUERY);
+if (!xDefaultPageStyle.is())
+return;
+
+if (xEndnotePageStyle->isUserDefined() || !xEndnotePageStyle->isInUse())
+return;
+
+uno::Reference
xEndnotePagePropSet(xPageStyles->getByName("Endnote"), uno::UNO_QUERY);
+uno::Reference
xDefaultPagePropSet(xPageStyles->getByName("Standard"), uno::UNO_QUERY);
+
+if (!xEndnotePagePropSet.is() || !xDefaultPagePropSet.is())
+{
+SAL_WARN("sw.ui", "xEndnotePagePropSet or xDefaultPagePropSet is
null.");
+return;
+}
+
+sal_Int32 nWidth, nHeight;
+bool bIsDefLandScape, bIsEndLandScape;
+
+xDefaultPagePropSet->getPropertyValue("IsLandscape") >>= bIsDefLandScape;
+xEndnotePagePropSet->getPropertyValue("IsLandscape") >>= bIsEndLandScape;
+
+if (bIsDefLandScape == bIsEndLandScape)
+return;
+
+xEndnotePagePropSet->getPropertyValue("Width") >>= nWidth;
+xEndnotePagePropSet->getPropertyValue("Height") >>= nHeight;
+
+xEndnotePagePropSet->setPropertyValue("IsLandscape",
css::uno::toAny(bIsDefLandScape));
+xEndnotePagePropSet->setPropertyValue("Width", css::uno::toAny(nHeight));
+xEndnotePagePropSet->setPropertyValue("Height", css::uno::toAny(nWidth));
+}
+}
+
void SwDocShell::Edit(
const OUString &rName,
const OUString &rParent,
@@ -845,7 +910,12 @@ void SwDocShell::Edit(
pReq->Ignore(); // the 'old' request is not relevant any more
}
-pDlg->StartExecuteAsync([bModified, bNew, nFamily, nSlot,
nNewStyleUndoId, pApplyStyleHelper, pRequest, xTmp, this](sal_Int32 nResult){
+bool bIsDefaultPage = nFamily == SfxStyleFamily::Page
+&& rName == SwResId(STR_POOLPAGE_STANDARD)
+&& pStyle->IsUsed()
+&& !pStyle->IsUserDefined();
+
+pDlg->St
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - 41 commits - basctl/source basic/source chart2/source cui/source extras/source framework/source .gitreview icon-themes/colibre icon-
Rebased ref, commits from common ancestor:
commit 8151de3b7c7dff6313e7f0a6d68a21a3216d440d
Author: Serge Krot
AuthorDate: Fri Nov 8 21:14:28 2019 +0100
Commit: Thorsten Behrens
CommitDate: Sat Nov 9 19:56:42 2019 +0100
Source code clean up: do not clean up EncryptionData during SaveAs
Change-Id: I1213ec55d6dc42f062930467976de45c73152f0b
Reviewed-on: https://gerrit.libreoffice.org/82326
Reviewed-by: Serge Krot (CIB)
Tested-by: Serge Krot (CIB)
diff --git a/package/source/zippackage/ZipPackage.cxx
b/package/source/zippackage/ZipPackage.cxx
index cf8df0b417cc..63178c7fec24 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1748,27 +1748,9 @@ void SAL_CALL ZipPackage::setPropertyValue( const
OUString& aPropertyName, const
// this property is only necessary to support raw passwords in storage
API;
// because of this support the storage has to operate with more than
one key dependent on storage generation algorithm;
// when this support is removed, the storage will get only one key
from outside
-uno::Sequence< beans::NamedValue > aKeys;
-if ( !( aValue >>= aKeys ) )
+if ( !( aValue >>= m_aStorageEncryptionKeys ) )
throw IllegalArgumentException(THROW_WHERE, uno::Reference<
uno::XInterface >(), 2 );
-/*if ( aKeys.hasElements() )
-{
-bool bHasSHA256 = false;
-bool bHasSHA1 = false;
-for ( const auto& rKey : std::as_const(aKeys) )
-{
-if ( rKey.Name == PACKAGE_ENCRYPTIONDATA_SHA256UTF8 )
-bHasSHA256 = true;
-if ( rKey.Name == PACKAGE_ENCRYPTIONDATA_SHA1UTF8 )
-bHasSHA1 = true;
-}
-
-if ( !bHasSHA256 && !bHasSHA1 )
-throw IllegalArgumentException(THROW_WHERE "Expected keys are
not provided!", uno::Reference< uno::XInterface >(), 2 );
-}*/
-
-m_aStorageEncryptionKeys = aKeys;
m_aEncryptionKey.realloc( 0 );
}
else if ( aPropertyName == ENCRYPTION_ALGORITHMS_PROPERTY )
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 545f520a7a1d..27e4284b258c 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1414,8 +1414,13 @@ ErrCode FileDialogHelper_Impl::execute(
std::vector& rpURLList,
// the password will be set in case user decide so
rpSet->ClearItem( SID_PASSWORDINTERACTION );
-rpSet->ClearItem( SID_PASSWORD );
-//rpSet->ClearItem( SID_ENCRYPTIONDATA );
+if (rpSet->HasItem( SID_PASSWORD ))
+{
+// As the SID_ENCRYPTIONDATA and SID_PASSWORD are using for
setting password together, we need to clear them both.
+// Note: Do not remove SID_ENCRYPTIONDATA without SID_PASSWORD
+rpSet->ClearItem( SID_PASSWORD );
+rpSet->ClearItem( SID_ENCRYPTIONDATA );
+}
rpSet->ClearItem( SID_RECOMMENDREADONLY );
rpSet->ClearItem( SID_MODIFYPASSWORDINFO );
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 9e386d8c5964..512fe81d6efd 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -809,22 +809,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
}
-bool bPreselectPassword = false;
const SfxStringItem* pOldPasswordItem =
SfxItemSet::GetItem(GetMedium()->GetItemSet(), SID_PASSWORD,
false);
-if (pOldPasswordItem)
-{
-bPreselectPassword = true;
-}
-else
-{
-const SfxUnoAnyItem* pOldEncryptionDataItem =
SfxItemSet::GetItem(GetMedium()->GetItemSet(),
SID_ENCRYPTIONDATA, false);
-if (pOldEncryptionDataItem)
-{
-uno::Sequence< beans::NamedValue > aEncryptionData;
-pOldEncryptionDataItem->GetValue() >>= aEncryptionData;
-
-}
-}
+const SfxUnoAnyItem* pOldEncryptionDataItem =
SfxItemSet::GetItem(GetMedium()->GetItemSet(),
SID_ENCRYPTIONDATA, false);
+bool bPreselectPassword = (pOldPasswordItem &&
pOldEncryptionDataItem);
uno::Sequence< beans::PropertyValue > aDispatchArgs;
if ( rReq.GetArgs() )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index ae58f9a88e97..174b06c761f3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2764,11 +2764,13 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString&
rFileName, const OUString&
std::unique_ptr pMergedParams(new SfxAllItemSet(
*pMedium->GetItemSet() ));
// in "SaveAs" title and password will be cleared ( maybe the new itemset
contains new v
[Libreoffice-commits] online.git: logerrit
logerrit | 201 +++
1 file changed, 201 insertions(+)
New commits:
commit 3e3e40bbe19f49786f4426f2817f2a3bef99c6d1
Author: Muhammet Kara
AuthorDate: Sat Nov 9 20:14:52 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 18:29:50 2019 +0100
Add logerrit for online
Copied over from core, replaced 'core' strings
with 'online', and removed 'testfeature'
Change-Id: Iae18ebc97b6851dbe61e5b089fa479dd740e2a8a
Reviewed-on: https://gerrit.libreoffice.org/82356
Reviewed-by: Muhammet Kara
Tested-by: Muhammet Kara
diff --git a/logerrit b/logerrit
new file mode 100755
index 0..36f9530e4
--- /dev/null
+++ b/logerrit
@@ -0,0 +1,201 @@
+#!/bin/bash
+
+#GERRITHOST=gerrit.libreoffice.org
+GERRITHOST=logerrit
+GERRITURL=ssh://$GERRITHOST/online
+
+get_SHA_for_change() {
+SHA=$(ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep
ref|tail -1|cut -d: -f2)
+}
+
+submit() {
+TYPE=$1
+BRANCH=$2
+if test -z "$BRANCH"
+then
+BRANCH=$(git symbolic-ref HEAD 2> /dev/null)
+BRANCH="${BRANCH##refs/heads/}"
+if test -z "$BRANCH"
+then
+echo "no branch specified, and could not guess the current
branch"
+exit 1
+fi
+echo "no branch specified, guessing current branch $BRANCH"
+fi
+git push $GERRITURL HEAD:refs/$TYPE/$BRANCH
+}
+
+logerrit() {
+echo "Host logerrit gerrit.libreoffice.org"
+echo "IdentityFile ~/.ssh/id_rsa"
+echo "User $1"
+echo "Port 29418"
+echo "HostName gerrit.libreoffice.org"
+}
+
+case "$1" in
+help|--help|"")
+echo "Usage: ./logerrit subcommand [options]"
+echo "simple and basic tool to interact with LibreOffice gerrit"
+echo "see https://wiki.documentfoundation.org/Development/gerrit for
details."
+echo
+echo "subcommands:"
+echo " setup walking you though your
gerrit setup"
+echo " testtest your gerrit setup"
+echo
+echo " --- for submitters:"
+echo " submit [BRANCH] submit your change for
review"
+echo " submit-draft [BRANCH] submit your change as draft"
+echo " nextchange [BRANCH] reset branch to the remote
to start with the next change"
+echo "Note: drafts are only visibly to yourself and those that you
explicitly add as reviewers."
+echo
+echo " --- for reviewers:"
+echo " checkout CHANGEID checkout the changes for
review"
+echo " pull CHANGEID pull (and merge) the
changes on current branch"
+echo " cherry-pick CHANGEIDcherry-pick the change on
current branch"
+echo " patch CHANGEID show the change as a patch"
+echo " query query for changes for
review on project online"
+echo " "
+echo
+echo "advanced users should consider using git review instead:"
+echo "http://wiki.documentfoundation.org/Development/GitReview";
+exit
+;;
+setup)
+script_canonical_file=$(readlink -f "$0")
+script_canonical_dir=$(dirname "$script_canonical_file")
+if ! cd "$script_canonical_dir"; then
+echo "Can't cd to $script_canonical_dir"
+exit 1
+fi
+ ssh_home="$HOME/.ssh";
+ ssh_key=
+ created_ssh=
+ if ! test -d $ssh_home; then
+ echo "It appears that you have no ssh setup, running ssh-keygen to
create that:"
+ mkdir $ssh_home
+ chmod 0700 $ssh_home
+ created_ssh=TRUE
+ echo
+ echo "Hit enter to generate an ssh key - you will need to enter a
pass-phrase"
+ echo
+ read
+ ssh-keygen -t rsa -f "$ssh_home/id_rsa"
+ fi
+ if test -d $ssh_home; then
+ if test -f "$ssh_home/id_rsa.pub"; then
+ ssh_key=$(cat $ssh_home/id_rsa.pub);
+ elif test -f "$ssh_home/id_dsa.pub"; then
+ ssh_key=$(cat $ssh_home/id_dsa.pub);
+ fi
+ fi
+echo "Please go to https://gerrit.libreoffice.org/ and:"
+echo "- press the 'register' button in the top right corner"
+echo "- after login set yourself a username (its recommended to use
your IRC-nick)"
+ if test "z$ssh_key" = "z"; then
+echo "- add your public ssh-key into the ssh keys settings."
+ else
+ echo "- paste the key below into the 'Add SSH Public Key' box."
+ echo
+ echo "$ssh_key"
+ echo
+ fi
+echo
+echo "Note that you need to register additional email addresses, if
you want t
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf124367.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 14 ++
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|2 +-
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|5 -
sw/qa/extras/rtfexport/rtfexport5.cxx|2 +-
sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
writerfilter/source/dmapper/DomainMapperTableManager.cxx |4 ++--
7 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit c401aa9f632758157021c2c45c5cc4d00ee12dab
Author: Bakos Attila
AuthorDate: Tue Nov 5 15:30:22 2019 +0100
Commit: László Németh
CommitDate: Sat Nov 9 18:20:27 2019 +0100
tdf124367 DOCX import: fix rounding error in table cell widths
Follow-up of commit 29cbbad64088354425c606f9eb6c267bdf7731dc
(DOCX import: fix rounding error in table cell widths),
its revert in commit e502463fa9a601963aa9f5a8783eb1318de36c13
(tdf#123104 DOCX import: fix lack of vertical merge due to rounding)
and commit 44e44239de35c1548809c96e13bfa9d64c7ca441
(tdf#120315 DOCX import: fix cells merged vertically).
Change-Id: Id85e8fd25dba26af77fe2fd3024db2ae834b5052
Reviewed-on: https://gerrit.libreoffice.org/82072
Reviewed-by: László Németh
Tested-by: László Németh
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/data/tdf124367.docx
b/sw/qa/extras/ooxmlexport/data/tdf124367.docx
new file mode 100644
index ..0a1356dd0d2b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf124367.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index c7f022d68311..12950c8451a7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -108,6 +108,20 @@ DECLARE_OOXMLEXPORT_TEST(testTdf121661, "tdf121661.docx")
assertXPath(pXmlSettings, "/w:settings/w:hyphenationZone", "val", "851");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx")
+{
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xTableRows = xTextTable->getRows();
+// it was 2761 at the first import, and 2760 at the second import, due to
incorrect rounding
+CPPUNIT_ASSERT_EQUAL(static_cast(2762),
+
getProperty>(
+ xTableRows->getByIndex(2),
"TableColumnSeparators")[0]
+ .Position);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index f2ce3fb3fe2a..a09479e44ea0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -272,7 +272,7 @@ DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave,
"test_segfault_while_save.docx")
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
-CPPUNIT_ASSERT_EQUAL(static_cast(6138), getXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").toInt32());
+CPPUNIT_ASSERT_EQUAL(static_cast(6137), getXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").toInt32());
// tdf#106572 - preventative test matching danger conditions, but imported
OK anyway
CPPUNIT_ASSERT_EQUAL(OUString("First Page"),
getProperty(getParagraphOrTable(1), "PageDescName"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index a46e3fb5eb63..e5b4ffc9cfdd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -884,7 +884,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo59273, "fdo59273.docx")
uno::Reference xTableRows = xTextTable->getRows();
// Was 9997, so the 4th column had ~zero width
-CPPUNIT_ASSERT_EQUAL(sal_Int16(7498), getProperty<
uno::Sequence >(xTableRows->getByIndex(0),
"TableColumnSeparators")[2].Position);
+CPPUNIT_ASSERT_LESSEQUAL(2, (sal_Int16(7500)
+ -
getProperty>(
+ xTableRows->getByIndex(0),
"TableColumnSeparators")[2]
+ .Position));
}
DECLARE_OOXMLEXPORT_TEST(testConditionalstylesTablelook,
"conditionalstyles-tbllook.docx")
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index e74e79073348..2a44ad72f1ff 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -944,7 +944,7 @@ DECLARE_RTFEXPORT_TEST(testTdf97035, "tdf97035.rtf")
// First cell width of the second row should be 2300
uno
[Libreoffice-commits] core.git: svx/source
svx/source/unodraw/unoshape.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 6070ef641f56cb826df884fdd846882c39a01342
Author: Muhammet Kara
AuthorDate: Sat Nov 9 13:28:30 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 18:00:31 2019 +0100
Add some info to the IllegalArgumentException in SvxShape
Change-Id: I31253a0410299ec2f7fbeb8bb981bdc97c66906c
Reviewed-on: https://gerrit.libreoffice.org/82351
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 7dee8bc71e30..3f07f5ab9a82 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2493,7 +2493,12 @@ bool SvxShape::setPropertyValueImpl( const OUString&,
const SfxItemPropertySimpl
return false;
}
}
-throw lang::IllegalArgumentException();
+
+OUString sExceptionMessage ("IllegalArgumentException in
SvxShape::setPropertyValueImpl."
+" Property Type: " +
pProperty->aType.getTypeName() + " Property nWID: " +
OUString::number(pProperty->nWID)
++ " Value Type: " + (rValue.hasValue() ?
rValue.getValueTypeName() : "void (no value)"));
+
+throw lang::IllegalArgumentException(sExceptionMessage, nullptr, 1);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl offapi/com toolkit/source vcl/headless vcl/inc vcl/source vcl/unx vcl/win
include/vcl/settings.hxx |9 +
offapi/com/sun/star/awt/XStyleSettings.idl |9 +
toolkit/source/awt/stylesettings.cxx | 41 ++
toolkit/source/awt/stylesettings.hxx |6 +++
vcl/headless/CustomWidgetDraw.cxx |3 +
vcl/inc/WidgetThemeLibrary.hxx |3 +
vcl/source/app/settings.cxx| 52 +
vcl/source/control/button.cxx | 13 +--
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |4 ++
vcl/win/window/salframe.cxx|3 +
10 files changed, 140 insertions(+), 3 deletions(-)
New commits:
commit 8a425fbd9c6b75b09672e0ce18f43162d9eda360
Author: Ashod Nakashian
AuthorDate: Sat Jan 19 07:49:24 2019 -0500
Commit: Tomaž Vajngerl
CommitDate: Sat Nov 9 17:35:21 2019 +0100
custom widgets: support custom action button text colors
Change-Id: I314183a1d6434c043183a600740c786e22a67503
Reviewed-on: https://gerrit.libreoffice.org/82276
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 2f0334a5bed8..75894432f05d 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -251,6 +251,15 @@ public:
voidSetButtonTextColor( const Color& rColor );
const Color&GetButtonTextColor() const;
+voidSetDefaultActionButtonTextColor( const
Color& rColor );
+const Color&GetDefaultActionButtonTextColor() const;
+
+voidSetActionButtonTextColor( const Color&
rColor );
+const Color&GetActionButtonTextColor() const;
+
+voidSetActionButtonRolloverTextColor( const
Color& rColor );
+const Color&GetActionButtonRolloverTextColor() const;
+
voidSetButtonRolloverTextColor( const Color&
rColor );
const Color&GetButtonRolloverTextColor() const;
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl
b/offapi/com/sun/star/awt/XStyleSettings.idl
index 47a55d6e4e62..6150033787c9 100644
--- a/offapi/com/sun/star/awt/XStyleSettings.idl
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -61,9 +61,18 @@ interface XStyleSettings
/// specifies the color to use for text on buttons which are hovered with
the mouse
[attribute] ::com::sun::star::util::Color ButtonRolloverTextColor;
+/// specifies the color to use for text on action buttons which are
hovered with the mouse
+[attribute] ::com::sun::star::util::Color ActionButtonRolloverTextColor;
+
/// specifies the color to use for text on buttons
[attribute] ::com::sun::star::util::Color ButtonTextColor;
+/// specifies the color to use for text on a default action buttons
+[attribute] ::com::sun::star::util::Color DefaultActionButtonTextColor;
+
+/// specifies the color to use for text on action buttons
+[attribute] ::com::sun::star::util::Color ActionButtonTextColor;
+
[attribute] ::com::sun::star::util::Color CheckedColor;
diff --git a/toolkit/source/awt/stylesettings.cxx
b/toolkit/source/awt/stylesettings.cxx
index 136832dce5bf..eb76209040b8 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -239,6 +239,20 @@ namespace toolkit
}
+::sal_Int32 SAL_CALL
WindowStyleSettings::getActionButtonRolloverTextColor()
+{
+StyleMethodGuard aGuard( *m_pData );
+return lcl_getStyleColor( *m_pData,
&StyleSettings::GetActionButtonRolloverTextColor );
+}
+
+
+void SAL_CALL WindowStyleSettings::setActionButtonRolloverTextColor(
::sal_Int32 _buttonrollovertextcolor )
+{
+StyleMethodGuard aGuard( *m_pData );
+lcl_setStyleColor( *m_pData,
&StyleSettings::SetActionButtonRolloverTextColor, _buttonrollovertextcolor );
+}
+
+
::sal_Int32 SAL_CALL WindowStyleSettings::getButtonTextColor()
{
StyleMethodGuard aGuard( *m_pData );
@@ -252,6 +266,33 @@ namespace toolkit
lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonTextColor,
_buttontextcolor );
}
+::sal_Int32 SAL_CALL WindowStyleSettings::getDefaultActionButtonTextColor()
+{
+StyleMethodGuard aGuard( *m_pData );
+return lcl_getStyleColor( *m_pData,
&StyleSettings::GetDefaultActionButtonTextColor );
+}
+
+
+void SAL_CALL WindowStyleSettings::setDefaultActionButtonTextColor(
::sal_Int32 _buttontextcolor )
+{
+StyleMethodGuard aGuard( *m_pData );
+lcl_setStyleColor( *m_pData,
&StyleSettings::SetDefaultActionButtonTextColor, _buttontextcolor );
+}
+
+
+::sal_Int32 SAL_CALL WindowStyleSettings::getActionButtonTextColor()
+{
+StyleMethodGuard aGuard( *m_pData );
+return lcl_getStyleColor( *m_pData,
&StyleSettings::GetActionButtonTe
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source
sd/source/core/CustomAnimationCloner.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 947e9ffba8e5a8b18b46efcf06de998cea6edaa6
Author: Muhammet Kara
AuthorDate: Sat Nov 9 00:14:11 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 17:21:09 2019 +0100
Fix tdf#124708: CRASH: Selecting all and deleting
Change-Id: I0de912dad97f266a56ab52a351b0676f17675ed5
Reviewed-on: https://gerrit.libreoffice.org/82332
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
(cherry picked from commit 8023a613e978be42758c88d23f1973f7b9661676)
Reviewed-on: https://gerrit.libreoffice.org/82354
diff --git a/sd/source/core/CustomAnimationCloner.cxx
b/sd/source/core/CustomAnimationCloner.cxx
index 281ad7f7affe..154e8ab6ecac 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -294,9 +294,13 @@ namespace sd
Reference< XAnimationNode > CustomAnimationClonerImpl::getClonedNode(
const Reference< XAnimationNode >& xSource ) const
{
-sal_Int32 nNode, nNodeCount = maSourceNodeVector.size();
+std::size_t nNodeCount = maSourceNodeVector.size();
+std::size_t nCloneNodeCount = maCloneNodeVector.size();
-for( nNode = 0; nNode < nNodeCount; nNode++ )
+if (nNodeCount != nCloneNodeCount)
+SAL_WARN("sd.core", "Sizes of maSourceNodeVector and
maCloneNodeVector mismatch!");
+
+for( std::size_t nNode = 0; nNode < nNodeCount && nNode <
nCloneNodeCount; ++nNode )
{
if( maSourceNodeVector[nNode] == xSource )
return maCloneNodeVector[nNode];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source
svx/source/unodraw/unoshape.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit ab7cdbb1961210ee9b0a6a847878befad8789991
Author: Muhammet Kara
AuthorDate: Sat Nov 9 13:28:30 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 17:14:04 2019 +0100
Add some info to the IllegalArgumentException in SvxShape
Change-Id: I31253a0410299ec2f7fbeb8bb981bdc97c66906c
Reviewed-on: https://gerrit.libreoffice.org/82350
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 4430da8af9c9..29e08997df88 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2512,7 +2512,12 @@ bool SvxShape::setPropertyValueImpl( const OUString&,
const SfxItemPropertySimpl
return false;
}
}
-throw lang::IllegalArgumentException();
+
+OUString sExceptionMessage (OUStringLiteral("IllegalArgumentException in
SvxShape::setPropertyValueImpl.")
++ " Property Type: " +
pProperty->aType.getTypeName() + " Property nWID: " +
OUString::number(pProperty->nWID)
++ " Value Type: " + (rValue.hasValue() ?
rValue.getValueTypeName() : "void (no value)"));
+
+throw lang::IllegalArgumentException(sExceptionMessage, nullptr, 1);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/cppuhelper xmloff/source
include/cppuhelper/weakref.hxx |6 ++
xmloff/source/core/nmspmap.cxx | 20
2 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit a0ebc6f898992dbc0da9f252911da867dfdfd741
Author: Noel Grandin
AuthorDate: Sat Nov 9 08:47:48 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 9 17:11:35 2019 +0100
missing move operator=
Change-Id: Id184cbc88f41eda78c58898693285e185298a1e4
Reviewed-on: https://gerrit.libreoffice.org/82343
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index c681284bac77..8a94145998fa 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -172,6 +172,12 @@ public:
const css::uno::Reference< interface_type > & xInt )
{ WeakReferenceHelper::operator=(xInt); return *this; }
+#if defined LIBO_INTERNAL_ONLY
+WeakReference & SAL_CALL operator = (
+const css::uno::Reference< interface_type > && xInt )
+{ WeakReferenceHelper::operator=(std::move(xInt)); return *this; }
+#endif
+
/** Gets a hard reference to the object.
@return hard reference or null, if the weakly referenced interface
has gone
commit 5ddbfea5f9f2c7fca852e2a25c804ad7050d14fa
Author: Noel Grandin
AuthorDate: Fri Nov 8 19:09:01 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 9 17:11:24 2019 +0100
micro-optimisation
Change-Id: I392b897be4f78bf368149ac47646c3d79790fd96
Reviewed-on: https://gerrit.libreoffice.org/82342
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 7aa50542b5e8..c1ee7412f438 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -173,19 +173,15 @@ const OUString& SvXMLNamespaceMap::GetNameByKey(
sal_uInt16 nKey ) const
OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const
{
-OUStringBuffer sAttrName;
NameSpaceMap::const_iterator aIter = aNameMap.find ( nKey );
-if (aIter != aNameMap.end())
-{
-sAttrName.append( sXMLNS );
-const OUString & prefix( (*aIter).second->sPrefix );
-if (!prefix.isEmpty()) // not default namespace
-{
-sAttrName.append( ':' );
-sAttrName.append( prefix );
-}
-}
-return sAttrName.makeStringAndClear();
+if (aIter == aNameMap.end())
+return OUString();
+
+const OUString & prefix( (*aIter).second->sPrefix );
+if (prefix.isEmpty()) // default namespace
+return sXMLNS;
+
+return sXMLNS + ":" + prefix;
}
OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/customize/CommandCategoryListBox.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit ebccc375248faebdfbca273b149483593c753387
Author: Mike Kaganski
AuthorDate: Sat Nov 9 15:12:52 2019 +0300
Commit: Mike Kaganski
CommitDate: Sat Nov 9 17:02:36 2019 +0100
tdf#128010: Don't ask to enable JRE when populating available scripts
It was user's intention to not use JRE, so omitting the JRE-dependent
scripts in dialogs is just consistent with user's configuration.
Change-Id: Ic551f5dd1d797fbaa2dc6d7e443e23d46b0ac5d3
Reviewed-on: https://gerrit.libreoffice.org/82353
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/source/customize/CommandCategoryListBox.cxx
b/cui/source/customize/CommandCategoryListBox.cxx
index a5c572e6a935..10758d0af47a 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -381,8 +382,15 @@ void
CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio
SfxCfgKind::GROUP_SCRIPTCONTAINER, 0 ) );
std::unique_ptr
xMacroGroup(pFunctionListBox->tree_append(OUString::number(reinterpret_cast(m_aGroupInfo.back().get())),
sUIName));
-//Add the children and the grand children
-addChildren(xMacroGroup.get(), childGroup,
pFunctionListBox, filterTerm, pCurrentSaveInData, aNodesToExpand);
+{
+// tdf#128010: Do not nag user asking to enable
JRE: if it's disabled,
+// simply don't show relevant entries (user chose
to not use JRE)
+css::uno::ContextLayer layer(
+comphelper::NoEnableJavaInteractionContext());
+//Add the children and the grand children
+addChildren(xMacroGroup.get(), childGroup,
pFunctionListBox, filterTerm,
+pCurrentSaveInData, aNodesToExpand);
+}
// Remove the main group if empty
if (!pFunctionListBox->iter_has_child(*xMacroGroup))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source
sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc |binary
sw/qa/extras/ww8export/ww8export3.cxx| 16 +
sw/source/filter/ww8/ww8par6.cxx | 18 ---
3 files changed, 30 insertions(+), 4 deletions(-)
New commits:
commit bf7894c4af3023f77a53427d756d8ccba2f0ac6e
Author: Justin Luth
AuthorDate: Sat Nov 9 07:27:21 2019 +0300
Commit: Xisco Faulí
CommitDate: Sat Nov 9 15:58:16 2019 +0100
partial revert tdf#116071 import to XATTR_FILL not RES_BACKGROUND
caused by commit 3539a1efb41a787237e4333ebc715db96ffacb5b
which fixes table-related regression bug report tdf#128608.
I was not able to create a unit test for this from scratch.
In fact, if I use MSWord2003 to roundtrip the file, then LO
opens it without problems.
A real fix (to move LO away from RES_BACKGROUND in tables) should
be subject to lots of testing time, so just reverting for now.
Change-Id: I328741947b7ed319ff8df0ba169618f6ad0d2c75
Reviewed-on: https://gerrit.libreoffice.org/82339
Tested-by: Jenkins
Reviewed-by: Justin Luth
(cherry picked from commit 5f0844077d289a257b914f0aad9fd93788f34511)
Reviewed-on: https://gerrit.libreoffice.org/82349
Reviewed-by: Xisco Faulí
diff --git a/sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc
b/sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc
new file mode 100644
index ..d9b16ca53a30
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 3b7dbd968bb3..30e75563a783 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -221,6 +221,22 @@ DECLARE_WW8EXPORT_TEST(testTdf127862_pageFillStyle,
"tdf127862_pageFillStyle.odt
CPPUNIT_ASSERT(drawing::FillStyle_NONE !=
getProperty(xStyle, "FillStyle"));
}
+DECLARE_WW8EXPORT_TEST(testTdf128608_tableParaBackColor,
"tdf128608_tableParaBackColor.doc")
+{
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A4"),
uno::UNO_QUERY);
+
+uno::Reference
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum =
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
+// ParaBackColor doesn't seem to be used in this case, but keep it here to
make sure it stays as AUTO.
+CPPUNIT_ASSERT_EQUAL(COL_AUTO, Color(getProperty(xPara,
"ParaBackColor")));
+// No paragraph background colour/fill. (The cell background colour should
be used.)
+CPPUNIT_ASSERT_EQUAL_MESSAGE("No fillstyle", drawing::FillStyle_NONE,
getProperty(xPara, "FillStyle"));
+}
+
DECLARE_WW8EXPORT_TEST(testTdf94009_zeroPgMargin, "tdf94009_zeroPgMargin.odt")
{
uno::Reference
defaultStyle(getStyles("PageStyles")->getByName("Standard"),
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e7308ac7e60e..69a6900220d2 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4886,8 +4886,13 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16,
const sal_uInt8* pData, sho
if (nLen <= 0)
{
// end of attribute
-m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLSTYLE );
-m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLCOLOR );
+if ( m_nInTable )
+m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_BACKGROUND );
+else
+{
+m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLSTYLE );
+m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLCOLOR );
+}
}
else
{
@@ -4895,8 +4900,13 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16,
const sal_uInt8* pData, sho
if (nLen != 10)
return;
-NewAttr( XFillStyleItem(drawing::FillStyle_SOLID) );
-NewAttr( XFillColorItem(OUString(), ExtractColour(pData, m_bVer67)) );
+if ( m_nInTable )
+NewAttr( SvxBrushItem(ExtractColour(pData, m_bVer67),
RES_BACKGROUND) );
+else
+{
+NewAttr( XFillStyleItem(drawing::FillStyle_SOLID) );
+NewAttr( XFillColorItem(OUString(), ExtractColour(pData,
m_bVer67)) );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf125778_lostPageBreakTOX.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx|5 +
sw/source/filter/ww8/wrtw8nds.cxx |6 +++---
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit bb6edb9d28058a7bf6ba7faa9b371002e1d8
Author: Justin Luth
AuthorDate: Mon Nov 4 08:14:41 2019 +0300
Commit: Xisco Faulí
CommitDate: Sat Nov 9 15:57:48 2019 +0100
tdf#125778 docxexport: handle pageBreak before TOX
The pagebreak before the TOX was lost in docx
(but not in .doc or .rtf).
Change-Id: I280b0bd19a73db180b65a0937bd0fe809e5dfc6f
Reviewed-on: https://gerrit.libreoffice.org/81979
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
(cherry picked from commit 4ea43e887498f9d78f70b40bcdc53865057a78c0)
Reviewed-on: https://gerrit.libreoffice.org/82250
Reviewed-by: Xisco Faulí
diff --git a/sw/qa/extras/ooxmlexport/data/tdf125778_lostPageBreakTOX.docx
b/sw/qa/extras/ooxmlexport/data/tdf125778_lostPageBreakTOX.docx
new file mode 100644
index ..dd5d323e5778
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf125778_lostPageBreakTOX.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 0fc73d0d2879..3800851c3b83 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -46,6 +46,11 @@ DECLARE_SW_EXPORT_TEST(testFlyInFly, "ooo39250-1-min.rtf",
nullptr, Test)
CPPUNIT_ASSERT_EQUAL(OUString("Frame2"),
uno::Reference(xAnchorFrame,
uno::UNO_QUERY_THROW)->getName());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf125778_lostPageBreakTOX,
"tdf125778_lostPageBreakTOX.docx")
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 3, getPages() );
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf126994_lostPageBreak,
"tdf126994_lostPageBreak.docx")
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 3, getPages() );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index dc7e4e18c6e8..947e16457bf5 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3025,8 +3025,7 @@ void MSWordExportBase::OutputSectionNode( const
SwSectionNode& rSectionNode )
SwNodeIndex aIdx( rSectionNode, 1 );
const SwNode& rNd = aIdx.GetNode();
-if ( !rNd.IsSectionNode() && !IsInTable()
-&& rSection.GetType() != TOX_CONTENT_SECTION && rSection.GetType() !=
TOX_HEADER_SECTION) //No sections in table
+if ( !rNd.IsSectionNode() && !IsInTable() ) //No sections in table
{
// if the first Node inside the section has an own
// PageDesc or PageBreak attribute, then don't write
@@ -3046,7 +3045,8 @@ void MSWordExportBase::OutputSectionNode( const
SwSectionNode& rSectionNode )
else
AttrOutput().SectionBreaks( rSectionNode );
-if ( !pSet )
+const bool bInTOX = rSection.GetType() == TOX_CONTENT_SECTION ||
rSection.GetType() == TOX_HEADER_SECTION;
+if ( !pSet && !bInTOX )
{
// new Section with no own PageDesc/-Break
// -> write follow section break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/opengl/zone.hxx |4
1 file changed, 4 insertions(+)
New commits:
commit 9336ae40d51e9a95ea31dd5fcfa5b67a9b2bafd7
Author: Rene Engelhard
AuthorDate: Sat Nov 9 11:03:47 2019 +0100
Commit: Rene Engelhard
CommitDate: Sat Nov 9 13:28:21 2019 +0100
disable static_assert on AtomicCounter::is_always_lock_free on armel ...
... since AtomicCounter::is_always_lock_free seems to be
always false on armel
Change-Id: I89c15fd41337ac5b29f781722423427825e6ff45
Reviewed-on: https://gerrit.libreoffice.org/82165
Tested-by: Rene Engelhard
Reviewed-by: Rene Engelhard
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx
index 3210186c3096..90b7f48fd5a8 100644
--- a/vcl/inc/opengl/zone.hxx
+++ b/vcl/inc/opengl/zone.hxx
@@ -35,8 +35,12 @@ class VCL_DLLPUBLIC OpenGLZone {
// that is actually lock-free. However, gnEnterCount and gnLeaveCount are
both monotonically
// increasing, so will eventually overflow, so the underlying type better
be unsigned, which
// sig_atomic_t is not guaranteed to be:
+#if !defined ARM32 || (defined ARM32 && defined __ARM_PCS_VFP)
using AtomicCounter = std::atomic>;
static_assert(AtomicCounter::is_always_lock_free);
+#else
+using AtomicCounter = volatile std::make_unsigned_t;
+#endif
/// how many times have we entered a GL zone
static AtomicCounter gnEnterCount;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/ShapeFactory.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit cb413b1de64dfaddf38f347b2f53d28f3c8246c6
Author: Muhammet Kara
AuthorDate: Sat Nov 9 13:11:03 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 13:02:34 2019 +0100
Don't call setPropertyValue with empty value
Change-Id: I3dd2525e5649cf71b47c2733db4d121625b33342
Reviewed-on: https://gerrit.libreoffice.org/82348
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index 3bcd72ff2904..f6219c650151 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2154,7 +2154,11 @@ uno::Reference< drawing::XShape >
//the matrix needs to be set at the end behind autogrow and such
position influencing properties
try
{
-xProp->setPropertyValue( "Transformation", rATransformation );
+if (rATransformation.hasValue())
+xProp->setPropertyValue( "Transformation", rATransformation );
+else
+SAL_INFO("chart2", "No rATransformation value is given to
ShapeFactory::createText()");
+
}
catch( const uno::Exception& )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source
chart2/source/view/main/ShapeFactory.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 24f8537bf8af516e5cb143126e1d3a089041d60a
Author: Muhammet Kara
AuthorDate: Sat Nov 9 13:11:03 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 13:02:22 2019 +0100
Don't call setPropertyValue with empty value
Change-Id: I3dd2525e5649cf71b47c2733db4d121625b33342
Reviewed-on: https://gerrit.libreoffice.org/82347
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index 28f981635529..bc358243e2b0 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2163,11 +2163,15 @@ uno::Reference< drawing::XShape >
//the matrix needs to be set at the end behind autogrow and such
position influencing properties
try
{
-xProp->setPropertyValue( "Transformation", rATransformation );
+if (rATransformation.hasValue())
+xProp->setPropertyValue( "Transformation", rATransformation );
+else
+SAL_INFO("chart2", "No rATransformation value is given to
ShapeFactory::createText()");
+
}
catch( const uno::Exception& e )
{
-SAL_WARN("chart2", "Exception caught. " << e );
+SAL_WARN("chart2", "Exception caught. " << e.Message );
}
}
return xShape;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: AtomicCounter::is_always_lock_free on armel
Hi, On Fri, Nov 08, 2019 at 09:05:12AM +0100, Stephan Bergmann wrote: > Ah. What I'd meant was something like > > > #if ... > > using AtomicCounter = std::atomic>; > > static_assert(AtomicCounter::is_always_lock_free); > > #else > > using AtomicCounter = volatile std::make_unsigned_t; > > #endif OK. changed and updated in gerrit. Verified in a armel build on abel.debian.org and in my local amd64 build. Regards, Rene > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
dev/null|binary icon-themes/colibre/cmd/32/calloutshapes.png|binary icon-themes/colibre/cmd/32/closepreview.png |binary icon-themes/colibre/cmd/32/dbsortingandgrouping.png |binary icon-themes/colibre/cmd/32/ko/bold.png |binary icon-themes/colibre/cmd/32/ko/charfontname.png |binary icon-themes/colibre/cmd/32/ko/color.png |binary icon-themes/colibre/cmd/32/ko/italic.png|binary icon-themes/colibre/cmd/32/ko/outlinefont.png |binary icon-themes/colibre/cmd/32/ko/outlineformat.png |binary icon-themes/colibre/cmd/32/ko/overline.png |binary icon-themes/colibre/cmd/32/ko/scaletext.png |binary icon-themes/colibre/cmd/32/ko/shadowed.png |binary icon-themes/colibre/cmd/32/ko/sortascending.png |binary icon-themes/colibre/cmd/32/ko/sortdescending.png|binary icon-themes/colibre/cmd/32/ko/strikeout.png |binary icon-themes/colibre/cmd/32/ko/text.png |binary icon-themes/colibre/cmd/32/ko/text_marquee.png |binary icon-themes/colibre/cmd/32/ko/textdirectionlefttoright.png |binary icon-themes/colibre/cmd/32/ko/textdirectiontoptobottom.png |binary icon-themes/colibre/cmd/32/ko/underline.png |binary icon-themes/colibre/cmd/32/ko/underlinedouble.png |binary icon-themes/colibre/cmd/32/ko/verticaltext.png |binary icon-themes/colibre/cmd/32/ko/verticaltextfittosizetool.png |binary icon-themes/colibre/cmd/32/verticaltextfittosizetool.png|binary icon-themes/colibre/cmd/ko/lc_verticaltextfittosizetool.png |binary icon-themes/colibre/cmd/ko/sc_verticaltextfittosizetool.png |binary icon-themes/colibre/cmd/lc_dbsortingandgrouping.png |binary icon-themes/colibre/cmd/lc_verticaltextfittosizetool.png|binary icon-themes/colibre/cmd/sc_dbsortingandgrouping.png |binary icon-themes/colibre/cmd/sc_verticaltextfittosizetool.png|binary icon-themes/colibre/links.txt |1 + icon-themes/colibre_svg/cmd/32/calloutshapes.svg|2 +- icon-themes/colibre_svg/cmd/32/closepreview.svg |1 + icon-themes/colibre_svg/cmd/32/dbsortingandgrouping.svg |2 +- icon-themes/colibre_svg/cmd/32/ko/bold.svg |1 + icon-themes/colibre_svg/cmd/32/ko/charfontname.svg |1 + icon-themes/colibre_svg/cmd/32/ko/color.svg |1 + icon-themes/colibre_svg/cmd/32/ko/italic.svg|1 + icon-themes/colibre_svg/cmd/32/ko/outlinefont.svg |1 + icon-themes/colibre_svg/cmd/32/ko/outlineformat.svg |1 + icon-themes/colibre_svg/cmd/32/ko/overline.svg |1 + icon-themes/colibre_svg/cmd/32/ko/scaletext.svg |1 + icon-themes/colibre_svg/cmd/32/ko/shadowed.svg |1 + icon-themes/colibre_svg/cmd/32/ko/sortascending.svg |1 + icon-themes/colibre_svg/cmd/32/ko/sortdescending.svg|1 + icon-themes/colibre_svg/cmd/32/ko/strikeout.svg |1 + icon-themes/colibre_svg/cmd/32/ko/text.svg |1 + icon-themes/colibre_svg/cmd/32/ko/text_marquee.svg |1 + icon-themes/colibre_svg/cmd/32/ko/textdirectionlefttoright.svg |1 + icon-themes/colibre_svg/cmd/32/ko/textdirectiontoptobottom.svg |1 + icon-themes/colibre_svg/cmd/32/ko/underline.svg |1 + icon-themes/colibre_svg/cmd/32/ko/underlinedouble.svg |1 + icon-themes/colibre_svg/cmd/32/ko/verticaltext.svg |1 + icon-themes/colibre_svg/cmd/32/ko/verticaltextfittosizetool.svg |1 + icon-themes/colibre_svg/cmd/32/verticaltextfittosizetool.svg|2 +- icon-themes/colibre_svg/cmd/ko/lc_dbsortingandgrouping.svg |1 - icon-themes/colibre_svg/cmd/ko/lc_verticaltextfittosizetool.svg |2 +- icon-themes/colibre_svg/cmd/ko/sc_dbsortingandgrouping.svg |1 - icon-themes/colibre_svg/cmd/ko/sc_verticaltextfittosizetool.svg |2 +- icon-themes/colibre_svg/cmd/lc_dbsortingandgrouping.svg |2 +- icon-themes/colibre_svg/cmd/lc_verticaltextfittosizetool.svg|2 +- icon-themes/colibre_svg/cmd/sc_dbsortingandgrouping.svg |2 +- icon-themes/colibre_svg/cmd/sc_verticaltextfittosizetool.svg|2 +- 64 files changed, 31 insertions(+), 11 deletions(-) New commits: commit 231f95cdfde28d419721e117e2a92570e8fc771c Author: Rizal Muttaqin AuthorDate: Sat Nov 9 13:16:05 2019 +0700 Commit: Rizal Muttaqin CommitDate: Sat Nov 9 12:07:17 2019 +0100 Colibre: tdf#128679 Add e
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/viewfrm.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit b505ca5b9c31b3d9c639406d03a25bea4e914242
Author: Serge Krot
AuthorDate: Fri Nov 8 17:31:49 2019 +0100
Commit: Thorsten Behrens
CommitDate: Sat Nov 9 11:41:28 2019 +0100
Switch to read-only mode: do not force reload document if possible
Change-Id: I5f83e7626e58cb4b558b54130b725b1041b7142f
Reviewed-on: https://gerrit.libreoffice.org/82313
Reviewed-by: Serge Krot (CIB)
Tested-by: Serge Krot (CIB)
(cherry picked from commit b92e774bbfe83aba80c8d480399887394937cc96)
Reviewed-on: https://gerrit.libreoffice.org/82314
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
old mode 100644
new mode 100755
index fafe5df417dc..e3f39e3aab40
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -459,6 +459,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
|| pVersionItem )
// <- tdf#82744
{
+bNeedsReload = true;
+
bool bOK = false;
bool bRetryIgnoringLock = false;
bool bOpenTemplate = false;
@@ -601,7 +603,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
}
}
-rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, true) );
+rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, bNeedsReload) );
rReq.AppendItem( SfxBoolItem( SID_SILENT, true ));
[[fallthrough]]; //TODO ???
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc |binary
sw/qa/extras/ww8export/ww8export3.cxx| 16 +
sw/source/filter/ww8/ww8par6.cxx | 18 ---
3 files changed, 30 insertions(+), 4 deletions(-)
New commits:
commit 5f0844077d289a257b914f0aad9fd93788f34511
Author: Justin Luth
AuthorDate: Sat Nov 9 07:27:21 2019 +0300
Commit: Justin Luth
CommitDate: Sat Nov 9 11:27:18 2019 +0100
partial revert tdf#116071 import to XATTR_FILL not RES_BACKGROUND
caused by commit 3539a1efb41a787237e4333ebc715db96ffacb5b
which fixes table-related regression bug report tdf#128608.
I was not able to create a unit test for this from scratch.
In fact, if I use MSWord2003 to roundtrip the file, then LO
opens it without problems.
A real fix (to move LO away from RES_BACKGROUND in tables) should
be subject to lots of testing time, so just reverting for now.
Change-Id: I328741947b7ed319ff8df0ba169618f6ad0d2c75
Reviewed-on: https://gerrit.libreoffice.org/82339
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc
b/sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc
new file mode 100644
index ..d9b16ca53a30
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf128608_tableParaBackColor.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 7a4dc17d4ede..95520e563155 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -226,6 +226,22 @@ DECLARE_WW8EXPORT_TEST(testTdf127862_pageFillStyle,
"tdf127862_pageFillStyle.odt
CPPUNIT_ASSERT(drawing::FillStyle_NONE !=
getProperty(xStyle, "FillStyle"));
}
+DECLARE_WW8EXPORT_TEST(testTdf128608_tableParaBackColor,
"tdf128608_tableParaBackColor.doc")
+{
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A4"),
uno::UNO_QUERY);
+
+uno::Reference
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum =
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
+// ParaBackColor doesn't seem to be used in this case, but keep it here to
make sure it stays as AUTO.
+CPPUNIT_ASSERT_EQUAL(COL_AUTO, Color(getProperty(xPara,
"ParaBackColor")));
+// No paragraph background colour/fill. (The cell background colour should
be used.)
+CPPUNIT_ASSERT_EQUAL_MESSAGE("No fillstyle", drawing::FillStyle_NONE,
getProperty(xPara, "FillStyle"));
+}
+
DECLARE_WW8EXPORT_TEST(testTdf94009_zeroPgMargin, "tdf94009_zeroPgMargin.odt")
{
uno::Reference
defaultStyle(getStyles("PageStyles")->getByName("Standard"),
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d83995198272..72e5f77db274 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4896,8 +4896,13 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16,
const sal_uInt8* pData, sho
if (nLen <= 0)
{
// end of attribute
-m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLSTYLE );
-m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLCOLOR );
+if ( m_nInTable )
+m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_BACKGROUND );
+else
+{
+m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLSTYLE );
+m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), XATTR_FILLCOLOR );
+}
}
else
{
@@ -4905,8 +4910,13 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16,
const sal_uInt8* pData, sho
if (nLen != 10)
return;
-NewAttr( XFillStyleItem(drawing::FillStyle_SOLID) );
-NewAttr( XFillColorItem(OUString(), ExtractColour(pData, m_bVer67)) );
+if ( m_nInTable )
+NewAttr( SvxBrushItem(ExtractColour(pData, m_bVer67),
RES_BACKGROUND) );
+else
+{
+NewAttr( XFillStyleItem(drawing::FillStyle_SOLID) );
+NewAttr( XFillColorItem(OUString(), ExtractColour(pData,
m_bVer67)) );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source basic/source cui/source include/comphelper scripting/source
basctl/source/basicide/baside2.cxx |7 ++
basic/source/comp/exprtree.cxx | 16 +
cui/source/customize/cfgutil.cxx |6 --
cui/source/dialogs/scriptdlg.cxx |6 --
include/comphelper/DisableInteractionHelper.hxx| 49
include/comphelper/SetFlagContextHelper.hxx| 63 +
scripting/source/provider/MasterScriptProvider.cxx |6 --
7 files changed, 91 insertions(+), 62 deletions(-)
New commits:
commit d628258f279d003ba4e11f1f7e2e69273acd008c
Author: Mike Kaganski
AuthorDate: Mon Oct 28 18:59:57 2019 +0300
Commit: Mike Kaganski
CommitDate: Sat Nov 9 09:53:38 2019 +0100
tdf#80731: Only check closing parenthesis when in IDE
This reinstates the fix by Pierre Lepage, which was reverted in
351dead74b4c213b13102f81b5ae9bb47ad8ca39, and makes sure it only
has effect when the compilation is started from IDE.
The idea is that the IDE is used primarily for development, and
that's a good opportunity to detect any error in the code. When
the code is compiled from outside of the IDE (like running an
extension), the error is tolerated to allow users run the legacy
code having this error. Hopefully this is enough for tdf#106529.
This re-uses comphelper's NoEnableJavaInteractionContext class,
which is converted into general-purpose SetFlagContext class to
avoid code duplication.
Change-Id: Ie290019cb190b8d1d590699ec13bd63eac478d09
Reviewed-on: https://gerrit.libreoffice.org/81616
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index e8bac4aa19af..af35a3a3dc7b 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -282,7 +283,11 @@ void ModulWindow::CheckCompileBasic()
bool bWasModified = GetBasic()->IsModified();
-bDone = m_xModule->Compile();
+{
+// tdf#106529: only use strict compilation mode when compiling
from the IDE
+css::uno::ContextLayer
layer(comphelper::NewFlagContext("BasicStrict"));
+bDone = m_xModule->Compile();
+}
if ( !bWasModified )
GetBasic()->SetModified(false);
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index a7f5188aa075..a5d149a6c0ef 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
SbiExpression::SbiExpression( SbiParser* p, SbiExprType t,
SbiExprMode eMode, const KeywordSymbolInfo* pKeywordSymbolInfo )
@@ -1033,6 +1034,21 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser*
pParser, bool bStandalon
{
if( ( pExprList->bBracket && eTok == RPAREN ) ||
SbiTokenizer::IsEoln( eTok ) )
{
+// tdf#80731
+if (SbiTokenizer::IsEoln(eTok) && pExprList->bBracket)
+{
+// tdf#106529: only fail here in strict mode (i.e. when
compiled from IDE), and
+// allow legacy code with missing closing parenthesis when
started e.g. from
+// extensions and event handlers
+bool bCheckStrict = false;
+if (auto xContext = css::uno::getCurrentContext())
+xContext->getValueByName("BasicStrict") >>=
bCheckStrict;
+if (bCheckStrict)
+{
+pParser->Error(ERRCODE_BASIC_EXPECTED, RPAREN);
+pExprList->bError = true;
+}
+}
break;
}
pParser->Error( pExprList->bBracket ? ERRCODE_BASIC_BAD_BRACKETS :
ERRCODE_BASIC_EXPECTED, COMMA );
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 0549e04cfbf5..1d94255e73eb 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -40,7 +40,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -52,7 +52,6 @@
#include
#include
#include
-#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -487,8 +486,7 @@ void CuiConfigGroupListBox::FillScriptList(const
css::uno::Reference< css::scrip
if ( xRootNode->hasChildNodes() )
{
// tdf#120362: Don't ask to enable disabled Java when filling
script list
-css::uno::ContextLayer layer(
-new
comphelper::NoEnableJavaInteractionContext(css::uno::getCurrentContext()));
+css::uno::ContextLayer
layer(comphelper::NoEnableJavaInteractionContext());
Sequence< Re
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/ControllerCommandDispatch.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7e7e97fc0bd2f3d7b794b3fc064c60ef86e9b72b
Author: Muhammet Kara
AuthorDate: Sat Nov 9 10:33:02 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 09:14:06 2019 +0100
Make ControllerCommandDispatch::commandAvailable() more talkative
Change-Id: I7d89a27692c619707ccb8356241422c9578fb081
Reviewed-on: https://gerrit.libreoffice.org/82345
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 4b732ceae1ac..ffbb53ac7176 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -713,7 +713,7 @@ bool ControllerCommandDispatch::commandAvailable( const
OUString & rCommand )
std::map< OUString, bool >::const_iterator aIt(
m_aCommandAvailability.find( rCommand ));
if( aIt != m_aCommandAvailability.end())
return aIt->second;
-OSL_FAIL( "commandAvailable: command not in availability map" );
+SAL_WARN("chart2", "commandAvailable: command not in availability map:" <<
rCommand);
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source
chart2/source/controller/main/ControllerCommandDispatch.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 896b1b0841a7b8c1ba37812db4a2b60c5b84f968
Author: Muhammet Kara
AuthorDate: Sat Nov 9 10:33:02 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 09:13:57 2019 +0100
Make ControllerCommandDispatch::commandAvailable() more talkative
Change-Id: I7d89a27692c619707ccb8356241422c9578fb081
Reviewed-on: https://gerrit.libreoffice.org/82344
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index d920a4a8c988..0dac15954de8 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -715,7 +715,7 @@ bool ControllerCommandDispatch::commandAvailable( const
OUString & rCommand )
std::map< OUString, bool >::const_iterator aIt(
m_aCommandAvailability.find( rCommand ));
if( aIt != m_aCommandAvailability.end())
return aIt->second;
-OSL_FAIL( "commandAvailable: command not in availability map" );
+SAL_WARN("chart2", "commandAvailable: command not in availability map:" <<
rCommand);
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
