date:20221103

 dbaccess/inc/strings.hxx  |  309 +--
 dbaccess/source/core/api/definitioncolumn.cxx |   26 
 dbaccess/source/filter/xml/xmlHelper.cxx  |   26 
 include/xmloff/maptype.hxx|   35 
 reportdesign/inc/strings.hxx  |  418 ++--
 reportdesign/source/filter/xml/xmlHelper.cxx  |   24 
 reportdesign/source/ui/inspection/DataProviderHandler.cxx |   10 
 reportdesign/source/ui/inspection/metadata.cxx|   52 
 sc/inc/unonames.hxx   | 1136 ++---
 sc/source/filter/xml/xmlstyle.cxx |2 
 sc/source/ui/unoobj/styleuno.cxx  |  530 +++---
 xmloff/inc/xmlprop.hxx|  670 +++
 xmloff/source/chart/PropertyMaps.cxx  |  247 +-
 xmloff/source/draw/sdpropls.cxx   |  477 ++---
 xmloff/source/draw/shapeexport.cxx|6 
 xmloff/source/draw/ximpshap.cxx   |7 
 xmloff/source/forms/controlpropertymap.cxx|   63 
 xmloff/source/forms/elementexport.cxx |   66 
 xmloff/source/forms/elementimport.cxx |   44 
 xmloff/source/forms/propertyexport.cxx|5 
 xmloff/source/forms/propertyexport.hxx|2 
 xmloff/source/forms/strings.hxx   |  230 +-
 xmloff/source/forms/valueproperties.cxx   |   12 
 xmloff/source/forms/valueproperties.hxx   |   13 
 xmloff/source/style/PageMasterStyleMap.cxx|  438 ++---
 xmloff/source/style/xmlprmap.cxx  |7 
 xmloff/source/table/XMLTableExport.cxx|   39 
 xmloff/source/text/txtprmap.cxx   | 1199 +++---
 28 files changed, 3385 insertions(+), 2708 deletions(-)

New commits:
commit e14a3ebf801848236bd9559f64c134412e498a32
Author: Noel Grandin 
AuthorDate: Thu Nov 3 08:29:41 2022 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 4 06:50:43 2022 +0100

tdf#54857 use OUStringConstExpr in XMLPropertyMapEntry

which means we don't need to allocate a bunch of strings
when building the property maps in xmloff

Change-Id: I83cb013f816d9b7bcb0dd55c59e5151b33b91c9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142192
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx
index eb90a6c04d82..021f34cc70b5 100644
--- a/dbaccess/inc/strings.hxx
+++ b/dbaccess/inc/strings.hxx
@@ -12,147 +12,152 @@
 
 // property names
 
-#define PROPERTY_URL "URL"
-#define PROPERTY_INFO "Info"
-#define PROPERTY_SETTINGS "Settings"
-#define PROPERTY_ISPASSWORDREQUIRED "IsPasswordRequired"
-#define PROPERTY_TABLEFILTER "TableFilter"
-#define PROPERTY_TABLETYPEFILTER "TableTypeFilter"
-#define PROPERTY_NAME "Name"
-#define PROPERTY_SCHEMANAME "SchemaName"
-#define PROPERTY_CATALOGNAME "CatalogName"
-#define PROPERTY_PRIVILEGES "Privileges"
-#define PROPERTY_ESCAPE_PROCESSING "EscapeProcessing"
-#define PROPERTY_COMMAND "Command"
-#define PROPERTY_TYPE "Type"
-#define PROPERTY_TYPENAME "TypeName"
-#define PROPERTY_PRECISION "Precision"
-#define PROPERTY_SCALE "Scale"
-#define PROPERTY_ISNULLABLE "IsNullable"
-#define PROPERTY_ISAUTOINCREMENT "IsAutoIncrement"
-#define PROPERTY_ISROWVERSION "IsRowVersion"
-#define PROPERTY_DESCRIPTION "Description"
-#define PROPERTY_DEFAULTVALUE "DefaultValue"
-#define PROPERTY_NUMBERFORMAT "FormatKey"
-#define PROPERTY_QUERYTIMEOUT "QueryTimeOut"
-#define PROPERTY_MAXFIELDSIZE "MaxFieldSize"
-#define PROPERTY_MAXROWS "MaxRows"
-#define PROPERTY_CURSORNAME "CursorName"
-#define PROPERTY_RESULTSETCONCURRENCY "ResultSetConcurrency"
-#define PROPERTY_RESULTSETTYPE "ResultSetType"
-#define PROPERTY_FETCHDIRECTION "FetchDirection"
-#define PROPERTY_FETCHSIZE "FetchSize"
-#define PROPERTY_USEBOOKMARKS "UseBookmarks"
-#define PROPERTY_ISSEARCHABLE "IsSearchable"
-#define PROPERTY_ISCURRENCY "IsCurrency"
-#define PROPERTY_ISSIGNED "IsSigned"
-#define PROPERTY_DISPLAYSIZE "DisplaySize"
-#define PROPERTY_LABEL "Label"
-#define PROPERTY_ISREADONLY "IsReadOnly"
-#define PROPERTY_ISWRITABLE "IsWritable"
-#define PROPERTY_ISDEFINITELYWRITABLE "IsDefinitelyWritable"
-#define PROPERTY_VALUE "Value"
-#define PROPERTY_TABLENAME "TableName"
-#define PROPERTY_ISCASESENSITIVE "IsCaseSensitive"
-#define PROPERTY_SERVICENAME "ServiceName"
-#define PROPERTY_ISBOOKMARKABLE "IsBookmarkable"
-#define PROPERTY_CANUPDATEINSERTEDROWS "CanUpdateInsertedRows"
-#define PROPERTY_NUMBERFORMATSSUPPLIER "NumberFormatsSupplier"
-#define PROPERTY_DATASOURCENAME "DataSourceName"
-#define PROPERTY_DATABASE_LOCATION "DatabaseLocation"
-#define PROPERTY_CONNECTION_RESOURCE "ConnectionResource"
-#define PROPERTY_CONNECTION_INFO "ConnectionInfo"
-#def

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

 sw/source/core/unocore/unoparagraph.cxx |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 2ae53eb5dcbe0a3c5b4dc5323639a11878a38101
Author: Noel Grandin 
AuthorDate: Tue Nov 1 10:05:17 2022 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 4 06:50:22 2022 +0100

tdf#126788 remove weak m_wThis reference

weak references are surprsingly expensive in bulk.

To make sure we don't get revive an object, we need to stop listening
before we destroy the Impl object

Change-Id: I8a3d99e29681e1f844598bc7ac792a659e1104f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142092
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/unocore/unoparagraph.cxx 
b/sw/source/core/unocore/unoparagraph.cxx
index 7f8aa247260c..d2f3db46680e 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -114,7 +114,6 @@ class SwXParagraph::Impl
 {
 public:
 SwXParagraph& m_rThis;
-unotools::WeakReference m_wThis;
 std::mutex m_Mutex; // just for OInterfaceContainerHelper4
 ::comphelper::OInterfaceContainerHelper4 
m_EventListeners;
 SfxItemPropertySet const& m_rPropSet;
@@ -192,12 +191,8 @@ void SwXParagraph::Impl::Notify(const SfxHint& rHint)
 std::unique_lock aGuard(m_Mutex);
 if (m_EventListeners.getLength(aGuard) != 0)
 {
-uno::Reference const xThis(m_wThis);
-if (!xThis.is())
-{   // fdo#72695: if UNO object is already dead, don't revive it 
with event
-return;
-}
-lang::EventObject const ev(xThis);
+uno::Reference const xThis(m_rThis);
+lang::EventObject const ev(m_rThis);
 m_EventListeners.disposeAndClear(aGuard, ev);
 }
 }
@@ -219,6 +214,10 @@ SwXParagraph::SwXParagraph(
 
 SwXParagraph::~SwXParagraph()
 {
+SolarMutexGuard aGuard;
+// need to stop listening before destruction so we don't get DYING events
+// that might then revive the SwXParagraph when constructing an EventObject
+m_pImpl->EndListeningAll();
 }
 
 const SwTextNode * SwXParagraph::GetTextNode() const
@@ -265,8 +264,6 @@ SwXParagraph::CreateXParagraph(SwDoc & rDoc, SwTextNode 
*const pTextNode,
 {
 pTextNode->SetXParagraph(xParagraph);
 }
-// need a permanent Reference to initialize m_wThis
-pXPara->m_pImpl->m_wThis = xParagraph.get();
 return xParagraph;
 }

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

2022-11-03 Thread Mike Kaganski (via logerrit)

 starmath/inc/utility.hxx|   29 -
 starmath/source/cfgitem.cxx |6 +++---
 starmath/source/dialog.cxx  |7 ---
 starmath/source/format.cxx  |2 +-
 starmath/source/mathml/mathmlexport.cxx |   14 +++---
 starmath/source/node.cxx|6 +++---
 starmath/source/unomodel.cxx|7 +++
 starmath/source/utility.cxx |2 +-
 8 files changed, 22 insertions(+), 51 deletions(-)

New commits:
commit a37a979107a8643136ff3733b5b350b6b1be2bb7
Author: Mike Kaganski 
AuthorDate: Thu Nov 3 21:36:26 2022 +0200
Commit: Mike Kaganski 
CommitDate: Fri Nov 4 05:32:27 2022 +0100

Use o3tl::convert in Math

... and use our standard definition of pt.

Change-Id: I5a162b137360210335b84de33606dc7404cfc2de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142204
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index ee504017038a..c0b473264532 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -27,35 +27,6 @@
 #include 
 #include 
 
-inline tools::Long SmPtsTo100th_mm(tools::Long nNumPts)
-// returns the length (in 100th of mm) that corresponds to the length
-// 'nNumPts' (in units points).
-// 72.27 [pt] = 1 [inch] = 2,54 [cm] = 2540 [100th of mm].
-// result is being rounded to the nearest integer.
-{
-SAL_WARN_IF( nNumPts < 0, "starmath", "Ooops..." );
-// broken into multiple and fraction of 'nNumPts' to reduce chance
-// of overflow
-// (7227 / 2) is added in order to round to the nearest integer
-return 35 * nNumPts + (nNumPts * 1055L + (7227 / 2)) / 7227L;
-}
-
-
-inline Fraction Sm100th_mmToPts(tools::Long nNum100th_mm)
-// returns the length (in points) that corresponds to the length
-// 'nNum100th_mm' (in 100th of mm).
-{
-SAL_WARN_IF( nNum100th_mm < 0, "starmath", "Ooops..." );
-return Fraction(7227L, 254000L) * Fraction(nNum100th_mm);
-}
-
-
-inline tools::Long SmRoundFraction(const Fraction &rFrac)
-{
-SAL_WARN_IF( rFrac <= Fraction(), "starmath", "Ooops..." );
-return (rFrac.GetNumerator() + rFrac.GetDenominator() / 2) / 
rFrac.GetDenominator();
-}
-
 
 class SmViewShell;
 SmViewShell * SmGetActiveView();
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index a8c0e5fcae38..9b6a4eadd184 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -988,7 +988,7 @@ void SmMathConfig::LoadFormat()
 ++pVal;
 // StandardFormat/BaseSize
 if (pVal->hasValue()  &&  (*pVal >>= nTmp16))
-pFormat->SetBaseSize( Size(0, SmPtsTo100th_mm( nTmp16 )) );
+pFormat->SetBaseSize(Size(0, o3tl::convert(nTmp16, o3tl::Length::pt, 
o3tl::Length::mm100)));
 ++pVal;
 
 sal_uInt16 i;
@@ -1059,8 +1059,8 @@ void SmMathConfig::SaveFormat()
 // StandardFormat/HorizontalAlignment
 *pValue++ <<= static_cast(pFormat->GetHorAlign());
 // StandardFormat/BaseSize
-*pValue++ <<= static_cast(SmRoundFraction( Sm100th_mmToPts(
-pFormat->GetBaseSize().Height() ) ));
+*pValue++ <<= static_cast(
+o3tl::convert(pFormat->GetBaseSize().Height(), o3tl::Length::mm100, 
o3tl::Length::pt));
 
 sal_uInt16 i;
 for (i = SIZ_BEGIN;  i <= SIZ_END;  ++i)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 043739cf5c0d..f700b8e6ce9a 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -392,8 +392,9 @@ SmFontSizeDialog::~SmFontSizeDialog()
 void SmFontSizeDialog::ReadFrom(const SmFormat &rFormat)
 {
 //! watch out: round properly!
-m_xBaseSize->set_value( SmRoundFraction(
-Sm100th_mmToPts( rFormat.GetBaseSize().Height() ) ), FieldUnit::NONE );
+m_xBaseSize->set_value(
+o3tl::convert(rFormat.GetBaseSize().Height(), o3tl::Length::mm100, 
o3tl::Length::pt),
+FieldUnit::NONE);
 
 m_xTextSize->set_value( rFormat.GetRelSize(SIZ_TEXT), FieldUnit::NONE );
 m_xIndexSize->set_value( rFormat.GetRelSize(SIZ_INDEX), FieldUnit::NONE );
@@ -404,7 +405,7 @@ void SmFontSizeDialog::ReadFrom(const SmFormat &rFormat)
 
 void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
 {
-rFormat.SetBaseSize( Size(0, SmPtsTo100th_mm( static_cast< tools::Long 
>(m_xBaseSize->get_value(FieldUnit::NONE );
+rFormat.SetBaseSize( Size(0, 
o3tl::convert(m_xBaseSize->get_value(FieldUnit::NONE), o3tl::Length::pt, 
o3tl::Length::mm100)) );
 
 rFormat.SetRelSize(SIZ_TEXT, 
sal::static_int_cast(m_xTextSize->get_value(FieldUnit::NONE)));
 rFormat.SetRelSize(SIZ_INDEX,
sal::static_int_cast(m_xIndexSize->get_value(FieldUnit::NONE)));
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 65ec09558d56..f1f7a00f3806 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -21,7 +21,7 @@
 
 
 SmFormat::

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-3' - dbaccess/source

2022-11-03 Thread Adolfo Jayme Barrientos (via logerrit)

 dbaccess/source/ui/uno/copytablewizard.cxx |   68 ++---
 1 file changed, 33 insertions(+), 35 deletions(-)

New commits:
commit 509703632ec0dc24d4c30a7a2400c05647c89aba
Author: Noel Grandin 
AuthorDate: Fri Oct 28 11:28:58 2022 +0200
Commit: Aron Budea 
CommitDate: Fri Nov 4 04:31:35 2022 +0100

make ValueTransfer easier to understand

storing references to local variables makes it harder to figure out what
the control flow is doing.

Change-Id: Ifa7fedd6e4be19a0aa8180aa4f754f1811ca44a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141965
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit ca82061c2cad00aeddb17b766063776fee0ee41a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142206
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx 
b/dbaccess/source/ui/uno/copytablewizard.cxx
index 4404c9595c1d..5894a642594e 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -942,40 +942,39 @@ namespace
 class ValueTransfer
 {
 public:
-ValueTransfer( const sal_Int32& _rSourcePos, const sal_Int32& 
_rDestPos, std::vector< sal_Int32 >&& _rColTypes,
+ValueTransfer( std::vector< sal_Int32 > _rColTypes,
 const Reference< XRow >& _rxSource, const Reference< XParameters 
>& _rxDest )
-:m_rSourcePos( _rSourcePos )
-,m_rDestPos( _rDestPos )
-,m_rColTypes( std::move(_rColTypes) )
+:m_ColTypes( std::move(_rColTypes) )
 ,m_xSource( _rxSource )
 ,m_xDest( _rxDest )
 {
 }
 
 template< typename VALUE_TYPE >
-void transferValue( VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ),
+void transferValue( sal_Int32 _nSourcePos, sal_Int32 _nDestPos,
+VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ),
 void (SAL_CALL XParameters::*_pSetter)( sal_Int32, VALUE_TYPE ) )
 {
-VALUE_TYPE value( (m_xSource.get()->*_pGetter)( m_rSourcePos ) );
+VALUE_TYPE value( (m_xSource.get()->*_pGetter)( _nSourcePos ) );
 if ( m_xSource->wasNull() )
-m_xDest->setNull( m_rDestPos, m_rColTypes[ m_rSourcePos ] );
+m_xDest->setNull( _nDestPos, m_ColTypes[ _nSourcePos ] );
 else
-(m_xDest.get()->*_pSetter)( m_rDestPos, value );
+(m_xDest.get()->*_pSetter)( _nDestPos, value );
 }
- template< typename VALUE_TYPE >
-void transferComplexValue( VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( 
sal_Int32 ),
+
+template< typename VALUE_TYPE >
+void transferComplexValue( sal_Int32 _nSourcePos, sal_Int32 _nDestPos,
+VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ),
 void (SAL_CALL XParameters::*_pSetter)( sal_Int32, const VALUE_TYPE& ) 
)
 {
-const VALUE_TYPE value( (m_xSource.get()->*_pGetter)( m_rSourcePos ) );
+const VALUE_TYPE value( (m_xSource.get()->*_pGetter)( _nSourcePos ) );
 if ( m_xSource->wasNull() )
-m_xDest->setNull( m_rDestPos, m_rColTypes[ m_rSourcePos ] );
+m_xDest->setNull( _nDestPos, m_ColTypes[ _nSourcePos ] );
 else
-(m_xDest.get()->*_pSetter)( m_rDestPos, value );
+(m_xDest.get()->*_pSetter)( _nDestPos, value );
 }
 private:
-const sal_Int32&m_rSourcePos;
-const sal_Int32&m_rDestPos;
-const std::vector< sal_Int32 >m_rColTypes;
+const std::vector< sal_Int32 >  m_ColTypes;
 const Reference< XRow > m_xSource;
 const Reference< XParameters >  m_xDest;
 };
@@ -1144,13 +1143,12 @@ void CopyTableWizard::impl_copyRows_throw( const 
Reference< XResultSet >& _rxSou
 // notify listeners
 m_aCopyTableListeners.notifyEach( &XCopyTableListener::copyingRow, 
aCopyEvent );
 
-sal_Int32 nDestColumn( 0 );
-sal_Int32 nSourceColumn( 1 );
-ValueTransfer aTransfer( nSourceColumn, nDestColumn, 
std::vector(aSourceColTypes), xRow, xStatementParams );
+sal_Int32 nSourceColumn( 0 );
+ValueTransfer aTransfer( aSourceColTypes, xRow, xStatementParams );
 
 for ( auto const& rColumnPos : aColumnPositions )
 {
-nDestColumn = rColumnPos.first;
+sal_Int32 nDestColumn = rColumnPos.first;
 if ( nDestColumn == COLUMN_POSITION_NOT_FOUND )
 {
 ++nSourceColumn;
@@ -1176,7 +1174,7 @@ void CopyTableWizard::impl_copyRows_throw( const 
Reference< XResultSet >& _rxSou
 {
 case DataType::DOUBLE:
 case DataType::REAL:
-aTransfer.transferValue( &XRow::getDouble, 
&XParameters::setDouble );
+aTransfer.transferValu

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

 sc/uiconfig/scalc/ui/validationcriteriapage.ui |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5efb023c27e693654b09c45894a6f4a50f3d950e
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Nov 3 04:59:17 2022 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 4 04:31:11 2022 +0100

tdf#150045 Supplemental label in Validity dialog

In a type ramp, this label has secondary importance. This
change gives texture to the dialog and makes it easier to parse.

Change-Id: If1dbb01ff2fb0a103a7f534b9ca4cc4681e923ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142227
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/sc/uiconfig/scalc/ui/validationcriteriapage.ui 
b/sc/uiconfig/scalc/ui/validationcriteriapage.ui
index 6bd6b7b29c2c..48f2395cb4e7 100644
--- a/sc/uiconfig/scalc/ui/validationcriteriapage.ui
+++ b/sc/uiconfig/scalc/ui/validationcriteriapage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -268,6 +268,9 @@
 50
 0
 0
+
+  
+
   
   
 1

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - configure.ac

2022-11-03 Thread Thorsten Behrens (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c307a92a8e6a8aa6ea403ebb67c8a4e3335faa4
Author: Thorsten Behrens 
AuthorDate: Fri Nov 4 03:50:24 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Nov 4 03:50:24 2022 +0100

Release 5.4.16

Change-Id: Ifffd9a8dfe6802fb829ca38541783f6e433a323b

diff --git a/configure.ac b/configure.ac
index 5c5f843c168c..a52137e6f88a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.4.15.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.16.0],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 7 commits - download.lst external/curl external/libxml2 external/poppler external/zlib sc/source sdext/Executable_xpdfimport.mk unox

2022-11-03 Thread Jan-Marek Glogowski (via logerrit)

 download.lst |   18 ++--
 external/curl/ExternalProject_curl.mk|2 
 external/curl/curl-7.26.0_win-proxy.patch|8 -
 external/curl/curl-nss.patch.1   |7 +
 external/libxml2/ExternalPackage_xml2.mk |2 
 external/libxml2/UnpackedTarball_xml2.mk |5 -
 external/libxml2/libxml2-android.patch   |6 -
 external/libxml2/libxml2-config.patch.1  |   43 -
 external/libxml2/xml2-config.in  |   28 ++
 external/poppler/UnpackedTarball_poppler.mk  |2 
 external/poppler/disable-freetype.patch.1|   41 +
 external/poppler/gcc7-EntityInfo.patch.1 |   48 +++
 external/poppler/poppler-c++11.patch.1   |   13 ++
 external/poppler/poppler-config.patch.1  |   27 ++
 external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch |   29 ++
 external/zlib/UnpackedTarball_zlib.mk|7 +
 external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch |   32 +++
 sc/source/core/tool/interpr7.cxx |3 
 sdext/Executable_xpdfimport.mk   |4 
 unoxml/source/xpath/xpathobject.cxx  |2 
 20 files changed, 248 insertions(+), 79 deletions(-)

New commits:
commit 98d3d103fb99ee4433e84aa2fd1f0fa13016cf02
Author: Jan-Marek Glogowski 
AuthorDate: Sun May 30 13:23:16 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Nov 4 03:05:50 2022 +0100

libxml2: use xml2-config dummy for internal build

When building a static LO with --disable-dynloading on Linux,
--without-system-libs failed for me. And it left me really puzzled:
raptor configure failed and claimed it couldn't link libxml2.

raptor's config.log showed missing math functions. xml2-config of
LO's build is patched and it includes a -lm. The xml2-config in my
chroot doesn't. But we explicitly pass the xml2-config for
non-system-libxml2 build. Reading the configure from raptor didn't
reveal a way, that it could somehow pick up the xml2-config from
the chroot, but that code is autoconf-complex...

When running "sh -x configure", it turned out the configure script
actually picks up the LIBXML_* flags from the environment, which
are set by LO's config_host.mk. These just add -lm for Android.

So this adds a xml2-config.in "dummy", which overwrites the one
from the libxml2 source and just echos LO's LIBXML_* values and
it adds -lm for all DISABLE_DYNLOADING targets.

Change-Id: Ia713cf80c8e7dc989cf23c224e7a0f7ea1210a87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116409
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 8b9f8f0f9d38cc64f742fe5358fce88d0f82391a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139965
Reviewed-by: Michael Stahl 
(cherry picked from commit 5c044ae7a3246bddbd0513bd5ed3efef10cb1503)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142035
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

Conflicts:
external/libxml2/UnpackedTarball_xml2.mk
external/libxml2/libxml2-config.patch.1

diff --git a/external/libxml2/UnpackedTarball_xml2.mk 
b/external/libxml2/UnpackedTarball_xml2.mk
index 5cff2aed0a87..52523c5c8bd3 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_xml2.mk
@@ -11,12 +11,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xml2))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,xml2))
+
 $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
-   external/libxml2/libxml2-config.patch.1 \
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
external/libxml2/libxml2-icu.patch.0 \
 ))
 
+$(eval $(call 
gb_UnpackedTarball_add_file,xml2,xml2-config.in,external/libxml2/xml2-config.in))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-config.patch.1 
b/external/libxml2/libxml2-config.patch.1
deleted file mode 100644
index 28ac8f2809a7..
--- a/external/libxml2/libxml2-config.patch.1
+++ /dev/null
@@ -1,43 +0,0 @@
-Hack the xml2-config to return paths into WORKDIR.
-
 a/xml2-config.in   2009-12-17 11:45:20.0 +
-+++ b/xml2-config.in   2009-12-17 11:45:36.0 +
-@@ -1,9 +1,14 @@
- #! /bin/sh
- 
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--includedir=@includedir@
--libdir=@libdir@
-+#prefix=@prefix@
-+#exec_prefix=@exec_prefix@
-+#include

Interacting with AT-SPI2 in CI environment

2022-11-03 Thread Colomban Wendling

Hello everyone,

As part of my effort to improve accessibility test infrastructure and
coverage [1], I'll have to work on covering the platform layer.

The chosen approach, after discussing with Florian Effenberger (back in
late 2021 I think), is communicating with a LO process through AT-SPI2
on Linux. This is because it's the true outer layer, and that GTK4 does
not use ATK anymore, so tests relying on simply checking the ATK
implementations in the GTK3 VCL would not be future-proof, and don't
seem sensible to invest on nowadays. Using AT-SPI2 directly would also
allow testing the Qt VCLs.

This means that to perform tests I'll have to run LO in the CI
environment in a way where it can use the gtk3/4 VCL, and have a working
AT-SPI2 bus so they can communicate. The tests themselves would then
simply use the exposed AT-SPI2 interfaces and control they behave as
expected.

We at Hypra already have done similar setups (even with LO itself) using
xvfb-run (or xvnc, but that's not very useful in CI) and dbus-launch,
and then interacting through AT-SPI2 using Python and the excellent
dogtail module [2].

My question here is: what would be acceptable in CIs, and how would it
work to add such CI dependencies? I'd rather not rebuild xvfb & al for
each CI run, as it seems heavy and not very sensible: it's a fairly
standard piece of software and I wouldn't need any specific version of it.

A follow-up question would be whether you have any pointers in how to
integrate this kind of things to the build? I didn't start
investigating because I'd like to make sure I'm not pursuing the wrong
path, but anything that could save me reading a hundred gbuild files
would be much appreciated :)

Thanks in advance,
Colomban

[1]
https://blog.documentfoundation.org/blog/2021/10/13/tender-to-implement-c-accessibility-tests-202110-01/

[2] https://gitlab.com/dogtail/dogtail

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

2022-11-03 Thread Eike Rathke (via logerrit)

 sc/source/core/tool/interpr4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 94c64c0c999eeaa91ebdc335186289046eacdc4f
Author: Eike Rathke 
AuthorDate: Thu Nov 3 19:10:00 2022 +0100
Commit: Eike Rathke 
CommitDate: Fri Nov 4 01:02:34 2022 +0100

Related: tdf#151863 Set #REF! error if reference list is not convertible

i.e. to array/matrix that a function or operator may expect.

That indicates the actual problem better than #VALUE! and also
seems to be what Excel does.

Change-Id: I9c3857613e330f9a93d4a0595e740106addc6e67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142250
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 90b02b1e7f47..b122a836d654 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1581,7 +1581,7 @@ bool ScInterpreter::ConvertMatrixParameters()
 eType != formula::ParamClass::ForceArray)
 {
 // can't convert to matrix
-SetError( FormulaError::NoValue);
+SetError( FormulaError::NoRef);
 }
 // else: the consuming function has to decide if and how to
 // handle a reference list argument in array context.

[Libreoffice-commits] core.git: chart2/qa include/test oox/qa sc/qa sd/qa

 chart2/qa/extras/chart2export.cxx   |   22 +++---
 chart2/qa/extras/chart2export2.cxx  |   36 ++--
 chart2/qa/extras/chart2export3.cxx  |8 
 chart2/qa/extras/chart2geometry.cxx |2 +-
 include/test/unoapi_test.hxx|5 ++---
 oox/qa/unit/export.cxx  |8 
 sc/qa/unit/scshapetest.cxx  |2 +-
 sc/qa/unit/uicalc/uicalc.cxx|2 +-
 sd/qa/unit/export-tests.cxx |4 ++--
 9 files changed, 44 insertions(+), 45 deletions(-)

New commits:
commit 2640796d90ad4c69f5093e7b3353d43b647901e1
Author: Xisco Fauli 
AuthorDate: Thu Nov 3 17:20:11 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 3 23:22:14 2022 +0100

UnoApiTest: make mbSkipValidation private

Change-Id: Icc292b40b3295e7890f81d448bb4907725f46970
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142245
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index f58796a3219c..f287577fb63a 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -354,7 +354,7 @@ void Chart2ExportTest::testTrendline()
 {
 // Validation fails with
 // Error: tag name "chart:symbol-image" is not allowed. Possible tag names 
are: 
-mbSkipValidation = true;
+skipValidation();
 loadFromURL(u"ods/trendline.ods");
 checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
 saveAndReload("calc8");
@@ -594,7 +594,7 @@ void Chart2ExportTest::testAreaChartLoad()
 loadFromURL(u"docx/testAreaChartLoad.docx");
 
 // FIXME: validation error in OOXML export: Errors: 1
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML 
Text");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -652,7 +652,7 @@ void Chart2ExportTest::testPieChartWallLineStyle()
 loadFromURL(u"odt/testPieChartWallLineStyle.odt");
 
 // FIXME: validation error in OOXML export: Errors: 9
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open 
XML Text");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -920,7 +920,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
 aTest.checkObject2(xChartDoc);
 
 // FIXME: validation error in OOXML export: Errors: 3
-mbSkipValidation = true;
+skipValidation();
 
 saveAndReload("Office Open XML Text");
 
@@ -938,7 +938,7 @@ void Chart2ExportTest::testDataLabel3DChartDOCX()
 CPPUNIT_ASSERT(xChartDoc.is());
 
 // FIXME: validation error in OOXML export: Errors: 1
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML 
Text");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -972,7 +972,7 @@ void Chart2ExportTest::testDataLabelClusteredBarChartDOCX()
 CPPUNIT_ASSERT(xChartDoc.is());
 
 // FIXME: validation error in OOXML export: Errors: 9
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML 
Text");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -1004,7 +1004,7 @@ void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
 CPPUNIT_ASSERT(xChartDoc.is());
 
 // FIXME: validation error in OOXML export: Errors: 1
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML 
Text");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -1022,7 +1022,7 @@ void Chart2ExportTest::testDataLabelAreaChartDOCX()
 CPPUNIT_ASSERT(xChartDoc.is());
 
 // FIXME: validation error in OOXML export: Errors: 1
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML 
Text");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -1060,7 +1060,7 @@ void Chart2ExportTest::testIndividualDataLabelProps()
 loadFromURL(u"xlsx/tdf122915.xlsx");
 
 // FIXME: validation error in OOXML export: Errors: 1
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open 
XML");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -1090,7 +1090,7 @@ void Chart2ExportTest::testShapeFollowedByChart()
 loadFromURL(u"docx/FDO74430.docx");
 
 // FIXME: validation error in OOXML export: Errors: 5
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/document", "Office Open XML 
Text" );
 CPPUNIT_ASSERT(pXmlDoc);
@@ -1106,7 +1106,7 @@ void Chart2ExportTest::testPieChartDataLabels()
 loadFromURL(u"docx/PieChartDataLabels.docx");
 
 // FIXME: validation error in OOXML export: Errors: 19
-mbSkipValidation = true;
+skipValidation();
 
 xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open 
XML Text");
 CPPUNIT_ASSERT(pXmlDoc);
diff --git a/chart2/qa/extras/cha

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

 sw/qa/core/text/text.cxx   |   16 
 sw/qa/inc/swmodeltestbase.hxx  |2 --
 sw/qa/unit/swmodeltestbase.cxx |8 
 3 files changed, 8 insertions(+), 18 deletions(-)

New commits:
commit c5e872e06a070ff8e90f644036981fa202c2b1e0
Author: Xisco Fauli 
AuthorDate: Thu Nov 3 17:37:11 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 3 23:21:44 2022 +0100

swmodeltestbase: remove duplicated method

Change-Id: I16b785c31f0e235b6a71b6ea86b17b72e063e95d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142247
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
index 8f3f18fd56d3..0bece6e95f2b 100644
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -122,7 +122,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testBibliographyUrlPdfExport)
 xText->insertTextContent(xCursor, xContent, /*bAbsorb=*/false);
 
 // When exporting to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure the field links the source.
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
@@ -646,7 +646,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testContentControlPDF)
 pContentControl->SetAlias("mydesc");
 
 // When exporting to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure that a fillable form widget is emitted:
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
@@ -672,7 +672,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testCheckboxContentControlPDF)
 pWrtShell->InsertContentControl(SwContentControlType::CHECKBOX);
 
 // When exporting to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure that a checkbox form widget is emitted:
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
@@ -697,7 +697,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testDropdownContentControlPDF)
 pWrtShell->InsertContentControl(SwContentControlType::DROP_DOWN_LIST);
 
 // When exporting to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure that a dropdown form widget is emitted:
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
@@ -722,7 +722,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testDateContentControlPDF)
 pWrtShell->InsertContentControl(SwContentControlType::DATE);
 
 // When exporting to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure that a date form widget is emitted:
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
@@ -751,7 +751,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testContentControlPDFFont)
 pWrtShell->InsertContentControl(SwContentControlType::RICH_TEXT);
 
 // When exporting that document to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure that the widget in the PDF result has that custom font 
size:
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
@@ -774,7 +774,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testComboContentControlPDF)
 pWrtShell->InsertContentControl(SwContentControlType::COMBO_BOX);
 
 // When exporting to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure that a combo box form widget is emitted:
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
@@ -811,7 +811,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testRichContentControlPDF)
 pWrtShell->SetAttrSet(aSet);
 
 // When exporting to PDF:
-StoreToTempFile("writer_pdf_Export");
+save("writer_pdf_Export");
 
 // Then make sure that a single fillable form widget is emitted:
 std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index db51a1f75aec..1c64baf4fbff 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -402,8 +402,6 @@ protected:
  */
 SwDoc* getSwDoc();
 
-void StoreToTempFile(const OUString& rFilterName);
-
 std::unique_ptr LoadPdfFromTempFile();
 
 /**
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
index b12f640fb34f..65048ffbac20 100644
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@@ -744,14 +744,6 @@ SwXTextDocument& SwModelTestBase::getSwXTextDocument()
 
 SwDoc* SwModelTestBase::getSwDoc() { return 
getSwXTextDocument().GetDocShell()->GetDoc(); }
 
-void SwModelTestBase::StoreToTempFile(const OUString& rFilterName)
-{
-uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
-utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor["FilterName"] <<= rFilterName;
-xStorable->storeToURL(maTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
-}
-
 std::unique_ptr 
SwModelTestBase::LoadPdfFromTempFile()
 {
 SvFileS

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

 sw/qa/extras/layout/layout2.cxx   |7 +++
 sw/qa/extras/odfexport/odfexport.cxx  |5 ++---
 sw/qa/extras/odfimport/odfimport.cxx  |2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|   10 +-
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx|   14 +++---
 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx|6 +++---
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |6 +++---
 sw/qa/extras/uiwriter/uiwriter4.cxx   |   20 
 sw/qa/extras/uiwriter/uiwriter6.cxx   |5 ++---
 sw/qa/filter/ww8/ww8.cxx  |6 +++---
 sw/qa/inc/swmodeltestbase.hxx |2 +-
 sw/qa/unit/swmodeltestbase.cxx|   11 +--
 12 files changed, 43 insertions(+), 51 deletions(-)

New commits:
commit ee1154d7fe84d507ce977b851c4044cafe0b9da9
Author: Xisco Fauli 
AuthorDate: Thu Nov 3 15:01:43 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 3 23:21:17 2022 +0100

swmodeltestbase: use maTempFile everywhere

Change-Id: Ifd840984e4144599f2527702a57688863854b7ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142235
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 92ad57c742ff..367eb23f05da 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -2246,12 +2246,11 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf121509)
 CPPUNIT_ASSERT(pTriangleShapeFormat->SetFormatAttr(aNewAnch));
 
 // Reload (docx)
-utl::TempFileNamed aTemp;
-save("Office Open XML Text", aTemp);
+save("Office Open XML Text");
 
 // The second part: check if the reloaded doc has flys inside a fly
 uno::Reference xComponent
-= loadFromDesktop(aTemp.GetURL(), "com.sun.star.text.TextDocument");
+= loadFromDesktop(maTempFile.GetURL(), 
"com.sun.star.text.TextDocument");
 uno::Reference xTextDoc(xComponent, uno::UNO_QUERY);
 auto pTextDoc = dynamic_cast(xTextDoc.get());
 CPPUNIT_ASSERT(pTextDoc);
@@ -2270,7 +2269,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf121509)
 }
 }
 // Drop the tempfile
-aTemp.CloseStream();
+maTempFile.CloseStream();
 
 // With the fix this cannot be true, if it is, that means Word unable to 
read the file..
 CPPUNIT_ASSERT_MESSAGE("Corrupt exported docx file!", !bFlyInFlyFound);
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index d5fe2c8cf706..0fa0f9b5ed30 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -901,10 +901,9 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo58949)
  * and replacement image) OLE objects using UNO, so we'll check the zip 
file directly.
  */
 
-utl::TempFileNamed aTempFile;
-save("writer8", aTempFile);
+save("writer8");
 
-uno::Sequence aArgs{ uno::Any(aTempFile.GetURL()) };
+uno::Sequence aArgs{ uno::Any(maTempFile.GetURL()) };
 uno::Reference 
xNameAccess(m_xSFactory->createInstanceWithArguments("com.sun.star.packages.zip.ZipFileAccess",
 aArgs), uno::UNO_QUERY);
 const css::uno::Sequence aNames(xNameAccess->getElementNames());
 // The exported document must have three objects named ObjNNN. The names 
are assigned in
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index eeea54388ab8..49ebdbfdeba7 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -1278,7 +1278,7 @@ CPPUNIT_TEST_FIXTURE(Test, testVerticallyMergedCellBorder)
 CPPUNIT_ASSERT(!rA2Set.GetBox().GetRight());
 
 // Given this document model, when exporting to ODT:
-save("writer8", maTempFile);
+save("writer8");
 mbExported = true;
 
 // Then make sure the covered cell has a style.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 337926c8dfb0..86fa7ea808a1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -805,7 +805,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testTdf133771)
 // Without the fix in place, this test would have failed with
 // "An uncaught exception of type com.sun.star.io.IOException"
 // exporting to docx
-save("Office Open XML Text", maTempFile);
+save("Office Open XML Text");
 mbExported = true;
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -823,7 +823,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testZeroLineSpacing)
 xParagraph->setPropertyValue("ParaLineSpacing", uno::Any(aSpacing));
 
 // Export to docx.
-save("Office Open XML Text", maTempFile);
+save("Office Open XML Text");
 mbExported = true;
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
 CPPUNIT_ASSERT(pXmlDoc);
@@ -851,7 +851,7 @@ CPPUNIT_TEST_FIXTURE(S

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

2022-11-03 Thread László Németh (via logerrit)

 i18npool/source/localedata/data/bg_BG.xml |   21 +
 i18npool/source/localedata/data/ca_ES.xml |   21 +
 i18npool/source/localedata/data/cs_CZ.xml |   21 +
 i18npool/source/localedata/data/da_DK.xml |   21 +
 i18npool/source/localedata/data/de_AT.xml |   21 +
 i18npool/source/localedata/data/de_CH.xml |   21 +
 i18npool/source/localedata/data/de_DE.xml |   21 +
 i18npool/source/localedata/data/de_LI.xml |   21 +
 i18npool/source/localedata/data/de_LU.xml |   21 +
 i18npool/source/localedata/data/el_GR.xml |   21 +
 i18npool/source/localedata/data/en_AU.xml |   24 
 i18npool/source/localedata/data/en_CA.xml |   24 
 i18npool/source/localedata/data/en_DK.xml |   24 
 i18npool/source/localedata/data/en_GB.xml |   24 
 i18npool/source/localedata/data/en_GH.xml |   24 
 i18npool/source/localedata/data/en_IE.xml |   15 ++-
 i18npool/source/localedata/data/en_JM.xml |   24 
 i18npool/source/localedata/data/en_NA.xml |   24 
 i18npool/source/localedata/data/en_ZA.xml |   24 
 i18npool/source/localedata/data/eo.xml|9 +
 i18npool/source/localedata/data/es_AR.xml |   21 +
 i18npool/source/localedata/data/es_BO.xml |   21 +
 i18npool/source/localedata/data/es_CL.xml |   21 +
 i18npool/source/localedata/data/es_CO.xml |   21 +
 i18npool/source/localedata/data/es_CR.xml |   21 +
 i18npool/source/localedata/data/es_DO.xml |   21 +
 i18npool/source/localedata/data/es_EC.xml |   21 +
 i18npool/source/localedata/data/es_ES.xml |   21 +
 i18npool/source/localedata/data/es_GT.xml |   21 +
 i18npool/source/localedata/data/es_PE.xml |   21 +
 i18npool/source/localedata/data/es_SV.xml |   21 +
 i18npool/source/localedata/data/et_EE.xml |   21 +
 i18npool/source/localedata/data/fi_FI.xml |   21 +
 i18npool/source/localedata/data/fr_BE.xml |   21 +
 i18npool/source/localedata/data/fr_BF.xml |   21 +
 i18npool/source/localedata/data/fr_CA.xml |   21 +
 i18npool/source/localedata/data/fr_CH.xml |   21 +
 i18npool/source/localedata/data/fr_FR.xml |   21 +
 i18npool/source/localedata/data/fr_LU.xml |   21 +
 i18npool/source/localedata/data/fr_TG.xml |   21 +
 i18npool/source/localedata/data/gl_ES.xml |   21 +
 i18npool/source/localedata/data/he_IL.xml |   21 +
 i18npool/source/localedata/data/hr_HR.xml |   21 +
 i18npool/source/localedata/data/hu_HU.xml |   21 +
 i18npool/source/localedata/data/id_ID.xml |   21 +
 i18npool/source/localedata/data/is_IS.xml |   21 +
 i18npool/source/localedata/data/it_CH.xml |   21 +
 i18npool/source/localedata/data/it_IT.xml |   21 +
 i18npool/source/localedata/data/lb_LU.xml |   21 +
 i18npool/source/localedata/data/lg_UG.xml |   21 +
 i18npool/source/localedata/data/lt_LT.xml |   21 +
 i18npool/source/localedata/data/lv_LV.xml |   21 +
 i18npool/source/localedata/data/mt_MT.xml |9 +
 i18npool/source/localedata/data/nl_BE.xml |   21 +
 i18npool/source/localedata/data/nl_NL.xml |   21 +
 i18npool/source/localedata/data/no_NO.xml |   21 +
 i18npool/source/localedata/data/pl_PL.xml |   21 +
 i18npool/source/localedata/data/pt_AO.xml |   21 +
 i18npool/source/localedata/data/pt_BR.xml |   21 +
 i18npool/source/localedata/data/pt_PT.xml |   21 +
 i18npool/source/localedata/data/ro_RO.xml |   21 +
 i18npool/source/localedata/data/ru_RU.xml |   21 +
 i18npool/source/localedata/data/sl_SI.xml |   21 +
 i18npool/source/localedata/data/sr_RS.xml |9 +
 i18npool/source/localedata/data/sv_FI.xml |   21 +
 i18npool/source/localedata/data/sv_SE.xml |   21 +
 i18npool/source/localedata/data/tr_TR.xml |   21 +
 i18npool/source/localedata/data/uk_UA.xml |   21 +
 i18npool/source/localedata/data/vi_VN.xml |9 +
 69 files changed, 1418 insertions(+), 1 deletion(-)

New com

[Libreoffice-commits] core.git: chart2/qa cui/source i18npool/source sc/qa svl/source svx/source

2022-11-03 Thread László Németh (via logerrit)

 chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt |2 
 cui/source/tabpages/numfmt.cxx   |   10 +
 i18npool/source/localedata/data/en_US.xml|   24 

 i18npool/source/nativenumber/nativenumbersupplier.cxx|   18 ++-
 sc/qa/uitest/calc_tests/formatCells.py   |   59 
++
 svl/source/numbers/zformat.cxx   |   38 
++
 svx/source/items/numfmtsh.cxx|   12 +-
 7 files changed, 157 insertions(+), 6 deletions(-)

New commits:
commit 2a1d2d42af7f365330479f4032ddfdd9eeba7c1d
Author: László Németh 
AuthorDate: Thu Oct 27 08:36:37 2022 +0200
Commit: László Németh 
CommitDate: Thu Nov 3 22:20:36 2022 +0100

tdf#115007 add NatNum12 number format list items, fix title case

Add NumberText NatNum12 number formats, e.g. "One Hundred",
and currency formats, e.g. "One U.S. Dollar and Twenty Cents"
to number formatting dialog windows, i.e. Format Cells->Numbers
in Calc and Format Numbers in Writer (Edit Fields->Format->
Additional formats...).

Fix also bad English title case:

"One Euro *and* *Twenty-Two* cents" (not *And* and *Twenty-two*)

Details:

– svl: list NatNum12 NumberText currency codes in Currency
  formats (i.e. after choosing Currency category).

– svx: Recognize bank symbol "CURRENCY" in NatNum12 parameters
  defined in locale resource files. For example,
  "[NatNum12 CURRENCY]" is converted to "[NatNum12 USD]" in
  the number format dialog windows, using bank symbol of
  the current locale settings.

  Recognize compatible (old) bank symbol "CCC" in NatNum12
  parameters defined in locale resource files. For example,
  "[NatNum12 CCC]" is converted to "[NatNum12 DEM]" in
  the number format dialog windows, using bank symbol of
  the compatible currency of the German locale settings.

  User-defined formats with arbitrary bank codes are
  recognized as currency formats, e.g. modifying
  "[NatNum12 USD]" to "[NatNum12 EUR]" in the dialog window
  results a new currency format item.

– i18npool/*en_US.xml: define four Standard NatNum12 formats
  (lower case, sentence case, title case, upper case) and
  four Currency NatNum12 formats (title case, title case with
  digits, upper case, upper case with digits).

– cui: use lower sample numbers for spell out formats:

  – 100 for Standard:

  One Hundred
  one hundred
  One hundred
  ONE HUNDRED

  – 1.2 for Currency:

  One U.S. Dollar
  ONE U.S. DOLLAR
  One U.S. Dollar and Twenty Cents
  ONE U.S. DOLLAR AND TWENTY CENTS

– i18npool: fix English title casing of NatNum12 conversions:

  – Don't apply casing on "and", according to the title
case rules, for example:

"One Euro and One Cent" instead of
"One Euro And One Cent".

  – Apply casing on the second element of the hyphenated
compound words:

"Twenty-One" instead of the bad "Twenty-one".

– add unit test for extended Number and Currency categories.

Note: according to the changes, update user-defined number format id in
chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt

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

diff --git 
a/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt 
b/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt
index 28a125d7a5ed..ec3bfa72e397 100644
--- a/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt
+++ b/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt
@@ -11,7 +11,7 @@ Quarter
 // sYAxisTitle
 Income (Ft)
 // nYAxisNumberFormat
-151
+159
 // nYAxisNumberType
 17
 // aColumnLabels.getLength()
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index ee6d949353a0..54b5b53d9aac 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1665,6 +1665,16 @@ OUString SvxNumberFormatTabPage::GetExpColorString(
 }
 double fVal = fSvxNumValConst[i];
 
+// use lower number for long NatNum12 transliteration
+if ( ( CAT_CURRENCY == nTmpCatPos || CAT_NUMBER == nTmpCatPos ) &&
+ rFormatStr.indexOf("NatNum12") >= 0 )
+{
+if ( CAT_CURRENCY == nTmpCatPos )
+fVal = 1.2;
+else
+fVal = 100; // show also title case for English: One Hundred
+}
+
 OUString aPreviewString;
 pNumFmtShell->MakePrevStringFromVal( rFormatStr, aPreviewString, 
rpPreviewColor, fVal );
 return aPreviewString;
diff --git a/i18npool/source/localed

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

2022-11-03 Thread Jan Holesovsky (via logerrit)

 sc/source/ui/view/gridwin.cxx |   61 +-
 1 file changed, 2 insertions(+), 59 deletions(-)

New commits:
commit 142d3e15916afd1c38bcccf0d23cac292ea357fc
Author: Jan Holesovsky 
AuthorDate: Mon Oct 24 16:27:17 2022 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Nov 3 21:52:40 2022 +0100

sc lok: Double-click should behave more like on desktop

When editing was introduced in Calc LibreOfficeKit, there were lots of
limitations.  Particularly the thinking was that it would be good if a
double-click into any text (even if spanning over more cells)
actually started editing that text.

These days, the LOK behaves much more consistently, so it is better to
behave as the LibreOffice on desktop (or other tools, like gdocs) do:

If the cell:

* Is empty

-> single click places the cell cursor
-> double click places the cell cursor & shows the text caret

* Is empty, but covered by text bleeding from other cell

-> same as if it was empty

* Isn't empty

-> single click places the cell cursor
-> double click places the cell cursor & places the text caret
   inside the text where the user clicked

+ this is actually different in gdocs - there the caret is
  placed at the end of the text; in LO it is where the user has
  double-clicked

Change-Id: Ib5884f887c98f803b06d8bed5057ec435be480ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142196
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 69a1daf6f9ce..1ae16dd962aa 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1833,49 +1833,6 @@ void ScGridWindow::HandleMouseButtonDown( const 
MouseEvent& rMEvt, MouseEventSta
 if ( !nButtonDown || !bDouble ) // single (first) click is 
always valid
 nButtonDown = rMEvt.GetButtons();   // set nButtonDown first, so 
StopMarking works
 
-// special handling of empty cells with tiled rendering
-if (bIsTiledRendering)
-{
-Point aPos(rMEvt.GetPosPixel());
-SCCOL nPosX, nNonEmptyX(0);
-SCROW nPosY;
-SCTAB nTab = mrViewData.GetTabNo();
-mrViewData.GetPosFromPixel(aPos.X(), aPos.Y(), eWhich, nPosX, nPosY);
-
-ScRefCellValue aCell(rDoc, ScAddress(nPosX, nPosY, nTab));
-bool bIsEmpty = aCell.isEmpty();
-bool bIsCoveredByText = bIsEmpty && IsCellCoveredByText(nPosX, nPosY, 
nTab, nNonEmptyX);
-
-if (bIsCoveredByText)
-{
-// if there's any text flowing to this cell, activate the
-// editengine, so that the text actually gets the events
-if (bDouble)
-{
-ScViewFunc* pView = mrViewData.GetView();
-
-pView->SetCursor(nNonEmptyX, nPosY);
-SC_MOD()->SetInputMode(SC_INPUT_TABLE);
-
-bEditMode = mrViewData.HasEditView(eWhich);
-assert(bEditMode);
-
-// synthesize the 1st click
-EditView* pEditView = mrViewData.GetEditView(eWhich);
-MouseEvent aEditEvt(rMEvt.GetPosPixel(), 1, 
MouseEventModifiers::SYNTHETIC, MOUSE_LEFT, 0);
-pEditView->MouseButtonDown(aEditEvt);
-pEditView->MouseButtonUp(aEditEvt);
-}
-}
-else if (bIsEmpty && bEditMode && bDouble)
-{
-// double-click in an empty cell: the entire cell is selected
-SetCellSelectionPixel(LOK_SETTEXTSELECTION_START, aPos.X(), 
aPos.Y());
-SetCellSelectionPixel(LOK_SETTEXTSELECTION_END, aPos.X(), 
aPos.Y());
-return;
-}
-}
-
 if ( ( bEditMode && mrViewData.GetActivePart() == eWhich ) || 
!bFormulaMode )
 GrabFocus();
 
@@ -2406,14 +2363,11 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& 
rMEvt )
 mrViewData.GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
 ScDPObject* pDPObj  = rDoc.GetDPAtCursor( nPosX, nPosY, nTab );
 
-bool bInDataPilotTable = (pDPObj != nullptr);
-
 // double click (only left button)
-// in the tiled rendering case, single click works this way too
 
 bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive();
 bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
-if ((bDouble || (bIsTiledRendering && !bInDataPilotTable))
+if ( bDouble
 && !bRefMode
 && (nMouseStatus == SC_GM_DBLDOWN || (bIsTiledRendering && 
nMouseStatus != SC_GM_URLDOWN))
 && !pScMod->IsRefDialogOpen())
@@ -2473,19 +2427,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& 
rMEvt )
 bEditAllowed = false;
 }
 
-// We don't want to activate the edit view for a single click in tiled 
rendering
-// (bu

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

 vcl/osx/salframeview.mm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6c0ac70a512c1789d26721bd1f7d01a8b24fa718
Author: Caolán McNamara 
AuthorDate: Thu Nov 3 10:30:44 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 3 20:48:53 2022 +0100

Related: tdf#149932 map NSUnderlineStyleDouble to new DoubleUnderline

and NSUnderlineStyleThick to ExtTextInputAttr::BoldUnderline

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

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 07d3c08a2960..40a06ddd54ad 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1578,10 +1578,10 @@ static AquaSalFrame* getMouseContainerFrame()
 aInputFlags[i] = ExtTextInputAttr::Underline;
 break;
 case NSUnderlineStyleThick:
-aInputFlags[i] = ExtTextInputAttr::Underline | 
ExtTextInputAttr::Highlight;
+aInputFlags[i] = ExtTextInputAttr::BoldUnderline;
 break;
 case NSUnderlineStyleDouble:
-aInputFlags[i] = ExtTextInputAttr::BoldUnderline;
+aInputFlags[i] = ExtTextInputAttr::DoubleUnderline;
 break;
 default:
 aInputFlags[i] = ExtTextInputAttr::Highlight;

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

 editeng/source/editeng/impedit3.cxx |2 ++
 include/vcl/commandevent.hxx|   19 ++-
 sw/source/core/text/redlnitr.cxx|2 ++
 vcl/source/control/edit.cxx |2 ++
 vcl/source/edit/texteng.cxx |2 ++
 vcl/unx/gtk3/gtkframe.cxx   |   13 +++--
 6 files changed, 29 insertions(+), 11 deletions(-)

New commits:
commit d1cd19b56d5fefaa6f41a4d70e748331525820a4
Author: Caolán McNamara 
AuthorDate: Thu Nov 3 10:21:59 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 3 20:48:37 2022 +0100

Related: tdf#149932 honour PANGO_UNDERLINE_DOUBLE for preedit underline

we already have support for double underline so that's an easy add

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

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index f932fd0df8ed..2d2a339658df 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3061,6 +3061,8 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, 
sal_Int32 nPos, SvxFont& rFo
 ExtTextInputAttr nAttr = mpIMEInfos->pAttribs[ nPos - 
mpIMEInfos->aPos.GetIndex() - 1 ];
 if ( nAttr & ExtTextInputAttr::Underline )
 rFont.SetUnderline( LINESTYLE_SINGLE );
+else if ( nAttr & ExtTextInputAttr::DoubleUnderline )
+rFont.SetUnderline( LINESTYLE_DOUBLE );
 else if ( nAttr & ExtTextInputAttr::BoldUnderline )
 rFont.SetUnderline( LINESTYLE_BOLD );
 else if ( nAttr & ExtTextInputAttr::DottedUnderline )
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index d5b043ddb97a..fc6ba290793f 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -48,18 +48,19 @@ enum class CommandEventId;
 
 enum class ExtTextInputAttr {
 NONE  = 0x,
-GrayWaveline  = 0x0100,
-Underline = 0x0200,
-BoldUnderline = 0x0400,
-DottedUnderline   = 0x0800,
-DashDotUnderline  = 0x1000,
-Highlight = 0x2000,
-RedText   = 0x4000,
-HalfToneText  = 0x8000
+GrayWaveline  = 0x0010,
+Underline = 0x0020,
+BoldUnderline = 0x0040,
+DottedUnderline   = 0x0080,
+DashDotUnderline  = 0x0100,
+DoubleUnderline   = 0x0200,
+Highlight = 0x0400,
+RedText   = 0x0800,
+HalfToneText  = 0x1000
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 #define EXTTEXTINPUT_CURSOR_INVISIBLE   (sal_uInt16(0x0001))
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 2b8c11693d20..2b77d86aa350 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -1049,6 +1049,8 @@ void SwExtend::ActualizeFont( SwFont &rFnt, 
ExtTextInputAttr nAttr )
 {
 if ( nAttr & ExtTextInputAttr::Underline )
 rFnt.SetUnderline( LINESTYLE_SINGLE );
+else if ( nAttr & ExtTextInputAttr::DoubleUnderline )
+rFnt.SetUnderline( LINESTYLE_DOUBLE );
 else if ( nAttr & ExtTextInputAttr::BoldUnderline )
 rFnt.SetUnderline( LINESTYLE_BOLD );
 else if ( nAttr & ExtTextInputAttr::DottedUnderline )
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 1554f846ba95..a072a42ec467 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -639,6 +639,8 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, 
const tools::Rectangl
 vcl::Font aFont = rRenderContext.GetFont();
 if (nAttr & ExtTextInputAttr::Underline)
 aFont.SetUnderline(LINESTYLE_SINGLE);
+else if (nAttr & ExtTextInputAttr::DoubleUnderline)
+aFont.SetUnderline(LINESTYLE_DOUBLE);
 else if (nAttr & ExtTextInputAttr::BoldUnderline)
 aFont.SetUnderline( LINESTYLE_BOLD);
 else if (nAttr & ExtTextInputAttr::DottedUnderline)
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 75d6085859e3..90140a58df11 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1382,6 +1382,8 @@ void TextEngine::SeekCursor( sal_uInt32 nPara, sal_Int32 
nPos, vcl::Font& rFont,
 ExtTextInputAttr nAttr = mpIMEInfos->pAttribs[ nPos - 
mpIMEInfos->aPos.GetIndex() - 1 ];
 if ( nAttr & ExtTextInputAttr::Underline )
 rFont.SetUnderline( LINESTYLE_SINGLE );
+else if ( nAttr & ExtTextInputAttr::DoubleUnderline )
+rFont.SetUnderline( LINESTYLE_DOUBLE );
 else if ( nAttr & ExtTextInputAttr::BoldUnderline )
 rFont.SetUnderline( LINES

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

2022-11-03 Thread Jim Raykowski (via logerrit)

 sw/source/uibase/inc/wrtsh.hxx|2 
 sw/source/uibase/wrtsh/wrtsh1.cxx |   95 ++
 2 files changed, 47 insertions(+), 50 deletions(-)

New commits:
commit be2cd4bcc4e55b9fe6e5fcd6276511d37f3f8e4c
Author: Jim Raykowski 
AuthorDate: Thu Nov 3 02:53:34 2022 -0800
Commit: Jim Raykowski 
CommitDate: Thu Nov 3 20:09:37 2022 +0100

tdf#142446 Improve show outline content to level

by reworking the MakeOutlineLevelsVisible function

Change-Id: I0a102420475ed97e35b8f92315eaa4cca2958599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142226
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index ebc255d3b05e..61f4570a71ab 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -501,7 +501,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
 void InsertPostIt(SwFieldMgr& rFieldMgr, const SfxRequest& rReq);
 
 bool IsOutlineContentVisible(const size_t nPos);
-void MakeOutlineContentVisible(const size_t nPos, bool bMakeVisible = 
true);
+void MakeOutlineContentVisible(const size_t nPos, bool bMakeVisible = 
true, bool bSetAttrOutlineVisibility = true);
 void MakeAllFoldedOutlineContentVisible(bool bMakeVisible = true);
 void InvalidateOutlineContentVisibility();
 bool GetAttrOutlineContentVisible(const size_t nPos);
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 9bf10af5ce2a..9ca81b72b4cd 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -2360,59 +2360,53 @@ bool SwWrtShell::IsOutlineContentVisible(const size_t 
nPos)
 
 void SwWrtShell::MakeOutlineLevelsVisible(const int nLevel)
 {
+MakeAllOutlineContentTemporarilyVisible a(GetDoc());
+
 m_rView.SetMaxOutlineLevelShown(nLevel);
 
 bool bDocChanged = false;
 
-const SwNodes& rNodes = GetNodes();
-const SwOutlineNodes& rOutlineNodes = rNodes.GetOutLineNds();
+const SwOutlineNodes& rOutlineNodes = GetNodes().GetOutLineNds();
 
-StartAction();
+// Make all missing frames.
 for (SwOutlineNodes::size_type nPos = 0; nPos < rOutlineNodes.size(); 
++nPos)
 {
 SwNode* pNode = rOutlineNodes[nPos];
-auto nOutlineLevel = pNode->GetTextNode()->GetAttrOutlineLevel();
-if ( nOutlineLevel > nLevel)
+if (!pNode->GetTextNode()->getLayoutFrame(GetLayout()))
 {
-// MakeOutlineContentVisible(nPos, false) sets the outline node 
outline content
-// visible attribute false so it needs restored to true if it was 
true.
-bool bOutlineContentVisible = false;
-
pNode->GetTextNode()->GetAttrOutlineContentVisible(bOutlineContentVisible);
-MakeOutlineContentVisible(nPos, false);
-pNode->GetTextNode()->DelFrames(GetLayout());
-if (bOutlineContentVisible)
-pNode->GetTextNode()->SetAttrOutlineContentVisible(true);
+SwNodeIndex aIdx(*pNode, +1);
+// Make the outline paragraph frame
+MakeFrames(GetDoc(), *pNode, aIdx.GetNode());
+// Make the outline content visible but don't set the outline 
visible attribute and
+// don't make outline content made visible not visible that have 
outline visible
+// attribute false. Visibility will be taken care of when
+// MakeAllOutlineContentTemporarilyVisible goes out of scope.
+MakeOutlineContentVisible(nPos, true, false);
 bDocChanged = true;
 }
-else
+}
+// Remove outline paragraph frame and outline content frames above given 
level.
+for (SwOutlineNodes::size_type nPos = 0; nPos < rOutlineNodes.size(); 
++nPos)
+{
+SwNode* pNode = rOutlineNodes[nPos];
+auto nOutlineLevel = pNode->GetTextNode()->GetAttrOutlineLevel();
+if (nOutlineLevel > nLevel)
 {
-if (!pNode->GetTextNode()->getLayoutFrame(GetLayout()))
-{
-SwNodeIndex aIdx(*pNode, +1);
-{
-// MakeAllOutlineContentTemporarilyVisible in this scope! 
Don't place at the
-// start of the function. Placed there will restore 
content to what it was
-// was at that point when the function exits.
-MakeAllOutlineContentTemporarilyVisible a(GetDoc());
-MakeFrames(GetDoc(), *pNode, aIdx.GetNode());
-}
-bool bVisible = true;
-if (GetViewOptions()->IsShowOutlineContentVisibilityButton())
-
pNode->GetTextNode()->GetAttrOutlineContentVisible(bVisible);
-if (bVisible)
-MakeOutlineContentVisible(nPos, true);
-bDocChanged = true;
-}
+// Remove the outline content but don't set the outline visible 
a

Re: LibreOffice Source File Compile Help

2022-11-03 Thread Jim Raykowski

Hello Siddharth,

You can cd from the core directory to instdir/program and then do
./soffice.bin or from the core directory ./instdir/program/soffice.bin
should work.

HTH, Jim

On Thu, Nov 3, 2022 at 10:33 AM Siddharth Khattar 
wrote:

> Hello all,
>
> So I recently compiled LibreOffice from source files. Can somebody please
> tell me how can I access this development version of LibreOffice from the
> bash terminal & also why can't I see it as an installed application when I
> click "show applications"? I am a beginner to this so if I am missing
> something extremely obvious please guide me. I also studied on the webpage
> : https://wiki.documentfoundation.org/Development/Environment_variables
> But when I tried the bash command given there ( using export ), It didn't
> work on my computer and showed and error message.
>
> For reference, I am using Linux Ubuntu. Thanks in advance for
> reading/answering my question!
>

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sfx2/source

2022-11-03 Thread Henry Castro (via logerrit)

 sfx2/source/doc/objstor.cxx |   15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 17bf69ba9d8168106162d1a4ddef7cb34d50fe73
Author: Henry Castro 
AuthorDate: Thu Nov 3 10:52:16 2022 -0400
Commit: Aron Budea 
CommitDate: Thu Nov 3 19:47:05 2022 +0100

sfx2: add log information to catch the exception

Add log information for data analysis if the ExportTo
fails due to an exception.

Signed-off-by: Henry Castro 
Change-Id: I888545da14f413a970faf50b3ce60d12966f3f9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142202
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index cee35fc3443c..e657ca6dad1c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2486,8 +2486,19 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium )
 }
 
 return xFilter->filter( aArgs );
-}catch(...)
-{}
+}
+catch (const css::uno::RuntimeException & e)
+{
+SAL_INFO("sfx.doc", "ExportTo: " << e);
+}
+catch (const std::exception & e)
+{
+SAL_INFO("sfx.doc", "ExportTo: " << e.what());
+}
+catch(...)
+{
+SAL_INFO("sfx.doc", "ExportTo: Unknown exception!");
+}
 }
 
 return false;

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

 oox/source/export/drawingml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc9ebcbfd28b417189c94ad6d7492928e2cfd43e
Author: Andrea Gelmini 
AuthorDate: Thu Nov 3 18:07:04 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 3 19:35:59 2022 +0100

Fix typo

Change-Id: I73fec7b8634704a8ceedf7a1be6eacd4dafc06e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142249
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 80d38e8dfc79..7c996be1d892 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3352,7 +3352,7 @@ void DrawingML::WriteText(const Reference& 
rXIface, bool bBodyPr, bo
 if (nTop + nBottom >= nTextHeight)
 {
 // Effective bottom would be above effective top of text area. LO 
normalizes the
-// effective text area in such case implicitely for rendering. MS 
needs indents so that
+// effective text area in such case implicitly for rendering. MS 
needs indents so that
 // the result is the normalized effective text area.
 std::swap(nTop, nBottom);
 nTop = nTextHeight - nTop;

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

 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46f00c710f6deb59f369dd6736693e133e51f05f
Author: Andrea Gelmini 
AuthorDate: Thu Nov 3 18:05:41 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 3 19:34:58 2022 +0100

Fix typo

Change-Id: If6bfabcfb1f9bc653b72c3775cdeaa91e0058fe0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142248
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index 867fdca9c8e6..d336625159a5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -148,7 +148,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf150966_regularInset)
 // That should result in tIns="179640" and bIns="36" on export.
 
 // Without fix the insets were tIns="359280" and bIns="539640". The text 
area had 1080Emu height
-// and Word displayes no text at all.
+// and Word displays no text at all.
 save("Office Open XML Text", maTempFile);
 mbExported = true;
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");

LibreOffice Source File Compile Help

2022-11-03 Thread Siddharth Khattar

Hello all,

So I recently compiled LibreOffice from source files. Can somebody please
tell me how can I access this development version of LibreOffice from the
bash terminal & also why can't I see it as an installed application when I
click "show applications"? I am a beginner to this so if I am missing
something extremely obvious please guide me. I also studied on the webpage
: https://wiki.documentfoundation.org/Development/Environment_variables
But when I tried the bash command given there ( using export ), It didn't
work on my computer and showed and error message.

For reference, I am using Linux Ubuntu. Thanks in advance for
reading/answering my question!

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

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

New commits:
commit e96be4156d50f9c1756cd5ff324a10a7a3487968
Author: Noel Grandin 
AuthorDate: Thu Nov 3 15:27:22 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 3 18:35:00 2022 +0100

fix warning C4701: potentially uninitialized local variable 'bBool' used

seen on jenkins

Change-Id: I9d514580a80534eff45578c9b6cfdaf45fb7285f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142234
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 3dc34bc259e0..b26e38cd81b0 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -479,7 +479,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue(
 ScAutoFormatData* pData = pFormats->findByIndex(nFormatIndex);
 OSL_ENSURE(pData,"AutoFormat data not available");
 
-bool bBool;
+bool bBool = false;
 if (aPropertyName == SC_UNONAME_INCBACK && (aValue >>= bBool))
 pData->SetIncludeBackground( bBool );
 else if (aPropertyName == SC_UNONAME_INCBORD && (aValue >>= bBool))

[Libreoffice-commits] core.git: sfx2/qa xmloff/qa

 sfx2/qa/cppunit/test_misc.cxx |6 -
 xmloff/qa/unit/draw.cxx   |8 ---
 xmloff/qa/unit/style.cxx  |8 ---
 xmloff/qa/unit/text.cxx   |   44 --
 4 files changed, 8 insertions(+), 58 deletions(-)

New commits:
commit be63419810cd6f418d33ef1b7724ba32e867e52b
Author: Xisco Fauli 
AuthorDate: Thu Nov 3 13:01:06 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 3 18:32:28 2022 +0100

qa: remove duplicated code

Change-Id: I13da5ca9d07131a340dcf95ca0b980d75ca6e9d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142229
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index 652533db4551..212dc1aea5bf 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -76,11 +76,7 @@ CPPUNIT_TEST_FIXTURE(MiscTest, testODFCustomMetadata)
 xProps->storeToMedium(aTempFile.GetURL(), mimeArgs);
 
 // check that custom metadata is preserved
-uno::Reference const xZip(
-packages::zip::ZipFileAccess::createWithURL(m_xContext, 
aTempFile.GetURL()));
-uno::Reference const 
xInputStream(xZip->getByName("meta.xml"), uno::UNO_QUERY);
-std::unique_ptr const 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
-xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
+xmlDocUniquePtr pXmlDoc = parseExport(aTempFile.GetURL(), "meta.xml");
 assertXPathContent(pXmlDoc, "/office:document-meta/office:meta/bork", 
"bork");
 assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar", 1);
 assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar/baz:foo", 
1);
diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx
index 93b230db8d72..1f41afbba3ed 100644
--- a/xmloff/qa/unit/draw.cxx
+++ b/xmloff/qa/unit/draw.cxx
@@ -13,7 +13,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -91,12 +90,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, 
testTdf141301_Extrusion_Angle)
 
 // Prepare use of XPath
 utl::TempFileNamed aTempFile = save("draw8");
-uno::Reference xNameAccess
-= packages::zip::ZipFileAccess::createWithURL(mxComponentContext, 
aTempFile.GetURL());
-uno::Reference 
xInputStream(xNameAccess->getByName("content.xml"),
-  uno::UNO_QUERY);
-std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
-xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
+xmlDocUniquePtr pXmlDoc = parseExport(aTempFile.GetURL(), "content.xml");
 
 // Without fix draw:extrusion-skew="50 -135" was not written to file 
although "50 -135" is not
 // default in ODF, but only default inside LO.
diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx
index f5b42fac1fb0..a51b55b37818 100644
--- a/xmloff/qa/unit/style.cxx
+++ b/xmloff/qa/unit/style.cxx
@@ -16,7 +16,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -89,12 +88,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testFontSorting)
 utl::TempFileNamed aTempFile = save("writer8");
 
 // Then make sure  elements are sorted (by 
style:name="..."):
-uno::Reference xNameAccess
-= packages::zip::ZipFileAccess::createWithURL(mxComponentContext, 
aTempFile.GetURL());
-uno::Reference 
xInputStream(xNameAccess->getByName("content.xml"),
-  uno::UNO_QUERY);
-std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
-xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
+xmlDocUniquePtr pXmlDoc = parseExport(aTempFile.GetURL(), "content.xml");
 xmlXPathObjectPtr pXPath
 = getXPathNode(pXmlDoc, 
"/office:document-content/office:font-face-decls/style:font-face");
 xmlNodeSetPtr pXmlNodes = pXPath->nodesetval;
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 7a78848c4b7a..64ec2500ad9f 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -17,7 +17,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -152,25 +151,10 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, 
testParaStyleListLevel)
 CPPUNIT_ASSERT_EQUAL(static_cast(1), nNumberingLevel);
 
 // Test the export as well:
-
-// Given a doc model that has a para style with NumberingLevel=2:
-uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
-
-// When exporting that to ODT:
-uno::Sequence aStoreProps = 
comphelper::InitPropertySequence({
-{ "FilterName", uno::Any(OUString("writer8")) },
-});
-utl::TempFileNamed aTempFile;
-aTempFile.EnableKillingFile();
-xStorable->storeToURL(aTempFile.GetURL(), aStoreProps);
+utl::TempFileNamed aTempFile = save("writer8");
 
 // Then make sure we save the style's numbering level:
-uno::Reference xNameAccess
-= packages::zip::ZipFileAccess::create

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

 vcl/unx/gtk3/gtkframe.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 57e0b4344111431e0a26622920b35dfc7d9e8ff8
Author: Caolán McNamara 
AuthorDate: Thu Nov 3 10:08:35 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 3 18:18:35 2022 +0100

Related: tdf#149932 honour PANGO_UNDERLINE_NONE for preedit underline

at least don't show an underline for PANGO_UNDERLINE_NONE

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

diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 33a42787ab4c..d937e8eddd9f 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -5712,8 +5712,12 @@ OUString GtkSalFrame::GetPreeditDetails(GtkIMContext* 
pIMContext, std::vector(pango_attr);
+if (pango_underline->value != PANGO_UNDERLINE_NONE)
+sal_attr |= ExtTextInputAttr::Underline;
 break;
+}
 case PANGO_ATTR_STRIKETHROUGH:
 sal_attr |= ExtTextInputAttr::RedText;
 break;
@@ -5723,7 +5727,7 @@ OUString GtkSalFrame::GetPreeditDetails(GtkIMContext* 
pIMContext, std::vectornext;
 }
-if (sal_attr == ExtTextInputAttr::NONE)
+if (!attr_list)
 sal_attr |= ExtTextInputAttr::Underline;
 g_slist_free (attr_list);

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

 include/test/unoapi_test.hxx  |4 ++
 sc/CppunitTest_sc_html_export_test.mk |1 
 sc/qa/extras/htmlexporttest.cxx   |   63 --
 test/source/unoapi_test.cxx   |8 +++-
 4 files changed, 20 insertions(+), 56 deletions(-)

New commits:
commit 6f77eda1f4de7f2835a32dd597442a29fe59291c
Author: Xisco Fauli 
AuthorDate: Thu Nov 3 13:55:06 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 3 17:33:42 2022 +0100

CppunitTest_sc_html_export_test: inherit from UnoApiXmlTest

Change-Id: Iee06f883704484bf62bf1d9988580d72ba40db22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142232
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index d5b8d2145d99..8c27437d237d 100644
--- a/include/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
@@ -40,6 +40,8 @@ public:
 utl::TempFileNamed saveAndClose(const OUString& rFilter);
 utl::TempFileNamed saveAndReload(const OUString& rFilter);
 
+void setFilterOptions(const OUString& rFilterOptions) { maFilterOptions = 
rFilterOptions; }
+
 protected:
 // reference to document component that we are testing
 css::uno::Reference mxComponent;
@@ -48,6 +50,8 @@ protected:
 
 private:
 OUString m_aBaseString;
+
+OUString maFilterOptions;
 };
 
 #endif // INCLUDED_TEST_UNOAPI_TEST_HXX
diff --git a/sc/CppunitTest_sc_html_export_test.mk 
b/sc/CppunitTest_sc_html_export_test.mk
index 16596fb3ef89..dae834614229 100644
--- a/sc/CppunitTest_sc_html_export_test.mk
+++ b/sc/CppunitTest_sc_html_export_test.mk
@@ -40,6 +40,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,sc_html_export_test, \
 scqahelper \
 sfx \
 sot \
+subsequenttest \
 svl \
 svt \
 svx \
diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx
index a94a34ba24d5..f7dc9c115f74 100644
--- a/sc/qa/extras/htmlexporttest.cxx
+++ b/sc/qa/extras/htmlexporttest.cxx
@@ -15,81 +15,36 @@
 #include 
 #include 
 
-#include 
 #include 
-#include 
+#include 
 #include 
-#include 
-#include 
 
 using namespace css::uno;
 using namespace css::lang;
 using namespace css::frame;
 using namespace utl;
 
-class ScHTMLExportTest : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools, public HtmlTestTools
+class ScHTMLExportTest : public UnoApiXmlTest, public HtmlTestTools
 {
-Reference mxComponent;
-OUString  maFilterOptions;
-
-void load(std::u16string_view pDir, const char* pName)
-{
-if (mxComponent.is())
-mxComponent->dispose();
-mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) + 
OUString::createFromAscii(pName), "com.sun.star.comp.Calc.SpreadsheetDocument");
-}
-
-void save(const OUString& aFilterName, TempFileNamed const & rTempFile)
-{
-Reference xStorable(mxComponent, UNO_QUERY);
-MediaDescriptor aMediaDescriptor;
-aMediaDescriptor["FilterName"] <<= aFilterName;
-if (!maFilterOptions.isEmpty())
-aMediaDescriptor["FilterOptions"] <<= maFilterOptions;
-xStorable->storeToURL(rTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
-}
-
 public:
 ScHTMLExportTest()
+: UnoApiXmlTest("/sc/qa/extras/testdocuments/")
 {}
 
-virtual void setUp() override
-{
-test::BootstrapFixture::setUp();
-
mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
-}
-
-virtual void tearDown() override
-{
-if (mxComponent.is())
-mxComponent->dispose();
-
-test::BootstrapFixture::tearDown();
-}
-
 void testHtmlSkipImage()
 {
-// need a temp dir, because there's an image exported too
-TempFileNamed aTempDir(nullptr, true);
-aTempDir.EnableKillingFile();
-OUString const url(aTempDir.GetURL());
-TempFileNamed aTempFile(&url, false);
-
-htmlDocUniquePtr pDoc;
-
-load(u"/sc/qa/extras/testdocuments/", "BaseForHTMLExport.ods");
-save("HTML (StarCalc)", aTempFile);
-pDoc = parseHtml(aTempFile);
+loadFromURL(u"BaseForHTMLExport.ods");
+utl::TempFileNamed aTempFile = save("HTML (StarCalc)");
+htmlDocUniquePtr pDoc = parseHtml(aTempFile);
 CPPUNIT_ASSERT (pDoc);
 
 assertXPath(pDoc, "/html/body", 1);
 assertXPath(pDoc, "/html/body/table/tr/td/img", 1);
 
-load(u"/sc/qa/extras/testdocuments/", "BaseForHTMLExport.ods");
-maFilterOptions = "SkipImages";
-save("HTML (StarCalc)", aTempFile);
+setFilterOptions("SkipImages");
+utl::TempFileNamed aTempFile2 = save("HTML (StarCalc)");
 
-pDoc = parseHtml(aTempFile);
+pDoc = parseHtml(aTempFile2);
 CPPUNIT_ASSERT (pDoc);
 assertXPath(pDoc, "/html/body", 1);
 assertXPath(pDoc, "/html/bod

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

2022-11-03 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/scriptitems.pm |   33 +++-
 1 file changed, 13 insertions(+), 20 deletions(-)

New commits:
commit 1cfa0f49922aa49597bac341393c8f38309a3bae
Author: Mike Kaganski 
AuthorDate: Thu Nov 3 09:35:07 2022 +0200
Commit: Mike Kaganski 
CommitDate: Thu Nov 3 17:23:11 2022 +0100

Do not merge filesarrayref and unixlinksarrayref when filtering out 
directories

In commit 8c6467a785037309d2a2cec56c8e38cf52da0aee, the code
filtering out the directories was creating a new array, that
was assigned to the function's inout filesarrayref argument;
and that code merged non-directories from both filesarrayref
and unixlinksarrayref.

This fixes the logic to only filter filesarrayref.

Change-Id: Ia00dcd3f645ba2a6c2d8ea0559627ccfe0eb232b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142195
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 97b76a503f6a..0c374054895d 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1679,33 +1679,28 @@ sub add_directory_with_create_flag_hash
 sub collect_directories_from_filesarray
 {
 my ($filesarrayref, $unixlinksarrayref) = @_;
-my @allfiles;
-push @allfiles, @{$filesarrayref};
-push @allfiles, @{$unixlinksarrayref};
 
 my %alldirectoryhash = ();
-my @filteredfilesarrayref = (); # without empty directories
-
-# Preparing this already as hash, although the only needed value at the 
moment is the HostName
-# But also adding: "specificlanguage" and "Dir" (for instance 
gid_Dir_Program)
-
-for ( my $i = 0; $i <= $#allfiles; $i++ )
+my @filteredfilesarray = (); # without empty directories
+foreach my $onefile (@{$filesarrayref})
 {
-my $onefile = $allfiles[$i];
-my $destinationpath = $onefile->{'destination'};
-
 # The "file" can actually be an empty directory added e.g. by 
gb_Package_add_empty_directory.
 # TODO/LATER: it would be better if gb_Package_add_empty_directory 
added empty directories to
 # "directories with CREATE flag" instead of a filelist.
 if (-d $onefile->{'sourcepath'})
 {
-my $sourcepath = $onefile->{'sourcepath'};
 # Do the same as 
collect_directories_with_create_flag_from_directoryarray does
 %alldirectoryhash = 
%{add_directory_with_create_flag_hash(\%alldirectoryhash, 
$onefile->{'destination'}, $onefile->{'specificlanguage'}, $onefile->{'gid'}, 
"(CREATE)", $onefile->{'modules'})};
-
-next;
 }
-push(@filteredfilesarrayref, $onefile);
+else { push(@filteredfilesarray, $onefile); }
+}
+
+# Preparing this already as hash, although the only needed value at the 
moment is the HostName
+# But also adding: "specificlanguage" and "Dir" (for instance 
gid_Dir_Program)
+
+foreach my $onefile (@filteredfilesarray, @{$unixlinksarrayref})
+{
+my $destinationpath = $onefile->{'destination'};
 
 
installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationpath);
 $destinationpath =~ s/\Q$installer::globals::separator\E\s*$//; # 
removing ending slashes or backslashes
@@ -1746,7 +1741,7 @@ sub collect_directories_from_filesarray
 $alldirectoryhash{$destdir}->{'modules'} = 
optimize_list($alldirectoryhash{$destdir}->{'modules'});
 }
 
-@_[0] = \@filteredfilesarrayref; # out argument
+@_[0] = \@filteredfilesarray; # out argument
 return \%alldirectoryhash;
 }
 
@@ -1758,12 +1753,10 @@ sub 
collect_directories_with_create_flag_from_directoryarray
 {
 my ($directoryarrayref, $alldirectoryhash) = @_;
 
-my $alreadyincluded = 0;
 my @alldirectories = ();
 
-for ( my $i = 0; $i <= $#{$directoryarrayref}; $i++ )
+foreach my $onedir (@{$directoryarrayref})
 {
-my $onedir = ${$directoryarrayref}[$i];
 $alldirectoryhash = 
add_directory_with_create_flag_hash($alldirectoryhash, $onedir->{'HostName'}, 
$onedir->{'specificlanguage'}, $onedir->{'gid'}, $onedir->{'Styles'}, 
$onedir->{'modules'});
 }

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

 sfx2/source/dialog/dockwin.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4865ad2365a25d89e61d382613a1f35c78800f4d
Author: Caolán McNamara 
AuthorDate: Thu Nov 3 12:21:23 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 3 16:45:52 2022 +0100

Resolves: tdf#151112 move focus into container widget hierarchy

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

diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 83c01c7f8475..ce37aa53ec8d 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1456,6 +1456,9 @@ bool SfxDockingWindow::EventNotify( NotifyEvent& rEvt )
 // base class, otherwise the parent learns nothing
 // if ( rEvt.GetWindow() == this )  PB: #i74693# not necessary any 
longer
 ResizableDockingWindow::EventNotify( rEvt );
+// tdf#151112 move focus into container widget hierarchy if not 
already there
+if (m_xContainer && !m_xContainer->has_child_focus())
+m_xContainer->child_grab_focus();
 return true;
 }
 else if( rEvt.GetType() == NotifyEventType::KEYINPUT )

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

2022-11-03 Thread Henry Castro (via logerrit)

 sd/qa/unit/ShapeImportExportTest.cxx  |2 
 sw/qa/extras/mailmerge/mailmerge2.cxx |   75 +++---
 sw/source/uibase/dbui/dbmgr.cxx   |   15 +-
 3 files changed, 38 insertions(+), 54 deletions(-)

New commits:
commit b1d13c48b57633c156e7d76fe81fc5828d1e3e20
Author: Henry Castro 
AuthorDate: Tue Oct 18 16:57:45 2022 -0400
Commit: Miklos Vajna 
CommitDate: Thu Nov 3 16:45:22 2022 +0100

sw: fix merge mail multiple files

If the document contains a section with a
hidden condition, and the user merges into several
files, the section has to be deleted in the same
way as the single file.

Signed-off-by: Henry Castro 
Change-Id: If5483aaf635a6515482f245c286132a365d72762
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141518
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/mailmerge/mailmerge2.cxx 
b/sw/qa/extras/mailmerge/mailmerge2.cxx
index fc514b6a1033..687b0e3ab8fb 100644
--- a/sw/qa/extras/mailmerge/mailmerge2.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge2.cxx
@@ -402,7 +402,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf122156_file, 
"linked-with-condition.odt", "5-
 "names")
 {
 // A document with a linked section hidden on an "empty field" condition
-// For separate documents, the sections are hidden, but not removed
+// For separate documents, the sections are removed
 executeMailMerge();
 {
 loadMailMergeDocument(0);
@@ -410,10 +410,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf122156_file, 
"linked-with-condition.odt", "5-
   
uno::UNO_QUERY_THROW);
 uno::Reference 
xSections(xSectionsSupplier->getTextSections(),
   
uno::UNO_QUERY_THROW);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
-uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
-// Record 1 has empty "Title" field => section is not shown
-CPPUNIT_ASSERT_EQUAL(false, getProperty(xSect, 
"IsCurrentlyVisible"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount());
 }
 {
 loadMailMergeDocument(1);
@@ -424,7 +421,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf122156_file, 
"linked-with-condition.odt", "5-
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
 uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
 // Record 2 has non-empty "Title" field => section is shown
-CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, 
"IsCurrentlyVisible"));
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, "IsVisible"));
 }
 {
 loadMailMergeDocument(2);
@@ -435,7 +432,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf122156_file, 
"linked-with-condition.odt", "5-
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
 uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
 // Record 3 has non-empty "Title" field => section is shown
-CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, 
"IsCurrentlyVisible"));
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, "IsVisible"));
 }
 {
 loadMailMergeDocument(3);
@@ -443,10 +440,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf122156_file, 
"linked-with-condition.odt", "5-
   
uno::UNO_QUERY_THROW);
 uno::Reference 
xSections(xSectionsSupplier->getTextSections(),
   
uno::UNO_QUERY_THROW);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
-uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
-// Record 4 has empty "Title" field => section is not shown
-CPPUNIT_ASSERT_EQUAL(false, getProperty(xSect, 
"IsCurrentlyVisible"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount());
 }
 {
 loadMailMergeDocument(4);
@@ -457,7 +451,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf122156_file, 
"linked-with-condition.odt", "5-
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
 uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
 // Record 5 has non-empty "Title" field => section is shown
-CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, 
"IsCurrentlyVisible"));
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, "IsVisible"));
 }
 }
 
@@ -539,6 +533,7 @@ DECLARE_SHELL_MAILMERGE_TEST(testTdf81750_shell, 
"tdf81750.odt", "10-testing-add
 
 DECLARE_FILE_MAILMERGE_TEST(testTdf123057_file, "pagecounttest.ott", 
"db_pagecounttest.ods", "Sheet1")
 {
+uno::Reference xSect0, xSect1;
 executeMailMerge(true);
 
 for (int doc = 0; doc < 4; ++doc)
@@ -549,58 +544,38 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf123057_file, 
"pagecounttest.ott", "db_pagecou
 uno

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

2022-11-03 Thread Henry Castro (via logerrit)

 sw/source/core/doc/DocumentContentOperationsManager.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7bd657b5dac270dae09cd0fe2b22d23fd2fc7245
Author: Henry Castro 
AuthorDate: Tue Oct 18 16:51:38 2022 -0400
Commit: Miklos Vajna 
CommitDate: Thu Nov 3 16:42:07 2022 +0100

sw: fix Content Node assertion

assert(nNode.GetNode().GetContentNode() && "only valid to call this if we 
point to an SwContentNode");

Signed-off-by: Henry Castro 
Change-Id: I31664decd83a1db92858c6d5efac90949eddb3ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141517
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index a49ed387aac3..0e23b4310c49 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2199,7 +2199,9 @@ bool DocumentContentOperationsManager::DelFullPara( 
SwPaM& rPam )
 
 SwContentNode *pTmpNode = rPam.GetPoint()->GetNode().GetContentNode();
 bool bGoNext = (nullptr == pTmpNode);
-rPam.GetMark()->SetContent( 0 );
+
+if (rPam.GetMark()->GetContentNode())
+rPam.GetMark()->SetContent( 0 );
 
 m_rDoc.GetIDocumentUndoRedo().ClearRedo();

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

2022-11-03 Thread Regina Henschel (via logerrit)

 oox/source/export/drawingml.cxx   |   23 ---
 sd/qa/unit/ShapeImportExportTest.cxx  |   44 +-
 sd/qa/unit/data/odp/tdf150966_hugeInset.odp   |binary
 sw/qa/extras/ooxmlexport/data/tdf150966_regularInset.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx|   18 +
 5 files changed, 63 insertions(+), 22 deletions(-)

New commits:
commit 933768ffcd8617942f45481de77e656ded9dcfe2
Author: Regina Henschel 
AuthorDate: Wed Nov 2 22:34:16 2022 +0100
Commit: Regina Henschel 
CommitDate: Thu Nov 3 16:28:31 2022 +0100

tdf#150966 oox export avoid bottom above top for text area

If bottom and top insets set so that the bottom edge of the resulting
text area is above the top edge, then LO and MS Office behave different
in how this is rendered. With commit e2169886 insets are converted on
import to make rendering in LO similar to MS Office, but the
implemented export has some problems, see analysis in bug report.

LibreOffice normalizes the resulting text area in case bottom edge is
above top edge. So this patch exports the insets so, that MS Office
gets a normalized resulting text area and will not apply its special
rules.

A roundtrip starting with pptx will not regenerate the old values but
will produce inset values, which give same rendering in MS Office than
in LO. Because the method is different now, the inset values have
changed and test testTextDistancesOOXML_Export is adapted. When you
compare the result with the screenshot on slide 2, you see that the
new method works as well.

The old method did not work for exporting an odp file. That is covered
by the new unit test. The docx unit test file covers the case, that
the export tweak was erroneously triggered.

Change-Id: I0091f284d9bdd635dd87ddb9e9b0e415cc0cc51e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142185
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 8939a5415683..80d38e8dfc79 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -110,6 +110,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3335,21 +3336,27 @@ void DrawingML::WriteText(const Reference& 
rXIface, bool bBodyPr, bo
 // Transform the text distance values so they are compatible with OOXML 
insets
 if (xShape.is())
 {
-sal_Int32 nTextHeight = xShape->getSize().Width;
+sal_Int32 nTextHeight = xShape->getSize().Height; // Hmm, default
 
-auto* pCustomShape = 
dynamic_cast(SdrObject::getSdrObjectFromXShape(xShape));
+// CustomShape can have text area different from shape rectangle
+auto* pCustomShape
+= 
dynamic_cast(SdrObject::getSdrObjectFromXShape(xShape));
 if (pCustomShape)
 {
-tools::Rectangle aAnchorRect;
-pCustomShape->TakeTextAnchorRect(aAnchorRect);
-nTextHeight = aAnchorRect.GetSize().getHeight();
+const EnhancedCustomShape2d aCustomShape2d(*pCustomShape);
+nTextHeight = aCustomShape2d.GetTextRect().getOpenHeight();
+if (DOCUMENT_DOCX == meDocumentType)
+nTextHeight = convertTwipToMm100(nTextHeight);
 }
 
 if (nTop + nBottom >= nTextHeight)
 {
-sal_Int32 nDiff = std::abs(std::min(nTop, nBottom));
-nTop += nDiff;
-nBottom += nDiff;
+// Effective bottom would be above effective top of text area. LO 
normalizes the
+// effective text area in such case implicitely for rendering. MS 
needs indents so that
+// the result is the normalized effective text area.
+std::swap(nTop, nBottom);
+nTop = nTextHeight - nTop;
+nBottom = nTextHeight - nBottom;
 }
 }
 
diff --git a/sd/qa/unit/ShapeImportExportTest.cxx 
b/sd/qa/unit/ShapeImportExportTest.cxx
index a0e6b63b4ccb..ce972e0a38cc 100644
--- a/sd/qa/unit/ShapeImportExportTest.cxx
+++ b/sd/qa/unit/ShapeImportExportTest.cxx
@@ -30,11 +30,13 @@ public:
 void testTextDistancesOOXML();
 void testTextDistancesOOXML_LargerThanTextAreaSpecialCase();
 void testTextDistancesOOXML_Export();
+void testTextDistancesODP_OOXML_Export();
 
 CPPUNIT_TEST_SUITE(ShapeImportExportTest);
 CPPUNIT_TEST(testTextDistancesOOXML);
 CPPUNIT_TEST(testTextDistancesOOXML_LargerThanTextAreaSpecialCase);
 CPPUNIT_TEST(testTextDistancesOOXML_Export);
+CPPUNIT_TEST(testTextDistancesODP_OOXML_Export);
 CPPUNIT_TEST_SUITE_END();
 
 virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -267,28 +269,28 @@ void 
ShapeImportExportTest::testTextDistancesOOXML_Export()
 //Check shape Top/Bottom - 0cm, 4cm
 assertXPath(pXmlDoc, "/p:sld

ESC meeting minutes: 2022-11-03

2022-11-03 Thread Miklos Vajna


* Present:
+ Ilmari, Heiko, Stephan, Olivier, Thorsten, Hossein, Miklos, Xisco, 
Gabriel, Kendy

* Completed Action Items:

* Pending Action Items:
+ ignore enhancement severity for the “QA update” section (Xisco)
+ create the Jenkins job for macOS arm64 (Cloph)

* Release Engineering update (Xisco)
+ 7.4 status: 7.4.3 rc1 was tagged yesterday, builds are in progress
+ 7.3 status: 7.3.7 was announced today
+ 7.5 release plan: alpha soonish, expect a wiki page similar to 7.3, a 
year later

* Documentation (Olivier)
+ Helpcontents2
   + More screenshots for Draw (ohallot)
   + updates and refactor for Draw Help pages (ohallot)
   + Updates in BASIC function (A. Romedenne)
+ Guides
   + updates in progress (P. Schofield, S. Masonsmith, K. Kriek)

+ Bugzilla Documentation statistics
239(239) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 1(-7)34(2)  77(1)  304(1)
 commented 6(-12)   61(4) 170(-9)1215(4)
  resolved 0(-2)13(0)  36(-1) 194(-1)
+ top 10 contributors:
  Olivier Hallot made 22 changes in 1 month, and 469 changes in 1 year
  Rafael Lima made 14 changes in 1 month, and 229 changes in 1 year
  Bogdan B made 12 changes in 1 month, and 13 changes in 1 year
  Srebotnjak, Martin made 8 changes in 1 month, and 12 changes in 1 year
  *UNKNOWN* made 7 changes in 1 month, and 7 changes in 1 year
  Roman Kuznetsov made 6 changes in 1 month, and 35 changes in 1 year
  Ilmari Lauhakangas made 6 changes in 1 month, and 90 changes in 1 year
  Kaganski, Mike made 6 changes in 1 month, and 120 changes in 1 year
  Dieter made 5 changes in 1 month, and 74 changes in 1 year
  Eyal Rozenberg made 5 changes in 1 month, and 9 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
272(272) (topicUI) bugs open, 103(103) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months   12 months
 added 15(6) 44(0)  68(5)   90(5)
 commented 44(6)249(-52)   651(-13)   2368(15)
   removed  0(0)  0(-1)  9(-1)  34(-1)
  resolved  2(-1)22(-2) 71(-9) 318(1)
+ top 10 contributors:
  Eyal Rozenberg made 125 changes in 1 month, and 277 changes in 1 year
  Heiko Tietze made 82 changes in 1 month, and 1518 changes in 1 year
  V Stuart Foote made 47 changes in 1 month, and 47 changes in 1 year
  Roman Kuznetsov made 46 changes in 1 month, and 214 changes in 1 year
  Dieter made 34 changes in 1 month, and 238 changes in 1 year
  Telesto made 31 changes in 1 month, and 176 changes in 1 year
  Rafael Lima made 28 changes in 1 month, and 207 changes in 1 year
  Foote, V Stuart made 23 changes in 1 month, and 253 changes in 1 year
  Kaganski, Mike made 14 changes in 1 month, and 157 changes in 1 year
  Cor Nouws made 13 changes in 1 month, and 62 changes in 1 year
+ blog post about polypoly is published, lots of feedback
  + some positive, but many have concerns

* Crash Testing (Caolan)
+ 22(-7) import failure, 0(-3) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/7.3.6.2
 + (-5) 797 802 695 605 523 391 313 139 0
   + https://crashreport.libreoffice.org/stats/version/7.4.1.2
 + (-340) 948 1288 1676 1942 1653 1202 783 0
   + https://crashreport.libreoffice.org/stats/version/7.4.2.3
 + (+379) 1632 1253 650 0

   + 
https://crashreport.libreoffice.org/stats/signature/void%20rtl::str::release%3C_rtl_uString%3E(_rtl_uString*)
   + Blind fix: 0d1eefda2a89d0dfb313c1f8fb388d95780ad126 (Thanks to Noel)

* Easyhack update / mentoring (Hossein)
  committer...   1 week 1 month 3 months12 months
  open  51(-23)120(-16)132(-17) 136(-17)
   reviews 288(-8)1144(94)2944(-12)   11874(94)
merged 278(-15)   1073(81)3566(57)14857(-113)
 abandoned  17(1)   57(8)  172(1)   841(9)
   own commits 212(-40)825(65)2731(38)11442(-153)
review commits  54(-23)266(25) 672(7)  3065(-30)
contributor...   1 week  1 month 3 months   12 months
  open  76(48)  248(12) 275(13) 293(14)
   reviews 708(-140)   2622(106)   7926(46)   32678(-176)
merged  10(-6)   61(7)  217(1) 1103(-13)
 abandoned   3(-8)   24(-3)  62(2)  370(-3)
   own commits  18(-2)   93(12) 224(9) 1052(5)
review commits

[Libreoffice-commits] core.git: chart2/qa emfio/qa filter/qa include/test oox/qa sc/qa sd/qa sfx2/qa svx/qa test/Library_subsequenttest.mk test/source xmloff/qa

 chart2/qa/extras/charttest.hxx|7 -
 emfio/qa/cppunit/emf/EmfImportTest.cxx|7 -
 filter/qa/unit/svg.cxx|7 -
 include/test/unoapixml_test.hxx   |   30 +
 oox/qa/unit/export.cxx|   94 -
 sc/qa/extras/macros-test.cxx  |   14 +-
 sc/qa/unit/SparklineImportExportTest.cxx  |   16 +-
 sc/qa/unit/jumbosheets-test.cxx   |   24 +---
 sc/qa/unit/tiledrendering/tiledrendering.cxx  |   11 --
 sd/qa/filter/eppt/eppt.cxx|   15 --
 sd/qa/unit/HtmlExportTest.cxx |7 -
 sd/qa/unit/SVGExportTests.cxx |7 -
 sd/qa/unit/ShapeImportExportTest.cxx  |6 -
 sd/qa/unit/activex-controls-tests.cxx |4 
 sd/qa/unit/export-tests-ooxml1.cxx|  116 ++---
 sd/qa/unit/export-tests-ooxml2.cxx|  118 +++--
 sd/qa/unit/export-tests-ooxml3.cxx|  140 +-
 sd/qa/unit/export-tests.cxx   |   40 +++
 sd/qa/unit/import-tests-smartart.cxx  |4 
 sd/qa/unit/import-tests.cxx   |4 
 sd/qa/unit/import-tests2.cxx  |4 
 sd/qa/unit/layout-tests.cxx   |7 -
 sd/qa/unit/misc-tests.cxx |   29 ++---
 sd/qa/unit/sdmodeltestbase.hxx|   29 -
 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx |9 -
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |   11 --
 sfx2/qa/cppunit/test_misc.cxx |8 -
 svx/qa/unit/sdr.cxx   |7 -
 svx/qa/unit/svdraw.cxx|7 -
 svx/qa/unit/table.cxx |7 -
 svx/qa/unit/unodraw.cxx   |7 -
 test/Library_subsequenttest.mk|2 
 test/source/unoapixml_test.cxx|   36 ++
 xmloff/qa/unit/draw.cxx   |   25 +---
 xmloff/qa/unit/style.cxx  |   25 +---
 xmloff/qa/unit/text.cxx   |   43 ++-
 36 files changed, 443 insertions(+), 484 deletions(-)

New commits:
commit 2dd592f0836184e3f275e8ff3248639f08a3f647
Author: Xisco Fauli 
AuthorDate: Thu Nov 3 11:42:17 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 3 16:21:57 2022 +0100

UnoApiXmlTest: add new wrapper for XmlTestTools tests

Change-Id: I767f464ec666330a2e8e832b6d6f5736a6bef54d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142228
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 3662027dbf07..2cacd4e43243 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -9,8 +9,7 @@
 
 #pragma once
 
-#include 
-#include 
+#include 
 #include 
 #include 
 
@@ -110,11 +109,11 @@ OUString findChartFile(const OUString& rDir, 
uno::Reference< container::XNameAcc
 
 }
 
-class ChartTest : public UnoApiTest, public XmlTestTools
+class ChartTest : public UnoApiXmlTest
 {
 public:
 ChartTest(OUString path)
-: UnoApiTest(path)
+: UnoApiXmlTest(path)
 {
 }
 
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 6c1e30d57ca4..99adda32e834 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -10,8 +10,7 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
 
 #include 
 #include 
@@ -38,7 +37,7 @@ using namespace css::graphic;
 using drawinglayer::primitive2d::Primitive2DSequence;
 using drawinglayer::primitive2d::Primitive2DContainer;
 
-class Test : public UnoApiTest, public XmlTestTools
+class Test : public UnoApiXmlTest
 {
 const OString aXPathPrefix = "/primitive2D/metafile/transform/";
 
@@ -90,7 +89,7 @@ class Test : public UnoApiTest, public XmlTestTools
 
 public:
 Test()
-: UnoApiTest("/emfio/qa/cppunit/emf/data/")
+: UnoApiXmlTest("/emfio/qa/cppunit/emf/data/")
 {
 }
 
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index fc932d80793e..90de658cf50f 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -11,8 +11,7 @@
 
 #include 
 
-#include 
-#include 
+#include 
 
 #include 
 #include 
@@ -28,7 +27,7 @@
 using namespace ::com::sun::star;
 
 /// SVG filter tests.
-class SvgFilterTest : public UnoApiTest, public XmlTestTools
+class SvgFilterTest : public UnoApiXmlTest
 {
 public:
 SvgFilterTest();
@@ -36,7 +35,7 @@ public:
 };
 
 SvgFilterTest::SvgFilterTest()
-: UnoApiTest("/filter/qa/unit/data/")
+: UnoApiXmlTest("/filter/qa/unit/data/")
 {
 }
 
diff --git a/include/test/unoapixml_test.hxx b/include/test/unoapixml_test.hxx
new file mode 100644
index ..36fb334a75cd
--- /dev/null
+++ b/include/test/unoapixml_test.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset:

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - 6 commits - editeng/inc editeng/source include/editeng include/svl include/svx oox/source sd/qa sd/source svx/source

2022-11-03 Thread Tomaž Vajngerl (via logerrit)

 editeng/inc/editdoc.hxx |   28 
 editeng/source/editeng/editdoc.cxx  |8 -
 editeng/source/editeng/editeng.cxx  |4 
 editeng/source/editeng/editobj.cxx  |6 
 editeng/source/editeng/editobj2.hxx |   10 -
 editeng/source/editeng/impedit.hxx  |   30 ++--
 editeng/source/editeng/impedit2.cxx |4 
 editeng/source/editeng/impedit3.cxx |  118 +--
 editeng/source/editeng/impedit4.cxx |6 
 editeng/source/outliner/outlin2.cxx |7 -
 editeng/source/outliner/outliner.cxx|   12 -
 include/editeng/editeng.hxx |4 
 include/editeng/outliner.hxx|4 
 include/svl/solar.hrc   |2 
 include/svx/svdotext.hxx|2 
 include/svx/unoshprp.hxx|4 
 oox/source/export/drawingml.cxx |5 
 sd/qa/unit/export-tests-ooxml2.cxx  |5 
 sd/source/ui/view/drtxtob.cxx   |6 
 svx/source/svdraw/svdotext.cxx  |  171 
 svx/source/svdraw/svdotextdecomposition.cxx |2 
 svx/source/unodraw/unoshape.cxx |   26 
 22 files changed, 246 insertions(+), 218 deletions(-)

New commits:
commit e87afb348cbb4e9e37cd3e6b1cca031a48f137ca
Author: Tomaž Vajngerl 
AuthorDate: Mon Oct 31 13:28:27 2022 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 3 15:39:27 2022 +0100

fix rendering of text when "fit to frame" is enabled

This changes the nStretchX and nStretchY from sal_uInt16 to double
so the text in text boxes is rendered correctly (text should be
resized to the same size as the textbox).

(cherry picked from commit 4c349be1d74c669e5804c3c43f3f0a3960c88bc5)

Conflicts:
editeng/source/editeng/impedit.hxx
editeng/source/editeng/impedit4.cxx
sd/qa/unit/import-tests2.cxx
sd/source/ui/view/drtxtob.cxx
svx/source/svdraw/svdotext.cxx

Change-Id: Ic92d03043af0abe86f1b67ae15522d0176ebb

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 73d85a07b7ce..e8f57b80cd5e 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2251,12 +2251,12 @@ bool EditEngine::HasText( const SvxSearchItem& 
rSearchItem )
 return pImpEditEngine->HasText( rSearchItem );
 }
 
-void EditEngine::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
+void EditEngine::SetGlobalCharStretching(double nX, double nY)
 {
 pImpEditEngine->SetCharStretching( nX, nY );
 }
 
-void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) 
const
+void EditEngine::GetGlobalCharStretching(double& rX, double& rY) const
 {
 pImpEditEngine->GetCharStretching( rX, rY );
 }
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index f93d4a6205ad..6d42ec021e5a 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -79,10 +79,10 @@ void XEditAttribute::SetItem(const SfxPoolItem& rNew)
 }
 
 XParaPortionList::XParaPortionList(
-OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 _nStretchX, sal_uInt16 
_nStretchY)
+OutputDevice* pRefDev, sal_uInt32 nPW, double nStretchX, double nStretchY)
 : pRefDevPtr(pRefDev)
-, nStretchX(_nStretchX)
-, nStretchY(_nStretchY)
+, mnStretchX(nStretchX)
+, mnStretchY(nStretchY)
 , nPaperWidth(nPW)
 {
 }
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index 41bbc5404e50..e817f68cc8a6 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -95,12 +95,12 @@ class XParaPortionList
 ListType maList;
 
 VclPtr pRefDevPtr;
-sal_uInt16  nStretchX;
-sal_uInt16  nStretchY;
+double  mnStretchX;
+double  mnStretchY;
 sal_uInt32  nPaperWidth;
 
 public:
-XParaPortionList(OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 
_nStretchX, sal_uInt16 _nStretchY);
+XParaPortionList(OutputDevice* pRefDev, sal_uInt32 nPW, double nStretchX, 
double nStretchY);
 
 void push_back(XParaPortion* p);
 const XParaPortion& operator[](size_t i) const;
@@ -109,8 +109,8 @@ public:
 sal_uInt32  GetPaperWidth() const   { return nPaperWidth; }
 boolRefDevIsVirtual() const {return 
pRefDevPtr->IsVirtual();}
 const MapMode&  GetRefMapMode() const   { return 
pRefDevPtr->GetMapMode(); }
-sal_uInt16  GetStretchX() const { return nStretchX; }
-sal_uInt16  GetStretchY() const { return nStretchY; }
+double  GetStretchX() const { return mnStretchX; }
+double  GetStretchY() const { return mnStretchY; }
 };
 
 class ContentInfo
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index bf6196953ea6..9c4159ec9796 100644
--- a/editeng/source/editeng/impedit.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - download.lst

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 23e6227ab347a00b235fb00892b379ef4e3a0d35
Author: Xisco Fauli 
AuthorDate: Wed Nov 2 20:29:51 2022 +0100
Commit: Caolán McNamara 
CommitDate: Thu Nov 3 16:06:03 2022 +0100

upgrade to openssl-1.1.1s

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

diff --git a/download.lst b/download.lst
index daa837fbf1fc..d871756fdf10 100644
--- a/download.lst
+++ b/download.lst
@@ -196,8 +196,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34
 export OPENLDAP_TARBALL := openldap-2.4.59.tgz
-export OPENSSL_SHA256SUM := 
d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
-export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz
+export OPENSSL_SHA256SUM := 
c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
+export OPENSSL_TARBALL := openssl-1.1.1s.tar.gz
 export ORCUS_SHA256SUM := 
2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143
 export ORCUS_TARBALL := liborcus-0.17.2.tar.bz2
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d

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

2022-11-03 Thread Rafael Lima (via logerrit)

 cui/source/dialogs/SpellDialog.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1de8308d40fad8e9281d2b491f8c5c919fda82f4
Author: Rafael Lima 
AuthorDate: Wed Nov 2 18:54:24 2022 +0200
Commit: Caolán McNamara 
CommitDate: Thu Nov 3 16:05:17 2022 +0100

tdf#116566 Make Spellcheck dialog respect dark background

This patch makes the sentence in the spellcheck dialog respect the colors 
in the selected color scheme. More specifically, it uses the AutoSpellcheck 
color and the Font Color in the Edit Engine.

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 49e1415e744e..21f7f2b4da80 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1140,6 +1140,7 @@ void 
SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 OutputDevice& rDevice = pDrawingArea->get_ref_device();
 rDevice.SetBackground(aBgColor);
 m_xEditView->SetBackgroundColor(aBgColor);
+m_xEditEngine->SetBackgroundColor(aBgColor);
 }
 
 SentenceEditWindow_Impl::~SentenceEditWindow_Impl()
@@ -1671,8 +1672,13 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_Int32 
nStart, sal_Int32 nEnd,
 m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT_CJK);
 m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT_CTL);
 
+// tdf#116566 Use color defined in the current Color Scheme
+Color aSpellErrorCollor = 
svtools::ColorConfig().GetColorValue(svtools::SPELL).nColor;
+
+// TODO: Create a new Color Scheme entry for grammar mistakes and use it 
below
+// instead of using hardcoded COL_LIGHTBLUE
 SfxItemSet aSet(m_xEditEngine->GetEmptyItemSet());
-aSet.Put(SvxColorItem(bGrammarError ? COL_LIGHTBLUE : COL_LIGHTRED, 
EE_CHAR_COLOR));
+aSet.Put(SvxColorItem(bGrammarError ? COL_LIGHTBLUE : aSpellErrorCollor, 
EE_CHAR_COLOR));
 aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT));
 aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT_CJK));
 aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT_CTL));

[Libreoffice-commits] core.git: helpcontent2

2022-11-03 Thread Alain Romedenne (via logerrit)

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

New commits:
commit bc456bac0ffdefd37164ca5d5b123ed8df72f4f1
Author: Alain Romedenne 
AuthorDate: Thu Nov 3 16:56:28 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Nov 3 15:56:28 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 638ca29e5446bd2f330f8a66bcadfced725597ec
  - Corrections to UNO objects, function & services help page

Change-Id: Ia72f062c5d0ec07e61aa6b45caea31139acf561e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142199
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/helpcontent2 b/helpcontent2
index f129a53a4238..638ca29e5446 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f129a53a423805628f95cf72469f48f5279147a6
+Subproject commit 638ca29e5446bd2f330f8a66bcadfced725597ec

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

2022-11-03 Thread Alain Romedenne (via logerrit)

 source/text/sbasic/shared/uno_objects.xhp |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 638ca29e5446bd2f330f8a66bcadfced725597ec
Author: Alain Romedenne 
AuthorDate: Thu Nov 3 16:42:25 2022 +0200
Commit: Alain Romedenne 
CommitDate: Thu Nov 3 15:56:26 2022 +0100

Corrections to UNO objects, function & services help page

Change-Id: Ia72f062c5d0ec07e61aa6b45caea31139acf561e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142199
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/source/text/sbasic/shared/uno_objects.xhp 
b/source/text/sbasic/shared/uno_objects.xhp
index ae20684850..61ae8e60da 100644
--- a/source/text/sbasic/shared/uno_objects.xhp
+++ b/source/text/sbasic/shared/uno_objects.xhp
@@ -40,17 +40,16 @@
 
   UNO Methods
   Use the following 
methods to manage or query Unified Network Objects (UNO).
-  
-  
-  
   
   
+  
+  
+  
   
-  
   
-  
   
   
+  
   %PRODUCTNAME provides an Application 
Programming Interface (API) that allows controlling the $[officename] 
components with different programming languages by using the $[officename] 
Software Development Kit (SDK). For more information about the $[officename] 
API and the Software Development Kit, visit https://api.libreoffice.org/"; 
name="api.libreoffice.org">https://api.libreoffice.org

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

2022-11-03 Thread Samuel Mehrbrodt (via logerrit)

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |   19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 490c2fc6080aa652b9b31385517aaf536f5bbd57
Author: Samuel Mehrbrodt 
AuthorDate: Thu Nov 3 10:56:47 2022 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 3 14:22:42 2022 +0100

tdf#151174 Hide transparency widgets when not needed

Regression from adc536e9efc77690df62177aa722f9252bdbf96b

Change-Id: I42d64fafe170d08e14bb4fe087a3e628ac862e49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142221
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 521d46ea1d3c..b11f61d775eb 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -411,11 +411,6 @@ void AreaPropertyPanelBase::FillStyleChanged(bool 
bUpdateModel)
 bool bShowMTRAngle = false;
 bool bShowToolBoxColor = false;
 bool bShowBmpImport = false;
-// Transparency widgets are shown by default
-bool bShowLBTransType = true;
-bool bShowTrspTextFT = true;
-bool bShowMTRTransparent = true;
-bool bShowSldTransparent = true;
 
 // #i122676# Do no longer trigger two Execute calls, one for 
SID_ATTR_FILL_STYLE
 // and one for setting the fill attribute itself, but add two SfxPoolItems 
to the
@@ -632,10 +627,12 @@ void AreaPropertyPanelBase::FillStyleChanged(bool 
bUpdateModel)
 }
 case USE_BACKGROUND:
 {
-bShowLBTransType = false;
-bShowTrspTextFT = false;
-bShowMTRTransparent = false;
-bShowSldTransparent = false;
+// No transparencies here
+mxLBTransType->hide();
+mxTrspTextFT->hide();
+mxMTRTransparent->hide();
+mxSldTransparent->hide();
+mxBTNGradient->hide();
 if (bUpdateModel)
 {
 const XFillStyleItem aXFillStyleItem(drawing::FillStyle_NONE);
@@ -653,10 +650,6 @@ void AreaPropertyPanelBase::FillStyleChanged(bool 
bUpdateModel)
 mxMTRAngle->set_visible(bShowMTRAngle);
 mxToolBoxColor->set_visible(bShowToolBoxColor);
 mxBmpImport->set_visible(bShowBmpImport);
-mxLBTransType->set_visible(bShowLBTransType);
-mxTrspTextFT->set_visible(bShowTrspTextFT);
-mxMTRTransparent->set_visible(bShowMTRTransparent);
-mxSldTransparent->set_visible(bShowSldTransparent);
 
 meLastXFS = static_cast(nPos);

Minutes from the UX/design meeting 2022-Nov-03

2022-11-03 Thread Heiko Tietze


Present: Heiko
Comments: André, Dieter, Eyal

Tickets/Topics

 * Writer: Caption strings should be set to document language instead
   of UI language
   + https://bugs.documentfoundation.org/show_bug.cgi?id=151020
   + use translation from PS for variable names requested on ask.libo (André)
   + not much of a problem, users can change category names manually (Dieter)
   + unclear set-up of document / UI language (Eyal)
   => keep the ticket with low priority for reference

 * ENHANCEMENT: Collapse or hide toggle for individual effect details
   in animation sidebar
   + https://bugs.documentfoundation.org/show_bug.cgi?id=151377
   + change the layout and/or workflow of the animations deck?
   + no further opinion, happy to change the layout slightly again (Heiko)
   => do it

 * Add ability to toggle a reader / reading view (mode) in Writer
   + https://bugs.documentfoundation.org/show_bug.cgi?id=151320
   + introduce a special reading mode or improve the web view mode
 with muted colors
   + suggest to realize this view mode / color settings combination
 per extension (Heiko)
   => move topic respectively


OpenPGP_signature
Description: OpenPGP digital signature

[Libreoffice-commits] core.git: configure.ac

2022-11-03 Thread Tor Lillqvist (via logerrit)

 configure.ac |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 029e4e8a614a86f22bcafc0e2db55449d2b07a52
Author: Tor Lillqvist 
AuthorDate: Thu Nov 3 11:11:29 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 3 14:07:01 2022 +0100

Accept macOS SDK 13.0

Change-Id: Ieb4fac4e909482b477fd228b86cfd458ff00def5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142219
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index f2314d4144e2..7116a768c1fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3428,7 +3428,7 @@ if test $_os = Darwin; then
 # The SDK in the currently selected Xcode should be found.
 
 AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 break
@@ -3473,6 +3473,9 @@ if test $_os = Darwin; then
 12.3)
 MACOSX_SDK_VERSION=120300
 ;;
+13.0)
+MACOSX_SDK_VERSION=13
+;;
 *)
 AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
 ;;
@@ -3538,8 +3541,11 @@ if test $_os = Darwin; then
 12.3)
 MAC_OS_X_VERSION_MIN_REQUIRED="120300"
 ;;
+13.0)
+MAC_OS_X_VERSION_MIN_REQUIRED="13"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.14--12.3])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.14--13.0])
 ;;
 esac

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

2022-11-03 Thread Stephan Bergmann (via logerrit)

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |3 +--
 sc/source/ui/drawfunc/drtxtob.cxx   |3 ++-
 sc/source/ui/view/editsh.cxx|3 ++-
 sd/qa/unit/tiledrendering/tiledrendering.cxx|8 
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit e0121b2478526d803681d57d59af0cbf9cf602b4
Author: Stephan Bergmann 
AuthorDate: Thu Nov 3 09:14:18 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 3 13:58:13 2022 +0100

-Werror=dangling-reference

In


"c++: Implement -Wdangling-reference [PR106393]" grew a new warning, 
included in
-Wall, and based on some more-or-less shaky heuristics, that warns about
"possibly dangling reference to a temporary".  It produces quite a number of
false positives, but for these uses of SfxItemSet::Get it does look 
plausible
that the returned item references could, at least in theory, point at data 
that
is destroyed along with the temporary SfxItemSet.

Change-Id: I11afc4512db488f73170c6cfa706e9e094209550
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142217
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index aacb01522f51..ee2f47254765 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1505,8 +1505,7 @@ namespace accessibility
 // NumberingLevel
 if (rRes.Name == "NumberingLevel")
 {
-const SvxNumBulletItem& rNumBullet = 
rCacheTF.GetParaAttribs(GetParagraphIndex()).Get(EE_PARA_NUMBULLET);
-if(rNumBullet.GetNumRule().GetLevelCount()==0)
+
if(rCacheTF.GetParaAttribs(GetParagraphIndex()).Get(EE_PARA_NUMBULLET).GetNumRule().GetLevelCount()==0)
 {
 rRes.Value <<= sal_Int16(-1);
 rRes.Handle = -1;
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx 
b/sc/source/ui/drawfunc/drtxtob.cxx
index ec796f4a8521..5d2e5a2e4019 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -205,7 +205,8 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
 
 case SID_CHARMAP:
 {
-const SvxFontItem& rItem = 
pOutView->GetAttribs().Get(EE_CHAR_FONTINFO);
+auto const attribs = pOutView->GetAttribs();
+const SvxFontItem& rItem = attribs.Get(EE_CHAR_FONTINFO);
 
 OUString aString;
 std::shared_ptr 
aNewItem(std::make_shared(EE_CHAR_FONTINFO));
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 0fd33f62ed6d..bdd0d32d551b 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -383,8 +383,9 @@ void ScEditShell::Execute( SfxRequest& rReq )
 sal_uInt16 nFontWhich = ( nScript == SvtScriptType::ASIAN ) ? 
EE_CHAR_FONTINFO_CJK :
 ( ( nScript == SvtScriptType::COMPLEX ) ? 
EE_CHAR_FONTINFO_CTL :
 
EE_CHAR_FONTINFO );
+auto const attribs = pTableView->GetAttribs();
 const SvxFontItem& rItem = static_cast(
-pTableView->GetAttribs().Get(nFontWhich));
+attribs.Get(nFontWhich));
 
 OUString aString;
 std::shared_ptr 
aNewItem(std::make_shared(EE_CHAR_FONTINFO));
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 3529290162c9..a7e9095ed950 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1490,8 +1490,8 @@ void SdTiledRenderingTest::testTdf102223()
 EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
 rEditView.SetSelection(ESelection(0, 0, 0, 3)); // start para, start char, 
end para, end char.
 CPPUNIT_ASSERT_EQUAL(OUString("Red"), rEditView.GetSelected());
-const SvxFontHeightItem& rItem = 
rEditView.GetAttribs().Get(EE_CHAR_FONTHEIGHT);
-CPPUNIT_ASSERT_EQUAL(int(1411), static_cast(rItem.GetHeight()));
+CPPUNIT_ASSERT_EQUAL(
+int(1411), 
static_cast(rEditView.GetAttribs().Get(EE_CHAR_FONTHEIGHT).GetHeight()));
 
 // cut contents of cell
 uno::Sequence aArgs;
@@ -1502,8 +1502,8 @@ void SdTiledRenderingTest::testTdf102223()
 CPPUNIT_ASSERT(pView->GetTextEditObject());
 EditView& rEditView2 = pView->GetTextEditOutlinerView()->GetEditView();
 rEditView2.SetSelection(ESelection(0, 0, 0, 1)); // start para, start 
char, end para, end char.
-const SvxFontHeightItem&

[Libreoffice-commits] core.git: include/unotest oox/qa sd/qa sw/qa unotest/source xmloff/qa

 include/unotest/macros_test.hxx|2 -
 oox/qa/unit/export.cxx |   64 +++--
 sd/qa/filter/eppt/eppt.cxx |6 ++-
 sd/qa/unit/export-tests-ooxml1.cxx |4 +-
 sd/qa/unit/export-tests-ooxml3.cxx |6 ++-
 sd/qa/unit/sdmodeltestbase.hxx |2 -
 sw/qa/inc/swmodeltestbase.hxx  |2 -
 sw/qa/unit/swmodeltestbase.cxx |   14 
 unotest/source/cpp/macros_test.cxx |5 +-
 xmloff/qa/unit/draw.cxx|   12 +++---
 xmloff/qa/unit/style.cxx   |   12 +++---
 xmloff/qa/unit/text.cxx|   24 ++---
 12 files changed, 79 insertions(+), 74 deletions(-)

New commits:
commit d40d64da771427423786dc62a2f4ad08cab53179
Author: Xisco Fauli 
AuthorDate: Thu Nov 3 09:55:06 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 3 13:41:14 2022 +0100

swmodeltestbase: remove duplicated code

parseExportStream is already in MacrosTest

Change-Id: Ibde88b176db1521966b6877bda90e06c278c397d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142218
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/include/unotest/macros_test.hxx b/include/unotest/macros_test.hxx
index b2ac283e4f7d..e6c3ecce9683 100644
--- a/include/unotest/macros_test.hxx
+++ b/include/unotest/macros_test.hxx
@@ -92,7 +92,7 @@ public:
 const css::uno::Sequence& 
rPropertyValues);
 
 /// Opens rStreamName from rTempFile, assuming it's a ZIP storage.
-static std::unique_ptr parseExportStream(const 
utl::TempFileNamed& rTempFile,
+static std::unique_ptr parseExportStream(const OUString& url,
const OUString& 
rStreamName);
 
 void setUpNssGpg(const test::Directories& rDirectories, const OUString& 
rTestName);
diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx
index de8385fbaf09..711b73922d91 100644
--- a/oox/qa/unit/export.cxx
+++ b/oox/qa/unit/export.cxx
@@ -45,7 +45,7 @@ CPPUNIT_TEST_FIXTURE(Test, testPolylineConnectorPosition)
 utl::TempFileNamed aTempFile = save("Office Open XML Text");
 
 // Then make sure polyline and connector have the correct position.
-std::unique_ptr pStream = parseExportStream(aTempFile, 
"word/document.xml");
+std::unique_ptr pStream = parseExportStream(aTempFile.GetURL(), 
"word/document.xml");
 xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
 
 // For child elements of groups in Writer the position has to be adapted 
to be relative
@@ -75,7 +75,7 @@ CPPUNIT_TEST_FIXTURE(Test, testRotatedShapePosition)
 utl::TempFileNamed aTempFile = save("Office Open XML Text");
 
 // Then make sure the rotated child shape has the correct position.
-std::unique_ptr pStream = parseExportStream(aTempFile, 
"word/document.xml");
+std::unique_ptr pStream = parseExportStream(aTempFile.GetURL(), 
"word/document.xml");
 xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
 
 // For a group itself and for shapes outside of groups, the position 
calculation is done in
@@ -99,7 +99,7 @@ CPPUNIT_TEST_FIXTURE(Test, testDmlGroupshapePolygon)
 
 // Then make sure that the group shape, the group shape's child size and 
the child shape's size
 // match:
-std::unique_ptr pStream = parseExportStream(aTempFile, 
"word/document.xml");
+std::unique_ptr pStream = parseExportStream(aTempFile.GetURL(), 
"word/document.xml");
 xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
 assertXPath(pXmlDoc, "//wpg:grpSpPr/a:xfrm/a:ext", "cx", "5328360");
 // Without the accompanying fix in place, this test would have failed, the 
 element was
@@ -120,7 +120,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCustomShapeArrowExport)
 utl::TempFileNamed aTempFile = save("Office Open XML Text");
 
 // Then the shapes should retain their correct control values.
-std::unique_ptr pStream = parseExportStream(aTempFile, 
"word/document.xml");
+std::unique_ptr pStream = parseExportStream(aTempFile.GetURL(), 
"word/document.xml");
 xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
 
 // Without the fix the output OOXML would have no  tags in it.
@@ -306,7 +306,8 @@ CPPUNIT_TEST_FIXTURE(Test, testCameraRevolutionGrabBag)
 // When saving that document:
 utl::TempFileNamed aTempFile = save("Impress Office Open XML");
 
-std::unique_ptr pStream = parseExportStream(aTempFile, 
"ppt/slides/slide1.xml");
+std::unique_ptr pStream
+= parseExportStream(aTempFile.GetURL(), "ppt/slides/slide1.xml");
 xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
 // Then make sure the revolution is exported without a problem:
 // First shape textbox:
@@ -332,7 +333,8 @@ CPPUNIT_TEST_FIXTURE(Test, testReferToTheme)
 // When saving that document:
 utl::TempFileNamed aTempFile = save("Impress Office Open XML");
 
-std::unique_ptr pStream = parseExportStream(aTempFile, 
"ppt/slides/slide1.xml");
+std:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac

2022-11-03 Thread Tor Lillqvist (via logerrit)

 configure.ac |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 807888b849187eaf5d1c0e4a064f66702180a8e9
Author: Tor Lillqvist 
AuthorDate: Thu Nov 3 12:02:08 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 3 13:36:49 2022 +0100

Accept macOS SDK 13.0

Change-Id: I2207f39583626c55900f3c027bd4a783d2dd36f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142231
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index e3e52c26e8f5..ab716311dc6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3302,7 +3302,7 @@ if test $_os = Darwin; then
 # The SDK in the currently selected Xcode should be found.
 
 AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 break
@@ -3347,6 +3347,9 @@ if test $_os = Darwin; then
 12.3)
 MACOSX_SDK_VERSION=120300
 ;;
+13.0)
+MACOSX_SDK_VERSION=13
+;;
 *)
 AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
 ;;
@@ -3422,8 +3425,11 @@ if test $_os = Darwin; then
 12.3)
 MAC_OS_X_VERSION_MIN_REQUIRED="120300"
 ;;
+13.0)
+MAC_OS_X_VERSION_MIN_REQUIRED="13"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.12--12.3])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.12--13.0])
 ;;
 esac
 
@@ -3493,8 +3499,11 @@ if test $_os = Darwin; then
 12.3)
 MAC_OS_X_VERSION_MAX_ALLOWED="120300"
 ;;
+13.0)
+MAC_OS_X_VERSION_MAX_ALLOWED="13"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.12--12.3])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.12--13.0])
 ;;
 esac

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

 wizards/source/scriptforge/SF_UI.xba |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit beceac5e0a2075696bbb267830ee952ade18da89
Author: Andrea Gelmini 
AuthorDate: Wed Nov 2 15:07:46 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 3 12:26:35 2022 +0100

Fix typo in code

Change-Id: I30dc89340942c1fc21a889e611b8a4510553476a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142169
Tested-by: Jean-Pierre Ledure 
Reviewed-by: Julien Nabet 

diff --git a/wizards/source/scriptforge/SF_UI.xba 
b/wizards/source/scriptforge/SF_UI.xba
index e64011b9ed78..8d2b78e3714b 100644
--- a/wizards/source/scriptforge/SF_UI.xba
+++ b/wizards/source/scriptforge/SF_UI.xba
@@ -78,7 +78,7 @@ Const TABLEDATA   = 
"TableData"
 Const QUERYDATA= "QueryData"
 Const SQLDATA  = "SqlData"
 Const BASEREPORT   = "BaseReport"
-Const BASEDIAGRAM  = "BaseDiaram"
+Const BASEDIAGRAM  = "BaseDiagram"
 
 ' Macro execution modes
 Const cstMACROEXECNORMAL   = 0 '  Default, 
execution depends on user configuration and choice
@@ -1364,4 +1364,4 @@ Private Function _Repr() As String
 End Function   '  ScriptForge.SF_UI._Repr
 
 REM  END OF SCRIPTFORGE.SF_UI
-
\ No newline at end of file
+

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

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

New commits:
commit b27906ac8d246734d274a1624cc231f240e8b97b
Author: Andrea Gelmini 
AuthorDate: Wed Nov 2 15:08:53 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 3 12:26:01 2022 +0100

Fix typo in code

Change-Id: I3df6a2b0b6600d4d9e37723c902e03310aab22c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142171
Tested-by: Jenkins
Tested-by: Jean-Pierre Ledure 
Reviewed-by: Julien Nabet 

diff --git a/wizards/source/sfdatabases/SF_Datasheet.xba 
b/wizards/source/sfdatabases/SF_Datasheet.xba
index 0236d68e7009..743e2ca3ea86 100644
--- a/wizards/source/sfdatabases/SF_Datasheet.xba
+++ b/wizards/source/sfdatabases/SF_Datasheet.xba
@@ -322,7 +322,7 @@ Public Function GetText(Optional ByVal Column As Variant) 
As String
 ''' The text in the cell as a string as how it is 
displayed
 ''' Note that the position of the cursor is left 
unchanged.
 ''' Examples:
-''' oSheet.GeText("ShipCity"))'  
Extract the text on the current row from the column "ShipCity"
+''' oSheet.GetText("ShipCity"))   '  
Extract the text on the current row from the column "ShipCity"
 
 Dim sText As String'  Return Text
 Dim lCol As Long   '  Numeric index 
of Column in lists of columns

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