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

[Stephan Bergmann (via logerrit)]

 include/rtl/string.hxx  |2 +-
 include/rtl/ustring.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5fca6fefc9cb47737663fbcd04660d2c5bcfde93
Author: Stephan Bergmann 
AuthorDate: Mon Aug 31 08:30:58 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 31 09:24:45 2020 +0200

Fix typos in comments

...introduced with 2e21240f23ac2191a3535d697a7308b29303c67c "Goodbye
O[U]StringView, welcome O[U]String::Concat".  Thanks to Mike for spotting 
them!

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

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 60485fbdfb96..da75e5eee57c 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -1909,7 +1909,7 @@ public:
 // concatenation chain, when neither of the first two e1, e2 is one of our 
rtl string-related
 // classes (so something like
 //
-//   OString s = "a" + (b ? std::string_view("c" : "dd");
+//   OString s = "a" + (b ? std::string_view("c") : 
std::string_view("dd"));
 //
 // would not compile):
 template [[nodiscard]] static
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index b99cf758ed8b..6c6e92207242 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -3701,7 +3701,7 @@ public:
 // concatenation chain, when neither of the first two e1, e2 is one of our 
rtl string-related
 // classes (so something like
 //
-//   OUString s = "a" + (b ? std::u16string_view(u"c" : u"dd");
+//   OUString s = "a" + (b ? std::u16string_view(u"c") : 
std::u16string_view(u"dd"));
 //
 // would not compile):
 template [[nodiscard]] static
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/qa chart2/source include/xmloff schema/libreoffice xmloff/source

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2export.cxx   |   18 
+++---
 chart2/qa/extras/data/docx/MSO_Custom_Leader_Line.docx  |binary
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx |7 +++
 include/xmloff/xmltoken.hxx |1 
 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |9 
+
 xmloff/source/chart/PropertyMap.hxx |1 
 xmloff/source/core/xmltoken.cxx |3 +
 xmloff/source/token/tokens.txt  |1 
 8 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit e2f4e65a7b8024c00b049eebf0d87637efda7f24
Author: Balazs Varga 
AuthorDate: Thu Aug 27 11:21:48 2020 +0200
Commit: László Németh 
CommitDate: Mon Aug 31 09:30:23 2020 +0200

tdf#134571 chart2, xmloff: add loext:custom-leader-lines

new ODF chart series style attribute for saving not default
(switched off) state of data labels in custom positions.

Note: import of the embedded chart of the DOCX unit test
document uses also ODF format in the background, testing
also this loext attribute, i.e. the chart of the unit test
document doesn't contain custom leader lines.

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 4be864c69ce4..6384ac17f0bc 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -2374,10 +2374,19 @@ void 
Chart2ExportTest::testCustomDataLabelMultipleSeries()
 void Chart2ExportTest::testLeaderLines()
 {
 load("/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx");
-xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open 
XML");
-CPPUNIT_ASSERT(pXmlDoc);
-assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
 "val", "1");
-assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
 "val", "0");
+{
+xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office 
Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
 "val", "1");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
 "val", "0");
+}
+load("/chart2/qa/extras/data/docx/", "MSO_Custom_Leader_Line.docx");
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office 
Open XML Text");
+CPPUNIT_ASSERT(pXmlDoc);
+// tdf#134571: Check the leader line is switch off.
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
 "val", "0");
+}
 }
 
 void Chart2ExportTest::testNumberFormatExportPPTX()
@@ -2882,6 +2891,7 @@ void Chart2ExportTest::testTdf123647()
 
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart", 1);
 }
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/MSO_Custom_Leader_Line.docx 
b/chart2/qa/extras/data/docx/MSO_Custom_Leader_Line.docx
new file mode 100644
index ..c158a0d76513
Binary files /dev/null and 
b/chart2/qa/extras/data/docx/MSO_Custom_Leader_Line.docx differ
diff --git 
a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index a6d45dddaa47..6701c1061b01 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -79,6 +79,7 @@ enum
 PROP_SERIES_DATAPOINT_LABEL_PLACEMENT,
 //other series properties
 PROP_SERIES_ATTACHED_AXIS,
+PROP_SERIES_SHOW_CUSTOM_LEADERLINES,
 PROP_SERIES_DATAPOINT_TEXT_ROTATION,
 PROP_SERIES_DATAPOINT_LABEL_BORDER_STYLE,
 PROP_SERIES_DATAPOINT_LABEL_BORDER_WIDTH,
@@ -211,6 +212,12 @@ void lcl_AddPropertiesToVector_SeriesOnly(
   cppu::UnoType::get(),
   beans::PropertyAttribute::BOUND
   | beans::PropertyAttribute::MAYBEDEFAULT );
+
+rOutProperties.emplace_back( "ShowCustomLeaderLines",
+  PROP_SERIES_SHOW_CUSTOM_LEADERLINES,
+  cppu::UnoType::get(),
+  beans::PropertyAttribute::BOUND
+  | beans::PropertyAttribute::MAYBEDEFAULT );
 }
 
 uno::Sequence< Property > lcl_GetPropertySequence( 
DataSeriesPointWrapper::eType _eType )
diff --git a/include/xmloff/xmltoken.hxx b/inclu

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2export.cxx   |   18 ++
 chart2/qa/extras/data/ods/tdf136024.ods |binary
 xmloff/source/chart/SchXMLExport.cxx|1 +
 3 files changed, 19 insertions(+)

New commits:
commit 177b54c2de7626ae42b65441cb81f359407431a1
Author: Balazs Varga 
AuthorDate: Fri Aug 28 14:18:57 2020 +0200
Commit: László Németh 
CommitDate: Mon Aug 31 09:45:16 2020 +0200

tdf#136024 chart2: fix ODF export of custom label positions

of pie and donut chart data labels.

Follow-up of commit 5339d0800ccdcd325294e61f8ae9e67648beb035
(tdf#130590 Chart OOXML export: fix custom label position).

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 6384ac17f0bc..fddfdc0c2e67 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2312,6 +2313,23 @@ void Chart2ExportTest::testCustomPositionofDataLabel()
 double nY = aYVal.toDouble();
 CPPUNIT_ASSERT_DOUBLES_EQUAL(0.172648731408574, nY, 1e-7);
 }
+
+load("/chart2/qa/extras/data/ods/", "tdf136024.ods");
+{
+reload("calc8");
+// tdf#136024: test custom position of pie chart data label after an 
ods export
+Reference xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference 
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
+CPPUNIT_ASSERT(xDataSeries.is());
+uno::Reference 
xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
+
+chart2::RelativePosition aCustomLabelPosition;
+CPPUNIT_ASSERT(xPropertySet->getPropertyValue("CustomLabelPosition") 
>>= aCustomLabelPosition);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(aCustomLabelPosition.Primary, 
-0.0961935120945059, 1e-5);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(aCustomLabelPosition.Secondary, 
0.209578842093566, 1e-5);
+}
 }
 
 void Chart2ExportTest::testCustomDataLabelMultipleSeries()
diff --git a/chart2/qa/extras/data/ods/tdf136024.ods 
b/chart2/qa/extras/data/ods/tdf136024.ods
new file mode 100644
index ..c8d004f54469
Binary files /dev/null and b/chart2/qa/extras/data/ods/tdf136024.ods differ
diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 2d65645d26c5..a2c18e494d19 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3315,6 +3315,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 aPoint.maStyleName = maAutoStyleNameQueue.front();
 if(bExportNumFmt)
 aPoint.mCustomLabelText = 
lcl_getCustomLabelField(nElement, xSeries);
+aPoint.mCustomLabelPos = 
lcl_getCustomLabelPosition(nElement, xSeries);
 maAutoStyleNameQueue.pop();
 aDataPointVector.push_back( aPoint );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst

[Andrea Gelmini (via logerrit)]

 helpers/help_hid.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0aacb4f63b6b5a1831a0880329f7a76af46b632
Author: Andrea Gelmini 
AuthorDate: Wed Aug 26 08:11:08 2020 +0200
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 09:51:40 2020 +0200

Fix typo

Change-Id: I0961b8a8e76c451bef5d064fdf9057dd9384bb20
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/101378
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-by: Caolán McNamara 

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6c5177818..41ab0aa8b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2471,7 +2471,7 @@ HID_SCSHELL_DRAWSH,58800,
 HID_SCSHELL_DRTXTOB,58801,
 HID_SCSHELL_FORMATSH,58808,
 HID_SCSHELL_GRAPHIC,58811,
-HID_SCSHELL_OLEOBEJCTSH,58809,
+HID_SCSHELL_OLEOBJECTSH,58809,
 HID_SCSHELL_PAGEBREAK,58812,
 HID_SCSHELL_PIVOTSH,58802,
 HID_SCSHELL_PREVWSH,58803,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini (via logerrit)]

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

New commits:
commit c0522d153eb92edd069ce5c10cebde9e21c0e84a
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 09:51:40 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Aug 31 09:51:40 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to e0aacb4f63b6b5a1831a0880329f7a76af46b632
  - Fix typo

Change-Id: I0961b8a8e76c451bef5d064fdf9057dd9384bb20
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/101378
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-by: Caolán McNamara 

diff --git a/helpcontent2 b/helpcontent2
index aeb5cc458fce..e0aacb4f63b6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit aeb5cc458fce90b7f5c02128e95bad89f92b3efd
+Subproject commit e0aacb4f63b6b5a1831a0880329f7a76af46b632
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/core/docnode/ndtbl.cxx   |   24 ++--
 sw/source/core/docnode/ndtbl1.cxx  |   26 ++
 sw/source/core/docnode/swthreadmanager.cxx |6 +++---
 sw/source/core/docnode/threadmanager.cxx   |6 +++---
 sw/source/core/docnode/threadmanager.hxx   |2 +-
 sw/source/core/inc/swthreadmanager.hxx |2 +-
 6 files changed, 36 insertions(+), 30 deletions(-)

New commits:
commit 284dbd865d1788ba8f31e736555dd9e9af8ffa7c
Author: Miklos Vajna 
AuthorDate: Mon Aug 31 09:08:37 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Aug 31 09:55:30 2020 +0200

sw: prefix members of SplitTable_Para, SwTableFormatCmp, SwThreadManager ...

... and ThreadManager

See tdf#94879 for motivation.

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

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c0496469e95d..7ab1c5de313d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3273,27 +3273,31 @@ namespace {
 
 class SplitTable_Para
 {
-std::map aSrcDestMap;
-SwTableNode* pNewTableNd;
-SwTable& rOldTable;
+std::map m_aSrcDestMap;
+SwTableNode* m_pNewTableNode;
+SwTable& m_rOldTable;
 
 public:
-SplitTable_Para( SwTableNode* pNew, SwTable& rOld )
-: aSrcDestMap(), pNewTableNd( pNew ), rOldTable( rOld )
+SplitTable_Para(SwTableNode* pNew, SwTable& rOld)
+: m_aSrcDestMap()
+, m_pNewTableNode(pNew)
+, m_rOldTable(rOld)
 {}
 SwFrameFormat* GetDestFormat( SwFrameFormat* pSrcFormat ) const
 {
-auto it = aSrcDestMap.find( pSrcFormat );
-return it == aSrcDestMap.end() ? nullptr : it->second;
+auto it = m_aSrcDestMap.find(pSrcFormat);
+return it == m_aSrcDestMap.end() ? nullptr : it->second;
 }
 
 void InsertSrcDest( SwFrameFormat const * pSrcFormat, SwFrameFormat* 
pDestFormat )
-{ aSrcDestMap[ pSrcFormat ] = pDestFormat; }
+{
+m_aSrcDestMap[pSrcFormat] = pDestFormat;
+}
 
 void ChgBox( SwTableBox* pBox )
 {
-rOldTable.GetTabSortBoxes().erase( pBox );
-pNewTableNd->GetTable().GetTabSortBoxes().insert( pBox );
+m_rOldTable.GetTabSortBoxes().erase(pBox);
+m_pNewTableNode->GetTable().GetTabSortBoxes().insert(pBox);
 }
 };
 
diff --git a/sw/source/core/docnode/ndtbl1.cxx 
b/sw/source/core/docnode/ndtbl1.cxx
index c9c4cd96b9c2..faeaeafac5ba 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -74,26 +74,28 @@ public:
 SwFrameFormat const* pOld, sal_Int16 
nType);
 
 private:
-SwFrameFormat *pOld, *pNew;
-sal_Int16 nType;
+SwFrameFormat *m_pOld, *m_pNew;
+sal_Int16 m_nType;
 };
 
 }
 
-SwTableFormatCmp::SwTableFormatCmp( SwFrameFormat *pO, SwFrameFormat *pN, 
sal_Int16 nT )
-: pOld ( pO ), pNew ( pN ), nType( nT )
+SwTableFormatCmp::SwTableFormatCmp(SwFrameFormat* pO, SwFrameFormat* pN, 
sal_Int16 nT)
+: m_pOld(pO)
+, m_pNew(pN)
+, m_nType(nT)
 {
-if (pOld)
-pOld->Add(this);
+if (m_pOld)
+m_pOld->Add(this);
 }
 
 SwTableFormatCmp::~SwTableFormatCmp()
 {
-if (pOld)
+if (m_pOld)
 {
-pOld->Remove(this);
-if (!pOld->HasWriterListeners())
-delete pOld;
+m_pOld->Remove(this);
+if (!m_pOld->HasWriterListeners())
+delete m_pOld;
 }
 }
 
@@ -103,8 +105,8 @@ SwFrameFormat* 
SwTableFormatCmp::FindNewFormat(std::vectorpOld == pOld && pCmp->nType == nType )
-return pCmp->pNew;
+if (pCmp->m_pOld == pOld && pCmp->m_nType == nType)
+return pCmp->m_pNew;
 }
 return nullptr;
 }
diff --git a/sw/source/core/docnode/swthreadmanager.cxx 
b/sw/source/core/docnode/swthreadmanager.cxx
index 4b646e8b22df..0409e5a96200 100644
--- a/sw/source/core/docnode/swthreadmanager.cxx
+++ b/sw/source/core/docnode/swthreadmanager.cxx
@@ -26,13 +26,13 @@
 
 #i73788#
 */
-bool SwThreadManager::mbThreadManagerInstantiated = false;
+bool SwThreadManager::sbThreadManagerInstantiated = false;
 
 SwThreadManager::SwThreadManager()
 : mpThreadManagerImpl( new ThreadManager( 
SwThreadJoiner::GetThreadJoiner() ) )
 {
 mpThreadManagerImpl->Init();
-mbThreadManagerInstantiated = true;
+sbThreadManagerInstantiated = true;
 }
 
 SwThreadManager::~SwThreadManager()
@@ -52,7 +52,7 @@ SwThreadManager& SwThreadManager::GetThreadManager()
 
 bool SwThreadManager::ExistsThreadManager()
 {
-return mbThreadManagerInstantiated;
+return sbThreadManagerInstantiated;
 }
 
 oslInterlockedCount SwThreadManager::AddThread( const rtl::Reference< 
ObservableThread >& rThread )
diff --git a/sw/source/core/docnode/threadmanager.cxx 
b/sw/source/

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

[Daniel Arato (NISZ) (via logerrit)]

 chart2/qa/extras/chart2export.cxx   |   14 ++
 chart2/qa/extras/data/odp/tdf121189.odp |binary
 oox/source/export/shapes.cxx|1 +
 3 files changed, 15 insertions(+)

New commits:
commit 0c5ac9d1cb39eac838a612092a8934a6ca12326f
Author: Daniel Arato (NISZ) 
AuthorDate: Mon Aug 24 17:29:08 2020 +0200
Commit: László Németh 
CommitDate: Mon Aug 31 10:12:41 2020 +0200

tdf#121189 PPTX export: fix missing chart

Based on Regina Henschel's technical analysis and code pointer.

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index fddfdc0c2e67..7e17c2f1307c 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -156,6 +156,7 @@ public:
 void testTdf119029();
 void testTdf108022();
 void testTdf121744();
+void testTdf121189();
 void testTdf122031();
 void testTdf115012();
 void testTdf134118();
@@ -295,6 +296,7 @@ public:
 CPPUNIT_TEST(testTdf119029);
 CPPUNIT_TEST(testTdf108022);
 CPPUNIT_TEST(testTdf121744);
+CPPUNIT_TEST(testTdf121189);
 CPPUNIT_TEST(testTdf122031);
 CPPUNIT_TEST(testTdf115012);
 CPPUNIT_TEST(testTdf134118);
@@ -2577,6 +2579,18 @@ void Chart2ExportTest::testTdf121744()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val", YValueId );
 }
 
+void Chart2ExportTest::testTdf121189()
+{
+load("/chart2/qa/extras/data/odp/", "tdf121189.odp");
+reload("Impress Office Open XML");
+
+uno::Reference xDoc(mxComponent, 
uno::UNO_QUERY_THROW);
+uno::Reference 
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xPage->getCount());
+uno::Reference xShape(xPage->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.OLE2Shape"), 
xShape->getShapeType());
+}
+
 void Chart2ExportTest::testTdf122031()
 {
 //Checks pie chart data label format.
diff --git a/chart2/qa/extras/data/odp/tdf121189.odp 
b/chart2/qa/extras/data/odp/tdf121189.odp
new file mode 100644
index ..6f99e0054936
Binary files /dev/null and b/chart2/qa/extras/data/odp/tdf121189.odp differ
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 3121aa745a16..e7997226f689 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1490,6 +1490,7 @@ static const NameToConvertMapType& lcl_GetConverters()
 
 { "com.sun.star.presentation.GraphicObjectShape"   , 
&ShapeExport::WriteGraphicObjectShape },
 { "com.sun.star.presentation.MediaShape"   , 
&ShapeExport::WriteGraphicObjectShape },
+{ "com.sun.star.presentation.ChartShape"   , 
&ShapeExport::WriteOLE2Shape },
 { "com.sun.star.presentation.OLE2Shape", 
&ShapeExport::WriteOLE2Shape },
 { "com.sun.star.presentation.TableShape"   , 
&ShapeExport::WriteTableShape },
 { "com.sun.star.presentation.TextShape", 
&ShapeExport::WriteTextShape },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/qa/extras/chart2dump/chart2dump.cxx |   12 ++--
 sw/source/filter/html/htmlatr.cxx  |6 +++---
 sw/source/filter/html/wrthtml.cxx  |4 ++--
 sw/source/filter/html/wrthtml.hxx  |2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit c9c2ce986de8ddf507bad1689d32d831875109f5
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 13:22:52 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 10:13:15 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Id8f549f69b5007ced62401130894f795dde8fb80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101616
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 6defbf6fc866..7bb98b648681 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -227,22 +227,22 @@ protected:
 
 OUString sequenceToOneLineString(const uno::Sequence& rSeq)
 {
-OUStringBuffer aBufer;
+OUStringBuffer aBuffer;
 for (const OUString& seqItem : rSeq)
 {
-aBufer.append(seqItem).append(";");
+aBuffer.append(seqItem).append(";");
 }
-return aBufer.makeStringAndClear();
+return aBuffer.makeStringAndClear();
 }
 
 OUString doubleVectorToOneLineString(const std::vector& rVector)
 {
-OUStringBuffer aBufer;
+OUStringBuffer aBuffer;
 for (const double& vectorItem : rVector)
 {
-aBufer.append(OUString::number(vectorItem)).append(";");
+aBuffer.append(OUString::number(vectorItem)).append(";");
 }
-return aBufer.makeStringAndClear();
+return aBuffer.makeStringAndClear();
 }
 
 OUString transformationToOneLineString(const drawing::HomogenMatrix3& 
rTransform)
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index e543026e2a2d..dd55897b2d8d 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2226,7 +2226,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const 
SwContentNode& rNode )
 
 // now it's a good opportunity again for an LF - if it is still allowed
 if( rHTMLWrt.m_bLFPossible &&
-rHTMLWrt.GetLineLen() >= rHTMLWrt.m_nWhishLineLen )
+rHTMLWrt.GetLineLen() >= rHTMLWrt.m_nWishLineLen )
 {
 rHTMLWrt.OutNewLine();
 }
@@ -2463,8 +2463,8 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const 
SwContentNode& rNode )
 nWordLen = nEnd;
 nWordLen -= nStrPos;
 
-if( nLineLen >= rHTMLWrt.m_nWhishLineLen ||
-(nLineLen+nWordLen) >= rHTMLWrt.m_nWhishLineLen )
+if( nLineLen >= rHTMLWrt.m_nWishLineLen ||
+(nLineLen+nWordLen) >= rHTMLWrt.m_nWishLineLen )
 {
 HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
 rHTMLWrt.OutNewLine();
diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 877d1a1c63cb..d89515215236 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -114,7 +114,7 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL, const 
OUString& rFilterOpt
 , m_nDfltTopMargin(0)
 , m_nDfltBottomMargin(0)
 , m_nIndentLvl(0)
-, m_nWhishLineLen(0)
+, m_nWishLineLen(0)
 , m_nDefListLvl(0)
 , m_nDefListMargin(0)
 , m_nHeaderFooterSpace(0)
@@ -357,7 +357,7 @@ ErrCode SwHTMLWriter::WriteStream()
 m_bFirstCSS1Property = m_bFirstCSS1Rule = false;
 m_bCSS1IgnoreFirstPageDesc = false;
 m_nIndentLvl = 0;
-m_nWhishLineLen = 70;
+m_nWishLineLen = 70;
 m_nLastLFPos = 0;
 m_nDefListLvl = 0;
 m_nDefListMargin = ((m_xTemplate.is() && !m_bCfgOutStyles) ? 
m_xTemplate.get() : m_pDoc)
diff --git a/sw/source/filter/html/wrthtml.hxx 
b/sw/source/filter/html/wrthtml.hxx
index ffc416f22662..f3d9ec706149 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -320,7 +320,7 @@ public:
 sal_uInt16 m_nDfltTopMargin;  // defaults which doesn't have to be
 sal_uInt16 m_nDfltBottomMargin;   // written (from template)
 sal_uInt16 m_nIndentLvl;  // How far is it indented?
-sal_Int32 m_nWhishLineLen;// How long can a line be?
+sal_Int32 m_nWishLineLen; // How long can a line be?
 sal_uInt16 m_nDefListLvl; // which DL level exists now
 sal_Int32  m_nDefListMargin;  // How far is the indentation in DL
 sal_uInt16 m_nHeaderFooterSpace;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 vcl/qa/cppunit/svm/svmtest.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 72ce4f57726e28c1e056cb354edb7aeae19347c0
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 14:33:37 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 10:13:47 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: I6aa72938526f5e81503367ecd2471a6d5afb05b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101620
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index e03267e3bd36..8960f727ea81 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -92,8 +92,8 @@ class SvmTest : public test::BootstrapFixture, public 
XmlTestTools
 void checkTextArray(const GDIMetaFile& rMetaFile);
 void testTextArray();
 
-void checkStrechText(const GDIMetaFile& rMetaFile);
-void testStrechText();
+void checkstretchText(const GDIMetaFile& rMetaFile);
+void teststretchText();
 
 void checkTextRect(const GDIMetaFile& rMetaFile);
 void testTextRect();
@@ -209,7 +209,7 @@ public:
 CPPUNIT_TEST(testPolyPolygon);
 CPPUNIT_TEST(testText);
 CPPUNIT_TEST(testTextArray);
-CPPUNIT_TEST(testStrechText);
+CPPUNIT_TEST(teststretchText);
 CPPUNIT_TEST(testTextRect);
 CPPUNIT_TEST(testTextLine);
 CPPUNIT_TEST(testBitmaps); // BMP, BMPSCALE, BMPSCALEPART
@@ -847,7 +847,7 @@ void SvmTest::testTextArray()
 checkTextArray(readFile("textarray.svm"));
 }
 
-void SvmTest::checkStrechText(const GDIMetaFile& rMetaFile)
+void SvmTest::checkstretchText(const GDIMetaFile& rMetaFile)
 {
 xmlDocUniquePtr pDoc = dumpMeta(rMetaFile);
 
@@ -858,15 +858,15 @@ void SvmTest::checkStrechText(const GDIMetaFile& 
rMetaFile)
 assertXPathContent(pDoc, "/metafile/stretchtext[1]/textcontent", "123456");
 }
 
-void SvmTest::testStrechText()
+void SvmTest::teststretchText()
 {
 GDIMetaFile aGDIMetaFile;
 ScopedVclPtrInstance pVirtualDev;
 setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
 pVirtualDev->DrawStretchText(Point(4,6), 10, "123456", 1, 4);
 
-checkStrechText(writeAndReadStream(aGDIMetaFile));
-checkStrechText(readFile("strecthtext.svm"));
+checkstretchText(writeAndReadStream(aGDIMetaFile));
+checkstretchText(readFile("strecthtext.svm"));
 }
 
 void SvmTest::checkTextRect(const GDIMetaFile& rMetaFile)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 canvas/source/opengl/ogl_spritedevicehelper.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f6c69ff33baa7de72a75afbf1de1f21f82adae47
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 13:23:27 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 10:14:20 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: If7c189f410f08d5069edf0fc7a29057897e08388
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101617
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx 
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 230a34edea06..bc4651f54157 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -501,13 +501,13 @@ namespace oglcanvas
 
 class BufferContextImpl : public IBufferContext
 {
-GLuint mnFrambufferId;
+GLuint mnFramebufferId;
 GLuint mnDepthId;
 GLuint mnTextureId;
 
 virtual void startBufferRendering() override
 {
-glBindFramebuffer(GL_FRAMEBUFFER, mnFrambufferId);
+glBindFramebuffer(GL_FRAMEBUFFER, mnFramebufferId);
 }
 
 virtual void endBufferRendering() override
@@ -522,11 +522,11 @@ namespace oglcanvas
 
 public:
 explicit BufferContextImpl(const ::basegfx::B2IVector& rSize) :
-mnFrambufferId(0),
+mnFramebufferId(0),
 mnDepthId(0),
 mnTextureId(0)
 {
-OpenGLHelper::createFramebuffer(rSize.getX(), rSize.getY(), 
mnFrambufferId,
+OpenGLHelper::createFramebuffer(rSize.getX(), rSize.getY(), 
mnFramebufferId,
 mnDepthId, mnTextureId);
 }
 
@@ -534,7 +534,7 @@ namespace oglcanvas
 {
 glDeleteTextures(1, &mnTextureId);
 glDeleteRenderbuffers(1, &mnDepthId);
-glDeleteFramebuffers(1, &mnFrambufferId);
+glDeleteFramebuffers(1, &mnFramebufferId);
 }
 };
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 editeng/source/editeng/editview.cxx |8 
 editeng/source/editeng/impedit.cxx  |4 ++--
 editeng/source/editeng/impedit.hxx  |6 +++---
 include/editeng/editview.hxx|4 ++--
 sc/source/ui/view/gridwin4.cxx  |   22 +++---
 5 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 7c32479b596156a7422a7b96f2548b8a4ea73185
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 13:01:09 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 10:15:56 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: I7596db11cae77c2dcadd740c44cc72fd5dbceb9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101619
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index fda93027044c..0bf2de883d46 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1602,14 +1602,14 @@ bool EditView::HasLOKSpecialPositioning() const
 return pImpEditView->HasLOKSpecialPositioning();
 }
 
-void EditView::SupressLOKMessages(bool bSet)
+void EditView::SuppressLOKMessages(bool bSet)
 {
-pImpEditView->SupressLOKMessages(bSet);
+pImpEditView->SuppressLOKMessages(bSet);
 }
 
-bool EditView::IsSupressLOKMessages() const
+bool EditView::IsSuppressLOKMessages() const
 {
-return pImpEditView->IsSupressLOKMessages();
+return pImpEditView->IsSuppressLOKMessages();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 666426c8485b..d90aa81be0c4 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -196,7 +196,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* 
pEng, vcl::Window* pWindo
 eAnchorMode(EEAnchorMode::TopLeft),
 mpEditViewCallbacks(nullptr),
 mbBroadcastLOKViewCursor(comphelper::LibreOfficeKit::isActive()),
-mbSupressLOKMessages(false)
+mbSuppressLOKMessages(false)
 {
 aEditSelection.Min() = pEng->GetEditDoc().GetStartPaM();
 aEditSelection.Max() = pEng->GetEditDoc().GetEndPaM();
@@ -1298,7 +1298,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool 
bForceVisCursor )
 
 GetCursor()->SetSize( aCursorSz );
 
-if (comphelper::LibreOfficeKit::isActive() && mpViewShell && 
!mbSupressLOKMessages)
+if (comphelper::LibreOfficeKit::isActive() && mpViewShell && 
!mbSuppressLOKMessages)
 {
 Point aPos = GetCursor()->GetPos();
 boost::property_tree::ptree aMessageParams;
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index e1e54664f815..77d8059fdcdb 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -299,7 +299,7 @@ private:
 const EditViewCallbacks* mpEditViewCallbacks;
 std::unique_ptr mpLOKSpecialPositioning;
 bool mbBroadcastLOKViewCursor:1;
-bool mbSupressLOKMessages:1;
+bool mbSuppressLOKMessages:1;
 
 const EditViewCallbacks* getEditViewCallbacks() const
 {
@@ -460,8 +460,8 @@ public:
 tools::Rectangle GetLOKSpecialVisArea() const;
 bool HasLOKSpecialPositioning() const;
 
-void SupressLOKMessages(bool bSet) { mbSupressLOKMessages = bSet; }
-bool IsSupressLOKMessages() const { return mbSupressLOKMessages; }
+void SuppressLOKMessages(bool bSet) { mbSuppressLOKMessages = bSet; }
+bool IsSuppressLOKMessages() const { return mbSuppressLOKMessages; }
 };
 
 
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 86c88f5824b7..0692a17696db 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -336,8 +336,8 @@ public:
 tools::Rectangle GetLOKSpecialVisArea() const;
 bool HasLOKSpecialPositioning() const;
 
-void SupressLOKMessages(bool bSet);
-bool IsSupressLOKMessages() const;
+void SuppressLOKMessages(bool bSet);
+bool IsSuppressLOKMessages() const;
 };
 
 #endif // INCLUDED_EDITENG_EDITVIEW_HXX
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 1ebdf95b60c5..8bb068e62159 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -578,26 +578,26 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 
 namespace {
 
-class SupressEditViewMessagesGuard
+class SuppressEditViewMessagesGuard
 {
 public:
-SupressEditViewMessagesGuard(EditView& rEditView) :
+SuppressEditViewMessagesGuard(EditView& rEditView) :
 mrEditView(rEditView),
-mbOrigSupressFlag(rEditView.IsSupressLOKMessages())
+mbOrigSuppressFlag(rEditView.IsSuppressLOKMessages())
 {
-if (!mbOrigSupressFlag)
-mrEditView.SupressLOKMessages(true);
+if (!mbOrigSuppressFlag)
+mrEditView.SuppressLOKMessages(true);
 }
 
-~SupressEditViewMessagesGuard()
+

[Libreoffice-commits] core.git: chart2/source cui/source include/svx solenv/clang-format svx/Library_svx.mk svx/source

[Andrea Gelmini (via logerrit)]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |2 +-
 cui/source/tabpages/tpline.cxx|2 +-
 include/svx/svxgraphicitem.hxx|5 +
 solenv/clang-format/excludelist   |4 ++--
 svx/Library_svx.mk|2 +-
 svx/source/dialog/svxgraphicitem.cxx  |2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 48289c37d73e7780ef3ea6a98aa5e214be0fde92
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 14:42:56 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 10:19:29 2020 +0200

Fix typo in code

Move "grahic" to "graphic"

It passed "make check" on Linux

+ Use "#pragma once" in include/svx/svxgraphicitem.hxx.

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

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 1add0435b0bc..a356c1ac4185 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -53,7 +53,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 522bab7789a4..cec452121a47 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -45,7 +45,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgraphicitem.hxx
similarity index 94%
rename from include/svx/svxgrahicitem.hxx
rename to include/svx/svxgraphicitem.hxx
index 6d9a757c5f29..78592f382445 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgraphicitem.hxx
@@ -16,9 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVX_SVXGRAHICITEM_HXX
-#define INCLUDED_SVX_SVXGRAHICITEM_HXX
 
+#pragma once
 
 #include 
 #include 
@@ -39,6 +38,4 @@ public:
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 61eea12ba9ea..d075bc227e66 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6914,7 +6914,7 @@ include/svx/svx3ditems.hxx
 include/svx/svxdlg.hxx
 include/svx/svxdllapi.h
 include/svx/svxerr.hxx
-include/svx/svxgrahicitem.hxx
+include/svx/svxgraphicitem.hxx
 include/svx/swframeexample.hxx
 include/svx/swframeposstrings.hxx
 include/svx/swframetypes.hxx
@@ -13326,7 +13326,7 @@ svx/source/dialog/srchdlg.cxx
 svx/source/dialog/strarray.cxx
 svx/source/dialog/svxbmpnumvalueset.cxx
 svx/source/dialog/svxdlg.cxx
-svx/source/dialog/svxgrahicitem.cxx
+svx/source/dialog/svxgraphicitem.cxx
 svx/source/dialog/svxruler.cxx
 svx/source/dialog/swframeexample.cxx
 svx/source/dialog/swframeposstrings.cxx
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index bb2dbb43e946..424361233542 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -151,7 +151,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/dialog/srchdlg \
 svx/source/dialog/strarray \
 svx/source/dialog/svxbmpnumvalueset \
-svx/source/dialog/svxgrahicitem \
+svx/source/dialog/svxgraphicitem \
 svx/source/dialog/svxruler \
 svx/source/dialog/swframeexample \
 svx/source/dialog/swframeposstrings \
diff --git a/svx/source/dialog/svxgrahicitem.cxx 
b/svx/source/dialog/svxgraphicitem.cxx
similarity index 97%
rename from svx/source/dialog/svxgrahicitem.cxx
rename to svx/source/dialog/svxgraphicitem.cxx
index 6a64afba8517..9550e79e4814 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgraphicitem.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 #include 
 
 SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 chart2/uiconfig/ui/sidebartype.ui |   28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 1923a3eab90a357671e3b3af70d80b0dd6f231a1
Author: Caolán McNamara 
AuthorDate: Fri Dec 20 14:05:06 2019 +
Commit: Aron Budea 
CommitDate: Mon Aug 31 11:00:32 2020 +0200

tweak sidebartype.ui for native gtk

Change-Id: Ie89073dfda5f9221a3d247ddacaf6e1d9bad2147
Reviewed-on: https://gerrit.libreoffice.org/85607
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101628
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/chart2/uiconfig/ui/sidebartype.ui 
b/chart2/uiconfig/ui/sidebartype.ui
index ce1c1fd28fc6..d8b82bae4fb3 100644
--- a/chart2/uiconfig/ui/sidebartype.ui
+++ b/chart2/uiconfig/ui/sidebartype.ui
@@ -16,14 +16,14 @@
   
 
   
-  
+  
 
-  
-  
   
   
   
   
+  
+  
 
   
   
@@ -377,9 +377,8 @@
 True
 False
 Chart Type:
-
-  
-
+True
+cmb_chartType
   
   
 0
@@ -392,9 +391,20 @@
 False
 True
 liststore2
-
-  
-
+0
+1
+
+  
+  
+0
+  
+
+
+  
+  
+2
+  
+
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[gokaysatir (via logerrit)]

 loleaflet/css/device-mobile.css   |3 ++-
 loleaflet/src/control/Control.PartsPreview.js |3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9c23e570421c881647c6035fa6ba00cd203f7ea5
Author: gokaysatir 
AuthorDate: Fri Aug 28 15:58:46 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Aug 31 11:09:27 2020 +0200

loleaflet: Slides preview section improvements.

Change-Id: I4018cbc30d7b8b03f117bb229bf637706c70dc26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101546
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 38a7658f4..c12126a04 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -700,8 +700,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button 
div.w2ui-icon, td[id
 .preview-frame-portrait {
max-height: 60px;
max-width: 100%;
-   display: table-cell;
+   display: inline-block;
padding-right: 1em;
+   margin: 0;
 }
 
 .preview-frame-portrait.preview-img-dropsite {
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 718d65b50..ca5155d4d 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -62,6 +62,9 @@ L.Control.PartsPreview = L.Control.extend({
}
}
});
+
+   var scrollContainer = 
$(this._partsPreviewCont).find('.mCSB_container').get(0);
+   scrollContainer.style.whiteSpace = 'nowrap';
},
 
_updateDisabled: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Bakos (via logerrit)]

 sw/qa/core/exportdata/ooxml/pass/tdf135711.odt |binary
 sw/source/filter/ww8/docxattributeoutput.cxx   |   50 ++---
 2 files changed, 44 insertions(+), 6 deletions(-)

New commits:
commit 5162647096fa061ae0a4ad5d4e1fd015fbeb9871
Author: Attila Bakos 
AuthorDate: Thu Aug 27 15:42:04 2020 +0200
Commit: László Németh 
CommitDate: Mon Aug 31 11:10:28 2020 +0200

tdf#135711: DOCX export: fix crash on page anchored textboxes

Page anchored objects didn't have the address what is needed for
the exporter for positioning. Fixed by using another address.

Regression from commit fd88bb81236ad6d1a63436b7ce20f2f93410d359
(tdf#107225 tdf#122887 sw: fix reanchoring of textboxes).

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

diff --git a/sw/qa/core/exportdata/ooxml/pass/tdf135711.odt 
b/sw/qa/core/exportdata/ooxml/pass/tdf135711.odt
new file mode 100644
index ..7110ce2909da
Binary files /dev/null and b/sw/qa/core/exportdata/ooxml/pass/tdf135711.odt 
differ
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 014ba6f96cd8..4bd72ebf247a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5985,9 +5985,28 @@ void 
DocxAttributeOutput::WriteTextBox(uno::Reference xShape)
 DocxTableExportContext aTableExportContext(*this);
 
 SwFrameFormat* pTextBox = SwTextBoxHelper::getOtherTextBoxFormat(xShape);
-const SwPosition* pAnchor = pTextBox->GetAnchor().GetContentAnchor();
-ww8::Frame aFrame(*pTextBox, *pAnchor);
-m_rExport.SdrExporter().writeDMLTextFrame(&aFrame, m_anchorId++, 
/*bTextBoxOnly=*/true);
+assert(pTextBox);
+const SwPosition* pAnchor = nullptr;
+if (pTextBox->GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PAGE) 
//tdf135711
+{
+auto pNdIdx = pTextBox->GetContent().GetContentIdx();
+if (pNdIdx) //Is that possible it is null?
+pAnchor = new SwPosition(*pNdIdx);
+}
+else
+{
+pAnchor = pTextBox->GetAnchor().GetContentAnchor();//This might be null
+}
+
+if (pAnchor) //pAnchor can be null, so that's why not assert here.
+{
+ww8::Frame aFrame(*pTextBox, *pAnchor);
+m_rExport.SdrExporter().writeDMLTextFrame(&aFrame, m_anchorId++, 
/*bTextBoxOnly=*/true);
+if (pTextBox->GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PAGE)
+{
+delete pAnchor;
+}
+}
 }
 
 void DocxAttributeOutput::WriteVMLTextBox(uno::Reference 
xShape)
@@ -5995,9 +6014,28 @@ void 
DocxAttributeOutput::WriteVMLTextBox(uno::Reference xShape
 DocxTableExportContext aTableExportContext(*this);
 
 SwFrameFormat* pTextBox = SwTextBoxHelper::getOtherTextBoxFormat(xShape);
-const SwPosition* pAnchor = pTextBox->GetAnchor().GetContentAnchor();
-ww8::Frame aFrame(*pTextBox, *pAnchor);
-m_rExport.SdrExporter().writeVMLTextFrame(&aFrame, /*bTextBoxOnly=*/true);
+assert(pTextBox);
+const SwPosition* pAnchor = nullptr;
+if (pTextBox->GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PAGE) 
//tdf135711
+{
+auto pNdIdx = pTextBox->GetContent().GetContentIdx();
+if (pNdIdx) //Is that possible it is null?
+pAnchor = new SwPosition(*pNdIdx);
+}
+else
+{
+pAnchor = pTextBox->GetAnchor().GetContentAnchor();//This might be null
+}
+
+if (pAnchor) //pAnchor can be null, so that's why not assert here.
+{
+ww8::Frame aFrame(*pTextBox, *pAnchor);
+m_rExport.SdrExporter().writeVMLTextFrame(&aFrame, 
/*bTextBoxOnly=*/true);
+if (pTextBox->GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PAGE)
+{
+delete pAnchor;
+}
+}
 }
 
 oox::drawingml::DrawingML& DocxAttributeOutput::GetDrawingML()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to enable Skia on Linux ?

[Miklos Vajna]

Hi Julien,

On Mon, Aug 31, 2020 at 02:06:09AM -0700, julien2412  
wrote:
> I build LO from master sources on pc Debian x86-64. To try to retrieve some
> debug info for Skia related bugtracker, I added "--enable-skia=debug" on my
> autogen.input, then runned "make clean && make".
> However, I can't succeed in enabling Skia on Linux.

It's disabled by default on Linux, at runtime. Try:

SAL_USE_VCLPLUGIN=gen SAL_FORCESKIA=1 ./soffice.bin

For more info, see vcl/README.vars, Lubos wrote a section on Skia there.

Regards,

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

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

[Andrea Gelmini (via logerrit)]

 cui/source/tabpages/chardlg.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7414166f952f087b47e267ebe55898e0d9e1691a
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 09:00:53 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Mon Aug 31 11:13:14 2020 +0200

Fix typo in code

Change-Id: I474351aa2a2f571bb550323bb011c47b4f13443d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101519
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 0b498f43a935..a7162eca0817 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1281,7 +1281,7 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& 
aSet)
 {
 const SvxFontListItem* pFontListItem = 
aSet.GetItem(SID_ATTR_CHAR_FONTLIST, false);
 const SfxUInt32Item* pFlagItem = 
aSet.GetItem(SID_FLAG_TYPE, false);
-const SfxUInt16Item* pDisalbeItem = 
aSet.GetItem(SID_DISABLE_CTL, false);
+const SfxUInt16Item* pDisableItem = 
aSet.GetItem(SID_DISABLE_CTL, false);
 if (pFontListItem)
 SetFontList(*pFontListItem);
 
@@ -1294,8 +1294,8 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& 
aSet)
 // the writer uses SID_ATTR_BRUSH as font background
 m_bPreviewBackgroundToCharacter = true;
 }
-if (pDisalbeItem)
-DisableControls(pDisalbeItem->GetValue());
+if (pDisableItem)
+DisableControls(pDisableItem->GetValue());
 }
 // class SvxCharEffectsPage --
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sd/uiconfig/sdraw/menubar/menubar.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c96120b0d73b7e915dfb0c01578e07cef0f8755
Author: Miklos Vajna 
AuthorDate: Mon Aug 31 10:34:39 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Aug 31 11:29:57 2020 +0200

sd signature line: move menu item to the insert menu

Improves consistency with Writer and Calc.

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

diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 8f201348..92579f361fc8 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -71,7 +71,6 @@
 
   
   
-  
 
   
   
@@ -273,6 +272,7 @@
   
 
   
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to enable Skia on Linux ?

[Luboš Luňák]

On Monday 31 of August 2020, julien2412 wrote:
> Thank you Miklos for your quick feedback.
>
> I gave a try but had a segfault.
> I attached the bt but don't know if I should submit a bugtracker or should
> wait. After all, I forced the use SKIA and perhaps it's just not ready yet.

 Skia on Linux is normally usable (if being usable only with the gen backend 
actually counts as being usable). So if you find a bug, report it as usual.

-- 
 Luboš Luňák
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sal/Library_sal.mk

[Stephan Bergmann (via logerrit)]

 sal/Library_sal.mk |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit cf73e0217169af9081951c3032d8de5fc30c81d7
Author: Stephan Bergmann 
AuthorDate: Mon Aug 31 10:39:55 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 31 11:51:03 2020 +0200

Remove some commented-out code

_CRT_NON_CONFORMING_SWPRINTFS is unconditionally defined in
solenv/gbuild/platform/com_MSC_defs.mk, anyway

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

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 42e3dc53e301..ddbd13a37392 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -218,13 +218,6 @@ endif
 
 else # $(OS) == WNT
 
-# FIXME ?
-# .IF "$(CCNUMVER)" >= "0014"
-# $(eval $(call gb_Library_add_defs,sal,\
-   -D_CRT_NON_CONFORMING_SWPRINTFS \
-))
-# .ENDIF
-
 $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/w32/backtrace \
sal/osl/w32/conditn \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Tor Lillqvist (via logerrit)]

 loleaflet/src/map/handler/Map.Keyboard.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 536ccdd6017673d33f8a18f83c6ee2cf321e8786
Author: Tor Lillqvist 
AuthorDate: Mon Aug 31 12:34:41 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Aug 31 12:13:56 2020 +0200

Make comments match reality

"Private" and "public" have no meaning in JavaScript as far as I know,
there are only naming conventions. And we keep using properties and
functions intended to be "private" (have names that start with an
underscore) quite freely across source files and classes anyway.

Also, the names in the comments were wrong.

Change-Id: Ib5172c26be8818cb261dbe7d08d1c3245ff64af8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101699
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index 852ab07fb..c3f578612 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -229,8 +229,8 @@ L.Map.Keyboard = L.Handler.extend({
return this.keymap[keyCode] || keyCode;
},
 
-   // Private onKeyDown - called only as a DOM event handler
-   // Calls the public onKeyDown(), but only if the event doesn't have
+   // _onKeyDown - called only as a DOM event handler
+   // Calls _handleKeyEvent(), but only if the event doesn't have
// a charCode property (set to something different than 0) - that 
ignores
// any 'beforeinput', 'keypress' and 'input' events that would add
// printable characters. Those are handled by TextInput.js.
@@ -245,7 +245,7 @@ L.Map.Keyboard = L.Handler.extend({
// _handleKeyEvent - checks if the given keyboard event shall trigger
// a message to loolwsd, and calls the given keyEventFn(type, charcode, 
keycode)
// callback if so.
-   // Called from private _onKeyDown
+   // Called from _onKeyDown
_handleKeyEvent: function (ev, keyEventFn) {
this._map.notifyActive();
if (this._map.slideShow && this._map.slideShow.fullscreen) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svx/dbaexchange.hxx |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 55dda1367a845b37184cedc287e5f8f03ef0f6cf
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 08:56:14 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 12:16:30 2020 +0200

can keep this comment to document the args

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

diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index c5bbeae01024..c5a0193b886a 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -159,15 +159,31 @@ namespace svx
 // needed to provide a SotClipboardFormatId::SBA_DATAEXCHANGE 
format
 
 public:
+/** should be used copying and the connection is needed.
+@param  _rDatasource
+The data source name.
+@param  _nCommandType
+The kind of command. @see com.sun.star.sdbc.CommandType
+@param  _rCommand
+The command, either a name of a table or query or a SQL 
statement.
+*/
 void Update(
-const OUString&  _rDatasourceOrLocation,
+const OUString& _rDatasource,
 const sal_Int32 _nCommandType,
 const OUString& _rCommand,
 const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
 );
 
+/** should be used when copying a query object and no connection is 
available.
+@param  _rDatasource
+The data source name.
+@param  _nCommandType
+The kind of command. @see com.sun.star.sdbc.CommandType
+@param  _rCommand
+The command, either a name of a table or query or a SQL 
statement.
+*/
 void Update(
-const OUString& _rDatasourceOrLocation,
+const OUString& _rDatasource,
 const sal_Int32 _nCommandType,
 const OUString& _rCommand
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: slideshow/README slideshow/source

[Sarper Akdemir (via logerrit)]

 slideshow/README |   33 
 slideshow/source/engine/animationfactory.cxx |7 
 slideshow/source/engine/box2dtools.cxx   |   56 ++-
 slideshow/source/inc/box2dtools.hxx  |  204 +--
 4 files changed, 251 insertions(+), 49 deletions(-)

New commits:
commit 8e36582d9289c3774f2733b021fafc93370cffae
Author: Sarper Akdemir 
AuthorDate: Thu Aug 27 17:08:38 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Aug 31 12:25:59 2020 +0200

document physics animations and related code

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

diff --git a/slideshow/README b/slideshow/README
index e523458531ae..e67379f43c89 100644
--- a/slideshow/README
+++ b/slideshow/README
@@ -8,3 +8,36 @@ written by GSOC student Shane.M.Mathews. Radek has later 
polished the
 code a bit, added few new 3D transitions, added infrastructure for
 vertex and fragment shaders. Wrote few transitions with fragment shader
 too.
+
+== Physics Animation Effects ==
+
+Physics animation effects are simulated by external 2d physics engine
+library Box2D. They don't directly call Box2D functions but instead
+use the wrapper in:
+* slideshow/source/inc/box2dtools.hxx
+* slideshow/source/engine/box2dtools.cxx
+
+The wrapper has two corresponding classes to manage the Box2D world
+and Box2D bodies.
+
+When a physics animation starts, a Box2DWorld is initiated and
+populated with every shape that is part of the foreground (which are
+shapes that do not belong to the master slide and not a background
+shape).
+
+After creation until the end of the slide (not the whole slideshow)
+the Box2D World isn't destroyed and reused. But the bodies that
+represent the shapes in the slide get destroyed when there's a point
+in time that there's no physics animation in progress. And recreated
+when another physics animation starts.
+
+If there are multiple physics animations in parallel only one of them
+takes the role of stepping through the simulation.
+
+If there are other animation effects that go in parallel which change
+the shape position, rotation, or visibility - they also report the
+change to Box2D World. These updates are collected in a queue in
+Box2DWorld and processed before stepping through the simulation.
+To achieve convincing results these updates are performed by setting
+the box2d body's linear velocity or angular velocity instead of
+setting directly it's position or rotation.
diff --git a/slideshow/source/engine/animationfactory.cxx 
b/slideshow/source/engine/animationfactory.cxx
index db141c906a50..e874b0924cd8 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -288,7 +288,8 @@ namespace slideshow::internal
 if( mpShape->isContentChanged() )
 mpShapeManager->notifyShapeUpdate( mpShape );
 
-// since animation ended zero out the linear velocity
+// if there is a physics animation going on report the 
animation ending
+// and zero out the velocity of the shape
 if( mpBox2DWorld->isInitialized() )
 mpBox2DWorld->queueLinearVelocityUpdate( 
mpShape->getXShape(), {0,0});
 }
@@ -323,6 +324,8 @@ namespace slideshow::internal
 if( mpShape->isContentChanged() )
 {
 mpShapeManager->notifyShapeUpdate( mpShape );
+
+// if there's a physics animation going on report the 
change to it
 if ( mpBox2DWorld->isInitialized() )
 {
 mpBox2DWorld->queueShapePathAnimationUpdate( 
mpShape->getXShape(),
@@ -654,6 +657,7 @@ namespace slideshow::internal
 
 if( mpBox2DWorld && mpBox2DWorld->isInitialized() )
 {
+// if there's a physics animation going on report the 
animation ending to it
 mpBox2DWorld->queueShapeAnimationEndUpdate( 
mpShape->getXShape(), meAttrType );
 }
 
@@ -717,6 +721,7 @@ namespace slideshow::internal
 
 if( mpBox2DWorld && mpBox2DWorld->isInitialized() )
 {
+// if there's a physics animation going on report the 
change to it
 mpBox2DWorld->queueShapeAnimationUpdate( 
mpShape->getXShape(), mpAttrLayer, meAttrType, mbAnimationFirstUpdate );
 }
 
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 5cefff743b2e..3c7c3deb657c 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -35,6 +35,8 @@ double calculateScaleFactor(cons

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

[Sarper Akdemir (via logerrit)]

 animations/source/animcore/animcore.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f525b8898dcefe9e43e63e475c18d754ef07
Author: Sarper Akdemir 
AuthorDate: Sun Aug 30 02:18:48 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Aug 31 12:27:39 2020 +0200

add missing initializers about physics animations to AnimationNode class

fixes the case when a physics animation preset is imported it
doesn't have any information about start velocity, density or
bounciness paramaters.

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

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index 107353cf327a..b87482a0c4cd 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -488,6 +488,12 @@ AnimationNode::AnimationNode( const AnimationNode& rNode )
 maPath( rNode.maPath ),
 maOrigin( rNode.maOrigin ),
 
+// attributes for XAnimatePhysics
+maStartVelocityX( rNode.maStartVelocityX ),
+maStartVelocityY( rNode.maStartVelocityY ),
+maDensity( rNode.maDensity ),
+maBounciness( rNode.maBounciness ),
+
 // attributes for XAnimateTransform
 mnTransformType( rNode.mnTransformType ),
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sarper Akdemir (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu |   12 ++
 sd/xml/effects.xml   |   20 +++
 2 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit d616104eeedef9ee32707c1b437c3e538de0ae25
Author: Sarper Akdemir 
AuthorDate: Sun Aug 30 02:34:21 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Aug 31 12:28:35 2020 +0200

add two physics based emphasis animation effects presets

Adding two physics based emphasis animation effects presets called
Shoot right/left and return.

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index 5e6d1088be95..3db77ded7575 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -1040,6 +1040,16 @@
   Fall simulated
 
   
+  
+
+  Shoot right and return
+
+  
+  
+
+  Shoot left and return
+
+  
   
 
   Start media
@@ -2505,7 +2515,7 @@
   Exciting
 
 
-  ooo-emphasis-blast;ooo-emphasis-bold-reveal;ooo-emphasis-style-emphasis;ooo-emphasis-wave;ooo-emphasis-blink;libo-physics-fall
+  ooo-emphasis-blast;ooo-emphasis-bold-reveal;ooo-emphasis-style-emphasis;ooo-emphasis-wave;ooo-emphasis-blink;libo-physics-fall;libo-physics-shoot-right-return;libo-physics-shoot-left-return
 
   
 
diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml
index df76e4e7c341..d910aa51c5a4 100644
--- a/sd/xml/effects.xml
+++ b/sd/xml/effects.xml
@@ -2646,6 +2646,26 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sarper Akdemir (via logerrit)]

 sd/source/core/CustomAnimationCloner.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bf0afdbe80933341debfe650c1969ad93ac98833
Author: Sarper Akdemir 
AuthorDate: Sun Aug 30 03:17:39 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Aug 31 12:29:18 2020 +0200

tdf#136276: fix physics animations faulty duplication

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

diff --git a/sd/source/core/CustomAnimationCloner.cxx 
b/sd/source/core/CustomAnimationCloner.cxx
index 03e38cf7c5f5..f81e7f522e63 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -162,6 +162,7 @@ namespace sd
 case AnimationNodeType::ANIMATE:
 case AnimationNodeType::SET:
 case AnimationNodeType::ANIMATEMOTION:
+case AnimationNodeType::ANIMATEPHYSICS:
 case AnimationNodeType::ANIMATECOLOR:
 case AnimationNodeType::ANIMATETRANSFORM:
 case AnimationNodeType::TRANSITIONFILTER:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sarper Akdemir (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu |7 ++-
 sd/xml/effects.xml   |9 +
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 6915d69a125417a62e4b795c7c97faac6088f94e
Author: Sarper Akdemir 
AuthorDate: Sun Aug 30 13:33:02 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Aug 31 12:30:12 2020 +0200

add physics based exit animation effect preset Fall and fade out

Adding a new animation effect preset in the Exciting sub category
of Exit category called Fall and fade out, which makes the shape
fall with a bounciness of 0.6 and fade out.

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index 3db77ded7575..14dbe16ae5bd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -1035,6 +1035,11 @@
   Vertical Figure 8
 
   
+  
+
+  Fall and fade out
+
+  
   
 
   Fall simulated
@@ -2549,7 +2554,7 @@
   Exciting
 
 
-  ooo-exit-swivel;ooo-exit-boomerang;ooo-exit-bounce;ooo-exit-movie-credits;ooo-exit-float;ooo-exit-breaks;ooo-exit-pinwheel;ooo-exit-swish;ooo-exit-thread;ooo-exit-whip;ooo-exit-sling;ooo-exit-magnify;ooo-exit-curve-down;ooo-exit-glide;ooo-exit-flip;ooo-exit-fold
+  ooo-exit-swivel;ooo-exit-boomerang;ooo-exit-bounce;ooo-exit-movie-credits;ooo-exit-float;ooo-exit-breaks;ooo-exit-pinwheel;ooo-exit-swish;ooo-exit-thread;ooo-exit-whip;ooo-exit-sling;ooo-exit-magnify;ooo-exit-curve-down;ooo-exit-glide;ooo-exit-flip;ooo-exit-fold;libo-physics-fall-fade-out
 
   
 
diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml
index d910aa51c5a4..2846caaa9450 100644
--- a/sd/xml/effects.xml
+++ b/sd/xml/effects.xml
@@ -2639,6 +2639,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sarper Akdemir (via logerrit)]

 slideshow/source/engine/box2dtools.cxx |   21 +++--
 slideshow/source/inc/box2dtools.hxx|3 +++
 2 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 943aaf6c61d9594ec229984b5d5801afe5d89024
Author: Sarper Akdemir 
AuthorDate: Sun Aug 30 20:44:02 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Aug 31 12:31:05 2020 +0200

tdf#136301: fix parallel physics animations over-stepping during lock 
transfer

introducing mbAlreadyStepped flag to make physics animation effects
aware that the lock was just obtained from another physics animation
which already stepped the time interval meant to be stepped through.

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

diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 3c7c3deb657c..1cc69b53632a 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -225,6 +225,7 @@ box2DWorld::box2DWorld(const ::basegfx::B2DVector& 
rSlideSize)
 , mfScaleFactor(calculateScaleFactor(rSlideSize))
 , mbShapesInitialized(false)
 , mbHasWorldStepper(false)
+, mbAlreadyStepped(false)
 , mnPhysicsAnimationCounter(0)
 , mpXShapeToBodyMap()
 , maShapeParallelUpdateQueue()
@@ -574,6 +575,13 @@ void box2DWorld::alertPhysicsAnimationEnd(const 
slideshow::internal::ShapeShared
 // destroyed if there's nothing else that owns them
 mpXShapeToBodyMap.clear();
 }
+else
+{
+// the physics animation that will take over the lock after this one
+// shouldn't step the world for an update cycle - since it was already
+// stepped.
+mbAlreadyStepped = true;
+}
 }
 
 void box2DWorld::alertPhysicsAnimationStart(
@@ -609,9 +617,18 @@ double box2DWorld::stepAmount(const double fPassedTime, 
const float fTimeStep,
 // do the updates required to simulate other animaton effects going in 
parallel
 processUpdateQueue(fTimeSteppedThrough);
 
-for (unsigned int nStepCounter = 0; nStepCounter < nStepAmount; 
nStepCounter++)
+if (!mbAlreadyStepped)
+{
+for (unsigned int nStepCounter = 0; nStepCounter < nStepAmount; 
nStepCounter++)
+{
+step(fTimeStep, nVelocityIterations, nPositionIterations);
+}
+}
+else
 {
-step(fTimeStep, nVelocityIterations, nPositionIterations);
+// just got the step lock from another physics animation
+// so skipping stepping the world for an update cycle
+mbAlreadyStepped = false;
 }
 
 return fTimeSteppedThrough;
diff --git a/slideshow/source/inc/box2dtools.hxx 
b/slideshow/source/inc/box2dtools.hxx
index a71af1d34bef..0f6707fbd7c6 100644
--- a/slideshow/source/inc/box2dtools.hxx
+++ b/slideshow/source/inc/box2dtools.hxx
@@ -85,6 +85,9 @@ private:
 /// Holds whether or not there is a PhysicsAnimation that
 /// is stepping the Box2D World. Used to create a lock mechanism
 bool mbHasWorldStepper;
+/// Flag used to stop overstepping that occurs when a physics
+/// animation effect transfers step-lock to another one.
+bool mbAlreadyStepped;
 /// Number of Physics Animations going on
 int mnPhysicsAnimationCounter;
 std::unordered_map, 
Box2DBodySharedPtr>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css loleaflet/images

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/mobilewizard.css   |1 +
 loleaflet/images/lc_tableautofitmenu.svg |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a1b73c4001e007a33b3f1fb86ab9df15d3fb2e82
Author: Pedro Pinto Silva 
AuthorDate: Thu Aug 27 15:49:06 2020 +0200
Commit: Pedro Silva 
CommitDate: Mon Aug 31 12:40:28 2020 +0200

Mobile: Cell size icon missing, headers works

- Add lc_tableautofitmenu.svg
(used in the context menu when inside of a cell)
- Sometimes headers do not get properly set from JS:
missing "justify-content: space-between;" and so set it in the CSS side

Change-Id: If383b15fc5920f1074c6eb88dd45bd2667095d66
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101481
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index efb84291e..a83108951 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -316,6 +316,7 @@ p.mobile-wizard.ui-combobox-text.selected {
flex-direction: row;
align-items: center;
background-color: #fff;
+   justify-content: space-between;
 }
 
 .ui-header.mobile-wizard.disabled .ui-header-left * {
diff --git a/loleaflet/images/lc_tableautofitmenu.svg 
b/loleaflet/images/lc_tableautofitmenu.svg
new file mode 100644
index 0..2b2b8590f
--- /dev/null
+++ b/loleaflet/images/lc_tableautofitmenu.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/layout/frmtool.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 586750da40c5b332d2442ef24ae121795e88e903
Author: Michael Stahl 
AuthorDate: Fri Aug 28 22:05:06 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Aug 31 12:41:22 2020 +0200

tdf#135001 sw_redlinehide: fix IsShown() for AT_PARA flys

There is one merged text frame from node 102 to node 328 with no
extents, and of course a shape anchored at node 271 should not be
visible at all.

This crashes because the shape was removed from the layout during
CheckParaRedlineMerge() but then moved to the visible heaven layer
again via sw::AddRemoveFlysAnchoredToFrameStartingAtNode() and the
layer determines if it's visible as far as Sdr* is concerned;
it lacks a connection to a SwFrame though.

warn:legacy.osl:3547848:3547848:sw/source/core/layout/paintfrm.cxx:3861: 
 - paint of drawing object without anchor frame!?

(regression from 6aaae44da382f4bc3eafc287b4a21734b740cf21)

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

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 1cadf5f06aec..4a721fb958cb 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1052,7 +1052,15 @@ static bool IsShown(sal_uLong const nIndex,
 {
 return false;
 }
-if (pIter && rAnch.GetAnchorId() != RndStdIds::FLY_AT_PARA)
+if (rAnch.GetAnchorId() == RndStdIds::FLY_AT_PARA)
+{
+return pIter == nullptr // not merged
+|| pIter != pEnd// at least one char visible in node
+|| !IsSelectFrameAnchoredAtPara(rAnchor,
+SwPosition(const_cast(*pFirstNode), 0),
+SwPosition(const_cast(*pLastNode), 
pLastNode->Len()));
+}
+if (pIter)
 {
 // note: frames are not sorted by anchor position.
 assert(pEnd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sarper Akdemir (via logerrit)]

 xmloff/source/draw/animationimport.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit a8355cf0fc9e109a119ef680a09ba254464cc111
Author: Sarper Akdemir 
AuthorDate: Sat Aug 29 18:43:09 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Aug 31 12:59:54 2020 +0200

make physics animation imports forward compatible

Change-Id: Ic61ec9fafdd45a76d6f000cf5bd64cab1025fe22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101644
Reviewed-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins

diff --git a/xmloff/source/draw/animationimport.cxx 
b/xmloff/source/draw/animationimport.cxx
index 5076ff1d98be..cfe312481d12 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -925,6 +925,8 @@ void AnimationNodeContext::init_node(  const 
css::uno::Reference< css::xml::sax:
 }
 break;
 
+case XML_ELEMENT(ANIMATION, 
XML_PHYSICS_ANIMATION_START_VELOCITY_X):
+case XML_ELEMENT(ANIMATION_OOO, 
XML_PHYSICS_ANIMATION_START_VELOCITY_X):
 case XML_ELEMENT(LO_EXT, XML_PHYSICS_ANIMATION_START_VELOCITY_X):
 {
 Reference< XAnimatePhysics > xAnimatePhysics( mxNode, 
UNO_QUERY );
@@ -933,6 +935,8 @@ void AnimationNodeContext::init_node(  const 
css::uno::Reference< css::xml::sax:
 }
 break;
 
+case XML_ELEMENT(ANIMATION, 
XML_PHYSICS_ANIMATION_START_VELOCITY_Y):
+case XML_ELEMENT(ANIMATION_OOO, 
XML_PHYSICS_ANIMATION_START_VELOCITY_Y):
 case XML_ELEMENT(LO_EXT, XML_PHYSICS_ANIMATION_START_VELOCITY_Y):
 {
 Reference< XAnimatePhysics > xAnimatePhysics( mxNode, 
UNO_QUERY );
@@ -941,6 +945,8 @@ void AnimationNodeContext::init_node(  const 
css::uno::Reference< css::xml::sax:
 }
 break;
 
+case XML_ELEMENT(ANIMATION, XML_PHYSICS_ANIMATION_DENSITY):
+case XML_ELEMENT(ANIMATION_OOO, XML_PHYSICS_ANIMATION_DENSITY):
 case XML_ELEMENT(LO_EXT, XML_PHYSICS_ANIMATION_DENSITY):
 {
 Reference< XAnimatePhysics > xAnimatePhysics( mxNode, 
UNO_QUERY );
@@ -949,6 +955,8 @@ void AnimationNodeContext::init_node(  const 
css::uno::Reference< css::xml::sax:
 }
 break;
 
+case XML_ELEMENT(ANIMATION, XML_PHYSICS_ANIMATION_BOUNCINESS):
+case XML_ELEMENT(ANIMATION_OOO, XML_PHYSICS_ANIMATION_BOUNCINESS):
 case XML_ELEMENT(LO_EXT, XML_PHYSICS_ANIMATION_BOUNCINESS):
 {
 Reference< XAnimatePhysics > xAnimatePhysics( mxNode, 
UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 basctl/source/basicide/localizationmgr.cxx  |8 
 comphelper/source/container/embeddedobjectcontainer.cxx |4 ++--
 include/comphelper/embeddedobjectcontainer.hxx  |4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 39078750d7719cf15d7a4c4a3e875a7e0ff52b77
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 12:50:20 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Mon Aug 31 13:08:57 2020 +0200

Fix typo in code

It passed "make check on Linux"

Change-Id: I53b40e36c6b1c0aa115044208b5a372fb101347b

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 6056cafd4c63..6adb91987455 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1430,7 +1430,7 @@ uno::Reference< io::XInputStream > 
EmbeddedObjectContainer::GetGraphicReplacemen
 return xInStream;
 }
 
-bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< 
embed::XStorage >& _xStorage,bool _bClearModifedFlag)
+bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< 
embed::XStorage >& _xStorage,bool _bClearModifiedFlag)
 {
 bool bError = false;
 const uno::Sequence < OUString > aNames = GetObjectNames();
@@ -1461,7 +1461,7 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const 
uno::Reference< embed::
 break;
 }
 }
-if ( _bClearModifedFlag )
+if ( _bClearModifiedFlag )
 {
 // if this method is used as part of SaveCompleted the object 
must stay unmodified after execution
 try
diff --git a/include/comphelper/embeddedobjectcontainer.hxx 
b/include/comphelper/embeddedobjectcontainer.hxx
index 130a6a1ad031..c477a6fbe8c2 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -176,10 +176,10 @@ public:
 /** call setPersistentEntry for each embedded object in the container
 *
 * \param _xStorage The storage where to store the objects.
-* \param _bClearModifedFlag If  then the modified flag will be set 
to  otherwise nothing happen.
+* \param _bClearModifiedFlag If  then the modified flag will be set 
to  otherwise nothing happen.
 * \return  if no error occurred, otherwise .
 */
-bool SetPersistentEntries(const css::uno::Reference< 
css::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true);
+bool SetPersistentEntries(const css::uno::Reference< 
css::embed::XStorage >& _xStorage,bool _bClearModifiedFlag = true);
 
 bool getUserAllowsLinkUpdate() const;
 void setUserAllowsLinkUpdate(bool bNew);
commit 43cc37e6953840ec337125e30e1de398bd36f69d
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 12:45:29 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Mon Aug 31 13:08:57 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: I2dc3d343058b6d77da30561ec4f62bdd292630dc

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index f7783efb6b1d..c8a393440094 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -658,7 +658,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< 
Locale >& aLocaleSeq
 {
 const Locale* pLocales = aLocaleSeq.getConstArray();
 sal_Int32 nLocaleCount = aLocaleSeq.getLength();
-bool bConsistant = true;
+bool bConsistent = true;
 bool bModified = false;
 
 for( sal_Int32 i = 0 ; i < nLocaleCount ; i++ )
@@ -678,7 +678,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< 
Locale >& aLocaleSeq
 else
 {
 // Inconsistency, keep last locale
-bConsistant = false;
+bConsistent = false;
 bRemove = false;
 }
 }
@@ -692,7 +692,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< 
Locale >& aLocaleSeq
 }
 catch(const IllegalArgumentException&)
 {
-bConsistant = false;
+bConsistent = false;
 }
 }
 }
@@ -710,7 +710,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< 
Locale >& aLocaleSeq
 handleTranslationbar();
 }
 
-DBG_ASSERT( bConsistant,
+DBG_ASSERT( bConsistent,
 "LocalizationMgr::handleRemoveLocales(): sequence contains unsupported 
locales" );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/tipofthedaydlg.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit db5f204b1d3d96975d902b587d6d18bc06610eea
Author: Heiko Tietze 
AuthorDate: Mon Aug 31 11:38:35 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon Aug 31 13:13:25 2020 +0200

Resolves tdf#135790 - Support for multiple %MOD1/2 entries

While loop added

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

diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index 7d6a05b72a0f..4775ed0578b9 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -89,11 +89,17 @@ void TipOfTheDayDialog::UpdateTip()
 #endif
 sal_Int32 aPos;
 aPos = aText.indexOf("%MOD1");
-if (aPos != -1)
+while (aPos != -1)
+{
 aText = aText.replaceAt(aPos, 5, aMOD1);
+aPos = aText.indexOf("%MOD1");
+}
 aPos = aText.indexOf("%MOD2");
-if (aPos != -1)
+while (aPos != -1)
+{
 aText = aText.replaceAt(aPos, 5, aMOD2);
+aPos = aText.indexOf("%MOD2");
+}
 m_pText->set_label(aText);
 
 // hyperlink
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[gokaysatir (via logerrit)]

 loleaflet/src/control/Control.UIManager.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0334c4b04872add86ee5f4526286c231c8bb376c
Author: gokaysatir 
AuthorDate: Fri Aug 28 11:17:03 2020 +0300
Commit: Szymon Kłos 
CommitDate: Mon Aug 31 13:24:00 2020 +0200

loleaflet: Tablet notebookbar special case.

Change-Id: I7acad9b8891cedac49f47746a61c8df6f19a1250
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101525
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/src/control/Control.UIManager.js 
b/loleaflet/src/control/Control.UIManager.js
index 3da1d6921..a4459e39e 100644
--- a/loleaflet/src/control/Control.UIManager.js
+++ b/loleaflet/src/control/Control.UIManager.js
@@ -114,7 +114,7 @@ L.Control.UIManager = L.Control.extend({
this.map.addControl(L.control.presentationBar());
}
 
-   if (window.mode.isMobile() || window.mode.isTablet()) {
+   if (window.mode.isMobile() || (window.mode.isTablet() && 
!enableNotebookbar)) {
this.map.on('updatetoolbarcommandvalues', function() {
w2ui['editbar'].refresh();
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Tomaž Vajngerl (via logerrit)]

 loleaflet/src/layer/marker/Annotation.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 522a6b6978d01683898bfe1e683df3174dbce9eb
Author: Tomaž Vajngerl 
AuthorDate: Mon Aug 31 10:29:03 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Aug 31 13:28:38 2020 +0200

add annotation marker only for presentations and draw documents

Change-Id: I1bb69239a9ec6ce3c6fb33f38ff9bb99b305dbfe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101692
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index 797c2d432..bf1ca54d3 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -465,9 +465,11 @@ L.Annotation = L.Layer.extend({
},
 
_updateAnnotationMarker: function () {
+   // Make sure to place the markers only for presentations and 
draw documents
+   if (this._map._docLayer._docType !== 'presentation') 
+   return;
if (this._data == null)
return;
-
if (this._annotationMarker == null) {
this._annotationMarker = L.marker(new L.LatLng(0, 0), {
icon: L.divIcon({
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 sd/source/ui/docshell/docshel3.cxx |   82 +
 sd/source/ui/docshell/docshell.cxx |   19 ++-
 sd/source/ui/func/fusearch.cxx |9 ++-
 sd/source/ui/inc/DrawDocShell.hxx  |3 -
 sd/source/ui/inc/View.hxx  |   32 ++--
 sd/source/ui/inc/fusearch.hxx  |2 
 sd/source/ui/unoidl/DrawController.cxx |6 +-
 sd/source/ui/view/Outliner.cxx |   12 +++-
 8 files changed, 108 insertions(+), 57 deletions(-)

New commits:
commit 714767b3d521eefc46dd8158ee67610347863f9f
Author: Tomaž Vajngerl 
AuthorDate: Sat Aug 22 21:45:44 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Aug 31 13:29:43 2020 +0200

sd: Make search bound to a view - to allow independent searching

Before if two windows are open, the search is not independent
because Outline class is not independent for a view (because of
FuSearch which remembers the view from when the it was created
and then an instance is stored in the DocShell).
This creates a SearchContext class stored on a View, which stores
the actual View bound FuSearch instance, fix us the calls.

Also move the VectorGraphicSearchContext back into Outline::Impl,
because it doesn't need to be bound to the view anymore.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101224
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 2ebc26aeefefe33ee6180862509e4971ff2dfc6f)

Change-Id: I6a5ce71efafa378845eee4ac9574e2e4301138d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101693
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sd/source/ui/docshell/docshel3.cxx 
b/sd/source/ui/docshell/docshel3.cxx
index 9d8ce84cb538..01705c12cf75 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -166,30 +166,37 @@ void DrawDocShell::Execute( SfxRequest& rReq )
 
 case FID_SEARCH_OFF:
 {
-if( dynamic_cast< FuSearch* >(mxDocShellFunction.get()) )
+if (mpViewShell)
 {
-// End Search&Replace in all docshells
-SfxObjectShell* pFirstShell = SfxObjectShell::GetFirst();
-SfxObjectShell* pShell = pFirstShell;
-
-while (pShell)
+sd::View* pView = mpViewShell->GetView();
+if (pView)
 {
-if( dynamic_cast< const DrawDocShell *>( pShell ) !=  
nullptr)
+auto& rFunctionContext = pView->getSearchContext();
+rtl::Reference& 
xFuSearch(rFunctionContext.getFunctionSearch());
+
+if (xFuSearch.is())
 {
-static_cast(pShell)->CancelSearching();
-}
+// End Search&Replace in all docshells
+SfxObjectShell* pFirstShell = 
SfxObjectShell::GetFirst();
+SfxObjectShell* pShell = pFirstShell;
 
-pShell = SfxObjectShell::GetNext(*pShell);
+while (pShell)
+{
+auto pDrawDocShell = 
dynamic_cast(pShell);
+if (pDrawDocShell)
+pDrawDocShell->CancelSearching();
 
-if (pShell == pFirstShell)
-{
-pShell = nullptr;
+pShell = SfxObjectShell::GetNext(*pShell);
+
+if (pShell == pFirstShell)
+pShell = nullptr;
+}
+
+rFunctionContext.resetSearchFunction();
+Invalidate();
+rReq.Done();
 }
 }
-
-SetDocShellFunction(nullptr);
-Invalidate();
-rReq.Done();
 }
 }
 break;
@@ -198,23 +205,30 @@ void DrawDocShell::Execute( SfxRequest& rReq )
 {
 const SfxItemSet* pReqArgs = rReq.GetArgs();
 
-if ( pReqArgs )
+if (pReqArgs && mpViewShell)
 {
-rtl::Reference< FuSearch > xFuSearch( dynamic_cast< FuSearch* 
>( GetDocShellFunction().get() ) );
-
-if( !xFuSearch.is() && mpViewShell )
+sd::View* pView = mpViewShell->GetView();
+if (pView)
 {
-::sd::View* pView = mpViewShell->GetView();
-SetDocShellFunction( FuSearch::Create( mpViewShell, 
mpViewShell->GetActiveWindow(), pView, mpDoc, rReq ) );
-xFuSearch.set( dynamic_cast< FuSearch* >( 
GetDocShellFunction().get() ) );
-}
+rtl::Reference & xFuSearch = 
pView->getSearchContext().getFunctionSearch();
 
-if( xFuSearch.is() )
-

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

[Tomaž Vajngerl (via logerrit)]

 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx  |  115 +
 sd/qa/unit/tiledrendering/data/ReplaceTest.odp |binary
 2 files changed, 115 insertions(+)

New commits:
commit dedbf2dd6209658b7d47b5d8bb0b4f37aa9a5277
Author: Tomaž Vajngerl 
AuthorDate: Sun Aug 23 13:41:58 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Aug 31 13:30:01 2020 +0200

sd: test Replace and ReplaceAll using LOKit

Change-Id: I68a612d3fb277970870818d290096b2824f31057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101635
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit ac11b1f0311289c43f9a2c68e311de02cd0b53cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101694
Tested-by: Jenkins CollaboraOffice 

diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx 
b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
index fa5a875573fb..56af331fac7c 100644
--- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
+++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
@@ -63,6 +63,9 @@ public:
 void testSearchInPDFInMultiplePagesBackwards();
 void testSearchIn2MixedObjects();
 void testSearchIn6MixedObjects();
+void testReplace();
+void testReplaceAll();
+void testReplaceCombined();
 
 CPPUNIT_TEST_SUITE(LOKitSearchTest);
 CPPUNIT_TEST(testSearch);
@@ -78,6 +81,9 @@ public:
 CPPUNIT_TEST(testSearchInPDFInMultiplePagesBackwards);
 CPPUNIT_TEST(testSearchIn2MixedObjects);
 CPPUNIT_TEST(testSearchIn6MixedObjects);
+CPPUNIT_TEST(testReplace);
+CPPUNIT_TEST(testReplaceAll);
+CPPUNIT_TEST(testReplaceCombined);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -145,6 +151,22 @@ void lcl_search(const OUString& rKey, bool bFindAll = 
false, bool bBackwards = f
 Scheduler::ProcessEventsToIdle();
 }
 
+void lcl_replace(const OUString& rKey, const OUString& rReplace, bool bAll = 
false)
+{
+Scheduler::ProcessEventsToIdle();
+
+SvxSearchCmd eSearch = bAll ? SvxSearchCmd::REPLACE_ALL : 
SvxSearchCmd::REPLACE;
+
+uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence({
+{ "SearchItem.SearchString", uno::makeAny(rKey) },
+{ "SearchItem.ReplaceString", uno::makeAny(rReplace) },
+{ "SearchItem.Command", uno::makeAny(sal_uInt16(eSearch)) },
+}));
+
+comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+}
+
 #if HAVE_FEATURE_PDFIUM
 SdrObject* lclGetSelectedObject(sd::ViewShell* pViewShell)
 {
@@ -827,6 +849,99 @@ void LOKitSearchTest::testSearchIn6MixedObjects()
 CPPUNIT_ASSERT_EQUAL(pPage->GetObj(0), lclGetSelectedObject(pViewShell));
 #endif
 }
+namespace
+{
+OUString getShapeText(SdXImpressDocument* pXImpressDocument, sal_uInt32 nPage, 
sal_uInt32 nShape)
+{
+uno::Reference xDrawPage;
+xDrawPage.set(pXImpressDocument->getDrawPages()->getByIndex(nPage), 
uno::UNO_QUERY);
+
+uno::Reference xShape(xDrawPage->getByIndex(nShape), 
uno::UNO_QUERY);
+return xShape->getString();
+}
+}
+
+void LOKitSearchTest::testReplace()
+{
+SdXImpressDocument* pXImpressDocument = createDoc("ReplaceTest.odp");
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+mpCallbackRecorder->registerCallbacksFor(pViewShell->GetViewShellBase());
+
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 0, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb bbb bbb bbb"), 
getShapeText(pXImpressDocument, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 2, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 3, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 4, 
0));
+
+lcl_replace("bbb", "aaa", false); // select
+
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 0, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb bbb bbb bbb"), 
getShapeText(pXImpressDocument, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 2, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 3, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 4, 
0));
+
+lcl_replace("bbb", "aaa", false); // replace
+
+CPPUNIT_ASSERT_EQUAL(OUString("aaa"), getShapeText(pXImpressDocument, 0, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb bbb bbb bbb"), 
getShapeText(pXImpressDocument, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 2, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 3, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 4, 
0));
+}
+
+void LOKitSearchTest::testReplaceAll()
+{
+SdXImpressDocument* pXImpressDocument = createDoc("ReplaceTest.odp");
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+mpCallbackRecorder->registerCallbacksFor(pViewShell-

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

[Julien Nabet (via logerrit)]

 vcl/source/gdi/vectorgraphicdata.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f115a7e047e5f1b6067667adc50d60499cc3e27e
Author: Julien Nabet 
AuthorDate: Wed Aug 26 11:23:34 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Aug 31 13:33:10 2020 +0200

tdf#136127: crash when adding protected PDF file on Photo Album

See https://bugs.documentfoundation.org/attachment.cgi?id=164704

Change-Id: I1c5713446f2af0a08873f0ea57afbfb34f9623be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101393
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/vectorgraphicdata.cxx 
b/vcl/source/gdi/vectorgraphicdata.cxx
index ec02e9570191..bfaa544bc7d4 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -151,7 +151,8 @@ void VectorGraphicData::ensurePdfReplacement()
 if (mnPageIndex >= 0)
 nUsePageIndex = mnPageIndex;
 vcl::RenderPDFBitmaps(maVectorGraphicDataArray.getConstArray(), 
maVectorGraphicDataArray.getLength(), aBitmaps, nUsePageIndex, 1/*, 
fResolutionDPI*/);
-maReplacement = aBitmaps[0];
+if (!aBitmaps.empty())
+maReplacement = aBitmaps[0];
 }
 
 void VectorGraphicData::ensureReplacement()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/tabview3.cxx |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 82f591a2ec06c680daf41628fe4c352b6a55d545
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 11:03:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 13:43:53 2020 +0200

tdf#136242 disable changing selection while formula wizard is open

similar to tdf#124975

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

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 8fcda5a25f0f..2a5fec98d85b 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -444,11 +444,16 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool 
bNew )
 SfxLokHelper::notifyDocumentSizeChanged(aViewData.GetViewShell(), sSize, 
pModel, false);
 }
 
-static bool lcl_IsScSimpleRefDlgOpen(SfxViewFrame* pViewFrm)
+static bool lcl_IsRefDlgOpen(SfxViewFrame* pViewFrm)
 {
-if (pViewFrm->HasChildWindow(WID_SIMPLE_REF))
+ScModule* pScMod = SC_MOD();
+if (!pScMod->IsRefDialogOpen())
+   return false;
+
+auto nDlgId = pScMod->GetCurRefDlgId();
+if (pViewFrm->HasChildWindow(nDlgId))
 {
-SfxChildWindow* pChild = pViewFrm->GetChildWindow(WID_SIMPLE_REF);
+SfxChildWindow* pChild = pViewFrm->GetChildWindow(nDlgId);
 if (pChild)
 {
 auto xDlgController = pChild->GetController();
@@ -478,10 +483,10 @@ void ScTabView::CheckSelectionTransfer()
 
 pScMod->SetSelectionTransfer( pNew.get() );
 
-// tdf#124975 changing the calc selection can trigger removal of the
-// selection of an open ScSimpleRefDlg dialog, so don't inform the
+// tdf#124975/tdf#136242 changing the calc selection can trigger removal 
of the
+// selection of an open RefDlg dialog, so don't inform the
 // desktop clipboard of the changed selection if that dialog is open
-if (!lcl_IsScSimpleRefDlgOpen(aViewData.GetViewShell()->GetViewFrame()))
+if (!lcl_IsRefDlgOpen(aViewData.GetViewShell()->GetViewFrame()))
 pNew->CopyToSelection( GetActiveWin() );// may 
delete pOld
 
 // Log the selection change
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC "Additions" Final Report

[Yusuf Keten]

Hello,

I would like to thank all the LibreOffice community, especially my mentors
Muhammet Kara and Heiko Tietze. I learned a lot of things during the GSoC.
Although GSoC is finished, I will continue to contribute to LibreOffice. I
am very happy to be part of the LibreOffice community. Thank you all for
giving me this opportunity.

My final report:
https://yusufketen.com/post/2020-08-31-libreoffice-gsoc-final-report/
I'm waiting for all your feedback.

Best regards,
Yusuf Keten
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/tabview3.cxx |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 9460b6baf392c11091e46105071b7d7b6c4eb1ca
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 11:05:38 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 13:56:44 2020 +0200

Related: tdf#136242 should only matter input ref mode is active

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

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 2a5fec98d85b..981b127b86ae 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -444,25 +444,26 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool 
bNew )
 SfxLokHelper::notifyDocumentSizeChanged(aViewData.GetViewShell(), sSize, 
pModel, false);
 }
 
-static bool lcl_IsRefDlgOpen(SfxViewFrame* pViewFrm)
+static bool lcl_IsRefDlgActive(SfxViewFrame* pViewFrm)
 {
 ScModule* pScMod = SC_MOD();
 if (!pScMod->IsRefDialogOpen())
return false;
 
 auto nDlgId = pScMod->GetCurRefDlgId();
-if (pViewFrm->HasChildWindow(nDlgId))
-{
-SfxChildWindow* pChild = pViewFrm->GetChildWindow(nDlgId);
-if (pChild)
-{
-auto xDlgController = pChild->GetController();
-if (xDlgController && xDlgController->getDialog()->get_visible())
-return true;
-}
-}
+if (!pViewFrm->HasChildWindow(nDlgId))
+return false;
 
-return false;
+SfxChildWindow* pChild = pViewFrm->GetChildWindow(nDlgId);
+if (!pChild)
+return false;
+
+auto xDlgController = pChild->GetController();
+if (!xDlgController || !xDlgController->getDialog()->get_visible())
+return false;
+
+IAnyRefDialog* pRefDlg = 
dynamic_cast(xDlgController.get());
+return pRefDlg && pRefDlg->IsRefInputMode();
 }
 
 void ScTabView::CheckSelectionTransfer()
@@ -486,7 +487,7 @@ void ScTabView::CheckSelectionTransfer()
 // tdf#124975/tdf#136242 changing the calc selection can trigger removal 
of the
 // selection of an open RefDlg dialog, so don't inform the
 // desktop clipboard of the changed selection if that dialog is open
-if (!lcl_IsRefDlgOpen(aViewData.GetViewShell()->GetViewFrame()))
+if (!lcl_IsRefDlgActive(aViewData.GetViewShell()->GetViewFrame()))
 pNew->CopyToSelection( GetActiveWin() );// may 
delete pOld
 
 // Log the selection change
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx  |   12 
 sw/source/filter/ww8/wrtw8nds.cxx   |   15 ---
 3 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit a0da393cac0a44c648238b815970245684173c99
Author: Justin Luth 
AuthorDate: Wed Aug 26 17:06:22 2020 +0300
Commit: Justin Luth 
CommitDate: Mon Aug 31 13:59:53 2020 +0200

tdf#132149 ww8export: nextNode has nothing to do with pageDesc

While it can often be assumed that the next paragraph following
one that has just soft-page-breaked in the middle will be on the
same page, it isn't necessarily correct. Either the paragraph
could span multiple pages, or a page-break could push it to
the next page.

Thus, strip the code out completely, and simply prepare a
new page style based on the follow style - which by definition
is different enough to not be a plausible single word section.

A few followup commits will add enhancements, but this is
broken up into minute bits in order to aid in regression
identification.

Change-Id: I80e4e17be69a49f45a624d819c9c4158541ee065
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101424
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak.odt 
b/sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak.odt
new file mode 100644
index ..b88e660a7458
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 821a254ea0fe..397b9040e026 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -329,6 +329,18 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf135343_columnSectionBreak_c15, "tdf135343_column
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Fits on two pages", 2, getPages());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf132149_pgBreak, "tdf132149_pgBreak.odt")
+{
+xmlDocUniquePtr pDump = parseLayoutDump();
+
+// No header on pages 1,2,3 (and currently 4).
+assertXPath(pDump, "//page[2]/header", 0);
+
+//Page break is not lost. This SHOULD be on page 4, but sadly it is not.
+//assertXPathContent(pDump, "//page[5]/header", "First Page Style");
+//CPPUNIT_ASSERT(getXPathContent(pDump, 
"//page[5]/body/txt").startsWith("Lorem ipsum"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf129452_excessBorder, 
"tdf129452_excessBorder.docx")
 {
 uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index da882d0cd4c6..a1f8965b686e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2717,24 +2717,9 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode 
)
 // if paragraph is split, put the section break between the parts
 if( bNeedParaSplit && *aBreakIt != rNode.GetText().getLength() )
 {
-SwNodeIndex aNextIndex( rNode, 1 );
-const SwNode& pNextNode = aNextIndex.GetNode();
-// if there is a next node, use its attributes to create the new
-// section
-if( pNextNode.IsTextNode() )
-{
-const SwTextNode& rNextNode = *static_cast(
-&aNextIndex.GetNode() );
-OutputSectionBreaks(rNextNode.GetpSwAttrSet(), rNextNode);
-}
-else if (pNextNode.IsEndNode() )
-{
-// In this case the same paragraph holds the next page style
-// too.
 const SwPageDesc* pNextPageDesc = 
m_pCurrentPageDesc->GetFollow();
 assert(pNextPageDesc);
 PrepareNewPageDesc( rNode.GetpSwAttrSet(), rNode, nullptr , 
pNextPageDesc);
-}
 }
 else if (!bNeedParaSplit)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 source/text/shared/01/signexistingpdf.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a402a3ca5ec58972967efca2c1f7030baca92a17
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:33:57 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Mon Aug 31 14:33:57 2020 +0200

Fix typo

Change-Id: I38e90ed3d90c6d76f508c20e5f3416d0d65a1856

diff --git a/source/text/shared/01/signexistingpdf.xhp 
b/source/text/shared/01/signexistingpdf.xhp
index 894682d69..1570d30e9 100644
--- a/source/text/shared/01/signexistingpdf.xhp
+++ b/source/text/shared/01/signexistingpdf.xhp
@@ -10,7 +10,7 @@
 -->
 
 
-
+
 Signing Existing PDF
 /text/shared/01/signexistingpdf.xhp
 
@@ -19,7 +19,7 @@
 
 digital signature;signing existing PDF
 
-Signing Existing PDF files
+Signing Existing PDF files
 %PRODUCTNAME can digitally sign an existing PDF 
document.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 60495cc10d7b549c295e7605de7972186391ec69
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:34:04 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Aug 31 14:34:04 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a402a3ca5ec58972967efca2c1f7030baca92a17
  - Fix typo

Change-Id: I38e90ed3d90c6d76f508c20e5f3416d0d65a1856

diff --git a/helpcontent2 b/helpcontent2
index e0aacb4f63b6..a402a3ca5ec5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e0aacb4f63b6b5a1831a0880329f7a76af46b632
+Subproject commit a402a3ca5ec58972967efca2c1f7030baca92a17
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sd/inc/sdpage.hxx |2 +-
 sd/source/core/sdpage2.cxx|4 ++--
 sd/source/ui/animations/CustomAnimationDialog.cxx |2 +-
 sd/source/ui/animations/CustomAnimationDialog.hxx |2 +-
 sd/source/ui/animations/CustomAnimationPane.cxx   |2 +-
 svx/source/engine3d/view3d.cxx|   10 +-
 svx/source/form/ParseContext.cxx  |6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 3dfbb9d41cf8fad3b41a9528967febcec6ea433b
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 10:51:34 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 14:50:49 2020 +0200

Fix typos in code

It passed "make check" on Linux

Change-Id: I9ba795bf188a9fe11d83516d6895888f880747c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101706
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index c29d2c84ebe2..4c4c3b9ca88a 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -245,7 +245,7 @@ public:
 voidsetTransitionFadeColor( sal_Int32 nTransitionFadeColor );
 
 double  getTransitionDuration() const { return mfTransitionDuration;}
-voidsetTransitionDuration( double fTranstionDuration );
+voidsetTransitionDuration( double fTransitionDuration );
 
 virtual void Changed(const SdrObject& rObj, SdrUserCallType eType,
  const ::tools::Rectangle& rOldBoundRect) override;
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index b477b03e1930..2f8f36c2b682 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -520,9 +520,9 @@ void SdPage::setTransitionFadeColor ( sal_Int32 
nTransitionFadeColor )
 ActionChanged();
 }
 
-void SdPage::setTransitionDuration ( double fTranstionDuration )
+void SdPage::setTransitionDuration ( double fTransitionDuration )
 {
-mfTransitionDuration = fTranstionDuration;
+mfTransitionDuration = fTransitionDuration;
 ActionChanged();
 }
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index c9f64e2c8125..ff9f8538b899 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2032,7 +2032,7 @@ std::unique_ptr 
CustomAnimationDialog::createDefaultSet()
 pSet->setPropertyDefaultValue( nHandleCurrentPage, aEmpty );
 
 pSet->setPropertyDefaultValue( nHandleSoundURL, aEmpty );
-pSet->setPropertyDefaultValue( nHandleSoundVolumne, makeAny( 1.0) );
+pSet->setPropertyDefaultValue( nHandleSoundVolume, makeAny( 1.0) );
 pSet->setPropertyDefaultValue( nHandleSoundEndAfterSlide, makeAny( 
sal_Int32(0) ) );
 
 pSet->setPropertyDefaultValue( nHandleCommand, makeAny( sal_Int16(0) ) );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx 
b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 64272633505d..ea8ebaed3158 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -58,7 +58,7 @@ const sal_Int32 nHandleTextReverse = 26;
 
 const sal_Int32 nHandleCurrentPage = 27;
 const sal_Int32 nHandleSoundURL = 28;
-const sal_Int32 nHandleSoundVolumne = 29;
+const sal_Int32 nHandleSoundVolume = 29;
 const sal_Int32 nHandleSoundEndAfterSlide = 30;
 
 const sal_Int32 nHandleCommand = 31;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 5e80435051bd..f7bfc28fca55 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1140,7 +1140,7 @@ std::unique_ptr 
CustomAnimationPane::createSelectionSet()
 if( pEffect->getAudio().is() )
 {
 aSoundSource = pEffect->getAudio()->getSource();
-addValue( pSet, nHandleSoundVolumne, makeAny( 
pEffect->getAudio()->getVolume() ) );
+addValue( pSet, nHandleSoundVolume, makeAny( 
pEffect->getAudio()->getVolume() ) );
 // todo addValue( pSet, nHandleSoundEndAfterSlide, makeAny( 
pEffect->getAudio()->getEndAfterSlide() ) );
 // this is now stored at the XCommand parameter sequence
 }
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 2a03587f1fe2..f572b92d1c0e 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1573,26 +1573,26 @@ void E3dView::CheckPossibilities()
 return;
 
 const size_t nMarkCnt = GetMarkedObjectCount();
-bool bCoumpound = false;
+bool bCompound = false;
 bool b3DObject = false;
-for(size_t nObjs = 0; (nObjs < nMarkCnt) && !bCoumpound; ++nObjs)
+for(size_t nObjs = 0; (nObjs < nMarkCnt) && !bCompound; ++nObjs)
 {
 SdrObject *pObj = GetMarkedObjectByIndex(nObjs);
 if(dynamic_cast< const E3dCompoundObject* >(pObj))
-   

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

[Andrea Gelmini (via logerrit)]

 svx/source/form/navigatortree.cxx   |8 
 test/source/sheet/xcellrangeformula.cxx |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit de81349e69ea229843a23cce1117f69f14862f6b
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 12:17:11 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 14:51:48 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Iecaab4ab9f7d8e05930685aaf5a2eb2770abbd1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101601
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/svx/source/form/navigatortree.cxx 
b/svx/source/form/navigatortree.cxx
index c84ec322bc80..de01cc9763a6 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -803,11 +803,11 @@ namespace svxform
 //  means moving the control)
 
 // collect the ancestors of the drop target (speeds up 3)
-SvLBoxEntrySortedArray arrDropAnchestors;
+SvLBoxEntrySortedArray arrDropAncestors;
 std::unique_ptr 
xLoop(m_xTreeView->make_iterator(_pTargetEntry));
 do
 {
-arrDropAnchestors.emplace(m_xTreeView->make_iterator(xLoop.get()));
+arrDropAncestors.emplace(m_xTreeView->make_iterator(xLoop.get()));
 }
 while (m_xTreeView->iter_parent(*xLoop));
 
@@ -835,12 +835,12 @@ namespace svxform
 // test for 3)
 if (IsFormEntry(*rCurrent))
 {
-auto aIter = std::find_if(arrDropAnchestors.begin(), 
arrDropAnchestors.end(),
+auto aIter = std::find_if(arrDropAncestors.begin(), 
arrDropAncestors.end(),
   [this, &rCurrent](const auto& rElem) 
{
 return 
m_xTreeView->iter_compare(*rElem, *rCurrent) == 0;
   });
 
-if ( aIter != arrDropAnchestors.end() )
+if ( aIter != arrDropAncestors.end() )
 return DND_ACTION_NONE;
 }
 else if (IsFormComponentEntry(*rCurrent))
commit 19cf1b4fcfb9d9d17587e4224c3c3818952cd69c
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 12:39:14 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 14:51:10 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Ia1fbd635d7d13c69c9b8911eadaa86ee5f7aadb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101707
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/test/source/sheet/xcellrangeformula.cxx 
b/test/source/sheet/xcellrangeformula.cxx
index 6de60149938f..8a2eeb220ba2 100644
--- a/test/source/sheet/xcellrangeformula.cxx
+++ b/test/source/sheet/xcellrangeformula.cxx
@@ -24,7 +24,7 @@ void XCellRangeFormula::testGetSetFormulaArray()
 {
 uno::Reference xCRF(init(), UNO_QUERY_THROW);
 
-uno::Sequence> aFormulaArrayOrginal = 
xCRF->getFormulaArray();
+uno::Sequence> aFormulaArrayOriginal = 
xCRF->getFormulaArray();
 uno::Sequence> aFormulaArrayNew = 
xCRF->getFormulaArray();
 aFormulaArrayNew[0][0] = "NewValue";
 
@@ -32,8 +32,8 @@ void XCellRangeFormula::testGetSetFormulaArray()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get new FormulaArray", 
OUString("NewValue"),
  xCRF->getFormulaArray()[0][0]);
 
-xCRF->setFormulaArray(aFormulaArrayOrginal);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to set new FormulaArray", 
aFormulaArrayOrginal[0][0],
+xCRF->setFormulaArray(aFormulaArrayOriginal);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to set new FormulaArray", 
aFormulaArrayOriginal[0][0],
  xCRF->getFormulaArray()[0][0]);
 }
 } // namespace apitest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 formula/source/ui/dlg/funcpage.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f1b07b9df7b99f2534c5554f73b59baece33d8eb
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 10:09:51 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 15:01:34 2020 +0200

tdf#136269 give search entry initial focus

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

diff --git a/formula/source/ui/dlg/funcpage.cxx 
b/formula/source/ui/dlg/funcpage.cxx
index 56162a45a1d9..e8370d54938d 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -70,6 +70,8 @@ FuncPage::FuncPage(weld::Container* pParent, const 
IFunctionManager* _pFunctionM
 m_xLbFunction->connect_row_activated( LINK( this, FuncPage, DblClkHdl ) );
 m_xLbFunction->connect_key_press( LINK( this, FuncPage, KeyInputHdl ) );
 m_xLbFunctionSearchString->connect_changed( LINK( this, FuncPage, 
ModifyHdl ) );
+
+m_xLbFunctionSearchString->grab_focus();
 }
 
 FuncPage::~FuncPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

How to enable Skia on Linux ?

[julien2412]

Hello,

I build LO from master sources on pc Debian x86-64. To try to retrieve some
debug info for Skia related bugtracker, I added "--enable-skia=debug" on my
autogen.input, then runned "make clean && make".
However, I can't succeed in enabling Skia on Linux.

Any thoughts?

Julien



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

[Libreoffice-commits] core.git: odk/examples

[Maxim Monastirsky (via logerrit)]

 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu
  |   24 --
 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu
 |   24 --
 odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu  
 |3 -
 3 files changed, 51 deletions(-)

New commits:
commit 9bf4e2aa77c208d09b32c3638afab6f904bf0257
Author: Maxim Monastirsky 
AuthorDate: Sun Aug 30 16:20:42 2020 +0300
Commit: Maxim Monastirsky 
CommitDate: Mon Aug 31 15:19:27 2020 +0200

Remove empty ImageIdentifier properties from sdk examples

Change-Id: Id1a6b4fc6e156f67550458b4b7e4b1ffe32f812a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101691
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu
 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu
index e891edaaef15..77aae07c47a5 100644
--- 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu
+++ 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu
@@ -31,9 +31,6 @@
 
 
org.openoffice.Office.addon.example:Function1
 
-
-
-
 
 
 Add-On Function 1
@@ -46,9 +43,6 @@
 
 
org.openoffice.Office.addon.example:Function2
 
-
-
-
 
 
 Add-On Function 2
@@ -71,9 +65,6 @@
 
 
org.openoffice.Office.addon.example:Function1
 
-
-
-
 
 
 Add-On Function 1
@@ -94,9 +85,6 @@
 
 
 
-
-
-
 
 
 Add-On sub menu
@@ -109,9 +97,6 @@
 
 
org.openoffice.Office.addon.example:Function2
 
-
-
-
 
 
 Add-On Function 
2
@@ -134,9 +119,6 @@
 
 
org.openoffice.Office.addon.example:Function1
 
-
-
-
 
 
 Function 1
@@ -152,9 +134,6 @@
 
 
org.openoffice.Office.addon.example:Function2
 
-
-
-
 
 
 Function 2
@@ -213,9 +192,6 @@
 
 org.openoffice.Office.addon.example:Help
 
-
-
-
 
 
   
   
diff --git 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu
 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu
index 4e23a827e945..8f302612c705 100644
--- 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu
+++ 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu
@@ -31,9 +31,6 @@
 
 
org.openoffice.Office.addon.example:Function1
 
-
-
-
 
 
 Add-On Function 1
@@ -46,9 +43,6 @@
 
 
org.openoffice.Office.addon.example:Function2
 
-
-
-
 
 
 Add-On Function 2
@@ -71,9 +65,6 @@
 
 
org.openoffice.Office.addon.example:Function1
 

[Libreoffice-commits] core.git: framework/inc framework/source include/vcl odk/examples officecfg/registry pyuno/demo sfx2/source vcl/source

[Maxim Monastirsky (via logerrit)]

 framework/inc/addonmenu.hxx |1 
 framework/inc/uielement/toolbarmerger.hxx   |2 
 framework/source/fwe/classes/addonmenu.cxx  |   10 ---
 framework/source/uielement/menubarmanager.cxx   |   32 
+-
 framework/source/uielement/toolbarmanager.cxx   |3 
 framework/source/uielement/toolbarmerger.cxx|   11 ---
 include/vcl/NotebookBarAddonsMerger.hxx |8 --
 odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Addons.xcu |   15 
 officecfg/registry/schema/org/openoffice/Office/Addons.xcs  |   12 ++-
 pyuno/demo/Addons.xcu   |3 
 sfx2/source/notebookbar/SfxNotebookBar.cxx  |   15 
 vcl/source/window/NotebookBarAddonsMerger.cxx   |7 --
 12 files changed, 20 insertions(+), 99 deletions(-)

New commits:
commit 3e4968e6761c816c0a6aedf59485191af8a0fa4e
Author: Maxim Monastirsky 
AuthorDate: Sun Aug 23 19:18:33 2020 +0300
Commit: Maxim Monastirsky 
CommitDate: Mon Aug 31 15:19:43 2020 +0200

Remove remains of private:image/ via ImageIdentifier addon property

This is broken since commit 5c39b28a87060f80404079ab77604f664addb063
("tdf#96059 Replaced imageproducer with CommandInfoProvider") but so
far no one complained (maybe because the usefulness of such internal
images from extensions is questionable at least). Given also that
the whole ImageIdentifier feature (even its still working part) is
obsolete since OOo 2.0.3 (according to the OOo dev guide), and that
the availability of a particular image from an internal hardcoded
image list by a particular numerical id is more an implementation
detail, let's just remove the broken code instead of fixing it.

In the meantime, the code was also copied into the newly introduced
notebookbar addon code, so I handled it there too.

There are also the registry schema and a sdk example that mention this
feature, and need to be adjusted. Interesting that the particular
example used there - private:image/3216 is actually broken since 2011
with commit 2559cab126f81375197051fb5b07ba6abb9efc77
("FDO#42454 - EasyHack: remove code associated with unused icons").

Change-Id: I968b4fb8c5b207654476dd92c57d8db0815520ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101529
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx
index dbffa8c1e495..0b778b705afe 100644
--- a/framework/inc/addonmenu.hxx
+++ b/framework/inc/addonmenu.hxx
@@ -74,7 +74,6 @@ class AddonMenuManager
 OUString& rTitle,
 OUString& rURL,
 OUString& rTarget,
-OUString& rImageId,
 OUString& rContext,
 css::uno::Sequence< 
css::uno::Sequence< css::beans::PropertyValue > >& rAddonSubMenu );
 };
diff --git a/framework/inc/uielement/toolbarmerger.hxx 
b/framework/inc/uielement/toolbarmerger.hxx
index f89bd8c6a1c3..d3ccc1c8cbcb 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -42,7 +42,6 @@ struct AddonToolbarItem
 {
 OUString aCommandURL;
 OUString aLabel;
-OUString aImageIdentifier;
 OUString aTarget;
 OUString aContext;
 OUString aControlType;
@@ -68,7 +67,6 @@ class ToolBarMerger
 static void   ConvertSequenceToValues( const css::uno::Sequence< 
css::beans::PropertyValue >& rSequence,
OUString& rCommandURL,
OUString& rLabel,
-   OUString& rImageIdentifier,
OUString& rTarget,
OUString& rContext,
OUString& rControlType,
diff --git a/framework/source/fwe/classes/addonmenu.cxx 
b/framework/source/fwe/classes/addonmenu.cxx
index 80ac7c0e0850..22e24655350b 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -144,7 +144,6 @@ void AddonMenuManager::MergeAddonPopupMenus( const 
Reference< XFrame >& rFrame,
 OUString  aTitle;
 OUString  aURL;
 OUString  aTarget;
-OUString  aImageId;
 OUString  aContext;
 Sequence< Sequence< PropertyValue > > aAddonSubMenu;
 sal_uInt16n

Re: How to enable Skia on Linux ?

[julien2412]

Thank you Miklos for your quick feedback.

I gave a try but had a segfault.
I attached the bt but don't know if I should submit a bugtracker or should
wait. After all, I forced the use SKIA and perhaps it's just not ready yet.

bt.txt

  

Julien



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

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 6b08eaa0c483efe5071c5a710a894e1204a0a3f4
Author: Julien Nabet 
AuthorDate: Mon Aug 31 11:50:44 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 15:27:31 2020 +0200

Fix end "ul" tag in LayoutManager.idl (offapi)

Change-Id: Ice50c048b62fe35d1a9f5b11435cb75f3fa45042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101701
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/offapi/com/sun/star/frame/LayoutManager.idl 
b/offapi/com/sun/star/frame/LayoutManager.idl
index e53818962308..511e43ada1c9 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -44,7 +44,7 @@
 boolean RefreshContextToolbarVisibility: Set to true 
to refresh visibility of context toolbars
 boolean HideCurrentUI: Hide/Show current UI elements 
(Toolbar, Statusbar, Menubar, etc)
 boolean PreserveContentSize: When true, the outer 
window is resized the content/document size is preserved
-
+
 
 
 @since OOo 2.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests cypress_test/Makefile.am cypress_test/README

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am  |   18 
--
 cypress_test/README   |   13 
+++
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |2 -
 3 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 9136bda96eac4ba1c4374a9bcd0459a46bc32713
Author: Tamás Zolnai 
AuthorDate: Mon Aug 31 15:06:44 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Aug 31 15:40:54 2020 +0200

cypress: use nonambiguous line style here.

Change-Id: I8679fb78a2af530692e91a84bacf2879506848ab
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101735
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git 
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js 
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 9cf50d0bb..e9457a3e9 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -195,7 +195,7 @@ describe('Change shape properties via mobile wizard.', 
function() {
 
helper.clickOnIdle('#linestyle');
 
-   helper.clickOnIdle('.ui-combobox-text', 'Dashed');
+   helper.clickOnIdle('.ui-combobox-text', 'Ultrafine Dashed');
 
triggerNewSVG();
 
commit d6005f09476bc7071317f65823436ff4c4f234c6
Author: Tamás Zolnai 
AuthorDate: Mon Aug 31 14:38:59 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Aug 31 15:40:44 2020 +0200

cypress: add a way to run tests with different browsers.

e.g. CYPRESS_BROWSER="firefox" make check

Change-Id: I3017179152c6e875df667da5081abb0c8cde60b1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101733
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 4ab2d2b61..e0679bf7b 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -47,7 +47,7 @@ SPACE :=$(EMPTY) $(EMPTY)
 
 CORE_VERSION := $(subst $(SPACE),_,$(shell "@LO_PATH@"/program/soffice.bin 
--version 2> /dev/null))
 
-BROWSER:=$(CHROME)
+BROWSER:=$(if $(shell echo $$CYPRESS_BROWSER),$(shell echo 
$$CYPRESS_BROWSER),$(CHROME))
 
 if ENABLE_DEBUG
 FILTER_DEBUG=cypress:electron,cypress:launcher
@@ -205,22 +205,6 @@ do-run-cov: @JAILS_PATH@ $(NODE_BINS)
$(call run_all_multiuser_tests,COVERAGE_RUN="1")
@$(KILL_COMMAND) || true
 
-
-check-firefox: do-check-firefox
-   $(if $(wildcard $(ERROR_LOG)),@cat $(ERROR_LOG))
-
-do-check-firefox: @JAILS_PATH@ $(NODE_BINS)
-   @echo
-   @echo "Run tests inside Firefox..."
-   @echo
-   @rm -f $(ERROR_LOG)
-   $(eval BROWSER="firefox")
-   $(call start_loolwsd)
-   $(call run_desktop_tests)
-   $(call run_mobile_tests)
-   $(call run_all_multiuser_tests)
-   @$(KILL_COMMAND) || true
-
 @JAILS_PATH@:
mkdir -p $@
 
diff --git a/cypress_test/README b/cypress_test/README
index fcf3cc0ed..a7cc3a0fc 100644
--- a/cypress_test/README
+++ b/cypress_test/README
@@ -115,6 +115,19 @@ mobile and desktop tests, that's why there are two 
separate commands
 for them and there is no option to open all the tests in the
 test runner.
 
+Running tests in different browsers
+---
+
+By default, the tests are run with chrome / chromium. If you need to
+run the tests with a different browser, you can use the CYPRESS_BROWSER
+variable:
+
+CYPRESS_BROWSER="firefox" make check
+
+This variable can be set to any value which is accepted by cypress
+--browser command line argument:
+https://docs.cypress.io/guides/guides/command-line.html#cypress-run-browser-lt-browser-name-or-path-gt
+
 Known issues
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/run_parallel.sh

[Tamás Zolnai (via logerrit)]

 cypress_test/run_parallel.sh |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit b16182c3c3f13949424efab9b2bee87f0c2ab48e
Author: Tamás Zolnai 
AuthorDate: Mon Aug 31 14:58:20 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Aug 31 15:41:03 2020 +0200

cypress: correctly append "Second chance!" string to the output.

Change-Id: I193b4b916babcda4e321b9c83e0301cc8a4b947f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101734
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/run_parallel.sh b/cypress_test/run_parallel.sh
index b73b2bb44..48feecef6 100755
--- a/cypress_test/run_parallel.sh
+++ b/cypress_test/run_parallel.sh
@@ -88,19 +88,20 @@ print_error() {
 fi
 }
 
-run_command() {
-rm -rf ${TEST_ERROR}
-echo "`echo ${RUN_COMMAND} && ${RUN_COMMAND} || touch ${TEST_ERROR}`" > 
${TEST_LOG} 2>&1
+echo_command_run() {
+echo "`echo ${RUN_COMMAND} && ${RUN_COMMAND} || touch ${TEST_ERROR}`"
 }
 
 mkdir -p `dirname ${TEST_LOG}`
 touch ${TEST_LOG}
-run_command
+rm -rf ${TEST_ERROR}
+echo_command_run > ${TEST_LOG} 2>&1
 if [ ! -f ${TEST_ERROR} ];
 then cat ${TEST_LOG};
 elif [ ${SECOND_CHANCE} = true ];
 then echo "Second chance!" > ${TEST_LOG} && \
-run_command && \
+rm -rf ${TEST_ERROR} && \
+echo_command_run >> ${TEST_LOG} 2>&1 && \
 if [ ! -f ${TEST_ERROR} ];\
 then cat ${TEST_LOG};\
 else cat ${TEST_LOG} >> ${ERROR_LOG} && \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/layout/frmtool.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 139ce6588a2980e52df9a106a254c16e6f27ea8d
Author: Michael Stahl 
AuthorDate: Fri Aug 28 22:05:06 2020 +0200
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 15:41:46 2020 +0200

tdf#135001 sw_redlinehide: fix IsShown() for AT_PARA flys

There is one merged text frame from node 102 to node 328 with no
extents, and of course a shape anchored at node 271 should not be
visible at all.

This crashes because the shape was removed from the layout during
CheckParaRedlineMerge() but then moved to the visible heaven layer
again via sw::AddRemoveFlysAnchoredToFrameStartingAtNode() and the
layer determines if it's visible as far as Sdr* is concerned;
it lacks a connection to a SwFrame though.

warn:legacy.osl:3547848:3547848:sw/source/core/layout/paintfrm.cxx:3861: 
 - paint of drawing object without anchor frame!?

(regression from 6aaae44da382f4bc3eafc287b4a21734b740cf21)

Change-Id: Ia20449b3a7d251f0c049eb979c88df1e80cd7d5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101584
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 586750da40c5b332d2442ef24ae121795e88e903)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101672
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 22217f5c0655..f5b2cc813e4a 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1052,7 +1052,15 @@ static bool IsShown(sal_uLong const nIndex,
 {
 return false;
 }
-if (pIter && rAnch.GetAnchorId() != RndStdIds::FLY_AT_PARA)
+if (rAnch.GetAnchorId() == RndStdIds::FLY_AT_PARA)
+{
+return pIter == nullptr // not merged
+|| pIter != pEnd// at least one char visible in node
+|| !IsSelectFrameAnchoredAtPara(rAnchor,
+SwPosition(const_cast(*pFirstNode), 0),
+SwPosition(const_cast(*pLastNode), 
pLastNode->Len()));
+}
+if (pIter)
 {
 // note: frames are not sorted by anchor position.
 assert(pEnd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 dev/null |binary
 sw/inc/IDocumentSettingAccess.hxx|1 
 sw/qa/extras/odfexport/odfexport.cxx |6 ---
 sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |9 +
 sw/source/core/doc/DocumentSettingManager.cxx|   13 
 sw/source/core/inc/DocumentSettingManager.hxx|1 
 sw/source/core/text/txtfly.cxx   |8 +++--
 sw/source/filter/xml/xmlimp.cxx  |6 ---
 sw/source/uibase/uno/SwXDocumentSettings.cxx |   17 ---
 10 files changed, 16 insertions(+), 45 deletions(-)

New commits:
commit 57320af60d97f2918b5d1e73575b23682e0a0637
Author: Justin Luth 
AuthorDate: Thu Aug 13 19:05:35 2020 +0300
Commit: Miklos Vajna 
CommitDate: Mon Aug 31 16:00:46 2020 +0200

tdf#104596 sw layout: wrap in header only if bLayoutInCell

This patch depends on tdf#77794's
7.1 commit 7cc353df4f0993228984fcda3efb2c9181dddafb.

For more details about the issue in general,
see the verbose comments in this bug's previous
7.1 commit e4635544b816d1ca27bd1ebba60f51444b0a898e.

This patch is related to CompatibilityMode < 15.
Unfortunately, the previous patch didn't work
with older Word 2010 versions of the file,
which _shouldn't_ wrap non-LayoutInCell table-anchored flies.

Unfortunately, now that different behaviour is necessary
for different Word compat levels,
it no longer allows a nice way for Writer to handle
this natively. So since it would be very unlikely for a
user to create a document like this (since the necessary
"keep inside text boundaries" is off by default in Writer,
but is forced on by definition in Word 2013+),
I'm removing the compatibility flag I added in 7.1,
and its related unit test.

[To do this natively would probably require enabling
the IsFollowingTextFlow property by default in SW.
That sounds very dangerous since this property
is not restricted to IsInTable layout situations.
This property has been around since at least LO 3.5.]

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

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 2f514bdcc62d..2ae267d08fe0 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -49,7 +49,6 @@ enum class DocumentSettingId
 ADD_PARA_SPACING_TO_TABLE_CELLS,
 USE_FORMER_OBJECT_POS,
 USE_FORMER_TEXT_WRAPPING,
-ALLOW_WRAP_WHEN_ANCHORED_IN_TABLE, // change LO to match MS allowing 
wrapping around fly-frames anchored in tables in header & footnote
 CONSIDER_WRAP_ON_OBJECT_POSITION,
 
 IGNORE_FIRST_LINE_INDENT_IN_NUMBERING,
diff --git a/sw/qa/extras/odfexport/data/tdf104596_breakingExample.odt 
b/sw/qa/extras/odfexport/data/tdf104596_breakingExample.odt
deleted file mode 100644
index 19d0e85c42b7..
Binary files a/sw/qa/extras/odfexport/data/tdf104596_breakingExample.odt and 
/dev/null differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 715d9ad68d35..cb131ece62de 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -466,12 +466,6 @@ DECLARE_ODFEXPORT_TEST(testredlineTextFrame, 
"redlineTextFrame.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
 }
 
-DECLARE_ODFEXPORT_TEST(testTdf104596_breakingExample, 
"tdf104596_breakingExample.odt")
-{
-//wrapping should be ignored on in-table flies for pre-LO7.1 documents. 
ALLOW_WRAP_WHEN_ANCHORED_IN_TABLE
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fits on one page", 1, getPages() );
-}
-
 DECLARE_ODFEXPORT_TEST(testTdf131621, "tdf131621.ott")
 {
 CPPUNIT_ASSERT_EQUAL(12, getShapes());
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docx 
b/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docx
new file mode 100644
index ..00c1353d984d
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 01f0726f5296..e68dde7499e7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -111,6 +111,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135595_HFtableWrap, 
"tdf135595_HFtableWrap.odt")
 CPPUNIT_ASSERT_MESSAGE("Image must be contained inside the table cell", 
nRowHeight > 2000);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf135595_HFtableWrap_c12, 
"tdf135595_HFtableWrap_c12.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseL

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

[Regényi Balázs (via logerrit)]

 oox/source/vml/vmlshape.cxx  |4 +++
 sw/qa/extras/ooxmlexport/data/tdf97618_testVmlShapeTextWordWrap.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   13 
++
 3 files changed, 17 insertions(+)

New commits:
commit 0d773f0b07798a59f7cf31207813aaf6bc9bb922
Author: Regényi Balázs 
AuthorDate: Sat Aug 29 09:11:46 2020 +0200
Commit: László Németh 
CommitDate: Mon Aug 31 16:04:01 2020 +0200

tdf#97618 DOCX import: VML shape: fix missing square wrap

Co-authored-by: Szabolcs Tóth

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

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 362f02c7cabf..85ad112bcfae 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -791,6 +791,10 @@ Reference< XShape > SimpleShape::implConvertAndInsert( 
const Reference< XShapes
 eTextVerticalAdjust = drawing::TextVerticalAdjust_BOTTOM;
 PropertySet(xShape).setAnyProperty(PROP_TextVerticalAdjust, 
makeAny(eTextVerticalAdjust));
 
+// tdf#97618
+if(!maTypeModel.maWrapStyle.isEmpty())
+PropertySet(xShape).setAnyProperty(PROP_TextWordWrap, 
makeAny(maTypeModel.maWrapStyle == "square"));
+
 PropertySet(xShape).setAnyProperty(PROP_TextAutoGrowHeight,
makeAny(maTypeModel.mbAutoHeight));
 
diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf97618_testVmlShapeTextWordWrap.docx 
b/sw/qa/extras/ooxmlexport/data/tdf97618_testVmlShapeTextWordWrap.docx
new file mode 100644
index ..eb31a1244c01
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf97618_testVmlShapeTextWordWrap.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index e68dde7499e7..30a27a22e1ce 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1264,6 +1264,19 @@ 
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromTopMarginNoHeader,
 assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "height", "2551");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testVmlShapeTextWordWrap, 
"tdf97618_testVmlShapeTextWordWrap.docx")
+{
+// tdf#97618 The text wraping of a shape was not handled in a canvas.
+// TODO: fix export too
+if (mbExported)
+return;
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+if (!pXmlDoc)
+return;
+// The bound rect of shape will be wider if wrap does not work (the wrong 
value is 3167).
+assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "width", "2500");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

[Andrea Gelmini (via logerrit)]

 scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
 |2 +-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
   |2 +-
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f10a4e20100515f1fc95b3254ac52894ec59bdda
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 11:59:42 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 16:07:31 2020 +0200

Fix typos in code

It passed "make check" on Linux

Change-Id: Id7c7ac1b88d290ed71f03fa28dec144bcd29b692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101590
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
index dbcb3b0bc7a9..395a1b6a8abb 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
@@ -43,7 +43,7 @@ public abstract class ScriptEditor {
 this.context = context;
 }
 
-public boolean isMacroExectionEnabled() {
+public boolean isMacroExecutionEnabled() {
 XNameAccess xNameAccess = null;
 try {
 String sAccess = "com.sun.star.configuration.ConfigurationAccess";
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 31c26dc51334..2a972df92ff6 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -170,7 +170,7 @@ public class ScriptEditorForBeanShell extends ScriptEditor 
implements ActionList
  *
  */
 public Object execute() throws Exception {
-if (!isMacroExectionEnabled()) {
+if (!isMacroExecutionEnabled()) {
 showErrorMessage("Macro Execution has been disabled.");
 return null;
 }
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 4cf5cc3384ca..8bb0828aff03 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -196,7 +196,7 @@ public class ScriptEditorForJavaScript extends ScriptEditor 
{
 private ScriptEditorForJavaScript(XScriptContext context, URL url) {
 setContext(context);
 // Need to check that before showing the window. Checking in execute() 
has no effect.
-if (!isMacroExectionEnabled()) {
+if (!isMacroExecutionEnabled()) {
 showErrorMessage("Macro Execution has been disabled.");
 return ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Szűcs (via logerrit)]

 sc/source/ui/view/output2.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 0bdd533900584f384e2ee4d127fa252e339342c0
Author: Attila Szűcs 
AuthorDate: Sat Aug 29 12:33:01 2020 +0200
Commit: László Németh 
CommitDate: Mon Aug 31 16:59:55 2020 +0200

tdf#47079 sc layout: fix visibility of Autofilter header

Rotated Autofilter header is shifted under the arrow image, if
there is not enough space for both of them. An exception if the
header is a value, and rotated by 90 or 270 degrees, which resulted
invisible or partially visible cell content in narrow cells. Remove
this exception.

Co-authored-by: Tibor Nagy (NISZ)

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

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index c4aaca82ca16..f3d9031b33bd 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1354,19 +1354,13 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE 
nArrY, long nPosX, long nPosY
 // filter drop-down width is now independent from row height
 const long nFilter = DROPDOWN_BITMAP_SIZE;
 bool bFit = ( nNeeded + nFilter <= nMergeSizeX );
-if ( bFit || bCellIsValue )
+if ( bFit )
 {
 // content fits even in the remaining area without the filter 
button
 // -> align within that remaining area
 
 rParam.maAlignRect.AdjustRight( -(nFilter * nLayoutSign) );
 rParam.maClipRect.AdjustRight( -(nFilter * nLayoutSign) );
-
-// if a number doesn't fit, don't hide part of the number 
behind the button
-// -> set clip flags, so "###" replacement is used (but also 
within the smaller area)
-
-if ( !bFit )
-rParam.mbLeftClip = rParam.mbRightClip = true;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CanvasTileLayer.js |   16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 5977df94df89b253cd587a9153f43f8ae9750bfc
Author: Michael Meeks 
AuthorDate: Fri Aug 28 16:05:04 2020 +0100
Commit: Michael Meeks 
CommitDate: Mon Aug 31 16:29:10 2020 +0100

calc tiles: connect debug to global setting.

Change-Id: I0db008ac40020c9173d37969aa6c23b3a1696f79

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 35f23437a..4983fef2a 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -36,10 +36,6 @@ L.TileCoordData.parseKey = function (keyString) {
 
 L.CanvasTilePainter = L.Class.extend({
 
-   options: {
-   debug: true,
-   },
-
initialize: function (layer) {
this._layer = layer;
this._canvas = this._layer._canvas;
@@ -126,8 +122,8 @@ L.CanvasTilePainter = L.Class.extend({
clear: function () {
this._canvasCtx.save();
this._canvasCtx.scale(1, 1);
-   if (this.options.debug)
-   this._canvasCtx.fillStyle = 'red';
+   if (this._layer._debug)
+   this._canvasCtx.fillStyle = 'rgba(255, 0, 0, 0.5)';
else
this._canvasCtx.fillStyle = 'white';
this._canvasCtx.fillRect(0, 0, this._width, this._height);
@@ -181,9 +177,9 @@ L.CanvasTilePainter = L.Class.extend({
this._canvasCtx.clip();
 
this._canvasCtx.drawImage(tile.el, tile.coords.x, 
tile.coords.y);
-   if (this.options.debug)
+   if (this._layer._debug)
{
-   this._canvasCtx.strokeStyle = 'red';
+   this._canvasCtx.strokeStyle = 'rgba(255, 0, 0, 
0.5)';
this._canvasCtx.strokeRect(tile.coords.x, 
tile.coords.y, 256, 256);
}
this._canvasCtx.restore();
@@ -273,13 +269,13 @@ L.CanvasTilePainter = L.Class.extend({
this._topLeft = newTopLeft;
this._paintWholeCanvas();
 
-   if (this.options.debug)
+   if (this._layer._debug)
this._drawSplits();
},
 
_paintWholeCanvas: function () {
 
-   if (this.options.debug)
+   if (this._layer._debug)
this.clear();
 
var zoom = this._lastZoom || Math.round(this._map.getZoom());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: scripts/list-ci-changes.py

[Miklos Vajna (via logerrit)]

 scripts/list-ci-changes.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bcf9fae51cacda0c8881cab00c8acd42d32b794f
Author: Miklos Vajna 
AuthorDate: Mon Aug 31 17:33:10 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Aug 31 17:33:48 2020 +0200

list-ci-changes: fix this up so it works with newer Gerrit URLs

Otherwise it reports a change is not in the queue when it is.

Change-Id: I1db2b03ce6042986dc9feb37290a684f982dd45e

diff --git a/scripts/list-ci-changes.py b/scripts/list-ci-changes.py
index 8df033d..12bb892 100755
--- a/scripts/list-ci-changes.py
+++ b/scripts/list-ci-changes.py
@@ -49,7 +49,7 @@ def getCIChanges(changesHTML):
 if tag == "a":
 for attrKey, attrValue in attrs:
 if attrKey == "tooltip":
-match = 
re.match(".*(https://gerrit.libreoffice.org/[0-9]+).*", attrValue)
+match = 
re.match(r".*(https://gerrit.libreoffice.org/c/core/\+/[0-9]+).*", attrValue)
 if match:
 self.changes.append(match.group(1))
 
@@ -59,7 +59,7 @@ def getCIChanges(changesHTML):
 
 def main():
 if len(sys.argv) > 1:
-gerrit = [{"url": "https://gerrit.libreoffice.org/"; + sys.argv[1], 
"branch": "unknown"}]
+gerrit = [{"url": "https://gerrit.libreoffice.org/c/core/+/"; + 
sys.argv[1], "branch": "unknown"}]
 else:
 gerrit = getGerritChanges()
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Final Report

[Aditya Sahu]

Hi,
You can check the final GSoC Report here [1]. Thank you LibreOffice
community for guidance and help. Special thanks to Tomaž who was super
helpful during the whole project. I'm grateful to do this project with such
a great mentor.
I will be submitting final changes in upcoming days and keep you updated
about the progress. It has been a pleasure contributing to LO.

Warm Regards,
Aditya Sahu


[1] https://gist.github.com/aditya-sahu/b36dfe02c4f58b869bde18d47030a04a
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 vcl/workben/ww2fuzzer.cxx |4 
 vcl/workben/ww6fuzzer.cxx |2 ++
 vcl/workben/ww8fuzzer.cxx |4 
 3 files changed, 10 insertions(+)

New commits:
commit 828914a94fe93d5b300bda1d23a049ae92c159e1
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 16:41:47 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 18:06:26 2020 +0200

ofz#25325 missing constructors

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

diff --git a/vcl/workben/ww2fuzzer.cxx b/vcl/workben/ww2fuzzer.cxx
index bd65223b5ba6..5ffe0445c3fb 100644
--- a/vcl/workben/ww2fuzzer.cxx
+++ b/vcl/workben/ww2fuzzer.cxx
@@ -33,6 +33,8 @@ void * com_sun_star_i18n_Transliteration_get_implementation( 
void *, void * );
 void * com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, 
void * );
 void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, 
void * );
 void * emfio_emfreader_XEmfParser_get_implementation( void *, void * );
+void * i18npool_CalendarImpl_get_implementation(void*, void*);
+void * i18npool_Calendar_gregorian_get_implementation( void *, void * );
 void * unoxml_rdfRepository_get_implementation( void *, void * );
 void * unoxml_CURI_get_implementation( void *, void * );
 void * unoxml_CLiteral_get_implementation( void *, void * );
@@ -79,6 +81,8 @@ lo_get_constructor_map(void)
 { "com_sun_star_text_DefaultNumberingProvider_get_implementation", 
com_sun_star_text_DefaultNumberingProvider_get_implementation },
 { "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", 
com_sun_star_comp_uri_UriReferenceFactory_get_implementation},
 { "emfio_emfreader_XEmfParser_get_implementation", 
emfio_emfreader_XEmfParser_get_implementation},
+{ "i18npool_CalendarImpl_get_implementation", 
i18npool_CalendarImpl_get_implementation},
+{ "i18npool_Calendar_gregorian_get_implementation", 
i18npool_Calendar_gregorian_get_implementation},
 { "unoxml_rdfRepository_get_implementation", 
unoxml_rdfRepository_get_implementation },
 { "unoxml_CURI_get_implementation", unoxml_CURI_get_implementation },
 { "unoxml_CLiteral_get_implementation", 
unoxml_CLiteral_get_implementation },
diff --git a/vcl/workben/ww6fuzzer.cxx b/vcl/workben/ww6fuzzer.cxx
index 341bf26447d9..a17be9105a06 100644
--- a/vcl/workben/ww6fuzzer.cxx
+++ b/vcl/workben/ww6fuzzer.cxx
@@ -35,6 +35,7 @@ void * 
com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, vo
 void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, 
void * );
 void * emfio_emfreader_XEmfParser_get_implementation( void *, void * );
 void * i18npool_CalendarImpl_get_implementation(void*, void*);
+void * i18npool_Calendar_gregorian_get_implementation( void *, void * );
 void * unoxml_rdfRepository_get_implementation( void *, void * );
 void * unoxml_CURI_get_implementation( void *, void * );
 void * unoxml_CLiteral_get_implementation( void *, void * );
@@ -83,6 +84,7 @@ lo_get_constructor_map(void)
 { "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", 
com_sun_star_comp_uri_UriReferenceFactory_get_implementation},
 { "emfio_emfreader_XEmfParser_get_implementation", 
emfio_emfreader_XEmfParser_get_implementation},
 { "i18npool_CalendarImpl_get_implementation", 
i18npool_CalendarImpl_get_implementation },
+{ "i18npool_Calendar_gregorian_get_implementation", 
i18npool_Calendar_gregorian_get_implementation},
 { "unoxml_rdfRepository_get_implementation", 
unoxml_rdfRepository_get_implementation },
 { "unoxml_CURI_get_implementation", unoxml_CURI_get_implementation },
 { "unoxml_CLiteral_get_implementation", 
unoxml_CLiteral_get_implementation },
diff --git a/vcl/workben/ww8fuzzer.cxx b/vcl/workben/ww8fuzzer.cxx
index 27391f18a889..113e798610f3 100644
--- a/vcl/workben/ww8fuzzer.cxx
+++ b/vcl/workben/ww8fuzzer.cxx
@@ -34,6 +34,8 @@ void * com_sun_star_i18n_Transliteration_get_implementation( 
void *, void * );
 void * com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, 
void * );
 void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, 
void * );
 void * emfio_emfreader_XEmfParser_get_implementation( void *, void * );
+void * i18npool_CalendarImpl_get_implementation(void*, void*);
+void * i18npool_Calendar_gregorian_get_implementation( void *, void * );
 void * unoxml_rdfRepository_get_implementation( void *, void * );
 void * unoxml_CURI_get_implementation( void *, void * );
 void * unoxml_CLiteral_get_implementation( void *, void * );
@@ -81,6 +83,8 @@ lo_get_constructor_map(void)
 { "com_sun_star_text_DefaultNumberingProvider_get_implementation", 
com_sun_star_text_DefaultNumberingProvider_get_implementation },
 { "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", 
com_sun_star_com

[SOLVED] Re: How to enable Skia on Linux ?

[julien2412]

Luboš Luňák wrote
>> ...
>  Skia on Linux is normally usable (if being usable only with the gen
> backend 
> actually counts as being usable). So if you find a bug, report it as
> usual.

Thank you for your feedback.
I had just a problem with remnants of an extension.
I runned "make clean && make" again and no crash due to SKIA for the moment.

Julien



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

[Libreoffice-commits] online.git: loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/control/Control.PartsPreview.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 57226f19818ad4c06981186821579d5a5c53a032
Author: Pranam Lashkari 
AuthorDate: Mon Aug 31 18:45:45 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Aug 31 19:21:56 2020 +0200

leaflet: fixed js error in slide reordering with touch screen

Change-Id: I7e1c864640f5829166616e5bf40b95646d913b23
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101756
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index ca5155d4d..e529fad22 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -588,7 +588,7 @@ L.Control.PartsPreview = L.Control.extend({
e.preventDefault();
}
 
-   this.currentNode = 
document.elementFromPoint(e.touches[0].clientX, e.touches[0].clientY);
+   this.currentNode = 
document.elementFromPoint(e.originalEvent.touches[0].clientX, 
e.originalEvent.touches[0].clientY);
 
if (this.currentNode !== this.previousNode && this.previousNode 
!== null) {
$('.preview-frame').removeClass('preview-img-dropsite');
@@ -600,8 +600,8 @@ L.Control.PartsPreview = L.Control.extend({
 
this.previousNode = this.currentNode;
 
-   $(this.draggedSlide).css('left', e.touches[0].clientX - 
(e.target.width/2));
-   $(this.draggedSlide).css('top', e.touches[0].clientY - 
e.target.height);
+   $(this.draggedSlide).css('left', 
e.originalEvent.touches[0].clientX - (e.target.width/2));
+   $(this.draggedSlide).css('top', 
e.originalEvent.touches[0].clientY - e.target.height);
return false;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/control/Control.PartsPreview.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 40fb94207e34d46aaba073b09667f53286d0ef0a
Author: Pranam Lashkari 
AuthorDate: Mon Aug 31 18:45:45 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Aug 31 19:21:48 2020 +0200

leaflet: fixed js error in slide reordering with touch screen

Change-Id: I7e1c864640f5829166616e5bf40b95646d913b23
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101736
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pranam Lashkari 

diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 718d65b50..af553f552 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -585,7 +585,7 @@ L.Control.PartsPreview = L.Control.extend({
e.preventDefault();
}
 
-   this.currentNode = 
document.elementFromPoint(e.touches[0].clientX, e.touches[0].clientY);
+   this.currentNode = 
document.elementFromPoint(e.originalEvent.touches[0].clientX, 
e.originalEvent.touches[0].clientY);
 
if (this.currentNode !== this.previousNode && this.previousNode 
!== null) {
$('.preview-frame').removeClass('preview-img-dropsite');
@@ -597,8 +597,8 @@ L.Control.PartsPreview = L.Control.extend({
 
this.previousNode = this.currentNode;
 
-   $(this.draggedSlide).css('left', e.touches[0].clientX - 
(e.target.width/2));
-   $(this.draggedSlide).css('top', e.touches[0].clientY - 
e.target.height);
+   $(this.draggedSlide).css('left', 
e.originalEvent.touches[0].clientX - (e.target.width/2));
+   $(this.draggedSlide).css('top', 
e.originalEvent.touches[0].clientY - e.target.height);
return false;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 sfx2/source/control/unoctitm.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2e601204c5d844ce5cd9d2e61fbbcff6ad59ee58
Author: Pranam Lashkari 
AuthorDate: Fri Jul 10 22:24:02 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Aug 31 19:22:16 2020 +0200

LOK: send state of FormatPaintbrush

Change-Id: I61057adff79e072aa4dc12e9c8943abd7166a260
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98540
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 91ee7efe49581b774d4be116888b490eb132ac5d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101677
Reviewed-by: Pranam Lashkari 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 405208e03766..23e02481c120 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1009,7 +1009,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "DocumentRepair" ||
 aEvent.FeatureURL.Path == "ObjectAlignLeft" ||
 aEvent.FeatureURL.Path == "ObjectAlignRight" ||
-aEvent.FeatureURL.Path == "AlignCenter")
+aEvent.FeatureURL.Path == "AlignCenter" ||
+aEvent.FeatureURL.Path == "FormatPaintbrush")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
@@ -,7 +1112,6 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "SplitTable" ||
  aEvent.FeatureURL.Path == "DeleteNote" ||
  aEvent.FeatureURL.Path == "AcceptChanges" ||
- aEvent.FeatureURL.Path == "FormatPaintbrush" ||
  aEvent.FeatureURL.Path == "SetDefault" ||
  aEvent.FeatureURL.Path == "ParaLeftToRight" ||
  aEvent.FeatureURL.Path == "ParaRightToLeft" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/css/leaflet.css|5 +
 loleaflet/css/loleaflet.css  |6 +++---
 loleaflet/src/control/Control.Toolbar.js |6 ++
 loleaflet/src/layer/marker/Cursor.js |4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 511d0cd956ea10b52c7b19aafa5b3fa2a4c6f6fc
Author: Pranam Lashkari 
AuthorDate: Mon Aug 31 17:54:15 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Aug 31 19:22:56 2020 +0200

leaflet: changing cursor according to objects selected

text cursor only if cursor is visible
appropriate cursor for drag markers
move cursor for selected object

Change-Id: If750ac91fc870a0d730d4455c51bde0423c55e4a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101727
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pranam Lashkari 

diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 88ee4572a..d8f1217ce 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -184,10 +184,7 @@
 /* cursors */
 
 .leaflet-interactive {
-   cursor: pointer;
-   }
-.leaflet-container {
-   cursor: text;
+   cursor: move;
}
 .leaflet-crosshair,
 .leaflet-crosshair .leaflet-interactive {
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index e60639b08..90f4afced 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -47,14 +47,14 @@
z-index: 1000;
 }
 
-#document-container.text-doctype > #map{
-   cursor: text;
-}
 .scroll-container .mCSB_scrollTools.mCSB_1_scrollbar {
position: absolute;
z-index: 1000;
 }
 
+.bucket-cursor {
+   cursor: url('images/cursors/fill.png'), auto !important;
+}
 .loleaflet-scrollbar-show {
opacity: 1 !important;
filter: "alpha(opacity=100)" !important;
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index bc2f590ed..1595be0b0 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -842,6 +842,12 @@ function onCommandStateChanged(e) {
toolbar.disable('repair');
}
}
+   else if (commandName === '.uno:FormatPaintbrush') {
+   if (state === 'true')
+   
$('.leaflet-pane.leaflet-map-pane').addClass('bucket-cursor');
+   else
+   
$('.leaflet-pane.leaflet-map-pane').removeClass('bucket-cursor');
+   }
 
var id = unoCmdToToolbarId(commandName);
// id is set to '' by unoCmdToToolbarId() if the statechange message 
should be ignored.
diff --git a/loleaflet/src/layer/marker/Cursor.js 
b/loleaflet/src/layer/marker/Cursor.js
index b7a0ba1a9..4e415b620 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -3,6 +3,7 @@
  * L.Cursor blinking cursor.
  */
 
+ /* global $ */
 L.Cursor = L.Layer.extend({
 
options: {
@@ -22,7 +23,7 @@ L.Cursor = L.Layer.extend({
if (!this._container) {
this._initLayout();
}
-
+   $('.leaflet-pane.leaflet-map-pane').css('cursor', 'text');
this._zoomAnimated = this._zoomAnimated && 
this.options.zoomAnimation;
if (this._zoomAnimated) {
L.DomUtil.addClass(this._container, 
'leaflet-zoom-animated');
@@ -33,6 +34,7 @@ L.Cursor = L.Layer.extend({
},
 
onRemove: function () {
+   $('.leaflet-pane.leaflet-map-pane').css('cursor', '');
if (this._container) {
this.getPane().removeChild(this._container);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Warner (via logerrit)]

 sw/qa/extras/ooxmlimport/data/tdf123386.docx |binary
 sw/qa/extras/ooxmlimport/data/tdf123389.docx |binary
 sw/qa/extras/ooxmlimport/data/tdf133647.docx |binary
 sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |  155 +++
 writerfilter/Library_writerfilter.mk |4 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   71 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|3 
 writerfilter/source/dmapper/SettingsTable.cxx|   17 ++
 writerfilter/source/dmapper/SettingsTable.hxx|3 
 10 files changed, 250 insertions(+), 3 deletions(-)

New commits:
commit a8dbdf4c41d0299aee6e155323f217e2fa1565c9
Author: Michael Warner 
AuthorDate: Fri Jul 3 10:18:33 2020 -0400
Commit: Xisco Fauli 
CommitDate: Mon Aug 31 19:32:31 2020 +0200

tdf133647 tdf123386 tdf123389 Improved .docx table formula import

Converts table formula syntax from MS Word to LibreOffice.
This version uses the list separator of the document for the
formula regexen; however, it does not convert the decimal or
list separators in the case where the person opening the document
is using a different locale from the author.

Change-Id: I9600a0bea060a76705a7ad6b051ed4fdd50b9d40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98614
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 68e74bdf63e992666016c790e8e4cfd5b28d6abe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101676
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf123386.docx 
b/sw/qa/extras/ooxmlimport/data/tdf123386.docx
new file mode 100644
index ..1278068ddedf
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf123386.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf123389.docx 
b/sw/qa/extras/ooxmlimport/data/tdf123389.docx
new file mode 100644
index ..4245464b820d
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf123389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf133647.docx 
b/sw/qa/extras/ooxmlimport/data/tdf133647.docx
new file mode 100644
index ..fb525446c7fc
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf133647.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx 
b/sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx
new file mode 100644
index ..d5749f89de53
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 343c08a94d89..fb71f67fe794 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -748,6 +748,161 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105975formula, 
"tdf105975.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("25"), 
xEnumerationAccess->getPresentation(false).trim());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf133647, "tdf133647.docx")
+{
+/* Tests that argument lists, cell references, and cell ranges are 
translated correctly
+ * when importing table formulae from MS Word */
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+
+if( !xFields->hasMoreElements() ) {
+CPPUNIT_ASSERT(false);
+return;
+}
+
+uno::Reference 
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SUM(1|2|3)"), 
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("6"), 
xEnumerationAccess1->getPresentation(false).trim());
+
+uno::Reference 
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("sum(|)"), 
xEnumerationAccess2->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("3"), 
xEnumerationAccess2->getPresentation(false).trim());
+
+uno::Reference 
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("(SUM(|5)*(2+7))*(3+SUM(1|))"), 
xEnumerationAccess3->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("432"), 
xEnumerationAccess3->getPresentation(false).trim());
+
+uno::Reference 
xEnumerationAccess4(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1+(SUM(1|2))"), 
xEnumerationAccess4->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("4"), 
xEnumerationAccess4->getPresentation(false).trim());
+
+uno::Reference 
xEnumerationAccess5(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("3*(2+SUM()+7)"), 
xEnumerationAccess5->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("45"), 
xEnumerationAccess5->get

[Libreoffice-commits] cppunit.git: examples/money

[Libreoffice Gerrit user]

 examples/money/MoneyTest.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 942992e8abbe00aad7d0671671124a046cae2cda
Author: Алексей Тулинов 
AuthorDate: Mon Aug 31 05:25:10 2020 +0300
Commit: Markus Mohrhard 
CommitDate: Mon Aug 31 19:51:32 2020 +0200

Fixed CPPUNIT_ASSERT_EQUAL() being called on doubles

Change-Id: Ie72531ebdc858a0122886a7a3cfe49185dc0ff76
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/101688
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/examples/money/MoneyTest.cpp b/examples/money/MoneyTest.cpp
index 65870a6..3fc9aaa 100644
--- a/examples/money/MoneyTest.cpp
+++ b/examples/money/MoneyTest.cpp
@@ -32,7 +32,7 @@ MoneyTest::testConstructor()
   Money money( longNumber, currencyFF );
 
   // Check
-  CPPUNIT_ASSERT_EQUAL( longNumber, money.getAmount() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( longNumber, money.getAmount(), 0.0001 );
   CPPUNIT_ASSERT_EQUAL( currencyFF, money.getCurrency() );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aditya (via logerrit)]

 include/svx/gallerybinaryengine.hxx |   18 ++-
 include/svx/galtheme.hxx|7 -
 svx/source/gallery2/gallery1.cxx|2 
 svx/source/gallery2/gallerybinaryengine.cxx |  129 ++--
 svx/source/gallery2/galtheme.cxx|  102 +-
 5 files changed, 142 insertions(+), 116 deletions(-)

New commits:
commit 9a7ab3527adef056291ec56c031ebbe3f471af66
Author: Aditya 
AuthorDate: Sat Aug 1 18:58:06 2020 +0530
Commit: Tomaž Vajngerl 
CommitDate: Mon Aug 31 20:10:01 2020 +0200

svx:Refactor WriteData() and move m_aDestDir member out of GalleryTheme

Move m_aDestDir out of GalleryTheme because only GalleryBinaryEngine seems 
to be using it.
Use SetDestDir() to delegate the member value to GalleryBinaryEngine.
Refactor WriteData() so that it's called writeGalleryTheme()

Change-Id: I5f6b6f0857695adeb102342e617ad341553abd14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99940
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/gallerybinaryengine.hxx 
b/include/svx/gallerybinaryengine.hxx
index cf56b98c8c47..eb9e0b291de1 100644
--- a/include/svx/gallerybinaryengine.hxx
+++ b/include/svx/gallerybinaryengine.hxx
@@ -38,6 +38,7 @@ class SotStorage;
 struct GalleryObject;
 class FmFormModel;
 class GalleryTheme;
+class GalleryThemeEntry;
 
 class SVXCORE_DLLPUBLIC GalleryBinaryEngine
 {
@@ -46,6 +47,8 @@ private:
 const GalleryStorageLocations& maGalleryStorageLocations;
 GalleryObjectCollection& mrGalleryObjectCollection;
 bool mbReadOnly;
+OUString m_aDestDir;
+bool m_bDestDirRelative;
 
 public:
 GalleryBinaryEngine(const GalleryStorageLocations& 
rGalleryStorageLocations,
@@ -54,6 +57,8 @@ public:
 
 void clearSotStorage();
 
+void setDestDir(const OUString& rDestDir, bool bRelative);
+
 SAL_DLLPRIVATE void ImplCreateSvDrawStorage();
 SAL_DLLPRIVATE const tools::SvRef& GetSvDrawStorage() const;
 
@@ -62,14 +67,12 @@ public:
 const INetURLObject& GetSdvURL() const { return 
maGalleryStorageLocations.GetSdvURL(); }
 const INetURLObject& GetStrURL() const { return 
maGalleryStorageLocations.GetStrURL(); }
 
-SAL_DLLPRIVATE bool implWrite(const GalleryTheme& rTheme);
+SAL_DLLPRIVATE bool implWrite(const GalleryTheme& rTheme, const 
GalleryThemeEntry* pThm);
 
-void insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, 
OUString& rDestDir,
-  sal_uInt32& rInsertPos);
+void insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, 
sal_uInt32& rInsertPos);
 
 std::unique_ptr implReadSgaObject(GalleryObject const* pEntry);
-bool implWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, 
GalleryObject* pExistentEntry,
-OUString& aDestDir);
+bool implWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, 
GalleryObject* pExistentEntry);
 
 bool readModel(const GalleryObject* pObject, SdrModel& rModel);
 SgaObjectSvDraw insertModel(const FmFormModel& rModel, const 
INetURLObject& rUserURL);
@@ -90,8 +93,9 @@ public:
 void updateTheme();
 static void insertFileOrDirURL(const INetURLObject& rFileOrDirURL,
std::vector& rURLVector);
-};
 
-SvStream& WriteGalleryTheme(SvStream& rOut, const GalleryTheme& rTheme);
+SvStream& writeGalleryTheme(SvStream& rOStm, const GalleryTheme& rTheme,
+const GalleryThemeEntry* pThm);
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 4c3748c7b145..97da3322044f 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -76,8 +75,6 @@ private:
 
 std::unique_ptr mpGalleryBinaryEngine;
 GalleryObjectCollection maGalleryObjectCollection;
-OUStringm_aDestDir;
-boolm_bDestDirRelative;
 Gallery*pParent;
 GalleryThemeEntry*  pThm;
 sal_uInt32  mnThemeLockCount;
@@ -112,8 +109,7 @@ public:
 const OUString& GetName() const;
 
 // used for building gallery themes during compilation:
-SAL_DLLPRIVATE void SetDestDir(const OUString& rDestDir, bool 
bRelative)
-{ m_aDestDir = rDestDir; m_bDestDirRelative = 
bRelative; }
+voidSetDestDir(const OUString& rDestDir, bool 
bRelative);
 
 SAL_DLLPRIVATE const INetURLObject& GetThmURL() const;
 const INetURLObject&GetSdgURL() const;
@@ -180,7 +176,6 @@ public:
 
 public:
 
-SAL_DLLPRIVATE SvStream&WriteData( SvStream& rOut ) const;
 SAL_DLLPRIVATE SvStream&ReadData( SvStream& rIn );
 static void InsertAllThemes(weld::ComboBox& rListBox);
 
diff --git a/svx/so

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

[Caolán McNamara (via logerrit)]

 cui/source/options/optaboutconfig.cxx  |4 +++-
 sc/source/ui/dialogs/searchresults.cxx |4 +++-
 svx/source/dialog/ctredlin.cxx |4 +++-
 sw/source/ui/misc/bookmark.cxx |4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 78876b03874915459f7ebe2135ac146ece92aaf4
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 11:28:04 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 20:13:22 2020 +0200

Related: tdf#136189 don't assert on unsetting non-existing previous sort 
column

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

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index cd91c4735048..f813c9a7c609 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -181,7 +181,9 @@ IMPL_LINK(CuiAboutConfigTabPage, HeaderBarClick, int, 
nColumn, void)
 }
 else
 {
-m_xPrefBox->set_sort_indicator(TRISTATE_INDET, 
m_xPrefBox->get_sort_column());
+int nOldSortColumn = m_xPrefBox->get_sort_column();
+if (nOldSortColumn != -1)
+m_xPrefBox->set_sort_indicator(TRISTATE_INDET, nOldSortColumn);
 m_xPrefBox->set_sort_column(nColumn);
 }
 
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index 950726a18c4e..0f94c64f32e7 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -196,7 +196,9 @@ IMPL_LINK(SearchResultsDlg, HeaderBarClick, int, nColumn, 
void)
 }
 else
 {
-mxList->set_sort_indicator(TRISTATE_INDET, mxList->get_sort_column());
+int nOldSortColumn = mxList->get_sort_column();
+if (nOldSortColumn != -1)
+mxList->set_sort_indicator(TRISTATE_INDET, nOldSortColumn);
 mxList->set_sort_column(nColumn);
 }
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 3b07ab66fb9d..2980d80ba6b2 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -111,7 +111,9 @@ IMPL_LINK(SvxRedlinTable, HeaderBarClick, int, nColumn, 
void)
 }
 else
 {
-pTreeView->set_sort_indicator(TRISTATE_INDET, 
pTreeView->get_sort_column());
+int nOldSortColumn = pTreeView->get_sort_column();
+if (nOldSortColumn != -1)
+pTreeView->set_sort_indicator(TRISTATE_INDET, nOldSortColumn);
 pTreeView->set_sort_column(nColumn);
 }
 
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 852a74c0d529..e62f778cc68c 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -362,7 +362,9 @@ IMPL_LINK(SwInsertBookmarkDlg, HeaderBarClick, int, 
nColumn, void)
 }
 else
 {
-m_xBookmarksBox->set_sort_indicator(TRISTATE_INDET, 
m_xBookmarksBox->get_sort_column());
+int nOldSortColumn = m_xBookmarksBox->get_sort_column();
+if (nOldSortColumn != -1)
+m_xBookmarksBox->set_sort_indicator(TRISTATE_INDET, 
nOldSortColumn);
 m_xBookmarksBox->set_sort_column(nColumn);
 }
 
___
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/findreplacedialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a39a107af190cac7105b1dafdd7ec01e8da6
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 12:39:16 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 20:13:51 2020 +0200

Resolves: tdf#123825 reassign mnemonic for Diacritic-sensitive

since

commit beeef93480fae65840646e4e36aa888efe92579a
Date:   Tue Mar 8 19:54:57 2016 +0530

the "Search For" label is invisible

so the _S can be safely removed from that and assigned to 
Diacritic-sensitive
instead, removing the dup _r assignment leaving only Replace using _r

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

diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index 4b8dfdb1371e..cee932875ea8 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -325,7 +325,7 @@
 
   
 False
-_Search For
+Search For
 True
 
   
@@ -836,7 +836,7 @@
 
 
   
-Diac_ritic-sensitive
+Diacritic-_sensitive
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/table/tabledlg.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 377525be476b989556339253fa073242058428a7
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 14:40:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 21:16:27 2020 +0200

duplicate line

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

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 77cf26c43042..09be137b1838 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1517,7 +1517,6 @@ void   SwTextFlowPage::Reset( const SfxItemSet* rSet )
 m_xPgBrkBeforeRB->set_sensitive(true);
 m_xPgBrkAfterRB->set_sensitive(true);
 m_xPageCollCB->set_sensitive(true);
-m_xPgBrkCB->set_active(true);
 
 m_xPgBrkCB->set_active(true);
 m_xColBrkRB->set_active( false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 3ba1144cb96c710e665ffb3ada26fb6a48a03472
Author: Miklos Vajna 
AuthorDate: Mon Aug 31 13:34:17 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Aug 31 21:28:14 2020 +0200

xmlsecurity: fix infobar vs signature dialog inconsistency

The infobar mentioned if a signature is partial, but the dialog just has
a bool UI for signatures. Then present "good, but partial" as "bad".

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

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index ff0ce32ec7d7..512df9a17460 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -605,8 +605,17 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 
 if ( bSigValid )
 {
-bSigValid = DocumentSignatureHelper::checkIfAllFilesAreSigned(
-  aElementsToBeVerified, rInfo, mode);
+if (maSignatureManager.getStore().is())
+{
+// XML based.
+bSigValid = 
DocumentSignatureHelper::checkIfAllFilesAreSigned(
+  aElementsToBeVerified, rInfo, mode);
+}
+else
+{
+// Assume PDF.
+bSigValid = !rInfo.bPartialDocumentSignature;
+}
 
 if( bSigValid )
 nValidSigs++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/tabsh.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 81f91196b98af38e29af451b86c26a893a109abc
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 15:23:58 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 21:57:10 2020 +0200

tdf#135636 the selection at dialog-launch time is lost by dialog-apply time

since...

commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98
Date:   Tue Jan 23 18:13:01 2018 +0100

lokdialog: Convert the Table -> Properties... to async exec.

so save it at launch and temp apply it during ok handler. This is somewhat
similar to tdf#134439

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

diff --git a/sw/source/uibase/shells/tabsh.cxx 
b/sw/source/uibase/shells/tabsh.cxx
index 3f1fca336f3a..1fa8f287fbff 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -596,9 +596,13 @@ void SwTableShell::Execute(SfxRequest &rReq)
 auto pRequest = std::make_shared(rReq);
 rReq.Ignore(); // the 'old' request is not relevant any more
 
-pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, 
&rBindings, &rSh](sal_Int32 nResult){
+auto xPaM(std::make_shared(*rSh.GetCursor(), nullptr)); 
// tdf#135636 make a copy to use at later apply
+pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, 
&rBindings, &rSh, xPaM](sal_Int32 nResult){
 if (RET_OK == nResult)
 {
+rSh.Push();  // save current cursor on 
stack
+rSh.SetSelection(*xPaM); // tdf#135636 set the table 
selected at dialog launch as current selection
+
 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
 //to record FN_INSERT_TABLE correctly
@@ -606,6 +610,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
 pRequest->Done(*pOutSet);
 
 ItemSetToTableParam(*pOutSet, rSh);
+
+rSh.Pop(SwCursorShell::PopMode::DeleteCurrent); // 
restore cursor from stack
 }
 
 rBindings.Update(SID_RULER_BORDERS);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/layout/frmtool.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 56db540f6b97cb7616e68308355e7930d3d64539
Author: Michael Stahl 
AuthorDate: Fri Aug 28 22:05:06 2020 +0200
Commit: Caolán McNamara 
CommitDate: Mon Aug 31 21:58:41 2020 +0200

tdf#135001 sw_redlinehide: fix IsShown() for AT_PARA flys

There is one merged text frame from node 102 to node 328 with no
extents, and of course a shape anchored at node 271 should not be
visible at all.

This crashes because the shape was removed from the layout during
CheckParaRedlineMerge() but then moved to the visible heaven layer
again via sw::AddRemoveFlysAnchoredToFrameStartingAtNode() and the
layer determines if it's visible as far as Sdr* is concerned;
it lacks a connection to a SwFrame though.

warn:legacy.osl:3547848:3547848:sw/source/core/layout/paintfrm.cxx:3861: 
 - paint of drawing object without anchor frame!?

(regression from 6aaae44da382f4bc3eafc287b4a21734b740cf21)

Change-Id: Ia20449b3a7d251f0c049eb979c88df1e80cd7d5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101584
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 586750da40c5b332d2442ef24ae121795e88e903)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101673
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 7aed05b0bdce..f839d0b946b4 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1052,7 +1052,15 @@ static bool IsShown(sal_uLong const nIndex,
 {
 return false;
 }
-if (pIter && rAnch.GetAnchorId() != RndStdIds::FLY_AT_PARA)
+if (rAnch.GetAnchorId() == RndStdIds::FLY_AT_PARA)
+{
+return pIter == nullptr // not merged
+|| pIter != pEnd// at least one char visible in node
+|| !IsSelectFrameAnchoredAtPara(rAnchor,
+SwPosition(const_cast(*pFirstNode), 0),
+SwPosition(const_cast(*pLastNode), 
pLastNode->Len()));
+}
+if (pIter)
 {
 // note: frames are not sorted by anchor position.
 assert(pEnd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 jvmfwk/source/fwkbase.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit d6ffa7670fcd88befb16de387a6a0edc896c18aa
Author: Stephan Bergmann 
AuthorDate: Mon Aug 31 17:02:49 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 31 22:30:13 2020 +0200

Simplify some code involving SAL_PATHSEPARATOR and OString/OUStringBuffer

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

diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 7f3cd0a132ae..df84d7c77f9e 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -252,8 +252,7 @@ OString BootParams::getClasspath()
 char * pCp = getenv("CLASSPATH");
 if (pCp)
 {
-char szSep[] = {SAL_PATHSEPARATOR,0};
-sClassPath += OStringLiteral(szSep) + pCp;
+sClassPath += OStringChar(SAL_PATHSEPARATOR) + pCp;
 }
 SAL_INFO(
 "jfw.level2",
@@ -415,7 +414,6 @@ OUString getApplicationClassPath()
 
 OUStringBuffer buf;
 sal_Int32 index = 0;
-const char szClassPathSep[] = {SAL_PATHSEPARATOR,0};
 do
 {
 OUString token( sParams.getToken( 0, ' ', index ).trim() );
@@ -428,7 +426,7 @@ OUString getApplicationClassPath()
 if (rc == osl_File_E_None && !systemPathElement.isEmpty())
 {
 if (buf.getLength() > 0)
-buf.append( szClassPathSep );
+buf.append( SAL_PATHSEPARATOR );
 buf.append( systemPathElement );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/source/app/watchdog.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 9f60ee1b57ada579d1afe2fe322af53f211c4549
Author: Stephan Bergmann 
AuthorDate: Mon Aug 31 17:43:35 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 31 23:07:31 2020 +0200

Clean up some SAL_WARN argument streaming

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

diff --git a/vcl/source/app/watchdog.cxx b/vcl/source/app/watchdog.cxx
index 588cf6d579be..f43f708b1eb4 100644
--- a/vcl/source/app/watchdog.cxx
+++ b/vcl/source/app/watchdog.cxx
@@ -56,8 +56,7 @@ template  struct WatchdogHelper
 if (!bFired)
 {
 gbWatchdogFiring = true;
-SAL_WARN("vcl.watchdog",
- OStringLiteral("Watchdog triggered: hard disable 
") + Zone::name());
+SAL_WARN("vcl.watchdog", "Watchdog triggered: hard disable 
" << Zone::name());
 Zone::hardDisable();
 gbWatchdogFiring = false;
 }
@@ -66,8 +65,7 @@ template  struct WatchdogHelper
 // we can hang using VCL in the abort handling -> be impatient
 if (bAbortFired)
 {
-SAL_WARN("vcl.watchdog",
- OStringLiteral("Watchdog gave up: hard exiting ") 
+ Zone::name());
+SAL_WARN("vcl.watchdog", "Watchdog gave up: hard exiting " 
<< Zone::name());
 _Exit(1);
 }
 }
@@ -77,8 +75,7 @@ template  struct WatchdogHelper
 {
 if (!bAbortFired)
 {
-SAL_WARN("vcl.watchdog",
- OStringLiteral("Watchdog gave up: aborting ") + 
Zone::name());
+SAL_WARN("vcl.watchdog", "Watchdog gave up: aborting " << 
Zone::name());
 gbWatchdogFiring = true;
 std::abort();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit bc9cb2e6bb7dce18303c2713ae6bd89a32fb46e3
Author: Jim Raykowski 
AuthorDate: Sun Aug 30 13:48:23 2020 -0800
Commit: Jim Raykowski 
CommitDate: Mon Aug 31 23:22:25 2020 +0200

remove unneeded include

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

diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx 
b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
index 2bbc55504e95..7ab66b9c3291 100644
--- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
+++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sax/qa/cppunit/xmlimport.cxx |   31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 0ccee5537371ea38265c2893fe110ca4f2f1492b
Author: Stephan Bergmann 
AuthorDate: Mon Aug 31 14:46:48 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 31 23:34:30 2020 +0200

Simplify code with std::string_view

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

diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index 97406d88310d..b6bd71728019 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -254,9 +255,9 @@ void SAL_CALL NSDocumentHandler::startElement( const 
OUString& aName, const Refe
 class DummyTokenHandler : public sax_fastparser::FastTokenHandlerBase
 {
 public:
-const static OStringLiteral tokens[];
+const static std::string_view tokens[];
 const static OUStringLiteral namespaceURIs[];
-const static OStringLiteral namespacePrefixes[];
+const static std::string_view namespacePrefixes[];
 
 // XFastTokenHandler
 virtual Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken 
) override;
@@ -265,26 +266,26 @@ public:
 virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) 
const override;
 };
 
-const OStringLiteral DummyTokenHandler::tokens[] = {
-OStringLiteral("Signature"), OStringLiteral("CanonicalizationMethod"),
-OStringLiteral("Algorithm"), OStringLiteral("Type"),
-OStringLiteral("DigestMethod"), OStringLiteral("Reference"),
-OStringLiteral("document"), OStringLiteral("spacing"),
-OStringLiteral("Player"), OStringLiteral("Height") };
+const std::string_view DummyTokenHandler::tokens[] = {
+"Signature", "CanonicalizationMethod",
+"Algorithm", "Type",
+"DigestMethod", "Reference",
+"document", "spacing",
+"Player", "Height" };
 
 const OUStringLiteral DummyTokenHandler::namespaceURIs[] = {
 u"http://www.w3.org/2000/09/xmldsig#";,
 u"http://schemas.openxmlformats.org/wordprocessingml/2006/main/";,
 u"xyzsports.com/players/football/" };
 
-const OStringLiteral DummyTokenHandler::namespacePrefixes[] = {
-OStringLiteral(""),
-OStringLiteral("w"),
-OStringLiteral("Player") };
+const std::string_view DummyTokenHandler::namespacePrefixes[] = {
+"",
+"w",
+"Player" };
 
 Sequence< sal_Int8 > DummyTokenHandler::getUTF8Identifier( sal_Int32 nToken )
 {
-OString aUtf8Token;
+std::string_view aUtf8Token;
 if ( ( nToken & 0x ) != 0 ) //namespace
 {
 sal_uInt32 nNamespaceToken = ( nToken >> 16 ) - 1;
@@ -298,7 +299,7 @@ Sequence< sal_Int8 > DummyTokenHandler::getUTF8Identifier( 
sal_Int32 nToken )
 aUtf8Token = tokens[ nElementToken ];
 }
 Sequence< sal_Int8 > aSeq( reinterpret_cast< const sal_Int8* >(
-aUtf8Token.getStr() ), aUtf8Token.getLength() );
+aUtf8Token.data() ), aUtf8Token.size() );
 return aSeq;
 }
 
@@ -310,7 +311,7 @@ sal_Int32 DummyTokenHandler::getTokenFromUTF8( const 
uno::Sequence< sal_Int8 >&
 
 sal_Int32 DummyTokenHandler::getTokenDirect( const char* pToken, sal_Int32 
nLength ) const
 {
-OString sToken( pToken, nLength );
+std::string_view sToken( pToken, nLength );
 for( size_t  i = 0; i < SAL_N_ELEMENTS(tokens); i++ )
 {
 if ( tokens[i] == sToken )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 sc/source/filter/xml/xmlcelli.cxx |   15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 35585f85049fd20719c42d7d7433859df59a0967
Author: Pranam Lashkari 
AuthorDate: Fri Aug 28 00:46:06 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Aug 31 23:39:38 2020 +0200

LOK: do not show calc notes in the online

Change-Id: I3d69aab2a76948182483025536dbc4ddc928a86e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101500
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 413f4bc4d54785d3953a03948276c8d9bb1f3397)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101465
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 1551fb9fbb6f..db4ce95cda52 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -95,6 +95,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace xmloff::token;
@@ -862,7 +863,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const 
ScAddress& rPos)
 
 /*  Try to reuse the drawing object already created (but only if the
 note is visible, and the object is a caption object). */
-if( mxAnnotationData->mbShown && mxAnnotationData->mbUseShapePos )
+if( mxAnnotationData->mbShown && mxAnnotationData->mbUseShapePos && 
!comphelper::LibreOfficeKit::isActive())
 {
 if( SdrCaptionObj* pCaption = dynamic_cast< SdrCaptionObj* >( 
pObject ) )
 {
@@ -896,9 +897,19 @@ void ScXMLTableRowCellContext::SetAnnotation(const 
ScAddress& rPos)
 if (xOutlinerObj)
 {
 // create cell note with all data from drawing object
-pNote = ScNoteUtil::CreateNoteFromObjectData( *pDoc, rPos,
+if(!comphelper::LibreOfficeKit::isActive())
+{
+pNote = ScNoteUtil::CreateNoteFromObjectData( *pDoc, rPos,
 std::move(xItemSet), xOutlinerObj.release(),
 aCaptionRect, mxAnnotationData->mbShown );
+}
+else
+{
+pNote = ScNoteUtil::CreateNoteFromObjectData( *pDoc, rPos,
+std::move(xItemSet), xOutlinerObj.release(),
+aCaptionRect, false );
+}
+
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 433b108c50752be9f0416c6b330ad8e03c4dc288
Author: Tamás Zolnai 
AuthorDate: Mon Aug 31 16:16:31 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Sep 1 00:20:18 2020 +0200

cypress: simplify this.

Change-Id: I4b055f13caebd7f034c4aa8aea724aff300c113d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101766
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index e0679bf7b..16bbc28c4 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -47,7 +47,7 @@ SPACE :=$(EMPTY) $(EMPTY)
 
 CORE_VERSION := $(subst $(SPACE),_,$(shell "@LO_PATH@"/program/soffice.bin 
--version 2> /dev/null))
 
-BROWSER:=$(if $(shell echo $$CYPRESS_BROWSER),$(shell echo 
$$CYPRESS_BROWSER),$(CHROME))
+BROWSER:=$(if $(CYPRESS_BROWSER),$(CYPRESS_BROWSER),$(CHROME))
 
 if ENABLE_DEBUG
 FILTER_DEBUG=cypress:electron,cypress:launcher
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ahmed ElShreif (via logerrit)]

 sc/source/ui/drawfunc/fudraw.cxx |   19 +++
 sc/source/ui/view/viewfun6.cxx   |   19 +++
 uitest/ui_logger_dsl/Special_commands.tx |   12 +++-
 uitest/ui_logger_dsl/dsl_core.py |   28 
 vcl/source/uitest/logger.cxx |   12 
 5 files changed, 89 insertions(+), 1 deletion(-)

New commits:
commit fe3d005155a8670d02ff1a8d17f1bcff74a44cab
Author: Ahmed ElShreif 
AuthorDate: Tue Aug 25 23:35:08 2020 +0200
Commit: Ahmed ElShreif 
CommitDate: Tue Sep 1 01:24:53 2020 +0200

uilogger : Add support in the Logger and DSL for Calc-Comments

For example the DSL syntax will be:
>>Open Comment
>>Close Comment

The set text is already added by default to the system

Change-Id: Ic06e00e75e202eece82fa6265e1bb4083fd8c337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101502
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 36abddf039f5..701790120bd6 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -37,6 +39,22 @@
 #include 
 #include 
 
+namespace
+{
+
+void collectUIInformation( const OUString& aevent )
+{
+EventDescription aDescription;
+aDescription.aID =  "grid_window";
+aDescription.aParameters = {{ aevent ,  ""}};
+aDescription.aAction = "COMMENT";
+aDescription.aParent = "MainWindow";
+aDescription.aKeyWord = "ScGridWinUIObject";
+UITestLogger::getInstance().logEvent(aDescription);
+}
+
+}
+
 // base class for draw module specific functions
 FuDraw::FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, const SfxRequest& rReq)
@@ -179,6 +197,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
 case KEY_ESCAPE:
 if ( rViewShell.IsDrawTextShell() || aSfxRequest.GetSlot() == 
SID_DRAW_NOTEEDIT )
 {
+collectUIInformation("CLOSE");
 // if object selected -> normal draw-shell, else turn off 
drawing
 rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), 
SfxCallMode::SLOT | SfxCallMode::RECORD);
 bReturn = true;
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index d9c664ee3e23..1332f94e4f07 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -46,6 +48,22 @@
 
 #include 
 
+namespace
+{
+
+void collectUIInformation( const OUString& aevent )
+{
+EventDescription aDescription;
+aDescription.aID =  "grid_window";
+aDescription.aParameters = {{ aevent ,  ""}};
+aDescription.aAction = "COMMENT";
+aDescription.aParent = "MainWindow";
+aDescription.aKeyWord = "ScGridWinUIObject";
+UITestLogger::getInstance().logEvent(aDescription);
+}
+
+}
+
 using ::std::vector;
 
 void ScViewFunc::DetectiveAddPred()
@@ -520,6 +538,7 @@ void ScViewFunc::EditNote()
 
 ScTabView::OnLOKNoteStateChanged( pNote );
 }
+collectUIInformation("OPEN");
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uitest/ui_logger_dsl/Special_commands.tx 
b/uitest/ui_logger_dsl/Special_commands.tx
index 601a600f4bdb..9a8dc4cff6c4 100644
--- a/uitest/ui_logger_dsl/Special_commands.tx
+++ b/uitest/ui_logger_dsl/Special_commands.tx
@@ -69,6 +69,8 @@ writer_Insert_BreakPage:
 10)  Paste Cells
 11) Merge Cells
 12) Unmerge Cells
+13) Open Comment
+14) Close Comment
 
   then we can add whatever we need in the future
 */
@@ -76,7 +78,8 @@ calc_command:
   calc_Type_command | calc_switch_sheet | calc_Select_cell | 
calc_AutoFill_filter |
   calc_SelectMenu_filter | calc_Delete_Cells | calc_Remove_Content | 
calc_insert_cells |
   calc_Cut_Cells | calc_Copy_Cells | calc_Paste_Cells | calc_UNMerge_Cells | 
-  calc_Merge_Cells | calc_Rename_Sheet | calc_Insert_sheet
+  calc_Merge_Cells | calc_Rename_Sheet | calc_Insert_sheet | calc_Open_Comment 
|
+  calc_Close_Comment
 ;
 calc_Type_command:
   'Type on current cell' what_to_type=Type_options
@@ -129,6 +132,13 @@ calc_Rename_Sheet:
 calc_Insert_sheet:
 'Insert New Tab '
 ;
+calc_Open_Comment:
+'Open Comment' (txt=STRING)?
+;
+calc_Close_Comment:
+'Close Comment' (txt=STRING)?
+;
+
 //this is the select options
 select_options:
 one_cell | range_of_cells
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index 8fa7d141c2c3..062415f00fb1 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -113,6 +113,8 @@ class ul_Compiler:
 "calc_Type_command": self.handle_calc_Type_command,
 "calc_AutoFill_filter": se

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/src/map/Map.js |   18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit dfd77d44836661472908993cbedcef41996c3487
Author: Jan Holesovsky 
AuthorDate: Tue Sep 1 01:39:07 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Sep 1 01:49:04 2020 +0200

calc canvas: Fix occasional off-by-one error that results in a blurry 
canvas.

The core of the fix is in _getNewPixelOrigin() where the round() behaves
non-predictably / inconsistently with the rest of the code, causing
random off-by-one error that shows (or not) depending on the window
size.

The biggest problem of this is that this off-by-one is then multiplied
somewhere by the zoom factor, causing the canvas being completely
blurry; but eventually when the user clicked into the sheet, it
'magically' fixed itself.

The rest of the changes (in setZoom()) should actually do the same thing
as the previous code, but using existing methods, instead of computing
the shifts manually.

Change-Id: If0ecb1301b7c1e65cfe8126385ef959c584c5d16

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 84a286eb6..718af8b05 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -474,6 +474,8 @@ L.Map = L.Evented.extend({
this._zoom = this._limitZoom(zoom);
return this;
}
+
+   var curCenter = this.getCenter();
if (this._docLayer && this._docLayer._docType === 
'spreadsheet') {
// for spreadsheets, when the document is smaller than 
the viewing area
// we want it to be glued to the row/column headers 
instead of being centered
@@ -483,14 +485,18 @@ L.Map = L.Evented.extend({
var sheetGeom = calcLayer.sheetGeometry;
var cellRange = sheetGeom.getViewCellRange();
var col = cellRange.columnrange.start, row = 
cellRange.rowrange.start;
-   var zoomScaleAbs = Math.pow(1.2, (zoom - 
this.options.zoom));
+   var zoomScaleAbs = this.zoomToFactor(zoom);
+
var newTopLeftPx = sheetGeom.getCellRect(col, 
row, zoomScaleAbs).getTopLeft();
-   var newCenterPx = 
newTopLeftPx.add(this.getSize().divideBy(2)._floor());
-   var newCenterLatLng = 
this.unproject(newCenterPx, zoom);
+   var moveByPoint = 
this._getTopLeftPoint(curCenter, zoom).subtract(newTopLeftPx);
+
+   // move the center (which is in LatLng) by the 
computed amount of pixels
+   var newCenterLatLng = 
this.unproject(this.project(curCenter, zoom).subtract(moveByPoint), zoom);
+
return this.setView(newCenterLatLng, zoom, 
{zoom: options});
}
}
-   var curCenter = this.getCenter();
+
if (this._docLayer && this._docLayer._visibleCursor && 
this.getBounds().contains(this._docLayer._visibleCursor.getCenter())) {
// Calculate new center after zoom. The intent is that 
the caret
// position stays the same.
@@ -1671,13 +1677,13 @@ L.Map = L.Evented.extend({
var pixelOrigin = center && zoom !== undefined ?
this._getNewPixelOrigin(center, zoom) :
this.getPixelOrigin();
+
return pixelOrigin.subtract(this._getMapPanePos());
},
 
_getNewPixelOrigin: function (center, zoom) {
var viewHalf = this.getSize()._divideBy(2);
-   // TODO round on display, not calculation to increase precision?
-   return this.project(center, 
zoom)._subtract(viewHalf)._add(this._getMapPanePos())._round();
+   return this.project(center, 
zoom)._subtract(viewHalf)._add(this._getMapPanePos())._floor();
},
 
_latLngToNewLayerPoint: function (latlng, zoom, center) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ahmed ElShreif (via logerrit)]

 sw/source/uibase/docvw/AnnotationWin.cxx  |   19 +++
 sw/source/uibase/docvw/AnnotationWin2.cxx |   16 ++
 uitest/ui_logger_dsl/Special_commands.tx  |   34 +
 uitest/ui_logger_dsl/dsl_core.py  |   75 ++
 vcl/source/uitest/logger.cxx  |   18 +++
 5 files changed, 161 insertions(+), 1 deletion(-)

New commits:
commit 2e635d22cdbfcfe163b46427d04ebce9fe21a61e
Author: Ahmed ElShreif 
AuthorDate: Fri Aug 28 03:11:44 2020 +0200
Commit: Ahmed ElShreif 
CommitDate: Tue Sep 1 03:36:53 2020 +0200

uilogger : Add support in the Logger and DSL for Writer-Comments

For example the DSL syntax will be:
>>Delete Comment1
>>Leave Comment1
>>Show Comment1
>>Hide Comment1
>>Resolve Comment1

Change-Id: Ibdd52f3a12f1679f80e9f3290868c77fbf942d6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101513
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx 
b/sw/source/uibase/docvw/AnnotationWin.cxx
index 579323fd40ef..db719948df8b 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -31,6 +31,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -67,6 +69,21 @@
 
 #include 
 
+namespace{
+
+void collectUIInformation( const OUString& aevent , const OUString& aID )
+{
+EventDescription aDescription;
+aDescription.aID =  aID;
+aDescription.aParameters = {{"" ,  ""}};
+aDescription.aAction = aevent;
+aDescription.aParent = "MainWindow";
+aDescription.aKeyWord = "SwEditWinUIObject";
+UITestLogger::getInstance().logEvent(aDescription);
+}
+
+}
+
 namespace sw::annotation {
 
 SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
@@ -245,6 +262,7 @@ void SwAnnotationWin::SetResolved(bool resolved)
 mbResolvedStateUpdated = true;
 UpdateData();
 Invalidate();
+collectUIInformation("SETRESOLVED",get_id());
 }
 
 void SwAnnotationWin::ToggleResolved()
@@ -307,6 +325,7 @@ void SwAnnotationWin::UpdateData()
 
 void SwAnnotationWin::Delete()
 {
+collectUIInformation("DELETE",get_id());
 if (!mrView.GetWrtShellPtr()->GotoField(*mpFormatField))
 return;
 
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx 
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 633b8ebe00d8..10493e45a04a 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -58,6 +58,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -80,6 +82,17 @@ using namespace sw::sidebarwindows;
 namespace
 {
 
+void collectUIInformation( const OUString& aevent , const OUString& aID )
+{
+EventDescription aDescription;
+aDescription.aID =  aID;
+aDescription.aParameters = {{"" ,  ""}};
+aDescription.aAction = aevent;
+aDescription.aParent = "MainWindow";
+aDescription.aKeyWord = "SwEditWinUIObject";
+UITestLogger::getInstance().logEvent(aDescription);
+}
+
 /// Translate absolute <-> relative twips: LOK wants absolute coordinates as 
output and gives absolute coordinates as input.
 void lcl_translateTwips(vcl::Window const & rParent, vcl::Window& rChild, 
MouseEvent* pMouseEvent)
 {
@@ -1126,6 +1139,7 @@ void SwAnnotationWin::ShowNote()
 
 // Invalidate.
 InvalidateControl();
+collectUIInformation("SHOW",get_id());
 }
 
 void SwAnnotationWin::HideNote()
@@ -1141,6 +1155,7 @@ void SwAnnotationWin::HideNote()
 }
 if (mpShadow && mpShadow->isVisible())
 mpShadow->setVisible(false);
+collectUIInformation("HIDE",get_id());
 }
 
 void SwAnnotationWin::InvalidateControl()
@@ -1510,6 +1525,7 @@ void SwAnnotationWin::SwitchToFieldPos()
 if (aCount)
 mrView.GetDocShell()->GetWrtShell()->SwCursorShell::Right(aCount, 0);
 GrabFocusToDocument();
+collectUIInformation("LEAVE",get_id());
 }
 
 void SwAnnotationWin::SetChangeTracking( const SwPostItHelper::SwLayoutStatus 
aLayoutStatus,
diff --git a/uitest/ui_logger_dsl/Special_commands.tx 
b/uitest/ui_logger_dsl/Special_commands.tx
index 9a8dc4cff6c4..9d37029a5e95 100644
--- a/uitest/ui_logger_dsl/Special_commands.tx
+++ b/uitest/ui_logger_dsl/Special_commands.tx
@@ -26,7 +26,7 @@ SpecialCommand:
 writer_command:
 writer_Type_command | writer_Select_command | writer_GOTO_command |
 writer_Create_table | writer_Copy_Text | writer_Cut_Text |
-writer_Paste_Text | writer_Insert_BreakPage
+writer_Paste_Text | writer_Insert_BreakPage | writer_Comment_command
 ;
 writer_Type_command:
   'Type on writer' what_to_type=Type_options
@@ -220,4 +220,36 @@ draw_Delete_Page:
 ;
 draw_Rename_Page:
 'Rename The Selected Page from ' old_name=STRING 'to' new_name=STRING
+;
+
+//=//
+/*
+  This part for all the Writer Comment statements:
+
+1) Leave
+

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

[Mike Kaganski (via logerrit)]

 cui/source/dialogs/about.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca7caf212a90b6e4290782159cbdbb36e4538f19
Author: Mike Kaganski 
AuthorDate: Mon Aug 31 15:37:33 2020 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 1 07:31:03 2020 +0200

Fix warning condition

Missed that I needed to reverse the condition when replacing OSL_ENSURE
with SAL_WARN_IF in 37f452bc2beeae9b4648013a3bf4f2e8b56c0c85.

Thanks Julien for noticing!

Change-Id: Id24216e11ca970b05aac40a09ed02cdbb4cf9865
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101678
Reviewed-by: Julien Nabet 
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 69fdc922c994..558f54b3da0e 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -158,7 +158,7 @@ OUString AboutDialog::GetVersionString() {
 OUString AboutDialog::GetBuildString()
 {
   OUString sBuildId(utl::Bootstrap::getBuildIdData(""));
-  SAL_WARN_IF(!sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap 
file");
+  SAL_WARN_IF(sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap 
file");
 
   return sBuildId;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sc/qa/extras/macros-test.cxx   |4 
 sc/qa/extras/testdocuments/NamesSheetLocal.xls |binary
 sc/source/ui/vba/vbaworksheet.cxx  |5 +
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 8f44418fa36fa5475fca1dab664a85bd47386297
Author: Mike Kaganski 
AuthorDate: Fri Aug 28 09:26:15 2020 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 1 07:31:37 2020 +0200

tdf#136233: Use sheet-local named ranges for VBA's Worksheet.Names

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

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index df2a1583edd4..5e6aa3d263fc 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -303,6 +303,10 @@ void ScMacrosTest::testVba()
 OUString("Names."),
 
OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
 },
+{
+OUString("NamesSheetLocal."),
+
OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+},
 {
 OUString("vba_endFunction."),
 
OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
diff --git a/sc/qa/extras/testdocuments/NamesSheetLocal.xls 
b/sc/qa/extras/testdocuments/NamesSheetLocal.xls
new file mode 100644
index ..9086d62a1f36
Binary files /dev/null and b/sc/qa/extras/testdocuments/NamesSheetLocal.xls 
differ
diff --git a/sc/source/ui/vba/vbaworksheet.cxx 
b/sc/source/ui/vba/vbaworksheet.cxx
index 57aca4796e41..91cfcd09a6f8 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -748,10 +748,7 @@ ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex )
 uno::Any SAL_CALL
 ScVbaWorksheet::Names( const css::uno::Any& aIndex )
 {
-// fake sheet-local names by returning all global names
-// #163498# initialize Names object with correct parent (this worksheet)
-// TODO: real sheet-local names...
-uno::Reference< beans::XPropertySet > xProps( mxModel, 
uno::UNO_QUERY_THROW );
+css::uno::Reference xProps(getSheet(), 
css::uno::UNO_QUERY_THROW);
 uno::Reference< sheet::XNamedRanges > xNamedRanges(  
xProps->getPropertyValue("NamedRanges"), uno::UNO_QUERY_THROW );
 uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, 
xNamedRanges, mxModel ) );
 if ( aIndex.hasValue() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 formula/source/ui/dlg/funcpage.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a3035a228f14f81a3db8cdbf6113edfc1358a616
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 10:09:51 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Sep 1 07:39:59 2020 +0200

tdf#136269 give search entry initial focus

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

diff --git a/formula/source/ui/dlg/funcpage.cxx 
b/formula/source/ui/dlg/funcpage.cxx
index 56162a45a1d9..e8370d54938d 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -70,6 +70,8 @@ FuncPage::FuncPage(weld::Container* pParent, const 
IFunctionManager* _pFunctionM
 m_xLbFunction->connect_row_activated( LINK( this, FuncPage, DblClkHdl ) );
 m_xLbFunction->connect_key_press( LINK( this, FuncPage, KeyInputHdl ) );
 m_xLbFunctionSearchString->connect_changed( LINK( this, FuncPage, 
ModifyHdl ) );
+
+m_xLbFunctionSearchString->grab_focus();
 }
 
 FuncPage::~FuncPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css

[Szymon Kłos (via logerrit)]

 loleaflet/css/loleaflet.css |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0124eb773d8e400964cc9eaf5f6b85a07460d158
Author: Szymon Kłos 
AuthorDate: Mon Aug 31 14:35:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Sep 1 07:44:23 2020 +0200

Fix blinking cursor

Change-Id: I723dcfc06e07d3d5a83e64eee812d3084dc8378c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101728
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 90f4afced..75b4a53a2 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -545,10 +545,10 @@ body {
 }
 
 .lokblink {
-animation: blink 150ms infinite alternate;
+animation: lokblink 150ms infinite alternate;
 }
 
-@keyframes blink {
+@keyframes lokblink {
 from { opacity:1; }
 to { opacity:0; }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 sd/uiconfig/simpress/ui/notebookbar.ui |  132 -
 1 file changed, 66 insertions(+), 66 deletions(-)

New commits:
commit 76fd25165b8c0e4a409becb4dbd9042a7cbe6a39
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:46:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Sep 1 07:47:48 2020 +0200

notebookbar: keep align items together

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

diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 037bf18b0348..27a432bdefd1 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -11203,17 +11203,6 @@
 True
 icons
 False
-
-  
-True
-False
-.uno:ObjectAlignLeft
-  
-  
-False
-True
-  
-
   
   
 False
@@ -11227,17 +11216,6 @@
 True
 icons
 False
-
-  
-True
-False
-.uno:AlignUp
-  
-  
-False
-True
-  
-
   
   
 False
@@ -11301,6 +11279,17 @@
 True
 icons
 False
+
+  
+True
+False
+.uno:ObjectAlignLeft
+  
+  
+False
+True
+  
+
 
   
 True
@@ -11336,6 +11325,17 @@
 True
 icons
 False
+
+  
+True
+False
+.uno:AlignUp
+  
+  
+False
+True
+  
+
 
   
 True
@@ -12403,17 +12403,6 @@
 True
 icons
 False
-
-  
-True
-False
-.uno:ObjectAlignLeft
-  
-  
-False
-True
-  
-
   
   
 False
@@ -12427,17 +12416,6 @@
 True
 icons
   

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src

[gokaysatir (via logerrit)]

 loleaflet/css/device-mobile.css   |3 ++-
 loleaflet/src/control/Control.PartsPreview.js |3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit dcbaeb9ec1f6b2833815cf00e4dd4b62d635a180
Author: gokaysatir 
AuthorDate: Fri Aug 28 15:58:46 2020 +0300
Commit: Andras Timar 
CommitDate: Tue Sep 1 08:03:03 2020 +0200

loleaflet: Slides preview section improvements.

Change-Id: I4018cbc30d7b8b03f117bb229bf637706c70dc26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101546
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 9c23e570421c881647c6035fa6ba00cd203f7ea5)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101669

diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index c6f8e7d5f..ca860b9f3 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -700,8 +700,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button 
div.w2ui-icon, td[id
 .preview-frame-portrait {
max-height: 60px;
max-width: 100%;
-   display: table-cell;
+   display: inline-block;
padding-right: 1em;
+   margin: 0;
 }
 
 .preview-frame-portrait.preview-img-dropsite {
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index af553f552..e529fad22 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -62,6 +62,9 @@ L.Control.PartsPreview = L.Control.extend({
}
}
});
+
+   var scrollContainer = 
$(this._partsPreviewCont).find('.mCSB_container').get(0);
+   scrollContainer.style.whiteSpace = 'nowrap';
},
 
_updateDisabled: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/draw/dcontact.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a609bc9cc03a0a23c8f20fee808cc6cc2887170d
Author: Michael Stahl 
AuthorDate: Mon Aug 31 15:24:48 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 1 08:15:43 2020 +0200

tdf#135661 sw: fix Undo of text deletion of SdrObject

This creates a non-working SwXShape without m_pFormat initialised:

0  
SwXShape::SwXShape(com::sun::star::uno::Reference&,
 SwDoc const*) (this=0x278de80, xShape=uno::Reference to (SvxCustomShape *) 
0x73ec840, pDoc=0x0) at sw/source/core/unocore/unodraw.cxx:889
1  SwFmDrawPage::CreateShape(SdrObject*) const (this=0x637a980, 
pObj=0x6409410) at sw/source/core/unocore/unodraw.cxx:372
2  SdrObject::getUnoShape() (this=0x6409410) at 
svx/source/svdraw/svdobj.cxx:2836
3  GetXShapeForSdrObject(SdrObject*) (pObj=0x6409410) at 
svx/source/unodraw/unoshape.cxx:3928
4  SdrObjCustomShape::GetCustomShapeEngine() const (this=0x6409410) at 
svx/source/svdraw/svdoashp.cxx:381
5  SdrObjCustomShape::GetTextBounds(tools::Rectangle&) const 
(this=0x6409410, rTextBound=...) at svx/source/svdraw/svdoashp.cxx:534
6  SdrObjCustomShape::AdaptTextMinSize() (this=0x6409410) at 
svx/source/svdraw/svdoashp.cxx:1397
7  SdrObjCustomShape::NbcSetSnapRect(tools::Rectangle const&) 
(this=0x6409410, rRect=...) at svx/source/svdraw/svdoashp.cxx:1421
8  SdrObjCustomShape::handlePageChange(SdrPage*, SdrPage*) (this=0x6409410, 
pOldPage=0x0, pNewPage=0x627fc80) at svx/source/svdraw/svdoashp.cxx:2855
9  SdrObject::setParentOfSdrObject(SdrObjList*) (this=0x6409410, 
pNewObjList=0x627fc80) at svx/source/svdraw/svdobj.cxx:294
10 SetParentAtSdrObjectFromSdrObjList(SdrObject&, SdrObjList*) 
(rSdrObject=..., pNew=0x627fc80) at svx/source/svdraw/svdpage.cxx:65
11 SdrObjList::NbcInsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/svdraw/svdpage.cxx:305
12 SdrObjList::InsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/svdraw/svdpage.cxx:358
13 FmFormPage::InsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/form/fmpage.cxx:79
14 SwDrawContact::InsertMasterIntoDrawPage() (this=0x640d6b0) at 
sw/source/core/draw/dcontact.cxx:1909
15 SwDrawContact::SwClientNotify(SwModify const&, SfxHint const&) 
(this=0x640d6b0, rMod=..., rHint=...) at sw/source/core/draw/dcontact.cxx:1457
16 SwModify::CallSwClientNotify(SfxHint const&) const (this=0x640d090, 
rHint=...) at sw/source/core/attr/calbck.cxx:373
17 sw::BroadcastingModify::CallSwClientNotify(SfxHint const&) const 
(this=0x640d090, rHint=...) at sw/source/core/attr/calbck.cxx:378
18 SwUndoFlyBase::InsFly(sw::UndoRedoContext&, bool) (this=0x78cdfd0, 
rContext=..., bShowSelFrame=false) at sw/source/core/undo/undobj1.cxx:97
19 SwUndoDelLayFormat::UndoImpl(sw::UndoRedoContext&) (this=0x78cdfd0, 
rContext=...) at sw/source/core/undo/undobj1.cxx:440
20 SwHistoryTextFlyCnt::SetInDoc(SwDoc*, bool) (this=0x60d14c0, 
pDoc=0x625aa30) at sw/source/core/undo/rolbck.cxx:581

Whereas if the shape is selected and deleted that way, a completely
different Undo is created, which doesn't have this problem:

0  SwXShape::SetFrameFormat(SwFrameFormat*) (this=0x2497d50, 
pFormat=0x564b470) at sw/inc/unodraw.hxx:206
1  SwXShape::AddExistingShapeToFormat(SdrObject const&) (_rObj=...) at 
sw/source/core/unocore/unodraw.cxx:945
2  SwDrawContact::SwDrawContact(SwFrameFormat*, SdrObject*) 
(this=0x6bad330, pToRegisterIn=0x564b470, pObj=0x5647880) at 
sw/source/core/draw/dcontact.cxx:709
3  SwUndoDrawDelete::UndoImpl(sw::UndoRedoContext&) (this=0x56ebcd0, 
rContext=...) at sw/source/core/undo/undraw.cxx:501

In SwUndoDelLayFormat, the SdrObject is apparently removed from SdrPage
and the SwDrawContact remains, whereas in SwUndoDrawDelete, the
SdrObject remains on SdrPage but is moved to invisible layer, and
SwDrawContact is destroyed (presumably).

Include obligatory rant why sw has 2 undos doing the same thing here.

(reportedly regression from 2d89b9929e85bede4c72684a12e7508751875f0e
 but probably this can be triggered before, at least since
 91b2325808a75174f284c48c8b8afc118fad74e4)

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

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 0b6fffab9057..74cff2fd43bc 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1458,6 +1458,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, 
const SfxHint& rHint)
 // #i40845# - follow-up of #i35635#
 // move object to visible layer
 MoveObjToVisibleLayer(GetMaster()

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

[Michael Stahl (via logerrit)]

 sw/inc/node.hxx   |2 +-
 sw/source/core/docnode/ndsect.cxx |3 ++-
 sw/source/core/docnode/nodes.cxx  |7 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 1d6e919046ed353a9d9d86bb9f0332da2e9dea4d
Author: Michael Stahl 
AuthorDate: Mon Aug 31 17:57:26 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 1 08:15:53 2020 +0200

tdf#135056 sw_redlinehide: when moving sections to undo nodes-array,

... delete frames with utmost prejudice - the code that was checking
for empty frames or cells was going into infinite loop because
first the *outer* section is moved to the undo nodes array, then when
the *inner* (index header) section is moved, its section node's
m_pStartOfSection points to the section node that is already in
undo nodes array and so SwNodes::GoPrevSection() goes very wrong
and CheckNodesRange() is called with positions in 2 different arrays.

(regression from a60dd9ef1361c5925803acaa5292e99277d1faf3)

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

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index af48d95d5ec2..6f1fa1bae68f 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -551,7 +551,7 @@ public:
 
 /** Method deletes all views of document for the node. The
  content frames are removed from the respective layout. */
-void DelFrames(SwRootFrame const* pLayout = nullptr);
+void DelFrames(SwRootFrame const* pLayout = nullptr, bool bForce = false);
 
 /** Method creates all views of document for the previous node.
The content frames created are put into the respective layout. */
diff --git a/sw/source/core/docnode/ndsect.cxx 
b/sw/source/core/docnode/ndsect.cxx
index 7865ae68e33f..524aef0d3d1e 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1159,7 +1159,7 @@ void SwSectionNode::MakeOwnFrames(SwNodeIndex* 
pIdxBehind, SwNodeIndex* pEndIdx)
 }
 }
 
-void SwSectionNode::DelFrames(SwRootFrame const*const /*FIXME TODO*/)
+void SwSectionNode::DelFrames(SwRootFrame const*const /*FIXME TODO*/, bool 
const bForce)
 {
 sal_uLong nStt = GetIndex()+1, nEnd = EndOfSectionIndex();
 if( nStt >= nEnd )
@@ -1176,6 +1176,7 @@ void SwSectionNode::DelFrames(SwRootFrame const*const 
/*FIXME TODO*/)
 // If the Area is within a Fly or TableBox, we can only hide it if
 // there is more Content which has Frames.
 // Or else the Fly/TableBox Frame does not have a Lower!
+if (!bForce)
 {
 SwNodeIndex aIdx( *this );
 if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 14a93715772e..5be7ba5cf9cf 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -636,7 +636,12 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 
 SwSectionNode* pSctNd = pSttNd->GetSectionNode();
 if( bNewFrames && pSctNd )
-pSctNd->DelFrames();
+{   // tdf#135056 skip over code in DelFrames() that moves
+// SwNodeIndex around because in case of nested
+// sections, m_pStartOfSection will point between
+// undo nodes-array and doc nodes-array
+pSctNd->DelFrames(nullptr, true);
+}
 
 RemoveNode( aRg.aEnd.GetIndex(), 1, false ); // delete 
EndNode
 sal_uLong nSttPos = pSttNd->GetIndex();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 lotuswordpro/source/filter/lwpfrib.cxx |2 +-
 slideshow/source/engine/box2dtools.cxx |4 ++--
 slideshow/source/inc/box2dtools.hxx|8 
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 09619872fe0c0d677006bcf4e9a8febe2978d242
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 19:37:07 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Tue Sep 1 08:17:08 2020 +0200

Fix typos

Change-Id: Ieff77be89ee8505b8241234f6dbb7507256dbc4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101757
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/lotuswordpro/source/filter/lwpfrib.cxx 
b/lotuswordpro/source/filter/lwpfrib.cxx
index b8d42a680153..bc9450fd17bc 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -195,7 +195,7 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, 
LwpObjectStream* pObjStrm, sal_uInt
 break;
 }
 
-//Do not know why the fribTag judgement is necessary, to be checked with
+//Do not know why the fribTag judgment is necessary, to be checked with
 if (fribtag & FRIB_TAG_MODIFIER)
 {
 newFrib->SetModifiers(xModInfo.release());
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 1cc69b53632a..e863616b2187 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -408,7 +408,7 @@ void box2DWorld::initateAllShapesAsStaticBodies(
 SdrObject* pTemp = 
SdrObject::getSdrObjectFromXShape(pShape->getXShape());
 if (pTemp && pTemp->IsGroupObject())
 {
-// if it is a group object iterate over it's childs and flag 
them
+// if it is a group object iterate over its children and flag 
them
 SdrObjList* aObjList = pTemp->GetSubList();
 const size_t nObjCount(aObjList->GetObjCount());
 
@@ -614,7 +614,7 @@ double box2DWorld::stepAmount(const double fPassedTime, 
const float fTimeStep,
 // that the updates can be processed using that value
 double fTimeSteppedThrough = fTimeStep * nStepAmount;
 
-// do the updates required to simulate other animaton effects going in 
parallel
+// do the updates required to simulate other animation effects going in 
parallel
 processUpdateQueue(fTimeSteppedThrough);
 
 if (!mbAlreadyStepped)
diff --git a/slideshow/source/inc/box2dtools.hxx 
b/slideshow/source/inc/box2dtools.hxx
index 0f6707fbd7c6..c17fb1648a51 100644
--- a/slideshow/source/inc/box2dtools.hxx
+++ b/slideshow/source/inc/box2dtools.hxx
@@ -299,7 +299,7 @@ public:
  */
 Box2DBodySharedPtr makeShapeStatic(const 
slideshow::internal::ShapeSharedPtr& pShape);
 
-/** Create a static body that represeted by the shape's geometry
+/** Create a static body that is represented by the shape's geometry
 
 @return pointer to the box2d body
  */
@@ -325,20 +325,20 @@ public:
const ::basegfx::B2DVector& rVelocity,
const int nDelayForSteps = 0);
 
-/// Queue an appropraite update for the animation effect that is in 
parallel with a physics animation
+/// Queue an appropriate update for the animation effect that is in 
parallel with a physics animation
 void
 queueShapeAnimationUpdate(const css::uno::Reference& 
xShape,
   const 
slideshow::internal::ShapeAttributeLayerSharedPtr& pAttrLayer,
   const slideshow::internal::AttributeType 
eAttrType,
   const bool bIsFirstUpdate);
 
-/// Queue an appropraite update for a path animation that is in parallel 
with a physics animation
+/// Queue an appropriate update for a path animation that is in parallel 
with a physics animation
 void queueShapePathAnimationUpdate(
 const css::uno::Reference& xShape,
 const slideshow::internal::ShapeAttributeLayerSharedPtr& pAttrLayer,
 const bool bIsFirstUpdate);
 
-/// Queue an appropraite update for the animation effect that just ended
+/// Queue an appropriate update for the animation effect that just ended
 void queueShapeAnimationEndUpdate(const 
css::uno::Reference& xShape,
   const slideshow::internal::AttributeType 
eAttrType);
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 30a27a22e1ce..88f86f57da67 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1266,7 +1266,7 @@ 
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromTopMarginNoHeader,
 
 DECLARE_OOXMLEXPORT_TEST(testVmlShapeTextWordWrap, 
"tdf97618_testVmlShapeTextWordWrap.docx")
 {
-// tdf#97618 The text wraping of a shape was not handled in a canvas.
+   

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

[Andrea Gelmini (via logerrit)]

 include/comphelper/propertycontainerhelper.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 453c7070692b6adfdf019c50238dc48c66d2a590
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:12:06 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 08:43:43 2020 +0200

Fix typo

Change-Id: I57611e6bc3a8dadcdeb7aff99f4788aac4d7e105
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101799
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/comphelper/propertycontainerhelper.hxx 
b/include/comphelper/propertycontainerhelper.hxx
index 6564cc0f85b3..eb213e4541ec 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -86,7 +86,7 @@ protected:
 ~OPropertyContainerHelper();
 
 /** register a property. The property is represented through a member of 
the derived class which calls
-this methdod.
+this method.
 @param  _rName  the name of the property
 @param  _nHandlethe handle of the property
 @param  _nAttributesthe attributes of the property
@@ -100,7 +100,7 @@ protected:
 
 
 /** register a property. The property is represented through a 
css::uno::Any member of the
-derived class which calls this methdod.
+derived class which calls this method.
 @param  _rName  the name of the property
 @param  _nHandlethe handle of the property
 @param  _nAttributesthe attributes of the property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 dbaccess/source/ui/inc/TableCopyHelper.hxx  |2 +-
 dbaccess/source/ui/misc/TableCopyHelper.cxx |4 ++--
 svx/source/dialog/svxruler.cxx  |   12 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit bbeb4b91a56a1fd6db8ae1beb1a59007fb25de37
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 15:11:00 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 08:44:30 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Idf44d88678de415e38ddb542c198c0eac642aaae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101785
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx 
b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index b3f03e2a7ff2..e8db559c4c02 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -88,7 +88,7 @@ namespace dbaui
 { }
 };
 
-OTableCopyHelper(OGenericUnoController* _pControler);
+OTableCopyHelper(OGenericUnoController* _pController);
 
 /** pastes a table into the data source
 @param  _rPasteData
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx 
b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 596aa7335771..36d7ab70fa14 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -56,8 +56,8 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::ucb;
 
-OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler)
-:m_pController(_pControler)
+OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pController)
+:m_pController(_pController)
 {
 }
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 3efa537af181..16ee08d4413e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -68,7 +68,7 @@ struct SvxRuler_Impl {
 long   lLastRMargin;
 std::unique_ptr aProtectItem;
 std::unique_ptr pTextRTLItem;
-sal_uInt16 nControlerItems;
+sal_uInt16 nControllerItems;
 sal_uInt16 nIdx;
 sal_uInt16 nColLeftPix;
 sal_uInt16 nColRightPix;// Pixel values for left / right edge
@@ -85,7 +85,7 @@ struct SvxRuler_Impl {
 lOldWinPos(0), lMaxLeftLogic(0), lMaxRightLogic(0),
 lLastLMargin(0), lLastRMargin(0),
 aProtectItem(std::make_unique(SID_RULER_PROTECT)),
-nControlerItems(0), nIdx(0),
+nControllerItems(0), nIdx(0),
 nColLeftPix(0), nColRightPix(0),
 bIsTableRows(false),
 bIsTabsRelativeToIndent(true)
@@ -263,7 +263,7 @@ SvxRuler::SvxRuler(
 
 pCtrlItems[i++].reset(new SvxRulerItem(SID_RULER_PROTECT, *this, 
rBindings));
 pCtrlItems[i++].reset(new SvxRulerItem(SID_RULER_BORDER_DISTANCE, *this, 
rBindings));
-mxRulerImpl->nControlerItems=i;
+mxRulerImpl->nControllerItems=i;
 
 if( (nFlags & SvxRulerSupportFlags::SET_NULLOFFSET) == 
SvxRulerSupportFlags::SET_NULLOFFSET )
 SetExtraType(RulerExtra::NullOffset);
@@ -1627,10 +1627,10 @@ void SvxRuler::SetActive(bool bOn)
 {
 pBindings->EnterRegistrations();
 if(bOn)
-for(sal_uInt16 i=0;inControlerItems;i++)
+for(sal_uInt16 i=0;inControllerItems;i++)
 pCtrlItems[i]->ReBind();
 else
-for(sal_uInt16 j=0;jnControlerItems;j++)
+for(sal_uInt16 j=0;jnControllerItems;j++)
 pCtrlItems[j]->UnBind();
 pBindings->LeaveRegistrations();
 }
@@ -3210,7 +3210,7 @@ void SvxRuler::EndDrag()
 Ruler::EndDrag();
 if(bUndo)
 {
-for(sal_uInt16 i = 0; i < mxRulerImpl->nControlerItems; i++)
+for(sal_uInt16 i = 0; i < mxRulerImpl->nControllerItems; i++)
 {
 pCtrlItems[i]->ClearCache();
 pCtrlItems[i]->GetBindings().Invalidate(pCtrlItems[i]->GetId());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 161c748e3732e99ec3279a3f9effca6594ed1b03
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:08:01 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 08:45:47 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: I8448ea8e50b38364913982010b106a51f7549911
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101797
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 346672c2bb2a..1c7e60157aef 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -143,7 +143,7 @@ void setLegendOverlay(const 
css::uno::Reference& xModel, boo
 xLegendProp->setPropertyValue("Overlay", css::uno::Any(bOverlay));
 }
 
-bool isTitleVisisble(const css::uno::Reference& xModel, 
TitleHelper::eTitleType eTitle)
+bool isTitleVisible(const css::uno::Reference& xModel, 
TitleHelper::eTitleType eTitle)
 {
 css::uno::Reference xTitle = 
TitleHelper::getTitle(eTitle, xModel);
 if (!xTitle.is())
@@ -447,13 +447,13 @@ void ChartElementsPanel::updateData()
 mxCBLegendNoOverlay->set_sensitive(isLegendVisible(mxModel));
 mxCBLegendNoOverlay->set_active(!isLegendOverlay(mxModel));
 mxBoxLegend->set_sensitive(isLegendVisible(mxModel));
-mxCBTitle->set_active(isTitleVisisble(mxModel, TitleHelper::MAIN_TITLE));
-mxCBSubtitle->set_active(isTitleVisisble(mxModel, TitleHelper::SUB_TITLE));
-mxCBXAxisTitle->set_active(isTitleVisisble(mxModel, 
TitleHelper::X_AXIS_TITLE));
-mxCBYAxisTitle->set_active(isTitleVisisble(mxModel, 
TitleHelper::Y_AXIS_TITLE));
-mxCBZAxisTitle->set_active(isTitleVisisble(mxModel, 
TitleHelper::Z_AXIS_TITLE));
-mxCB2ndXAxisTitle->set_active(isTitleVisisble(mxModel, 
TitleHelper::SECONDARY_X_AXIS_TITLE));
-mxCB2ndYAxisTitle->set_active(isTitleVisisble(mxModel, 
TitleHelper::SECONDARY_Y_AXIS_TITLE));
+mxCBTitle->set_active(isTitleVisible(mxModel, TitleHelper::MAIN_TITLE));
+mxCBSubtitle->set_active(isTitleVisible(mxModel, TitleHelper::SUB_TITLE));
+mxCBXAxisTitle->set_active(isTitleVisible(mxModel, 
TitleHelper::X_AXIS_TITLE));
+mxCBYAxisTitle->set_active(isTitleVisible(mxModel, 
TitleHelper::Y_AXIS_TITLE));
+mxCBZAxisTitle->set_active(isTitleVisible(mxModel, 
TitleHelper::Z_AXIS_TITLE));
+mxCB2ndXAxisTitle->set_active(isTitleVisible(mxModel, 
TitleHelper::SECONDARY_X_AXIS_TITLE));
+mxCB2ndYAxisTitle->set_active(isTitleVisible(mxModel, 
TitleHelper::SECONDARY_Y_AXIS_TITLE));
 mxCBGridVerticalMajor->set_active(isGridVisible(mxModel, 
GridType::VERT_MAJOR));
 mxCBGridHorizontalMajor->set_active(isGridVisible(mxModel, 
GridType::HOR_MAJOR));
 mxCBGridVerticalMinor->set_active(isGridVisible(mxModel, 
GridType::VERT_MINOR));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8936af6c396236bc94a76f5bb3a95b02712d711e
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:27:31 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 08:47:39 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Ifd5198f76bc9e91c311364348cb8f5dc6e3fea87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101772
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl 
b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
index 725bc59db9cc..95d0d6b9d271 100644
--- a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
+++ b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
@@ -189,7 +189,7 @@
 
 
 
-
+
 
 
 
@@ -5318,10 +5318,10 @@
 
 
 
-
+
 
-
-
+
+
 
 
 
@@ -5357,7 +5357,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx |4 ++--
 chart2/source/controller/main/ChartController_Insert.cxx|4 ++--
 chart2/source/inc/AxisHelper.hxx|2 +-
 chart2/source/tools/AxisHelper.cxx  |2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a6cabde7af00ca2b23fc4d9f042e71fb525c7199
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 15:53:50 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 08:48:33 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Icb950648977545c02ec8569f8b246359b33f8054
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101790
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx 
b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index b191f2a42468..66301e2cd606 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -79,7 +79,7 @@ void TitlesAndObjectsTabPage::initializePage()
 uno::Sequence< sal_Bool > aPossibilityList;
 uno::Sequence< sal_Bool > aExistenceList;
 AxisHelper::getAxisOrGridPossibilities( aPossibilityList, xDiagram, 
false );
-AxisHelper::getAxisOrGridExcistence( aExistenceList, xDiagram, false );
+AxisHelper::getAxisOrGridExistence( aExistenceList, xDiagram, false );
 m_xCB_Grid_X->set_sensitive( aPossibilityList[0] );
 m_xCB_Grid_Y->set_sensitive( aPossibilityList[1] );
 m_xCB_Grid_Z->set_sensitive( aPossibilityList[2] );
@@ -122,7 +122,7 @@ void TitlesAndObjectsTabPage::commitToModel()
 {
 uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( 
xModel );
 uno::Sequence< sal_Bool > aOldExistenceList;
-AxisHelper::getAxisOrGridExcistence( aOldExistenceList, xDiagram, 
false );
+AxisHelper::getAxisOrGridExistence( aOldExistenceList, xDiagram, false 
);
 uno::Sequence< sal_Bool > aNewExistenceList(aOldExistenceList);
 aNewExistenceList[0] = m_xCB_Grid_X->get_active();
 aNewExistenceList[1] = m_xCB_Grid_Y->get_active();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx 
b/chart2/source/controller/main/ChartController_Insert.cxx
index 85f7ea5c345e..320282a5deb5 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -95,7 +95,7 @@ void ChartController::executeDispatch_InsertAxes()
 {
 InsertAxisOrGridDialogData aDialogInput;
 uno::Reference< XDiagram > xDiagram = 
ChartModelHelper::findDiagram(getModel());
-AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, 
xDiagram );
+AxisHelper::getAxisOrGridExistence( aDialogInput.aExistenceList, 
xDiagram );
 AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, 
xDiagram );
 
 SolarMutexGuard aGuard;
@@ -133,7 +133,7 @@ void ChartController::executeDispatch_InsertGrid()
 {
 InsertAxisOrGridDialogData aDialogInput;
 uno::Reference< XDiagram > xDiagram = 
ChartModelHelper::findDiagram(getModel());
-AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, 
xDiagram, false );
+AxisHelper::getAxisOrGridExistence( aDialogInput.aExistenceList, 
xDiagram, false );
 AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, 
xDiagram, false );
 
 SolarMutexGuard aGuard;
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index 2097d216bc60..df57609b0092 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -172,7 +172,7 @@ public:
 static void getAxisOrGridPossibilities( css::uno::Sequence< sal_Bool >& 
rPossibilityList
 , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool 
bAxis=true );
 
-static void getAxisOrGridExcistence( css::uno::Sequence< sal_Bool >& 
rExcistenceList
+static void getAxisOrGridExistence( css::uno::Sequence< sal_Bool >& 
rExistenceList
 , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool 
bAxis=true );
 
 static bool changeVisibilityOfGrids( const css::uno::Reference< 
css::chart2::XDiagram>& xDiagram
diff --git a/chart2/source/tools/AxisHelper.cxx 
b/chart2/source/tools/AxisHelper.cxx
index 77bf0555ec97..735f00a430c7 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -955,7 +955,7 @@ bool AxisHelper::shouldAxisBeDisplayed( const Reference< 
XAxis >& xAxis
 return bRet;
 }
 
-void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
+void AxisHelper::getAxisOrGridExistence( Sequence< sal_Bool >& rExistenceList
 , const Reference< XDiagram>& xDiagram, bool bAxis )