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

[Noel (via logerrit)]

 vcl/inc/graphic/UnoGraphic.hxx|4 -
 vcl/inc/graphic/UnoGraphicDescriptor.hxx  |3 
 vcl/inc/unx/gtk/gtkdata.hxx   |   63 +++-
 vcl/source/app/salvtables.cxx |6 -
 vcl/source/app/unohelp2.cxx   |2 
 vcl/source/control/edit.cxx   |5 -
 vcl/source/edit/textview.cxx  |7 --
 vcl/source/gdi/graph.cxx  |2 
 vcl/source/gdi/pdfwriter_impl2.cxx|2 
 vcl/source/gdi/vectorgraphicdata.cxx  |3 
 vcl/source/graphic/UnoGraphicProvider.cxx |   12 +--
 vcl/unx/gtk3/a11y/gtk3atkutil.cxx |   68 --
 vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx |6 -
 vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx   |3 
 vcl/unx/gtk3/gtk3gtkdata.cxx  |1 
 vcl/unx/gtk3/gtk3gtkframe.cxx |2 
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx |4 -
 xmlhelp/source/treeview/tvfactory.cxx |3 
 18 files changed, 90 insertions(+), 106 deletions(-)

New commits:
commit 7b649f835cc00ed76927c6821a135605609bed4e
Author: Noel 
AuthorDate: Fri Feb 19 08:40:18 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 19 08:46:44 2021 +0100

loplugin:refcounting in vcl

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

diff --git a/vcl/inc/graphic/UnoGraphic.hxx b/vcl/inc/graphic/UnoGraphic.hxx
index 33f97df5b183..be2991eb6a5d 100644
--- a/vcl/inc/graphic/UnoGraphic.hxx
+++ b/vcl/inc/graphic/UnoGraphic.hxx
@@ -44,14 +44,12 @@ public:
 using ::unographic::GraphicDescriptor::init;
 void init(const ::Graphic& rGraphic);
 
-private:
-
 // XInterface
 virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & 
rType ) override;
 virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType ) override;
 virtual void SAL_CALL acquire() throw() override;
 virtual void SAL_CALL release() throw() override;
-
+private:
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
diff --git a/vcl/inc/graphic/UnoGraphicDescriptor.hxx 
b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
index ad46952ce925..db39c070deda 100644
--- a/vcl/inc/graphic/UnoGraphicDescriptor.hxx
+++ b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
@@ -74,8 +74,6 @@ public:
 void init( const OUString& rURL );
 void init( const css::uno::Reference< css::io::XInputStream >& rxIStm, 
const OUString& rURL );
 
-protected:
-
 static rtl::Reference<::comphelper::PropertySetInfo> 
createPropertySetInfo();
 
 // XInterface
@@ -84,6 +82,7 @@ protected:
 virtual void SAL_CALL acquire() throw() override;
 virtual void SAL_CALL release() throw() override;
 
+protected:
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 2f88ffe8b309..976412cfb6d5 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -58,6 +60,64 @@ public:
 sal_uLongm_nTimeoutMS;
 };
 
+class DocumentFocusListener :
+public ::cppu::WeakImplHelper< 
css::accessibility::XAccessibleEventListener >
+{
+
+o3tl::sorted_vector< css::uno::Reference< css::uno::XInterface > > 
m_aRefList;
+
+public:
+/// @throws lang::IndexOutOfBoundsException
+/// @throws uno::RuntimeException
+void attachRecursive(
+const css::uno::Reference< css::accessibility::XAccessible >& 
xAccessible
+);
+
+/// @throws lang::IndexOutOfBoundsException
+/// @throws uno::RuntimeException
+void attachRecursive(
+const css::uno::Reference< css::accessibility::XAccessible >& 
xAccessible,
+const css::uno::Reference< css::accessibility::XAccessibleContext >& 
xContext
+);
+
+/// @throws lang::IndexOutOfBoundsException
+/// @throws uno::RuntimeException
+void attachRecursive(
+const css::uno::Reference< css::accessibility::XAccessible >& 
xAccessible,
+const css::uno::Reference< css::accessibility::XAccessibleContext >& 
xContext,
+const css::uno::Reference< css::accessibility::XAccessibleStateSet >& 
xStateSet
+);
+
+/// @throws lang::IndexOutOfBoundsException
+/// @throws uno::RuntimeException
+void detachRecursive(
+const css::uno::Reference< css::accessibility::XAccessible >& 
xAccessible
+);
+
+/// @throws lang::IndexOutOfBoundsException
+/// @throws uno::RuntimeExcep

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

[Noel (via logerrit)]

 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |   27 ++---
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx|   22 ++---
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |   12 -
 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx   |   26 
 xmlscript/source/xmllib_imexp/xmllib_export.cxx|5 +--
 xmlscript/source/xmlmod_imexp/xmlmod_export.cxx|6 ++--
 6 files changed, 44 insertions(+), 54 deletions(-)

New commits:
commit 85e51d1fb5ed3019ef2409c8c8a7721148bb4178
Author: Noel 
AuthorDate: Fri Feb 19 08:38:41 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 19 08:46:06 2021 +0100

loplugin:refcounting in xmlscript

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

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 0646be0cc824..be5899fb72d9 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -87,7 +88,7 @@ void ElementDescriptor::readMultiPageModel( StyleBag * 
all_styles )
 uno::Reference< container::XNameContainer > xPagesContainer( _xProps, 
uno::UNO_QUERY );
 if ( xPagesContainer.is() && 
xPagesContainer->getElementNames().hasElements() )
 {
-ElementDescriptor * pElem = new ElementDescriptor( _xProps, 
_xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
+rtl::Reference pElem = new ElementDescriptor( 
_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
 pElem->readBullitinBoard( all_styles );
 addSubElement( pElem );
 }
@@ -115,14 +116,14 @@ void ElementDescriptor::readFrameModel( StyleBag * 
all_styles )
 
 if ( readProp( "Label" ) >>= aTitle)
 {
-ElementDescriptor * title = new ElementDescriptor( _xProps, 
_xPropState, XMLNS_DIALOGS_PREFIX ":title", _xDocument );
+rtl::Reference title = new ElementDescriptor( 
_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":title", _xDocument );
 title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle );
 addSubElement( title );
 }
 uno::Reference< container::XNameContainer > xControlContainer( _xProps, 
uno::UNO_QUERY );
 if ( xControlContainer.is() && 
xControlContainer->getElementNames().hasElements() )
 {
-ElementDescriptor * pElem = new ElementDescriptor( _xProps, 
_xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
+rtl::Reference pElem = new ElementDescriptor( 
_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
 pElem->readBullitinBoard( all_styles );
 addSubElement( pElem );
 }
@@ -152,7 +153,7 @@ void ElementDescriptor::readPageModel( StyleBag * 
all_styles )
 uno::Reference< container::XNameContainer > xControlContainer( _xProps, 
uno::UNO_QUERY );
 if ( xControlContainer.is() && 
xControlContainer->getElementNames().hasElements() )
 {
-ElementDescriptor * pElem = new ElementDescriptor( _xProps, 
_xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
+rtl::Reference pElem = new ElementDescriptor( 
_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
 pElem->readBullitinBoard( all_styles );
 addSubElement( pElem );
 }
@@ -312,11 +313,11 @@ void ElementDescriptor::readComboBoxModel( StyleBag * 
all_styles )
 Sequence< OUString > itemValues;
 if ((readProp( "StringItemList" ) >>= itemValues) &&  
itemValues.hasElements())
 {
-ElementDescriptor * popup = new ElementDescriptor( _xProps, 
_xPropState, XMLNS_DIALOGS_PREFIX ":menupopup", _xDocument );
+rtl::Reference popup = new ElementDescriptor( 
_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menupopup", _xDocument );
 
 for ( const auto& rItemValue : std::as_const(itemValues) )
 {
-ElementDescriptor * item = new ElementDescriptor( _xProps, 
_xPropState, XMLNS_DIALOGS_PREFIX ":menuitem", _xDocument );
+rtl::Reference item = new ElementDescriptor( 
_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menuitem", _xDocument );
 item->addAttribute( XMLNS_DIALOGS_PREFIX ":value", rItemValue );
 popup->addSubElement( item );
 }
@@ -359,11 +360,11 @@ void ElementDescriptor::readListBoxModel( StyleBag * 
all_styles )
 Sequence< OUString > itemValues;
 if ((readProp( "StringItemList" ) >>= itemValues) && 
itemValues.hasElements())
 {
-ElementDescriptor * popup = new ElementDescriptor( _xProps, 
_xPropState, XMLNS_DIALOGS_PREFIX ":menupopup", _xDocument );
+rtl::Reference popup = new ElementDescriptor( 
_xProps, _xProp

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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx |   41 
 vcl/source/pdf/PDFiumLibrary.cxx |   51 ++-
 2 files changed, 51 insertions(+), 41 deletions(-)

New commits:
commit efb093893ffe9aa6340bde72e12d0512200d2100
Author: Miklos Vajna 
AuthorDate: Thu Feb 18 20:49:54 2021 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 19 08:33:22 2021 +0100

pdfium: eliminate FPDF_DOCUMENT from public header

Which means the last pdfium include can go from PDFiumLibrary.hxx.

Change-Id: I73e40767f594c9a6ce75582621af975419ccf996
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/63
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 7bf14eb910dc..d65658769e84 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -10,15 +10,11 @@
 
 #pragma once
 
-#include 
+#include 
 
 #include 
 
-#if HAVE_FEATURE_PDFIUM
-
 #include 
-
-#include 
 #include 
 #include 
 #include 
@@ -39,8 +35,6 @@
 #include 
 #include 
 
-#include 
-
 class SvMemoryStream;
 
 namespace vcl::pdf
@@ -217,30 +211,21 @@ public:
 virtual css::util::DateTime getTime() = 0;
 };
 
-class VCL_DLLPUBLIC PDFiumDocument final
+class VCL_DLLPUBLIC PDFiumDocument
 {
-private:
-FPDF_DOCUMENT mpPdfDocument;
-
-private:
-PDFiumDocument(const PDFiumDocument&) = delete;
-PDFiumDocument& operator=(const PDFiumDocument&) = delete;
-
 public:
-PDFiumDocument(FPDF_DOCUMENT pPdfDocument);
-~PDFiumDocument();
-FPDF_DOCUMENT getPointer() { return mpPdfDocument; }
+virtual ~PDFiumDocument() = default;
 
 // Page size in points
-basegfx::B2DSize getPageSize(int nIndex);
-int getPageCount();
-int getSignatureCount();
-int getFileVersion();
-bool saveWithVersion(SvMemoryStream& rStream, int nFileVersion);
-
-std::unique_ptr openPage(int nIndex);
-std::unique_ptr getSignature(int nIndex);
-std::vector getTrailerEnds();
+virtual basegfx::B2DSize getPageSize(int nIndex) = 0;
+virtual int getPageCount() = 0;
+virtual int getSignatureCount() = 0;
+virtual int getFileVersion() = 0;
+virtual bool saveWithVersion(SvMemoryStream& rStream, int nFileVersion) = 
0;
+
+virtual std::unique_ptr openPage(int nIndex) = 0;
+virtual std::unique_ptr getSignature(int nIndex) = 0;
+virtual std::vector getTrailerEnds() = 0;
 };
 
 struct PDFiumLibrary final : public 
rtl::StaticWithInit, PDFiumLibrary>
@@ -254,6 +239,4 @@ VCL_DLLPUBLIC OUString convertPdfDateToISO8601(OUString 
const& rInput);
 
 } // namespace vcl::pdf
 
-#endif // HAVE_FEATURE_PDFIUM
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index fda247861913..232ed10cb9b6 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -12,9 +12,11 @@
 
 #if HAVE_FEATURE_PDFIUM
 
+#include 
+
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -367,6 +369,31 @@ public:
 
 bool hasLinks() override;
 };
+
+class PDFiumDocumentImpl : public PDFiumDocument
+{
+private:
+FPDF_DOCUMENT mpPdfDocument;
+
+private:
+PDFiumDocumentImpl(const PDFiumDocumentImpl&) = delete;
+PDFiumDocumentImpl& operator=(const PDFiumDocumentImpl&) = delete;
+
+public:
+PDFiumDocumentImpl(FPDF_DOCUMENT pPdfDocument);
+~PDFiumDocumentImpl() override;
+
+// Page size in points
+basegfx::B2DSize getPageSize(int nIndex) override;
+int getPageCount() override;
+int getSignatureCount() override;
+int getFileVersion() override;
+bool saveWithVersion(SvMemoryStream& rStream, int nFileVersion) override;
+
+std::unique_ptr openPage(int nIndex) override;
+std::unique_ptr getSignature(int nIndex) override;
+std::vector getTrailerEnds() override;
+};
 }
 
 OUString convertPdfDateToISO8601(OUString const& rInput)
@@ -476,7 +503,7 @@ std::unique_ptr PDFium::openDocument(const 
void* pData, int nSiz
 }
 else
 {
-pPDFiumDocument = std::make_unique(pDocument);
+pPDFiumDocument = std::make_unique(pDocument);
 }
 
 return pPDFiumDocument;
@@ -584,18 +611,18 @@ util::DateTime PDFiumSignatureImpl::getTime()
 return aRet;
 }
 
-PDFiumDocument::PDFiumDocument(FPDF_DOCUMENT pPdfDocument)
+PDFiumDocumentImpl::PDFiumDocumentImpl(FPDF_DOCUMENT pPdfDocument)
 : mpPdfDocument(pPdfDocument)
 {
 }
 
-PDFiumDocument::~PDFiumDocument()
+PDFiumDocumentImpl::~PDFiumDocumentImpl()
 {
 if (mpPdfDocument)
 FPDF_CloseDocument(mpPdfDocument);
 }
 
-std::unique_ptr PDFiumDocument::openPage(int nIndex)
+std::unique_ptr PDFiumDocumentImpl::openPage(int nIndex)
 {
 std::unique_ptr pPDFiumPage;
 FPDF_PAGE pPage = FPDF_LoadPage(mpPdfDocument, nIndex);
@@ -606,7 +633,7 @@ std::unique_ptr PDFiumDocument::openPage(int 
nIndex)
 return pPDFiumPa

Re: Local LO build on Raspberry pi 4b doesn't launch

[Stephan Bergmann]

On 18/02/2021 19:28, julien2412 wrote:

Is there anything I could test to provide more info?
I mean if there's some patch to add logs or anything, I can apply it and
provide the result.


I guess you'd need to actually debug into that callVirtualMethod.


Should I submit a bugtracker or Raspberry is too specific so it wouldn't
worth it?


Sorry, no idea here.

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

Patch: fix unpack-sources to not require GNU find

[Andrew Udvare]

Requesting review.

Patch submitted here a few months ago: 
https://gerrit.libreoffice.org/c/core/+/107936

The find that comes with macOS is BSD find and does not have -printf.

On macOS: $ man /usr/share/man/man1/find.1 | grep -F printf
(No results)

On Linux: $ man /usr/share/man/man1/find.1* | grep -F printf
   -delete, -exec, -execdir, -ok, -okdir, -fls, -fprint, -fprintf, -ls, 
-print and -printf.
  -printf with the %F directive to see the types of your 
filesystems.

Thanks

-- 
Andrew Udvare


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

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

[Noel (via logerrit)]

 xmloff/source/transform/ChartOASISTContext.cxx|2 
 xmloff/source/transform/ChartOOoTContext.cxx  |2 
 xmloff/source/transform/ChartPlotAreaOASISTContext.cxx|4 
 xmloff/source/transform/ChartPlotAreaOOoTContext.cxx  |2 
 xmloff/source/transform/ControlOASISTContext.cxx  |2 
 xmloff/source/transform/CreateElemTContext.cxx|2 
 xmloff/source/transform/DlgOASISTContext.cxx  |2 
 xmloff/source/transform/DocumentTContext.cxx  |2 
 xmloff/source/transform/EventOASISTContext.cxx|2 
 xmloff/source/transform/EventOOoTContext.cxx  |2 
 xmloff/source/transform/FormPropOASISTContext.cxx |2 
 xmloff/source/transform/FormPropOOoTContext.cxx   |2 
 xmloff/source/transform/FrameOOoTContext.cxx  |4 
 xmloff/source/transform/MergeElemTContext.cxx |2 
 xmloff/source/transform/MutableAttrList.cxx   |5 
 xmloff/source/transform/MutableAttrList.hxx   |3 
 xmloff/source/transform/NotesTContext.cxx |2 
 xmloff/source/transform/OOo2Oasis.cxx |6 
 xmloff/source/transform/Oasis2OOo.cxx |6 
 xmloff/source/transform/PersAttrListTContext.cxx  |2 
 xmloff/source/transform/ProcAddAttrTContext.cxx   |2 
 xmloff/source/transform/RenameElemTContext.cxx|2 
 xmloff/source/transform/StyleOASISTContext.cxx|4 
 xmloff/source/transform/StyleOOoTContext.cxx  |2 
 xmloff/source/transform/TransformerBase.cxx   |6 
 xmlsecurity/source/gpg/SecurityEnvironment.cxx|   12 -
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  |4 
 xmlsecurity/source/helper/xsecctl.cxx |   28 ++--
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   64 +++---
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |5 
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |4 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx   |   11 -
 32 files changed, 90 insertions(+), 110 deletions(-)

New commits:
commit 75894d5c6afd3f4d206b50c529d83db9c1f8232d
Author: Noel 
AuthorDate: Thu Feb 18 15:06:44 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 19 07:35:28 2021 +0100

loplugin:refcounting in xmloff

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

diff --git a/xmloff/source/transform/ChartOASISTContext.cxx 
b/xmloff/source/transform/ChartOASISTContext.cxx
index fbe2c70726da..314de40318d2 100644
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -50,7 +50,7 @@ void XMLChartOASISTransformerContext::StartElement(
 
 OUString aAddInName;
 Reference< XAttributeList > xAttrList( rAttrList );
-XMLMutableAttributeList *pMutableAttrList = nullptr;
+rtl::Reference pMutableAttrList;
 sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
 for( sal_Int16 i=0; i < nAttrCount; i++ )
 {
diff --git a/xmloff/source/transform/ChartOOoTContext.cxx 
b/xmloff/source/transform/ChartOOoTContext.cxx
index dcbd495031cd..781cb3764c8e 100644
--- a/xmloff/source/transform/ChartOOoTContext.cxx
+++ b/xmloff/source/transform/ChartOOoTContext.cxx
@@ -51,7 +51,7 @@ void XMLChartOOoTransformerContext::StartElement(
 sal_Int16 nClassName = -1;
 OUString aAddInName;
 Reference< XAttributeList > xAttrList( rAttrList );
-XMLMutableAttributeList *pMutableAttrList = nullptr;
+rtl::Reference pMutableAttrList;
 sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
 for( sal_Int16 i=0; i < nAttrCount; i++ )
 {
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx 
b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
index b14457047411..b8603f62fd59 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
@@ -95,7 +95,7 @@ void XMLAxisOASISContext::StartElement(
 const Reference< xml::sax::XAttributeList >& rAttrList )
 {
 Reference< xml::sax::XAttributeList > xAttrList( rAttrList );
-XMLMutableAttributeList *pMutableAttrList = nullptr;
+rtl::Reference pMutableAttrList;
 sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
 for( sal_Int16 i=0; i < nAttrCount; i++ )
 {
@@ -157,7 +157,7 @@ void XMLAxisOASISContext::EndElement()
 m_rCategoriesContext.is() )
 {
 OSL_ENSURE( GetAttrList().is(), "Invalid attribute list" );
-XMLMutableAttributeList * pMutableAttrList =
+rtl::Reference pMutableA

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

[Mike Kaganski (via logerrit)]

 drawinglayer/source/tools/wmfemfhelper.cxx |   34 +-
 svx/source/svdraw/svdopath.cxx |5 -
 svx/source/table/viewcontactoftableobj.cxx |4 
 svx/source/unodraw/unoshape.cxx|  142 +++--
 4 files changed, 69 insertions(+), 116 deletions(-)

New commits:
commit ce671c2275195f7545366ec9a11100c105ac366b
Author: Mike Kaganski 
AuthorDate: Fri Feb 19 08:46:10 2021 +0300
Commit: Mike Kaganski 
CommitDate: Fri Feb 19 07:27:34 2021 +0100

Some more unit conversion unification

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

diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx 
b/drawinglayer/source/tools/wmfemfhelper.cxx
index f5a171b9e204..f287e2a4e23c 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2523,34 +2524,15 @@ namespace wmfemfhelper
 }
 else
 {
-switch(rMapMode.GetMapUnit())
+const auto eFrom = 
MapToO3tlLength(rPropertyHolders.Current().getMapUnit()),
+   eTo = 
MapToO3tlLength(rMapMode.GetMapUnit());
+if (eFrom != o3tl::Length::invalid && eTo != 
o3tl::Length::invalid)
 {
-case MapUnit::Map100thMM :
-{
-if(MapUnit::MapTwip == 
rPropertyHolders.Current().getMapUnit())
-{
-// MapUnit::MapTwip -> MapUnit::Map100thMM
-const double fTwipTo100thMm(127.0 / 72.0);
-aMapping.scale(fTwipTo100thMm, 
fTwipTo100thMm);
-}
-break;
-}
-case MapUnit::MapTwip :
-{
-if(MapUnit::Map100thMM == 
rPropertyHolders.Current().getMapUnit())
-{
-// MapUnit::Map100thMM -> MapUnit::MapTwip
-const double f100thMmToTwip(72.0 / 127.0);
-aMapping.scale(f100thMmToTwip, 
f100thMmToTwip);
-}
-break;
-}
-default :
-{
-OSL_FAIL("implInterpretMetafile: 
MetaActionType::MAPMODE with unsupported MapUnit (!)");
-break;
-}
+const double fConvert(o3tl::convert(1.0, eFrom, 
eTo));
+aMapping.scale(fConvert, fConvert);
 }
+else
+OSL_FAIL("implInterpretMetafile: 
MetaActionType::MAPMODE with unsupported MapUnit (!)");
 
 aMapping = getTransformFromMapMode(rMapMode) * 
aMapping;
 
rPropertyHolders.Current().setMapUnit(rMapMode.GetMapUnit());
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index aea01d2d279d..c3b1995e2b16 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -2935,8 +2936,8 @@ void SdrPathObj::TRSetBaseGeometry(const 
basegfx::B2DHomMatrix& rMatrix, const b
 // is no length but only a factor here. Convert back.
 if (getSdrModelFromSdrObject().IsWriter())
 {
-aScale.setX(aScale.getX() * 127.0 / 72.0);
-aScale.setY(aScale.getY() * 127.0 / 72.0);
+aScale.setX(o3tl::convert(aScale.getX(), o3tl::Length::twip, 
o3tl::Length::mm100));
+aScale.setY(o3tl::convert(aScale.getY(), o3tl::Length::twip, 
o3tl::Length::mm100));
 }
 fScaleX *= fabs(aScale.getX());
 fScaleY *= fabs(aScale.getY());
diff --git a/svx/source/table/viewcontactoftableobj.cxx 
b/svx/source/table/viewcontactoftableobj.cxx
index 56f68c0f7781..967bfe820738 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include "tablelayouter.hxx"
@@ -186,7 +187,8 @@ namespace sdr::contact
 aLine.SetMirrorWidths( );
 }
 
-const double fTwipsToMM(127.0 / 72.0);
+constexpr double fTwipsToMM(
+

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

[Quentin DELAGE (via logerrit)]

 include/oox/drawingml/shapegroupcontext.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 409a9dbc04c4b98a3f9ca81618906b16937ff2f0
Author: Quentin DELAGE 
AuthorDate: Thu Feb 18 20:39:52 2021 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Fri Feb 19 06:50:32 2021 +0100

tdf#124176 Use pragma once in include/oox/drawingml

Change-Id: Ifcf41582cd305293a701707618ff0f4b7d6322ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/62
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Ilmari Lauhakangas 

diff --git a/include/oox/drawingml/shapegroupcontext.hxx 
b/include/oox/drawingml/shapegroupcontext.hxx
index 3e458927d9d5..d9dfcbfa56dc 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
-#define INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#pragma once
 
 #include 
 #include 
@@ -43,6 +42,4 @@ protected:
 
 }
 
-#endif // INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/uicalc/uicalc.cxx |   48 +++
 1 file changed, 48 insertions(+)

New commits:
commit 3a1e3bd2bb71d084233dfb791c1d0c3dd81b43e5
Author: Xisco Fauli 
AuthorDate: Thu Feb 18 22:43:07 2021 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 19 00:22:15 2021 +0100

tdf#117706: sc_uicalc: Add unittest

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

diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index af82c872a183..0a719ee29bb2 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -429,6 +429,54 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf120660)
 pMod->SetInputOptions(aInputOption);
 }
 
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf117706)
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+ScModelObj* pModelObj = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+insertStringToCell(*pModelObj, "A1", "A1");
+insertStringToCell(*pModelObj, "A3", "A3");
+
+// Use Adding Selection
+dispatchCommand(mxComponent, ".uno:StatusSelectionModeExp", {});
+Scheduler::ProcessEventsToIdle();
+
+goToCell("A1");
+dispatchCommand(mxComponent, ".uno:SelectRow", {});
+Scheduler::ProcessEventsToIdle();
+
+dispatchCommand(mxComponent, ".uno:GoDown", {});
+dispatchCommand(mxComponent, ".uno:GoDown", {});
+lcl_AssertCurrentCursorPosition(0, 2);
+
+dispatchCommand(mxComponent, ".uno:SelectRow", {});
+Scheduler::ProcessEventsToIdle();
+
+// FIXME: The rows are not copied/pasted if using CopyToClip/PasteToClip
+dispatchCommand(mxComponent, ".uno:Copy", {});
+
+mxComponent->dispose();
+
+// Open a new document
+mxComponent = loadFromDesktop("private:factory/scalc");
+pModelObj = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+dispatchCommand(mxComponent, ".uno:Paste", {});
+
+// Without the fix in place, this test would have failed with
+// - Expected: A1
+// - Actual  : A3
+CPPUNIT_ASSERT_EQUAL(OUString("A1"), pDoc->GetString(ScAddress(0, 0, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("A3"), pDoc->GetString(ScAddress(0, 1, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 2, 0)));
+}
+
 CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf131442)
 {
 mxComponent = loadFromDesktop("private:factory/scalc");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos (via logerrit)]

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

New commits:
commit dbc13b94f67ce1017577e11af53b0c13daba180e
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Feb 18 16:50:23 2021 -0600
Commit: Gerrit Code Review 
CommitDate: Thu Feb 18 23:50:23 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1f290dca1dedb503935ef2ee627b00bbb8eb37be
  - Another random typo grab bag

Change-Id: Ib548ab7e25600fc693d7a9d6319104f431eb8e8e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/67
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 99f8092e8b69..1f290dca1ded 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 99f8092e8b6949c519b8f03c1134b7d3e0282ef7
+Subproject commit 1f290dca1dedb503935ef2ee627b00bbb8eb37be
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos (via logerrit)]

 source/text/sbasic/python/main.xhp   |2 +-
 source/text/sbasic/python/python_2_basic.xhp |2 +-
 source/text/sbasic/shared/0003.xhp   |2 +-
 source/text/sbasic/shared/03/sf_session.xhp  |4 ++--
 source/text/shared/00/0406.xhp   |2 +-
 source/text/shared/guide/convertfilters.xhp  |2 +-
 source/text/swriter/00/stylesmenu.xhp|2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 1f290dca1dedb503935ef2ee627b00bbb8eb37be
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Feb 18 16:47:48 2021 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Feb 18 23:50:23 2021 +0100

Another random typo grab bag

Change-Id: Ib548ab7e25600fc693d7a9d6319104f431eb8e8e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/67
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sbasic/python/main.xhp 
b/source/text/sbasic/python/main.xhp
index c3b3dfde8..f90781ba0 100644
--- a/source/text/sbasic/python/main.xhp
+++ b/source/text/sbasic/python/main.xhp
@@ -30,7 +30,7 @@
 You can execute Python scripts 
choosing Tools - Macros - Run Macro. Editing scripts can 
be done with your preferred text editor. Python scripts are present in various 
locations detailed hereafter. You can refer to Programming examples for macros 
illustrating how to run the Python interactive console from 
%PRODUCTNAME.
 
 
-The %PRODUCTNAME scripting 
framework for Python is optional on some GNU/Linux distributions. If it is 
installed, selecting Tools - Macros - Run Macro... and 
checking %PRODUCTNAME Macros for the presence of 
HelloWorld – HelloWorldPython macro is sufficient. If 
absent, please refer to your distribution documentation in order to install the 
%PRODUCTNAME scripting framework for Python.
+The %PRODUCTNAME scripting 
framework for Python is optional on some GNU/Linux distributions. If it is 
installed, selecting Tools - Macros - Run Macro and 
checking %PRODUCTNAME Macros for the presence of 
HelloWorld – HelloWorldPython macro is sufficient. If 
absent, please refer to your distribution documentation in order to install the 
%PRODUCTNAME scripting framework for Python.
 
 
 
diff --git a/source/text/sbasic/python/python_2_basic.xhp 
b/source/text/sbasic/python/python_2_basic.xhp
index 5cd5308c0..f3295d788 100644
--- a/source/text/sbasic/python/python_2_basic.xhp
+++ b/source/text/sbasic/python/python_2_basic.xhp
@@ -27,7 +27,7 @@
   Xray calls interrupting Python script execution 
to help inspect variables.
  
  
- The %PRODUCTNAME 
Application Programming Interface (API) Scripting Framework supports 
inter-language script execution between Python and Basic, or other supported 
programming languages for that matter. Arguments can be passed back and fourth 
across calls, provided that they represent primitive data types that both 
languages recognize, and assuming that the Scripting Framework converts them 
appropriately.
+The %PRODUCTNAME 
Application Programming Interface (API) Scripting Framework supports 
inter-language script execution between Python and Basic, or other supported 
programming languages for that matter. Arguments can be passed back and forth 
across calls, provided that they represent primitive data types that both 
languages recognize, and assuming that the Scripting Framework converts them 
appropriately.
  
  It is recommended to have knowledge of Python 
standard modules and %PRODUCTNAME API features prior to perform inter-language 
calls from Python to Basic, JavaScript or any other script engine.
   
diff --git a/source/text/sbasic/shared/0003.xhp 
b/source/text/sbasic/shared/0003.xhp
index ea06d3aab..0a58a725e 100644
--- a/source/text/sbasic/shared/0003.xhp
+++ b/source/text/sbasic/shared/0003.xhp
@@ -180,7 +180,7 @@
 
 
 
-Open Tools - Macros - Organize 
dialogs... and select %PRODUCTNAME Dialogs 
container.
+Open Tools - Macros - Organize 
Dialogs and select %PRODUCTNAME Dialogs 
container.
 
 
 Open Tools - Macros - %PRODUCTNAME Basic 
- Edit  and select %PRODUCTNAME Macros 
container.
diff --git a/source/text/sbasic/shared/03/sf_session.xhp 
b/source/text/sbasic/shared/03/sf_session.xhp
index e9a32de58..6422612ca 100644
--- a/source/text/sbasic/shared/03/sf_session.xhp
+++ b/source/text/sbasic/shared/03/sf_session.xhp
@@ -24,7 +24,7 @@
 
 ScriptForge.Session 
service
 
-  The 
Session service gathers various general purpose methods 
about:
+  The 
Session service gathers various general-purpose methods 
about:
   
  
 the installation or execution environment
@@ -59,7 +59,7 @@
  Value
   
   
- Where to find the library ?
+ Where to find the library?
  
   
  Applicable
diff --git a/source/text/shared/00/0406.xhp 

[Libreoffice-commits] core.git: officecfg/registry

[Seth Chaiklin (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 
+++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 37157772a1888cd0c227ded2311afd0abe6d02ef
Author: Seth Chaiklin 
AuthorDate: Mon Feb 15 09:23:12 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Feb 18 23:29:08 2021 +0100

tdf#134432  icon label to "Character Highlighting Color" for Shapes

WriterCommands.xcu has .uno:BackColor for character highlighting
in text, while GenericCommands.xcu has .uno:CharBackColor, which
is used for all character highlighting in textboxes and shapes,
in all the modules including Writer, but this .uno appears on
the Text Objects toolbar for Writer and Text Formatting bar for
Calc, Draw, and Impress.

Both .unos produce 

http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#property-fo_background-color

.unoCharBackColor appears only in Calc, Draw, Impress, while
Writer has both .uno:CharBackColor and .uno:BackColor

Adding "Character Highlighting Color" for tooltip and menu labels
to .uno:CharBackColor for Calc, Draw, and Impress, togheter with a
longer label "(in Textbox and Shape)" that appears only in the
"Description" box in the Customize dialog. This longer label should
not create confusion for the other modules,which only have
.uno:CharBackColor but will help to  differentiate the function of
.uno:CharBackColor from .uno:BackColor in Customize for Writer.

Change-Id: Ia88b51ee73d0c9ccc82700ed39bc01486ff3a8a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110865
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 508238ccbaf4..756bdd288b91 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3302,7 +3302,13 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Highlight Color
+  Character Highlighting Color (in Text Box 
and Shapes)
+
+
+  Character Highlighting Color
+
+
+  Character Highlighting Color
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Local LO build on Raspberry pi 4b doesn't launch

[julien2412]

Thank you again Stephan for your feedback.

Is there anything I could test to provide more info?
I mean if there's some patch to add logs or anything, I can apply it and
provide the result.

Should I submit a bugtracker or Raspberry is too specific so it wouldn't
worth it?



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

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

[Seth Chaiklin (via logerrit)]

 sw/uiconfig/swriter/ui/conditionpage.ui |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit be28e10f6fd758b5f811900468b7d3791025485d
Author: Seth Chaiklin 
AuthorDate: Wed Feb 17 15:32:20 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Feb 18 23:26:34 2021 +0100

tdf#139667 adjust Condition tab dialog for Text Body to "list"

  - This dialog referred to "Numbering", but better to refer to "List"
  because the level can also apply to bullets and graphics.
  - adjusted tooltip accordingly.

Change-Id: I5256be054f44058f4473a85f3053bfd4c755
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111041
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/ui/conditionpage.ui 
b/sw/uiconfig/swriter/ui/conditionpage.ui
index 5dacdebe1e26..fd825ab25dc6 100644
--- a/sw/uiconfig/swriter/ui/conditionpage.ui
+++ b/sw/uiconfig/swriter/ui/conditionpage.ui
@@ -96,7 +96,7 @@
 
 
   
-Here you can see 
the %PRODUCTNAME predefined contexts, including outline levels 1 to 10, 
numbering/bullets levels 1 to 10, table header, table contents, section, 
border, footnote, header and footer.
+Here you can see 
the %PRODUCTNAME predefined contexts, including outline levels 1 to 10, list 
levels 1 to 10, table header, table contents, section, border, footnote, header 
and footer.
   
 
   
@@ -240,16 +240,16 @@

8th Outline Level

9th Outline Level
   10th Outline Level
-   
1st Numbering Level
-   
2nd Numbering Level
-   
3rd Numbering Level
-   
4th Numbering Level
-   
5th Numbering Level
-   
6th Numbering Level
-   
7th Numbering Level
-   
8th Numbering Level
-   
9th Numbering Level
-  10th Numbering Level
+   
1st List Level
+   
2nd List Level
+   
3rd List Level
+   
4th List Level
+   
5th List Level
+   
6th List Level
+   
7th List Level
+   
8th List Level
+   
9th List Level
+  10th List Level
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 1e0bd648db025236bfaa33aec8b1aab407e414a4
Author: Seth Chaiklin 
AuthorDate: Thu Feb 18 23:25:53 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 18 23:25:53 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 99f8092e8b6949c519b8f03c1134b7d3e0282ef7
  - tdf#139667 update "numbering style" in footnote/endnote / linenumbering

  ( swriter/01/06080100.xhp ) "footnote settings"
   * move 1,2,3 to first in list of numbering schemes
 (to correspond with dialog box)
   * combine paragraphs about styles
   * replace German id
   - remove "colspan = , rowspan=
   * move position of "Start at" to correspond to dialog box
   - remove "Character Style" heading, which is no longer
 in dialog box.
   + add sys-switch for F11 shortcut key
   * update to 

  ( swriter/01/06080200.xhp ) "endnote settings"
   * update replaced German id
   - remove "Character Style" heading, which is no longer
 in dialog box.
   * update to 

  ( swriter/01/0618.xhp ) "line numbering"
* "numbering style" -> "numbering scheme"
* update to 

   ( swriter/01/05040700.xhp )  "footnotes/endnotes"
* "numbering style" -> "numbering scheme"
* update to ,

Change-Id: I563b3c20aabe94edfec76fae22a2585483492520
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111035
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 6a461bd0ac2c..99f8092e8b69 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6a461bd0ac2ccb8b385f24d0698d29cad49084b7
+Subproject commit 99f8092e8b6949c519b8f03c1134b7d3e0282ef7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/05040700.xhp |   15 ++---
 source/text/swriter/01/06080100.xhp |  100 
 source/text/swriter/01/06080200.xhp |   29 --
 source/text/swriter/01/0618.xhp |   42 +++
 4 files changed, 85 insertions(+), 101 deletions(-)

New commits:
commit 99f8092e8b6949c519b8f03c1134b7d3e0282ef7
Author: Seth Chaiklin 
AuthorDate: Wed Feb 17 11:20:46 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Feb 18 23:25:53 2021 +0100

tdf#139667 update "numbering style" in footnote/endnote / linenumbering

  ( swriter/01/06080100.xhp ) "footnote settings"
   * move 1,2,3 to first in list of numbering schemes
 (to correspond with dialog box)
   * combine paragraphs about styles
   * replace German id
   - remove "colspan = , rowspan=
   * move position of "Start at" to correspond to dialog box
   - remove "Character Style" heading, which is no longer
 in dialog box.
   + add sys-switch for F11 shortcut key
   * update to 

  ( swriter/01/06080200.xhp ) "endnote settings"
   * update replaced German id
   - remove "Character Style" heading, which is no longer
 in dialog box.
   * update to 

  ( swriter/01/0618.xhp ) "line numbering"
* "numbering style" -> "numbering scheme"
* update to 

   ( swriter/01/05040700.xhp )  "footnotes/endnotes"
* "numbering style" -> "numbering scheme"
* update to ,

Change-Id: I563b3c20aabe94edfec76fae22a2585483492520
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111035
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/01/05040700.xhp 
b/source/text/swriter/01/05040700.xhp
index e0205d08f..66f62ebc1 100644
--- a/source/text/swriter/01/05040700.xhp
+++ b/source/text/swriter/01/05040700.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
 
 
 
@@ -33,80 +30,80 @@
 
 
 
-Footnote 
Settings
+Footnote 
Settings
 Specifies the formatting for 
footnotes.
 
 
   
 
-To set additional 
option for footnotes, choose Format - Page Style, and then 
click the Footnote tab.
-AutoNumbering
+To set additional option for 
footnotes, choose Format - Page Style, and then click the 
Footnote tab.
+AutoNumbering
 
-
-Numbering
-Select the numbering style 
that you want to use.
+
+Numbering
+Select the numbering scheme 
that you want to use.
 
 
-
+
 Selection
 
-
+
 Description
 
 
 
-
+
+1, 2, 
3
+
+
+Arabic 
numerals
+
+
+
+
 A, B, 
C
 
-
+
 Uppercase
 
 
 
-
+
 a, b, 
c
 
-
+
 Lowercase
 
 
 
-
+
 I, II, 
III
 
-
+
 Roman numerals 
(upper case)
 
 
 
-
+
 i, ii, 
iii
 
-
+
 Roman numerals 
(lower case)
 
 
 
-
-1, 2, 
3
-
-
-Arabic 
numerals
-
-
-
-
+
 A,... AA,... 
AAA,...
 
-
+
 Alphabetical 
numbering with uppercase letters. After the first 26 entries, the numbering 
restarts at "AA".
 
 
 
-
+
 a,... aa,... 
aaa,...
 
-
+
 Alphabetical 
numbering with lowercase letters. After the first 26 entries, the numbering 
restarts at "aa".
 
 
@@ -114,7 +111,7 @@
 
 
 
-Counting
+Counting
 Select the numbering option 
for the footnotes.
 
 
@@ -150,47 +147,44 @@
 
 
 
-
-
-Start 
at
-Enter the number for the first 
footnote in the document. This option is only available if you selected "Per 
Document" in the Counting box.
 
-Before
+Before
 Enter the text that you want to 
display in front of the footnote number in the note text. For example, 
type "To " to display "To 1".
 
-After
+After
 Enter the text that you want to 
display after the footnote number in the note text. For example, type 
")" to display "1)".
-Footnote numbers 
are left aligned by default in the footnote area. For right aligned footnote 
numbers first edit the paragraph style Footnote. Press F11 to open Styles dialog and select 
Footnote from the list of paragraph styles. Open the local menu 
with right click and choose Modify. Go to the Indents & 
Spacing tab page and set indent to 0 before and after the paragraph, 
including the first line. On Tabs tab page create a tab of right 
type at 12pt and a tab of left type at 14pt. Then in Footnotes/Endnotes 
Settings dialog enter \t into the 
Before and After edit boxes.
-Position
+Footnote numbers are left aligned 
by default in the footnote area. For right aligned footnote numbers first edit 
the paragraph style Footnote. Press Command+TF11
 to open Styles dialog and select Footnote from the 
list of paragraph styles. Open the local menu with right click and choose 
Modify. Go to the Indents & Spacing tab page and 
set indent to 0 before and after the paragraph, including the first line. On 
Tabs tab page create a tab of right type at 12pt and a tab of left 
type at 14pt. Then in Footnotes/Endnotes Settings dialog enter 
\t into the Before and 
After edit boxes.
+
+Start at
+Enter the number for the first 
footnote in the document. This option is only available if you selected "Per 
Document" in the Counting box.
+Position
 
-End of 
p

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

[Seth Chaiklin (via logerrit)]

 sw/uiconfig/swriter/ui/bulletsandnumbering.ui |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 77663f16bb5951e7ca96975c06235bf3eb7385f5
Author: Seth Chaiklin 
AuthorDate: Sat Feb 13 10:44:35 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Feb 18 23:25:02 2021 +0100

tdf#139667 Bullet and Numbering tooltips, use verbs and add missing one

Change-Id: Id5439fb3820db94c08d9902c859da199127fd339
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110791
Reviewed-by: Heiko Tietze 
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui 
b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index 088c2cb4bafa..859afd0f36e8 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -160,6 +160,7 @@
 True
 False
 Unordered
+Select a bullet type for an unordered 
list.
   
   
 False
@@ -207,7 +208,7 @@
 True
 False
 Ordered
-Ordered numbering schemes
+Select a numbering scheme for an 
ordered list.
   
   
 1
@@ -256,7 +257,7 @@
 True
 False
 Outline
-Hierarchical numbering 
schemes
+Select an outline format for an 
ordered list.
   
   
 2
@@ -305,7 +306,7 @@
 True
 False
 Image
-Graphic bullet symbols
+Select a graphic bullet symbol for an 
unordered list.
   
   
 3
@@ -354,7 +355,7 @@
 True
 False
 Position
-Indent, spacing, and alignment options 
for ordered and unordered lists
+Modify indent, spacing, and alignment 
options for ordered and unordered lists.
   
   
 4
@@ -403,7 +404,7 @@
 True
 False
 Customize
-Design your own bullet or numbering 
scheme
+Design your own bullet or numbering 
scheme.
   
   
 5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Seth Chaiklin (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   48 
+-
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 7c08c1d920268c389f784218417ab4554d2781bf
Author: Seth Chaiklin 
AuthorDate: Sat Feb 6 00:25:23 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Feb 18 23:24:07 2021 +0100

tdf#139667 adjust tooltips and labels for diverse List Styles

Change-Id: I10d9ba5d5f7278cc89db84125e59b0e58eb0e980
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110447
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 1d1204391755..9c6266fa3a0a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3571,15 +3571,15 @@
   
   
 
-  Alphabet Uppercase List
+  Numbering ABC List Style
 
   
   
 
-  Alphabet Uppercase List
+  Numbering ABC List Style
 
 
-  Alphabet Uppercase List Style
+  Numbering ABC List Style
 
 
   .uno:StyleApply?Style:string=Numbering 
ABC&FamilyName:string=NumberingStyles
@@ -3590,15 +3590,15 @@
   
   
 
-  Alphabet Lowercase List
+  Numbering abc List Style
 
   
   
 
-  Alphabet Lowercase List
+  Numbering abc List Style
 
 
-  Alphabet Lowercase List Style
+  Numbering abc List Style
 
 
   .uno:StyleApply?Style:string=Numbering 
abc&FamilyName:string=NumberingStyles
@@ -3609,15 +3609,15 @@
   
   
 
-  Roman Uppercase List
+  Numbering IVX List Style
 
   
   
 
-  Roman Uppercase List
+  Numbering IVX List Style
 
 
-  Roman Uppercase List Style
+  Numbering IVX List Style
 
 
   .uno:StyleApply?Style:string=Numbering 
IVX&FamilyName:string=NumberingStyles
@@ -3626,9 +3626,23 @@
   11
 
   
+  
+
+  Numbering ivx List Style
+
+
+  Numbering ivx List Style
+
+
+  .uno:StyleApply?Style:string=Numbering 
ivx&FamilyName:string=NumberingStyles
+
+
+  11
+
+  
   
 
-  Roman Lowercase List
+  Numbering ivx List Style
 
   
   
@@ -3671,20 +3685,6 @@
   Box List Yellow
 
   
-  
-
-  Roman Lowercase List
-
-
-  Roman Lowercase List Style
-
-
-  .uno:StyleApply?Style:string=Numbering 
ivx&FamilyName:string=NumberingStyles
-
-
-  11
-
-  
   
 
   Paragraph Style
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 cui/uiconfig/ui/acorexceptpage.ui |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 37bed869d9bd6cf81d39634c901f68798c3c20a6
Author: Seth Chaiklin 
AuthorDate: Thu Feb 11 17:01:23 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Feb 18 23:17:15 2021 +0100

extended tooltip corrections in AutoCorrect Exceptions dialog

The Exceptions dialog tab got its extended tooltips automatically from
the help pages. Two of them (Autoinclude) inherited a missing space in
the tooltip. "Words with TWo INitial CApitals or sMALL iNITIAL" did not
have an updated version of the help that included "small initial".

Also, the inherited "extended tooltip" was for both "Autoinclude"
items, and was missing a critical piece of information. See tdf#140366 and
https://gerrit.libreoffice.org/c/help/+/110782 for details.

The patch corrects the extended tooltips so that they are
appropriate for each autoinclude.  Plus it adds a tooltip for
each autoinclude.

Also, changed the accelerator key for Autoinclude so that it did not
clash with the accelerator for the "language" option.

Change-Id: I893577c2da6da85cdd25465d6e0463dab185fe3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110773
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/cui/uiconfig/ui/acorexceptpage.ui 
b/cui/uiconfig/ui/acorexceptpage.ui
index 9d7a00ee195f..faf4449c953f 100644
--- a/cui/uiconfig/ui/acorexceptpage.ui
+++ b/cui/uiconfig/ui/acorexceptpage.ui
@@ -64,15 +64,16 @@
 
 
   
-_AutoInclude
+Auto_Include
 True
 True
 False
 True
 True
+Automatically add to the exception list if 
autocorrection is immediately undone.
 
   
-Automatically adds 
abbreviations or words that start with two capital letters to the corresponding 
list of exceptions. This feature only works if the Correct TWo INitial CApitals 
option or the Capitalize first letter of every sentence option are selected in 
the [T] column onOptions tab of this dialog.
+Adds 
autocorrected abbreviations to the list of exceptions, if the autocorrection is 
immediately undone. This feature is only effective when Capitalize first letter 
of every sentence option is selected in the [T] column on the Options tab of 
this dialog.
   
 
   
@@ -244,7 +245,7 @@
 True
 
   
-Type the word 
or abbreviation that starts with two capital letters that you do not want 
%PRODUCTNAME to change to one initial capital. For example, enter PC to prevent 
%PRODUCTNAME from changing PC to Pc.
+Type the word 
or abbreviation that starts with two capital letters or a small initial that 
you do not want %PRODUCTNAME to change to one initial capital. For example, 
enter PC to prevent %PRODUCTNAME from changing PC to Pc, or enter eBook to 
prevent a change to Ebook.
   
 
   
@@ -261,9 +262,10 @@
 False
 True
 True
+Automatically add to the exception list if 
autocorrection is immediately undone.
 
   
-Automatically adds 
abbreviations or words that start with two capital letters to the corresponding 
list of exceptions. This feature only works if the Correct TWo INitial CApitals 
option or the Capitalize first letter of every sentence option are selected in 
the [T] column onOptions tab of this dialog.
+Adds 
autocorrected words that start with two capital letters to the list of 
exceptions, if the autocorrection is immediately undone. This feature is only 
effective if the Correct TWo INitial CApitals option is selected in the [T] 
column on the Options tab of this dialog.
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Caolán McNamara (via logerrit)]

 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16ba07b59d417444d73e4dd70535d7379b34df31
Author: Caolán McNamara 
AuthorDate: Thu Feb 18 20:08:58 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 18 22:20:38 2021 +0100

Library_gie no longer exists

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

diff --git a/Makefile.in b/Makefile.in
index 860240a8aa51..ac3334d6f9c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -481,7 +481,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
-fuzzers: StaticLibrary_dtoa StaticLibrary_zlib Library_sal Library_salhelper 
Library_reg Library_store Library_unoidl codemaker Library_cppu 
Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu 
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools 
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng 
Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp 
Library_ucbhelper Rdb_services udkapi offapi Library_gie Library_icg 
Library_reflection Library_invocadapt Library_bootstrap Library_introspection 
Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native 
more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs 
StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw 
StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math Library_forui 
Library_binaryurp Library_io Library_invocation Library_namingservice 
Library_proxyfac Library_uuresolver Module_ure Library_wpftwr
 iter Executable_pptfuzzer Executable_cgmfuzzer Executable_ww2fuzzer 
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer 
Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer 
Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer 
Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer 
Executable_xlsxfuzzer Executable_pptxfuzzer Executable_htmlfuzzer 
Executable_rtffuzzer Executable_mmlfuzzer Executable_mtpfuzzer 
Executable_olefuzzer Executable_lwpfuzzer Executable_hwpfuzzer 
Executable_wmffuzzer Executable_dxffuzzer Executable_sftfuzzer 
Executable_svmfuzzer Executable_tiffuzzer Executable_epsfuzzer 
Executable_jpgfuzzer Executable_metfuzzer Executable_bmpfuzzer 
Executable_giffuzzer Executable_pngfuzzer Executable_602fuzzer 
Executable_tgafuzzer Executable_pcxfuzzer Executable_psdfuzzer 
Executable_ppmfuzzer Executable_pcdfuzzer Executable_rasfuzzer 
Executable_pctfuzzer Executable_xpmfuzzer Executable_xbmfuzzer
+fuzzers: StaticLibrary_dtoa StaticLibrary_zlib Library_sal Library_salhelper 
Library_reg Library_store Library_unoidl codemaker Library_cppu 
Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu 
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools 
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng 
Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp 
Library_ucbhelper Rdb_services udkapi offapi Library_icg Library_reflection 
Library_invocadapt Library_bootstrap Library_introspection Library_stocservices 
Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts 
StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core 
StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer 
StaticLibrary_fuzzer_math Library_forui Library_binaryurp Library_io 
Library_invocation Library_namingservice Library_proxyfac Library_uuresolver 
Module_ure Library_wpftwriter Executa
 ble_pptfuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer 
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer 
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer 
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer 
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer 
Executable_pptxfuzzer Executable_htmlfuzzer Executable_rtffuzzer 
Executable_mmlfuzzer Executable_mtpfuzzer Executable_olefuzzer 
Executable_lwpfuzzer Executable_hwpfuzzer Executable_wmffuzzer 
Executable_dxffuzzer Executable_sftfuzzer Executable_svmfuzzer 
Executable_tiffuzzer Executable_epsfuzzer Executable_jpgfuzzer 
Executable_metfuzzer Executable_bmpfuzzer Executable_giffuzzer 
Executable_pngfuzzer Executable_602fuzzer Executable_tgafuzzer 
Executable_pcxfuzzer Executable_psdfuzzer Executable_ppmfuzzer 
Executable_pcdfuzzer Executable_rasfuzzer Executable_pctfuzzer 
Executable_xpmfuzzer Executable_xbmfuzzer
 
 endif # MAKE_RESTARTS
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svtools/brwbox.hxx  |1 +
 include/svtools/editbrowsebox.hxx   |   10 ++
 svtools/source/brwbox/brwbox2.cxx   |4 
 svtools/source/brwbox/ebbcontrols.cxx   |   20 
 svtools/source/brwbox/editbrowsebox.cxx |   11 +--
 5 files changed, 40 insertions(+), 6 deletions(-)

New commits:
commit 422a8c3218b484817a8723b57fe9845d6abb83f4
Author: Caolán McNamara 
AuthorDate: Thu Feb 18 17:22:31 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 18 21:24:43 2021 +0100

update DataBrowser has-focus when child widget loses focus

similar to tdf#135641 case, focus-out becomes an issue with
the bibliography editor if focus-in is seen on clicking in a cell,
then click in a GtkEntry and tab around in a circle. Without this
lose-focus support focus will be grabbed back to the cell of the
initial click on a circuit of the focus-cycle

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

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 8e7b3fc6f4dc..948650015e19 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -588,6 +588,7 @@ public:
 tools::Rectangle   GetControlArea() const;
 virtual boolProcessKey(const KeyEvent& rEvt);
 virtual voidChildFocusIn();
+virtual voidChildFocusOut();
 voidDispatch( sal_uInt16 nId );
 voidSetMode( BrowserMode nMode );
 BrowserMode GetMode( ) const { return m_nCurrentMode; }
diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 34696522bd78..6ff261e2e254 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -174,6 +174,7 @@ namespace svt
 protected:
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
 DECL_LINK(FocusInHdl, weld::Widget&, void);
+DECL_LINK(FocusOutHdl, weld::Widget&, void);
 };
 
 class SVT_DLLPUBLIC EditControlBase : public ControlBase
@@ -191,6 +192,7 @@ namespace svt
 weld::Entry& get_widget() { return *m_pEntry; }
 
 virtual void connect_changed(const Link& rLink) = 
0;
+virtual void connect_focus_out(const Link& rLink) 
= 0;
 
 protected:
 void InitEditControlBase(weld::Entry* pEntry);
@@ -211,6 +213,11 @@ namespace svt
 m_xWidget->connect_changed(rLink);
 }
 
+virtual void connect_focus_out(const Link& rLink) 
override
+{
+m_xWidget->connect_focus_out(rLink);
+}
+
 protected:
 std::unique_ptr m_xWidget;
 };
@@ -696,6 +703,7 @@ namespace svt
 virtual void dispose() override;
 
 virtual void connect_changed(const Link& rLink) 
override;
+virtual void connect_focus_out(const Link& rLink) 
override;
 
 weld::EntryFormatter& get_formatter();
 
@@ -762,6 +770,7 @@ namespace svt
 weld::PatternFormatter& get_formatter() { return *m_xEntryFormatter; }
 
 virtual void connect_changed(const Link& rLink) 
override;
+virtual void connect_focus_out(const Link& rLink) 
override;
 
 virtual void dispose() override;
 private:
@@ -995,6 +1004,7 @@ namespace svt
 virtual bool ProcessKey(const KeyEvent& rEvt) override;
 
 virtual void ChildFocusIn() override;
+virtual void ChildFocusOut() override;
 
 css::uno::Reference< css::accessibility::XAccessible > 
CreateAccessibleCheckBoxCell(sal_Int32 _nRow, sal_uInt16 _nColumnPos,const 
TriState& eState);
 bool ControlHasFocus() const;
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 3ad89e4a4bbc..e52421f9cdcd 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1690,6 +1690,10 @@ void BrowseBox::ChildFocusIn()
 {
 }
 
+void BrowseBox::ChildFocusOut()
+{
+}
+
 void BrowseBox::Dispatch( sal_uInt16 nId )
 {
 
diff --git a/svtools/source/brwbox/ebbcontrols.cxx 
b/svtools/source/brwbox/ebbcontrols.cxx
index db614a86c31c..35fb994daaea 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -31,6 +31,7 @@ namespace svt
 m_xWidget->connect_changed(LINK(this, ComboBoxControl, SelectHdl));
 m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
 m_xWidget->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
+m_xWidget->connect_focus_out(LINK(this, ControlBase, FocusOutHdl));
 }
 
 void ComboBoxControl::dispose()
@@ -117,6 +118,7 @@ namespace svt
 m_xWidget->connect_changed(LINK(this, ListBoxControl, SelectHdl));
 m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
 m_xWidget->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
+m_xWidget->connect_focus_out(LIN

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

[Caolán McNamara (via logerrit)]

 formula/source/ui/dlg/funcutl.cxx |   48 ++--
 include/formula/funcutl.hxx   |   13 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   73 --
 3 files changed, 70 insertions(+), 64 deletions(-)

New commits:
commit c56e0c791a79dc414108e1b2fbf0f7eb38657f10
Author: Caolán McNamara 
AuthorDate: Thu Feb 18 14:56:01 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 18 21:04:32 2021 +0100

move async focus-in/focus-out workaround to known client that needs it

and for the normal case process immediately. Use-case is the
bibliography editor, modified uncommitted entry, click in browser
column margin area to select a new row, the entry should commit its
old contents to the old row before filling from the new row

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

diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index f64b6aff9bd5..361ec4c9ebaa 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include "ControlHelper.hxx"
 #include "parawin.hxx"
 #include 
@@ -265,9 +266,11 @@ RefEdit::RefEdit(std::unique_ptr xControl)
 , aIdle("formula RefEdit Idle")
 , pAnyRefDlg(nullptr)
 , pLabelWidget(nullptr)
+, mpFocusInEvent(nullptr)
+, mpFocusOutEvent(nullptr)
 {
-xEntry->connect_focus_in(LINK(this, RefEdit, GetFocus));
-xEntry->connect_focus_out(LINK(this, RefEdit, LoseFocus));
+xEntry->connect_focus_in(LINK(this, RefEdit, GetFocusHdl));
+xEntry->connect_focus_out(LINK(this, RefEdit, LoseFocusHdl));
 xEntry->connect_key_press(LINK(this, RefEdit, KeyInputHdl));
 xEntry->connect_changed(LINK(this, RefEdit, Modify));
 aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) );
@@ -275,6 +278,10 @@ RefEdit::RefEdit(std::unique_ptr xControl)
 
 RefEdit::~RefEdit()
 {
+if (mpFocusInEvent)
+Application::RemoveUserEvent(mpFocusInEvent);
+if (mpFocusOutEvent)
+Application::RemoveUserEvent(mpFocusOutEvent);
 aIdle.ClearInvokeHandler();
 aIdle.Stop();
 }
@@ -355,22 +362,53 @@ void RefEdit::GrabFocus()
 bool bHadFocus = xEntry->has_focus();
 xEntry->grab_focus();
 if (!bHadFocus && xEntry->has_focus())
-GetFocus(*xEntry);
+GetFocus();
 }
 
-IMPL_LINK_NOARG(RefEdit, GetFocus, weld::Widget&, void)
+void RefEdit::GetFocus()
 {
 maGetFocusHdl.Call(*this);
 StartUpdateData();
 }
 
-IMPL_LINK_NOARG(RefEdit, LoseFocus, weld::Widget&, void)
+void RefEdit::LoseFocus()
 {
 maLoseFocusHdl.Call(*this);
 if( pAnyRefDlg )
 pAnyRefDlg->HideReference();
 }
 
+IMPL_LINK_NOARG(RefEdit, GetFocusHdl, weld::Widget&, void)
+{
+// in e.g. function wizard RefEdits we want to select all when we get focus
+// but in the gtk case there are pending gtk handlers which change 
selection
+// after our handler, so post our focus in event to happen after those 
complete
+if (mpFocusInEvent)
+Application::RemoveUserEvent(mpFocusInEvent);
+mpFocusInEvent = Application::PostUserEvent(LINK(this, RefEdit, 
AsyncFocusInHdl));
+}
+
+IMPL_LINK_NOARG(RefEdit, LoseFocusHdl, weld::Widget&, void)
+{
+// tdf#127262 because focus in is async, focus out must not appear out
+// of sequence to focus in
+if (mpFocusOutEvent)
+Application::RemoveUserEvent(mpFocusOutEvent);
+mpFocusOutEvent = Application::PostUserEvent(LINK(this, RefEdit, 
AsyncFocusOutHdl));
+}
+
+IMPL_LINK_NOARG(RefEdit, AsyncFocusInHdl, void*, void)
+{
+mpFocusInEvent = nullptr;
+GetFocus();
+}
+
+IMPL_LINK_NOARG(RefEdit, AsyncFocusOutHdl, void*, void)
+{
+mpFocusOutEvent = nullptr;
+LoseFocus();
+}
+
 IMPL_LINK_NOARG(RefEdit, UpdateHdl, Timer *, void)
 {
 if( pAnyRefDlg )
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 915152466174..e94f29115068 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -27,6 +27,7 @@
 #include 
 
 class KeyEvent;
+struct ImplSVEvent;
 
 namespace formula {
 
@@ -41,6 +42,9 @@ private:
 Idle aIdle;
 IControlReferenceHandler* pAnyRefDlg; // parent dialog
 weld::Label* pLabelWidget;
+ImplSVEvent* mpFocusInEvent;
+ImplSVEvent* mpFocusOutEvent;
+
 Link maGetFocusHdl;
 Link maLoseFocusHdl;
 Link maModifyHdl;
@@ -49,10 +53,15 @@ private:
 DECL_LINK( UpdateHdl, Timer*, void );
 
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
-DECL_LINK(GetFocus, weld::Widget&, void);
-DECL_LINK(LoseFocus, weld::Widget&, void);
+DECL_LINK(GetFocusHdl, weld::Widget&, void);
+DECL_LINK(LoseFocusHdl, weld::Widget&, void);
+DECL_LINK(AsyncFocusInHdl, void*, void);
+DECL_LINK(AsyncFocusOutHdl, void*, void);
 DECL_LINK(Modify, weld::Entry&, void);
 
+  

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

[Caolán McNamara (via logerrit)]

 extensions/uiconfig/sbibliography/ui/mappingdialog.ui |  579 +-
 solenv/sanitizers/ui/modules/sbibliography.suppr  |3 
 2 files changed, 291 insertions(+), 291 deletions(-)

New commits:
commit 28557f54caf924240e6d698a9d2f1e2bc1cf3ab4
Author: Caolán McNamara 
AuthorDate: Thu Feb 18 09:32:00 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 18 21:04:09 2021 +0100

link up orphan labels in mapping dialog to the entries they should label

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

diff --git a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui 
b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui
index 3b19ce48aa16..2dca5ddf11e0 100644
--- a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui
+++ b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui
@@ -1,34 +1,34 @@
 
-
+
 
   
   
-False
-6
+False
+6
 Column Layout for Table “%1”
 True
-0
-0
-dialog
+0
+0
+dialog
 
   
-False
+False
 True
 True
 vertical
 12
 
   
-False
-end
+False
+end
 
   
 _OK
 True
-True
-True
-True
-True
+True
+True
+True
+True
 True
   
   
@@ -41,8 +41,8 @@
   
 _Cancel
 True
-True
-True
+True
+True
 True
   
   
@@ -55,8 +55,8 @@
   
 _Help
 True
-True
-True
+True
+True
 True
   
   
@@ -70,875 +70,881 @@
   
 False
 True
-end
+end
 1
   
 
 
   
 True
-False
+False
 True
 True
-0
-none
+0
+none
 
-  
+  
   
 True
-False
-True
-True
-6
-12
+False
 12
 6
+True
+True
+6
+12
 
   
 True
-False
+False
 end
 _Short name
-True
-identifierCombobox
+True
+identifierCombobox
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 end
 _Author(s)
-True
-authorCombobox
+True
+authorCombobox
   
   
-0
-1
+0
+1
   
 
 
   
 True
-False
+False
 end
 _Publisher
-True
-publisherCombobox
+True
+publisherCombobox
   
   
-0
-2
+0
+2
   
 
 
   
 True
-False
+False
 end
 _Chapter
-True
-chapterCombobox
+True
+chapterCombobox
   
   
-0
-3
+0
+3
   
 
 
   
 True
-False
+False
 end
 Editor
+True
+editorCombobox
   
   
-0
-5
+0
+5
   
   

Code Contributor Statement

[Quentin Delage]

Hello there,

Just a ping to tell you that:
    All of my past & future contributions to LibreOffice may be
    licensed under the MPLv2/LGPLv3+ dual license.
--
Quentin DELAGE
French student
Mail : quentin.dela...@etu.unilim.fr
GPG fingerprint : FB45 B942 190E 0DB0 E7A2 DA60 88C2 8BC1 D8B6 3327



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

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

[Stephan Bergmann (via logerrit)]

 avmedia/source/macavf/manager.mm |2 +-
 avmedia/source/macavf/player.mm  |2 +-
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx  |2 +-
 connectivity/source/drivers/macab/MacabPreparedStatement.cxx |2 +-
 connectivity/source/drivers/macab/MacabResultSet.cxx |4 ++--
 vcl/osx/a11yfactory.mm   |2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9ece0ae7e1b07d61274c975cbc1cd55966a89013
Author: Stephan Bergmann 
AuthorDate: Thu Feb 18 15:40:53 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 18 19:01:33 2021 +0100

loplugin:referencecasting (macOS)

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

diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 44768b54c4e3..d240bb27a8d1 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -44,7 +44,7 @@ uno::Reference< media::XPlayer > SAL_CALL 
Manager::createPlayer( const OUString&
 if( !xPlayer->create( aURL.GetMainURL( 
INetURLObject::DecodeMechanism::Unambiguous ) )  )
 return {};
 
-return uno::Reference(xPlayer.get());
+return uno::Reference(xPlayer);
 }
 
 
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 7fdc58247f50..401cba74c2d2 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -333,7 +333,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL 
Player::createFrameGrabber()
 if( !pGrabber->create( pMovie ) )
 return {};
 
-return pGrabber.get();
+return pGrabber;
 }
 
 
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx 
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 540e333aa639..9b3aed095039 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -729,7 +729,7 @@ sal_Bool SAL_CALL 
MacabDatabaseMetaData::supportsBatchUpdates(  )
 
 Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection(  )
 {
-return m_xConnection.get();
+return m_xConnection;
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  )
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx 
b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index cbb3dc75608c..22fd7b499a82 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -131,7 +131,7 @@ Reference< XResultSetMetaData > SAL_CALL 
MacabPreparedStatement::getMetaData()
 m_xMetaData = new 
MacabResultSetMetaData(getOwnConnection(),sTableName);
 setMacabFields();
 }
-Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
+Reference< XResultSetMetaData > xMetaData = m_xMetaData;
 return xMetaData;
 }
 
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx 
b/connectivity/source/drivers/macab/MacabResultSet.cxx
index da2d2dafd3ed..b35f6e2d57ca 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -513,7 +513,7 @@ Reference< XResultSetMetaData > SAL_CALL 
MacabResultSet::getMetaData()
 if (!m_xMetaData.is())
 m_xMetaData = new 
MacabResultSetMetaData(m_xStatement->getOwnConnection(), m_sTableName);
 
-Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
+Reference< XResultSetMetaData > xMetaData = m_xMetaData;
 return xMetaData;
 }
 
@@ -668,7 +668,7 @@ Reference< XInterface > SAL_CALL 
MacabResultSet::getStatement()
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 
-Reference< XStatement > xStatement = m_xStatement.get();
+Reference< XStatement > xStatement = m_xStatement;
 return xStatement;
 }
 
diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm
index 0a17f15dad8d..797a7492d391 100644
--- a/vcl/osx/a11yfactory.mm
+++ b/vcl/osx/a11yfactory.mm
@@ -59,7 +59,7 @@ static bool enabled = false;
 mdAllWrapper = [ [ [ NSMutableDictionary alloc ] init ] retain ];
 // initialize keyboard focus tracker
 rtl::Reference< AquaA11yFocusListener > listener( 
AquaA11yFocusListener::get() );
-TheAquaA11yFocusTracker::get().setFocusListener(listener.get());
+TheAquaA11yFocusTracker::get().setFocusListener(listener);
 enabled = true;  
 }
 return mdAllWrapper;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 extensions/source/update/check/updatecheckjob.cxx |2 +-
 extensions/source/update/check/updateprotocol.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4adf4e0a5518f6895ca188c7b03ac430a53571e8
Author: Stephan Bergmann 
AuthorDate: Thu Feb 18 15:40:25 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 18 19:01:14 2021 +0100

loplugin:referencecasting (--enable-extension-update)

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

diff --git a/extensions/source/update/check/updatecheckjob.cxx 
b/extensions/source/update/check/updatecheckjob.cxx
index 977e7fbaa12f..82d2f7439ba2 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -314,7 +314,7 @@ extensions_update_UpdateCheckJob_get_implementation(
 css::uno::Reference desktop(
 css::frame::Desktop::create(context));
 rtl::Reference job(new UpdateCheckJob(context, desktop));
-desktop->addTerminateListener(job.get());
+desktop->addTerminateListener(job);
 return cppu::acquire(job.get());
 }
 
diff --git a/extensions/source/update/check/updateprotocol.cxx 
b/extensions/source/update/check/updateprotocol.cxx
index 4417565c4752..a2da6a82c716 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -144,7 +144,7 @@ checkForUpdates(
 
 if( aUpdateInfoEnumeration->nextElement() >>= aEntry )
 {
-uno::Reference< xml::dom::XNode > xNode( 
aEntry.UpdateDocument.get() );
+uno::Reference< xml::dom::XNode > xNode( aEntry.UpdateDocument 
);
 uno::Reference< xml::dom::XNodeList > xNodeList;
 try {
 xNodeList = xXPath->selectNodeList(xNode, aXPathExpression
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/README

[Laurent BP (via logerrit)]

 extras/README |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 22cc13ae083c8c092c657003c27a71a3ab5fea95
Author: Laurent BP 
AuthorDate: Sun Jan 31 19:03:10 2021 +0100
Commit: Laurent Balland-Poirier 
CommitDate: Thu Feb 18 18:18:10 2021 +0100

Clearer text to add new Impress template

Change-Id: I291d90795b1b2a6c160bdf20544df73dbb8054c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110209
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/extras/README b/extras/README
index 448d0baafa77..8644d990d5d9 100644
--- a/extras/README
+++ b/extras/README
@@ -29,10 +29,11 @@ How-to add a new autotext to an existing category
 
 How-to add a new Impress template
+ clean-up template file as indicated on wiki 
https://wiki.documentfoundation.org/Documentation/HowTo/Impress/Make_template_language_independent
-   + unzip Foo.otp in extras/source/templates/presnt/Foo (no space allowed 
in any file names)
-   + add Foo.otp in Package_tplpresnt.mk
+   + add Foo in meta.xml to make presentation name 
translatable
+   + unzip Foo.otp file in extras/source/templates/presnt/Foo (no space 
allowed in any file names)
+   + add "Foo.otp" in Package_tplpresnt.mk
+ in CustomTarget_tplpresnt.mk:
-   + add Foo / in extras_TEMPLATES_PRESENTATIONS
+   + add "Foo /" in extras_TEMPLATES_PRESENTATIONS
+ add files names contained in Foo.otp (except mimetype) in 
extras_PRESENTATIONS_XMLFILES
+ if Foo.otp contains files with other extension than .xml, 
.svm, .svg, .png and .jpg
+ add a CPY call at the end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cherry pick for 7.1.1

[Ilmari Lauhakangas]

cfgitem.hxx seems to have an unresolved merge conflict, see the first 
and last lines


Ilmari

On 18.2.2021 19.02, Dante Doménech wrote:

Hello.
It's the first time I'm doing this, so I have some doubts.
I did cherry pick a patch for 7.1.1 but I'm having a strange behaviour.
This file starmath/inc/cfgitem.hxx appears as a new creation, but only 2 
lines of code should have been added.

Does anyone know what could be happening?

(patch over here: https://gerrit.libreoffice.org/c/core/+/49 
)


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


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

Cherry pick for 7.1.1

[Dante Doménech]

Hello.
It's the first time I'm doing this, so I have some doubts.
I did cherry pick a patch for 7.1.1 but I'm having a strange behaviour.
This file starmath/inc/cfgitem.hxx appears as a new creation, but only 2
lines of code should have been added.
Does anyone know what could be happening?

(patch over here: https://gerrit.libreoffice.org/c/core/+/49)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Pranam Lashkari (via logerrit)]

 sc/source/ui/view/viewdata.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 95c9eaa43daf823bffb3365ec57ff2f15dff77eb
Author: Pranam Lashkari 
AuthorDate: Thu Feb 18 20:19:57 2021 +0530
Commit: Jan Holesovsky 
CommitDate: Thu Feb 18 17:35:09 2021 +0100

online: fixed freeze pane not writing correct data on file save

problem:
when we save the file after setting freeze panes in online,
opening same file in Desktop libreoffice will show incorrect view,
each freeze view would start from A1

this patch ensures that we write correct starting cell pos for each freeze 
view

Change-Id: Ic8ccd5fb5cbedf2ea4f0e9376f0cfdd530e32d6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/31
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index e98378fa853f..a1ff8bc20051 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -4221,7 +4221,10 @@ void ScViewData::OverrideWithLOKFreeze(ScSplitMode& 
eExHSplitMode, ScSplitMode&
 eExHSplitMode = SC_SPLIT_FIX;
 
 if (eExHSplitMode == SC_SPLIT_FIX)
+{
 nExFixPosX = nFreezeCol;
+pThisTab->nPosX[SC_SPLIT_RIGHT] = nFreezeCol;
+}
 else
 bConvertToScrPosX = true;
 }
@@ -4232,7 +4235,10 @@ void ScViewData::OverrideWithLOKFreeze(ScSplitMode& 
eExHSplitMode, ScSplitMode&
 eExVSplitMode = SC_SPLIT_FIX;
 
 if (eExVSplitMode == SC_SPLIT_FIX)
+{
 nExFixPosY = nFreezeRow;
+pThisTab->nPosY[SC_SPLIT_BOTTOM] = nFreezeRow;
+}
 else
 bConvertToScrPosY = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 xmloff/source/forms/propertyimport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 67db5b7c8df4aa0fab08ac2d11b732dbc28c4c62
Author: Noel Grandin 
AuthorDate: Thu Feb 18 16:07:52 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 17:34:07 2021 +0100

tdf#140486 forms "empty string is null" setting not loaded

regression from
commit 3de38e95561ab7ca114d9f3307702ba89c4e3e9a
Date:   Tue Nov 10 19:20:06 2020 +0200
use fastparser in forms

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

diff --git a/xmloff/source/forms/propertyimport.cxx 
b/xmloff/source/forms/propertyimport.cxx
index 31d9c6e5fc55..ce1293baafea 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -285,7 +285,7 @@ void OPropertyImport::startFastElement(sal_Int32 
/*nElement*/, const Reference<
 handleAttribute(aIter.getToken(), aIter.toString());
 
 if (m_bTrackAttributes)
-m_aEncounteredAttributes.insert(aIter.getToken());
+m_aEncounteredAttributes.insert(aIter.getToken() & TOKEN_MASK);
 }
 
 // TODO: create PropertyValues for all the attributes which were not 
present, because they were implied
@@ -296,7 +296,7 @@ void OPropertyImport::startFastElement(sal_Int32 
/*nElement*/, const Reference<
 bool OPropertyImport::encounteredAttribute(sal_Int32 nAttributeToken) const
 {
 OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: 
attribute tracking not enabled!");
-return m_aEncounteredAttributes.end() != 
m_aEncounteredAttributes.find(nAttributeToken);
+return m_aEncounteredAttributes.end() != 
m_aEncounteredAttributes.find(nAttributeToken & TOKEN_MASK);
 }
 
 void OPropertyImport::characters(const OUString& _rChars )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - chart2/Library_chartcontroller.mk chart2/source officecfg/registry sw/qa

[Kelemen Gábor (via logerrit)]

 chart2/Library_chartcontroller.mk |4 ++
 chart2/source/controller/dialogs/tp_PolarOptions.cxx  |4 +-
 chart2/source/model/template/PieChartTypeTemplate.cxx |   11 +-
 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |8 
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   17 
++
 5 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 8c7c4505cce12fb305ef6e5b2689f7c39ca1893a
Author: Kelemen Gábor 
AuthorDate: Tue Nov 12 15:03:04 2019 +0100
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 16:44:39 2021 +0100

tdf#108059 Introduce compatibility key for pie chart orientation

There is no similar setting in MSO, it just always uses clockwise.

LO on the other hand confuses users by using counterclockwise
which turns to clockwise upon save to OOXML and reload.

Eliminate this behavior by introducing a compatibility key
for OOXML-heavy environments that:
- sets the orientation to clockwise when pie chart type is selected
- hides the checkbox that would have no effect after a save to OOXML

Default value is false to keep current behavior

Change-Id: I9e12ecad8e9978f960c921a521461aee023a5063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/82524
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: Balazs Varga 
Reviewed-by: László Németh 
(cherry picked from commit 41fa7244746819411f209110f13af43941f17ce8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/46
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/chart2/Library_chartcontroller.mk 
b/chart2/Library_chartcontroller.mk
index 48115dd2a33b..05f031415213 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -22,6 +22,10 @@ $(eval $(call 
gb_Library_use_external,chartcontroller,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,chartcontroller))
 
+$(eval $(call gb_Library_use_custom_headers,chartcontroller,\
+officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_libraries,chartcontroller,\
 basegfx \
 chartcore \
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx 
b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 804c4221247a..e858813bb39f 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 namespace chart
 {
@@ -80,7 +81,8 @@ void PolarOptionsTabPage::Reset(const SfxItemSet* rInAttrs)
 {
 m_xFL_StartingAngle->hide();
 }
-if (rInAttrs->GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == 
SfxItemState::SET)
+// tdf#108059 Hide clockwise orientation checkbox in OOXML-heavy 
environments it would be useless anyways
+if 
(!officecfg::Office::Compatibility::View::ClockwisePieChartDirection::get() && 
rInAttrs->GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == 
SfxItemState::SET)
 {
 bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem 
)->GetValue();
 m_xCB_Clockwise->set_active(bCheck);
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx 
b/chart2/source/model/template/PieChartTypeTemplate.cxx
index ec08764a7509..7f58b6e856e6 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -237,7 +238,15 @@ void PieChartTypeTemplate::adaptScales(
 {
 chart2::ScaleData aScaleData( xAxis->getScaleData() );
 AxisHelper::removeExplicitScaling( aScaleData );
-aScaleData.Orientation = chart2::AxisOrientation_MATHEMATICAL;
+// tdf#108059 Create new pie/donut charts with clockwise 
orientation
+if 
(!officecfg::Office::Compatibility::View::ClockwisePieChartDirection::get())
+{
+aScaleData.Orientation = 
chart2::AxisOrientation_MATHEMATICAL;
+}
+else
+{
+aScaleData.Orientation = chart2::AxisOrientation_REVERSE;
+}
 xAxis->setScaleData( aScaleData );
 }
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 5b89f9498005..87d139fb9116 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -193,6 +193,14 @@
 
 true
   
+  
+
+
+Specifies whether the default orientation of pie charts 
should be clockwise. In OOXML-heavy environments it might be confusing to see 
charts being mirrored after save, avoid that

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/sort/tdf105301.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5e0a0b13eee64d27bb2a45580e409e6c2c5ae6cb
Author: Xisco Fauli 
AuthorDate: Thu Feb 18 14:22:11 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 18 16:41:23 2021 +0100

tdf#51828: uitest: add comment to existing test

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

diff --git a/sc/qa/uitest/sort/tdf105301.py b/sc/qa/uitest/sort/tdf105301.py
index 71ec6372c762..48cb62ec9252 100644
--- a/sc/qa/uitest/sort/tdf105301.py
+++ b/sc/qa/uitest/sort/tdf105301.py
@@ -32,6 +32,8 @@ class tdf105301(UITestCase):
 self.assertEqual("Column E", 
get_state_as_dict(xDialog.getChild("sortlb4"))['DisplayText'])
 self.assertEqual("Column F", 
get_state_as_dict(xDialog.getChild("sortlb5"))['DisplayText'])
 self.assertEqual("Column G", 
get_state_as_dict(xDialog.getChild("sortlb6"))['DisplayText'])
+
+# tdf#51828: Without the fix in place, this test would have failed here
 self.assertEqual("- undefined -", 
get_state_as_dict(xDialog.getChild("sortlb7"))['DisplayText'])
 
 xOk = xDialog.getChild("ok")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sc/inc sc/source

[Eike Rathke (via logerrit)]

 sc/inc/validat.hxx  |   10 
 sc/source/core/data/validat.cxx |   81 ++--
 2 files changed, 64 insertions(+), 27 deletions(-)

New commits:
commit ada5033f8edc29b0e97962765947ea40bc6dfaa0
Author: Eike Rathke 
AuthorDate: Fri Sep 25 23:26:19 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 16:36:22 2021 +0100

Consolidate, factor out common duplicated code, tdf#128797 follow-up

Change-Id: I939c9f88a6cf09e1caa87131562ad67e389c2710
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103470
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit ebe4bbb25a9bcb4263b079a50d932384c7c7fb3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/45
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index d4e92bd9ce4e..19c4bb31c354 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -34,6 +34,7 @@ struct RefUpdateContext;
 class ScPatternAttr;
 class ScTokenArray;
 class ScTypedStrData;
+struct ScValidationDataIsNumeric;
 
 enum ScValidationMode
 {
@@ -183,6 +184,15 @@ private:
 
 /** Tests, if contents of pCell occur in cell range referenced by own 
formula, or in a string list. */
 bool IsListValid( ScRefCellValue& rCell, const ScAddress& rPos ) const;
+
+/** Tests, if string or numeric data has valid text length.
+@param pDataNumeric
+nullptr if string data to be tested, else for numeric data a
+properly initialized ScValidationDataIsNumeric struct, see
+implementation.
+ */
+bool IsDataValidTextLen( const OUString& rTest, const ScAddress& rPos,
+ScValidationDataIsNumeric* pDataNumeric ) const;
 };
 
 //  list of conditions:
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 221796a9567e..2600d9cc668e 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -471,6 +471,53 @@ bool ScValidationData::IsDataValidCustom(
 return bRet;
 }
 
+/** To test numeric data text length in IsDataValidTextLen().
+
+If mpFormatter is not set, it is obtained from the document and the format
+key is determined from the cell position's attribute pattern.
+ */
+struct ScValidationDataIsNumeric
+{
+SvNumberFormatter*  mpFormatter;
+double  mfVal;
+sal_uInt32  mnFormat;
+
+ScValidationDataIsNumeric( double fVal, SvNumberFormatter* pFormatter = 
nullptr, sal_uInt32 nFormat = 0 )
+: mpFormatter(pFormatter), mfVal(fVal), mnFormat(nFormat)
+{
+}
+
+void init( const ScDocument& rDoc, const ScAddress& rPos )
+{
+const ScPatternAttr* pPattern = rDoc.GetPattern( rPos.Col(), 
rPos.Row(), rPos.Tab());
+mpFormatter = rDoc.GetFormatTable();
+mnFormat = pPattern->GetNumberFormat( mpFormatter);
+}
+};
+
+bool ScValidationData::IsDataValidTextLen( const OUString& rTest, const 
ScAddress& rPos,
+ScValidationDataIsNumeric* pDataNumeric ) const
+{
+sal_Int32 nLen;
+if (!pDataNumeric)
+nLen = rTest.getLength();
+else
+{
+if (!pDataNumeric->mpFormatter)
+pDataNumeric->init( *GetDocument(), rPos);
+
+// For numeric values use the resulting input line string to
+// determine length, otherwise an once accepted value maybe could
+// not be edited again, for example abbreviated dates or leading
+// zeros or trailing zeros after decimal separator change length.
+OUString aStr;
+pDataNumeric->mpFormatter->GetInputLineString( pDataNumeric->mfVal, 
pDataNumeric->mnFormat, aStr);
+nLen = aStr.getLength();
+}
+ScRefCellValue aTmpCell( static_cast(nLen));
+return IsCellValid( aTmpCell, rPos);
+}
+
 bool ScValidationData::IsDataValid(
 const OUString& rTest, const ScPatternAttr& rPattern, const ScAddress& 
rPos ) const
 {
@@ -493,21 +540,13 @@ bool ScValidationData::IsDataValid(
 bool bRet;
 if (SC_VALID_TEXTLEN == eDataMode)
 {
-double nLenVal;
 if (!bIsVal)
-nLenVal = static_cast(rTest.getLength());
+bRet = IsDataValidTextLen( rTest, rPos, nullptr);
 else
 {
-// For numeric values use the resulting input line string to
-// determine length, otherwise an once accepted value maybe could
-// not be edited again, for example abbreviated dates or leading
-// zeros or trailing zeros after decimal separator change length.
-OUString aStr;
-pFormatter->GetInputLineString( nVal, nFormat, aStr);
-nLenVal = static_cast( aStr.getLength() );
+ScValidationDataIsNumeric aDataNumeric( nVal, pFormatter, nFormat);
+bRet = IsDataValidTextLen( rTest, rPos, &aDataNumeric);
 }
-ScRefCellValue aTmpCell(nLenVal);
-bRet = IsCellValid(aTmp

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sc/qa sc/source

[Tibor Nagy (via logerrit)]

 sc/qa/unit/data/xlsx/textLengthDataValidity.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx   |   40 +++
 sc/source/core/data/validat.cxx  |   20 +--
 3 files changed, 56 insertions(+), 4 deletions(-)

New commits:
commit 5e99596e8980ebe7b6295e5cf07567a37f63ddea
Author: Tibor Nagy 
AuthorDate: Wed Sep 9 14:23:12 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 16:33:05 2021 +0100

tdf#128797 sc: fix invalid detective marks cells

If numeric value of cell formatted as text or not and validation
set up as text length > 0 to ensure cells are filled.
When the detective is used to mark invalid data, the value of
cells are marked as invalid.

Co-authored-by: Attila Szűcs (NISZ)
Change-Id: I3481a6c999871f9a5cf73669d2ac73df1fc0ca20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102322
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 192235e0b71dd2a75bc7de85fe664bb69283f4a0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/44
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sc/qa/unit/data/xlsx/textLengthDataValidity.xlsx 
b/sc/qa/unit/data/xlsx/textLengthDataValidity.xlsx
new file mode 100644
index ..a007fd9f7146
Binary files /dev/null and b/sc/qa/unit/data/xlsx/textLengthDataValidity.xlsx 
differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index f548a9b8e21b..7ff383a8a760 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -264,6 +264,7 @@ public:
 void testShapeRotationImport();
 void testShapeDisplacementOnRotationImport();
 void testTextBoxBodyUpright();
+void testTextLengthDataValidityXLSX();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -416,6 +417,7 @@ public:
 CPPUNIT_TEST(testShapeRotationImport);
 CPPUNIT_TEST(testShapeDisplacementOnRotationImport);
 CPPUNIT_TEST(testTextBoxBodyUpright);
+CPPUNIT_TEST(testTextLengthDataValidityXLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4584,6 +4586,44 @@ void ScFiltersTest::testTextBoxBodyUpright()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(90), nAngle);
 }
 
+void ScFiltersTest::testTextLengthDataValidityXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("textLengthDataValidity.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load textLengthDataValidity.xlsx", 
xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+const ScValidationData* pData = rDoc.GetValidationEntry(1);
+
+ScRefCellValue aCellA1; // A1 = 1234(numeric value)
+ScAddress aValBaseAddrA1( 0,0,0 );
+aCellA1.assign(rDoc, aValBaseAddrA1);
+bool bValidA1 = pData->IsDataValid(aCellA1, aValBaseAddrA1);
+
+ScRefCellValue aCellA2; // A2 = 1234(numeric value format as text)
+ScAddress aValBaseAddrA2( 0,1,0 );
+aCellA2.assign(rDoc, aValBaseAddrA2);
+bool bValidA2 = pData->IsDataValid(aCellA2, aValBaseAddrA2);
+
+ScRefCellValue aCellA3; // A3 = 1234.00(numeric value)
+ScAddress aValBaseAddrA3( 0,2,0 );
+aCellA3.assign(rDoc, aValBaseAddrA3);
+bool bValidA3 = pData->IsDataValid(aCellA3, aValBaseAddrA3);
+
+ScRefCellValue aCellA4; // A4 = 12.3(numeric value)
+ScAddress aValBaseAddrA4( 0,3,0 );
+aCellA4.assign(rDoc, aValBaseAddrA4);
+bool bValidA4 = pData->IsDataValid(aCellA4, aValBaseAddrA4);
+
+// True if text length = 4
+CPPUNIT_ASSERT_EQUAL(true, bValidA1);
+CPPUNIT_ASSERT_EQUAL(true, bValidA2);
+CPPUNIT_ASSERT_EQUAL(true, bValidA3);
+CPPUNIT_ASSERT_EQUAL(true, bValidA4);
+
+xDocSh->DoClose();
+}
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index e2921aaf7368..221796a9567e 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -584,14 +584,26 @@ bool ScValidationData::IsDataValid( ScRefCellValue& 
rCell, const ScAddress& rPos
 break;
 
 case SC_VALID_TEXTLEN:
+{
+double nLenVal;
 bOk = !bIsVal;  // only Text
 if ( bOk )
 {
-double nLenVal = static_cast(aString.getLength());
-ScRefCellValue aTmpCell(nLenVal);
-bOk = IsCellValid(aTmpCell, rPos);
+nLenVal = static_cast(aString.getLength());
 }
-break;
+else
+{
+const ScPatternAttr* pPattern
+= mpDoc->GetPattern(rPos.Col(), rPos.Row(), rPos.Tab());
+SvNumberFormatter* pFormatter = 
GetDocument()->GetFormatTable();
+sal_uInt32 nFormat = pPattern->GetNumberFormat(pFormatter);
+pFormatter->GetInputLineString(nVal, nFormat, aString);
+nLenVal = static_cast(aString.g

ESC meeting minutes: 2021-02-18

[Miklos Vajna]

* Present:
+ Caolan, Michael S, Michael W, Olivier, Cloph, Stephan, Heiko, Miklos, 
Sophie, Thorsten, Xisco, Eike

* Completed Action Items:
+ get GSoC 2021 application filed until 19th February (Heiko)

* Pending Action Items:
+ data of mentoring update / qa stats look outdated, investigate (Xisco)

* Release Engineering update (Cloph)
+ 7.1 status
  + 7.1.1 rc2 is due next week; 6 gerrit changes to review
  + libreoffice-7-1-1 branch is created
+ 7.0 status: 7.0.5 rc1 tagged, branch is created
+ Remotes: Android, iOS
+ Android viewer
AI: add  (Cloph)
+ may change if rolling releases would happen

* Documentation (Olivier)
+ Google Season of Doc’s 2021
   + Time to doc the development?
 + could have 1-2 technical writers for this
   + Ideas welcome
  + API doc?
  + LO Dev How-To ?
  + Git/gerrit for LO-dev?
  + Development guide?
+ please ask the board what is their input on the non-technical 
side (Miklos)
+ Ilmari was working on this in the past (Michael S)
  + Administration guide
+ what about Copyright with AOO wiki docs?
   + Doc Format?
   + Mentors? (please line up !!!)
AI:  + create wiki page for ideas (Olivier)
 + New Help
+ No news
 + Helpcontents2
+ Updates and fixes (S. Chaiklin, ohallot, Johnny_M…)
+ ScriptForge doc (Scriptforge Team)
 + Guides
+ Updates on-going
+ Export Guides to HTML, XHTML?
  + install the XSLT 2.0 extension to get better XHTML export 
performance (Michael S)
  + sample: https://newdesign.libreoffice.org/guides/pt/CG70/CG7000.html


* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
244(244) (topicUI) bugs open, 231(231) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month 3 months   12 months
 added  5(0)  18(-10) 42(-13)140(-17)
 commented 41(-18)   296(-115)   913(-94)   3861(-130)
   removed  2(0)   8(2)   11(2)   54(0)
  resolved 13(5)  51(-8) 153(1)  518(10)
+ top 10 contributors:
  Heiko Tietze made 290 changes in 1 month, and 2529 changes in 1 year
  Telesto made 65 changes in 1 month, and 910 changes in 1 year
  Foote, V Stuart made 64 changes in 1 month, and 636 changes in 1 year
  Ilmari Lauhakangas made 45 changes in 1 month, and 335 changes in 1y
  Xisco Fauli made 24 changes in 1 month, and 354 changes in 1 year
  Seth Chaiklin made 23 changes in 1 month, and 135 changes in 1 year
  Dieter made 18 changes in 1 month, and 398 changes in 1 year
  Rizal Muttaqin made 16 changes in 1 month, and 34 changes in 1 year
  BogdanB made 15 changes in 1 month, and 189 changes in 1 year
  Jim Raykowski made 11 changes in 1 month, and 31 changes in 1 year

+ 8 new tickets with needsUXEval Feb/11-18

  + [Bug 140347] UI: Footnote area in Tools _> Footnotes and endnotes
 not self-explaining
  + [Bug 140360] Provide option to turn off sidebar's minimum width
  + [Bug 140387] Orca no longer reads many options on the sidebar in Linux
  + [Bug 140409] LO Windows Writer: The greater the zoom, the tinier
 the comment text
  + [Bug 140451] PDF Export: show the file PDF version and/or make the
 version selectable (if possible)
  + [Bug 114532] add support for WEBP image format (image import and
 inside .ods/.odt)
  + [Bug 140476] UI: different compression scales used within same dialog
 for different formats
  + [Bug 140483] Redo Undo Enhancement for protect/unprotect sheet and
 spreadsheet structure in Libreoffice Calc

  ->  + Add an "Extensions" sidebar (similar to the "Extensions" tab)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=139979
+ WF since possible per extension?
+ you can use the existing sidebar and add an extension there (Michael 
W)
  + Wollmux is a (complex) example

  ->  + tdf#140400: Percentile function wizard has a typo in the hint
+ https://gerrit.libreoffice.org/c/core/+/37
+ cherry-pick to 7.1?
   + not that important (Eike)
+ please don’t do that in general (Sophie)

* Crash Testing (Caolan)
+ 15(+1) import failure, 3(+1) export failures
+ 0 coverity issues
+ 18 ossfuzz issues, 10 timeouts

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/7.0.3.1
 + (-497) 3894 4391 5080 5583 6244 6046 2302 7544 6347 6410 6208 4932 
3472 1732 0
   + https://crashreport.libreoffice.org/stats/version/7.0.4.2
 + (-426) 5272 5698 6259 5595 3893 2033 1027 0
   + https://crashreport.libreoffice.o

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - oox/inc oox/source sc/qa

[Szabolcs Toth (via logerrit)]

 oox/inc/drawingml/textbodyproperties.hxx   |1 
 oox/source/drawingml/shape.cxx |   24 +--
 oox/source/drawingml/textbodypropertiescontext.cxx |5 +-
 oox/source/export/drawingml.cxx|   37 -
 sc/qa/unit/data/xlsx/tdf106197_import_upright.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx |   45 +
 6 files changed, 89 insertions(+), 23 deletions(-)

New commits:
commit 2967aae06af4c6c56da53db67e2e6fb297b4881e
Author: Szabolcs Toth 
AuthorDate: Wed Sep 16 14:41:24 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 16:18:53 2021 +0100

tdf#106197 XLSX shape import: keep text upright

Handle and grab-bag attribute upright to keep
text upright regardless of shape rotation, fixing
the text direction after import and after a round-trip.

Co-authored-by: Balázs Regényi

Change-Id: If4c73aeaebad55af967cea894a94756068ca3766
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102870
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 8c23be49fb5a9044989532e6e20feb1e3ff64f2b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/43
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/oox/inc/drawingml/textbodyproperties.hxx 
b/oox/inc/drawingml/textbodyproperties.hxx
index eddf78a5f97f..27ca26fabc67 100644
--- a/oox/inc/drawingml/textbodyproperties.hxx
+++ b/oox/inc/drawingml/textbodyproperties.hxx
@@ -35,6 +35,7 @@ struct TextBodyProperties
 OptValue< sal_Int32 >   moRotation;
 boolmbAnchorCtr;
 OptValue< sal_Int32 >   moVert;
+boolmoUpright = false;
 std::optional< sal_Int32 >moInsets[4];
 std::optional< sal_Int32 >moTextOffUpper;
 std::optional< sal_Int32 >moTextOffLeft;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 567564479846..173095b37df2 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1429,10 +1429,26 @@ Reference< XShape > const & Shape::createAndInsert(
 sal_Int32 nTextRotateAngle = static_cast< sal_Int32 >( 
getTextBody()->getTextProperties().moRotation.get( 0 ) );
 
 nTextRotateAngle -= mnDiagramRotation;
-/* OOX measures text rotation clockwise in 1/6th degrees,
-   relative to the containing shape. setTextRotateAngle wants
-   degrees anticlockwise. */
-mpCustomShapePropertiesPtr->setTextRotateAngle( -1 * 
nTextRotateAngle / 6 );
+
+bool isUpright = getTextBody()->getTextProperties().moUpright;
+if (isUpright)
+{
+// When upright is set, we want the text without any 
rotation.
+// But if we set 0 here, the text is still rotated if the
+// shape containing it is rotated.
+// Hence, we rotate the text into the the opposite 
direction of
+// the rotation of the shape, by as much as the shape was 
rotated.
+mpCustomShapePropertiesPtr->setTextRotateAngle(mnRotation 
/ 6);
+// Also put this away in a Gabbag.
+putPropertyToGrabBag("Upright", Any(isUpright));
+}
+else
+{
+/* OOX measures text rotation clockwise in 1/6th 
degrees,
+   relative to the containing shape. setTextRotateAngle 
wants
+   degrees anticlockwise. */
+mpCustomShapePropertiesPtr->setTextRotateAngle(-1 * 
nTextRotateAngle / 6);
+}
 }
 
 // Note that the script 
oox/source/drawingml/customshapes/generatePresetsData.pl looks
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index 14f23c935b34..699c15ec2632 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -94,7 +94,10 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( 
ContextHandler2Helper cons
 // ST_PositiveCoordinate
 //   sal_Int32 nSpcCol = rAttribs.getInteger( XML_spcCol, 0 );
 //   bool bSpcFirstLastPara = rAttribs.getBool( XML_spcFirstLastPara, 0 );
-//   bool bUpRight = rAttribs.getBool( XML_upright, 0 );
+
+bool bUpright = rAttribs.getBool(XML_upright, false);
+if (bUpright)
+mrTextBodyProp.moUpright = true;
 
 // ST_TextVerticalType
 if( rAttribs.hasAttribute( XML_vert ) ) {
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 70ecafec02f9..0728a131550f 100644
--- a/oox

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

[Tamás Zolnai (via logerrit)]

 sd/source/ui/view/drawview.cxx |7 ++-
 svx/source/svdraw/svdedxv.cxx  |1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 92d1eaab8adf8de7afa607119770adb042283700
Author: Tamás Zolnai 
AuthorDate: Wed Feb 17 15:53:08 2021 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 18 16:13:17 2021 +0100

Better fix for tdf#125824: switch page only for the current view.

First workaround was avoiding undoing:
9dca7c2fac5c6b83a6910aa61b1a2a316f36d948

Second workaround was forcing all views to exit text editing:
e6c7a018a0cfee395ce2886d41c908a2447ef5cc

Instead of these solutions, we allow to continue text editing
in other views. What we do is avoiding jumping to the object
location in all views while undoing. In theory, the two views
/ windows should be able to edit the document's different parts
independently. So one view should not jump to the location where
the other view edits something / does an undo.

It works both with multi-window and Collabora Online's collaborative
editing.

Change-Id: I7ffe29bf175b8f855fe3e92b3d7e11ca6bcd3f5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111073
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 7db8c3d36db3ed727ade2609b7c1017cc813a560)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/12
Tested-by: Jenkins

diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 4ac4580cd118..deaa309e5031 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -423,8 +423,13 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& 
rHint)
 // switch to that page when it's not a master page
 if(SdrHintKind::SwitchToPage == eHintKind)
 {
-const SdrPage* pPage = static_cast(rHint).GetPage();
+// We switch page only in the current view, which triggered this 
event
+// and keep other views ontouched.
+SfxViewShell* pViewShell = SfxViewShell::Current();
+if(pViewShell && pViewShell != 
&mpDrawViewShell->GetViewShellBase())
+return;
 
+const SdrPage* pPage = static_cast(rHint).GetPage();
 if(pPage && !pPage->IsMasterPage())
 {
 if(mpDrawViewShell->GetActualPage() != pPage)
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 15dac1b614ee..268981f99df0 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1523,7 +1523,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
 const bool bUndo = IsUndoEnabled();
 if (bUndo)
 {
-EndTextEditAllViews();
 OUString aObjName(pTEObj->TakeObjNameSingul());
 BegUndo(SvxResId(STR_UndoObjSetText), aObjName);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - chart2/source

[Balazs Varga (via logerrit)]

 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |1 +
 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |1 +
 chart2/source/controller/main/ChartController_Tools.cxx|8 
++--
 chart2/source/tools/DataSeriesHelper.cxx   |2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 16babc553294b676d7cdbbca9bb2e90cb46e484d
Author: Balazs Varga 
AuthorDate: Wed Sep 2 15:09:01 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 16:08:22 2021 +0100

tdf#136402 Chart View: remove custom label text

Now Delete Data Labels and Insert Data Labels local
menu options remove custom label text instead of keeping it.
See with unit test document custom_data_label.xlsx of
commit bcda268cde1f8408c2066ce985acedfce3e3bc2e
(tdf#134977 Chart OOXML: fix import of custom data label).

Change-Id: Ifc7afd0f2ece9da528e6206a6bd393b394b36f9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101929
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 0dce53516011f5d2d9408501714e2b1865517119)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/42
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 4920d2b727e0..1dcfc4c27321 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -338,6 +338,7 @@ bool DataPointItemConverter::ApplySpecialItem(
 
DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, 
CHART_UNONAME_LABEL , aOldValue ) )
 {
 
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_LABEL , uno::Any( aLabel ) );
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_CUSTOM_LABEL_FIELDS, uno::Any() );
 bChanged = true;
 }
 }
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 496b25e2692f..d96b56a26f2e 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -286,6 +286,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 
nWhichId, const SfxIte
 
DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, 
CHART_UNONAME_LABEL, aOldValue))
 {
 
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, 
CHART_UNONAME_LABEL, uno::Any(aLabel));
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, 
CHART_UNONAME_CUSTOM_LABEL_FIELDS, uno::Any());
 bChanged = true;
 }
 }
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index bf2b97f5773b..34b33d2f84d3 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -764,10 +764,14 @@ bool ChartController::executeDispatch_Delete()
 if( aObjectType == OBJECTTYPE_DATA_LABELS )
 {
 uno::Reference< chart2::XDataSeries > xSeries( 
ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ));
-
::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_LABEL, uno::Any(aLabel) );
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_LABEL, uno::Any(aLabel) );
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_CUSTOM_LABEL_FIELDS, uno::Any() );
 }
 else
-xObjectProperties->setPropertyValue( 
CHART_UNONAME_LABEL, uno::Any(aLabel) );
+{
+
xObjectProperties->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
+
xObjectProperties->setPropertyValue(CHART_UNONAME_CUSTOM_LABEL_FIELDS, 
uno::Any());
+}
 bReturn = true;
 aUndoGuard.commit();
 }
diff --git a/chart2/source/tools/DataSeriesHelper.cxx 
b/chart2/source/tools/DataSeriesHelper.cxx
index c5fd3e43fb2f..82c41fb74c56 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -173,6 +173,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPo

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - oox/source sw/qa

[Szabolcs Toth (via logerrit)]

 oox/source/export/drawingml.cxx |   19 
 oox/source/shape/WpsContext.cxx |   11 ++
 sw/qa/extras/ooxmlexport/data/tdf123610_handle_upright.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx   |   10 ++
 4 files changed, 40 insertions(+)

New commits:
commit 691de5dc45a86844c53723b4e32180876a0fc1c9
Author: Szabolcs Toth 
AuthorDate: Mon Sep 14 17:16:51 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 15:59:47 2021 +0100

tdf#123610 DOCX shape import: keep text upright

Grab-bag attribute upright to keep text upright
regardless of shape rotation, fixing the text
direction in MSO after a round-trip.

Co-authored-by: Balázs Regényi

Change-Id: If18a12c7728317a7af093048b07bc392d2964389
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102690
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit d3094b98231730b8e6d863c6a2fc0dd62f3e991a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/41
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index de2d34979471..70ecafec02f9 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2813,6 +2813,24 @@ void DrawingML::WriteText( const Reference< XInterface 
>& rXIface, const OUStrin
 else if( bVertical && eHorizontalAlignment == TextHorizontalAdjust_LEFT )
 sVerticalAlignment = "b";
 
+bool isUpright = false;
+if (GetProperty(rXPropSet, "InteropGrabBag"))
+{
+if 
(rXPropSet->getPropertySetInfo()->hasPropertyByName("InteropGrabBag"))
+{
+uno::Sequence aGrabBag;
+rXPropSet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
+for (auto& aProp : aGrabBag)
+{
+if (aProp.Name == "Upright")
+{
+aProp.Value >>= isUpright;
+break;
+}
+}
+}
+}
+
 bool bHasWrap = false;
 bool bWrap = false;
 // Only custom shapes obey the TextWordWrap option, normal text always 
wraps.
@@ -2844,6 +2862,7 @@ void DrawingML::WriteText( const Reference< XInterface >& 
rXIface, const OUStrin
XML_anchor, sVerticalAlignment,
XML_anchorCtr, bHorizontalCenter ? "1" : 
nullptr,
XML_vert, sWritingMode,
+   XML_upright, isUpright ? "1" : "0",
XML_rot, ((nTextPreRotateAngle + 
nTextRotateAngle) != 0) ? oox::drawingml::calcRotationValue( 
(nTextPreRotateAngle + nTextRotateAngle) * 100 ).getStr() : nullptr );
 if (bIsFontworkShape)
 {
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index f78c38ff91e9..076fd1124307 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -96,6 +96,17 @@ oox::core::ContextHandlerRef 
WpsContext::onCreateContext(sal_Int32 nElementToken
 }
 }
 
+if (bool bUpright = rAttribs.getBool(XML_upright, false))
+{
+uno::Sequence aGrabBag;
+xPropertySet->getPropertyValue("InteropGrabBag") >>= 
aGrabBag;
+sal_Int32 length = aGrabBag.getLength();
+aGrabBag.realloc(length + 1);
+aGrabBag[length].Name = "Upright";
+aGrabBag[length].Value <<= bUpright;
+xPropertySet->setPropertyValue("InteropGrabBag", 
uno::makeAny(aGrabBag));
+}
+
 if (xServiceInfo.is())
 {
 // Handle inset attributes for Writer textframes.
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123610_handle_upright.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123610_handle_upright.docx
new file mode 100644
index ..d7dc1978a067
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf123610_handle_upright.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index a7fa86d47a14..61ba601ed1c5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1190,6 +1190,16 @@ 
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorWidthFromInsideOutsideMargin, "tdf133
 CPPUNIT_ASSERT_EQUAL(static_cast(2552), nAnchoredWidth);
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testBodyPrUpright, 
"tdf123610_handle_upright.docx")
+{
+// tdf#123610: Check grab-bag attribute upright to keep text upright 
regardless of shape rotation.
+
+xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
+
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor"
+   

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sw/qa writerfilter/source

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

 sw/qa/extras/ooxmlexport/data/tdf136667.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |8 +++
 writerfilter/source/dmapper/PropertyMap.cxx  |   57 ++-
 3 files changed, 39 insertions(+), 26 deletions(-)

New commits:
commit 3f9a5f348769d033a819869787c5593f6a6fae9e
Author: László Németh 
AuthorDate: Mon Sep 14 11:00:27 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 15:30:46 2021 +0100

tdf#136667 DOCX import: fix crash of floating tables

with tracked changes of table structure (not only cell
text content), where text ranges of redlines aren't
connected to a cell. Support also different table names
of redline text ranges for sure.

Regression from commit 288db6eb47fbbd2b3ca34ffea0686d8ed8ed9be9
(tdf#132271 DOCX: import change tracking in floating tables).

Change-Id: I58b1b21c8016d682a292409165991dec2f8cfa3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102655
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 464a7b0631335a8f8729512b8c27f864747f56a7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/40
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf136667.docx 
b/sw/qa/extras/ooxmlexport/data/tdf136667.docx
new file mode 100644
index ..e5b047ee3330
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf136667.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 10ea1017e577..c6c2a3461cdd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -978,6 +978,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132271, 
"tdf132271.docx")
 assertXPath(pXmlDoc, "//w:ins", 2);
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf136667, "tdf136667.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+// import change tracking in floating tables
+assertXPath(pXmlDoc, "//w:del", 2);
+assertXPath(pXmlDoc, "//w:ins", 4);
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx")
 {
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index a97933f7aeb3..650aaebff542 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1364,52 +1364,57 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 // convert redline ranges to cursor movement and character 
length
 std::vector redPos, redLen;
 std::vector redCell;
-OUString sTableName;
+std::vector redTable;
 for( size_t i = 0; i < aFramedRedlines.size(); i+=3)
 {
 uno::Reference xCell;
 uno::Reference< text::XTextRange > xRange;
 aFramedRedlines[i] >>= xRange;
 uno::Reference< beans::XPropertySet > xRangeProperties;
+OUString sTableName;
+OUString sCellName;
 if ( xRange.is() )
 {
 xRangeProperties.set( xRange, uno::UNO_QUERY_THROW );
-
-const uno::Sequence aRangeProperties
-= 
xRangeProperties->getPropertySetInfo()->getProperties();
-
-for (const beans::Property& rProperty : 
aRangeProperties)
+if 
(xRangeProperties->getPropertySetInfo()->hasPropertyByName("TextTable"))
 {
-const OUString& rKey = rProperty.Name;
-uno::Any aValue = 
xRangeProperties->getPropertyValue(rKey);
-if ( rKey == "TextTable" )
+uno::Any aTable = 
xRangeProperties->getPropertyValue("TextTable");
+if ( aTable != uno::Any() )
 {
 uno::Reference xTable;
-aValue >>= xTable;
+aTable >>= xTable;
 uno::Reference 
xTableProperties(xTable, uno::UNO_QUERY);
 
xTableProperties->getPropertyValue("TableName") >>= sTableName;
 }
-else if ( rKey == "Cell" )
+if 
(xRangeProperties->getPropertySetInfo()->hasPropertyByName("Cell"))
 {
- OUString sCellName;
- aValue >>= xCell;
- uno::Reference 
xCellProperties(xCell, uno::UNO_QUERY);
- xCellProperties->getPrope

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sc/qa sc/source

[Attila Szűcs (via logerrit)]

 sc/qa/unit/copy_paste_test.cxx  |   73 
 sc/qa/unit/data/ods/tdf53431_autofilterFilldown.ods |binary
 sc/source/core/data/documen3.cxx|5 +
 sc/source/ui/inc/viewfunc.hxx   |3 
 4 files changed, 80 insertions(+), 1 deletion(-)

New commits:
commit 1c914b4b2d9ab2bbdde1c9c309b90832ca806d0d
Author: Attila Szűcs 
AuthorDate: Mon Sep 7 14:36:25 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 15:15:48 2021 +0100

tdf#53431 tdf#136535 sc: fix Fill Cells with Autofilter

Sheet->Fill Cells on a selected range duplicated or
removed the AutoFilter button, when the range contained
that, by copying cell properties. Apply RefreshAutoFilter()
after the fill to repair this.

Note: this refresh is not slow, because it depends only on
the number of columns, see ATTR_MERGE_FLAG attribute of the
columns.

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I95d394c5432d22805a761b76219f656fad3feae1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102173
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 789abce00bbb1139eb4005f78b82478a17342048)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/39
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 71adbe5c8c8d..69557ea982c9 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -14,6 +14,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -36,6 +39,7 @@ public:
 void testTdf124565();
 void testTdf126421();
 void testTdf107394();
+void testTdf53431_fillOnAutofilter();
 
 CPPUNIT_TEST_SUITE(ScCopyPasteTest);
 CPPUNIT_TEST(testCopyPasteXLS);
@@ -43,6 +47,7 @@ public:
 CPPUNIT_TEST(testTdf124565);
 CPPUNIT_TEST(testTdf126421);
 CPPUNIT_TEST(testTdf107394);
+CPPUNIT_TEST(testTdf53431_fillOnAutofilter);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -421,6 +426,74 @@ void ScCopyPasteTest::testTdf107394()
 xComponent->dispose();
 }
 
+static ScMF lcl_getMergeFlagOfCell(const ScDocument& rDoc, SCCOL nCol, SCROW 
nRow, SCTAB nTab)
+{
+const SfxPoolItem& rPoolItem = rDoc.GetPattern(nCol, nRow, 
nTab)->GetItem(ATTR_MERGE_FLAG);
+const ScMergeFlagAttr& rMergeFlag = static_cast(rPoolItem);
+return rMergeFlag.GetValue();
+}
+
+void ScCopyPasteTest::testTdf53431_fillOnAutofilter()
+{
+uno::Reference< frame::XDesktop2 > xDesktop = 
frame::Desktop::create(::comphelper::getProcessComponentContext());
+CPPUNIT_ASSERT(xDesktop.is());
+
+// create a frame
+Reference< frame::XFrame > xTargetFrame = xDesktop->findFrame("_blank", 0);
+CPPUNIT_ASSERT(xTargetFrame.is());
+
+// 1. Open the document
+ScDocShellRef xDocSh = loadDoc("tdf53431_autofilterFilldown.", FORMAT_ODS, 
true);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf53431_autofilterFilldown.ods.", 
xDocSh.is());
+
+uno::Reference< frame::XModel2 > xModel2(xDocSh->GetModel(), UNO_QUERY);
+CPPUNIT_ASSERT(xModel2.is());
+
+Reference< frame::XController2 > xController = 
xModel2->createDefaultViewController(xTargetFrame);
+CPPUNIT_ASSERT(xController.is());
+
+// introduce model/view/controller to each other
+xController->attachModel(xModel2.get());
+xModel2->connectController(xController.get());
+xTargetFrame->setComponent(xController->getComponentWindow(), 
xController.get());
+xController->attachFrame(xTargetFrame);
+xModel2->setCurrentController(xController.get());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Get the document controller
+ScTabViewShell* pView = xDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT(pView != nullptr);
+
+//Fill should not clone Autofilter button
+ScDocShell::GetViewData()->GetMarkData().SetMarkArea(ScRange(1, 1, 0, 2, 
4, 0));
+pView->FillSimple(FILL_TO_BOTTOM);
+CPPUNIT_ASSERT((lcl_getMergeFlagOfCell(rDoc, 1, 1, 0) & ScMF::Auto));
+CPPUNIT_ASSERT((lcl_getMergeFlagOfCell(rDoc, 2, 1, 0) & ScMF::Auto));
+CPPUNIT_ASSERT(!(lcl_getMergeFlagOfCell(rDoc, 1, 4, 0) & ScMF::Auto));
+
+ScDocShell::GetViewData()->GetMarkData().SetMarkArea(ScRange(1, 1, 0, 4, 
4, 0));
+pView->FillSimple(FILL_TO_RIGHT);
+CPPUNIT_ASSERT((lcl_getMergeFlagOfCell(rDoc, 1, 1, 0) & ScMF::Auto));
+CPPUNIT_ASSERT((lcl_getMergeFlagOfCell(rDoc, 2, 1, 0) & ScMF::Auto));
+CPPUNIT_ASSERT(!(lcl_getMergeFlagOfCell(rDoc, 4, 1, 0) & ScMF::Auto));
+CPPUNIT_ASSERT(!(lcl_getMergeFlagOfCell(rDoc, 1, 4, 0) & ScMF::Auto));
+CPPUNIT_ASSERT(!(lcl_getMergeFlagOfCell(rDoc, 4, 4, 0) & ScMF::Auto));
+
+//Fill should not delete Autofilter buttons
+ScDocShell::GetViewData()->GetMarkData().SetMarkArea(ScRange(0, 0, 0, 2, 
4, 0));
+pView->FillSimple(FILL_TO_TOP);
+CPPUNIT_ASSERT((lcl_getMergeF

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/data/tdf57465.ods |binary
 sc/qa/uitest/sort/tdf57465.py  |   54 +
 2 files changed, 54 insertions(+)

New commits:
commit fd745457be6371794ca8178631ecb3523c9474cd
Author: Xisco Fauli 
AuthorDate: Thu Feb 18 12:34:02 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 18 15:12:52 2021 +0100

tdf#57465: sc: Add UItest

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

diff --git a/sc/qa/uitest/data/tdf57465.ods b/sc/qa/uitest/data/tdf57465.ods
new file mode 100644
index ..0c4215d81605
Binary files /dev/null and b/sc/qa/uitest/data/tdf57465.ods differ
diff --git a/sc/qa/uitest/sort/tdf57465.py b/sc/qa/uitest/sort/tdf57465.py
new file mode 100644
index ..9f03d09fa798
--- /dev/null
+++ b/sc/qa/uitest/sort/tdf57465.py
@@ -0,0 +1,54 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from uitest.uihelper.common import select_pos
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf57465(UITestCase):
+
+def test_tdf57465(self):
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf57465.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:G4"}))
+
+self.ui_test.execute_dialog_through_command(".uno:DataSort")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "1")
+
+xHeader = xDialog.getChild("header")
+if (get_state_as_dict(xHeader)["Selected"]) == 'true':
+xHeader.executeAction("CLICK", tuple())
+
+xLeftRight = xDialog.getChild("leftright")
+xLeftRight.executeAction("CLICK", tuple())
+
+select_pos(xTabs, "0")
+
+self.assertEqual("Row 1", 
get_state_as_dict(xDialog.getChild("sortlb"))['DisplayText'])
+
+xOk = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOk)
+
+self.assertEqual("a", get_cell_by_position(document, 0, 1, 
1).getString())
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 'b' != ''
+self.assertEqual("b", get_cell_by_position(document, 0, 2, 
2).getString())
+self.assertEqual("c", get_cell_by_position(document, 0, 3, 
3).getString())
+self.assertEqual("d", get_cell_by_position(document, 0, 4, 
1).getString())
+self.assertEqual("e", get_cell_by_position(document, 0, 5, 
2).getString())
+self.assertEqual("f", get_cell_by_position(document, 0, 6, 
3).getString())
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/sort/tdf100517.py |   80 +
 1 file changed, 80 insertions(+)

New commits:
commit 4e36ff33245ef1bb7cfb1f2d86d84736d2ceeaa2
Author: Xisco Fauli 
AuthorDate: Thu Feb 18 11:55:34 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 18 15:12:17 2021 +0100

tdf#100517: sc: Add UItest

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

diff --git a/sc/qa/uitest/sort/tdf100517.py b/sc/qa/uitest/sort/tdf100517.py
new file mode 100644
index ..defbb4a47cc6
--- /dev/null
+++ b/sc/qa/uitest/sort/tdf100517.py
@@ -0,0 +1,80 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf100517(UITestCase):
+
+def execute_sort_dialog(self, gridwin, bIncludeNotes):
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"}))
+
+self.ui_test.execute_dialog_through_command(".uno:DataSort")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "1")
+
+xIncludeNotes = xDialog.getChild("includenotes")
+
+if (get_state_as_dict(xIncludeNotes)["Selected"]) != bIncludeNotes:
+xIncludeNotes.executeAction("CLICK", tuple())
+
+xOk = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOk)
+
+def test_tdf100517(self):
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+enter_text_to_cell(gridwin, "A1", "Text 2")
+enter_text_to_cell(gridwin, "A2", "Text 3")
+enter_text_to_cell(gridwin, "A3", "Text 1")
+
+for i in ['B1', 'B2', 'B3']:
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": i}))
+xArgs = mkPropertyValues({"Text": i})
+
+self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation", 
xArgs)
+
+self.execute_sort_dialog(gridwin, "true")
+
+self.assertEqual("Text 1", get_cell_by_position(document, 0, 0, 
0).getString())
+self.assertEqual("Text 2", get_cell_by_position(document, 0, 0, 
1).getString())
+self.assertEqual("Text 3", get_cell_by_position(document, 0, 0, 
2).getString())
+
+self.assertEqual("B3", get_cell_by_position(document, 0, 1, 
0).Annotation.String)
+self.assertEqual("B1", get_cell_by_position(document, 0, 1, 
1).Annotation.String)
+self.assertEqual("B2", get_cell_by_position(document, 0, 1, 
2).Annotation.String)
+
+self.xUITest.executeCommand(".uno:Undo")
+
+self.assertEqual("Text 2", get_cell_by_position(document, 0, 0, 
0).getString())
+self.assertEqual("Text 3", get_cell_by_position(document, 0, 0, 
1).getString())
+self.assertEqual("Text 1", get_cell_by_position(document, 0, 0, 
2).getString())
+
+self.assertEqual("B1", get_cell_by_position(document, 0, 1, 
0).Annotation.String)
+self.assertEqual("B2", get_cell_by_position(document, 0, 1, 
1).Annotation.String)
+self.assertEqual("B3", get_cell_by_position(document, 0, 1, 
2).Annotation.String)
+
+self.execute_sort_dialog(gridwin, "false")
+
+self.assertEqual("Text 1", get_cell_by_position(document, 0, 0, 
0).getString())
+self.assertEqual("Text 2", get_cell_by_position(document, 0, 0, 
1).getString())
+self.assertEqual("Text 3", get_cell_by_position(document, 0, 0, 
2).getString())
+
+self.assertEqual("B1", get_cell_by_position(document, 0, 1, 
0).Annotation.String)
+self.assertEqual("B2", get_cell_by_position(document, 0, 1, 
1).Annotation.String)
+self.assertEqual("B3", get_cell_by_position(document, 0, 1, 
2).Annotation.String)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_core_tox.mk   |   76 
 sw/Module_sw.mk |1 
 sw/inc/ToxLinkProcessor.hxx |2 
 sw/qa/core/test_ToxLinkProcessor.cxx|   14 ++---
 sw/qa/core/tox/tox.cxx  |   71 +
 sw/source/core/tox/ToxLinkProcessor.cxx |   23 ++---
 sw/source/core/tox/ToxTextGenerator.cxx |   18 ++-
 7 files changed, 186 insertions(+), 19 deletions(-)

New commits:
commit 3591c657ddee42a0a4b05fe87b13a737c5bfe868
Author: Miklos Vajna 
AuthorDate: Thu Feb 18 12:57:21 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 18 15:07:28 2021 +0100

sw bibliography: make URLs in the bibliography table clickable

- Don't reuse the  /
   mechianism from
  , because
   doesn't allow this

- Use STR_POOLCHR_INET_NORMAL as a char style, so the URL looks
  clickable

- Allow absolute URLs for ToxAuthorityField::AUTH_FIELD_URL (other URLs
  like ToC are always relative)

- Track the new text added by FillText() between the StartNewLink() and
  CloseLink() to figure out what is the URL to be launched on click

Change-Id: I126fa06aecfff783e62b65a548228ff781b62c5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/17
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/CppunitTest_sw_core_tox.mk b/sw/CppunitTest_sw_core_tox.mk
new file mode 100644
index ..4a99347239f5
--- /dev/null
+++ b/sw/CppunitTest_sw_core_tox.mk
@@ -0,0 +1,76 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_tox))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_tox))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_tox, \
+sw/qa/core/tox/tox \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_tox, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sfx \
+sw \
+swqahelper \
+test \
+unotest \
+utl \
+vcl \
+svt \
+tl \
+svl \
+svxcore \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_tox,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_tox,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_tox,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_tox))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_tox))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_tox,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_tox,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_tox))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_tox, \
+modules/swriter \
+svt \
+svx \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_tox))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index fc4498ca29be..75bf13e75231 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_core_accessibilitycheck \
 CppunitTest_sw_core_layout \
 CppunitTest_sw_core_fields \
+CppunitTest_sw_core_tox \
 CppunitTest_sw_core_frmedt \
 CppunitTest_sw_core_txtnode \
 CppunitTest_sw_core_objectpositioning \
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index e53c537b758e..77307cf6b784 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -41,7 +41,7 @@ public:
  * STR_POOLCHR_TOXJUMP.
  */
 void
-CloseLink(sal_Int32 endPosition, const OUString& url);
+CloseLink(sal_Int32 endPosition, const OUString& url, bool bRelative);
 
 /** Insert the found links as attributes to a text node */
 void
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx 
b/sw/qa/core/test_ToxLinkProcessor.cxx
index cd18f453db87..a4bb1eac60f0 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -56,11 +56,11 @@ 
ToxLinkProcessorTest::NoExceptionIsThrownIfTooManyLinksAreClosed()
 {
 ToxLinkProcessor sut;
 sut.StartNewLink(0, STYLE_NAME_1);
-sut.CloseLink(1, URL_1);
+sut.CloseLink(1, URL_1, /*bRelative=*/true);
 // fdo#85872 actually it turns out the UI does something like this
 // so an exception must not be thrown!
 

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

[Noel Grandin (via logerrit)]

 vcl/source/font/font.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 787158d528838bdb25d86139ab02ecdd4e341bdb
Author: Noel Grandin 
AuthorDate: Thu Feb 18 10:17:18 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 14:39:01 2021 +0100

disable-pch fix

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

diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 0edcb913aaf7..ed12ff7e0d6c 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -24,6 +24,8 @@
 #include 
 
 #include 
+#include 
+#include 
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sw/qa writerfilter/source

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

 sw/qa/extras/ooxmlexport/data/tdf132271.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|8 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 
 writerfilter/source/dmapper/PropertyMap.cxx   |   81 ++
 4 files changed, 90 insertions(+), 1 deletion(-)

New commits:
commit 3908f51a95be1460612924cb2dd1b00cdb2ae2bc
Author: László Németh 
AuthorDate: Mon Sep 7 09:48:45 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 14:28:35 2021 +0100

tdf#132271 DOCX: import change tracking in floating tables

Change-Id: If892a16875ef16015639aacf8359d15c953fb1d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102149
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 288db6eb47fbbd2b3ca34ffea0686d8ed8ed9be9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/38
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf132271.docx 
b/sw/qa/extras/ooxmlexport/data/tdf132271.docx
new file mode 100644
index ..202bfdda2ba0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132271.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 984564415989..10ea1017e577 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -970,6 +970,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125894, 
"tdf125894.docx")
 assertXPath(pXmlDoc, "//w:ins");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132271, "tdf132271.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+// import change tracking in floating tables
+assertXPath(pXmlDoc, "//w:del", 2);
+assertXPath(pXmlDoc, "//w:ins", 2);
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx")
 {
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 07de495c68f2..48b5bd6fea53 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2619,7 +2619,7 @@ void 
DomainMapper_Impl::CreateRedline(uno::Reference const& xR
 uno::Reference < text::XRedline > xRedline( xRange, 
uno::UNO_QUERY_THROW );
 xRedline->makeRedline( sType, aRedlineProperties );
 }
-else
+if (m_bIsActualParagraphFramed || (hasTableManager() && 
getTableManager().isInTable()))
 {
 aFramedRedlines.push_back( uno::makeAny(xRange) );
 aFramedRedlines.push_back( uno::makeAny(sType) );
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index d510bfc8be35..a97933f7aeb3 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -45,8 +45,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -1355,15 +1358,93 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 rInfo.m_nBreakType = m_nBreakType;
 if ( FloatingTableConversion( rDM_Impl, rInfo ) )
 {
+std::vector aFramedRedlines = 
rDM_Impl.aFramedRedlines;
 try
 {
+// convert redline ranges to cursor movement and character 
length
+std::vector redPos, redLen;
+std::vector redCell;
+OUString sTableName;
+for( size_t i = 0; i < aFramedRedlines.size(); i+=3)
+{
+uno::Reference xCell;
+uno::Reference< text::XTextRange > xRange;
+aFramedRedlines[i] >>= xRange;
+uno::Reference< beans::XPropertySet > xRangeProperties;
+if ( xRange.is() )
+{
+xRangeProperties.set( xRange, uno::UNO_QUERY_THROW );
+
+const uno::Sequence aRangeProperties
+= 
xRangeProperties->getPropertySetInfo()->getProperties();
+
+for (const beans::Property& rProperty : 
aRangeProperties)
+{
+const OUString& rKey = rProperty.Name;
+uno::Any aValue = 
xRangeProperties->getPropertyValue(rKey);
+if ( rKey == "TextTable" )
+{
+uno::Reference xTable;
+aValue >>= xTable;
+uno::Reference 
xTableProperties(xTable, uno::UNO_QUERY);
+
xTableProperties->getPropertyValue("TableName") >>= sTableName;
+}
+  

License statement

[Eyal Rozenberg]

All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

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

[Libreoffice-commits] core.git: compilerplugins/clang drawinglayer/qa drawinglayer/source include/vcl include/xmloff io/source ucbhelper/source vcl/inc vcl/source vcl/unx xmlhelp/source

[Noel (via logerrit)]

 compilerplugins/clang/referencecasting.cxx   |  172 ---
 compilerplugins/clang/test/referencecasting.cxx  |   34 +++
 drawinglayer/qa/unit/border.cxx  |2 
 drawinglayer/source/tools/wmfemfhelper.cxx   |2 
 include/vcl/transfer.hxx |6 
 include/xmloff/xmlexp.hxx|2 
 io/source/acceptor/acc_pipe.cxx  |2 
 io/source/acceptor/acc_socket.cxx|2 
 io/source/connector/connector.cxx|4 
 ucbhelper/source/provider/cancelcommandexecution.cxx |4 
 ucbhelper/source/provider/contenthelper.cxx  |6 
 vcl/inc/jsdialog/jsdialogbuilder.hxx |2 
 vcl/source/app/svapp.cxx |2 
 vcl/unx/generic/dtrans/X11_clipboard.cxx |2 
 vcl/unx/gtk3/gtk3gtkinst.cxx |   11 -
 xmlhelp/source/cxxhelp/provider/content.cxx  |2 
 xmlhelp/source/cxxhelp/provider/databases.cxx|2 
 xmlhelp/source/cxxhelp/provider/provider.cxx |2 
 18 files changed, 175 insertions(+), 84 deletions(-)

New commits:
commit 1ad26c9fc237e00247f18fcc8ccc778fba88d1fd
Author: Noel 
AuthorDate: Thu Feb 11 16:15:15 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 13:45:03 2021 +0100

loplugin:referencecasting add check for new rtl::Reference operator

rtl::Reference now has a conversion operator to uno::Reference,
so look for places where we can simplify the code and use that.

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

diff --git a/compilerplugins/clang/referencecasting.cxx 
b/compilerplugins/clang/referencecasting.cxx
index aa11bc0738d7..496654237b7d 100644
--- a/compilerplugins/clang/referencecasting.cxx
+++ b/compilerplugins/clang/referencecasting.cxx
@@ -61,16 +61,34 @@ public:
 bool VisitCXXConstructExpr(const CXXConstructExpr* cce);
 bool VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce);
 bool VisitCallExpr(const CallExpr*);
+bool VisitInitListExpr(const InitListExpr*);
 
 private:
-bool CheckForUnnecessaryGet(const Expr*);
+bool CheckForUnnecessaryGet(const Expr*, bool includeRtlReference);
 };
 
-static const RecordType* extractTemplateType(const clang::Type*);
+static const RecordType* extractTemplateType(QualType);
 static bool isDerivedFrom(const CXXRecordDecl* subtypeRecord, const 
CXXRecordDecl* baseRecord);
 
+bool ReferenceCasting::VisitInitListExpr(const InitListExpr* ile)
+{
+if (ignoreLocation(ile))
+return true;
+for (const Expr* expr : ile->inits())
+{
+if (CheckForUnnecessaryGet(expr, /*includeRtlReference*/ true))
+{
+report(DiagnosticsEngine::Warning, "unnecessary get() call", 
compat::getBeginLoc(expr))
+<< expr->getSourceRange();
+return true;
+}
+}
+return true;
+}
 bool ReferenceCasting::VisitCXXConstructExpr(const CXXConstructExpr* cce)
 {
+if (ignoreLocation(cce))
+return true;
 // don't bother processing anything in the Reference.h file. Makes my life 
easier when debugging this.
 StringRef aFileName = getFilenameOfLocation(
 compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(cce)));
@@ -79,24 +97,46 @@ bool ReferenceCasting::VisitCXXConstructExpr(const 
CXXConstructExpr* cce)
 if (loplugin::isSamePathname(aFileName, SRCDIR 
"/include/com/sun/star/uno/Reference.hxx"))
 return true;
 
+if (cce->getNumArgs() == 0)
+return true;
+
 // look for calls to the Reference(x, UNO_something) constructor
 auto constructorClass = cce->getConstructor()->getParent();
-if (!constructorClass->getIdentifier() || constructorClass->getName() != 
"Reference")
+auto dc = loplugin::DeclCheck(constructorClass);
+bool isUnoReference(dc.Class("Reference").Namespace("uno"));
+bool 
isRtlReference(dc.Class("Reference").Namespace("rtl").GlobalNamespace());
+if (!isUnoReference && !isRtlReference)
 return true;
 
-if (cce->getNumArgs() != 2)
-return true;
+if (isUnoReference)
+if (CheckForUnnecessaryGet(cce->getArg(0), /*includeRtlReference*/ 
cce->getNumArgs() == 1))
+{
+report(DiagnosticsEngine::Warning, "unnecessary get() call",
+   compat::getBeginLoc(cce->getArg(0)))
+<< cce->getArg(0)->getSourceRange();
+return true;
+}
+if (isRtlReference && cce->getNumArgs() == 1)
+if (CheckForUnnecessaryGet(cce->getArg(0), /*includeRtlReference*/ 
true))
+{
+report(DiagnosticsEngine::Warning, "unnecessary get() call",
+   compat::getBeginLoc(cce->getArg(0)))
+<< cce->getArg(0)->getSourceRange();
+re

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - chart2/source offapi/com oox/source sc/source sw/qa xmloff/source

[Balazs Varga (via logerrit)]

 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx |
4 ++
 chart2/source/controller/main/ChartController_Tools.cxx   |
1 
 chart2/source/model/main/DataPointProperties.cxx  |
3 +-
 chart2/source/tools/DataSeriesHelper.cxx  |
6 ++--
 chart2/source/view/main/VDataSeries.cxx   |
2 -
 offapi/com/sun/star/chart/ChartDataCaption.idl|
8 +
 offapi/com/sun/star/chart2/DataPointLabel.idl |
7 +
 oox/source/drawingml/chart/seriesconverter.cxx|   
12 
 sc/source/filter/excel/xichart.cxx|
2 -
 sw/qa/extras/layout/data/tdf136061.docx   
|binary
 sw/qa/extras/layout/layout.cxx|   
14 ++
 xmloff/source/chart/SchXMLSeries2Context.cxx  |
2 +
 12 files changed, 49 insertions(+), 12 deletions(-)

New commits:
commit 359760c34373ea89876a9dd656e465e836a0d38d
Author: Balazs Varga 
AuthorDate: Sat Aug 29 13:44:37 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 13:42:30 2021 +0100

tdf#136061 Chart ODF/OOXML: fix missing custom labels

by UNO extensions ShowCustomLabel in DataPointLabel.idl and
CUSTOM in ChartDataCaption.idl, fixing OOXML/ODF import/export.

We should display custom data label even if DataPointLabel is
disabled (e.g. category name and/or value fields are not displayed).

Note: import of the embedded chart of the DOCX unit test
document uses also ODF format in the background, testing
also the extension of the native file format.

Change-Id: I73e21f1e69fddec9f3b4163c46b6582cd1c74b5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101640
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 0d2340998415fb4b2f794054c62ef61c83e32155)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/35
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git 
a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index f55540f67db8..c786c1b3913c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -71,7 +71,7 @@ sal_Int32 lcl_LabelToCaption( const chart2::DataPointLabel& 
rLabel )
 
 chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption )
 {
-chart2::DataPointLabel aLabel(false,false,false,false);
+chart2::DataPointLabel aLabel(false,false,false,false,false);
 
 if( nCaption & css::chart::ChartDataCaption::VALUE )
 aLabel.ShowNumber = true;
@@ -81,6 +81,8 @@ chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption 
)
 aLabel.ShowCategoryName = true;
 if( nCaption & css::chart::ChartDataCaption::SYMBOL )
 aLabel.ShowLegendSymbol = true;
+if( nCaption & css::chart::ChartDataCaption::CUSTOM )
+aLabel.ShowCustomLabel = true;
 
 return aLabel;
 }
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index c6024350430d..bf2b97f5773b 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -760,6 +760,7 @@ bool ChartController::executeDispatch_Delete()
 aLabel.ShowNumberInPercent = false;
 aLabel.ShowCategoryName = false;
 aLabel.ShowLegendSymbol = false;
+aLabel.ShowCustomLabel = false;
 if( aObjectType == OBJECTTYPE_DATA_LABELS )
 {
 uno::Reference< chart2::XDataSeries > xSeries( 
ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ));
diff --git a/chart2/source/model/main/DataPointProperties.cxx 
b/chart2/source/model/main/DataPointProperties.cxx
index dba488fdd924..dcc343002ffb 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -515,7 +515,8 @@ void DataPointProperties::AddDefaultsToMap(
 false, // ShowNumber
 false, // ShowNumberInPercent
 false, // ShowCategoryName
-false  // ShowLegendSymbol
+false, // ShowLegendSymbol
+false  // ShowCustomLabel
 ));
 
 PropertyHelper::setPropertyValueDefault( rOutMap, 
PROP_DATAPOINT_TEXT_WORD_WRAP, false );
diff --git a/chart2/source/tools/DataSeriesHelper.cxx 
b/chart2/source/tools/DataSeriesHelper.cxx
index c90a356bf2ee..c5fd3e43fb2f 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/s

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

[Stephan Bergmann (via logerrit)]

 ucb/source/ucp/gio/gio_content.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 653e9627828adafc833fd179cea495f4b6e409ce
Author: Stephan Bergmann 
AuthorDate: Tue Feb 16 11:40:48 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 18 13:36:13 2021 +0100

More verbose GIO transfer failure information

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

diff --git a/ucb/source/ucp/gio/gio_content.cxx 
b/ucb/source/ucp/gio/gio_content.cxx
index 5a5bf05a32cd..cfce60270c27 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1098,8 +1098,13 @@ void Content::transfer( const css::ucb::TransferInfo& 
aTransferInfo, const css::
 bSuccess = g_file_copy(pSource, pDest, DEFAULT_COPYDATA_FLAGS, 
nullptr, nullptr, nullptr, &pError);
 g_object_unref(pSource);
 g_object_unref(pDest);
-if (!bSuccess)
+if (!bSuccess) {
+SAL_INFO(
+"ucb.ucp.gio",
+"transfer <" << aTransferInfo.SourceURL << "> to <" << sDest << "> 
(MoveData = "
+<< int(aTransferInfo.MoveData) << ") failed with \"" << 
pError->message << "\"");
 ucbhelper::cancelCommandExecution(mapGIOError(pError), xEnv);
+}
 }
 
 css::uno::Sequence< css::ucb::ContentInfo > 
Content::queryCreatableContentsInfo(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 writerfilter/source/dmapper/DomainMapper.cxx  |   24 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |  224 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |   26 +-
 writerfilter/source/dmapper/PropertyMap.cxx   |2 
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx   |6 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2 
 6 files changed, 157 insertions(+), 127 deletions(-)

New commits:
commit 7dd8f8aace536a8e60e87e61ee1d90d61fba15eb
Author: László Németh 
AuthorDate: Wed Feb 17 09:47:43 2021 +0100
Commit: László Németh 
CommitDate: Thu Feb 18 13:30:55 2021 +0100

tdf#120351 DOCX import: fix slow endnote import

by parsing endnotes.xml only once instead
of parsing again and again for every endnotes.
This was a serious performance problem for
documents with hundreds of endnotes, where the
endnote import took minutes instead of seconds.

Note: switch off CHECK_NOTMERGED in a debug build
to measure realistic speed-up, e.g. 98 s -> 18 s
for a document with thousand of endnotes.

Follow-up of commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357
"tdf#76260 DOCX import: fix slow footnote import".

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

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4f58670aefb5..a3b04a014ca8 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3249,7 +3249,9 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, 
size_t len)
 m_pImpl->SetFieldLocked();
 return;
 case 0x0c: //page break
-m_pImpl->deferBreak(PAGE_BREAK);
+// page breaks aren't supported in footnotes and endnotes
+if (!m_pImpl->IsInFootOrEndnote())
+m_pImpl->deferBreak(PAGE_BREAK);
 return;
 case 0x0e: //column break
 m_pImpl->deferBreak(COLUMN_BREAK);
@@ -3373,12 +3375,24 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 // preload all footnotes in separated footnotes
 if (sText[0] == 0x5)
 {
-if (m_pImpl->GetFootnoteCount() > -1)
+if (m_pImpl->IsInFootnote())
 {
-m_pImpl->PopFootOrEndnote(/*bIsFootnote=*/true);
-m_pImpl->PushFootOrEndnote(/*bIsFootnote=*/true);
+if (m_pImpl->GetFootnoteCount() > -1)
+{
+m_pImpl->PopFootOrEndnote();
+m_pImpl->PushFootOrEndnote(/*bIsFootnote=*/true);
+}
+m_pImpl->IncrementFootnoteCount();
+}
+else
+{
+if (m_pImpl->GetEndnoteCount() > -1)
+{
+m_pImpl->PopFootOrEndnote();
+m_pImpl->PushFootOrEndnote(/*bIsFootnote=*/false);
+}
+m_pImpl->IncrementEndnoteCount();
 }
-m_pImpl->IncrementFootnoteCount();
 }
 
 // If the footnote contains a Footnote Reference Mark, it can't be a 
custom footnote
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ebfe9d625bd2..d0ddb431c4d7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -304,10 +304,12 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_eInHeaderFooterImport( HeaderFooterImportState::none ),
 m_bDiscardHeaderFooter( false ),
 m_bInFootOrEndnote(false),
+m_bInFootnote(false),
 m_bHasFootnoteStyle(false),
 m_bCheckFootnoteStyle(false),
 m_eSkipFootnoteState(SkipFootnoteSeparator::OFF),
 m_nFootnotes(-1),
+m_nEndnotes(-1),
 m_bLineNumberingSet( false ),
 m_bIsInFootnoteProperties( false ),
 m_bIsParaMarkerChange( false ),
@@ -2614,6 +2616,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool 
bIsFootnote )
 {
 SAL_WARN_IF(m_bInFootOrEndnote, "writerfilter.dmapper", 
"PushFootOrEndnote() is called from another foot or endnote");
 m_bInFootOrEndnote = true;
+m_bInFootnote = bIsFootnote;
 m_bCheckFirstFootnoteTab = true;
 m_bSaveFirstParagraphInCell = m_bFirstParagraphInCell;
 try
@@ -2703,24 +2706,25 @@ void 
DomainMapper_Impl::CreateRedline(uno::Reference const& xR
 pRedlineProperties[1].Value <<= 
ConversionHelper::ConvertDateStringToDateTime( pRedline->m_sDate );
 pRedlineProperties[2].Name = getPropertyName( 
PROP_REDLINE_REVERT_PROPERTIES );
 pRedlineProperties[2].Value <<= pRedline->m_aRevertPro

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - download.lst external/postgresql RepositoryExternal.mk solenv/flatpak-manifest.in

[Michael Stahl (via logerrit)]

 RepositoryExternal.mk  |   24 ++-
 download.lst   |4 
 external/postgresql/ExternalPackage_postgresql.mk  |   16 ++
 external/postgresql/ExternalProject_postgresql.mk  |   16 +-
 external/postgresql/Module_postgresql.mk   |6 
 external/postgresql/UnpackedTarball_postgresql.mk  |   11 -
 external/postgresql/config.pl  |1 
 external/postgresql/internal-zlib.patch.1  |   29 
 external/postgresql/postgres-msvc-build.patch.1|  110 +
 external/postgresql/postgresql-9.2.1-libreoffice.patch |   74 ---
 external/postgresql/postgresql-libs-leak.patch |   40 --
 solenv/flatpak-manifest.in |6 
 12 files changed, 166 insertions(+), 171 deletions(-)

New commits:
commit 530535fd12536a83e1c192272c54c43c9ea4c94b
Author: Michael Stahl 
AuthorDate: Tue Jan 19 15:38:05 2021 +0100
Commit: Vasily Melenchuk 
CommitDate: Wed Feb 17 23:57:22 2021 +0300

postgresql: upgrade to release 13.1

Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant.

* --with-krb5 no longer exists, neither does --disable-shared
* remove internal-zlib.patch.1:
  zlib is only used by pg_* tools / contrib/pgcrypto
* remove postgresql-libs-leak.patch:
  some relic from pre-gbuild times, not clear what the point is for
  static libs
* remove postgresql-9.2.1-libreoffice.patch:
  another dmake .mk file relic, and the win32 nmake build system was
  removed
* add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl
* on WNT, libpq.dll is now built, no longer static lib

postgresql: fix mistake in RepositoryExternal.mk

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109698
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 1362bf7fa2957d34a7cef18dd95ede22cc42787f)

 Conflicts:
download.lst

Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d8ce2a880be..6a3b785c3695 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3056,9 +3056,15 @@ endef
 
 else # !SYSTEM_POSTGRESQL
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+   postgresql \
+))
+endif # WNT
+
 define gb_LinkTarget__use_postgresql
 
-$(call gb_LinkTarget_use_external_project,$(1),postgresql)
+$(call gb_LinkTarget_use_external_project,$(1),postgresql,full)
 
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,postgresql)/src/include \
@@ -3066,19 +3072,21 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
+ifeq ($(OS),WNT)
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call gb_UnpackedTarball_get_dir,postgresql)/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/libpq/libpq.lib \
 )
 
-ifeq ($(OS),WNT)
-$(call gb_LinkTarget_use_external,$(1),openssl)
+else # WNT
 
-$(call gb_LinkTarget_use_system_win32_libs,$(1),\
-   secur32 \
-   ws2_32 \
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
-endif
+endif # WNT
 
 endef
 
diff --git a/download.lst b/download.lst
index ab52c4e2c1c0..e3f1bb159cd6 100644
--- a/download.lst
+++ b/download.lst
@@ -208,8 +208,8 @@ export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201f
 export LIBPNG_TARBALL := libpng-1.6.37.tar.xz
 export POPPLER_SHA256SUM := 
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
 export POPPLER_TARBALL := poppler-21.01.0.tar.xz
-export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
-export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
+export POSTGRESQL_SHA256SUM := 
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
+export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
 export PYTHON_SHA256SUM := 
c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
 export PYTHON_TARBALL := Python-3.5.9.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
diff --git a/external/postgresql/ExternalPackage_postgresql.mk 
b/external/postgresql/ExternalPackage_postgresql.mk
new file mode 100644
index ..f6c9a9bb6deb
--- /dev/null

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - chart2/source officecfg/registry sw/qa

[Tünde Tóth (via logerrit)]

 chart2/source/model/template/PieChartTypeTemplate.cxx |   23 +
 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |8 
 sw/qa/extras/uiwriter/uiwriter2.cxx   |  121 
++
 3 files changed, 149 insertions(+), 3 deletions(-)

New commits:
commit 47c4921dca9f911fa3744e4c78d0e8c72afccf6c
Author: Tünde Tóth 
AuthorDate: Mon Aug 10 10:26:06 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 12:38:40 2021 +0100

tdf#123218 tdf#108067 config key ReverseXAxisOrientationDoughnutChart

for OOXML compatibility of newly created doughnut charts.

The X axis orientation of doughnut charts is the opposite of the primary
writing direction in LibreOffice but not in Microsoft Office. Default
value is "true" to keep current behavior. Using "false", the inner and
outer data series of new doughnut charts are the same, as after DOCX
export.

Change-Id: If431d5717e70599f07231bd673cd90c196450ae6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100417
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 22cd7d8b679d238559820d3c4cd5ff0b9153ffce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/34
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx 
b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 964b5d96d5c2..ec08764a7509 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -245,7 +246,12 @@ void PieChartTypeTemplate::adaptScales(
 if( xAxis.is() )
 {
 chart2::ScaleData aScaleData( xAxis->getScaleData() );
-aScaleData.Orientation = chart2::AxisOrientation_REVERSE;
+
+//tdf#123218 Don't reverse the orientation in OOXML-heavy 
environments
+if( 
officecfg::Office::Compatibility::View::ReverseXAxisOrientationDoughnutChart::get()
 )
+aScaleData.Orientation = chart2::AxisOrientation_REVERSE;
+else
+aScaleData.Orientation = 
chart2::AxisOrientation_MATHEMATICAL;
 xAxis->setScaleData( aScaleData );
 }
 }
@@ -316,15 +322,20 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
 {
 double fOffset=0.0;
 bool bAllOffsetsEqual = true;
+sal_Int32 nOuterSeriesIndex = 0;
 
 std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
 DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
 
+//tdf#108067 The outer series is the last series in OOXML-heavy 
environments
+if( 
!officecfg::Office::Compatibility::View::ReverseXAxisOrientationDoughnutChart::get()
 )
+nOuterSeriesIndex = aSeriesVec.size() - 1;
+
 //check offset of outer series
 if( !aSeriesVec.empty() )
 {
 //@todo in future this will depend on Orientation of the 
radius axis scale
-Reference< chart2::XDataSeries > xSeries( aSeriesVec[0] );
+Reference< chart2::XDataSeries > xSeries( 
aSeriesVec[nOuterSeriesIndex] );
 Reference< beans::XPropertySet > xProp( xSeries, 
uno::UNO_QUERY_THROW );
 xProp->getPropertyValue( "Offset") >>= fOffset;
 
@@ -450,8 +461,14 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
 uno::Reference< beans::XPropertySet > xProp( xSeries, 
uno::UNO_QUERY_THROW );
 
 bool bTemplateUsesRings = false;
+sal_Int32 nOuterSeriesIndex = 0;
 getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS ) >>= 
bTemplateUsesRings;
-if( nSeriesIndex == 0 ) //@todo in future this will depend on 
Orientation of the radius axis scale
+
+//tdf#108067 The outer series is the last series in OOXML-heavy 
environments
+if( 
!officecfg::Office::Compatibility::View::ReverseXAxisOrientationDoughnutChart::get()
 )
+nOuterSeriesIndex = nSeriesCount - 1;
+
+if( nSeriesIndex == nOuterSeriesIndex ) //@todo in future this will 
depend on Orientation of the radius axis scale
 {
 const OUString aOffsetPropName( "Offset" );
 // get offset mode
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 9c93c9513301..5b89f9498005 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -185,6 +185,14 @@
 
 true
   
+  
+
+  
+  Specifies the X axis orientation of doughnut charts.
+  Reverse the X axis orientation of doughnut c

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sc/qa sc/source

[Attila Szűcs (via logerrit)]

 sc/qa/unit/data/ods/tdf121718_UseFirstPageNumber.ods |binary
 sc/qa/unit/subsequent_export-test.cxx|   27 +++
 sc/source/filter/excel/xepage.cxx|8 -
 3 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit de14b8ad2cabf857c510d78e6d21a0ab1fb84b9e
Author: Attila Szűcs 
AuthorDate: Thu Aug 6 10:35:06 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 12:18:58 2021 +0100

tdf#121718 XLSX export: fix first page number

Changed code to not save 'useFirstPageNumber' and 'firstPageNumber'
if "First page number" is not checked.

It was needed because Excel does not care about 'useFirstPageNumber',
and blindly load 'firstPageNumber' even if that had an invalid value
(that could happen when useFirstPageNumber==false).

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I69c9ed0fd4fdca1794d4bbc197713ac687eb4005
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100203
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 790c0aeab258f770eb94f2d2cceceebfeaceb825)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/33
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sc/qa/unit/data/ods/tdf121718_UseFirstPageNumber.ods 
b/sc/qa/unit/data/ods/tdf121718_UseFirstPageNumber.ods
new file mode 100644
index ..0726e4cb1edc
Binary files /dev/null and 
b/sc/qa/unit/data/ods/tdf121718_UseFirstPageNumber.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index e84a464ab886..d387221d4156 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -260,6 +260,7 @@ public:
 void testTdf121716_ExportEvenHeaderFooterXLSX();
 void testTdf134459_HeaderFooterColorXLSX();
 void testTdf134817_HeaderFooterTextWith2SectionXLSX();
+void testTdf121718_UseFirstPageNumberXLSX();
 void testHeaderFontStyleXLSX();
 void testTdf135828_Shape_Rect();
 void testTdf123353();
@@ -418,6 +419,7 @@ public:
 CPPUNIT_TEST(testTdf121716_ExportEvenHeaderFooterXLSX);
 CPPUNIT_TEST(testTdf134817_HeaderFooterTextWith2SectionXLSX);
 CPPUNIT_TEST(testTdf134459_HeaderFooterColorXLSX);
+CPPUNIT_TEST(testTdf121718_UseFirstPageNumberXLSX);
 CPPUNIT_TEST(testHeaderFontStyleXLSX);
 CPPUNIT_TEST(testTdf135828_Shape_Rect);
 CPPUNIT_TEST(testTdf123353);
@@ -5267,6 +5269,31 @@ void 
ScExportTest::testTdf134817_HeaderFooterTextWith2SectionXLSX()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testTdf121718_UseFirstPageNumberXLSX()
+{
+// If "First page number" is not checked then useFirstPageNumb, and 
firstPageNumber should not be exported.
+ScDocShellRef xShell = loadDoc("tdf121718_UseFirstPageNumber.", 
FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile = 
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pDoc);
+
+assertXPath(pDoc, "/x:worksheet/x:pageSetup", "useFirstPageNumber", 
"true");
+assertXPath(pDoc, "/x:worksheet/x:pageSetup", "firstPageNumber", "10");
+
+pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/worksheets/sheet2.xml");
+CPPUNIT_ASSERT(pDoc);
+
+assertXPathNoAttribute(pDoc, "/x:worksheet/x:pageSetup", 
"useFirstPageNumber");
+assertXPathNoAttribute(pDoc, "/x:worksheet/x:pageSetup", 
"firstPageNumber");
+
+xDocSh->DoClose();
+}
+
 void ScExportTest::testHeaderFontStyleXLSX()
 {
 ScDocShellRef xShell = loadDoc("tdf134826.", FORMAT_XLSX);
diff --git a/sc/source/filter/excel/xepage.cxx 
b/sc/source/filter/excel/xepage.cxx
index 3941bd191f92..64d671a3acba 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -107,7 +107,6 @@ void XclExpSetup::SaveXml( XclExpXmlStream& rStrm )
 // pAttrList->add( XML_paperUnits,  "mm" );
 }
 pAttrList->add( XML_scale,  OString::number(  mrData.mnScaling 
).getStr() );
-pAttrList->add( XML_firstPageNumber,OString::number(  
mrData.mnStartPage ).getStr() );
 pAttrList->add( XML_fitToWidth, OString::number(  
mrData.mnFitToWidth ).getStr() );
 pAttrList->add( XML_fitToHeight,OString::number(  
mrData.mnFitToHeight ).getStr() );
 pAttrList->add( XML_pageOrder,  mrData.mbPrintInRows ? 
"overThenDown" : "downThenOver" );
@@ -119,7 +118,12 @@ void XclExpSetup::SaveXml( XclExpXmlStream& rStrm )
 pAttrList->add( XML_blackAndWhite,  ToPsz( mrData.mbBlackWhite ) );
 pAttrList->add( XML_draft,  ToPsz( mrData.mbDraftQuality ) );
 pAttrList->add( XML_cellComments,   mrData.mbPrintNotes ? "atEnd" : 
"none" ); //

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

[Noel Grandin (via logerrit)]

 xmloff/source/forms/elementimport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63d14566ba93b87f23a7ba68f8ea733cf19be101
Author: Noel Grandin 
AuthorDate: Thu Feb 18 10:50:40 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 12:08:23 2021 +0100

tdf#140198 Base text field will not retain multi-line setting

regression due to a combination of
commit 3de38e95561ab7ca114d9f3307702ba89c4e3e9a
Date:   Tue Nov 10 19:20:06 2020 +0200
use fastparser in forms
and
commit 3d0084770923ed8c17e496965abae862a4796e63
Date:   Fri Dec 4 16:14:16 2020 +0200
fastparser in a couple of random places
The first one introduced the bug, due to the fallback
paths from fast to slowparser, things kept working, until
the second one removed the fallback.

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

diff --git a/xmloff/source/forms/elementimport.cxx 
b/xmloff/source/forms/elementimport.cxx
index bb2e371f6c79..efcc4b7e73aa 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1339,7 +1339,7 @@ namespace xmloff
 }
 }
 
-return nullptr;
+return OControlImport::createFastChildContext( nElement, xAttrList );
 }
 
 void OTextLikeImport::startFastElement(sal_Int32 nElement, const 
Reference< css::xml::sax::XFastAttributeList >& _rxAttrList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - chart2/qa oox/source

[Tünde Tóth (via logerrit)]

 chart2/qa/extras/chart2export.cxx |   26 +-
 chart2/qa/extras/chart2import.cxx |2 -
 chart2/qa/extras/data/xlsx/custom_data_label.xlsx |binary
 oox/source/drawingml/chart/seriesconverter.cxx|1 
 4 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit fd46a1f8b0f55d167b087ac88b17060b8f18da7f
Author: Tünde Tóth 
AuthorDate: Mon Aug 3 09:12:14 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 12:00:32 2021 +0100

tdf#134977 Chart OOXML: fix import of custom data label

Use the data series properties for the default properties
of the custom data labels.

Change-Id: I651fa030276dfdec13b5801c0188bfd07c498b49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99987
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit bcda268cde1f8408c2066ce985acedfce3e3bc2e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/32
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 52001159e7e8..a7fbc4a4b21a 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -175,6 +175,7 @@ public:
 void testTdf132594();
 void testTdf136267();
 void testTdf134255();
+void testTdf134977();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
@@ -313,6 +314,7 @@ public:
 CPPUNIT_TEST(testTdf132594);
 CPPUNIT_TEST(testTdf136267);
 CPPUNIT_TEST(testTdf134255);
+CPPUNIT_TEST(testTdf134977);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2242,7 +2244,7 @@ void Chart2ExportTest::testCustomDataLabel()
 CPPUNIT_ASSERT_EQUAL(OUString("line"), aFields[5]->getString());
 aFields[5]->getPropertyValue("CharHeight") >>= nFontSize;
 aFields[5]->getPropertyValue("CharColor") >>= nFontColor;
-CPPUNIT_ASSERT_EQUAL(static_cast(13), nFontSize);
+CPPUNIT_ASSERT_EQUAL(static_cast(11.97), nFontSize);
 CPPUNIT_ASSERT_EQUAL(static_cast(0xbf9000), nFontColor);
 
 
CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_NEWLINE,
 aFields[6]->getFieldType());
@@ -2860,6 +2862,28 @@ void Chart2ExportTest::testTdf134255()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:txPr/a:bodyPr", 
"wrap", "square");
 }
 
+void Chart2ExportTest::testTdf134977()
+{
+load("/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx");
+
+//import test
+uno::Reference xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+CPPUNIT_ASSERT(xChartDoc.is());
+Reference< chart2::XDataSeries > xDataSeries = 
getDataSeriesFromDoc(xChartDoc, 0);
+CPPUNIT_ASSERT(xDataSeries.is());
+uno::Reference 
xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
+uno::Sequence> aFields;
+float nFontSize;
+xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
+aFields[0]->getPropertyValue("CharHeight") >>= nFontSize;
+CPPUNIT_ASSERT_EQUAL(static_cast(9), nFontSize);
+
+//export test
+xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open 
XML");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:r/a:rPr",
 "sz", "900");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 757d993edf64..e4a805654f28 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -1885,7 +1885,7 @@ void Chart2ImportTest::testTdf115107()
 CPPUNIT_ASSERT_EQUAL(OUString("line"), aFields[5]->getString());
 aFields[5]->getPropertyValue("CharHeight") >>= nFontSize;
 aFields[5]->getPropertyValue("CharColor") >>= nFontColor;
-CPPUNIT_ASSERT_EQUAL(static_cast(13), nFontSize);
+CPPUNIT_ASSERT_EQUAL(static_cast(11.97), nFontSize);
 CPPUNIT_ASSERT_EQUAL(static_cast(0xbf9000), nFontColor);
 
 
CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_NEWLINE,
 aFields[6]->getFieldType());
diff --git a/chart2/qa/extras/data/xlsx/custom_data_label.xlsx 
b/chart2/qa/extras/data/xlsx/custom_data_label.xlsx
new file mode 100644
index ..cc69aaf0dc66
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/custom_data_label.xlsx 
differ
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx 
b/oox/source/drawingml/chart/seriesconverter.cxx
index 32ee4fbd2cd7..47e2f643b900 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -322,6 +322,7 @@ void DataLabelConverter::convertFromModel( const Reference< 
XDataSeries >& rxDat
 
 // Store properties
 oox::PropertySet aProp

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 6d1b079b0c034948384a11675c6f7f52a29d23d7
Author: Julien Nabet 
AuthorDate: Sun Feb 14 10:05:12 2021 +0100
Commit: Eike Rathke 
CommitDate: Thu Feb 18 11:55:52 2021 +0100

tdf#140400: Percentile function wizard has a typo in the hint

Change-Id: I4f0c72f974b410a2da7e0c7c2c505ecbf5a6a751
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110879
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index a5a5e2449fc6..a5479ebdb226 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -1938,11 +1938,11 @@ const char* SC_OPCODE_MEDIAN_ARY[] =
 // -=*# Resource for function PERCENTILE #*=-
 const char* SC_OPCODE_PERCENTILE_ARY[] =
 {
-NC_("SC_OPCODE_PERCENTILE", "Returns the alpha quantile of a sample."),
+NC_("SC_OPCODE_PERCENTILE", "Returns the alpha percentile of a sample."),
 NC_("SC_OPCODE_PERCENTILE", "Data"),
 NC_("SC_OPCODE_PERCENTILE", "The array of the data in the sample."),
 NC_("SC_OPCODE_PERCENTILE", "Alpha"),
-NC_("SC_OPCODE_PERCENTILE", "The percentage rate of the quantile between 0 
and 1.")
+NC_("SC_OPCODE_PERCENTILE", "The percentile value between 0 and 1, 
inclusive.")
 };
 
 // -=*# Resource for function PERCENTILE.EXC #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6953b18e20d048abc1330b79fc57c395db00bac3
Author: Caolán McNamara 
AuthorDate: Wed Feb 17 10:05:44 2021 +
Commit: Michael Stahl 
CommitDate: Thu Feb 18 11:26:13 2021 +0100

Resolves: tdf#140444 return early before null-deref

Change-Id: I85c0d178c3d6e375beb3ad50c4bae9ba0ac29937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111033
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx 
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index cd4d9c6e8b80..0e52b87baf95 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -766,13 +766,15 @@ std::unique_ptr 
OAppDetailPageHelper::elementAdded(ElementType _
 {
 std::unique_ptr xRet;
 DBTreeViewBase* pTreeView = m_aLists[_eType].get();
+if (!pTreeView)
+return xRet;
 weld::TreeView& rTreeView = pTreeView->GetWidget();
 rTreeView.make_unsorted();
-if( _eType == E_TABLE && pTreeView )
+if (_eType == E_TABLE)
 {
 xRet = 
static_cast(pTreeView->getListBox()).addedTable( _rName );
 }
-else if ( pTreeView )
+else
 {
 std::unique_ptr xEntry;
 Reference xChild(_rObject,UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sw/qa sw/source

[Tibor Nagy (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf133702.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx|9 +
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx |   10 +-
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |4 ++--
 sw/source/filter/ww8/docxattributeoutput.cxx  |   13 +
 6 files changed, 26 insertions(+), 12 deletions(-)

New commits:
commit 083da8cfe23878c2ff3fde88106fa1a93a57041e
Author: Tibor Nagy 
AuthorDate: Wed Jul 29 11:10:04 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 11:03:43 2021 +0100

tdf#133702 DOCX export: fix frame anchor position

On saving a frame from Writer the anchor moves to the next
paragraph, moving the whole frame lower in the document.

Co-authored-by: Attila Szűcs (NISZ)
Change-Id: Ic47becb323282500871d825c12330b328f5059d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99673
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit e5f0c4dd632d3c4a9eea36f65974d6004ac07983)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111049
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf133702.docx 
b/sw/qa/extras/ooxmlexport/data/tdf133702.docx
new file mode 100644
index ..46e08a920ca3
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133702.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 3f8c025e8aa8..ff1e2cb45038 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -275,6 +275,15 @@ DECLARE_OOXMLEXPORT_TEST(testImageSpaceSettings, 
"tdf135047_ImageSpaceSettings.f
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:anchor", "distR", "90170");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133702, "tdf133702.docx")
+{
+xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[1]/w:pPr/w:framePr");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index e6645a0e819f..83aef189b416 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1339,7 +1339,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf112287, 
"tdf112287.docx")
 
 xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
 
-assertXPath(pXmlDocument, 
"/w:document/w:body/w:p[2]/w:pPr/w:framePr","vAnchor","margin");
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:p[1]/w:pPr/w:framePr","vAnchor","margin");
 }
 
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testZOrderInHeader, 
"tdf120760_ZOrderInHeader.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index d3099505aa12..6e7dad9fd2fa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -48,8 +48,8 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133701, 
"tdf133701.docx")
 if (!pXmlDocument)
 return;
 
-assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", 
"hSpace", "567");
-assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", 
"vSpace", "284");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[1]/w:pPr/w:framePr", 
"hSpace", "567");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[1]/w:pPr/w:framePr", 
"vSpace", "284");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle, "dml-shape-title.docx")
@@ -1000,7 +1000,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133457, "tdf133457.docx")
 if (!pXmlDocument)
 return;
 
-assertXPath(pXmlDocument, "/w:document/w:body/w:p[4]/w:pPr/w:framePr", 
"vAnchor", "text");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[3]/w:pPr/w:framePr", 
"vAnchor", "text");
 }
 
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133924, "tdf133924.docx")
@@ -1009,8 +1009,8 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133924, 
"tdf133924.docx")
 if (!pXmlDocument)
 return;
 
-assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", 
"wrap", "around");
-assertXPath(pXmlDocument, "/w:document/w:body/w:p[3]/w:pPr/w:framePr", 
"wrap", "notBeside");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[1]/w:pPr/w:framePr", 
"wrap", "around");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", 
"wrap", "notBeside");
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index df4ac56ec5b1..645091e56323 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfie

[Libreoffice-commits] translations.git: Changes to 'distro/cib/libreoffice-6-4'

[Christian Lohmaier (via logerrit)]

New branch 'distro/cib/libreoffice-6-4' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

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

New commits:
commit f36c3a7dc21e33bf7a2e47a6151775a7f747c6a8
Author: Andras Timar 
AuthorDate: Wed Feb 17 12:58:20 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 18 10:40:37 2021 +0100

On aarch64 platform deb package platform string should be arm64 actually

Change-Id: I0b4b04e4a6f5c474b3961e5223128e0c835b8c44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111096
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index c3e15f6397de..368ef699159b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4806,6 +4806,7 @@ linux-gnu*)
 CPUNAME=AARCH64
 PLATFORMID=linux_aarch64
 RTL_ARCH=AARCH64
+EPM_FLAGS="-a arm64"
 ;;
 alpha)
 CPUNAME=AXP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sc/qa sc/source

[Attila Szűcs (via logerrit)]

 sc/qa/unit/data/ods/tdf121716_EvenHeaderFooter.ods |binary
 sc/qa/unit/subsequent_export-test.cxx  |   52 ++---
 sc/source/filter/excel/xepage.cxx  |   49 +--
 sc/source/filter/excel/xipage.cxx  |8 ++-
 sc/source/filter/excel/xlpage.cxx  |3 +
 sc/source/filter/inc/xlpage.hxx|9 +++
 6 files changed, 106 insertions(+), 15 deletions(-)

New commits:
commit 74ff90587db28aa199fdbcae0abb7f37f83fb617
Author: Attila Szűcs 
AuthorDate: Thu Jul 23 14:51:01 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 10:36:27 2021 +0100

tdf#121716 XLSX export: fix loss of left header (footer)

when footer (header) is shared (even).

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I6e656f2df1f9b6522af933bd1c71b8d60bbfe19f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99315
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit a858284092e976fa284d5ed118e366d9860ec9bb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111048
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sc/qa/unit/data/ods/tdf121716_EvenHeaderFooter.ods 
b/sc/qa/unit/data/ods/tdf121716_EvenHeaderFooter.ods
new file mode 100644
index ..2666a9d4291e
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf121716_EvenHeaderFooter.ods 
differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 56f38a3697a9..e84a464ab886 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -257,8 +257,9 @@ public:
 void testTdf131372();
 void testTdf122331();
 void testTdf83779();
-void testTdf134817_HeaderFooterTextWith2SectionXLSX();
+void testTdf121716_ExportEvenHeaderFooterXLSX();
 void testTdf134459_HeaderFooterColorXLSX();
+void testTdf134817_HeaderFooterTextWith2SectionXLSX();
 void testHeaderFontStyleXLSX();
 void testTdf135828_Shape_Rect();
 void testTdf123353();
@@ -414,6 +415,7 @@ public:
 CPPUNIT_TEST(testTdf131372);
 CPPUNIT_TEST(testTdf122331);
 CPPUNIT_TEST(testTdf83779);
+CPPUNIT_TEST(testTdf121716_ExportEvenHeaderFooterXLSX);
 CPPUNIT_TEST(testTdf134817_HeaderFooterTextWith2SectionXLSX);
 CPPUNIT_TEST(testTdf134459_HeaderFooterColorXLSX);
 CPPUNIT_TEST(testHeaderFontStyleXLSX);
@@ -5195,20 +5197,36 @@ void ScExportTest::testTdf83779()
 xShell->DoClose();
 }
 
-void ScExportTest::testTdf134817_HeaderFooterTextWith2SectionXLSX()
+void ScExportTest::testTdf121716_ExportEvenHeaderFooterXLSX()
 {
-// Header/footer text with multiple selection should be exported, and 
imported properly
-ScDocShellRef xShell = loadDoc("tdf134817_HeaderFooterTextWith2Section.", 
FORMAT_XLSX);
+// Header and footer on even pages should be exported properly
+// If there are separate odd/even header, but only 1 footer for all pages 
(this is possible only in LibreOffice)
+//  then the footer will be duplicated to have the same footer separately 
for even/odd pages
+
+ScDocShellRef xShell = loadDoc("tdf121716_EvenHeaderFooter.", FORMAT_ODS);
 CPPUNIT_ASSERT(xShell.is());
 
 ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
 CPPUNIT_ASSERT(xDocSh.is());
 
-xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, 
m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX);
+std::shared_ptr pXPathFile = 
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/worksheets/sheet1.xml");
 CPPUNIT_ASSERT(pDoc);
 
-assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddHeader", 
"&L&\"Abadi,Regular\"&11aaa&\"Bembo,Regular\"&20bbb");
-assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddFooter", 
"&R&\"Cambria,Regular\"&14camb&\"Dante,Regular\"&18dant");
+assertXPath(pDoc, "/x:worksheet/x:headerFooter", "differentOddEven", 
"true");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddHeader", 
"&Lodd/right&Cpage&Rheader");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddFooter", 
"&Lboth&C&12page&Rfooter");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:evenHeader", 
"&Lpage&Cheader&Reven/left");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:evenFooter", 
"&Lboth&C&12page&Rfooter");
+
+pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/worksheets/sheet2.xml");
+CPPUNIT_ASSERT(pDoc);
+
+assertXPath(pDoc, "/x:worksheet/x:headerFooter", "differentOddEven", 
"true");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddHeader", 
"&Coddh");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:oddFooter", 
"&Coddf");
+assertXPathContent(pDoc, "/x:worksheet/x:headerFooter/x:evenHeader", 
"&Cevenh");
+assertXPathContent(pDoc, "/x

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

[Stephan Bergmann (via logerrit)]

 vcl/source/font/font.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0f2256b90fb30a5a7858f93c168d9da12061e70
Author: Stephan Bergmann 
AuthorDate: Thu Feb 18 08:39:45 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 18 10:31:33 2021 +0100

Fix an OUString construction

...introduced with 9d161857f1d4afcb772b477455797a2da0e47a9b "tdf#127471 
correct
EMF/WMF im/export for scaled font"

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

diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 67fc3e7bc633..0edcb913aaf7 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -389,7 +389,7 @@ tools::Long Font::GetOrCalculateAverageFontWidth() const
 aUnscaledFont.SetAverageFontWidth(0);
 pVirDev->SetFont(aUnscaledFont);
 const double fAverageFontWidth(
-pVirDev->GetTextWidth(OUString(aArray.data())) / 
static_cast(nSize));
+pVirDev->GetTextWidth(OUString(aArray.data(), nSize)) / 
static_cast(nSize));
 
const_cast(this)->mpImplFont->SetCalculatedAverageFontWidth(basegfx::fround(fAverageFontWidth));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Local LO build on Raspberry pi 4b doesn't launch

[Stephan Bergmann]

On 17/02/2021 19:39, julien2412 wrote:

Another bt this time without Python (with gtk3 rendering so all the
accessibility stuff), I'll try with gen rendering.
bt2.txt



Looks like an issue passing the rType argument of


#12 (anonymous namespace)::ProxyRoot::queryAggregation(com::sun::star::uno::Type 
const&) (this=0x2fe7f90, rType=) at 
stoc/source/proxy_factory/proxyfac.cxx:308


through the binary UNO bridge to the aType argument of


#5  0xb48d5d10 in cppu::ImplInheritanceHelper::queryInterface(com::sun::star::uno::Type 
const&) (this=0xbee96380, aType=...) at include/cppuhelper/implbase.hxx:165


Maybe an issue with calling conventions and the assembly code at


#7  0xac1c97a0 in (anonymous namespace)::callVirtualMethod(void*, long, void*, 
_typelib_TypeDescriptionReference*, unsigned long*, unsigned long, unsigned 
long*, unsigned long, double*)
(pThis=0x2f97cf4, nVtableIndex=0, pRegisterReturn=0xbee961f8, 
pReturnType=0x1555318, pStack=0xbee96208, nStack=0, pGPR=0xbee963f4, nGPR=3, 
pFPR=0xbee963b0)
at bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:270


And if there is a general issue with parameter passing through the 
binary UNO bridge, that would most probably also be the reason for your 
first crash at 
.


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

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/inc vcl/source

[Armin Le Grand (Allotropia) (via logerrit)]

 vcl/inc/impfont.hxx  |4 -
 vcl/source/font/font.cxx |  117 ---
 2 files changed, 114 insertions(+), 7 deletions(-)

New commits:
commit 0f21cec340059f8895ebc4c549a695025e70d068
Author: Armin Le Grand (Allotropia) 
AuthorDate: Tue Feb 2 17:57:12 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 18 10:09:07 2021 +0100

tdf#127471 improve SVM FontScaling im/export

Due to svg::Font Width and it's expression of
FontScaling being system-dependent the FontScaling
when exchanging beween win-based SVM creators and
others was creating errors.
Corrected this to work now with newly created SVM
files in both directions. For more aspects see
discussion in task.

Change-Id: I326e4e7e895a9dfc3cdfc5323174ca81e22795e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110330
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 40b56cd8da8c38582dc4660b486993d1b4711535)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111039
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index b9b8fb4654e4..d2933b63a5f0 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -83,8 +83,8 @@ public:
 
 private:
 friend class vcl::Font;
-friend SvStream&ReadImplFont( SvStream& rIStm, ImplFont& );
-friend SvStream&WriteImplFont( SvStream& rOStm, const ImplFont& );
+friend SvStream&ReadImplFont( SvStream& rIStm, ImplFont&, long& );
+friend SvStream&WriteImplFont( SvStream& rOStm, const ImplFont&, const 
long& );
 
 voidAskConfig();
 
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 0d4cc3a480e0..be5fa5e1c719 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -35,6 +35,12 @@
 
 #include 
 
+#ifdef _WIN32
+#include 
+#include 
+#include 
+#endif
+
 using namespace vcl;
 
 namespace
@@ -358,7 +364,7 @@ void Font::GetFontAttributes( FontAttributes& rAttrs ) const
 rAttrs.SetSymbolFlag( mpImplFont->GetCharSet() == RTL_TEXTENCODING_SYMBOL 
);
 }
 
-SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont )
+SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont, long& 
rnNormedFontScaling )
 {
 VersionCompat   aCompat( rIStm, StreamMode::READ );
 sal_uInt16  nTmp16(0);
@@ -399,15 +405,25 @@ SvStream& ReadImplFont( SvStream& rIStm, ImplFont& 
rImplFont )
 rIStm.ReadUInt16( nTmp16 ); rImplFont.meOverline = 
static_cast(nTmp16);
 }
 
+// tdf#127471 read NormedFontScaling
+if( aCompat.GetVersion() >= 4 )
+{
+sal_Int32 nNormedFontScaling(0);
+rIStm.ReadInt32(nNormedFontScaling);
+rnNormedFontScaling = nNormedFontScaling;
+}
+
 // Relief
 // CJKContextLanguage
 
 return rIStm;
 }
 
-SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont )
+SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont, const 
long& rnNormedFontScaling )
 {
-VersionCompat aCompat( rOStm, StreamMode::WRITE, 3 );
+// tdf#127471 increase to version 4
+VersionCompat aCompat( rOStm, StreamMode::WRITE, 4 );
+
 rOStm.WriteUniOrByteString( rImplFont.GetFamilyName(), 
rOStm.GetStreamCharSet() );
 rOStm.WriteUniOrByteString( rImplFont.GetStyleName(), 
rOStm.GetStreamCharSet() );
 WritePair( rOStm, rImplFont.maAverageFontSize );
@@ -438,17 +454,108 @@ SvStream& WriteImplFont( SvStream& rOStm, const 
ImplFont& rImplFont )
 // new in version 3
 rOStm.WriteUInt16( rImplFont.meOverline );
 
+// new in version 4, NormedFontScaling
+rOStm.WriteInt32(rnNormedFontScaling);
+
 return rOStm;
 }
 
 SvStream& ReadFont( SvStream& rIStm, vcl::Font& rFont )
 {
-return ReadImplFont( rIStm, *rFont.mpImplFont );
+// tdf#127471 try to read NormedFontScaling
+long nNormedFontScaling(0);
+SvStream& rRetval(ReadImplFont( rIStm, *rFont.mpImplFont, 
nNormedFontScaling ));
+
+if (nNormedFontScaling > 0)
+{
+#ifdef _WIN32
+// we run on windows and a NormedFontScaling was written
+if(rFont.GetFontSize().getWidth() == nNormedFontScaling)
+{
+// the writing producer was running on a non-windows system, adapt 
to needed windows
+// system-specific pre-multiply
+const long nHeight(std::max(rFont.GetFontSize().getHeight(), 
0));
+sal_uInt32 nScaledWidth(0);
+
+if(nHeight > 0)
+{
+vcl::Font aUnscaledFont(rFont);
+aUnscaledFont.SetAverageFontWidth(0);
+const FontMetric 
aUnscaledFontMetric(Application::GetDefaultDevice()->GetFontMetric(aUnscaledFont));
+
+if (aUnscaledFontMetric.GetAverageFontWidth() > 0)
+{
+const double 
fScaleFactor(static_cast(nNormedFontScaling) / 
static_cast(nHeight));
+nScale

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - vcl/inc vcl/source

[Armin Le Grand (Allotropia) (via logerrit)]

 vcl/inc/impfont.hxx  |4 -
 vcl/source/font/font.cxx |  117 ---
 2 files changed, 114 insertions(+), 7 deletions(-)

New commits:
commit 7d974de2ad79cccea69b1bd54eea3c72821e6b49
Author: Armin Le Grand (Allotropia) 
AuthorDate: Tue Feb 2 17:57:12 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 18 10:08:26 2021 +0100

tdf#127471 improve SVM FontScaling im/export

Due to svg::Font Width and it's expression of
FontScaling being system-dependent the FontScaling
when exchanging beween win-based SVM creators and
others was creating errors.
Corrected this to work now with newly created SVM
files in both directions. For more aspects see
discussion in task.

Change-Id: I326e4e7e895a9dfc3cdfc5323174ca81e22795e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110330
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 40b56cd8da8c38582dc4660b486993d1b4711535)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111040
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 7f4301d97778..5e7e75a69246 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -84,8 +84,8 @@ public:
 
 private:
 friend class vcl::Font;
-friend SvStream&ReadImplFont( SvStream& rIStm, ImplFont& );
-friend SvStream&WriteImplFont( SvStream& rOStm, const ImplFont& );
+friend SvStream&ReadImplFont( SvStream& rIStm, ImplFont&, long& );
+friend SvStream&WriteImplFont( SvStream& rOStm, const ImplFont&, const 
long& );
 
 voidAskConfig();
 
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 4db757cd7532..87514537425d 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -34,6 +34,12 @@
 #include 
 #include 
 
+#ifdef _WIN32
+#include 
+#include 
+#include 
+#endif
+
 using namespace vcl;
 
 namespace
@@ -357,7 +363,7 @@ void Font::GetFontAttributes( FontAttributes& rAttrs ) const
 rAttrs.SetSymbolFlag( mpImplFont->GetCharSet() == RTL_TEXTENCODING_SYMBOL 
);
 }
 
-SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont )
+SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont, long& 
rnNormedFontScaling )
 {
 VersionCompat   aCompat( rIStm, StreamMode::READ );
 sal_uInt16  nTmp16(0);
@@ -399,15 +405,25 @@ SvStream& ReadImplFont( SvStream& rIStm, ImplFont& 
rImplFont )
 rIStm.ReadUInt16( nTmp16 ); rImplFont.meOverline = 
static_cast(nTmp16);
 }
 
+// tdf#127471 read NormedFontScaling
+if( aCompat.GetVersion() >= 4 )
+{
+sal_Int32 nNormedFontScaling(0);
+rIStm.ReadInt32(nNormedFontScaling);
+rnNormedFontScaling = nNormedFontScaling;
+}
+
 // Relief
 // CJKContextLanguage
 
 return rIStm;
 }
 
-SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont )
+SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont, const 
long& rnNormedFontScaling )
 {
-VersionCompat aCompat( rOStm, StreamMode::WRITE, 3 );
+// tdf#127471 increase to version 4
+VersionCompat aCompat( rOStm, StreamMode::WRITE, 4 );
+
 TypeSerializer aSerializer(rOStm);
 rOStm.WriteUniOrByteString( rImplFont.GetFamilyName(), 
rOStm.GetStreamCharSet() );
 rOStm.WriteUniOrByteString( rImplFont.GetStyleName(), 
rOStm.GetStreamCharSet() );
@@ -439,17 +455,108 @@ SvStream& WriteImplFont( SvStream& rOStm, const 
ImplFont& rImplFont )
 // new in version 3
 rOStm.WriteUInt16( rImplFont.meOverline );
 
+// new in version 4, NormedFontScaling
+rOStm.WriteInt32(rnNormedFontScaling);
+
 return rOStm;
 }
 
 SvStream& ReadFont( SvStream& rIStm, vcl::Font& rFont )
 {
-return ReadImplFont( rIStm, *rFont.mpImplFont );
+// tdf#127471 try to read NormedFontScaling
+long nNormedFontScaling(0);
+SvStream& rRetval(ReadImplFont( rIStm, *rFont.mpImplFont, 
nNormedFontScaling ));
+
+if (nNormedFontScaling > 0)
+{
+#ifdef _WIN32
+// we run on windows and a NormedFontScaling was written
+if(rFont.GetFontSize().getWidth() == nNormedFontScaling)
+{
+// the writing producer was running on a non-windows system, adapt 
to needed windows
+// system-specific pre-multiply
+const long nHeight(std::max(rFont.GetFontSize().getHeight(), 
0));
+sal_uInt32 nScaledWidth(0);
+
+if(nHeight > 0)
+{
+vcl::Font aUnscaledFont(rFont);
+aUnscaledFont.SetAverageFontWidth(0);
+const FontMetric 
aUnscaledFontMetric(Application::GetDefaultDevice()->GetFontMetric(aUnscaledFont));
+
+if (aUnscaledFontMetric.GetAverageFontWidth() > 0)
+{
+const double 
fScaleFactor(static_cast(nNormedFontScaling) / 
static_cast(nHeight));
+nScaledWidt

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sw/qa writerfilter/source

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

 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   14 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |7 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   19 +++
 3 files changed, 40 insertions(+)

New commits:
commit 521e350ff967bfc3019e8184a0d077228853fba1
Author: László Németh 
AuthorDate: Tue Jun 9 14:42:26 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Feb 18 10:01:55 2021 +0100

tdf#131070 DOCX import: fix indentation of direct numbering

Indentation came from direct numbering has precedence over
table style.

Also paragraph style based right indentation affects DOCX list
items with not paragraph style based numbering, unlike Writer.

Keep all indentation values using direct paragraph formatting.

Change-Id: Ia66645269a4fcd06f0be4f02c775007c83d22a0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95954
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 20ba8d8d9f4fcf7d5826fcb3366a9bff0d6a8ca1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111047
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index ae47d4f28a9c..eca4c431fbc4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -386,6 +386,20 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118812, 
"tdf118812_tableStyles-compre
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[6]/w:tc/w:p/w:r[2]/w:rPr/w:color", 1);
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[6]/w:tc/w:p/w:r[2]/w:rPr/w:color", "val", 
"00");
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[6]/w:tc/w:p/w:r[2]/w:rPr/w:sz", "val", "16");
+
+// tdf#131070 keep paragraph style based right indentation with 
indentation of direct numbering
+// cell A7 - This was 
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[7]/w:tc/w:p/w:pPr/w:ind", 0);
+// cell A8
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[8]/w:tc/w:p/w:pPr/w:ind", "start", "714");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[8]/w:tc/w:p/w:pPr/w:ind", "end", "1701");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[8]/w:tc/w:p/w:pPr/w:ind", "hanging", "357");
+// cell A9
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[9]/w:tc/w:p/w:pPr/w:ind", "end", "1440");
+// This was 1440
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[9]/w:tc/w:p/w:pPr/w:ind", "start", "720");
+// This was 0
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[9]/w:tc/w:p/w:pPr/w:ind", "hanging", "360");
 }
 
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf107626, "tdf107626.odt")
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index c32b33af10c4..d5bde5aea4d8 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1074,6 +1074,13 @@ void 
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
 // if there is no direct paragraph formatting
 if ( !rParaProp.m_pPropertyMap->isSet(eId) )
 {
+if ( (eId == PROP_PARA_LEFT_MARGIN || eId == 
PROP_PARA_FIRST_LINE_INDENT) &&
+rParaProp.m_pPropertyMap->isSet(PROP_NUMBERING_RULES) )
+{
+// indentation of direct numbering has bigger precedence, than 
table style
+continue;
+}
+
 OUString sPropertyName = getPropertyName(eId);
 auto pCellProp = std::find_if(rCellProperties.begin(), 
rCellProperties.end(),
 [&](const beans::PropertyValue& rProp) { return rProp.Name == 
sPropertyName; });
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 40fef6294438..07de495c68f2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1468,6 +1468,25 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
 pParaContext->Insert(PROP_PARA_RIGHT_MARGIN, 
uno::makeAny(nParaRightMargin), /*bOverwrite=*/false);
 }
 }
+// Paragraph style based right paragraph indentation affects not 
paragraph style based lists in DOCX.
+// Apply it as direct formatting, also left and first line indentation 
of numbering to keep them.
+else if (isNumberingViaRule)
+{
+uno::Any aRightMargin = 
GetPropertyFromParaStyleSheet(PROP_PARA_RIGHT_MARGIN);
+if ( aRightMargin != uno::Any() )
+{
+pParaContext->Insert(PROP_PARA_RIGHT_MARGIN, aRightMargin, 
/*bOverwrite=*/false);
+
+sal_Int32 
nLi

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

[Quan Nguyen (via logerrit)]

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |4 +---
 chart2/source/inc/TitleHelper.hxx   |2 ++
 chart2/source/tools/TitleHelper.cxx |   11 +++
 chart2/source/view/main/ChartView.cxx   |2 +-
 chart2/source/view/main/VTitle.cxx  |   15 +++
 chart2/source/view/main/VTitle.hxx  |2 ++
 6 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 62dff2844b0bf1d1bcb8eb4d6db529ef4a31bee4
Author: Quan Nguyen 
AuthorDate: Mon Feb 15 07:49:33 2021 +0700
Commit: Noel Grandin 
CommitDate: Thu Feb 18 09:49:06 2021 +0100

tdf#92768 Add rendering support for hiding title object in chart2

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

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index b14705cc8080..5212186da371 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -665,9 +665,7 @@ void 
ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bV
 }
 else
 {
-// TODO tdf#92768 use TitleHelper::hideTitle() here once there is
-// rendering support for the property "Visible"
-TitleHelper::removeTitle(eTitle, mxModel);
+TitleHelper::hideTitle(eTitle, mxModel);
 }
 }
 
diff --git a/chart2/source/inc/TitleHelper.hxx 
b/chart2/source/inc/TitleHelper.hxx
index 0628252f5fd6..c85b5ce1a3ff 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -89,6 +89,8 @@ public:
 static bool getTitleType( eTitleType& rType
 , const css::uno::Reference< css::chart2::XTitle >& xTitle
 , const css::uno::Reference< css::frame::XModel >& xModel 
);
+static void hideTitle( eTitleType nTitleIndex,
+const css::uno::Reference< css::frame::XModel > & xModel);
 };
 
 } //namespace chart
diff --git a/chart2/source/tools/TitleHelper.cxx 
b/chart2/source/tools/TitleHelper.cxx
index 600ebedd2d3b..bc11c4f99c32 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -436,6 +436,17 @@ bool TitleHelper::getTitleType( eTitleType& rType
 return false;
 }
 
+void TitleHelper::hideTitle( TitleHelper::eTitleType nTitleIndex
+, const css::uno::Reference< css::frame::XModel >& xModel)
+{
+uno::Reference< chart2::XTitle > xTitled( TitleHelper::getTitle( 
nTitleIndex, xModel ) );
+if( xTitled.is())
+{
+css::uno::Reference xProps(xTitled, 
css::uno::UNO_QUERY_THROW);
+xProps->setPropertyValue("Visible",css::uno::makeAny(false));
+}
+}
+
 } //namespace chart
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index c88144137721..93bf35672123 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2131,7 +2131,7 @@ std::shared_ptr lcl_createTitle( 
TitleHelper::eTitleType eType
 
 uno::Reference< XTitle > xTitle( TitleHelper::getTitle( eType, rModel ) );
 OUString aCompleteString = TitleHelper::getCompleteString(xTitle);
-if (aCompleteString.isEmpty())
+if (aCompleteString.isEmpty() || !VTitle::isVisible(xTitle))
 return apVTitle;
 
 //create title
diff --git a/chart2/source/view/main/VTitle.cxx 
b/chart2/source/view/main/VTitle.cxx
index f0befe954659..ad2e857101fb 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -97,6 +97,21 @@ void VTitle::changePosition( const awt::Point& rPos )
 }
 }
 
+bool VTitle::isVisible(const uno::Reference< XTitle >& xTitle) {
+if (!xTitle.is()) {
+return false;
+}
+bool bShow = true;
+try {
+uno::Reference< beans::XPropertySet > xTitleProps(xTitle, 
uno::UNO_QUERY_THROW);
+xTitleProps->getPropertyValue("Visible") >>= bShow;
+} catch (const uno::Exception &) {
+DBG_UNHANDLED_EXCEPTION("chart2");
+}
+return bShow;
+}
+
+
 void VTitle::createShapes(
   const awt::Point& rPos
 , const awt::Size& rReferenceSize
diff --git a/chart2/source/view/main/VTitle.hxx 
b/chart2/source/view/main/VTitle.hxx
index 6d330076dedf..cdfd0a89cdc4 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -51,6 +51,8 @@ public:
 css::awt::Size getUnrotatedSize() const;
 css::awt::Size getFinalSize() const;
 voidchangePosition( const css::awt::Point& rPos );
+static bool isVisible(
+const css::uno::Reference< css::chart2::XTitle > & xTitle);
 
 private:
 css::uno::Reference< css::drawing::XShapes >m_xTarget;
___

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ad4d715ca69d6f09fb2d8a713c79edb999ad2316
Author: Caolán McNamara 
AuthorDate: Wed Feb 17 10:05:44 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 18 09:40:32 2021 +0100

Resolves: tdf#140444 return early before null-deref

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

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx 
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 02a80d2046d7..4d6b88f79738 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -766,13 +766,15 @@ std::unique_ptr 
OAppDetailPageHelper::elementAdded(ElementType _
 {
 std::unique_ptr xRet;
 DBTreeViewBase* pTreeView = m_aLists[_eType].get();
+if (!pTreeView)
+return xRet;
 weld::TreeView& rTreeView = pTreeView->GetWidget();
 rTreeView.make_unsorted();
-if( _eType == E_TABLE && pTreeView )
+if (_eType == E_TABLE)
 {
 xRet = 
static_cast(pTreeView->getListBox()).addedTable( _rName );
 }
-else if ( pTreeView )
+else
 {
 std::unique_ptr xEntry;
 Reference xChild(_rObject,UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomoyuki Kubota (via logerrit)]

 sw/source/core/text/guess.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddde467cdc60a0373c952c04b5f138ad96ff66e4
Author: Tomoyuki Kubota 
AuthorDate: Wed Feb 17 19:37:47 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 18 09:14:15 2021 +0100

adapt to prefixing , even when OSL_DEBUG_LEVEL > 1

Change-Id: I5fe9755eaf0cce963fda2dbc2ec27b31d0d7dc52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111045
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 8f7d39566973..8bf9819c4d66 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -205,10 +205,10 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 m_nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, 
rInf.GetCachedVclData().get() );
 
 #if OSL_DEBUG_LEVEL > 1
-if ( TextFrameIndex(COMPLETE_STRING) != nCutPos )
+if ( TextFrameIndex(COMPLETE_STRING) != m_nCutPos )
 {
 sal_uInt16 nMinSize;
-rInf.GetTextSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
+rInf.GetTextSize( &rSI, rInf.GetIdx(), m_nCutPos - rInf.GetIdx(),
  nMaxComp, nMinSize, nMaxSizeDiff );
 OSL_ENSURE( nMinSize <= nLineWidth, "What a Guess!!!" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 sdext/source/pdfimport/misc/pwdinteract.cxx |2 +-
 sdext/source/presenter/PresenterAccessibility.cxx   |8 
 sdext/source/presenter/PresenterProtocolHandler.cxx |2 +-
 sdext/source/presenter/PresenterToolBar.cxx |6 +++---
 sdext/source/presenter/PresenterViewFactory.cxx |2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 6cb2365511e23abd22f76cda76981222b81efdc4
Author: Noel 
AuthorDate: Wed Feb 17 18:23:31 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 09:13:48 2021 +0100

loplugin:referencecasting in sdext

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

diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx 
b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 4eb7e7d96281..4179795cc073 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -161,7 +161,7 @@ bool getPassword( const uno::Reference< 
task::XInteractionHandler >& xHandler,
 new PDFPasswordRequest( bFirstTry, rDocName ) );
 try
 {
-xHandler->handle( xReq.get() );
+xHandler->handle( xReq );
 }
 catch( uno::Exception& )
 {
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx 
b/sdext/source/presenter/PresenterAccessibility.cxx
index 936c75df35f7..768f4717a48d 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -617,7 +617,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
 mxNotesContentWindow,
 mxNotesBorderWindow,
 rpNotesTextView);
-mpAccessibleConsole->AddChild(mpAccessibleNotes.get());
+mpAccessibleConsole->AddChild(mpAccessibleNotes);
 }
 }
 
@@ -809,7 +809,7 @@ Reference SAL_CALL
 if (nIndex<0 || nIndex>=sal_Int32(maChildren.size()))
 throw lang::IndexOutOfBoundsException("invalid child index", 
static_cast(this));
 
-return Reference(maChildren[nIndex].get());
+return maChildren[nIndex];
 }
 
 Reference SAL_CALL
@@ -1367,7 +1367,7 @@ Reference SAL_CALL
 }
 }
 
-return Reference(pSet.get());
+return pSet;
 }
 
 //- XAccessibleText ---
@@ -1684,7 +1684,7 @@ rtl::Reference 
AccessibleNotes::Create (
 pObject->UpdateStateSet();
 pObject->SetWindow(rxContentWindow, rxBorderWindow);
 
-return 
rtl::Reference(pObject.get());
+return pObject;
 }
 
 void AccessibleNotes::SetTextView (
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx 
b/sdext/source/presenter/PresenterProtocolHandler.cxx
index ff2cf4f251c5..0ee967ffe063 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -340,7 +340,7 @@ Reference 
PresenterProtocolHandler::Dispatch::Create (
 {
 ::rtl::Reference pDispatch (new Dispatch (rsURLPath, 
rpPresenterController));
 if (pDispatch->mpCommand != nullptr)
-return Reference(pDispatch.get());
+return pDispatch;
 else
 return nullptr;
 }
diff --git a/sdext/source/presenter/PresenterToolBar.cxx 
b/sdext/source/presenter/PresenterToolBar.cxx
index db679d94d4ee..1c70661879df 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1403,7 +1403,7 @@ namespace {
 {
 ::rtl::Reference pElement (new Button(rpToolBar));
 pElement->Initialize();
-return ::rtl::Reference(pElement.get());
+return pElement;
 }
 
 Button::Button (
@@ -1765,7 +1765,7 @@ void TimeLabel::ConnectToTimer()
 {
 ::rtl::Reference pElement(new CurrentTimeLabel(rpToolBar));
 pElement->ConnectToTimer();
-return ::rtl::Reference(pElement.get());
+return pElement;
 }
 
 CurrentTimeLabel::~CurrentTimeLabel()
@@ -1802,7 +1802,7 @@ void CurrentTimeLabel::SetModes (
 {
 ::rtl::Reference pElement(new PresentationTimeLabel(rpToolBar));
 pElement->ConnectToTimer();
-return ::rtl::Reference(pElement.get());
+return pElement;
 }
 
 PresentationTimeLabel::~PresentationTimeLabel()
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx 
b/sdext/source/presenter/PresenterViewFactory.cxx
index 6a59a32935d7..01b40d6e2ab8 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -355,7 +355,7 @@ Reference PresenterViewFactory::CreateSlideShowView(
 Reference(mxControllerWeak),
 mpPresenterController));
 pShowView->LateInit();
-xView.set(pShowView.get());
+xView = pShowView;
 }
 catch (RuntimeException&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinf

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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx |   44 ++---
 vcl/source/pdf/PDFiumLibrary.cxx |   73 ---
 2 files changed, 72 insertions(+), 45 deletions(-)

New commits:
commit 17388045d0b2191a7af7245b286e153e30fa0f3e
Author: Miklos Vajna 
AuthorDate: Wed Feb 17 21:08:25 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 18 09:12:55 2021 +0100

pdfium: eliminate FPDF_PAGE from public header

Change-Id: I8cfe55b4b23441f7b5c3b748903137a145cc00bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111085
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 1c60e52d5f09..7bf14eb910dc 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -177,48 +177,30 @@ public:
 virtual basegfx::B2DRectangle getCharBox(int nIndex, double fPageHeight) = 
0;
 };
 
-class VCL_DLLPUBLIC PDFiumPage final
+class VCL_DLLPUBLIC PDFiumPage
 {
-private:
-FPDF_PAGE mpPage;
-
-private:
-PDFiumPage(const PDFiumPage&) = delete;
-PDFiumPage& operator=(const PDFiumPage&) = delete;
-
 public:
-PDFiumPage(FPDF_PAGE pPage)
-: mpPage(pPage)
-{
-}
+virtual ~PDFiumPage() = default;
 
-~PDFiumPage()
-{
-if (mpPage)
-FPDF_ClosePage(mpPage);
-}
-
-FPDF_PAGE getPointer() { return mpPage; }
-
-int getObjectCount();
-std::unique_ptr getObject(int nIndex);
+virtual int getObjectCount() = 0;
+virtual std::unique_ptr getObject(int nIndex) = 0;
 
-int getAnnotationCount();
-int getAnnotationIndex(std::unique_ptr const& 
rAnnotation);
+virtual int getAnnotationCount() = 0;
+virtual int getAnnotationIndex(std::unique_ptr const& 
rAnnotation) = 0;
 
-std::unique_ptr getAnnotation(int nIndex);
+virtual std::unique_ptr getAnnotation(int nIndex) = 0;
 
-std::unique_ptr getTextPage();
+virtual std::unique_ptr getTextPage() = 0;
 
 /// Get bitmap checksum of the page, without annotations/commenting.
-BitmapChecksum getChecksum(int nMDPPerm);
+virtual BitmapChecksum getChecksum(int nMDPPerm) = 0;
 
-double getWidth();
-double getHeight();
+virtual double getWidth() = 0;
+virtual double getHeight() = 0;
 
-bool hasTransparency();
+virtual bool hasTransparency() = 0;
 
-bool hasLinks();
+virtual bool hasLinks() = 0;
 };
 
 /// Represents one digital signature, as exposed by PDFium.
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index d183cd6f22c3..fda247861913 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -324,6 +324,49 @@ public:
 OUString getReason() override;
 css::util::DateTime getTime() override;
 };
+
+class PDFiumPageImpl final : public PDFiumPage
+{
+private:
+FPDF_PAGE mpPage;
+
+private:
+PDFiumPageImpl(const PDFiumPageImpl&) = delete;
+PDFiumPageImpl& operator=(const PDFiumPageImpl&) = delete;
+
+public:
+PDFiumPageImpl(FPDF_PAGE pPage)
+: mpPage(pPage)
+{
+}
+
+~PDFiumPageImpl() override
+{
+if (mpPage)
+FPDF_ClosePage(mpPage);
+}
+
+FPDF_PAGE getPointer() { return mpPage; }
+
+int getObjectCount() override;
+std::unique_ptr getObject(int nIndex) override;
+
+int getAnnotationCount() override;
+int getAnnotationIndex(std::unique_ptr const& 
rAnnotation) override;
+
+std::unique_ptr getAnnotation(int nIndex) override;
+
+std::unique_ptr getTextPage() override;
+
+BitmapChecksum getChecksum(int nMDPPerm) override;
+
+double getWidth() override;
+double getHeight() override;
+
+bool hasTransparency() override;
+
+bool hasLinks() override;
+};
 }
 
 OUString convertPdfDateToISO8601(OUString const& rInput)
@@ -558,7 +601,7 @@ std::unique_ptr PDFiumDocument::openPage(int 
nIndex)
 FPDF_PAGE pPage = FPDF_LoadPage(mpPdfDocument, nIndex);
 if (pPage)
 {
-pPDFiumPage = std::make_unique(pPage);
+pPDFiumPage = std::make_unique(pPage);
 }
 return pPDFiumPage;
 }
@@ -617,9 +660,9 @@ bool PDFiumDocument::saveWithVersion(SvMemoryStream& 
rStream, int nFileVersion)
 return true;
 }
 
-int PDFiumPage::getObjectCount() { return FPDFPage_CountObjects(mpPage); }
+int PDFiumPageImpl::getObjectCount() { return FPDFPage_CountObjects(mpPage); }
 
-std::unique_ptr PDFiumPage::getObject(int nIndex)
+std::unique_ptr PDFiumPageImpl::getObject(int nIndex)
 {
 std::unique_ptr pPDFiumPageObject;
 FPDF_PAGEOBJECT pPageObject = FPDFPage_GetObject(mpPage, nIndex);
@@ -630,15 +673,15 @@ std::unique_ptr 
PDFiumPage::getObject(int nIndex)
 return pPDFiumPageObject;
 }
 
-int PDFiumPage::getAnnotationCount() { return FPDFPage_GetAnnotCount(mpPage); }
+int PDFiumPageImpl::getAnnotationCount() { return 
FPDFPage_GetAnnotCount(mpPage); }
 
-int PDFiumPage::getAnnotationIndex(std::

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - instsetoo_native/CustomTarget_install.mk postprocess/CustomTarget_signing.mk postprocess/signing solenv/bin

[Andras Timar (via logerrit)]

 instsetoo_native/CustomTarget_install.mk|2 +-
 postprocess/CustomTarget_signing.mk |2 +-
 postprocess/signing/signing.pl  |2 +-
 solenv/bin/modules/installer/windows/msp.pm |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 305edb371a8a2f9f9e4c44f54a2fed1b7beaf935
Author: Andras Timar 
AuthorDate: Thu Feb 11 08:27:23 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 18 08:57:23 2021 +0100

try to use a different timestamp service

Change-Id: I0fdbe2871d74836d530a69532bf22c17f642c922

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 21535d4fe39f..f014f192921c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -131,7 +131,7 @@ endif
 endif # LIBO_TEST_INSTALL
touch $@
 
-TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll";
+TIMESTAMPURL ?= "http://timestamp.digicert.com/";
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done: 
\
 $(if $(filter HELP,$(BUILD_TYPE)),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done)
 \
 $(if $(filter ODK,$(BUILD_TYPE)),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done) \
diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index 413de6397e07..f675684a045a 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -15,7 +15,7 @@ $(eval $(call 
gb_CustomTarget_register_targets,postprocess/signing,\
 ))
 
 # PFXFILE and PFXPASSWORD should be set in environment
-TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll";
+TIMESTAMPURL ?= "http://timestamp.digicert.com/";
 
 $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/signing.pl \
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index b42e5bb17e89..a443984a2a7b 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -242,7 +242,7 @@ sub usage   #09.07.2007 08:39
 print "\t -e filename\t\t\tFile which contains a list of files which don't 
have to be signed.\n";
 print "\t -f pfx_filename\t\t\"Personal Information Exchange\" file.\n";
 print "\t -p password\t\t\tPassword for \"Personal Information Exchange\" 
file.\n";
-print "\t -t timestamp\t\t\tTimestamp URL e.g. 
\"http://timestamp.verisign.com/scripts/timstamp.dll\"\n";;
+print "\t -t timestamp\t\t\tTimestamp URL e.g. 
\"http://timestamp.digicert.com/\"\n";;
 print "\t -l log_filename\t\tFile for logging.\n";
 print "\t -v\t\t\t\tVerbose.\n";
 }   ##usage
diff --git a/solenv/bin/modules/installer/windows/msp.pm 
b/solenv/bin/modules/installer/windows/msp.pm
index e76d5da7ab7f..3783634ff395 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1194,7 +1194,7 @@ sub create_msp_patch
 my $systemcall = "signtool.exe sign ";
 if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'} 
"; }
 if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p 
$ENV{'PFXPASSWORD'} "; }
-if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t 
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t 
http://timestamp.globalsign.com/scripts/timestamp.dll "; }
+if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t 
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t 
http://timestamp.digicert.com/ "; }
 $systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " . 
$allvariables->{'PRODUCTVERSION'} . " Patch " . 
$allvariables->{'WINDOWSPATCHLEVEL'} . "\" ";
 $systemcall .= $localmspfilename;
 installer::logger::print_message( "... code signing and timestamping 
with signtool.exe ...\n" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits