date:20210726

 cui/source/dialogs/hldocntp.cxx  |2 
 framework/source/uielement/newmenucontroller.cxx |2 
 include/unotools/dynamicmenuoptions.hxx  |   52 --
 include/unotools/itemholderbase.hxx  |1 
 sfx2/source/appl/shutdowniconaqua.mm |2 
 sfx2/source/appl/shutdowniconw32.cxx |2 
 unotools/source/config/dynamicmenuoptions.cxx|  453 ++-
 unotools/source/config/itemholder1.cxx   |4 
 8 files changed, 144 insertions(+), 374 deletions(-)

New commits:
commit 4df98358135689e1d2600819c61c6b07d8c8a722
Author: Noel Grandin 
AuthorDate: Sun Jul 25 16:55:17 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 10:10:47 2021 +0200

simplify SvtDynamicMenuOptions

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

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 31b3ba2d5de4..8d8628ded6ed 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -158,7 +158,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList()
 {
 weld::WaitObject aWaitObj(mpDialog->getDialog());
 
-std::vector aDynamicMenuEntries( 
SvtDynamicMenuOptions().GetMenu( EDynamicMenuType::NewMenu ) );
+std::vector aDynamicMenuEntries( 
SvtDynamicMenuOptions::GetMenu( EDynamicMenuType::NewMenu ) );
 
 for ( const SvtDynMenuEntry & rDynamicMenuEntry : aDynamicMenuEntries )
 {
diff --git a/framework/source/uielement/newmenucontroller.cxx 
b/framework/source/uielement/newmenucontroller.cxx
index 4189442d701c..579fff015582 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -326,7 +326,7 @@ void NewMenuController::fillPopupMenu( Reference< 
css::awt::XPopupMenu > const &
 return;
 
 const std::vector< SvtDynMenuEntry > aDynamicMenuEntries =
-SvtDynamicMenuOptions().GetMenu( m_bNewMenu ? 
EDynamicMenuType::NewMenu : EDynamicMenuType::WizardMenu );
+SvtDynamicMenuOptions::GetMenu( m_bNewMenu ? EDynamicMenuType::NewMenu 
: EDynamicMenuType::WizardMenu );
 
 sal_uInt16 nItemId = 1;
 
diff --git a/include/unotools/dynamicmenuoptions.hxx 
b/include/unotools/dynamicmenuoptions.hxx
index 9b436d64488b..d1c1c7249af1 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -21,12 +21,8 @@
 
 #include 
 #include 
-#include 
 #include 
-#include 
-
-namespace com::sun::star::beans { struct PropertyValue; }
-namespace osl { class Mutex; }
+#include 
 
 
/*-
 @descr  struct to hold information about one menu entry.
@@ -48,14 +44,6 @@ enum class EDynamicMenuType
 WizardMenu=   1
 };
 
-/*-
-@short  forward declaration to our private date container 
implementation
-@descr  We use these class as internal member to support small 
memory requirements.
-You can create the container if it is necessary. The class 
which use these mechanism
-is faster and smaller then a complete implementation!
-*//*-*/
-
-class SvtDynamicMenuOptions_Impl;
 
 
/*-
 @short  collect information about dynamic menus
@@ -63,39 +51,23 @@ class SvtDynamicMenuOptions_Impl;
 @devstatus  ready to use
 
*//*-*/
 
-class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions final : public 
utl::detail::Options
+namespace SvtDynamicMenuOptions
 {
-public:
- SvtDynamicMenuOptions();
-virtual ~SvtDynamicMenuOptions() override;
-
-
/*-
-@short  return complete specified list
-@descr  Call it to get all entries of an dynamic menu.
-We return a list of all nodes with its names and 
properties.
-@param  "eMenu" select right menu.
-@return A list of menu items is returned.
-
-@onerrorWe return an empty list.
-
*//*-*/
 
-std::vector< SvtDynMenuEntry > GetMenu( EDynamicMenuType eMenu ) const;
-private:
+

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

2021-07-26 Thread Kevin Suo (via logerrit)

 sdext/source/pdfimport/wrapper/wrapper.cxx|   97 +++---
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |5 
 2 files changed, 89 insertions(+), 13 deletions(-)

New commits:
commit 2ee3d4076481262c1e3014dc9341cdf3d1922ff7
Author: Kevin Suo 
AuthorDate: Sat Jul 17 14:25:45 2021 +0800
Commit: Noel Grandin 
CommitDate: Mon Jul 26 08:28:20 2021 +0200

sdext.pdfimport: Restore to read font file for the determination...

of font attributes, as suggested by Mike Kaganski in
https://gerrit.libreoffice.org/c/core/+/118977.

This partially reverts da59686672fd2bc98f8cb28d5f04dc978b50ac13
but did some modification of the previous code with some
explanationary comments.

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

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index e22fe0aeca72..ffa29b1f7b7b 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -503,25 +504,36 @@ void LineParser::parseFontFamilyName( FontAttributes& 
rResult )
 
 void LineParser::readFont()
 {
-OString aFontName;
+/*
+xpdf line is like (separated by space):
+updateFont  
  
+updateFont 14   100  0 
1200.00   23068TimesNewRomanPSMT
+
+If nEmbedSize > 0, then a fontFile is followed as a stream.
+*/
+
+OStringaFontName;
 sal_Int64  nFontID;
 sal_Int32  nIsEmbedded, nIsBold, nIsItalic, nIsUnderline, nFileLen;
 double nSize;
 
-readInt64(nFontID);
-readInt32(nIsEmbedded);
-readInt32(nIsBold);
-readInt32(nIsItalic);
-readInt32(nIsUnderline);
-readDouble(nSize);
-readInt32(nFileLen);
+readInt64(nFontID); // read FontID
+readInt32(nIsEmbedded); // read isEmbedded
+readInt32(nIsBold); // read isBold
+readInt32(nIsItalic);   // read isItalic
+readInt32(nIsUnderline);// read isUnderline
+readDouble(nSize);  // read TransformedFontSize
+readInt32(nFileLen);// read nEmbedSize
 
 nSize = nSize < 0.0 ? -nSize : nSize;
-aFontName = lcl_unescapeLineFeeds( m_aLine.subView( m_nCharIndex ) );
+// Read FontName. From the current position to the end (any white spaces 
will be included).
+aFontName = lcl_unescapeLineFeeds(m_aLine.subView(m_nCharIndex));
 
 // name gobbles up rest of line
 m_nCharIndex = std::string_view::npos;
 
+// Check if this font is already in our font map list.
+// If yes, update the font size and skip.
 Parser::FontMapType::const_iterator pFont( 
m_parser.m_aFontMap.find(nFontID) );
 if( pFont != m_parser.m_aFontMap.end() )
 {
@@ -534,16 +546,75 @@ void LineParser::readFont()
 }
 
 // yet unknown font - get info and add to map
-FontAttributes aResult( OStringToOUString( aFontName,
-RTL_TEXTENCODING_UTF8 ),
+FontAttributes aResult( OStringToOUString( aFontName, 
RTL_TEXTENCODING_UTF8 ),
 nIsBold != 0,
 nIsItalic != 0,
 nIsUnderline != 0,
 nSize,
 1.0);
 
-// extract textual attributes (bold, italic in the name, etc.)
-parseFontFamilyName(aResult);
+/* The above font attributes (fontName, bold, italic) are based on
+   xpdf line output and may not be reliable. To get correct attributes,
+   we do the following:
+1. Read the embeded font file and determine the attributes based on the
+   font file.
+2. If we failed to read the font file, or empty result is returned, then
+   determine the font attributes from the font name.
+3. If all these attemps have failed, then use a fallback font.
+*/
+if (nFileLen > 0)
+{
+uno::Sequence aFontFile(nFileLen);
+readBinaryData(aFontFile);  // Read fontFile.
+
+uno::Sequence aArgs(1);
+awt::FontDescriptor aFontDescriptor;
+aArgs[0] <<= aFontFile;
+
+try
+{
+uno::Reference xHolder(
+
m_parser.m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+"com.sun.star.awt.FontIdentificator", aArgs, 
m_parser.m_xContext),
+uno::UNO_QUERY);
+if (xHolder.is())
+{
+uno::Any aFontReadResult(xHolder->getMaterial());
+aFontReadResult >>= aFontDescriptor;
+if (!aFontDescriptor.Name.isEmpty())
+{
+aResult.familyName = aFontDescriptor.Name;
+aResult.isBold =

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

 sw/source/ui/index/swuiidxmrk.cxx |   24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 5e93753ca60ac52f94f9adee5c6b55a2e9387750
Author: Miklos Vajna 
AuthorDate: Mon Jul 26 09:39:38 2021 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 26 10:17:08 2021 +0200

sw bibliography, local copy: add initial UI / browse button

The entry was working out of the box in the Define Bibliography Entry
dialog, add the matching browse button as a start.

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

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 3a3c5021d176..01e0b5ed18f1 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1084,6 +1084,7 @@ class SwCreateAuthEntryDlg_Impl : public 
weld::GenericDialogController
 std::unique_ptr m_xTypeListBox;
 std::unique_ptr m_xIdentifierBox;
 std::unique_ptr m_xBrowseButton;
+std::unique_ptr m_xLocalBrowseButton;
 std::unique_ptr m_xPageCB;
 std::unique_ptr m_xPageSB;
 
@@ -1666,6 +1667,12 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 m_xPageCB->set_buildable_name(m_xPageCB->get_buildable_name() 
+ "-visible");
 m_xPageSB = m_aBuilders.back()->weld_spin_button("pagesb");
 }
+else if (aCurInfo.nToxField == AUTH_FIELD_LOCAL_URL)
+{
+m_xLocalBrowseButton = 
m_aBuilders.back()->weld_button("browse");
+m_xLocalBrowseButton->connect_clicked(
+LINK(this, SwCreateAuthEntryDlg_Impl, BrowseHdl));
+}
 
 // Now that both pEdits[nIndex] and m_xPageSB is initialized, set 
their values.
 OUString aText = pFields[aCurInfo.nToxField];
@@ -1797,13 +1804,22 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, 
weld::ComboBox&, rBox, void)
 {
 m_xOKBT->set_sensitive(m_bNameAllowed && rBox.get_active() != -1);
 m_xBrowseButton->show();
+m_xLocalBrowseButton->show();
 };
 
-IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, BrowseHdl, weld::Button&, void)
+IMPL_LINK(SwCreateAuthEntryDlg_Impl, BrowseHdl, weld::Button&, rButton, void)
 {
 sfx2::FileDialogHelper 
aFileDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
 FileDialogFlags::NONE, getDialog());
-OUString aPath = GetEntryText(AUTH_FIELD_URL);
+OUString aPath;
+if ( == m_xBrowseButton.get())
+{
+aPath = GetEntryText(AUTH_FIELD_URL);
+}
+else if ( == m_xLocalBrowseButton.get())
+{
+aPath = GetEntryText(AUTH_FIELD_LOCAL_URL);
+}
 if (!aPath.isEmpty())
 {
 aFileDlg.SetDisplayDirectory(aPath);
@@ -1819,7 +1835,9 @@ IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, BrowseHdl, 
weld::Button&, void)
 for (int nIndex = 0; nIndex < AUTH_FIELD_END; nIndex++)
 {
 const TextInfo& rCurInfo = aTextInfoArr[nIndex];
-if (rCurInfo.nToxField == AUTH_FIELD_URL)
+if ((rCurInfo.nToxField == AUTH_FIELD_URL &&  == 
m_xBrowseButton.get())
+|| (rCurInfo.nToxField == AUTH_FIELD_LOCAL_URL
+&&  == m_xLocalBrowseButton.get()))
 {
 pEdits[nIndex]->set_text(aPath);
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cui/source/options/optpath.cxx|3 
 include/unotools/defaultoptions.hxx   |   20 -
 include/unotools/itemholderbase.hxx   |2 
 unotools/source/config/defaultoptions.cxx |  381 +-
 unotools/source/config/itemholder1.cxx|4 
 5 files changed, 77 insertions(+), 333 deletions(-)

New commits:
commit 6bb901a1282373e747fcca5deaa9dbe92488812c
Author: Noel Grandin 
AuthorDate: Sun Jul 25 18:10:21 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 10:58:14 2021 +0200

use officecfg for default options

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

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 6e2cc6e48d61..1670dfb91d82 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -62,7 +62,6 @@ using namespace svx;
 
 struct OptPath_Impl
 {
-SvtDefaultOptions   m_aDefOpt;
 OUStringm_sMultiPathDlg;
 Reference< css::util::XPathSettings >   m_xPathSettings;
 
@@ -351,7 +350,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, 
weld::Button&, void)
 {
 m_xPathBox->selected_foreach([this](weld::TreeIter& rEntry){
 PathUserData_Impl* pPathImpl = 
reinterpret_cast(m_xPathBox->get_id(rEntry).toInt64());
-OUString aOldPath = pImpl->m_aDefOpt.GetDefaultPath( 
pPathImpl->nRealId );
+OUString aOldPath = SvtDefaultOptions::GetDefaultPath( 
pPathImpl->nRealId );
 
 if ( !aOldPath.isEmpty() )
 {
diff --git a/include/unotools/defaultoptions.hxx 
b/include/unotools/defaultoptions.hxx
index 6192522c5002..dfa07fb5e100 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
@@ -16,29 +16,15 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
-#define INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
+#pragma once
 
 #include 
 #include 
-#include 
 #include 
-#include 
 
-class SvtDefaultOptions_Impl;
-
-class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDefaultOptions final : public 
utl::detail::Options
+namespace SvtDefaultOptions
 {
-private:
-std::shared_ptr pImpl;
-
-public:
-SvtDefaultOptions();
-virtual ~SvtDefaultOptions() override;
-
-OUString GetDefaultPath(SvtPathOptions::Paths nId) const;
+UNOTOOLS_DLLPUBLIC OUString GetDefaultPath(SvtPathOptions::Paths nId);
 };
 
-#endif // INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/itemholderbase.hxx 
b/include/unotools/itemholderbase.hxx
index 579046511e38..0d7390e20537 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -39,8 +39,6 @@ enum class EItem
 Compatibility ,
 CTLOptions,   // 2
 
-DefaultOptions,
-
 EventConfig   ,
 
 HistoryOptions,
diff --git a/unotools/source/config/defaultoptions.cxx 
b/unotools/source/config/defaultoptions.cxx
index c24d7daf8388..2cdbc263b2be 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -23,335 +23,100 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
-
-#include 
 #include 
+#include 
 
-#include "itemholder1.hxx"
-
-using namespace osl;
-using namespace utl;
-using namespace com::sun::star::uno;
-
-#define DEFAULTPATH_ADDIN  0
-#define DEFAULTPATH_AUTOCORRECT1
-#define DEFAULTPATH_AUTOTEXT   2
-#define DEFAULTPATH_BACKUP 3
-#define DEFAULTPATH_BASIC  4
-#define DEFAULTPATH_BITMAP 5
-#define DEFAULTPATH_CONFIG 6
-#define DEFAULTPATH_DICTIONARY 7
-#define DEFAULTPATH_FAVORITES  8
-#define DEFAULTPATH_FILTER 9
-#define DEFAULTPATH_GALLERY10
-#define DEFAULTPATH_GRAPHIC11
-#define DEFAULTPATH_HELP   12
-#define DEFAULTPATH_LINGUISTIC 13
-#define DEFAULTPATH_MODULE 14
-#define DEFAULTPATH_PALETTE15
-#define DEFAULTPATH_PLUGIN 16
-#define DEFAULTPATH_TEMP   17
-#define DEFAULTPATH_TEMPLATE   18
-#define DEFAULTPATH_USERCONFIG 19
-#define DEFAULTPATH_WORK   20
-#define DEFAULTPATH_CLASSIFICATION 21
-#define DEFAULTPATH_USERDICTIONARY 22
-
-// class SvtDefaultOptions_Impl --
-
-class SvtDefaultOptions_Impl : public utl::ConfigItem
-{
-public:
-OUString m_aAddinPath;
-OUString m_aAutoCorrectPath;
-OUString m_aAutoTextPath;
-OUString m_aBackupPath;
-OUString m_aBasicPath;
-OUString m_aBitmapPath;
-OUString m_aConfigPath;
-OUString m_aDictionaryPath;

[Libreoffice-commits] core.git: Branch 'feature/gsoc-svm-writer' - 2 commits - include/vcl vcl/source

2021-07-26 Thread panoskorovesis (via logerrit)

 include/vcl/filter/SvmWriter.hxx|7 ---
 vcl/source/filter/svm/SvmWriter.cxx |   35 +--
 2 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit 212fba1c1871f1d4b81cb21169e2451bba004888
Author: panoskorovesis 
AuthorDate: Mon Jul 26 10:23:00 2021 +0300
Commit: panoskorovesis 
CommitDate: Mon Jul 26 10:24:22 2021 +0300

Simplify SvmWriter Code

There is no need to call ActionHandler for each metaact derived class.

Change-Id: Ieaf6834c246e674845cb52fe4025ccbe827fa0a4

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 3ba7553adff5..3273e12e7fe2 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -37,8 +37,8 @@ public:
 SvmWriter(SvStream& rIStm);
 
 SvStream& Write(GDIMetaFile& rMetaFile);
-void MetaActionHandler(MetaAction* pAct, ImplMetaWriteData* pData);
-void ActionHandler(MetaActionType nType);
-void PixelHandler(MetaPixelAction* pAct);
-void PointHandler(MetaPointAction* pAct);
+void MetaActionHandler(MetaAction* pAction, ImplMetaWriteData* pData);
+void ActionHandler(MetaAction* pAction);
+void PixelHandler(MetaPixelAction* pAction);
+void PointHandler(MetaPointAction* pAction);
 };
\ No newline at end of file
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index 8733e493b254..89dbe3dfb3a7 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -68,51 +68,52 @@ SvStream& SvmWriter::Write(GDIMetaFile& rMetaFile)
 return mrStream;
 }
 
-void SvmWriter::MetaActionHandler(MetaAction* pAct, ImplMetaWriteData* pData)
+void SvmWriter::MetaActionHandler(MetaAction* pAction, ImplMetaWriteData* 
pData)
 {
-MetaActionType nType = static_cast(pAct->GetType());
+MetaActionType nType = static_cast(pAction->GetType());
 
 switch (nType)
 {
 case MetaActionType::NONE:
 {
-ActionHandler(pAct->GetType());
+auto* pMetaAction = static_cast(pAction);
+ActionHandler(pMetaAction);
 }
 break;
 case MetaActionType::PIXEL:
 {
-auto* pMetaAction = static_cast(pAct);
+auto* pMetaAction = static_cast(pAction);
 PixelHandler(pMetaAction);
 }
 break;
 case MetaActionType::POINT:
 {
-auto pMetaAction = static_cast(pAct);
+auto pMetaAction = static_cast(pAction);
 PointHandler(pMetaAction);
 }
 break;
 default:
-pAct->Write(mrStream, pData);
+pAction->Write(mrStream, pData);
 }
 }
 
-void SvmWriter::ActionHandler(MetaActionType nType)
+void SvmWriter::ActionHandler(MetaAction* pAction)
 {
-mrStream.WriteUInt16(static_cast(nType));
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
 }
 
-void SvmWriter::PixelHandler(MetaPixelAction* pAct)
+void SvmWriter::PixelHandler(MetaPixelAction* pAction)
 {
-ActionHandler(pAct->GetType());
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
 VersionCompatWrite aCompat(mrStream, 1);
 TypeSerializer aSerializer(mrStream);
-aSerializer.writePoint(pAct->GetPoint());
-WriteColor(pAct->GetColor());
+aSerializer.writePoint(pAction->GetPoint());
+WriteColor(pAction->GetColor());
 }
 
 void SvmWriter::PointHandler(MetaPointAction* pAct)
 {
-ActionHandler(pAct->GetType());
+mrStream.WriteUInt16(static_cast(pAct->GetType()));
 VersionCompatWrite aCompat(mrStream, 1);
 TypeSerializer aSerializer(mrStream);
 aSerializer.writePoint(pAct->GetPoint());
commit 0d7afd98e1838480f0f922e31f9ed4718209485b
Author: panoskorovesis 
AuthorDate: Sat Jul 17 12:44:05 2021 +0300
Commit: panoskorovesis 
CommitDate: Sat Jul 17 12:44:05 2021 +0300

Add Handler for Point Write

The handler separates MetaPointAction::Read from metaact.hxx
Write implementation is now in SvmWriter.hxx

Change-Id: I805d092e0a932cf1e9d9d7d0c7fac7d9dd9cbd6e

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 5b57d969b80b..3ba7553adff5 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -40,4 +40,5 @@ public:
 void MetaActionHandler(MetaAction* pAct, ImplMetaWriteData* pData);
 void ActionHandler(MetaActionType nType);
 void PixelHandler(MetaPixelAction* pAct);
+void PointHandler(MetaPointAction* pAct);
 };
\ No newline at end of file
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index b4c373a16946..8733e493b254 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -85,6 +85,12 @@ void SvmWriter::MetaActionHandler(MetaAction* pAct, 
ImplMetaWriteData* pData)
 PixelHandler(pMetaAction);
 }
 break;
+case

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

2021-07-26 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/init.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 38caa5c15e016231fe8739383e5b3149950273b6
Author: Szymon Kłos 
AuthorDate: Fri Apr 23 15:15:00 2021 +0200
Commit: Jan Holesovsky 
CommitDate: Mon Jul 26 09:27:38 2021 +0200

Deduplicate reference marks and cell auto fill messages

We use only the last value

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 19cb7973dca7..b80eb0f3171e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1530,6 +1530,8 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_WINDOW:
 case LOK_CALLBACK_CALC_FUNCTION_LIST:
 case LOK_CALLBACK_INVALIDATE_SHEET_GEOMETRY:
+case LOK_CALLBACK_REFERENCE_MARKS:
+case LOK_CALLBACK_CELL_AUTO_FILL_AREA:
 {
 const auto& pos = std::find_if(m_queue.rbegin(), m_queue.rend(),
 [type] (const queue_type::value_type& elem) { return 
(elem.Type == type); });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source desktop/source framework/source include/svtools include/unotools svtools/Library_svt.mk svtools/source

 cui/source/options/optgdlg.cxx|   42 +-
 desktop/source/app/app.cxx|9 
 framework/source/uielement/menubarmanager.cxx |3 
 framework/source/uielement/toolbarmanager.cxx |4 
 include/svtools/menuoptions.hxx   |   90 -
 include/unotools/itemholderbase.hxx   |1 
 svtools/Library_svt.mk|1 
 svtools/source/config/itemholder2.cxx |5 
 svtools/source/config/menuoptions.cxx |  413 --
 9 files changed, 28 insertions(+), 540 deletions(-)

New commits:
commit 131759a3db51140c21594308ed99c71aa7aba43a
Author: Noel Grandin 
AuthorDate: Sun Jul 25 16:21:39 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 08:26:18 2021 +0200

use officecfg for menu options

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 30ca6b79a068..e55eca6dcf09 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -30,7 +30,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -661,11 +660,10 @@ std::unique_ptr OfaViewTabPage::Create( 
weld::Container* pPage, weld
 
 bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 {
-SvtMenuOptions aMenuOpt;
-
 bool bModified = false;
 bool bMenuOptModified = false;
 bool bRepaintWindows(false);
+std::shared_ptr 
xChanges(comphelper::ConfigurationChanges::create());
 
 SvtMiscOptions aMiscOptions;
 const sal_Int32 nSizeLB_NewSelection = m_xIconSizeLB->get_active();
@@ -698,9 +696,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 default:
 OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of 
m_xSidebarIconSizeLB should not be possible!" );
 }
-auto xChanges = comphelper::ConfigurationChanges::create();
 
officecfg::Office::Common::Misc::SidebarIconSize::set(static_cast(eSet),
 xChanges);
-xChanges->commit();
 }
 
 const sal_Int32 nNotebookbarSizeLB_NewSelection = 
m_xNotebookbarIconSizeLB->get_active();
@@ -716,9 +712,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 default:
 OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of 
m_xNotebookbarIconSizeLB should not be possible!" );
 }
-auto xChanges = comphelper::ConfigurationChanges::create();
 
officecfg::Office::Common::Misc::NotebookbarIconSize::set(static_cast(eSet),
 xChanges);
-xChanges->commit();
 }
 
 const sal_Int32 nStyleLB_NewSelection = m_xIconStyleLB->get_active();
@@ -768,17 +762,19 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 
 if (m_xFontShowCB->get_state_changed_from_saved())
 {
-std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::set(m_xFontShowCB->get_active(),
 batch);
-batch->commit();
+
officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::set(m_xFontShowCB->get_active(),
 xChanges);
 bModified = true;
 }
 
 if (m_xMenuIconsLB->get_value_changed_from_saved())
 {
-aMenuOpt.SetMenuIconsState(m_xMenuIconsLB->get_active() == 0 ?
+TriState eMenuIcons = m_xMenuIconsLB->get_active() == 0 ?
 TRISTATE_INDET :
-static_cast(m_xMenuIconsLB->get_active() - 1));
+static_cast(m_xMenuIconsLB->get_active() - 1);
+// Output cache of current setting as possibly modified by System 
Theme for older version
+bool bMenuIcons = 
Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+
officecfg::Office::Common::View::Menu::IsSystemIconsInMenus::set(eMenuIcons == 
TRISTATE_INDET, xChanges);
+
officecfg::Office::Common::View::Menu::ShowIconsInMenues::set(bMenuIcons, 
xChanges);
 bModified = true;
 bMenuOptModified = true;
 bAppearanceChanged = true;
@@ -786,9 +782,11 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 
 if (m_xContextMenuShortcutsLB->get_value_changed_from_saved())
 {
-
aMenuOpt.SetContextMenuShortcuts(m_xContextMenuShortcutsLB->get_active() == 0 ?
+officecfg::Office::Common::View::Menu::ShortcutsInContextMenus::set(
+m_xContextMenuShortcutsLB->get_active() == 0 ?
 TRISTATE_INDET :
-static_cast(m_xContextMenuShortcutsLB->get_active() - 
1));
+static_cast(m_xContextMenuShortcutsLB->get_active() - 1),
+xChanges);
 bModified = true;
 bMenuOptModified = true;
 bAppearanceChanged = true;
@@ -818,13 +816,13 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 if (m_xUseSkia->get_state_changed_from_saved() ||
 m_xForceSkiaRaster->get_state_changed_from_saved())
 {

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

 sw/source/filter/xml/xmliteme.cxx |   16 
 sw/source/filter/xml/xmltble.cxx  |   14 +++---
 sw/source/filter/xml/xmltbli.cxx  |6 +++---
 sw/source/filter/xml/xmltexti.cxx |   36 ++--
 sw/source/filter/xml/xmltexti.hxx |2 +-
 5 files changed, 37 insertions(+), 37 deletions(-)

New commits:
commit 1cca6ad35e648ba7fa9a4b5814541c3525ef3a28
Author: Miklos Vajna 
AuthorDate: Mon Jul 26 08:41:41 2021 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 26 11:12:44 2021 +0200

sw: prefix members of SwXMLTableColContext_Impl, SwXMLTableColumn_Impl, ...

... SwXMLTableItemMapper_Impl and SwXMLTextImportHelper

See tdf#94879 for motivation.

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

diff --git a/sw/source/filter/xml/xmliteme.cxx 
b/sw/source/filter/xml/xmliteme.cxx
index 447abab52b67..d60cc12b7d12 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -44,11 +44,11 @@ namespace {
 
 class SwXMLTableItemMapper_Impl: public SvXMLExportItemMapper
 {
-SwXMLBrushItemExport aBrushItemExport;
+SwXMLBrushItemExport m_aBrushItemExport;
 
 protected:
 
-sal_uInt32 nAbsWidth;
+sal_uInt32 m_nAbsWidth;
 
 static void AddAttribute( sal_uInt16 nPrefix, enum XMLTokenEnum eLName,
const OUString& rValue,
@@ -81,8 +81,8 @@ SwXMLTableItemMapper_Impl::SwXMLTableItemMapper_Impl(
 SvXMLItemMapEntriesRef rMapEntries,
 SwXMLExport& rExp ) :
 SvXMLExportItemMapper( std::move(rMapEntries) ),
-aBrushItemExport( rExp ),
-nAbsWidth( USHRT_MAX )
+m_aBrushItemExport( rExp ),
+m_nAbsWidth( USHRT_MAX )
 {
 }
 
@@ -174,10 +174,10 @@ void SwXMLTableItemMapper_Impl::handleSpecialItem(
 switch( nMemberId )
 {
 case MID_FRMSIZE_WIDTH:
-if( nAbsWidth )
+if( m_nAbsWidth )
 {
 OUStringBuffer sBuffer;
-rUnitConverter.convertMeasureToXML( sBuffer, nAbsWidth );
+rUnitConverter.convertMeasureToXML( sBuffer, m_nAbsWidth );
 AddAttribute( rEntry.nNameSpace, rEntry.eLocalName,
   sBuffer.makeStringAndClear(),
   rNamespaceMap, rAttrList );
@@ -210,7 +210,7 @@ void SwXMLTableItemMapper_Impl::handleElementItem(
 {
 case RES_BACKGROUND:
 {
-const_cast(this)->aBrushItemExport.exportXML(
+const_cast(this)->m_aBrushItemExport.exportXML(
 static_cast(rItem) );
 }
 break;
@@ -219,7 +219,7 @@ void SwXMLTableItemMapper_Impl::handleElementItem(
 
 inline void SwXMLTableItemMapper_Impl::SetAbsWidth( sal_uInt32 nAbs )
 {
-nAbsWidth = nAbs;
+m_nAbsWidth = nAbs;
 }
 
 void SwXMLExport::InitItemExport()
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 492eb5f7520a..90764b3ee19f 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -69,21 +69,21 @@ using std::advance;
 
 class SwXMLTableColumn_Impl : public SwWriteTableCol
 {
-OUStringsStyleName;
-sal_uInt32  nRelWidth;
+OUStringm_sStyleName;
+sal_uInt32  m_nRelWidth;
 
 public:
 
 explicit SwXMLTableColumn_Impl(sal_uInt32 nPosition)
 : SwWriteTableCol(nPosition)
-, nRelWidth(0)
+, m_nRelWidth(0)
 {};
 
-void SetStyleName( const OUString& rName ) { sStyleName = rName; }
-const OUString& GetStyleName() const { return sStyleName; }
+void SetStyleName( const OUString& rName ) { m_sStyleName = rName; }
+const OUString& GetStyleName() const { return m_sStyleName; }
 
-void SetRelWidth( sal_uInt32 nSet ) { nRelWidth = nSet; }
-sal_uInt32 GetRelWidth() const { return nRelWidth; }
+void SetRelWidth( sal_uInt32 nSet ) { m_nRelWidth = nSet; }
+sal_uInt32 GetRelWidth() const { return m_nRelWidth; }
 };
 
 namespace {
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 560fe1c81e1f..ffd284926fcf 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -639,9 +639,9 @@ namespace {
 
 class SwXMLTableColContext_Impl : public SvXMLImportContext
 {
-SvXMLImportContextRef   xMyTable;
+SvXMLImportContextRef   m_xMyTable;
 
-SwXMLTableContext *GetTable() { return static_cast(xMyTable.get()); }
+SwXMLTableContext *GetTable() { return static_cast(m_xMyTable.get()); }
 
 public:
 
@@ -660,7 +660,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
 const Reference< xml::sax::XFastAttributeList > & xAttrList,
 SwXMLTableContext *pTable ) :
 SvXMLImportContext( rImport ),
-xMyTable( pTable )
+m_xMyTable( pTable )
 {

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - download.lst external/curl external/expat RepositoryExternal.mk

 RepositoryExternal.mk |2 +-
 download.lst  |8 
 external/curl/ExternalPackage_curl.mk |4 ++--
 external/curl/ExternalProject_curl.mk |7 ---
 external/curl/curl-7.26.0_win-proxy.patch |2 +-
 external/curl/curl-msvc-disable-protocols.patch.1 |7 ---
 external/curl/zlib.patch.0|4 ++--
 external/expat/expat-winapi.patch |   14 ++
 8 files changed, 32 insertions(+), 16 deletions(-)

New commits:
commit 4666e23c20017ead3eaee8e4467eb498dc858e70
Author: Michael Stahl 
AuthorDate: Wed Jul 21 11:57:51 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 26 13:24:14 2021 +0200

curl: upgrade to release 7.78.0

* Fixes CVE-2020-8284 CVE-2021-22924
* Also fixes these which don't look relevant to LO:
  CVE-2020-8231
  CVE-2020-8285 CVE-2020-8286
  CVE-2021-22876 CVE-2021-22890
  CVE-2021-22897 CVE-2021-22898 CVE-2021-22901
  CVE-2021-22922 CVE-2021-22923 CVE-2021-22925 CVE-2021-22926
* disable some new protocols and dependencies
* remove curl-ios.patch.1 as the code no longer exists upstream

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 946f457c885bd10ff1a7281c351f3981f035f5a7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119262
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 020eb3b363a5c9444c97075a2e15b63ccbe7bf2d)

Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119427
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e029f3f32026..a892a59452e3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2775,7 +2775,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if 
$(filter X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
+   $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if 
$(filter X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-schannel/lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/download.lst b/download.lst
index 6e5b355beabc..b4f7df8d263c 100644
--- a/download.lst
+++ b/download.lst
@@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 
3d569869d27b48860210c758c4f313082103a5e58219a7669b52
 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772
-export CURL_TARBALL := curl-7.71.0.tar.xz
+export CURL_SHA256SUM := 
be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5
+export CURL_TARBALL := curl-7.78.0.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index 8da569e3e0cf..1fb360c85ca9 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -14,13 +14,13 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,curl,curl))
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter 
X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter 
X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-schannel/bin/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
 else ifeq ($(OS),AIX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
 else
-$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.6.0))
+$(eval $(call

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - include/sal

2021-07-26 Thread Stephan Bergmann (via logerrit)

 include/sal/log.hxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4fce3cefe5286deb4d76f2217c63e96d780fcc41
Author: Stephan Bergmann 
AuthorDate: Wed May 5 08:20:18 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 26 13:23:32 2021 +0200

Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"



towards GCC 12, so that now "the return type is the original rvalue stream 
type
not its base class."  (And which would thus have caused issues like

> sfx2/source/control/bindings.cxx:1323:19: error: dynamic_cast from rvalue 
to reference type '::std::ostringstream &' (aka 'basic_ostringstream &')
> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : 
""));
> 
~~^~
> include/sal/log.hxx:198:6: note: expanded from macro 'SAL_STREAM'
> (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << 
stream).str())
>  ^
> include/sal/log.hxx:341:20: note: expanded from macro 'SAL_INFO'
> SAL_WHERE, stream)
> ~~~^~~
> include/sal/log.hxx:155:68: note: expanded from macro 
'SAL_DETAIL_LOG_STREAM'
> SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, 
stream); \
> ~~~^~~
> include/sal/log.hxx:133:45: note: expanded from macro 
'SAL_DETAIL_LOG_STREAM_PRIVATE_'
> ::sal::detail::StreamStart() << stream) == 1) \
> ^~

now.  While the issue with old libstdc++ that originally prompted the
dynamic_cast was

> sfx2/source/control/bindings.cxx:1323:19: error: no member named 'str' in 
'std::basic_ostream'
> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : 
""));
> 
~~^~
> include/sal/log.hxx:194:40: note: expanded from macro 'SAL_STREAM'
> (::std::ostringstream() << stream).str()
>^
> include/sal/log.hxx:336:20: note: expanded from macro 'SAL_INFO'
> SAL_WHERE, stream)
> ~~~^~~
> include/sal/log.hxx:155:68: note: expanded from macro 
'SAL_DETAIL_LOG_STREAM'
> SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, 
stream); \
> ~~~^~~
> include/sal/log.hxx:133:45: note: expanded from macro 
'SAL_DETAIL_LOG_STREAM_PRIVATE_'
> ::sal::detail::StreamStart() << stream) == 1) \
> ^~

.)

The libstdc++ macro _GLIBCXX_RELEASE is reportedly available since GCC 7.1.

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

(cherry picked from commit 1f36f21d91c429190ae314dadeec409f35f4, plus
follow-up 95e26d3dce4f5a3b2d010d5ca47b4e450905a100 "tdf#142326: Adapt to
'libstdc++: Implement LWG 1203 for rvalue iostreams'")
Change-Id: I7c8fef25e15fcfa9b83924467dc86dc2957fbd7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116447
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 428206c3c1c54d01435cf4e4a07174cfbd567335)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119425
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 00d533ab5495..f85c7d882134 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -161,7 +161,10 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER 
StreamIgnore const &) {
 
 @since LibreOffice 3.5
 */
-#if defined _LIBCPP_VERSION || (defined _MSC_VER && _MSC_VER >= 1915)
+#if defined _LIBCPP_VERSION \
+|| (defined _GLIBCXX_RELEASE \
+&& (_GLIBCXX_RELEASE >= 12 || (_GLIBCXX_RELEASE == 11 && __GLIBCXX__ > 
20210428))) \
+|| (defined _MSC_VER && _MSC_VER >= 1915)
 #define SAL_STREAM(stream) \
 (::std::ostringstream() << stream).str()
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread Tünde Tóth (via logerrit)

 sc/qa/unit/data/ods/tdf143220.ods  |binary
 sc/qa/unit/subsequent_export-test2.cxx |   15 +++
 sc/source/filter/excel/xecontent.cxx   |8 +---
 3 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 3c3b9ad8886da916027f0fb940a2df822d63d4d7
Author: Tünde Tóth 
AuthorDate: Wed Jul 14 14:57:00 2021 +0200
Commit: László Németh 
CommitDate: Mon Jul 26 13:54:57 2021 +0200

tdf#143220 XLSX export: fix hyperlink to sheet target

Hyperlink to another sheet didn't work in Excel.

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

diff --git a/sc/qa/unit/data/ods/tdf143220.ods 
b/sc/qa/unit/data/ods/tdf143220.ods
new file mode 100644
index ..6aa1536eae8e
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf143220.ods differ
diff --git a/sc/qa/unit/subsequent_export-test2.cxx 
b/sc/qa/unit/subsequent_export-test2.cxx
index 030e4a4ae7df..6ee07223a824 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -194,6 +194,7 @@ public:
 void testButtonFormControlXlsxExport();
 void testTdf142929_filterLessThanXLSX();
 void testInvalidNamedRange();
+void testTdf143220XLSX();
 
 CPPUNIT_TEST_SUITE(ScExportTest2);
 
@@ -296,6 +297,7 @@ public:
 CPPUNIT_TEST(testButtonFormControlXlsxExport);
 CPPUNIT_TEST(testTdf142929_filterLessThanXLSX);
 CPPUNIT_TEST(testInvalidNamedRange);
+CPPUNIT_TEST(testTdf143220XLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2460,6 +2462,19 @@ void ScExportTest2::testInvalidNamedRange()
 CPPUNIT_ASSERT(!xNamedRanges->hasByName("myname"));
 }
 
+void ScExportTest2::testTdf143220XLSX()
+{
+ScDocShellRef xDocSh = loadDoc(u"tdf143220.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, 
m_xSFactory,
+ 
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+assertXPath(pDoc, "/x:worksheet/x:hyperlinks/x:hyperlink", "location", 
"Sheet2!A1");
+
+xDocSh->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 0848745b8d4a..0a7a3baeb953 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -428,15 +428,17 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& 
rRoot, const SvxURLField& rU
aTextMark = aTextMark.replaceAt( nSepPos, 1, "!" );
 }
 
-if(nSepPos != -1)
+if (nSepPos != -1)
 {
-OUString aSheetName( aTextMark.copy(0, nSepPos));
+OUString aSheetName(aTextMark.copy(0, nSepPos));
 
-if ( aSheetName.indexOf(' ') != -1 && aSheetName[0] != '\'')
+if (aSheetName.indexOf(' ') != -1 && aSheetName[0] != '\'')
 {
 aTextMark = "'" + aTextMark.replaceAt(nSepPos, 0, "'");
 }
 }
+else
+aTextMark += "!A1";// tdf#143220 link to sheet not valid 
without cell reference
 
 mxTextMark.reset( new XclExpString( aTextMark, 
XclStrFlags::ForceUnicode, 255 ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - download.lst external/expat include/sal

 download.lst|4 ++--
 external/expat/UnpackedTarball_expat.mk |1 -
 external/expat/expat-winapi.patch   |   14 ++
 external/expat/ubsan.patch.0|   11 ---
 include/sal/log.hxx |5 -
 5 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit ff5c9e9557f40248db838520b849e95e0bc3308c
Author: Caolán McNamara 
AuthorDate: Tue May 25 10:44:13 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 12:39:16 2021 +0200

upgrade to Expat 2.4.1

drop ubsan patch in favour of fix applied as
https://github.com/libexpat/libexpat/pull/398

Change-Id: I59eb9e24206b9a4cf323b7f7d48d8df0792a1c46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116102
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 740d12d8a8294d4bfd28e6c3e4cf1e0ed560b198)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119422
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index 520482de6475..bc484b5f6238 100644
--- a/download.lst
+++ b/download.lst
@@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
 export ETONYEK_SHA256SUM := 
e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
 export ETONYEK_VERSION_MICRO := 9
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
-export EXPAT_SHA256SUM := 
9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102
-export EXPAT_TARBALL := expat-2.2.8.tar.bz2
+export EXPAT_SHA256SUM := 
2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40
+export EXPAT_TARBALL := expat-2.4.1.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
 export FONTCONFIG_SHA256SUM := 
cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
diff --git a/external/expat/UnpackedTarball_expat.mk 
b/external/expat/UnpackedTarball_expat.mk
index 96f4e3ec8732..5d4f41f6d147 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -15,7 +15,6 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,expat,conftools))
 
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
external/expat/expat-winapi.patch \
-   external/expat/ubsan.patch.0 \
 ))
 
 # This is a bit hackish.
diff --git a/external/expat/expat-winapi.patch 
b/external/expat/expat-winapi.patch
index b33c12b83b4c..bd4da1472fc8 100644
--- a/external/expat/expat-winapi.patch
+++ b/external/expat/expat-winapi.patch
@@ -11,3 +11,17 @@
  #  endif
  #endif /* not defined XML_STATIC */
  
+--- misc/expat-2.1.0/lib/xmlparse.c2021-05-23 16:56:25.0 +0100
 misc/build/expat-2.1.0/lib/xmlparse.c  2021-05-25 12:42:11.997173600 
+0100
+@@ -92,6 +92,11 @@
+ 
+ #include 
+ 
++#ifdef _WIN32
++#  undef HAVE_GETRANDOM
++#  undef HAVE_SYSCALL_GETRANDOM
++#endif
++
+ #include "ascii.h"
+ #include "expat.h"
+ #include "siphash.h"
diff --git a/external/expat/ubsan.patch.0 b/external/expat/ubsan.patch.0
deleted file mode 100644
index 8317f922df88..
--- a/external/expat/ubsan.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
 lib/xmlparse.c
-+++ lib/xmlparse.c
-@@ -6485,7 +6485,7 @@
- static void FASTCALL
- hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
-   iter->p = table->v;
--  iter->end = iter->p + table->size;
-+  iter->end = table->size == 0 ? iter->p : iter->p + table->size;
- }
- 
- static NAMED *FASTCALL
commit 6a564eaa163cea2bc4d9f0d0404f0efaa3990651
Author: Stephan Bergmann 
AuthorDate: Wed May 5 08:20:18 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 12:39:00 2021 +0200

Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"



towards GCC 12, so that now "the return type is the original rvalue stream 
type
not its base class."  (And which would thus have caused issues like

> sfx2/source/control/bindings.cxx:1323:19: error: dynamic_cast from rvalue 
to reference type '::std::ostringstream &' (aka 'basic_ostringstream &')
> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : 
""));
> 
~~^~
> include/sal/log.hxx:198:6: note: expanded from macro 'SAL_STREAM'
> (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << 
stream).str())
>  ^
> include/sal/log.hxx:341:20: note: expanded from macro 'SAL_INFO'
> SAL_WHERE, stream)
> ~~~^~~
> include/sal/log.hxx:155:68: note: expanded from macro 
'SAL_DETAIL_LOG_STREAM'
> SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, 
stream); \
>

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - download.lst external/curl RepositoryExternal.mk

 RepositoryExternal.mk |2 +-
 download.lst  |4 ++--
 external/curl/ExternalPackage_curl.mk |4 ++--
 external/curl/ExternalProject_curl.mk |7 ---
 external/curl/curl-7.26.0_win-proxy.patch |2 +-
 external/curl/curl-msvc-disable-protocols.patch.1 |7 ---
 external/curl/zlib.patch.0|4 ++--
 7 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 7c9aac0cef11693505f9639965e27294a3220993
Author: Michael Stahl 
AuthorDate: Wed Jul 21 11:57:51 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 12:39:35 2021 +0200

curl: upgrade to release 7.78.0

* Fixes CVE-2020-8284 CVE-2021-22924
* Also fixes these which don't look relevant to LO:
  CVE-2020-8231
  CVE-2020-8285 CVE-2020-8286
  CVE-2021-22876 CVE-2021-22890
  CVE-2021-22897 CVE-2021-22898 CVE-2021-22901
  CVE-2021-22922 CVE-2021-22923 CVE-2021-22925 CVE-2021-22926
* disable some new protocols and dependencies
* remove curl-ios.patch.1 as the code no longer exists upstream

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 946f457c885bd10ff1a7281c351f3981f035f5a7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119262
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 020eb3b363a5c9444c97075a2e15b63ccbe7bf2d)

Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119423
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d2d61dfc2b4..9aa00cb82e33 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2725,7 +2725,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if 
$(filter X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
+   $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if 
$(filter X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-schannel/lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/download.lst b/download.lst
index bc484b5f6238..29ae2e8fdd27 100644
--- a/download.lst
+++ b/download.lst
@@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 
3d569869d27b48860210c758c4f313082103a5e58219a7669b52
 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772
-export CURL_TARBALL := curl-7.71.0.tar.xz
+export CURL_SHA256SUM := 
be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5
+export CURL_TARBALL := curl-7.78.0.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index 8da569e3e0cf..1fb360c85ca9 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -14,13 +14,13 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,curl,curl))
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter 
X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter 
X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-schannel/bin/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
 else ifeq ($(OS),AIX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
 else
-$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.6.0))
+$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.7.0))
 endif
 
 endif # $(DISABLE_DYNLOADING)
diff --git

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - include/sal

2021-07-26 Thread Stephan Bergmann (via logerrit)

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

New commits:
commit f1d815ba476446be72559a01597342aebb917f3e
Author: Stephan Bergmann 
AuthorDate: Thu Aug 30 18:31:33 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 12:46:47 2021 +0200

At least MSVC 19.15.26726 (VS 2017 15.8.1) needs the SAL_STREAM fix too

...that was originally introduced for libc++ in
691b6ea8e100fc55f0ff70a82511722733113a07 "Make the SAL_STREAM thing compile 
with
clang++ -std=c++11 -stdlib=libc++".  MSVC and clang-cl builds now started to
fail like

> [build CXX] sfx2/source/control/bindings.cxx
> C:/lo-clang/core/sfx2/source/control/bindings.cxx(1333,19):  error: 
dynamic_cast from rvalue to reference type '::std::ostringstream &' (aka 
'basic_ostringstream, allocator > &')
> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : 
""));
> 
~~^~
> C:/lo-clang/core/include\sal/log.hxx(169,6):  note: expanded from macro 
'SAL_STREAM'
> (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << 
stream).str())
>  ^
> C:/lo-clang/core/include\sal/log.hxx(306,20):  note: expanded from macro 
'SAL_INFO'
> SAL_WHERE, stream)
> ~~~^~~
> C:/lo-clang/core/include\sal/log.hxx(120,53):  note: expanded from macro 
'SAL_DETAIL_LOG_STREAM'
> ::sal::detail::StreamStart() << stream) == 1) \
> ^~
[...]

Change-Id: Icb311c8a61cd7e7f450a45fc7f07327e94b5d186
Reviewed-on: https://gerrit.libreoffice.org/59833
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 965ac9915280e3d570d7b32ff20799507f4e42eb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119424
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 6bcd34b09fe2..00d533ab5495 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -161,7 +161,7 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER 
StreamIgnore const &) {
 
 @since LibreOffice 3.5
 */
-#ifdef _LIBCPP_VERSION
+#if defined _LIBCPP_VERSION || (defined _MSC_VER && _MSC_VER >= 1915)
 #define SAL_STREAM(stream) \
 (::std::ostringstream() << stream).str()
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - cui/source cui/util include/svtools include/svx offapi/com offapi/UnoApi_offapi.mk sfx2/source svtools/source svx/source

2021-07-26 Thread Szymon Kłos (via logerrit)

 cui/source/dialogs/colorpicker.cxx   |   33 -
 cui/util/cui.component   |4 +
 include/svtools/colrdlg.hxx  |9 +++
 include/svx/PaletteManager.hxx   |3 +
 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/cui/AsyncColorPicker.idl |   41 +
 sfx2/source/appl/appserv.cxx |3 +
 svtools/source/dialogs/colrdlg.cxx   |   65 ++-
 svx/source/tbxctrls/PaletteManager.cxx   |   29 ++--
 9 files changed, 168 insertions(+), 20 deletions(-)

New commits:
commit 2d9c05d615c2bf8dc494f4eec1213d27c74d24ef
Author: Szymon Kłos 
AuthorDate: Mon Jul 26 11:59:39 2021 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 26 13:26:31 2021 +0200

online: keep sidebar opened

when we switch mode in online keep sidebar in opened
state. For example when switching from notebookbar
to classic mode - sidebar is set to "Tabs" what makes
sidebar hidden in online. The same happened when
crash occured.

Change-Id: I5d0d1dba4c89b5e380a0bf717fabf4337016894c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119496
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 42cd0825e747..2e41b999cf70 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -933,6 +933,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 // Sidebar
 pViewFrame->ShowChildWindow( SID_SIDEBAR );
 
+if (comphelper::LibreOfficeKit::isActive())
+aSidebarMode = "Opened";
+
 sfx2::sidebar::SidebarController* pSidebar =
 
sfx2::sidebar::SidebarController::GetSidebarControllerForFrame( xFrame );
 if ( pSidebar )
commit 3381abd0bb3b3664b63185d63c11b8fe11565880
Author: Szymon Kłos 
AuthorDate: Fri Jul 16 10:06:43 2021 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 26 13:26:18 2021 +0200

Make Custom Color Picker dialog async

- now supports also XAsynchronousExecutableDialog
- inherits from SfxDialogController to attach correct LOKNotifier

Change-Id: Ic21db4057b8087d74a437b1c8ec95408ade5264d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119012
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/cui/source/dialogs/colorpicker.cxx 
b/cui/source/dialogs/colorpicker.cxx
index a341c193c890..0738fe7bd26f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -31,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -727,7 +729,7 @@ void ColorSliderControl::SetValue(const Color& rColor, 
ColorMode eMode, double d
 
 namespace {
 
-class ColorPickerDialog : public weld::GenericDialogController
+class ColorPickerDialog : public SfxDialogController
 {
 private:
 ColorFieldControl m_aColorField;
@@ -790,7 +792,7 @@ private:
 }
 
 ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, 
sal_Int16 nDialogMode)
-: GenericDialogController(pParent, "cui/ui/colorpickerdialog.ui", 
"ColorPicker")
+: SfxDialogController(pParent, "cui/ui/colorpickerdialog.ui", 
"ColorPicker")
 , m_xColorField(new weld::CustomWeld(*m_xBuilder, "colorField", 
m_aColorField))
 , m_xColorSlider(new weld::CustomWeld(*m_xBuilder, "colorSlider", 
m_aColorSlider))
 , m_xColorPreview(new weld::CustomWeld(*m_xBuilder, "preview", 
m_aColorPreview))
@@ -1205,7 +1207,7 @@ void ColorPickerDialog::setColorComponent( ColorComponent 
nComp, double dValue )
 }
 }
 
-typedef ::cppu::WeakComponentImplHelper< XServiceInfo, XExecutableDialog, 
XInitialization, XPropertyAccess > ColorPickerBase;
+typedef ::cppu::WeakComponentImplHelper< XServiceInfo, XExecutableDialog, 
XAsynchronousExecutableDialog, XInitialization, XPropertyAccess > 
ColorPickerBase;
 
 namespace {
 
@@ -1231,6 +1233,10 @@ public:
 virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 virtual sal_Int16 SAL_CALL execute(  ) override;
 
+// XAsynchronousExecutableDialog
+virtual void SAL_CALL setDialogTitle( const OUString& aTitle ) override;
+virtual void SAL_CALL startExecuteModal( const css::uno::Reference< 
css::ui::dialogs::XDialogClosedListener >& xListener ) override;
+
 private:
 Color mnColor;
 sal_Int16 mnMode;
@@ -1279,7 +1285,8 @@ sal_Bool SAL_CALL ColorPicker::supportsService( const 
OUString& sServiceName )
 
 Sequence< OUString > SAL_CALL ColorPicker::getSupportedServiceNames(  )
 {
-return { "com.sun.star.ui.dialogs.ColorPicker" };
+return { "com.sun.star.ui.dialogs.ColorPicker",
+

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

2021-07-26 Thread Arnaud Versini (via logerrit)

 cpputools/source/unoexe/unoexe.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 057191fb50ea2ae9cca42ef84329581094047db8
Author: Arnaud Versini 
AuthorDate: Sun Jul 18 18:04:44 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 13:45:34 2021 +0200

cpputools : no need to use fprintf for putting a string

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

diff --git a/cpputools/source/unoexe/unoexe.cxx 
b/cpputools/source/unoexe/unoexe.cxx
index add2d0e4a192..2181e850d7fe 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -67,7 +67,7 @@ static bool s_quiet = false;
 static void out( const char * pText )
 {
 if (! s_quiet)
-fprintf( stderr, "%s", pText );
+fputs( pText, stderr );
 }
 
 static void out( std::u16string_view rText )
@@ -75,7 +75,7 @@ static void out( std::u16string_view rText )
 if (! s_quiet)
 {
 OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
-fprintf( stderr, "%s", aText.getStr() );
+fputs( aText.getStr(), stderr );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/uitest/ui/index/index.py|   37 ++
 sw/source/ui/index/swuiidxmrk.cxx |   63 +-
 2 files changed, 80 insertions(+), 20 deletions(-)

New commits:
commit 6e07c40577df013dc113310b7c2b76ee2b26e158
Author: Miklos Vajna 
AuthorDate: Mon Jul 26 13:16:29 2021 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 26 14:50:22 2021 +0200

sw bibliography, local copy: finish UI in the Define Bibliography Entry 
dialog

Add the missing page check-button/spin-button, so the local copy UI is
on par with the URL one.

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

diff --git a/sw/qa/uitest/ui/index/index.py b/sw/qa/uitest/ui/index/index.py
index 8b76b04bc5a5..4d974764fa2a 100644
--- a/sw/qa/uitest/ui/index/index.py
+++ b/sw/qa/uitest/ui/index/index.py
@@ -52,4 +52,41 @@ class TestSwuiidxmrk(UITestCase):
 # i.e. the page number was not part of the URL.
 self.assertEqual(field.Value, "#page=1")
 
+def test_bibliography_local_page_number_insert(self):
+
+# Given an empty Writer document:
+with self.ui_test.create_doc_in_start_center("writer") as component:
+
+
self.ui_test.execute_modeless_dialog_through_command(".uno:InsertAuthoritiesEntry")
+insert_entry = self.xUITest.getTopFocusWindow()
+from_document = insert_entry.getChild("fromdocument")
+from_document.executeAction("CLICK", tuple())
+new = insert_entry.getChild("new")
+
+# When inserting a biblio entry field with a page number:
+with self.ui_test.execute_blocking_action(new.executeAction, 
args=('CLICK', ())) as define_entry:
+entry = define_entry.getChild("entry")
+type_text(entry, "aaa")
+listbox = define_entry.getChild("listbox")
+select_pos(listbox, "16")  # WWW document, just select a valid 
position
+pagecb = define_entry.getChild("pagecb-local-visible")
+pagecb.executeAction("CLICK", tuple())
+
+insert = insert_entry.getChild("insert")
+insert.executeAction("CLICK", tuple())
+close = insert_entry.getChild("close")
+self.ui_test.close_dialog_through_button(close)
+
+# Then make sure the local URL contains that page number:
+paragraphs = component.Text.createEnumeration()
+paragraph = paragraphs.nextElement()
+portions = paragraph.createEnumeration()
+portion = portions.nextElement()
+for field in portion.TextField.Fields:
+if field.Name != "LocalURL":
+continue
+# Without the accompanying fix in place, this test would have 
failed with:
+# Could not find child with id: pagecb-local-visible
+self.assertEqual(field.Value, "#page=1")
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 01e0b5ed18f1..a7f13e504b14 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1086,7 +1086,9 @@ class SwCreateAuthEntryDlg_Impl : public 
weld::GenericDialogController
 std::unique_ptr m_xBrowseButton;
 std::unique_ptr m_xLocalBrowseButton;
 std::unique_ptr m_xPageCB;
+std::unique_ptr m_xLocalPageCB;
 std::unique_ptr m_xPageSB;
+std::unique_ptr m_xLocalPageSB;
 
 DECL_LINK(IdentifierHdl, weld::ComboBox&, void);
 DECL_LINK(ShortNameHdl, weld::Entry&, void);
@@ -1672,30 +1674,44 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 m_xLocalBrowseButton = 
m_aBuilders.back()->weld_button("browse");
 m_xLocalBrowseButton->connect_clicked(
 LINK(this, SwCreateAuthEntryDlg_Impl, BrowseHdl));
+m_xLocalPageCB = 
m_aBuilders.back()->weld_check_button("pagecb");
+// Distinguish different instances of this for ui-testing.
+
m_xLocalPageCB->set_buildable_name(m_xLocalPageCB->get_buildable_name()
+   + "-local-visible");
+m_xLocalPageSB = 
m_aBuilders.back()->weld_spin_button("pagesb");
 }
 
 // Now that both pEdits[nIndex] and m_xPageSB is initialized, set 
their values.
 OUString aText = pFields[aCurInfo.nToxField];
-if (aCurInfo.nToxField != AUTH_FIELD_URL)
-{
-pEdits[nIndex]->set_text(aText);
-}
-else
+if (aCurInfo.nToxField == AUTH_FIELD_URL || aCurInfo.nToxField == 
AUTH_FIELD_LOCAL_URL)
 {
 OUString aUrl;
 int nPageNumber;
 if

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

 source/text/sbasic/shared/03/avail_release.xhp |5 
 source/text/sbasic/shared/03/sf_array.xhp  | 1770 -
 2 files changed, 916 insertions(+), 859 deletions(-)

New commits:
commit 1cd02ab17dec63054396dfddb675334f2963a533
Author: Rafael Lima 
AuthorDate: Fri Jul 23 21:27:33 2021 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Mon Jul 26 11:48:14 2021 +0200

Adapt SF_Array to the new method signature notation

This patch updates the syntax and arguments in all methods according to the 
new notation used in other SF services. It also introduces the 
ImportFromCSVFile method to Python scripts.

This patch also updates a few examples in Basic.

Change-Id: Ib565f31ad13f5455ff1df260ec60cae5d8848cd9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119437
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/source/text/sbasic/shared/03/avail_release.xhp 
b/source/text/sbasic/shared/03/avail_release.xhp
index 0a02b37aa..887351ad8 100644
--- a/source/text/sbasic/shared/03/avail_release.xhp
+++ b/source/text/sbasic/shared/03/avail_release.xhp
@@ -22,6 +22,7 @@
   This method is 
not available in Python.
   This property 
is not available in Python.
 
+ Tags for LibreOffice 7.2 
 
 This service is available from 
%PRODUCTNAME 7.2 onwards.
 
@@ -40,6 +41,10 @@
 
 This property is available from 
%PRODUCTNAME 7.2 onwards.
 
+ Tags for LibreOffice 7.3 
+
+This method is available from 
%PRODUCTNAME 7.3 onwards.
+
 
 
 
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03/sf_array.xhp 
b/source/text/sbasic/shared/03/sf_array.xhp
index d4b65fb01..8307754d8 100644
--- a/source/text/sbasic/shared/03/sf_array.xhp
+++ b/source/text/sbasic/shared/03/sf_array.xhp
@@ -17,899 +17,951 @@
 
 
 
-   
-  Array service
-   
-
-   ScriptForge.Array 
service
-   Provides a collection of methods for manipulating and 
transforming arrays of one dimension (vectors) and arrays of two dimensions 
(matrices). This includes set operations, sorting, importing to and exporting 
from text files.
-   Arrays with more 
than two dimensions cannot be used with the methods in this service, the only 
exception being the CountDims method that accepts Arrays 
with any number of dimensions.
-
-
-   Array items may contain any type of value, including 
(sub)arrays.
-
-   Service invocation
-   Before using the 
Array service the ScriptForge library 
needs to be loaded using:
-  
-  GlobalScope.BasicLibraries.LoadLibrary("ScriptForge")
-   
-   Loading the library 
will create the SF_Array object that can be used to call the 
methods in the Array service.
-   The 
following code snippets show the various ways to call methods in the 
Array service (the Append method is used 
as an example):
-   
-  SF_Array.Append(...)
-   
-   
-  Dim arr:arr = SF_Array
-  arr.Append(...)
-   
-   
-  Dim arr:arr = 
CreateScriptService("Array")
-  arr.Append(...)
-   
-   The CreateScriptService 
method is only available after you have loaded the 
ScriptForge library.
-   
-   
- Methods
-   
-   
- 
-   Append
-   AppendColumn
-   AppendRow
-   Contains
-   ConvertToDictionary
-   CountDims
-   Difference
-   ExportToTextFile
-   ExtractColumn
-   ExtractRow
- 
- 
-   Flatten
-   ImportFromCSVFile
-   IndexOf
-   Insert
-   InsertSorted
-   Intersection
-   Join2D
-   Prepend
-   PrependColumn
-   PrependRow
- 
- 
-RangeInit
-Reverse
-Shuffle
-Slice
-Sort
-SortColumns
-SortRows
-Transpose
-TrimArray
-Union
-Unique
- 
-   
-   
-   The first argument of most 
methods is the array object to be considered. It is always passed by reference 
and left unchanged. Methods such as Append, Prepend, etc return a new array 
object after their execution.
-  
-   Append 
--
 
-   
-  Array service;Append
-   
-   Append
-   Appends the items 
listed as arguments to the end of the input array.
-   
-   
-  SF_Array.Append(Array_1D As Variant, arg0 As 
Variant, [arg1 As Variant], ...) As Variant
-   
-   
-   Array_1D : the pre-existing array, may 
be empty.
-   arg0, 
... : a list of items to append to Array_1D.
-   
-   
-  Sub 
Example_Append()
-  Dim a As Variant
- 
 a = SF_Array.Append(Array(1, 2, 3), 4, 5)
- 
 ' (1, 2, 3, 4, 5)
-  End Sub
-   
-   
-   
-AppendColumn 
--
 
-   
-  Array service;AppendColumn
-   
-   AppendColumn
-   Appends a new column 
to the right side of a two dimensional

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 7458f19a254c799612795a0cddeb0910f71948d4
Author: Rafael Lima 
AuthorDate: Mon Jul 26 11:48:14 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 26 11:48:14 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1cd02ab17dec63054396dfddb675334f2963a533
  - Adapt SF_Array to the new method signature notation

This patch updates the syntax and arguments in all methods according to 
the new notation used in other SF services. It also introduces the 
ImportFromCSVFile method to Python scripts.

This patch also updates a few examples in Basic.

Change-Id: Ib565f31ad13f5455ff1df260ec60cae5d8848cd9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119437
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/helpcontent2 b/helpcontent2
index 36052eea4f79..1cd02ab17dec 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 36052eea4f7977303088774c3299a7c721ca2608
+Subproject commit 1cd02ab17dec63054396dfddb675334f2963a533
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/data/TC-table-DnD-move.docx  |binary
 sw/qa/extras/ooxmlexport/data/TC-table-Separate-Move.docx |binary
 sw/qa/extras/ooxmlexport/data/TC-table-rowDND-front.docx  |binary
 sw/qa/extras/ooxmlexport/data/TC-table-rowDND.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   50 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |   13 +++
 writerfilter/source/dmapper/DomainMapperTableManager.cxx  |   17 
 writerfilter/source/dmapper/DomainMapperTableManager.hxx  |   37 ++
 writerfilter/source/ooxml/model.xml   |4 +
 9 files changed, 121 insertions(+)

New commits:
commit 5602803d07453bfd7c17ed5b6df7551d1041f97c
Author: László Németh 
AuthorDate: Thu Jul 22 19:08:47 2021 +0200
Commit: László Németh 
CommitDate: Mon Jul 26 12:09:10 2021 +0200

tdf#143510 DOCX import: fix tracked table drag & drop

Accept or reject of tracked drag & drop table (row)
move weren't handled, resulting an extra empty table
(rows) instead of removing the deleted or inserted
table (rows).

Note: tables moved by drag & drop with track changes use
w:moveFromRangeStart/End and w:moveToRangeStart/End
bookmark-like elements to sign the boundary of the
moved text. Now moveFrom/moveTo import is handled by
tracked table (row) deletion and insertion.

Change-Id: Ie382645fef28f57b30d3504fb28ac08489f705c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119406
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 7f3c0bbc174b9b0316991c174ca3b407c0e3d141)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119436

diff --git a/sw/qa/extras/ooxmlexport/data/TC-table-DnD-move.docx 
b/sw/qa/extras/ooxmlexport/data/TC-table-DnD-move.docx
new file mode 100644
index ..f231d6f84240
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/TC-table-DnD-move.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/TC-table-Separate-Move.docx 
b/sw/qa/extras/ooxmlexport/data/TC-table-Separate-Move.docx
new file mode 100644
index ..227f2862c68a
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/TC-table-Separate-Move.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/TC-table-rowDND-front.docx 
b/sw/qa/extras/ooxmlexport/data/TC-table-rowDND-front.docx
new file mode 100644
index ..17d3feeb3406
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/TC-table-rowDND-front.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/TC-table-rowDND.docx 
b/sw/qa/extras/ooxmlexport/data/TC-table-rowDND.docx
new file mode 100644
index ..9608736cf20a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/TC-table-rowDND.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 1864c4bcf83e..431d5d71753d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -881,6 +881,56 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104797, "tdf104797.docx")
 CPPUNIT_ASSERT_EQUAL( OUString( " Will this sentence be duplicated ADDED 
STUFF?" ), getRun( getParagraph( 2 ), 4 )->getString());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf143510, "TC-table-DnD-move.docx")
+{
+// check moveFromRangeStart/End and moveToRangeStart/End for tracked table 
move by drag & drop
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+if (mbExported)
+{
+// This was 0 (missing tracked table row deletion/insertion)
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl[1]/w:tr/w:trPr/w:del", 
2);
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl[2]/w:tr/w:trPr/w:ins", 
2);
+}
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf143510_table_from_row, 
"TC-table-Separate-Move.docx")
+{
+// check moveFromRangeStart/End and moveToRangeStart/End for tracked table 
move by drag & drop
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+if (mbExported)
+{
+// This was 0 (missing tracked table row deletion/insertion)
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl[1]/w:tr/w:trPr/w:del", 
1);
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl[1]/w:tr[3]/w:trPr/w:del", 1);
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl[2]/w:tr", 1);
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl[2]/w:tr/w:trPr/w:ins", 
1);
+}
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf143510_within_table, "TC-table-rowDND.docx")
+{
+// check moveFromRangeStart/End and moveToRangeStart/End for tracked table 
row move by DnD
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+if (mbExported)
+{
+// This was 0 (missing tracked table row deletion/insertion)
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:trPr/w:del", 
1);
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:trPr/w:ins", 
1);
+}
+}
+

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

 svtools/source/config/optionsdrawinglayer.cxx |   41 --
 1 file changed, 26 insertions(+), 15 deletions(-)

New commits:
commit 57ee7deddd0934dab58199cb1d0b95439e2ba6b3
Author: Noel Grandin 
AuthorDate: Mon Jul 26 11:32:15 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 12:49:48 2021 +0200

UBSAN fix

after
commit 28993c0a8d8628c650b661767fd8ab2228c507d9
Author: Noel Grandin 
Date:   Sun Jul 25 15:05:51 2021 +0200
use officecfg for drawing options

I had the IsAAPossibleOnThisSystem() check inverted, and I didn't quite
translate the existing IsAntiAliasing()/SetAntAliasing() logic correctly

Fixes CppunitTest_sc_jumbosheets_test failure noted at

https://gerrit.libreoffice.org/c/core/+/119481/5#message-747bde6ad4bdcf90d2ff51e8daa03cb0189e6355

Change-Id: I5408da2e46f1f68646a74bd674b164ccfafdeb71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119495
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/svtools/source/config/optionsdrawinglayer.cxx 
b/svtools/source/config/optionsdrawinglayer.cxx
index c615a2f6b6a0..43a1d68544f5 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -32,12 +32,6 @@
 namespace SvtOptionsDrawinglayer
 {
 
-// helper
-bool IsAAPossibleOnThisSystem()
-{
-return !Application::GetDefaultDevice()->SupportsOperation( 
OutDevSupportType::TransparentRect );
-}
-
 bool IsOverlayBuffer()
 {
 return officecfg::Office::Common::Drawinglayer::OverlayBuffer::get();
@@ -126,19 +120,36 @@ sal_uInt32 GetMaximumPaperBottomMargin()
 }
 
 static std::mutex gaAntiAliasMutex;
-static bool bAntiAliasingInit = false;
-static bool bAntiAliasing = false;
+static bool gbAntiAliasingInit = false;
+static bool gbAntiAliasing = false;
+static bool gbAllowAAInit = false;
+static bool gbAllowAA = false;
 
-bool IsAntiAliasing()
+bool IsAAPossibleOnThisSystem()
 {
 std::lock_guard aGuard(gaAntiAliasMutex);
-if (!bAntiAliasingInit)
+if (!gbAllowAAInit)
+{
+gbAllowAAInit = true;
+gbAllowAA = Application::GetDefaultDevice()->SupportsOperation( 
OutDevSupportType::TransparentRect );
+}
+return gbAllowAA;
+}
+
+
+bool IsAntiAliasing()
+{
+bool bAntiAliasing;
 {
-bAntiAliasingInit = true;
-bAntiAliasing = 
officecfg::Office::Common::Drawinglayer::AntiAliasing::get()
-&& IsAAPossibleOnThisSystem();
+std::lock_guard aGuard(gaAntiAliasMutex);
+if (!gbAntiAliasingInit)
+{
+gbAntiAliasingInit = true;
+gbAntiAliasing = 
officecfg::Office::Common::Drawinglayer::AntiAliasing::get();
+}
+bAntiAliasing = gbAntiAliasing;
 }
-return bAntiAliasing;
+return bAntiAliasing && IsAAPossibleOnThisSystem();
 }
 
 /**
@@ -156,7 +167,7 @@ void SetAntiAliasing( bool bOn, bool bTemporary )
 officecfg::Office::Common::Drawinglayer::AntiAliasing::set(bOn, batch);
 batch->commit();
 }
-bAntiAliasing = bOn;
+gbAntiAliasing = bOn;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/oox include/svl include/svx oox/source sc/source svx/source sw/qa sw/sdi sw/source sw/uiconfig writerfilter/source xmloff/source

2021-07-26 Thread Samuel Mehrbrodt (via logerrit)

 include/editeng/unoprnms.hxx |2 
 include/oox/vml/vmlshape.hxx |1 
 include/oox/vml/vmlshapecontext.hxx  |2 
 include/svl/solar.hrc|2 
 include/svx/svdobj.hxx   |5 +
 include/svx/unoshprp.hxx |6 +
 oox/source/export/vmlexport.cxx  |4 +
 oox/source/token/properties.txt  |1 
 oox/source/vml/vmlshape.cxx  |4 +
 oox/source/vml/vmlshapecontext.cxx   |6 +
 sc/source/filter/xml/xmlexprt.cxx|   34 
 svx/source/unodraw/unoshape.cxx  |   17 
 sw/qa/extras/odfexport/data/shape-with-hyperlink.odt |binary
 sw/qa/extras/odfexport/odfexport2.cxx|   10 ++
 sw/qa/extras/ooxmlexport/data/hyperlinkshape.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx   |7 +
 sw/sdi/_drwbase.sdi  |   33 
 sw/source/filter/ww8/docxsdrexport.cxx   |   16 +++-
 sw/source/uibase/shells/drwbassh.cxx |   74 +++
 sw/uiconfig/sglobal/popupmenu/draw.xml   |5 +
 sw/uiconfig/swform/popupmenu/draw.xml|5 +
 sw/uiconfig/swreport/popupmenu/draw.xml  |5 +
 sw/uiconfig/swriter/popupmenu/draw.xml   |5 +
 sw/uiconfig/swxform/popupmenu/draw.xml   |5 +
 writerfilter/source/dmapper/GraphicImport.cxx|   16 +++-
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 xmloff/source/draw/shapeexport.cxx   |   28 ++-
 xmloff/source/text/XMLTextFrameContext.cxx   |4 +
 xmloff/source/text/XMLTextFrameHyperlinkContext.cxx  |   12 +++
 xmloff/source/text/XMLTextFrameHyperlinkContext.hxx  |1 
 31 files changed, 269 insertions(+), 43 deletions(-)

New commits:
commit a23b44fd9f0119f7ea3523e32875f55c1a07c1cd
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jul 19 08:11:43 2021 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jul 26 14:13:53 2021 +0200

tdf#123626 Allow adding hyperlinks to shapes

* Support hyperlinks on Shapes in Writer
* Add menu items
* Add context menu items
* ODF import/export + test
* OOXML import/export + test

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

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 011e504ae7f4..f99ddac50414 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -163,6 +163,8 @@
 #define UNO_NAME_MISC_OBJ_TITLE "Title"
 #define UNO_NAME_MISC_OBJ_DESCRIPTION   "Description"
 
+#define UNO_NAME_HYPERLINK  "Hyperlink"
+
 #define UNO_NAME_GRAPHOBJ_FILLBITMAP"GraphicObjectFillBitmap"
 #define UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC   "ReplacementGraphic"
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 0e50e5b6ee1f..d90ecc2865bf 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -112,6 +112,7 @@ struct ShapeTypeModel
 OptValue moCropRight; ///< Specifies how much to crop the image 
from the right in as a fraction of picture size.
 OptValue moCropTop; ///< Specifies how much to crop the image 
from the top down as a fraction of picture size.
 OUString maLayoutFlowAlt; ///< Specifies the alternate layout flow for 
text in textboxes.
+OUString maHyperlink; ///< The hyperlink assigned to the shape
 
 explicitShapeTypeModel();
 
diff --git a/include/oox/vml/vmlshapecontext.hxx 
b/include/oox/vml/vmlshapecontext.hxx
index ddca7b13ad93..0d4b3ddd9e7e 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -107,6 +107,8 @@ public:
 private:
 /** Processes the 'style' attribute. */
 voidsetStyle( const OUString& rStyle );
+/** Processes the 'href' attribute. */
+voidsetHyperlink( const OUString& rHyperlink );
 
 /** Resolve a relation identifier to a fragment path. */
 OptValue< OUString > decodeFragmentPath( const AttributeList& rAttribs, 
sal_Int32 nToken ) const;
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index 521e24365f9f..5caeb64f40c2 100644
--- a/include/svl/solar.hrc
+++ b/include/svl/solar.hrc
@@ -23,7 +23,7 @@
 // defines --
 
 #define OWN_ATTR_VALUE_START3900
-#define OWN_ATTR_VALUE_END  4006
+#define OWN_ATTR_VALUE_END  4007
 
 #define

[Libreoffice-commits] core.git: avmedia/source cui/source desktop/source editeng/source include/editeng include/unotools sc/source sd/source sfx2/source sw/source unotools/source uui/source xmloff/sou

 avmedia/source/viewer/mediawindow_impl.cxx |2 
 cui/source/options/optinet2.cxx|   27 
 cui/source/options/optinet2.hxx|2 
 cui/source/options/securityoptions.cxx |   26 
 cui/source/options/securityoptions.hxx |4 
 desktop/source/lib/init.cxx|2 
 editeng/source/editeng/impedit2.cxx|3 
 editeng/source/items/frmitems.cxx  |3 
 include/editeng/brushitem.hxx  |2 
 include/unotools/configitem.hxx|5 
 include/unotools/itemholderbase.hxx|1 
 include/unotools/securityoptions.hxx   |  217 +-
 sc/source/core/data/global.cxx |3 
 sc/source/ui/docshell/docsh4.cxx   |4 
 sd/source/ui/func/fusel.cxx|5 
 sfx2/source/appl/appcfg.cxx|   13 
 sfx2/source/appl/appopen.cxx   |2 
 sfx2/source/appl/linkmgr2.cxx  |2 
 sfx2/source/appl/sfxhelp.cxx   |3 
 sfx2/source/dialog/filedlghelper.cxx   |3 
 sfx2/source/doc/docmacromode.cxx   |   10 
 sfx2/source/doc/objcont.cxx|2 
 sfx2/source/doc/objstor.cxx|4 
 sw/source/core/doc/DocumentLinksAdministrationManager.cxx  |2 
 sw/source/filter/html/htmlgrin.cxx |3 
 sw/source/filter/ww8/docxattributeoutput.cxx   |   15 
 sw/source/uibase/docvw/SidebarTxtControl.cxx   |3 
 sw/source/uibase/docvw/edtwin.cxx  |9 
 unotools/source/config/configitem.cxx  |  145 +
 unotools/source/config/itemholder1.cxx |4 
 unotools/source/config/securityoptions.cxx |  956 ++---
 unotools/source/misc/mediadescriptor.cxx   |2 
 uui/source/secmacrowarnings.cxx|5 
 xmloff/source/draw/sdxmlexp.cxx|3 
 xmloff/source/text/XMLRedlineExport.cxx|6 
 xmloff/source/text/txtflde.cxx |3 
 xmlsecurity/inc/macrosecurity.hxx  |1 
 xmlsecurity/source/component/documentdigitalsignatures.cxx |   20 
 xmlsecurity/source/dialogs/macrosecurity.cxx   |   24 
 39 files changed, 437 insertions(+), 1109 deletions(-)

New commits:
commit 6ed8c5a0f19901ab413c6610649326b2475c3a8c
Author: Noel Grandin 
AuthorDate: Sun Jul 25 21:35:05 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 14:25:35 2021 +0200

use officecfg for security options

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

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index ea15b6413e2a..affc0ff63611 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -175,7 +175,7 @@ uno::Reference 
MediaWindowImpl::createPlayer(const OUString& rUR
 if( rURL.isEmpty() )
 return xPlayer;
 
-if (SvtSecurityOptions().isUntrustedReferer(rReferer))
+if (SvtSecurityOptions::isUntrustedReferer(rReferer))
 {
 return xPlayer;
 }
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index acb04b97d696..e01433516ff7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -475,7 +475,6 @@ IMPL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl, 
weld::Widget&, rControl, vo
 //
 SvxSecurityTabPage::SvxSecurityTabPage(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet& rSet)
 : SfxTabPage(pPage, pController, "cui/ui/optsecuritypage.ui", 
"OptSecurityPage", )
-, mpSecOptions(new SvtSecurityOptions)
 , m_xSecurityOptionsPB(m_xBuilder->weld_button("options"))
 , m_xSavePasswordsCB(m_xBuilder->weld_check_button("savepassword"))
 , m_xShowConnectionsPB(m_xBuilder->weld_button("connections"))
@@ -523,7 +522,7 @@ SvxSecurityTabPage::~SvxSecurityTabPage()
 IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, weld::Button&, void)
 {
 if (!m_xSecOptDlg)
-m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetFrameWeld(), 
mpSecOptions.get()));
+m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetFrameWeld()));
 m_xSecOptDlg->run();
 }
 
@@ -766,15 +765,15 @@ DeactivateRC SvxSecurityTabPage::DeactivatePage( 
SfxItemSet* _pSet )
 
 namespace
 {
-

[Libreoffice-commits] core.git: Branch 'feature/cib_contract6721b' - include/svx include/xmloff sc/source sd/qa sd/source svx/source sw/qa sw/source xmloff/source

 include/svx/xmlgrhlp.hxx|4 +
 include/xmloff/xmlimppr.hxx |   12 +++-
 sc/source/filter/xml/xmlwrap.cxx|2 
 sd/qa/unit/data/odp/fillbitmap2.odp |binary
 sd/qa/unit/export-tests.cxx |   49 +
 sd/source/filter/xml/sdxmlwrp.cxx   |   36 
 svx/source/unodraw/UnoNameItemTable.cxx |   17 +++--
 svx/source/unodraw/UnoNameItemTable.hxx |   14 
 svx/source/unodraw/unomtabl.cxx |   30 ++
 svx/source/xml/xmlgrhlp.cxx |   67 +++
 sw/qa/extras/odfexport/data/fillbitmap3.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx|   59 
 sw/source/filter/xml/swxml.cxx  |2 
 xmloff/source/draw/XMLShapeStyleContext.cxx |   31 ++
 xmloff/source/draw/ximpstyl.cxx |   44 ---
 xmloff/source/style/PageMasterImportContext.cxx |   69 ++--
 xmloff/source/text/txtstyli.cxx |   31 ++
 17 files changed, 353 insertions(+), 114 deletions(-)

New commits:
commit fe5d05de0f853d8f4219f1523edcb86cb6cd2b22
Author: Michael Stahl 
AuthorDate: Wed Jul 14 19:50:18 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 26 12:14:09 2021 +0200

tdf#92796 ODF import: remove unused bitmap fills

With CWS impress64 a partial fix for this was implemented to drop
unreferenced named items including all non-color fills after ODF import,
but this is only done in sd so move the code that does that to svx and
call it from sc and sw as well.

Implement some UNO interface for this, it's at least better than a magic
string, and not obvious how a better solution would look like since it's
known only at the end of the import if a bitmap is used or not.

Another problem: when the Area tab is used to change to a different kind
of fill, the items with the details for the previous fill aren't
cleared, and so they are written to ODF files.  Hence bitmaps in the
file can be referenced even if they aren't actually used, and bloat up
the files.

Fix this by dropping all unused draw:fill-image-name attributes in ODF
import.

Also do the same for Gradient and Hatch fills; Transparency gradients
can be combined with anything so leave them as they are.

Change-Id: I0b591fd9f963d974d0c3e7208b99621ad61dd93c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118950
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 86c0f58b6f9f392865196606173d1b98a6897f32)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119036
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 6511448b408887811f5026ccdd1b170e3731afd8)

diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 37d8c63bda35..fd39e0b29fbc 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -120,6 +120,10 @@ public:
 virtual OUString SAL_CALL resolveOutputStream( const css::uno::Reference< 
css::io::XOutputStream >& rxBinaryStream ) override;
 };
 
+namespace svx {
+SVXCORE_DLLPUBLIC void 
DropUnusedNamedItems(css::uno::Reference const& xModel);
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 5f5a72d17cb3..7e825cf17586 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -37,6 +37,7 @@ namespace com::sun::star::uno { class Any; }
 namespace com::sun::star::uno { template  class Reference; }
 namespace com::sun::star::uno { template  class Sequence; }
 namespace com::sun::star::xml::sax { class XAttributeList; }
+namespace com::sun::star::drawing { enum class SAL_DLLPUBLIC_RTTI FillStyle; }
 
 struct XMLPropertyState;
 class XMLPropertySetMapper;
@@ -53,8 +54,9 @@ class SvXMLImport;
  */
 struct ContextID_Index_Pair
 {
-sal_Int16 nContextID;
+sal_Int16 /*const*/ nContextID;
 sal_Int32 nIndex;
+css::drawing::FillStyle /*const*/ nExpectedFillStyle;
 };
 
 class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public 
salhelper::SimpleReferenceObject
@@ -182,6 +184,14 @@ inline const rtl::Reference< XMLPropertySetMapper >&
 return maPropMapper;
 }
 
+namespace xmloff {
+
+bool IsIgnoreFillStyleNamedItem(
+css::uno::Reference const& xProps,
+css::drawing::FillStyle nExpectedFillStyle);
+
+}
+
 #endif // INCLUDED_XMLOFF_XMLIMPPR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 7712bfcc265f..4651a5f1f26d 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -544,6 +544,8 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, 
ErrCode& rError )
 else
 bRet = true;
 
+

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

2021-07-26 Thread Luboš Luňák (via logerrit)

 solenv/bin/concat-deps.c |   10 ++
 solenv/gbuild/Executable.mk  |2 
 solenv/gbuild/Library.mk |2 
 solenv/gbuild/LinkTarget.mk  |  136 ++-
 solenv/gbuild/StaticLibrary.mk   |2 
 solenv/gbuild/TargetLocations.mk |6 +
 6 files changed, 155 insertions(+), 3 deletions(-)

New commits:
commit 2fb06e18ae6fcf4813d98aa3fda0bcd1c9b9a7d0
Author: Luboš Luňák 
AuthorDate: Fri Jul 16 18:39:17 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Jul 26 13:32:16 2021 +0200

add gbuild support for ObjC/C++ sources from tarballs

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

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 155328bf9360..9cd6b63c4374 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1076,6 +1076,16 @@ static int process(struct hash* dep_hash, char* fn)
 created_line = generate_phony_line(src_relative, "o");
 rc = generate_phony_file(fn, created_line);
 }
+else if(strncmp(src_relative, "GenObjCxxObject/", 16) == 0)
+{
+created_line = generate_phony_line(src_relative, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "GenObjCObject/", 14) == 0)
+{
+created_line = generate_phony_line(src_relative, "o");
+rc = generate_phony_file(fn, created_line);
+}
 else if(strncmp(src_relative, "CxxClrObject/", 13) == 0)
 {
 created_line = generate_phony_line(src_relative, "o");
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 70879bb9eb8c..ef393cb33949 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -111,6 +111,8 @@ gb_Executable_add_scanners = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(
 gb_Executable_add_exception_objects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_generated_cobjects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_generated_exception_objects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Executable_add_generated_objcobjects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Executable_add_generated_objcxxobjects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_cflags = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_cxxflags = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_objcflags = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index f8a08f915d35..a4f1fe7b376a 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -199,6 +199,8 @@ gb_Library_add_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0)
 gb_Library_add_x64_generated_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_generated_cobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_generated_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Library_add_generated_objcobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Library_add_generated_objcxxobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_use_library_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_grammar = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_grammars = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d9d6d07a1349..60be7cfb68cc 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -166,9 +166,9 @@ endef
 # Overview of dependencies and tasks of LinkTarget
 #
 # target  task depends on
-# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject 
GenCxxClrObject
+# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject GenObjCObject 
GenObjCxxObject CxxClrObject GenCxxClrObject
 #  LinkTarget/headers
-# LinkTarget/dep  joined dep file  AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/skia

2021-07-26 Thread Luboš Luňák (via logerrit)

 config_host.mk.in   |1 
 configure.ac|7 ++
 external/skia/Library_skia.mk   |   36 
 external/skia/swap-buffers-rect.patch.1 |   27 +---
 4 files changed, 64 insertions(+), 7 deletions(-)

New commits:
commit 5d051f443bcd4b79041ef379bf032b76616f9ce2
Author: Luboš Luňák 
AuthorDate: Wed Jul 21 21:39:23 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Jul 26 13:32:37 2021 +0200

build Skia also on Mac

This only builds the library, without using it.

Change-Id: I54e940bcaa61852b831dbe7ae5660a5daf5fe609
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119356
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index f2117f306615..d74fecae9522 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -550,6 +550,7 @@ export SERF_CFLAGS=$(gb_SPACE)@SERF_CFLAGS@
 export SERF_LIBS=$(gb_SPACE)@SERF_LIBS@
 export SHA256SUM=@SHA256SUM@
 export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
+export 
SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX=@SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX@
 export SOLARINC=@SOLARINC@
 export SORT=@SORT@
 export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
diff --git a/configure.ac b/configure.ac
index b2ca6f8d4edd..675a6a1e8395 100644
--- a/configure.ac
+++ b/configure.ac
@@ -928,6 +928,7 @@ cygwin*|wsl*)
 darwin*|macos*) # macOS
 using_freetype_fontconfig=no
 using_x11=no
+build_skia=yes
 if test -n "$LODE_HOME" ; then
 mac_sanitize_path
 AC_MSG_NOTICE([sanitized the PATH to $PATH])
@@ -11968,6 +11969,12 @@ if test "$enable_skia" != "no" -a "$build_skia" = 
"yes" -a -z "$DISABLE_GUI"; th
 ENABLE_SKIA=TRUE
 AC_DEFINE(HAVE_FEATURE_SKIA)
 BUILD_TYPE="$BUILD_TYPE SKIA"
+
+if test -n "$MAC_OS_X_VERSION_MIN_REQUIRED" -a 
"$MAC_OS_X_VERSION_MIN_REQUIRED" -lt "101200"; then
+SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX=1
+AC_SUBST(SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX)
+fi
+
 else
 AC_MSG_RESULT([no])
 fi
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index a1f1f1c30ef6..ad55400a24e5 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -59,6 +59,19 @@ $(eval $(call gb_Library_use_system_win32_libs,skia,\
 usp10 \
 gdi32 \
 ))
+else ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Library_use_system_darwin_frameworks,skia,\
+Carbon \
+))
+
+ifneq ($(SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX),)
+# Disable std::shared_mutex usage on MacOSX < 10.12.
+$(eval $(call gb_Library_add_defs,skia,\
+-DVMA_USE_STL_SHARED_MUTEX=0 \
+))
+endif
+
 else
 $(eval $(call gb_Library_use_externals,skia,\
 freetype \
@@ -876,6 +889,29 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/tools/sk_app/win/RasterWindowContext_win \
 UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win \
 ))
+
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+UnpackedTarball/skia/src/ports/SkDebug_stdio \
+UnpackedTarball/skia/src/ports/SkImageEncoder_CG \
+UnpackedTarball/skia/src/ports/SkImageGeneratorCG \
+UnpackedTarball/skia/src/ports/SkFontMgr_mac_ct \
+UnpackedTarball/skia/src/ports/SkFontMgr_mac_ct_factory \
+UnpackedTarball/skia/src/ports/SkScalerContext_mac_ct \
+UnpackedTarball/skia/src/ports/SkTypeface_mac_ct \
+UnpackedTarball/skia/src/ports/SkOSFile_posix \
+UnpackedTarball/skia/src/ports/SkOSLibrary_posix \
+UnpackedTarball/skia/src/utils/mac/SkCTFont \
+UnpackedTarball/skia/src/utils/mac/SkCreateCGImageRef \
+))
+
+$(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
+UnpackedTarball/skia/tools/sk_app/mac/RasterWindowContext_mac \
+))
+
+#UnpackedTarball/skia/tools/sk_app/mac/VulkanWindowContext_mac \
+#UnpackedTarball/skia/tools/sk_app/mac/MetalWindowContext_mac \
+
 else
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/ports/SkDebug_stdio \
diff --git a/external/skia/swap-buffers-rect.patch.1 
b/external/skia/swap-buffers-rect.patch.1
index d04ea91c0bc9..7673a358ebc4 100644
--- a/external/skia/swap-buffers-rect.patch.1
+++ b/external/skia/swap-buffers-rect.patch.1
@@ -1,8 +1,21 @@
+diff --git a/tools/sk_app/GLWindowContext.h b/tools/sk_app/GLWindowContext.h
+index c519903006..5dc5bcd180 100644
+--- a/tools/sk_app/GLWindowContext.h
 b/tools/sk_app/GLWindowContext.h
+@@ -25,7 +25,7 @@ public:
+ bool isValid() override { return SkToBool(fBackendContext.get()); }
+ 
+ void resize(int w, int h) override;
+-void swapBuffers() override;
++void swapBuffers(const SkIRect* rect = nullptr) override;
+ 
+ void setDisplayParams(const DisplayParams& params) override;
+ 
 diff --git a/tools/sk_app/VulkanWindowContext.cpp 
b/tools/sk_app/VulkanWindowContext.cpp
-index 66670c892e..3a6804166f 100644

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

2021-07-26 Thread Andrea Gelmini (via logerrit)

 sdext/source/pdfimport/wrapper/wrapper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dd43ed8610f2d3e4c90d4bfd8a6ab3c736e5b4b8
Author: Andrea Gelmini 
AuthorDate: Mon Jul 26 17:56:32 2021 +0200
Commit: Julien Nabet 
CommitDate: Mon Jul 26 18:04:41 2021 +0200

Fix typos

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

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index ffa29b1f7b7b..7cf30241c5ee 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -556,11 +556,11 @@ void LineParser::readFont()
 /* The above font attributes (fontName, bold, italic) are based on
xpdf line output and may not be reliable. To get correct attributes,
we do the following:
-1. Read the embeded font file and determine the attributes based on the
+1. Read the embedded font file and determine the attributes based on the
font file.
 2. If we failed to read the font file, or empty result is returned, then
determine the font attributes from the font name.
-3. If all these attemps have failed, then use a fallback font.
+3. If all these attempts have failed, then use a fallback font.
 */
 if (nFileLen > 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread Eike Rathke (via logerrit)

 include/formula/grammar.hxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 3c766512984feff739377d0f0af46558ee7139fd
Author: Eike Rathke 
AuthorDate: Mon Jul 26 16:05:22 2021 +0200
Commit: Eike Rathke 
CommitDate: Mon Jul 26 21:41:55 2021 +0200

Related: tdf#64086 Add FormulaGrammar::isRefConventionOOXML()

... to prepare detailed compiler scanner handling.

Change-Id: I4a50491b4fa95516773adbd7b86e91ab121b1820
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119517
Tested-by: Eike Rathke 
Reviewed-by: Eike Rathke 

diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index 5d7933dee24a..b5b499d5aab4 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -209,6 +209,19 @@ public:
 css::sheet::FormulaLanguage::OOXML;
 }
 
+/** If reference convention is OOXML.
+
+Note this is not equivalent to isOOXML() as it does not have to be
+FormulaLanguage::OOXML but can be Grammar::GRAM_EXTERNAL merged with
+AddressConvention::CONV_XL_OOX, which is used by various parts of OOXML
+import through the API FormulaParser.
+ */
+static bool isRefConventionOOXML( const Grammar eGrammar )
+{
+return extractRefConvention( eGrammar) ==
+FormulaGrammar::AddressConvention::CONV_XL_OOX;
+}
+
 /// If grammar has an Excel syntax, determined by address convention.
 static bool isExcelSyntax( const Grammar eGrammar )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 xmlsecurity/source/helper/ooxmlsecparser.cxx |  156 ++---
 xmlsecurity/source/helper/xsecparser.cxx |  194 +--
 2 files changed, 175 insertions(+), 175 deletions(-)

New commits:
commit 4ce8c219fc4cc252e4f2546c2a59ee0447efa7ee
Author: Caolán McNamara 
AuthorDate: Mon Jul 26 19:44:38 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 26 22:44:37 2021 +0200

cid#1489423 Big parameter passed by value

and

cid#1489424 Big parameter passed by value
cid#1489425 Big parameter passed by value
cid#1489427 Big parameter passed by value
cid#1489432 Big parameter passed by value
cid#1489435 Big parameter passed by value
cid#1489436 Big parameter passed by value
cid#1489439 Big parameter passed by value
cid#1489441 Big parameter passed by value
cid#1489443 Big parameter passed by value
cid#1489445 Big parameter passed by value
cid#1489451 Big parameter passed by value
cid#1489459 Big parameter passed by value
cid#1489462 Big parameter passed by value
cid#1489463 Big parameter passed by value
cid#1489465 Big parameter passed by value
cid#1489467 Big parameter passed by value
cid#1489468 Big parameter passed by value
cid#1489469 Big parameter passed by value
cid#1489473 Big parameter passed by value
cid#1489475 Big parameter passed by value
cid#1489476 Big parameter passed by value
cid#1489477 Big parameter passed by value
cid#1489479 Big parameter passed by value
cid#1489481 Big parameter passed by value
cid#1489489 Big parameter passed by value
cid#1489491 Big parameter passed by value
cid#1489493 Big parameter passed by value
cid#1489495 Big parameter passed by value
cid#1489498 Big parameter passed by value
cid#1489501 Big parameter passed by value
cid#1489504 Big parameter passed by value
cid#1489508 Big parameter passed by value
cid#1489509 Big parameter passed by value
cid#1489513 Big parameter passed by value
cid#1489516 Big parameter passed by value
cid#1489518 Big parameter passed by value
cid#1489521 Big parameter passed by value
cid#1489533 Big parameter passed by value
cid#1489534 Big parameter passed by value
cid#1489537 Big parameter passed by value
cid#1489538 Big parameter passed by value
cid#1489540 Big parameter passed by value

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

diff --git a/xmlsecurity/source/helper/xsecparser.cxx 
b/xmlsecurity/source/helper/xsecparser.cxx
index f12e7031e349..2e07a1d14f8c 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -39,8 +39,8 @@ class XSecParser::Context
 std::optional m_pOldNamespaceMap;
 
 public:
-Context(XSecParser & rParser,
-std::optional pOldNamespaceMap)
+Context(XSecParser& rParser,
+std::optional&& pOldNamespaceMap)
 : m_rParser(rParser)
 , m_pOldNamespaceMap(std::move(pOldNamespaceMap))
 {
@@ -74,8 +74,8 @@ class XSecParser::UnknownContext
 : public XSecParser::Context
 {
 public:
-UnknownContext(XSecParser & rParser,
-std::optional pOldNamespaceMap)
+UnknownContext(XSecParser& rParser,
+std::optional&& pOldNamespaceMap)
 : XSecParser::Context(rParser, std::move(pOldNamespaceMap))
 {
 }
@@ -113,8 +113,8 @@ class XSecParser::ReferencedContextImpl
 bool m_isReferenced;
 
 public:
-ReferencedContextImpl(XSecParser & rParser,
-std::optional pOldNamespaceMap,
+ReferencedContextImpl(XSecParser& rParser,
+std::optional&& pOldNamespaceMap,
 bool const isReferenced)
 : XSecParser::Context(rParser, std::move(pOldNamespaceMap))
 , m_isReferenced(isReferenced)
@@ -139,8 +139,8 @@ class XSecParser::LoPGPOwnerContext
 OUString m_Value;
 
 public:
-LoPGPOwnerContext(XSecParser & rParser,
-std::optional pOldNamespaceMap)
+LoPGPOwnerContext(XSecParser& rParser,
+std::optional&& pOldNamespaceMap)
 : XSecParser::Context(rParser, std::move(pOldNamespaceMap))
 {
 }
@@ -163,8 +163,8 @@ class XSecParser::DsPGPKeyPacketContext
 OUString m_Value;
 
 public:
-DsPGPKeyPacketContext(XSecParser & rParser,
-std::optional pOldNamespaceMap)
+DsPGPKeyPacketContext(XSecParser& rParser,
+std::optional&& pOldNamespaceMap)
 : XSecParser::Context(rParser, std::move(pOldNamespaceMap))
 {
 }
@@ -187,8 +187,8 @@ class XSecParser::DsPGPKeyIDContext
 OUString m_Value;
 
 public:
-

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

 xmlsecurity/source/helper/xsecparser.cxx |   48 +++
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 1dd4a80fa076bedb3a82821517036bad8dd79857
Author: Caolán McNamara 
AuthorDate: Mon Jul 26 20:09:46 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 26 22:44:51 2021 +0200

cid#1489541 Big parameter passed by value

etc

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

diff --git a/xmlsecurity/source/helper/xsecparser.cxx 
b/xmlsecurity/source/helper/xsecparser.cxx
index 2e07a1d14f8c..b31f961e3548 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -58,7 +58,7 @@ class XSecParser::Context
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const /*nNamespace*/, OUString const& /*rName*/);
 
 virtual void Characters(OUString const& /*rChars*/)
@@ -88,7 +88,7 @@ class XSecParser::UnknownContext
 };
 
 auto XSecParser::Context::CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const /*nNamespace*/, OUString const& /*rName*/)
 -> std::unique_ptr
 {
@@ -221,7 +221,7 @@ class XSecParser::DsPGPDataContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_DS && rName == "PGPKeyID")
@@ -321,7 +321,7 @@ class XSecParser::DsX509IssuerSerialContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_DS && rName == "X509IssuerName")
@@ -360,7 +360,7 @@ class XSecParser::DsX509DataContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_DS && rName == "X509IssuerSerial")
@@ -395,7 +395,7 @@ class XSecParser::DsKeyInfoContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_DS && rName == "X509Data")
@@ -556,7 +556,7 @@ class XSecParser::DsTransformsContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_DS && rName == "Transform")
@@ -625,7 +625,7 @@ class XSecParser::DsReferenceContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_DS && rName == "Transforms")
@@ -688,7 +688,7 @@ class XSecParser::DsSignedInfoContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_DS && rName == "SignatureMethod")
@@ -751,7 +751,7 @@ class XSecParser::XadesCertificateValuesContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_XADES132 && rName == 
"EncapsulatedX509Certificate")
@@ -780,7 +780,7 @@ class XSecParser::XadesUnsignedSignaturePropertiesContext
 }
 
 virtual std::unique_ptr CreateChildContext(
-std::optional pOldNamespaceMap,
+std::optional&& pOldNamespaceMap,
 sal_uInt16 const nNamespace, OUString const& rName) override
 {
 if (nNamespace == XML_NAMESPACE_XADES132 && rName == 
"CertificateValues")
@@ -823,7 +823,7 @@ class XSecParser::XadesUnsignedPropertiesContext
 }
 
 virtual std::unique_ptr

[Libreoffice-commits] core.git: cui/source dbaccess/source include/svtools sc/source svtools/source sw/qa sw/source

 cui/source/options/opthtml.cxx  |   89 ---
 dbaccess/source/ui/misc/TokenWriter.cxx |3 
 include/svtools/htmlcfg.hxx |   58 
 sc/source/filter/html/htmlexp.cxx   |8 
 sc/source/filter/html/htmlpars.cxx  |   11 
 sc/source/filter/rtf/eeimpars.cxx   |4 
 svtools/source/config/htmlcfg.cxx   |  406 
 sw/qa/extras/htmlexport/htmlexport.cxx  |7 
 sw/source/filter/html/swhtml.cxx|   20 -
 sw/source/filter/html/wrthtml.cxx   |   27 +-
 sw/source/ui/chrdlg/pardlg.cxx  |3 
 sw/source/ui/dbui/mmresultdialogs.cxx   |3 
 sw/source/ui/dialog/uiregionsw.cxx  |6 
 sw/source/ui/fmtui/tmpdlg.cxx   |3 
 sw/source/ui/table/tabledlg.cxx |3 
 sw/source/uibase/app/docsh.cxx  |5 
 sw/source/uibase/app/docsh2.cxx |4 
 sw/source/uibase/app/docst.cxx  |3 
 sw/source/uibase/config/viewopt.cxx |3 
 sw/source/uibase/dbui/dbmgr.cxx |3 
 sw/source/uibase/shells/textsh.cxx  |6 
 sw/source/uibase/uiview/srcview.cxx |6 
 22 files changed, 176 insertions(+), 505 deletions(-)

New commits:
commit da9bba7cc3c243e936daea689fea64ecaf110f35
Author: Noel Grandin 
AuthorDate: Mon Jul 26 10:10:17 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 15:12:40 2021 +0200

use officecfg for SvxHtmlOptions

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

diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 7c9e15aa8704..5fb93652b9a9 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -19,6 +19,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include "opthtml.hxx"
 
 
@@ -72,68 +74,83 @@ std::unique_ptr OfaHtmlTabPage::Create( 
weld::Container* pPage, weld
 
 bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
 {
-SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
+std::shared_ptr xChanges = 
comphelper::ConfigurationChanges::create();
 if(m_xSize1NF->get_value_changed_from_saved())
-rHtmlOpt.SetFontSize(0, 
static_cast(m_xSize1NF->get_value()));
+officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::set(
+static_cast(m_xSize1NF->get_value()), xChanges);
 if(m_xSize2NF->get_value_changed_from_saved())
-rHtmlOpt.SetFontSize(1, 
static_cast(m_xSize2NF->get_value()));
+officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::set(
+static_cast(m_xSize2NF->get_value()), xChanges);
 if(m_xSize3NF->get_value_changed_from_saved())
-rHtmlOpt.SetFontSize(2, 
static_cast(m_xSize3NF->get_value()));
+officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::set(
+static_cast(m_xSize3NF->get_value()), xChanges);
 if(m_xSize4NF->get_value_changed_from_saved())
-rHtmlOpt.SetFontSize(3, 
static_cast(m_xSize4NF->get_value()));
+officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::set(
+static_cast(m_xSize4NF->get_value()), xChanges);
 if(m_xSize5NF->get_value_changed_from_saved())
-rHtmlOpt.SetFontSize(4, 
static_cast(m_xSize5NF->get_value()));
+officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::set(
+static_cast(m_xSize5NF->get_value()), xChanges);
 if(m_xSize6NF->get_value_changed_from_saved())
-rHtmlOpt.SetFontSize(5, 
static_cast(m_xSize6NF->get_value()));
+officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::set(
+static_cast(m_xSize6NF->get_value()), xChanges);
 if(m_xSize7NF->get_value_changed_from_saved())
-rHtmlOpt.SetFontSize(6, 
static_cast(m_xSize7NF->get_value()));
+officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::set(
+static_cast(m_xSize7NF->get_value()), xChanges);
 
 if(m_xNumbersEnglishUSCB->get_state_changed_from_saved())
-rHtmlOpt.SetNumbersEnglishUS(m_xNumbersEnglishUSCB->get_active());
+officecfg::Office::Common::Filter::HTML::Import::NumbersEnglishUS::set(
+m_xNumbersEnglishUSCB->get_active(), xChanges);
 
 if(m_xUnknownTagCB->get_state_changed_from_saved())
-rHtmlOpt.SetImportUnknown(m_xUnknownTagCB->get_active());
+officecfg::Office::Common::Filter::HTML::Import::UnknownTag::set(
+m_xUnknownTagCB->get_active(), xChanges);
 
 if(m_xIgnoreFontNamesCB->get_state_changed_from_saved())
-rHtmlOpt.SetIgnoreFontFamily(m_xIgnoreFontNamesCB->get_active());
+officecfg::Office::Common::Filter::HTML::Import::FontSetting::set(
+m_xIgnoreFontNamesCB->get_active(), xChanges);
 
 if(m_xStarBasicCB->get_state_changed_from_saved())
-rHtmlOpt.SetStarBasic(m_xStarBasicCB->get_active());
+

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

 editeng/source/items/numitem.cxx|   21 ++
 include/editeng/numitem.hxx |1 
 sw/inc/chpfld.hxx   |1 
 sw/qa/core/fields/data/chapter_field_followedby.odt |binary
 sw/qa/core/fields/fields.cxx|   41 ++--
 sw/source/core/fields/chpfld.cxx|9 ++--
 sw/source/core/txtnode/ndtxt.cxx|   28 -
 7 files changed, 68 insertions(+), 33 deletions(-)

New commits:
commit b67b3e2be0c80c3667ad2cb633e7e932d51d63a8
Author: Vasily Melenchuk 
AuthorDate: Fri Jul 23 20:15:08 2021 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 15:21:39 2021 +0200

sw: use followby parameter of outline in Chapter field

When Chapter field with format "Chapter number and name" is used
it does not insert any delimiter between number and name. Best is
to use outline/list property LabelFollowBy.

But since it is done inside field we are limited with supported
characters, so practically only space and nothing are correctly
supported. Tab and newline are replaced by space.

Change-Id: I4583b7051ae5ad963132980443fa70b5a19354e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119428
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 2f30242b911a..12ee8dbe533d 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -483,6 +483,27 @@ void SvxNumberFormat::SetLabelFollowedBy( const 
LabelFollowedBy eLabelFollowedBy
 {
 meLabelFollowedBy = eLabelFollowedBy;
 }
+
+OUString SvxNumberFormat::GetLabelFollowedByAsString() const
+{
+switch (meLabelFollowedBy)
+{
+case LISTTAB:
+return "\t";
+case SPACE:
+return " ";
+case NEWLINE:
+return "\n";
+case NOTHING:
+// intentionally left blank.
+return OUString();
+default:
+SAL_WARN("editeng", "Unknown SvxNumberFormat::GetLabelFollowedBy() 
return value");
+assert(false);
+}
+return OUString();
+}
+
 void SvxNumberFormat::SetListtabPos( const tools::Long nListtabPos )
 {
 mnListtabPos = nListtabPos;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 1846e6a8739c..63e819edf27e 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -213,6 +213,7 @@ public:
 
 void SetLabelFollowedBy( const LabelFollowedBy eLabelFollowedBy );
 LabelFollowedBy GetLabelFollowedBy() const { return meLabelFollowedBy;}
+OUString GetLabelFollowedByAsString() const;
 void SetListtabPos( const tools::Long nListtabPos );
 tools::Long GetListtabPos() const { return mnListtabPos;}
 void SetFirstLineIndent( const tools::Long nFirstLineIndent );
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 305831911b5f..1032f19b4abe 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -55,6 +55,7 @@ class SW_DLLPUBLIC SwChapterField final : public SwField
 sal_uInt8 nLevel;
 OUString sTitle;
 OUString sNumber;
+OUString sLabelFollowedBy;
 OUString sPre;
 OUString sPost;
 State() : nLevel(0) {}
diff --git a/sw/qa/core/fields/data/chapter_field_followedby.odt 
b/sw/qa/core/fields/data/chapter_field_followedby.odt
new file mode 100644
index ..b2086f2591b3
Binary files /dev/null and 
b/sw/qa/core/fields/data/chapter_field_followedby.odt differ
diff --git a/sw/qa/core/fields/fields.cxx b/sw/qa/core/fields/fields.cxx
index 7f59597831ea..a0c5a2c86c7e 100644
--- a/sw/qa/core/fields/fields.cxx
+++ b/sw/qa/core/fields/fields.cxx
@@ -84,9 +84,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf143424)
 
 // Field: Chapter Format: Chapter number and name
 xField.set(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Chapter 2 -Another title"), 
xField->getPresentation(false));
-//   ^^ seems here must be a separator
-// Please modify this testcase once this behavior will be fixed. For now I 
just fix and check this behavior
+CPPUNIT_ASSERT_EQUAL(OUString("Chapter 2 - Another title"), 
xField->getPresentation(false));
 
 // Field: Chapter Format: Chapter number
 xField.set(xFields->nextElement(), uno::UNO_QUERY);
@@ -96,6 +94,43 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf143424)
 xField.set(xFields->nextElement(), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(OUString("2"), xField->getPresentation(false));
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testChapterFieldsFollowedBy)
+{
+createSwDoc(DATA_DIRECTORY, "chapter_field_followedby.odt");
+
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xFieldsAccess(
+xTextFieldsSupplier->getTextFields());
+uno::Reference

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

 source/text/sbasic/shared/03/sf_array.xhp |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 4373f58e837de5fe8ae2d0650da53fa881a83f1e
Author: Rafael Lima 
AuthorDate: Mon Jul 26 15:25:56 2021 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Mon Jul 26 17:11:35 2021 +0200

Fix example in SF_Array

Change-Id: Ib52749668ada9c1b250cb0eb5f9c530808475fd2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119439
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/source/text/sbasic/shared/03/sf_array.xhp 
b/source/text/sbasic/shared/03/sf_array.xhp
index 8307754d8..48f53418b 100644
--- a/source/text/sbasic/shared/03/sf_array.xhp
+++ b/source/text/sbasic/shared/03/sf_array.xhp
@@ -814,8 +814,9 @@
 ' 
arr = | 5, 7, 3 |
 '
   | 1, 9, 5 |
 '
   | 6, 1, 8 |
-Dim 
arr as Variant
-arr = 
Array(Array(5, 7, 3), Array(1, 9, 5), Array(6, 1, 8))
+Dim 
arr as Variant : arr = Array(5, 7, 3)
+arr = 
SF_Array.AppendRow(arr, Array(1, 9, 5))
+arr = 
SF_Array.AppendRow(arr, Array(6, 1, 8))
 arr 
= SF_Array.SortColumns(arr, 2, "ASC")
 ' 
arr = | 7, 5, 3 |
 '
   | 9, 1, 5 |
@@ -846,8 +847,9 @@
 ' 
arr = | 5, 7, 3 |
 '
   | 1, 9, 5 |
 '
   | 6, 1, 8 |
-Dim 
arr as Variant
-arr = 
Array(Array(5, 7, 3), Array(1, 9, 5), Array(6, 1, 8))
+Dim 
arr as Variant : arr = Array(5, 7, 3)
+arr = 
SF_Array.AppendRow(arr, Array(1, 9, 5))
+arr = 
SF_Array.AppendRow(arr, Array(6, 1, 8))
 arr 
= SF_Array.SortRows(arr, 0, "ASC")
 ' 
arr = | 1, 9, 5 |
 '
   | 5, 7, 3 |
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit b199d04da2df72e700bf7086ee637e1c2f5d6f58
Author: Rafael Lima 
AuthorDate: Mon Jul 26 17:11:35 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 26 17:11:35 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 4373f58e837de5fe8ae2d0650da53fa881a83f1e
  - Fix example in SF_Array

Change-Id: Ib52749668ada9c1b250cb0eb5f9c530808475fd2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119439
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/helpcontent2 b/helpcontent2
index e400fba16ad4..4373f58e837d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e400fba16ad40d36f2feb5f05f7d90386f091e5d
+Subproject commit 4373f58e837de5fe8ae2d0650da53fa881a83f1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/text/frmform.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0e4775c8d629a343d30d2d1562e53717bd50c76
Author: Michael Stahl 
AuthorDate: Fri Jul 23 16:19:59 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 15:16:46 2021 +0200

sw: layout: fix red triangle problem with text frame in sections

First, a document is loaded, then about 4 pages of content are pasted into
it, in about 6 paste operations.

In an idle layout action, a page's worth of content moves forward; the
text frame at the bottom was split previously, and is joined.

The follow has the same upper as the master text frame, so this causes
the upper section frame to shrink:

 SwRect::operator=(const SwRect & rRect) Zeile 256
 SwFrameAreaDefinition::FrameAreaWriteAccess::~FrameAreaWriteAccess() Zeile 
112
 SwSectionFrame::Shrink_(__int64 nDist, bool bTst) Zeile 2327
 SwFrame::Shrink(__int64 nDist, bool bTst, bool bInfo) Zeile 1562
 SwContentFrame::Cut() Zeile 1339
 SwTextFrame::JoinFrame() Zeile 677
 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1310

The ToMaximize(false) check doesn't help because the section frame
doesn't have a follow (or footnotes).

Then the text frame is formatted, resulting in one line but no height
for it, and a split after the one line.

The split causes a follow section frame to be created, calling
SwSectionFrame::SimpleFormat() on the master's upper:

 
SwFrameAreaDefinition::FramePrintAreaWriteAccess::~FramePrintAreaWriteAccess() 
Zeile 120
 SwFrame::SetTopBottomMargins(__int64 nTop, __int64 nBot) Zeile 175
 SwRectFnSet::SetYMargins(SwFrame & rFrame, __int64 nTop, __int64 nBottom) 
Zeile 1405
 SwSectionFrame::SimpleFormat() Zeile 1192
 SwSectionFrame::SwSectionFrame(SwSectionFrame & rSect, bool bMaster) Zeile 
110
 SwFrame::GetNextSctLeaf(MakePageType eMakePage) Zeile 1781
 SwFrame::GetLeaf(MakePageType eMakePage, bool bFwd) Zeile 879
 SwFlowFrame::MoveFwd(bool bMakePage, bool bPageBreak, bool bMoveAlways) 
Zeile 1977
 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1349
 SwFrame::PrepareMake(OutputDevice * pRenderContext) Zeile 286
 SwFrame::Calc(OutputDevice * pRenderContext) Zeile 1794
 SwTextFrame::CalcFollow(o3tl::strong_int 
nTextOfst) Zeile 281
 SwTextFrame::AdjustFollow_(SwTextFormatter & rLine, 
o3tl::strong_int nOffset, 
o3tl::strong_int nEnd, const unsigned char nMode) 
Zeile 608

Now the upper has space but at this point the master text frame is valid
and not invalidated, so it never grows into the available space.

There is a check to format again in case additional space is available
in SwTextFrame::CalcFollow() but peculiarly it's disabled if the upper
is a section frame since initial CVS import.

Removing this check appears to fix the problem.

Change-Id: Ifad545f7e79675af6e33d68c7fcdbc82bd4f8f57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119419
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 44cc59db6f4f4f8b2ce5c993a31b5a019a8d7e97)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119434
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 82f2a8dcd893..f59665b2602b 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -323,7 +323,7 @@ bool SwTextFrame::CalcFollow(TextFrameIndex const nTextOfst)
 
 const tools::Long nRemaining =
  - aRectFnSet.BottomDist( GetUpper()->getFrameArea(), 
nOldBottom );
-if (  nRemaining > 0 && !GetUpper()->IsSctFrame() &&
+if (  nRemaining > 0 &&
   nRemaining != ( aRectFnSet.IsVert() ?
   nMyPos - getFrameArea().Right() :
   getFrameArea().Top() - nMyPos ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 editeng/source/items/numitem.cxx |   10 ++
 include/editeng/numitem.hxx  |2 +-
 sw/qa/core/fields/data/tdf143424.odt |binary
 sw/qa/core/fields/fields.cxx |   34 ++
 sw/source/core/doc/number.cxx|3 ++-
 sw/source/filter/ww8/wrtw8num.cxx|2 +-
 6 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit d44730148a95933f4a45a70241cb6d1d0546f626
Author: Vasily Melenchuk 
AuthorDate: Wed Jul 21 12:21:07 2021 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 15:18:16 2021 +0200

tdf#143424: support for "Chapter number without separator"

If LO is using list format strings (this is default behavior since
aa5c6d12) it was not able to show just numbering without all formatting,
as it used in some fields.

Change-Id: Ib4695b8e1c2d7a451522c7e04af2216d16aceefe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119309
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins

diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 41ee6e4cf952..2f30242b911a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -608,6 +608,16 @@ void 
SvxNumberFormat::SetListFormat(std::optional oSet)
 sSuffix = sListFormat->copy(nLastReplacement);
 }
 
+OUString SvxNumberFormat::GetListFormat(bool bIncludePrefixSuffix /*= true*/) 
const
+{
+assert(sListFormat.has_value());
+
+if (bIncludePrefixSuffix)
+return *sListFormat;
+
+// Strip prefix & suffix from string
+return sListFormat->copy(sPrefix.getLength(), sListFormat->getLength() - 
sPrefix.getLength() - sSuffix.getLength());
+}
 
 OUString SvxNumberFormat::GetCharFormatName()const
 {
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index bbcbecdf4c79..1846e6a8739c 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -175,7 +175,7 @@ public:
 voidSetListFormat(const OUString& rPrefix, const OUString& 
rSuffix, int nLevel);
 voidSetListFormat(std::optional oSet = std::nullopt);
 boolHasListFormat() const { return sListFormat.has_value(); }
-const OUString& GetListFormat() const { return *sListFormat; }
+OUStringGetListFormat(bool bIncludePrefixSuffix = true) const;
 
 voidSetCharFormatName(const OUString& rSet){ 
sCharStyleName = rSet; }
 virtual OUStringGetCharFormatName()const;
diff --git a/sw/qa/core/fields/data/tdf143424.odt 
b/sw/qa/core/fields/data/tdf143424.odt
new file mode 100644
index ..d485267f12e4
Binary files /dev/null and b/sw/qa/core/fields/data/tdf143424.odt differ
diff --git a/sw/qa/core/fields/fields.cxx b/sw/qa/core/fields/fields.cxx
index 74b94d7a3f8e..7f59597831ea 100644
--- a/sw/qa/core/fields/fields.cxx
+++ b/sw/qa/core/fields/fields.cxx
@@ -10,6 +10,8 @@
 #include 
 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -26,6 +28,8 @@ class Test : public SwModelTestBase
 {
 };
 
+constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/fields/data/";
+
 CPPUNIT_TEST_FIXTURE(Test, testAuthorityTooltip)
 {
 // Create a document with a bibliography reference in it.
@@ -62,6 +66,36 @@ CPPUNIT_TEST_FIXTURE(Test, testAuthorityTooltip)
 // first inserting an empty bibliography table into the document.
 CPPUNIT_ASSERT_EQUAL(OUString("ARJ00: Ar, J, mytitle, 2020"), aTooltip);
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf143424)
+{
+createSwDoc(DATA_DIRECTORY, "tdf143424.odt");
+
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xFieldsAccess(
+xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+
+// TODO: I have no idea why fields are enumerated in invalid order, not 
like in document
+
+// Field: Chapter Format: Chapter name
+uno::Reference xField(xFields->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Another title"), 
xField->getPresentation(false));
+
+// Field: Chapter Format: Chapter number and name
+xField.set(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Chapter 2 -Another title"), 
xField->getPresentation(false));
+//   ^^ seems here must be a separator
+// Please modify this testcase once this behavior will be fixed. For now I 
just fix and check this behavior
+
+// Field: Chapter Format: Chapter number
+xField.set(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Chapter 2 -"), 
xField->getPresentation(false));
+
+// Field: Chapter Format: Chapter number without separator
+xField.set(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2"), xField->getPresentation(false));
+}
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/number.cxx

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

 sw/source/ui/fldui/flddok.cxx |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 965636121cb1fb09739fcbca2c85f0a07bf6bf96
Author: Vasily Melenchuk 
AuthorDate: Wed Jul 21 21:28:59 2021 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 15:18:56 2021 +0200

tdf#143483: sw field edit: improved selection of format

During selection of used field format do this after list
is initialized. Otherwise selection can be lost during
further treelist filling.

Removed ancient hack which was trying to select at least
something in field format list: it is incorrect and does
not cover all possible fields/formats. It is just hiding
any potenial initialization problems.

Change-Id: Ibbbdd1e9a3436fec37cc49c11e6e235e8afcf4ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119341
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 7164c4ff2692..e7d5ad8a3930 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -464,19 +464,11 @@ sal_Int32 SwFieldDokPage::FillFormatLB(SwFieldTypesEnum 
nTypeId)
 const sal_uInt16 nFormatId = GetFieldMgr().GetFormatId( nTypeId, i );
 OUString sId(OUString::number(nFormatId));
 m_xFormatLB->append(sId, GetFieldMgr().GetFormatStr(nTypeId, i));
-if (IsFieldEdit() && nFormatId == (GetCurField()->GetFormat() & 
~AF_FIXED))
-m_xFormatLB->select_id(sId);
 }
 
-if (nSize && m_xFormatLB->get_selected_index() == -1)
+if (IsFieldEdit())
 {
-m_xFormatLB->select_text( SwResId(FMT_NUM_PAGEDESC) );
-if (m_xFormatLB->get_selected_index() == -1)
-{
-m_xFormatLB->select_text( SwResId(FMT_NUM_ARABIC) );
-if (m_xFormatLB->get_selected_index() == -1)
-m_xFormatLB->select( 0 );
-}
+m_xFormatLB->select_id(OUString::number(GetCurField()->GetFormat() & 
~AF_FIXED));
 }
 
 FormatHdl(*m_xFormatLB);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 5 commits - download.lst external/curl external/expat include/sal RepositoryExternal.mk sw/source

 RepositoryExternal.mk |2 +-
 download.lst  |8 
 external/curl/ExternalPackage_curl.mk |4 ++--
 external/curl/ExternalProject_curl.mk |7 ---
 external/curl/curl-7.26.0_win-proxy.patch |2 +-
 external/curl/curl-msvc-disable-protocols.patch.1 |7 ---
 external/curl/zlib.patch.0|4 ++--
 external/expat/expat-winapi.patch |   14 ++
 include/sal/log.hxx   |5 -
 sw/source/core/text/frmform.cxx   |2 +-
 10 files changed, 37 insertions(+), 18 deletions(-)

New commits:
commit be58fd35fdec695b7e0d1f6194b05486e4bb121e
Author: Michael Stahl 
AuthorDate: Fri Jul 23 16:19:59 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 26 14:40:16 2021 +0200

sw: layout: fix red triangle problem with text frame in sections

First, a document is loaded, then about 4 pages of content are pasted into
it, in about 6 paste operations.

In an idle layout action, a page's worth of content moves forward; the
text frame at the bottom was split previously, and is joined.

The follow has the same upper as the master text frame, so this causes
the upper section frame to shrink:

 SwRect::operator=(const SwRect & rRect) Zeile 256
 SwFrameAreaDefinition::FrameAreaWriteAccess::~FrameAreaWriteAccess() Zeile 
112
 SwSectionFrame::Shrink_(__int64 nDist, bool bTst) Zeile 2327
 SwFrame::Shrink(__int64 nDist, bool bTst, bool bInfo) Zeile 1562
 SwContentFrame::Cut() Zeile 1339
 SwTextFrame::JoinFrame() Zeile 677
 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1310

The ToMaximize(false) check doesn't help because the section frame
doesn't have a follow (or footnotes).

Then the text frame is formatted, resulting in one line but no height
for it, and a split after the one line.

The split causes a follow section frame to be created, calling
SwSectionFrame::SimpleFormat() on the master's upper:

 
SwFrameAreaDefinition::FramePrintAreaWriteAccess::~FramePrintAreaWriteAccess() 
Zeile 120
 SwFrame::SetTopBottomMargins(__int64 nTop, __int64 nBot) Zeile 175
 SwRectFnSet::SetYMargins(SwFrame & rFrame, __int64 nTop, __int64 nBottom) 
Zeile 1405
 SwSectionFrame::SimpleFormat() Zeile 1192
 SwSectionFrame::SwSectionFrame(SwSectionFrame & rSect, bool bMaster) Zeile 
110
 SwFrame::GetNextSctLeaf(MakePageType eMakePage) Zeile 1781
 SwFrame::GetLeaf(MakePageType eMakePage, bool bFwd) Zeile 879
 SwFlowFrame::MoveFwd(bool bMakePage, bool bPageBreak, bool bMoveAlways) 
Zeile 1977
 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1349
 SwFrame::PrepareMake(OutputDevice * pRenderContext) Zeile 286
 SwFrame::Calc(OutputDevice * pRenderContext) Zeile 1794
 SwTextFrame::CalcFollow(o3tl::strong_int 
nTextOfst) Zeile 281
 SwTextFrame::AdjustFollow_(SwTextFormatter & rLine, 
o3tl::strong_int nOffset, 
o3tl::strong_int nEnd, const unsigned char nMode) 
Zeile 608

Now the upper has space but at this point the master text frame is valid
and not invalidated, so it never grows into the available space.

There is a check to format again in case additional space is available
in SwTextFrame::CalcFollow() but peculiarly it's disabled if the upper
is a section frame since initial CVS import.

Removing this check appears to fix the problem.

Change-Id: Ifad545f7e79675af6e33d68c7fcdbc82bd4f8f57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119419
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 44cc59db6f4f4f8b2ce5c993a31b5a019a8d7e97)

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index d5a402ebe4c6..80d90a580bf1 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -333,7 +333,7 @@ bool SwTextFrame::CalcFollow(TextFrameIndex const nTextOfst)
 
 const long nRemaining =
  - aRectFnSet.BottomDist( GetUpper()->getFrameArea(), 
nOldBottom );
-if (  nRemaining > 0 && !GetUpper()->IsSctFrame() &&
+if (  nRemaining > 0 &&
   nRemaining != ( aRectFnSet.IsVert() ?
   nMyPos - getFrameArea().Right() :
   getFrameArea().Top() - nMyPos ) )
commit 850d48846bf95fc3bb8db4bcfb4fb2d11b03b6f0
Author: Michael Stahl 
AuthorDate: Wed Jul 21 11:57:51 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 26 14:40:16 2021 +0200

curl: upgrade to release 7.78.0

* Fixes CVE-2020-8284 CVE-2021-22924
* Also fixes these which don't look relevant to LO:
  CVE-2020-8231
  CVE-2020-8285 CVE-2020-8286
  CVE-2021-22876 CVE-2021-22890
  CVE-2021-22897 CVE-2021-22898 CVE-2021-22901

[Libreoffice-commits] core.git: 2 commits - sfx2/source vcl/inc vcl/jsdialog

2021-07-26 Thread Szymon Kłos (via logerrit)

 sfx2/source/sidebar/Deck.cxx |4 +---
 vcl/inc/jsdialog/jsdialogbuilder.hxx |8 
 vcl/jsdialog/jsdialogbuilder.cxx |   17 +
 3 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit 9cf1c5c8468d0e4974fe809455713a3e8f162822
Author: Szymon Kłos 
AuthorDate: Fri May 21 16:45:29 2021 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 26 15:55:51 2021 +0200

jsdialog: sidebar: dump all panels

Change-Id: Ifa547014f6857b0c1fbdce50cba745f1bee4e975
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119500
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 700fb19251bf..422eb3bb6b9b 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -144,9 +144,6 @@ void Deck::DumpAsPropertyTree(tools::JsonWriter& 
rJsonWriter)
 auto childrenNode = rJsonWriter.startArray("children");
 for (auto  : maPanels)
 {
-if (it->IsLurking())
-continue;
-
 // collapse the panel itself out
 auto xContent = it->GetContents();
 if (!xContent)
@@ -157,6 +154,7 @@ void Deck::DumpAsPropertyTree(tools::JsonWriter& 
rJsonWriter)
 rJsonWriter.put("type", "panel");
 rJsonWriter.put("text", it->GetTitle());
 rJsonWriter.put("enabled", true);
+rJsonWriter.put("hidden", it->IsLurking());
 
 {
 auto children2Node = rJsonWriter.startArray("children");
commit bd96480dab1313d62d8b58f2f6cb09ea03022cf7
Author: Szymon Kłos 
AuthorDate: Tue May 18 17:07:30 2021 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 26 15:55:34 2021 +0200

jsdialog: weld Container

Change-Id: I9516538cac8d2e42e0d029feaf84c3bc3a80151a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119499
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index cb2a95d9d368..450a11529507 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -229,6 +229,7 @@ public:
 virtual ~JSInstanceBuilder() override;
 virtual std::unique_ptr weld_message_dialog(const 
OString& id) override;
 virtual std::unique_ptr weld_dialog(const OString& id) 
override;
+virtual std::unique_ptr weld_container(const OString& id) 
override;
 virtual std::unique_ptr weld_label(const OString& id) 
override;
 virtual std::unique_ptr weld_button(const OString& id) 
override;
 virtual std::unique_ptr weld_entry(const OString& id) 
override;
@@ -393,6 +394,13 @@ public:
 virtual void response(int response) override;
 };
 
+class JSContainer final : public JSWidget
+{
+public:
+JSContainer(JSDialogSender* pSender, vcl::Window* pContainer, 
SalInstanceBuilder* pBuilder,
+bool bTakeOwnership);
+};
+
 class JSLabel final : public JSWidget
 {
 public:
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index fd9d152ae6ed..5a57e63dfbce 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -626,6 +626,17 @@ std::unique_ptr 
JSInstanceBuilder::weld_message_dialog(cons
 return pRet;
 }
 
+std::unique_ptr JSInstanceBuilder::weld_container(const 
OString& id)
+{
+vcl::Window* pContainer = m_xBuilder->get(id);
+auto pWeldWidget = std::make_unique(this, pContainer, this, 
false);
+
+if (pWeldWidget)
+RememberWidget(id, pWeldWidget.get());
+
+return pWeldWidget;
+}
+
 std::unique_ptr JSInstanceBuilder::weld_label(const OString& id)
 {
 ::FixedText* pLabel = m_xBuilder->get(id);
@@ -860,6 +871,12 @@ void JSDialog::response(int response)
 SalInstanceDialog::response(response);
 }
 
+JSContainer::JSContainer(JSDialogSender* pSender, vcl::Window* pContainer,
+ SalInstanceBuilder* pBuilder, bool bTakeOwnership)
+: JSWidget(pSender, pContainer, 
pBuilder, bTakeOwnership)
+{
+}
+
 JSLabel::JSLabel(JSDialogSender* pSender, FixedText* pLabel, 
SalInstanceBuilder* pBuilder,
  bool bTakeOwnership)
 : JSWidget(pSender, pLabel, pBuilder, 
bTakeOwnership)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: gl/Changelog.txt gl/description.xml gl/gl_ES.aff gl/gl_ES.dic gl/package-description.txt gl/README

2021-07-26 Thread Xisco Fauli (via logerrit)

 gl/Changelog.txt   |2 
 gl/README  |3 
 gl/description.xml |4 
 gl/gl_ES.aff   |  245 
 gl/gl_ES.dic   |240448 
++---
 gl/package-description.txt |3 
 6 files changed, 121576 insertions(+), 119129 deletions(-)

New commits:
commit c292071ca8f8dece2bf5655038cdfd4899a09fa3
Author: Xisco Fauli 
AuthorDate: Thu Jul 22 13:26:49 2021 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 26 16:31:04 2021 +0200

tdf#143489: Update Galician dictionaries to version 20.08

Change-Id: I95b0064894a10a47e638568f85ddf5eb97ac345e
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/119372
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/gl/Changelog.txt b/gl/Changelog.txt
index 38a86d7..683507c 100644
--- a/gl/Changelog.txt
+++ b/gl/Changelog.txt
@@ -1 +1 @@
-Véxase/See https://github.com/meixome/hunspell-gl/blob/master/CHANGELOG
+Véxase/See 
https://gitlab.com/proxecto-trasno/hunspell-gl/-/blob/master/CHANGELOG.rst
diff --git a/gl/README b/gl/README
index 7bd3779..b6556d3 100644
--- a/gl/README
+++ b/gl/README
@@ -4,8 +4,7 @@ and the coordination of Antón Méixome for Proxecto Trasno
 Corrector ortográfico hunspell-gl para galego (Volga estrito)
 e coordinado por Antón Méixome para Proxecto Trasno (www.trasno.net)
 
-Version 18.07 "Francisco Mirás"
-(https://gl.wikipedia.org/wiki/Francisco_Mirás)
+Version 20.08
 
 Nota.
 
diff --git a/gl/description.xml b/gl/description.xml
index 53e73a8..c8e312a 100644
--- a/gl/description.xml
+++ b/gl/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 
 
 
-https://github.com/meixome/hunspell-gl/issues; 
lang="en">Hunspell-gl
+https://gitlab.com/proxecto-trasno/hunspell-gl/-/issues; 
lang="en">Hunspell-gl
 
 
 
diff --git a/gl/gl_ES.aff b/gl/gl_ES.aff
index 51f0261..6af2e36 100644
--- a/gl/gl_ES.aff
+++ b/gl/gl_ES.aff
@@ -8629,8 +8629,6 @@ COMPOUNDRULE 3
 COMPOUNDRULE (901)(901)*(903)?
 COMPOUNDRULE (901)(901)*(902)(901)(901)*(903)?
 COMPOUNDRULE (901)(901)*(904)?(905)
-SFX 1011 Y 1
-SFX 1011 0 s 0 . is:plural
 PFX 1001 Y 8
 PFX 1001 0 Y .
 PFX 1001 0 Z .
@@ -8663,7 +8661,9 @@ PFX 1004 0 Ti .
 PFX 1004 0 Gi .
 PFX 1004 0 Mi .
 PFX 1004 0 ki .
-REP 21452
+SFX 1011 Y 1
+SFX 1011 0 s 0 . is:plural
+REP 21601
 REP ^abag avag
 REP ^abág avág
 REP ^abagada$ avagada
@@ -9265,6 +9265,8 @@ REP ^adubiar$ adobiar
 REP ^aducción$ adución
 REP ^aductor$ adutor
 REP ^aductores$ adutores
+REP ^advenimento$ chegada
+REP ^advenimentos$ chegadas
 REP ^adxetiva$ adxectiva
 REP ^adxetivas$ adxectivas
 REP ^adxetivo$ adxectivo
@@ -9637,6 +9639,7 @@ REP ^algunhos$ algúns
 REP ^algús$ algúns
 REP ^alhaja$ alfaia
 REP ^alhajas$ alfaias
+REP ^aliación aliaxe
 REP ^alicante$ alacante
 REP ^alicantina$ alacantina
 REP ^alicantinas$ alacantinas
@@ -12724,11 +12727,16 @@ REP ^callejón$ calello
 REP ^callejón$ canella
 REP ^callejón$ canellón
 REP ^callejón$ quella
-REP ^callejones^ calellas
-REP ^callejones^ calellos
-REP ^callejones^ canellas
-REP ^callejones^ canellóns
-REP ^callejones^ quellas
+REP ^callejones$ calellas
+REP ^callejones$ calellos
+REP ^callejones$ canellas
+REP ^callejones$ canellóns
+REP ^callejones$ quellas
+REP ^callejóns$ calellas
+REP ^callejóns$ calellos
+REP ^callejóns$ canellas
+REP ^callejóns$ canellóns
+REP ^callejóns$ quellas
 REP ^callexeira$ da_rúa
 REP ^callexeira$ na_rúa
 REP ^callexeiras$ da_rúa
@@ -13535,6 +13543,7 @@ REP ^cince cice
 REP ^cinceis$ ciceis
 REP ^cincel$ cicel
 REP ^cincoenta$ cincuenta
+REP ^cinguideiro cinguidoiro
 REP ^cintilada$ brillada
 REP ^cintilada$ escintilada
 REP ^cintilada$ refulxida
@@ -13598,6 +13607,7 @@ REP ^ciúme celo
 REP ^cizaña$ discordia
 REP ^cizaña$ xoio
 REP ^cizañas$ xoios
+REP ^claroscuro clarescuro
 REP ^clas$ clase
 REP ^clavada$ cravada
 REP ^clavadas$ cravadas
@@ -16604,6 +16614,7 @@ REP ^emplear$ empregar
 REP ^empleo emprego
 REP ^empleo$ emprego
 REP ^empleos$ empregos
+REP ^empoderamento apoderamento
 REP ^empola$ ampola
 REP ^empolada$ ampolada
 REP ^empoladas$ ampoladas
@@ -22782,6 +22793,8 @@ REP ^pao$ pau
 REP ^paolo$ paiolo
 REP ^paolos$ paiolos
 REP ^paos$ paus
+REP ^papeleo$ papelame
+REP ^papeleos$ papelames
 REP ^paquistaníes$ paquistanís
 REP ^paradeiro$ paradoiro
 REP ^paradeiros$ paradoiros
@@ -24080,7 +24093,13 @@ REP ^pontas$ puntas
 REP ^ponto punto
 REP ^ponto$ punto
 REP ^pontos$ puntos
+REP ^populación poboación
 REP ^populación$ poboación
+REP ^populaciona poboaciona
+REP ^populacionais$ demográficas
+REP ^populacionais$ demográficos
+REP ^populacional$ demográfica
+REP ^populacional$ demográfico
 REP ^populacións$ poboacións
 REP ^popurri$ popurrí
 REP ^popurris$ popurrís
@@ -24164,6 +24183,8

[Libreoffice-commits] core.git: dictionaries

2021-07-26 Thread Xisco Fauli (via logerrit)

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

New commits:
commit 264d28183e40cf35fa8351dc15503276524973b8
Author: Xisco Fauli 
AuthorDate: Mon Jul 26 16:31:04 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 26 16:31:04 2021 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to c292071ca8f8dece2bf5655038cdfd4899a09fa3
  - tdf#143489: Update Galician dictionaries to version 20.08

Change-Id: I95b0064894a10a47e638568f85ddf5eb97ac345e
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/119372
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index 01bb1d2c47c2..c292071ca8f8 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 01bb1d2c47c2c132adf6c6bef77cf7ec39d84535
+Subproject commit c292071ca8f8dece2bf5655038cdfd4899a09fa3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread Attila Szűcs (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf142693_hugePaperSizeImport.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |7 +++
 writerfilter/source/dmapper/ConversionHelper.cxx |5 +
 writerfilter/source/dmapper/ConversionHelper.hxx |1 +
 writerfilter/source/dmapper/DomainMapper.cxx |4 ++--
 5 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit d5d9795968771651c57c661d95b6992c3c778eca
Author: Attila Szűcs 
AuthorDate: Wed Jul 14 16:24:01 2021 +0200
Commit: László Németh 
CommitDate: Mon Jul 26 17:05:38 2021 +0200

tdf#142693 DOCX import: fix zeroing huge page sizes

which bigger than 2^15 twips (> ~57.8 cm).

Regression from commit 4d1621136c464b462a598571ecdcfe2ae119d8c7
"Fix ignoring large twips values like MSO does (cp#187)".

Note: Writer could export page size up to 600 cm × 600 cm,
and now it can import it back as well. It can even import
page sizes in kilometers, and display that, but there will
be other issues about its display. MS Word couldn't save
page size over 2^15, but can import, and display them till
up to 2^16 (that is about 116 cm).

Co-authored-by: Tibor Nagy (NISZ)

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf142693_hugePaperSizeImport.docx 
b/sw/qa/extras/ooxmlexport/data/tdf142693_hugePaperSizeImport.docx
new file mode 100644
index ..6ec35a7684d7
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf142693_hugePaperSizeImport.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 0c7c1984f421..3e7b38f8df75 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -1226,6 +1226,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf127741, "tdf127741.docx")
 CPPUNIT_ASSERT(visitedStyleName.equalsIgnoreAsciiCase("Visited Internet 
Link"));
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf142693_hugePaperSizeImport, 
"tdf142693_hugePaperSizeImport.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:pgSz", "w", "90369");
+assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:pgSz", "h", "104372");
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127925, "tdf127925.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx 
b/writerfilter/source/dmapper/ConversionHelper.cxx
index c5b1d3e5d027..6cb238b5a21f 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -423,6 +423,11 @@ sal_Int32 convertTwipToMM100(sal_Int32 _t)
 return ::convertTwipToMm100( _t );
 }
 
+sal_Int32 convertTwipToMM100WithoutLimit(sal_Int32 _t)
+{
+return ::convertTwipToMm100(_t);
+}
+
 double convertTwipToMM100Double(sal_Int32 _t)
 {
 // It appears that MSO handles large twip values specially, probably 
legacy 16bit handling,
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx 
b/writerfilter/source/dmapper/ConversionHelper.hxx
index 72c0efe0d540..619c93c9b8af 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -46,6 +46,7 @@ namespace writerfilter::dmapper::ConversionHelper{
 OUString ConvertMSFormatStringToSO(const OUString& rFormat, 
css::lang::Locale& rLocale, bool bHijri);
 // export just for test
 SAL_DLLPUBLIC_EXPORT sal_Int32 convertTwipToMM100(sal_Int32 _t);
+SAL_DLLPUBLIC_EXPORT sal_Int32 convertTwipToMM100WithoutLimit(sal_Int32 
_t);
 SAL_DLLPUBLIC_EXPORT double convertTwipToMM100Double(sal_Int32 _t);
 SAL_DLLPUBLIC_EXPORT sal_uInt32 convertTwipToMM100Unsigned(sal_Int32 _t);
 sal_Int16 convertTableJustification( sal_Int32 nIntValue );
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 7a9ac75306ff..52a4c9d5aae0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -625,7 +625,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 break;
 case NS_ooxml::LN_CT_PageSz_h:
 {
-sal_Int32 nHeight = 
ConversionHelper::convertTwipToMM100(nIntValue);
+sal_Int32 nHeight = 
ConversionHelper::convertTwipToMM100WithoutLimit(nIntValue);
 CT_PageSz.h = PaperInfo::sloppyFitPageDimension(nHeight);
 }
 break;
@@ -634,7 +634,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 break;
 case NS_ooxml::LN_CT_PageSz_w:
 {
-sal_Int32 nWidth =

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

 extras/source/database/biblio.dbf |binary
 extras/source/database/biblio.dbt |binary
 extras/source/database/biblio.odb |binary
 3 files changed

New commits:
commit a21a2bbb1c6f6a9281783bb6818cddc9075fe7c5
Author: Miklos Vajna 
AuthorDate: Mon Jul 26 15:17:58 2021 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 26 17:17:41 2021 +0200

sw bibliography, local copy: extend biblio.odb with a new column to store 
this

A new LocalURL column at the end, similar to how the
BibliographyDataField constant group was extended previously.

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

diff --git a/extras/source/database/biblio.dbf 
b/extras/source/database/biblio.dbf
index 4161cea25c37..2715f9945626 100644
Binary files a/extras/source/database/biblio.dbf and 
b/extras/source/database/biblio.dbf differ
diff --git a/extras/source/database/biblio.dbt 
b/extras/source/database/biblio.dbt
index e17daea26bd8..0ad40670b287 100644
Binary files a/extras/source/database/biblio.dbt and 
b/extras/source/database/biblio.dbt differ
diff --git a/extras/source/database/biblio.odb 
b/extras/source/database/biblio.odb
index 199fd6f5f4ba..9e7074495952 100644
Binary files a/extras/source/database/biblio.odb and 
b/extras/source/database/biblio.odb differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 4 commits - download.lst external/curl external/expat include/sal RepositoryExternal.mk sw/source

 RepositoryExternal.mk |2 +-
 download.lst  |8 
 external/curl/ExternalPackage_curl.mk |4 ++--
 external/curl/ExternalProject_curl.mk |7 ---
 external/curl/curl-7.26.0_win-proxy.patch |2 +-
 external/curl/curl-msvc-disable-protocols.patch.1 |7 ---
 external/curl/zlib.patch.0|4 ++--
 external/expat/UnpackedTarball_expat.mk   |1 -
 external/expat/expat-winapi.patch |   14 ++
 external/expat/ubsan.patch.0  |   11 ---
 include/sal/log.hxx   |5 -
 sw/source/core/text/frmform.cxx   |2 +-
 12 files changed, 37 insertions(+), 30 deletions(-)

New commits:
commit afbcde91d82de49f998d3103fa241d9ffddbf2d6
Author: Michael Stahl 
AuthorDate: Fri Jul 23 16:19:59 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 26 14:40:00 2021 +0200

sw: layout: fix red triangle problem with text frame in sections

First, a document is loaded, then about 4 pages of content are pasted into
it, in about 6 paste operations.

In an idle layout action, a page's worth of content moves forward; the
text frame at the bottom was split previously, and is joined.

The follow has the same upper as the master text frame, so this causes
the upper section frame to shrink:

 SwRect::operator=(const SwRect & rRect) Zeile 256
 SwFrameAreaDefinition::FrameAreaWriteAccess::~FrameAreaWriteAccess() Zeile 
112
 SwSectionFrame::Shrink_(__int64 nDist, bool bTst) Zeile 2327
 SwFrame::Shrink(__int64 nDist, bool bTst, bool bInfo) Zeile 1562
 SwContentFrame::Cut() Zeile 1339
 SwTextFrame::JoinFrame() Zeile 677
 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1310

The ToMaximize(false) check doesn't help because the section frame
doesn't have a follow (or footnotes).

Then the text frame is formatted, resulting in one line but no height
for it, and a split after the one line.

The split causes a follow section frame to be created, calling
SwSectionFrame::SimpleFormat() on the master's upper:

 
SwFrameAreaDefinition::FramePrintAreaWriteAccess::~FramePrintAreaWriteAccess() 
Zeile 120
 SwFrame::SetTopBottomMargins(__int64 nTop, __int64 nBot) Zeile 175
 SwRectFnSet::SetYMargins(SwFrame & rFrame, __int64 nTop, __int64 nBottom) 
Zeile 1405
 SwSectionFrame::SimpleFormat() Zeile 1192
 SwSectionFrame::SwSectionFrame(SwSectionFrame & rSect, bool bMaster) Zeile 
110
 SwFrame::GetNextSctLeaf(MakePageType eMakePage) Zeile 1781
 SwFrame::GetLeaf(MakePageType eMakePage, bool bFwd) Zeile 879
 SwFlowFrame::MoveFwd(bool bMakePage, bool bPageBreak, bool bMoveAlways) 
Zeile 1977
 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1349
 SwFrame::PrepareMake(OutputDevice * pRenderContext) Zeile 286
 SwFrame::Calc(OutputDevice * pRenderContext) Zeile 1794
 SwTextFrame::CalcFollow(o3tl::strong_int 
nTextOfst) Zeile 281
 SwTextFrame::AdjustFollow_(SwTextFormatter & rLine, 
o3tl::strong_int nOffset, 
o3tl::strong_int nEnd, const unsigned char nMode) 
Zeile 608

Now the upper has space but at this point the master text frame is valid
and not invalidated, so it never grows into the available space.

There is a check to format again in case additional space is available
in SwTextFrame::CalcFollow() but peculiarly it's disabled if the upper
is a section frame since initial CVS import.

Removing this check appears to fix the problem.

Change-Id: Ifad545f7e79675af6e33d68c7fcdbc82bd4f8f57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119419
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 44cc59db6f4f4f8b2ce5c993a31b5a019a8d7e97)

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 69db90b6502d..5ef68ca3010d 100755
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -326,7 +326,7 @@ bool SwTextFrame::CalcFollow(TextFrameIndex const nTextOfst)
 
 const long nRemaining =
  - aRectFnSet.BottomDist( GetUpper()->getFrameArea(), 
nOldBottom );
-if (  nRemaining > 0 && !GetUpper()->IsSctFrame() &&
+if (  nRemaining > 0 &&
   nRemaining != ( aRectFnSet.IsVert() ?
   nMyPos - getFrameArea().Right() :
   getFrameArea().Top() - nMyPos ) )
commit c5d829e6067d1cfa8607843bb31d870b3466c5b8
Author: Michael Stahl 
AuthorDate: Wed Jul 21 11:57:51 2021 +0200
Commit: Michael Stahl 
CommitDate: Fri Jul 23 17:24:23 2021 +0200

curl: upgrade to release 7.78.0

* Fixes CVE-2020-8284 CVE-2021-22924
* Also fixes these which don't look relevant to LO:
  CVE-2020-8231

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

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

New commits:
commit 1da91cd552d29923ab7ea8027119ff5f62103d57
Author: Vasily Melenchuk 
AuthorDate: Fri Jul 23 11:46:57 2021 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Jul 26 15:19:15 2021 +0200

sw: undo/redo: change undo id for numbering

Instead of "Reset attributes" new undo id is "Apply attributes". Seems
less confusing when modified numbering rule is appled.

Change-Id: I0bad38475363d6e0af01597271720d71aca7722c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119401
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index cd4458c276dd..994efbf37ec4 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -775,7 +775,7 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
 {
 StartAllAction();
 
-GetDoc()->GetIDocumentUndoRedo().StartUndo( SwUndoId::START, nullptr );
+GetDoc()->GetIDocumentUndoRedo().StartUndo( SwUndoId::INSATTR, nullptr );
 
 SwPaM* pCursor = GetCursor();
 if( IsMultiSelection() )
@@ -808,7 +808,7 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
   true, bResetIndentAttrs );
 GetDoc()->SetCounted( *pCursor, true, GetLayout() );
 }
-GetDoc()->GetIDocumentUndoRedo().EndUndo( SwUndoId::END, nullptr );
+GetDoc()->GetIDocumentUndoRedo().EndUndo( SwUndoId::INSATTR, nullptr );
 
 EndAllAction();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2021-07-26 Thread Julien Nabet (via logerrit)

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

New commits:
commit 97370902a77f403c569720f30b556eaf0a4b777c
Author: Julien Nabet 
AuthorDate: Mon Jul 26 15:39:40 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 26 15:39:40 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to e400fba16ad40d36f2feb5f05f7d90386f091e5d
  - Fix Duplicated entry. ID = par_id291613654389792

Change-Id: I72ea44bd3d61b390ded1ccdaf4dd53d192d76dc5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119510
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/helpcontent2 b/helpcontent2
index 1cd02ab17dec..e400fba16ad4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1cd02ab17dec63054396dfddb675334f2963a533
+Subproject commit e400fba16ad40d36f2feb5f05f7d90386f091e5d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread Julien Nabet (via logerrit)

 source/text/sbasic/shared/03/avail_release.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e400fba16ad40d36f2feb5f05f7d90386f091e5d
Author: Julien Nabet 
AuthorDate: Mon Jul 26 15:31:31 2021 +0200
Commit: Rafael Lima 
CommitDate: Mon Jul 26 15:39:40 2021 +0200

Fix Duplicated entry. ID = par_id291613654389792

Change-Id: I72ea44bd3d61b390ded1ccdaf4dd53d192d76dc5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119510
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/source/text/sbasic/shared/03/avail_release.xhp 
b/source/text/sbasic/shared/03/avail_release.xhp
index 887351ad8..d4219c3c3 100644
--- a/source/text/sbasic/shared/03/avail_release.xhp
+++ b/source/text/sbasic/shared/03/avail_release.xhp
@@ -43,8 +43,8 @@
 
  Tags for LibreOffice 7.3 
 
-This method is available from 
%PRODUCTNAME 7.3 onwards.
+This method is available from 
%PRODUCTNAME 7.3 onwards.
 
 
 
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/unx/generic/app/saldisp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3378c34287c6f02a8f75cb3a6d301cb27ac188e3
Author: Caolán McNamara 
AuthorDate: Mon Jul 26 13:38:38 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 26 19:28:07 2021 +0200

cid#1489523 silence bogus Out-of-bounds access

drop comment referring to no longer used return value

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

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index f7135eeada0a..33259eb2da49 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1895,7 +1895,7 @@ void SalX11Display::Yield()
 
 XNextEvent( pDisp_,  );
 
-// FIXME: under-convinced by Dispatch boolean return value vs. salframe.
+// coverity[overrun-buffer-val : FALSE] - coverity has problems with 
uno::Sequence
 Dispatch(  );
 
 #ifdef DBG_UTIL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 unotools/source/config/configitem.cxx|3 ++-
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |   12 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 8c48dd5ac555e37a1ee50f70edcb678d723e62f4
Author: Caolán McNamara 
AuthorDate: Mon Jul 26 13:51:09 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 26 19:28:45 2021 +0200

cid#1485150 silence Uncaught exception

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

diff --git a/unotools/source/config/configitem.cxx 
b/unotools/source/config/configitem.cxx
index bb77ac3d40b1..152730cec0b1 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -155,7 +156,7 @@ ConfigItem::ConfigItem(const OUString , 
ConfigItemMode nSetMode ) :
 
 ConfigItem::~ConfigItem()
 {
-RemoveChangesListener();
+suppress_fun_call_w_exception(RemoveChangesListener());
 ConfigManager::getConfigManager().removeConfigItem(*this);
 }
 
commit 682df20a542e5d113eaa3111db5ff28026987861
Author: Caolán McNamara 
AuthorDate: Mon Jul 26 13:46:34 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 26 19:28:32 2021 +0200

cid#1489422 Improper use of negative value

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

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index ef90297c5b97..a2e492936b96 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -147,20 +147,20 @@ public:
 return;
 
 if ( !sMoved.isEmpty() )
-m_aMoved.end()[-1] = sMoved;
+m_aMoved[m_aMoved.size() - 1] = sMoved;
 else if ( m_aMoved.size() >= 2 )
 // next table rows weren't moved
-m_aMoved.end()[-2] = "";
+m_aMoved[m_aMoved.size() - 2] = "";
 else
-m_aMoved.end()[-1] = "";
+m_aMoved[m_aMoved.size() - 1] = "";
 }
 
 OUString getMoved() const
 {
-if ( m_aMoved.size() >= 2 && !m_aMoved.end()[-2].isEmpty() )
-   return m_aMoved.end()[-2];
+if ( m_aMoved.size() >= 2 && !m_aMoved[m_aMoved.size() - 2].isEmpty() )
+   return m_aMoved[m_aMoved.size() - 2];
 else if ( !m_aMoved.empty() )
-   return m_aMoved.end()[-1];
+   return m_aMoved[m_aMoved.size() -1 ];
 
 return OUString();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/unotools/compatibility.hxx   |3 +
 sw/source/ui/config/optcomp.cxx  |   53 ---
 unotools/source/config/compatibility.cxx |   26 ++-
 3 files changed, 27 insertions(+), 55 deletions(-)

New commits:
commit 78adf246d5e99d0f5d91d2e03c1379b154289d8d
Author: Noel Grandin 
AuthorDate: Mon Jul 26 10:54:36 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 20:50:16 2021 +0200

return SvtCompatibilityEntry from SvtCompatibilityOptions::GetList

instead of converting back and forth

Change-Id: Iec913494ccad65ebff76bf7b6cf5b2440fbade42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119514
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/include/unotools/compatibility.hxx 
b/include/unotools/compatibility.hxx
index ba8de4e784b5..85c6c2484a31 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace osl { class Mutex; }
@@ -211,7 +212,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions final : 
public utl::detail::Opt
 
 @onerrorWe return an empty list.
 
*//*-*/
-css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > 
GetList() const;
+std::vector< SvtCompatibilityEntry > GetList() const;
 
 private:
 std::shared_ptr m_pImpl;
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index bea377047ae9..071b2fa1c76c 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -206,27 +206,16 @@ void SwCompatibilityOptPage::InitControls( const 
SfxItemSet& rSet )
 m_xMain->set_label(rText.replaceAll("%DOCNAME", sDocTitle));
 
 // loading file formats
-const Sequence< Sequence< PropertyValue > > aList = 
m_aConfigItem.GetList();
+const std::vector< SvtCompatibilityEntry > aList = m_aConfigItem.GetList();
 
-SvtCompatibilityEntry aEntry;
-
-for ( const Sequence< PropertyValue >& rEntry : aList )
+for ( const SvtCompatibilityEntry& rEntry : aList )
 {
-for ( const PropertyValue& aValue : rEntry )
-{
-aEntry.setValue( SvtCompatibilityEntry::getIndex(aValue.Name), 
aValue.Value );
-}
-
-const OUString sEntryName = aEntry.getValue( 
SvtCompatibilityEntry::Index::Name );
-
+const OUString sEntryName = rEntry.getValue( 
SvtCompatibilityEntry::Index::Name );
 const bool bIsUserEntry= ( sEntryName == 
SvtCompatibilityEntry::USER_ENTRY_NAME );
-const bool bIsDefaultEntry = ( sEntryName == 
SvtCompatibilityEntry::DEFAULT_ENTRY_NAME );
-
-aEntry.setDefaultEntry( bIsDefaultEntry );
 
-m_pImpl->m_aList.push_back( aEntry );
+m_pImpl->m_aList.push_back( rEntry );
 
-if ( aEntry.isDefaultEntry() )
+if ( rEntry.isDefaultEntry() )
 continue;
 
 OUString sNewEntry;
@@ -245,22 +234,22 @@ void SwCompatibilityOptPage::InitControls( const 
SfxItemSet& rSet )
 sNewEntry = sEntryName;
 
 sal_uInt32 nOptions = convertBools2Ulong_Impl(
-aEntry.getValue( SvtCompatibilityEntry::Index::UsePrtMetrics 
),
-aEntry.getValue( SvtCompatibilityEntry::Index::AddSpacing ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::AddSpacingAtPages ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::UseOurTabStops ),
-aEntry.getValue( SvtCompatibilityEntry::Index::NoExtLeading 
),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::UseLineSpacing ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::AddTableSpacing ),
-
aEntry.getValue(SvtCompatibilityEntry::Index::AddTableLineSpacing),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::UseObjectPositioning ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::UseOurTextWrapping ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::ConsiderWrappingStyle ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::ExpandWordSpace ),
-aEntry.getValue( SvtCompatibilityEntry::Index::ProtectForm ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::MsWordTrailingBlanks ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::SubtractFlysAnchoredAtFlys ),
-aEntry.getValue( 
SvtCompatibilityEntry::Index::EmptyDbFieldHidesPara ) );
+rEntry.getValue( SvtCompatibilityEntry::Index::UsePrtMetrics 
),
+rEntry.getValue( SvtCompatibilityEntry::Index::AddSpacing ),
+rEntry.getValue( 
SvtCompatibilityEntry::Index::AddSpacingAtPages ),
+rEntry.getValue( 
SvtCompatibilityEntry::Index::UseOurTabStops ),
+rEntry.getValue(

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

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4d85cf64bde5ad7d59deba2d8211404f1ec61fb3
Author: Caolán McNamara 
AuthorDate: Sun Jul 18 16:45:16 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 26 19:30:41 2021 +0200

crashtesting: assert on loading ooo127821-1.docx

there is another later assert unchanged by this commit

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bc63eae6c0b0..d0bf42c041ad 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3229,7 +3229,7 @@ void DomainMapper_Impl::PopFootOrEndnote()
 xFootnotes->getByIndex(1) >>= xFootnoteFirst;
 else
 xEndnotes->getByIndex(1) >>= xFootnoteFirst;
-if (!m_bSaxError)
+if (!m_bSaxError && xFootnoteFirst != xFootnoteLast)
 {
 uno::Reference< text::XText > xSrc( xFootnoteFirst, 
uno::UNO_QUERY_THROW );
 uno::Reference< text::XText > xDest( xFootnoteLast, 
uno::UNO_QUERY_THROW );
@@ -3248,10 +3248,10 @@ void DomainMapper_Impl::PopFootOrEndnote()
 // remove processed redlines
 for( size_t i = 0; redIdx > -1 && i <= 
sal::static_int_cast(redIdx) + 2; i++)
 m_aStoredRedlines[eType].pop_front();
-}
 
-// remove temporary footnote
-xFootnoteFirst->getAnchor()->setString("");
+// remove temporary footnote
+xFootnoteFirst->getAnchor()->setString("");
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread Olivier Hallot (via logerrit)

 filter/uiconfig/ui/pdflinkspage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21cb6039a3320682d0b1617facd86b092fcea10f
Author: Olivier Hallot 
AuthorDate: Mon Jul 26 09:56:13 2021 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jul 26 20:18:11 2021 +0200

tdf#143543 Fix extended tip for pdflinkspage.ui

Note: E.T. borrowed from Help page.
Change-Id: Ia4da746aa25c72a3ef1a77a52fea5034fb3a0ae6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119507
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/filter/uiconfig/ui/pdflinkspage.ui 
b/filter/uiconfig/ui/pdflinkspage.ui
index 09f1a4349fb0..892f72864665 100644
--- a/filter/uiconfig/ui/pdflinkspage.ui
+++ b/filter/uiconfig/ui/pdflinkspage.ui
@@ -34,7 +34,7 @@
 True
 
   
-Exports the 
current file in PDF format.
+Enable the 
checkbox to export the names of objects in your document as valid bookmark 
targets. This allows you to link to those objects by name from other 
documents.
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/svl/languageoptions.hxx   |   19 +---
 svl/source/config/cjkoptions.cxx  |   11 +
 svl/source/config/languageoptions.cxx |   40 +-
 3 files changed, 15 insertions(+), 55 deletions(-)

New commits:
commit f2b3256297241da458a471d591e582c14d6ab73c
Author: Noel Grandin 
AuthorDate: Mon Jul 26 12:04:33 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 20:51:02 2021 +0200

use officecfg for SvtSystemLanguageOptions

Change-Id: Icf5cf974e4235d9a961e08bfc5689ec58930236e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119515
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index 5fc9c8624dc4..9ae8475dd9eb 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -112,24 +112,9 @@ public:
 
 /** #i42730# Gives access to the Windows 16bit system locale
  */
-class SvtSystemLanguageOptions final : public utl::ConfigItem
+namespace SvtSystemLanguageOptions
 {
-private:
-OUString m_sWin16SystemLocale;
-
-boolisKeyboardLayoutTypeInstalled(sal_Int16 scriptType) const;
-
-virtual voidImplCommit() override;
-
-public:
-SvtSystemLanguageOptions();
-virtual ~SvtSystemLanguageOptions() override;
-
-virtual voidNotify( const css::uno::Sequence< OUString >& 
rPropertyNames ) override;
-
-LanguageTypeGetWin16SystemLanguage() const;
-
-boolisCJKKeyboardLayoutInstalled() const;
+boolisCJKKeyboardLayoutInstalled();
 };
 
 #endif // INCLUDED_SVL_LANGUAGEOPTIONS_HXX
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 71054f564de4..84c972875f3a 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -22,11 +22,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include "itemholder2.hxx"
 
@@ -199,10 +201,11 @@ void SvtCJKOptions_Impl::Load()
 
 if (!bAutoEnableCJK)
 {
-SvtSystemLanguageOptions aSystemLocaleSettings;
-
 //windows secondary system locale is CJK
-LanguageType eSystemLanguage = 
aSystemLocaleSettings.GetWin16SystemLanguage();
+OUString sWin16SystemLocale = 
officecfg::System::L10N::SystemLocale::get();
+LanguageType eSystemLanguage = LANGUAGE_NONE;
+if( !sWin16SystemLocale.isEmpty() )
+eSystemLanguage = 
LanguageTag::convertToLanguageTypeWithFallback( sWin16SystemLocale );
 if (eSystemLanguage != LANGUAGE_SYSTEM)
 {
 SvtScriptType nWinScript = 
SvtLanguageOptions::GetScriptTypeOfLanguage( eSystemLanguage );
@@ -211,7 +214,7 @@ void SvtCJKOptions_Impl::Load()
 
 //CJK keyboard is installed
 if (!bAutoEnableCJK)
-bAutoEnableCJK = 
aSystemLocaleSettings.isCJKKeyboardLayoutInstalled();
+bAutoEnableCJK = 
SvtSystemLanguageOptions::isCJKKeyboardLayoutInstalled();
 }
 
 if (bAutoEnableCJK)
diff --git a/svl/source/config/languageoptions.cxx 
b/svl/source/config/languageoptions.cxx
index 4f3f7671eda7..faaa93e2ddba 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -193,40 +193,9 @@ sal_Int16 SvtLanguageOptions::GetI18NScriptTypeOfLanguage( 
LanguageType nLang )
 return FromSvtScriptTypeToI18N( GetScriptTypeOfLanguage( nLang ) );
 }
 
-SvtSystemLanguageOptions::SvtSystemLanguageOptions() :
-utl::ConfigItem( "System/L10N")
-{
-uno::Sequence< OUString > aPropertyNames { "SystemLocale" };
-uno::Sequence< uno::Any > aValues = GetProperties( aPropertyNames );
-
-if ( aValues.hasElements() )
-{
-aValues[0]>>= m_sWin16SystemLocale;
-}
-}
-
-SvtSystemLanguageOptions::~SvtSystemLanguageOptions()
-{
-}
-
-voidSvtSystemLanguageOptions::ImplCommit()
-{
-//does nothing
-}
 
-voidSvtSystemLanguageOptions::Notify( const css::uno::Sequence< OUString 
>& )
-{
-// no listeners supported yet
-}
 
-LanguageType SvtSystemLanguageOptions::GetWin16SystemLanguage() const
-{
-if( m_sWin16SystemLocale.isEmpty() )
-return LANGUAGE_NONE;
-return LanguageTag::convertToLanguageTypeWithFallback( 
m_sWin16SystemLocale );
-}
-
-bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16 
scriptType) const
+static bool isKeyboardLayoutTypeInstalled(sal_Int16 scriptType)
 {
 bool isInstalled = false;
 #ifdef _WIN32
@@ -257,9 +226,12 @@ bool 
SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16 scriptTyp
 return isInstalled;
 }
 
-bool SvtSystemLanguageOptions::isCJKKeyboardLayoutInstalled() const
+namespace SvtSystemLanguageOptions
 {
-return isKeyboardLayoutTypeInstalled(css::i18n::ScriptType::ASIAN);
+bool isCJKKeyboardLayoutInstalled()
+{
+return

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

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

New commits:
commit d115205bc05209a32d8d47bae853424bef4191b1
Author: Caolán McNamara 
AuthorDate: Mon Jul 26 18:58:17 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 26 21:04:24 2021 +0200

cid#1489450 Big parameter passed by value

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

diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 885be2ead5ab..0b25efe97e5f 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -52,7 +52,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public 
css::xml::sax::XFastContextHa
 std::optional  m_xRewindMap;
 
 SAL_DLLPRIVATE std::optional TakeRewindMap() { return 
std::move(m_xRewindMap); }
-SAL_DLLPRIVATE void PutRewindMap(std::optional p) { 
m_xRewindMap = std::move(p); }
+SAL_DLLPRIVATE void PutRewindMap(std::optional&& p) { 
m_xRewindMap = std::move(p); }
 
 protected:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread Justin Luth (via logerrit)

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1441e001938d6a0b19743ef8170980238b88d350
Author: Justin Luth 
AuthorDate: Mon Jul 26 14:39:17 2021 +0200
Commit: Justin Luth 
CommitDate: Mon Jul 26 19:24:04 2021 +0200

tdf#143517 partial revert "tdf#141964 writerfilter CN: get para...

...paragraph and inherited listLevel

IIRC, I changed GetCurrentNumberingCharStyle() on the premise that
no matter where the level is defined (paragraph or style),
any function looking for it should use the inherited/applied level.
But GetCurrentNumberingCharStyle() itself looks like a bogus
hack that probably should be eliminated completely.

Unfortunately, 2123ede032ca64f696ef54af4ad3238974ca2b5d
from 2012 which introduced it does not include a unit test,
so there is no easy way to test whether it still has any
function.
[Eliminating it passes all unit tests and sounds similar to
tdf#108518 revert OOo hack: Fix issue #i119405: Numbering text style.]

In any case, just revert the changes to this function for now,
since hopelessly faulty functions don't need to operate "better".

Another alternative would be to just use GetListlevel(pEntry)
to at least allow style inheritance, but since it seems like
a completely faulty function to begin with, it seems better to
leave the function completely untouched.

Change-Id: I2eba777fdd68615d68b63288005a30301fa6ea2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119521
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 78f7dbc16b24..bc63eae6c0b0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -7657,7 +7657,7 @@ uno::Reference 
DomainMapper_Impl::GetCurrentNumberingRu
 if (nListId < 0)
 return xRet;
 if (pListLevel)
-*pListLevel = GetListLevel(pEntry, 
GetTopContextOfType(CONTEXT_PARAGRAPH));
+*pListLevel = pStyleSheetProperties->GetListLevel();
 
 // So we are in a paragraph style and it has numbering. Look up the 
relevant numbering rules.
 auto const pList(GetListTable()->GetList(nListId));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-07-26 Thread Olivier Hallot (via logerrit)

 filter/uiconfig/ui/pdflinkspage.ui |  106 ++---
 1 file changed, 53 insertions(+), 53 deletions(-)

New commits:
commit 01600f8917e290e59a8cdd2756231281bce96493
Author: Olivier Hallot 
AuthorDate: Mon Jul 26 09:49:51 2021 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jul 26 20:17:21 2021 +0200

Bump Glade version to 3.38 for pdflinkspage.ui

No change in dialog contents

Change-Id: I648ef9bda3d20782d6912e765fa4a28a68a663b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119506
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/filter/uiconfig/ui/pdflinkspage.ui 
b/filter/uiconfig/ui/pdflinkspage.ui
index 0af2b1861fee..09f1a4349fb0 100644
--- a/filter/uiconfig/ui/pdflinkspage.ui
+++ b/filter/uiconfig/ui/pdflinkspage.ui
@@ -1,37 +1,37 @@
 
-
+
 
   
   
 True
-False
+False
 True
 True
-6
+6
 vertical
 12
 
   
 True
-False
-0
-none
+False
+0
+none
 
-  
+  
   
 True
-False
-6
+False
 12
 6
+6
 
   
 Export outlines as named destinations
 True
-True
-False
-True
-True
+True
+False
+True
+True
 
   
 Exports the 
current file in PDF format.
@@ -39,18 +39,18 @@
 
   
   
-0
-0
+0
+0
   
 
 
   
 _Convert document references to PDF 
targets
 True
-True
-False
-True
-True
+True
+False
+True
+True
 
   
 Enable this 
checkbox to convert the URLs referencing other ODF files to PDF files with the 
same name. In the referencing URLs the extensions .odt, .odp, .ods, .odg, and 
.odm are converted to the extension .pdf.
@@ -58,18 +58,18 @@
 
   
   
-0
-1
+0
+1
   
 
 
   
 Export _URLs relative to file system
 True
-True
-False
-True
-True
+True
+False
+True
+True
 
   
 Enable this 
checkbox to export URLs to other documents as relative URLs in the file system. 
See "relative hyperlinks" in the Help.
@@ -77,8 +77,8 @@
 
   
   
-0
-2
+0
+2
   
 
   
@@ -86,7 +86,7 @@
 
   
 True
-False
+False
 General
 
   
@@ -103,26 +103,26 @@
 
   
 True
-False
-0
-none
+False
+0
+none
 
-  
+  
   
 True
-False
-6
+False
 12
 6
+6
 
   
 Default mode
 True
-True
-False
-True
+True
+False
+True
 True
-True
+True
 
   
 Links from your 
PDF document to other documents will be handled as it is specified in your 
operating system.
@@ -130,18 +130,18 @@
 
   
   
-0
-0
+0
+0
   
 
 
   
 Open with PDF reader application
 True
-True
-False
-True
-True
+True
+False
+True
+True
 default
 
   
@@ -150,18 +150,18 @@
 
   
   
-0
-1
+0
+1
   
 
 
   
 Open _with Internet browser
 True
-True
-False
-True
-True
+True
+False
+

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

 include/unotools/compatibility.hxx   |   11 ++-
 sw/source/ui/config/optcomp.cxx  |4 ++--
 unotools/source/config/compatibility.cxx |4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit d14ab85a4446279e24aa6b6d5e8bfedb48ccdfe1
Author: Noel Grandin 
AuthorDate: Mon Jul 26 10:44:16 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 26 20:49:25 2021 +0200

convert these into constants

Change-Id: Ie3e3b497cfeb8c9e9456fb86a04f409658116e1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119513
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/include/unotools/compatibility.hxx 
b/include/unotools/compatibility.hxx
index 3c025224ea1b..ba8de4e784b5 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -75,15 +75,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
 
 static OUString getName( const Index rIdx );
 
-static OUString getUserEntryName()
-{
-return "_user";
-}
-
-static OUString getDefaultEntryName()
-{
-return "_default";
-}
+static constexpr OUStringLiteral USER_ENTRY_NAME = u"_user";
+static constexpr OUStringLiteral DEFAULT_ENTRY_NAME = u"_default";
 
 static Index getIndex( std::u16string_view rName )
 {
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 8a57f054abca..bea377047ae9 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -219,8 +219,8 @@ void SwCompatibilityOptPage::InitControls( const 
SfxItemSet& rSet )
 
 const OUString sEntryName = aEntry.getValue( 
SvtCompatibilityEntry::Index::Name );
 
-const bool bIsUserEntry= ( sEntryName == 
SvtCompatibilityEntry::getUserEntryName() );
-const bool bIsDefaultEntry = ( sEntryName == 
SvtCompatibilityEntry::getDefaultEntryName() );
+const bool bIsUserEntry= ( sEntryName == 
SvtCompatibilityEntry::USER_ENTRY_NAME );
+const bool bIsDefaultEntry = ( sEntryName == 
SvtCompatibilityEntry::DEFAULT_ENTRY_NAME );
 
 aEntry.setDefaultEntry( bIsDefaultEntry );
 
diff --git a/unotools/source/config/compatibility.cxx 
b/unotools/source/config/compatibility.cxx
index 5556a0a231d4..c3ac4b6c532a 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -186,7 +186,7 @@ 
SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() : ConfigItem( ROOTN
 
 m_aOptions.push_back( aItem );
 
-if ( !bDefaultFound && aItem.getValue( 
SvtCompatibilityEntry::Index::Name ) == 
SvtCompatibilityEntry::getDefaultEntryName() )
+if ( !bDefaultFound && aItem.getValue( 
SvtCompatibilityEntry::Index::Name ) == 
SvtCompatibilityEntry::DEFAULT_ENTRY_NAME )
 {
 SvtSysLocale aSysLocale;
 css::lang::Locale aLocale = 
aSysLocale.GetLanguageTag().getLocale();
@@ -209,7 +209,7 @@ void SvtCompatibilityOptions_Impl::AppendItem( const 
SvtCompatibilityEntry& aIte
 m_aOptions.push_back( aItem );
 
 // default item reset?
-if ( aItem.getValue( SvtCompatibilityEntry::Index::Name ) == 
SvtCompatibilityEntry::getDefaultEntryName() )
+if ( aItem.getValue( SvtCompatibilityEntry::Index::Name ) == 
SvtCompatibilityEntry::DEFAULT_ENTRY_NAME )
 m_aDefOptions = aItem;
 
 SetModified();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build Failure on OpenSUSE Tumbleweed after distro upgrade: `NSSUTIL_3.59' not found

2021-07-26 Thread Luke Benes

This was resolved after a distro update of openSUSE Tumbleweed
20210709-0 -> 20210725-0
which updated:
mozilla-nss-3.64 -> mozilla-nss-3.66

I no longer need "--with-system-nss"

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

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

2021-07-26 Thread Regina Henschel (via logerrit)

 sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007image.docx   |binary
 sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007imageInline.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx   |   49 
+
 sw/source/filter/ww8/docxattributeoutput.cxx|   51 
-
 sw/source/filter/ww8/docxexport.cxx |   52 
++
 sw/source/filter/ww8/docxexport.hxx |3 
 sw/source/filter/ww8/docxsdrexport.cxx  |   27 
+++--
 writerfilter/source/dmapper/GraphicImport.cxx   |   31 
+
 writerfilter/source/dmapper/GraphicImport.hxx   |1 
 9 files changed, 159 insertions(+), 55 deletions(-)

New commits:
commit 67f2a99229101757af4f40118f4d3c83ba38648b
Author: Regina Henschel 
AuthorDate: Sun Jul 25 18:04:53 2021 +0200
Commit: Regina Henschel 
CommitDate: Tue Jul 27 01:34:02 2021 +0200

tdf#143475 consider Word 2007 rotated image speciality

Usually Word relates effectExtent to a rectangle with swapped width and
height, if the object rotation is between 45deg and 135deg. But Word
2007 (=version 12) makes an exception for images (bug?).
The patch determines the version from compatibility setting and
calculates wrap margins and effectExtent values considering this
special feature of Word 2007.

I have moved the part for getting the Word version from InteropGrabBag
from the local function lcl_getWordCompatibilityMode to DocxExport,
because I need it exactly the same way in docxsdrexport.cxx.

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

diff --git a/sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007image.docx 
b/sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007image.docx
new file mode 100644
index ..48506f4ec53a
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007image.docx differ
diff --git 
a/sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007imageInline.docx 
b/sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007imageInline.docx
new file mode 100644
index ..42c4894255ca
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/tdf143475_rotatedWord2007imageInline.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 257ffb234b6e..86f91c91fcaf 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -48,6 +48,55 @@ public:
 }
 };
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf143475rotatedWord2007imageInline)
+{
+// Given a docx document with compatibility to Word version 12 (2007), 
which has a shape
+// rotated by 75deg. Similar to testTdf143475rotatedWord2007image but with 
inline anchored
+// shape, as in bug report.
+load(mpTestDocumentPath, "tdf143475_rotatedWord2007imageInline.docx");
+
+// Word 2007 does not swap width and height for rotated images as done in 
later versions.
+// This was not considered and lead to wrong distance to text on import 
and wrong effectExtent
+// on export.
+// Import fails without fix with left: expected 1258 actual -743 ; right 
expected 1256 actual -743;
+// top: expected 14 actual 2013; bottom: expected 0 actual 1960;
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1258), 
getProperty(getShape(1), "LeftMargin"),
+ 1);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1256),
+ getProperty(getShape(1), 
"RightMargin"), 1);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(14), 
getProperty(getShape(1), "TopMargin"),
+ 1);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(0), 
getProperty(getShape(1), "BottomMargin"),
+ 1);
+
+// Because LO made the same error on export, which inverts the import 
error, import-export-cycle
+// does not fail without the patch. Therefore no export test.
+}
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf143475rotatedWord2007image)
+{
+// Given a docx document with compatibility to Word version 12 (2007), 
which has a shape
+// rotated by 75deg.
+load(mpTestDocumentPath, "tdf143475_rotatedWord2007image.docx");
+
+// Word 2007 does not swap width and height for rotated images as done in 
later versions.
+// This was not considered and lead to wrong distance to text on import 
and wrong effectExtent
+// on export.
+// Import fails without fix with left: expected 1252 actual -746 ; right 
expected 1256 actual -743;
+// top: expected 12 actual 2013; bottom: expected 0 actual 1960;
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1252), 
getProperty(getShape(1), "LeftMargin"),
+

[Libreoffice-bugs] [Bug 142120] Application color for CalcText not respected for cells with line breaks

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

--- Comment #1 from stragu  ---
Created attachment 173873
  --> https://bugs.documentfoundation.org/attachment.cgi?id=173873=edit
test ODS with different text return types

Heiko, I tried in 7.0.6, 7.2 RC1 and 7.3 alpha0+ (on Ubuntu 18.04), and I
couldn't even change the text colour for any cell. In "Tools > Options >
LibreOffice > Application Colors", starting from the default colour scheme, I
change the value for "Spreadsheet > Text", clicked Apply or OK: no change
whatsoever.

If I change the scheme to Dark, the text colour does change to whatever the
scheme defines, but changing the Text colour again does not work either.

Version: 7.2.0.1 / LibreOffice Community
Build ID: 32efc3b7f3a71cfa6a7fa3f6c208333df48656cc
CPU threads: 8; OS: Linux 4.15; UI render: default; VCL: gtk3
Locale: en-AU (en_AU.UTF-8); UI: en-US
Calc: threaded

Version: 7.3.0.0.alpha0+ / LibreOffice Community
Build ID: cd2b5168e8ef1cb6e721bc5220421464ed723096
CPU threads: 8; OS: Linux 4.15; UI render: default; VCL: gtk3
Locale: en-AU (en_AU.UTF-8); UI: en-US
TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time:
2021-07-21_14:56:23
Calc: threaded

Adding a test document to make it easy to test.

Which version were you using, Heiko?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143084] Vertical text layout is corrupted with fallback fonts and the Skia backend enabled

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

--- Comment #2 from Volga  ---
I suggest LibreOffice should build own font fallback machanism, so LibreOffice
could correctly handle fallback on any platform or rendering backend.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 140045] Windows Draw - forcing Skia software rendering apparently produces a memory leak

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

mwtjunkm...@gmail.com changed:

   What|Removed |Added

 Resolution|--- |INSUFFICIENTDATA
 Status|UNCONFIRMED |RESOLVED

--- Comment #2 from mwtjunkm...@gmail.com ---
I'm closing this because the problem seems to be (major guess on my part) more
a case of being in Draw and repeatedly using the image replace shortcut menu (I
audition a ton of PNG photographs next to each other in pamphlets) and after
about 90 minutes or so I must quit LO because it's getting slower and slower
and eventually becomes unusable, which is why I wrote this bug, but it's not
necessarily a Skia problem. PNG images range from about 500k to 1M each. 

It's ridiculous to ask someone to spend 90 minutes repeatedly using the image
replace feature to test, so I'm closing this.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 134294] Chapter numbering not updated when heading added in between (until reload)

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

BogdanB  changed:

   What|Removed |Added

 CC||buzea.bog...@libreoffice.or
   ||g

--- Comment #6 from BogdanB  ---
I retested in Version: 7.3.0.0.alpha0+ / LibreOffice Community
Build ID: 612d5b1a04fe022a34018d901bb9b052791d54e5
CPU threads: 4; OS: Linux 5.8; UI render: default; VCL: gtk3
Locale: ro-RO (ro_RO.UTF-8); UI: en-US
Calc: threaded

With the attachment from description if I click once on Heading 2 is a bug, if
I click one more time on Heading 2 everything is ok.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143517] FILESAVE: DOCX: Numbering list is incorrect in MSO after RT

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

Justin L  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Justin L  ---
Xisco: thanks for finding these problems.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143558] New: UI: It's possible to scroll Fontwork dialog to far (so lots of empty space)

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

Bug ID: 143558
   Summary: UI: It's possible to scroll Fontwork dialog to far (so
lots of empty space)
   Product: LibreOffice
   Version: 7.3.0.0 alpha0+ Master
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: UI
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: tele...@surfxs.nl

Description:
It's possible to scroll Fontwork dialog to far (so lots of empty space)

Steps to Reproduce:
1. Open Writer
2. insert -> Fontwork
3. Scroll down to bottom

Actual Results:
See screenshot

Expected Results:
Scroll to last row with content


Reproducible: Always


User Profile Reset: No



Additional Info:
Version: 7.3.0.0.alpha0+ (x64) / LibreOffice Community
Build ID: 2a151d1d5bc055d5e0011460b6ec42ea9f34f880
CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win
Locale: nl-NL (nl_NL); UI: en-US
Calc: CL

I have reported the same thing before.. but got fixed.. now it's back again?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143557] docx highlighting lost in round trip through odt format

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

Luke Deller  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=13
   ||1920

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 131920] Full text highlight + shading support

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

Luke Deller  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=14
   ||3557

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143558] UI: It's possible to scroll Fontwork dialog to far (so lots of empty space)

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

--- Comment #1 from Telesto  ---
Created attachment 173872
  --> https://bugs.documentfoundation.org/attachment.cgi?id=173872=edit
Screenshot

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 142115] Color of comments bar should follow the document canvas color

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

--- Comment #3 from stragu  ---
I see three options:

- Option 1: "Follow" the document background colour automatically (but don't
use the same, just something similar), so the comment's colours don't clash
between the two areas. But trickier to get it right, and might frustrate users
that it can't be changed to the colour the want?
- Option 2: New enhancement request for "Add a color setting for comment bar
background in Options > LibreOffice > Application Colors", to expose that
setting. Not sure if it should live in the "General" section or "Text document"
section, given that it is only relevant to Writer but does not affect the
document area per se.
- Option 3: Use the same colour as "document background" (Mike's idea). We
should then decide between keeping a frame around the area to distinguish it
from the application background, or let the comments "float" over the
application background (but still having a button above to show or hide the
comments, of course). The "floating" option might give it a more modern look,
and might work better if comments end up being presented at different X
positions in the future (to avoid overcrowded section and position mismatch).

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143347] Inserting a new row resets table formats.

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

Telesto  changed:

   What|Removed |Added

 CC||heiko.tietze@documentfounda
   ||tion.org

--- Comment #7 from Telesto  ---
@Heiko
The comment below is slightly off for fixing the bug here (I think). However
the bug reporter is [properly, no dev] right about the "binary table autoformat
is a dead" part. There must be some bug reported related to that, right?
Searching proper ticket. [Assuming you keeping tabs on the matter combined with
a vague recollection about some comments about this in context of issues arisen
in the 5.3 branch]


(In reply to taiwuco from comment #5)
> Thanks for notifying. I did make a quick search before posting the bug.
> 
> I read the bug 126008. I am no C++ developer but I, as a software developer,
> know the binary table autoformat is a dead end and this bug cannot be solved
> by debugging binary autoformat issue. It's too troublesome.
> 
> Why not just get rid of table autoformat? Instead, add a new format group
> tool to the table tool sets. Mark a group of formatted rows or columns as a
> format group in advance. Inserting a single row or column belonging to a
> format group will instead inserting the group of rows of columns. Deletion
> or other table tools apply the same concept.
> 
> I now use a no-style table only just to bypass the table autoformat.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 135982] Deleting text with backspace slows down heavily

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

Telesto  changed:

   What|Removed |Added

   Keywords|bibisectRequest, regression |
 Resolution|--- |WORKSFORME
 Status|UNCONFIRMED |RESOLVED

--- Comment #4 from Telesto  ---
(In reply to Buovjaga from comment #3)
> Nothing weird seen with perf. I don't see any frames or objects, though.
> 
> NixOS
> Version: 7.3.0.0.alpha0+ / LibreOffice Community
> Build ID: 67e47070a7580a17804adce812cc2f98bfe7b51f
> CPU threads: 16; OS: Linux 5.13; UI render: default; VCL: x11
> Locale: fi-FI (fi_FI.UTF-8); UI: en-US
> Calc: threaded

Track changes ->  show will popup the hidden content

But I'm not noticing anything off either.. 
Version: 7.3.0.0.alpha0+ (x64) / LibreOffice Community
Build ID: 2a151d1d5bc055d5e0011460b6ec42ea9f34f880
CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win
Locale: nl-NL (nl_NL); UI: en-US
Calc: CL

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143521] Crash of LibreOffice under Wayland when changing font size

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

--- Comment #8 from QA Administrators  ---
[Automated Action] NeedInfo-To-Unconfirmed

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 138830] After LobreOffice Writer crashed last few inserts are lost during recovery.

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

--- Comment #3 from QA Administrators  ---
Dear Constantin,

Please read this message in its entirety before proceeding.

Your bug report is being closed as INSUFFICIENTDATA due to inactivity and
a lack of information which is needed in order to accurately
reproduce and confirm the problem. We encourage you to retest
your bug against the latest release. If the issue is still
present in the latest stable release, we need the following
information (please ignore any that you've already provided):

a) Provide details of your system including your operating
   system and the latest version of LibreOffice that you have
   confirmed the bug to be present

b) Provide easy to reproduce steps – the simpler the better

c) Provide any test case(s) which will help us confirm the problem

d) Provide screenshots of the problem if you think it might help

e) Read all comments and provide any requested information

Once all of this is done, please set the bug back to UNCONFIRMED
and we will attempt to reproduce the issue. Please do not:

a) respond via email 

b) update the version field in the bug or any of the other details
   on the top section of our bug tracker

Warm Regards,
QA Team

MassPing-NeedInfo-FollowUp

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 138830] After LobreOffice Writer crashed last few inserts are lost during recovery.

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

QA Administrators  changed:

   What|Removed |Added

 Resolution|--- |INSUFFICIENTDATA
 Status|NEEDINFO|RESOLVED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 139853] libreoffice Calc Vlookup Error

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

--- Comment #6 from QA Administrators  ---
Dear peter,

This bug has been in NEEDINFO status with no change for at least
6 months. Please provide the requested information as soon as
possible and mark the bug as UNCONFIRMED. Due to regular bug
tracker maintenance, if the bug is still in NEEDINFO status with
no change in 30 days the QA team will close the bug as INSUFFICIENTDATA
due to lack of needed information.

For more information about our NEEDINFO policy please read the
wiki located here:
https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Status/NEEDINFO

If you have already provided the requested information, please
mark the bug as UNCONFIRMED so that the QA team knows that the
bug is ready to be confirmed.

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-NeedInfo-Ping

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 134967] LibreOffice Writer causes Ubuntu system forced logout when trying to handle multiple imported screenshots

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

--- Comment #2 from QA Administrators  ---
Dear trumpetguy314,

This bug has been in NEEDINFO status with no change for at least
6 months. Please provide the requested information as soon as
possible and mark the bug as UNCONFIRMED. Due to regular bug
tracker maintenance, if the bug is still in NEEDINFO status with
no change in 30 days the QA team will close the bug as INSUFFICIENTDATA
due to lack of needed information.

For more information about our NEEDINFO policy please read the
wiki located here:
https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Status/NEEDINFO

If you have already provided the requested information, please
mark the bug as UNCONFIRMED so that the QA team knows that the
bug is ready to be confirmed.

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-NeedInfo-Ping

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 139545] Nimbus Roman No9 L Bold font (otf fomat) not displayed correctly

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

--- Comment #3 from QA Administrators  ---
Dear donotspam,

This bug has been in NEEDINFO status with no change for at least
6 months. Please provide the requested information as soon as
possible and mark the bug as UNCONFIRMED. Due to regular bug
tracker maintenance, if the bug is still in NEEDINFO status with
no change in 30 days the QA team will close the bug as INSUFFICIENTDATA
due to lack of needed information.

For more information about our NEEDINFO policy please read the
wiki located here:
https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Status/NEEDINFO

If you have already provided the requested information, please
mark the bug as UNCONFIRMED so that the QA team knows that the
bug is ready to be confirmed.

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-NeedInfo-Ping

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143521] Crash of LibreOffice under Wayland when changing font size

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

QA Administrators  changed:

   What|Removed |Added

 Ever confirmed|1   |0
 Status|NEEDINFO|UNCONFIRMED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 136306] Dutch spell checker produces debatable suggestions

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 139596] Unexpected "Merge" option results in Calc

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 142120] Application color for CalcText not respected for cells with line breaks

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 136854] Delayed Application Background color change

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 137263] Export selection to png in Calc doesn't work with line wrap

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 135725] Chapter numbering cannot be compared

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

BogdanB  changed:

   What|Removed |Added

 CC||buzea.bog...@libreoffice.or
   ||g

--- Comment #3 from BogdanB  ---
Retested. The same in Version: 7.3.0.0.alpha0+ / LibreOffice Community
Build ID: 612d5b1a04fe022a34018d901bb9b052791d54e5
CPU threads: 4; OS: Linux 5.8; UI render: default; VCL: gtk3
Locale: ro-RO (ro_RO.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 142122] Applying changes to application color must not save it

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

stragu  changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #5 from stragu  ---
Apologies, I understand now: changing a colour saves the value in the selected
scheme automatically, which means it is not possible to go back to the default
colours of the scheme.

One way to fix it would be to:
- automatically switch to a "User-defined" scheme as soon as a value is
changed,
- change the "Save" button to "Save as...", to make it clearer that it will
save it as a new, separate scheme.

The "auto-save" behaviour would be kept, but the user can always go back to a
pre-existing scheme, or create a new one with "Save as...".

Version: 7.2.0.1 / LibreOffice Community
Build ID: 32efc3b7f3a71cfa6a7fa3f6c208333df48656cc
CPU threads: 8; OS: Linux 4.15; UI render: default; VCL: gtk3
Locale: en-AU (en_AU.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143557] New: docx highlighting lost in round trip through odt format

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

Bug ID: 143557
Summary: docx highlighting lost in round trip through odt
format
Product: LibreOffice
Version: 7.0.0.3 release
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: normal
Priority: medium
Component: Writer
Assignee: libreoffice-bugs@lists.freedesktop.org
Reporter: l...@deller.id.au

Description:
LibreOffice preserves text highlighting when opening a doc/docx file and saving
it again. However when the file is saved as odt, then the odt converted back
to doc/docx, then the highlighting is converted to shading. While this looks
visually the same, it surprises users who can no longer remove the highlighting
in Microsoft Word as expected.

Steps to Reproduce:
1. Open the attached highlighting.docx file (or any doc/docx produced by
Microsoft Word containing highlighting will do)
2. Save As highlighting-output.docx
3. Save As highlighting-output.odt
4. Close document
5. Open highlighting-output.odt
6. Save As highlighting-via-odt.docx
7. For each of the two output docx files (highlighting-output.docx
and highlighting-via-odt.docx) check whether this still contains highlighting

If you have access to Microsoft Word:
7A. Open the docx file in Word and try to remove the yellow highlighting
according to the documentation at
https://support.microsoft.com/en-us/office/apply-or-remove-highlighting-1747d808-6db7-4d49-86ac-1f0c3cc87e2e

If you do not have access to Microsoft Word:
7B. Unzip the docx file, open the contained word/document.xml, and search for
an element starting " Options -> Load/Save -> Microsoft Office -> Character Highlighting
"Export As" defaults to "Shading". Setting this to "Highlighting" avoids this
issue here but it breaks export of shading, effectively reintroducing bug
125268.

--
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 137140] Some delay after releasing the fontwork in drag drop action

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

Telesto  changed:

   What|Removed |Added

 Resolution|--- |WORKSFORME
 Status|NEEDINFO|RESOLVED

--- Comment #4 from Telesto  ---
Probably simply inserting fontworks called snow/stone.. 

Anyhow looks OK to me
Version: 7.3.0.0.alpha0+ (x64) / LibreOffice Community
Build ID: 2a151d1d5bc055d5e0011460b6ec42ea9f34f880
CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win
Locale: nl-NL (nl_NL); UI: en-US
Calc: CL

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143557] docx highlighting lost in round trip through odt format

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

--- Comment #1 from Luke Deller  ---
Created attachment 173871
  --> https://bugs.documentfoundation.org/attachment.cgi?id=173871=edit
highlighting.docx

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 142962] The text color button resets to it's default color when entering and exiting textboxes

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 137100] LO 7.0.1.2 - Ubuntu 19.10 (snap version)

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 142935] Spinners don't spin in LibO 7.2 beta and RC 1 KDE

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 136499] The startup of LibreOffice causes different connections to my Google Drive

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143084] Vertical text layout is corrupted with fallback fonts and the Skia backend enabled

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

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 129270] Chapter Numbering of Heading 1 changes after setting Return, if Next Style is set to Heading 2

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

BogdanB  changed:

   What|Removed |Added

 CC||buzea.bog...@libreoffice.or
   ||g

--- Comment #4 from BogdanB  ---
Retested. Also in
Version: 7.3.0.0.alpha0+ / LibreOffice Community
Build ID: 612d5b1a04fe022a34018d901bb9b052791d54e5
CPU threads: 4; OS: Linux 5.8; UI render: default; VCL: gtk3
Locale: ro-RO (ro_RO.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 136895] No undo step for marking a a comment as resolved

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

BogdanB  changed:

   What|Removed |Added

 CC||buzea.bog...@libreoffice.or
   ||g

--- Comment #3 from BogdanB  ---
The same. Retested in 
Version: 7.3.0.0.alpha0+ / LibreOffice Community
Build ID: 612d5b1a04fe022a34018d901bb9b052791d54e5
CPU threads: 4; OS: Linux 5.8; UI render: default; VCL: gtk3
Locale: ro-RO (ro_RO.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 135726] Chapter numbering change cannot be undone

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

BogdanB  changed:

   What|Removed |Added

 CC||buzea.bog...@libreoffice.or
   ||g

--- Comment #2 from BogdanB  ---
Still the same in
Version: 7.3.0.0.alpha0+ / LibreOffice Community
Build ID: 612d5b1a04fe022a34018d901bb9b052791d54e5
CPU threads: 4; OS: Linux 5.8; UI render: default; VCL: gtk3
Locale: ro-RO (ro_RO.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 139634] Writer: Selection of words by double click and mouse move in comments

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

BogdanB  changed:

   What|Removed |Added

 CC||buzea.bog...@libreoffice.or
   ||g

--- Comment #4 from BogdanB  ---
Retested in Version: 7.3.0.0.alpha0+ / LibreOffice Community
Build ID: 612d5b1a04fe022a34018d901bb9b052791d54e5
CPU threads: 4; OS: Linux 5.8; UI render: default; VCL: gtk3
Locale: ro-RO (ro_RO.UTF-8); UI: en-US
Calc: threaded

The same.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 138919] Text will split differently after applying highlighting (or font color) independent of zoom-level

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

Telesto  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=61
   ||444

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 143347] Inserting a new row resets table formats.