Row height test failing for some on Windows

[Ilmari Lauhakangas]

Someone I am mentoring got this test failure on Windows:

C:/cygwin/home/user/lode/dev/core/sc/qa/unit/subsequent_filters-test.cxx(3384) 
: error : Assertion

Test name: ScFiltersTest::testTdf118086
equality assertion failed
- Expected: 477
- Actual  : 480

Failures !!!
Run: 179   Failure total: 1   Failures: 1   Errors: 0

The test was added a few months ago:
https://git.libreoffice.org/core/commit/8e3548af67218034c9fc816c011ae4b16e081e16

The Windows display scaling was default, so that wasn't the issue. Any 
ideas?


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

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx|   12 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ---
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit a45876adc36a3764cfeadb1737e5dcfb7ffee9da
Author: Justin Luth 
AuthorDate: Fri Apr 30 13:25:54 2021 +0200
Commit: Justin Luth 
CommitDate: Fri Jul 9 07:24:16 2021 +0200

tdf#141964 writerfilter CN: listLevel 9 means no numbering

and so does numId 0.

Wow - this is REALLY FUNDAMENTAL stuff, and we weren't
handling it? Did anyone look at any of the specs
when they were implementing import of numbering?

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 7ef26bb13b4c..c65e59e2ff78 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -168,6 +168,18 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf141966_chapterNumberTortureTest, "tdf141966_chap
 // 2nd.iii in MS Word 2003.  2nd.ii in MS Word 2010/2016 where para5 is 
not numbered. Why not?
 CPPUNIT_ASSERT_EQUAL(OUString("2nd.iii"), getProperty(xPara, 
"ListLabelString"));
 CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(xPara, 
"NumberingLevel")); // Level 2
+
+xPara.set(getParagraph(9, "outline with Body listLvl(9)."), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara, 
"ListLabelString"));
+
+xPara.set(getParagraph(10, "outline with Body listLvl(9) #2."), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara, 
"ListLabelString"));
+
+xPara.set(getParagraph(11, "direct formatting - Body listLvl(9)."), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara, 
"ListLabelString"));
+
+xPara.set(getParagraph(13, "Style numId0 cancels inherited numbering."), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara, 
"ListLabelString"));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf132752, "tdf132752.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 74550ec80245..01ea5230ecfa 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1548,14 +1548,15 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
 if (nListLevel == -1 && nListId > 0)
 nListLevel = 0;
 
-if ( !bNoNumbering && !isNumberingViaRule && nListLevel >= 0 )
+if (!bNoNumbering && !isNumberingViaRule && nListLevel >= 0 && 
nListLevel < 9)
 pParaContext->Insert( PROP_NUMBERING_LEVEL, 
uno::makeAny(nListLevel), false );
 
 auto const pList(GetListTable()->GetList(nListId));
 if (pList && nListId >= 0 && 
!pParaContext->isSet(PROP_NUMBERING_STYLE_NAME))
 {
-if ( bNoNumbering )
-pParaContext->Insert( PROP_NUMBERING_STYLE_NAME, 
uno::makeAny(OUString()) );
+// ListLevel 9 means Body Level/no numbering.  numId 0 means no 
numbering.
+if (bNoNumbering || nListLevel == 9 || (!isNumberingViaRule && 
!nListId))
+pParaContext->Insert(PROP_NUMBERING_STYLE_NAME, 
uno::makeAny(OUString()), true);
 else if ( !isNumberingViaRule )
 {
 isNumberingViaStyle = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

1 new defect(s) introduced to LibreOffice found with Coverity Scan.


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


** CID 1487029:  Incorrect expression  (IDENTICAL_BRANCHES)
/sc/source/filter/xml/XMLExportDatabaseRanges.cxx: 484 in 
::WriteDatabaseRange::writeCondition(const ScQueryEntry &, int, bool, 
utl::SearchParam::SearchType)()



*** CID 1487029:  Incorrect expression  (IDENTICAL_BRANCHES)
/sc/source/filter/xml/XMLExportDatabaseRanges.cxx: 484 in 
::WriteDatabaseRange::writeCondition(const ScQueryEntry &, int, bool, 
utl::SearchParam::SearchType)()
478 {
479 // Multi-item condition.
480 assert( rItems.size() > 1 && "rItems should have more than 
1 element");
481 
482 // Store the 1st value for backward compatibility.
483 const ScQueryEntry::Item& rItem = rItems.front();
>>> CID 1487029:  Incorrect expression  (IDENTICAL_BRANCHES)
>>> The same code is executed regardless of whether "rItem.meType == 
>>> ScQueryEntry::ByValue" is true, because the 'then' and 'else' branches are 
>>> identical. Should one of the branches be modified, or the entire 'if' 
>>> statement replaced?
484 if (rItem.meType == ScQueryEntry::ByValue)
485 {
486 mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, 
rItem.maString.getString());
487 }
488 else
489 {



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3DwOnx_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJin9-2B-2BJqbuhkYr2oOcNx6-2FYQ6uI15Xuvwlqpxw-2BVUXWujt-2FnTQJMvadxq4-2FpPkbEz7lqKSezKmLxEowyBaU-2Fzyc7DaF1aOCNjcSuHM8Iba32rabAFlsI7QmHuH-2BqcqZZOvsxE0cIDGRbDEUo44TrSu4w-2BtGWVka-2FKjdW-2F70MaeDvo-3D

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

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

[Gülşah Köse (via logerrit)]

 include/oox/core/contexthandler2.hxx  |   19 +
 include/oox/core/fragmenthandler2.hxx |   11 ---
 include/oox/drawingml/graphicshapecontext.hxx |1 
 include/oox/ole/oleobjecthelper.hxx   |1 
 oox/source/core/contexthandler2.cxx   |   85 +-
 oox/source/core/fragmenthandler2.cxx  |   70 -
 oox/source/drawingml/graphicshapecontext.cxx  |   11 +++
 sc/source/filter/oox/worksheetfragment.cxx|6 -
 sd/qa/unit/data/pptx/tdf143222.pptx   |binary
 sd/qa/unit/export-tests-ooxml3.cxx|   30 +
 10 files changed, 148 insertions(+), 86 deletions(-)

New commits:
commit 92a407b7f90a98704a238c5ffa3a3491eaf3263a
Author: Gülşah Köse 
AuthorDate: Wed Jul 7 00:27:58 2021 +0300
Commit: Gülşah Köse 
CommitDate: Thu Jul 8 23:12:07 2021 +0200

tdf143222 Handle alternate content of graphicData element.

Handle alternate content and make true choice.

According to ooxml spec ole object requires exactly one pic
element. (ECMA-376 Part 1, Annex A, CT_OleObject). In the
current case first choice has not pic element and we should
allow fallback processing.

Change-Id: I30b7de703b8c2f00d6bf286e05eea505ac3627f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118539
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/include/oox/core/contexthandler2.hxx 
b/include/oox/core/contexthandler2.hxx
index 4e256089ac8e..3a75aff5706a 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -72,7 +72,7 @@ struct ElementInfo;
 class OOX_DLLPUBLIC ContextHandler2Helper
 {
 public:
-explicitContextHandler2Helper( bool bEnableTrimSpace );
+explicitContextHandler2Helper( bool bEnableTrimSpace, 
XmlFilterBase& rFilter );
 explicitContextHandler2Helper( const ContextHandler2Helper& 
rParent );
 virtual ~ContextHandler2Helper();
 
@@ -201,6 +201,21 @@ protected:
 /** Must be called from endRecord() in derived classes. */
 voidimplEndRecord( sal_Int32 nRecId );
 
+boolprepareMceContext( sal_Int32 nElement, const 
AttributeList& rAttribs );
+XmlFilterBase&  getDocFilter() const { return mrFilter; }
+
+enum class MCE_STATE
+{
+Started,
+FoundChoice
+};
+
+MCE_STATE   getMCEState() const { return aMceState.back(); }
+voidsetMCEState( MCE_STATE aState ) { aMceState.back() = 
aState; }
+voidaddMCEState( MCE_STATE aState ) { aMceState.push_back( 
aState ); }
+voidremoveMCEState() { aMceState.pop_back(); }
+boolisMCEStateEmpty() { return aMceState.empty(); }
+
 private:
 ContextHandler2Helper& operator=( const ContextHandler2Helper& ) = delete;
 
@@ -214,9 +229,11 @@ private:
 
 ContextStackRef mxContextStack; ///< Stack of all processed 
elements.
 size_t  mnRootStackSize;///< Stack size on construction 
time.
+std::vector aMceState;
 
 protected:
 boolmbEnableTrimSpace;  ///< True = trim whitespace in 
characters().
+XmlFilterBase&  mrFilter;
 };
 
 class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public 
ContextHandler2Helper
diff --git a/include/oox/core/fragmenthandler2.hxx 
b/include/oox/core/fragmenthandler2.hxx
index 86d1453f13a1..598426ee681e 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -47,17 +47,6 @@ class XmlFilterBase;
 
 class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public 
ContextHandler2Helper
 {
-protected:
-enum class MCE_STATE
-{
-Started,
-FoundChoice
-};
-::std::vector   aMceState;
-
-boolprepareMceContext( sal_Int32 nElement, const 
AttributeList& rAttribs );
-
-
 public:
 explicitFragmentHandler2(
 XmlFilterBase& rFilter,
diff --git a/include/oox/drawingml/graphicshapecontext.hxx 
b/include/oox/drawingml/graphicshapecontext.hxx
index 4813d5fc9aed..ffd579f00bb1 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -62,6 +62,7 @@ public:
 OleObjectGraphicDataContext( ::oox::core::ContextHandler2Helper const & 
rParent, const ShapePtr& pShapePtr );
 virtual ~OleObjectGraphicDataContext() override;
 virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 
Element, const ::oox::AttributeList& rAttribs ) override;
+virtual void onEndElement() override;
 
 private:
 ::oox::vml::OleObjectInfo& mrOleObjectInfo;
diff --git a/include/oox/ole/oleobjecthelper.hxx 
b/include/oox/ole/oleobjecthelper.hxx
index d2506f3d4949..5b792f2048b1 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -47,6 +47,7 @@ struc

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

[Caolán McNamara (via logerrit)]

 framework/source/uielement/toolbarmanager.cxx |3 ---
 include/vcl/window.hxx|2 +-
 svtools/source/uno/popupwindowcontroller.cxx  |3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 3175a7684982e7812e8071c595395eb3da3035fc
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 14:28:25 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 22:26:51 2021 +0200

make SetParentToDefaultWindow available from vcl only

rechecked tdf#119390. If I tear off the color popdown in writer, click
in the combobox and shift-tab to put focus in the button (where focus is
more visible) and close the torn off window then focus continues to
return to the main document as wanted.

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

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 0bd0d627ff9d..f08cfe60a6d8 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -182,9 +182,6 @@ public:
 delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( 
nItemId ));
 }
 
-// tdf#119390 this will reparent the toolbar, so focus is restored 
from a
-// floating toolbar to the last focused control of the application 
window.
-m_pToolBar->SetParentToDefaultWindow();
 // #i93173# note we can still be in one of the toolbar's handlers
 m_pToolBar->SetSelectHdl( Link() );
 m_pToolBar->SetActivateHdl( Link() );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 1cdb347a486e..0deb36dad6fd 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1455,7 +1455,7 @@ public:
  * document window and not the first widget in the current parent of the 
floating
  * window.
 */
-void SetParentToDefaultWindow();
+SAL_DLLPRIVATE void SetParentToDefaultWindow();
 
 
 //  Keyboard access functions
diff --git a/svtools/source/uno/popupwindowcontroller.cxx 
b/svtools/source/uno/popupwindowcontroller.cxx
index 17b432c445e5..8d3efd838bd1 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -80,9 +80,6 @@ void PopupWindowControllerImpl::SetFloatingWindow()
 if( mpFloatingWindow )
 {
 mpFloatingWindow->RemoveEventListener( LINK( this, 
PopupWindowControllerImpl, WindowEventListener ) );
-// tdf#119390 reparent the window, so focus is restored
-// to the last focused control of the application window.
-mpFloatingWindow->SetParentToDefaultWindow();
 mpFloatingWindow.disposeAndClear();
 }
 mpFloatingWindow = mpPopupWindow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/sidebar/TabBar.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c109e1d1f5965fe03c666fee6c0bd4dd875f29c8
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 13:48:35 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 20:16:57 2021 +0200

tdf#143146 copy functor and arg before calling function that can delete this

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

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index a233519f4752..b823a7c61b3d 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -251,13 +251,17 @@ TabBar::Item::~Item()
 mrTabBar.GetContainer()->move(mxButton.get(), nullptr);
 }
 
-
 IMPL_LINK_NOARG(TabBar::Item, HandleClick, const OString&, void)
 {
+// tdf#143146 copy the functor and arg before calling
+// GrabFocusToDocument which may destroy this object
+auto aDeckActivationFunctor = maDeckActivationFunctor;
+auto sDeckId = msDeckId;
+
 mrTabBar.GrabFocusToDocument();
 try
 {
-maDeckActivationFunctor(msDeckId);
+aDeckActivationFunctor(sDeckId);
 }
 catch(const css::uno::Exception&)
 {} // workaround for #i123198#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] ESC meeting minutes: 2021-07-08

[Stephan Bergmann]

On 08/07/2021 17:01, Noel Grandin wrote:

I'm playing with the idea of saying:

     Everything inside the soffice binary __must__ use OWeakObject and 
css::uno::WeakReference to do any weak stuff.


That still leaves the dreaded scenario of a C++ extension not using 
OWeakObject---whether or not that's a scenario to worry about.


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

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 3fa9e73a5b07c828ac6377fc3b40d3c71d4b3a41
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 14:36:28 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 17:46:09 2021 +0200

tidy up comment formatting

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index fa029f89400f..61bcc8ce57a0 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1803,7 +1803,7 @@ void Window::KeyInput( const KeyEvent& rKEvt )
 KeyCode cod = rKEvt.GetKeyCode ();
 bool autoacc = ImplGetSVData()->maNWFData.mbAutoAccel;
 
-// do not respond to accelerators unless Alt or Ctrl is held */
+// do not respond to accelerators unless Alt or Ctrl is held
 if (cod.GetCode () >= 0x200 && cod.GetCode () <= 0x219)
 {
 if (autoacc && cod.GetModifier () != KEY_MOD2 && !(cod.GetModifier() & 
KEY_MOD1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/drviewsj.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 36e1f1f5e7da5563ba721874e15a92b874ae1c5f
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 14:15:12 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 17:40:58 2021 +0200

Resolves: tdf#143153 null-deref on grouping fit-to-frame obj with another

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

diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 47cbb175ddf4..9eebdbc57c29 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -271,7 +271,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
 if( SfxItemState::DEFAULT == rSet.GetItemState( 
SID_OUTLINE_TEXT_AUTOFIT ) )
 {
 const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-const bool bSet = 
pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE)->GetValue()
 != drawing::TextFitToSizeType_NONE;
+const SdrTextFitToSizeTypeItem* pItem = 
pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE);
+const bool bSet = pItem && pItem->GetValue() != 
drawing::TextFitToSizeType_NONE;
 rSet.Put(SfxBoolItem(SID_OUTLINE_TEXT_AUTOFIT, bSet));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/uiconfig/ui/sidebartextcolumnspanel.ui |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 321436d7bb9087a92e8f69cc948bb3ebb23049c7
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 14:05:56 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 17:40:05 2021 +0200

Related: tdf#143153 these are GtkBox properties not GtkGrid ones

nothing to do with the crash though

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

diff --git a/svx/uiconfig/ui/sidebartextcolumnspanel.ui 
b/svx/uiconfig/ui/sidebartextcolumnspanel.ui
index 42b93c64f213..47d6fd0977ca 100644
--- a/svx/uiconfig/ui/sidebartextcolumnspanel.ui
+++ b/svx/uiconfig/ui/sidebartextcolumnspanel.ui
@@ -98,9 +98,8 @@
 
   
   
-False
-True
-0
+0
+0
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ESC meeting minutes: 2021-07-08

[Noel Grandin]

> * What’s cooking (Miklos)
>   + Noel looked at UNO-level weak references, performance → found a
> different solution for a11y
>
>
Our a11y is fundamentally slow because it always builds a parallel object
hierarchy of ~everything, UI and document model.

And because it makes extensive use of weak pointers, and ours are even
slower than std::weak_ptr (which is not high performance itself).

Ideally, we should be building the a11y stuff on-demand, but that it just
too deep of a change to be achievable.

I'm playing with the idea of saying:

Everything inside the soffice binary __must__ use OWeakObject and
css::uno::WeakReference to do any weak stuff.

and then I can specialise the weak object implementation into two - one
fast one for everything inside the process, and a slow one for handling
cross-process weak pointers.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: ESC meeting minutes: 2021-07-08

[Noel Grandin]

On Thu, 8 Jul 2021 at 16:29, Miklos Vajna  wrote:

>   8 CppunitTest_sw_core_undogerrit_windows
>   9 CppunitTest_writerperfect_writergerrit_windows
>  22 CppunitTest_sc_uicalc   gerrit_windows
>
>
Can anyone else trigger these? I've tried and I can't seem to get any of
these on my Windows box, despite running them repeatedly.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

ESC meeting minutes: 2021-07-08

[Miklos Vajna]

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

* Completed Action Items:
+ Upload a PO file for classification (Cloph)

* Pending Action Items:
+ None

* Release Engineering update (Cloph)
+ 7.2 status: 7.2 rc1 this week (this evening)
  + string freeze, 1 review needed
+ 7.1 status: 7.1.5 rc2 next week
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)
+ New Help: no news
+ Helpcontents2:
  + New: +1, fixed: 1, Open:248, partial:23
  + Updates and fixes (R. Lima, fitoshido, ohallot, Johnny_M, s. Fanning)
+ Guides
  + Published Getting started guide 7.1 in HTML5 format
 + https://books.libreoffice.org/en/GS71/GS71.html
  + Guides being updated as usual
+ Open question:
  + LO/ODF is “good” between offline file formats (OOXML, ODF or PDF, but 
poor in online export.
  + Can we look into better export of ODF/LO to HTML5 with modern browser 
techniques?
  + Look beyond file export short vision and reach document export to 
online long vision.
+some extensions (unsupported) has the right approach (writer2latex.oxt)
  + ODF spec itself: XHTML export worked in practice (Michael S)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
259(259) (topicUI) bugs open, 138(138) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added 12(9) 15(7) 30(7)   74(3)
 commented 59(12)   227(-3)   795(-33)   3564(-72)
   removed  2(1)  6(1) 15(0)   36(2)
  resolved  9(2) 43(-7)   144(-3) 508(-5)
+ top 10 contributors:
  Heiko Tietze made 197 changes in 1 month, and 2345 changes in 1 year
  Foote, V Stuart made 54 changes in 1 month, and 618 changes in 1 year
  Eyal Rozenberg made 29 changes in 1 month, and 112 changes in 1 year
  Telesto made 25 changes in 1 month, and 781 changes in 1 year
  Dieter made 23 changes in 1 month, and 386 changes in 1 year
  Ilmari Lauhakangas made 16 changes in 1 month, and 339 changes in 1 
year
  Max L. made 16 changes in 1 month, and 16 changes in 1 year
  Kaganski, Mike made 14 changes in 1 month, and 182 changes in 1 year
  Roman Kuznetsov made 10 changes in 1 month, and 194 changes in 1 year
  NISZ LibreOffice Team made 9 changes in 1 month, and 22 changes in 1 
year

  + New tickets with needsUXEval Jul/01-08

* [Bug 143249] UI: Buttons to toggle border lines on/off in table
   properties border dialog
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143249
* [Bug 143248] UI: Line width of a border is impossible to tell from GUI
   (in table properties)
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143248
* [Bug 143245] Clicking anywhere in the Description area will trigger
   the Form creation window
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143245
* [Bug 143210] UI: Item View>Toolbars>Customize should open Toolbars
   tab in Customize dialog at once
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143210
* [Bug 143202] A way stop animating gifs on a slide from animating in
   EDIT mode
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143202
* [Bug 143201] A way to identify animating gif images inside a
   presentation (or draw)
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143201
 -> * [Bug 143187] Calc: Delete Tools>Options>LibreOffice Calc>
   Compatibility page
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143187
* [Bug 142750] Text area loses focus when pressing the
  Format Painter button
  + https://bugs.documentfoundation.org/show_bug.cgi?id=142750
* [Bug 143144] (wishlist) "Input list" field: Add confirmation
  dialog in order to prevent lost of data
  + https://bugs.documentfoundation.org/show_bug.cgi?id=143144


* Crash Testing (Caolan)
+ 18(+2) import failure, 9(+1) export failures
+ 0 coverity issues
+ 10 ossfuzz issues
  + big improvement, even some timeouts gone, but new ones always return

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/7.0.6.2
 + (+37) 1000 963 979 1143 1052 824 234 0
   + https://crashreport.libreoffice.org/stats/version/7.1.3.2
 + (695) 2858 3553 4687 6349 7105 6534 5427 3679 1730 0
   + https://crashreport.libreoffice.org/stats/version/7.1.4.2
 + (+924) 4028 3104 1968 1590 0
   + 
https://crashreport.libreoffice.org/stats/signature/SalInstanceTreeView::get_drag_source()
- Save as dialog ?
  - SwContentTree::TimerUpdate is

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

[Caolán McNamara (via logerrit)]

 toolkit/source/awt/vclxwindows.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a32c39bb29a8f085d3a2b0880a632b3cda7e8bf5
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:03:22 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 16:04:22 2021 +0200

pGetFormatter was already fetched via GetFormatter()

so don't need to refetch it here

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

diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index ce81e68fdd2e..c1fbf72c1d55 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -5725,7 +5725,7 @@ css::uno::Any VCLXNumericField::getProperty( const 
OUString& PropertyName )
 break;
 case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
 {
-NumericFormatter* pNumericFormatter = 
static_cast(GetFormatter());
+NumericFormatter* pNumericFormatter = 
static_cast(pFormatter);
 aProp <<= pNumericFormatter->IsUseThousandSep();
 }
 break;
@@ -5981,7 +5981,7 @@ css::uno::Any VCLXMetricField::getProperty( const 
OUString& PropertyName )
 {
 case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
 {
-NumericFormatter* pNumericFormatter = 
static_cast(GetFormatter());
+NumericFormatter* pNumericFormatter = 
static_cast(pFormatter);
 aProp <<= pNumericFormatter->IsUseThousandSep();
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 toolkit/source/awt/vclxwindows.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 583291d2d8d0cc9815b144c1b02847eb29421ccb
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:03:22 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 16:04:09 2021 +0200

pGetFormatter was already fetched via GetFormatter()

so don't need to refetch it here

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

diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index 0277ec36a780..caf63ba3b5d0 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -5725,7 +5725,7 @@ css::uno::Any VCLXNumericField::getProperty( const 
OUString& PropertyName )
 break;
 case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
 {
-NumericFormatter* pNumericFormatter = 
static_cast(GetFormatter());
+NumericFormatter* pNumericFormatter = 
static_cast(pFormatter);
 aProp <<= pNumericFormatter->IsUseThousandSep();
 }
 break;
@@ -5981,7 +5981,7 @@ css::uno::Any VCLXMetricField::getProperty( const 
OUString& PropertyName )
 {
 case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
 {
-NumericFormatter* pNumericFormatter = 
static_cast(GetFormatter());
+NumericFormatter* pNumericFormatter = 
static_cast(pFormatter);
 aProp <<= pNumericFormatter->IsUseThousandSep();
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/xlsx/tdf122191.xlsx|binary
 sc/qa/unit/subsequent_export-test2.cxx |   33 +
 2 files changed, 33 insertions(+)

New commits:
commit aa5acdda9a1bd05263e482c4f527be6d088edde6
Author: Xisco Fauli 
AuthorDate: Thu Jul 8 11:42:28 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jul 8 16:02:26 2021 +0200

tdf#122191: sc_subsequent_export-test2: Add unittest

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

diff --git a/sc/qa/unit/data/xlsx/tdf122191.xlsx 
b/sc/qa/unit/data/xlsx/tdf122191.xlsx
new file mode 100644
index ..023fa849cc28
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf122191.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test2.cxx 
b/sc/qa/unit/subsequent_export-test2.cxx
index 74e795709b0e..e222c202e885 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -146,6 +146,7 @@ public:
 void testTdf91634XLSX();
 void testTdf115159();
 void testTdf112567();
+void testTdf122191();
 void testTdf112567b();
 void testTdf123645XLSX();
 void testTdf125173XLSX();
@@ -245,6 +246,7 @@ public:
 CPPUNIT_TEST(testTdf91634XLSX);
 CPPUNIT_TEST(testTdf115159);
 CPPUNIT_TEST(testTdf112567);
+CPPUNIT_TEST(testTdf122191);
 CPPUNIT_TEST(testTdf112567b);
 CPPUNIT_TEST(testTdf123645XLSX);
 CPPUNIT_TEST(testTdf125173XLSX);
@@ -1341,6 +1343,37 @@ void ScExportTest2::testTdf112567()
 xDocSh->DoClose();
 }
 
+void ScExportTest2::testTdf122191()
+{
+// Set the system locale to Hungarian
+SvtSysLocaleOptions aOptions;
+OUString sLocaleConfigString = aOptions.GetLanguageTag().getBcp47();
+aOptions.SetLocaleConfigString("hu-HU");
+aOptions.Commit();
+comphelper::ScopeGuard g([&aOptions, &sLocaleConfigString] {
+aOptions.SetLocaleConfigString(sLocaleConfigString);
+aOptions.Commit();
+});
+
+ScDocShellRef xShell = loadDoc(u"tdf122191.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocument& rDoc = xShell->GetDocument();
+CPPUNIT_ASSERT_EQUAL(OUString("IGAZ"), rDoc.GetString(0, 0, 0));
+
+ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+xShell->DoClose();
+
+ScDocument& rDoc2 = xDocSh->GetDocument();
+// Without the fix in place, this test would have failed with
+// - Expected: IGAZ
+// - Actual  : BOOL00AN
+CPPUNIT_ASSERT_EQUAL(OUString("IGAZ"), rDoc2.GetString(0, 0, 0));
+
+xDocSh->DoClose();
+}
+
 void ScExportTest2::testTdf112567b()
 {
 // Set the system locale to Hungarian (a language with different range 
separator)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/qa sal/rtl

[Stephan Bergmann (via logerrit)]

 sal/qa/rtl/math/test-rtl-math.cxx |   16 
 sal/rtl/math.cxx  |4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 2b2b6405161025678f91a5625e50d0b414597368
Author: Stephan Bergmann 
AuthorDate: Thu Jul 8 10:46:46 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jul 8 15:32:19 2021 +0200

Reliably generate positive or negative NaN again

...after e5c80bb69a30dfb0a3daf6061ab127d92f8142d6 "Purge out setNan from
math.cxx" had dropped the use of rtl::math::setNan and sign bit fiddling, 
and
relied on the implicit assumption that 
std::numeric_limits::quiet_NaN
would produce a positive NaN (but which does not seem to be guaranteed by 
the
C++ standard) and on the expressed hope that multiplying such a positive 
NaN by
-1 would generate a negative NaN (but which does not seem to be guaranteed 
by
IEEE 754: while it mandates that a NaN's payload is preserved across such an
operation, the result's sign bit appears to be unspecified)

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

diff --git a/sal/qa/rtl/math/test-rtl-math.cxx 
b/sal/qa/rtl/math/test-rtl-math.cxx
index d5bbac1a684e..f4df71e78ac3 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -74,6 +74,22 @@ public:
 CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
 CPPUNIT_ASSERT(std::isnan(res));
 
+res = rtl::math::stringToDouble(
+OUString("+1.#NAN"),
+'.', ',', &status, &end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(7), end);
+CPPUNIT_ASSERT(std::isnan(res));
+CPPUNIT_ASSERT(!std::signbit(res));
+
+res = rtl::math::stringToDouble(
+OUString("-1.#NAN"),
+'.', ',', &status, &end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(7), end);
+CPPUNIT_ASSERT(std::isnan(res));
+CPPUNIT_ASSERT(std::signbit(res));
+
 res = rtl::math::stringToDouble(
 OUString("INF"),
 '.', ',', &status, &end);
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index e9b50a1b4638..5d4ed6061f97 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1004,8 +1004,8 @@ double stringToDouble(CharT const * pBegin, CharT const * 
pEnd,
 {
 // "1.#NAN", "+1.#NAN", "-1.#NAN"
 p += 4;
-fVal = std::numeric_limits::quiet_NaN();
-// bSign will cause negation of fVal in the end, producing a 
negative NAN.
+fVal = std::copysign(std::numeric_limits::quiet_NaN(), 
bSign ? -1.0 : 1.0);
+bSign = false; // don't negate again
 
 // Eat any further digits:
 while (p != pEnd && rtl::isAsciiDigit(*p))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 framework/source/uiconfiguration/imagemanagerimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b39292ac6c89ee20db72e2dc33a59e8d49ca449c
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:55:02 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 15:16:37 2021 +0200

SolarMutexGuard::clear called twice where the 2nd call site should undo the 
1st

since

commit 94f8a0e60b7bc5c1176eafe9a36c3f3466bd1408
Date:   Thu Mar 20 09:08:10 2014 +0100

Use SolarMutexGuard directly

Change-Id: I4b245dd68bf032a1d74fb16b910dc952fd761781

seen with compiler warning of:

In member function ‘sal_uInt32 comphelper::SolarMutex::release(bool)’,
inlined from ‘void osl::ClearableGuard::clear() [with T = 
comphelper::SolarMutex]’ at include/osl/mutex.hxx:194:28,
inlined from ‘void framework::ImageManagerImpl::reload()’ at 
framework/source/uiconfiguration/imagemanagerimpl.cxx:1071:25:
include/comphelper/solarmutex.hxx:91:22: error: ‘this’ pointer is null 
[-Werror=nonnull]

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

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx 
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 681ce8a4a7ba..bbed5cc71243 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -929,7 +929,7 @@ void ImageManagerImpl::insertImages( ::sal_Int16 
nImageType, const Sequence< OUS
 // XUIConfigurationPersistence
 void ImageManagerImpl::reload()
 {
-SolarMutexClearableGuard aGuard;
+SolarMutexResettableGuard aGuard;
 
 if ( m_bDisposed )
 throw DisposedException();
@@ -1068,7 +1068,7 @@ void ImageManagerImpl::reload()
 implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove 
);
 }
 
-aGuard.clear();
+aGuard.reset();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sc/source/filter/excel/xeescher.cxx |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 8b7f948d9d79393bc6c1b11d23970fd5d7de
Author: Miklos Vajna 
AuthorDate: Thu Jul 8 11:57:36 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jul 8 14:50:30 2021 +0200

sc, VmlFormControlExporter: avoid OStringBuffer style

It's more efficient to have just one big statement with all the + 
operations.

See

.

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

diff --git a/sc/source/filter/excel/xeescher.cxx 
b/sc/source/filter/excel/xeescher.cxx
index 2f92384c25b4..144782ddbbc1 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1151,14 +1151,11 @@ void VmlFormControlExporter::EndShape(sal_Int32 
nShapeElement)
 break;
 }
 pVmlDrawing->startElement(FSNS(XML_x, XML_ClientData), XML_ObjectType, 
aObjectType);
-OString aAnchor = OString::number(m_aAreaFrom.Left());
-aAnchor += ", " + OString::number(m_aAreaFrom.Top());
-aAnchor += ", " + OString::number(m_aAreaFrom.Right());
-aAnchor += ", " + OString::number(m_aAreaFrom.Bottom());
-aAnchor += ", " + OString::number(m_aAreaTo.Left());
-aAnchor += ", " + OString::number(m_aAreaTo.Top());
-aAnchor += ", " + OString::number(m_aAreaTo.Right());
-aAnchor += ", " + OString::number(m_aAreaTo.Bottom());
+OString aAnchor
+= OString::number(m_aAreaFrom.Left()) + ", " + 
OString::number(m_aAreaFrom.Top()) + ", "
+  + OString::number(m_aAreaFrom.Right()) + ", " + 
OString::number(m_aAreaFrom.Bottom()) + ", "
+  + OString::number(m_aAreaTo.Left()) + ", " + 
OString::number(m_aAreaTo.Top()) + ", "
+  + OString::number(m_aAreaTo.Right()) + ", " + 
OString::number(m_aAreaTo.Bottom());
 XclXmlUtils::WriteElement(pVmlDrawing, FSNS(XML_x, XML_Anchor), aAnchor);
 
 if (!m_aMacroName.isEmpty())
___
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' - framework/source

[Caolán McNamara (via logerrit)]

 framework/source/uiconfiguration/imagemanagerimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d3f265085997d35b917d2b35409ecdbd25cb2075
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:55:02 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 14:43:37 2021 +0200

SolarMutexGuard::clear called twice where the 2nd call site should undo the 
1st

since

commit 94f8a0e60b7bc5c1176eafe9a36c3f3466bd1408
Date:   Thu Mar 20 09:08:10 2014 +0100

Use SolarMutexGuard directly

Change-Id: I4b245dd68bf032a1d74fb16b910dc952fd761781

seen with compiler warning of:

In member function ‘sal_uInt32 comphelper::SolarMutex::release(bool)’,
inlined from ‘void osl::ClearableGuard::clear() [with T = 
comphelper::SolarMutex]’ at include/osl/mutex.hxx:194:28,
inlined from ‘void framework::ImageManagerImpl::reload()’ at 
framework/source/uiconfiguration/imagemanagerimpl.cxx:1071:25:
include/comphelper/solarmutex.hxx:91:22: error: ‘this’ pointer is null 
[-Werror=nonnull]

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

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx 
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 8b7733aac91e..ecd4d18b2391 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -925,7 +925,7 @@ void ImageManagerImpl::insertImages( ::sal_Int16 
nImageType, const Sequence< OUS
 // XUIConfigurationPersistence
 void ImageManagerImpl::reload()
 {
-SolarMutexClearableGuard aGuard;
+SolarMutexResettableGuard aGuard;
 
 if ( m_bDisposed )
 throw DisposedException();
@@ -1061,7 +1061,7 @@ void ImageManagerImpl::reload()
 implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove 
);
 }
 
-aGuard.clear();
+aGuard.reset();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 framework/source/uiconfiguration/imagemanagerimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86a8701e2eb7ac81852fab3f49372d5ab58032e4
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:55:02 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 14:43:16 2021 +0200

SolarMutexGuard::clear called twice where the 2nd call site should undo the 
1st

since

commit 94f8a0e60b7bc5c1176eafe9a36c3f3466bd1408
Date:   Thu Mar 20 09:08:10 2014 +0100

Use SolarMutexGuard directly

Change-Id: I4b245dd68bf032a1d74fb16b910dc952fd761781

seen with compiler warning of:

In member function ‘sal_uInt32 comphelper::SolarMutex::release(bool)’,
inlined from ‘void osl::ClearableGuard::clear() [with T = 
comphelper::SolarMutex]’ at include/osl/mutex.hxx:194:28,
inlined from ‘void framework::ImageManagerImpl::reload()’ at 
framework/source/uiconfiguration/imagemanagerimpl.cxx:1071:25:
include/comphelper/solarmutex.hxx:91:22: error: ‘this’ pointer is null 
[-Werror=nonnull]

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

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx 
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 8b7733aac91e..ecd4d18b2391 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -925,7 +925,7 @@ void ImageManagerImpl::insertImages( ::sal_Int16 
nImageType, const Sequence< OUS
 // XUIConfigurationPersistence
 void ImageManagerImpl::reload()
 {
-SolarMutexClearableGuard aGuard;
+SolarMutexResettableGuard aGuard;
 
 if ( m_bDisposed )
 throw DisposedException();
@@ -1061,7 +1061,7 @@ void ImageManagerImpl::reload()
 implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove 
);
 }
 
-aGuard.clear();
+aGuard.reset();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 17811ca444676767ec72089c9fe8fb4ccd54cfc6
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:34:44 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 14:42:13 2021 +0200

we check pChild against null in one branch but not another

presumably we don't need to check against null at all

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

diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 3c3d224024f4..14ff3f5d7690 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -411,7 +411,7 @@ vcl::Window* findChild(vcl::Window* pParent, const 
OUString& rID, bool bRequireV
 for (size_t i = 0; i < nCount; ++i)
 {
 vcl::Window* pChild = pParent->GetChild(i);
-if (pChild && pChild->get_id() == rID
+if (pChild->get_id() == rID
 && (!bRequireVisible || pChild->IsVisible()))
 return pChild;
 
___
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' - oox/source sd/qa sd/source

[Attila Bakos (NISZ) (via logerrit)]

 oox/source/export/drawingml.cxx   |3 --
 sd/qa/unit/data/odp/placeholder-box-textalignment.odp |binary
 sd/qa/unit/export-tests-ooxml3.cxx|   20 ++
 sd/source/filter/eppt/pptx-epptooxml.cxx  |9 +++-
 4 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 3518b4cebdddc0446cf923c38acee52bf5d6a9b1
Author: Attila Bakos (NISZ) 
AuthorDate: Tue Jun 8 12:25:41 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jul 8 14:11:30 2021 +0200

tdf#142235 PPTX export: fix styles with placeholders

inserting icons and alignment.

Regression from commit b6b02e0b4c9d739836e1f61a886ea45b01e6696e
(tdf#111903 tdf#137152 PPTX export: fix placeholders).

Note: in the unit test document, check fixed vertical position
of the second text boxes of Slide 2–4.

Change-Id: I3c649db69f94a2e9f49ae7aa11d9cd9d9f6d80d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116828
Tested-by: László Németh 
Reviewed-by: László Németh 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118446
Tested-by: Jenkins

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0372ae804b13..d27b28cb7d1f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2988,8 +2988,7 @@ void DrawingML::WriteText(const Reference& 
rXIface, bool bBodyPr, bo
 const char* sVerticalAlignment = nullptr;
 if (GetProperty(rXPropSet, "TextVerticalAdjust"))
 mAny >>= eVerticalAlignment;
-if( eVerticalAlignment != TextVerticalAdjust_TOP )
-sVerticalAlignment = GetTextVerticalAdjust(eVerticalAlignment);
+sVerticalAlignment = GetTextVerticalAdjust(eVerticalAlignment);
 
 const char* sWritingMode = nullptr;
 bool bVertical = false;
diff --git a/sd/qa/unit/data/odp/placeholder-box-textalignment.odp 
b/sd/qa/unit/data/odp/placeholder-box-textalignment.odp
new file mode 100644
index ..df33291fbd40
Binary files /dev/null and 
b/sd/qa/unit/data/odp/placeholder-box-textalignment.odp differ
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx 
b/sd/qa/unit/export-tests-ooxml3.cxx
index fb2db18e8d22..6632934e430e 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -116,6 +116,7 @@ public:
 void testTdf125560_textDeflate();
 void testTdf125560_textInflateTop();
 void testTdf96061_textHighlight();
+void testTdf142235_TestPlaceholderTextAlignment();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest3);
 
@@ -184,6 +185,7 @@ public:
 CPPUNIT_TEST(testTdf125560_textDeflate);
 CPPUNIT_TEST(testTdf125560_textInflateTop);
 CPPUNIT_TEST(testTdf96061_textHighlight);
+CPPUNIT_TEST(testTdf142235_TestPlaceholderTextAlignment);
 CPPUNIT_TEST_SUITE_END();
 
 virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -1688,6 +1690,24 @@ void SdOOXMLExportTest3::testTdf125560_textInflateTop()
 "type", "mso-spt164");
 }
 
+void SdOOXMLExportTest3::testTdf142235_TestPlaceholderTextAlignment()
+{
+auto xDocShRef = loadURL(
+
m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/placeholder-box-textalignment.odp"),
 ODP);
+
+utl::TempFile tmpfile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile);
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXml1 = parseExport(tmpfile, "ppt/slides/slide2.xml");
+xmlDocUniquePtr pXml2 = parseExport(tmpfile, "ppt/slides/slide3.xml");
+
+// Without the fix in place many of these asserts failed, because 
alignment was bad.
+
+assertXPath(pXml1, "/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:bodyPr", 
"anchor", "t");
+assertXPath(pXml2, "/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:bodyPr", 
"anchor", "t");
+}
+
 void SdOOXMLExportTest3::testTdf96061_textHighlight()
 {
 ::sd::DrawDocShellRef xDocShRef
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 6a8502361061..f30a4d040fc6 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1555,8 +1555,15 @@ ShapeExport& 
PowerPointShapeExport::WritePlaceholderShape(const Reference< XShap
 default:
 SAL_INFO("sd.eppt", "warning: unhandled placeholder type: " << 
ePlaceholder);
 }
+
 SAL_INFO("sd.eppt", "write placeholder " << pType);
-mpFS->singleElementNS(XML_p, XML_ph, XML_type, pType);
+
+if ((mePageType == PageType::LAYOUT || mePageType == PageType::NORMAL)
+&& ePlaceholder == Outliner)
+mpFS->singleElementNS(XML_p, XML_ph);
+else
+mpFS->singleElementNS(XML_p, XML_ph, XML_type, pType);
+
 mpFS->endElementNS(XML_p, XML_nvPr);
 mpFS->endElementNS(XML_p, XML_nvSpPr);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/ma

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

[Szabolcs Toth (via logerrit)]

Rebased ref, commits from common ancestor:
commit 546d94f864ed866fac9ba3790950820d60991e6f
Author: Szabolcs Toth 
AuthorDate: Thu Feb 20 10:54:19 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Jul 8 14:05:34 2021 +0200

tdf#130799 DOCX import: fix missing inside vertical borders

caused by incomplete handling of tables with 1-column
rows with merged cells.

Have to check the rows below current to see if they contain
also one cell, therefore form a column, or more than one cell,
in which case do not remove vertical borders.

Regression from commit: 8a2eb40abbd52d960dd21308157186be0ca9dd3d
(tdf#129442 DOCX import: fix right border of 1-column tables).

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 3726c9022b97..b1c8c98ba8fc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1048,6 +1048,17 @@ DECLARE_OOXMLEXPORT_TEST(testBottomBorders, 
"tdf129452_BottomBorders.docx")
 assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[4]/w:tc[2]/w:tcPr/w:tcBorders/w:bottom [@w:val = 
'nil']", 0);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testVerticalBorders, "calendar3.docx")
+{
+// tdf#130799: Inside vertical borders of a table should not be missing.
+
+xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+// Left and right borders.
+assertXPathChildren(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[3]/w:tc[3]/w:tcPr/w:tcBorders", 2);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 4cb518eb29d8..458feaa6cd96 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -836,7 +836,17 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 // Do not apply vertical borders to a one column table.
 else if (m_aCellProperties.size() > 1 && 
aRowOfCellsIterator->size() <= 1)
 {
-rInfo.pTableBorders->Erase(META_PROP_VERTICAL_BORDER);
+bool isOneCol = true;
+for (size_t i = nRow; i < m_aCellProperties.size(); i++)
+{
+if (m_aCellProperties[i].size() > 1)
+{
+isOneCol = false;
+break;
+}
+}
+if (isOneCol)
+rInfo.pTableBorders->Erase(META_PROP_VERTICAL_BORDER);
 }
 // Do not apply horizontal borders to a one row table.
 else if (m_aCellProperties.size() == 1 && 
aRowOfCellsIterator->size() > 1)
___
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' - vcl/source

[Michael Stahl (via logerrit)]

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

New commits:
commit c6a7b755425def1103a70dc9b878cb2850f54ceb
Author: Michael Stahl 
AuthorDate: Wed Jul 7 18:00:36 2021 +0200
Commit: Michael Stahl 
CommitDate: Thu Jul 8 13:45:59 2021 +0200

vcl: nerf Window::SetParentToDefaultWindow()

There is a problem with keyboard focus in an Eclipse RCP application on
WNT; it is apparently caused by re-parenting calling
ImplSalReCreateHWND() and that first transfers the focus to the newly
re-created window and when that dies shortly thereafter to the Eclipse
top-level window instead of LO child window.

Re-parenting doesn't work anyway because mpAppWin is always null outside
of unit tests and mpDefaultWin lives outside of time and space and
doesn't know about any window the LO window may be embedded in.

Re-parenting appears to be unnecessary because if a parent dies with
undisposed children that's considered a bug anyway nowadays.

(partially regression from 8a2f7704cd0e43304e54bf2281232335cc0979a3
 which removed conditionals that limited the reparenting to floating
 windows)

Change-Id: I7a3997d5e714b40918337207ec1387922f86f8e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118588
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4c6b204fdc0cba873d33d801a9853819c09bdc6e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118621

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b399091bd201..fa029f89400f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1785,7 +1785,7 @@ void Window::SetModalHierarchyHdl(const Link& 
rLink)
 void Window::SetParentToDefaultWindow()
 {
 Show(false);
-SetParent(ImplGetDefaultWindow());
+// don't reparent: this window dies anyway and any children must have been 
disposed already
 }
 
 KeyIndicatorState Window::GetIndicatorState() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract6721b' - 9 commits - external/coinmp external/liborcus external/libwpd framework/qa include/sal odk/build-examples_common.mk solenv/gbuild v

[Michael Stahl (via logerrit)]

 external/coinmp/UnpackedTarball_coinmp.mk |2 
 external/coinmp/configure-exit.patch  |   33 ++
 external/coinmp/register.patch|  369 ++
 external/liborcus/UnpackedTarball_liborcus.mk |1 
 external/liborcus/include.patch.0 |   30 ++
 external/libwpd/UnpackedTarball_libwpd.mk |1 
 external/libwpd/include.patch |   10 
 framework/qa/cppunit/dispatchtest.cxx |2 
 include/sal/log.hxx   |5 
 odk/build-examples_common.mk  |2 
 solenv/gbuild/platform/com_GCC_defs.mk|4 
 vcl/source/window/window.cxx  |2 
 12 files changed, 457 insertions(+), 4 deletions(-)

New commits:
commit 61c4306a89ff37ee0fe7bb885ed41c28fad64a3d
Author: Michael Stahl 
AuthorDate: Wed Jul 7 18:00:36 2021 +0200
Commit: Michael Stahl 
CommitDate: Thu Jul 8 13:43:03 2021 +0200

vcl: nerf Window::SetParentToDefaultWindow()

There is a problem with keyboard focus in an Eclipse RCP application on
WNT; it is apparently caused by re-parenting calling
ImplSalReCreateHWND() and that first transfers the focus to the newly
re-created window and when that dies shortly thereafter to the Eclipse
top-level window instead of LO child window.

Re-parenting doesn't work anyway because mpAppWin is always null outside
of unit tests and mpDefaultWin lives outside of time and space and
doesn't know about any window the LO window may be embedded in.

Re-parenting appears to be unnecessary because if a parent dies with
undisposed children that's considered a bug anyway nowadays.

(partially regression from 8a2f7704cd0e43304e54bf2281232335cc0979a3
 which removed conditionals that limited the reparenting to floating
 windows)

Change-Id: I7a3997d5e714b40918337207ec1387922f86f8e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118588
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4c6b204fdc0cba873d33d801a9853819c09bdc6e)

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 82ce1465b9a9..c2d04462b068 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1784,7 +1784,7 @@ void Window::SetModalHierarchyHdl(const Link& 
rLink)
 void Window::SetParentToDefaultWindow()
 {
 Show(false);
-SetParent(ImplGetDefaultWindow());
+// don't reparent: this window dies anyway and any children must have been 
disposed already
 }
 
 KeyIndicatorState Window::GetIndicatorState() const
commit dfad6e1b3e5fb8a1bf3cc424dd4df3b27d01da11
Author: Stephan Bergmann 
AuthorDate: Wed May 5 08:20:18 2021 +0200
Commit: Michael Stahl 
CommitDate: Thu Jul 8 13:43:03 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 
'SA

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

[Miklos Vajna (via logerrit)]

 sfx2/source/view/viewsh.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d6811bd47a255d40aeb4509c7011fa7d9e75e3f3
Author: Miklos Vajna 
AuthorDate: Thu Jul 8 11:49:13 2021 +0200
Commit: Pranam Lashkari 
CommitDate: Thu Jul 8 13:29:37 2021 +0200

sfx2: fix uninitialized SfxViewShell::mbLOKIsFreemiumView

Introduced in commit 1b9fe58acb7b5bbbc83ecca30e17663fff7f0db4 (LOK:
introduced Freemium LOK API, 2021-06-02).

Change-Id: Ifdd6c13a64a167fa00b0305441c52340167f3809
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118632
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pranam Lashkari 

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 2da4bc1e81bd..1119af3dc23d 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1076,6 +1076,7 @@ SfxViewShell::SfxViewShell
 ,   maLOKLanguageTag(LANGUAGE_NONE)
 ,   maLOKLocale(LANGUAGE_NONE)
 ,   maLOKDeviceFormFactor(LOKDeviceFormFactor::UNKNOWN)
+,   mbLOKIsFreemiumView(false)
 {
 SetMargin( pViewFrame->GetMargin_Impl() );
 
___
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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf141966_chapterNumberTortureTest.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx|   19 
+++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   56 
--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 
 4 files changed, 71 insertions(+), 6 deletions(-)

New commits:
commit bedd73ea578ad01171536ee90d22249fa221d2d6
Author: Justin Luth 
AuthorDate: Fri Apr 30 13:01:29 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jul 8 13:16:06 2021 +0200

tdf#141964 writerfilter CN: get paragraph and inherited listLevel

Just like numId, listLevel is inherited from parent styles.
This was totally missing. Even the direct formatting of
a listLevel value was ignored (although that case would
be rare, because usually both numId and listLevel are defined
together).

It seems like the most fundamental basics of our numbering
import are wrong. EXTREMELY DANGEROUS TERRITORY,
although this particular change ought to be quite safe.

Change-Id: Ia3cbd941a0a90a932938597e0797ee8e2b0aca6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115257
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf141966_chapterNumberTortureTest.docx 
b/sw/qa/extras/ooxmlexport/data/tdf141966_chapterNumberTortureTest.docx
new file mode 100644
index ..808a70846617
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf141966_chapterNumberTortureTest.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 8ec840b3b479..7ef26bb13b4c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -151,6 +151,25 @@ DECLARE_OOXMLEXPORT_TEST(testTdf141966_chapterNumbering, 
"tdf141966_chapterNumbe
 CPPUNIT_ASSERT_EQUAL(OUString("2nd"), getProperty(xPara, 
"ListLabelString"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf141966_chapterNumberTortureTest, 
"tdf141966_chapterNumberTortureTest.docx")
+{
+// There is no point in identifying what the wrong values where in this 
test,
+//because EVERYTHING was wrong, and MANY different fixes are required to 
solve the problems.
+uno::Reference xPara(getParagraph(1, "No numId in 
style or paragraph"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara, 
"ListLabelString"));
+
+xPara.set(getParagraph(2, "Paragraph cancels numbering(0)"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara, 
"ListLabelString"));
+
+xPara.set(getParagraph(3, "First numbered line"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1st.i.a.1.I"), getProperty(xPara, 
"ListLabelString"));
+
+xPara.set(getParagraph(7, "inheritOnly: inherit outlineLvl and listLvl."), 
uno::UNO_QUERY);
+// 2nd.iii in MS Word 2003.  2nd.ii in MS Word 2010/2016 where para5 is 
not numbered. Why not?
+CPPUNIT_ASSERT_EQUAL(OUString("2nd.iii"), getProperty(xPara, 
"ListLabelString"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(xPara, 
"NumberingLevel")); // Level 2
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf132752, "tdf132752.docx")
 {
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1801), 
getProperty(getParagraph(1), "ParaLeftMargin"));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 25390cc20024..74550ec80245 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1447,6 +1447,45 @@ static sal_Int32 lcl_getListId(const StyleSheetEntryPtr& 
rEntry, const StyleShee
 return lcl_getListId(pParent, rStyleTable, rNumberingFromBaseStyle);
 }
 
+/// Return the paragraph's list level (from styles, unless pParacontext is 
provided).
+/// -1 indicates the level is not set anywhere. [In that case, with a numId, 
use 0 (level 1)]
+///  9 indicates that numbering should be at body level (aka disabled) - 
rarely used by MSWord.
+///  0-8 are the nine valid numbering levels.
+sal_Int16 DomainMapper_Impl::GetListLevel(const StyleSheetEntryPtr& pEntry,
+  const PropertyMapPtr& pParaContext)
+{
+sal_Int16 nListLevel = -1;
+if (pParaContext)
+{
+GetAnyProperty(PROP_NUMBERING_LEVEL, pParaContext) >>= nListLevel;
+if (nListLevel != -1)
+return nListLevel;
+}
+
+if (!pEntry)
+return -1;
+
+const StyleSheetPropertyMap* pEntryProperties = dynamic_cast(pEntry->pProperties.get());
+if (!pEntryProperties)
+return -1;
+
+nListLevel = pEntryProperties->GetListLevel();
+// The style itself has a list level.
+if (nListLevel >= 0)
+return nListLevel;
+
+// The style has no parent.
+if (pEntry->sBaseStyleIdentifier.isEmpty())
+return -1;
+
+const

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

[Caolán McNamara (via logerrit)]

 svx/source/accessibility/GraphCtlAccessibleContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63c9e69f60b3535afe27fcc989ad122a9c993053
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:04:10 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 13:06:04 2021 +0200

return value of PixelToLogic ignored

the other uses of SdrObjListPrimitiveHit operate in Logic Position

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

diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx 
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 98484033820e..989be9e6d189 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -177,7 +177,7 @@ Reference< XAccessible > SAL_CALL 
SvxGraphCtrlAccessibleContext::getAccessibleAt
 }
 
 Point aPnt( rPoint.X, rPoint.Y );
-mpControl->GetDrawingArea()->get_ref_device().PixelToLogic( aPnt );
+aPnt = mpControl->GetDrawingArea()->get_ref_device().PixelToLogic(aPnt);
 
 SdrObject* pObj = nullptr;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/outdev.hxx |  129 +++--
 1 file changed, 63 insertions(+), 66 deletions(-)

New commits:
commit 19e0c59a722dca6cd8b6ca61ed421c34c2773d18
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:05:34 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 12:26:05 2021 +0200

annotate LogicToPixel etc with SAL_WARN_UNUSED_RESULT

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index eb3c7815450a..fce10e1ef077 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1603,75 +1603,72 @@ public:
 
 @return the current offset in pixel
  */
-SizeGetPixelOffset() const { return 
Size(mnOutOffOrigX, mnOutOffOrigY);}
-
-Point   LogicToPixel( const Point& rLogicPt ) const;
-SizeLogicToPixel( const Size& rLogicSize ) const;
-tools::Rectangle   LogicToPixel( const tools::Rectangle& 
rLogicRect ) const;
-tools::Polygon  LogicToPixel( const tools::Polygon& rLogicPoly 
) const;
-tools::PolyPolygon  LogicToPixel( const tools::PolyPolygon& 
rLogicPolyPoly ) const;
-basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& 
rLogicPolyPoly ) const;
-vcl::Region LogicToPixel( const vcl::Region& rLogicRegion 
)const;
-Point   LogicToPixel( const Point& rLogicPt,
-  const MapMode& rMapMode ) const;
-SizeLogicToPixel( const Size& rLogicSize,
-  const MapMode& rMapMode ) const;
-tools::Rectangle   LogicToPixel( const tools::Rectangle& 
rLogicRect,
-  const MapMode& rMapMode ) const;
-tools::Polygon  LogicToPixel( const tools::Polygon& rLogicPoly,
-  const MapMode& rMapMode ) const;
-basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& 
rLogicPolyPoly,
-  const MapMode& rMapMode ) const;
-
-Point   PixelToLogic( const Point& rDevicePt ) const;
-SizePixelToLogic( const Size& rDeviceSize ) const;
-tools::Rectangle   PixelToLogic( const tools::Rectangle& 
rDeviceRect ) const;
-tools::Polygon  PixelToLogic( const tools::Polygon& 
rDevicePoly ) const;
-tools::PolyPolygon  PixelToLogic( const tools::PolyPolygon& 
rDevicePolyPoly ) const;
-basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& 
rDevicePolyPoly ) const;
-vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion 
) const;
-Point   PixelToLogic( const Point& rDevicePt,
-  const MapMode& rMapMode ) const;
-SizePixelToLogic( const Size& rDeviceSize,
-  const MapMode& rMapMode ) const;
-tools::Rectangle   PixelToLogic( const tools::Rectangle& 
rDeviceRect,
-  const MapMode& rMapMode ) const;
-tools::Polygon  PixelToLogic( const tools::Polygon& 
rDevicePoly,
-  const MapMode& rMapMode ) const;
-basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& 
rDevicePoly,
-  const MapMode& rMapMode ) const;
-basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& 
rDevicePolyPoly,
-  const MapMode& rMapMode ) const;
-
-Point   LogicToLogic( const Point&  rPtSource,
-  const MapMode*pMapModeSource,
-  const MapMode*pMapModeDest ) 
const;
-SizeLogicToLogic( const Size&   rSzSource,
-  const MapMode*pMapModeSource,
-  const MapMode*pMapModeDest ) 
const;
-tools::Rectangle   LogicToLogic( const tools::Rectangle&  
rRectSource,
-  const MapMode*pMapModeSource,
-  const MapMode*pMapModeDest ) 
const;
-static PointLogicToLogic( const Point&  rPtSource,
-  const MapMode&rMapModeSource,
-  const MapMode&rMapModeDest );
-s

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

[Caolán McNamara (via logerrit)]

 svx/source/accessibility/GraphCtlAccessibleContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16121e0144fc11fc26f45ea1a7b2e1488d5267ef
Author: Caolán McNamara 
AuthorDate: Thu Jul 8 10:04:10 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 12:25:47 2021 +0200

return value of PixelToLogic ignored

the other uses of SdrObjListPrimitiveHit operate in Logic Position

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

diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx 
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 98484033820e..989be9e6d189 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -177,7 +177,7 @@ Reference< XAccessible > SAL_CALL 
SvxGraphCtrlAccessibleContext::getAccessibleAt
 }
 
 Point aPnt( rPoint.X, rPoint.Y );
-mpControl->GetDrawingArea()->get_ref_device().PixelToLogic( aPnt );
+aPnt = mpControl->GetDrawingArea()->get_ref_device().PixelToLogic(aPnt);
 
 SdrObject* pObj = nullptr;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/interpr1.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 79523008fba5765d27e6a3d214362f68ca46b1db
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 13:31:59 2020 +
Commit: Eike Rathke 
CommitDate: Thu Jul 8 12:25:35 2021 +0200

cid#1468696 Logically dead code

bool bTryXlA1 = (eConv == FormulaGrammar::CONV_A1_XL_A1);

if (...)
eConv = FormulaGrammar::CONV_XL_R1C1;

if (bTryXlA1 || eConv == FormulaGrammar::CONV_OOO)
{
if (...)
{
bExternalName = true;
eConv = FormulaGrammar::CONV_OOO;
}
}

if (!bExternalName && (bTryXlA1 || eConv != FormulaGrammar::CONV_OOO))
{
if (...)
{
if (eConv == FormulaGrammar::CONV_OOO)
{
// this condition can only be reached if bTryXlA1 is true
// but bTryXlA1 is only true if eConv was originally
// CONV_A1_XL_A1. The only things eConv can be changed to
// in this function are CONV_XL_R1C1 or CONV_OOO. If it
// was changed to CONV_OOO then bExternalName was also
// set to true and the block isn't entered if that is true
}
}
}

maybe an unconditional assignment of
eConv = FormulaGrammar::CONV_XL_A1
is a better solution

Change-Id: I45f9947c21662369474048acf2d648733a9b9a6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107076
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 22c7ad49679c2abcac4409c93d32b20746b16904)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118602

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 4204215d8d97..4f2789160a1c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8241,8 +8241,6 @@ void ScInterpreter::ScIndirect()
 if (nIndex >= 3 && sRefStr[nIndex-1] == '\'')
 {
 bExternalName = true;
-if (eConv == FormulaGrammar::CONV_OOO)
-eConv = FormulaGrammar::CONV_XL_A1;
 }
 }
 }
___
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' - 2 commits - editeng/source include/svl svl/source

[Eike Rathke (via logerrit)]

 editeng/source/editeng/editdoc.cxx |2 
 include/svl/nfkeytab.hxx   |2 
 include/svl/zforlist.hxx   |4 -
 include/svl/zformat.hxx|3 -
 svl/source/numbers/zforlist.cxx|  104 ++---
 svl/source/numbers/zformat.cxx |6 +-
 svl/source/numbers/zforscan.cxx|   13 +++-
 svl/source/numbers/zforscan.hxx|2 
 8 files changed, 107 insertions(+), 29 deletions(-)

New commits:
commit b92718fe3e9c873dc7d5a3aee66fb2adb780861a
Author: Eike Rathke 
AuthorDate: Wed Jul 7 20:50:28 2021 +0200
Commit: Caolán McNamara 
CommitDate: Thu Jul 8 11:54:00 2021 +0200

Resolves: tdf#122191 BOOLEAN is a keyword, treat it as such

... to not end up with "BOOL"E"AN" instead, which is a date type
with an era year and literal strings.

This never worked but only was uncovered by

commit ce4fc2fc08be8ea2773194e303ed42d2579e93a0
CommitDate: Fri Mar 2 20:27:45 2018 +0100

Resolves: tdf#115351 convert boolean equivalent format codes to 
proper Boolean

if the format also had to be converted between locales.

Also preserve boolean equivalent formats during Excel export and
try hard to convert back as much as possible if a literal boolean
string format is a Boolean equivalent of the target locale.

Change-Id: I54f65c276cbf7bb99e960b6d7053c5fa95fbccb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118591
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 7a58221f800e215934cbcb2d3907c35b44981611)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118510
Reviewed-by: Caolán McNamara 

diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index fe1e3bb69ec5..3b8140498128 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -71,13 +71,13 @@ enum NfKeywordIndex
 NF_KEY_WW,  // week of year, as of version 8, 19.06.98
 NF_KEY_THAI_T,  // Thai T modifier, speciality of Thai Excel, only 
used with Thai locale and converted to [NatNum1]
 NF_KEY_CCC, // currency bank symbol (old version)
+NF_KEY_BOOLEAN, // boolean
 NF_KEY_GENERAL, // General / Standard
 NF_KEY_LASTKEYWORD = NF_KEY_GENERAL,
 
 // Reserved words translated and color names follow:
 NF_KEY_TRUE,// boolean true
 NF_KEY_FALSE,   // boolean false
-NF_KEY_BOOLEAN, // boolean
 NF_KEY_COLOR,   // color
 NF_KEY_FIRSTCOLOR,
 NF_KEY_BLACK = NF_KEY_FIRSTCOLOR,   // you do know colors, don't you?
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 7a8703873460..c3d82d7b109a 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -473,7 +473,7 @@ public:
 nKey contains the index key of the format.
  */
 bool PutEntry( OUString& rString, sal_Int32& nCheckPos, SvNumFormatType& 
nType, sal_uInt32& nKey,
-   LanguageType eLnge = LANGUAGE_DONTKNOW );
+   LanguageType eLnge = LANGUAGE_DONTKNOW, bool 
bReplaceBooleanEquivalent = true );
 
 /** Same as PutEntry but the format code string is
  considered to be of language/country eLnge and is converted to
@@ -481,7 +481,7 @@ public:
 bool PutandConvertEntry( OUString& rString, sal_Int32& nCheckPos,
  SvNumFormatType& nType, sal_uInt32& nKey,
  LanguageType eLnge, LanguageType eNewLnge,
- bool bConvertDateOrder );
+ bool bConvertDateOrder, bool 
bReplaceBooleanEquivalent = true );
 
 /** Same as PutandConvertEntry but the format code string
  is considered to be of the System language/country eLnge and is
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 543c5967804c..976488257218 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -171,7 +171,8 @@ public:
ImpSvNumberformatScan* pSc,
ImpSvNumberInputScan* pISc,
sal_Int32& nCheckPos,
-   LanguageType& eLan );
+   LanguageType& eLan,
+   bool bReplaceBooleanEquivalent = true );
 
 // Copy ctor
 SvNumberformat( SvNumberformat const & rFormat );
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index b1885ad4a94a..0a2f699f81ec 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -569,7 +569,8 @@ bool SvNumberFormatter::PutEntry(OUString& rString,
  sal_Int32& nCheckPos,
  SvNumFormatType& nType,
  sal_uInt32& nKey,  // format key
- LanguageType eLnge)
+ LanguageType eLnge,
+ bool bReplaceBooleanEquivalent)
 {
 ::osl::

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 8f8187370908de55492d83b4c555904465a3a0ba
Author: Christian Lohmaier 
AuthorDate: Thu Jul 8 11:40:07 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jul 8 11:40:07 2021 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-2'
  to aa48c56ee2ce8b011eb55157b3bbeb8f5ea0700b
  - update translations for 7.2 / master

and force-fix errors using pocheck

Change-Id: I42420023bbf647224c6e216da57904cedb6b7e89
(cherry picked from commit 6e44dc455cecec8e0109243bf7e2398e4dc1306b)

diff --git a/translations b/translations
index 28f0646cc41e..aa48c56ee2ce 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 28f0646cc41ef976de183d828061e73886887904
+Subproject commit aa48c56ee2ce8b011eb55157b3bbeb8f5ea0700b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit d5c64be26a3be69814097ccfce44a42150ca9d2d
Author: Christian Lohmaier 
AuthorDate: Thu Jul 8 11:36:59 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jul 8 11:36:59 2021 +0200

Update git submodules

* Update translations from branch 'master'
  to 6e44dc455cecec8e0109243bf7e2398e4dc1306b
  - update translations for 7.2 / master

and force-fix errors using pocheck

Change-Id: I42420023bbf647224c6e216da57904cedb6b7e89

diff --git a/translations b/translations
index 491af494a983..6e44dc455cec 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 491af494a983aea54a24d68ff1bc1703d21f0a6c
+Subproject commit 6e44dc455cecec8e0109243bf7e2398e4dc1306b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

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

New commits:
commit 4c6b204fdc0cba873d33d801a9853819c09bdc6e
Author: Michael Stahl 
AuthorDate: Wed Jul 7 18:00:36 2021 +0200
Commit: Michael Stahl 
CommitDate: Thu Jul 8 11:32:03 2021 +0200

vcl: nerf Window::SetParentToDefaultWindow()

There is a problem with keyboard focus in an Eclipse RCP application on
WNT; it is apparently caused by re-parenting calling
ImplSalReCreateHWND() and that first transfers the focus to the newly
re-created window and when that dies shortly thereafter to the Eclipse
top-level window instead of LO child window.

Re-parenting doesn't work anyway because mpAppWin is always null outside
of unit tests and mpDefaultWin lives outside of time and space and
doesn't know about any window the LO window may be embedded in.

Re-parenting appears to be unnecessary because if a parent dies with
undisposed children that's considered a bug anyway nowadays.

(partially regression from 8a2f7704cd0e43304e54bf2281232335cc0979a3
 which removed conditionals that limited the reparenting to floating
 windows)

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b399091bd201..fa029f89400f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1785,7 +1785,7 @@ void Window::SetModalHierarchyHdl(const Link& 
rLink)
 void Window::SetParentToDefaultWindow()
 {
 Show(false);
-SetParent(ImplGetDefaultWindow());
+// don't reparent: this window dies anyway and any children must have been 
disposed already
 }
 
 KeyIndicatorState Window::GetIndicatorState() const
___
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

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

 sw/qa/extras/ooxmlexport/data/tdf142700.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|8 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   66 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 +
 4 files changed, 78 insertions(+), 1 deletion(-)

New commits:
commit 474e16bbb613c2ca61b8d41d1562d9b86f689851
Author: László Németh 
AuthorDate: Wed Jul 7 12:18:42 2021 +0200
Commit: László Németh 
CommitDate: Thu Jul 8 11:28:38 2021 +0200

tdf#142700 DOCX: fix lost track changes of images

anchored to characters or paragraphs.

Tracked deletions and insertions weren't imported,
if they contain only images anchored to character,
resulting loss of the document content: i.e. deleted
images were reappeared, as not deleted images.

Note: because change tracking of the OpenDocument
and Writer supports only text range based changes,
the fix is a workaround using zero width spaces
to create an invisible text around the anchoring point
of the images. This workaround is not used, if it's not
necessary, i.e. if the image is part of a bigger
deletion or insertion, which contains also text, not
only an image.

Change-Id: Iaae6aae2c01191512c71117a0c788a4147c4cae0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118557
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 8726cf692299ea262a7455adcf6ec25451c7869d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118612

diff --git a/sw/qa/extras/ooxmlexport/data/tdf142700.docx 
b/sw/qa/extras/ooxmlexport/data/tdf142700.docx
new file mode 100644
index ..393e2ff4771b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf142700.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 9cfaf5aa6e6c..1864c4bcf83e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1376,6 +1376,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128913, 
"tdf128913.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:del/w:r/w:drawing/wp:inline/a:graphic");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf142700, "tdf142700.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport();
+// w:ins and w:del are imported correctly, if they contain only images 
anchored to character
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:ins/w:r/w:drawing/wp:anchor/a:graphic");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:del/w:r/w:drawing/wp:anchor/a:graphic");
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf142387, "tdf142387.docx")
 {
 xmlDocUniquePtr pXmlDoc = parseExport();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9f12d3a7de4f..b52b24162344 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -316,6 +316,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bLineNumberingSet( false ),
 m_bIsInFootnoteProperties( false ),
 m_bIsParaMarkerChange( false ),
+m_bRedlineImageInPreviousRun( false ),
 m_bParaChanged( false ),
 m_bIsFirstParaInSection( true ),
 m_bIsFirstParaInSectionAfterRedline( true ),
@@ -2248,6 +2249,40 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString& rString, const Proper
 rValue.Value <<= false;
 }
 
+// remove workaround for change tracked images, if they are part of a 
redline,
+// i.e. if the next run is a tracked change with the same type, author 
and date,
+// as in the change tracking of the image.
+if ( m_bRedlineImageInPreviousRun )
+{
+auto pCurrentRedline = m_aRedlines.top().size() > 0
+? m_aRedlines.top().back()
+: GetTopContextOfType(CONTEXT_CHARACTER) &&
+
GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().size() > 0
+? 
GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().back()
+: nullptr;
+if ( m_previousRedline && pCurrentRedline &&
+   // same redline
+   (m_previousRedline->m_nToken & 0x) == 
(pCurrentRedline->m_nToken & 0x) &&
+m_previousRedline->m_sAuthor == pCurrentRedline->m_sAuthor 
&&
+m_previousRedline->m_sDate == pCurrentRedline->m_sDate )
+{
+uno::Reference< text::XTextCursor > xCursor = 
xTextAppend->getEnd()->getText( )->createTextCursor( );
+assert(xCursor.is());
+xCursor->gotoEnd(false);
+xCursor->goLeft(2, true);
+if ( xCursor->getString() == u"​​" )
+{
+xCursor->goRight(1, true);
+   

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

[Miklos Vajna (via logerrit)]

 sc/qa/unit/subsequent_export-test2.cxx |6 ++
 sc/source/filter/excel/xeescher.cxx|5 -
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit d67085cd86dc1e74941c8337d1eba39981117977
Author: Miklos Vajna 
AuthorDate: Thu Jul 8 10:15:29 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jul 8 11:06:31 2021 +0200

XSLX export, button form control: fix handling of no macros

Turns out that in case there is no macro, then the attribute should be
omitted, leaving it empty is not OK. Excel warns about this.

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

diff --git a/sc/qa/unit/subsequent_export-test2.cxx 
b/sc/qa/unit/subsequent_export-test2.cxx
index 0a44090734ab..74e795709b0e 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -2367,6 +2367,12 @@ void ScExportTest2::testButtonFormControlXlsxExport()
 assertXPathContent(pDoc, "//x:anchor/x:from/xdr:row", "3");
 assertXPathContent(pDoc, "//x:anchor/x:to/xdr:col", "3");
 assertXPathContent(pDoc, "//x:anchor/x:to/xdr:row", "7");
+
+// Also make sure that an empty macro attribute is not written.
+// Without the fix in place, this test would have failed with:
+// - XPath '//x:controlPr' unexpected 'macro' attribute
+// i.e. macro in an xlsx file was not omitted, which is considered invalid 
by Excel.
+assertXPathNoAttribute(pDoc, "//x:controlPr", "macro");
 }
 
 void ScExportTest2::testInvalidNamedRange()
diff --git a/sc/source/filter/excel/xeescher.cxx 
b/sc/source/filter/excel/xeescher.cxx
index eafc30de8b0a..2f92384c25b4 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1481,9 +1481,12 @@ void XclExpTbxControlObj::SaveSheetXml(XclExpXmlStream& 
rStrm, const OUString& a
 rWorksheet->startElement(XML_control, XML_shapeId, 
OString::number(mnShapeId).getStr(),
  FSNS(XML_r, XML_id), aIdFormControlPr, 
XML_name, msCtrlName);
 
+OString aMacroName = GetMacroName().toUtf8();
+// Omit the macro attribute if it would be empty.
+const char* pMacroName = aMacroName.isEmpty() ? nullptr : 
aMacroName.getStr();
 rWorksheet->startElement(XML_controlPr, XML_defaultSize, "0", 
XML_print,
  mbPrint ? "true" : "false", XML_autoFill, 
"0", XML_autoPict,
- "0", XML_macro, GetMacroName());
+ "0", XML_macro, pMacroName);
 
 rWorksheet->startElement(XML_anchor, XML_moveWithCells, "true", 
XML_sizeWithCells,
  "false");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/outdevmap.hxx |   10 ++
 vcl/source/outdev/map.cxx |   18 +++---
 2 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit ac407ab285b69f67e0e82bc10ea4abdbe8f9c08f
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 13:04:27 2020 +
Commit: Michael Stahl 
CommitDate: Thu Jul 8 10:44:29 2021 +0200

cid#1470369 Uninitialized scalar variable

and

cid#1470372 Uninitialized scalar variable
cid#1470364 Uninitialized scalar variable
cid#1470363 Uninitialized scalar variable
cid#1470359 Uninitialized scalar variable
cid#1470357 Uninitialized scalar variable
cid#1470355 Uninitialized scalar variable
cid#1470354 Uninitialized scalar variable
cid#1470353 Uninitialized scalar variable

Change-Id: I4a28f0f375f9108f4c43da7074f85d1fdbb3ebff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107070
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 2a988b1ecddd17f9c851b625d33fbe0c4dfa2325)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118594
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/vcl/outdevmap.hxx b/include/vcl/outdevmap.hxx
index d4ef27e94e91..467dd688c612 100644
--- a/include/vcl/outdevmap.hxx
+++ b/include/vcl/outdevmap.hxx
@@ -28,6 +28,16 @@ struct ImplMapRes
 tools::LongmnMapScNumY;// Scaling factor - 
numerator in Y direction
 tools::LongmnMapScDenomX;  // Scaling factor - 
denominator in X direction
 tools::LongmnMapScDenomY;  // Scaling factor - 
denominator in Y direction
+
+ImplMapRes()
+: mnMapOfsX(0)
+, mnMapOfsY(0)
+, mnMapScNumX(1)
+, mnMapScNumY(1)
+, mnMapScDenomX(1)
+, mnMapScDenomY(1)
+{
+}
 };
 
 #endif // INCLUDED_VCL_OUTDEVMAP_HXX
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 3f478f2fdf88..dc7fca36fa3d 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1344,17 +1344,11 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( 
const basegfx::B2DPolyPolygo
 return rSource; \
 \
 ImplMapRes aMapResSource;   \
-aMapResSource.mnMapOfsX  = 0;   \
-aMapResSource.mnMapOfsY  = 0;   \
-aMapResSource.mnMapScNumX= 1;   \
-aMapResSource.mnMapScNumY= 1;   \
-aMapResSource.mnMapScDenomX  = 1;   \
-aMapResSource.mnMapScDenomY  = 1;   \
-ImplMapRes aMapResDest(aMapResSource);  \
+ImplMapRes aMapResDest; \
 \
 if ( !mbMap || pMapModeSource != &maMapMode )   \
 {   \
-if ( pMapModeSource->GetMapUnit() == MapUnit::MapRelative )
 \
+if ( pMapModeSource->GetMapUnit() == MapUnit::MapRelative ) \
 aMapResSource = maMapRes;   \
 ImplCalcMapResolution( *pMapModeSource, \
mnDPIX, mnDPIY, aMapResSource ); \
@@ -1402,13 +1396,7 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, 
MapUnit eUnitDest )
 
 #define ENTER4( rMapModeSource, rMapModeDest )  \
 ImplMapRes aMapResSource;   \
-aMapResSource.mnMapOfsX  = 0;   \
-aMapResSource.mnMapOfsY  = 0;   \
-aMapResSource.mnMapScNumX= 1;   \
-aMapResSource.mnMapScNumY= 1;   \
-aMapResSource.mnMapScDenomX  = 1;   \
-aMapResSource.mnMapScDenomY  = 1;   \
-ImplMapRes aMapResDest(aMapResSource);  \
+ImplMapRes aMapResDest; \
 \
 ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); \
 ImplCalcMapResolution( rMapModeDest, 72, 72, aMapResDest )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 emfio/source/reader/mtftools.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 3d1e59d9882d1146be303dafff937a51ba4e1867
Author: Caolán McNamara 
AuthorDate: Thu Feb 25 15:06:50 2021 +
Commit: Michael Stahl 
CommitDate: Thu Jul 8 10:42:56 2021 +0200

ofz#31370 Divide-by-zero

Change-Id: If581d61b678616f8a80f8ad2d2dea5ecbf10d8fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit da457f41f8f0a14014ff9f122467f3a26eb1ac20)

and...

cid#1473321 Division or modulo by float zero

and

cid#1473322 Division or modulo by float zero

where oss-fuzz also found a reproducer as ofz#31370 Divide-by-zero

Change-Id: I0facd2e794384515891dbf040f4fe43530478d3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111601
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 28e022c258682dc030668fed7879d9d3f078b720)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118595
Reviewed-by: Michael Stahl 

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 0d918af72dc0..53564c34f82b 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -385,10 +385,13 @@ namespace emfio
 // calculate measured TextLength
 const vcl::Font& 
rFontCandidate(maCurrentMetaFontAction->GetFont());
 pTempVirtualDevice->SetFont(rFontCandidate);
-const tools::Long 
nMeasuredTextLength(pTempVirtualDevice->GetTextWidth(rText));
+tools::Long 
nMeasuredTextLength(pTempVirtualDevice->GetTextWidth(rText));
+// on failure, use original length
+if (!nMeasuredTextLength)
+nMeasuredTextLength = nImportedTextLength;
 
 // compare expected and imported TextLengths
-if(nImportedTextLength != nMeasuredTextLength)
+if (nImportedTextLength != nMeasuredTextLength)
 {
 const double 
fFactorText(static_cast(nImportedTextLength) / 
static_cast(nMeasuredTextLength));
 const double fFactorTextPercent(fabs(1.0 - fFactorText) * 
100.0);
@@ -417,6 +420,9 @@ namespace emfio
 
rFontCandidate2.SetAverageFontWidth(static_cast(fCorrectedAverageFontWidth));
 pTempVirtualDevice->SetFont(rFontCandidate2);
 nCorrectedTextLength = 
pTempVirtualDevice->GetTextWidth(rText);
+// on failure, use original length
+if (!nCorrectedTextLength)
+nCorrectedTextLength = nImportedTextLength;
 }
 
 const double 
fFactorCorrectedText(static_cast(nImportedTextLength) / 
static_cast(nCorrectedTextLength));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmlsecurity/source/helper/ooxmlsecparser.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 81ffcdfe9005bdd78b09e75d06e1a76c24bb9ac6
Author: Caolán McNamara 
AuthorDate: Thu Apr 1 09:16:12 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Jul 8 10:41:48 2021 +0200

cid#1475790 Uninitialized scalar field

this appeared in:

commit 0dac6d1f179c286dd7aea2d9ef7c37db8323fa37
Author: Miklos Vajna 
Date:   Mon Jan 25 15:34:38 2016 +0100

xmlsecurity: implement OOXML stream references

and disappeared in:

commit cc1d19f7bbaefa5fb22ebd1344112755068b93c9
Author: Michael Stahl 
Date:   Tue Mar 30 17:37:31 2021 +0200

xmlsecurity: replace OOXMLSecParser implementation

Change-Id: Ibaff786612d0f58639471d409dc49d813fb1cb6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113442
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 36e8a0348f7d1ea9f718c3d71514a72990f77a34)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118581
Reviewed-by: Michael Stahl 

diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx 
b/xmlsecurity/source/helper/ooxmlsecparser.hxx
index ba0e274be6af..4c6d06caaa31 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.hxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx
@@ -77,10 +77,6 @@ private:
 XSecController* m_pXSecController;
 css::uno::Reference m_xNextHandler;
 
-/// Last seen .
-OUString m_aReferenceURI;
-/// Already called addStreamReference() for this reference.
-bool m_bReferenceUnresolved;
 XMLSignatureHelper& m_rXMLSignatureHelper;
 
 OUString HandleIdAttr(css::uno::Reference 
const& xAttrs);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmloff/source/transform/ActionMapTypesOASIS.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c1989782859a9754571ba048e9ae3d988b33059
Author: Caolán McNamara 
AuthorDate: Wed Jul 7 17:33:06 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Jul 8 10:40:35 2021 +0200

WaE: Wodr type 'ActionMapTypesOOo' violates the C++ ODR

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

diff --git a/xmloff/source/transform/ActionMapTypesOASIS.hxx 
b/xmloff/source/transform/ActionMapTypesOASIS.hxx
index 8a45d9d1e80c..59ad0fdd2741 100644
--- a/xmloff/source/transform/ActionMapTypesOASIS.hxx
+++ b/xmloff/source/transform/ActionMapTypesOASIS.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOASIS_HXX
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOASIS_HXX
 
-enum ActionMapTypesOOo
+enum ActionMapTypesOasis
 {
 PROP_OASIS_GRAPHIC_ATTR_ACTIONS,
 PROP_OASIS_DRAWING_PAGE_ATTR_ACTIONS,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/print.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 071e5a422b6a795fd396b378bebc9cd8cc02819c
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 10:17:18 2020 +
Commit: Michael Stahl 
CommitDate: Thu Jul 8 10:37:51 2021 +0200

cid#1202935 Uninitialized scalar field

Change-Id: Ie95426e6188253dd5f2bd77782f62647d9ddba50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106956
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit ad53629186343f8a111b4bee21721e8b446bd8a2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118582
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 48338a879ea5..fb3e5de9a95b 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -459,6 +459,7 @@ void Printer::ImplInitData()
 mbPrintFile = false;
 mbInPrintPage   = false;
 mbNewJobSetup   = false;
+mbSinglePrintJobs   = false;
 mpInfoPrinter   = nullptr;
 mpPrinter   = nullptr;
 mpDisplayDev= nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/inc

[Caolán McNamara (via logerrit)]

 sc/inc/refdata.hxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 64525c4932a217a19fa94bf7cebbd48a36c004cf
Author: Caolán McNamara 
AuthorDate: Fri Jan 15 09:44:38 2021 +
Commit: Michael Stahl 
CommitDate: Thu Jul 8 10:37:28 2021 +0200

cid#1472119 silence Uninitialized scalar field

Change-Id: I0a8a12e8bb823fc650212f5cf946ad9139395030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109327
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit a94aecfdaafc5525be73246d3e8f19fdb714b387)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118583
Reviewed-by: Michael Stahl 

diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 9b57fe807536..7674794a9a80 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -124,11 +124,7 @@ struct ScComplexRefData
 {
 ScSingleRefData Ref1;
 ScSingleRefData Ref2;
-bool bTrimToData;
-
-ScComplexRefData() :
-bTrimToData(false)
-{}
+bool bTrimToData = false;
 
 void InitFlags()
 { Ref1.InitFlags(); Ref2.InitFlags(); }
___
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' - external/breakpad

[Christian Lohmaier (via logerrit)]

 external/breakpad/UnpackedTarball_breakpad.mk |1 +
 external/breakpad/breakpad-no-env.patch.1 |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit e170e08e009642ccdea5db490dc5dd038b45c04d
Author: Christian Lohmaier 
AuthorDate: Sat Jun 19 15:57:21 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 8 10:30:46 2021 +0200

breakpad: don't include the users's env in linux dumps

Change-Id: I004b862295686789c0a88dc678bd098d81c76421
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117503
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 47282cc577eda78b9cceff0860e74ce7b3f121cd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117728

diff --git a/external/breakpad/UnpackedTarball_breakpad.mk 
b/external/breakpad/UnpackedTarball_breakpad.mk
index 4eb10158ca18..1b92728946cd 100644
--- a/external/breakpad/UnpackedTarball_breakpad.mk
+++ b/external/breakpad/UnpackedTarball_breakpad.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\

external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
 \
external/breakpad/c++20-allocator.patch \
external/breakpad/breakpad-dump_syms.patch.1 \
+   external/breakpad/breakpad-no-env.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_files,breakpad,src/tools/windows/dump_syms,\
diff --git a/external/breakpad/breakpad-no-env.patch.1 
b/external/breakpad/breakpad-no-env.patch.1
new file mode 100644
index ..d1b37bd21868
--- /dev/null
+++ b/external/breakpad/breakpad-no-env.patch.1
@@ -0,0 +1,13 @@
+diff -ur breakpad.org/src/client/linux/minidump_writer/minidump_writer.cc 
breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+--- breakpad.org/src/client/linux/minidump_writer/minidump_writer.cc   
2021-06-19 15:32:57.258078847 +0200
 breakpad/src/client/linux/minidump_writer/minidump_writer.cc   
2021-06-19 15:35:07.014082452 +0200
+@@ -289,7 +289,8 @@
+ dir.CopyIndex(dir_index++, &dirent);
+ 
+ dirent.stream_type = MD_LINUX_ENVIRON;
+-if (!WriteProcFile(&dirent.location, GetCrashThread(), "environ"))
++// don't include the user's env
++if (true || !WriteProcFile(&dirent.location, GetCrashThread(), "environ"))
+   NullifyDirectoryEntry(&dirent);
+ dir.CopyIndex(dir_index++, &dirent);
+ 
___
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

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

 sw/qa/extras/ooxmlexport/data/tdf142700.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|8 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   66 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 +
 4 files changed, 78 insertions(+), 1 deletion(-)

New commits:
commit 8726cf692299ea262a7455adcf6ec25451c7869d
Author: László Németh 
AuthorDate: Wed Jul 7 12:18:42 2021 +0200
Commit: László Németh 
CommitDate: Thu Jul 8 10:17:08 2021 +0200

tdf#142700 DOCX: fix lost track changes of images

anchored to characters or paragraphs.

Tracked deletions and insertions weren't imported,
if they contain only images anchored to character,
resulting loss of the document content: i.e. deleted
images were reappeared, as not deleted images.

Note: because change tracking of the OpenDocument
and Writer supports only text range based changes,
the fix is a workaround using zero width spaces
to create an invisible text around the anchoring point
of the images. This workaround is not used, if it's not
necessary, i.e. if the image is part of a bigger
deletion or insertion, which contains also text, not
only an image.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf142700.docx 
b/sw/qa/extras/ooxmlexport/data/tdf142700.docx
new file mode 100644
index ..393e2ff4771b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf142700.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 9cfaf5aa6e6c..1864c4bcf83e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1376,6 +1376,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128913, 
"tdf128913.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:del/w:r/w:drawing/wp:inline/a:graphic");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf142700, "tdf142700.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport();
+// w:ins and w:del are imported correctly, if they contain only images 
anchored to character
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:ins/w:r/w:drawing/wp:anchor/a:graphic");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:del/w:r/w:drawing/wp:anchor/a:graphic");
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf142387, "tdf142387.docx")
 {
 xmlDocUniquePtr pXmlDoc = parseExport();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 30928027007c..25390cc20024 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -316,6 +316,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bLineNumberingSet( false ),
 m_bIsInFootnoteProperties( false ),
 m_bIsParaMarkerChange( false ),
+m_bRedlineImageInPreviousRun( false ),
 m_bParaChanged( false ),
 m_bIsFirstParaInSection( true ),
 m_bIsFirstParaInSectionAfterRedline( true ),
@@ -2245,6 +2246,40 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString& rString, const Proper
 rValue.Value <<= false;
 }
 
+// remove workaround for change tracked images, if they are part of a 
redline,
+// i.e. if the next run is a tracked change with the same type, author 
and date,
+// as in the change tracking of the image.
+if ( m_bRedlineImageInPreviousRun )
+{
+auto pCurrentRedline = m_aRedlines.top().size() > 0
+? m_aRedlines.top().back()
+: GetTopContextOfType(CONTEXT_CHARACTER) &&
+
GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().size() > 0
+? 
GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().back()
+: nullptr;
+if ( m_previousRedline && pCurrentRedline &&
+   // same redline
+   (m_previousRedline->m_nToken & 0x) == 
(pCurrentRedline->m_nToken & 0x) &&
+m_previousRedline->m_sAuthor == pCurrentRedline->m_sAuthor 
&&
+m_previousRedline->m_sDate == pCurrentRedline->m_sDate )
+{
+uno::Reference< text::XTextCursor > xCursor = 
xTextAppend->getEnd()->getText( )->createTextCursor( );
+assert(xCursor.is());
+xCursor->gotoEnd(false);
+xCursor->goLeft(2, true);
+if ( xCursor->getString() == u"​​" )
+{
+xCursor->goRight(1, true);
+xCursor->setString("");
+xCursor->gotoEnd(false);
+xCursor->goLeft(1, true);
+  

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

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

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 84ede3b4c1021d6ec49fd653e6c8bebb26d9fb67
Author: Luboš Luňák 
AuthorDate: Thu Apr 22 17:10:53 2021 +0200
Commit: Pranam Lashkari 
CommitDate: Thu Jul 8 10:13:40 2021 +0200

fix cairocanvas build with internal cairo

3a4bfe3e45be2d5b591ab5cae3694c9492ca9e1b made cairocanvas #include
also a pixman header, but the internal cairo case wasn't setting
up the pixman include path.

Change-Id: Ib0daab3a5ec1a6ebf1b29eb37b039d2f41f770c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114491
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 04bd21d483c33c5011e31ac12d02c9e00dc410ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118499
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pranam Lashkari 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7a4fd496d654..a937feead3cb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1279,6 +1279,7 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cairo) \
-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
+   -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
___
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' - sc/inc sc/qa sc/source

[Balazs Varga (via logerrit)]

 sc/inc/queryentry.hxx|3 
 sc/inc/typedstrdata.hxx  |9 +-
 sc/qa/uitest/autofilter/autofilter.py|   73 ++-
 sc/source/core/data/column3.cxx  |9 +-
 sc/source/core/data/table3.cxx   |   32 +-
 sc/source/core/tool/queryentry.cxx   |2 
 sc/source/core/tool/typedstrdata.cxx |   37 +++
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |   34 +-
 sc/source/filter/xml/xmlfilti.cxx|   21 +-
 sc/source/ui/cctrl/checklistmenu.cxx |4 -
 sc/source/ui/dbgui/filtdlg.cxx   |1 
 sc/source/ui/inc/checklistmenu.hxx   |6 -
 sc/source/ui/unoobj/datauno.cxx  |6 -
 sc/source/ui/view/gridwin.cxx|   20 --
 14 files changed, 122 insertions(+), 135 deletions(-)

New commits:
commit 3069df790cca2917e5aedd87bac1af65f9605d51
Author: Balazs Varga 
AuthorDate: Fri Jul 2 09:40:32 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jul 8 09:50:09 2021 +0200

tdf#142910 sc filter: fix "greater than" or "smaller than" etc

Filter "greater than" or "smaller than" (>, <, >=, <=)
conditions according to the cell number format.

Regression from commit: d5c2584bf36d21580db677b231c57f99f49aa2cb
(Related: tdf#140968 avoid duplicated filter values)

Follow-up to commit: 1f755525189884e4b2824889a6b9dea8933402db
(tdf#142402 sc UI: store formatted values in standard filter)

Clean-up for commit: d5c2584bf36d21580db677b231c57f99f49aa2cb
(Related: tdf#140968 avoid duplicated filter values)

Change-Id: I1284892398c9964ca5407b4d617a617f20341107
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118272
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118593

diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 1855744f78f7..94ea761c1239 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -48,10 +48,9 @@ struct SC_DLLPUBLIC ScQueryEntry
 doublemfVal;
 svl::SharedString maString;
 bool  mbMatchEmpty;
-bool  mbFormattedValue;
 Color maColor;
 
-Item() : meType(ByValue), mfVal(0.0), mbMatchEmpty(false), 
mbFormattedValue(false) {}
+Item() : meType(ByValue), mfVal(0.0), mbMatchEmpty(false) {}
 
 bool operator== (const Item& r) const;
 };
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index 50a7effea87e..7c7b1c7e45d4 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -24,14 +24,14 @@ public:
 Header   = 4
 };
 
-ScTypedStrData( const OUString& rStr, double nVal = 0.0, StringType eType 
= Standard,
-bool bDate = false, bool mbIsFormatted = false, bool 
bDuplicated = false );
+ScTypedStrData( const OUString& rStr, double fVal = 0.0, double fRVal = 
0.0, StringType eType = Standard,
+bool bDate = false );
 
 bool IsDate() const { return mbIsDate;}
 const OUString& GetString() const { return maStrValue;}
 StringType GetStringType() const { return meStrType;}
 double GetValue() const { return mfValue; }
-bool IsDuplicated() const { return mbIsDuplicated; }
+double GetRoundedValue() const { return mfRoundedValue; }
 
 struct LessCaseSensitive
 {
@@ -58,10 +58,9 @@ public:
 private:
 OUString maStrValue;
 double mfValue;
+double mfRoundedValue; // rounded value by format code
 StringType meStrType;
 bool   mbIsDate;
-bool   mbIsFormatted; // true if the cell value is a formatted filter value
-bool   mbIsDuplicated; // true if the cell has a formatted filter value 
and has at least one duplicate formatted value.
 };
 
 class FindTypedStrData
diff --git a/sc/qa/uitest/autofilter/autofilter.py 
b/sc/qa/uitest/autofilter/autofilter.py
index 060ada717844..7c8078c702c5 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -469,20 +469,8 @@ class AutofilterTest(UITestCase):
 
 xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
 
-xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", 
"COL": "0", "ROW": "0"}))
-xFloatWindow = self.xUITest.getFloatWindow()
-#Choose Standard Filter... button
-xMenu = xFloatWindow.getChild("menu")
-
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-   

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/skia

[Attila Szűcs (via logerrit)]

 vcl/skia/salbmp.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 26846d1cee0f348d6aba464fbe7b27c04796884d
Author: Attila Szűcs 
AuthorDate: Thu Jul 1 02:58:09 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jul 8 09:48:56 2021 +0200

tdf#143059 sw export: fix assert crash

Incomplete reset in SkiaSalBitmap::ResetAllData() was
followed by a broken scaling of a dummy image without
buffer/image data.

SvxLineStyleToolBoxControl::statusChanged() creates
a dummy image via GetBitmapForUISolidLine... deleted its
image/buffer data immediately ("no line style" dummy
image preview for the line style popup list).

But the dummy image wasn't ready, it still needed
postponed scaling processed by the GPU. This information
wasn't reset by Erase, and without pixel data it couldn't
be scaled, so this dummy image became a forever "not ready"/
"waiting to be scaled" image. There are parts in the code
that require that the image is already scaled... These parts
check if scalings are ended with the assert(mPixelsSize == mSize).

Note: Use the following method to start LO with Skia in Linux

SAL_USE_VCLPLUGIN=gen SAL_ENABLESKIA=1 ./soffice

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I5099eb8671a1c5d16668743f26feb47fe99cd70e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118204
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit aa7b1f2ec7da5b94459f808e151085f4d301afd1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118184
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index fa2cf67ed5d9..3c0c9d32ed99 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -1289,6 +1289,8 @@ void SkiaSalBitmap::ResetAllData()
 mImage.reset();
 mAlphaImage.reset();
 mEraseColorSet = false;
+mPixelsSize = mSize;
+ComputeScanlineSize();
 }
 
 void SkiaSalBitmap::ResetPendingScaling()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2021-Jul-07

[Heiko Tietze]

Present: Maria, Nissa, Heiko
Comments: Cor, Alex et al.

Tickets/Topics

 * Final touches to the Calc survey
   + https://www.mail-archive.com/design@global.libreoffice.org/msg09476.html
 + accepted ideas/comments, added to/fixed in the survey
   + drop question about gender -> done
   + What do you use LibreOffice Calc for? Personal, School... -> added
   + typo in "Liner(sp) and non-linear" -> fixed
   + 5 steps Likert Scale instead of 7 -> done
   + "select 6.." could become "Select 6 if you are not a robot" ->
 we removed the question
   + "Please select "No Answer" -> added an answer option
   + make it typograhically perfect -> the PDF was just to share the content
   + usage frequency - less than once a year, a couple of times in a year...
 + https://www.qualtrics.com/blog/measuring-behavioral-frequency/
   -> we updated the answer options but didnt stick to the example since
 an office suite is something special
 + rejected ideas
   + why people don't use Calc more often -> would be weird for "every day"
   + number of items in Q9 (importance of Calc features),
 Spell Check, Formulas and Calculations, Rows and columns manipulation,
 Number, percent, and Currency formatting;
 combine text and cell formatting -> hard to say what to remove; we'd
 like to learn how users understand the features and answer groups might
 reveal this; we put questions into groups to make it easier to read
   + add descriptions to the answer options -> as for the expertise it
 should be clear anyway, and the other questions will not become useless
 with a bit fuzzyness
   + SUS
 + cut "very" from Q13 (SUS)
 + Ask "To what extent do you agree with the following statements"
 + hard to switch between positive/negative answers
 -> it's a standardized questionnaire with exactly these questions
 + alternative but still accepted versions
 -> familiar with the classic version, easier to compare with previous
results; positive wording is acc. to Sauro similar to classic form
   + Age
 + age drop/to the end; rather ask how long using computers; if age,
   then year of birth
 -> year of birth is also not clear; age in years is common in surveys
 + age: add steps above 55 -> ???
 -> we changed the steps with the idea of pupils, students, master/ph.d,
   postdocs, mid-ager, retired <18, 32, 45, 65, >65
   + run the survey with a couple of people and evaluate -> usually a good
 idea but a bit overdone for a non-scientific survey, and with 10
 subjects we cannot group answers
   + More/other open questions (list your top 5 jobs, most important
 application, answers are you looking for) -> proposed open questions
 are more or less covered in the survey; idea was to give people (non-
 native speakers) an idea what we are looking for with the opportunity
 to answer freely
   + Q7 (now 8) size of data: average/typical is not the maximum -> largest
 is not the normal use and while both are interesting we decided to ask
 for the average
   + better split "How many sheets, How many rows/cols -> we want to learn
 how people think about size rather than get exact answers
   => many thanks for reading and commenting to everyone
  + start is planned for this week and it will run until end of July

 * "Input list" field: Add confirmation dialog in order to prevent lost of data
   + https://bugs.documentfoundation.org/show_bug.cgi?id=143144
   + in general, input on any field requiring some action before okay
 is not checked; should be only a few cases, if any, and definitely not
 critical
   + adding a warning in this particular case sounds like over-engineering
 (field input !empty and <> list entries on okay) and interrupting (Heiko)
   -> comment and remove keyword but keep open

 * The visibility of inserted index entries is poor and editing is difficult
   + https://bugs.documentfoundation.org/show_bug.cgi?id=116715
   + depends on the interaction and is flexible
   + no further input for 2 years
   -> resolve NAB

 * Formdesign: Design-Mode for the whole form could only be changed by
   "Open in Design Mode"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=128968
   + "form design mode" and "form elements design mode" or
 "controls design mode" (Cor)
   + "document design mode" and "form control design mode" (Alex)
   + current situation is "Design Mode On/Off", "Form Design", and
 "Toggle Design Mode" / "Design Mode" in context
   + commands are named differently (now), new labels wont help to reduce
 the complexity
   -> resolve NAB



OpenPGP_signature
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOff

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

[Noel Grandin (via logerrit)]

 editeng/source/editeng/impedit.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 865641047be4a693f7a51635ce06eab15675126d
Author: Noel Grandin 
AuthorDate: Tue Jul 6 18:52:16 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Jul 8 09:22:39 2021 +0200

tdf#132740 bypass work if selection has not changed

takes 10% of the time off

Change-Id: Ia0a2f4469088e103f162b7d85abb7fadc5f365cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118532
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 2ca614be3eb65d852b2c811c853b754e5e5ecb36)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118509

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 9fb5ce8d8897..22421c226234 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -241,6 +241,9 @@ const OutlinerViewShell* ImpEditView::GetViewShell() const
 
 void ImpEditView::SetEditSelection( const EditSelection& rEditSelection )
 {
+if (aEditSelection == rEditSelection)
+return;
+
 // set state before notification
 aEditSelection = rEditSelection;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 writerfilter/source/dmapper/NumberingManager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e5b3f975144228d49c0bac71031fc7356fd252ab
Author: Justin Luth 
AuthorDate: Wed Jul 7 06:59:33 2021 +0200
Commit: Justin Luth 
CommitDate: Thu Jul 8 09:00:19 2021 +0200

tdf#141966 writerfilter CN: set minimum threshold

I have found that in both DOC and DOCX numbering bugs,
many can be fixed simply by not assigning Chapter Numbering
at all. So set a minimum threshold to deter useless assignments.

[Note that a LO round-trip should save as numId 1,
and thus a single entry would make it qualify.
For Word-authored documents, this threshold means
at least 3 Heading X styles (which matches LO default workflow)
or 6 out of 9 Levels defined for non-heading styles.]

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

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 98c634511124..62118630e2d4 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -1181,8 +1181,9 @@ ListDef::Pointer ListsManager::GetList( sal_Int32 nId )
 void ListsManager::CreateNumberingRules( )
 {
 // Try to determine which numId would best work as LO's Chapter Numbering 
Outline rule.
+// (The best fix for many import bugs is just to prevent ANY assignment as 
chapter numbering.)
 sal_Int16 nChosenAsChapterNumberingId = -1;
-sal_uInt16 nHighestWeight = 0;
+sal_uInt16 nHighestWeight = 5; // arbitrarily chosen minimum threshold
 for (const auto& rList : m_aLists)
 {
 sal_uInt16 nWeight = rList->GetChapterNumberingWeight();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits