[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 428957e6dbd798513af55a97b505c8359f73b9f5
Author: Andrea Gelmini 
AuthorDate: Fri Aug 23 11:44:29 2019 +0200
Commit: Julien Nabet 
CommitDate: Sat Aug 24 08:55:49 2019 +0200

Fix typo

See:
https://bugs.documentfoundation.org/show_bug.cgi?id=127103

Thanks a lot to Emil Tanev
(e m o _ a s s e n o v at y a h o o dot c o m)

Change-Id: I39fb0f3457383d07c0a48fdf52631ab11e510c02
Reviewed-on: https://gerrit.libreoffice.org/78005
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 9ad4e3fcd88b..0045e5e1a60c 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -48,7 +48,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: 
paragraph styles that have different properties depending on the context."), 
"modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/05130100.html
  { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0119.html
  { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0519.html
- { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily starts with a fresh user 
profile or to restore a non-working %PRODUCTNAME instance start Help > Restart 
in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/profile_safe_mode.html
+ { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user 
profile or to restore a non-working %PRODUCTNAME instance start Help > Restart 
in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/profile_safe_mode.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01040300.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/guide/autotext.html
  { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01041100.html
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

3 new defect(s) introduced to LibreOffice found with Coverity Scan.
2 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)


** CID 1452763:  Error handling issues  (CHECKED_RETURN)
/xmloff/source/draw/QRCodeContext.cxx: 81 in 
QRCodeContext::QRCodeContext(SvXMLImport &, unsigned short, const rtl::OUString 
&, const 
com::sun::star::uno::Reference &, 
const com::sun::star::uno::Reference &)()



*** CID 1452763:  Error handling issues  (CHECKED_RETURN)
/xmloff/source/draw/QRCodeContext.cxx: 81 in 
QRCodeContext::QRCodeContext(SvXMLImport &, unsigned short, const rtl::OUString 
&, const 
com::sun::star::uno::Reference &, 
const com::sun::star::uno::Reference &)()
75 else
76 aQRCode.ErrorCorrection = 
css::drawing::QRCodeErrorCorrection::HIGH;
77 }
78 
79 if (IsXMLToken(aLocalName, XML_QRCODE_BORDER))
80 {
>>> CID 1452763:  Error handling issues  (CHECKED_RETURN)
>>> Calling "convertNumber" without checking return value (as is done 
>>> elsewhere 23 out of 24 times).
81 sax::Converter::convertNumber(aQRCode.Border, 
sValue, 0);
82 }
83 break;
84 
85 case XML_NAMESPACE_OFFICE:
86 if (IsXMLToken(aLocalName, XML_STRING_VALUE))

** CID 1452762:  Uninitialized members  (UNINIT_CTOR)
/sw/source/ui/dbui/mmgreetingspage.hxx: 74 in 
SwGreetingsHandler::SwGreetingsHandler(SwMailMergeConfigItem &, weld::Builder 
&)()



*** CID 1452762:  Uninitialized members  (UNINIT_CTOR)
/sw/source/ui/dbui/mmgreetingspage.hxx: 74 in 
SwGreetingsHandler::SwGreetingsHandler(SwMailMergeConfigItem &, weld::Builder 
&)()
68 , m_xFemaleColumnLB(rBuilder.weld_combo_box("femalecol"))
69 , m_xFemaleFieldFT(rBuilder.weld_label("femalefieldft"))
70 , m_xFemaleFieldCB(rBuilder.weld_combo_box("femalefield"))
71 , m_xNeutralFT(rBuilder.weld_label("generalft"))
72 , m_xNeutralCB(rBuilder.weld_combo_box("general"))
73 {
>>> CID 1452762:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "m_pWizard" is not initialized in this 
>>> constructor nor in any functions that it calls.
74 }
75 
76 ~SwGreetingsHandler() {}
77 
78 DECL_LINK(IndividualHdl_Impl, weld::ToggleButton&, void);
79 DECL_LINK(GreetingHdl_Impl, weld::Button&, void);

** CID 1452761:  Error handling issues  (UNCAUGHT_EXCEPT)
/editeng/source/items/frmitems.cxx: 2822 in 
SvxBrushItem::SvxBrushItem(SvxBrushItem&&)()



*** CID 1452761:  Error handling issues  (UNCAUGHT_EXCEPT)
/editeng/source/items/frmitems.cxx: 2822 in 
SvxBrushItem::SvxBrushItem(SvxBrushItem&&)()
2816 , maStrFilter(rItem.maStrFilter)
2817 , eGraphicPos(rItem.eGraphicPos)
2818 , bLoadAgain(rItem.bLoadAgain)
2819 {
2820 }
2821 
>>> CID 1452761:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown 
>>> but the throw list "noexcept" doesn't allow it to be thrown. This will 
>>> cause a call to unexpected() which usually calls terminate().
2822 SvxBrushItem::SvxBrushItem(SvxBrushItem&& rItem) noexcept
2823 : SfxPoolItem(std::move(rItem))
2824 , aColor(std::move(rItem.aColor))
2825 , nShadingValue(std::move(rItem.nShadingValue))
2826 , xGraphicObject(std::move(rItem.xGraphicObject))
2827 , nGraphicTransparency(std::move(rItem.nGraphicTransparency))



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB73RtgzoPcQtNNP5dkHLuV1E-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy2sHx8n-2FGX94VL835wOQ4iXa90iBbtj8dxlQaQuXx7jFG2zF82eaaRN54vdmvMKN4AdOE3m2HzN7-2BZ9y6Lnww68qPo9GSYKXVxUsLyCgxMl9T9coj-2FP7GltzT9f-2Fq772ElHa6Bt7W5gN1B8znwJFBXKykGtMD-2F14ecD0lwWqwBTs-3D

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

[Libreoffice-commits] core.git: cui/uiconfig dbaccess/uiconfig extensions/uiconfig filter/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig sw/uiconfig vcl/uiconfig

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/galleryfilespage.ui   |2 +-
 cui/uiconfig/ui/optfontspage.ui   |4 ++--
 dbaccess/uiconfig/ui/backuppage.ui|2 +-
 extensions/uiconfig/sabpilot/ui/datasourcepage.ui |2 +-
 extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui  |4 ++--
 extensions/uiconfig/scanner/ui/sanedialog.ui  |2 +-
 filter/uiconfig/ui/pdfgeneralpage.ui  |2 +-
 filter/uiconfig/ui/xmlfiltertabpagegeneral.ui |2 +-
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui |2 +-
 sc/uiconfig/scalc/ui/textimportcsv.ui |2 +-
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui  |2 +-
 sd/uiconfig/simpress/ui/publishingdialog.ui   |2 +-
 sfx2/uiconfig/ui/helpsearchpage.ui|2 +-
 sw/uiconfig/swriter/ui/addressblockdialog.ui  |2 +-
 sw/uiconfig/swriter/ui/charurlpage.ui |2 +-
 sw/uiconfig/swriter/ui/frmurlpage.ui  |2 +-
 sw/uiconfig/swriter/ui/mmmailbody.ui  |4 ++--
 sw/uiconfig/swriter/ui/mmsalutationpage.ui|2 +-
 sw/uiconfig/swriter/ui/optcaptionpage.ui  |2 +-
 sw/uiconfig/swriter/ui/optfonttabpage.ui  |   20 ++--
 sw/uiconfig/swriter/ui/tocentriespage.ui  |2 +-
 vcl/uiconfig/ui/printdialog.ui|2 +-
 22 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit eb3587b1c54f7b264e6439d1cf39768c863284e4
Author: Caolán McNamara 
AuthorDate: Fri Aug 23 20:01:33 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 23:48:51 2019 +0200

Related: tdf#126693 cannot put focus into combobox entry

set can-focus=True in internal GtkComboBoxText GtkEntry where the
GtkEntry is editable=True

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

diff --git a/cui/uiconfig/ui/galleryfilespage.ui 
b/cui/uiconfig/ui/galleryfilespage.ui
index 456627d16cd1..99b5888b3d8e 100644
--- a/cui/uiconfig/ui/galleryfilespage.ui
+++ b/cui/uiconfig/ui/galleryfilespage.ui
@@ -53,7 +53,7 @@
 0
 
   
-False
+True
 True
   
 
diff --git a/cui/uiconfig/ui/optfontspage.ui b/cui/uiconfig/ui/optfontspage.ui
index 02d9fe4db20d..8de16075a2d3 100644
--- a/cui/uiconfig/ui/optfontspage.ui
+++ b/cui/uiconfig/ui/optfontspage.ui
@@ -241,7 +241,7 @@
 True
 
   
-False
+True
 True
   
 
@@ -259,7 +259,7 @@
 True
 
   
-False
+True
 True
   
 
diff --git a/dbaccess/uiconfig/ui/backuppage.ui 
b/dbaccess/uiconfig/ui/backuppage.ui
index 6236a0b2b9d9..0ea91eed52f6 100644
--- a/dbaccess/uiconfig/ui/backuppage.ui
+++ b/dbaccess/uiconfig/ui/backuppage.ui
@@ -90,7 +90,7 @@
 True
 
   
-False
+True
   
 
   
diff --git a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui 
b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui
index 3aa64cca58ca..ac4a90acb281 100644
--- a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui
+++ b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui
@@ -96,7 +96,7 @@ Now, just enter the name under which you want to register the 
data source in %PR
 True
 
   
-False
+True
   
 
   
diff --git a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui 
b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui
index 060893dacf12..3abf54171d2f 100644
--- a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui
+++ b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui
@@ -67,7 +67,7 @@
 True
 
   
-False
+True
   
 
   
@@ -115,7 +115,7 @@
 True
 
   
-False
+True
   
 
   
diff --git a/extensions/uiconfig/scanner/ui/sanedialog.ui 
b/extensions/uiconfig/scanner/ui/sanedialog.ui
index 9050cf8ac14a..b2a902c1b810 100644
--- a/extensions/uiconfig/scanner/ui/sanedialog.ui
+++ b/extensions/uiconfig/scanner/ui/sanedialog.ui
@@ -406,7 +406,7 @@
 True
  

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/insertcaption.ui |2 +-
 vcl/source/uitest/logger.cxx|4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 260086dffc5adddb3c6e60d423acd2aaeeb036eb
Author: Caolán McNamara 
AuthorDate: Fri Aug 23 19:35:40 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 23:48:28 2019 +0200

Resolves: tdf#126693 cannot put focus into combobox entry

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

diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui 
b/sw/uiconfig/swriter/ui/insertcaption.ui
index 3a858b3e0bec..dab2087f14ca 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -294,7 +294,7 @@
 True
 
   
-False
+True
 True
   
 
commit dbd7189f970e52f664b4bb3f96b397c1035b9ec8
Author: Caolán McNamara 
AuthorDate: Fri Aug 23 21:20:43 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 23:48:15 2019 +0200

cid#1452394 silence Using invalid iterator

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

diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index ccbf44fda51c..861cc4f4fb8e 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -337,6 +337,8 @@ OUString GetValueInMapWithIndex(const std::map& rParameters,
 for (; itr != rParameters.end() && j < index; ++itr, ++j)
 ;
 
+assert(itr != rParameters.end());
+
 return itr->second;
 }
 
@@ -349,6 +351,8 @@ OUString GetKeyInMapWithIndex(const std::map& rParameters, s
 for (; itr != rParameters.end() && j < index; ++itr, ++j)
 ;
 
+assert(itr != rParameters.end());
+
 return itr->first;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regina Henschel (via logerrit)]

 oox/source/export/shapes.cxx|   74 ++--
 sd/qa/unit/data/odp/tdf99497_CircleKind.odp |binary
 sd/qa/unit/export-tests-ooxml2.cxx  |   42 +++
 3 files changed, 113 insertions(+), 3 deletions(-)

New commits:
commit 72b50be0197159c5afc5da4daf01ba303519b14a
Author: Regina Henschel 
AuthorDate: Tue Aug 20 10:43:46 2019 +0200
Commit: Regina Henschel 
CommitDate: Fri Aug 23 23:38:33 2019 +0200

tdf#99497 CircleKind ARC, CUT, SECTION to OOXML arc, chord, pie

Before this patch, a classical ellipse or circle was exported as
OOXML preset type 'ellipse', regardless of the value of property
CircleKind. Now the property is evaluated and the corresponding
preset type is used.

Change-Id: I49ff43cf7e2ce02654979e82f7d83d60ace39e23
Reviewed-on: https://gerrit.libreoffice.org/77785
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index a5928223ff1c..5e9d069c3290 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -102,6 +103,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::css;
 using namespace ::css::beans;
@@ -697,6 +699,21 @@ static sal_Int32 lcl_NormalizeAngle( sal_Int32 nAngle )
 return nAngle < 0 ? ( nAngle + 360 ) : nAngle ;
 }
 
+static sal_Int32 lcl_CircleAngle2CustomShapeEllipseAngleOOX(const sal_Int32 
nInternAngle, const sal_Int32 nWidth, const sal_Int32 nHeight)
+{
+if (nWidth != 0 || nHeight != 0)
+{
+double fAngle = basegfx::deg2rad(nInternAngle / 100.0); // intern 
1/100 deg to degree to rad
+fAngle = atan2(nHeight * sin(fAngle), nWidth * cos(fAngle)); // circle 
to ellipse
+fAngle = basegfx::rad2deg(fAngle) * 6.0; // rad to degree to OOXML 
angle unit
+sal_Int32 nAngle = basegfx::fround(fAngle); // normalize
+nAngle = nAngle % 2160;
+return nAngle < 0 ? (nAngle + 2160) : nAngle;
+}
+else // should be handled by caller, dummy value
+return 0;
+}
+
 ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
 {
 // First check, if this is a Fontwork-shape. For DrawingML, such a shape 
is a
@@ -1055,7 +1072,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( const 
Reference< XShape >& xShape )
 
 pFS->startElementNS(mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? 
XML_sp : XML_wsp));
 
-// TODO: arc, section, cut, connector
+// TODO: connector ?
 
 // non visual shape properties
 if (GetDocumentType() != DOCUMENT_DOCX)
@@ -1071,13 +1088,64 @@ ShapeExport& ShapeExport::WriteEllipseShape( const 
Reference< XShape >& xShape )
 else
 pFS->singleElementNS(mnXmlNamespace, XML_cNvSpPr);
 
+Reference< XPropertySet > xProps( xShape, UNO_QUERY );
+CircleKind  eCircleKind(CircleKind_FULL);
+if (xProps.is())
+xProps->getPropertyValue("CircleKind" ) >>= eCircleKind;
+
 // visual shape properties
 pFS->startElementNS( mnXmlNamespace, XML_spPr );
 WriteShapeTransformation( xShape, XML_a );
-WritePresetShape( "ellipse" );
-Reference< XPropertySet > xProps( xShape, UNO_QUERY );
+
+if (CircleKind_FULL == eCircleKind)
+WritePresetShape("ellipse");
+else
+{
+sal_Int32 nStartAngleIntern(9000);
+sal_Int32 nEndAngleIntern(0);
+if (xProps.is())
+{
+   xProps->getPropertyValue("CircleStartAngle" ) >>= nStartAngleIntern;
+   xProps->getPropertyValue("CircleEndAngle") >>= nEndAngleIntern;
+}
+std::vector< std::pair> aAvList;
+awt::Size aSize = xShape->getSize();
+if (aSize.Width != 0 || aSize.Height != 0)
+{
+// Our arc has 90° up, OOXML has 90° down, so mirror it.
+// API angles are 1/100 degree.
+sal_Int32 
nStartAngleOOXML(lcl_CircleAngle2CustomShapeEllipseAngleOOX(36000 - 
nEndAngleIntern, aSize.Width, aSize.Height));
+sal_Int32 
nEndAngleOOXML(lcl_CircleAngle2CustomShapeEllipseAngleOOX(36000 - 
nStartAngleIntern, aSize.Width, aSize.Height));
+lcl_AppendAdjustmentValue( aAvList, 1, nStartAngleOOXML);
+lcl_AppendAdjustmentValue( aAvList, 2, nEndAngleOOXML);
+}
+switch (eCircleKind)
+{
+case CircleKind_ARC :
+WritePresetShape("arc", aAvList);
+break;
+case CircleKind_SECTION :
+WritePresetShape("pie", aAvList);
+break;
+case CircleKind_CUT :
+WritePresetShape("chord", aAvList);
+break;
+default :
+WritePresetShape("ellipse");
+}
+}
 if( xProps.is() )
 {
+if (CircleKind_ARC == eCircleKind)
+{
+// An arc in ODF is never filled, even if a fil

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

[Stephan Bergmann (via logerrit)]

 xmlscript/source/xml_helper/xml_byteseq.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 7b4b70afba2d6bde66dd59da5950d45efb4a645b
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 21:15:01 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 23:33:18 2019 +0200

Avoid -fsanitizeinvalid-null-argument

...as witnessed once with some `instdir/program/unopkg remove 
ooo2gd_3.0.0.oxt`:

> xmlscript/source/xml_helper/xml_byteseq.cxx:116:13: runtime error: null 
pointer passed as argument 1, which is declared to never be null
> /usr/include/string.h:43:28: note: nonnull attribute specified here
>  #0 in 
xmlscript::BSeqOutputStream::writeBytes(com::sun::star::uno::Sequence const&) at xmlscript/source/xml_helper/xml_byteseq.cxx:116:5
>  #1 in fileaccess::TaskManager::page(int, rtl::OUString const&, 
com::sun::star::uno::Reference const&) at 
ucb/source/ucp/file/filtask.cxx:655:32
>  #2 in fileaccess::BaseContent::open(int, 
com::sun::star::ucb::OpenCommandArgument2 const&) at 
ucb/source/ucp/file/bc.cxx:911:29
>  #3 in fileaccess::BaseContent::execute(com::sun::star::ucb::Command 
const&, int, 
com::sun::star::uno::Reference 
const&) at ucb/source/ucp/file/bc.cxx:323:53
>  #4 in non-virtual thunk to 
fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int, 
com::sun::star::uno::Reference 
const&) at ucb/source/ucp/file/bc.cxx
>  #5 in 
ucbhelper::Content_Impl::executeCommand(com::sun::star::ucb::Command const&) at 
ucbhelper/source/client/content.cxx:1254:19
>  #6 in 
ucbhelper::Content::openStream(com::sun::star::uno::Reference
 const&) at ucbhelper/source/client/content.cxx:816:14
>  #7 in dp_misc::readFile(ucbhelper::Content&) at 
desktop/source/deployment/misc/dp_ucb.cxx:195:23
>  #8 in dp_misc::readLine(rtl::OUString*, rtl::OUString const&, 
ucbhelper::Content&, unsigned short) at 
desktop/source/deployment/misc/dp_ucb.cxx:207:34
>  #9 in dp_registry::backend::configuration::(anonymous 
namespace)::BackendImpl::configmgrini_verify_init(com::sun::star::uno::Reference
 const&) at 
desktop/source/deployment/registry/configuration/dp_configuration.cxx:371:17
[...]

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

diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx 
b/xmlscript/source/xml_helper/xml_byteseq.cxx
index 24b7e2b6ee47..dc443a968e2d 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -113,9 +113,11 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > 
const & rData )
 {
 sal_Int32 nPos = _seq->size();
 _seq->resize( nPos + rData.getLength() );
-memcpy( _seq->data() + nPos,
-  rData.getConstArray(),
-  rData.getLength() );
+if (rData.getLength() != 0) {
+memcpy( _seq->data() + nPos,
+rData.getConstArray(),
+rData.getLength() );
+}
 }
 void BSeqOutputStream::flush()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5Tools.hxx|3 +++
 vcl/inc/qt5/Qt5Widget.hxx   |2 +-
 vcl/qt5/Qt5AccessibleWidget.cxx |2 +-
 vcl/qt5/Qt5DragAndDrop.cxx  |   28 ++--
 vcl/qt5/Qt5Frame.cxx|   11 ---
 vcl/qt5/Qt5Tools.cxx|2 --
 vcl/qt5/Qt5Widget.cxx   |6 +++---
 7 files changed, 22 insertions(+), 32 deletions(-)

New commits:
commit 51c663b49deea46145eef185bf4e551f2c213428
Author: Jan-Marek Glogowski 
AuthorDate: Thu Aug 15 10:35:33 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Fri Aug 23 23:15:25 2019 +0200

Qt5 some minor code cleanups

Change-Id: I1ee81de7ef03447991e12dcf01aef7858408dc40
Reviewed-on: https://gerrit.libreoffice.org/77975
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/qt5/Qt5Tools.hxx b/vcl/inc/qt5/Qt5Tools.hxx
index 697b703e28f4..54257de86241 100644
--- a/vcl/inc/qt5/Qt5Tools.hxx
+++ b/vcl/inc/qt5/Qt5Tools.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include 
 #include 
 #include 
 #include 
@@ -62,6 +63,8 @@ inline QSize toQSize(const Size& rSize) { return 
QSize(rSize.Width(), rSize.Heig
 
 inline Size toSize(const QSize& rSize) { return Size(rSize.width(), 
rSize.height()); }
 
+inline Point toPoint(const QPoint& rPoint) { return Point(rPoint.x(), 
rPoint.y()); }
+
 inline QColor toQColor(const Color& rColor)
 {
 return QColor(rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(),
diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index a69c86876a44..457fc8b78612 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -74,7 +74,7 @@ class Qt5Widget : public QWidget
 public:
 Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags());
 
-Qt5Frame& getFrame() const { return m_rFrame; }
+Qt5Frame& frame() const { return m_rFrame; }
 void endExtTextInput();
 
 static bool handleEvent(Qt5Frame&, const QWidget&, QEvent*);
diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index 6ee5eedb6414..6a828865036e 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -718,7 +718,7 @@ QAccessibleInterface* 
Qt5AccessibleWidget::customFactory(const QString& classnam
 if (classname == QLatin1String("Qt5Widget") && object && 
object->isWidgetType())
 {
 Qt5Widget* pWidget = static_cast(object);
-vcl::Window* pWindow = pWidget->getFrame().GetWindow();
+vcl::Window* pWindow = pWidget->frame().GetWindow();
 
 if (pWindow)
 return new Qt5AccessibleWidget(pWindow->GetAccessible());
diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/Qt5DragAndDrop.cxx
index 3f57f3bc303e..615b5d1f7e2a 100644
--- a/vcl/qt5/Qt5DragAndDrop.cxx
+++ b/vcl/qt5/Qt5DragAndDrop.cxx
@@ -78,16 +78,16 @@ void Qt5DragSource::startDrag(
 
 void Qt5DragSource::fire_dragEnd(sal_Int8 nAction, bool bDropSuccessful)
 {
-if (m_xListener.is())
-{
-datatransfer::dnd::DragSourceDropEvent aEv;
-aEv.DropAction = nAction;
-aEv.DropSuccess = bDropSuccessful;
+if (!m_xListener.is())
+return;
 
-auto xListener = m_xListener;
-m_xListener.clear();
-xListener->dragDropEnd(aEv);
-}
+datatransfer::dnd::DragSourceDropEvent aEv;
+aEv.DropAction = nAction;
+aEv.DropSuccess = bDropSuccessful;
+
+auto xListener = m_xListener;
+m_xListener.clear();
+xListener->dragDropEnd(aEv);
 }
 
 OUString SAL_CALL Qt5DragSource::getImplementationName()
@@ -128,11 +128,7 @@ css::uno::Sequence SAL_CALL 
Qt5DropTarget::getSupportedServiceNames()
 return { "com.sun.star.datatransfer.dnd.Qt5DropTarget" };
 }
 
-Qt5DropTarget::~Qt5DropTarget()
-{
-//if (m_pFrame)
-//m_pFrame->deregisterDropTarget(this);
-}
+Qt5DropTarget::~Qt5DropTarget() {}
 
 void Qt5DropTarget::deinitialize()
 {
@@ -213,9 +209,7 @@ void Qt5DropTarget::fire_dragOver(const 
css::datatransfer::dnd::DropTargetDragEn
 aGuard.clear();
 
 for (auto const& listener : aListeners)
-{
 listener->dragOver(dtde);
-}
 }
 
 void Qt5DropTarget::fire_drop(const 
css::datatransfer::dnd::DropTargetDropEvent& dtde)
@@ -228,9 +222,7 @@ void Qt5DropTarget::fire_drop(const 
css::datatransfer::dnd::DropTargetDropEvent&
 aGuard.clear();
 
 for (auto const& listener : aListeners)
-{
 listener->drop(dtde);
-}
 }
 
 void Qt5DropTarget::fire_dragExit(const 
css::datatransfer::dnd::DropTargetEvent& dte)
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index cd850e6c3c0f..a18af04b5cbd 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1053,8 +1053,7 @@ void Qt5Frame::Beep() { QApplication::beep(); }
 SalFrame::SalPointerState Qt5Frame::GetPointerState()
 {
 SalPointerState aState;
-QPoint pos = QCursor::pos();
-aState.maPos = Point(pos.x(), pos.y());
+aState.maPos = toPoint(QCursor::pos());
 aState.mnState = GetMouseModCode(QGuiApplication

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

[Noel Grandin (via logerrit)]

 svx/source/accessibility/AccessibleTextEventQueue.cxx |   13 ++---
 svx/source/accessibility/AccessibleTextHelper.cxx |2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 04991eaf9f6767d94ad7c4e47708f47615beccf6
Author: Noel Grandin 
AuthorDate: Fri Aug 23 20:35:15 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 22:17:23 2019 +0200

tdf#119388 only enqueue events we actually process

shaves 10% of the time off, deleting columns

Change-Id: Id992572419a3c9a5693d37d7c5e5fe2da955bb23
Reviewed-on: https://gerrit.libreoffice.org/78029
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx 
b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index 6a586117ddd3..177950aac8ce 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -49,7 +49,13 @@ namespace accessibility
 
 void AccessibleTextEventQueue::Append( const SdrHint& rHint )
 {
-maEventQueue.push_back( new SdrHint( rHint ) );
+// only enqueue the events we actually care about in
+// AccessibleTextHelper_Impl::ProcessQueue(), because
+// the cost of some events adds up.
+auto eKind = rHint.GetKind();
+if (eKind == SdrHintKind::BeginEdit
+|| eKind == SdrHintKind::EndEdit)
+maEventQueue.push_back( new SdrHint( rHint ) );
 }
 
 void AccessibleTextEventQueue::Append( const TextHint& rHint )
@@ -82,8 +88,9 @@ namespace accessibility
 void AccessibleTextEventQueue::Clear()
 {
 // clear queue
-while( !IsEmpty() )
-PopFront();
+for( auto p : maEventQueue)
+delete p;
+maEventQueue.clear();
 }
 
 } // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx 
b/svx/source/accessibility/AccessibleTextHelper.cxx
index 288d2c3c362f..208f65945155 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1134,6 +1134,8 @@ namespace accessibility
 {
 const SfxHint& rHint = *pHint;
 
+// Note, if you add events here, you need to update the 
AccessibleTextEventQueue::Append
+// code, because only the events we process here, are actually 
queued there.
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/firebird-tdf125284.patch.1  |   27 ++
 2 files changed, 28 insertions(+)

New commits:
commit 7bc3da4ff0a6fda621340a4ded79f7ed4ce31d85
Author: Caolán McNamara 
AuthorDate: Fri Aug 23 17:00:43 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 21:58:46 2019 +0200

Resolves: tdf#125284 config entries not substituted under Turkish locale

cause i is not the lowercase of I

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

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 96f29a76ead5..a2fe0afec0e5 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/c++17.patch \
external/firebird/ubsan.patch \
external/firebird/asan.patch \
+   external/firebird/firebird-tdf125284.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/firebird-tdf125284.patch.1 
b/external/firebird/firebird-tdf125284.patch.1
new file mode 100644
index ..a1cb2043e34b
--- /dev/null
+++ b/external/firebird/firebird-tdf125284.patch.1
@@ -0,0 +1,27 @@
+--- firebird/src/common/config/config_file.cpp 2019-08-23 16:42:26.721439468 
+0100
 firebird/src/common/config/config_file.cpp 2019-08-23 16:43:07.506579222 
+0100
+@@ -521,16 +521,14 @@
+   unsigned code;
+   const char* name;
+   } dirs[] = {
+-#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a},
+-  NMDIR(DIR_CONF)
+-  NMDIR(DIR_SECDB)
+-  NMDIR(DIR_PLUGINS)
+-  NMDIR(DIR_UDF)
+-  NMDIR(DIR_SAMPLE)
+-  NMDIR(DIR_SAMPLEDB)
+-  NMDIR(DIR_INTL)
+-  NMDIR(DIR_MSG)
+-#undef NMDIR
++  {Firebird::IConfigManager::DIR_CONF, "FB_dir_conf"},
++  {Firebird::IConfigManager::DIR_SECDB, "FB_dir_secdb"},
++  {Firebird::IConfigManager::DIR_PLUGINS, "FB_dir_plugins"},
++  {Firebird::IConfigManager::DIR_UDF, "FB_dir_udf"},
++  {Firebird::IConfigManager::DIR_SAMPLE, "FB_dir_sample"},
++  {Firebird::IConfigManager::DIR_SAMPLEDB, "FB_dir_sampledb"},
++  {Firebird::IConfigManager::DIR_INTL, "FB_dir_intl"},
++  {Firebird::IConfigManager::DIR_MSG, "FB_dir_msg"},
+   {Firebird::IConfigManager::DIR_COUNT, NULL}
+   };
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 svx/source/dialog/svxruler.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e4c7126354c4d96f20e87c0d72b631ed99c6c2be
Author: Tomaž Vajngerl 
AuthorDate: Fri Aug 23 21:52:20 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Aug 23 21:49:46 2019 +0200

Fix commented out debug code in ruler so it compiles

Change-Id: I4b0af0009e525a28dd124b34b424058bf3ed4c4a
Reviewed-on: https://gerrit.libreoffice.org/78010
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index d418afbe8e07..5cb7769bb2df 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -79,8 +79,8 @@ public:
 Show();
 Size aParentSize(pParent->GetOutputSizePixel());
 Size aOwnSize(GetSizePixel());
-aParentSize.Width() -= aOwnSize.Width();
-aParentSize.Height() -= aOwnSize.Height();
+aParentSize.setWidth(aParentSize.Width() - aOwnSize.Width());
+aParentSize.setHeight(aParentSize.Height() - 
aOwnSize.Height());
 SetPosPixel(Point(aParentSize.Width(), aParentSize.Height()));
 }
 ~RulerDebugWindow();
___
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' - sfx2/source

[Muhammet Kara (via logerrit)]

 sfx2/source/doc/autoredactdialog.cxx |   35 +--
 1 file changed, 21 insertions(+), 14 deletions(-)

New commits:
commit 647af2fb861ead7afaa3d9d0e7380469d691088f
Author: Muhammet Kara 
AuthorDate: Fri Aug 23 21:15:55 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Aug 23 21:35:59 2019 +0200

AutoRedaction: Adapt State Remembering

[NO-FORWARD-PORT]

Change-Id: If44141228ff4ecafd6f1cf686a695e32293fcfa0
Reviewed-on: https://gerrit.libreoffice.org/78040
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index cbeb8a8705a1..367482a8cbf7 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -559,10 +559,10 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(vcl::Window* 
pParent)
 m_pAddBtn->SetClickHdl(LINK(this, SfxAutoRedactDialog, AddHdl));
 m_pEditBtn->SetClickHdl(LINK(this, SfxAutoRedactDialog, EditHdl));
 
-// Can be used to remmeber the last set of redaction targets?
-/*OUString sExtraData;
+// Bring back last set of targets
+OUString sExtraData;
 SvtViewOptions aDlgOpt(EViewType::Dialog,
-   OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+   OStringToOUString(GetHelpId(), 
RTL_TEXTENCODING_UTF8));
 
 if (aDlgOpt.Exists())
 {
@@ -573,13 +573,14 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(vcl::Window* 
pParent)
 // update the targets configuration if necessary
 if (!sExtraData.isEmpty())
 {
-weld::WaitObject aWaitCursor(m_xDialog.get());
+EnterWait();
 
 try
 {
 // Create path string, and read JSON from file
 boost::property_tree::ptree aTargetsJSON;
-std::stringstream aStream(std::string(sExtraData.toUtf8()));
+std::stringstream aStream(
+std::string(sExtraData.toUtf8().getStr())); //TODO: Check 
correctness
 
 boost::property_tree::read_json(aStream, aTargetsJSON);
 
@@ -588,7 +589,7 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(vcl::Window* 
pParent)
  aTargetsJSON.get_child("RedactionTargets"))
 {
 RedactionTarget* pTarget = JSONtoRedactionTarget(rValue);
-addTarget(pTarget);
+m_pTargetsBox->InsertTarget(pTarget);
 }
 }
 catch (css::uno::Exception& e)
@@ -598,18 +599,18 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(vcl::Window* 
pParent)
 return;
 //TODO: Warn the user with a message box
 }
-}*/
+
+LeaveWait();
+}
 }
 
 SfxAutoRedactDialog::~SfxAutoRedactDialog()
 {
-if (!m_bTargetsCopied)
-clearTargets();
-/*if (m_aTableTargets.empty())
+if (m_pTargetsBox->GetEntryCount() < 1)
 {
 // Clear the dialog data
 SvtViewOptions aDlgOpt(EViewType::Dialog,
-   OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+   OStringToOUString(GetHelpId(), 
RTL_TEXTENCODING_UTF8));
 aDlgOpt.Delete();
 return;
 }
@@ -618,7 +619,12 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog()
 {
 // Put the targets into a JSON array
 boost::property_tree::ptree aTargetsArray;
-for (const auto& targetPair : m_aTableTargets)
+std::vector> vRedactionTargets;
+
+// Get the targets
+getTargets(vRedactionTargets);
+
+for (const auto& targetPair : vRedactionTargets)
 {
 aTargetsArray.push_back(std::make_pair("", 
redactionTargetToJSON(targetPair.first)));
 }
@@ -634,7 +640,7 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog()
 
 // Store the dialog data
 SvtViewOptions aDlgOpt(EViewType::Dialog,
-   OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+   OStringToOUString(GetHelpId(), 
RTL_TEXTENCODING_UTF8));
 aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sUserDataStr));
 
 if (!m_bTargetsCopied)
@@ -646,7 +652,8 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog()
  "Exception caught while trying to store the dialog state: " 
<< e.Message);
 return;
 //TODO: Warn the user with a message box
-}*/
+}
+
 disposeOnce();
 }
 
___
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' - sfx2/inc sfx2/source

[Muhammet Kara (via logerrit)]

 sfx2/inc/autoredactdialog.hxx|   14 
 sfx2/source/doc/autoredactdialog.cxx |  120 ++-
 2 files changed, 52 insertions(+), 82 deletions(-)

New commits:
commit 16772ff18d04af5b91d00075841b967597fae595
Author: Muhammet Kara 
AuthorDate: Fri Aug 23 20:29:37 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Aug 23 21:35:27 2019 +0200

AutoRedaction: Adapt EditHdl

And do some clean-up

[NO-FORWARD-PORT]

Change-Id: I8fec2acd38e0f160b22db20f6d9adc585b67c13c
Reviewed-on: https://gerrit.libreoffice.org/78039
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index 5af176a6f7ce..90e5ec6ad3d5 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -48,7 +48,7 @@ class TargetsTable : public SvSimpleTable
 public:
 TargetsTable(SvSimpleTableContainer& rParent);
 void InsertTarget(RedactionTarget* pTarget);
-void SelectByName(const OUString& sName);
+void InsertTargetAtPos(RedactionTarget* pTarget, const sal_uLong& nPos);
 RedactionTarget* GetTargetByName(const OUString& sName);
 OUString GetNameProposal();
 };
@@ -67,7 +67,6 @@ enum class StartFileDialogType
 class SFX2_DLLPUBLIC SfxAutoRedactDialog : public SfxModalDialog
 {
 SfxObjectShellLock m_xDocShell;
-//std::vector> m_aTableTargets;
 std::unique_ptr m_pFileDlg;
 bool m_bIsValidState;
 bool m_bTargetsCopied;
@@ -84,16 +83,14 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public 
SfxModalDialog
 DECL_LINK(Load, Button*, void);
 DECL_LINK(Save, Button*, void);
 DECL_LINK(AddHdl, Button*, void);
-//DECL_LINK(EditHdl, Button*, void);
+DECL_LINK(EditHdl, Button*, void);
 DECL_LINK(DeleteHdl, Button*, void);
 
 DECL_LINK(LoadHdl, sfx2::FileDialogHelper*, void);
 DECL_LINK(SaveHdl, sfx2::FileDialogHelper*, void);
 
 void StartFileDialog(StartFileDialogType nType, const OUString& rTitle);
-/// Carry out proper addition both to the targets box, and to the 
tabletargets vector.
-/*void addTarget(RedactionTarget* pTarget);*/
-/// Clear all targets both visually and from the targets vector
+/// Clear all targets both visually and from the memory
 void clearTargets();
 
 public:
@@ -101,11 +98,6 @@ public:
 virtual ~SfxAutoRedactDialog() override;
 virtual void dispose() override;
 
-/// Check if the dialog has any valid redaction targets.
-//bool hasTargets() const;
-/// Check if the dialog is in a valid state.
-//bool isValidState() const { return m_bIsValidState; }
-
 /** Copies targets vector
  *  Does a shallow copy.
  *  Returns true if successful.
diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index 040fb3a9dacc..cbeb8a8705a1 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -150,13 +150,34 @@ void TargetsTable::InsertTarget(RedactionTarget* pTarget)
 InsertEntryToColumn(sColumnData, TREELIST_APPEND, 0x, pTarget);
 }
 
-void TargetsTable::SelectByName(const OUString& sName)
+void TargetsTable::InsertTargetAtPos(RedactionTarget* pTarget, const 
sal_uLong& nPos)
 {
-SvTreeListEntry* pEntry = GetRowByTargetName(sName);
-if (!pEntry)
+if (!pTarget)
+{
+SAL_WARN("sfx.doc", "pTarget is null in TargetsTable::InsertTarget()");
 return;
+}
+
+// Check if the name is empty or invalid (clashing with another entry's 
name)
+if (pTarget->sName.isEmpty() || GetRowByTargetName(pTarget->sName) != 
nullptr)
+{
+SAL_WARN("sfx.doc", "Repetitive or empty target name in 
TargetsTable::InsertTarget()");
+pTarget->sName = GetNameProposal();
+}
+
+OUString sContent = pTarget->sContent;
+
+if (pTarget->sType == RedactionTargetType::REDACTION_TARGET_PREDEFINED)
+{
+//selection_num;selection_name
+sContent = sContent.getToken(1, ';');
+}
 
-Select(pEntry);
+OUString sColumnData = pTarget->sName + "\t" + getTypeName(pTarget->sType) 
+ "\t" + sContent
+   + "\t" + (pTarget->bCaseSensitive ? OUString("Yes") 
: OUString("No"))
+   + "\t" + (pTarget->bWholeWords ? OUString("Yes") : 
OUString("No"));
+
+InsertEntryToColumn(sColumnData, nPos, 0x, pTarget);
 }
 
 RedactionTarget* TargetsTable::GetTargetByName(const OUString& sName)
@@ -191,23 +212,6 @@ OUString TargetsTable::GetNameProposal()
 return sDefaultTargetName + " " + OUString::number(nHighestTargetId + 1);
 }
 
-/*void TargetsTable::setRowData(const int& nRowIndex, const RedactionTarget* 
pTarget)
-{
-OUString sContent = pTarget->sContent;
-
-if (pTarget->sType == RedactionTargetType::REDACTION_TARGET_PREDEFINED)
-{
-//selection_num;selection_name
-sContent = sContent.getToken(1, ';');
-}
-
-m_xControl->set_text(nRowIn

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

[Muhammet Kara (via logerrit)]

 sfx2/inc/autoredactdialog.hxx|   41 +++---
 sfx2/source/doc/autoredactdialog.cxx |  228 ++-
 2 files changed, 138 insertions(+), 131 deletions(-)

New commits:
commit 0cb4b06798975735ee812ad6ca20e3d8c5cc4ca8
Author: Muhammet Kara 
AuthorDate: Fri Aug 23 13:56:47 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Aug 23 21:34:54 2019 +0200

AutoRedaction: Adapt AddHdl

[NO-FORWARD-PORT]

Change-Id: Id33ee13d8342c862bd063e2345cb14805b950e37
Reviewed-on: https://gerrit.libreoffice.org/78038
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index 9399ba530a80..5af176a6f7ce 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -83,8 +83,8 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public 
SfxModalDialog
 
 DECL_LINK(Load, Button*, void);
 DECL_LINK(Save, Button*, void);
-/*DECL_LINK(AddHdl, Button*, void);
-DECL_LINK(EditHdl, Button*, void);*/
+DECL_LINK(AddHdl, Button*, void);
+//DECL_LINK(EditHdl, Button*, void);
 DECL_LINK(DeleteHdl, Button*, void);
 
 DECL_LINK(LoadHdl, sfx2::FileDialogHelper*, void);
@@ -113,35 +113,34 @@ public:
 bool getTargets(std::vector>& 
r_aTargets);
 };
 
-/*class SfxAddTargetDialog : public weld::GenericDialogController
+class SfxAddTargetDialog : public SfxModalDialog
 {
 private:
-std::unique_ptr m_xName;
-std::unique_ptr m_xType;
-std::unique_ptr m_xLabelContent;
-std::unique_ptr m_xContent;
-std::unique_ptr m_xLabelPredefContent;
-std::unique_ptr m_xPredefContent;
-std::unique_ptr m_xCaseSensitive;
-std::unique_ptr m_xWholeWords;
+VclPtr m_pName;
+VclPtr m_pType;
+VclPtr m_pLabelContent;
+VclPtr m_pContent;
+VclPtr m_pLabelPredefContent;
+VclPtr m_pPredefContent;
+VclPtr m_pCaseSensitive;
+VclPtr m_pWholeWords;
 
-DECL_LINK(SelectTypeHdl, weld::ComboBox&, void);
+DECL_LINK(SelectTypeHdl, ListBox&, void);
 
 public:
-SfxAddTargetDialog(weld::Window* pWindow, const OUString& rName);
-SfxAddTargetDialog(weld::Window* pWindow, const OUString& sName,
+SfxAddTargetDialog(vcl::Window* pWindow, const OUString& rName);
+SfxAddTargetDialog(vcl::Window* pWindow, const OUString& sName,
const RedactionTargetType& eTargetType, const OUString& 
sContent,
const bool& bCaseSensitive, const bool& bWholeWords);
+virtual ~SfxAddTargetDialog() override;
+virtual void dispose() override;
 
-OUString getName() const { return m_xName->get_text(); }
+OUString getName() const { return m_pName->GetText(); }
 RedactionTargetType getType() const;
 OUString getContent() const;
-bool isCaseSensitive() const
-{
-return m_xCaseSensitive->get_state() == TriState::TRISTATE_TRUE;
-}
-bool isWholeWords() const { return m_xWholeWords->get_state() == 
TriState::TRISTATE_TRUE; }
-};*/
+bool isCaseSensitive() const { return m_pCaseSensitive->GetState() == 
TriState::TRISTATE_TRUE; }
+bool isWholeWords() const { return m_pWholeWords->GetState() == 
TriState::TRISTATE_TRUE; }
+};
 
 #endif
 
diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index 0bfe244e760f..040fb3a9dacc 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -95,28 +96,28 @@ OUString getTypeName(RedactionTargetType nType)
 }
 
 /// Returns TypeID to be used in the add/edit target dialog
-/*OUString getTypeID(RedactionTargetType nType)
+sal_Int32 getTypeID(RedactionTargetType nType)
 {
-OUString sTypeID("unknown");
+sal_Int32 nTypeID(-1);
 
 switch (nType)
 {
 case RedactionTargetType::REDACTION_TARGET_TEXT:
-sTypeID = "text";
+nTypeID = 0;
 break;
 case RedactionTargetType::REDACTION_TARGET_REGEX:
-sTypeID = "regex";
+nTypeID = 1;
 break;
 case RedactionTargetType::REDACTION_TARGET_PREDEFINED:
-sTypeID = "predefined";
+nTypeID = 2;
 break;
 case RedactionTargetType::REDACTION_TARGET_UNKNOWN:
-sTypeID = "unknown";
+nTypeID = -1;
 break;
 }
 
-return sTypeID;
-}*/
+return nTypeID;
+}
 }
 
 void TargetsTable::InsertTarget(RedactionTarget* pTarget)
@@ -220,17 +221,17 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, Save, Button*, void)
 StartFileDialog(StartFileDialogType::SaveAs, "Save Targets");
 }
 
-/*IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, Button*, void)
+IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, Button*, void)
 {
 // Open the Add Target dialog, craete a new target and insert into the 
targets vector and the listbox
-SfxAddTargetDialog aAddTargetDialog(getDialog(), 
m_xTar

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

[Muhammet Kara (via logerrit)]

 sfx2/inc/autoredactdialog.hxx|8 ++--
 sfx2/source/doc/autoredactdialog.cxx |   66 ++-
 2 files changed, 46 insertions(+), 28 deletions(-)

New commits:
commit 9fc2afbb2a10e29617791005168b64a881ebfb3f
Author: Muhammet Kara 
AuthorDate: Fri Aug 23 10:31:34 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Aug 23 21:34:23 2019 +0200

AutoRedaction: Adapt Save & DeleteHdl

[NO-FORWARD-PORT]

Change-Id: I0feeed87cc69f364980657f5b6a2dfdee05ce2f3
Reviewed-on: https://gerrit.libreoffice.org/78037
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index b128e9d67634..9399ba530a80 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -82,10 +82,10 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public 
SfxModalDialog
 VclPtr m_pDeleteBtn;
 
 DECL_LINK(Load, Button*, void);
-/*DECL_LINK(Save, Button*, void);
-DECL_LINK(AddHdl, Button*, void);
-DECL_LINK(EditHdl, Button*, void);
-DECL_LINK(DeleteHdl, Button*, void);*/
+DECL_LINK(Save, Button*, void);
+/*DECL_LINK(AddHdl, Button*, void);
+DECL_LINK(EditHdl, Button*, void);*/
+DECL_LINK(DeleteHdl, Button*, void);
 
 DECL_LINK(LoadHdl, sfx2::FileDialogHelper*, void);
 DECL_LINK(SaveHdl, sfx2::FileDialogHelper*, void);
diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index b62cb249b426..0bfe244e760f 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -213,13 +214,13 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, Load, Button*, void)
 StartFileDialog(StartFileDialogType::Open, "Load Targets");
 }
 
-/*IMPL_LINK_NOARG(SfxAutoRedactDialog, Save, Button*, void)
+IMPL_LINK_NOARG(SfxAutoRedactDialog, Save, Button*, void)
 {
 //Allow saving the targets into a file
 StartFileDialog(StartFileDialogType::SaveAs, "Save Targets");
 }
 
-IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, Button*, void)
+/*IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, Button*, void)
 {
 // Open the Add Target dialog, craete a new target and insert into the 
targets vector and the listbox
 SfxAddTargetDialog aAddTargetDialog(getDialog(), 
m_xTargetsBox->GetNameProposal());
@@ -342,39 +343,47 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, EditHdl, Button*, 
void)
 
 // And sync the targets box row with the actual target data
 m_xTargetsBox->setRowData(nSelectedRow, pTarget);
-}
+}*/
 
 IMPL_LINK_NOARG(SfxAutoRedactDialog, DeleteHdl, Button*, void)
 {
-std::vector aSelectedRows = m_xTargetsBox->get_selected_rows();
+sal_uLong nSelectionCount = m_pTargetsBox->GetSelectionCount();
 
 //No selection, so nothing to delete
-if (aSelectedRows.empty())
+if (nSelectionCount < 1)
 return;
 
-if (aSelectedRows.size() > 1)
+if (nSelectionCount > 1)
 {
-OUString sMsg("Are you sure you would like to delete "
-  + OUString::number(aSelectedRows.size()) + " targets at 
once?");
+OUString sMsg("Are you sure you would like to delete " + 
OUString::number(nSelectionCount)
+  + " targets at once?");
+
 //Warn the user about multiple deletions
-std::unique_ptr 
xBox(Application::CreateMessageDialog(
-getDialog(), VclMessageType::Question, VclButtonsType::OkCancel, 
sMsg));
-if (xBox->run() == RET_CANCEL)
+if (ScopedVclPtrInstance(this, MessBoxStyle::OkCancel, 
sMsg)->Execute()
+== RET_CANCEL)
 return;
 }
 
-// After each delete, the indexes of the following items decrease by one.
-int delta = 0;
-for (const auto& i : aSelectedRows)
+SvTreeListEntry* pSelected = m_pTargetsBox->FirstSelected();
+
+for (sal_uLong i = nSelectionCount; i > 0; i--)
 {
-m_aTableTargets.erase(m_aTableTargets.begin() + (i - delta));
-m_xTargetsBox->remove(i - delta++);
+// remove the target
+RedactionTarget* pTarget = 
static_cast(pSelected->GetUserData());
+delete pTarget;
+
+// remove from the table
+SvTreeListEntry* nextSelected = m_pTargetsBox->NextSelected(pSelected);
+m_pTargetsBox->RemoveEntry(pSelected);
+pSelected = nextSelected;
 }
-}*/
+
+m_pTargetsBox->SelectAll(false);
+}
 
 namespace
 {
-/*boost::property_tree::ptree redactionTargetToJSON(RedactionTarget* pTarget)
+boost::property_tree::ptree redactionTargetToJSON(RedactionTarget* pTarget)
 {
 boost::property_tree::ptree aNode;
 aNode.put("sName", pTarget->sName.toUtf8().getStr());
@@ -385,7 +394,7 @@ namespace
 aNode.put("nID", pTarget->nID);
 
 return aNode;
-}*/
+}
 
 RedactionTarget* JSONtoRedactionTarget(const 
boost::property_tree::ptree::value_type& rValue)
 {
@@ -456,7 +465,7 @@ IMPL_LINK_NOARG(Sf

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

[Muhammet Kara (via logerrit)]

 sfx2/inc/autoredactdialog.hxx|   14 +++---
 sfx2/source/doc/autoredactdialog.cxx |   78 ++-
 sfx2/source/doc/objserv.cxx  |2 
 3 files changed, 58 insertions(+), 36 deletions(-)

New commits:
commit 9b63b1a51e7cd11a7450f2dc4f70aa561a46b4da
Author: Muhammet Kara 
AuthorDate: Wed Aug 21 22:22:15 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Aug 23 21:33:20 2019 +0200

AutoRedaction: Adapt Load

And enable getTargets()

[NO-FORWARD-PORT]

Change-Id: I6f6fb690183e54bef8f4cb5b21c625ff757fd16e
Reviewed-on: https://gerrit.libreoffice.org/77935
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index 0011166e631a..b128e9d67634 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -67,7 +67,7 @@ enum class StartFileDialogType
 class SFX2_DLLPUBLIC SfxAutoRedactDialog : public SfxModalDialog
 {
 SfxObjectShellLock m_xDocShell;
-std::vector> m_aTableTargets;
+//std::vector> m_aTableTargets;
 std::unique_ptr m_pFileDlg;
 bool m_bIsValidState;
 bool m_bTargetsCopied;
@@ -81,20 +81,20 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public 
SfxModalDialog
 VclPtr m_pEditBtn;
 VclPtr m_pDeleteBtn;
 
-/*DECL_LINK(Load, Button*, void);
-DECL_LINK(Save, Button*, void);
+DECL_LINK(Load, Button*, void);
+/*DECL_LINK(Save, Button*, void);
 DECL_LINK(AddHdl, Button*, void);
 DECL_LINK(EditHdl, Button*, void);
-DECL_LINK(DeleteHdl, Button*, void);
+DECL_LINK(DeleteHdl, Button*, void);*/
 
 DECL_LINK(LoadHdl, sfx2::FileDialogHelper*, void);
 DECL_LINK(SaveHdl, sfx2::FileDialogHelper*, void);
 
 void StartFileDialog(StartFileDialogType nType, const OUString& rTitle);
 /// Carry out proper addition both to the targets box, and to the 
tabletargets vector.
-void addTarget(RedactionTarget* pTarget);
+/*void addTarget(RedactionTarget* pTarget);*/
 /// Clear all targets both visually and from the targets vector
-void clearTargets();*/
+void clearTargets();
 
 public:
 SfxAutoRedactDialog(vcl::Window* pParent);
@@ -110,7 +110,7 @@ public:
  *  Does a shallow copy.
  *  Returns true if successful.
  */
-//bool getTargets(std::vector>& 
r_aTargets);
+bool getTargets(std::vector>& 
r_aTargets);
 };
 
 /*class SfxAddTargetDialog : public weld::GenericDialogController
diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index bd8c4dfcd646..b62cb249b426 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -204,7 +204,7 @@ OUString TargetsTable::GetNameProposal()
 m_xControl->set_text(nRowIndex, sContent, 2);
 m_xControl->set_text(nRowIndex, pTarget->bCaseSensitive ? OUString("Yes") 
: OUString("No"), 3);
 m_xControl->set_text(nRowIndex, pTarget->bWholeWords ? OUString("Yes") : 
OUString("No"), 4);
-}
+}*/
 
 IMPL_LINK_NOARG(SfxAutoRedactDialog, Load, Button*, void)
 {
@@ -213,7 +213,7 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, Load, Button*, void)
 StartFileDialog(StartFileDialogType::Open, "Load Targets");
 }
 
-IMPL_LINK_NOARG(SfxAutoRedactDialog, Save, Button*, void)
+/*IMPL_LINK_NOARG(SfxAutoRedactDialog, Save, Button*, void)
 {
 //Allow saving the targets into a file
 StartFileDialog(StartFileDialogType::SaveAs, "Save Targets");
@@ -370,11 +370,11 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, DeleteHdl, Button*, 
void)
 m_aTableTargets.erase(m_aTableTargets.begin() + (i - delta));
 m_xTargetsBox->remove(i - delta++);
 }
-}
+}*/
 
 namespace
 {
-boost::property_tree::ptree redactionTargetToJSON(RedactionTarget* pTarget)
+/*boost::property_tree::ptree redactionTargetToJSON(RedactionTarget* pTarget)
 {
 boost::property_tree::ptree aNode;
 aNode.put("sName", pTarget->sName.toUtf8().getStr());
@@ -385,7 +385,7 @@ boost::property_tree::ptree 
redactionTargetToJSON(RedactionTarget* pTarget)
 aNode.put("nID", pTarget->nID);
 
 return aNode;
-}
+}*/
 
 RedactionTarget* JSONtoRedactionTarget(const 
boost::property_tree::ptree::value_type& rValue)
 {
@@ -421,7 +421,7 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, LoadHdl, 
sfx2::FileDialogHelper*, void)
 osl::File::getSystemPathFromFileURL(sTargetsFile, sSysPath);
 sTargetsFile = sSysPath;
 
-weld::WaitObject aWaitObject(getDialog());
+EnterWait();
 
 try
 {
@@ -440,7 +440,7 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, LoadHdl, 
sfx2::FileDialogHelper*, void)
  aTargetsJSON.get_child("RedactionTargets"))
 {
 RedactionTarget* pTarget = JSONtoRedactionTarget(rValue);
-addTarget(pTarget);
+m_pTargetsBox->InsertTarget(pTarget);
 }
 }
 catch (css::uno::Exception& e)
@@ -450,11 +450,13 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, LoadHdl, 
sfx2::FileDialogHelper*, void)
 

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/mmaddressblockpage.cxx |   13 +
 sw/uiconfig/swriter/ui/mmaddressblockpage.ui |8 +---
 2 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 5e01eb45862a59e1d68efabd725b69219fd3bee1
Author: Caolán McNamara 
AuthorDate: Fri Aug 23 13:15:36 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 21:14:17 2019 +0200

give address page an initial size req of its max size

so it won't jump around in size on activation

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

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 51d00b0b53da..9f20fac6a0b6 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -97,6 +97,19 @@ 
SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(SwMailMergeWizard* pWiz
 Link aLink = LINK(this, SwMailMergeAddressBlockPage, 
InsertDataHdl_Impl);
 m_xPrevSetIB->connect_clicked(aLink);
 m_xNextSetIB->connect_clicked(aLink);
+
+// lock in preferred size including current address line
+Size aSize1(m_xContainer->get_preferred_size());
+
+OUString sOrigLabel = m_xAddressListPB->get_label();
+m_xAddressListPB->set_label(m_sChangeAddress);
+Size aSize2(m_xContainer->get_preferred_size());
+m_xAddressListPB->set_label(sOrigLabel);
+
+m_xCurrentAddressFI->hide();
+
+m_xContainer->set_size_request(std::max(aSize1.Width(), aSize2.Width()),
+   std::max(aSize1.Height(), aSize2.Height()));
 }
 
 SwMailMergeAddressBlockPage::~SwMailMergeAddressBlockPage()
diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui 
b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
index a79532185440..b5008b95b9b2 100644
--- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
+++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
@@ -90,8 +90,8 @@
 
 
   
+True
 False
-True
 Current address list: %1
 1
   
@@ -114,7 +114,8 @@
 True
 Select the address list containing the 
address data you want to use. This data is needed to create the address 
block.
 True
-56
+40
+40
 0
 0
   
@@ -181,7 +182,8 @@
 True
 Match the field name used in the mail merge 
to the column headers in your data source.
 True
-56
+40
+40
 0
 0
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: stoc/test

[Stephan Bergmann (via logerrit)]

 stoc/test/uriproc/test_uriproc.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit c4c2e14b1b2cbd234772ca6f2be2a85528b6bc13
Author: Stephan Bergmann 
AuthorDate: Thu Aug 22 10:34:59 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 21:11:38 2019 +0200

Clarify a corner case

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

diff --git a/stoc/test/uriproc/test_uriproc.cxx 
b/stoc/test/uriproc/test_uriproc.cxx
index 918cd1af1a15..b601eb3a1e04 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -979,7 +979,17 @@ void Test::testMakeAbsolute() {
   css::uri::RelativeUriExcessParentSegments_REMOVE, "scheme://a#s2" },
 
 { "schema://a", "schema://b/c/../d", true, 
css::uri::RelativeUriExcessParentSegments_REMOVE,
-  "schema://b/d" } };
+  "schema://b/d" },
+
+// Per RFC 3986 Section 5.2.1 "Pre-parse the Base URI", "Normalization 
of the base URI
+// [...; esp. dot-segment removal per Section 6.2.2.3 "Path Segment 
Normalization"] is
+// optional" (and not done by our implemenation), so if the relative 
URI has no scheme and
+// no authority and an empty path, the Base URI's path is used 
unmodified per Section 5.2.2
+// "Transform References" and thus still contains dot-segments:
+{ "scheme:/a/../b/c", "", true, 
css::uri::RelativeUriExcessParentSegments_REMOVE,
+  "scheme:/a/../b/c" },
+{ "scheme:/a/../b/c", "d", true, 
css::uri::RelativeUriExcessParentSegments_REMOVE,
+  "scheme:/b/d" } };
 for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
 css::uno::Reference< css::uri::XUriReference > baseUriRef(
 m_uriFactory->parse(
___
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' - sw/qa writerfilter/source

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf119809.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |   11 +++
 writerfilter/source/dmapper/DomainMapper.cxx |5 +++--
 writerfilter/source/dmapper/SdtHelper.cxx|3 +++
 writerfilter/source/dmapper/SdtHelper.hxx|5 +
 5 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 0c7b24745bad049ce57ec13afb6f6c4e7210c2a3
Author: Tamás Zolnai 
AuthorDate: Fri Aug 23 17:24:40 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Aug 23 21:04:18 2019 +0200

tdf#119809: FILESAVE DOCX The combo box ActiveX control is lost

The problem was with the empty combobox. The implemenation before this
commit imported a combobox only when the combobox had any item.

Reviewed-on: https://gerrit.libreoffice.org/78024
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 3ceefe9abff98fc24ffb5e8e405f4999faddc351)

Change-Id: I945098277d1ed34c65b43f0f6ad8eb361cf41b53

diff --git a/sw/qa/extras/ooxmlexport/data/tdf119809.docx 
b/sw/qa/extras/ooxmlexport/data/tdf119809.docx
new file mode 100644
index ..977938253108
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf119809.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 04e8442cac40..506d17729e01 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class Test : public SwModelTestBase
 {
@@ -555,6 +556,16 @@ DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), getProperty(xShape, 
"FillTransparence"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
+{
+// Combobox without an item list lost during import
+uno::Reference xControlShape(getShape(1), 
uno::UNO_QUERY);
+uno::Reference 
xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
+uno::Reference xServiceInfo(xPropertySet, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(true, 
bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox")));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< uno::Sequence 
>(xPropertySet, "StringItemList").getLength());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 673037ee884e..f2e7270b5597 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1037,7 +1037,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 else
 m_pImpl->setSdtEndDeferred(true);
 
-if (!m_pImpl->m_pSdtHelper->getDropDownItems().empty())
+if (m_pImpl->m_pSdtHelper->isInsideDropDownControl())
 m_pImpl->m_pSdtHelper->createDropDownControl();
 else if (m_pImpl->m_pSdtHelper->validateDateFormat())
 m_pImpl->m_pSdtHelper->createDateContentControl();
@@ -2553,6 +2553,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 case NS_ooxml::LN_CT_SdtPr_dropDownList:
 case NS_ooxml::LN_CT_SdtPr_comboBox:
 {
+m_pImpl->m_pSdtHelper->setInsideDropDownControl(true);
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if (pProperties.get() != nullptr)
 pProperties->resolve(*this);
@@ -3326,7 +3327,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 }
 
 bool bNewLine = len == 1 && (sText[0] == 0x0d || sText[0] == 0x07);
-if (!m_pImpl->m_pSdtHelper->getDropDownItems().empty())
+if (m_pImpl->m_pSdtHelper->isInsideDropDownControl())
 {
 if (bNewLine)
 // Dropdown control has single-line texts, so in case of newline, 
create the control.
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index eec3438fa2a4..80ac2e6eb650 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -65,6 +65,7 @@ awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& 
pStyleSheet, OUString co
 
 SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
 : m_rDM_Impl(rDM_Impl)
+, m_bInsideDropDownControl(false)
 , m_bHasElements(false)
 , m_bOutsideAParagraph(false)
 {
@@ -74,6 +75,7 @@ SdtHelper::~SdtHelper() = default;
 
 void SdtHelper::createDropDownControl()
 {
+assert(m_bInsideDropDownControl);
 OUString aDefaultText = m_aSdtTexts.makeStringAndClear();
 uno::Reference 
xControlModel(m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.form.component.ComboBox"),
 uno::UNO_QUERY);
 uno::Reference xPropertySet(xControlModel, 
uno::UNO_QUERY);
@@ -84,6 +86,7 @@ void SdtHelper::createDropDownControl()
 createControlShape(lcl_getOpt

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

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf119809.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   11 +++
 writerfilter/source/dmapper/DomainMapper.cxx |5 +++--
 writerfilter/source/dmapper/SdtHelper.cxx|3 +++
 writerfilter/source/dmapper/SdtHelper.hxx|5 +
 5 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 1a9e0d78edd9808030c5a7b6511a915f742fb67b
Author: Tamás Zolnai 
AuthorDate: Fri Aug 23 17:24:40 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Aug 23 20:07:33 2019 +0200

tdf#119809: FILESAVE DOCX The combo box ActiveX control is lost

The problem was with the empty combobox. The implemenation before this
commit imported a combobox only when the combobox had any item.

Reviewed-on: https://gerrit.libreoffice.org/78024
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 3ceefe9abff98fc24ffb5e8e405f4999faddc351)

Change-Id: I945098277d1ed34c65b43f0f6ad8eb361cf41b53

diff --git a/sw/qa/extras/ooxmlexport/data/tdf119809.docx 
b/sw/qa/extras/ooxmlexport/data/tdf119809.docx
new file mode 100644
index ..977938253108
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf119809.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 7e4220866902..51ee0463272f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -301,6 +302,16 @@ DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), getProperty(xShape, 
"FillTransparence"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
+{
+// Combobox without an item list lost during import
+uno::Reference xControlShape(getShape(1), 
uno::UNO_QUERY);
+uno::Reference 
xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
+uno::Reference xServiceInfo(xPropertySet, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(true, 
bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox")));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< uno::Sequence 
>(xPropertySet, "StringItemList").getLength());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 0c788dbb9c41..e408b74df7e0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1016,7 +1016,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 else
 m_pImpl->setSdtEndDeferred(true);
 
-if (!m_pImpl->m_pSdtHelper->getDropDownItems().empty())
+if (m_pImpl->m_pSdtHelper->isInsideDropDownControl())
 m_pImpl->m_pSdtHelper->createDropDownControl();
 else if (m_pImpl->m_pSdtHelper->validateDateFormat())
 m_pImpl->m_pSdtHelper->createDateContentControl();
@@ -2393,6 +2393,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 case NS_ooxml::LN_CT_SdtPr_dropDownList:
 case NS_ooxml::LN_CT_SdtPr_comboBox:
 {
+m_pImpl->m_pSdtHelper->setInsideDropDownControl(true);
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if (pProperties.get() != nullptr)
 pProperties->resolve(*this);
@@ -3167,7 +3168,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 }
 
 bool bNewLine = len == 1 && (sText[0] == 0x0d || sText[0] == 0x07);
-if (!m_pImpl->m_pSdtHelper->getDropDownItems().empty())
+if (m_pImpl->m_pSdtHelper->isInsideDropDownControl())
 {
 if (bNewLine)
 // Dropdown control has single-line texts, so in case of newline, 
create the control.
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 5e56340e0b80..a2f9c8131375 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -72,6 +72,7 @@ static awt::Size lcl_getOptimalWidth(const 
StyleSheetTablePtr& pStyleSheet, OUSt
 
 SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
 : m_rDM_Impl(rDM_Impl)
+, m_bInsideDropDownControl(false)
 , m_bHasElements(false)
 , m_bOutsideAParagraph(false)
 {
@@ -81,6 +82,7 @@ SdtHelper::~SdtHelper() = default;
 
 void SdtHelper::createDropDownControl()
 {
+assert(m_bInsideDropDownControl);
 OUString aDefaultText = m_aSdtTexts.makeStringAndClear();
 uno::Reference 
xControlModel(m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.form.component.ComboBox"),
 uno::UNO_QUERY);
 uno::Reference xPropertySet(xControlModel, 
uno::UNO_QUERY);
@@ -91,6 +93,7 @@ void SdtHelper::createDropDownControl()
 createControlShape(lcl_getOptimalWidth(m_rDM_Im

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

[Mike Kaganski (via logerrit)]

 sc/source/core/data/table2.cxx |  115 +
 1 file changed, 82 insertions(+), 33 deletions(-)

New commits:
commit effde02da2ec4fed5e9e0552be99bd20ac15566c
Author: Mike Kaganski 
AuthorDate: Tue Jul 16 16:14:49 2019 +1000
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 20:39:16 2019 +0200

tdf#126418: add some more checks for allocated columns

Change-Id: Ia91f0f11c9d7bcec5b9ecc2f8a28d9e4f6212dc5
Reviewed-on: https://gerrit.libreoffice.org/75671
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 159db459418a2c831bf00dca5a2c5087d65e9ab6)
Reviewed-on: https://gerrit.libreoffice.org/77442
Reviewed-by: Noel Grandin 
(cherry picked from commit 7a42bf4caa46093ced87a4db54b94f6b4c4decd0)
Reviewed-on: https://gerrit.libreoffice.org/77704
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 98f316424cbd..1f62b1a9418d 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -534,15 +534,39 @@ void ScTable::CopyToClip(
 void ScTable::CopyStaticToDocument(
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const 
SvNumberFormatterMergeMap& rMap, ScTable* pDestTab )
 {
-if (nCol1 > nCol2)
+if (nCol1 > nCol2 || nRow1 > nRow2)
 return;
 
-for (SCCOL i = nCol1; i <= nCol2; ++i)
+const SCCOL nFirstUnallocated = 
std::clamp(GetAllocatedColumnsCount(), nCol1, nCol2 + 1);
+if (nFirstUnallocated > nCol1)
+pDestTab->CreateColumnIfNotExists(nFirstUnallocated - 1);
+
+for (SCCOL i = nCol1; i < nFirstUnallocated; ++i)
 {
 ScColumn& rSrcCol = aCol[i];
 ScColumn& rDestCol = pDestTab->aCol[i];
 rSrcCol.CopyStaticToDocument(nRow1, nRow2, rMap, rDestCol);
 }
+
+// Maybe copy this table's default attrs to dest not limiting to already 
allocated in dest?
+const SCCOL nLastInDest = 
std::min(pDestTab->GetAllocatedColumnsCount() - 1, nCol2);
+for (SCCOL i = nFirstUnallocated; i <= nLastInDest; ++i)
+{
+ScColumn& rDestCol = pDestTab->aCol[i];
+rDestCol.maCellTextAttrs.set_empty(nRow1, nRow2);
+rDestCol.maCells.set_empty(nRow1, nRow2);
+for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
+{
+sal_uInt32 nNumFmt = 
aDefaultColAttrArray.GetPattern(nRow)->GetNumberFormat(
+pDocument->GetNonThreadedContext().GetFormatTable());
+SvNumberFormatterMergeMap::const_iterator itNum = 
rMap.find(nNumFmt);
+if (itNum != rMap.end())
+nNumFmt = itNum->second;
+
+rDestCol.SetNumberFormat(nRow, nNumFmt);
+}
+rDestCol.CellStorageModified();
+}
 }
 
 void ScTable::CopyCellToDocument(SCCOL nSrcCol, SCROW nSrcRow, SCCOL nDestCol, 
SCROW nDestRow, ScTable& rDestTab )
@@ -550,8 +574,21 @@ void ScTable::CopyCellToDocument(SCCOL nSrcCol, SCROW 
nSrcRow, SCCOL nDestCol, S
 if (!ValidColRow(nSrcCol, nSrcRow) || !ValidColRow(nDestCol, nDestRow))
 return;
 
+if (nSrcCol >= GetAllocatedColumnsCount())
+{
+if (nDestCol < rDestTab.GetAllocatedColumnsCount())
+{
+ScColumn& rDestCol = rDestTab.aCol[nDestCol];
+rDestCol.maCells.set_empty(nDestRow, nDestRow);
+rDestCol.maCellTextAttrs.set_empty(nDestRow, nDestRow);
+rDestCol.maCellNotes.set_empty(nDestRow, nDestRow);
+rDestCol.CellStorageModified();
+}
+return;
+}
+
 ScColumn& rSrcCol = aCol[nSrcCol];
-ScColumn& rDestCol = rDestTab.aCol[nDestCol];
+ScColumn& rDestCol = rDestTab.CreateColumnIfNotExists(nDestCol);
 rSrcCol.CopyCellToDocument(nSrcRow, nDestRow, rDestCol);
 }
 
@@ -1055,7 +1092,7 @@ ScColumn* ScTable::FetchColumn( SCCOL nCol )
 
 const ScColumn* ScTable::FetchColumn( SCCOL nCol ) const
 {
-if (!ValidCol(nCol))
+if (!ValidCol(nCol) || nCol >= GetAllocatedColumnsCount())
 return nullptr;
 
 return &aCol[nCol];
@@ -1084,6 +1121,7 @@ void ScTable::StartListeners( sc::StartListeningContext& 
rCxt, bool bAll )
 void ScTable::AttachFormulaCells(
 sc::StartListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2 )
 {
+nCol2 = ClampToAllocatedColumns(nCol2);
 for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
 aCol[nCol].AttachFormulaCells(rCxt, nRow1, nRow2);
 }
@@ -1091,6 +1129,7 @@ void ScTable::AttachFormulaCells(
 void ScTable::DetachFormulaCells(
 sc::EndListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2 )
 {
+nCol2 = ClampToAllocatedColumns(nCol2);
 for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
 aCol[nCol].DetachFormulaCells(rCxt, nRow1, nRow2, nullptr);
 }
@@ -1438,7 +1477,7 @@ void ScTable::SetEditText( SCCOL nCol, SCROW nRow, const 
EditTextObject& rEditTe
 if (!ValidColRow(nCol, nRow))
  

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-1' - svx/source

[Regina Henschel (via logerrit)]

 svx/source/svdraw/svdopath.cxx |   71 +
 1 file changed, 44 insertions(+), 27 deletions(-)

New commits:
commit 7bdaab829a4e17eabba0559cf9a4ac62bd7a6fbe
Author: Regina Henschel 
AuthorDate: Wed Aug 21 14:11:23 2019 +0200
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 20:38:01 2019 +0200

tdf#126271 Revert "tdf120965 Simplify SdrPathObj::AddToHdlList()"

This reverts commit 26001f4f84b0d921c8612d56613735ba5314.

Change-Id: Ib4df476b405e65be9203ab376c9c68b03198c040
Reviewed-on: https://gerrit.libreoffice.org/77882
Tested-by: Regina Henschel 
Reviewed-by: Regina Henschel 
(cherry picked from commit 59189f3e02acbdf4e5bbd35fc278252b30022f43)
Reviewed-on: https://gerrit.libreoffice.org/77939
Tested-by: Jenkins
(cherry picked from commit 6f9e19c85ffc290e600084b33d9a929db28c144d)
Reviewed-on: https://gerrit.libreoffice.org/78007
Reviewed-by: Xisco Faulí 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 12a7b2c1af39..9b4e5f060310 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2008,45 +2008,62 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) 
const
 
 void SdrPathObj::AddToPlusHdlList(SdrHdlList& rHdlList, SdrHdl& rHdl) const
 {
-// exclude some error situations
-const XPolyPolygon aPathPolyPolygon(GetPathPoly());
+// keep old stuff to be able to keep old SdrHdl stuff, too
+const XPolyPolygon aOldPathPolygon(GetPathPoly());
+sal_uInt16 nPnt = static_cast(rHdl.GetPointNum());
 sal_uInt16 nPolyNum = static_cast(rHdl.GetPolyNum());
-if (nPolyNum>=aPathPolyPolygon.Count())
-return;
 
-const XPolygon& rXPoly = aPathPolyPolygon[nPolyNum];
-sal_uInt16 nPntCount = rXPoly.GetPointCount();
-if (nPntCount<=0)
+if (nPolyNum>=aOldPathPolygon.Count())
 return;
 
-sal_uInt16 nPnt = static_cast(rHdl.GetPointNum());
-if (nPnt>=nPntCount)
-return;
+const XPolygon& rXPoly = aOldPathPolygon[nPolyNum];
+sal_uInt16 nPntMax = rXPoly.GetPointCount();
 
-if (rXPoly.IsControl(nPnt))
+if (nPntMax<=0)
+return;
+nPntMax--;
+if (nPnt>nPntMax)
 return;
 
-// segment before
-if (nPnt==0 && IsClosed())
-nPnt=nPntCount-1;
-if (nPnt>0 && rXPoly.IsControl(nPnt-1))
+// calculate the number of plus points
+sal_uInt16 nCnt = 0;
+if (rXPoly.GetFlags(nPnt)!=PolyFlags::Control)
 {
-std::unique_ptr pHdl(new SdrHdlBezWgt(&rHdl));
-pHdl->SetPos(rXPoly[nPnt-1]);
-pHdl->SetPointNum(nPnt-1);
-pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
-pHdl->SetPlusHdl(true);
-rHdlList.AddHdl(std::move(pHdl));
+if (nPnt==0 && IsClosed())
+nPnt=nPntMax;
+if (nPnt>0 && rXPoly.GetFlags(nPnt-1)==PolyFlags::Control)
+nCnt++;
+if (nPnt==nPntMax && IsClosed())
+nPnt=0;
+if (nPnt(rHdl.GetPointNum());
 std::unique_ptr pHdl(new SdrHdlBezWgt(&rHdl));
-pHdl->SetPos(rXPoly[nPnt+1]);
-pHdl->SetPointNum(nPnt+1);
+pHdl->SetPolyNum(rHdl.GetPolyNum());
+
+if (nPnt==0 && IsClosed())
+nPnt=nPntMax;
+if (nPnt>0 && rXPoly.GetFlags(nPnt-1)==PolyFlags::Control && 
nPlusNum==0)
+{
+pHdl->SetPos(rXPoly[nPnt-1]);
+pHdl->SetPointNum(nPnt-1);
+}
+else
+{
+if (nPnt==nPntMax && IsClosed())
+nPnt=0;
+if (nPntSetPos(rXPoly[nPnt+1]);
+pHdl->SetPointNum(nPnt+1);
+}
+}
+
 pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
 pHdl->SetPlusHdl(true);
 rHdlList.AddHdl(std::move(pHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-1' - sc/uiconfig

[Caolán McNamara (via logerrit)]

 sc/uiconfig/scalc/ui/conditionalentry.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 909d532b10118881e36d27194756bbf26e443c58
Author: Caolán McNamara 
AuthorDate: Mon Aug 19 21:34:24 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 20:38:42 2019 +0200

Resolves: tdf#126781 don't let width grow to fit condition text

make the label have no part of the width calc by giving it a small
width request and force it to live with with the rest of the dialog
ends up as

Change-Id: Iae3012b6acfd63ba527727f022e999b144c6a941
Reviewed-on: https://gerrit.libreoffice.org/2
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 16eaea5fe8c3e9942b36f6d9969886191f25620c)
Reviewed-on: https://gerrit.libreoffice.org/77794
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui 
b/sc/uiconfig/scalc/ui/conditionalentry.ui
index 717f9a252048..85134870d0b0 100644
--- a/sc/uiconfig/scalc/ui/conditionalentry.ui
+++ b/sc/uiconfig/scalc/ui/conditionalentry.ui
@@ -40,8 +40,11 @@
 
 
   
+10
 True
 False
+True
+end
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch |   24 
+++---
 1 file changed, 19 insertions(+), 5 deletions(-)

New commits:
commit caabc3f9fc0b7640966bd55ca0a2bc42f255a945
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 17:08:12 2019 +0200
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 20:23:19 2019 +0200

external/liborcus: Blind fix attempt for older macOS builds, take 3

One more place that needs a workaround like
5c2c08f635c30b732df48faca7ba3d411074e05a "external/liborcus: Blind fix 
attempt
for older macOS builds" and ee02218eb9aaa36f37619cb16bb389762e1785b2
"external/liborcus: Blind fix attempt for older macOS builds, take 2".

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

diff --git 
a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
index 17bbf6393bf7..a25a42fd2549 100644
--- a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
+++ b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
@@ -1,4 +1,4 @@
-From 37e7b4629c06c241e2fbd33c1897b384875bcbd3 Mon Sep 17 00:00:00 2001
+From a0d47fff81ac100192ada343574da75d992dd00d Mon Sep 17 00:00:00 2001
 From: Stephan Bergmann 
 Date: Fri, 23 Aug 2019 10:26:51 +0200
 Subject: [PATCH] Blind fix attempt for older macOS builds
@@ -46,11 +46,11 @@ MacOSX10.13.sdk, but not sure with what Clang and libc++ 
versions):
 
 )
 ---
- src/liborcus/xml_map_tree.cpp | 12 
- 1 file changed, 8 insertions(+), 4 deletions(-)
+ src/liborcus/xml_map_tree.cpp | 15 ++-
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
-index 8338b930..f66b1ff6 100644
+index 8338b930..1a9251c8 100644
 --- a/src/liborcus/xml_map_tree.cpp
 +++ b/src/liborcus/xml_map_tree.cpp
 @@ -211,12 +211,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_child(
@@ -97,7 +97,21 @@ index 8338b930..f66b1ff6 100644
  element_unlinked,
  reference_unknown
  )
-@@ -789,11 +792,12 @@ xml_map_tree::element* xml_map_tree::get_element(const 
pstring& xpath)
+@@ -748,11 +751,12 @@ xml_map_tree::linked_node_type 
xml_map_tree::get_linked_node(const pstring& xpat
+ if (it != attrs.end())
+ throw xpath_error("This attribute is already linked.  You can't 
link the same attribute twice.");
+ 
++auto const nm = m_names.intern(token.name.get(), 
token.name.size()).first;
+ attribute* p = m_attribute_pool.construct(
+ attribute::args_type(
+ *this,
+ token.ns,
+-m_names.intern(token.name.get(), token.name.size()).first,
++nm,
+ ref_type
+ )
+ );
+@@ -789,11 +793,12 @@ xml_map_tree::element* xml_map_tree::get_element(const 
pstring& xpath)
  if (token.attribute)
  throw xpath_error("root element cannot be an attribute.");
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 include/vcl/combobox.hxx |1 +
 include/vcl/lstbox.hxx   |1 +
 include/vcl/weld.hxx |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 93e3945330cd231e05c637aefe00419cb14f2ab7
Author: Miklos Vajna 
AuthorDate: Fri Aug 23 10:08:16 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 23 20:03:50 2019 +0200

vcl: document ComboBox vs ListBox

These are two separate VCL classes, but merged together for weld, which
confused me.

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

diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 0080e39dfda5..1993d00e0ae6 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -30,6 +30,7 @@
 
 class UserDrawEvent;
 
+/// A widget used to choose from a list of items and which has an entry.
 class VCL_DLLPUBLIC ComboBox : public Edit
 {
 private:
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index df42d7b6b9d2..4e6130a7dd18 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -74,6 +74,7 @@ class ImplBtn;
 class ImplWin;
 class ImplListBoxWindow;
 
+/// A widget used to choose from a list of items and which has no entry.
 class VCL_DLLPUBLIC ListBox : public Control
 {
 private:
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 61deac2be88a..3200164f1da6 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -514,6 +514,7 @@ enum class EntryMessageType
 Error,
 };
 
+/// A widget used to choose from a list of items.
 class VCL_DLLPUBLIC ComboBox : virtual public Container
 {
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf119809.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   10 ++
 writerfilter/source/dmapper/DomainMapper.cxx |5 +++--
 writerfilter/source/dmapper/SdtHelper.cxx|3 +++
 writerfilter/source/dmapper/SdtHelper.hxx|5 +
 5 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 3ceefe9abff98fc24ffb5e8e405f4999faddc351
Author: Tamás Zolnai 
AuthorDate: Fri Aug 23 17:24:40 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Aug 23 20:01:04 2019 +0200

tdf#119809: FILESAVE DOCX The combo box ActiveX control is lost

The problem was with the empty combobox. The implemenation before this
commit imported a combobox only when the combobox had any item.

Change-Id: I945098277d1ed34c65b43f0f6ad8eb361cf41b53
Reviewed-on: https://gerrit.libreoffice.org/78024
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf119809.docx 
b/sw/qa/extras/ooxmlexport/data/tdf119809.docx
new file mode 100644
index ..977938253108
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf119809.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index f8bafc76d47c..ea5b48b33397 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -586,6 +586,16 @@ DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), getProperty(xShape, 
"FillTransparence"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
+{
+// Combobox without an item list lost during import
+uno::Reference xControlShape(getShape(1), 
uno::UNO_QUERY);
+uno::Reference 
xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
+uno::Reference xServiceInfo(xPropertySet, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(true, 
bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox")));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< uno::Sequence 
>(xPropertySet, "StringItemList").getLength());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index c7c57a7682ad..871d84735059 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1017,7 +1017,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 else
 m_pImpl->setSdtEndDeferred(true);
 
-if (!m_pImpl->m_pSdtHelper->getDropDownItems().empty())
+if (m_pImpl->m_pSdtHelper->isInsideDropDownControl())
 m_pImpl->m_pSdtHelper->createDropDownControl();
 else if (m_pImpl->m_pSdtHelper->validateDateFormat())
 m_pImpl->m_pSdtHelper->createDateContentControl();
@@ -2421,6 +2421,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 case NS_ooxml::LN_CT_SdtPr_dropDownList:
 case NS_ooxml::LN_CT_SdtPr_comboBox:
 {
+m_pImpl->m_pSdtHelper->setInsideDropDownControl(true);
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if (pProperties.get() != nullptr)
 pProperties->resolve(*this);
@@ -3208,7 +3209,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 }
 
 bool bNewLine = len == 1 && (sText[0] == 0x0d || sText[0] == 0x07);
-if (!m_pImpl->m_pSdtHelper->getDropDownItems().empty())
+if (m_pImpl->m_pSdtHelper->isInsideDropDownControl())
 {
 if (bNewLine)
 // Dropdown control has single-line texts, so in case of newline, 
create the control.
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 322834de7ac9..4022f67270e5 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -69,6 +69,7 @@ static awt::Size lcl_getOptimalWidth(const 
StyleSheetTablePtr& pStyleSheet,
 
 SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
 : m_rDM_Impl(rDM_Impl)
+, m_bInsideDropDownControl(false)
 , m_bHasElements(false)
 , m_bOutsideAParagraph(false)
 {
@@ -78,6 +79,7 @@ SdtHelper::~SdtHelper() = default;
 
 void SdtHelper::createDropDownControl()
 {
+assert(m_bInsideDropDownControl);
 OUString aDefaultText = m_aSdtTexts.makeStringAndClear();
 uno::Reference xControlModel(
 
m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.form.component.ComboBox"),
@@ -92,6 +94,7 @@ void SdtHelper::createDropDownControl()
 lcl_getOptimalWidth(m_rDM_Impl.GetStyleSheetTable(), aDefaultText, 
m_aDropDownItems),
 xControlModel, uno::Sequence());
 m_aDropDownItems.clear();
+m_bInsideDropDownControl = false;
 }
 
 bool SdtHelper::validateDateFormat()
diff --git a/writerfilter/source/dmapper/SdtH

Re: GSoC'19 Final Report [ Improvement to Notebookbar]

[Olr]

Thanks for your work.
This is useful.

Regards,
Olivier



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - include/svx include/xmloff svx/source sw/inc sw/source xmloff/source

[Noel Grandin (via logerrit)]

 include/svx/framelink.hxx   |6 +++---
 include/svx/svdobj.hxx  |2 ++
 include/svx/svdoedge.hxx|2 ++
 include/svx/svdovirt.hxx|2 +-
 include/svx/txenctab.hxx|2 +-
 include/svx/unoshape.hxx|2 +-
 include/xmloff/xmlcnimp.hxx |4 ++--
 include/xmloff/xmlimp.hxx   |8 
 svx/source/accessibility/AccessibleControlShape.cxx |2 +-
 svx/source/dialog/txenctab.cxx  |2 +-
 svx/source/fmcomp/fmgridif.cxx  |   12 +---
 svx/source/svdraw/svdovirt.cxx  |2 +-
 svx/source/svdraw/svdpage.cxx   |   10 +-
 svx/source/unodraw/unoshap4.cxx |2 +-
 sw/inc/dcontact.hxx |2 +-
 sw/source/core/draw/dcontact.cxx|2 +-
 xmloff/source/core/SvXMLAttrCollection.cxx  |4 ++--
 xmloff/source/core/SvXMLAttrCollection.hxx  |4 ++--
 xmloff/source/core/xmlcnimp.cxx |4 ++--
 xmloff/source/core/xmlimp.cxx   |8 
 xmloff/source/text/txtflde.cxx  |   12 ++--
 21 files changed, 44 insertions(+), 50 deletions(-)

New commits:
commit bc50aa40f9ad790c7a9afc1dd9059ac0755be3fe
Author: Noel Grandin 
AuthorDate: Fri Aug 23 16:41:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 19:35:46 2019 +0200

loplugin:returnconstval in xmloff

Change-Id: I200080ff1c44544fdb8211e58228fd62465f3732
Reviewed-on: https://gerrit.libreoffice.org/78020
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx
index 338a48f753ac..c987e9943138 100644
--- a/include/xmloff/xmlcnimp.hxx
+++ b/include/xmloff/xmlcnimp.hxx
@@ -47,8 +47,8 @@ public:
   const OUString& rValue );
 
 size_t GetAttrCount() const;
-const OUString GetAttrNamespace( size_t i ) const;
-const OUString GetAttrPrefix( size_t i ) const;
+OUString GetAttrNamespace( size_t i ) const;
+OUString GetAttrPrefix( size_t i ) const;
 const OUString& GetAttrLName( size_t i ) const;
 const OUString& GetAttrValue( size_t i ) const;
 
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 33ab9dab9d68..9713f720f08a 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -376,10 +376,10 @@ public:
 // get import helper for events
 XMLEventImportHelper& GetEventImport();
 
-static const OUString getNameFromToken( sal_Int32 nToken );
-static const OUString getNamespacePrefixFromToken(sal_Int32 nToken, const 
SvXMLNamespaceMap* pMap);
-static const OUString getNamespaceURIFromToken( sal_Int32 nToken );
-static const OUString getNamespacePrefixFromURI( const OUString& rURI );
+static OUString getNameFromToken( sal_Int32 nToken );
+static OUString getNamespacePrefixFromToken(sal_Int32 nToken, const 
SvXMLNamespaceMap* pMap);
+static OUString getNamespaceURIFromToken( sal_Int32 nToken );
+static OUString getNamespacePrefixFromURI( const OUString& rURI );
 
 SvXMLNamespaceMap& GetNamespaceMap() { return *mpNamespaceMap; }
 const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; 
}
diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx 
b/xmloff/source/core/SvXMLAttrCollection.cxx
index fd79079a7a40..7217aee6393d 100644
--- a/xmloff/source/core/SvXMLAttrCollection.cxx
+++ b/xmloff/source/core/SvXMLAttrCollection.cxx
@@ -130,7 +130,7 @@ const OUString& SvXMLAttrCollection::GetAttrValue(size_t i) 
const
 return aAttrs[i].getValue();
 }
 
-const OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const
+OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const
 {
 OUString sRet;
 sal_uInt16 nPos = GetPrefixPos( i );
@@ -140,7 +140,7 @@ const OUString SvXMLAttrCollection::GetAttrNamespace( 
size_t i ) const
 return sRet;
 }
 
-const OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const
+OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const
 {
 OUString sRet;
 sal_uInt16 nPos = GetPrefixPos( i );
diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx 
b/xmloff/source/core/SvXMLAttrCollection.hxx
index feed18820a26..e029491ce182 100644
--- a/xmloff/source/core/SvXMLAttrCollection.hxx
+++ b/xmloff/source/core/SvXMLAttrCollection.hxx
@@ -52,8 +52,8 @@ public:
 size_t GetAttrCount() const;
 const OUString& GetAttrLName(size_t i) const;
 const OUString& GetAttrValue(size_t i) const;
-const OUString GetAttrNamespace( size_t i ) const;
-const OUString GetAttrPrefix( size_t i ) const;
+OUString GetAttrNamespace( size_t i ) const;
+OUString GetAttrPrefix( size_t i ) const;
 const O

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

[Noel Grandin (via logerrit)]

 include/oox/core/xmlfilterbase.hxx|2 +-
 include/oox/ole/axcontrol.hxx |2 +-
 include/oox/ppt/pptimport.hxx |2 +-
 include/oox/shape/ShapeFilterBase.hxx |2 +-
 oox/source/drawingml/fillproperties.cxx   |2 +-
 oox/source/ppt/pptimport.cxx  |2 +-
 oox/source/shape/ShapeFilterBase.cxx  |2 +-
 sc/source/filter/excel/xestream.cxx   |2 +-
 sc/source/filter/inc/excelfilter.hxx  |2 +-
 sc/source/filter/inc/xestream.hxx |2 +-
 sc/source/filter/oox/excelfilter.cxx  |2 +-
 sd/source/filter/eppt/epptooxml.hxx   |2 +-
 sw/source/filter/ww8/docxexportfilter.hxx |2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 09cd0e363d6c5b0e7b9cebc598030a7e3d397922
Author: Noel Grandin 
AuthorDate: Fri Aug 23 14:59:48 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 19:34:49 2019 +0200

loplugin:returnconstval in oox

Change-Id: Id83744fcb90d1bf6e6fe048858f48a4944351494
Reviewed-on: https://gerrit.libreoffice.org/78013
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/oox/core/xmlfilterbase.hxx 
b/include/oox/core/xmlfilterbase.hxx
index 4f828abf82eb..68bd801eaefd 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -102,7 +102,7 @@ public:
 virtual void useInternalChartDataTable( bool /*bInternal*/ ) { }
 
 /** Has to be implemented by each filter to return the table style list. */
-virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() 
= 0;
+virtual ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0;
 
 
 OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rPart 
);
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 968360a5b39b..d1d47459bdb8 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -334,7 +334,7 @@ public:
 PropertySet const & rPropSet,
 sal_Int32& nOrientation );
 
-const css::uno::Reference GetDocModel() const { return 
mxDocModel; }
+const css::uno::Reference & GetDocModel() const { 
return mxDocModel; }
 
 private:
 css::uno::Reference< css::frame::XModel > mxDocModel;
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index c97a6f8c4f57..c5ff1b1e5a0c 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -62,7 +62,7 @@ public:
 
 virtual const ::oox::drawingml::Theme* getCurrentTheme() const override;
 virtual ::oox::vml::Drawing* getVmlDrawing() override;
-virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() 
override;
+virtual oox::drawingml::table::TableStyleListPtr getTableStyles() override;
 virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() 
override;
 
 const SlidePersistPtr&  
getActualSlidePersist() const { return mpActualSlidePersist; };
diff --git a/include/oox/shape/ShapeFilterBase.hxx 
b/include/oox/shape/ShapeFilterBase.hxx
index 50d80f39cae9..b0ddbff4e217 100644
--- a/include/oox/shape/ShapeFilterBase.hxx
+++ b/include/oox/shape/ShapeFilterBase.hxx
@@ -56,7 +56,7 @@ public:
 virtual ::oox::vml::Drawing* getVmlDrawing() override;
 
 /** Has to be implemented by each filter to return TableStyles. */
-virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() 
override;
+virtual ::oox::drawingml::table::TableStyleListPtr getTableStyles() 
override;
 
 virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() 
override;
 
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 81d46dae8a23..82c48426d1a2 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -132,7 +132,7 @@ RectanglePoint lclGetRectanglePoint( sal_Int32 nToken )
 return RectanglePoint_LEFT_TOP;
 }
 
-const awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const 
Reference< XGraphic >& rxGraphic )
+awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const 
Reference< XGraphic >& rxGraphic )
 {
 awt::Size aSizeHmm( 0, 0 );
 try
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index a5ef6c54150d..efc10c69af97 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -254,7 +254,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< 
PropertyValue >& rDe
 return mpActualSlidePersist ? mpActualSlidePersist->getDrawing() : nullptr;
 }
 
-const oox::drawingml::table::TableStyleListPtr 
PowerPointImport::getTableStyles()
+oox::drawingml::table::TableStyleListPtr PowerPointImport::getTableStyles()
 {
 if ( !mpTableStyleList && !maTableStyleListPath.isEmpty() )
 {
diff --git a/oox/source/shape/ShapeFilterBase.cxx 
b/o

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

[Miklos Vajna (via logerrit)]

 vcl/source/control/button.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 306180ac17ad6f3edfe403fb5b79232717f8e75f
Author: Miklos Vajna 
AuthorDate: Fri Aug 23 16:55:11 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 23 19:01:22 2019 +0200

tdf#98130 vcl CheckBox: fix incorrect ignored mouse event

Regression from commit 53ef550ac6fc3505914c3d77e9d0575913e54bb3 (vcl
button: Delegate RenderContext to sub-methods, use Invalidate,
2015-04-28), the problem was that when clicking on the middle checkbox
in the second row of the bugdoc, the click was simply ignored, the
checkbox widget remained in unchecked state.

The above commit changed CheckBox::GetFocus() so that it uses
Invalidate() instead of ImplDrawCheckBox(), which looks innocent, but
ImplDrawCheckBox() resulted in a call to CheckBox::ImplDraw(), which (as
a side effect) initialized maMouseRect to a non-empty rectangle.

Now in case GetFocus() was followed by MouseButtonDown() immediately,
then that ignored the mouse event as the event position wasn't in the
mouse rectangle.

Fix this by updating the window right after the invalidate, this way we
still don't paint directly, but MouseButtonDown() already has a correct
maMouseRect.

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

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 27b6bd4f9b0e..ad70daed0d15 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3378,6 +3378,9 @@ void CheckBox::GetFocus()
 aSize.AdjustWidth(2 );
 setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height() );
 Invalidate();
+// Trigger drawing to initialize the mouse rectangle, otherwise the 
mouse button down
+// handler would ignore the mouse event.
+Update();
 }
 else
 ShowFocus( ImplGetFocusRect() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-1' - 2 commits - framework/inc framework/Library_fwk.mk framework/source include/svx sd/source svx/source sw/source

[Noel Grandin (via logerrit)]

 framework/Library_fwk.mk   |1 
 framework/inc/helper/statusindicatorfactory.hxx|7 --
 framework/inc/helper/wakeupthread.hxx  |   57 +++
 framework/source/helper/statusindicatorfactory.cxx |   25 
 framework/source/helper/wakeupthread.cxx   |   60 +
 include/svx/pszctrl.hxx|2 
 include/svx/zoomctrl.hxx   |2 
 sd/source/ui/app/tmplctrl.cxx  |1 
 svx/source/stbctrls/insctrl.cxx|1 
 svx/source/stbctrls/pszctrl.cxx|   31 --
 svx/source/stbctrls/zoomctrl.cxx   |   12 ++--
 sw/source/uibase/utlui/bookctrl.cxx|1 
 sw/source/uibase/utlui/tmplctrl.cxx|1 
 sw/source/uibase/utlui/zoomctrl.cxx|6 --
 14 files changed, 170 insertions(+), 37 deletions(-)

New commits:
commit cc730643359a000d61e8817fe0168e239678283d
Author: Noel Grandin 
AuthorDate: Fri Aug 16 15:33:15 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 18:04:21 2019 +0200

tdf#126819 Can't retrieve the mouse position written in the statusbar

regression from
commit 77e260f915e0c77ddb1e915e9fd27ab0bdccc763
Date:   Mon Jul 8 11:22:12 2019 +0200
tdf#121793 speedup VCLXAccessibleStatusBarItem::GetItemText

Make the custom StatusBarControls set better text on their parent
StatusBar. Also remove some unnecessary work being done in the Paint
methods, to reduce confusion.

Change-Id: I3b0a0af3b01d3b01f85ab335a3eb5993c07a50f4
Reviewed-on: https://gerrit.libreoffice.org/77586
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit c53f3f8f58f55d0978fb968446975856d72a52f8)
Reviewed-on: https://gerrit.libreoffice.org/77697
(cherry picked from commit 3638ac34cab9b8db8454267f53f43f216a373eda)
Reviewed-on: https://gerrit.libreoffice.org/77705
Tested-by: Xisco Faulí 

diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index d22e0ba05d18..faf8923d94cc 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -39,6 +39,8 @@ public:
 virtual voidStateChanged( sal_uInt16 nSID, SfxItemState eState, const 
SfxPoolItem* pState ) override;
 virtual voidPaint( const UserDrawEvent& rEvt ) override;
 virtual voidCommand( const CommandEvent& rCEvt ) override;
+private:
+void ImplUpdateItemText();
 };
 
 #endif
diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index afd3130e2c20..e0daa4b971ca 100644
--- a/include/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
@@ -40,6 +40,8 @@ public:
 
 SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& 
rStb );
 
+private:
+void ImplUpdateItemText();
 };
 
 class SVX_DLLPUBLIC SvxZoomPageStatusBarControl : public SfxStatusBarControl
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 2c27db05bafb..c78f1a3ef126 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -89,7 +89,6 @@ void SdTemplateControl::StateChanged(
 
 void SdTemplateControl::Paint( const UserDrawEvent&  )
 {
-GetStatusBar().SetItemText( GetId(), msTemplate );
 }
 
 void SdTemplateControl::Command( const CommandEvent& rCEvt )
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 952f82332f8e..eaad418e4909 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -65,7 +65,6 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , 
SfxItemState eState,
 
 void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
 {
-DrawItemText_Impl();
 }
 
 void SvxInsertStatusBarControl::DrawItemText_Impl()
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 474ca2c81f0d..06877c8f06e4 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -231,6 +231,7 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( 
sal_uInt16 _nSlotId,
 addStatusListener( STR_POSITION); // SID_ATTR_POSITION
 addStatusListener( STR_TABLECELL);   // SID_TABLE_CELL
 addStatusListener( STR_FUNC);// SID_PSZ_FUNCTION
+ImplUpdateItemText();
 }
 
 /*  [Description]
@@ -334,12 +335,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 
nSID, SfxItemState eSt
 
 GetStatusBar().SetItemData( GetId(), nullptr );
 
-//  set only strings as text at the statusBar, so that the Help-Tips
-//  can work with the text, when it is too long for the statusBar
-OUString aText;
-if ( pImpl->bTable )
-aText = pImpl->aStr;
-GetStatusBar().SetItemText( GetId(), aText );
+ImplUpdateItemText();
 }
 
 
@@ -461,4 +457,27 @@ void SvxPosSizeStatusBarControl::Paint( const 
UserDrawEvent& rUsrEvt )
 pDev->SetFillColor( aOldFillColor );
 }
 
+void SvxPosSizeStatusBa

[Libreoffice-commits] core.git: offapi/com

[Stephan Bergmann (via logerrit)]

 offapi/com/sun/star/text/NumberingLevel.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f8dea0b01fcbc7ca8d2ff218605c61956989d0a8
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 16:05:05 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 17:30:44 2019 +0200

fix link

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

diff --git a/offapi/com/sun/star/text/NumberingLevel.idl 
b/offapi/com/sun/star/text/NumberingLevel.idl
index 9362bb7b3f04..18d98aa5ff35 100644
--- a/offapi/com/sun/star/text/NumberingLevel.idl
+++ b/offapi/com/sun/star/text/NumberingLevel.idl
@@ -145,7 +145,7 @@ published service NumberingLevel
 [property] long FirstLineOffset;
 
 
-/** specifies the type of numbering. @see NumberingType
+/** specifies the type of numbering. @see 
com::sun::star::style::NumberingType
  */
 [property] short NumberingType;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 external/harfbuzz/ExternalProject_harfbuzz.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4b73cbd8d07cdefefc6d99e2a584e0b15de1be84
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 08:43:14 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 17:30:10 2019 +0200

external/harfbuzz configure needs MAKE now

...after 352924a64750bb99aec54feea3af0121603c12a8 "Update HarfBbuzz to 
2.6.0",
where it started to fail for me on Windows with

> config.status: error: in 
`/cygdrive/c/lo/core/workdir/UnpackedTarball/harfbuzz':
> config.status: error: Something went wrong bootstrapping makefile 
fragments
> for automatic dependency tracking.  Try re-running configure with the
> '--disable-dependency-tracking' option to at least be able to build
> the package (albeit without support for automatic dependency 
tracking).
> See `config.log' for more details
> make[1]: *** 
[C:/lo/core/external/harfbuzz/ExternalProject_harfbuzz.mk:24: 
C:/lo/core/workdir/ExternalProject/harfbuzz/build] Error 1

because it didn't find any `make` (I only have an /opt/lo/bin/make 
installed).

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

diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 9bb2f5b9bc71..50def834b4d2 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(CXXFLAGS) $(CXXFLAGS_CXX11) \
$(ICU_UCHAR_TYPE) \
$(if $(filter 
LINUX,$(OS)),-fvisibility=hidden)' \
+   MAKE=$(MAKE) \
&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Python.xba |   16 +++---
 wizards/source/access2base/access2base.py |   47 +++---
 2 files changed, 30 insertions(+), 33 deletions(-)

New commits:
commit 4b0a01911be5ec69b6c7e24b6eb854bb0a9bf208
Author: Jean-Pierre Ledure 
AuthorDate: Fri Aug 23 16:58:39 2019 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Fri Aug 23 16:58:39 2019 +0200

Access2Base - (Python) Explicit missing arguments

Avoid confusion between Null, Empty and missing arguments
by creating a "missing" symbolic constants
and use it as argument when appropriate
Adapt Basic wrapper accordingly

Change-Id: Iede8a66ac348a041b984f124948cd65032946d7d

diff --git a/wizards/source/access2base/Python.xba 
b/wizards/source/access2base/Python.xba
index 0ef8a7e96fbc..94a44215995d 100644
--- a/wizards/source/access2base/Python.xba
+++ b/wizards/source/access2base/Python.xba
@@ -101,7 +101,7 @@ Const cstApplication = -1, cstDoCmd = -2
 Const cstScalar = 0, cstObject = 1, cstNull = 2, cstUNO = 3
 
 'Conventional special values
-Const cstNoArgs = "+++NOARGS+++", cstSymEmpty = 
"+++EMPTY+++", cstSymNull = "+++NULL+++"
+Const cstNoArgs = "+++NOARGS+++", cstSymEmpty = 
"+++EMPTY+++", cstSymNull = "+++NULL+++", cstSymMissing = 
"+++MISSING+++"
 
 
'https://support.office.com/en-us/article/CallByName-fonction-49ce9475-c315-4f13-8d35-e98cfe98729a
 'Determines the pvCallType
@@ -124,15 +124,15 @@ Const vbGet = 2, vbLet = 4, vbMethod = 1, vbSet = 8, 
vbUNO = 16
vArg = Empty
ElseIf vArg = cstSymNull Then
vArg = Null
+   ElseIf vArg = cstSymMissing Then
+   Exit For'  Next arguments 
must be missing also
Else
vArg = _CDate(vArg)
End If
End If
-   If Not IsEmpty(vArg) Then
-   iNbArgs = iNbArgs + 1
-   ReDim Preserve vArgs(iNbArgs)
-   vArgs(iNbArgs) = vArg
-   End If
+   iNbArgs = iNbArgs + 1
+   ReDim Preserve vArgs(iNbArgs)
+   vArgs(iNbArgs) = vArg
Next i
End If
 
@@ -222,10 +222,6 @@ Const vbGet = 2, vbLet = 4, vbMethod = 1, vbSet = 8, vbUNO 
= 16
If vObject._Type = 
"COLLECTION" And vObject._CollType = COLLTABLEDEFS Then vArgs = 
Array(_A2B_.PythonCache(vArgs(0)))
Case "Close"
sSCript = "mClose"
-   Case "Find"
-   For i = 0 To UBound(vArgs)
-   If IsNull(vArgs(i)) Then 
vArgs(i) = Empty
-   Next i
Case "Type"
sScript = "pType"
Case Else
diff --git a/wizards/source/access2base/access2base.py 
b/wizards/source/access2base/access2base.py
index ca4a2b64bd19..af14a880cb3d 100644
--- a/wizards/source/access2base/access2base.py
+++ b/wizards/source/access2base/access2base.py
@@ -73,6 +73,7 @@ class acConstants(object, metaclass = _Singleton):
 # -
 Empty = '+++EMPTY+++'
 Null = '+++NULL+++'
+Missing = '+++MISSING+++'
 FromIsoFormat = '%Y-%m-%d %H:%M:%S' # To be used with 
datetime.datetime.strptime()
 
 # AcCloseSave
@@ -684,19 +685,19 @@ class Application(object, metaclass = _Singleton):
 basicmodule = -1
 
 @classmethod
-def AllDialogs(cls, dialog = None):
+def AllDialogs(cls, dialog = acConstants.Missing):
 return cls.W(_vbMethod, cls.basicmodule, 'AllDialogs', dialog)
 @classmethod
-def AllForms(cls, form = None):
+def AllForms(cls, form = acConstants.Missing):
 return cls.W(_vbMethod, cls.basicmodule, 'AllForms', form)
 @classmethod
-def AllModules(cls, module = None):
+def AllModules(cls, module = acConstants.Missing):
 return cls.W(_vbMethod, cls.basicmodule, 'AllModules', module)
 @classmethod
 def CloseConnection(cls):
 return cls.W(_vbMethod, cls.basicmodule, 'CloseConnection')
 @classmethod
-def CommandBars(cls, bar = None):
+def CommandBars(cls, bar = acConstants.Missing):
 return cls.W(_vbMethod, cls.basicmodule, 'CommandBars', bar)
 @classmethod
 def CurrentDb(cls):
@@ -738,7 +739,7 @@ class Application(object, metaclass = _Singleton):
 def Events(cls, event):
 return cls.W(_vbMethod, cls.basicmodule, 'Events', event)
 @classmethod
-def Forms(cls, form = None):
+def Forms(cls, 

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

[Stephan Bergmann (via logerrit)]

 external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch |   71 
+-
 1 file changed, 64 insertions(+), 7 deletions(-)

New commits:
commit ee02218eb9aaa36f37619cb16bb389762e1785b2
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 14:38:32 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 16:41:11 2019 +0200

external/liborcus: Blind fix attempt for older macOS builds, take 2

More places that need a workaround like 
5c2c08f635c30b732df48faca7ba3d411074e05a
"external/liborcus: Blind fix attempt for older macOS builds".

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

diff --git 
a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
index 4b77cb1be933..17bbf6393bf7 100644
--- a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
+++ b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
@@ -1,4 +1,4 @@
-From 46221fdfc62e317d34def4ebede814cf2bb14ebb Mon Sep 17 00:00:00 2001
+From 37e7b4629c06c241e2fbd33c1897b384875bcbd3 Mon Sep 17 00:00:00 2001
 From: Stephan Bergmann 
 Date: Fri, 23 Aug 2019 10:26:51 +0200
 Subject: [PATCH] Blind fix attempt for older macOS builds
@@ -30,27 +30,84 @@ MacOSX10.13.sdk, but not sure with what Clang and libc++ 
versions):
 > Makefile:1804: recipe for target 'liborcus_0.15_la-xml_map_tree.lo' failed
 > make[5]: *** [liborcus_0.15_la-xml_map_tree.lo] Error 1
 
-(while building orcus as part of LibreOffice)
+(while building orcus as part of LibreOffice).
+
+(Using "nm" instead of a more descriptive variable name "name" to avoid
+-Wshadow warnings like
+
+> xml_map_tree.cpp: In member function ‘orcus::xml_map_tree::element* 
orcus::xml_map_tree::element::get_or_create_child(orcus::xml_map_tree&, 
orcus::xmlns_id_t, const orcus::pstring&)’:
+> xml_map_tree.cpp:214:16: warning: declaration of ‘name’ shadows a member of 
‘orcus::xml_map_tree::element’ [-Wshadow]
+>   214 | auto const name = sp.intern(_name.get(), _name.size()).first;
+>   |^~~~
+> In file included from xml_map_tree.cpp:8:
+> xml_map_tree.hpp:126:17: note: shadowed declaration is here
+>   126 | pstring name;
+>   | ^~~~
+
+)
 ---
- src/liborcus/xml_map_tree.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/liborcus/xml_map_tree.cpp | 12 
+ 1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
-index 8338b930..8fd40534 100644
+index 8338b930..f66b1ff6 100644
 --- a/src/liborcus/xml_map_tree.cpp
 +++ b/src/liborcus/xml_map_tree.cpp
 @@ -211,12 +211,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_child(
  string_pool& sp = parent.m_names;
  
  // Insert a new element of this name.
-+auto const name = sp.intern(_name.get(), _name.size()).first;
++auto const nm = sp.intern(_name.get(), _name.size()).first;
  child_elements->push_back(
  parent.m_element_pool.construct(
  element::args_type(
  parent,
  _ns,
 -sp.intern(_name.get(), _name.size()).first,
-+name,
++nm,
+ element_unlinked,
+ reference_unknown
+ )
+@@ -251,12 +252,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_linked_child(
+ string_pool& sp = parent.m_names;
+ 
+ // Insert a new linked element of this name.
++auto const nm = sp.intern(_name.get(), _name.size()).first;
+ child_elements->push_back(
+ parent.m_element_pool.construct(
+ element::args_type(
+ parent,
+ _ns,
+-sp.intern(_name.get(), _name.size()).first,
++nm,
+ element_linked,
+ _ref_type
+ )
+@@ -699,11 +701,12 @@ xml_map_tree::linked_node_type 
xml_map_tree::get_linked_node(const pstring& xpat
+ if (token.attribute)
+ throw xpath_error("root element cannot be an attribute.");
+ 
++auto const nm = m_names.intern(token.name).first;
+ mp_root = m_element_pool.construct(
+ element::args_type(
+ *this,
+ token.ns,
+-m_names.intern(token.name).first,
++nm,
+ element_unlinked,
+ reference_unknown
+ )
+@@ -789,11 +792,12 @@ xml_map_tree::element* xml_map_tree::get_element(const 
pstring& xpath)
+ if (token.attribute)
+ throw xpath_error("root element cannot be an attribute.");
+ 
++auto const nm = m_names.intern(token.name).first;
+ mp_root = m_element_pool.construct(
+ element::args_type(
+ *this,

[Libreoffice-commits] core.git: chart2/source dbaccess/source include/vcl sw/source sw/uiconfig vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/dlg_CreationWizard.cxx |8 -
 chart2/source/controller/inc/dlg_CreationWizard.hxx |2 
 dbaccess/source/ui/dlg/dbwizsetup.cxx   |8 -
 dbaccess/source/ui/inc/dbwizsetup.hxx   |1 
 include/vcl/roadmapwizard.hxx   |5 
 sw/source/ui/dbui/mailmergewizard.cxx   |   62 ++
 sw/source/ui/dbui/mmaddressblockpage.cxx|9 -
 sw/source/ui/dbui/mmaddressblockpage.hxx|4 
 sw/source/ui/dbui/mmdocselectpage.cxx   |9 -
 sw/source/ui/dbui/mmdocselectpage.hxx   |3 
 sw/source/ui/dbui/mmgreetingspage.hxx   |2 
 sw/source/ui/dbui/mmlayoutpage.cxx  |1 
 sw/source/ui/dbui/mmlayoutpage.hxx  |2 
 sw/source/ui/dbui/mmoutputtypepage.cxx  |8 -
 sw/source/ui/dbui/mmoutputtypepage.hxx  |3 
 sw/source/ui/dialog/swdlgfact.cxx   |   19 +--
 sw/source/ui/dialog/swdlgfact.hxx   |   10 -
 sw/source/uibase/inc/mailmergewizard.hxx|   12 --
 sw/uiconfig/swriter/ui/mmaddressblockpage.ui|   91 ++--
 sw/uiconfig/swriter/ui/mmoutputtypepage.ui  |   12 +-
 sw/uiconfig/swriter/ui/mmsalutationpage.ui  |4 
 vcl/source/app/salvtables.cxx   |   26 ++--
 vcl/source/control/wizardmachine.cxx|   14 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx|   86 ++-
 24 files changed, 150 insertions(+), 251 deletions(-)

New commits:
commit 693d9ff29e7838bafcad5faa7a4e7355807c54cb
Author: Caolán McNamara 
AuthorDate: Thu Aug 22 09:15:51 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 16:28:12 2019 +0200

weld SwMailMergeWizard

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

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx 
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 58a744980556..85f263b1c21f 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -80,14 +80,6 @@ CreationWizard::CreationWizard(weld::Window* pParent, const 
uno::Referenceset_current_page(0);
 }
 
-short CreationWizard::run()
-{
-int nRet = vcl::RoadmapWizardMachine::run();
-if (nRet == static_cast(WizardButtonFlags::FINISH))
-return ui::dialogs::ExecutableDialogResults::OK;
-return ui::dialogs::ExecutableDialogResults::CANCEL;
-}
-
 CreationWizard::~CreationWizard() = default;
 
 VclPtr CreationWizard::createPage(WizardState nState)
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx 
b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 8562d6365020..db64d9d1cb9d 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -50,8 +50,6 @@ public:
 virtual void setInvalidPage(TabPage * pTabPage) override;
 virtual void setValidPage(TabPage * pTabPage) override;
 
-virtual short run() override;
-
 protected:
 virtual bool leaveState( WizardState _nState ) override;
 virtual WizardState determineNextState(WizardState nCurrentState) const 
override;
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index bc1bd79c581e..cc901bd84817 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -174,14 +174,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(weld::Window* 
_pParent
 m_xAssistant->set_current_page(0);
 }
 
-short ODbTypeWizDialogSetup::run()
-{
-int nRet = vcl::RoadmapWizardMachine::run();
-if (nRet == static_cast(WizardButtonFlags::FINISH))
-return ui::dialogs::ExecutableDialogResults::OK;
-return ui::dialogs::ExecutableDialogResults::CANCEL;
-}
-
 void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId 
_nPathId, const vcl::RoadmapWizardTypes::WizardPath& _rPaths)
 {
 bool bHasAuthentication = DataSourceMetaData::getAuthentication( _sURL ) 
!= AuthNone;
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx 
b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 171c58bfbba1..16969b467ee3 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -118,7 +118,6 @@ public:
 */
 bool IsTableWizardToBeStarted() const;
 
-virtual short run() override;
 private:
 /// to override to create new pages
 virtual VclPtr createPage(WizardState _nState) override;
diff --git a/include/vcl/roadmapwizard.hxx b/include/vcl/roadmapwizard.hxx
index de70169fdbcc..b94b89f61a38 100644
--- a/include/vcl/roadmapwizard.hxx
+++ b/include/vcl/road

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/acConstants.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61f75f05adb171064d9ba17b4684069de36fa11a
Author: Jean-Pierre Ledure 
AuthorDate: Fri Aug 23 15:50:03 2019 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Fri Aug 23 15:50:03 2019 +0200

Access2Base - Change version number

6.4 i.o. 6.3

Change-Id: I0a03de3ad6b67373f809433cd3dba6c2a7a461b3

diff --git a/wizards/source/access2base/acConstants.xba 
b/wizards/source/access2base/acConstants.xba
index d61cf0b31dc4..e1c04bd6f9be 100644
--- a/wizards/source/access2base/acConstants.xba
+++ b/wizards/source/access2base/acConstants.xba
@@ -9,7 +9,7 @@ REM 

 Option Explicit
 
 REM Access2Base -
-Global Const Access2Base_Version = "6.3.0"   '  
Alignment on LibreOffice versions
+Global Const Access2Base_Version = "6.4.0"   '  
Alignment on LibreOffice versions
 
 REM AcCloseSave
 REM -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 03e2d2a906288f520a4b046d5b96dfba759b27b0
Author: Miklos Vajna 
AuthorDate: Thu May 9 11:32:56 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 23 15:48:29 2019 +0200

svx lok: fix crash on select all when there is no mpMarkedObj yet

Fixes the online.git HTTPWSTest::testRenderShapeSelectionImpress()
testcase by reverting one hunk of commit
3fb298f673db169a38c1258d66ec24821386eb40 (lok: writer: svg export
transformed images, 2019-03-26).

This was probably meant to be a cleanup, but getting the sdr mark,
followed by getting the sdr object of the mark always gives us a shape,
while directly accessing mpMarkedObj does not.

Change-Id: Id733ba5c6fdf6fc86a3e9f7de62b4bdcbf9b06db
Reviewed-on: https://gerrit.libreoffice.org/72039
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/72566
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti 
(cherry picked from commit b359e4816a9d40beb79f1f87be1c0d12a59555f7)

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b6cd8a3426ef..5ce4ccc84518 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -847,7 +847,8 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
 {
 if (GetMarkedObjectCount())
 {
-SdrObject* pO = mpMarkedObj;
+SdrMark* pM = GetSdrMarkByIndex(0);
+SdrObject* pO = pM->GetMarkedSdrObj();
 long nRotAngle = pO->GetRotateAngle();
 // true if we are delaing with a RotGrfFlyFrame
 // (SwVirtFlyDrawObj with a SwGrfNode)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 include/svx offapi/com offapi/UnoApi_offapi.mk sc/source sd/source sfx2/source svx/source sw/source

[Noel Grandin (via logerrit)]

 include/sfx2/sfxbasemodel.hxx |   22 +++--
 include/svx/AccessibleControlShape.hxx|3 
 include/svx/AccessibleShape.hxx   |   13 +--
 include/svx/AccessibleShapeTreeInfo.hxx   |8 -
 offapi/UnoApi_offapi.mk   |2 
 offapi/com/sun/star/document/XShapeEventBroadcaster.idl   |   55 +
 offapi/com/sun/star/document/XShapeEventListener.idl  |   49 
 sc/source/ui/Accessibility/DrawModelBroadcaster.cxx   |   36 
 sc/source/ui/inc/DrawModelBroadcaster.hxx |9 +-
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |6 -
 sd/source/ui/accessibility/AccessiblePageShape.cxx|   14 ---
 sd/source/ui/inc/AccessiblePageShape.hxx  |5 -
 sfx2/source/doc/sfxbasemodel.cxx  |   44 ++
 svx/source/accessibility/AccessibleShape.cxx  |   57 +-
 svx/source/accessibility/AccessibleShapeTreeInfo.cxx  |2 
 svx/source/accessibility/ChildrenManagerImpl.cxx  |2 
 sw/source/core/access/accmap.cxx  |   46 ++-
 17 files changed, 288 insertions(+), 85 deletions(-)

New commits:
commit ec940941e0bd7db15c5cf7d43df82226e0d849dc
Author: Noel Grandin 
AuthorDate: Tue Aug 20 17:03:13 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 15:11:27 2019 +0200

tdf#119388 add new UNO listener/broadcaster

so that we only need to fire each event to the exact shape that wants
it, instead of spamming all the shapes.
Takes deleting a column from 20s to 10s for me.

Note that none of the broadcasters are calling disposing(EventObject),
so I did not make XShapeEventListener extend lang::XEventListener.
If a memory leak regression points at this commit, possibly I
missed something.

Change-Id: I2b8db08247d3e0203d41faf77491368168994e4d
Reviewed-on: https://gerrit.libreoffice.org/77857
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 9dcba7e68542..92c69b5c3bc9 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -119,7 +120,7 @@ typedef ::cppu::WeakImplHelper  <   css::container::XChild
 ,   css::rdf::XDocumentMetadataAccess
 ,   css::document::XDocumentRecovery
 ,   css::document::XUndoManagerSupplier
-,   css::document::XEventBroadcaster
+,   
css::document::XShapeEventBroadcaster
 ,   
css::document::XDocumentEventBroadcaster
 ,   css::lang::XEventListener
 ,   css::document::XEventsSupplier
@@ -494,24 +495,33 @@ public:
 virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL 
getScriptContainer() override;
 
 
-//  XEventBroadcaster
-
+//  document::XEventBroadcaster
 
 
/**___
 @descr  -   registers the given XEventListener.
 */
-
 virtual void SAL_CALL addEventListener( const css::uno::Reference< 
css::document::XEventListener >& xListener ) override;
 
 
/**___
 @descr  -   unregisters the given XEventListener.
 */
-
 virtual void SAL_CALL removeEventListener( const css::uno::Reference< 
css::document::XEventListener >& xListener ) override;
 
 
-//  XDocumentEventBroadcaster
+//  document::XShapeEventBroadcaster
+
+
/**___
+@descr  -   registers the given XEventListener.
+*/
+virtual void SAL_CALL addShapeEventListener( const css::uno::Reference< 
css::drawing::XShape >& xShape, const css::uno::Reference< 
css::document::XShapeEventListener >& xListener ) override;
 
+
/**___
+@descr  -   unregisters the given XEventListener.
+*/
+virtual void SAL_CALL removeShapeEventListener( const css::uno::Reference< 
css::drawing::XShape >& xShape, const css::uno::Reference< 
css::document::XShapeEventListener >& xListener ) override;
+
+
+//  XDocumentEventBroadcaster
 
 virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< 
css::document::XDocumentEventListener >& Listener ) override;
 virtual void SAL_CALL remove

Re: [API CHANGE] Adapt css.uri UNOIDL entities to RFC 3986

[Stephan Bergmann]

On 21/08/2019 08:59, Stephan Bergmann wrote:
If there is no objections over the coming days, I'm going to push this 
to master soon.


done, 
 
"[API CHANGE] Adapt css.uri UNOIDL entities to RFC 3986" (release notes 
at 
 
"css.uri RFC 3986 update")

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-66'

[Andras Timar (via logerrit)]

Tag 'cp-5.3-66' created by Andras Timar  at 
2019-08-23 12:57 +

cp-5.3-66

Changes since cp-5.3-65-57:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-66'

[Andras Timar (via logerrit)]

Tag 'cp-5.3-66' created by Andras Timar  at 
2019-08-23 12:57 +

cp-5.3-66

Changes since cp-5.3-36-8:
---
 0 files changed
---
___
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-5.3' - 57 commits - configure.ac cppcanvas/source download.lst external/nss filter/source include/sfx2 oox/source scripting/source sc/source

[Andras Timar (via logerrit)]

 configure.ac |2 
 cppcanvas/source/mtfrenderer/emfplus.cxx |2 
 download.lst |4 
 external/nss/UnpackedTarball_nss.mk  |3 
 external/nss/clang-cl.patch.0|   14 
 external/nss/nss-chromium-nss-static.patch   |  487 --
 external/nss/nss-more-static.patch   |   39 
 external/nss/nss.fix-freebl-add-lcc-support.patch.1  |   11 
 external/nss/nss.patch   |   13 
 filter/source/msfilter/msdffimp.cxx  |   32 
 filter/source/xsltfilter/OleHandler.cxx  |2 
 include/sfx2/objsh.hxx   |2 
 oox/source/drawingml/shapecontext.cxx|4 
 oox/source/shape/WpsContext.cxx  |   13 
 oox/source/vml/vmlshape.cxx  |3 
 sc/source/core/data/column3.cxx  |2 
 sc/source/core/data/document.cxx |2 
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx   |2 
 sc/source/ui/docshell/externalrefmgr.cxx |   53 
 scripting/source/protocolhandler/scripthandler.cxx   |9 
 scripting/source/pyprov/pythonscript.py  |   16 
 sd/source/filter/ppt/pptin.cxx   |2 
 sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx |5 
 sfx2/source/doc/objmisc.cxx  |   55 
 sfx2/source/notify/eventsupplier.cxx |   18 
 starmath/source/mathtype.cxx |4 
 svl/source/numbers/zformat.cxx   |4 
 svx/source/svdraw/svdopath.cxx   |3 
 sw/inc/anchoredobject.hxx|1 
 sw/qa/core/data/odt/fail/forcepoint-xstor-1.odt  |binary
 sw/qa/core/data/ooxml/fail/ofz9934-1.docx|binary
 sw/qa/core/data/rtf/fail/forcepoint-4.rtf| 1779 
++
 sw/qa/core/data/ww8/fail/forcepoint-44.doc   |binary
 sw/qa/core/data/ww8/indeterminate/ofz7322-1.doc  |binary
 sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc |binary
 sw/qa/extras/uiwriter/data/tdf114536.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |9 
 sw/source/core/doc/DocumentRedlineManager.cxx|4 
 sw/source/core/doc/docbm.cxx |9 
 sw/source/core/inc/layouter.hxx  |4 
 sw/source/core/layout/anchoredobject.cxx |9 
 sw/source/core/layout/flowfrm.cxx|4 
 sw/source/core/layout/fly.cxx|3 
 sw/source/core/layout/layouter.cxx   |   15 
 sw/source/core/layout/objstmpconsiderwrapinfl.cxx|   27 
 sw/source/core/layout/objstmpconsiderwrapinfl.hxx|1 
 sw/source/core/layout/pagechg.cxx|2 
 sw/source/core/layout/ssfrm.cxx  |5 
 sw/source/core/layout/trvlfrm.cxx|8 
 sw/source/core/text/itrform2.cxx |   13 
 sw/source/core/unocore/unostyle.cxx  |3 
 sw/source/filter/ww8/ww8graf.cxx |   13 
 sw/source/filter/ww8/ww8par.cxx  |3 
 vcl/headless/svpgdi.cxx  |   15 
 vcl/inc/regionband.hxx   |3 
 vcl/source/gdi/region.cxx|8 
 vcl/source/gdi/regionband.cxx|   27 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |7 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   28 
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx  |6 
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx|   20 
 writerfilter/source/rtftok/rtfsdrimport.cxx  |2 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx |   30 
 63 files changed, 2180 insertions(+), 684 deletions(-)

New commits:
co

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.3-66'

[Olivier R (via logerrit)]

Tag 'cp-5.3-66' created by Andras Timar  at 
2019-08-23 12:57 +

cp-5.3-66

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.3-66'

[Andras Timar (via logerrit)]

Tag 'cp-5.3-66' created by Andras Timar  at 
2019-08-23 12:57 +

cp-5.3-66

Changes since libreoffice-5-3-branch-point-28:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-5.3-66'

[Andras Timar (via logerrit)]

Tag 'co-5.3-66' created by Andras Timar  at 
2019-08-23 12:53 +

co-5.3-66

Changes since co-5.3-65-56:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-5.3-66'

[Andras Timar (via logerrit)]

Tag 'co-5.3-66' created by Andras Timar  at 
2019-08-23 12:53 +

co-5.3-66

Changes since cp-5.3-36-8:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/co-5.3-66'

[Andras Timar (via logerrit)]

Tag 'co-5.3-66' created by Andras Timar  at 
2019-08-23 12:53 +

co-5.3-66

Changes since libreoffice-5-3-branch-point-28:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-5.3-66'

[Olivier R (via logerrit)]

Tag 'co-5.3-66' created by Andras Timar  at 
2019-08-23 12:53 +

co-5.3-66

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 stoc/source/uriproc/UriReference.cxx  |8 
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx |6 
 stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx  |9 
 stoc/test/uriproc/test_uriproc.cxx|  656 
+-
 sw/source/ui/dbui/mmaddressblockpage.cxx  |   18 
 sw/source/ui/dbui/mmaddressblockpage.hxx  |   10 
 sw/source/ui/dbui/mmgreetingspage.cxx |4 
 sw/source/ui/dbui/mmgreetingspage.hxx |2 
 sw/source/ui/dbui/mmresultdialogs.cxx |2 
 sw/source/uibase/dbui/mailmergehelper.cxx |   38 
 sw/source/uibase/inc/mailmergehelper.hxx  |6 
 11 files changed, 393 insertions(+), 366 deletions(-)

New commits:
commit 1d524bc7a331e8381e88cfd1b6dea4678ad32514
Author: Caolán McNamara 
AuthorDate: Thu Aug 22 17:30:54 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 14:48:03 2019 +0200

rename AddressPreview back to SwAddressPreview

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

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index f4b7359be648..b95d4344a402 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -74,8 +74,8 @@ 
SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(SwMailMergeWizard* pWiz
 , m_xPrevSetIB(m_xBuilder->weld_button("prev"))
 , m_xNextSetIB(m_xBuilder->weld_button("next"))
 , m_xDifferentlist(m_xBuilder->weld_label("differentlist"))
-, m_xSettings(new 
AddressPreview(m_xBuilder->weld_scrolled_window("settingspreviewwin")))
-, m_xPreview(new 
AddressPreview(m_xBuilder->weld_scrolled_window("addresspreviewwin")))
+, m_xSettings(new 
SwAddressPreview(m_xBuilder->weld_scrolled_window("settingspreviewwin")))
+, m_xPreview(new 
SwAddressPreview(m_xBuilder->weld_scrolled_window("addresspreviewwin")))
 , m_xSettingsWIN(new weld::CustomWeld(*m_xBuilder, "settingspreview", 
*m_xSettings))
 , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addresspreview", 
*m_xPreview))
 {
@@ -246,7 +246,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, 
AddressBlockSelectHdl_Impl, LinkPar
 const sal_uInt16 nSel = m_xSettings->GetSelectedAddress();
 const uno::Sequence< OUString> aBlocks =
 m_pWizard->GetConfigItem().GetAddressBlocks();
-m_xPreview->SetAddress(AddressPreview::FillData(aBlocks[nSel],
+m_xPreview->SetAddress(SwAddressPreview::FillData(aBlocks[nSel],
  
m_pWizard->GetConfigItem()));
 m_pWizard->GetConfigItem().SetCurrentAddressBlockIndex( nSel );
 GetWizard()->UpdateRoadmap();
@@ -291,7 +291,7 @@ void 
SwMailMergeAddressBlockPage::InsertDataHdl(weld::Button* pButton)
 const sal_uInt16 nSel = m_xSettings->GetSelectedAddress();
 const uno::Sequence< OUString> aBlocks =
 m_pWizard->GetConfigItem().GetAddressBlocks();
-m_xPreview->SetAddress(AddressPreview::FillData(aBlocks[nSel], 
rConfig));
+m_xPreview->SetAddress(SwAddressPreview::FillData(aBlocks[nSel], 
rConfig));
 }
 }
 m_xPrevSetIB->set_sensitive(bEnable);
@@ -316,7 +316,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, 
weld::Button&, rButto
 SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(weld::Window* pParent, 
SwMailMergeConfigItem& rConfig)
 : SfxDialogController(pParent, "modules/swriter/ui/selectblockdialog.ui", 
"SelectBlockDialog")
 , m_rConfig(rConfig)
-, m_xPreview(new 
AddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
+, m_xPreview(new 
SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
 , m_xNewPB(m_xBuilder->weld_button("new"))
 , m_xCustomizePB(m_xBuilder->weld_button("edit"))
 , m_xDeletePB(m_xBuilder->weld_button("delete"))
@@ -472,7 +472,7 @@ 
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
 , m_xFieldFT(m_xBuilder->weld_label("customft"))
 , m_xFieldCB(m_xBuilder->weld_combo_box("custom"))
 , m_xOK(m_xBuilder->weld_button("ok"))
-, m_xPreview(new 
AddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
+, m_xPreview(new 
SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
 , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addrpreview", 
*m_xPreview))
 , m_xDragED(new AddressMultiLineEdit(this))
 , m_xDragWIN(new weld::CustomWeld(*m_xBuilder, "addressdest", *m_xDragED))
@@ -569,7 +569,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, 
ListBoxSelectHdl_Impl, weld::TreeView&,
 
 IMPL_LINK_NOARG(SwCustomizeAddres

[Libreoffice-commits] core.git: dbaccess/source stoc/source stoc/test svl/source udkapi/com udkapi/type_reference

[Stephan Bergmann (via logerrit)]

 dbaccess/source/core/dataaccess/databasecontext.cxx   |2 
 dbaccess/source/filter/xml/xmlfilter.cxx  |2 
 stoc/source/uriproc/UriReference.cxx  |   14 
 stoc/source/uriproc/UriReference.hxx  |3 
 stoc/source/uriproc/UriReferenceFactory.cxx   |  375 
+--
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx |2 
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |2 
 stoc/test/uriproc/test_uriproc.cxx|  478 
+-
 svl/source/misc/urihelper.cxx |2 
 udkapi/com/sun/star/uri/UriReferenceFactory.idl   |2 
 udkapi/com/sun/star/uri/XUriReference.idl |   44 
 udkapi/com/sun/star/uri/XUriReferenceFactory.idl  |   31 
 udkapi/com/sun/star/uri/XUriSchemeParser.idl  |2 
 udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl  |3 
 udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl  |3 
 udkapi/type_reference/udkapi.idl  |2 
 16 files changed, 735 insertions(+), 232 deletions(-)

New commits:
commit 5bbf9ca7ccb60c9d90f2cabbe4be4962329fda61
Author: Stephan Bergmann 
AuthorDate: Tue Aug 20 09:38:10 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 14:47:01 2019 +0200

[API CHANGE] Adapt css.uri UNOIDL entities to RFC 3986

...which obsoleted RFC 2396.  Notable changes are that the distinction 
between
hierarchical and opaque URIs has been dropped, and that the relative URI
resolution specification has been made more rigid.

As a consequence, various features of css.uri entities have changed:

* XUriReference.isHierarchical is obsolete and deprecated.

* The behavior of XUriReference.hasAuthority, XUriReference.getAuthority,
  XUriReference.getPath, XUriReference.hasRelativePath,
  XUriReference.getPathSegmentCount, XUriReference.getPathSegment,
  XUriReference.hasQuery, and XUriReference.getQuery has been made 
consistent
  for all URIs, no matter whether they were considered hierarchical or 
opaque in
  the past.

* The behavior of XUriReferenceFactory.makeAbsolute and
  XUriReferenceFactory.makeRelative has been changed to match the RFC 3986
  reference resolution specification.  The 
XUriReferenceFactory.makeAbsolulte
  parameter processSpecialBaseSegments has been renamed to
  processAdditionalSpecialSegments, as per the updated specification it now
  controls treatment of special segments in the given uriReference, in 
addition
  to special segments in the given baseUriReference.  (Renaming UNOIDL 
interface
  method parameters is technically an incompatible change, but the benefits 
of
  improved clarity presumably outweigh any potential drawbacks in this 
case.)

The implementation in stoc has been adapted, and various call sites have 
been
adapted to the deprecated XUriReference.isHierarchical semantics.

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

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 1c6cb283fe29..6e9a38da6552 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -366,7 +366,7 @@ Reference< XInterface > 
ODatabaseContext::loadObjectFromURL(const OUString& _rNa
 {
 // In this case the host contains the real path, and the path is 
the embedded stream name.
 auto const uri = 
css::uri::UriReferenceFactory::create(m_aContext)->parse(_sURL);
-if (uri.is() && uri->isAbsolute() && uri->isHierarchical()
+if (uri.is() && uri->isAbsolute()
 && uri->hasAuthority() && !uri->hasQuery() && 
!uri->hasFragment())
 {
 auto const auth = uri->getAuthority();
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 93175e1d9f1a..80faab524164 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -310,7 +310,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue 
>& rDescriptor )
 // In this case the authority contains the real path, and the 
path is the embedded stream name.
 auto const uri = 
css::uri::UriReferenceFactory::create(GetComponentContext())
 ->parse(sFileName);
-if (uri.is() && uri->isAbsolute() && uri->isHierarchical()
+if (uri.is() && uri->isAbsolute()
 && uri->hasAuthority() && !uri->hasQuery() && 
!uri->hasFr

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/sequenceloop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a251699d728fa6207b71406cd91aafb7803f453
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 09:05:46 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 14:40:19 2019 +0200

Improve loplugin:sequenceloop warning

...from

> sfx2/source/appl/shutdowniconaqua.mm:416:13: error: use std::as_const, or 
make range var const, to avoid creating a copy of the Sequence 
[loplugin:sequenceloop]
> for ( auto const & newMenuProp : aNewMenu )
> ^~~

to

> sfx2/source/appl/shutdowniconaqua.mm:416:46: error: use std::as_const, or 
make range var const, to avoid creating a copy of the Sequence 
[loplugin:sequenceloop]
> for ( auto const & newMenuProp : aNewMenu )
> ~^~

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

diff --git a/compilerplugins/clang/sequenceloop.cxx 
b/compilerplugins/clang/sequenceloop.cxx
index 340412a5137a..735c57d21b8e 100644
--- a/compilerplugins/clang/sequenceloop.cxx
+++ b/compilerplugins/clang/sequenceloop.cxx
@@ -64,7 +64,7 @@ bool SequenceLoop::VisitCXXForRangeStmt(CXXForRangeStmt 
const* forStmt)
 
 report(DiagnosticsEngine::Warning,
"use std::as_const, or make range var const, to avoid creating a 
copy of the Sequence",
-   compat::getBeginLoc(forStmt))
+   compat::getBeginLoc(forStmt->getRangeInit()))
 << forStmt->getSourceRange();
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/dlg/dbwizsetup.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8d71f19550c969bb322460fd7a06021a0421ba66
Author: Caolán McNamara 
AuthorDate: Fri Aug 23 09:55:02 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 13:44:21 2019 +0200

don't call Show on the SfxTabPage

it causes spurious toplevels in the welded case

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

diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 78ec885efa14..bc1bd79c581e 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -556,7 +556,6 @@ VclPtr 
ODbTypeWizDialogSetup::createPage(WizardState _nState)
 defaultButton( _nState == PAGE_DBSETUPWIZARD_FINAL ? 
WizardButtonFlags::FINISH : WizardButtonFlags::NEXT );
 enableButtons( WizardButtonFlags::FINISH, _nState == 
PAGE_DBSETUPWIZARD_FINAL );
 enableButtons( WizardButtonFlags::NEXT, _nState != 
PAGE_DBSETUPWIZARD_FINAL );
-pPage->Show();
 
 m_xAssistant->set_page_title(sIdent, getStateDisplayName(_nState));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 comphelper/source/misc/accimplaccess.cxx |2 +-
 comphelper/source/misc/backupfilehelper.cxx  |2 +-
 comphelper/source/misc/sequenceashashmap.cxx |6 +++---
 include/comphelper/accimplaccess.hxx |2 +-
 include/comphelper/backupfilehelper.hxx  |2 +-
 include/comphelper/sequenceashashmap.hxx |6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit e48deb1d36d2c237badc4d2d8ce6d3be6a1685b2
Author: Noel Grandin 
AuthorDate: Fri Aug 23 10:43:44 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 13:42:19 2019 +0200

loplugin:returnconstval in comphelper

Change-Id: I6e8d45e4d5e6223ffa7ae844a8bd46eae8e1f3c8
Reviewed-on: https://gerrit.libreoffice.org/78000
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/comphelper/source/misc/accimplaccess.cxx 
b/comphelper/source/misc/accimplaccess.cxx
index 8d06e1b91c6e..71a12c8a7e98 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -38,7 +38,7 @@ namespace comphelper
 {
 }
 
-const Sequence< sal_Int8 > 
OAccessibleImplementationAccess::getUnoTunnelImplementationId()
+Sequence< sal_Int8 > 
OAccessibleImplementationAccess::getUnoTunnelImplementationId()
 {
 static cppu::OImplementationId implID;
 
diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index 113edfbea845..268432df3c99 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -2203,7 +2203,7 @@ namespace comphelper
 
 /// helpers ///
 
-const OUString BackupFileHelper::getPackURL()
+OUString BackupFileHelper::getPackURL()
 {
 return OUString(maUserConfigWorkURL + "/pack");
 }
diff --git a/comphelper/source/misc/sequenceashashmap.cxx 
b/comphelper/source/misc/sequenceashashmap.cxx
index 0ba26b689a71..eb78e60c55d2 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -180,7 +180,7 @@ void SequenceAsHashMap::operator>>(css::uno::Sequence< 
css::beans::NamedValue >&
 }
 }
 
-const css::uno::Any SequenceAsHashMap::getAsConstAny(bool 
bAsPropertyValueList) const
+css::uno::Any SequenceAsHashMap::getAsConstAny(bool bAsPropertyValueList) const
 {
 css::uno::Any aDestination;
 if (bAsPropertyValueList)
@@ -190,14 +190,14 @@ const css::uno::Any SequenceAsHashMap::getAsConstAny(bool 
bAsPropertyValueList)
 return aDestination;
 }
 
-const css::uno::Sequence< css::beans::NamedValue > 
SequenceAsHashMap::getAsConstNamedValueList() const
+css::uno::Sequence< css::beans::NamedValue > 
SequenceAsHashMap::getAsConstNamedValueList() const
 {
 css::uno::Sequence< css::beans::NamedValue > lReturn;
 (*this) >> lReturn;
 return lReturn;
 }
 
-const css::uno::Sequence< css::beans::PropertyValue > 
SequenceAsHashMap::getAsConstPropertyValueList() const
+css::uno::Sequence< css::beans::PropertyValue > 
SequenceAsHashMap::getAsConstPropertyValueList() const
 {
 css::uno::Sequence< css::beans::PropertyValue > lReturn;
 (*this) >> lReturn;
diff --git a/include/comphelper/accimplaccess.hxx 
b/include/comphelper/accimplaccess.hxx
index 86b16c8ad97a..46cce628be12 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -65,7 +65,7 @@ namespace comphelper
 public:
 
 private:
-COMPHELPER_DLLPRIVATE static const css::uno::Sequence< sal_Int8 > 
getUnoTunnelImplementationId();
+COMPHELPER_DLLPRIVATE static css::uno::Sequence< sal_Int8 > 
getUnoTunnelImplementationId();
 };
 
 } // namespace comphelper
diff --git a/include/comphelper/backupfilehelper.hxx 
b/include/comphelper/backupfilehelper.hxx
index 11a2593aeb4e..e0a2ca244fb0 100644
--- a/include/comphelper/backupfilehelper.hxx
+++ b/include/comphelper/backupfilehelper.hxx
@@ -184,7 +184,7 @@ namespace comphelper
 
 private:
 // internal helper methods
-static const OUString getPackURL();
+static OUString getPackURL();
 static const std::vector< OUString >& getCustomizationDirNames();
 static const std::vector< OUString >& getCustomizationFileNames();
 
diff --git a/include/comphelper/sequenceashashmap.hxx 
b/include/comphelper/sequenceashashmap.hxx
index ba956f8401e6..8e0d07c524aa 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -158,7 +158,7 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap
 @return A const Any, which
 contains all items of this map.
  */
-const css::uno::Any getAsConstAny(bool bAsPropertyValue) const;
+css::uno::Any getAsConstAny(bool bAsPropertyValue) const;
 
 
 /** @short  return this map instance to as a
@@ -172,7 +172,7 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHa

[Libreoffice-commits] core.git: include/tools tools/source

[Noel Grandin (via logerrit)]

 include/tools/b3dtrans.hxx|4 ++--
 include/tools/wldcrd.hxx  |2 +-
 tools/source/generic/b3dtrans.cxx |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3d9f291cd336dc59d8582e349d5f9e8e86776703
Author: Noel Grandin 
AuthorDate: Fri Aug 23 10:38:09 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 13:42:03 2019 +0200

loplugin:returnconstval in tools

Change-Id: Ic00c0a6788e65ba2b50e93d49592e67596354f96
Reviewed-on: https://gerrit.libreoffice.org/77998
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index e42c7efbb76a..2f6752e0848a 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -121,8 +121,8 @@ public:
 void CalcViewport();
 
 // Direct accessors for miscellaneous transformations
-const basegfx::B3DPoint WorldToEyeCoor(const basegfx::B3DPoint& rVec);
-const basegfx::B3DPoint EyeToWorldCoor(const basegfx::B3DPoint& rVec);
+basegfx::B3DPoint WorldToEyeCoor(const basegfx::B3DPoint& rVec);
+basegfx::B3DPoint EyeToWorldCoor(const basegfx::B3DPoint& rVec);
 
 static void Frustum(
 basegfx::B3DHomMatrix& rTarget,
diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index 9ff2a5b8ffd6..5fc3d87e4ab5 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
@@ -44,7 +44,7 @@ public:
 {
 }
 
-const OUString getGlob() const
+OUString getGlob() const
 {
 return OStringToOUString(aWildString, osl_getThreadTextEncoding());
 }
diff --git a/tools/source/generic/b3dtrans.cxx 
b/tools/source/generic/b3dtrans.cxx
index a896e9f1b7df..b8e29be31d4a 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -334,14 +334,14 @@ void 
B3dTransformationSet::SetViewportRectangle(tools::Rectangle const & rRect,
 
 // direct access to various transformations
 
-const basegfx::B3DPoint B3dTransformationSet::WorldToEyeCoor(const 
basegfx::B3DPoint& rVec)
+basegfx::B3DPoint B3dTransformationSet::WorldToEyeCoor(const 
basegfx::B3DPoint& rVec)
 {
 basegfx::B3DPoint aVec(rVec);
 aVec *= maOrientation;
 return aVec;
 }
 
-const basegfx::B3DPoint B3dTransformationSet::EyeToWorldCoor(const 
basegfx::B3DPoint& rVec)
+basegfx::B3DPoint B3dTransformationSet::EyeToWorldCoor(const 
basegfx::B3DPoint& rVec)
 {
 basegfx::B3DPoint aVec(rVec);
 aVec *= maInvOrientation;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[nd101 (via logerrit)]

 oox/source/drawingml/lineproperties.cxx |2 +-
 oox/source/export/drawingml.cxx |2 +-
 sd/qa/unit/data/pptx/tdf126741.pptx |binary
 sd/qa/unit/export-tests-ooxml2.cxx  |   30 ++
 4 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit e2b16c5660a8f3f72c1d1ba74ce565e8628b3dbb
Author: nd101 
AuthorDate: Wed Aug 14 16:07:22 2019 +0800
Commit: Regina Henschel 
CommitDate: Fri Aug 23 13:20:08 2019 +0200

tdf#126741 - fix dash dot dot line style import problem, for pptx

To make it consistent with MS PowerPoint, make the dash dot dot
line start with dash instead of dots.

Based on Regina Henschel's technical analysis and code pointers,
but only make change to the lgDashDotDot case and leave
everything else untouched.

Change-Id: Ide533a562005c617eca9d556a63b6aec39017e93
Reviewed-on: https://gerrit.libreoffice.org/77443
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/oox/source/drawingml/lineproperties.cxx 
b/oox/source/drawingml/lineproperties.cxx
index a7ea2396e65d..1139273a1831 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -67,7 +67,7 @@ void lclConvertPresetDash(LineDash& orLineDash, sal_Int32 
nPresetDash, sal_Int32
 
 case XML_lgDash:lclSetDashData( orLineDash, 0, 0, 1, 8, 3 );   
 break;
 case XML_lgDashDot: lclSetDashData( orLineDash, 1, 1, 1, 8, 3 );   
 break;
-case XML_lgDashDotDot:  lclSetDashData( orLineDash, 2, 1, 1, 8, 3 );   
 break;
+case XML_lgDashDotDot:  lclSetDashData( orLineDash, 1, 8, 2, 1, 3 );   
 break;
 
 case XML_sysDot:lclSetDashData( orLineDash, 1, 1, 0, 0, 1 );   
 break;
 case XML_sysDash:   lclSetDashData( orLineDash, 0, 0, 1, 3, 1 );   
 break;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6f975a298e50..27dd7e5b2a16 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -897,7 +897,7 @@ void DrawingML::WriteOutline( const 
Reference& rXPropSet, Referenc
 {
 mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "lgDashDot");
 }
-else if (aLineDash.Dots == 2 && relDotLen == 1 && aLineDash.Dashes == 
1 && relDashLen == 8 && relDistance == 3)
+else if (aLineDash.Dots == 1 && relDotLen == 8 && aLineDash.Dashes == 
2 && relDashLen == 1 && relDistance == 3)
 {
 mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, 
"lgDashDotDot");
 }
diff --git a/sd/qa/unit/data/pptx/tdf126741.pptx 
b/sd/qa/unit/data/pptx/tdf126741.pptx
new file mode 100644
index ..ca74d1c34914
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf126741.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index d17122744fdb..dc1c4246ff35 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -39,6 +39,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -216,6 +218,7 @@ public:
 void testTdf125360_2();
 void testTdf125551();
 void testTdf126234();
+void testTdf126741();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -309,6 +312,7 @@ public:
 CPPUNIT_TEST(testTdf125360_2);
 CPPUNIT_TEST(testTdf125551);
 CPPUNIT_TEST(testTdf126234);
+CPPUNIT_TEST(testTdf126741);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2508,6 +2512,32 @@ void SdOOXMLExportTest2::testTdf126234()
 xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testTdf126741()
+{
+sd::DrawDocShellRef xDocShRef = loadURL( 
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf126741.pptx"), PPTX );
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+// dash dot dot line style import fix
+const SdrPage *pPage = GetPage( 1, xDocShRef );
+SdrObject *const pObj = pPage->GetObj(0);
+CPPUNIT_ASSERT(pObj);
+
+const XLineStyleItem& rStyleItem = dynamic_cast(
+pObj->GetMergedItem(XATTR_LINESTYLE));
+const XLineDashItem& rDashItem = dynamic_cast(
+pObj->GetMergedItem(XATTR_LINEDASH));
+
+CPPUNIT_ASSERT_EQUAL(drawing::LineStyle_DASH, rStyleItem.GetValue());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), rDashItem.GetDashValue().GetDots());
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(280), 
rDashItem.GetDashValue().GetDotLen());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), rDashItem.GetDashValue().GetDashes());
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(35), 
rDashItem.GetDashValue().GetDashLen());
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(105), 
rDashItem.GetDashValue().GetDistance());
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freed

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - oox/source sw/qa

[Tamás Zolnai (via logerrit)]

 oox/source/export/drawingml.cxx  |   12 ++--
 sw/qa/extras/ooxmlexport/data/tdf127085.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |7 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit aa4392de09770b08d267a5c0201d9e89053d9cb5
Author: Tamás Zolnai 
AuthorDate: Thu Aug 22 15:57:41 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Aug 23 13:13:43 2019 +0200

tdf#127085: FILESAVE: Transparency is lost after RT

Reviewed-on: https://gerrit.libreoffice.org/77963
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 505cbb9c3d2771a12c989515663cc1eb73dd0c2f)

Change-Id: I22ba83b5cc00f84112a3755898ee2be58337afd6
Reviewed-on: https://gerrit.libreoffice.org/77982
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0bc60021feb5..26939c4ff2ec 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1194,11 +1194,19 @@ OUString DrawingML::WriteBlip( const Reference< 
XPropertySet >& rXPropSet, const
 }
 sal_Int16 nBright = 0;
 sal_Int32 nContrast = 0;
-sal_Int16 nTransparence = 0;
+sal_Int32 nTransparence = 0;
 
 GET( nBright, AdjustLuminance );
 GET( nContrast, AdjustContrast );
-GET( nTransparence, Transparency );
+// Used for shapes with picture fill
+GET( nTransparence, FillTransparence );
+if (nTransparence == 0)
+{
+// Used for pictures
+sal_Int16 nPicTransparency = 0;
+GET( nPicTransparency, Transparency );
+nTransparence = static_cast(nPicTransparency);
+}
 
 mpFS->startElementNS( XML_a, XML_blip,
 FSNS( XML_r, XML_embed), sRelId.toUtf8().getStr(),
diff --git a/sw/qa/extras/ooxmlexport/data/tdf127085.docx 
b/sw/qa/extras/ooxmlexport/data/tdf127085.docx
new file mode 100644
index ..65556fe38abd
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf127085.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 5a63694ba4af..04e8442cac40 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -548,6 +548,13 @@ DECLARE_OOXMLIMPORT_TEST(testInvalidDateFormField, 
"invalid_date_form_field.docx
 CPPUNIT_ASSERT_EQUAL(int(3), nIndex);
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx")
+{
+// Fill transparency was lost during export
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(50), getProperty(xShape, 
"FillTransparence"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 oox/source/export/drawingml.cxx  |   10 +++---
 sw/qa/extras/ooxmlexport/data/tdf127085.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |7 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 85e4a7677d41bdacf76bafd0fea3f1543cecf74c
Author: Tamás Zolnai 
AuthorDate: Thu Aug 22 15:57:41 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Aug 23 13:13:55 2019 +0200

tdf#127085: FILESAVE: Transparency is lost after RT

Change-Id: I22ba83b5cc00f84112a3755898ee2be58337afd6
Reviewed-on: https://gerrit.libreoffice.org/77963
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 505cbb9c3d2771a12c989515663cc1eb73dd0c2f)
Reviewed-on: https://gerrit.libreoffice.org/77979
Tested-by: Tamás Zolnai 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b29fc4a5bc4b..7962c41f6406 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1245,14 +1245,18 @@ void 
DrawingML::WriteImageBrightnessContrastTransparence(uno::Reference();
 if (GetProperty(rXPropSet, "AdjustContrast"))
 nContrast = mAny.get();
-if (GetProperty(rXPropSet, "Transparency"))
-nTransparence = mAny.get();
+// Used for shapes with picture fill
+if (GetProperty(rXPropSet, "FillTransparence"))
+nTransparence = mAny.get();
+// Used for pictures
+if (nTransparence == 0 && GetProperty(rXPropSet, "Transparency"))
+nTransparence = static_cast(mAny.get());
 
 
 if (nBright || nContrast)
diff --git a/sw/qa/extras/ooxmlexport/data/tdf127085.docx 
b/sw/qa/extras/ooxmlexport/data/tdf127085.docx
new file mode 100644
index ..65556fe38abd
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf127085.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 8ccc2bc68100..7e4220866902 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -294,6 +294,13 @@ DECLARE_OOXMLIMPORT_TEST(testInvalidDateFormField, 
"invalid_date_form_field.docx
 CPPUNIT_ASSERT_EQUAL(int(3), nIndex);
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx")
+{
+// Fill transparency was lost during export
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(50), getProperty(xShape, 
"FillTransparence"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Python.xba |   18 +++
 wizards/source/access2base/access2base.py |   36 ++
 2 files changed, 41 insertions(+), 13 deletions(-)

New commits:
commit 54b47a81fdba4fb42f7f5eaee65292014567cd29
Author: Jean-Pierre Ledure 
AuthorDate: Fri Aug 23 13:08:12 2019 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Fri Aug 23 13:12:17 2019 +0200

Access2Base - Implement Find and ProcOfLine

Find and ProcOfLine are methods of the MODULE class
They return a value (as usual) but also parameters
passed by reference, which is not supported by Python
As a workaround, specific properties are set after
their execution

Change-Id: I70ed3646a6d701a4853d071d4ca6eb213276d5e9

diff --git a/wizards/source/access2base/Python.xba 
b/wizards/source/access2base/Python.xba
index 45144ec7c8d3..0ef8a7e96fbc 100644
--- a/wizards/source/access2base/Python.xba
+++ b/wizards/source/access2base/Python.xba
@@ -88,7 +88,7 @@ Public Function PythonWrapper(ByVal pvCallType As Variant _
 ' [0] => 0 = scalar or array returned by the 
method
 ' => 1 = basic object returned by the 
method
 ' => 2 = a null value
-' [1] => the object reference or the returned 
value or Null
+' [1] => the object reference or the returned 
value (complemented with arguments passed by reference, if any) or Null
 ' [2] => the object type or Null
 ' [3] => the object name, if any
 ' or, when pvCallType == vbUNO, as the UNO object 
returned by the property
@@ -222,6 +222,10 @@ Const vbGet = 2, vbLet = 4, vbMethod = 1, vbSet = 8, vbUNO 
= 16
If vObject._Type = 
"COLLECTION" And vObject._CollType = COLLTABLEDEFS Then vArgs = 
Array(_A2B_.PythonCache(vArgs(0)))
Case "Close"
sSCript = "mClose"
+   Case "Find"
+   For i = 0 To UBound(vArgs)
+   If IsNull(vArgs(i)) Then 
vArgs(i) = Empty
+   Next i
Case "Type"
sScript = "pType"
Case Else
@@ -294,9 +298,15 @@ Const vbGet = 2, vbLet = 4, vbMethod = 1, vbSet = 8, vbUNO 
= 16
Case "Close", "Dispose", 
"Terminate"
Set _A2B_.PythonCache(pvObject) = 
Nothing
Case "Move", "MoveFirst", 
"MoveLast", "MoveNext", "MovePrevious"  
'  Pass the new BOF, EOF values (binary format)
-   If vObject._Type = 
"RECORDSET" Then
-   vReturn = 
(Iif(vObject.BOF, 1, 0) * 2 + Iif(vObject.EOF, 1, 0)) * Iif(vReturn, 1, -1)
-   End If
+   If vObject._Type = 
"RECORDSET" Then
+   vReturn = (Iif(vObject.BOF, 1, 
0) * 2 + Iif(vObject.EOF, 1, 0)) * Iif(vReturn, 1, -1)
+   End If
+   Case "Find"   
'  Store in array the arguments passed by reference
+   If vObject._Type = "MODULE" 
And vReturn = True Then
+   vReturn = Array(vReturn, 
vArgs(1), vArgs(2), vArgs(3), vArgs(4))
+   End If
+   Case "ProcOfLine" '  
Store in array the arguments passed by reference
+   vReturn = Array(vReturn, vArgs(1))
Case Else
End Select
End Select
diff --git a/wizards/source/access2base/access2base.py 
b/wizards/source/access2base/access2base.py
index e58f1cce9f14..ca4a2b64bd19 100644
--- a/wizards/source/access2base/access2base.py
+++ b/wizards/source/access2base/access2base.py
@@ -985,16 +985,17 @@ class _BasicObject(object):
 5. Setting a property value is done via a Basic call, except if 
self.internal == True
 """
 W = _A2B.invokeWrapper
-internal_attributes = ('objectreference', 'objecttype', 'name', 'count', 
'index', 'internal')
+internal_attributes = ('objectreference', 'objecttype', 'name', 'internal')
 
 def __init__(self, reference = -1, objtype = None, name = ''):
 self.objectreference = reference# reference in the cache managed 
by Basic
 self.objecttype = objtype   # ('DATABASE', 'COLLECTION', ...)
 self.name = name# '' when no name
 self.internal = False 

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

[Stephan Bergmann (via logerrit)]

 external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch |   59 
++
 external/liborcus/UnpackedTarball_liborcus.mk |1 
 2 files changed, 60 insertions(+)

New commits:
commit 5c2c08f635c30b732df48faca7ba3d411074e05a
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 10:33:50 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 13:00:13 2019 +0200

external/liborcus: Blind fix attempt for older macOS builds

see external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
for
details

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

diff --git 
a/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch 
b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
new file mode 100644
index ..4b77cb1be933
--- /dev/null
+++ b/external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch
@@ -0,0 +1,59 @@
+From 46221fdfc62e317d34def4ebede814cf2bb14ebb Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Fri, 23 Aug 2019 10:26:51 +0200
+Subject: [PATCH] Blind fix attempt for older macOS builds
+
+...like  (which builds with
+MacOSX10.13.sdk, but not sure with what Clang and libc++ versions):
+
+> In file included from xml_map_tree.cpp:8:
+> In file included from ./xml_map_tree.hpp:11:
+> In file included from ../../include/orcus/pstring.hpp:14:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string:470:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string_view:169:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/__string:56:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/algorithm:643:
+> In file included from 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/memory:653:
+> 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:227:10:
 error: static_assert failed "Attempted to construct a reference element in a 
tuple with an rvalue"
+> {static_assert(__can_bind_reference<_Tp>(),
+>  ^ ~~~
+> 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:385:13:
 note: in instantiation of function template specialization 
'std::__1::__tuple_leaf<2, const orcus::pstring &, 
false>::__tuple_leaf' requested here
+> __tuple_leaf<_Uf, _Tf>(_VSTD::forward<_Up>(__u))...,
+> ^
+> 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:738:15:
 note: in instantiation of function template specialization 
'std::__1::__tuple_impl, 
orcus::xml_map_tree &, const char *, const orcus::pstring &, 
orcus::xml_map_tree::element_type, 
orcus::xml_map_tree::reference_type>::__tuple_impl<0, 1, 2, 3, 4, 
orcus::xml_map_tree &, const char *, const orcus::pstring &, 
orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type, 
orcus::xml_map_tree &, const char *&, orcus::pstring, 
orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>' 
requested here
+> : __base_(typename __make_tuple_indices::type(),
+>   ^
+> xml_map_tree.cpp:216:13: note: in instantiation of function template 
specialization 'std::__1::tuple::tuple' requested here
+> element::args_type(
+> ^
+> 1 error generated.
+> Makefile:1804: recipe for target 'liborcus_0.15_la-xml_map_tree.lo' failed
+> make[5]: *** [liborcus_0.15_la-xml_map_tree.lo] Error 1
+
+(while building orcus as part of LibreOffice)
+---
+ src/liborcus/xml_map_tree.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
+index 8338b930..8fd40534 100644
+--- a/src/liborcus/xml_map_tree.cpp
 b/src/liborcus/xml_map_tree.cpp
+@@ -211,12 +211,13 @@ xml_map_tree::element* 
xml_map_tree::element::get_or_create_child(
+ string_pool& sp = parent.m_names;
+ 
+ // Insert a new element of this name.
++auto const name = sp.intern(_name.get(), _name.size()).first;
+ child_elements->push_back(
+ parent.m_element_pool.construct(
+ element::args_type(
+ parent,
+ _ns,
+-sp.intern(_name.get(), _name.size()).first,
++name,
+ element_unlinked,
+ reference_unknown
+ )
+-- 
+2.21.0
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/

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

[Stephan Bergmann (via logerrit)]

 external/liborcus/UnpackedTarball_liborcus.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 83664b83b0118cf7ea654da3819d2b62b9dffaa7
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 08:57:14 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 11:49:27 2019 +0200

Update comment

external/liborcus/create-element.patch.0 has been removed with
52800fd6d9867252b795b6afacce19f66b5a5107 "Update orcus to 0.15.1."

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

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index e1aef32edcf7..f0cbd0db17eb 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,9 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 
-# * external/liborcus/create-element.patch.0 covered by upstream
-#   

 "Fix linking of
-#   newly created element":
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source comphelper/source connectivity/source editeng/source extensions/source filter/source include/canvas include/comphelper include/connectivity include/drawin

[Mike Kaganski (via logerrit)]

 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx |2 -
 chart2/source/controller/inc/ViewElementListProvider.hxx  |2 -
 chart2/source/view/charttypes/VSeriesPlotter.cxx  |4 +-
 chart2/source/view/inc/VSeriesPlotter.hxx |2 -
 comphelper/source/misc/namedvaluecollection.cxx   |4 +-
 connectivity/source/commontools/FValue.cxx|4 +-
 connectivity/source/commontools/dbmetadata.cxx|4 +-
 connectivity/source/drivers/dbase/dindexnode.cxx  |2 -
 connectivity/source/inc/dbase/dindexnode.hxx  |2 -
 editeng/source/items/frmitems.cxx |2 -
 extensions/source/abpilot/datasourcehandling.cxx  |2 -
 extensions/source/abpilot/datasourcehandling.hxx  |2 -
 filter/source/svg/svgwriter.hxx   |2 -
 include/canvas/vclwrapper.hxx |7 +---
 include/comphelper/namedvaluecollection.hxx   |4 +-
 include/connectivity/FValue.hxx   |8 ++---
 include/connectivity/dbmetadata.hxx   |4 +-
 include/drawinglayer/primitive2d/baseprimitive2d.hxx  |4 +-
 include/drawinglayer/primitive3d/baseprimitive3d.hxx  |4 +-
 include/editeng/brushitem.hxx |2 -
 include/o3tl/cow_wrapper.hxx  |4 +-
 include/svl/itemset.hxx   |2 -
 include/svl/sharedstring.hxx  |4 +-
 include/svl/svdde.hxx |4 +-
 include/svx/dataaccessdescriptor.hxx  |4 +-
 include/svx/sdr/attribute/sdrformtextattribute.hxx|4 +-
 include/svx/sdr/attribute/sdrtextattribute.hxx|4 +-
 include/tools/ref.hxx |2 -
 include/ucbhelper/content.hxx |4 +-
 include/vcl/bitmap.hxx|2 -
 include/vcl/graph.hxx |4 +-
 include/vcl/transfer.hxx  |2 -
 l10ntools/inc/po.hxx  |2 -
 l10ntools/source/po.cxx   |2 -
 o3tl/qa/cow_wrapper_clients.cxx   |   12 
+++
 o3tl/qa/cow_wrapper_clients.hxx   |   12 
+++
 sc/inc/attrib.hxx |2 -
 sc/inc/cellvalue.hxx  |6 +--
 sc/inc/formulalogger.hxx  |2 -
 sc/inc/markarr.hxx|4 +-
 sc/inc/mtvelements.hxx|2 -
 sc/inc/postit.hxx |6 +--
 sc/inc/rangelst.hxx   |4 +-
 sc/source/core/data/attrib.cxx|2 -
 sc/source/core/data/cellvalue.cxx |6 +--
 sc/source/core/data/markarr.cxx   |4 +-
 sc/source/core/data/mtvelements.cxx   |2 -
 sc/source/core/data/postit.cxx|8 ++---
 sc/source/core/tool/formulalogger.cxx |2 -
 sc/source/core/tool/rangelst.cxx  |4 +-
 sc/source/core/tool/scmatrix.cxx  |   16 
+-
 sd/inc/OutlinerIterator.hxx   |4 +-
 sd/source/ui/view/OutlinerIterator.cxx|4 +-
 svl/source/items/itemset.cxx  |2 -
 svl/source/misc/sharedstring.cxx  |4 +-
 svl/source/svdde/ddedata.cxx  |4 +-
 svl/unx/source/svdde/ddedummy.cxx |4 +-
 svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx |2 -
 svx/source/form/dataaccessdescriptor.cxx  |4 +-
 svx/source/sdr/attribute/sdrformtextattribute.cxx |4 +-
 svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx  |2 -
 svx/source/sdr/attribute/sdrtextattribute.cxx |4 +-
 ucbhelper/source/client/content.cxx   |4 +-
 vcl/inc/impgraph.hxx  |2 -
 vcl/inc/opengl/texture.hxx  

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

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

 sw/inc/redline.hxx|4 +++-
 sw/qa/extras/uiwriter/uiwriter2.cxx   |7 +++
 sw/source/core/doc/DocumentRedlineManager.cxx |6 ++
 sw/source/core/doc/docredln.cxx   |   22 +-
 4 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit 61ed17cafc90d9b4303b52260f729638eed107c7
Author: László Németh 
AuthorDate: Wed Aug 7 13:51:32 2019 +0200
Commit: László Németh 
CommitDate: Fri Aug 23 11:27:06 2019 +0200

tdf#127101 Change tracking: fix format reject at paragraph join

Now "Reject tracked change" can restore the
original format of multiple paragraphs of a tracked
deletion during editing.

Change-Id: I83a307b4206ab610af3458f8cb6e9de905b88776
Reviewed-on: https://gerrit.libreoffice.org/77101
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index c75cb932d35d..c7cddc9fad3a 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -55,9 +55,10 @@ class SW_DLLPUBLIC SwRedlineExtraData_FormatColl : public 
SwRedlineExtraData
 OUString m_sFormatNm;
 std::unique_ptr m_pSet;
 sal_uInt16 m_nPoolId;
+bool m_bFormatAll; // don't strip the last paragraph mark
 public:
 SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 
nPoolFormatId,
-const SfxItemSet* pSet = nullptr );
+const SfxItemSet* pSet = nullptr, bool 
bFormatAll = true );
 virtual ~SwRedlineExtraData_FormatColl() override;
 virtual SwRedlineExtraData* CreateNew() const override;
 virtual void Reject( SwPaM& rPam ) const override;
@@ -66,6 +67,7 @@ public:
 const OUString& GetFormatName() const{ return m_sFormatNm; }
 void SetItemSet( const SfxItemSet& rSet );
 SfxItemSet* GetItemSet( ) const { return m_pSet.get(); }
+void SetFormatAll( bool bAll )   { m_bFormatAll = bAll; }
 };
 
 class SwRedlineExtraData_Format : public SwRedlineExtraData
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 992ffe190d88..6ae3c023439c 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -572,6 +572,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, 
testTdf119571_keep_numbering_with_Reject)
 sNumName = getProperty(getParagraph(3), "NumberingStyleName");
 CPPUNIT_ASSERT_MESSAGE("Missing numbering style", !sNumName.isEmpty());
 CPPUNIT_ASSERT_MESSAGE("Not a bulleted list item", sNumName != "Outline");
+
+// third paragraph: normal text without numbering
+
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"),
+ getProperty(getParagraph(4), 
"ParaStyleName"));
+sNumName = getProperty(getParagraph(4), "NumberingStyleName");
+CPPUNIT_ASSERT_MESSAGE("Bad numbering", sNumName.isEmpty());
 }
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf109376_redline)
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 1ed3851c90b2..2372429afc70 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2026,6 +2026,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 SwTextNode* pDelNode = 
pStt->nNode.GetNode().GetTextNode();
 SwTextNode* pTextNode;
 SwNodeIndex aIdx( pEnd->nNode.GetNode() );
+bool bFirst = true;
 
 while (pDelNode != nullptr && pTextNd != nullptr && 
pDelNd->GetIndex() < pTextNd->GetIndex())
 {
@@ -2045,6 +2046,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 if (pExtraData)
 {
 
std::unique_ptr xRedlineExtraData;
+if (!bFirst)
+pExtraData->SetFormatAll(false);
 xRedlineExtraData.reset(pExtraData);
 pPar->SetExtraData( 
xRedlineExtraData.get() );
 }
@@ -2054,6 +2057,9 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 lcl_CopyStyle(*pStt, aPos);
 }
 pTextNd = SwNodes::GoPrevious( &aIdx );
+
+if (bFirst)
+bFirst = false;
 }
 }
 }
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 08bfa9e51c77..2585b1208751 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -753,8 +753,9 @@ bool SwRedlineExtraData::operator == ( 

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

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

 sw/qa/extras/uiwriter/uiwriter2.cxx   |   86 ++
 sw/source/core/doc/DocumentRedlineManager.cxx |   59 -
 2 files changed, 128 insertions(+), 17 deletions(-)

New commits:
commit dc9a0b124272a6dc0a8d875d51b6f882e60a8a04
Author: László Németh 
AuthorDate: Wed Aug 7 11:25:13 2019 +0200
Commit: László Németh 
CommitDate: Fri Aug 23 11:25:14 2019 +0200

tdf#127101 Change tracking: reject format at paragraph join

Now "Reject tracked change" can restore the
original format of the paragraphs of a tracked
deletion during editing, storing the format change
using SetExtraData() of SwRangeRedline.

Change-Id: I916f624de081bf2fab020e0574aa4ec3136946c4
Reviewed-on: https://gerrit.libreoffice.org/77100
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index eb85d96d25fe..992ffe190d88 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -488,6 +488,92 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, 
testTdf119571_keep_numbering_with_Undo)
 CPPUNIT_ASSERT_MESSAGE("Bad numbering", sNumName.isEmpty());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf119571_keep_numbering_with_Reject)
+{
+// as the previous test, but with partial paragraph deletion:
+// all deleted paragraphs get the formatting of the first (the partially 
deleted) one
+load(DATA_DIRECTORY, "tdf54819b.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// heading
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Outline"),
+ getProperty(getParagraph(2), 
"NumberingStyleName"));
+
+// next paragraph: bulleted list item
+
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"),
+ getProperty(getParagraph(3), 
"ParaStyleName"));
+OUString sNumName = getProperty(getParagraph(3), 
"NumberingStyleName");
+CPPUNIT_ASSERT_MESSAGE("Missing numbering style", !sNumName.isEmpty());
+CPPUNIT_ASSERT_MESSAGE("Not a bulleted list item", sNumName != "Outline");
+
+// third paragraph: normal text without numbering
+
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"),
+ getProperty(getParagraph(4), 
"ParaStyleName"));
+sNumName = getProperty(getParagraph(4), "NumberingStyleName");
+CPPUNIT_ASSERT_MESSAGE("Bad numbering", sNumName.isEmpty());
+
+//turn on red-lining and show changes
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE("redlines shouldn't be visible",
+   !IDocumentRedlineAccess::IsShowChanges(
+   
pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// remove only end part of the heading and the next numbered paragraph 
with paragraph break
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 6, 
/*bBasicCall=*/false);
+pWrtShell->EndPara(/*bSelect=*/true);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 2, 
/*bBasicCall=*/false);
+pWrtShell->EndPara(/*bSelect=*/true);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, 
/*bBasicCall=*/false);
+rtl::Reference pTransfer = new SwTransferable(*pWrtShell);
+pTransfer->Cut();
+
+// solved problem: changing paragraph style after deletion
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+
+// solved problem: apply numbering
+CPPUNIT_ASSERT_EQUAL(OUString("Outline"),
+ getProperty(getParagraph(2), 
"NumberingStyleName"));
+
+// reject deletion
+IDocumentRedlineAccess& rIDRA(pDoc->getIDocumentRedlineAccess());
+rIDRA.AcceptAllRedline(false);
+
+// heading
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Outline"),
+ getProperty(getParagraph(2), 
"NumberingStyleName"));
+
+// next paragraph: bulleted list item
+
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"),
+   

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

[Shubham Goyal (via logerrit)]

 cui/uiconfig/ui/qrcodegen.ui |   37 ++---
 1 file changed, 26 insertions(+), 11 deletions(-)

New commits:
commit 58c9b9802ca7cbd6e6b11dda3e905742c1e4fb3c
Author: Shubham Goyal <22shub...@gmail.com>
AuthorDate: Thu Aug 22 17:20:31 2019 +0530
Commit: Samuel Mehrbrodt 
CommitDate: Fri Aug 23 11:20:25 2019 +0200

tdf#126720 Fixing label length fix UI break

Change-Id: I4fefc4fcb64388fb3c3ca35b73a7264b381d4e6f
Reviewed-on: https://gerrit.libreoffice.org/77751
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index a7523405ae10..4d39f12b7bf0 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -12,7 +12,7 @@
   
 False
 6
-QR Code
+QR Code Generator
 True
 0
 0
@@ -102,7 +102,6 @@
 True
 False
 6
-12
 
   
 True
@@ -127,9 +126,10 @@
 True
 False
 start
-URL/Text 
:
+URL/Text 
:
 True
 edit_text
+0
   
   
 0
@@ -141,9 +141,10 @@
 True
 False
 start
-Border :
+Border 
:
 True
 edit_border
+0
   
   
 0
@@ -151,12 +152,27 @@
   
 
 
-  
+  
 True
 False
-start
-Error 
Correction Level :
-True
+2
+
+  
+True
+False
+start
+Error Correction:
+True
+0
+  
+  
+0
+0
+  
+
+
+  
+
   
   
 0
@@ -182,8 +198,7 @@
   
 True
 False
-6
-4
+2
 
   
 Low
@@ -266,7 +281,7 @@
   
 True
 False
-QR Code
+Options
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

[Samuel Mehrbrodt (via logerrit)]

 offapi/com/sun/star/text/NumberingLevel.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f0d757bfc7db1eb4f4d1754f4362ce92a02ac470
Author: Samuel Mehrbrodt 
AuthorDate: Fri Aug 23 09:33:00 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Fri Aug 23 11:15:57 2019 +0200

Add missing "See also"

Change-Id: If226fcb97cd67ad2239f55f4138703d712b70a08
Reviewed-on: https://gerrit.libreoffice.org/77991
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/offapi/com/sun/star/text/NumberingLevel.idl 
b/offapi/com/sun/star/text/NumberingLevel.idl
index 92a08931a147..9362bb7b3f04 100644
--- a/offapi/com/sun/star/text/NumberingLevel.idl
+++ b/offapi/com/sun/star/text/NumberingLevel.idl
@@ -145,7 +145,7 @@ published service NumberingLevel
 [property] long FirstLineOffset;
 
 
-/** specifies the type of numbering.
+/** specifies the type of numbering. @see NumberingType
  */
 [property] short NumberingType;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sc/qa/unit/copy_paste_test.cxx |   59 +
 sc/source/ui/inc/impex.hxx |4 +-
 sc/source/ui/undo/undoblk.cxx  |6 ++--
 3 files changed, 65 insertions(+), 4 deletions(-)

New commits:
commit 472679b00da5de87a76587bb5d7c0e0a607a5bba
Author: Miklos Vajna 
AuthorDate: Wed Jul 24 14:40:21 2019 +0200
Commit: Luboš Luňák 
CommitDate: Fri Aug 23 11:12:10 2019 +0200

tdf#107394 sc ui: fix lack of row height update on undo of paste

This is a problem since commit df9243626b39742a9a148bea95796f8824fee68a
(fdo#73606: Avoid excessive and unnecessary heap allocation of array
objects., 2014-01-14), though it seems this uncovered a problem that was
introduced earlier.

Reading ScViewFunc::AdjustBlockHeight(), commit
64a36fd4f4085ed05e4c0ee40ac109452ff81a78 (ScUndoPaste to handle multiple
ranges., 2011-09-09) changed ScUndoPaste::DoChange(), so that
AdjustBlockHeight() is invoked in a loop, but always with the same
arguments. In case AdjustBlockHeight() doesn't get a mark data, the
function takes the mark data from the view data, which is empty in the
"undo of paste" case, so no row height gets updated.

Fix the problem by explicitly providing the mark data to
AdjustBlockHeight(), probably that was the intention in the second
commit.

[ Testing this from CppunitTest_sc_copypaste means ScImportExport has to
be dllpublic, but that seems still better than having a view shell in
CppunitTest_sc_ucalc. ]

(cherry picked from commit 4840880148318dc384e28f9a8df9990b8690a4b6)

Change-Id: I140b53588d59d231772152c0e820e5fdedf6894c
Reviewed-on: https://gerrit.libreoffice.org/76318
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 
Reviewed-by: Luboš Luňák 

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index a31312c6fe6f..32cdd333f3f2 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -13,6 +13,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -34,12 +35,14 @@ public:
 void testTdf84411();
 void testTdf124565();
 void testTdf126421();
+void testTdf107394();
 
 CPPUNIT_TEST_SUITE(ScCopyPasteTest);
 CPPUNIT_TEST(testCopyPasteXLS);
 CPPUNIT_TEST(testTdf84411);
 CPPUNIT_TEST(testTdf124565);
 CPPUNIT_TEST(testTdf126421);
+CPPUNIT_TEST(testTdf107394);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -363,6 +366,62 @@ void ScCopyPasteTest::testTdf126421()
 xDocSh->DoClose();
 }
 
+void ScCopyPasteTest::testTdf107394()
+{
+uno::Reference xDesktop
+= frame::Desktop::create(::comphelper::getProcessComponentContext());
+CPPUNIT_ASSERT(xDesktop.is());
+
+uno::Reference xComponent
+= xDesktop->loadComponentFromURL("private:factory/scalc", "_blank", 0, 
{});
+CPPUNIT_ASSERT(xComponent.is());
+
+auto pModelObj = dynamic_cast(xComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+CPPUNIT_ASSERT(pModelObj->GetDocument());
+
+ScDocument& rDoc = *pModelObj->GetDocument();
+
+sal_uInt16 nFirstRowHeight = rDoc.GetRowHeight(0, 0);
+sal_uInt16 nSecondRowHeight = rDoc.GetRowHeight(1, 0);
+CPPUNIT_ASSERT_EQUAL(nFirstRowHeight, nSecondRowHeight);
+
+// Import values to A1:A2.
+ScImportExport aObj(&rDoc, ScAddress(0,0,0));
+aObj.SetImportBroadcast(true);
+
+OString aHTML("First\nVery long sentence.");
+SvMemoryStream aStream;
+aStream.WriteOString(aHTML);
+aStream.Seek(0);
+CPPUNIT_ASSERT(aObj.ImportStream(aStream, OUString(), 
SotClipboardFormatId::HTML));
+
+CPPUNIT_ASSERT_EQUAL(OUString("First"), rDoc.GetString(ScAddress(0,0,0)));
+CPPUNIT_ASSERT_EQUAL(OUString("Very long sentence."), 
rDoc.GetString(ScAddress(0,1,0)));
+
+nFirstRowHeight = rDoc.GetRowHeight(0, 0);
+nSecondRowHeight = rDoc.GetRowHeight(1, 0);
+CPPUNIT_ASSERT_GREATER(nFirstRowHeight, nSecondRowHeight);
+
+// Undo, and check the result.
+SfxUndoManager* pUndoMgr = rDoc.GetUndoManager();
+CPPUNIT_ASSERT_MESSAGE("Failed to get the undo manager.", pUndoMgr);
+pUndoMgr->Undo();
+
+CPPUNIT_ASSERT(rDoc.GetString(ScAddress(0,0,0)).isEmpty());
+CPPUNIT_ASSERT(rDoc.GetString(ScAddress(0,1,0)).isEmpty());
+
+nFirstRowHeight = rDoc.GetRowHeight(0, 0);
+nSecondRowHeight = rDoc.GetRowHeight(1, 0);
+// Without the accompanying fix in place, this test would have failed:
+// - Expected: 256
+// - Actual  : 477
+// i.e. the increased height of the second row remained after undo.
+CPPUNIT_ASSERT_EQUAL(nFirstRowHeight, nSecondRowHeight);
+
+xComponent->dispose();
+}
+
 ScCopyPasteTest::ScCopyPasteTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 1b703d821373..3ddba5d9b89a 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -44,7 +44,7 @@ struct ScExportTextOp

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

[Noel Grandin (via logerrit)]

 include/o3tl/lru_map.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b8f42b202f7afc882b77b66c4b24c086950f10fc
Author: Noel Grandin 
AuthorDate: Fri Aug 23 09:46:53 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 11:08:24 2019 +0200

loplugin:returnconstval in o3tl

Change-Id: Ib36382243552cd80dab431741f45dc767beccf59
Reviewed-on: https://gerrit.libreoffice.org/77993
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index 54378a319ece..e822fde0294c 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -122,7 +122,7 @@ public:
 }
 }
 
-const list_const_iterator_t find(const Key& key)
+list_const_iterator_t find(const Key& key)
 {
 const map_iterator_t i = mLruMap.find(key);
 if (i == mLruMap.cend()) // can't find entry for the key
@@ -155,12 +155,12 @@ public:
 }
 }
 
-const list_const_iterator_t begin() const
+list_const_iterator_t begin() const
 {
 return mLruList.cbegin();
 }
 
-const list_const_iterator_t end() const
+list_const_iterator_t end() const
 {
 return mLruList.cend();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sw/qa/extras/ooxmlimport/data/numbering-circle.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx   |   20 
 writerfilter/source/dmapper/ConversionHelper.cxx|2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 66576edf4e7ed26f09788fac348ea6b556ae1c47
Author: Samuel Mehrbrodt 
AuthorDate: Fri Aug 23 09:41:51 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Fri Aug 23 10:43:02 2019 +0200

tdf#103345 Import decimalEnclosedCircle correctly

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

diff --git a/sw/qa/extras/ooxmlimport/data/numbering-circle.docx 
b/sw/qa/extras/ooxmlimport/data/numbering-circle.docx
new file mode 100644
index ..b8c1da3d6f87
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/numbering-circle.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index d664d78e6d33..e2d930b9f4bf 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -414,6 +414,26 @@ DECLARE_OOXMLIMPORT_TEST(testTdf126114, "tdf126114.docx")
 CPPUNIT_ASSERT_EQUAL(7, getLength());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf103345, "numbering-circle.docx")
+{
+uno::Reference xPropertySet(
+getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
+uno::Reference xLevels(
+xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+uno::Sequence aProps;
+xLevels->getByIndex(0) >>= aProps; // 1st level
+
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+if (aProps[i].Name == "NumberingType")
+{
+CPPUNIT_ASSERT_EQUAL(style::NumberingType::CIRCLE_NUMBER,
+ aProps[i].Value.get());
+return;
+}
+}
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in 
ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx 
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 7206a7fde18a..91624dae17dd 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -524,6 +524,7 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
 nRet = style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_RU;
 break;
 case NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedCircleChinese:
+case NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedCircle:
 case NS_ooxml::LN_Value_ST_NumberFormat_ideographEnclosedCircle:
 nRet = style::NumberingType::CIRCLE_NUMBER;
 break;
@@ -590,7 +591,6 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
 NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth = 91691;
 NS_ooxml::LN_Value_ST_NumberFormat_decimalHalfWidth = 91692;
 NS_ooxml::LN_Value_ST_NumberFormat_japaneseDigitalTenThousand = 91694;
-NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedCircle = 91695;
 NS_ooxml::LN_Value_ST_NumberFormat_decimalZero = 91699;
 NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedFullstop = 91703;
 NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedParen = 91704;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 include/sax/fastattribs.hxx|6 +++---
 sax/source/tools/fastattribs.cxx   |2 +-
 sc/source/filter/xml/XMLCalculationSettingsContext.cxx |2 +-
 sc/source/filter/xml/XMLDDELinksContext.cxx|4 ++--
 sc/source/filter/xml/XMLTrackedChangesContext.cxx  |8 
 sc/source/filter/xml/xmlcoli.cxx   |2 +-
 sc/source/filter/xml/xmldpimp.cxx  |4 ++--
 sc/source/filter/xml/xmldrani.cxx  |2 +-
 sc/source/filter/xml/xmlrowi.cxx   |2 +-
 xmloff/source/core/xmlimp.cxx  |2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 5e01bae7f4a6f81ff70f328d0289dae37fab01eb
Author: Noel Grandin 
AuthorDate: Fri Aug 23 09:23:20 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 10:37:31 2019 +0200

loplugin:returnconstval in sax

Change-Id: Icf5c337164b71aab10dd960815eee516822c276c
Reviewed-on: https://gerrit.libreoffice.org/77990
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index f8005a65a27a..10ca8a2fad1f 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -190,9 +190,9 @@ public:
 return !strcmp(str, mrList.getFastAttributeValue(mnIdx));
 }
 };
-const FastAttributeIter begin() const { return FastAttributeIter(*this, 
0); }
-const FastAttributeIter end() const { return FastAttributeIter(*this, 
maAttributeTokens.size()); }
-const FastAttributeIter find( sal_Int32 nToken ) const;
+FastAttributeIter begin() const { return FastAttributeIter(*this, 0); }
+FastAttributeIter end() const { return FastAttributeIter(*this, 
maAttributeTokens.size()); }
+FastAttributeIter find( sal_Int32 nToken ) const;
 
 private:
 sal_Char *mpChunk; ///< buffer to store all attribute values - null 
terminated strings
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 6175c7873882..8aff8569d903 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -253,7 +253,7 @@ Sequence< FastAttribute > 
FastAttributeList::getFastAttributes(  )
 return aSeq;
 }
 
-const FastAttributeList::FastAttributeIter FastAttributeList::find( sal_Int32 
nToken ) const
+FastAttributeList::FastAttributeIter FastAttributeList::find( sal_Int32 nToken 
) const
 {
 for (size_t i = 0; i < maAttributeTokens.size(); ++i)
 if( maAttributeTokens[i] == nToken )
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx 
b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 1b69a38a34a5..90c59096e300 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -147,7 +147,7 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& 
rImport,
 {
 if ( rAttrList.is() )
 {
-auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DATE_VALUE ) ) );
+auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_DATE_VALUE ) ) );
 if (aIter != rAttrList->end())
 {
 util::DateTime aDateTime;
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx 
b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 7ddf26f920ef..df0ee77f4fe1 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -265,7 +265,7 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& 
rImport,
 if ( rAttrList.is() )
 {
 sal_Int32 nCols(1);
-auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, 
XML_NUMBER_COLUMNS_REPEATED ) ) );
+auto aIter( rAttrList->find( XML_ELEMENT( TABLE, 
XML_NUMBER_COLUMNS_REPEATED ) ) );
 if (aIter != rAttrList->end())
 nCols = aIter.toInt32();
 
@@ -286,7 +286,7 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& 
rImport,
 {
 if ( rAttrList.is() )
 {
-auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, 
XML_NUMBER_ROWS_REPEATED ) ) );
+auto aIter( rAttrList->find( XML_ELEMENT( TABLE, 
XML_NUMBER_ROWS_REPEATED ) ) );
 if (aIter != rAttrList->end())
 nRows = aIter.toInt32();
 
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx 
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 0c75444d925c..5c1e3073067a 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -549,7 +549,7 @@ 
ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext(  ScXMLImport&
 {
 if ( rAttrList.is() )
 {
-auto &aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
+auto aIter( rAttrList->find( XML_ELEMENT( TABLE, XML_ID ) ) );
 if (aIter != rAttrList->end())
 nID = ScXMLChangeTrackingImportHelper::GetIDFromString( 
aIter.to

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/dialog.cxx |4 ++--
 vcl/unx/gtk3/gtk3gtkinst.cxx |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 205eb935c286f52870d7ffd9b2d8b75c2d6bc57f
Author: Caolán McNamara 
AuthorDate: Thu Aug 22 16:14:29 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 10:22:23 2019 +0200

an assistant might have no parent

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

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 9b5f0babe06a..b6e462ba72ea 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -224,10 +224,10 @@ void Accelerator::GenerateAutoMnemonicsOnHierarchy(const 
vcl::Window* pWindow)
 if ( pWindow->GetType() == WindowType::TABPAGE )
 {
 vcl::Window* pParent = pWindow->GetParent();
-if ( pParent->GetType() == WindowType::TABCONTROL )
+if (pParent && pParent->GetType() == WindowType::TABCONTROL )
 pParent = pParent->GetParent();
 
-if ( (pParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) 
== WB_DIALOGCONTROL )
+if (pParent && (pParent->GetStyle() & (WB_DIALOGCONTROL | 
WB_NODIALOGCONTROL)) == WB_DIALOGCONTROL )
 {
 pGetChild = pParent->GetWindow( GetWindowType::FirstChild );
 while ( pGetChild )
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 4045e1c3c91c..fc0ccc8184fe 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -10916,7 +10916,8 @@ public:
 GtkAssistant* pAssistant = 
GTK_ASSISTANT(gtk_builder_get_object(m_pBuilder, id.getStr()));
 if (!pAssistant)
 return nullptr;
-gtk_window_set_transient_for(GTK_WINDOW(pAssistant), 
GTK_WINDOW(gtk_widget_get_toplevel(m_pParentWidget)));
+if (m_pParentWidget)
+gtk_window_set_transient_for(GTK_WINDOW(pAssistant), 
GTK_WINDOW(gtk_widget_get_toplevel(m_pParentWidget)));
 return std::make_unique(pAssistant, this, 
bTakeOwnership);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC'19 Final Report [ Improvement to Notebookbar]

[Sumit Chauhan]

GSoC'19 final report : Link 
GSoC'19 Blog - Link 

The work done and to do work is mentioned in the blog of extension and
customization support.
Looking for your feedbacks

Thanks and regards
Sumit Chauhan
IRC Nick : sumitcn
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/vcl officecfg/registry sd/inc sd/sdi sd/source

[Grzegorz Araminowicz (via logerrit)]

 cui/Library_cui.mk   |1 
 cui/UIConfig_cui.mk  |1 
 cui/source/dialogs/DiagramDialog.cxx |   27 +++
 cui/source/factory/dlgfact.cxx   |   13 +
 cui/source/factory/dlgfact.hxx   |   21 ++
 cui/source/inc/DiagramDialog.hxx |   34 

 cui/uiconfig/ui/diagramdialog.ui |   73 
++
 include/vcl/abstdlg.hxx  |   12 +
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
 sd/inc/app.hrc   |1 
 sd/sdi/_drvwsh.sdi   |5 
 sd/sdi/sdraw.sdi |   17 ++
 sd/source/ui/view/drviews3.cxx   |   21 ++
 13 files changed, 231 insertions(+)

New commits:
commit 5457ddf2f529daf5962abcba76dbaeccff0de826
Author: Grzegorz Araminowicz 
AuthorDate: Sun Aug 18 16:23:51 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 23 09:53:09 2019 +0200

SmartArt: add Edit Diagram dialog

Currently it displays only text representation of diagram.

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

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 1822dc311097..f770cb08158a 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/dialogs/cuiimapwnd \
 cui/source/dialogs/cuitbxform \
 cui/source/dialogs/dlgname \
+cui/source/dialogs/DiagramDialog \
 cui/source/dialogs/FontFeaturesDialog \
 cui/source/dialogs/hangulhanjadlg \
 cui/source/dialogs/hldocntp \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e25d8fbe6a13..f953af64a954 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/croppage \
cui/uiconfig/ui/cuiimapdlg \
cui/uiconfig/ui/databaselinkdialog \
+   cui/uiconfig/ui/diagramdialog \
cui/uiconfig/ui/dimensionlinestabpage \
cui/uiconfig/ui/editdictionarydialog \
cui/uiconfig/ui/editmodulesdialog \
diff --git a/cui/source/dialogs/DiagramDialog.cxx 
b/cui/source/dialogs/DiagramDialog.cxx
new file mode 100644
index ..f93b3bbdf28b
--- /dev/null
+++ b/cui/source/dialogs/DiagramDialog.cxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#include 
+
+#include 
+
+DiagramDialog::DiagramDialog(weld::Window* pWindow,
+ std::shared_ptr 
pDiagramData)
+: GenericDialogController(pWindow, "cui/ui/diagramdialog.ui", 
"DiagramDialog")
+, mpDiagramData(pDiagramData)
+, mpBtnOk(m_xBuilder->weld_button("btnOk"))
+, mpBtnCancel(m_xBuilder->weld_button("btnCancel"))
+, mpTextDiagram(m_xBuilder->weld_text_view("textDiagram"))
+{
+mpTextDiagram->set_text(mpDiagramData->getString());
+}
+
+DiagramDialog::~DiagramDialog() {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 37460b879aa0..289c79ccf8be 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -87,6 +87,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
@@ -1384,6 +1385,11 @@ short AbstractTipOfTheDayDialog_Impl::Execute()
 return m_xDlg->run();
 }
 
+short AbstractDiagramDialog_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
 VclPtr AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg(
 weld::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const 
bool _bUnoDialogMode,
 const Reference< XNameReplace >& _rxEvents, const sal_uInt16 
_nInitiallySelectedEvent )
@@ -1641,4 +1647,11 @@ 
AbstractDialogFactory_Impl::CreateTipOfTheDayDialog(weld::Window* pParent)
 return 
VclPtr::Create(std::make_unique(pParent));
 }
 
+VclPtr
+AbstractDialogFactory_Impl::CreateDiagramDialog(weld::Window* pParent, 
std::shared_ptr pDiagramData)
+{
+return VclPtr::Create(
+std::make_unique(pParent, pDiagramData));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 9948e71fcf24..7d579b22ae20 1

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/rtfexport/data/tbrl-page.rtf   |3 ++
 sw/qa/extras/rtfexport/rtfexport4.cxx   |   12 
 sw/source/filter/ww8/rtfattributeoutput.cxx |   33 +++-
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |   20 ++
 4 files changed, 56 insertions(+), 12 deletions(-)

New commits:
commit 1aed241deb816b2a6b9f3f97978443939f61d076
Author: Miklos Vajna 
AuthorDate: Fri Aug 23 08:34:29 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 23 09:18:50 2019 +0200

RTF filter: handle tbrl section text direction

Makes no sense to support btlr, Word can't handle it. (UI is disabled.)

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

diff --git a/sw/qa/extras/rtfexport/data/tbrl-page.rtf 
b/sw/qa/extras/rtfexport/data/tbrl-page.rtf
new file mode 100644
index ..ecaa2b3e05ff
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tbrl-page.rtf
@@ -0,0 +1,3 @@
+{\rtf1\sectd\stextflow1
+\pard\plain asdf\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx 
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index 6e4458efb600..bcac3b291cb7 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -224,6 +224,18 @@ DECLARE_RTFIMPORT_TEST(testPageBorder, "page-border.rtf")
 CPPUNIT_ASSERT_EQUAL(static_cast(71), aRightBorder.LineWidth);
 }
 
+DECLARE_RTFEXPORT_TEST(testTbrlPage, "tbrl-page.rtf")
+{
+uno::Reference 
xPageStyle(getStyles("PageStyles")->getByName("Standard"),
+   uno::UNO_QUERY);
+auto nActual = getProperty(xPageStyle, "WritingMode");
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 2
+// - Actual  : 0
+// i.e. custom writing mode was lost.
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::TB_RL, nActual);
+}
+
 DECLARE_RTFIMPORT_TEST(testTdf126309, "tdf126309.rtf")
 {
 // Without the accompanying fix in place, this test would have failed, as
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index a073df08cb18..d8afcc351867 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3524,9 +3524,25 @@ void RtfAttributeOutput::FormatLineNumbering(const 
SwFormatLineNumber& rNumberin
 
 void RtfAttributeOutput::FormatFrameDirection(const SvxFrameDirectionItem& 
rDirection)
 {
+SvxFrameDirection nDir = rDirection.GetValue();
+if (nDir == SvxFrameDirection::Environment)
+nDir = GetExport().GetDefaultFrameDirection();
+
+if (m_rExport.m_bOutPageDescs)
+{
+if (nDir == SvxFrameDirection::Vertical_RL_TB)
+{
+m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_STEXTFLOW);
+m_aSectionBreaks.append(static_cast(1));
+if (!m_bBufferSectionBreaks)
+
m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr());
+}
+return;
+}
+
 if (m_rExport.GetRTFFlySyntax())
 {
-if (rDirection.GetValue() == SvxFrameDirection::Vertical_RL_TB)
+if (nDir == SvxFrameDirection::Vertical_RL_TB)
 {
 // Top to bottom non-ASCII font
 m_aFlyProperties.push_back(std::make_pair("txflTextFlow", "3"));
@@ -3539,17 +3555,10 @@ void RtfAttributeOutput::FormatFrameDirection(const 
SvxFrameDirectionItem& rDire
 return;
 }
 
-if (!m_rExport.m_bOutPageDescs)
-{
-SvxFrameDirection nDir = rDirection.GetValue();
-if (nDir == SvxFrameDirection::Environment)
-nDir = GetExport().GetDefaultFrameDirection();
-
-if (nDir == SvxFrameDirection::Horizontal_RL_TB)
-m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RTLPAR);
-else
-m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LTRPAR);
-}
+if (nDir == SvxFrameDirection::Horizontal_RL_TB)
+m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RTLPAR);
+else
+m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LTRPAR);
 }
 
 void RtfAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index fa6bcc46f024..3b7434228ab7 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -1655,6 +1655,26 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 outputSettingsTable();
 break;
 }
+case RTF_STEXTFLOW:
+{
+nId = 0;
+switch (nParam)
+{
+case 0:
+nId = NS_ooxml::LN_Value_ST_TextDirection_lrTb;
+break;
+case 1:
+nId = NS_ooxml::LN_Value_ST_TextDirection_tbRl;

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/vcl solenv/CompilerTest_compilerplugins_clang.mk vcl/headless vcl/inc vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win

[Noel Grandin (via logerrit)]

 compilerplugins/clang/returnconstval.cxx   |   76 +
 compilerplugins/clang/test/returnconstval.cxx  |   21 ++
 include/vcl/commandinfoprovider.hxx|2 
 include/vcl/graphicfilter.hxx  |2 
 include/vcl/region.hxx |4 -
 include/vcl/status.hxx |2 
 include/vcl/toolbox.hxx|2 
 solenv/CompilerTest_compilerplugins_clang.mk   |1 
 vcl/headless/svptext.cxx   |2 
 vcl/inc/headless/svpgdi.hxx|2 
 vcl/inc/qt5/Qt5Graphics.hxx|2 
 vcl/inc/quartz/salgdi.h|2 
 vcl/inc/salgdi.hxx |2 
 vcl/inc/textrender.hxx |2 
 vcl/inc/unx/cairotextrender.hxx|2 
 vcl/inc/unx/genpspgraphics.h   |2 
 vcl/inc/unx/glyphcache.hxx |2 
 vcl/inc/unx/salgdi.h   |2 
 vcl/inc/win/salgdi.h   |2 
 vcl/qt5/Qt5Graphics_Text.cxx   |2 
 vcl/quartz/salgdi.cxx  |5 -
 vcl/source/control/field.cxx   |2 
 vcl/source/filter/graphicfilter.cxx|4 -
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx|4 -
 vcl/source/gdi/region.cxx  |4 -
 vcl/source/helper/commandinfoprovider.cxx  |   12 +--
 vcl/source/window/status.cxx   |2 
 vcl/source/window/toolbox2.cxx |2 
 vcl/unx/generic/gdi/cairotextrender.cxx|5 -
 vcl/unx/generic/gdi/font.cxx   |2 
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |5 -
 vcl/unx/generic/print/genpspgraphics.cxx   |5 -
 vcl/win/gdi/salfont.cxx|5 -
 33 files changed, 142 insertions(+), 49 deletions(-)

New commits:
commit 9d5b9bf881606e83a051cc192d08c4690f98a8ba
Author: Noel Grandin 
AuthorDate: Thu Aug 22 16:33:14 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 23 09:12:23 2019 +0200

loplugin:returnconstval in vcl

Change-Id: Id4a0b460ba3c43e80b80ae6e2da9e40a6753e14c
Reviewed-on: https://gerrit.libreoffice.org/77965
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/vcl/commandinfoprovider.hxx 
b/include/vcl/commandinfoprovider.hxx
index f1254a04a14a..8b5bac1a5c31 100644
--- a/include/vcl/commandinfoprovider.hxx
+++ b/include/vcl/commandinfoprovider.hxx
@@ -88,7 +88,7 @@ namespace vcl { namespace CommandInfoProvider {
 const OUString& rsCommandName,
 const OUString& rModuleName);
 
-VCL_DLLPUBLIC OUString const GetModuleIdentifier(const 
css::uno::Reference& rxFrame);
+VCL_DLLPUBLIC OUString GetModuleIdentifier(const 
css::uno::Reference& rxFrame);
 } }
 
 #endif // INCLUDED_VCL_COMMANDINFOPROVIDER_HXX
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 14373039b684..eea2e9ac8b7d 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -300,7 +300,7 @@ public:
 const FilterErrorEx&GetLastError() const { return *pErrorEx;}
 voidResetLastError();
 
-const Link GetFilterCallback() const;
+Link GetFilterCallback() const;
 static GraphicFilter& GetGraphicFilter();
 static ErrCode  LoadGraphic( const OUString& rPath, const OUString& 
rFilter,
  Graphic& rGraphic,
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 80feefcec5b5..3edcaa033636 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -82,8 +82,8 @@ public:
 
 // access with converters, the asked data will be created from the most
 // valuable data, buffered and returned
-const tools::PolyPolygon GetAsPolyPolygon() const;
-const basegfx::B2DPolyPolygon GetAsB2DPolyPolygon() const;
+tools::PolyPolygon GetAsPolyPolygon() const;
+basegfx::B2DPolyPolygon GetAsB2DPolyPolygon() const;
 const RegionBand* GetAsRegionBand() const;
 
 // manipulators
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index c89b5064ff81..fe6ec34e41a4 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -156,7 +156,7 @@ public:
 void*   GetItemData( sal_uInt16 nItemId ) const;
 
 voidSetItemCommand( sal_uInt16 nItemId, const OUString& 
rCommand );
-const OUString  GetItemCommand( sal_uInt16 nItemId );
+OUStringGetItemCommand( sal_uInt16 nItemId );
 
 voidSetHelpText( sal_uInt16 nItemId, const OUString& rText 
);
 const OUString& GetHelpText( sal_uInt16 nItemId ) const;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 21ba679150f6..32f9c061889e 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -413,7 +413,7 @@ public:
 boolIsItemReallyVisible( s

[Libreoffice-commits] core.git: animations/source editeng/source include/comphelper include/toolkit sc/source sd/source starmath/source svx/source sw/inc sw/source toolkit/source vcl/source xmloff/sou

[Arkadiy Illarionov (via logerrit)]

 animations/source/animcore/animcore.cxx   |2 -
 editeng/source/uno/unofield.cxx   |3 --
 editeng/source/uno/unotext.cxx|6 +---
 include/comphelper/servicehelper.hxx  |   13 ++
 include/toolkit/controls/unocontrolmodel.hxx  |2 -
 sc/source/ui/app/drwtrans.cxx |3 --
 sc/source/ui/app/transobj.cxx |3 --
 sc/source/ui/unoobj/dapiuno.cxx   |4 ---
 sc/source/ui/unoobj/docuno.cxx|4 ---
 sc/source/ui/unoobj/nameuno.cxx   |4 ---
 sc/source/ui/unoobj/textuno.cxx   |4 ---
 sc/source/ui/vba/vbaworksheet.cxx |3 --
 sd/source/ui/app/sdxfer.cxx   |3 --
 sd/source/ui/dlg/sdtreelb.cxx |3 --
 sd/source/ui/framework/factories/Pane.cxx |3 --
 sd/source/ui/framework/factories/ViewShellWrapper.cxx |3 --
 sd/source/ui/unoidl/DrawController.cxx|3 --
 sd/source/ui/unoidl/unopage.cxx   |3 --
 starmath/source/mathmlexport.cxx  |4 ---
 starmath/source/mathmlimport.cxx  |4 ---
 starmath/source/unomodel.cxx  |6 +---
 svx/source/fmcomp/gridcell.cxx|4 ---
 svx/source/unodraw/unoshape.cxx   |2 -
 sw/inc/unobaseclass.hxx   |5 +--
 sw/source/core/unocore/TextCursorHelper.cxx   |   10 +++
 sw/source/core/unocore/unochart.cxx   |4 ---
 sw/source/core/unocore/unodraw.cxx|4 ---
 sw/source/core/unocore/unoframe.cxx   |4 ---
 sw/source/core/unocore/unoport.cxx|4 ---
 sw/source/core/unocore/unoportenum.cxx|4 ---
 sw/source/core/unocore/unosett.cxx|8 +-
 sw/source/core/unocore/unosrch.cxx|4 ---
 sw/source/core/unocore/unotbl.cxx |   11 ++--
 sw/source/filter/xml/xmlexp.cxx   |4 ---
 sw/source/filter/xml/xmlimp.cxx   |4 ---
 sw/source/uibase/dochdl/swdtflvr.cxx  |3 --
 sw/source/uibase/uno/unoatxt.cxx  |   12 +++--
 sw/source/uibase/uno/unodispatch.cxx  |6 +---
 sw/source/uibase/uno/unotxdoc.cxx |6 +---
 sw/source/uibase/uno/unotxvw.cxx  |   10 +++
 toolkit/source/controls/grid/gridcolumn.cxx   |3 +-
 toolkit/source/controls/unocontrolmodel.cxx   |4 +--
 vcl/source/graphic/UnoGraphic.cxx |3 +-
 vcl/source/treelist/transfer.cxx  |3 --
 xmloff/source/core/unoatrcn.cxx   |3 --
 xmlsecurity/source/gpg/CertificateImpl.cxx|2 -
 xmlsecurity/source/gpg/SecurityEnvironment.cxx|2 -
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |2 -
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |2 -
 49 files changed, 77 insertions(+), 139 deletions(-)

New commits:
commit 24c17dab2f10ad1b7ba342fbd40dc65b7d8f9b24
Author: Arkadiy Illarionov 
AuthorDate: Wed Jun 12 12:18:07 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Fri Aug 23 09:10:49 2019 +0200

tdf#39593 extract UnoTunnelId comparison to template function

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

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index 9078b2fe4649..b7e28dc15c6d 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1935,7 +1935,7 @@ void SAL_CALL AnimationNode::removeChangesListener( const 
Reference< XChangesLis
 // XUnoTunnel
 ::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 
>& rId )
 {
-if( rId.getLength() == 16 && memcmp( getUnoTunnelId().getConstArray(), 
rId.getConstArray(), 16 ) == 0 )
+if( isUnoTunnelId(rId) )
 {
 return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr 
>(this));
 
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index ab1b0927dceb..94ca091bead8 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unof