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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 100e5503d113f88b8e82b8f8c4c39b7db93f5f0d
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:36:13 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:48:19 2019 +0200

Fix typo

Change-Id: Ia88380a9699e74eb93c0a093ff87e4437d084515
Reviewed-on: https://gerrit.libreoffice.org/70629
Tested-by: Jenkins
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 56c38b6fa501..f633bdc458a9 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -282,7 +282,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Writer: To delete picture's caption select the 
picture›Ctrl+X›There is only the legend's frame›Select›Delete›Ctrl+C to paste 
the picture"),
 NC_("RID_CUI_TIPOFTHEDAY", "Base: Need a crosstab query ? Calc›Data›Pivot 
Table›Create›choose your registered Data source"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc Print: Repeat rows/columns on every 
pages? Format›Print Ranges›Edit›Click the Row/Col text box›drag the mouse in 
the sheet"),
-NC_("RID_CUI_TIPOFTHEDAY", "Calc: To copy rows/cols to another sheet 
preserving heights/widths, select them by clicking the labels before before 
copying"),
+NC_("RID_CUI_TIPOFTHEDAY", "Calc: To copy rows/cols to another sheet 
preserving heights/widths, select them by clicking the labels before copying"),
 NC_("RID_CUI_TIPOFTHEDAY", "With LibreOffice it is very easy to install a 
new dictionary: they are supplied as an extension"),
 NC_("RID_CUI_TIPOFTHEDAY", "Registered databases can also be used in Calc, 
for example to export your tables to CSV format"),
 NC_("RID_CUI_TIPOFTHEDAY", "Need to precisely position? Alt+Arrow Keys 
move objects (shape, picture, formula...) by one pixel"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7093744e2daa8d3e3cef732462c9d5c3fbe957af
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:38:11 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:46:57 2019 +0200

Fix typo

Change-Id: I1fc7426f93d0c2e73450377c8bd5c3d847fe5218
Reviewed-on: https://gerrit.libreoffice.org/70625
Tested-by: Jenkins
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 2c15a312236a..4084b4cfb79d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -218,7 +218,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Calc can display a number or a calculation as 
a fraction: Format›Cells›Number tab›Category›Fraction"),
 NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides 
File›Print›General tab›Select Notes in the Print listbox"),
 NC_("RID_CUI_TIPOFTHEDAY", "Draw: To Move an object to another Layer›Hold 
it until its edges flash›Drag to the name tab of the layer you want to move it 
to›Release"),
-NC_("RID_CUI_TIPOFTHEDAY", "Want to exclude duplicate rows in a 
spreasheet? Use Data›Filter›Standard Filter›Options›No duplications"),
+NC_("RID_CUI_TIPOFTHEDAY", "Want to exclude duplicate rows in a 
spreadsheet? Use Data›Filter›Standard Filter›Options›No duplications"),
 NC_("RID_CUI_TIPOFTHEDAY", "Want to find words more than 10 characters? 
Edit›Find & Replace›Search›\\<[a-z]{10,}›Other Options›Check Regular 
expressions"),
 NC_("RID_CUI_TIPOFTHEDAY", "You delete instead of insert? You are in 
overwrite mode. Press the Insert key on the keyboard or click in the status bar 
on Overwrite"),
 NC_("RID_CUI_TIPOFTHEDAY", "Surprised that Writer adds blank pages in a 
mailing? Would you like to have a recipient letter to the back of another 
(Duplexing)?"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b61b3f37ba800386a5457e3225b47f9e6eccea50
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:35:50 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:47:41 2019 +0200

Fix typo

Change-Id: I368c0127d679e8c6e2d8f0bc979828c4f4795fda
Reviewed-on: https://gerrit.libreoffice.org/70630
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 4084b4cfb79d..56c38b6fa501 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -302,7 +302,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Tools›Customize›Keyboard›Save saves the 
current shortcut key configuration, so that you can load it later or on another 
computer"),
 NC_("RID_CUI_TIPOFTHEDAY", "Property mapping for charts allows to change 
data serie's fill & border colors based on spreadsheet values"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc: Ctrl+Shift+F9 Recalculates all formulas 
in all sheets (some functions like RANDBETWEEN are not calculated by F9)"),
-NC_("RID_CUI_TIPOFTHEDAY", "Writer: Write along a curve ? Draw the 
line›Double clic›Type the text›Format›Object›Fontwork... Have fun with the 
proposed effects"),
+NC_("RID_CUI_TIPOFTHEDAY", "Writer: Write along a curve? Draw the 
line›Double click›Type the text›Format›Object›Fontwork... Have fun with the 
proposed effects"),
 NC_("RID_CUI_TIPOFTHEDAY", "Click the bo4rders button adds borders to 
selected cells - Shift+Click replaces all borders of current cell with your 
choice"),
 NC_("RID_CUI_TIPOFTHEDAY", "Writer: you can create an illustration index 
from Object names, not only from Captions"),
 NC_("RID_CUI_TIPOFTHEDAY", "To enable macro recording check 
Tools›Options›LibreOffice›Advanced›Enable macro recording (limited)"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a68053b311644e1f68c279a019b2d8cd8d06aa8
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:42:54 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:46:14 2019 +0200

Fix typo

Change-Id: Id09373f15389f241b56a73c406b4c88e334ab505
Reviewed-on: https://gerrit.libreoffice.org/70619
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 6c533467fcc2..2c15a312236a 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -52,7 +52,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "You can use Quickstart to open LibreOffice 
quicker"),
 NC_("RID_CUI_TIPOFTHEDAY", "Have you tried our new sidebar- Appearance- 
Sidebar"),
 NC_("RID_CUI_TIPOFTHEDAY", "Have you known that LibreOffice has great 
documentation and free user guide books 
http://www.libreoffice.org/get-help/documentation/ "),
-NC_("RID_CUI_TIPOFTHEDAY", "Embedded help can save lifes. Just click F1 to 
reach the embedded help, if you've installed it. Otherwise you may benefit from 
this huge content online at http://help.libreoffice.org";),
+NC_("RID_CUI_TIPOFTHEDAY", "Embedded help can save lives. Just click F1 to 
reach the embedded help, if you've installed it. Otherwise you may benefit from 
this huge content online at http://help.libreoffice.org";),
 NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has a portable version which gives 
you mobility. If you don't have administrator rights on your computer you may 
install LibreOffice Portable to your hard drive too 
http://www.libreoffice.org/download/portable-versions/";),
 NC_("RID_CUI_TIPOFTHEDAY", "How to remove pagebreaks from a .docx document 
that someone sent you, where there are pagebreaks for each sentence in the 
document."),
 NC_("RID_CUI_TIPOFTHEDAY", "Open 1 document in 2 windows"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/source/view/axes/Tickmarks_Equidistant.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3baf692ab0b67e4d1228a9f30b4ea62f3aa9a07a
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:06:05 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:44:51 2019 +0200

Fix typo

Change-Id: I68142f38fef08131f0d1ebff35ee38b4a5a441ba
Reviewed-on: https://gerrit.libreoffice.org/70635
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx 
b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index e8910efadfb9..485fbd58b366 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -81,7 +81,7 @@ EquidistantTickFactory::EquidistantTickFactory(
 if( m_rScale.Scaling.is() )
 {
 m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
-OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a 
inverse Scaling" );
+OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return an 
inverse Scaling" );
 }
 
 double fMin = m_fScaledVisibleMin = m_rScale.Minimum;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/source/view/main/PlottingPositionHelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a92399fe85d5b80fa51d6553f883bc9c5247a9a7
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:06:03 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:45:25 2019 +0200

Fix typo

Change-Id: I3e39a3d9b90b61eeaef5aace03f2392078924152
Reviewed-on: https://gerrit.libreoffice.org/70637
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx 
b/chart2/source/view/main/PlottingPositionHelper.cxx
index c2c2d25b4c9c..d26e9331ba44 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -106,10 +106,10 @@ uno::Reference< XTransformation > 
PlottingPositionHelper::getTransformationScale
 {
 //this is a standard transformation for a cartesian coordinate system
 
-//transformation from 2) to 4) //@todo 2) and 4) need a ink to a document
+//transformation from 2) to 4) //@todo 2) and 4) need an ink to a document
 
 //we need to apply this transformation to each geometric object because of 
a bug/problem
-//of the old drawing layer (the UNO_NAME_3D_EXTRUDE_DEPTH is an integer 
value instead of an double )
+//of the old drawing layer (the UNO_NAME_3D_EXTRUDE_DEPTH is an integer 
value instead of a double )
 if(!m_xTransformationLogicToScene.is())
 {
 ::basegfx::B3DHomMatrix aMatrix;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/source/view/axes/Tickmarks_Dates.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b189fddb7dc6798c37e265db87f8752415974f1
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:06:06 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:43:54 2019 +0200

Fix typo

Change-Id: I8fee0a168164e87e02c4157fbef245792d6c977a
Reviewed-on: https://gerrit.libreoffice.org/70634
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx 
b/chart2/source/view/axes/Tickmarks_Dates.cxx
index 9fe4c657b5f0..854e661f67b4 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -43,7 +43,7 @@ DateTickFactory::DateTickFactory(
 if( m_aScale.Scaling.is() )
 {
 m_xInverseScaling = m_aScale.Scaling->getInverseScaling();
-OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a 
inverse Scaling" );
+OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return an 
inverse Scaling" );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/source/ui/view/viewfun2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c115ccb0cfc8a474587bf4f35156a68948ec1f5
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 13:08:11 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:42:51 2019 +0200

Fix typo

Change-Id: Ic215895f9e67e16d5c5a6d4e70af47544d49813e
Reviewed-on: https://gerrit.libreoffice.org/70631
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 5bf77e821bfc..91be2d16d54b 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -451,7 +451,7 @@ bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
 }
 else
 {
-nStartCol = nSeekCol;   // nSeekCol might be adjusted vie 
reference
+nStartCol = nSeekCol;   // nSeekCol might be adjusted via 
reference
 if ( eSum == ScAutoSumSum )
 nEndCol = nStartCol;// only sum sums
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d80eb7640a06f46569f455d12adb7d954291ad97
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:37:45 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:42:03 2019 +0200

Fix typo

Change-Id: I578e3801aa7ddc424d9e4e9c6da7ff7231f49ee6
Reviewed-on: https://gerrit.libreoffice.org/70626
Tested-by: Jenkins
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index d4372afae795..6c533467fcc2 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -233,7 +233,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Search by default in several sheets, select 
them before you start the search"),
 NC_("RID_CUI_TIPOFTHEDAY", "Want to change spell checking for some part of 
the text? Click in the language zone of the status bar or better, apply a 
style"),
 NC_("RID_CUI_TIPOFTHEDAY", "You don't like the selection color ? Uncheck 
or modify Tools›Options›LibreOffice›View›Selection›Transparency"),
-NC_("RID_CUI_TIPOFTHEDAY", "Calc: a date is a formated number of days 
since a date origin. An hour is a day divided by 24: noon = 0.5"),
+NC_("RID_CUI_TIPOFTHEDAY", "Calc: a date is a formatted number of days 
since a date origin. An hour is a day divided by 24: noon = 0.5"),
 NC_("RID_CUI_TIPOFTHEDAY", "Need custom contents for metadata properties? 
File›Properties›Custom Properties tab lets you create what you want"),
 NC_("RID_CUI_TIPOFTHEDAY", "Customize›ToolbarModify›Change Icon›Import to 
use your icons for toolbars (only PNG file format and 16x16 or 26x26 pixels)"),
 NC_("RID_CUI_TIPOFTHEDAY", "Insert your metadata in your Writer document: 
Insert›Fields›Other›Document or DocInformation tabs"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95261be55ecf4cc6e57fc2bdf70530c41c18e697
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:37:29 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:40:56 2019 +0200

Fix typo

Change-Id: I34c4ff8ba4c68190e8c59253b0f2e6f3a5729794
Reviewed-on: https://gerrit.libreoffice.org/70627
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 4ff4422cd146..d4372afae795 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -152,7 +152,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Want your chapter titles to always begin a 
page? Edit Heading1 (paragraph style)›Flow tab›Breaks›check 
Insert›Page›Before"),
 NC_("RID_CUI_TIPOFTHEDAY", "Do you want to keep the text but remove a 
hyperlink in Writer? Right click on the link›Remove Hyperlink"),
 NC_("RID_CUI_TIPOFTHEDAY", "Want to remove all <> at once & keep the text 
inside? Edit›Find & Replace›Search›[<|>]›Replace›blank›Other Options›check 
Regular expressions"),
-NC_("RID_CUI_TIPOFTHEDAY", "Calc: Use Format›Conditional Formating›Manage 
to find out which are the cells for which conditional 9formating has been 
defined"),
+NC_("RID_CUI_TIPOFTHEDAY", "Calc: Use Format›Conditional Formatting›Manage 
to find out which are the cells for which conditional formatting has been 
defined"),
 NC_("RID_CUI_TIPOFTHEDAY", "Writer: To create a chart based on a Writer 
table, click in the table and then Insert›Object›Chart"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc: Move a column between 2 others in 1 
step? Click header then a cell in the col, keep mouse button and move to the 
target with Alt key"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc: Use the Backspace key instead of Delete. 
 You can choose what to delete"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90b13c2c406ec2cdddfa6580edb401c0d07feae6
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:46:31 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:39:35 2019 +0200

Fix typo

Change-Id: I8e9d540dfb8e1f800386226aa68ae2e789c3ba36
Reviewed-on: https://gerrit.libreoffice.org/70618
Tested-by: Jenkins
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 697dd0f56489..4ff4422cd146 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -124,7 +124,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Want to print 2 portrait pages on a landscape 
one (reducing A4 to A5)? File›Print›Page Layout tab, select 2 pages per page"),
 NC_("RID_CUI_TIPOFTHEDAY", "To be able to get the Vertical Text tool in 
Drawing toolbar check Tool›Options›Language Settings›Languages›Default 
languages›Asian"),
 NC_("RID_CUI_TIPOFTHEDAY", "Draw/Impress: double-click a tool in drawing 
toolbar to use it for multiple tasks"),
-NC_("RID_CUI_TIPOFTHEDAY", "Want to to display only the highest 10 values 
in a spreadsheet g? Data›Filter›AutoFilter›Standard click the drop-down 
arrow›Top10"),
+NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest 10 values in 
a spreadsheet? Data›Filter›AutoFilter›Standard click the drop-down 
arrow›Top10"),
 NC_("RID_CUI_TIPOFTHEDAY", "You can not modify or delete a custom cell 
style? Check all sheets: none should be protected"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc: Want to get the number of days in month? 
Try =DAYSINMONTH(TODAY())"),
 NC_("RID_CUI_TIPOFTHEDAY", "Do you know that the Styles & Formatting 
dialog allows you to hide the styles you do not use?"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69aac5b0784aa75546599ad809db3cd873b34999
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:42:41 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:38:41 2019 +0200

Fix typo

Change-Id: Ifd0ea4fedad84820b91913a29bab68c0534a1f5b
Reviewed-on: https://gerrit.libreoffice.org/70620
Tested-by: Jenkins
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 41ffd187efa2..697dd0f56489 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -99,7 +99,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Besides styles, customizations menus and 
toolbars can be saved in a template"),
 NC_("RID_CUI_TIPOFTHEDAY", "Tools›Options›LibreOffice›Color lets you edit 
and create colors available in all LibreOffice documents"),
 NC_("RID_CUI_TIPOFTHEDAY", "To edit a not showed comment in Calc, 
right-click the cell and choose Insert comment. Edit then click outside the 
comment (hidden again)"),
-NC_("RID_CUI_TIPOFTHEDAY", "In Calc use TRIMMEAN() to return the mean of a 
data set excluding the the highest and lowest values "),
+NC_("RID_CUI_TIPOFTHEDAY", "In Calc use TRIMMEAN() to return the mean of a 
data set excluding the highest and lowest values"),
 NC_("RID_CUI_TIPOFTHEDAY", "To keep the zeros before a number, use the 
'leading zeroes' cell format option or format the cell as text before entering 
the number"),
 NC_("RID_CUI_TIPOFTHEDAY", "To copy a comment without losing the content 
of the target cell : Paste Special›uncheck everything except Comments. 
Operations select Add"),
 NC_("RID_CUI_TIPOFTHEDAY", "With Calc calculate loan repayments: eg. 
PMT(2%/12;36;2500) interest rate per payment period 2%/12, 36 months, loan 
amount 2500"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b91f6ab24a667a1d072b40e9a92399515cb3cf9
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:38:25 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:38:04 2019 +0200

Fix typo

Change-Id: I27fc9c47563ed791511915d50d83f87ebb712d8a
Reviewed-on: https://gerrit.libreoffice.org/70624
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 8886e63bc976..41ffd187efa2 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -213,7 +213,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice uses Regexp ICU’s engine 
(International Components for Unicode)"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc›View›Value Highlighting displays cell 
contents in colors: Text/black, Formulas/green, Numbers/blue, Protected 
cells/grey background"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc: to show formulas instead of results in 
cells Tools›Options›Calc›View›Display›Formulas or check Format›Page›Sheet 
tab›Print›Formulas"),
-NC_("RID_CUI_TIPOFTHEDAY", "Writer: Want to reach a page by its number? F5 
to open the navigator›Type the number in the fied›Enter"),
+NC_("RID_CUI_TIPOFTHEDAY", "Writer: Want to reach a page by its number? F5 
to open the navigator›Type the number in the field›Enter"),
 NC_("RID_CUI_TIPOFTHEDAY", "With Edit›AutoText›Import you can select Word 
document or template, containing the AutoText entries that you want to import"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc can display a number or a calculation as 
a fraction: Format›Cells›Number tab›Category›Fraction"),
 NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides 
File›Print›General tab›Select Notes in the Print listbox"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 49ffc953885208906c71a4f7d859704a37d15e2e
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:40:13 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:36:56 2019 +0200

Fix typo

Change-Id: I099e59ba1e1d880b3903ff8d7e9c0f8c9ca0bdf3
Reviewed-on: https://gerrit.libreoffice.org/70622
Reviewed-by: himajin10 
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 2f65eb499462..8886e63bc976 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -197,8 +197,8 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "New versions do not bring that new features 
and bug fixes. They also include security patches. Be safe, put yourself 
updated!"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc: Want to duplicate the above line? Click 
the row header and then press Ctrl + D"),
 NC_("RID_CUI_TIPOFTHEDAY", "You can embed copied graphics from web to your 
docs via Edit - Links - Break Link "),
-NC_("RID_CUI_TIPOFTHEDAY", "You can easily arrange size table rows and 
coloumns - Right click - Row(or Coloums) - Optimal Height and Width"),
-NC_("RID_CUI_TIPOFTHEDAY", "Best way to fix bad looking MS Word table 
cells via Right click - Row(or Coloums) - Optimal Height and Width (Or Table 
AutoFit)"),
+NC_("RID_CUI_TIPOFTHEDAY", "You can easily arrange size table rows and 
columns - Right click - Row(or Columns) - Optimal Height and Width"),
+NC_("RID_CUI_TIPOFTHEDAY", "Best way to fix bad looking MS Word table 
cells via Right click - Row(or Columns) - Optimal Height and Width (Or Table 
AutoFit)"),
 NC_("RID_CUI_TIPOFTHEDAY", "Don't get lost in long%large documents. Use 
Navigator(F5) to find your way through the content."),
 NC_("RID_CUI_TIPOFTHEDAY", "Want to change a word which appears multiple 
places many place Use Find&Replace to save time."),
 NC_("RID_CUI_TIPOFTHEDAY", "You can use various table styles via Table - 
AutoFormat to have good looking tables"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c68b368b51d78baccf31b2c09e992f6595f4ed4
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:40:35 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:33:07 2019 +0200

Fix typo

Change-Id: I1873cea1a3205f28aa6106924c0df5b63d64d7ab
Reviewed-on: https://gerrit.libreoffice.org/70621
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index fbbc4784ae84..2f65eb499462 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -254,7 +254,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "Want to sort a pivot table? Click on 
drop-list's arrow in the row/col header and select sort method: ascending, 
descending or custom"),
 NC_("RID_CUI_TIPOFTHEDAY", "Sticky templates (user & shared template 
folders) let you apply style changes when you open a document created from the 
template"),
 NC_("RID_CUI_TIPOFTHEDAY", "Tools›AutoCorrect›Replace provides a list of 
common substitutions. Take a look and complete with your own replacements"),
-NC_("RID_CUI_TIPOFTHEDAY", "Center a picture in a Writer Table's cell? 
Anchor as ›Center buttons in Formating (horizontally) & Table (vertically) 
toolbars"),
+NC_("RID_CUI_TIPOFTHEDAY", "Center a picture in a Writer Table's cell? 
Anchor as ›Center buttons in Formatting (horizontally) & Table (vertically) 
toolbars"),
 NC_("RID_CUI_TIPOFTHEDAY", "Do not insert empty paragraph to separate two 
paragraphs, set Indents & Spacing›Spacing›Below paragraph for the paragraph 
style"),
 NC_("RID_CUI_TIPOFTHEDAY", "Want your documents open where you were when 
last saved? Fill Tools›Options›LibreOffice›User Data First/Last name"),
 NC_("RID_CUI_TIPOFTHEDAY", "Writer: with the navigator you can select & 
move up/down headings and the text below the heading, in the Navigator and in 
the document"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c711feddbd45701c881f67a2a64103f595bf115e
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 14:38:43 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:31:26 2019 +0200

Fix typo

Change-Id: Ie30b67859b3494a7cad17398c2edb377499725c1
Reviewed-on: https://gerrit.libreoffice.org/70623
Tested-by: Jenkins
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 1162a09d7779..fbbc4784ae84 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -200,7 +200,7 @@ const char* TIPOFTHEDAY_STRINGARRAY[] =
 NC_("RID_CUI_TIPOFTHEDAY", "You can easily arrange size table rows and 
coloumns - Right click - Row(or Coloums) - Optimal Height and Width"),
 NC_("RID_CUI_TIPOFTHEDAY", "Best way to fix bad looking MS Word table 
cells via Right click - Row(or Coloums) - Optimal Height and Width (Or Table 
AutoFit)"),
 NC_("RID_CUI_TIPOFTHEDAY", "Don't get lost in long%large documents. Use 
Navigator(F5) to find your way through the content."),
-NC_("RID_CUI_TIPOFTHEDAY", "Want to change a word which appeares multiple 
places many place Use Find&Replace to save time."),
+NC_("RID_CUI_TIPOFTHEDAY", "Want to change a word which appears multiple 
places many place Use Find&Replace to save time."),
 NC_("RID_CUI_TIPOFTHEDAY", "You can use various table styles via Table - 
AutoFormat to have good looking tables"),
 NC_("RID_CUI_TIPOFTHEDAY", "Want to select a large range of cells without 
scrolling? Type the range reference (e.g. A1:A1000) in the name box then 
Enter"),
 NC_("RID_CUI_TIPOFTHEDAY", "Calc›Data›Validity allows you to create 
drop-down lists for the user selects instead of typing"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/source/view/main/Clipping.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 362e162323c431c8ba75ce7d121c2f255254398b
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:06:04 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 12 08:30:50 2019 +0200

Fix typo

Change-Id: I47295a5dee2ca95e36934ac74dc90f95912dc605
Reviewed-on: https://gerrit.libreoffice.org/70636
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/chart2/source/view/main/Clipping.cxx 
b/chart2/source/view/main/Clipping.cxx
index a7c212a91049..547539ded363 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -257,7 +257,7 @@ void Clipping::clipPolygonAtRectangle( const 
drawing::PolyPolygonShape3D& rPolyg
 aTo = getPointFromPoly(rPolygon,nOldPoint,nOldPolyIndex);
 if( lcl_clip2d_(aFrom, aTo, rRectangle) )
 {
-// compose an Polygon of as many consecutive points as possible
+// compose a Polygon of as many consecutive points as possible
 if(aFrom == aLast)
 {
 if( aTo != aFrom )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit b5fdb148fe87a90f3e586efcea7aa6ef865fa42a
Author: Samuel Mehrbrodt 
AuthorDate: Thu Apr 11 15:34:13 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Fri Apr 12 08:17:11 2019 +0200

tdf#124654 Don't reopen closed sidebar decks

NotifyResize was called after a deck was closed,
so this is the wrong place to ensure minimum sidebar width.

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

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index c9958afbe388..e15415fae421 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -553,6 +553,13 @@ void SidebarController::OpenThenToggleDeck (
 }
 RequestOpenDeck();
 SwitchToDeck(rsDeckId);
+
+// Make sure the sidebar is wide enough to fit the requested content
+sal_Int32 nRequestedWidth = (mpCurrentDeck->GetMinimalWidth() + 
TabBar::GetDefaultWidth())
+* mpTabBar->GetDPIScaleFactor();
+if (mnSavedSidebarWidth < nRequestedWidth)
+SetChildWindowWidth(nRequestedWidth);
+
 mpTabBar->Invalidate();
 mpTabBar->HighlightDeck(rsDeckId);
 collectUIInformation(rsDeckId);
@@ -1223,10 +1230,6 @@ void SidebarController::RestrictWidth (sal_Int32 nWidth)
 const sal_Int32 nRequestedWidth
 = (TabBar::GetDefaultWidth() + nWidth) * 
mpTabBar->GetDPIScaleFactor();
 
-// Make sure the sidebar is wide enough to fit the requested content
-if (pSplitWindow->GetSizePixel().Width() < nRequestedWidth)
-SetChildWindowWidth(nRequestedWidth);
-
 pSplitWindow->SetItemSizeRange(
 nSetId,
 Range(nRequestedWidth,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 735964c39097ff952fcaffee6b35c79e210c019c
Author: Mike Kaganski 
AuthorDate: Thu Apr 11 23:35:13 2019 +0300
Commit: Mike Kaganski 
CommitDate: Fri Apr 12 06:21:08 2019 +0200

f315fee54eee57e6e55e5fcacf2522534682c2ce follow-up: fix tdf#109310 unit test

The test should guarantee presense of w:val attribute of w:rStyle element.
Turns out we must not use w: namespace before attribute name; likely it
is true when attribute namespace is the same as of its element.

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 92f8f64d3d85..8696259fe959 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -488,7 +488,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf109310_endnoteStyleForMSO, 
"tdf109310_endnoteSty
 xmlDocPtr pXmlDoc = parseExport("word/endnotes.xml");
 if (!pXmlDoc)
 return;
-//assertXPath(pXmlDoc, 
"/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "w:val"); // what 
does it test?
+// Check w:rStyle element has w:val attribute - note that w: is not 
specified for attribute
+assertXPath(pXmlDoc, 
"/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "val",
+"EndnoteCharacters");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl (via logerrit)]

 include/test/text/textcontent.hxx  |   51 +++
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv |3 
 sc/qa/extras/sceditfieldobj-cell.cxx   |   12 +
 sc/qa/extras/sceditfieldobj-header.cxx |   14 +-
 test/Library_subsequenttest.mk |1 
 test/source/text/textcontent.cxx   |   68 
++
 6 files changed, 143 insertions(+), 6 deletions(-)

New commits:
commit c498e548ee45430b31cb63df17818ba39771ef7c
Author: Jens Carl 
AuthorDate: Thu Apr 11 22:24:00 2019 +
Commit: Jens Carl 
CommitDate: Fri Apr 12 06:12:19 2019 +0200

tdf#45904 Move TextContent Java tests to C++

Move TextContent Java tests to C++ for ScEditFieldObj_Cell and
ScEditFieldObj_Header (formerly ScCellFieldObj).

Change-Id: Ieed5cdbc128490e66d1797c817d998a932317dd4
Reviewed-on: https://gerrit.libreoffice.org/70615
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/include/test/text/textcontent.hxx 
b/include/test/text/textcontent.hxx
new file mode 100644
index ..e6333d60e478
--- /dev/null
+++ b/include/test/text/textcontent.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST TextContent
+{
+public:
+TextContent(const css::text::TextContentAnchorType aExpectedTCAT,
+const css::text::TextContentAnchorType aNewTCAT,
+const css::text::WrapTextMode aExpectedWTM, const 
css::text::WrapTextMode aNewWTM)
+: m_aExpectedTCAT(aExpectedTCAT)
+, m_aNewTCAT(aNewTCAT)
+, m_aExpectedWTM(aExpectedWTM)
+, m_aNewWTM(aNewWTM)
+{
+}
+
+virtual css::uno::Reference init() = 0;
+
+void testTextContentProperties();
+
+protected:
+~TextContent() {}
+
+private:
+css::text::TextContentAnchorType const m_aExpectedTCAT;
+css::text::TextContentAnchorType const m_aNewTCAT;
+css::text::WrapTextMode const m_aExpectedWTM;
+css::text::WrapTextMode const m_aNewWTM;
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
index 1912ae235b3b..35be57d9423c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
@@ -1,6 +1,3 @@
 "ScCellFieldObj";"com::sun::star::lang::XComponent";"dispose()"
 "ScCellFieldObj";"com::sun::star::lang::XComponent";"addEventListener()"
 "ScCellFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()"
-"ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorType#optional"
-"ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorTypes#optional"
-"ScCellFieldObj";"com::sun::star::text::TextContent";"TextWrap#optional"
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx 
b/sc/qa/extras/sceditfieldobj-cell.cxx
index 071be82489ff..4852fcc1ca41 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -9,15 +9,18 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
 #include 
-#include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -33,6 +36,7 @@ using namespace css;
 namespace sc_apitest
 {
 class ScEditFieldObj_Cell : public CalcUnoApiTest,
+public apitest::TextContent,
 public apitest::XPropertySet,
 public apitest::XTextContent,
 public apitest::XTextField
@@ -51,6 +55,9 @@ public:
 
 CPPUNIT_TEST_SUITE(ScEditFieldObj_Cell);
 
+// TextContent
+CPPUNIT_TEST(testTextContentProperties);
+
 // XPropertySet
 CPPUNIT_TEST(testGetPropertySetInfo);
 CPPUNIT_TEST(testGetPropertyValue);
@@ -79,6 +86,9 @@ uno::Reference ScEditFieldObj_Cell::mxField;
 
 ScEditFieldObj_Cell::ScEditFieldObj_Cell()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, TextContent(text::TextContentAnchorType_AS_CHARACTER,
+  text::TextContentAnchorType_AS_CHARACTER, 
text::WrapTextMode_NONE,
+  text::WrapTextMode_NONE)
 {
 }
 
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx 
b/sc/qa/extras/sceditfieldobj-header.cxx
index e04f5087f17f..a38b3a122ebb 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extr

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

[Mike Kaganski (via logerrit)]

 include/comphelper/windowsdebugoutput.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74288f5af28de3d14044c951e7e5d62bb2e22301
Author: Mike Kaganski 
AuthorDate: Fri Apr 12 01:56:03 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri Apr 12 01:59:17 2019 +0200

Fix build after 9be7991df15da9d4d954eeac1ec342ad1a2b7467

Change-Id: Ie4b756000c478a2e0a745571c6eda021665406b4
Reviewed-on: https://gerrit.libreoffice.org/70616
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
index 7033b811a66c..45a38d007bc3 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -424,7 +424,7 @@ inline std::basic_ostream& 
operator<<(std::basic_ostream, 
wchar_t>().to_bytes(
-rVariant.bstrVal));
+rVariant.bstrVal);
 break;
 case VT_DISPATCH:
 stream << rVariant.pdispVal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 sc/inc/dpcache.hxx   |1 
 sc/qa/unit/data/ods/caseinsensitive-duplicate-fields.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx   |   24 +++
 sc/source/core/data/dpcache.cxx  |   97 +--
 4 files changed, 60 insertions(+), 62 deletions(-)

New commits:
commit 238cadd315901cbacfd9304bb1205e9f53f13eae
Author: Dennis Francis 
AuthorDate: Wed Apr 10 04:30:25 2019 +0530
Commit: Dennis Francis 
CommitDate: Fri Apr 12 00:48:38 2019 +0200

dpcache : use case-insensitive normalization of...

field labels, else on export to xlsx,
Excel will fail to load the pivot table due to case-insensitive
duplicate field labels in the pivotCacheDefinition1.xml.

This could be done just for xlsx export filter, but we do normalization
in dpcache.cxx anyway and it would not hurt if we do a case-insensitive
normalization here.

The private member ScDPCache::AddLabel had code duplication and
more importantly it is called in loop for every label in the database
so results in O(n^2) time complexity where n is the number of labels,
so removed it to reuse normalizeLabels() at the only call-site.

Also added a unit test that checks case-insensitive normalization.

Change-Id: Id563dee232a98a2aea9f4fc29254f6942e1c5ba7
Reviewed-on: https://gerrit.libreoffice.org/70498
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 1c88c14fff7e..1d1559755369 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -209,7 +209,6 @@ public:
 private:
 void PostInit();
 void Clear();
-void AddLabel(const OUString& rLabel);
 const GroupItems* GetGroupItems(long nDim) const;
 };
 
diff --git a/sc/qa/unit/data/ods/caseinsensitive-duplicate-fields.ods 
b/sc/qa/unit/data/ods/caseinsensitive-duplicate-fields.ods
new file mode 100644
index ..795b74ca3c00
Binary files /dev/null and 
b/sc/qa/unit/data/ods/caseinsensitive-duplicate-fields.ods differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index d5b1afd64701..719b9bc95e70 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -82,6 +82,7 @@ public:
 void testPivotTableOutlineModeXLSX();
 void testPivotTableDuplicatedMemberFilterXLSX();
 void testPivotTableTabularModeXLSX();
+void testPivotTableDuplicateFields();
 void testTdf112106();
 void testTdf123923();
 void testTdf123939();
@@ -125,6 +126,7 @@ public:
 CPPUNIT_TEST(testPivotTableOutlineModeXLSX);
 CPPUNIT_TEST(testPivotTableDuplicatedMemberFilterXLSX);
 CPPUNIT_TEST(testPivotTableTabularModeXLSX);
+CPPUNIT_TEST(testPivotTableDuplicateFields);
 CPPUNIT_TEST(testTdf112106);
 CPPUNIT_TEST(testTdf123923);
 CPPUNIT_TEST(testTdf123939);
@@ -2359,6 +2361,28 @@ void 
ScPivotTableFiltersTest::testPivotTableTabularModeXLSX()
 xShell->DoClose();
 }
 
+void ScPivotTableFiltersTest::testPivotTableDuplicateFields()
+{
+ScDocShellRef xShell = loadDoc("caseinsensitive-duplicate-fields.", 
FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pCacheDef
+= XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/pivotCache/pivotCacheDefinition1.xml");
+CPPUNIT_ASSERT(pCacheDef);
+
+assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields", "count", 
"6");
+assertXPath(pCacheDef, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]", "name", "ID");
+assertXPath(pCacheDef, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[2]", "name", "Name");
+assertXPath(pCacheDef, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[3]", "name", "Score");
+assertXPath(pCacheDef, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[4]", "name", "Method");
+assertXPath(pCacheDef, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[5]", "name", "method2");
+assertXPath(pCacheDef, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[6]", "name", "Method3");
+
+xShell->DoClose();
+}
+
 void ScPivotTableFiltersTest::testTdf112106()
 {
 ScDocShellRef xDocSh = loadDoc("tdf112106.", FORMAT_XLSX);
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 60011acd6317..de62e25f5d91 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -33,6 +33,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -336,43 +337,51 @@ struct InitDocData
 
 typedef std::unordered_set LabelSet;
 
-class InsertLabel
+void normalizeAddLabel(const OUString& rLabel, std::vector& rLabels, 
LabelSet& rExistingNames)
 {
-LabelSet& mrNames;
-public:
-explicit InsertLabel(LabelSet& rNames) : mrNames(rNames) {}
-void opera

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

[Tor Lillqvist (via logerrit)]

 include/comphelper/windowsdebugoutput.hxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 9be7991df15da9d4d954eeac1ec342ad1a2b7467
Author: Tor Lillqvist 
AuthorDate: Thu Apr 11 23:23:46 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Apr 12 01:26:02 2019 +0300

Don't crash if the BSTR pointer in a VARIANT is (weirdly) null

Change-Id: I8473b1f411a45c7c17e742ca0d69245d77f078f7

diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
index 26c95fea5c22..7033b811a66c 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -420,8 +420,11 @@ inline std::basic_ostream& 
operator<<(std::basic_ostream(rVariant.date);
 break; // FIXME
 case VT_BSTR:
-stream << std::wstring_convert, 
wchar_t>().to_bytes(
-rVariant.bstrVal);
+if (rVariant.bstrVal == nullptr)
+stream << "(null)";
+else
+stream << std::wstring_convert, 
wchar_t>().to_bytes(
+rVariant.bstrVal));
 break;
 case VT_DISPATCH:
 stream << rVariant.pdispVal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - jvmfwk/inc jvmfwk/plugins jvmfwk/source solenv/clang-format

[Stephan Bergmann (via logerrit)]

 jvmfwk/inc/fwkbase.hxx  |   11 
 jvmfwk/inc/libxmlutil.hxx   |4 
 jvmfwk/inc/vendorplugin.hxx |   94 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |  109 ++-
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx  |7 
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx|   17 -
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx|5 
 jvmfwk/source/elements.cxx  |4 
 jvmfwk/source/framework.cxx |  275 ++--
 jvmfwk/source/fwkbase.cxx   |   18 +
 jvmfwk/source/libxmlutil.cxx|2 
 solenv/clang-format/blacklist   |4 
 12 files changed, 192 insertions(+), 358 deletions(-)

New commits:
commit c4aa8b366fb879b0dd37241e70c5842825305620
Author: Stephan Bergmann 
AuthorDate: Tue Apr 9 14:51:54 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Apr 12 00:19:20 2019 +0200

tdf#124503: Support JRE installations with unknown java.vendor property

After recent additions of 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support
AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon
Corretto" to our hard-coded list, there is now reports that at least Debian 
and
Ubuntu tried to distribute versions of OpenJDK with the java.vendor propety 
set
to string like "Debian" or "Ubuntu".  Instead of trying to catch up with an
ever-growing hard-coded list, it is probably better to stop relying 
exclusively
on such a hard-coded list, and for unknown vendor values, try out whether 
the
SunInfo backend (which supports the "generic" OpenJDK) would be able to 
handle
the given JRE.  (For simplicity, assume that any versions of such JREs are
supported.  Our baseline is Java 6, and there are unlikely any older 
versions of
JREs from unknown vendors out there.  If this turns out to be problematic, 
we
could include information about problematic vendors after all, or add a 
general
check that JREs from unknown vendors are at least Java 6.)

Many functions in jvmfwk/inc/vendorplugin.hxx that used to take a set of
sVendor/sMinVersion/sMaxVerison/arExcludeList paramters had to be revised to
take a vendorSettings parameter instead, and
VendorSettings::getVersionInformation has been changed to return a
boost::optional, so that unknown vendors can be handled gracefully.

Reviewed-on: https://gerrit.libreoffice.org/70460
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 3d27b2fa9c5a03f78e5145377402f8a88e3da1be)
Conflicts:
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
jvmfwk/source/framework.cxx

Change-Id: Ibf915f2ddd59e09b77e2c03be688cac0547b9ac9
Reviewed-on: https://gerrit.libreoffice.org/70587
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
similarity index 93%
rename from jvmfwk/source/fwkbase.hxx
rename to jvmfwk/inc/fwkbase.hxx
index b3779cda96b6..8fe077b79a28 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -16,10 +16,15 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
-#define INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
+#ifndef INCLUDED_JVMFWK_INC_FWKBASE_HXX
+#define INCLUDED_JVMFWK_INC_FWKBASE_HXX
+
+#include 
+
+#include 
 
 #include 
+#include "elements.hxx"
 #include "libxmlutil.hxx"
 
 namespace jfw
@@ -34,7 +39,7 @@ class VendorSettings
 public:
 VendorSettings();
 
-VersionInfo getVersionInformation(const OUString & sVendor) const;
+boost::optional getVersionInformation(const OUString & 
sVendor) const;
 
 ::std::vector< OUString> getSupportedVendors() const;
 };
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/inc/libxmlutil.hxx
similarity index 96%
rename from jvmfwk/source/libxmlutil.hxx
rename to jvmfwk/inc/libxmlutil.hxx
index 8a58280b406d..078d285ac78f 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/inc/libxmlutil.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
-#define INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
+#ifndef INCLUDED_JVMFWK_INC_LIBXMLUTIL_HXX
+#define INCLUDED_JVMFWK_INC_LIBXMLUTIL_HXX
 
 #include 
 #include 
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index f370f1123375..0aa6d84276e3 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -28,10 +28,10 @@
 
 #include 
 #include 
-#include 
-#include "elements.hxx"
 #include "vendorbase.hxx"
 
+namespace jfw { class VendorSettings; }
+
 /**
@file

@@ -56,7 +56,6 @@ enu

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - include/comphelper

[Tor Lillqvist (via logerrit)]

 include/comphelper/windowsdebugoutput.hxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 978976bbc8ef33c75c3409fa9235f888765241d9
Author: Tor Lillqvist 
AuthorDate: Thu Apr 11 23:25:57 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 11 23:32:18 2019 +0300

Run clang-format

Change-Id: I6287aee720bbddcb28142bcbdb910b89e942c4ec

diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
index 13c233361264..0b4201fe5452 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -34,8 +34,10 @@
 #endif
 #include 
 
-namespace {
-DEFINE_GUID(IID_IdentityUnmarshal, 0x001B, 0x, 0x, 0xC0, 0x00, 
0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
+namespace
+{
+DEFINE_GUID(IID_IdentityUnmarshal, 0x001B, 0x, 0x, 0xC0, 0x00, 
0x00, 0x00, 0x00, 0x00,
+0x00, 0x46);
 }
 
 template 
commit 379cef94da6695d29d09b9dee3ed7add481dca2d
Author: Tor Lillqvist 
AuthorDate: Thu Apr 11 23:23:46 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 11 23:32:18 2019 +0300

Don't crash if the BSTR pointer in a VARIANT is (weirdly) null

Change-Id: I8473b1f411a45c7c17e742ca0d69245d77f078f7

diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
index 04eb8b5dcf36..13c233361264 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -421,8 +421,11 @@ inline std::basic_ostream& 
operator<<(std::basic_ostream, 
wchar_t>().to_bytes(
-rVariant.bstrVal);
+if (rVariant.bstrVal == nullptr)
+stream << "(null)";
+else
+stream << std::wstring_convert, 
wchar_t>().to_bytes(
+rVariant.bstrVal);
 break;
 case VT_DISPATCH:
 stream << rVariant.pdispVal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 include/osl/mutex.hxx |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit ad7302b5a62bbf382fb7e900cedfa317a4bf57d8
Author: Jan-Marek Glogowski 
AuthorDate: Wed Apr 10 17:38:10 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Apr 11 23:53:48 2019 +0200

[API CHANGE] Restore old exteral API behaviour

Commit d38f9934f08939032cca64a32de58fa3901a88d5 ("[API CHANGE]
Asserts to never clear already cleared guard") changes the API
in a way, which can silently break compiling code for no reason.

As discussed on the mailing list, this uses LIBO_INTERNAL_ONLY to
restores the old behaviour for external API users.

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

diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 9a9f76f67efa..f984f035ca40 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -185,9 +185,15 @@ namespace osl
 */
 void clear()
 {
+#ifdef LIBO_INTERNAL_ONLY
 assert(pT);
-pT->release();
-pT = NULL;
+#else
+if (pT)
+#endif
+{
+pT->release();
+pT = NULL;
+}
 }
 };
 
@@ -226,9 +232,14 @@ namespace osl
 */
 void reset()
 {
+#ifdef LIBO_INTERNAL_ONLY
 assert(!this->pT);
-this->pT = pResetT;
-this->pT->acquire();
+#endif
+if (pResetT)
+{
+this->pT = pResetT;
+this->pT->acquire();
+}
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

libreoffice converstion of egistrymodifications.xcu user items to systemwide xml registry share

[Jelle de Jong]

Hello everybody,

I am trying to convert changes to 
/home/$USER/.config/libreoffice/4/user/registrymodifications.xcu into 
systemwide configuration for users that start libreoffice for the first 
time under linux with systemwide settings.


I tried placing a xml file in 
/usr/lib/libreoffice/share/registry/registrymodifications-system-wide.xcu 
but I can not seem to get the syntax right.


I found the schema here, not sure how to use them to create my own 
configuration: 
https://cgit.freedesktop.org/libreoffice/core/tree/officecfg/registry/schema/org/openoffice


Can somebody give me example for a system wide registrymodificaton or 
look at the attachments and help me out with these few settings.


Kind regards and best wishes,

Jelle de Jong (GNU/Linux Consultant)

false
MS Word 2007 
XML
Impress MS 
PowerPoint 2007 XML
Calc MS Excel 2007 
XML

http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 xmlns:oor="http://openoffice.org/2001/registry";>
  
  http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office">

  
MS Word 2007 XML
  


  
Impress MS PowerPoint 2007 XML
  


  
Calc MS Excel 2007 XML
  

  
  http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office">



false
  


  


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

[Libreoffice-commits] core.git: include/vcl sc/source sc/uiconfig solenv/sanitizers vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx  |3 
 sc/source/ui/dbgui/dbnamdlg.cxx   |  408 ++
 sc/source/ui/inc/dbnamdlg.hxx |   68 +--
 sc/source/ui/inc/reffact.hxx  |2 
 sc/source/ui/view/reffact.cxx |4 
 sc/source/ui/view/tabvwshc.cxx|   23 -
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui |  199 ++
 solenv/sanitizers/ui/modules/scalc.suppr  |3 
 vcl/source/app/salvtables.cxx |   10 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   10 
 10 files changed, 397 insertions(+), 333 deletions(-)

New commits:
commit 5dfc4fd2af11322dfbface30fd66c1ce553a0703
Author: Caolán McNamara 
AuthorDate: Thu Apr 11 12:05:07 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 22:18:01 2019 +0200

weld ScDbNameDlg

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 4074df14b8c7..77205ced1f69 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -285,11 +285,14 @@ public:
 virtual int get_vscroll_width() const = 0;
 };
 
+class Label;
+
 class VCL_DLLPUBLIC Frame : virtual public Container
 {
 public:
 virtual void set_label(const OUString& rText) = 0;
 virtual OUString get_label() const = 0;
+virtual std::unique_ptr weld_label_widget() const = 0;
 };
 
 class VCL_DLLPUBLIC Notebook : virtual public Container
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 067666be2152..0299367a240f 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -56,8 +56,8 @@ namespace
 class DBSaveData
 {
 public:
-DBSaveData( Edit& rEd, CheckBox& rHdr, CheckBox& rTot, CheckBox& rSize, 
CheckBox& rFmt,
-CheckBox& rStrip, ScRange& rArea )
+DBSaveData( formula::WeldRefEdit& rEd, weld::CheckButton& rHdr, 
weld::CheckButton& rTot, weld::CheckButton& rSize, weld::CheckButton& rFmt,
+weld::CheckButton& rStrip, ScRange& rArea )
 : rEdAssign(rEd)
 , rBtnHeader(rHdr)
 , rBtnTotals(rTot)
@@ -77,12 +77,12 @@ public:
 void Restore();
 
 private:
-Edit&   rEdAssign;
-CheckBox&   rBtnHeader;
-CheckBox&   rBtnTotals;
-CheckBox&   rBtnSize;
-CheckBox&   rBtnFormat;
-CheckBox&   rBtnStrip;
+formula::WeldRefEdit& rEdAssign;
+weld::CheckButton& rBtnHeader;
+weld::CheckButton& rBtnTotals;
+weld::CheckButton& rBtnSize;
+weld::CheckButton& rBtnFormat;
+weld::CheckButton& rBtnStrip;
 ScRange&rCurArea;
 OUStringaStr;
 ScRange aArea;
@@ -98,11 +98,11 @@ void DBSaveData::Save()
 {
 aArea   = rCurArea;
 aStr= rEdAssign.GetText();
-bHeader = rBtnHeader.IsChecked();
-bTotals = rBtnTotals.IsChecked();
-bSize   = rBtnSize.IsChecked();
-bFormat = rBtnFormat.IsChecked();
-bStrip  = rBtnStrip.IsChecked();
+bHeader = rBtnHeader.get_active();
+bTotals = rBtnTotals.get_active();
+bSize   = rBtnSize.get_active();
+bFormat = rBtnFormat.get_active();
+bStrip  = rBtnStrip.get_active();
 bDirty  = true;
 }
 
@@ -112,103 +112,81 @@ void DBSaveData::Restore()
 {
 rCurArea = aArea;
 rEdAssign.SetText( aStr );
-rBtnHeader.Check ( bHeader );
-rBtnTotals.Check ( bTotals );
-rBtnSize.Check   ( bSize );
-rBtnFormat.Check ( bFormat );
-rBtnStrip.Check  ( bStrip );
+rBtnHeader.set_active ( bHeader );
+rBtnTotals.set_active ( bTotals );
+rBtnSize.set_active   ( bSize );
+rBtnFormat.set_active ( bFormat );
+rBtnStrip.set_active  ( bStrip );
 bDirty = false;
 }
 }
 
 //  class ScDbNameDlg
 
-ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* 
pParent,
+ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* 
pParent,
 ScViewData* ptrViewData)
-: ScAnyRefDlg(pB, pCW, pParent,
-"DefineDatabaseRangeDialog",
-"modules/scalc/ui/definedatabaserangedialog.ui")
+: ScAnyRefDlgController(pB, pCW, pParent,
+"modules/scalc/ui/definedatabaserangedialog.ui", 
"DefineDatabaseRangeDialog")
 , pViewData(ptrViewData)
 , pDoc(ptrViewData->GetDocument())
 , bRefInputMode(false)
 , aAddrDetails(pDoc->GetAddressConvention(), 0, 0)
 , aLocalDbCol(*(pDoc->GetDBCollection()))
+, m_xEdName(m_xBuilder->weld_entry_tree_view("entrygrid", "entry", 
"entry-list"))
+, m_xAssignFrame(m_xBuilder->weld_frame("RangeFrame"))
+, m_xEdAssign(new formula::WeldRefEdit(m_xBuilder->weld_entry("assign")))
+, m_xRbAssign(new 
formula::WeldRefButton(m_xBuilder->weld_button("assignrb")))
+, 

libreoffice converstion of egistrymodifications.xcu user items to systemwide xml registry share

[Jelle de Jong]

Hello everybody,

I am trying to convert changes to 
/home/$USER/.config/libreoffice/4/user/registrymodifications.xcu into 
systemwide configuration for users that start libreoffice for the first 
time under linux with systemwide settings.


I tried placing a xml file in 
/usr/lib/libreoffice/share/registry/registrymodifications-system-wide.xcu 
but I can not seem to get the syntax right.


I found the schema here, not sure how to use them to create my own 
configuration: 
https://cgit.freedesktop.org/libreoffice/core/tree/officecfg/registry/schema/org/openoffice


Can somebody give me example for a system wide registrymodificaton or 
look at the attachments and help me out with these few settings.


Kind regards and best wishes,

Jelle de Jong (GNU/Linux Consultant)


false
MS Word 2007 
XML
Impress MS 
PowerPoint 2007 XML
Calc MS Excel 2007 
XML

http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 xmlns:oor="http://openoffice.org/2001/registry";>
  
  http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office">

  
MS Word 2007 XML
  


  
Impress MS PowerPoint 2007 XML
  


  
Calc MS Excel 2007 XML
  

  
  http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office">



false
  


  



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

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

[Jan Holesovsky (via logerrit)]

 external/graphite/StaticLibrary_graphite.mk |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 86c1b5ff8f66747a3d4cebe6e2e0d1892db9ba9a
Author: Jan Holesovsky 
AuthorDate: Thu Apr 11 21:17:43 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Apr 11 21:23:47 2019 +0200

graphite: Force optimization on Android.

The Pass.cpp triggers an infinite loop in clang when not optimizing (ie.
with the debugging buildls), at least with this version:

  > 
~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ 
--version
  Android (5058415 based on r339409) clang version 8.0.2 
(https://android.googlesource.com/toolchain/clang 
40173bab62ec746213857d083c0e8b0abb568790) 
(https://android.googlesource.com/toolchain/llvm 
7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn)
  Target: x86_64-unknown-linux-gnu
  Thread model: posix
  InstalledDir: 
/local/home/kendy/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin

Change-Id: Ib4984f8838fc733be6da4e24eb10915d3efbf79e

diff --git a/external/graphite/StaticLibrary_graphite.mk 
b/external/graphite/StaticLibrary_graphite.mk
index 9eeff041dc28..a8f8bce7cc6f 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -32,6 +32,15 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
 endif
 endif
 
+ifeq ($(OS),ANDROID)
+# Force optimizations on Android, because otherwise Pass.cpp triggers an
+# infinite loop in clang, at least in this version:
+# Android (5058415 based on r339409) clang version 8.0.2 
(https://android.googlesource.com/toolchain/clang 
40173bab62ec746213857d083c0e8b0abb568790) 
(https://android.googlesource.com/toolchain/llvm 
7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn)
+$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
+ -Os \
+))
+endif
+
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/item_refactor2' - basctl/source include/item item/source item/test svx/source

[Armin Le Grand (via logerrit)]

 basctl/source/basicide/sbxitem.cxx |3 ++-
 include/item/base/ItemControlBlock.hxx |   10 +-
 item/source/base/ItemControlBlock.cxx  |6 --
 item/source/simple/CntInt16.cxx|3 ++-
 item/source/simple/CntOUString.cxx |3 ++-
 item/test/ItemTest.cxx |   12 
 svx/source/items/TransformAnchor.cxx   |3 ++-
 7 files changed, 29 insertions(+), 11 deletions(-)

New commits:
commit 54ca9cac1871d269cf608ac1d18441849b7be6c2
Author: Armin Le Grand 
AuthorDate: Thu Apr 11 20:29:49 2019 +0200
Commit: Armin Le Grand 
CommitDate: Thu Apr 11 20:29:49 2019 +0200

WIP: Added a Name to ItemControlBlock

...and thus to Item-Implementations. Will be needed
at some time anyways, currently already in the ressources
and used to stream out infos or similar.

Change-Id: Ie23d839b9444cd3cbc6403c366629bd7d55de542

diff --git a/basctl/source/basicide/sbxitem.cxx 
b/basctl/source/basicide/sbxitem.cxx
index 1243535c22f4..c33c9477c885 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -31,7 +31,8 @@ namespace Item
 static ::Item::ItemControlBlock aItemControlBlock(
 std::shared_ptr<::Item::ItemAdministrator>(new 
::Item::IAdministrator_vector()),
 [](){ return new Sbx(Sbx::GetStaticItemControlBlock()); },
-[](){ return new Sbx(Sbx::GetStaticItemControlBlock()); });
+[](){ return new Sbx(Sbx::GetStaticItemControlBlock()); },
+"Sbx");
 
 return aItemControlBlock;
 }
diff --git a/include/item/base/ItemControlBlock.hxx 
b/include/item/base/ItemControlBlock.hxx
index d61b8e79d07d..daf5d68a9ffd 100755
--- a/include/item/base/ItemControlBlock.hxx
+++ b/include/item/base/ItemControlBlock.hxx
@@ -37,12 +37,14 @@ namespace Item
 std::shared_ptr m_aDefaultItem;
 std::function  m_aConstructDefaultItem;
 std::function  m_aConstructItem;
+OUStringm_aName;
 
 public:
 ItemControlBlock(
 const std::shared_ptr& rItemAdministrator,
 std::functionconstructDefaultItem,
-std::functionconstructItem);
+std::functionconstructItem,
+const OUString& rName);
 ItemControlBlock();
 
 const std::shared_ptr& GetItemAdministrator()
@@ -58,7 +60,13 @@ namespace Item
 }
 
 std::shared_ptr CreateFromAny(const 
ItemBase::AnyIDArgs& rArgs);
+
 bool IsDefault(const ItemBase& rItem) const;
+
+const OUString& GetName() const
+{
+return m_aName;
+}
 };
 } // end of namespace Item
 
diff --git a/item/source/base/ItemControlBlock.cxx 
b/item/source/base/ItemControlBlock.cxx
index ffd32e7c4a86..16f31efcb0d2 100755
--- a/item/source/base/ItemControlBlock.cxx
+++ b/item/source/base/ItemControlBlock.cxx
@@ -17,11 +17,13 @@ namespace Item
 ItemControlBlock::ItemControlBlock(
 const std::shared_ptr& rItemAdministrator,
 std::functionconstructDefaultItem,
-std::functionconstructItem)
+std::functionconstructItem,
+const OUString& rName)
 :   m_aItemAdministrator(rItemAdministrator),
 m_aDefaultItem(),
 m_aConstructDefaultItem(constructDefaultItem),
-m_aConstructItem(constructItem)
+m_aConstructItem(constructItem),
+m_aName(rName)
 {
 assert(rItemAdministrator && "nullptr not allowed, an 
ItemAdministrator *is* required (!)");
 }
diff --git a/item/source/simple/CntInt16.cxx b/item/source/simple/CntInt16.cxx
index 9da54cdf2ae7..493d63bcdc1f 100644
--- a/item/source/simple/CntInt16.cxx
+++ b/item/source/simple/CntInt16.cxx
@@ -21,7 +21,8 @@ namespace Item
 static ItemControlBlock aItemControlBlock(
 std::shared_ptr(new IAdministrator_set()),
 [](){ return new CntInt16(CntInt16::GetStaticItemControlBlock()); 
},
-[](){ return new CntInt16(CntInt16::GetStaticItemControlBlock()); 
});
+[](){ return new CntInt16(CntInt16::GetStaticItemControlBlock()); 
},
+"CntInt16");
 
 return aItemControlBlock;
 }
diff --git a/item/source/simple/CntOUString.cxx 
b/item/source/simple/CntOUString.cxx
index 47de99947372..c25e7fb9a116 100644
--- a/item/source/simple/CntOUString.cxx
+++ b/item/source/simple/CntOUString.cxx
@@ -21,7 +21,8 @@ namespace Item
 static ItemControlBlock aItemControlBlock(
 std::shared_ptr(new 
IAdministrator_unordered_set()),
 [](){ return new 
CntOUString(CntOUString::GetStaticItemControlBlock()); },
-[](){ return new 
CntOUString(CntOUString::GetStaticItemControlBlock()); });
+[](){ return new 
CntOUString(CntOUString::GetStaticItemControlBlock()); },
+"CntOUString");
 
 return aItemControlBlock;
 }
diff --git a/item/test/ItemTest.cxx b/item/test/ItemTest.cxx
index b5c78cb5

Gagandeep Singh license statement

[Gagandeep Singh]

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Crash test update

[Caolán McNamara]

On Wed, 2019-04-10 at 18:40 +, Crashtest VM wrote:
> New crashtest update available at 
> http://dev-builds.libreoffice.org/crashtest/9575aa3bba055258977d9a013889aa3acbaecb6a/

Looking through these crash failure, they break down into two
categories...

dynamic column stuff in calc

There seems to be outstanding just two different distinct crashes,
which looked sufficiently non-trivial I didn't have a stab at fixing it
myself, one on reexport to ods of ooo118068-1.ods and one on import of
e.g. ooo6593-5.sxc

and

in writer, the assert of !m_bLockNotifyContentChange 
in SwTextInputField e.g. import of ooo48071-4.odt but all the rest of
the .odt failures happen in the same place

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - jvmfwk/inc jvmfwk/plugins jvmfwk/source solenv/clang-format

[Stephan Bergmann (via logerrit)]

 jvmfwk/inc/fwkbase.hxx  |   11 
 jvmfwk/inc/libxmlutil.hxx   |4 
 jvmfwk/inc/vendorplugin.hxx |   94 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |  109 ++-
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx  |7 
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx|   18 -
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx|5 
 jvmfwk/source/elements.cxx  |4 
 jvmfwk/source/framework.cxx |  273 ++--
 jvmfwk/source/fwkbase.cxx   |   18 +
 jvmfwk/source/libxmlutil.cxx|2 
 solenv/clang-format/blacklist   |4 
 12 files changed, 191 insertions(+), 358 deletions(-)

New commits:
commit feca4bf320ae33dd1926f3a1afdc77c3b4f7b2a4
Author: Stephan Bergmann 
AuthorDate: Tue Apr 9 14:51:54 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 18:02:30 2019 +0200

tdf#124503: Support JRE installations with unknown java.vendor property

After recent additions of 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support
AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon
Corretto" to our hard-coded list, there is now reports that at least Debian 
and
Ubuntu tried to distribute versions of OpenJDK with the java.vendor propety 
set
to string like "Debian" or "Ubuntu".  Instead of trying to catch up with an
ever-growing hard-coded list, it is probably better to stop relying 
exclusively
on such a hard-coded list, and for unknown vendor values, try out whether 
the
SunInfo backend (which supports the "generic" OpenJDK) would be able to 
handle
the given JRE.  (For simplicity, assume that any versions of such JREs are
supported.  Our baseline is Java 6, and there are unlikely any older 
versions of
JREs from unknown vendors out there.  If this turns out to be problematic, 
we
could include information about problematic vendors after all, or add a 
general
check that JREs from unknown vendors are at least Java 6.)

Many functions in jvmfwk/inc/vendorplugin.hxx that used to take a set of
sVendor/sMinVersion/sMaxVerison/arExcludeList paramters had to be revised to
take a vendorSettings parameter instead, and
VendorSettings::getVersionInformation has been changed to return a
boost::optional, so that unknown vendors can be handled gracefully.

Change-Id: Ibf915f2ddd59e09b77e2c03be688cac0547b9ac9
Reviewed-on: https://gerrit.libreoffice.org/70460
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 3d27b2fa9c5a03f78e5145377402f8a88e3da1be)
Reviewed-on: https://gerrit.libreoffice.org/70586
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
similarity index 93%
rename from jvmfwk/source/fwkbase.hxx
rename to jvmfwk/inc/fwkbase.hxx
index b3779cda96b6..8fe077b79a28 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -16,10 +16,15 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
-#define INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
+#ifndef INCLUDED_JVMFWK_INC_FWKBASE_HXX
+#define INCLUDED_JVMFWK_INC_FWKBASE_HXX
+
+#include 
+
+#include 
 
 #include 
+#include "elements.hxx"
 #include "libxmlutil.hxx"
 
 namespace jfw
@@ -34,7 +39,7 @@ class VendorSettings
 public:
 VendorSettings();
 
-VersionInfo getVersionInformation(const OUString & sVendor) const;
+boost::optional getVersionInformation(const OUString & 
sVendor) const;
 
 ::std::vector< OUString> getSupportedVendors() const;
 };
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/inc/libxmlutil.hxx
similarity index 96%
rename from jvmfwk/source/libxmlutil.hxx
rename to jvmfwk/inc/libxmlutil.hxx
index 8a58280b406d..078d285ac78f 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/inc/libxmlutil.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
-#define INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
+#ifndef INCLUDED_JVMFWK_INC_LIBXMLUTIL_HXX
+#define INCLUDED_JVMFWK_INC_LIBXMLUTIL_HXX
 
 #include 
 #include 
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index f370f1123375..0aa6d84276e3 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -28,10 +28,10 @@
 
 #include 
 #include 
-#include 
-#include "elements.hxx"
 #include "vendorbase.hxx"
 
+namespace jfw { class VendorSettings; }
+
 /**
@file

@@ -56,7 +56,6 @@ enum class javaPluginError
 WrongVersionFormat,
 FailedVersion,
 NoJre,
-WrongVendor,
 WrongArch,

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

[Miklos Vajna (via logerrit)]

 sc/source/ui/view/notemark.cxx |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 600fbb77a0869723dd00b6ec1643bac1be2e211c
Author: Miklos Vajna 
AuthorDate: Thu Apr 11 09:13:59 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 11 17:25:04 2019 +0200

tdf#122767 sc opengl: fix rendering artifacts after hiding a cell comment

Actually this is not specific to opengl, affects e.g. the Linux gen
backend as well, it just doesn't happen with the Windows gdi backend.

The rendering of the caption itself was OK. Focusing on the arrow
polygon at the end of the comment's "tail" (connector polyline):

- What gets painted is determined by SdrCaptionObj ->
  ViewContactOfSdrCaptionObj::createViewIndependentPrimitive2DSequence(),
  which produces a PolyPolygonColorPrimitive2D, which is then processed by
  VclPixelProcessor2D::tryDrawPolyPolygonColorPrimitive2DDirect().

- The polygon passed to VCL there is within the bounds of the
  invalidation rectangle set in ScNoteMarker::TimeHdl().

So it seems the only reason sometimes these 1px rendering artifacts are
left around is anti-aliasing. Fix those by simply extending the
invalidation rectangle in each direction.

(cherry picked from commit 37aa4f0d64e276c46821ef6122483fb6b4c04781)

Change-Id: I37b8e666999d3ff5ee1328fca7ac017ee8c7e9e0
Reviewed-on: https://gerrit.libreoffice.org/70585
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index b18d54a44173..87da6bed 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -172,21 +172,30 @@ void ScNoteMarker::InvalidateWin()
 {
 if (m_bVisible)
 {
-m_pWindow->Invalidate( OutputDevice::LogicToLogic(m_aRect, m_aMapMode, 
m_pWindow->GetMapMode()) );
+// Extend the invalidated rectangle by 1 pixel in each direction in 
case AA would slightly
+// paint outside the nominal area.
+tools::Rectangle aRect(m_aRect);
+const Size aPixelSize = m_pWindow->PixelToLogic(Size(1, 1));
+aRect.AdjustLeft(-aPixelSize.getWidth());
+aRect.AdjustTop(-aPixelSize.getHeight());
+aRect.AdjustRight(aPixelSize.getWidth());
+aRect.AdjustBottom(aPixelSize.getHeight());
+
+m_pWindow->Invalidate( OutputDevice::LogicToLogic(aRect, m_aMapMode, 
m_pWindow->GetMapMode()) );
 
 if ( m_pRightWin || m_pBottomWin )
 {
 Size aWinSize = m_pWindow->PixelToLogic( 
m_pWindow->GetOutputSizePixel(), m_aMapMode );
 if ( m_pRightWin )
-m_pRightWin->Invalidate( OutputDevice::LogicToLogic(m_aRect,
+m_pRightWin->Invalidate( OutputDevice::LogicToLogic(aRect,
 lcl_MoveMapMode( m_aMapMode, Size( 
aWinSize.Width(), 0 ) ),
 m_pRightWin->GetMapMode()) );
 if ( m_pBottomWin )
-m_pBottomWin->Invalidate( OutputDevice::LogicToLogic(m_aRect,
+m_pBottomWin->Invalidate( OutputDevice::LogicToLogic(aRect,
 lcl_MoveMapMode( m_aMapMode, Size( 0, 
aWinSize.Height() ) ),
 m_pBottomWin->GetMapMode()) );
 if ( m_pDiagWin )
-m_pDiagWin->Invalidate( OutputDevice::LogicToLogic(m_aRect,
+m_pDiagWin->Invalidate( OutputDevice::LogicToLogic(aRect,
 lcl_MoveMapMode( m_aMapMode, aWinSize 
),
 m_pDiagWin->GetMapMode()) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/item_refactor2' - basctl/source include/item include/svx item/source item/test svx/source

[Armin Le Grand (via logerrit)]

 basctl/source/basicide/sbxitem.cxx |   27 +-
 basctl/source/inc/sbxitem.hxx  |2 
 include/item/base/ItemBase.hxx |   14 -
 include/item/base/ItemControlBlock.hxx |   16 -
 include/item/base/ItemSet.hxx  |9 
 include/item/base/SlotSet.hxx  |2 
 include/item/simple/CntInt16.hxx   |6 
 include/item/simple/CntOUString.hxx|5 
 include/svx/item/TransformAnchor.hxx   |5 
 item/source/base/ItemBase.cxx  |   29 --
 item/source/base/ItemControlBlock.cxx  |   24 +-
 item/source/simple/CntInt16.cxx|   19 -
 item/source/simple/CntOUString.cxx |   19 -
 item/test/ItemTest.cxx |  326 +
 svx/source/items/TransformAnchor.cxx   |   21 +-
 15 files changed, 359 insertions(+), 165 deletions(-)

New commits:
commit 0c1b918b84c1b47a35dbb7a9a995728f3fcb1d7c
Author: Armin Le Grand 
AuthorDate: Thu Apr 11 16:54:36 2019 +0200
Commit: Armin Le Grand 
CommitDate: Thu Apr 11 16:54:36 2019 +0200

WIP: Further basic changes

Decided to have a reference to the ItemControlBlock
in each incarnation of Item to make accesses from the
incarnations more simple. This avoids the hierarchical
virtual GetItemControlBlock implementations which just
call the local static ones - easy to forget when
implementing items. Instead, hand over a reference
when constructing an Item - anyways inside the protected
constructors, not in ::Create methods.
Adapted ItemControlBlock accordingly to get now two
lambdas (construct and default-construct). The default
no longer gets pre-constructed, that may lead to endless
loops when inside the 1st constructor call the static
ItemControlBlock gets created

Change-Id: Id4629578ef46668652c949f3ec831ba4a784cb6e

diff --git a/basctl/source/basicide/sbxitem.cxx 
b/basctl/source/basicide/sbxitem.cxx
index 33b3adca54e7..1243535c22f4 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -30,19 +30,20 @@ namespace Item
 {
 static ::Item::ItemControlBlock aItemControlBlock(
 std::shared_ptr<::Item::ItemAdministrator>(new 
::Item::IAdministrator_vector()),
-std::shared_ptr(new Sbx()),
-[](){ return new Sbx(); });
+[](){ return new Sbx(Sbx::GetStaticItemControlBlock()); },
+[](){ return new Sbx(Sbx::GetStaticItemControlBlock()); });
 
 return aItemControlBlock;
 }
 
-::Item::ItemControlBlock& Sbx::GetItemControlBlock() const
-{
-return Sbx::GetStaticItemControlBlock();
-}
-
-Sbx::Sbx(const ScriptDocument* pDocument, const OUString& aLibName, const 
OUString& aName, const OUString& aMethodName, ItemType eType)
-:   ::Item::ItemBase(),
+Sbx::Sbx(
+::Item::ItemControlBlock& rItemControlBlock,
+const ScriptDocument* pDocument,
+const OUString& aLibName,
+const OUString& aName,
+const OUString& aMethodName,
+ItemType eType)
+:   ::Item::ItemBase(rItemControlBlock),
 m_aDocument(nullptr != pDocument ? *pDocument : 
ScriptDocument::getApplicationScriptDocument()),
 m_aLibName(aLibName),
 m_aName(aName),
@@ -65,7 +66,13 @@ namespace Item
 {
 return std::static_pointer_cast(
 Sbx::GetStaticItemControlBlock().GetItemAdministrator()->Create(
-new Sbx(&rDocument, aLibName, aName, aMethodName, eType)));
+new Sbx(
+Sbx::GetStaticItemControlBlock(),
+&rDocument,
+aLibName,
+aName,
+aMethodName,
+eType)));
 }
 
 bool Sbx::operator==(const ItemBase& rCandidate) const
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index fe6cc705b83d..56b62d3e4ed4 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -47,7 +47,6 @@ namespace Item
 {
 public:
 static ::Item::ItemControlBlock& GetStaticItemControlBlock();
-virtual ::Item::ItemControlBlock& GetItemControlBlock() const override;
 
 private:
 const ScriptDocumentm_aDocument;
@@ -58,6 +57,7 @@ namespace Item
 
 protected:
 Sbx(
+::Item::ItemControlBlock& rItemControlBlock,
 const ScriptDocument* pDocument = nullptr,
 const OUString& aLibName = OUString(),
 const OUString& aName = OUString(),
diff --git a/include/item/base/ItemBase.hxx b/include/item/base/ItemBase.hxx
index f356d5edadc1..f7fbd889a640 100644
--- a/include/item/base/ItemBase.hxx
+++ b/include/item/base/ItemBase.hxx
@@ -98,6 +98,12 @@ namespace Item
 typedef std::vector AnyIDArgs;
 
 private:
+// local reference to instance of ItemControlBlock for this
+// incarnation - same as type::GetStaticItemControlBlock(), but
+// this way accessible 

[Libreoffice-commits] core.git: test/user-template

[Stephan Bergmann (via logerrit)]

 test/user-template/registry/modifications.xcd |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e74bbefcd7048723b0cf2a3a775e2d84bf171591
Author: Stephan Bergmann 
AuthorDate: Thu Apr 11 14:18:18 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 11 16:58:38 2019 +0200

Fix deadlocks of `make screenshot` tests

...like CppunitTest_sw_dialogs_test after
a1700d52a47184ee07b91b461a846dc5435f0022 "tdf#124238 - Show a Tip-Of-The-Day
dialog on startup" (see my comment from today at
 "tdf#124238 - Show a 
Tip-Of-The-Day
dialog on startup").

As it is unlikely that any test would actually want the Tip-Of-The-Day 
dialog to
appear, just set the corresponding configuration property to false so that 
all
tests using gb_CppunitTest_use_unittest_configuration no longer show it.


(
had added the --nofirststartwizard resp. later --nologo hack to
SfxViewFrame::Notify in sfx2/source/view/viewfrm.cxx, in response to
 failing in UITest_hide_cols.
However, that hack is not obsoleted by this change, as those UITest 
apparently
don't use gb_CppunitTest_use_unittest_configuration.)

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

diff --git a/test/user-template/registry/modifications.xcd 
b/test/user-template/registry/modifications.xcd
index a5db262338e9..d8483c6f33ed 100644
--- a/test/user-template/registry/modifications.xcd
+++ b/test/user-template/registry/modifications.xcd
@@ -19,6 +19,9 @@
 
   false
 
+
+  false
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 include/vcl/svimpbox.hxx  |2 +-
 include/vcl/viewdataentry.hxx |7 +++
 vcl/source/treelist/svimpbox.cxx  |   25 +++--
 vcl/source/treelist/treelistbox.cxx   |   12 ++--
 vcl/source/treelist/viewdataentry.cxx |2 ++
 5 files changed, 31 insertions(+), 17 deletions(-)

New commits:
commit c96949f171b98c3dc4bf954dbf10b1720725ab8f
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 10 16:18:15 2019 +0900
Commit: Andras Timar 
CommitDate: Thu Apr 11 16:21:26 2019 +0200

tdf#82009 TreeList move painting of drag target into Paint func.

When we drag a entry in TreeListBox, we execute a PaintDDCursor
which paints a "cursor" of a possible drag target (for example
to show where the entry will be moved to if we want to change the
order). The problem with this fuction is that it paints a line
directlly at that location, and that it uses invert raster
operation to draw a line. So to hide the line it just needs to
draw again. On MacOS this invertion causes a problem and draws
the whole area black, which is the cause of this bug.

So instead of inverting the drawing of the drag target cursor
has now been moved into the main Paint method, where it redraws
the whole entry, and if present, also the drag target cursor.
This means that all we need to do is Invalidate the entry,
which then just gets redrawn in a normal Paint pass.

One exception is still MacOS, which doesn't invalidate the entry,
but redraws the entry directly. DnD is MacOS is a bit different
as it is not async (if I understand correctly) so the invalidate
has no effect.

Change-Id: I8542f47940a3b90114ea4bbbac57fd303ca3434b
Reviewed-on: https://gerrit.libreoffice.org/70521
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 14abbc6e86ba234996dfed477a54030adeac2a52)
Reviewed-on: https://gerrit.libreoffice.org/70526
Reviewed-by: Andras Timar 

diff --git a/include/vcl/svimpbox.hxx b/include/vcl/svimpbox.hxx
index 88c068874165..e26594969250 100644
--- a/include/vcl/svimpbox.hxx
+++ b/include/vcl/svimpbox.hxx
@@ -291,7 +291,7 @@ public:
 voidMakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop 
= false );
 voidScrollToAbsPos( long nPos );
 
-voidPaintDDCursor( SvTreeListEntry* );
+voidPaintDDCursor(SvTreeListEntry* pEntry, bool bShow);
 
 // Images
 inline Image&   implGetImageLocation( const ImageType _eType );
diff --git a/include/vcl/viewdataentry.hxx b/include/vcl/viewdataentry.hxx
index 1277b75edf29..8bf5c6a30b8a 100644
--- a/include/vcl/viewdataentry.hxx
+++ b/include/vcl/viewdataentry.hxx
@@ -51,6 +51,8 @@ class VCL_DLLPUBLIC SvViewDataEntry
 bool mbExpanded:1;
 bool mbFocused:1;
 bool mbSelectable:1;
+bool mbDragTarget:1;
+
 tools::Rectangle maPaintRectangle;
 
 public:
@@ -63,11 +65,16 @@ public:
 bool IsExpanded() const { return mbExpanded;}
 bool HasFocus() const { return mbFocused;}
 bool IsSelectable() const { return mbSelectable;}
+bool IsDragTarget() const { return mbDragTarget;}
 void SetFocus( bool bFocus );
 void SetSelected( bool bSelected );
 void SetHighlighted( bool bHighlighted );
 void SetExpanded( bool bExpanded );
 void SetSelectable( bool bSelectable );
+void SetDragTarget( bool bDragTarget )
+{
+mbDragTarget = bDragTarget;
+}
 
 void Init(size_t nSize);
 
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index a39b18744878..6ba41bbf0823 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2872,23 +2872,20 @@ IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl, Timer *, void)
 pView->StartDrag( 0, aAsyncBeginDragPos );
 }
 
-void SvImpLBox::PaintDDCursor( SvTreeListEntry* pInsertionPos )
+void SvImpLBox::PaintDDCursor(SvTreeListEntry* pEntry, bool bShow)
 {
-long nY;
-if( pInsertionPos )
+if (pEntry)
 {
-nY = GetEntryLine( pInsertionPos );
-nY += pView->GetEntryHeight();
+
+SvViewDataEntry* pViewData = pView->GetViewData(pEntry);
+pViewData->SetDragTarget(bShow);
+#ifdef MACOSX
+// in MacOS we need to draw directly (as we are synchronuous) or no 
invalidation happens
+pView->PaintEntry1(*pEntry, GetEntryLine(pEntry), *pView);
+#else
+InvalidateEntry(pEntry);
+#endif
 }
-else
-nY = 1;
-RasterOp eOldOp = pView->GetRasterOp();
-pView->SetRasterOp( RasterOp::Invert );
-Color aOldLineColor = pView->GetLineColor();
-pView->SetLineColor( COL_BLACK );
-pView->DrawLine( Point( 0, nY ), Point( aOutputSize.Width(), nY ) );
-pView->SetLineColor( aOldLineColor );
-pView->SetRasterOp( eOldOp );
 }
 
 void SvImpLBox::Command( const CommandEvent& rCEvt )
diff --git a/vcl/source/treelist/treelistbox.cxx 
b/vcl

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57c' - vcl/source

[Thorsten Behrens (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |   49 +++---
 1 file changed, 40 insertions(+), 9 deletions(-)

New commits:
commit 49cb0dc7d70fdb12fa6eb91c98d63f9e0cf0067c
Author: Thorsten Behrens 
AuthorDate: Thu Apr 11 09:47:27 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Apr 11 15:42:36 2019 +0200

Fix appearance for checkboxes

Conflicts:
vcl/source/gdi/pdfwriter_impl.cxx

Change-Id: Id5028b0d062e0491b1cc9c36e2d9d4e4a7ab14a1

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 1f8d1a1a31e9..58c08759e92f 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -4384,45 +4385,75 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( 
PDFWidget& rBox, const PDFW
 pop();
 
 OStringBuffer aDA( 256 );
+
+// tdf#93853 don't rely on Zapf (or any other 'standard' font)
+// being present, but our own OpenSymbol - N.B. PDF/A for good
+// reasons require even the standard PS fonts to be embedded!
+Push();
+SetFont( Font( OUString( "OpenSymbol" ), Size( 0, 500 ) ) );
+FontCharMapRef pMap;
+GetFontCharMap(pMap);
+const LogicalFontInstance* pFontInstance = GetFontInstance();
+const PhysicalFontFace* pDevFont = pFontInstance->GetFontFace();
+Pop();
+
+// make sure OpenSymbol is embedded, and includes our checkmark
+const sal_Unicode cMark=0x2713;
+const GlyphItem aItem(pMap->GetGlyphIndex(cMark), 0, 0,
+  Point(), 0, 0, 0,
+  const_cast(pFontInstance));
+const std::vector aCodeUnits={ cMark };
+sal_uInt8 nMappedGlyph;
+sal_Int32 nMappedFontObject;
+registerGlyph(&aItem, pDevFont, aCodeUnits, nMappedGlyph, 
nMappedFontObject);
+
 appendNonStrokingColor( replaceColor( rWidget.TextColor, 
rSettings.GetRadioCheckTextColor() ), aDA );
 sal_Int32 nBest = getBestBuiltinFont( Font( "ZapfDingbats", 
aFont.GetFontSize() ) );
 aDA.append( ' ' );
-aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
+aDA.append( "/F" );
+aDA.append( nMappedFontObject );
 aDA.append( " 0 Tf" );
+
+OStringBuffer aDR( 32 );
+aDR.append( "/Font " );
+aDR.append( getFontDictObject() );
+aDR.append( " 0 R" );
+rBox.m_aDRDict = aDR.makeStringAndClear();
 rBox.m_aDAString = aDA.makeStringAndClear();
 rBox.m_aMKDict = "/CA";
 rBox.m_aMKDictCAString = "8";
 rBox.m_aRect = aCheckRect;
 
 // create appearance streams
-sal_Char cMark = '8';
-sal_Int32 nCharXOffset = 
1000-m_aBuiltinFonts[13].m_aWidths[sal_Int32(cMark)];
+sal_Int32 nCharXOffset = 1000;
 nCharXOffset *= aCheckRect.GetHeight();
 nCharXOffset /= 2000;
-sal_Int32 nCharYOffset = 1000-
-(m_aBuiltinFonts[13].m_nAscent+m_aBuiltinFonts[13].m_nDescent); // 
descent is negative
+sal_Int32 nCharYOffset = 1000-(820-143); // metrics from Zapf
 nCharYOffset *= aCheckRect.GetHeight();
 nCharYOffset /= 2000;
 
+// write 'checked' appearance stream
 SvMemoryStream* pCheckStream = new SvMemoryStream( 256, 256 );
 beginRedirect( pCheckStream, aCheckRect );
 aDA.append( "/Tx BMC\nq BT\n" );
 appendNonStrokingColor( replaceColor( rWidget.TextColor, 
rSettings.GetRadioCheckTextColor() ), aDA );
 aDA.append( ' ' );
-aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
+aDA.append( "/F" );
+aDA.append( nMappedFontObject );
 aDA.append( ' ' );
 m_aPages[ m_nCurrentPage ].appendMappedLength( sal_Int32( 
aCheckRect.GetHeight() ), aDA );
 aDA.append( " Tf\n" );
 m_aPages[ m_nCurrentPage ].appendMappedLength( nCharXOffset, aDA );
 aDA.append( " " );
 m_aPages[ m_nCurrentPage ].appendMappedLength( nCharYOffset, aDA );
-aDA.append( " Td (" );
-aDA.append( cMark );
-aDA.append( ") Tj\nET\nQ\nEMC\n" );
+aDA.append( " Td <" );
+appendHex( nMappedGlyph, aDA );
+aDA.append( "> Tj\nET\nQ\nEMC\n" );
 writeBuffer( aDA.getStr(), aDA.getLength() );
 endRedirect();
 rBox.m_aAppearances[ "N" ][ "Yes" ] = pCheckStream;
 
+// write 'unchecked' appearance stream
 SvMemoryStream* pUncheckStream = new SvMemoryStream( 256, 256 );
 beginRedirect( pUncheckStream, aCheckRect );
 writeBuffer( "/Tx BMC\nEMC\n", 12 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx |  315 
--
 sc/source/ui/inc/RandomNumberGeneratorDialog.hxx   |   65 +-
 sc/source/ui/inc/reffact.hxx   |2 
 sc/source/ui/view/tabvwshc.cxx |9 
 sc/uiconfig/scalc/ui/randomnumbergenerator.ui  |   86 +-
 solenv/sanitizers/ui/modules/scalc.suppr   |1 
 6 files changed, 213 insertions(+), 265 deletions(-)

New commits:
commit a683074cc9fd6d3c74477b4228584a159206dada
Author: Caolán McNamara 
AuthorDate: Thu Apr 11 11:12:21 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 15:31:02 2019 +0200

weld ScRandomNumberGeneratorDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx 
b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index b105e8b29115..6821743fef99 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -44,35 +44,31 @@ const sal_Int64 DIGITS  = 4;
 
 ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent,
-  "RandomNumberGeneratorDialog", 
"modules/scalc/ui/randomnumbergenerator.ui" ),
-mpViewData   ( pViewData ),
-mpDoc( pViewData->GetDocument() ),
-mbDialogLostFocus( false )
+weld::Window* pParent, ScViewData* pViewData)
+: ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
+  "modules/scalc/ui/randomnumbergenerator.ui",
+  "RandomNumberGeneratorDialog")
+, mpViewData(pViewData)
+, mpDoc(pViewData->GetDocument())
+, mbDialogLostFocus(false)
+, mxInputRangeText(m_xBuilder->weld_label("cell-range-label"))
+, mxInputRangeEdit(new 
formula::WeldRefEdit(m_xBuilder->weld_entry("cell-range-edit")))
+, mxInputRangeButton(new 
formula::WeldRefButton(m_xBuilder->weld_button("cell-range-button")))
+, mxDistributionCombo(m_xBuilder->weld_combo_box("distribution-combo"))
+, mxParameter1Text(m_xBuilder->weld_label("parameter1-label"))
+, mxParameter1Value(m_xBuilder->weld_spin_button("parameter1-spin"))
+, mxParameter2Text(m_xBuilder->weld_label("parameter2-label"))
+, mxParameter2Value(m_xBuilder->weld_spin_button("parameter2-spin"))
+, mxSeed(m_xBuilder->weld_spin_button("seed-spin"))
+, mxEnableSeed(m_xBuilder->weld_check_button("enable-seed-check"))
+, mxDecimalPlaces(m_xBuilder->weld_spin_button("decimal-places-spin"))
+, mxEnableRounding(m_xBuilder->weld_check_button("enable-rounding-check"))
+, mxButtonApply(m_xBuilder->weld_button("apply"))
+, mxButtonOk(m_xBuilder->weld_button("ok"))
+, mxButtonClose(m_xBuilder->weld_button("close"))
 {
-get(mpInputRangeText,   "cell-range-label");
-get(mpInputRangeEdit,   "cell-range-edit");
-get(mpInputRangeButton, "cell-range-button");
-mpInputRangeEdit->SetReferences(this, mpInputRangeText);
-mpInputRangeButton->SetReferences(this, mpInputRangeEdit);
-
-get(mpParameter1Value, "parameter1-spin");
-get(mpParameter1Text,  "parameter1-label");
-get(mpParameter2Value, "parameter2-spin");
-get(mpParameter2Text,  "parameter2-label");
-
-get(mpEnableSeed, "enable-seed-check");
-get(mpSeed,   "seed-spin");
-
-get(mpEnableRounding, "enable-rounding-check");
-get(mpDecimalPlaces,  "decimal-places-spin");
-
-get(mpDistributionCombo, "distribution-combo");
-
-get(mpButtonOk, "ok");
-get(mpButtonApply,  "apply");
-get(mpButtonClose,  "close");
+mxInputRangeEdit->SetReferences(this, mxInputRangeText.get());
+mxInputRangeButton->SetReferences(this, mxInputRangeEdit.get());
 
 Init();
 GetRangeFromSelection();
@@ -80,61 +76,38 @@ 
ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog(
 
 ScRandomNumberGeneratorDialog::~ScRandomNumberGeneratorDialog()
 {
-disposeOnce();
-}
-
-void ScRandomNumberGeneratorDialog::dispose()
-{
-mpInputRangeText.clear();
-mpInputRangeEdit.clear();
-mpInputRangeButton.clear();
-mpDistributionCombo.clear();
-mpParameter1Text.clear();
-mpParameter1Value.clear();
-mpParameter2Text.clear();
-mpParameter2Value.clear();
-mpSeed.clear();
-mpEnableSeed.clear();
-mpDecimalPlaces.clear();
-mpEnableRounding.clear();
-mpButtonApply.clear();
-mpButtonOk.clear();
-mpButtonClose.clear();
-ScAnyRefDlg::dispose();
 }
 
 void ScRandomNumberGeneratorDialog::Init()
 

Re: Faulty handle position in shapes imported from MS Office

[Regina Henschel]

Hi Mark,

Mark Hung schrieb am 11-Apr-19 um 13:21:


The equation should hold: (adj1-adj0) = (y1-y0) * 10 / height.
I think this should cover lots of cases already.

[..]
I think the patterns of the formula is much less than the number of 
types. Maybe worthy of identify them?


Yes, I'm currently examine all the faulty shapes.

Found e.g.
Callout uses pattern
adjustment = (x-coordinate - horizontal center) * 10 / w
adjustment = (x-coordinate - horizontal center) * 10 / w

even stars use pattern
adjust = (vertical center - y-coordinate) * 10 / height
odd stars have an additional factor to correct, that the star center is 
different from the shape center


Kind regards
Regina

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

Re: On backporting fix for tdf#124503 "LibreOffice doesn't detect JVM because of unexpected java.vendor property value"

[Stephan Bergmann]

On 11/04/2019 09:30, Thorsten Behrens wrote:

I'd prefer a backport to both maintained branches - at the current
speed of new binary Java distros springing up (and the overall
trajectory of that ecosystem there), I'd expect more of those issues
down the road.


Fair enough.  Gerrit changes up for review at 
 for libreoffice-6-1 and at 
 for libreoffice-6-2.

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

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

[Libreoffice Gerrit user]

 source/text/swriter/guide/search_regexp.xhp |   46 ++--
 1 file changed, 24 insertions(+), 22 deletions(-)

New commits:
commit 7d80346111e3945a8ec6cf5bbf5258eb7402d76d
Author: Olivier Hallot 
AuthorDate: Wed Apr 10 17:12:52 2019 -0300
Commit: Olivier Hallot 
CommitDate: Thu Apr 11 15:01:37 2019 +0200

tdf#118076 Clarify use of regexp in writer search

Writer only supports regex in searches. Wildcards restricted to Calc.

Change-Id: If0ac52672a397832d48754e8221967b7b30b4df6
Reviewed-on: https://gerrit.libreoffice.org/70551
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/guide/search_regexp.xhp 
b/source/text/swriter/guide/search_regexp.xhp
index 9ccbda171..c0f455376 100644
--- a/source/text/swriter/guide/search_regexp.xhp
+++ b/source/text/swriter/guide/search_regexp.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
   
- Using Wildcards in Text 
Searches
+ Using Regular Expressions in Text 
Searches
  /text/swriter/guide/search_regexp.xhp
   


-wildcards, see regular 
expressions
-  searching; with wildcards
-  regular expressions;searching
-  examples for regular expressions
-  characters;finding all
-  invisible characters;finding
-  paragraph marks;searching
+
+wildcards, see regular expressions
+searching; with regular expressions
+regular expressions;searching
+examples for regular expressions
+characters;finding all
+invisible characters;finding
+paragraph marks;searching
 mw deleted "wildcards;" and inserted wildcards 
crossreferencemw added "paragraph marks;"
-Using Wildcards in Text 
Searches
+Using Regular Expressions in Text 
Searches
 
-  Wildcards or placeholders can be used to search for some 
unspecified or even invisible characters.
-  You can 
use wildcards when you find and replace text in a document. For example, "s.n" 
finds "sun" and "son".
+  Regular expressions can be used to search for some unspecified 
or even invisible characters.
+  Searching with regular expressions is 
different from searching with wildcards. %PRODUCTNAME Writer only supports 
searching with regular expressions.
+  You can 
use regular expressions when you find and replace text in a document. For 
example, "s.n" finds "sun" and "son".
   
  
 Choose Edit - Find & 
Replace.
@@ -50,7 +52,7 @@
 Select the Regular expressions 
check box.
  
  
-In 
the Find box, type the search term and the 
wildcard(s) that you want to use in your search.
+In 
the Find box, type the search term and the regular 
expression(s) that you want to use in your search.
  
  
 Click Find Next or Find All.
@@ -59,24 +61,24 @@
   Regular Expression Examples
   
  
-The 
wildcard for a single character is a period (.).
+The 
regular expression for a single character is a period (.).
  
  
-The 
wildcard for zero or more occurrences of the previous character is an asterisk. 
For example: "123*" finds "12" "123", and "1233".
+The 
regular expression for zero or more occurrences of the previous character is an 
asterisk. For example: "123*" finds "12" "123", and "1233".
  
  
-The 
wildcard combination to search for zero or more occurrences of any character is 
a period and asterisk (.*).
+The 
regular expression combination to search for zero or more occurrences of any 
character is a period and asterisk (.*).
  
  
-The 
wildcard for the end of a paragraph is a dollar sign ($). The wildcard 
character combination for the start of a paragraph is a caret and a period 
(^.).
+The 
regular expression for the end of a paragraph is a dollar sign ($). The regular 
expression character combination for the start of a paragraph is a caret and a 
period (^.).
  
  
-The wildcard for a tab character is \t.
+The regular expression for a tab character is \t.
  
   
   A search 
using a regular expression will work only within one paragraph. To search using 
a regular expression in more than one paragraph, do a separate search in each 
paragraph.
   
- List of 
Wildcards
+ List of 
regular expressions
   

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 41792cee7af07c60aae4d9e44b6e013973f6
Author: Olivier Hallot 
AuthorDate: Wed Apr 10 17:12:52 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Apr 11 15:01:37 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#118076 Clarify use of regexp in writer search

Writer only supports regex in searches. Wildcards restricted to Calc.

Change-Id: If0ac52672a397832d48754e8221967b7b30b4df6
Reviewed-on: https://gerrit.libreoffice.org/70551
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 282bc6b71771..7d80346111e3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 282bc6b717716b077e95c0e1028ac820c4ea5da2
+Subproject commit 7d80346111e3945a8ec6cf5bbf5258eb7402d76d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit bbcf70500987a5279fea45f7169f0f06722089eb
Author: Olivier Hallot 
AuthorDate: Wed Apr 10 22:07:02 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Apr 11 15:00:40 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#118093 Fix ANOVA help page

Add last column in table (F-critical)

Change-Id: I988127a6adfc0890770c4eb3922ba2c162113310
Reviewed-on: https://gerrit.libreoffice.org/70580
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 4ff9ffa9f742..282bc6b71771 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4ff9ffa9f74290ecc8dae66034e16fda64aa369f
+Subproject commit 282bc6b717716b077e95c0e1028ac820c4ea5da2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/scalc/01/statistics.xhp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 282bc6b717716b077e95c0e1028ac820c4ea5da2
Author: Olivier Hallot 
AuthorDate: Wed Apr 10 22:07:02 2019 -0300
Commit: Olivier Hallot 
CommitDate: Thu Apr 11 15:00:40 2019 +0200

tdf#118093 Fix ANOVA help page

Add last column in table (F-critical)

Change-Id: I988127a6adfc0890770c4eb3922ba2c162113310
Reviewed-on: https://gerrit.libreoffice.org/70580
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/statistics.xhp 
b/source/text/scalc/01/statistics.xhp
index 13c842ada..52b3a6081 100644
--- a/source/text/scalc/01/statistics.xhp
+++ b/source/text/scalc/01/statistics.xhp
@@ -634,6 +634,9 @@
 
 P-value
 
+
+F-critical
+
 
 
 
@@ -654,6 +657,9 @@
 
 0.0224614952
 
+
+3.340385558
+
 
 
 
___
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.0' - sc/inc sc/qa sc/source

[Dennis Francis (via logerrit)]

 sc/inc/dpsave.hxx |2 
 sc/qa/unit/data/ods/tdf123421_1datafield.ods  |binary
 sc/qa/unit/data/ods/tdf123421_2datafields.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx|   56 ++
 sc/source/filter/excel/xepivotxml.cxx |   11 +++--
 5 files changed, 65 insertions(+), 4 deletions(-)

New commits:
commit 2672473e970dd02d37be5661de1afe99d785b970
Author: Dennis Francis 
AuthorDate: Fri Apr 5 22:04:13 2019 +0530
Commit: Andras Timar 
CommitDate: Thu Apr 11 14:46:53 2019 +0200

tdf#123421 : xlsx export : Don't write data field entry...

under colFields tag if there is only one data-field.


  <--- -2 indicates data field.


Excel 2013/2016 seems to crash at the presence of ''
in colFields when there is only one data-field.

Additionally, call 
GetOutputRangeByType(sheet::DataPilotOutputRangeType::TABLE)
on all ScDPObject's in non-const mode, so that the internal
pOuput member of ScDPObject is populated. Otherwise the
const GetOutputRangeByType(sheet::DataPilotOutputRangeType::TABLE)
call always return an invalid range.

This also adds 2 unit tests :-
1. To check the presence of  in colFields tag
   if there are more than one data-fields.
2. To ensure the absence of  in colFields tag
   if there is only one data-field.

Change-Id: I8f470bd1ab883f73586f04a3fcc30e3fbf948c4a
Reviewed-on: https://gerrit.libreoffice.org/70316
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index b88b08161495..5150a6b51255 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -316,7 +316,7 @@ public:
 
 ScDPSaveDimension* 
GetInnermostDimension(css::sheet::DataPilotFieldOrientation nOrientation);
 ScDPSaveDimension* GetFirstDimension(css::sheet::DataPilotFieldOrientation 
eOrientation);
-long GetDataDimensionCount() const;
+SC_DLLPUBLIC long GetDataDimensionCount() const;
 
 void SetPosition( ScDPSaveDimension* pDim, long nNew );
 SC_DLLPUBLIC void SetColumnGrand( bool bSet );
diff --git a/sc/qa/unit/data/ods/tdf123421_1datafield.ods 
b/sc/qa/unit/data/ods/tdf123421_1datafield.ods
new file mode 100644
index ..985d6c0c44b6
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf123421_1datafield.ods differ
diff --git a/sc/qa/unit/data/ods/tdf123421_2datafields.ods 
b/sc/qa/unit/data/ods/tdf123421_2datafields.ods
new file mode 100644
index ..c5d8a09647b0
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf123421_2datafields.ods 
differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index 4674ebb2533f..d54cb9dc18c6 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -61,6 +61,8 @@ public:
 
 // Export
 void testPivotTableExportXLSX();
+void testPivotTableExportXLSXSingleDataField();
+void testPivotTableExportXLSXMultipleDataFields();
 void testPivotCacheExportXLSX();
 void testPivotTableXLSX();
 void testPivotTableTwoDataFieldsXLSX();
@@ -101,6 +103,8 @@ public:
 CPPUNIT_TEST(testTdf112501);
 
 CPPUNIT_TEST(testPivotTableExportXLSX);
+CPPUNIT_TEST(testPivotTableExportXLSXSingleDataField);
+CPPUNIT_TEST(testPivotTableExportXLSXMultipleDataFields);
 CPPUNIT_TEST(testPivotCacheExportXLSX);
 CPPUNIT_TEST(testPivotTableXLSX);
 CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX);
@@ -757,6 +761,58 @@ void ScPivotTableFiltersTest::testPivotTableExportXLSX()
 "h", "1");
 }
 
+void ScPivotTableFiltersTest::testPivotTableExportXLSXSingleDataField()
+{
+ScDocShellRef xShell = loadDoc("tdf123421_1datafield.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pTable
+= XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/pivotTables/pivotTable1.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", "ref", "A3:B6");
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", 
"firstHeaderRow", "1");
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", "firstDataRow", 
"1");
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", "firstDataCol", 
"1");
+assertXPath(pTable, "/x:pivotTableDefinition/x:dataFields", "count", "1");
+
+// There should not be any colFields tag, before the fix there used to be 
a singleton with
+//  as child node.
+assertXPath(pTable, "/x:pivotTableDefinition/x:colFields", 0);
+
+xShell->DoClose();
+}
+
+void ScPivotTableFiltersTest::testPivotTableExportXLSXMultipleDataFields()
+{
+ScDocShellRef xShell = loadDoc("tdf123421_2datafields.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FOR

Minutes from the UX/design meeting 2019-Apr-11

[Heiko Tietze]

Present:Heiko

Tickets 

 * Easier use of CSV in Wizards->Address Data Source
   + https://bugs.documentfoundation.org/show_bug.cgi?id=113753
   => go with Timur's proposal in c4

 * Merge text direction related buttons into single button
   + https://bugs.documentfoundation.org/show_bug.cgi?id=104912
   => WF

 * FORMATTING: paragraph alignment options position is unintuitive
   + https://bugs.documentfoundation.org/show_bug.cgi?id=65473
   + WFM because important items come first (Heiko)
   + agree with the request because of consistency with other places (Stuart, 
Thomas)
   => change the order

 * UX: Handling of empty textboxes
   + https://bugs.documentfoundation.org/show_bug.cgi?id=107825
   => enable the border around text boxes by by default

 * Grammatical gender concordance for "spell out" numbering feature
   + https://bugs.documentfoundation.org/show_bug.cgi?id=120214
   + a grammatical correct solution, eg. in German "Erste[s] Kapitel" vs. 
"Erste[r] Absatz",
 is likely not possible but can be done manually per B/N > Customize > 
After (of course
 not depending on the actual value in this case) 
   => NOB
   + besides the request we should add a numbering style for spelled out 
 to have, for example, "First Chapter", "Second Chapter" as a predefined 
option
   => https://bugs.documentfoundation.org/show_bug.cgi?id=124608





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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/svtools svtools/source

[Tomaž Vajngerl (via logerrit)]

 include/svtools/viewdataentry.hxx   |7 +++
 svtools/source/contnr/svimpbox.cxx  |   24 ++--
 svtools/source/contnr/treelistbox.cxx   |   12 ++--
 svtools/source/contnr/viewdataentry.cxx |2 ++
 svtools/source/inc/svimpbox.hxx |2 +-
 5 files changed, 30 insertions(+), 17 deletions(-)

New commits:
commit 85e56cd2b2fcbb5f74f01c20ed089acf7710489c
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 10 16:18:15 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 11 20:55:37 2019 +0900

tdf#82009 TreeList move painting of drag target into Paint func.

When we drag a entry in TreeListBox, we execute a PaintDDCursor
which paints a "cursor" of a possible drag target (for example
to show where the entry will be moved to if we want to change the
order). The problem with this fuction is that it paints a line
directlly at that location, and that it uses invert raster
operation to draw a line. So to hide the line it just needs to
draw again. On MacOS this invertion causes a problem and draws
the whole area black, which is the cause of this bug.

So instead of inverting the drawing of the drag target cursor
has now been moved into the main Paint method, where it redraws
the whole entry, and if present, also the drag target cursor.
This means that all we need to do is Invalidate the entry,
which then just gets redrawn in a normal Paint pass.

One exception is still MacOS, which doesn't invalidate the entry,
but redraws the entry directly. DnD is MacOS is a bit different
as it is not async (if I understand correctly) so the invalidate
has no effect.

Reviewed-on: https://gerrit.libreoffice.org/70521
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 14abbc6e86ba234996dfed477a54030adeac2a52)

Change-Id: I8542f47940a3b90114ea4bbbac57fd303ca3434b

diff --git a/include/svtools/viewdataentry.hxx 
b/include/svtools/viewdataentry.hxx
index 1a61b3f6c13a..91c51d39dc9a 100644
--- a/include/svtools/viewdataentry.hxx
+++ b/include/svtools/viewdataentry.hxx
@@ -51,6 +51,8 @@ class SVT_DLLPUBLIC SvViewDataEntry
 bool mbExpanded:1;
 bool mbFocused:1;
 bool mbSelectable:1;
+bool mbDragTarget:1;
+
 tools::Rectangle maPaintRectangle;
 
 public:
@@ -63,11 +65,16 @@ public:
 bool IsExpanded() const { return mbExpanded;}
 bool HasFocus() const { return mbFocused;}
 bool IsSelectable() const { return mbSelectable;}
+bool IsDragTarget() const { return mbDragTarget;}
 void SetFocus( bool bFocus );
 void SetSelected( bool bSelected );
 void SetHighlighted( bool bHighlighted );
 void SetExpanded( bool bExpanded );
 void SetSelectable( bool bSelectable );
+void SetDragTarget( bool bDragTarget )
+{
+mbDragTarget = bDragTarget;
+}
 
 void Init(size_t nSize);
 
diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 6153f987efd3..2432a74246d9 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2879,23 +2879,19 @@ IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl, Timer *, void)
 pView->StartDrag( 0, aAsyncBeginDragPos );
 }
 
-void SvImpLBox::PaintDDCursor( SvTreeListEntry* pInsertionPos )
+void SvImpLBox::PaintDDCursor(SvTreeListEntry* pEntry, bool bShow)
 {
-long nY;
-if( pInsertionPos )
+if (pEntry)
 {
-nY = GetEntryLine( pInsertionPos );
-nY += pView->GetEntryHeight();
+SvViewDataEntry* pViewData = pView->GetViewData(pEntry);
+pViewData->SetDragTarget(bShow);
+#ifdef MACOSX
+// in MacOS we need to draw directly (as we are synchronuous) or no 
invalidation happens
+pView->PaintEntry1(*pEntry, GetEntryLine(pEntry), *pView);
+#else
+InvalidateEntry(pEntry);
+#endif
 }
-else
-nY = 1;
-RasterOp eOldOp = pView->GetRasterOp();
-pView->SetRasterOp( RasterOp::Invert );
-Color aOldLineColor = pView->GetLineColor();
-pView->SetLineColor( Color( COL_BLACK ) );
-pView->DrawLine( Point( 0, nY ), Point( aOutputSize.Width(), nY ) );
-pView->SetLineColor( aOldLineColor );
-pView->SetRasterOp( eOldOp );
 }
 
 void SvImpLBox::Command( const CommandEvent& rCEvt )
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 45a789633a87..f41e907c11c4 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -701,7 +701,7 @@ void SvTreeListBox::ImplShowTargetEmphasis( 
SvTreeListEntry* pEntry, bool bShow)
 return;
 if ( !bShow && !(nImpFlags & SvTreeListBoxFlags::TARGEMPH_VIS) )
 return;
-pImpl->PaintDDCursor( pEntry );
+pImpl->PaintDDCursor( pEntry, bShow);
 if( bShow )
 nImpFlags |= SvTreeListBoxFlags::TARGEMPH_VIS;
 else
@@ -2657,7 +2657,6 @@ void SvTreeListBox::InvalidateEntry(SvTreeListEnt

Re: Faulty handle position in shapes imported from MS Office

[Mark Hung]

Regina Henschel  於 2019年4月11日 週四 下午6:55寫道：

> Miklos Vajna schrieb am 11-Apr-19 um 09:59:
> > Hi Regina,
> >
> > I might be wrong, but I would expect that the evaluation of the formulas
> > don't depend on the shape type. If it does, it feels we don't understand
> > the general rule, so we work the problem around with evaluating a
> > formula in different ways for different shape types.
>
> Evaluating the formulas _is_ independent from shape type. But for
> getting the adjustment value, you need to revers the calculation.
> Shortened example for evaluating the formula:
> To get the y position of the handle:
> wedgeRectCallout: y = vertical center + adjust * height / 10
>

The equation should hold: (adj1-adj0) = (y1-y0) * 10 / height.
I think this should cover lots of cases already.


> star4 : y = vertical center - adjust * height / 10
> diagStripe : y = height * adjust / 10
>
> Currently we have only "adjust = y * 10 / height" to get the
> adjustment value from the position. That fits to the diagStripe but not
> to wedgeRectCallout and star4.
>
> The problem with the ooxml-shapes is, that they bind the handle position
> to a formula result and not directly to the adjustment value.
>
> >
> >> Would that be OK? If yes, which are suitable C++ tools to do that and
> where
> >> should the parts be placed?
> >
> > Sure, if special-casing on the shape type improves the situation, then
> > it's better than nothing.
>
> I would like a generic solution too, but I see no way to do it.
>
>   I would keep it simple: just create an enum
>

I think the patterns of the formula is much less than the number of types.
Maybe worthy of identify them?

> with the different cases, and then you can have a switch to handle each.
> > If the function gets large, extract the handling of complicated cases to
> > their own functions.
>
> I think I'll just start and work out a concrete proposal. Then it might
> be easier to discuss possible better solutions.
>
> Kind regards
> Regina
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice



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

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/inc/namedefdlg.hxx  |   49 
 sc/source/ui/inc/reffact.hxx |2 
 sc/source/ui/inc/tabvwsh.hxx |3 
 sc/source/ui/namedlg/namedefdlg.cxx  |  173 +--
 sc/source/ui/namedlg/namedlg.cxx |2 
 sc/source/ui/view/reffact.cxx|4 
 sc/source/ui/view/tabvwshc.cxx   |   62 +--
 sc/uiconfig/scalc/ui/definename.ui   |   25 ++--
 solenv/sanitizers/ui/modules/scalc.suppr |1 
 9 files changed, 153 insertions(+), 168 deletions(-)

New commits:
commit e9f2e6526c68045380b64e7579b07c6064be9c58
Author: Caolán McNamara 
AuthorDate: Thu Apr 11 09:42:46 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 13:15:56 2019 +0200

weld ScNameDefDlg

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

diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index aa971727884c..aa9861cd278f 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -22,25 +22,9 @@ class ScDocument;
 class ScDocShell;
 class ScViewData;
 
-class ScNameDefDlg : public ScAnyRefDlg
+class ScNameDefDlg : public ScAnyRefDlgController
 {
 private:
-VclPtr m_pEdName;
-
-VclPtr m_pEdRange;
-VclPtr m_pRbRange;
-
-VclPtr m_pLbScope;
-
-VclPtr m_pBtnRowHeader;
-VclPtr m_pBtnColHeader;
-VclPtr m_pBtnPrintArea;
-VclPtr m_pBtnCriteria;
-
-VclPtr m_pBtnAdd;
-VclPtr m_pBtnCancel;
-VclPtr m_pFtInfo;
-
 bool const mbUndo; //if true we need to add an undo action after creating 
a range name
 ScDocument* mpDoc;
 ScDocShell* mpDocShell;
@@ -58,33 +42,50 @@ private:
 
 std::map maRangeMap;
 
+std::unique_ptr m_xEdName;
+
+std::unique_ptr m_xEdRange;
+std::unique_ptr m_xRbRange;
+
+std::unique_ptr m_xLbScope;
+
+std::unique_ptr m_xBtnRowHeader;
+std::unique_ptr m_xBtnColHeader;
+std::unique_ptr m_xBtnPrintArea;
+std::unique_ptr m_xBtnCriteria;
+
+std::unique_ptr m_xBtnAdd;
+std::unique_ptr m_xBtnCancel;
+std::unique_ptr m_xFtInfo;
+std::unique_ptr m_xExpander;
+std::unique_ptr m_xFtRange;
+
 void CancelPushed();
 void AddPushed();
 
 bool IsNameValid();
 bool IsFormulaValid();
 
-DECL_LINK( CancelBtnHdl, Button*, void );
-DECL_LINK( AddBtnHdl, Button*, void );
-DECL_LINK( NameModifyHdl, Edit&, void );
-DECL_LINK( AssignGetFocusHdl, Control&, void );
+DECL_LINK( CancelBtnHdl, weld::Button&, void );
+DECL_LINK( AddBtnHdl, weld::Button&, void );
+DECL_LINK( NameModifyHdl, weld::Entry&, void );
+DECL_LINK( AssignGetFocusHdl, formula::WeldRefEdit&, void );
 
 protected:
 virtual voidRefInputDone( bool bForced = false ) override;
 
 public:
-ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent,
+ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent,
 const ScViewData* pViewData, const std::map& aRangeMap,
 const ScAddress& aCursorPos, const bool bUndo);
 
 virtual ~ScNameDefDlg() override;
-virtual voiddispose() override;
 
 virtual voidSetReference( const ScRange& rRef, ScDocument* pDoc ) 
override;
 virtual boolIsRefInputMode() const override;
 
 virtual voidSetActive() override;
-virtual boolClose() override;
+virtual voidClose() override;
 
 void GetNewData( OUString& rName, OUString& rScope );
 };
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index e6bf12c0feec..f41d5331b066 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -45,7 +45,7 @@
 };
 
 DECL_WRAPPER_WITHID_CONTROLLER(ScNameDlgWrapper)
-DECL_WRAPPER_WITHID(ScNameDefDlgWrapper)
+DECL_WRAPPER_WITHID_CONTROLLER(ScNameDefDlgWrapper)
 DECL_WRAPPER_WITHID(ScSolverDlgWrapper)
 DECL_WRAPPER_WITHID(ScOptSolverDlgWrapper)
 DECL_WRAPPER_WITHID(ScXMLSourceDlgWrapper)
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 4a2a142befef..266d816a78af 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -378,8 +378,7 @@ public:
 const   OUString DoAutoSum(bool& rRangeFinder, bool& rSubTotal);
 
 // ugly hack to call Define Names from Manage Names
-voidSwitchBetweenRefDialogs(SfxModelessDialog* pDialog);
-voidSwitchBetweenRefDialogControllers(SfxModelessDialogController* 
pDialog);
+voidSwitchBetweenRefDialogs(SfxModelessDialogController* pDialog);
 // #i123629#
 boolGetForceFocusOnCurCell() const { return bForceFocusOnCurCell; }
 void SetForceFocusOnCurCell(bool bFlag) { bForceFocusOnCurCell=bFlag; }
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx 
b/sc/source/ui/namedlg/namedefdlg.cxx
index 2b3e6ce45545..9eda9de45387

Re: Faulty handle position in shapes imported from MS Office

[Regina Henschel]

Miklos Vajna schrieb am 11-Apr-19 um 09:59:

Hi Regina,
 
I might be wrong, but I would expect that the evaluation of the formulas

don't depend on the shape type. If it does, it feels we don't understand
the general rule, so we work the problem around with evaluating a
formula in different ways for different shape types.


Evaluating the formulas _is_ independent from shape type. But for 
getting the adjustment value, you need to revers the calculation.

Shortened example for evaluating the formula:
To get the y position of the handle:
wedgeRectCallout: y = vertical center + adjust * height / 10
star4 : y = vertical center - adjust * height / 10
diagStripe : y = height * adjust / 10

Currently we have only "adjust = y * 10 / height" to get the 
adjustment value from the position. That fits to the diagStripe but not 
to wedgeRectCallout and star4.


The problem with the ooxml-shapes is, that they bind the handle position 
to a formula result and not directly to the adjustment value.





Would that be OK? If yes, which are suitable C++ tools to do that and where
should the parts be placed?


Sure, if special-casing on the shape type improves the situation, then
it's better than nothing.


I would like a generic solution too, but I see no way to do it.

 I would keep it simple: just create an enum

with the different cases, and then you can have a switch to handle each.
If the function gets large, extract the handling of complicated cases to
their own functions.


I think I'll just start and work out a concrete proposal. Then it might 
be easier to discuss possible better solutions.


Kind regards
Regina

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

[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6.2.3.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.2.3.2' created by Andras Timar  
at 2019-04-11 10:25 +

libreoffice-6.2.3.2

Changes since libreoffice-6.2.2.2-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 comphelper/source/misc/threadpool.cxx |   55 --
 1 file changed, 53 insertions(+), 2 deletions(-)

New commits:
commit e09bf8260e17e9ab8c4524c3b3d5d617d8d89bd5
Author: Luboš Luňák 
AuthorDate: Mon Apr 8 18:31:42 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 11 12:21:19 2019 +0200

don't kill threads after 3 minutes while debugging

It makes sense to kill threads after 3 minutes in dbgutils mode for 
unittests,
but this also meant that e.g. threaded Calc calculations in a gdb session
or when ran in Valgrind sometimes asserted halfway through the calculation.

Change-Id: I4fdd82549909feda9d4461b64eba0fcdca8be9be
Reviewed-on: https://gerrit.libreoffice.org/70422
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/comphelper/source/misc/threadpool.cxx 
b/comphelper/source/misc/threadpool.cxx
index 89d80298432b..f075c0600968 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -20,6 +20,18 @@
 #include 
 #include 
 
+#if defined HAVE_VALGRIND_HEADERS
+#include 
+#endif
+
+#if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#include 
+#elif defined UNX
+#include 
+#include 
+#endif
+
 namespace comphelper {
 
 /** prevent waiting for a task from inside a task */
@@ -304,15 +316,54 @@ bool ThreadTaskTag::isDone()
 return mnTasksWorking == 0;
 }
 
+#if defined DBG_UTIL && !defined NDEBUG
+static bool isDebuggerAttached()
+{
+#if defined(_WIN32)
+return IsDebuggerPresent();
+#elif defined LINUX
+char buf[ 4096 ];
+int fd = open( "/proc/self/status", O_RDONLY );
+if( fd < 0 )
+return false;
+int size = read( fd, buf, sizeof( buf ) - 1 );
+close( fd );
+if( size < 0 )
+return false;
+assert( size < int( sizeof( buf )) - 1 );
+buf[ sizeof( buf ) - 1 ] = '\0';
+// "TracerPid: " for pid != 0 means something is attached
+const char* pos = strstr( buf, "TracerPid:" );
+if( pos == nullptr )
+return false;
+pos += strlen( "TracerPid:" );
+while( *pos != '\n' && isspace( *pos ))
+++pos;
+return *pos != '\n' && *pos != '0';
+#else
+return false; // feel free to add your platform
+#endif
+}
+#endif
+
 void ThreadTaskTag::waitUntilDone()
 {
 std::unique_lock< std::mutex > aGuard( maMutex );
 while( mnTasksWorking > 0 )
 {
 #if defined DBG_UTIL && !defined NDEBUG
-// 3 minute timeout in debug mode so our tests fail sooner rather than 
later
+// 3 minute timeout in debug mode so our tests fail sooner rather than 
later,
+// unless the code is debugged in valgrind or gdb, in which case the 
threads
+// should not time out in the middle of a debugging session
+int maxTimeout = 3 * 60;
+#if defined HAVE_VALGRIND_HEADERS
+if( RUNNING_ON_VALGRIND )
+maxTimeout = 30 * 60;
+#endif
+if( isDebuggerAttached())
+maxTimeout = 300 * 60;
 std::cv_status result = maTasksComplete.wait_for(
-aGuard, std::chrono::seconds( 3 * 60 ));
+aGuard, std::chrono::seconds( maxTimeout ));
 assert(result != std::cv_status::timeout);
 #else
 // 10 minute timeout in production so the app eventually throws some 
kind of error
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac solenv/gbuild

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

 config_host.mk.in   |3 -
 configure.ac|   52 ++-
 solenv/gbuild/LinkTarget.mk |   71 
 solenv/gbuild/Module.mk |8 +--
 solenv/gbuild/PrecompiledHeaders.mk |9 +---
 solenv/gbuild/TargetLocations.mk|6 +-
 solenv/gbuild/gbuild.mk |   42 +-
 solenv/gbuild/platform/com_GCC_class.mk |2 
 solenv/gbuild/platform/com_MSC_class.mk |5 --
 solenv/gbuild/platform/com_MSC_defs.mk  |2 
 10 files changed, 97 insertions(+), 103 deletions(-)

New commits:
commit c33ada5923f1f534334b22c15d6e2c6f1d35
Author: Luboš Luňák 
AuthorDate: Thu Apr 4 16:39:49 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 11 12:20:55 2019 +0200

merge --enable-selective-debuginfo into --enable-symbols

This got broken again due to confusion about the interaction between
the various debug/symbol/whatever variables, so let's try to clean it
up once more. So gb_SYMBOLS or any other global flag is no more.
For checking whether a build target should get symbols, use
gb_LinkTarget__symbols_enabled, which is internally controlled by
gb_ENABLE_SYMBOLS_FOR (and flags from configure, command line or
wherever affect that).

This commit breaks the debug/nodebug split for PCH files, but fixing
that is a relatively separate and complex change, so it'll be done
in another commit.

Change-Id: I6060dd38684445bb761e664344fb530386481332
Reviewed-on: https://gerrit.libreoffice.org/70369
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index ef174b790939..eccc3ef1924f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -131,7 +131,6 @@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
 export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DCONF=@ENABLE_DCONF@
 export ENABLE_DEBUG=@ENABLE_DEBUG@
-export ENABLE_DEBUGINFO_FOR=@ENABLE_DEBUGINFO_FOR@
 export ENABLE_EOT=@ENABLE_EOT@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
@@ -179,7 +178,7 @@ export 
ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
 export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
-export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
+export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export ENABLE_VLC=@ENABLE_VLC@
 export ENABLE_WERROR=@ENABLE_WERROR@
diff --git a/configure.ac b/configure.ac
index 5f4a6de14dcb..2d62af9981a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1145,20 +1145,15 @@ libo_FUZZ_ARG_ENABLE(sal-log,
 AS_HELP_STRING([--enable-sal-log],
 [Make SAL_INFO and SAL_WARN calls do something even in a non-debug 
build.]))
 
-AC_ARG_ENABLE(selective-debuginfo,
-AS_HELP_STRING([--enable-selective-debuginfo],
-[If --enable-debug or --enable-dbgutil is used, build debugging 
information
- (-g compiler flag) only for the specified gbuild build targets
- (where all means everything, - prepended means not to enable, / 
appended means
- everything in the directory; there is no ordering, more specific 
overrides
- more general, and disabling takes precedence).
- Example: --enable-selective-debuginfo="all -sw/ -Library_sc".]))
-
 libo_FUZZ_ARG_ENABLE(symbols,
 AS_HELP_STRING([--enable-symbols],
 [Generate debug information.
  By default, enabled for --enable-debug and --enable-dbgutil, disabled
- otherwise.]))
+ otherwise. It is possible to explicitly specify gbuild build targets
+ (where 'all' means everything, '-' prepended means to not enable, '/' 
appended means
+ everything in the directory; there is no ordering, more specific 
overrides
+ more general, and disabling takes precedence).
+ Example: --enable-symbols="all -sw/ -Library_sc".]))
 
 libo_FUZZ_ARG_ENABLE(optimized,
 AS_HELP_STRING([--disable-optimized],
@@ -3813,7 +3808,7 @@ AC_SUBST(MSVC_USE_DEBUG_RUNTIME)
 dnl Set the ENABLE_DEBUG variable.
 dnl ===
 if test -n "$enable_debug" && test "$enable_debug" != "yes" && test 
"$enable_debug" != "no"; then
-AC_MSG_ERROR([--enable-debug now accepts only yes or no, use 
--enable-selective-debuginfo])
+AC_MSG_ERROR([--enable-debug now accepts only yes or no, use 
--enable-symbols])
 fi
 if test -n "$ENABLE_DBGUTIL" -a "$enable_debug" = "no"; then
 if test -z "$libo_fuzzed_enable_debug"; then
@@ -4048,27 +4043,6 @@ if test "$enable_sal_log" = yes; then
 fi
 AC_SUBST(ENABLE_SAL_LOG)
 
-dnl Selective debuginfo
-ENABLE_DEBUGINFO_FOR=
-if test -n "$ENABLE_DEBUG"; then
-AC_MSG_CHECKING([whether to use selective debuginfo])
-if test -n "$enable_selective_debuginfo" -a "$enable_selective_debugin

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk |   27 +++--
 solenv/gbuild/PrecompiledHeaders.mk |   65 ++--
 solenv/gbuild/TargetLocations.mk|8 +--
 solenv/gbuild/platform/com_GCC_class.mk |   12 ++---
 solenv/gbuild/platform/com_MSC_class.mk |6 +-
 5 files changed, 67 insertions(+), 51 deletions(-)

New commits:
commit 3d3826dae92a8bd4671717d92f497db57f6424d1
Author: Luboš Luňák 
AuthorDate: Sun Apr 7 12:06:19 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 11 12:21:08 2019 +0200

fix getting correct debug/nodebug PCH file with selective debuginfo

Since debuginfo enabled/disabled is per-linktarget, the rules need
to be per-linktarget as well, and so instead of one generic rule
there needs to be a define generating one rule per each linktarget.

Change-Id: I9423c4a86bc02aa3c0bf816f47e3c3d43ff03b23
Reviewed-on: https://gerrit.libreoffice.org/70370
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 33579bf0e99f..3e2d19e58956 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -271,7 +271,7 @@ define gb_CxxObject__set_pchflags
 ifeq ($(gb_ENABLE_PCH),$(true))
 ifneq ($(strip $$(PCH_NAME)),)
 ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) 
$$(DEFS)))
-$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
+$$@ : PCHFLAGS := $$(call 
gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME),$$(PCH_LINKTARGETMAKEFILENAME))
 else
 $$(info No precompiled header available for $$*.cxx .)
 $$(info precompiled header flags : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)))
@@ -777,6 +777,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_LIBS :=
 $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE :=
 $(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 :=
 $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
+$(call gb_LinkTarget_get_target,$(1)) : PCH_LINKTARGETMAKEFILENAME :=
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS :=
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX :=
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJNOEX :=
@@ -816,6 +817,8 @@ gb_LinkTarget_CXX_SUFFIX_$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1))
 # installed linktargets need a rule to build!
 $(if $(findstring $(INSTDIR),$(1)),$(call 
gb_LinkTarget__make_installed_rule,$(1)))
 
+$(call gb_PrecompiledHeader_generate_timestamp_rule,$(2))
+
 endef
 
 # call gb_LinkTarget_set_soversion_script,linktarget,soversionscript
@@ -1119,7 +1122,7 @@ $(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
 $(call gb_CxxObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
 ifeq ($(gb_ENABLE_PCH),$(true))
-$(call gb_CxxObject_get_target,$(2)) : $(call 
gb_PrecompiledHeader_get_timestamp,$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)))
+$(call gb_CxxObject_get_target,$(2)) : $(call 
gb_PrecompiledHeader_get_timestamp,$(4))
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -1256,7 +1259,7 @@ $(call gb_GenCxxObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
 $(call gb_GenCxxObject_get_target,$(2)) : GEN_CXX_SOURCE := $(call 
gb_GenCxxObject_get_source,$(2),$(1))
 ifeq ($(gb_ENABLE_PCH),$(true))
-$(call gb_GenCxxObject_get_target,$(2)) : $(call 
gb_PrecompiledHeader_get_timestamp,$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)))
+$(call gb_GenCxxObject_get_target,$(2)) : $(call 
gb_PrecompiledHeader_get_timestamp,$(4))
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -1502,31 +1505,33 @@ endef
 # call 
gb_LinkTarget__set_precompiled_header_impl,linktarget,pchcxxfile,pchtarget,linktargetmakefilename
 define gb_LinkTarget__set_precompiled_header_impl
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_PrecompiledHeader_get_clean_target,$(3))
-$(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx
+$(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(2).cxx
 
-$(call gb_PrecompiledHeader_get_target,$(3)) : $(call 
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call 
gb_LinkTarget_get_headers_target,$(1))
 
 $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3)
-$(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX = $(call 
gb_PrecompiledHeader_get_objectfile, $(call 
gb_PrecompiledHeader_get_target,$(3)))
+$(call gb_LinkTarget_get_target,$(1)) : PCH_LINKTARGETMAKEFILENAME := $(4)
+$(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX = $(call 
gb_PrecompiledHeader_get_objectfile, $(call 
gb_PrecompiledHeader_get_target,$(3),$(4)))
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX)
 
 $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(DEFS)
 $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call 
gb_LinkTarget__get_cxxflags,$(4))
 
-$(call gb_PrecompiledHeader_get_target,$(3)) : VISIBILIT

[Libreoffice-commits] core.git: 2 commits - solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk|2 +-
 solenv/gbuild/platform/com_GCC_defs.mk |   12 ++--
 solenv/gbuild/platform/com_MSC_defs.mk |2 ++
 solenv/gbuild/platform/iOS.mk  |1 +
 solenv/gbuild/platform/solaris.mk  |5 -
 solenv/gbuild/platform/unxgcc.mk   |9 -
 6 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 65f27f55cbb5994fbabe9716a92ea4d3f20e3e54
Author: Luboš Luňák 
AuthorDate: Thu Apr 4 16:19:54 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 11 12:18:32 2019 +0200

--gdb-index flags should be used only when linking with symbols

Change-Id: I32681fd56367c583efc55ab11c0bc59aaf845b86
Reviewed-on: https://gerrit.libreoffice.org/70367
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3292c26bcde2..85804ca8bcc5 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -50,7 +50,7 @@ gb_LinkTarget__get_debugflags=$(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(
 # but moreover strip debug from libraries for which debuginfo is not wanted
 # (some libraries reuse .o files from other libraries, notably unittests)
 gb_LinkTarget__get_stripldflags=$(if $(strip 
$(CFLAGS)$(CXXFLAGS)$(OBJCFLAGS)$(OBJCXXFLAGS)$(LDFLAGS)),,$(gb_LINKERSTRIPDEBUGFLAGS))
-gb_LinkTarget__get_debugldflags=$(if $(call 
gb_LinkTarget__debug_enabled,$(1)),,$(gb_LINKEROPTFLAGS) $(call 
gb_LinkTarget__get_stripldflags,$(1)))
+gb_LinkTarget__get_debugldflags=$(if $(call 
gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUGINFO_FLAGS),$(gb_LINKEROPTFLAGS) 
$(call gb_LinkTarget__get_stripldflags,$(1)))
 
 # generic cflags/cxxflags to use (optimization flags, debug flags)
 # user supplied CFLAGS/CXXFLAGS override default debug/optimization flags
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index b780358dbe4e..28bb7138d0d7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -85,12 +85,6 @@ endif
 
 gb_CXXFLAGS_Wundef = -Wno-undef
 
-ifeq ($(ENABLE_GDB_INDEX),TRUE)
-gb_LinkTarget_LDFLAGS += -Wl,--gdb-index
-gb_CFLAGS_COMMON += -ggnu-pubnames
-gb_CXXFLAGS_COMMON += -ggnu-pubnames
-endif
-
 ifeq ($(strip $(gb_GCOV)),YES)
 gb_CFLAGS_COMMON += -fprofile-arcs -ftest-coverage
 gb_CXXFLAGS_COMMON += -fprofile-arcs -ftest-coverage
@@ -199,11 +193,17 @@ gb_DEBUGINFO_FLAGS=-ggdb2
 else
 gb_DEBUGINFO_FLAGS=-g2
 endif
+gb_LINKER_DEBUGINFO_FLAGS=
 
 ifeq ($(HAVE_GCC_SPLIT_DWARF),TRUE)
 gb_DEBUGINFO_FLAGS+=-gsplit-dwarf
 endif
 
+ifeq ($(ENABLE_GDB_INDEX),TRUE)
+gb_LINKER_DEBUGINFO_FLAGS += -Wl,--gdb-index
+gb_DEBUGINFO_FLAGS += -ggnu-pubnames
+endif
+
 gb_LinkTarget_INCLUDE :=\
 $(SOLARINC) \
 -I$(BUILDDIR)/config_$(gb_Side) \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 1bb766f91da6..300a047f352d 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -259,6 +259,8 @@ gb_DEBUGINFO_FLAGS := \
-FS \
-Zi \
 
+gb_LINKER_DEBUGINFO_FLAGS=
+
 gb_COMPILEROPTFLAGS := -O2 -Oy-
 gb_COMPILERNOOPTFLAGS := -Od
 
diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 05f7e65781b5..abdeb8cc59e7 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -30,6 +30,7 @@ include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
 # Use standard lldb debugger
 gb_DEBUGINFO_FLAGS=-g
+gb_LINKER_DEBUGINFO_FLAGS=
 
 # Darwin mktemp -t expects a prefix, not a pattern
 gb_MKTEMP := /usr/bin/mktemp -t gbuild.
commit e7a883994723d7002a92d34aafefb2d18763
Author: Luboš Luňák 
AuthorDate: Thu Apr 4 15:37:29 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 11 12:18:20 2019 +0200

make linker flags conditional when used, not when defined

gb_LINKEROPTFLAGS and gb_LINKERSTRIPDEBUGFLAGS are only used by
gb_LinkTarget__get_debugldflags, which already properly uses them
depending on whether debuginfo is wanted or not

Change-Id: I0befc10d6f1ee99ccd49a640241e3ae023454875
Reviewed-on: https://gerrit.libreoffice.org/70366
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 88fa9413f726..e386601996f2 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -86,12 +86,7 @@ endif
 
 # sun ld doesn't understand -O1 optimize flag
 gb_LINKEROPTFLAGS :=
-
-ifeq ($(gb_SYMBOL),$(true))
-gb_LINKERSTRIPDEBUGFLAGS :=
-else
 gb_LINKERSTRIPDEBUGFLAGS := -Wl,-zredlocsym -Wl,-znoldynsym
-endif
 
 # LinkTarget class
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a84c095721ff..27edd2932589 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -83,17 +83,8 @@ endif
 endif
 endif
 
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_LINKEROP

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - README

[Matthias Seidel (via logerrit)]

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

New commits:
commit 2b61e66768284b8aa775425e2cbac4f7ef62a137
Author: Matthias Seidel 
AuthorDate: Thu Apr 11 09:07:12 2019 +
Commit: Matthias Seidel 
CommitDate: Thu Apr 11 09:07:12 2019 +

Updated download number to 270 million.

diff --git a/README b/README
index 79790f58837b..a35686a78ea6 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ Apache OpenOffice (AOO)
 FreeBSD
 OS/2
 
-OpenOffice is used by millions of users worldwide and with more than 260 
million
+OpenOffice is used by millions of users worldwide and with more than 270 
million
 downloads it is one of the most successful open source projects.
 
 Getting the latest sources via Subversion
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/formula sc/source sc/uiconfig solenv/sanitizers

[Caolán McNamara (via logerrit)]

 include/formula/funcutl.hxx  |   12 +++
 sc/source/ui/inc/reffact.hxx |5 +
 sc/source/ui/inc/simpref.hxx |   25 +++---
 sc/source/ui/miscdlgs/simpref.cxx|   91 +---
 sc/source/ui/view/reffact.cxx|   35 +
 sc/source/ui/view/tabvwshc.cxx   |   19 ++---
 sc/uiconfig/scalc/ui/simplerefdialog.ui  |  113 ---
 solenv/sanitizers/ui/modules/scalc.suppr |1 
 8 files changed, 151 insertions(+), 150 deletions(-)

New commits:
commit 8d19e03b17fdd6e6159843249fe0b4f41c526f17
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 13:09:05 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 11:23:30 2019 +0200

weld ScSimpleRefDlg

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

diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 5a6c095db77e..d2aec01bf90a 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -142,6 +142,18 @@ public:
 xEntry->select_region(0, -1);
 }
 
+void SetSelection(const Selection& rSelection)
+{
+xEntry->select_region(rSelection.Min(), rSelection.Max());
+}
+
+Selection GetSelection() const
+{
+int nStartPos, nEndPos;
+xEntry->get_selection_bounds(nStartPos, nEndPos);
+return Selection(nStartPos, nEndPos);
+}
+
 weld::Label* GetLabelWidgetForShrinkMode()
 {
 return pLabelWidget;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index b7ab53612a0b..e6bf12c0feec 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -180,7 +180,10 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
 SfxBindings*,
 SfxChildWinInfo* );
 
-SFX_DECL_CHILDWINDOW_WITHID(Class);
+static std::unique_ptr CreateImpl(vcl::Window 
*pParent, sal_uInt16 nId,
+  SfxBindings 
*pBindings, SfxChildWinInfo* pInfo);
+static void RegisterChildWindow(bool bVisible=false, SfxModule 
*pMod=nullptr, SfxChildWindowFlags nFlags=SfxChildWindowFlags::NONE);
+static  sal_uInt16 GetChildWindowId();
 
 static void SetDefaultPosSize(Point aPos, Size aSize);
 voidSetRefString(const OUString& rStr);
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 492dac5910b2..c3a9184c1099 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -25,7 +25,7 @@
 
 class ScDocument;
 
-class ScSimpleRefDlg: public ScAnyRefDlg
+class ScSimpleRefDlg: public ScAnyRefDlgController
 {
 private:
 Link aCloseHdl;
@@ -33,13 +33,6 @@ private:
 Link aAbortedHdl;
 Link aChangeHdl;
 
-VclPtr m_pFtAssign;
-VclPtr m_pEdAssign;
-VclPtr m_pRbAssign;
-
-VclPtr   m_pBtnOk;
-VclPtr   m_pBtnCancel;
-
 ScRange theCurArea;
 boolbCloseFlag;
 boolbAutoReOpen;
@@ -47,30 +40,34 @@ private:
 boolbSingleCell;
 boolbMultiSelection;
 
+std::unique_ptr m_xFtAssign;
+std::unique_ptr m_xEdAssign;
+std::unique_ptr m_xRbAssign;
+std::unique_ptr m_xBtnOk;
+std::unique_ptr m_xBtnCancel;
+
 voidInit();
 
-DECL_LINK( CancelBtnHdl, Button*, void );
-DECL_LINK( OkBtnHdl, Button*, void );
+DECL_LINK( CancelBtnHdl, weld::Button&, void );
+DECL_LINK( OkBtnHdl, weld::Button&, void );
 
 protected:
 
 virtual voidRefInputDone( bool bForced = false ) override;
 
 public:
-ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, 
vcl::Window* pParent);
+ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, 
weld::Window* pParent);
 virtual~ScSimpleRefDlg() override;
-virtual voiddispose() override;
 
 virtual voidSetReference( const ScRange& rRef, ScDocument* pDoc ) 
override;
 
 virtual boolIsRefInputMode() const override;
 virtual voidSetActive() override;
-virtual boolClose() override;
+virtual voidClose() override;
 
 voidStartRefInput();
 
 voidSetRefString(const OUString &rStr);
-virtual voidFillInfo(SfxChildWinInfo&) const override;
 
 voidSetCloseHdl( const Link& rLink );
 voidSetUnoLinks( const Link& rDone, 
const Link& rAbort,
diff --git a/sc/source/ui/miscdlgs/simpref.cxx 
b/sc/source/ui/miscdlgs/simpref.cxx
index def1babab0f9..362c4e1382ae 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -21,23 +21,20 @@
 #include 
 #include 
 
-ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, 
vcl::Window* pP

Re: Make API versioning compiler evaluable

[Michael Stahl]

On 11.04.19 09:32, Jan-Marek Glogowski wrote:

* Has UDK an independent versioning, or is it also the Office version?


it used to have independent versioning in OOo days, although looking at 
@since tags in include/rtl that is evidently replaced by LO versioning now.



More comments?


i'm not sure if it is worth the effort - we generally discourage C++ 
extensions anyway since Java or Python extensions have a lot less 
pitfalls; Java doesn't have a preprocessor, and so the way to build 
against an old API is to just put a corresonding old jar on the 
classpath; Python doesn't even have static typing so it's not applicable.


also, if you look at the URE headers, almost any new addition in the 
last years is behind #ifdef LIBO_INTERNAL_ONLY anyway.

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

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

[Patrick Jaap (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |   25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

New commits:
commit cafed2e65e86d813822d2c650fa057f1a1f81c06
Author: Patrick Jaap 
AuthorDate: Wed Apr 3 14:58:05 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 11 10:15:29 2019 +0200

Fix in convertToOOXMLHoriOrient: values of VertOrient were taken

Change-Id: I47093292aeed5c0579dd4b365561ee86935632e4
Reviewed-on: https://gerrit.libreoffice.org/70197
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 2111f607973166ebc39414ba6d2019832bcfe4da)
Reviewed-on: https://gerrit.libreoffice.org/70513
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7d6a618b554f..aab60d8cec1c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -512,24 +512,21 @@ static OString convertToOOXMLVertOrient(sal_Int16 nOrient)
 }
 }
 
-static OString convertToOOXMLHoriOrient(sal_Int16 nOrient)
+static OString convertToOOXMLHoriOrient(sal_Int16 nOrient, bool bIsPosToggle)
 {
 switch( nOrient )
 {
-case text::VertOrientation::NONE:
+case text::HoriOrientation::NONE:
 return OString();
-case text::VertOrientation::CENTER:
-case text::VertOrientation::LINE_CENTER:
-return OString( "center" );
-case text::VertOrientation::BOTTOM:
-return OString( "bottom" );
-case text::VertOrientation::LINE_BOTTOM:
-return OString( "outside" );
-case text::VertOrientation::TOP:
-return OString( "top" );
-case text::VertOrientation::LINE_TOP:
+case text::HoriOrientation::LEFT:
+return OString( bIsPosToggle ? "inside" : "left" );
+case text::HoriOrientation::RIGHT:
+return OString( bIsPosToggle ? "outside" : "right" );
+case text::HoriOrientation::CENTER:
+// fall-through indended
+case text::HoriOrientation::FULL:
 default:
-return OString( "inside" );
+return OString( "center" );
 }
 }
 
@@ -8407,7 +8404,7 @@ void DocxAttributeOutput::FormatVertOrientation( const 
SwFormatVertOrient& rFlyV
 
 void DocxAttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& 
rFlyHori )
 {
-OString sAlign   = convertToOOXMLHoriOrient( rFlyHori.GetHoriOrient() );
+OString sAlign   = convertToOOXMLHoriOrient( rFlyHori.GetHoriOrient(), 
rFlyHori.IsPosToggle() );
 OString sHAnchor = convertToOOXMLHoriOrientRel( 
rFlyHori.GetRelationOrient() );
 
 if (m_rExport.SdrExporter().getTextFrameSyntax())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sc/source/ui/view/notemark.cxx |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 37aa4f0d64e276c46821ef6122483fb6b4c04781
Author: Miklos Vajna 
AuthorDate: Thu Apr 11 09:13:59 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 11 10:03:22 2019 +0200

tdf#122767 sc opengl: fix rendering artifacts after hiding a cell comment

Actually this is not specific to opengl, affects e.g. the Linux gen
backend as well, it just doesn't happen with the Windows gdi backend.

The rendering of the caption itself was OK. Focusing on the arrow
polygon at the end of the comment's "tail" (connector polyline):

- What gets painted is determined by SdrCaptionObj ->
  ViewContactOfSdrCaptionObj::createViewIndependentPrimitive2DSequence(),
  which produces a PolyPolygonColorPrimitive2D, which is then processed by
  VclPixelProcessor2D::tryDrawPolyPolygonColorPrimitive2DDirect().

- The polygon passed to VCL there is within the bounds of the
  invalidation rectangle set in ScNoteMarker::TimeHdl().

So it seems the only reason sometimes these 1px rendering artifacts are
left around is anti-aliasing. Fix those by simply extending the
invalidation rectangle in each direction.

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

diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 0868f557cfb5..642bf405a2e8 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -170,21 +170,30 @@ void ScNoteMarker::InvalidateWin()
 {
 if (m_bVisible)
 {
-m_pWindow->Invalidate( OutputDevice::LogicToLogic(m_aRect, m_aMapMode, 
m_pWindow->GetMapMode()) );
+// Extend the invalidated rectangle by 1 pixel in each direction in 
case AA would slightly
+// paint outside the nominal area.
+tools::Rectangle aRect(m_aRect);
+const Size aPixelSize = m_pWindow->PixelToLogic(Size(1, 1));
+aRect.AdjustLeft(-aPixelSize.getWidth());
+aRect.AdjustTop(-aPixelSize.getHeight());
+aRect.AdjustRight(aPixelSize.getWidth());
+aRect.AdjustBottom(aPixelSize.getHeight());
+
+m_pWindow->Invalidate( OutputDevice::LogicToLogic(aRect, m_aMapMode, 
m_pWindow->GetMapMode()) );
 
 if ( m_pRightWin || m_pBottomWin )
 {
 Size aWinSize = m_pWindow->PixelToLogic( 
m_pWindow->GetOutputSizePixel(), m_aMapMode );
 if ( m_pRightWin )
-m_pRightWin->Invalidate( OutputDevice::LogicToLogic(m_aRect,
+m_pRightWin->Invalidate( OutputDevice::LogicToLogic(aRect,
 lcl_MoveMapMode( m_aMapMode, Size( 
aWinSize.Width(), 0 ) ),
 m_pRightWin->GetMapMode()) );
 if ( m_pBottomWin )
-m_pBottomWin->Invalidate( OutputDevice::LogicToLogic(m_aRect,
+m_pBottomWin->Invalidate( OutputDevice::LogicToLogic(aRect,
 lcl_MoveMapMode( m_aMapMode, Size( 0, 
aWinSize.Height() ) ),
 m_pBottomWin->GetMapMode()) );
 if ( m_pDiagWin )
-m_pDiagWin->Invalidate( OutputDevice::LogicToLogic(m_aRect,
+m_pDiagWin->Invalidate( OutputDevice::LogicToLogic(aRect,
 lcl_MoveMapMode( m_aMapMode, aWinSize 
),
 m_pDiagWin->GetMapMode()) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Faulty handle position in shapes imported from MS Office

[Miklos Vajna]

Hi Regina,

On Wed, Apr 10, 2019 at 02:41:17PM +0200, Regina Henschel 
 wrote:
> The needed calculation depends on the shape type, the handle and the
> parameter ( X, Y, Radius, Angle) of the handle. Different handles of a shape
> can need different calculations. On the other hand, different shapes can use
> the same calculation for their handles, e.g all those, which are correct
> with the current implementation.

I might be wrong, but I would expect that the evaluation of the formulas
don't depend on the shape type. If it does, it feels we don't understand
the general rule, so we work the problem around with evaluating a
formula in different ways for different shape types.

> Would that be OK? If yes, which are suitable C++ tools to do that and where
> should the parts be placed?

Sure, if special-casing on the shape type improves the situation, then
it's better than nothing. I would keep it simple: just create an enum
with the different cases, and then you can have a switch to handle each.
If the function gets large, extract the handling of complicated cases to
their own functions.

Regards,

Miklos


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

[Libreoffice-commits] core.git: include/vcl sc/source sc/uiconfig solenv/sanitizers vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx  |1 
 sc/source/ui/inc/namedlg.hxx  |   76 +++---
 sc/source/ui/inc/namemgrtable.hxx |   13 -
 sc/source/ui/inc/reffact.hxx  |   13 +
 sc/source/ui/inc/tabvwsh.hxx  |1 
 sc/source/ui/namedlg/namedlg.cxx  |  345 ++
 sc/source/ui/namedlg/namemgrtable.cxx |   38 +++
 sc/source/ui/view/reffact.cxx |   28 ++
 sc/source/ui/view/tabvwshc.cxx|  112 +++--
 sc/uiconfig/scalc/ui/managenamesdialog.ui |   91 ++-
 solenv/sanitizers/ui/modules/scalc.suppr  |1 
 vcl/source/app/salvtables.cxx |8 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   19 +
 13 files changed, 441 insertions(+), 305 deletions(-)

New commits:
commit 565a254a814a06086ac067d5c64b4557e73c9666
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 15:50:49 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:58:26 2019 +0200

weld ScNameDlg

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 2a7511b419fc..4074df14b8c7 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1435,6 +1435,7 @@ public:
 virtual void set_label(const OUString& rText) = 0;
 virtual OUString get_label() const = 0;
 virtual void set_mnemonic_widget(Widget* pTarget) = 0;
+virtual void set_error(bool bShowError) = 0;
 };
 
 class VCL_DLLPUBLIC TextView : virtual public Container
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index cf8192ba4196..2034cd26e918 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -33,28 +33,9 @@ class ScViewData;
 class ScDocument;
 
 //logic behind the manage names dialog
-class ScNameDlg : public ScAnyRefDlg, public ScRangeManagerTable::InitListener
+class ScNameDlg : public ScAnyRefDlgController
 {
 private:
-VclPtr   m_pEdName;
-VclPtr   m_pEdAssign;
-VclPtr m_pRbAssign;
-VclPtrm_pLbScope;
-
-VclPtr   m_pBtnPrintArea;
-VclPtr   m_pBtnColHeader;
-VclPtr   m_pBtnCriteria;
-VclPtr   m_pBtnRowHeader;
-
-VclPtr m_pBtnAdd;
-VclPtr m_pBtnDelete;
-VclPtr m_pBtnOk;
-VclPtr m_pBtnCancel;
-
-VclPtr  m_pFtInfo;
-
-VclPtr m_pRangeManagerTable;
-
 const OUString maGlobalNameStr;
 const OUString maErrInvalidNameStr;
 const OUString maErrNameInUse;
@@ -74,6 +55,28 @@ private:
 
 RangeNameContainer m_RangeMap;
 
+std::unique_ptr m_xEdName;
+std::unique_ptr m_xFtAssign;
+std::unique_ptr   m_xEdAssign;
+std::unique_ptr m_xRbAssign;
+std::unique_ptr m_xLbScope;
+
+std::unique_ptr m_xBtnPrintArea;
+std::unique_ptr m_xBtnColHeader;
+std::unique_ptr m_xBtnCriteria;
+std::unique_ptr m_xBtnRowHeader;
+
+std::unique_ptr m_xBtnAdd;
+std::unique_ptr m_xBtnDelete;
+std::unique_ptr m_xBtnOk;
+std::unique_ptr m_xBtnCancel;
+
+std::unique_ptr m_xFtInfo;
+
+std::unique_ptr m_xExpander;
+
+std::unique_ptr m_xRangeManagerTable;
+
 private:
 void Init();
 void UpdateChecks(const ScRangeData* pData);
@@ -87,41 +90,38 @@ private:
 
 void AddPushed();
 void RemovePushed();
-void CancelPushed();
 void ScopeChanged();
 void NameModified();
 
 void SelectionChanged();
 
 // Handler:
-DECL_LINK( OkBtnHdl, Button*, void );
-DECL_LINK( CancelBtnHdl, Button*, void );
-DECL_LINK( AddBtnHdl, Button*, void );
-DECL_LINK( RemoveBtnHdl, Button*, void );
-DECL_LINK( EdModifyHdl, Edit&, void );
-DECL_LINK( EdModifyCheckBoxHdl, CheckBox&, void );
-DECL_LINK( AssignGetFocusHdl, Control&, void );
-DECL_LINK( SelectionChangedHdl_Impl, SvTreeListBox*, void );
-DECL_LINK( ScopeChangedHdl, ListBox&, void );
+DECL_LINK( OkBtnHdl, weld::Button&, void );
+DECL_LINK( CancelBtnHdl, weld::Button&, void );
+DECL_LINK( AddBtnHdl, weld::Button&, void );
+DECL_LINK( RemoveBtnHdl, weld::Button&, void );
+DECL_LINK( EdModifyHdl, weld::Entry&, void );
+DECL_LINK( RefEdModifyHdl, formula::WeldRefEdit&, void );
+DECL_LINK( EdModifyCheckBoxHdl, weld::ToggleButton&, void );
+DECL_LINK( AssignGetFocusHdl, formula::WeldRefEdit&, void );
+DECL_LINK( SelectionChangedHdl_Impl, weld::TreeView&, void );
+DECL_LINK( ScopeChangedHdl, weld::ComboBox&, void );
 
 protected:
 virtual voidRefInputDone( bool bForced = false ) override;
 
 public:
-ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, 
vcl::Window* pParent,
-   ScViewData*  ptrViewData,
-   const ScAddress& aCursorPos,
-   std::map>* pRange

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx|6 
 sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx |2 
 sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx |2 
 sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx  |2 
 sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx   |6 
 sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx   |2 
 sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx |2 
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx |  324 
--
 sc/source/ui/inc/AnalysisOfVarianceDialog.hxx  |2 
 sc/source/ui/inc/ChiSquareTestDialog.hxx   |2 
 sc/source/ui/inc/DescriptiveStatisticsDialog.hxx   |2 
 sc/source/ui/inc/ExponentialSmoothingDialog.hxx|2 
 sc/source/ui/inc/FourierAnalysisDialog.hxx |2 
 sc/source/ui/inc/MatrixComparisonGenerator.hxx |2 
 sc/source/ui/inc/MovingAverageDialog.hxx   |2 
 sc/source/ui/inc/StatisticsInputOutputDialog.hxx   |   73 --
 16 files changed, 43 insertions(+), 390 deletions(-)

New commits:
commit 92b25179973fce7cafa3364dc19693a5a22f4952
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 12:41:36 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:58:14 2019 +0200

rename ScStatisticsInputOutputDialogController back...

to...

ScStatisticsInputOutputDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx 
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 0dc391a17e2f..0c4aaa7b3d70 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -67,10 +67,10 @@ OUString lclCreateMultiParameterFormula(
 return aResult.makeStringAndClear();
 }
 
-void lclMakeSubRangesList(ScRangeList& rRangeList, const ScRange& rInputRange, 
ScStatisticsInputOutputDialogController::GroupedBy aGroupedBy)
+void lclMakeSubRangesList(ScRangeList& rRangeList, const ScRange& rInputRange, 
ScStatisticsInputOutputDialog::GroupedBy aGroupedBy)
 {
 std::unique_ptr pIterator;
-if (aGroupedBy == ScStatisticsInputOutputDialogController::BY_COLUMN)
+if (aGroupedBy == ScStatisticsInputOutputDialog::BY_COLUMN)
 pIterator.reset(new DataRangeByColumnIterator(rInputRange));
 else
 pIterator.reset(new DataRangeByRowIterator(rInputRange));
@@ -87,7 +87,7 @@ void lclMakeSubRangesList(ScRangeList& rRangeList, const 
ScRange& rInputRange, S
 ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
 weld::Window* pParent, ScViewData* pViewData )
-: ScStatisticsInputOutputDialogController(
+: ScStatisticsInputOutputDialog(
 pSfxBindings, pChildWindow, pParent, pViewData,
 "modules/scalc/ui/analysisofvariancedialog.ui",
 "AnalysisOfVarianceDialog")
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx 
b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 96349ed6f955..0d5a4faabf98 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -17,7 +17,7 @@
 ScChiSquareTestDialog::ScChiSquareTestDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
 weld::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsInputOutputDialogController(
+ScStatisticsInputOutputDialog(
 pSfxBindings, pChildWindow, pParent, pViewData,
 "modules/scalc/ui/chisquaretestdialog.ui", "ChiSquareTestDialog")
 {
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx 
b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index aabb3ae06c88..99798b0c73d5 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -49,7 +49,7 @@ static const StatisticCalculation lclCalcDefinitions[] =
 ScDescriptiveStatisticsDialog::ScDescriptiveStatisticsDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
 weld::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsInputOutputDialogController(
+ScStatisticsInputOutputDialog(
 pSfxBindings, pChildWindow, pParent, pViewData,
 "modules/scalc/ui/descriptivestatisticsdialog.ui",
 "DescriptiveStatisticsDialog")
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx 
b/sc/source/ui/StatisticsDi

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx |   67 ++-
 sc/source/ui/inc/FourierAnalysisDialog.hxx   |   21 ++--
 sc/source/ui/inc/reffact.hxx |2 
 sc/source/ui/view/tabvwshc.cxx   |   11 +-
 sc/uiconfig/scalc/ui/fourieranalysisdialog.ui|   14 ++-
 solenv/sanitizers/ui/modules/scalc.suppr |2 
 6 files changed, 57 insertions(+), 60 deletions(-)

New commits:
commit 849f575abb2521aa3ca628346b5de7efd2bd2c17
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 12:31:14 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:57:14 2019 +0200

weld ScFourierAnalysisDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx 
b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
index 7ccabfcb0ed5..d41cb9b61674 100644
--- a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
@@ -26,11 +26,11 @@
 #include 
 
 ScFourierAnalysisDialog::ScFourierAnalysisDialog(SfxBindings* pSfxBindings,
- SfxChildWindow* pChildWindow, 
vcl::Window* pParent,
- ScViewData* pViewData)
-: ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, 
pViewData,
-"FourierAnalysisDialog",
-
"modules/scalc/ui/fourieranalysisdialog.ui")
+ SfxChildWindow* pChildWindow,
+ weld::Window* pParent, 
ScViewData* pViewData)
+: ScStatisticsInputOutputDialogController(pSfxBindings, pChildWindow, 
pParent, pViewData,
+  
"modules/scalc/ui/fourieranalysisdialog.ui",
+  "FourierAnalysisDialog")
 , maLabelAddr(ScAddress::INITIALIZE_INVALID)
 , maActualInputRange(ScAddress::INITIALIZE_INVALID)
 , mnLen(0)
@@ -40,32 +40,22 @@ 
ScFourierAnalysisDialog::ScFourierAnalysisDialog(SfxBindings* pSfxBindings,
 , mbWithLabels(false)
 , mbInverse(false)
 , mbPolar(false)
+, mxWithLabelsCheckBox(m_xBuilder->weld_check_button("withlabels-check"))
+, mxInverseCheckBox(m_xBuilder->weld_check_button("inverse-check"))
+, mxPolarCheckBox(m_xBuilder->weld_check_button("polar-check"))
+, mxMinMagnitudeField(m_xBuilder->weld_spin_button("minmagnitude-spin"))
+, mxErrorMessage(m_xBuilder->weld_label("error-message"))
 {
-SetText(ScResId(STR_FOURIER_ANALYSIS));
-get(mpWithLabelsCheckBox, "withlabels-check");
-get(mpInverseCheckBox, "inverse-check");
-get(mpPolarCheckBox, "polar-check");
-get(mpMinMagnitudeField, "minmagnitude-spin");
-get(mpErrorMessage, "error-message");
-
-mpWithLabelsCheckBox->SetToggleHdl(LINK(this, ScFourierAnalysisDialog, 
CheckBoxHdl));
-}
-
-ScFourierAnalysisDialog::~ScFourierAnalysisDialog() { disposeOnce(); }
+m_xDialog->set_title(ScResId(STR_FOURIER_ANALYSIS));
 
-bool ScFourierAnalysisDialog::Close()
-{
-return DoClose(ScFourierAnalysisDialogWrapper::GetChildWindowId());
+mxWithLabelsCheckBox->connect_toggled(LINK(this, ScFourierAnalysisDialog, 
CheckBoxHdl));
 }
 
-void ScFourierAnalysisDialog::dispose()
+ScFourierAnalysisDialog::~ScFourierAnalysisDialog() {}
+
+void ScFourierAnalysisDialog::Close()
 {
-mpWithLabelsCheckBox.disposeAndClear();
-mpInverseCheckBox.disposeAndClear();
-mpPolarCheckBox.disposeAndClear();
-mpMinMagnitudeField.disposeAndClear();
-mpErrorMessage.disposeAndClear();
-ScStatisticsInputOutputDialog::dispose();
+DoClose(ScFourierAnalysisDialogWrapper::GetChildWindowId());
 }
 
 const char* ScFourierAnalysisDialog::GetUndoNameId() { return 
STR_FOURIER_ANALYSIS; }
@@ -120,20 +110,20 @@ bool ScFourierAnalysisDialog::InputRangesValid()
 {
 if (!mInputRange.IsValid())
 {
-mpErrorMessage->SetText(ScResId(STR_MESSAGE_INVALID_INPUT_RANGE));
+mxErrorMessage->set_label(ScResId(STR_MESSAGE_INVALID_INPUT_RANGE));
 return false;
 }
 
 if (!mOutputAddress.IsValid())
 {
-mpErrorMessage->SetText(ScResId(STR_MESSAGE_INVALID_OUTPUT_ADDR));
+mxErrorMessage->set_label(ScResId(STR_MESSAGE_INVALID_OUTPUT_ADDR));
 return false;
 }
 
 mInputRange.PutInOrder();
 
 mbGroupedByColumn = mGroupedBy == BY_COLUMN;
-mbWithLabels = mpWithLabelsCheckBox->IsChecked();
+mbWithLabels = mxWithLabelsCheckBox->get_active();
 
 mbUse3DAddresses = mInputRange.aStart.Tab() != mOutputAddress.Tab();
 
@@ -147,13 +137,13 @@ bool ScFourierAnalysisDialog::InputRangesValid()
 {
 O

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx |2 
 sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx  |2 
 sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx |   76 ---
 sc/source/ui/inc/CorrelationDialog.hxx   |2 
 sc/source/ui/inc/CovarianceDialog.hxx|2 
 sc/source/ui/inc/MatrixComparisonGenerator.hxx   |   22 ---
 6 files changed, 9 insertions(+), 97 deletions(-)

New commits:
commit 725a5bc4729a8122f1c36ae49ad8d34b83983526
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 12:34:42 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:57:47 2019 +0200

rename ScMatrixComparisonGeneratorController back...

to... ScMatrixComparisonGenerator

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

diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx 
b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index d1463f608b3d..6ac135d33b43 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -16,7 +16,7 @@
 ScCorrelationDialog::ScCorrelationDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* 
pChildWindow,
 weld::Window* pParent, ScViewData* pViewData ) :
-ScMatrixComparisonGeneratorController(
+ScMatrixComparisonGenerator(
 pSfxBindings, pChildWindow, pParent, pViewData,
 "modules/scalc/ui/correlationdialog.ui", "CorrelationDialog")
 {}
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx 
b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index 522297cc731d..f447b89d0c93 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -16,7 +16,7 @@
 ScCovarianceDialog::ScCovarianceDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* 
pChildWindow,
 weld::Window* pParent, ScViewData* pViewData ) :
-ScMatrixComparisonGeneratorController(
+ScMatrixComparisonGenerator(
 pSfxBindings, pChildWindow, pParent, pViewData,
 "modules/scalc/ui/covariancedialog.ui", "CovarianceDialog")
 {}
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx 
b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 11146e438224..4ae4ef0e392d 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -39,7 +39,7 @@ namespace
 }
 }
 
-ScMatrixComparisonGeneratorController::ScMatrixComparisonGeneratorController(
+ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
 SfxBindings* pSfxBindings, SfxChildWindow* 
pChildWindow,
 weld::Window* pParent, ScViewData* 
pViewData,
 const OUString& rUiXmlDescription,
@@ -47,15 +47,15 @@ 
ScMatrixComparisonGeneratorController::ScMatrixComparisonGeneratorController(
 : ScStatisticsInputOutputDialogController(pSfxBindings, pChildWindow, 
pParent, pViewData, rUiXmlDescription, rID)
 {}
 
-ScMatrixComparisonGeneratorController::~ScMatrixComparisonGeneratorController()
+ScMatrixComparisonGenerator::~ScMatrixComparisonGenerator()
 {}
 
-const char* ScMatrixComparisonGeneratorController::GetUndoNameId()
+const char* ScMatrixComparisonGenerator::GetUndoNameId()
 {
 return STR_CORRELATION_UNDO_NAME;
 }
 
-ScRange ScMatrixComparisonGeneratorController::ApplyOutput(ScDocShell* 
pDocShell)
+ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
 {
 AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument,
 formula::FormulaGrammar::mergeToGrammar( 
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
diff --git a/sc/source/ui/inc/CorrelationDialog.hxx 
b/sc/source/ui/inc/CorrelationDialog.hxx
index 2a98da43881f..12db6f39df5b 100644
--- a/sc/source/ui/inc/CorrelationDialog.hxx
+++ b/sc/source/ui/inc/CorrelationDialog.hxx
@@ -13,7 +13,7 @@
 
 #include "MatrixComparisonGenerator.hxx"
 
-class ScCorrelationDialog : public ScMatrixComparisonGeneratorController
+class ScCorrelationDialog : public ScMatrixComparisonGenerator
 {
 public:
 ScCorrelationDialog(
diff --git a/sc/source/ui/inc/CovarianceDialog.hxx 
b/sc/source/ui/inc/CovarianceDialog.hxx
index 99052c51b644..21acb96e4b75 100644
--- a/sc/source/ui/inc/CovarianceDialog.hxx
+++ b/sc/source/ui/inc/CovarianceDialog.hxx
@@ -13,7 +13,7 @@
 
 #include "MatrixComparisonGenerator.hxx"
 
-class ScCovarianceDialog : public ScMatrixComparisonGeneratorController
+class ScCovarianceDialog : public ScMatrixComparisonGenerator
 {
 public:
 ScCovarianceDialog(
diff --git a/sc/sour

[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig solenv/sanitizers

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx |   12 
 sc/source/ui/StatisticsDialogs/FTestDialog.cxx |2 
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx|2 
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx |   48 +--
 sc/source/ui/StatisticsDialogs/TTestDialog.cxx |2 
 sc/source/ui/StatisticsDialogs/ZTestDialog.cxx |2 
 sc/source/ui/inc/ChiSquareTestDialog.hxx   |6 
 sc/source/ui/inc/FTestDialog.hxx   |2 
 sc/source/ui/inc/RegressionDialog.hxx  |2 
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx   |6 
 sc/source/ui/inc/TTestDialog.hxx   |2 
 sc/source/ui/inc/ZTestDialog.hxx   |2 
 sc/source/ui/inc/reffact.hxx   |2 
 sc/source/ui/view/tabvwshc.cxx |   11 
 sc/uiconfig/scalc/ui/chisquaretestdialog.ui|  141 
+-
 solenv/sanitizers/ui/modules/scalc.suppr   |2 
 16 files changed, 126 insertions(+), 118 deletions(-)

New commits:
commit 8d526da348107227bee3101ccc7aa9a2beb5dbd2
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 12:24:15 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:56:59 2019 +0200

weld ScChiSquareTestDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx 
b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index d6f729c086d4..96349ed6f955 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -16,20 +16,20 @@
 
 ScChiSquareTestDialog::ScChiSquareTestDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsInputOutputDialog(
+weld::Window* pParent, ScViewData* pViewData ) :
+ScStatisticsInputOutputDialogController(
 pSfxBindings, pChildWindow, pParent, pViewData,
-"ChiSquareTestDialog", "modules/scalc/ui/chisquaretestdialog.ui" )
+"modules/scalc/ui/chisquaretestdialog.ui", "ChiSquareTestDialog")
 {
-SetText(ScResId(STR_CHI_SQUARE_TEST));
+m_xDialog->set_title(ScResId(STR_CHI_SQUARE_TEST));
 }
 
 ScChiSquareTestDialog::~ScChiSquareTestDialog()
 {}
 
-bool ScChiSquareTestDialog::Close()
+void ScChiSquareTestDialog::Close()
 {
-return DoClose(ScChiSquareTestDialogWrapper::GetChildWindowId());
+DoClose(ScChiSquareTestDialogWrapper::GetChildWindowId());
 }
 
 const char* ScChiSquareTestDialog::GetUndoNameId()
diff --git a/sc/source/ui/inc/ChiSquareTestDialog.hxx 
b/sc/source/ui/inc/ChiSquareTestDialog.hxx
index 849914d57f6e..78d1895b6332 100644
--- a/sc/source/ui/inc/ChiSquareTestDialog.hxx
+++ b/sc/source/ui/inc/ChiSquareTestDialog.hxx
@@ -13,16 +13,16 @@
 
 #include "StatisticsInputOutputDialog.hxx"
 
-class ScChiSquareTestDialog : public ScStatisticsInputOutputDialog
+class ScChiSquareTestDialog : public ScStatisticsInputOutputDialogController
 {
 public:
 ScChiSquareTestDialog(
 SfxBindings* pB, SfxChildWindow* pCW,
-vcl::Window* pParent, ScViewData* pViewData );
+weld::Window* pParent, ScViewData* pViewData );
 
 virtual ~ScChiSquareTestDialog() override;
 
-virtual bool Close() override;
+virtual void Close() override;
 
 protected:
 virtual const char* GetUndoNameId() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index b04e4860da6b..e9fb083c472f 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -135,7 +135,7 @@ private:
 };
 
 class ScChiSquareTestDialogWrapper :
-public ChildWindowWrapper
+public ChildControllerWrapper
 {
 private:
 ScChiSquareTestDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 8b86b2986cb1..22405862f434 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr ScTabViewShell::CreateRefDialog(
 }
 break;
 
-case SID_CHI_SQUARE_TEST_DIALOG:
-{
-pResult = VclPtr::Create( pB, pCW, pParent, 
&GetViewData() );
-}
-break;
-
 case SID_FOURIER_ANALYSIS_DIALOG:
 {
 pResult = VclPtr::Create( pB, pCW, 
pParent, &GetViewData() );
@@ -528,6 +522,11 @@ std::unique_ptr 
ScTabViewShell::CreateRefDialogCont
 xResult.reset(new ScZTestDialog(pB, pCW, pParent, &GetViewData()));
 }
 break;
+case SID_CHI_SQUARE_TEST_DIALOG:
+{
+xResult.reset(n

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx |  317 
--
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx   |   72 --
 2 files changed, 389 deletions(-)

New commits:
commit f4a0c9d9728499176460f8641d3c4edd3a31fdb4
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 12:16:49 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:56:23 2019 +0200

ScStatisticsTwoVariableDialog no longer used

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

diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx 
b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 1dfce0397f53..07cb21b60b90 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -18,323 +18,6 @@
 
 #include 
 
-ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
-SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData, const 
OUString& rID, const OUString& rUIXMLDescription ) :
-ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, 
rUIXMLDescription ),
-mViewData   ( pViewData ),
-mDocument   ( pViewData->GetDocument() ),
-mVariable1Range ( ScAddress::INITIALIZE_INVALID ),
-mVariable2Range ( ScAddress::INITIALIZE_INVALID ),
-mAddressDetails ( mDocument->GetAddressConvention(), 0, 0 ),
-mOutputAddress  ( ScAddress::INITIALIZE_INVALID ),
-mGroupedBy  ( BY_COLUMN ),
-mpActiveEdit( nullptr ),
-mCurrentAddress ( pViewData->GetCurX(), pViewData->GetCurY(), 
pViewData->GetTabNo() ),
-mDialogLostFocus( false )
-{
-get(mpVariable1RangeLabel,  "variable1-range-label");
-get(mpVariable1RangeEdit,   "variable1-range-edit");
-get(mpVariable1RangeButton, "variable1-range-button");
-mpVariable1RangeEdit->SetReferences(this, mpVariable1RangeLabel);
-mpVariable1RangeButton->SetReferences(this, mpVariable1RangeEdit);
-
-get(mpVariable2RangeLabel,  "variable2-range-label");
-get(mpVariable2RangeEdit,   "variable2-range-edit");
-get(mpVariable2RangeButton, "variable2-range-button");
-mpVariable2RangeEdit->SetReferences(this, mpVariable2RangeLabel);
-mpVariable2RangeButton->SetReferences(this, mpVariable2RangeEdit);
-
-get(mpOutputRangeLabel,  "output-range-label");
-get(mpOutputRangeEdit,   "output-range-edit");
-get(mpOutputRangeButton, "output-range-button");
-mpOutputRangeEdit->SetReferences(this, mpOutputRangeLabel);
-mpOutputRangeButton->SetReferences(this, mpOutputRangeEdit);
-
-get(mpButtonOk, "ok");
-
-get(mpGroupByColumnsRadio,   "groupedby-columns-radio");
-get(mpGroupByRowsRadio,  "groupedby-rows-radio");
-
-Init();
-GetRangeFromSelection();
-}
-
-ScStatisticsTwoVariableDialog::~ScStatisticsTwoVariableDialog()
-{
-disposeOnce();
-}
-
-void ScStatisticsTwoVariableDialog::dispose()
-{
-mpVariable1RangeLabel.clear();
-mpVariable1RangeEdit.clear();
-mpVariable1RangeButton.clear();
-mpVariable2RangeLabel.clear();
-mpVariable2RangeEdit.clear();
-mpVariable2RangeButton.clear();
-mpOutputRangeLabel.clear();
-mpOutputRangeEdit.clear();
-mpOutputRangeButton.clear();
-mpButtonOk.clear();
-mpGroupByColumnsRadio.clear();
-mpGroupByRowsRadio.clear();
-mpActiveEdit.clear();
-ScAnyRefDlg::dispose();
-}
-
-void ScStatisticsTwoVariableDialog::Init()
-{
-mpButtonOk->SetClickHdl( LINK( this, ScStatisticsTwoVariableDialog, 
OkClicked ) );
-mpButtonOk->Enable(false);
-
-Link aLink = LINK( this, ScStatisticsTwoVariableDialog, 
GetFocusHandler );
-mpVariable1RangeEdit->SetGetFocusHdl( aLink );
-mpVariable1RangeButton->SetGetFocusHdl( aLink );
-mpVariable2RangeEdit->SetGetFocusHdl( aLink );
-mpVariable2RangeButton->SetGetFocusHdl( aLink );
-mpOutputRangeEdit->SetGetFocusHdl( aLink );
-mpOutputRangeButton->SetGetFocusHdl( aLink );
-
-aLink = LINK( this, ScStatisticsTwoVariableDialog, LoseFocusHandler );
-mpVariable1RangeEdit->SetLoseFocusHdl( aLink );
-mpVariable1RangeButton->SetLoseFocusHdl( aLink );
-mpVariable2RangeEdit->SetLoseFocusHdl( aLink );
-mpVariable2RangeButton->SetLoseFocusHdl( aLink );
-mpOutputRangeEdit->SetLoseFocusHdl( aLink );
-mpOutputRangeButton->SetLoseFocusHdl( aLink );
-
-Link aLink2 = LINK( this, ScStatisticsTwoVariableDialog, 
RefInputModifyHandler);
-mpVariable1RangeEdit->SetModifyHdl( aLink2);
-mpVariable2RangeEdit->SetModifyHdl( aLink2);
-mpOutputRangeEdit->SetModifyHdl( aLink2);
-
-mpOutputRangeEdit->GrabFocus();
-
-mpGroupByColumnsRadio->SetToggleHdl( LINK( this, 
ScStatisticsTwoVariableDialog, GroupByChanged ) );
-mpGroupByRowsRadio->SetToggleHdl( LINK( 

[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig solenv/sanitizers

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/FTestDialog.cxx |   12 +-
 sc/source/ui/StatisticsDialogs/TTestDialog.cxx |   12 +-
 sc/source/ui/StatisticsDialogs/ZTestDialog.cxx |   12 +-
 sc/source/ui/inc/FTestDialog.hxx   |6 -
 sc/source/ui/inc/TTestDialog.hxx   |6 -
 sc/source/ui/inc/ZTestDialog.hxx   |6 -
 sc/source/ui/inc/reffact.hxx   |6 -
 sc/source/ui/view/tabvwshc.cxx |   33 ++---
 sc/uiconfig/scalc/ui/ttestdialog.ui|  148 +
 sc/uiconfig/scalc/ui/ztestdialog.ui|  148 +
 solenv/sanitizers/ui/modules/scalc.suppr   |6 +
 11 files changed, 207 insertions(+), 188 deletions(-)

New commits:
commit c2d2f91a6cb684c435ff5a5b68f90be69328aab2
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 12:13:21 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:55:35 2019 +0200

weld ScZTestDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx 
b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index 0a1e64526df0..f03f8a41a7bf 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -18,20 +18,20 @@
 
 ScZTestDialog::ScZTestDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsTwoVariableDialog(
+weld::Window* pParent, ScViewData* pViewData ) :
+ScStatisticsTwoVariableDialogController(
 pSfxBindings, pChildWindow, pParent, pViewData,
-"ZTestDialog", "modules/scalc/ui/ztestdialog.ui" )
+"modules/scalc/ui/ztestdialog.ui", "ZTestDialog")
 {
-SetText(ScResId(STR_ZTEST));
+m_xDialog->set_title(ScResId(STR_ZTEST));
 }
 
 ScZTestDialog::~ScZTestDialog()
 {}
 
-bool ScZTestDialog::Close()
+void ScZTestDialog::Close()
 {
-return DoClose( ScZTestDialogWrapper::GetChildWindowId() );
+DoClose( ScZTestDialogWrapper::GetChildWindowId() );
 }
 
 const char* ScZTestDialog::GetUndoNameId()
diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx
index 6fd8496c814b..529dd3f9d850 100644
--- a/sc/source/ui/inc/ZTestDialog.hxx
+++ b/sc/source/ui/inc/ZTestDialog.hxx
@@ -13,16 +13,16 @@
 
 #include "StatisticsTwoVariableDialog.hxx"
 
-class ScZTestDialog : public ScStatisticsTwoVariableDialog
+class ScZTestDialog : public ScStatisticsTwoVariableDialogController
 {
 public:
 ScZTestDialog(
 SfxBindings* pB, SfxChildWindow* pCW,
-vcl::Window* pParent, ScViewData* pViewData );
+weld::Window* pParent, ScViewData* pViewData );
 
 virtual ~ScZTestDialog() override;
 
-virtual bool Close() override;
+virtual void Close() override;
 
 protected:
 virtual const char* GetUndoNameId() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index c3e90eda63d7..b04e4860da6b 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -128,7 +128,7 @@ private:
 };
 
 class ScZTestDialogWrapper :
-public ChildWindowWrapper
+public ChildControllerWrapper
 {
 private:
 ScZTestDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index f84644eba3bb..8b86b2986cb1 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr ScTabViewShell::CreateRefDialog(
 }
 break;
 
-case SID_ZTEST_DIALOG:
-{
-pResult = VclPtr::Create( pB, pCW, pParent, 
&GetViewData() );
-}
-break;
-
 case SID_CHI_SQUARE_TEST_DIALOG:
 {
 pResult = VclPtr::Create( pB, pCW, pParent, 
&GetViewData() );
@@ -529,6 +523,11 @@ std::unique_ptr 
ScTabViewShell::CreateRefDialogCont
 xResult.reset(new ScTTestDialog(pB, pCW, pParent, &GetViewData()));
 }
 break;
+case SID_ZTEST_DIALOG:
+{
+xResult.reset(new ScZTestDialog(pB, pCW, pParent, &GetViewData()));
+}
+break;
 }
 
 if (xResult)
diff --git a/sc/uiconfig/scalc/ui/ztestdialog.ui 
b/sc/uiconfig/scalc/ui/ztestdialog.ui
index 7bb7e4e0d28e..a23dd22ab90f 100644
--- a/sc/uiconfig/scalc/ui/ztestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ztestdialog.ui
@@ -1,17 +1,80 @@
 
-
+
 
   
-  
   
 False
 6
+0
+0
 dialog
+
+  
+
 
   
 False
 vertical
 12
+
+  
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True

[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig solenv/sanitizers

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx |   22 
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx|   94 +-
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx |  319 
++
 sc/source/ui/inc/MovingAverageDialog.hxx   |9 
 sc/source/ui/inc/RegressionDialog.hxx  |   29 
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx   |   73 ++
 sc/source/ui/inc/reffact.hxx   |4 
 sc/source/ui/view/tabvwshc.cxx |   22 
 sc/uiconfig/scalc/ui/movingaveragedialog.ui|  146 ++--
 sc/uiconfig/scalc/ui/regressiondialog.ui   |   27 
 solenv/sanitizers/ui/modules/scalc.suppr   |   13 
 11 files changed, 570 insertions(+), 188 deletions(-)

New commits:
commit 5a816c4241c98b97d464007f25657b946eb29005
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 11:36:45 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:54:55 2019 +0200

weld ScRegressionDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx 
b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 11ac7b017e77..02b57e2e75db 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -132,49 +132,35 @@ static size_t lcl_GetNumRowsColsInRange(const ScRange& 
rRange, bool bRows)
 
 ScRegressionDialog::ScRegressionDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsTwoVariableDialog(
+weld::Window* pParent, ScViewData* pViewData )
+: ScStatisticsTwoVariableDialogController(
 pSfxBindings, pChildWindow, pParent, pViewData,
-"RegressionDialog", "modules/scalc/ui/regressiondialog.ui" ),
-mbUnivariate(true),
-mnNumIndependentVars(1),
-mnNumObservations(0),
-mbUse3DAddresses(false),
-mbCalcIntercept(true)
+"modules/scalc/ui/regressiondialog.ui", "RegressionDialog")
+, mbUnivariate(true)
+, mnNumIndependentVars(1)
+, mnNumObservations(0)
+, mbUse3DAddresses(false)
+, mbCalcIntercept(true)
+, mxWithLabelsCheckBox(m_xBuilder->weld_check_button("withlabels-check"))
+, mxLinearRadioButton(m_xBuilder->weld_radio_button("linear-radio"))
+, 
mxLogarithmicRadioButton(m_xBuilder->weld_radio_button("logarithmic-radio"))
+, mxPowerRadioButton(m_xBuilder->weld_radio_button("power-radio"))
+, mxErrorMessage(m_xBuilder->weld_label("error-message"))
+, 
mxConfidenceLevelField(m_xBuilder->weld_spin_button("confidencelevel-spin"))
+, 
mxCalcResidualsCheckBox(m_xBuilder->weld_check_button("calcresiduals-check"))
+, mxNoInterceptCheckBox(m_xBuilder->weld_check_button("nointercept-check"))
 {
-get(mpWithLabelsCheckBox, "withlabels-check");
-get(mpLinearRadioButton, "linear-radio");
-get(mpLogarithmicRadioButton, "logarithmic-radio");
-get(mpPowerRadioButton, "power-radio");
-get(mpConfidenceLevelField, "confidencelevel-spin");
-get(mpCalcResidualsCheckBox, "calcresiduals-check");
-get(mpNoInterceptCheckBox, "nointercept-check");
-get(mpErrorMessage, "error-message");
-mpWithLabelsCheckBox->SetToggleHdl(LINK(this, ScRegressionDialog, 
CheckBoxHdl));
-mpConfidenceLevelField->SetModifyHdl(LINK(this, ScRegressionDialog, 
NumericFieldHdl));
+mxWithLabelsCheckBox->connect_toggled(LINK(this, ScRegressionDialog, 
CheckBoxHdl));
+mxConfidenceLevelField->connect_value_changed(LINK(this, 
ScRegressionDialog, NumericFieldHdl));
 }
 
 ScRegressionDialog::~ScRegressionDialog()
 {
-disposeOnce();
 }
 
-bool ScRegressionDialog::Close()
+void ScRegressionDialog::Close()
 {
-return DoClose(ScRegressionDialogWrapper::GetChildWindowId());
-}
-
-void ScRegressionDialog::dispose()
-{
-mpWithLabelsCheckBox.disposeAndClear();
-mpLinearRadioButton.disposeAndClear();
-mpLogarithmicRadioButton.disposeAndClear();
-mpPowerRadioButton.disposeAndClear();
-mpConfidenceLevelField.disposeAndClear();
-mpCalcResidualsCheckBox.disposeAndClear();
-mpNoInterceptCheckBox.disposeAndClear();
-mpErrorMessage.disposeAndClear();
-ScStatisticsTwoVariableDialog::dispose();
+DoClose(ScRegressionDialogWrapper::GetChildWindowId());
 }
 
 const char* ScRegressionDialog::GetUndoNameId()
@@ -188,7 +174,7 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell* 
pDocShell)
 formula::FormulaGrammar::mergeToGrammar( 
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
 FormulaTemplate aTemplate(mDocument);
 aTemplate.autoReplaceUses3D(mbUse3DA

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx |   22 -
 sc/source/ui/inc/ExponentialSmoothingDialog.hxx   |9 
 sc/source/ui/inc/reffact.hxx  |2 
 sc/source/ui/view/tabvwshc.cxx|   11 
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui|  146 +-
 solenv/sanitizers/ui/modules/scalc.suppr  |2 
 6 files changed, 97 insertions(+), 95 deletions(-)

New commits:
commit ab2906c593c280c95de7f1984b4e0eea7b52b768
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 10:32:56 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:54:12 2019 +0200

weld ScExponentialSmoothingDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx 
b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index b2ab5b48f438..3a94e7c5de72 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -18,28 +18,22 @@
 
 ScExponentialSmoothingDialog::ScExponentialSmoothingDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsInputOutputDialog(
+weld::Window* pParent, ScViewData* pViewData )
+: ScStatisticsInputOutputDialogController(
 pSfxBindings, pChildWindow, pParent, pViewData,
-"ExponentialSmoothingDialog", 
"modules/scalc/ui/exponentialsmoothingdialog.ui" )
+"modules/scalc/ui/exponentialsmoothingdialog.ui",
+"ExponentialSmoothingDialog")
+, mxSmoothingFactor(m_xBuilder->weld_spin_button("smoothing-factor-spin"))
 {
-get(mpSmoothingFactor, "smoothing-factor-spin");
 }
 
 ScExponentialSmoothingDialog::~ScExponentialSmoothingDialog()
 {
-disposeOnce();
 }
 
-void ScExponentialSmoothingDialog::dispose()
+void ScExponentialSmoothingDialog::Close()
 {
-mpSmoothingFactor.clear();
-ScStatisticsInputOutputDialog::dispose();
-}
-
-bool ScExponentialSmoothingDialog::Close()
-{
-return DoClose( ScExponentialSmoothingDialogWrapper::GetChildWindowId() );
+DoClose( ScExponentialSmoothingDialogWrapper::GetChildWindowId() );
 }
 
 const char* ScExponentialSmoothingDialog::GetUndoNameId()
@@ -54,7 +48,7 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* 
pDocShell)
 FormulaTemplate aTemplate(mDocument);
 
 // Smoothing factor
-double aSmoothingFactor = mpSmoothingFactor->GetValue() / 100.0;
+double aSmoothingFactor = mxSmoothingFactor->get_value() / 100.0;
 
 // Alpha
 output.writeBoldString(ScResId(STR_LABEL_ALPHA));
diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx 
b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
index ae2b255df918..f8fad4fa95cf 100644
--- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
+++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
@@ -16,20 +16,19 @@
 
 #include "StatisticsInputOutputDialog.hxx"
 
-class ScExponentialSmoothingDialog : public ScStatisticsInputOutputDialog
+class ScExponentialSmoothingDialog : public 
ScStatisticsInputOutputDialogController
 {
 private:
-VclPtr mpSmoothingFactor;
+std::unique_ptr mxSmoothingFactor;
 
 public:
 ScExponentialSmoothingDialog(
 SfxBindings* pB, SfxChildWindow* pCW,
-vcl::Window* pParent, ScViewData* pViewData );
+weld::Window* pParent, ScViewData* pViewData );
 
 virtual ~ScExponentialSmoothingDialog() override;
-virtual void dispose() override;
 
-virtual bool Close() override;
+virtual void Close() override;
 
 protected:
 virtual const char* GetUndoNameId() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index fe9070e61771..eb4923dc7903 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -93,7 +93,7 @@ private:
 };
 
 class ScExponentialSmoothingDialogWrapper :
-public ChildWindowWrapper
+public ChildControllerWrapper
 {
 private:
 ScExponentialSmoothingDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 818a1f610b28..5052ab24ec55 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr ScTabViewShell::CreateRefDialog(
 }
 break;
 
-case SID_EXPONENTIAL_SMOOTHING_DIALOG:
-{
-pResult = VclPtr::Create( pB, pCW, 
pParent, &GetViewData() );
-}
-break;
-
 case SID_MOVING_AVERAGE_DIALOG:
 {
 pResult = VclPtr::Create( pB, pCW, pParent, 
&GetViewData() );
@@ -534,6 +528,11 @@ std::unique_ptr 
ScTabViewShell::CreateRefDialogCont
 xResult.

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx |   66 +---
 sc/source/ui/inc/AnalysisOfVarianceDialog.hxx   |   19 +--
 sc/source/ui/inc/reffact.hxx|2 
 sc/source/ui/view/tabvwshc.cxx  |   11 --
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui|   32 +++--
 sc/uiconfig/scalc/ui/correlationdialog.ui   |4 
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui |2 
 sc/uiconfig/scalc/ui/samplingdialog.ui  |4 
 solenv/sanitizers/ui/modules/scalc.suppr|2 
 9 files changed, 75 insertions(+), 67 deletions(-)

New commits:
commit a5a0d6050b05362a39424ae9f44627fb3c604b8a
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 10:15:20 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:53:25 2019 +0200

weld ScAnalysisOfVarianceDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx 
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index b8284c6f885d..0dc391a17e2f 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -67,10 +67,10 @@ OUString lclCreateMultiParameterFormula(
 return aResult.makeStringAndClear();
 }
 
-void lclMakeSubRangesList(ScRangeList& rRangeList, const ScRange& rInputRange, 
ScStatisticsInputOutputDialog::GroupedBy aGroupedBy)
+void lclMakeSubRangesList(ScRangeList& rRangeList, const ScRange& rInputRange, 
ScStatisticsInputOutputDialogController::GroupedBy aGroupedBy)
 {
 std::unique_ptr pIterator;
-if (aGroupedBy == ScStatisticsInputOutputDialog::BY_COLUMN)
+if (aGroupedBy == ScStatisticsInputOutputDialogController::BY_COLUMN)
 pIterator.reset(new DataRangeByColumnIterator(rInputRange));
 else
 pIterator.reset(new DataRangeByRowIterator(rInputRange));
@@ -86,43 +86,33 @@ void lclMakeSubRangesList(ScRangeList& rRangeList, const 
ScRange& rInputRange, S
 
 ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsInputOutputDialog(
+weld::Window* pParent, ScViewData* pViewData )
+: ScStatisticsInputOutputDialogController(
 pSfxBindings, pChildWindow, pParent, pViewData,
-"AnalysisOfVarianceDialog", 
"modules/scalc/ui/analysisofvariancedialog.ui" ),
-meFactor(SINGLE_FACTOR)
+"modules/scalc/ui/analysisofvariancedialog.ui",
+"AnalysisOfVarianceDialog")
+, meFactor(SINGLE_FACTOR)
+, mxAlphaField(m_xBuilder->weld_spin_button("alpha-spin"))
+, mxSingleFactorRadio(m_xBuilder->weld_radio_button("radio-single-factor"))
+, mxTwoFactorRadio(m_xBuilder->weld_radio_button("radio-two-factor"))
+, 
mxRowsPerSampleField(m_xBuilder->weld_spin_button("rows-per-sample-spin"))
 {
-get(mpAlphaField, "alpha-spin");
-get(mpSingleFactorRadio,  "radio-single-factor");
-get(mpTwoFactorRadio, "radio-two-factor");
-get(mpRowsPerSampleField, "rows-per-sample-spin");
+mxSingleFactorRadio->connect_toggled( LINK( this, 
ScAnalysisOfVarianceDialog, FactorChanged ) );
+mxTwoFactorRadio->connect_toggled( LINK( this, ScAnalysisOfVarianceDialog, 
FactorChanged ) );
 
-mpSingleFactorRadio->SetToggleHdl( LINK( this, ScAnalysisOfVarianceDialog, 
FactorChanged ) );
-mpTwoFactorRadio->SetToggleHdl( LINK( this, ScAnalysisOfVarianceDialog, 
FactorChanged ) );
-
-mpSingleFactorRadio->Check();
-mpTwoFactorRadio->Check(false);
+mxSingleFactorRadio->set_active(true);
+mxTwoFactorRadio->set_active(false);
 
 FactorChanged();
 }
 
 ScAnalysisOfVarianceDialog::~ScAnalysisOfVarianceDialog()
 {
-disposeOnce();
-}
-
-void ScAnalysisOfVarianceDialog::dispose()
-{
-mpAlphaField.clear();
-mpSingleFactorRadio.clear();
-mpTwoFactorRadio.clear();
-mpRowsPerSampleField.clear();
-ScStatisticsInputOutputDialog::dispose();
 }
 
-bool ScAnalysisOfVarianceDialog::Close()
+void ScAnalysisOfVarianceDialog::Close()
 {
-return DoClose( ScAnalysisOfVarianceDialogWrapper::GetChildWindowId() );
+DoClose( ScAnalysisOfVarianceDialogWrapper::GetChildWindowId() );
 }
 
 const char* ScAnalysisOfVarianceDialog::GetUndoNameId()
@@ -130,25 +120,25 @@ const char* ScAnalysisOfVarianceDialog::GetUndoNameId()
 return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME;
 }
 
-IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, RadioButton&, void 
)
+IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, 
weld::ToggleButton&, void )
 {
 FactorChanged();
 }
 
 void ScAnalysisOfVarianceDialog::Fa

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx |   10 -
 sc/source/ui/inc/CovarianceDialog.hxx   |6 
 sc/source/ui/inc/reffact.hxx|2 
 sc/source/ui/view/tabvwshc.cxx  |   11 -
 sc/uiconfig/scalc/ui/covariancedialog.ui|  140 ++--
 solenv/sanitizers/ui/modules/scalc.suppr|2 
 6 files changed, 90 insertions(+), 81 deletions(-)

New commits:
commit 364880e744398bf4e95eb9176819a870c1852e03
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 10:23:49 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:53:46 2019 +0200

weld ScCovarianceDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx 
b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index d5243745278b..522297cc731d 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -15,10 +15,10 @@
 
 ScCovarianceDialog::ScCovarianceDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* 
pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScMatrixComparisonGenerator(
+weld::Window* pParent, ScViewData* pViewData ) :
+ScMatrixComparisonGeneratorController(
 pSfxBindings, pChildWindow, pParent, pViewData,
-"CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" )
+"modules/scalc/ui/covariancedialog.ui", "CovarianceDialog")
 {}
 
 const char* ScCovarianceDialog::GetUndoNameId()
@@ -26,9 +26,9 @@ const char* ScCovarianceDialog::GetUndoNameId()
 return STR_COVARIANCE_UNDO_NAME;
 }
 
-bool ScCovarianceDialog::Close()
+void ScCovarianceDialog::Close()
 {
-return DoClose( ScCovarianceDialogWrapper::GetChildWindowId() );
+DoClose( ScCovarianceDialogWrapper::GetChildWindowId() );
 }
 
 const OUString ScCovarianceDialog::getLabel()
diff --git a/sc/source/ui/inc/CovarianceDialog.hxx 
b/sc/source/ui/inc/CovarianceDialog.hxx
index 3bd5a9e2657b..99052c51b644 100644
--- a/sc/source/ui/inc/CovarianceDialog.hxx
+++ b/sc/source/ui/inc/CovarianceDialog.hxx
@@ -13,14 +13,14 @@
 
 #include "MatrixComparisonGenerator.hxx"
 
-class ScCovarianceDialog : public ScMatrixComparisonGenerator
+class ScCovarianceDialog : public ScMatrixComparisonGeneratorController
 {
 public:
 ScCovarianceDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData);
+weld::Window* pParent, ScViewData* pViewData);
 
-virtual bool Close() override;
+virtual void Close() override;
 
 protected:
 virtual const OUString getLabel() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index b1dda37d1249..fe9070e61771 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -86,7 +86,7 @@ private:
 };
 
 class ScCovarianceDialogWrapper :
-public ChildWindowWrapper
+public ChildControllerWrapper
 {
 private:
 ScCovarianceDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 379bf2ad3f1f..818a1f610b28 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr ScTabViewShell::CreateRefDialog(
 }
 break;
 
-case SID_COVARIANCE_DIALOG:
-{
-pResult = VclPtr::Create( pB, pCW, pParent, 
&GetViewData() );
-}
-break;
-
 case SID_EXPONENTIAL_SMOOTHING_DIALOG:
 {
 pResult = VclPtr::Create( pB, pCW, 
pParent, &GetViewData() );
@@ -535,6 +529,11 @@ std::unique_ptr 
ScTabViewShell::CreateRefDialogCont
 xResult.reset(new ScAnalysisOfVarianceDialog(pB, pCW, pParent, 
&GetViewData()));
 }
 break;
+case SID_COVARIANCE_DIALOG:
+{
+xResult.reset(new ScCovarianceDialog(pB, pCW, pParent, 
&GetViewData()));
+}
+break;
 }
 
 if (xResult)
diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui 
b/sc/uiconfig/scalc/ui/covariancedialog.ui
index f8a92854221b..07a766a13dd4 100644
--- a/sc/uiconfig/scalc/ui/covariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/covariancedialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -8,12 +8,76 @@
 6
 Covariance
 False
+0
+0
 dialog
+
+  
+
 
   
 False
 vertical
 12
+
+  
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx |   11 
 sc/source/ui/inc/DescriptiveStatisticsDialog.hxx   |6 
 sc/source/ui/inc/reffact.hxx   |2 
 sc/source/ui/view/tabvwshc.cxx |   11 
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui|  139 
+-
 solenv/sanitizers/ui/modules/scalc.suppr   |2 
 6 files changed, 89 insertions(+), 82 deletions(-)

New commits:
commit 48af979d264fff14352b2c69db137332fcfdb25e
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 09:56:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:52:30 2019 +0200

weld ScDescriptiveStatisticsDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx 
b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 3e55faced5d9..aabb3ae06c88 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -48,18 +48,19 @@ static const StatisticCalculation lclCalcDefinitions[] =
 
 ScDescriptiveStatisticsDialog::ScDescriptiveStatisticsDialog(
 SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsInputOutputDialog(
+weld::Window* pParent, ScViewData* pViewData ) :
+ScStatisticsInputOutputDialogController(
 pSfxBindings, pChildWindow, pParent, pViewData,
-"DescriptiveStatisticsDialog", 
"modules/scalc/ui/descriptivestatisticsdialog.ui" )
+"modules/scalc/ui/descriptivestatisticsdialog.ui",
+"DescriptiveStatisticsDialog")
 {}
 
 ScDescriptiveStatisticsDialog::~ScDescriptiveStatisticsDialog()
 {}
 
-bool ScDescriptiveStatisticsDialog::Close()
+void ScDescriptiveStatisticsDialog::Close()
 {
-return DoClose( ScDescriptiveStatisticsDialogWrapper::GetChildWindowId() );
+DoClose( ScDescriptiveStatisticsDialogWrapper::GetChildWindowId() );
 }
 
 const char* ScDescriptiveStatisticsDialog::GetUndoNameId()
diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx 
b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
index bbdc727b06e4..0ffe831163bc 100644
--- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
+++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
@@ -13,16 +13,16 @@
 
 #include "StatisticsInputOutputDialog.hxx"
 
-class ScDescriptiveStatisticsDialog : public ScStatisticsInputOutputDialog
+class ScDescriptiveStatisticsDialog : public 
ScStatisticsInputOutputDialogController
 {
 public:
 ScDescriptiveStatisticsDialog(
 SfxBindings* pB, SfxChildWindow* pCW,
-vcl::Window* pParent, ScViewData* pViewData );
+weld::Window* pParent, ScViewData* pViewData );
 
 virtual ~ScDescriptiveStatisticsDialog() override;
 
-virtual bool Close() override;
+virtual void Close() override;
 
 protected:
 virtual const char* GetUndoNameId() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index a19ef1686d1b..c8ce5507bc08 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -51,7 +51,7 @@ DECL_WRAPPER_WITHID(ScHighlightChgDlgWrapper)
 DECL_WRAPPER_WITHID(ScCondFormatDlgWrapper)
 
 class ScDescriptiveStatisticsDialogWrapper :
-public ChildWindowWrapper
+public ChildControllerWrapper
 {
 private:
 ScDescriptiveStatisticsDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 6f3a947e7dce..545a9dc4974f 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr ScTabViewShell::CreateRefDialog(
 }
 break;
 
-case SID_DESCRIPTIVE_STATISTICS_DIALOG:
-{
-pResult = VclPtr::Create( pB, pCW, 
pParent, &GetViewData() );
-}
-break;
-
 case SID_ANALYSIS_OF_VARIANCE_DIALOG:
 {
 pResult = VclPtr::Create( pB, pCW, 
pParent, &GetViewData() );
@@ -537,6 +531,11 @@ std::unique_ptr 
ScTabViewShell::CreateRefDialogCont
 xResult.reset(new ScSamplingDialog(pB, pCW, pParent, 
&GetViewData()));
 }
 break;
+case SID_DESCRIPTIVE_STATISTICS_DIALOG:
+{
+xResult.reset(new ScDescriptiveStatisticsDialog(pB, pCW, pParent, 
&GetViewData()));
+}
+break;
 }
 
 if (xResult)
diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui 
b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
index a4c5bbea3413..4086f5a7cdb7 100644
--- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
+++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
@@ -1,19

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx |  305 ++
 sc/source/ui/inc/SamplingDialog.hxx   |   65 ++--
 sc/source/ui/inc/reffact.hxx  |2 
 sc/source/ui/view/tabvwshc.cxx|   11 
 sc/uiconfig/scalc/ui/samplingdialog.ui|   14 -
 solenv/sanitizers/ui/modules/scalc.suppr  |2 
 6 files changed, 197 insertions(+), 202 deletions(-)

New commits:
commit ab181504329e33a31ad23c887d817519374c9797
Author: Caolán McNamara 
AuthorDate: Wed Apr 10 09:05:57 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 11 09:52:11 2019 +0200

weld ScSamplingDialog

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

diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx 
b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 277485f6b492..59fbb194df9f 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -19,43 +19,39 @@
 #include 
 #include 
 
-ScSamplingDialog::ScSamplingDialog(
-SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent,
-  "SamplingDialog", "modules/scalc/ui/samplingdialog.ui" ),
-mpActiveEdit( nullptr  ),
-mViewData   ( pViewData ),
-mDocument   ( pViewData->GetDocument() ),
-mInputRange ( ScAddress::INITIALIZE_INVALID ),
-mAddressDetails ( mDocument->GetAddressConvention(), 0, 0 ),
-mOutputAddress  ( ScAddress::INITIALIZE_INVALID ),
-mCurrentAddress ( pViewData->GetCurX(), pViewData->GetCurY(), 
pViewData->GetTabNo() ),
-mnLastSampleSizeValue(1),
-mnLastPeriodValue(1),
-mDialogLostFocus( false )
+ScSamplingDialog::ScSamplingDialog(SfxBindings* pSfxBindings, SfxChildWindow* 
pChildWindow,
+   weld::Window* pParent, ScViewData* 
pViewData)
+: ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
+  "modules/scalc/ui/samplingdialog.ui", 
"SamplingDialog")
+, mpActiveEdit(nullptr)
+, mViewData(pViewData)
+, mDocument(pViewData->GetDocument())
+, mInputRange(ScAddress::INITIALIZE_INVALID)
+, mAddressDetails(mDocument->GetAddressConvention(), 0, 0)
+, mOutputAddress(ScAddress::INITIALIZE_INVALID)
+, mCurrentAddress(pViewData->GetCurX(), pViewData->GetCurY(), 
pViewData->GetTabNo())
+, mnLastSampleSizeValue(1)
+, mnLastPeriodValue(1)
+, mDialogLostFocus(false)
+, mxInputRangeLabel(m_xBuilder->weld_label("input-range-label"))
+, mxInputRangeEdit(new 
formula::WeldRefEdit(m_xBuilder->weld_entry("input-range-edit")))
+, mxInputRangeButton(new 
formula::WeldRefButton(m_xBuilder->weld_button("input-range-button")))
+, mxOutputRangeLabel(m_xBuilder->weld_label("output-range-label"))
+, mxOutputRangeEdit(new 
formula::WeldRefEdit(m_xBuilder->weld_entry("output-range-edit")))
+, mxOutputRangeButton(new 
formula::WeldRefButton(m_xBuilder->weld_button("output-range-button")))
+, mxSampleSize(m_xBuilder->weld_spin_button("sample-size-spin"))
+, mxPeriod(m_xBuilder->weld_spin_button("period-spin"))
+, mxRandomMethodRadio(m_xBuilder->weld_radio_button("random-method-radio"))
+, mxWithReplacement(m_xBuilder->weld_check_button("with-replacement"))
+, mxKeepOrder(m_xBuilder->weld_check_button("keep-order"))
+, 
mxPeriodicMethodRadio(m_xBuilder->weld_radio_button("periodic-method-radio"))
+, mxButtonOk(m_xBuilder->weld_button("ok"))
 {
-get(mpInputRangeLabel,  "input-range-label");
-get(mpInputRangeEdit,   "input-range-edit");
-get(mpInputRangeButton, "input-range-button");
-mpInputRangeEdit->SetReferences(this, mpInputRangeLabel);
-mpInputRangeButton->SetReferences(this, mpInputRangeEdit);
+mxInputRangeEdit->SetReferences(this, mxInputRangeLabel.get());
+mxInputRangeButton->SetReferences(this, mxInputRangeEdit.get());
 
-get(mpOutputRangeLabel,  "output-range-label");
-get(mpOutputRangeEdit,   "output-range-edit");
-get(mpOutputRangeButton, "output-range-button");
-mpOutputRangeEdit->SetReferences(this, mpOutputRangeLabel);
-mpOutputRangeButton->SetReferences(this, mpOutputRangeEdit);
-
-get(mpSampleSize, "sample-size-spin");
-get(mpPeriod, "period-spin");
-
-get(mpRandomMethodRadio,   "random-method-radio");
-get(mpWithReplacement, "with-replacement");
-get(mpKeepOrder,   "keep-order");
-get(mpPeriodicMethodRadio, "periodic-method-radio");
-
-get(mpButtonOk, "ok");
+mxOutputRangeEdit->SetReferences(this, mxOutputRangeLabel.get());
+mxOutputRangeButton->SetReferences(this, mxOutputRangeEdit.get());
 
 Init

Make API versioning compiler evaluable

[Jan-Marek Glogowski]

Hi everyone,

while discussing https://gerrit.libreoffice.org/#/c/70528/, I realized that we
have actually extended API documentation using @deprecated and @since (which I
knew), but I don't know a way to automatically check them. Maybe I'm just
unaware, but I also couldn't find anything, neither via Web search nor various
greps on the code base.

Using opengrok I got "Searched full:deprecated" = 593 and "Searched full:"@
deprecated"" = 348. And while at it "Searched full:since" = 2959 and "Searched
full:"@ since" = 1447. So massive info is there :-)

IMHO we want to introduce something like glib/gversionmacros.h (see the end of
https://developer.gnome.org/glib/stable/glib-compiling.html). Nobody can
manually verify the use of deprecated or introduced functions with regard to the
version (@deprecated is sadly currently unversioned).

I was just aware of G_DISABLE_DEPRECATED, which glib / gtk has "since ever". Now
I found there also is (and we should use) GLIB_VERSION_MIN_REQUIRED and
GLIB_VERSION_MAX_ALLOWED. I was already bitten by not using this, when I checked
in the timer changes for the VCL gtk backend and found that our baseline glib
was too old, after pushing it.

Some questions that came to my mind:
* Has UDK an independent versioning, or is it also the Office version?
* Does anybody have a sensible idea to generate macros from docs or the other
way around?
* Is this easyhackable, if the required infrastructure is in place?
* Any good idea to automatically version the @deprecated?

More comments?

Jan-Marek

P.S. there are some funny @since, like "@since #i39203#". I've attached a "git
grep '@since' | sed 's/^[^@]*//' | sort -u". The 2007 dates are from
reportbuilder/java/org/libreoffice/report/pentaho/. The rest looks promising.
P.P.S. that would have been something for GSoC...
@overload @since LibreOffice 5.3 */
@overload @since LibreOffice 5.4 */
@since 02.03.2007
@since 05.03.2007
@since 06.03.2007
@since 07.03.2007
@since 08.03.2007
@since 09.03.2007
@since 0.9.2
@since 11.03.2007
@since 12.03.2007
@since 13.03.2007
@since 1.4
@since 14.03.2007
@since 15.03.2007
@since 1.7.0
@since 1.8.0.8
@since 19.03.2007
@since 20.03.2007
@since 22.03.2007
@since 24.03.2007
@since 26.03.2007
@since 30.03.2007
@since 31.03.2007
@since 3.5
@since 3.5.0
@since 4.5
@since AOO bug 75163 (OpenOffice.org 2.4.3 - OOH 680 milestone 212)
@since Apache OpenOffice 4.0, LibreOffice 4.2
@since \#i32109#
@since #i39203#
@since #i40086#
@since  LibreOffice 3.3
@since LibreOffice 3.3
@since LibreOffice 3.4
@since LibreOffice 3.5
@since LibreOffice 3.5.
@since LibreOffice 3.6
@since LibreOffice 4.0
@since LibreOffice 4.0 */
@since LibreOffice 4.1
@since LibreOffice 4.2
@since LibreOffice 4.3
@since LibreOffice 4.3 **/
@since LibreOffice 4.4
@since LibreOffice 5.0
@since LibreOffice 5.0 */
@since LibreOffice 5.1
@since LibreOffice 5.2
@since LibreOffice 5.3
@since LibreOffice 5.3 */
@since LibreOffice 5.4
@since LibreOffice 5.5
@since LibreOffice 6.0
@since LibreOffice 6.0 */ const short CHECKBOX_GPGENCRYPTION = 211;
@since LibreOffice 6.1
@since LibreOffice 6.1 */ const short LISTBOX_IMAGE_ANCHOR   = 212;
@since LibreOffice 6.1 */ const short LISTBOX_IMAGE_ANCHOR_LABEL = 213;
@since LibreOffice 6.1)
@since LibreOffice 6.2
@since LibreOffice 6.3
@since OOo 1.1.2
@since OOo 2.0
@since OOo 2.0.0
@since  OOo 2.0.1
@since OOo 2.0.1
@since OOo 2.0.3
@since OOo 2.0.4
@since  OOo 2.1
@since OOo 2.1
@since OOo 2.2
@since OOo 2.3
@since OOo 2.3.1
@since  OOo 2.4
@since OOo 2.4
@since OOo 3.0
@since  OOo 3.0.1
@since OOo 3.0.1
@since OOo 3.1
@since OOo 3.2
@since OOo 3.3
@since OOo 3.4
@since OOo 3.5
@since pFilterOptions argument added in LibreOffice 5.0
@since   UDK1.0
@since UDK 1.0
@since UDK1.0
@since UDK2.0
@since UDK 3.1.0
@since UDK 3.2
@since UDK 3.2.0
@since UDK 3.2.1
@since UDK 3.2.10
@since UDK 3.2.12
@since UDK 3.2.13
@since UDK 3.2.2
@since UDK 3.2.3
@since UDK 3.2.7
@since UDK 3.2.8
@since UDK 3.2.9
@since UDK 3.6
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: On backporting fix for tdf#124503 "LibreOffice doesn't detect JVM because of unexpected java.vendor property value"

[Thorsten Behrens]

Hi Stephan,

Stephan Bergmann wrote:
> If not, the question is whether to backport the above fix to
> libreoffice-6-1 (towards LO 6.1.6), libreoffice-6-2 (towards LO
> 6.2.4), and maybe even libreoffice-6-2-3. The fix isn't exactly
> small, so I would prefer to not backport it aggressively.  But I
> don't know how severely users would be affected by this issue.
>
I'd prefer a backport to both maintained branches - at the current
speed of new binary Java distros springing up (and the overall
trajectory of that ecosystem there), I'd expect more of those issues
down the road.

Cheers,

-- Thorsten


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

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/unowriter/unowriter.cxx |   66 +++
 1 file changed, 14 insertions(+), 52 deletions(-)

New commits:
commit e0fde23412496d548c74603223f7a21b638ece79
Author: Miklos Vajna 
AuthorDate: Wed Apr 10 21:21:13 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 11 09:13:45 2019 +0200

CppunitTest_sw_unowriter: use CPPUNIT_TEST_FIXTURE()

Instead of the custom DECLARE_UNOAPI_TEST_FILE() and
DECLARE_UNOAPI_TEST().

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

diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index 361a608df78b..376ba0389637 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -83,49 +83,7 @@ public:
 }
 };
 
-/**
- * Macro to declare a new test with preloaded file
- * (similar to DECLARE_SW_ROUNDTRIP_TEST)
- */
-#define DECLARE_UNOAPI_TEST_FILE(TestName, filename)   
\
-class TestName : public SwUnoWriter
\
-{  
\
-protected: 
\
-virtual OUString getTestName() override { return OUString(#TestName); 
}\
-   
\
-public:
\
-CPPUNIT_TEST_SUITE(TestName);  
\
-CPPUNIT_TEST(loadAndTest); 
\
-CPPUNIT_TEST_SUITE_END();  
\
-void loadAndTest() 
\
-{  
\
-load(mpTestDocumentPath, filename);
\
-runTest(); 
\
-}  
\
-void runTest();
\
-}; 
\
-CPPUNIT_TEST_SUITE_REGISTRATION(TestName); 
\
-void TestName::runTest()
-
-/**
- * Macro to declare a new test without loading any files
- */
-#define DECLARE_UNOAPI_TEST(TestName)  
\
-class TestName : public SwUnoWriter
\
-{  
\
-protected: 
\
-virtual OUString getTestName() override { return OUString(#TestName); 
}\
-   
\
-public:
\
-CPPUNIT_TEST_SUITE(TestName);  
\
-CPPUNIT_TEST(runTest); 
\
-CPPUNIT_TEST_SUITE_END();  
\
-void runTest();
\
-}; 
\
-CPPUNIT_TEST_SUITE_REGISTRATION(TestName); 
\
-void TestName::runTest()
-
-DECLARE_UNOAPI_TEST(testDefaultCharStyle)
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testDefaultCharStyle)
 {
 // Create a new document, type a character, set its char style to Emphasis
 // and assert the style was set.
@@ -151,7 +109,7 @@ DECLARE_UNOAPI_TEST(testDefaultCharStyle)
  getProperty(xCursorProps, 
"CharPosture"));
 }
 
-DECLARE_UNOAPI_TEST(testGraphicDesciptorURL)
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testGraphicDesciptorURL)
 {
 loadURL("private:factory/swriter", nullptr);
 
@@ -178,7 +136,7 @@ DECLARE_UNOAPI_TEST(testGraphicDesciptorURL)
 CPPUNIT_ASSERT(xGraphic.is());
 }
 
-DECLARE_UNOAPI_TEST(testGraphicDescip