[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - filter/source sd/qa
filter/source/msfilter/msdffimp.cxx|3 +
sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt |binary
sd/qa/unit/export-tests-ooxml2.cxx | 26 +
3 files changed, 29 insertions(+)
New commits:
commit 6c411afae7f6cd9819c1b65d7b4212019a7b3cfe
Author: Mike Kaganski
AuthorDate: Thu Jul 15 01:14:15 2021 +0300
Commit: Miklos Vajna
CommitDate: Thu Jul 15 08:58:21 2021 +0200
tdf#143315: restore the stylesheet after clearing outliner object
Prior to commit c4f615b359be56e88e4fbf9aaaf30affb29d57e2, pObj passed
to SvxMSDffManager::ReadObjText was not initializing its properties
(no call to AttributeProperties::GetObjectItemSet() happened) until
call to CreateParaObject in the end of the function. Then it finally
initialized, and called applyDefaultStyleSheetFromSdrModel, which
applied the obtained stylesheet to the nodes of the outliner object,
and resulted in OutlinerParaObject having correct style name in its
ContentInfo structures, which then went into pObj.
The mentioned commit added calls to SdrTextObj::GetTextColumns* in
SdrOutliner::SetTextObj, called by SdrTextObj::ImpGetDrawOutliner
indirectly. These calls initialize the object properties, and the
stylesheet gets applied to the SdrOutliner and its empty node early.
Then the call to Outliner::Init and Outliner::Clear resulted in the
node being destroyed and re-created without stylesheet info. Then in
AttributeProperties::GetObjectItemSet called from CreateParaObject,
re-initialization does not happen, because the item set exists.
When exporting to OOXML, the missing stylesheet required to use pool
default value, which led to bullet being exported.
The previous behavior relied on fragile and unspecified assumption.
Instead, now we call SetStyleSheet after all operations, to make sure
that the stylesheet information is present in the final data.
Change-Id: I14de9017e4af92a2eaf12b3a0e090b0db7fcc759
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118961
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118963
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index e2f5b2eac0a4..d4617e652791 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3662,6 +3662,9 @@ void SvxMSDffManager::ReadObjText( const OUString& rText,
SdrObject* pObj )
rOutliner.Clear();
rOutliner.SetUpdateMode( bOldUpdateMode );
pText->SetOutlinerParaObject( std::move(pNewText) );
+// tdf#143315: restore stylesheet applied to Outliner's nodes when
SdrTextObj initializes
+// its attributes, but removed by Outliner::Init, which calls
Outliner::Clear.
+pText->SetStyleSheet(pText->GetStyleSheet(), true);
}
//static
diff --git a/sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt
b/sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt
new file mode 100644
index ..54111bb28a7a
Binary files /dev/null and
b/sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index b80078fe7844..759fa8e203e5 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -215,6 +215,7 @@ public:
void testTextColumns_3columns();
void testTdf59323_slideFooters();
void testTdf143222_embeddedWorksheet();
+void testTdf143315();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -342,6 +343,7 @@ public:
CPPUNIT_TEST(testTextColumns_3columns);
CPPUNIT_TEST(testTdf59323_slideFooters);
CPPUNIT_TEST(testTdf143222_embeddedWorksheet);
+CPPUNIT_TEST(testTdf143315);
CPPUNIT_TEST_SUITE_END();
@@ -3319,6 +3321,30 @@ void
SdOOXMLExportTest2::testTdf143222_embeddedWorksheet()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testTdf143315()
+{
+auto xDocShRef = loadURL(
+
m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt"),
+PPT);
+
+utl::TempFile tmpfile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile);
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXml = parseExport(tmpfile, "ppt/slides/slide1.xml");
+
+// Without the fix in place, whis would have failed with
+// - Expected:
+// - Actual : 216000
+// - In , XPath
'/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr' unexpected 'marL' attribute
+
+assertXPathNoAttribute(pXml,
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr", "marL");
+assertXPathNoAttribute(pXml,
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr", "indent");
+assertXPath(pXml,
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr/a:buClr", 0);
+assertXPath(pXml,
"/p:sld/p:cSl
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - svx/source
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 33e4ad909b54de433e7f73a87348505bd3fd6624 Author: Szymon Kłos AuthorDate: Wed Jul 14 16:10:03 2021 +0200 Commit: Szymon Kłos CommitDate: Thu Jul 15 08:52:38 2021 +0200 jsdialog: sidebar: do relayouting not too often To avoid jumping in Online avoid not needed relayouting. Change-Id: I4a59a9aa077de60ffd0486bb843fd2ce5b4174d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118936 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index a52dfd10d245..016cb4784092 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -438,7 +438,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, weld::ComboBox&, void) meLastXFS = static_cast(nPos); -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } @@ -597,7 +597,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() break; } } -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } @@ -853,7 +853,7 @@ void AreaPropertyPanelBase::updateFillStyle(bool bDisabled, bool bDefaultOrSet, mxToolBoxColor->hide(); meLastXFS = static_cast(-1); mpStyleItem.reset(); -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } @@ -894,7 +894,7 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefaultOrSe mxLbFillGradTo->SetNoSelection(); } } -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } @@ -927,7 +927,7 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefaultOrSet, mxLbFillAttr->set_active(-1); } } -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } @@ -946,7 +946,7 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefaultOrSet, const SfxPoolIte mxLbFillType->set_active(SOLID); Update(); } -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } @@ -981,7 +981,7 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet, mxLbFillAttr->set_active(-1); } } -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } @@ -1249,7 +1249,7 @@ void AreaPropertyPanelBase::Update() OSL_ENSURE(false, "Non supported FillType (!)"); break; } -if (m_pPanel) +if (m_pPanel && !comphelper::LibreOfficeKit::isActive()) m_pPanel->TriggerDeckLayouting(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/layout/data/tdf58521-footnotes-endnotes.rtf | 217 +++
sw/qa/extras/layout/layout2.cxx | 15 +
writerfilter/source/dmapper/DomainMapper.cxx |4
writerfilter/source/filter/WriterFilter.cxx |1
4 files changed, 236 insertions(+), 1 deletion(-)
New commits:
commit 892488b64f09190896d5a14e3f555ca91b3449e3
Author: Gabor Kelemen
AuthorDate: Wed Jul 14 23:31:12 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 15 08:44:04 2021 +0200
tdf#58521 Enable ContinuousEndnotes compat option for RTF too
Now it's used in RTF, DOC and DOCX import consistently.
Change-Id: I062a5fbbdf6ee0ef4d3c86a09ce50ac3d588fae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118960
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/layout/data/tdf58521-footnotes-endnotes.rtf
b/sw/qa/extras/layout/data/tdf58521-footnotes-endnotes.rtf
new file mode 100644
index ..469ce3a034a1
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf58521-footnotes-endnotes.rtf
@@ -0,0 +1,217 @@
+{\rtf1\adeflang1054\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch13\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe2052\themelang1033\themelangfe2052\themelangcs1054{\fonttbl{\f0\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose
02010600030101010101}SimSun{\*\falt \'cb\'ce\'cc\'e5};}{\f34\fbidi
\froman\fcharset1\fprq2{\*\panose 02040503050406030204}Cambria Math;}
+{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose
020b0604030504040204}Tahoma;}{\f40\fbidi \fnil\fcharset134\fprq2{\*\panose
02010600030101010101}@SimSun;}{\flomajor\f31500\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose
02010600030101010101}SimSun{\*\falt \'cb\'ce\'cc\'e5};}{\fhimajor\f31502\fbidi
\fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Angsana New;}{\flominor\f31504\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose
02010600030101010101}SimSun{\*\falt \'cb\'ce\'cc\'e5};}{\fhiminor\f31506\fbidi
\fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \fswiss\fcharset0\fprq2{\*\panose
020b0304020202020204}Cordia New;}{\f41\fbidi \froman\fcharset238\fprq2 Times
New Roman CE;}{\f42\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f44\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f45\fbidi
\froman\fcharset162\fprq2 Times New Roman Tur;}{\f46\fbidi
\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f47\fbidi
\froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f48\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f49\fbidi
\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f173\fbidi
\fnil\fcharset0\fprq2 SimSun Western{\*\falt \'cb\'ce\'cc\'e5};}
+{\f431\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f432\fbidi
\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f434\fbidi \fswiss\fcharset161\fprq2
Tahoma Greek;}{\f435\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}
+{\f436\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f437\fbidi
\fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f438\fbidi
\fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f439\fbidi \fswiss\fcharset163\fprq2
Tahoma (Vietnamese);}
+{\f440\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f443\fbidi
\fnil\fcharset0\fprq2 @SimSun Western;}{\flomajor\f31508\fbidi
\froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi
\froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman
Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman
Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman
(Hebrew);}
+{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman
(Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman
Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman
(Vietnamese);}
+{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt
\'cb\'ce\'cc\'e5};}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri
Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}
+{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light
Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light
Tur;}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}
+{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light
(Vietnamese);}{\fbimajor\f31547\fbidi \froman\fcharset222\fprq2 Angsana New
(Thai);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman
Cyr
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 43f11dfb6674bb1e8a52ffba0682d692da8d45b2
Author: Miklos Vajna
AuthorDate: Wed Jul 14 20:44:24 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 15 08:35:00 2021 +0200
sw: use SfxPoolItem::StaticWhichCast() in RtfAttributeOutput
See commit 0025e80ba6d882f6f885499efaf37ab0e2ed699d (sw: use
SfxPoolItem::StaticWhichCast() in SwTextBoxHelper, 2021-07-07) for
motivation.
Change-Id: Ifb3e2466dd25ad554b81cdac63742230072e64a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118952
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5759c4f60c89..16892f24833b 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -747,7 +747,7 @@ void RtfAttributeOutput::TableDefaultBorders(
if (!pCellFormat->GetAttrSet().HasItem(RES_BOX, &pItem))
return;
-auto& rBox = static_cast(*pItem);
+auto& rBox = pItem->StaticWhichCast(RES_BOX);
static const SvxBoxItemLine aBorders[] = { SvxBoxItemLine::TOP,
SvxBoxItemLine::LEFT,
SvxBoxItemLine::BOTTOM,
SvxBoxItemLine::RIGHT };
static const char* aBorderNames[]
@@ -801,7 +801,7 @@ void RtfAttributeOutput::TableBackgrounds(
const SfxPoolItem* pItem;
if (pCellFormat->GetAttrSet().HasItem(RES_BACKGROUND, &pItem))
{
-auto& rBack = static_cast(*pItem);
+auto& rBack = pItem->StaticWhichCast(RES_BACKGROUND);
if (rBack.GetColor() != COL_AUTO)
aColor = rBack.GetColor();
}
@@ -905,7 +905,7 @@ void RtfAttributeOutput::TableVerticalCell(
if (!pCellFormat->GetAttrSet().HasItem(RES_VERT_ORIENT, &pItem))
return;
-switch (static_cast(pItem)->GetVertOrient())
+switch (pItem->StaticWhichCast(RES_VERT_ORIENT).GetVertOrient())
{
case text::VertOrientation::CENTER:
m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLVERTALC);
@@ -2559,6 +2559,8 @@ void RtfAttributeOutput::CharUnderline(const
SvxUnderlineItem& rUnderline)
const char* pStr = nullptr;
const SfxPoolItem* pItem = m_rExport.HasItem(RES_CHRATR_WORDLINEMODE);
bool bWord = false;
+// No StaticWhichCast(RES_CHRATR_WORDLINEMODE), this may be for a postit,
where the which ids
+// don't match.
if (pItem)
bWord = static_cast(pItem)->GetValue();
switch (rUnderline.GetLineStyle())
@@ -3586,7 +3588,7 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox)
{
SvxShadowLocation eShadowLocation = SvxShadowLocation::NONE;
if (const SfxPoolItem* pItem = GetExport().HasItem(RES_SHADOW))
-eShadowLocation = static_cast(pItem)->GetLocation();
+eShadowLocation = pItem->StaticWhichCast(RES_SHADOW).GetLocation();
const SvxBoxItemLine* pBrd = aBorders;
const char** pBrdNms = aBorderNames;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/inc
tools/inc/poly.h |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 2a31c5dd37012de5a52dbbc08937401fc38434fb Author: YakovlevAl AuthorDate: Thu Jul 15 01:49:52 2021 +0300 Commit: Ilmari Lauhakangas CommitDate: Thu Jul 15 08:06:11 2021 +0200 tdf#143148 Use pragma once instead of include guards Switch to #pragma once Change-Id: Id5436aee3398fe2ee0fecd125cb1e7f71e587c88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118962 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/tools/inc/poly.h b/tools/inc/poly.h index 3de1374efd94..64885ac29762 100644 --- a/tools/inc/poly.h +++ b/tools/inc/poly.h @@ -16,8 +16,7 @@ * 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_TOOLS_INC_POLY_H -#define INCLUDED_TOOLS_INC_POLY_H +#pragma once #include #include @@ -81,6 +80,4 @@ struct ImplPolyPolygon } }; -#endif - /* 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: test/qa test/source
test/qa/cppunit/test_xpath.cxx |3 +++
test/source/xmltesttools.cxx |4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 798d19c80853166042ce8a14edf4a25cd491d6aa
Author: Mike Kaganski
AuthorDate: Thu Jul 15 00:03:13 2021 +0200
Commit: Mike Kaganski
CommitDate: Thu Jul 15 08:01:29 2021 +0200
Fix UB calling operator<<(std::basic_ostream) with nullptr
This resulted in segfault instead of a useful test failure message.
Was this way ever since 548b360c0e4693aac0cbdd2fcc1aab433fc54010,
and before in 6e31cbb4eaea3c6600248ba59a22853acc1d6606 and
9791453283407a0a129a71767a290058ac759da2.
Change-Id: I498d1c84a4eaf3e8180dedd67d1176cf6f8c1a60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118916
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/test/qa/cppunit/test_xpath.cxx b/test/qa/cppunit/test_xpath.cxx
index 12852fc7dc6e..87d6a7ac177e 100644
--- a/test/qa/cppunit/test_xpath.cxx
+++ b/test/qa/cppunit/test_xpath.cxx
@@ -35,6 +35,9 @@ CPPUNIT_TEST_FIXTURE(TestXPath, test_getXPath)
CPPUNIT_ASSERT_EQUAL(OUString("val"), getXPath(pTable, "/xml/item",
"attrib"));
// Trying to get position of missing child of a node must fail assertion
CPPUNIT_ASSERT_ASSERTION_FAIL(getXPathPosition(pTable, "/xml/item",
"absent"));
+// Asserting that an attribute is absent
+CPPUNIT_ASSERT_ASSERTION_FAIL(assertXPathNoAttribute(pTable, "/xml/item",
"attrib"));
+CPPUNIT_ASSERT_ASSERTION_PASS(assertXPathNoAttribute(pTable, "/xml/item",
"foo"));
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 12aed37f18e0..f92c380d9bf8 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -247,8 +247,8 @@ void XmlTestTools::assertXPathNoAttribute(const
xmlDocUniquePtr& pXmlDoc, const
CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(OString::Concat("In <") +
pXmlDoc->name + ">, XPath '" + rXPath + "' number of nodes is
incorrect").getStr(),
1, xmlXPathNodeSetGetLength(pXmlNodes));
xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(OString::Concat("In <") +
pXmlDoc->name + ">, XPath '" + rXPath + "' unexpected '" + rAttribute + "'
attribute").getStr(),
- static_cast(nullptr),
xmlGetProp(pXmlNode, BAD_CAST(rAttribute.getStr(;
+CPPUNIT_ASSERT_MESSAGE(OString(OString::Concat("In <") + pXmlDoc->name +
">, XPath '" + rXPath + "' unexpected '" + rAttribute + "' attribute").getStr(),
+ !xmlGetProp(pXmlNode,
BAD_CAST(rAttribute.getStr(;
xmlXPathFreeObject(pXmlObj);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source sd/qa
filter/source/msfilter/msdffimp.cxx|3 +
sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt |binary
sd/qa/unit/export-tests-ooxml3.cxx | 27 +
3 files changed, 30 insertions(+)
New commits:
commit 717dc8e3575a18e1e18dc446031e6db4e60a873d
Author: Mike Kaganski
AuthorDate: Thu Jul 15 01:14:15 2021 +0300
Commit: Mike Kaganski
CommitDate: Thu Jul 15 01:24:36 2021 +0200
tdf#143315: restore the stylesheet after clearing outliner object
Prior to commit c4f615b359be56e88e4fbf9aaaf30affb29d57e2, pObj passed
to SvxMSDffManager::ReadObjText was not initializing its properties
(no call to AttributeProperties::GetObjectItemSet() happened) until
call to CreateParaObject in the end of the function. Then it finally
initialized, and called applyDefaultStyleSheetFromSdrModel, which
applied the obtained stylesheet to the nodes of the outliner object,
and resulted in OutlinerParaObject having correct style name in its
ContentInfo structures, which then went into pObj.
The mentioned commit added calls to SdrTextObj::GetTextColumns* in
SdrOutliner::SetTextObj, called by SdrTextObj::ImpGetDrawOutliner
indirectly. These calls initialize the object properties, and the
stylesheet gets applied to the SdrOutliner and its empty node early.
Then the call to Outliner::Init and Outliner::Clear resulted in the
node being destroyed and re-created without stylesheet info. Then in
AttributeProperties::GetObjectItemSet called from CreateParaObject,
re-initialization does not happen, because the item set exists.
When exporting to OOXML, the missing stylesheet required to use pool
default value, which led to bullet being exported.
The previous behavior relied on fragile and unspecified assumption.
Instead, now we call SetStyleSheet after all operations, to make sure
that the stylesheet information is present in the final data.
Change-Id: I14de9017e4af92a2eaf12b3a0e090b0db7fcc759
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118961
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index f7176c186a77..783609c4ca24 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3668,6 +3668,9 @@ void SvxMSDffManager::ReadObjText( const OUString& rText,
SdrObject* pObj )
rOutliner.Clear();
rOutliner.SetUpdateMode( bOldUpdateMode );
pText->SetOutlinerParaObject( std::move(pNewText) );
+// tdf#143315: restore stylesheet applied to Outliner's nodes when
SdrTextObj initializes
+// its attributes, but removed by Outliner::Init, which calls
Outliner::Clear.
+pText->SetStyleSheet(pText->GetStyleSheet(), true);
}
//static
diff --git a/sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt
b/sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt
new file mode 100644
index ..54111bb28a7a
Binary files /dev/null and
b/sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt differ
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx
b/sd/qa/unit/export-tests-ooxml3.cxx
index f773c364f395..597783d85a70 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -119,6 +119,7 @@ public:
void testTdf96061_textHighlight();
void testTdf143222_embeddedWorksheet();
void testTdf142235_TestPlaceholderTextAlignment();
+void testTdf143315();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest3);
@@ -189,6 +190,7 @@ public:
CPPUNIT_TEST(testTdf96061_textHighlight);
CPPUNIT_TEST(testTdf143222_embeddedWorksheet);
CPPUNIT_TEST(testTdf142235_TestPlaceholderTextAlignment);
+CPPUNIT_TEST(testTdf143315);
CPPUNIT_TEST_SUITE_END();
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -1773,6 +1775,31 @@ void
SdOOXMLExportTest3::testTdf143222_embeddedWorksheet()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest3::testTdf143315()
+{
+auto xDocShRef = loadURL(
+
m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt"),
+PPT);
+
+utl::TempFile tmpfile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile);
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXml = parseExport(tmpfile, "ppt/slides/slide1.xml");
+
+// Without the fix in place, whis would have failed with
+// - Expected:
+// - Actual : 216000
+// - In , XPath
'/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr' unexpected 'marL' attribute
+
+assertXPathNoAttribute(pXml,
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr", "marL");
+assertXPathNoAttribute(pXml,
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr", "indent");
+assertXPath(pXml,
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr/a:buClr", 0);
+assertXPath(pXml,
"/p:sld/p:cSld/p:spTree/p:sp/p:
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source
vcl/source/uitest/uiobject.cxx |2 +-
vcl/source/window/window.cxx |5 -
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7fc110d776caa32e7209880d19aab45e3f1b46ba
Author: Michael Meeks
AuthorDate: Fri Jul 9 15:14:50 2021 +0100
Commit: Michael Meeks
CommitDate: Wed Jul 14 22:55:40 2021 +0200
vcl: make get_id safe for disposed windows; avoid unsafe use as well.
crash from:
findChild(vcl::Window*, rtl::OUString const&, bool)
include/rtl/ustring.hxx:1744
WindowUIObject::get_visible_child(rtl::OUString const&)
/vcl/source/uitest/uiobject.cxx:463
lcl_sendDialogEvent ...
Change-Id: Ic1756c7b03f2dee9780fb1a735917f1d0fc11876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118690
Tested-by: Michael Meeks
Reviewed-by: Michael Meeks
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index c10cc5f21d9d..08e2dc01fb9c 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -395,7 +395,7 @@ vcl::Window* findChild(vcl::Window* pParent, const
OUString& rID, bool bRequireV
for (size_t i = 0; i < nCount; ++i)
{
vcl::Window* pChild = pParent->GetChild(i);
-if (pChild && pChild->get_id() == rID
+if (pChild && !pChild->isDisposed() && pChild->get_id() == rID
&& (!bRequireVisible || pChild->IsVisible()))
return pChild;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0143bf85ee2f..60160d46b71a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3889,7 +3889,10 @@ void Window::set_id(const OUString& rID)
const OUString& Window::get_id() const
{
-return mpWindowImpl->maID;
+if (mpWindowImpl)
+return mpWindowImpl->maID;
+static OUString empty;
+return empty;
}
FactoryFunction Window::GetUITestFactory() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/svm/SvmReader.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 9e2b0a7399bb53cba9ae4cdb3b0e2cbbe04d602d
Author: Caolán McNamara
AuthorDate: Wed Jul 14 20:25:06 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 14 22:38:42 2021 +0200
cid#1487034 Untrusted value as argument
Change-Id: I2c0edac58b92b9d828c62ff3b8859f23ed1d3c85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118954
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 56197443757d..f8336068a0ac 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -663,6 +663,13 @@ rtl::Reference
SvmReader::TextHandler(ImplMetaReadData* pData)
if (aCompat.GetVersion() >= 2) // Version 2
aStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(mrStream);
+if (nTmpIndex + nTmpLen > aStr.getLength())
+{
+SAL_WARN("vcl.gdi", "inconsistent offset and len");
+pAction->SetIndex(0);
+pAction->SetLen(aStr.getLength());
+}
+
pAction->SetText(aStr);
return pAction;
@@ -696,8 +703,9 @@ rtl::Reference
SvmReader::TextArrayHandler(ImplMetaReadData* pData)
sal_Int32 nAryLen(0);
mrStream.ReadInt32(nAryLen);
-if (nTmpLen > aStr.getLength() - nTmpIndex)
+if (nTmpIndex + nTmpLen > aStr.getLength())
{
+SAL_WARN("vcl.gdi", "inconsistent offset and len");
pAction->SetIndex(0);
pAction->SetLen(aStr.getLength());
return pAction;
@@ -735,6 +743,7 @@ rtl::Reference
SvmReader::TextArrayHandler(ImplMetaReadData* pData)
if (nTmpIndex + nTmpLen > aStr.getLength())
{
+SAL_WARN("vcl.gdi", "inconsistent offset and len");
pAction->SetIndex(0);
pAction->SetLen(aStr.getLength());
aArray.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/swpatch.txt | 39 ---
1 file changed, 39 deletions(-)
New commits:
commit 8b6bcdcddbf76e256b142408c855889414a4dd33
Author: Samuel Mehrbrodt
AuthorDate: Wed Jul 14 16:25:59 2021 +0200
Commit: Caolán McNamara
CommitDate: Wed Jul 14 21:30:09 2021 +0200
Remove unused file
Change-Id: Iac67ca026fd0463da67cef7838f9a36da04f3378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118937
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/sdi/swpatch.txt b/sw/sdi/swpatch.txt
deleted file mode 100644
index 3aaeb25703d5..
--- a/sw/sdi/swpatch.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-swinter.h:
-
-unsigned char SYSCALL SwDocumentGetIsPrinting( C_Object ObjHdl );
-
-
-swinter.c:
-
-unsigned char SYSCALL SwDocumentGetIsPrinting( C_Object ObjHdl )
-{
-if( SvIPCIsConnected() )
-{
-return (unsigned char) pIPCCallFunction( SvIPCGetClient(), 136598,
- ObjHdl , 1, NULL );
-}
-return 0;
-}
-
-#ifdef _MSC_VER
-#pragma code_seg("swinter2","CODE")
-#endif
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/Transmitter.cxx | 16 +---
sd/source/ui/remotecontrol/Transmitter.hxx | 11 ---
2 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 8e6cdb02450a876b5c684eb621e1c9383fb1c428
Author: Andrzej Hunt
AuthorDate: Sun Jul 11 17:17:27 2021 +0200
Commit: Andrzej Hunt
CommitDate: Wed Jul 14 21:02:03 2021 +0200
sdremote: fix race condition in Transmitter shutdown to plug leak
We need to acquire the mutex in notifyFinished() to avoid a race between
notifyFinished() and the loop in run(). And we also need to check
mFinishRequested) while holding the mutex to avoid the same race
condition. While we're here, rename the mutex to make it more obvious
that it's not only protecting the queues.
The race can happen because the loop in run() blocks until
mQueuesNotEmpty is set. It also resets mQueuesNotEmpty at the end of
each iteration if the queues are empty. So if someone sets
mQueuesNotEmpty in the middle of an iteration, and the loop later resets
it, the loop won't continue iterating. But we're actually using
mQueuesNotEmpty to indicate either that the queues have data OR that we
might want to finish transmission.
And the problem is that notifyFinished() sets mFinishRequested, followed
by setting mQueuesNotEmpty in an attempt to get the loop to process
mFinishRequested (at which point the loop should finish and return).
But as described above, we can easily get into a situation where the
loop resets mQueuesNotEmpty again (at least if there's no more pending
data in the queues). In this scenario, the loop blocks forever
(we won't receive any new messages after notifyFinished()), causing a
leak of both Transmitter and any resources it's using - e.g. the
StreamSocket.
The easiest way to fix this is to make it clear that the mutex protects
all internal state, followed by using it to protect all internal state.
This issue is not a big deal in normal usage - it's a tiny leak, and
users won't connect enough clients for accumulated leaks to pose
any issues. But it's ugly, and potentially problematic for long-running
tests which could run out of filedescriptors because of the socket leak.
I will rename mQueuesNotEmpty to something more obvious (possibly
mProcessingRequired) in a separate commit.
Change-Id: I2e22087054f3f6a02e05c568b1832ccc5a8b47a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118751
Reviewed-by: Andrzej Hunt
Tested-by: Jenkins
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx
b/sd/source/ui/remotecontrol/Transmitter.cxx
index 8f3b7d24c184..76cda8feae55 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -17,8 +17,8 @@ using namespace sd;
Transmitter::Transmitter( IBluetoothSocket* aSocket )
: pStreamSocket( aSocket ),
mQueuesNotEmpty(),
-mFinishRequested(),
-mQueueMutex(),
+mMutex(),
+mFinishRequested( false ),
mLowPriority(),
mHighPriority()
{
@@ -32,10 +32,11 @@ void SAL_CALL Transmitter::run()
{
mQueuesNotEmpty.wait();
-if ( mFinishRequested.check() )
-return;
+::osl::MutexGuard aGuard( mMutex );
-::osl::MutexGuard aQueueGuard( mQueueMutex );
+if ( mFinishRequested ) {
+return;
+}
if ( !mHighPriority.empty() )
{
OString aMessage( mHighPriority.front() );
@@ -60,7 +61,8 @@ void SAL_CALL Transmitter::run()
void Transmitter::notifyFinished()
{
-mFinishRequested.set();
+::osl::MutexGuard aGuard( mMutex );
+mFinishRequested = true;
mQueuesNotEmpty.set();
}
@@ -70,7 +72,7 @@ Transmitter::~Transmitter()
void Transmitter::addMessage( const OString& aMessage, const Priority
aPriority )
{
-::osl::MutexGuard aQueueGuard( mQueueMutex );
+::osl::MutexGuard aGuard( mMutex );
switch ( aPriority )
{
case PRIORITY_LOW:
diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx
b/sd/source/ui/remotecontrol/Transmitter.hxx
index 8acebfeff7e8..1cd94ea26712 100644
--- a/sd/source/ui/remotecontrol/Transmitter.hxx
+++ b/sd/source/ui/remotecontrol/Transmitter.hxx
@@ -37,11 +37,16 @@ private:
::sd::IBluetoothSocket* pStreamSocket;
::osl::Condition mQueuesNotEmpty;
-::osl::Condition mFinishRequested;
-
-::osl::Mutex mQueueMutex;
+::osl::Mutex mMutex;
+/**
+ * Used to indicate that we're done and the transmitter loop should exit.
+ * All access must be guarded my `mMutex`.
+ */
+bool mFinishRequested;
+/// Queue for low priority messages. All access must be guarded my
`mMutex`.
std::queue mLowPriority;
+/// Queue for high priority messages. All access must be guarded my
`mMutex`.
std::queue mHighPriority;
};
_
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/customcellrenderer.cxx |4
vcl/unx/gtk3/gtkinst.cxx|1 +
2 files changed, 5 insertions(+)
New commits:
commit 12fe411cffb4cb7088f6af096b858e0c6c091c54
Author: Caolán McNamara
AuthorDate: Wed Jul 14 10:22:27 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 14 20:54:19 2021 +0200
gtk4: add SolarMutexGuard on entering vcl from gtk
Change-Id: I1f380c5f700b77520ce548963195ce30059f0633
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118890
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/customcellrenderer.cxx
b/vcl/unx/gtk3/customcellrenderer.cxx
index 7021f8be064c..c43638648dc6 100644
--- a/vcl/unx/gtk3/customcellrenderer.cxx
+++ b/vcl/unx/gtk3/customcellrenderer.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
#include "customcellrenderer.hxx"
#if !GTK_CHECK_VERSION(4, 0, 0)
#include
@@ -250,6 +251,9 @@ void custom_cell_renderer_render(GtkCellRenderer* cell,
cairo_t* cr, GtkWidget*
gpointer pWidget = g_value_get_pointer(&value);
if (!pWidget)
return;
+
+SolarMutexGuard aGuard;
+
custom_cell_renderer_ensure_device(cellsurface, pWidget);
Size aSize(cell_area->width, cell_area->height);
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 1ee5072aed7f..f82ab5d105cc 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -17490,6 +17490,7 @@ private:
static void signalPopupToggled(GObject*, GParamSpec*, gpointer widget)
{
GtkInstanceComboBox* pThis = static_cast(widget);
+SolarMutexGuard aGuard;
pThis->signal_popup_toggled();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk4/convert3to4.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 03f1d66a57e7093c85a906bc08e3ce3ee74f81e4
Author: Caolán McNamara
AuthorDate: Wed Jul 14 10:20:27 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 14 20:47:50 2021 +0200
gtk4: convert GtkSeparatorToolItem to GtkSeparator
Change-Id: I24c0e3b515df505085ae77c350eb6aecfc0db003
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 9d7fd36ae543..dc896a28cf4e 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1171,6 +1171,10 @@ ConvertResult Convert3To4(const
css::uno::Reference& xNode
{
xClass->setNodeValue("GtkToggleButton");
}
+else if (sClass == "GtkSeparatorToolItem")
+{
+xClass->setNodeValue("GtkSeparator");
+}
else if (sClass == "GtkBox")
{
// reverse the order of the pack-type=end widgets
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source sc/source
desktop/source/app/dispatchwatcher.cxx | 26 +++-
sc/source/ui/dbgui/imoptdlg.cxx|7 ++
sc/source/ui/docshell/docsh.cxx| 97 -
sc/source/ui/inc/docsh.hxx |2
sc/source/ui/inc/imoptdlg.hxx |6 +-
5 files changed, 106 insertions(+), 32 deletions(-)
New commits:
commit b8903bc106dad036acb3d117e5c4fc955697fe02
Author: Caolán McNamara
AuthorDate: Tue Jul 13 12:38:07 2021 +0100
Commit: Eike Rathke
CommitDate: Wed Jul 14 20:37:33 2021 +0200
rhbz#1980800 allow --convert-to csv to write each sheet to a separate file
Related: tdf#135762 except only currently implemented for command line use
sample usage:
soffice --convert-to csv:"Text - txt - csv
(StarCalc)":44,34,UTF8,1,,0,false,true,false,false,false,-1 sample.ods
where the new (11th!) final token ("-1") enables writing each sheet to a
new file based on the suggested target name so output in this example
is files sample-Sheet1.csv and sample-Sheet2.csv
Only -1 for 'all sheets' vs 0 for existing 'current sheet only' (which
is always sheet 0 from the command line) are currently options but the
token could be expanded in the future to select specific sheets to
export.
Change-Id: Ib99a120f1a2c8d1008a7a3c59a6b39f572fb346e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118850
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index a2e79d8283ae..8541c273cc83 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -30,6 +30,7 @@
#include "officeipcthread.hxx"
#include
#include
+#include
#include
#include
#include
@@ -598,6 +599,8 @@ bool DispatchWatcher::executeDispatchRequests( const
std::vector " << aTargetURL8;
+std::cout << "convert " << aSource8;
+if (!bMultiFileTarget)
+std::cout << " -> " << aTargetURL8;
std::cout << " using filter : " <<
OUStringToOString(aFilter, osl_getThreadTextEncoding()) << std::endl;
-if (FStatHelper::IsDocument(aOutFile))
+if (!bMultiFileTarget &&
FStatHelper::IsDocument(aOutFile))
std::cout << "Overwriting: " <<
OUStringToOString(aTempName, osl_getThreadTextEncoding()) << std::endl ;
}
try
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 071f1b0257bc..d8c4fd810ea3 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -43,6 +43,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
bSaveNumberAsSuch = true;
bSaveFormulas = false;
bRemoveSpace = false;
+bNewFilePerSheet = false;
sal_Int32 nTokenCount = comphelper::string::getTokenCount(rStr, ',');
if ( nTokenCount < 3 )
return;
@@ -77,6 +78,8 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
bSaveFormulas = rStr.getToken(0, ',', nIdx) == "true";
if ( nTokenCount >= 11 )
bRemoveSpace = rStr.getToken(0, ',', nIdx) == "true";
+if ( nTokenCount >= 12 )
+bNewFilePerSheet = rStr.getToken(0, ',', nIdx) == "-1";
}
}
@@ -99,7 +102,9 @@ OUString ScImportOptions::BuildString() const
"," +
OUString::boolean( bSaveFormulas ) + // "save formulas": not in
ScAsciiOptions
"," +
-OUString::boolean( bRemoveSpace );// same as "Remove space" in
ScAsciiOptions
+OUString::boolean( bRemoveSpace ) + // same as "Remove space" in
ScAsciiOptions
+"," +
+std::u16string_view(bNewFilePerSheet ? u"-1" : u"0") ; // Only
available for command line --convert-to
return aResult;
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 055f2fdf727a..873e5c598bab 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -120,6 +121,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1926,7 +1928,7 @@ void escapeTextSep(sal_Int32 nPos, const StrT& rStrDelim,
StrT& rStr)
}
-void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions&
rAsciiOpt )
+void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions&
rAsciiOpt, SCTAB nTab )
{
sal_Unicode cDelim= rAsciiOpt.nFieldSepCode;
sal_Unicode cStrDelim = rAsciiOpt.nTextSepCode;
@@ -1972,7 +1974,6 @@ void ScDocShell::AsciiSave( SvStream& rStream, const
ScImportOptions& rAsciiOpt
SCCOL nStartCol = 0;
SCROW nSta
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/viewfrm.hxx |2 +-
sfx2/source/view/viewfrm.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6c94eeb92fa0ea14814175276f35a25512cc6f2b
Author: Andrea Gelmini
AuthorDate: Wed Jul 14 18:13:09 2021 +0200
Commit: Julien Nabet
CommitDate: Wed Jul 14 20:35:19 2021 +0200
Fix typo in code
Change-Id: I9e92dcee5f49f81aeadf9e2baa504a247bece33b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118948
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 1bd0cbca39eb..1e3bc1b19796 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -67,7 +67,7 @@ class SFX2_DLLPUBLIC SfxViewFrame final : public SfxShell,
public SfxListener
DECL_LINK(SwitchReadOnlyHandler, weld::Button&, void);
DECL_LINK(SignDocumentHandler, weld::Button&, void);
DECL_LINK(HiddenTrackChangesHandler, weld::Button&, void);
-DECL_LINK(HypenationMissingHandler, weld::Button&, void);
+DECL_LINK(HyphenationMissingHandler, weld::Button&, void);
SAL_DLLPRIVATE void KillDispatcher_Impl();
virtual ~SfxViewFrame() override;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 37b090429425..95d1d5d1dfeb 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1510,7 +1510,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
weld::Button& rHyphenationButton =
pInfoBar->addButton();
rHyphenationButton.set_label(SfxResId(STR_HYPHENATION_BUTTON));
rHyphenationButton.connect_clicked(LINK(this,
- SfxViewFrame,
HypenationMissingHandler));
+ SfxViewFrame,
HyphenationMissingHandler));
}
aPendingInfobars.pop_back();
@@ -1653,7 +1653,7 @@ IMPL_LINK(SfxViewFrame, HiddenTrackChangesHandler,
weld::Button&, rButton, void)
}
}
-IMPL_LINK_NOARG(SfxViewFrame, HypenationMissingHandler, weld::Button&, void)
+IMPL_LINK_NOARG(SfxViewFrame, HyphenationMissingHandler, weld::Button&, void)
{
GetDispatcher()->Execute(SID_HYPHENATIONMISSING);
RemoveInfoBar(u"hyphenationmissing");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Are there ideas for client-server model.
Op wo 14 jul. 2021 om 14:52 schreef Marc : > But that is not libre office > > > Exactly. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/qa
basic/qa/basic_coverage/test_tdf98778.bas | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit f7d128f1223a28d5fdae53ceaad55bf3166a9036
Author: Xisco Fauli
AuthorDate: Wed Jul 14 17:48:32 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 14 19:39:07 2021 +0200
tdf#98778: basic_macros: Add unittest
Change-Id: I35468fb35f5c24af2138688d99af0e41ba672334
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118944
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/basic/qa/basic_coverage/test_tdf98778.bas
b/basic/qa/basic_coverage/test_tdf98778.bas
new file mode 100644
index ..0228e5060ba8
--- /dev/null
+++ b/basic/qa/basic_coverage/test_tdf98778.bas
@@ -0,0 +1,22 @@
+Option VBASupport 0
+Option Explicit
+
+Function doUnitTest() As String
+TestUtil.TestInit
+verify_tdf98778
+doUnitTest = TestUtil.GetResult()
+End Function
+
+Sub verify_tdf98778()
+On Error GoTo errorHandler
+
+dim d as double
+dim s as string
+s="1.0E-5"
+d=s
+TestUtil.AssertEqual(d, 1E-05, "tdf#98778")
+
+Exit Sub
+errorHandler:
+TestUtil.ReportErrorHandler("verify_tdf98778", Err, Error$, Erl)
+End Sub
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/implbase_ex.cxx | 19 ---
1 file changed, 4 insertions(+), 15 deletions(-)
New commits:
commit c82914912f73f1fc9912d53fb60ca7a66379c560
Author: Arnaud Versini
AuthorDate: Sat Jun 5 13:38:14 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 14 19:12:01 2021 +0200
cppuhelper : use std::mutex and remove useless rtl::Static
Change-Id: Idb272e664c4b745c4db96e505b60905c93937900
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116746
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cppuhelper/source/implbase_ex.cxx
b/cppuhelper/source/implbase_ex.cxx
index 00eeaf376618..24b7a74582d7 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -24,28 +24,16 @@
#include
+#include
+
using namespace ::cppu;
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace
-{
-class theImplHelperInitMutex : public rtl::Static{};
-}
-
namespace cppu
{
-/** Shared mutex for implementation helper initialization.
-Not for public use.
-*/
-static ::osl::Mutex & getImplHelperInitMutex()
-{
-return theImplHelperInitMutex::get();
-}
-
-
static void checkInterface( Type const & rType )
{
if (TypeClass_INTERFACE != rType.getTypeClass())
@@ -79,7 +67,8 @@ static type_entry * getTypeEntries( class_data * cd )
type_entry * pEntries = cd->m_typeEntries;
if (! cd->m_storedTypeRefs) // not inited?
{
-MutexGuard guard( getImplHelperInitMutex() );
+static std::mutex aMutex;
+std::lock_guard guard( aMutex );
if (! cd->m_storedTypeRefs) // not inited?
{
// get all types
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/CppunitTest_sdext_pdfimport.mk sdext/source
sdext/CppunitTest_sdext_pdfimport.mk |1
sdext/source/pdfimport/test/testdocs/testFontFeatures.pdf |binary
sdext/source/pdfimport/test/tests.cxx | 136 +-
3 files changed, 136 insertions(+), 1 deletion(-)
New commits:
commit 12b57e43563a643dd653d78f3e2877ef75998d82
Author: Kevin Suo
AuthorDate: Wed Jul 14 23:59:35 2021 +0800
Commit: Noel Grandin
CommitDate: Wed Jul 14 18:55:47 2021 +0200
tdf#78427 tdf#81481 sdext.pdfimport: added unittest
Change-Id: Ia112762f0ece1be589997f6b9be336424603a1c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118947
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sdext/CppunitTest_sdext_pdfimport.mk
b/sdext/CppunitTest_sdext_pdfimport.mk
index 87a917f8d81d..b2676d32002b 100644
--- a/sdext/CppunitTest_sdext_pdfimport.mk
+++ b/sdext/CppunitTest_sdext_pdfimport.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_set_include,sdext_pdfimport,\
$(eval $(call gb_CppunitTest_use_externals,sdext_pdfimport,\
boost_headers \
zlib \
+libxml2 \
))
$(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\
diff --git a/sdext/source/pdfimport/test/testdocs/testFontFeatures.pdf
b/sdext/source/pdfimport/test/testdocs/testFontFeatures.pdf
new file mode 100644
index ..0405d95f8425
Binary files /dev/null and
b/sdext/source/pdfimport/test/testdocs/testFontFeatures.pdf differ
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index 7611511aa92a..cb8416d71b21 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
@@ -448,8 +449,13 @@ namespace
bool m_bImageSeen;
};
-class PDFITest : public test::BootstrapFixture
+class PDFITest : public test::BootstrapFixture, public XmlTestTools
{
+protected:
+virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
override
+{
+XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
+};
public:
void testXPDFParser()
{
@@ -577,6 +583,133 @@ namespace
#endif
}
+void testFontFeatures() // tdf#78427
+{
+rtl::Reference xAdaptor(new
pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
+xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
+
+OString aOutput;
+CPPUNIT_ASSERT_MESSAGE("Converting PDF to ODF XML",
+ xAdaptor->odfConvert(
m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testdocs/testFontFeatures.pdf"),
+new
OutputWrapString(aOutput),
+nullptr ));
+std::cout << aOutput << std::endl;
+xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast(aOutput.getStr(;
+//CPPUNIT_ASSERT(pXmlDoc);
+
+/* Test for the 1st paragraph */
+OUString styleName = getXPath(pXmlDoc,
"//draw:frame[1]//text:span[1]", "style-name");
+OString xpath =
"//office:automatic-styles/style:style[@style:name=\"" +
+OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
+"\"]/style:text-properties";
+// the font-weight and font-style should be normal (e.g., no such
attribute)
+assertXPathNoAttribute(pXmlDoc, xpath, "font-weight");
+assertXPathNoAttribute(pXmlDoc, xpath, "font-style");
+
+/* Test for the 2nd paragraph */
+styleName = getXPath(pXmlDoc, "//draw:frame[2]//text:span[1]",
"style-name");
+xpath = "//office:automatic-styles/style:style[@style:name=\"" +
+OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
+"\"]/style:text-properties";
+// there should be a font-weight="bold", but no font-style italic
+assertXPath(pXmlDoc, xpath, "font-weight", "bold");
+assertXPathNoAttribute(pXmlDoc, xpath, "font-style");
+
+/* Test for the 3rd paragraph */
+styleName = getXPath(pXmlDoc, "//draw:frame[3]//text:span[1]",
"style-name");
+xpath = "//office:automatic-styles/style:style[@style:name=\"" +
+OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
+"\"]/style:text-properties";
+// there should be a font-style="italic", but no font-weight bold
+assertXPathNoAttribute(pXmlDoc, xpath, "font-weight");
+assertXPath(pXmlDoc, xpath, "font-style", "italic");
+
+/* Test for the 4th paragraph */
+styleName = getXPath(pXmlDoc, "//draw:frame[4]//text:span[1]",
"style-name");
+xpath = "//office:automatic-styles/style:style[@style:name=\
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/drawtreevisiting.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b1ca6d3aae3b75ec3e5c1ef17d582bcec01fc7eb
Author: Kevin Suo
AuthorDate: Wed Jul 14 09:44:30 2021 +0800
Commit: Noel Grandin
CommitDate: Wed Jul 14 18:53:44 2021 +0200
sdext.pdfimport: and don't have "text:style-name"
attribute
Per OpenDocument specs:
* The element only has a "text:c" attribute.
* The element only has a text:tab-ref attribute.
seen in the SAL_WARN message:
warn:xmloff:221658:221658:xmloff/source/text/txtparai.cxx:137: unknown
attribute urn:oasis:names:tc:opendocument:xmlns:text:1.0 text:style-name
value=text13
...
Change-Id: I02a29ac2c9f9db026caec19238cd97111ce587c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118946
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 69f70001f6d6..d5ce02ad89bf 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -126,6 +126,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const
std::list< std::unique_ptr<
m_rEmitContext.rEmitter.beginTag( "text:span", aProps );
+aProps = {};
for(int i=0; i< elem.Text.getLength(); i++)
{
OUString strToken= str.copy(i,1) ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
4 new defect(s) introduced to LibreOffice found with Coverity Scan.
6 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 4 of 4 defect(s)
** CID 1487479: Integer handling issues (DIVIDE_BY_ZERO)
*** CID 1487479: Integer handling issues (DIVIDE_BY_ZERO)
/svx/source/svdraw/svdopath.cxx: 2395 in SdrPathObj::NbcSetSnapRect(const
tools::Rectangle &)()
2389 if ( nDivX == 0 ) { nMulX = 1; nDivX = 1; }
2390 if ( nDivY == 0 ) { nMulY = 1; nDivY = 1; }
2391 if ( nDivX == nMulX ) { nMulX = 1; nDivX = 1; }
2392 if ( nDivY == nMulY ) { nMulY = 1; nDivY = 1; }
2393 Fraction aX(nMulX,nDivX);
2394 Fraction aY(nMulY,nDivY);
>>> CID 1487479: Integer handling issues (DIVIDE_BY_ZERO)
>>> In function call "NbcResize", modulo by expression "aX.mnNumerator"
>>> which may be zero has undefined behavior.
2395 NbcResize(aOld.TopLeft(), aX, aY);
2396 NbcMove(Size(rRect.Left() - aOld.Left(), rRect.Top() -
aOld.Top()));
2397 }
2398
2399 sal_uInt32 SdrPathObj::GetSnapPointCount() const
2400 {
** CID 1487478: Integer handling issues (DIVIDE_BY_ZERO)
*** CID 1487478: Integer handling issues (DIVIDE_BY_ZERO)
/svx/source/svdraw/svdopath.cxx: 2395 in SdrPathObj::NbcSetSnapRect(const
tools::Rectangle &)()
2389 if ( nDivX == 0 ) { nMulX = 1; nDivX = 1; }
2390 if ( nDivY == 0 ) { nMulY = 1; nDivY = 1; }
2391 if ( nDivX == nMulX ) { nMulX = 1; nDivX = 1; }
2392 if ( nDivY == nMulY ) { nMulY = 1; nDivY = 1; }
2393 Fraction aX(nMulX,nDivX);
2394 Fraction aY(nMulY,nDivY);
>>> CID 1487478: Integer handling issues (DIVIDE_BY_ZERO)
>>> In function call "NbcResize", modulo by expression "aY.mnNumerator"
>>> which may be zero has undefined behavior.
2395 NbcResize(aOld.TopLeft(), aX, aY);
2396 NbcMove(Size(rRect.Left() - aOld.Left(), rRect.Top() -
aOld.Top()));
2397 }
2398
2399 sal_uInt32 SdrPathObj::GetSnapPointCount() const
2400 {
** CID 1475942: Uninitialized members (UNINIT_CTOR)
/usr/include/c++/9/bits/random.h: 2010 in
std::normal_distribution::normal_distribution()()
*** CID 1475942: Uninitialized members (UNINIT_CTOR)
/usr/include/c++/9/bits/random.h: 2010 in
std::normal_distribution::normal_distribution()()
2004 private:
2005_RealType _M_mean;
2006_RealType _M_stddev;
2007 };
2008
2009 public:
>>> CID 1475942: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "_M_saved" is not initialized in this
>>> constructor nor in any functions that it calls.
2010 normal_distribution() : normal_distribution(0.0) { }
2011
2012 /**
2013* Constructs a normal distribution with parameters @f$mean@f$
and
2014* standard deviation.
2015*/
** CID 257629:(MISSING_BREAK)
/workdir/YaccTarget/connectivity/source/parse/sqlbison.cxx: 4451 in
yytnamerr(char *, const char *)()
/workdir/YaccTarget/idlc/source/parser.cxx: 1473 in yytnamerr(char *, const
char *)()
*** CID 257629:(MISSING_BREAK)
/workdir/YaccTarget/connectivity/source/parse/sqlbison.cxx: 4451 in
yytnamerr(char *, const char *)()
4445 switch (*++yyp)
4446 {
4447 case '\'':
4448 case ',':
4449 goto do_not_strip_quotes;
4450
>>> CID 257629:(MISSING_BREAK)
>>> The case for value "'\\'" is not terminated by a "break" statement.
4451 case '\\':
4452 if (*++yyp != '\\')
4453 goto do_not_strip_quotes;
4454 else
4455 goto append;
4456
/workdir/YaccTarget/idlc/source/parser.cxx: 1473 in yytnamerr(char *, const
char *)()
1467 switch (*++yyp)
1468 {
1469 case '\'':
1470 case ',':
1471 goto do_not_strip_quotes;
1472
>>> CID 257629:(MISSING_BREAK)
>>> The case for value "'\\'" is not terminated by a "break" statement.
1473 case '\\':
1474 if (*++yyp != '\\')
1475 goto do_not_strip_quotes;
1476 else
1477 goto append;
1478
___
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/inc/wrapper.hxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6a1de4f74e2510029313771d2751b6cd59141acf
Author: Kevin Suo
AuthorDate: Tue Jul 13 15:13:45 2021 +0800
Commit: Noel Grandin
CommitDate: Wed Jul 14 18:22:20 2021 +0200
tdf#78427 sdext.pdfimport: more bold/italic/Oblique fixes
e.g. the PDF in tdf#107812.
Also added notes to the fontAttributesSuffixes list.
Change-Id: I4a4dcba2d9369c6b09168a18784d2f6e7d08793d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118832
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sdext/source/pdfimport/inc/wrapper.hxx
b/sdext/source/pdfimport/inc/wrapper.hxx
index 918f976ee817..12476a01aa1c 100644
--- a/sdext/source/pdfimport/inc/wrapper.hxx
+++ b/sdext/source/pdfimport/inc/wrapper.hxx
@@ -54,21 +54,25 @@ namespace pdfi
const OUString&rFilterOptions );
const OUString fontAttributesSuffixes[] = {
+// Note: for performance consideration, each one listed here is
evaluated once,
+// and they are checked from the suffix, thus the order matters.
+// e.g. for "TimesNewRomanPS-BoldItalic", to get "TimesNewRoman", you
should
+// first have "Italic", and then "Bold", then "-", and then "PS".
"MT",
"PS",
"PSMT",
"Regular",
"Bold",
"Italic",
-"Bold",
"Oblique",
+"Bold", //BoldItalic, BoldObique
"Light",
"Reg",
"VKana",
"-",
",",
";",
-"PS",
+"PS", // e.g. TimesNewRomanPS-BoldMT
};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa
basic/qa/basic_coverage/dateadd.bas |5 +
1 file changed, 5 insertions(+)
New commits:
commit c3fc5aaa654b649be9adec8904f76272cd50bb16
Author: Xisco Fauli
AuthorDate: Wed Jul 14 17:30:01 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 14 18:15:28 2021 +0200
tdf#114011: basic_macros: Add unittest
Change-Id: Ib9a7e87b4c8159fd5fb66705cddae138fcdd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118942
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/basic/qa/basic_coverage/dateadd.bas
b/basic/qa/basic_coverage/dateadd.bas
index 84b796db3cba..409a55a9b76c 100644
--- a/basic/qa/basic_coverage/dateadd.bas
+++ b/basic/qa/basic_coverage/dateadd.bas
@@ -20,6 +20,11 @@ Sub verify_testDateAdd()
' tdf#117612
TestUtil.AssertEqual(DateAdd("m", 1, "2014-01-29"), CDate("2014-02-28"),
"DateAdd(""m"", 1, ""2014-01-29"")")
+' tdf#114011 Without the fix in place, this test would have failed with
+' returned 01/31/32767, expected 12/31/32767
+TestUtil.AssertEqual(DateAdd("m", 1, 31012004), CDate("32767-12-31"),
"DateAdd(""m"", 1, 31012004)")
+TestUtil.AssertEqual(DateAdd("M", 1, 31012005), CDate("32767-12-31"),
"DateAdd(""M"", 1, 31012005)")
+
Exit Sub
errorHandler:
TestUtil.ReportErrorHandler("verify_testDateAdd", Err, Error$, Erl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 34aae062110cbb50e634b3678ccaf4428d3687c9 Author: Tor Lillqvist AuthorDate: Wed May 19 14:18:56 2021 +0300 Commit: Tor Lillqvist CommitDate: Wed Jul 14 18:15:42 2021 +0200 We do want scripting on iOS, too The native-code.py script unconditionally generates references to that now. Change-Id: Ib0ca1e994af15597f8a191ccdd32d95efca063da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115796 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118897 diff --git a/configure.ac b/configure.ac index d5b2dc15c0f9..2a1b09e09db6 100644 --- a/configure.ac +++ b/configure.ac @@ -2905,11 +2905,7 @@ if test "$enable_extensions" = yes; then fi if test -z "$enable_scripting"; then -# Disable scripting for iOS unless specifically overridden -# with --enable-scripting. -if test $_os != iOS; then -enable_scripting=yes -fi +enable_scripting=yes fi DISABLE_SCRIPTING='' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/Library_bib.mk extensions/source extensions/uiconfig
extensions/Library_bib.mk |1
extensions/source/bibliography/general.cxx | 25 ++
extensions/source/bibliography/general.hxx |2 +
extensions/uiconfig/sbibliography/ui/generalpage.ui | 34 +---
4 files changed, 57 insertions(+), 5 deletions(-)
New commits:
commit 3be01c11e87f6989f75cc5d000afb3c4fe50b3ab
Author: Miklos Vajna
AuthorDate: Wed Jul 14 16:44:08 2021 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 14 17:38:43 2021 +0200
extensions: bibliography database window: add browse button for URLs
To be consistent with the Define Bibliography Entry dialog which already
had this.
Change-Id: I1f2eda189ae594dbef9c7fd4f0f1a1d12dc6ad5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118939
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 1f04de241c23..04787f16058e 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_exception_objects,bib,\
$(eval $(call gb_Library_use_libraries,bib,\
dbtools \
+ sfx \
sot \
svt \
svl \
diff --git a/extensions/source/bibliography/general.cxx
b/extensions/source/bibliography/general.cxx
index f2517ed95515..07fda81fc69f 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -25,6 +25,8 @@
#include
#include
#include
+#include
+
#include
#include
#include
@@ -42,6 +44,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -121,6 +124,7 @@ BibGeneralPage::BibGeneralPage(vcl::Window* pParent,
BibDataManager* pMan)
, xNoteED(m_xBuilder->weld_entry("notecontrol"))
, xURLFT(m_xBuilder->weld_label("url"))
, xURLED(m_xBuilder->weld_entry("urlcontrol"))
+, m_xBrowseButton(m_xBuilder->weld_button("browse"))
, xCustom1FT(m_xBuilder->weld_label("custom1"))
, xCustom1ED(m_xBuilder->weld_entry("custom1control"))
, xCustom2FT(m_xBuilder->weld_label("custom2"))
@@ -248,6 +252,8 @@ BibGeneralPage::BibGeneralPage(vcl::Window* pParent,
BibDataManager* pMan)
xURLFT->get_label(), *xURLED,
sTableErrorString, HID_BIB_URL_POS);
+m_xBrowseButton->connect_clicked(LINK(this, BibGeneralPage, BrowseHdl));
+
AddControlWithError(lcl_GetColumnName(pMapping, CUSTOM1_POS),
xCustom1FT->get_label(), *xCustom1ED,
sTableErrorString, HID_BIB_CUSTOM1_POS);
@@ -279,6 +285,24 @@ BibGeneralPage::BibGeneralPage(vcl::Window* pParent,
BibDataManager* pMan)
set_height_request(aSize.Height());
}
+IMPL_LINK_NOARG(BibGeneralPage, BrowseHdl, weld::Button&, void)
+{
+sfx2::FileDialogHelper
aFileDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+FileDialogFlags::NONE, GetFrameWeld());
+OUString aPath = xURLED->get_text();
+if (!aPath.isEmpty())
+{
+aFileDlg.SetDisplayDirectory(aPath);
+}
+
+if (aFileDlg.Execute() != ERRCODE_NONE)
+{
+return;
+}
+
+xURLED->set_text(aFileDlg.GetPath());
+};
+
IMPL_LINK(BibGeneralPage, FirstElementKeyInputHdl, const KeyEvent&, rKeyEvent,
bool)
{
sal_uInt16 nCode = rKeyEvent.GetKeyCode().GetCode();
@@ -586,6 +610,7 @@ void BibGeneralPage::dispose()
xNoteED.reset();
xURLFT.reset();
xURLED.reset();
+m_xBrowseButton.reset();
xCustom1FT.reset();
xCustom1ED.reset();
xCustom2FT.reset();
diff --git a/extensions/source/bibliography/general.hxx
b/extensions/source/bibliography/general.hxx
index 3c897bfbeb4c..acf996a52a25 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -107,6 +107,7 @@ class BibGeneralPage : public InterimItemWindow
std::unique_ptr xNoteED;
std::unique_ptr xURLFT;
std::unique_ptr xURLED;
+std::unique_ptr m_xBrowseButton;
std::unique_ptr xCustom1FT;
std::unique_ptr xCustom1ED;
@@ -137,6 +138,7 @@ class BibGeneralPage : public InterimItemWindow
DECL_LINK(FirstElementKeyInputHdl, const KeyEvent&, bool);
DECL_LINK(LastElementKeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(BrowseHdl, weld::Button&, void);
public:
BibGeneralPage(vcl::Window* pParent,
BibDataManager* pDatMan);
diff --git a/extensions/uiconfig/sbibliography/ui/generalpage.ui
b/extensions/uiconfig/sbibliography/ui/generalpage.ui
index 2d16427fb6f8..8baf5fb0aa00 100644
--- a/extensions/uiconfig/sbibliography/ui/generalpage.ui
+++ b/extensions/uiconfig/sbibliography/ui/generalpage.ui
@@ -762,11 +762,35 @@
-
-True
-True
-True
-True
+
+Tru
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source
sw/source/core/doc/docdesc.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit ac1817a2fb9fde32f40c5afe96bab174621de892 Author: Noel Grandin AuthorDate: Wed Jul 14 10:24:17 2021 +0200 Commit: Xisco Fauli CommitDate: Wed Jul 14 17:31:32 2021 +0200 tdf#143320 Crash at paste/undo paste again revert commit 790135003b03b38a14efb7e0d345188607020a99 Author: Noel Grandin Date: Wed May 19 20:03:07 2021 +0200 fix leak when removing PageDesc Change-Id: Ia6a03dec2db8f68c5c0c34d6ee9fb1889151f29d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118885 Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit 2575f9757126228ba43f382a419b92e71ee5b608) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118913 Reviewed-by: Xisco Fauli diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index c51c5cde92ef..a4de7277fc63 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -753,7 +753,6 @@ void SwDoc::DelPageDesc( size_t i, bool bBroadcast ) PreDelPageDesc(&rDel); // #i7983# m_PageDescs.erase(m_PageDescs.begin() + i); -delete &rDel; getIDocumentState().SetModified(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/tdf141964_numId0.rtf | 42 ++
sw/qa/extras/rtfexport/rtfexport3.cxx |8
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 ++--
writerfilter/source/dmapper/NumberingManager.cxx |2 -
4 files changed, 55 insertions(+), 5 deletions(-)
New commits:
commit 6d81084e4f5100b1c8204f30a91d7a5b79998508
Author: Justin Luth
AuthorDate: Wed Jul 14 10:27:24 2021 +0200
Commit: Justin Luth
CommitDate: Wed Jul 14 17:29:54 2021 +0200
tdf#141964 writerfilter CN: numId0 has different meaning for RTF
For DOCX, numId means turn off numbering.
RTF probably doesn't have numbering as part of paragraph styles,
so it doesn't need a numId 0 to cancel existing numbering.
This numbering is applied directly to the paragraph during import.
So, for RTF, numId 0 needs to be treated just like any other numId
(except for -1 through -5 although currently
we only import positive numbers).
The statement "if pList and numId > 0" is basically redundant.
pList will not be exist for an invalid numId.
Since numId can be zero for RTF, just get rid of the clause
to avoid any misleading conclusions.
And that is all that this patch is doing. It doesn't really fix
anything, it just changes code that gives out the wrong impression.
AFAICT, RTF never uses styles, and therefore it is always
isNumberingViaRule and so is almost untouched by finishParagraph.
Change-Id: Ibc89d00ce69ad09208254ed85710f1f1aed18074
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118910
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/rtfexport/data/tdf141964_numId0.rtf
b/sw/qa/extras/rtfexport/data/tdf141964_numId0.rtf
new file mode 100644
index ..aa79b2618c19
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf141964_numId0.rtf
@@ -0,0 +1,42 @@
+{\rtf1\ansi\deff0\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\froman\fprq2\fcharset0 Times New Roman;}{\f4\fnil\fprq0\fcharset2
StarSymbol{\*\falt Arial Unicode MS};}{\f5\fnil\fprq2\fcharset0 Arial Unicode
MS;}{\f6\fnil\fprq2\fcharset0 MS Mincho;}{\f7\fnil\fprq2\fcharset0
Tahoma;}{\f8\fnil\fprq0\fcharset0 Tahoma;}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue128;\red255\green255\blue255;\red227\green227\blue227;\red128\green128\blue128;}
+{\stylesheet{\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af7\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031\snext1
Normal;}
+{\s2\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af7\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031\sbasedon1\snext2
Body Text;}
+{\s3\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af8\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031\sbasedon2\snext3
List;}
+{\s4\sb120\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af8\afs20\lang255\ai\ltrch\dbch\af5\langfe255\hich\f0\fs20\lang1031\i\loch\f0\fs20\lang1031\i\sbasedon1\snext4
caption;}
+{\s5\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af8\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031\sbasedon1\snext5
Index;}
+{\s6\sb240\sa283\keepn\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\afs28\lang255\ltrch\dbch\af6\langfe255\hich\f2\fs28\lang1031\loch\f2\fs28\lang1031\sbasedon1\snext2
Heading;}
+{\s7\sb240\sa283\keepn\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\afs48\lang255\ab\ltrch\dbch\af5\langfe255\hich\f0\fs48\lang1031\b\loch\f0\fs48\lang1031\b\sbasedon6\snext2{\*\soutlvl0}
heading 1;}
+{\s8\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af7\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031\sbasedon1\snext8
Table Contents;}
+{\s9\cf0\qc{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af7\afs24\lang255\ab\ltrch\dbch\af5\langfe255\hich\f0\fs24\lang1031\b\loch\f0\fs24\lang1031\b\sbasedon8\snext9
Table Heading;}
+{\s10\sb240\sa283\keepn\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\afs36\lang255\ab\ltrch\dbch\af5\langfe255\hich\f0\fs36\lang1031\b\loch\f0\fs36\lang1031\b\sbasedon6\snext2{\*\soutlvl1}
heading 2;}
+{\*\cs12\cf2\ul\ulc0\rtlch\af7\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031
Internet link;}
+{\*\cs13\cf0\rtlch\af4\afs18\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs18\lang1031\loch\f4\fs18\lang1031
Bullet Symbols;}
+}{\*\listtable{\list\listtemplateid1
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext
\'01\u8226 ?;}{\levelnumbers;}\f4\fs18\f4\fs18\f4\fs18\f4\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext
\'01\u8226 ?;}{\levelnumbers;}\f4\fs18\f4\fs18\f4\fs18\f4\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstarta
[Libreoffice-commits] core.git: basctl/source include/sfx2 sfx2/source
basctl/source/basicide/baside2.cxx | 30 +++
basctl/source/basicide/baside2.hxx |1
basctl/source/basicide/baside3.cxx | 44 ---
basctl/source/inc/baside3.hxx|2 -
basctl/source/inc/basidesh.hxx |2 -
include/sfx2/filedlghelper.hxx |4 +++
sfx2/source/dialog/filedlghelper.cxx |8 ++
7 files changed, 49 insertions(+), 42 deletions(-)
New commits:
commit 9a55b97e980bbf2a0ce12841f6168f1f7545ac96
Author: Samuel Mehrbrodt
AuthorDate: Wed Jul 14 09:44:38 2021 +0200
Commit: Samuel Mehrbrodt
CommitDate: Wed Jul 14 16:29:54 2021 +0200
tdf#40068 Remember last directory for basic/dialog import/export
Change-Id: I9dee98a2018beb0b8d5a0e57b66dbd9d5390c71c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118883
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index ce654b998904..4e562420ef19 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -45,6 +45,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -423,22 +424,20 @@ void ModulWindow::BasicStop()
void ModulWindow::LoadBasic()
{
-Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
-Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext,
TemplateDescription::FILEOPEN_SIMPLE);
-
-if ( !m_sCurPath.isEmpty() )
-xFP->setDisplayDirectory ( m_sCurPath );
+sfx2::FileDialogHelper
aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+FileDialogFlags::NONE, this->GetFrameWeld());
+aDlg.SetContext(sfx2::FileDialogHelper::BasicImportSource);
+Reference xFP = aDlg.GetFilePicker();
xFP->appendFilter( "BASIC" , "*.bas" );
xFP->appendFilter( IDEResId(RID_STR_FILTER_ALLFILES), FilterMask_All );
xFP->setCurrentFilter( "BASIC" );
-if( xFP->execute() != RET_OK )
+if( aDlg.Execute() != ERRCODE_NONE )
return;
Sequence< OUString > aPaths = xFP->getSelectedFiles();
-m_sCurPath = aPaths[0];
-SfxMedium aMedium( m_sCurPath, StreamMode::READ |
StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE );
+SfxMedium aMedium( aPaths[0], StreamMode::READ |
StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE );
SvStream* pStream = aMedium.GetInStream();
if ( pStream )
{
@@ -470,7 +469,10 @@ void ModulWindow::LoadBasic()
void ModulWindow::SaveBasicSource()
{
Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
-Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext,
TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD);
+sfx2::FileDialogHelper
aDlg(ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD,
+FileDialogFlags::NONE, this->GetFrameWeld());
+aDlg.SetContext(sfx2::FileDialogHelper::BasicExportSource);
+const Reference& xFP = aDlg.GetFilePicker();
Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY);
xFPControl->enableControl(ExtendedFilePickerElementIds::CHECKBOX_PASSWORD,
false);
@@ -478,19 +480,15 @@ void ModulWindow::SaveBasicSource()
aValue <<= true;
xFPControl->setValue(ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION,
0, aValue);
-if ( !m_sCurPath.isEmpty() )
-xFP->setDisplayDirectory ( m_sCurPath );
-
xFP->appendFilter( "BASIC", "*.bas" );
xFP->appendFilter( IDEResId(RID_STR_FILTER_ALLFILES), FilterMask_All );
xFP->setCurrentFilter( "BASIC" );
-if( xFP->execute() != RET_OK )
+if( aDlg.Execute() != ERRCODE_NONE )
return;
Sequence< OUString > aPaths = xFP->getSelectedFiles();
-m_sCurPath = aPaths[0];
-SfxMedium aMedium( m_sCurPath, StreamMode::WRITE |
StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC );
+SfxMedium aMedium( aPaths[0], StreamMode::WRITE |
StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC );
SvStream* pStream = aMedium.GetOutStream();
if ( pStream )
{
@@ -518,7 +516,7 @@ void ModulWindow::ImportDialog()
{
const ScriptDocument& rDocument = GetDocument();
OUString aLibName = GetLibName();
-implImportDialog(GetFrameWeld(), m_sCurPath, rDocument, aLibName);
+implImportDialog(GetFrameWeld(), rDocument, aLibName);
}
void ModulWindow::ToggleBreakPoint( sal_uInt16 nLine )
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 06045356bccb..ab6d7102bd15 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -281,7 +281,6 @@ private:
VclPtr m_aXEditorWindow;
BasicStatus m_aStatus;
SbModuleRef m_xModule;
-OUStringm_sCurPath;
OUStringm_aModule;
voidCheckCompileBasic();
diff --
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |1 +
vcl/source/filter/svm/SvmReader.cxx | 15 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit e49ffd9ea4f3e183004f9f4aa4749f8fec46eb7f
Author: panoskorovesis
AuthorDate: Wed Jul 14 13:20:44 2021 +0300
Commit: Miklos Vajna
CommitDate: Wed Jul 14 16:11:29 2021 +0200
Add Handler for TextColor Read
The handler separates MetaTextColorAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: Ibff3c33b273efb581b8dbb03bddef9fd7c64f7fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118896
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 2f953bac201c..66ec96b1afce 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -73,6 +73,7 @@ public:
rtl::Reference ISectRectClipRegionHandler();
rtl::Reference ISectRegionClipRegionHandler();
rtl::Reference MoveClipRegionHandler();
+rtl::Reference TextColorHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index e8219081ad38..bfbd08c3b0d9 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1370,6 +1370,7 @@ public:
explicitMetaTextColorAction( const Color& );
const Color&GetColor() const { return maColor; }
+voidSetColor(Color& rColor) { maColor = rColor; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextFillColorAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 1c009e093b56..56197443757d 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -268,7 +268,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return FillColorHandler();
break;
case MetaActionType::TEXTCOLOR:
-pAction = new MetaTextColorAction;
+return TextColorHandler();
break;
case MetaActionType::TEXTFILLCOLOR:
pAction = new MetaTextFillColorAction;
@@ -1145,4 +1145,17 @@ rtl::Reference
SvmReader::MoveClipRegionHandler()
return pAction;
}
+
+rtl::Reference SvmReader::TextColorHandler()
+{
+auto pAction = new MetaTextColorAction();
+
+VersionCompatRead aCompat(mrStream);
+Color aColor;
+ReadColor(aColor);
+
+pAction->SetColor(aColor);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |2 ++
vcl/source/filter/svm/SvmReader.cxx | 16 +++-
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 8f00b018cd035db040ec18bff5c53571e3f86f93
Author: panoskorovesis
AuthorDate: Wed Jul 14 13:07:41 2021 +0300
Commit: Miklos Vajna
CommitDate: Wed Jul 14 16:10:32 2021 +0200
Add Handler for MoveClipRegion Read
The handler separates the MetaMoveClipRegion::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I12f987a2887060b30ae0496a5785baffe8550dfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118895
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 23c2bee11698..2f953bac201c 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -72,6 +72,7 @@ public:
rtl::Reference ClipRegionHandler();
rtl::Reference ISectRectClipRegionHandler();
rtl::Reference ISectRegionClipRegionHandler();
+rtl::Reference MoveClipRegionHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 259b813b4db2..e8219081ad38 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1284,6 +1284,8 @@ public:
tools::LongGetHorzMove() const { return mnHorzMove; }
tools::LongGetVertMove() const { return mnVertMove; }
+voidSetHorzMove(tools::Long nHorzMove) { mnHorzMove =
nHorzMove; }
+voidSetVertMove(tools::Long nVertMove) { mnVertMove =
nVertMove; }
};
class VCL_DLLPUBLIC MetaLineColorAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 47683276eab4..1c009e093b56 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -259,7 +259,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return ISectRegionClipRegionHandler();
break;
case MetaActionType::MOVECLIPREGION:
-pAction = new MetaMoveClipRegionAction;
+return MoveClipRegionHandler();
break;
case MetaActionType::LINECOLOR:
return LineColorHandler();
@@ -1131,4 +1131,18 @@ rtl::Reference
SvmReader::ISectRegionClipRegionHandler()
return pAction;
}
+
+rtl::Reference SvmReader::MoveClipRegionHandler()
+{
+auto pAction = new MetaMoveClipRegionAction();
+
+VersionCompatRead aCompat(mrStream);
+sal_Int32 nTmpHM(0), nTmpVM(0);
+mrStream.ReadInt32(nTmpHM).ReadInt32(nTmpVM);
+
+pAction->SetHorzMove(nTmpHM);
+pAction->SetVertMove(nTmpVM);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |1 +
vcl/source/filter/svm/SvmReader.cxx | 14 +-
3 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit ce30918cfe59a702dfe5f69ed84d13a0cc3de4bc
Author: panoskorovesis
AuthorDate: Wed Jul 14 12:58:31 2021 +0300
Commit: Miklos Vajna
CommitDate: Wed Jul 14 16:09:44 2021 +0200
Add Handler for ISectRegionClipRegion Read
The handler separates MetaISectRegionClipRegionAction::Read from
metaact.hxx. Read implementation is now in SvmReader.hxx
Change-Id: I49f6667f2e439c18ec4bc0cbc8d74b8203fc1472
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118894
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index a295990821c6..23c2bee11698 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -71,6 +71,7 @@ public:
rtl::Reference WallpaperHandler();
rtl::Reference ClipRegionHandler();
rtl::Reference ISectRectClipRegionHandler();
+rtl::Reference ISectRegionClipRegionHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 2d5ca05f7181..259b813b4db2 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1254,6 +1254,7 @@ public:
virtual voidScale( double fScaleX, double fScaleY ) override;
const vcl::Region& GetRegion() const { return maRegion; }
+voidSetRegion(vcl::Region& rRegion) { maRegion = rRegion; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaMoveClipRegionAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 87d6157a7734..47683276eab4 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -256,7 +256,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return ISectRectClipRegionHandler();
break;
case MetaActionType::ISECTREGIONCLIPREGION:
-pAction = new MetaISectRegionClipRegionAction;
+return ISectRegionClipRegionHandler();
break;
case MetaActionType::MOVECLIPREGION:
pAction = new MetaMoveClipRegionAction;
@@ -1119,4 +1119,16 @@ rtl::Reference
SvmReader::ISectRectClipRegionHandler()
return pAction;
}
+
+rtl::Reference SvmReader::ISectRegionClipRegionHandler()
+{
+auto pAction = new MetaISectRegionClipRegionAction();
+
+VersionCompatRead aCompat(mrStream);
+vcl::Region aRegion;
+ReadRegion(mrStream, aRegion);
+pAction->SetRegion(aRegion);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |1 +
vcl/source/filter/svm/SvmReader.cxx | 16 +++-
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 8a13231580a806e3ee9b2d197d4cc118f30ab157
Author: panoskorovesis
AuthorDate: Wed Jul 14 12:40:11 2021 +0300
Commit: Miklos Vajna
CommitDate: Wed Jul 14 16:06:43 2021 +0200
Add Handler for ISectRectClipRegion Read
The handler separates MetaISectRectClipRegionAction::Read from
metaact.hxx. Read implementation is now in SvmReader.hxx
Change-Id: I5db6d405ac926d8881acbb17b47610f24ce77994
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118892
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 002157ff932b..a295990821c6 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -70,6 +70,7 @@ public:
rtl::Reference HatchHandler();
rtl::Reference WallpaperHandler();
rtl::Reference ClipRegionHandler();
+rtl::Reference ISectRectClipRegionHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 40d31a6f452b..2d5ca05f7181 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1225,6 +1225,7 @@ public:
virtual voidScale( double fScaleX, double fScaleY ) override;
const tools::Rectangle&GetRect() const { return maRect; }
+voidSetRect(tools::Rectangle& rRect) { maRect = rRect; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaISectRegionClipRegionAction final :
public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index b01acffd92ad..87d6157a7734 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -253,7 +253,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return ClipRegionHandler();
break;
case MetaActionType::ISECTRECTCLIPREGION:
-pAction = new MetaISectRectClipRegionAction;
+return ISectRectClipRegionHandler();
break;
case MetaActionType::ISECTREGIONCLIPREGION:
pAction = new MetaISectRegionClipRegionAction;
@@ -1105,4 +1105,18 @@ rtl::Reference SvmReader::ClipRegionHandler()
return pAction;
}
+
+rtl::Reference SvmReader::ISectRectClipRegionHandler()
+{
+auto pAction = new MetaISectRectClipRegionAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+tools::Rectangle aRect;
+aSerializer.readRectangle(aRect);
+
+pAction->SetRect(aRect);
+
+return pAction;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uiview/viewstat.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9a8c8053b4fb322edb1e45b891307cdad1f3d41f Author: Heiko Tietze AuthorDate: Wed Jul 14 11:25:28 2021 +0200 Commit: Heiko Tietze CommitDate: Wed Jul 14 15:26:12 2021 +0200 Resolves tdf#113171 - Text box must not toggle command Change-Id: I1985a377c9b299dce7d3e01d4e67099562008d22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/11 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index bacc2f395583..f21772ffe28d 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -602,6 +602,7 @@ void SwView::GetDrawState(SfxItemSet &rSet) if ( bWeb ) rSet.DisableItem( nWhich ); else +if (nWhich != SID_DRAW_TEXT) //tdf#113171 rSet.Put( SfxBoolItem( nWhich, m_nDrawSfxId == nWhich ) ); break; @@ -610,6 +611,7 @@ void SwView::GetDrawState(SfxItemSet &rSet) if ( bWeb || !SvtLanguageOptions().IsVerticalTextEnabled() ) rSet.DisableItem( nWhich ); else +if (nWhich != SID_DRAW_TEXT_VERTICAL) //tdf#113171 rSet.Put( SfxBoolItem( nWhich, m_nDrawSfxId == nWhich ) ); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/window/toolbox2.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9a321fad30a3f7a2d1048ad00285d7a2bcd3ba2e
Author: Szymon Kłos
AuthorDate: Wed Jul 14 12:00:25 2021 +0200
Commit: Szymon Kłos
CommitDate: Wed Jul 14 15:23:51 2021 +0200
jsdialog: dump selected state for toolitems
Change-Id: I8c2c017168e4feae6e24118153906ee24ed90a5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118893
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 4538fcf23e58..55047743a3ed 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1753,6 +1753,8 @@ void ToolBox::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
rJsonWriter.put("type", "toolitem");
rJsonWriter.put("text", GetItemText(nId));
rJsonWriter.put("command", sCommand);
+if (IsItemChecked(nId))
+rJsonWriter.put("selected", true);
if (!IsItemVisible(nId))
rJsonWriter.put("visible", false);
if (GetItemBits(nId) & ToolBoxItemBits::DROPDOWN)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf168442ae74837e61939981475068a628fd21ad Author: Johnny_M AuthorDate: Wed Jul 14 14:57:42 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:57:42 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 5314f2bf56153760b4d704eb971b41638fc4c4d1 - tdf#132643 Translate German section IDs Change-Id: Ic431c8645a11f1b9bc4fdfe1e7d2fbe051df4d65 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118907 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4aa4029c1daf..5314f2bf5615 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4aa4029c1daf5a5137befc6a52dfa2c666a47b24 +Subproject commit 5314f2bf56153760b4d704eb971b41638fc4c4d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/schart/04/0102.xhp |2 -- source/text/smath/04/0102.xhp|2 +- source/text/smath/guide/keyboard.xhp |2 +- 3 files changed, 2 insertions(+), 4 deletions(-) New commits: commit 5314f2bf56153760b4d704eb971b41638fc4c4d1 Author: Johnny_M AuthorDate: Wed Jul 14 13:20:42 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:57:42 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ic431c8645a11f1b9bc4fdfe1e7d2fbe051df4d65 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118907 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/schart/04/0102.xhp b/source/text/schart/04/0102.xhp index 749425186..a97b85b77 100644 --- a/source/text/schart/04/0102.xhp +++ b/source/text/schart/04/0102.xhp @@ -47,10 +47,8 @@ Tab Select next object. - Shift+Tab Select previous object. - Home Select first object. diff --git a/source/text/smath/04/0102.xhp b/source/text/smath/04/0102.xhp index 532219d10..a7b3b523c 100644 --- a/source/text/smath/04/0102.xhp +++ b/source/text/smath/04/0102.xhp @@ -71,7 +71,7 @@ Tab Jump from the first category item to the first function of the category. - + Shift+Tab Jump from the last category item to the last function of the category. diff --git a/source/text/smath/guide/keyboard.xhp b/source/text/smath/guide/keyboard.xhp index 21ee877c7..2cee52b06 100644 --- a/source/text/smath/guide/keyboard.xhp +++ b/source/text/smath/guide/keyboard.xhp @@ -69,7 +69,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5ea19e2dfbfa7517aff3b7bc38242506c7c41858 Author: Johnny_M AuthorDate: Wed Jul 14 14:56:59 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:56:59 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 4aa4029c1daf5a5137befc6a52dfa2c666a47b24 - tdf#132643 Translate German section IDs Remove unused. Change-Id: If36ee8cac32e1d5b9ef85e35ac7b7f7510ceb527 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118906 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3a55b50e0ca4..4aa4029c1daf 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3a55b50e0ca48b1904f625f7041d30830d2e9c65 +Subproject commit 4aa4029c1daf5a5137befc6a52dfa2c666a47b24 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/schart/04/0102.xhp |2 -- source/text/shared/main0226.xhp|2 -- 2 files changed, 4 deletions(-) New commits: commit 4aa4029c1daf5a5137befc6a52dfa2c666a47b24 Author: Johnny_M AuthorDate: Wed Jul 14 13:15:26 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:56:59 2021 +0200 tdf#132643 Translate German section IDs Remove unused. Change-Id: If36ee8cac32e1d5b9ef85e35ac7b7f7510ceb527 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118906 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/schart/04/0102.xhp b/source/text/schart/04/0102.xhp index c9a686141..749425186 100644 --- a/source/text/schart/04/0102.xhp +++ b/source/text/schart/04/0102.xhp @@ -30,7 +30,6 @@ - shortcut keys; charts charts; shortcuts @@ -38,7 +37,6 @@ You can use the following shortcut keys in charts. You can also use the general shortcut keys for $[officename]. - Shortcuts in Charts diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp index 98dddeb9f..b5ad5a26b 100644 --- a/source/text/shared/main0226.xhp +++ b/source/text/shared/main0226.xhp @@ -30,10 +30,8 @@ - Form Design Toolbar The Form Design toolbar becomes visible as soon as you select a form object when working in the design mode. - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 073e7b0ce56456187e87b8a13846ba853a4cf10b Author: Johnny_M AuthorDate: Wed Jul 14 14:56:17 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:56:17 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 3a55b50e0ca48b1904f625f7041d30830d2e9c65 - tdf#132643 Translate German section IDs Change-Id: I0a51b1c2b2503fb8c07a63a806bddd7345be1f7e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118905 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 17ccb362fcbd..3a55b50e0ca4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 17ccb362fcbd6a54600232b63b554c5f5ae7345b +Subproject commit 3a55b50e0ca48b1904f625f7041d30830d2e9c65 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0002.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a55b50e0ca48b1904f625f7041d30830d2e9c65 Author: Johnny_M AuthorDate: Wed Jul 14 13:12:11 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:56:17 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I0a51b1c2b2503fb8c07a63a806bddd7345be1f7e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118905 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0002.xhp b/source/text/shared/00/0002.xhp index 9c0f7c275..0cfbc9b60 100644 --- a/source/text/shared/00/0002.xhp +++ b/source/text/shared/00/0002.xhp @@ -173,7 +173,7 @@ HTML is a specialized application of SGML. This means that most Web browsers support only a limited range of SGML standards and that almost all SGML-enabled systems can produce attractive HTML pages. - + search engines; definition ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9188dd9ad99baa5dcd6e9b1b3ec01c27ca1322df Author: Johnny_M AuthorDate: Wed Jul 14 14:55:25 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:55:25 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 17ccb362fcbd6a54600232b63b554c5f5ae7345b - tdf#132643 Translate German section IDs Change-Id: I8298819cbb9ce2d7d973742592dc4299e4488dbf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118901 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d6df4a20a56d..17ccb362fcbd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d6df4a20a56da69912d321950d2d32db8e49897a +Subproject commit 17ccb362fcbd6a54600232b63b554c5f5ae7345b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/05340300.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 17ccb362fcbd6a54600232b63b554c5f5ae7345b Author: Johnny_M AuthorDate: Wed Jul 14 12:57:12 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:55:25 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I8298819cbb9ce2d7d973742592dc4299e4488dbf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118901 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index 769e9fb73..7db2a6a34 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -54,7 +54,7 @@ Choose Format - Axis - Y Axis - Numbers tab (chart documents). - + Choose Format - Title - Main Title - Alignment tab.Choose Format - Cells - Alignment tab. Open context menu of a column header in a database table - choose Column Format - Alignment tab. diff --git a/source/text/shared/01/05340300.xhp b/source/text/shared/01/05340300.xhp index ca98487a4..a9f1c6bcb 100644 --- a/source/text/shared/01/05340300.xhp +++ b/source/text/shared/01/05340300.xhp @@ -37,7 +37,7 @@ Sets the alignment options for the contents of the current cell, or the selected cells. - + Horizontal ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d5622efa9a78d4d5798045f4c5131bd7753af51 Author: Johnny_M AuthorDate: Wed Jul 14 14:54:06 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:54:06 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d6df4a20a56da69912d321950d2d32db8e49897a - tdf#132643 Translate German section IDs Change-Id: Ie3a867a7bcda9edc66327ef2c5413a6faee8a7fc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118904 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index fca292b94b83..d6df4a20a56d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fca292b94b832ad2de0609dd98ebdb45a53ca94e +Subproject commit d6df4a20a56da69912d321950d2d32db8e49897a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/0536.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d6df4a20a56da69912d321950d2d32db8e49897a Author: Johnny_M AuthorDate: Wed Jul 14 13:08:45 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:54:06 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ie3a867a7bcda9edc66327ef2c5413a6faee8a7fc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118904 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index 4ec6cf686..769e9fb73 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -77,7 +77,7 @@ Choose Format - Flip - Horizontally. Right-click a selected object - choose Flip - Horizontally ($[officename] Impress). - + Select three or more objects and Choose Shape - Distribute Selection ($[officename] Draw). Open context menu - choose Distribute Selection ($[officename] Impress). diff --git a/source/text/shared/01/0536.xhp b/source/text/shared/01/0536.xhp index 3fbbae9c5..af9f8d314 100644 --- a/source/text/shared/01/0536.xhp +++ b/source/text/shared/01/0536.xhp @@ -43,7 +43,7 @@ Distributes three or more selected objects evenly along the horizontal axis or the vertical axis. You can also evenly distribute the spacing between objects. - + Objects are distributed with respect to the outermost objects in the selection. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6130f18980ef898923d0cf0c22834f5114d12bdd Author: Johnny_M AuthorDate: Wed Jul 14 14:53:36 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:53:36 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to fca292b94b832ad2de0609dd98ebdb45a53ca94e - tdf#132643 Translate German section IDs Change-Id: I768845ed90efe57c11522759bae5a1da6fe99901 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118903 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 95b36f942f0e..fca292b94b83 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 95b36f942f0e9f7130dec40af7a471a392d7deb4 +Subproject commit fca292b94b832ad2de0609dd98ebdb45a53ca94e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/0524.xhp |2 +- source/text/shared/01/05240200.xhp |4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit fca292b94b832ad2de0609dd98ebdb45a53ca94e Author: Johnny_M AuthorDate: Wed Jul 14 13:05:16 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:53:36 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I768845ed90efe57c11522759bae5a1da6fe99901 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118903 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index a830e0226..4ec6cf686 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -71,7 +71,7 @@ Choose Format - Image - Properties - Image tab. Open context menu - choose Flip - Vertically (presentation documents). - + Choose Shape - Flip - Horizontally ($[officename] Draw). Choose Format - Image - Properties, and then click the Image tab. Choose Format - Flip - Horizontally. diff --git a/source/text/shared/01/0524.xhp b/source/text/shared/01/0524.xhp index 621eb614e..eda40485f 100644 --- a/source/text/shared/01/0524.xhp +++ b/source/text/shared/01/0524.xhp @@ -44,6 +44,6 @@ - + diff --git a/source/text/shared/01/05240200.xhp b/source/text/shared/01/05240200.xhp index d4375d8a9..79070464e 100644 --- a/source/text/shared/01/05240200.xhp +++ b/source/text/shared/01/05240200.xhp @@ -29,14 +29,14 @@ - + Horizontally Flips the selected object(s) horizontally from left to right. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 148508090f24c1e560b88e6ceb31c04cc1a2afc1 Author: Johnny_M AuthorDate: Wed Jul 14 14:53:01 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:53:01 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 95b36f942f0e9f7130dec40af7a471a392d7deb4 - tdf#132643 Translate German section IDs Change-Id: Ie92420fa13971bd11451ecf1c10089c7713dca7e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118902 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4d648ad84649..95b36f942f0e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4d648ad8464957732ea905672546d348ae279b13 +Subproject commit 95b36f942f0e9f7130dec40af7a471a392d7deb4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/0524.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 95b36f942f0e9f7130dec40af7a471a392d7deb4 Author: Johnny_M AuthorDate: Wed Jul 14 12:58:34 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:53:01 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ie92420fa13971bd11451ecf1c10089c7713dca7e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118902 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index c53cfb66c..a830e0226 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -61,7 +61,7 @@ Open context menu of a row header in a database table - choose Table Format. Open context menu of a column header in a database table - choose Column Format. Context menu for a row header in an open database table - Delete Rows. - + Choose Shape - Flip ($[officename] Draw). Choose Format - Image - Properties - Image tab. Open context menu - choose Flip (presentation documents). diff --git a/source/text/shared/01/0524.xhp b/source/text/shared/01/0524.xhp index ec73cd261..621eb614e 100644 --- a/source/text/shared/01/0524.xhp +++ b/source/text/shared/01/0524.xhp @@ -41,7 +41,7 @@ Flips the selected object horizontally, or vertically. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c31e741c562fa6607c9bd8c8b2ff4ba0ffa394b5 Author: Johnny_M AuthorDate: Wed Jul 14 14:52:32 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:52:32 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 4d648ad8464957732ea905672546d348ae279b13 - tdf#132643 Translate German section IDs Change-Id: I8730d353f578caa2a9ecb392819f7e957030db16 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118899 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f88bb249fc86..4d648ad84649 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f88bb249fc86e1d381b6e7551999ea084aadd142 +Subproject commit 4d648ad8464957732ea905672546d348ae279b13 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/05340200.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4d648ad8464957732ea905672546d348ae279b13 Author: Johnny_M AuthorDate: Wed Jul 14 12:53:14 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:52:32 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I8730d353f578caa2a9ecb392819f7e957030db16 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118899 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index e2cb699eb..c53cfb66c 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -34,7 +34,7 @@ Choose Format - Rows - Height. Open context menu of a row header in an open database table - choose Row Height. - + Choose Format - Columns - Width. Open context menu of a column header in a database table - choose Column Width. diff --git a/source/text/shared/01/05340200.xhp b/source/text/shared/01/05340200.xhp index 4f2b5f4c4..6f6d9 100644 --- a/source/text/shared/01/05340200.xhp +++ b/source/text/shared/01/05340200.xhp @@ -37,7 +37,7 @@ Column width Changes the width of the current column, or the selected columns. - + You can also change the width of a column by dragging the divider beside the column header. To fit the column width to the cell contents, double-click the divider. Width ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ab7ca478b65c019863929b2932474c092041f7e Author: Johnny_M AuthorDate: Wed Jul 14 14:51:58 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:51:58 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to f88bb249fc86e1d381b6e7551999ea084aadd142 - tdf#132643 Translate German section IDs Change-Id: I595af96cd8c7847387a11d300fb85bd8a8313fba Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118900 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d55f1498b49d..f88bb249fc86 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d55f1498b49ddeedad84b5f79012fc80fb4e6c75 +Subproject commit f88bb249fc86e1d381b6e7551999ea084aadd142 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: Are there ideas for client-server model.
But that is not libre office > -Original Message- > From: LibreOffice On Behalf > Of Miklos Vajna > Sent: Wednesday, 14 July 2021 11:03 > To: libreoffice@lists.freedesktop.org > Subject: Re: Are there ideas for client-server model. > > Hi Stef, > > On Tue, Jul 13, 2021 at 09:32:10AM +0200, Stef Bon > wrote: > > > What you describe sounds a lot like the functionality that the LOK > API > > > exposes. Online builds a c++ server on top of that, and then clients > > > connect to that via websockets. > > > > Online? What do you mean with "online"? > > https://collaboraonline.github.io/ which uses the LOK API and has a > client-server model. > > > > But core has a gtktiledviewer demo app > > > that shows that that LOK API is not tied to web browsers. So either > you > > > could build something not-browser-based on top of the LOK API or > build > > > on top of Online's server piece, but your clients would be desktop > apps, > > > not browsers. > > > > > > > Yes, does this example program read only or also write access? > > Is editing possible? > > Sure. If you build core.git, you can do 'bin/run gtktiledviewer' to try > it out yourself. It runs in-process to help debugging, though. > > > This client is a bit what I want, but still very far from the end > goal. > > Another example is the gtk app in online.git: that is also nominally a > desktop app, but in fact it reuses the JS user interface from Online. > > The bottom line is that the LOK API already provides collaborative > editing, and if you want a client-server protocol, Online already has > that, it would be probably a bit pointless to invent a parallel protocol > which does the same. :-) > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/05020300.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f88bb249fc86e1d381b6e7551999ea084aadd142 Author: Johnny_M AuthorDate: Wed Jul 14 12:55:24 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:51:58 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I595af96cd8c7847387a11d300fb85bd8a8313fba Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118900 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index 8f20f8e29..e2cb699eb 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -38,7 +38,7 @@ Choose Format - Columns - Width. Open context menu of a column header in a database table - choose Column Width. - + Choose Format - Cells - Numbers tab. diff --git a/source/text/shared/01/05020300.xhp b/source/text/shared/01/05020300.xhp index 4bb82c6a7..f3ad87522 100644 --- a/source/text/shared/01/05020300.xhp +++ b/source/text/shared/01/05020300.xhp @@ -49,7 +49,7 @@ - + Category ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2ee3c34aac9fc1ab0ad3ffe6ab11e4fd3684381b Author: Johnny_M AuthorDate: Wed Jul 14 14:50:52 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 14 14:50:52 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d55f1498b49ddeedad84b5f79012fc80fb4e6c75 - tdf#132643 Translate German section IDs Change-Id: Idd1c44b507aa4a739d58659504fb6bacd3add879 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118898 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4a07aa673277..d55f1498b49d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4a07aa673277b6769d16c968a3f868c11b6765c5 +Subproject commit d55f1498b49ddeedad84b5f79012fc80fb4e6c75 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/05340100.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d55f1498b49ddeedad84b5f79012fc80fb4e6c75 Author: Johnny_M AuthorDate: Wed Jul 14 12:50:50 2021 +0200 Commit: Olivier Hallot CommitDate: Wed Jul 14 14:50:52 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Idd1c44b507aa4a739d58659504fb6bacd3add879 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118898 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index 2f41d5a14..8f20f8e29 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -30,7 +30,7 @@ This listing is split over the files 00040500, 00040501, 00040502 and 00040503. Format Menu - + Choose Format - Rows - Height. Open context menu of a row header in an open database table - choose Row Height. diff --git a/source/text/shared/01/05340100.xhp b/source/text/shared/01/05340100.xhp index bfa85b7a0..9e3cb966d 100644 --- a/source/text/shared/01/05340100.xhp +++ b/source/text/shared/01/05340100.xhp @@ -37,7 +37,7 @@ You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang solenv/CompilerTest_compilerplugins_clang.mk
compilerplugins/clang/test/weakobject.cxx| 31
compilerplugins/clang/weakobject.cxx | 189 +++
solenv/CompilerTest_compilerplugins_clang.mk |1
3 files changed, 85 insertions(+), 136 deletions(-)
New commits:
commit 81697ca63d47decf165420c4373b2b53d7eab385
Author: Noel Grandin
AuthorDate: Tue Jul 13 15:50:35 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 14 14:39:39 2021 +0200
new loplugin:weakobject
find classes with more than one copy of OWeakObject in their inheritance
hierarchy, which is dodgy
Change-Id: I4e31bd6db03d25d934b736bd6a9c1b665f976ee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118855
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/test/weakobject.cxx
b/compilerplugins/clang/test/weakobject.cxx
new file mode 100644
index ..7c7da55664d2
--- /dev/null
+++ b/compilerplugins/clang/test/weakobject.cxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "config_clang.h"
+
+namespace cppu
+{
+class OWeakObject
+{
+};
+}
+
+class Foo1 : public cppu::OWeakObject
+{
+};
+class Foo2 : public cppu::OWeakObject
+{
+};
+
+// expected-error@+1 {{more than one copy of cppu::OWeakObject inherited
[loplugin:weakobject]}}
+class Foo3 : public Foo1, public Foo2
+{
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/weakobject.cxx
b/compilerplugins/clang/weakobject.cxx
index 055110ef9331..4801953cc44a 100644
--- a/compilerplugins/clang/weakobject.cxx
+++ b/compilerplugins/clang/weakobject.cxx
@@ -2,163 +2,80 @@
/*
* This file is part of the LibreOffice project.
*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
*/
-
#ifndef LO_CLANG_SHARED_PLUGINS
-#include "check.hxx"
+#include
+#include
+#include
+#include
+#include
+#include
#include "plugin.hxx"
+#include "check.hxx"
-/* OWeakObject::release() disposes weak references. If that isn't done
- * because a sub-class improperly overrides release() then
- * OWeakConnectionPoint::m_pObject continues to point to the deleted object
- * and that could result in use-after-free.
- */
-
-namespace {
+/*
+Check for places where we end up with more than one copy of cppu::OweakObject
in a class, which
+really should not happen - we should be using one of the
AggImplInheritanceHelper classes then
+to inherit.
+*/
-class WeakObject
-: public loplugin::FilteringPlugin
+namespace
+{
+class WeakObject : public loplugin::FilteringPlugin
{
-
public:
-explicit WeakObject(loplugin::InstantiationData const& rData):
FilteringPlugin(rData)
-{}
-
-virtual bool preRun() override {
-return compiler.getLangOpts().CPlusPlus; // no OWeakObject in C
-}
-void run() override {
-if( preRun()) {
-TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
-}
+explicit WeakObject(loplugin::InstantiationData const& data)
+: FilteringPlugin(data)
+{
}
-bool isDerivedFromOWeakObject(CXXMethodDecl const*const pMethodDecl)
+virtual bool preRun() override
{
-QualType const pClass(pMethodDecl->getParent()->getTypeForDecl(), 0);
-if (loplugin::TypeCheck(pClass).Class("OWeakObject").Namespace("cppu"))
-{
-return true;
-}
-// hopefully it's faster to recurse overridden methods than the
-// thicket of WeakImplHelper32 but that is purely speculation
-for (auto it = pMethodDecl->begin_overridden_methods();
- it != pMethodDecl->end_overridden_methods(); ++it)
-{
-if (isDerivedFromOWeakObject(*it))
-{
-return true;
-}
-}
-return false;
+return true;
}
-bool VisitCXXMethodDecl(CXXMethodDecl const*const pMethodDecl)
+virtual void run() override
{
-if (ignoreLocation(pMethodDecl)) {
-return true;
-}
-if (!pMethodDecl->isThisDeclarationADefinition()
-|| pMethodDecl->isLateTemplateParsed())
-{
-return true;
-}
-if (!pMethodDecl->isInstance()) {
-return true;
-}
-// this is too "simple", if a NamedDecl class has a getName() member exp
[Libreoffice-commits] core.git: bin/check-missing-unittests.py
bin/check-missing-unittests.py | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 03cdb7392bc79476f1725df6160e196497057882
Author: Xisco Fauli
AuthorDate: Wed Jul 14 10:44:11 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 14 14:13:57 2021 +0200
check-missing-unittests: only care about FIXED bugs
Change-Id: Ifc13149acce6baa9e107e819b97ab879ff99d2d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118887
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/bin/check-missing-unittests.py b/bin/check-missing-unittests.py
index 50f329f6139d..c1efce6eda0e 100755
--- a/bin/check-missing-unittests.py
+++ b/bin/check-missing-unittests.py
@@ -14,9 +14,6 @@ import re
import json
import requests
-def isOpen(status):
-return status == 'NEW' or status == 'ASSIGNED' or status == 'REOPENED'
-
def splitList(lst, n):
for i in range(0, len(lst), n):
yield lst[i:i + n]
@@ -182,18 +179,19 @@ def main(ignoredBugs):
print('\n=== ' + k1 + ' ===')
for bugId, info in v1.items():
-status = ''
+resolution = ''
keywords = []
priority = ''
for bug in bugzillaJson:
if str(bug['id']) == str(bugId):
-status = bug['status']
+resolution = bug['resolution']
keywords = bug['keywords']
priority = bug['priority']
break
-#Ignore open bugs, performance bugs and accessibility bugs
-if status and not isOpen(status) and 'perf' not in keywords \
+# Only care about FIXED bugs
+# Ignore performance bugs and accessibility bugs
+if resolution and resolution == 'FIXED' and 'perf' not in
keywords \
and 'accessibility' not in keywords:
print(
"# {} - [{}] {} -
[https://bugs.documentfoundation.org/show_bug.cgi?id={} tdf#{}]".format(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/commandpopup/CommandPopup.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 32b820b7ac299de66965857a86feed895f91c4d5
Author: Julien Nabet
AuthorDate: Wed Jul 14 11:39:07 2021 +0200
Commit: Julien Nabet
CommitDate: Wed Jul 14 13:02:00 2021 +0200
tdf#143342: fix crash when using "Search Command" feature
Error: attempt to subscript container with out-of-bounds index -1, but
container only holds 0 elements.
Objects involved in the operation:
sequence "this" @ 0x0x85b1d50 {
type = std::__debug::vector >;
}
4 0x7fe75d569357 in CommandListBox::RowActivated(weld::TreeView&)
(this=0x85b1d30) at sfx2/source/commandpopup/CommandPopup.cxx:202
5 0x7fe75d569649 in CommandListBox::TreeViewKeyPress(KeyEvent const&)
(this=0x85b1d30, rKeyEvent=...) at sfx2/source/commandpopup/CommandPopup.cxx:222
6 0x7fe75d569170 in CommandListBox::LinkStubTreeViewKeyPress(void*,
KeyEvent const&) (instance=0x85b1d30, data=...) at
sfx2/source/commandpopup/CommandPopup.cxx:209
Change-Id: I62923ce106da62e3d7d7572536f5e065773683ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118891
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/commandpopup/CommandPopup.cxx
b/sfx2/source/commandpopup/CommandPopup.cxx
index 5500f8913673..518e73a132b1 100644
--- a/sfx2/source/commandpopup/CommandPopup.cxx
+++ b/sfx2/source/commandpopup/CommandPopup.cxx
@@ -197,7 +197,7 @@ IMPL_LINK_NOARG(CommandListBox, RowActivated,
weld::TreeView&, bool)
{
OUString aCommandURL;
int nSelected = mpCommandTreeView->get_selected_index();
-if (nSelected < int(maCommandList.size()))
+if (nSelected != -1 && nSelected < int(maCommandList.size()))
{
auto const& rCurrent = maCommandList[nSelected];
aCommandURL = rCurrent.m_aCommandURL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docdesc.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 2575f9757126228ba43f382a419b92e71ee5b608 Author: Noel Grandin AuthorDate: Wed Jul 14 10:24:17 2021 +0200 Commit: Noel Grandin CommitDate: Wed Jul 14 12:11:02 2021 +0200 tdf#143320 Crash at paste/undo paste again revert commit 790135003b03b38a14efb7e0d345188607020a99 Author: Noel Grandin Date: Wed May 19 20:03:07 2021 +0200 fix leak when removing PageDesc Change-Id: Ia6a03dec2db8f68c5c0c34d6ee9fb1889151f29d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118885 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index c51c5cde92ef..a4de7277fc63 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -753,7 +753,6 @@ void SwDoc::DelPageDesc( size_t i, bool bBroadcast ) PreDelPageDesc(&rDel); // #i7983# m_PageDescs.erase(m_PageDescs.begin() + i); -delete &rDel; getIDocumentState().SetModified(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/source
vcl/source/treelist/svimpbox.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit fc319d0872d0873ab22b98ba457fdce5cf3cb323
Author: Caolán McNamara
AuthorDate: Tue Jul 13 16:56:23 2021 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jul 14 12:02:38 2021 +0200
tdf#143245 activate-on-single-click only if 'up' is at active entry
which is typically selected by the 'down'
Change-Id: I23382fb97146820da49e570280778729a3156f03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118806
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 11a8fb344998..835ee2eac949 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2017,7 +2017,16 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt)
}
if (m_pView->mbActivateOnSingleClick)
+{
+Point aPos(rMEvt.GetPosPixel());
+SvTreeListEntry* pEntry = GetEntry(aPos);
+// tdf#143245 ActivateOnSingleClick only
+// if the 'up' is at the active entry
+// typically selected by the 'down'
+if (!pEntry || pEntry != m_pCursor)
+return;
m_pView->DoubleClickHdl();
+}
}
void SvImpLBox::MouseMove( const MouseEvent& rMEvt)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: embeddedobj/source sfx2/source
embeddedobj/source/msole/olecomponent.cxx |8 +++-
sfx2/source/control/unoctitm.cxx | 21 -
2 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit 19d473da14ac877cb0721063c7b18e16cb6f2b76
Author: Miklos Vajna
AuthorDate: Wed Jul 14 10:32:46 2021 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 14 11:52:00 2021 +0200
sfx2: handle OnMainThread=true in SfxOfficeDispatch::dispatch()
This is needed when an out of process Java UNO client registers their
command dispatch interceptor, Windows OleInitialize() has been called
already on the main thread and then dispatching e.g. uno:Paste (which
would interact with OLE) would call OLE functions on a thread, which
would fail with RPC_E_CHANGED_MODE.
In other words, a situation similar to commit
22aa6508e0a65e65a6f9410b498fe4fd6c236639 (framework: allow dispatching a
command on the main thread, 2019-01-29), but that one was for
DispatchHelper, this one is for XDispatch implementations.
Change-Id: If5a80fe36962e014e781d2a8c156055f127e69a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118886
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/embeddedobj/source/msole/olecomponent.cxx
b/embeddedobj/source/msole/olecomponent.cxx
index cbcc1f6e79d7..b0c4fc62c1ac 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -445,9 +446,14 @@ OleComponent::OleComponent( const uno::Reference<
uno::XComponentContext >& xCon
OSL_ENSURE( m_pUnoOleObject, "No owner object is provided!" );
HRESULT hr = OleInitialize( nullptr );
-OSL_ENSURE( hr == S_OK || hr == S_FALSE, "The ole can not be successfully
initialized" );
if ( hr == S_OK || hr == S_FALSE )
m_bOleInitialized = true;
+else
+{
+SAL_WARN("embeddedobj.ole", "OleComponent ctor: OleInitialize() failed
with 0x"
+<<
OUString::number(static_cast(hr), 16) << ": "
+<< WindowsErrorStringFromHRESULT(hr));
+}
m_pOleWrapClientSite = new OleWrapperClientSite( this );
m_pOleWrapClientSite->AddRef();
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 0a98f806d708..bc07f2af71d3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -78,6 +78,8 @@
#include
#include
+#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -233,7 +235,24 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const
css::util::URL& aURL, const css
#if HAVE_FEATURE_JAVA
std::unique_ptr< css::uno::ContextLayer > layer(EnsureJavaContext());
#endif
-pImpl->dispatch( aURL, aArgs, css::uno::Reference <
css::frame::XDispatchResultListener >() );
+utl::MediaDescriptor aDescriptor(aArgs);
+bool bOnMainThread =
aDescriptor.getUnpackedValueOrDefault("OnMainThread", false);
+if (bOnMainThread)
+{
+// Make sure that we own the solar mutex, otherwise later
+// vcl::SolarThreadExecutor::execute() will release the solar
mutex, even if it's owned by
+// an other thread, leading to an std::abort() at the end.
+SolarMutexGuard aGuard;
+vcl::solarthread::syncExecute([this, &aURL, &aArgs]() {
+pImpl->dispatch(aURL, aArgs,
+
css::uno::Reference());
+});
+}
+else
+{
+pImpl->dispatch(aURL, aArgs,
+
css::uno::Reference());
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/unoframe.hxx |6 +++---
sw/source/core/unocore/unoframe.cxx |8
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 686b2d70fe6361835a9c549ca13ecf0837b82296
Author: Noel Grandin
AuthorDate: Tue Jul 13 15:49:36 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 14 11:40:42 2021 +0200
use ImplInheritanceHelper in SwXTextFrame
so we avoid having two copies of OWeakObject in it
Change-Id: I1c3de4873a25e9cfb1a4bf67c369d9ecce0129d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118854
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 4da5dde9ec79..fd976ae12260 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -162,8 +162,9 @@ public:
static SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat);
};
-typedef cppu::WeakImplHelper
+typedef cppu::ImplInheritanceHelper
<
+SwXFrame,
css::text::XTextFrame,
css::container::XEnumerationAccess,
css::document::XEventsSupplier
@@ -171,8 +172,7 @@ typedef cppu::WeakImplHelper
SwXTextFrameBaseClass;
class SwXTextFrame final : public SwXTextFrameBaseClass,
-public SwXText,
-public SwXFrame
+public SwXText
{
friend class SwXFrame; // just for CreateXFrame
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index fd4f07a73390..d7f08efa80e4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3170,14 +3170,14 @@ OUString SwXFrame::getShapeType()
}
SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) :
-SwXText(nullptr, CursorType::Frame),
-SwXFrame(FLYCNTTYPE_FRM,
aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME), _pDoc )
+SwXTextFrameBaseClass(FLYCNTTYPE_FRM,
aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME), _pDoc ),
+SwXText(nullptr, CursorType::Frame)
{
}
SwXTextFrame::SwXTextFrame(SwFrameFormat& rFormat) :
-SwXText(rFormat.GetDoc(), CursorType::Frame),
-SwXFrame(rFormat, FLYCNTTYPE_FRM,
aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME))
+SwXTextFrameBaseClass(rFormat, FLYCNTTYPE_FRM,
aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME)),
+SwXText(rFormat.GetDoc(), CursorType::Frame)
{
}
___
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 writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_glow_rotate.docx |binary
sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_stroke_shadow.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx| 51
sw/qa/extras/ooxmlimport/data/tdf143219_ContourWrap_rotate.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 27 ++
sw/source/filter/ww8/docxsdrexport.cxx| 36
++-
writerfilter/source/dmapper/GraphicImport.cxx | 112
--
7 files changed, 210 insertions(+), 16 deletions(-)
New commits:
commit af99c01570adc0c9205e1650d10866f80bb8118a
Author: Regina Henschel
AuthorDate: Mon Jul 5 22:21:23 2021 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 14 11:34:43 2021 +0200
tdf#143219 improve docx import/export of contour wrap
The current solution has some problems:
(1)
Currently effectExtent is used on import to increase the wrap margins
for fat stroke and effects like shadow and glow in case of contour
wrap.
Problems:
Word writes these values, but actually the wrap polygon is authorative
and third party applications might not write these values at all.
The wrap margins were increased on import, but not decreased on export.
The effectExtent values by Word contain in addition the amount for
rotation as needed in wrapSquare. That part was not removed.
(2)
To avoid negative values in dist* values they were compensated with
effectExtent. For that, the complete effectExtent was shifted to dist*
and effectExtent was set to zero.
Problems:
Contour wrap does not use effectExtent but a wrap polygon. This is set
by Word in a way, that it includes the effect extents. LO uses the
original wrap polygon if available. So moving the effectExtent values
to dist* gives too large 'distance to text' in case of contour wrap,
because effects were considered twice.
The solution here replaces the way, how the margins are calculated in
case of contour wrap. Now the range used by the wrap polygon is
compared with the range used by the shape geometry. The difference is
added to 'distance to text'. To be able to remove these values on
export, they are put into the InteropGrabBag.
LO and Word use different concepts for contour wrap. Any solution gives
only an approximation. But adapting 'distance to text' brings
rendering in LO nearer to the way Word renders contour wrap.
Change-Id: Ic3c1c075fedfa7f79e4fe1f3c095da12cf274e36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118538
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git
a/sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_glow_rotate.docx
b/sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_glow_rotate.docx
new file mode 100644
index ..b83188073bea
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_glow_rotate.docx differ
diff --git
a/sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_stroke_shadow.docx
b/sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_stroke_shadow.docx
new file mode 100644
index ..53dfb488a2ae
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf143219ContourWrap_stroke_shadow.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 504b2d3ea802..7a1486f6a46c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -72,6 +72,57 @@ protected:
return OString(filename).endsWith(".docx");
}
};
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf134219ContourWrap_glow_rotate)
+{
+auto verify = [this]() {
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1461),
+ getProperty(getShape(1),
"LeftMargin"), 2);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1302),
+ getProperty(getShape(1),
"RightMargin"), 1);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1522),
+ getProperty(getShape(1),
"TopMargin"), 1);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1296),
+ getProperty(getShape(1),
"BottomMargin"), 1);
+};
+// Given a document with a shape with contour wrap, that has glow effect
and rotation.
+load(mpTestDocumentPath, "tdf143219ContourWrap_glow_rotate.docx");
+
+// Error was, that the margins, which were added on import to approximate
Word's rendering of
+// contour wrap, contained the effect extent for rotation. But LibreOffice
extents the wrap
+// distance automatically. The distance was too large on first load and
because the extent was
+// not removed on export, much larger on reload.
+// Test fails on reload without fix with left: expected 1461 actual 2455;
right: expected 1302
+
[Libreoffice-commits] core.git: bin/find-unneeded-includes
bin/find-unneeded-includes | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 3f618170b8474b4a4e97aa7685daf064d0413a57
Author: Gabor Kelemen
AuthorDate: Wed Jul 14 00:24:50 2021 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 14 11:28:49 2021 +0200
find-unneeded-includes: add --recursive option
so that f-u-i will be able to find files to check on its own.
Previously you had to find foo -name "*cxx" | xargs bin/f-u-i
Now its a bit easier to mass-check files.
Change-Id: I2823832ce8335a30493cf9f538f6fc5baec42dde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118875
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index fbda1007adfd..9b38fd524f49 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -308,6 +308,8 @@ def main(argv):
help='Don\'t stop on errors. Useful for periodic re-check
of large amount of files')
parser.add_argument('Files' , nargs='*',
help='The files to be checked')
+parser.add_argument('--recursive', metavar='DIR', nargs=1, type=str,
+help='Recursively search a directory for source files to
check')
args = parser.parse_args()
@@ -315,6 +317,15 @@ def main(argv):
parser.print_help()
return
+list_of_files = []
+if args.recursive:
+for root, dirs, files in os.walk(args.recursive[0]):
+for file in files:
+if (file.endswith(".cxx") or file.endswith(".hxx") or
file.endswith(".hrc") or file.endswith(".h") or file.endswith(".c")):
+list_of_files.append(os.path.join(root,file))
+else:
+list_of_files = args.Files
+
try:
with open("compile_commands.json", 'r') as compileCommandsSock:
compileCommands = json.load(compileCommandsSock)
@@ -322,7 +333,7 @@ def main(argv):
print ("File 'compile_commands.json' does not exist, please run:\nmake
vim-ide-integration")
sys.exit(-1)
-tidy(compileCommands, paths=args.Files, dontstop=args.dontstop)
+tidy(compileCommands, paths=list_of_files, dontstop=args.dontstop)
if __name__ == '__main__':
main(sys.argv[1:])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |2 ++
vcl/source/filter/svm/SvmReader.cxx | 18 +-
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 98042f96c8d6806c9ce01c13b6b75cebfb8405de
Author: panoskorovesis
AuthorDate: Tue Jul 13 15:52:51 2021 +0300
Commit: Miklos Vajna
CommitDate: Wed Jul 14 11:14:09 2021 +0200
Add Handler for ClipRegion Read
The handler separates MetaClipRegionAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I14c7bb721defea8d18305e7cc24facf3d7e6e05c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118845
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index c5c8568c25ef..002157ff932b 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -69,6 +69,7 @@ public:
rtl::Reference GradientExHandler();
rtl::Reference HatchHandler();
rtl::Reference WallpaperHandler();
+rtl::Reference ClipRegionHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index df027889b4dd..40d31a6f452b 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1195,6 +1195,8 @@ public:
const vcl::Region& GetRegion() const { return maRegion; }
boolIsClipping() const { return mbClip; }
+voidSetRegion(vcl::Region& rRegion) { maRegion = rRegion; }
+voidSetClipping(bool bClip) { mbClip = bClip; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaISectRectClipRegionAction final :
public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 5abf191a440a..b01acffd92ad 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -250,7 +250,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return WallpaperHandler();
break;
case MetaActionType::CLIPREGION:
-pAction = new MetaClipRegionAction;
+return ClipRegionHandler();
break;
case MetaActionType::ISECTRECTCLIPREGION:
pAction = new MetaISectRectClipRegionAction;
@@ -1089,4 +1089,20 @@ rtl::Reference SvmReader::WallpaperHandler()
return pAction;
}
+
+rtl::Reference SvmReader::ClipRegionHandler()
+{
+auto pAction = new MetaClipRegionAction();
+
+VersionCompatRead aCompat(mrStream);
+vcl::Region aRegion;
+ReadRegion(mrStream, aRegion);
+bool aClip;
+mrStream.ReadCharAsBool(aClip);
+
+pAction->SetRegion(aRegion);
+pAction->SetClipping(aClip);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |1 +
vcl/source/filter/svm/SvmReader.cxx | 15 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 250ac047f5aef05738600457354d4998a0456a51
Author: panoskorovesis
AuthorDate: Tue Jul 13 14:17:11 2021 +0300
Commit: Miklos Vajna
CommitDate: Wed Jul 14 11:13:01 2021 +0200
Add Handler for Wallpaper Read
The handler separates MetaWallpaperAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I5878eb3c789dfa46ec6dbef358d26e69abc9e705
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118837
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index d075955db479..c5c8568c25ef 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -68,6 +68,7 @@ public:
rtl::Reference GradientHandler();
rtl::Reference GradientExHandler();
rtl::Reference HatchHandler();
+rtl::Reference WallpaperHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index ccca055522df..df027889b4dd 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1164,6 +1164,7 @@ public:
const tools::Rectangle&GetRect() const { return maRect; }
const Wallpaper&GetWallpaper() const { return maWallpaper; }
+voidSetWallpaper(Wallpaper& rWallpaper) { maWallpaper =
rWallpaper; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaClipRegionAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 357cd338db4c..5abf191a440a 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -247,7 +247,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return HatchHandler();
break;
case MetaActionType::WALLPAPER:
-pAction = new MetaWallpaperAction;
+return WallpaperHandler();
break;
case MetaActionType::CLIPREGION:
pAction = new MetaClipRegionAction;
@@ -1076,4 +1076,17 @@ rtl::Reference SvmReader::HatchHandler()
return pAction;
}
+
+rtl::Reference SvmReader::WallpaperHandler()
+{
+auto pAction = new MetaWallpaperAction();
+
+VersionCompatRead aCompat(mrStream);
+Wallpaper aWallpaper;
+ReadWallpaper(mrStream, aWallpaper);
+
+pAction->SetWallpaper(aWallpaper);
+
+return pAction;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Are there ideas for client-server model.
Hi Stef, On Tue, Jul 13, 2021 at 09:32:10AM +0200, Stef Bon wrote: > > What you describe sounds a lot like the functionality that the LOK API > > exposes. Online builds a c++ server on top of that, and then clients > > connect to that via websockets. > > Online? What do you mean with "online"? https://collaboraonline.github.io/ which uses the LOK API and has a client-server model. > > But core has a gtktiledviewer demo app > > that shows that that LOK API is not tied to web browsers. So either you > > could build something not-browser-based on top of the LOK API or build > > on top of Online's server piece, but your clients would be desktop apps, > > not browsers. > > > > Yes, does this example program read only or also write access? > Is editing possible? Sure. If you build core.git, you can do 'bin/run gtktiledviewer' to try it out yourself. It runs in-process to help debugging, though. > This client is a bit what I want, but still very far from the end goal. Another example is the gtk app in online.git: that is also nominally a desktop app, but in fact it reuses the JS user interface from Online. The bottom line is that the LOK API already provides collaborative editing, and if you want a client-server protocol, Online already has that, it would be probably a bit pointless to invent a parallel protocol which does the same. :-) Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/source
vcl/source/window/window.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e025317cc357d11e8c4afc35fbd5bacba4a07f4e
Author: Michael Meeks
AuthorDate: Fri Jul 9 15:14:50 2021 +0100
Commit: Michael Meeks
CommitDate: Wed Jul 14 10:54:23 2021 +0200
vcl: make get_id safe for disposed windows.
crash from:
findChild(vcl::Window*, rtl::OUString const&, bool)
include/rtl/ustring.hxx:1744
WindowUIObject::get_visible_child(rtl::OUString const&)
/vcl/source/uitest/uiobject.cxx:463
lcl_sendDialogEvent ...
Change-Id: Ic1756c7b03f2dee9780fb1a735917f1d0fc11876
Signed-off-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118691
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 303c46e2394f6b744f0df5e8e55a8e1cd8e22a91)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118802
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index fa029f89400f..4ec17ae8b18f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3917,7 +3917,8 @@ void Window::set_id(const OUString& rID)
const OUString& Window::get_id() const
{
-return mpWindowImpl->maID;
+static OUString empty;
+return mpWindowImpl ? mpWindowImpl->maID : empty;
}
FactoryFunction Window::GetUITestFactory() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/pdfium solenv/flatpak-manifest.in vcl/qa vcl/source
download.lst |4 external/pdfium/Library_pdfium.mk | 12 ++ external/pdfium/build.patch.1 | 109 - external/pdfium/inc/pch/precompiled_pdfium.hxx | 16 ++- external/pdfium/ubsan.patch|8 - solenv/flatpak-manifest.in |6 - vcl/qa/cppunit/PDFiumLibraryTest.cxx |6 + vcl/source/pdf/PDFiumLibrary.cxx |9 +- 8 files changed, 148 insertions(+), 22 deletions(-) New commits: commit 7707339a7d10225ff2503a852f68427519ae26f6 Author: Miklos Vajna AuthorDate: Tue Jul 13 20:28:17 2021 +0200 Commit: Miklos Vajna CommitDate: Wed Jul 14 10:53:33 2021 +0200 external: update pdfium to 4568 Change-Id: I2bfd5f806281e747702d423b7e59b5f88a7bea9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118868 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/download.lst b/download.lst index 05b5b8b8e8fc..30fd66f58351 100644 --- a/download.lst +++ b/download.lst @@ -208,8 +208,8 @@ export ORCUS_SHA256SUM := c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f9 export ORCUS_TARBALL := liborcus-0.16.1.tar.bz2 export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz -export PDFIUM_SHA256SUM := 26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304 -export PDFIUM_TARBALL := pdfium-4500.tar.bz2 +export PDFIUM_SHA256SUM := b0c5725e1cdcef7f52f068fd33adf9e8d833a271c28ba5b6a5a576ef8f2bbbf4 +export PDFIUM_TARBALL := pdfium-4568.tar.bz2 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index e048c8dab0d5..1cec5c19573d 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -77,6 +77,12 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_interactiveform \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_renderpage \ UnpackedTarball/pdfium/fpdfsdk/fpdf_signature \ + UnpackedTarball/pdfium/constants/annotation_common \ + UnpackedTarball/pdfium/constants/appearance \ + UnpackedTarball/pdfium/constants/form_fields \ + UnpackedTarball/pdfium/constants/page_object \ + UnpackedTarball/pdfium/constants/stream_dict_common \ + UnpackedTarball/pdfium/constants/transparency \ )) # fdrm @@ -90,7 +96,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_checkbox \ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_combobox \ -UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_formfiller \ +UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_formfield \ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_interactiveformfiller \ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_listbox \ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_pushbutton \ @@ -347,7 +353,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_SymbolDict \ UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_TrdProc \ UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gif \ -UnpackedTarball/pdfium/core/fxcodec/gif/cfx_lzwdecompressor \ +UnpackedTarball/pdfium/core/fxcodec/gif/lzw_decompressor \ UnpackedTarball/pdfium/core/fxcodec/cfx_codec_memory \ UnpackedTarball/pdfium/core/fxcodec/fax/faxmodule \ UnpackedTarball/pdfium/core/fxcodec/scanlinedecoder \ @@ -460,7 +466,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/cfx_gemodule \ UnpackedTarball/pdfium/core/fxge/cfx_graphstate \ UnpackedTarball/pdfium/core/fxge/cfx_graphstatedata \ -UnpackedTarball/pdfium/core/fxge/cfx_pathdata \ +UnpackedTarball/pdfium/core/fxge/cfx_path \ UnpackedTarball/pdfium/core/fxge/cfx_renderdevice \ UnpackedTarball/pdfium/core/fxge/cfx_substfont \ UnpackedTarball/pdfium/core/fxge/cfx_unicodeencoding \ diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 index 9d48b022fae2..b4c69ba00f84 100644 --- a/external/pdfium/build.patch.1 +++ b/external/pdfium/build.patch.1 @@ -38,12 +38,115 @@ index 0fb627ba8..dda1fc8bc 100644 template < typename Container, diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp -index dbc1b1045..36b72461d 100644 +index c66985a7f..9c1122b75 100644 --- a/core/fxcodec/jpx/cjpx_decoder.cpp +++ b/core/fxcodec/jpx/cjpx_decoder.cpp -@@ -70,7 +70,7 @@
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/python/scriptforge.py |3 +
wizards/source/sfdocuments/SF_Base.xba | 43 +++
2 files changed, 46 insertions(+)
New commits:
commit 2366c24ffe564643ca616d848a477ba382e9fe50
Author: Jean-Pierre Ledure
AuthorDate: Tue Jul 13 16:30:16 2021 +0200
Commit: Jean-Pierre Ledure
CommitDate: Wed Jul 14 10:45:15 2021 +0200
ScriptForge - (SF_Base) new CloseFormDocument() method
The closure of a form document is available from
the SF_Form service.
A form document is since recent commits associated with
actions like PrintOut() that do not require to access
its internal forms.
As a consequence, the closure of a form document from
the SF_Base service gains in relevance.
Hence the actual commit.
Change-Id: I9d4af078e6631d18c2d92c17249be6025ac9dfdd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118857
Tested-by: Jean-Pierre Ledure
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/scriptforge/python/scriptforge.py
b/wizards/source/scriptforge/python/scriptforge.py
index 5e3b2c6c7a8c..16dbca2b4fd2 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -1794,6 +1794,9 @@ class SFDocuments:
def CloseDocument(self, saveask = True):
return self.ExecMethod(self.vbMethod, 'CloseDocument', saveask)
+def CloseFormDocument(self, formdocument):
+return self.ExecMethod(self.vbMethod, 'CloseFormDocument',
formdocument)
+
def FormDocuments(self):
return self.ExecMethod(self.vbMethod + self.flgArrayRet,
'FormDocuments')
diff --git a/wizards/source/sfdocuments/SF_Base.xba
b/wizards/source/sfdocuments/SF_Base.xba
index 52fc0fd768c2..ae2a23e9f0d3 100644
--- a/wizards/source/sfdocuments/SF_Base.xba
+++ b/wizards/source/sfdocuments/SF_Base.xba
@@ -135,6 +135,49 @@ Catch:
GoTo Finally
End Function ' SFDocuments.SF_Base.CloseDocument
+REM
-
+Public Function CloseFormDocument(Optional ByVal FormDocument As Variant) As
Boolean
+''' Close the given form document
+''' Nothing happens if the form document is not open
+''' Args:
+''' FormDocument: a valid document form name as a
case-sensitive string
+''' Returns:
+''' True if closure is successful
+''' Example:
+'''
oDoc.CloseFormDocument("Folder1/myFormDocument")
+
+Dim bClose As Boolean ' Return value
+Dim oMainForm As Object'
com.sun.star.comp.sdb.Content
+Dim vFormNames As Variant ' Array of all document
form names present in the document
+
+Const cstThisSub = "SFDocuments.Base.CloseFormDocument"
+Const cstSubArgs = "FormDocument"
+
+ If ScriptForge.SF_Utils._ErrorHandling() Then On Local Error GoTo Catch
+ bClose = False
+
+Check:
+ If ScriptForge.SF_Utils._EnterFunction(cstThisSub, cstSubArgs) Then
+ If Not _IsStillAlive() Then GoTo Finally
+ ' Build list of available FormDocuments recursively with
_CollectFormDocuments
+ If IsNull(_FormDocuments) Then Set _FormDocuments =
_Component.getFormDocuments()
+ vFormNames = Split(_CollectFormDocuments(_FormDocuments),
cstToken)
+ If Not ScriptForge.SF_Utils._Validate(FormDocument,
"FormDocument", V_STRING, vFormNames) Then GoTo Finally
+ End If
+ If Not IsLoaded(FormDocument) Then GoTo Finally
+
+Try:
+ Set oMainForm = _FormDocuments.getByHierarchicalName(FormDocument)
+ bClose = oMainForm.close()
+
+Finally:
+ CloseFormDocument = bClose
+ ScriptForge.SF_Utils._ExitFunction(cstThisSub)
+ Exit Function
+Catch:
+ GoTo Finally
+End Function ' SFDocuments.SF_Base.CloseFormDocument
+
REM
-
Public Function FormDocuments() As Variant
''' Return the list of the FormDocuments contained in the
Base document
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/qa sc/source
sc/qa/unit/data/xlsx/tdf142929.xlsx |binary
sc/qa/unit/subsequent_export-test2.cxx| 17 +
sc/source/filter/oox/autofilterbuffer.cxx |2 +-
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit bbd4d7c1b8a219cd295fd799d39b9cbb7a5b464d
Author: Tünde Tóth
AuthorDate: Thu Jul 1 13:40:03 2021 +0200
Commit: Eike Rathke
CommitDate: Wed Jul 14 10:32:31 2021 +0200
tdf#142929 XLSX: fix import of "Less than" filter condition
"Less than" standard filter condition became <> instead of <.
Change-Id: I53435590de3a03d9fcaf0359e8421ae3ef941316
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118227
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 0d3398e5d141b79706653c04f1ab6dc9381a5cc1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118809
Reviewed-by: Eike Rathke
diff --git a/sc/qa/unit/data/xlsx/tdf142929.xlsx
b/sc/qa/unit/data/xlsx/tdf142929.xlsx
new file mode 100644
index ..6bf23b951360
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf142929.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test2.cxx
b/sc/qa/unit/subsequent_export-test2.cxx
index 47a50a3d8ee6..55faefb0ddb3 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -188,6 +188,7 @@ public:
void testTdf139258_rotated_image();
void testTdf126541_SheetVisibilityImportXlsx();
void testTdf140431();
+void testTdf142929_filterLessThanXLSX();
CPPUNIT_TEST_SUITE(ScExportTest2);
@@ -284,6 +285,7 @@ public:
CPPUNIT_TEST(testTdf139258_rotated_image);
CPPUNIT_TEST(testTdf126541_SheetVisibilityImportXlsx);
CPPUNIT_TEST(testTdf140431);
+CPPUNIT_TEST(testTdf142929_filterLessThanXLSX);
CPPUNIT_TEST_SUITE_END();
@@ -2320,6 +2322,21 @@ void ScExportTest2::testTdf140431()
xDocSh->DoClose();
}
+void ScExportTest2::testTdf142929_filterLessThanXLSX()
+{
+// Document contains a standard filter with '<' condition.
+ScDocShellRef xDocSh = loadDoc(u"tdf142929.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
+
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+assertXPath(pDoc, "//x:customFilters/x:customFilter", "val", "2");
+assertXPath(pDoc, "//x:customFilters/x:customFilter", "operator",
"lessThan");
+
+xDocSh->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx
b/sc/source/filter/oox/autofilterbuffer.cxx
index 8eb24f231bd4..ab0ff9a43c68 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -77,7 +77,7 @@ bool lclGetApiOperatorFromToken( sal_Int32& rnApiOperator,
sal_Int32 nToken )
{
switch( nToken )
{
-case XML_lessThan: rnApiOperator =
FilterOperator2::NOT_EQUAL; return true;
+case XML_lessThan: rnApiOperator = FilterOperator2::LESS;
return true;
case XML_equal: rnApiOperator =
FilterOperator2::EQUAL; return true;
case XML_lessThanOrEqual: rnApiOperator =
FilterOperator2::LESS_EQUAL;return true;
case XML_greaterThan: rnApiOperator =
FilterOperator2::GREATER; return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source
vcl/source/treelist/svimpbox.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit bfc49fc16c1cc9b9a5dee406fe7348c079c45ba6
Author: Caolán McNamara
AuthorDate: Tue Jul 13 16:56:23 2021 +0100
Commit: Xisco Fauli
CommitDate: Wed Jul 14 09:58:32 2021 +0200
tdf#143245 activate-on-single-click only if 'up' is at active entry
which is typically selected by the 'down'
Change-Id: I23382fb97146820da49e570280778729a3156f03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118807
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index d72de8763981..bab21eb7c1c7 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2011,7 +2011,16 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt)
}
if (m_pView->mbActivateOnSingleClick)
+{
+Point aPos(rMEvt.GetPosPixel());
+SvTreeListEntry* pEntry = GetEntry(aPos);
+// tdf#143245 ActivateOnSingleClick only
+// if the 'up' is at the active entry
+// typically selected by the 'down'
+if (!pEntry || pEntry != m_pCursor)
+return;
m_pView->DoubleClickHdl();
+}
}
void SvImpLBox::MouseMove( const MouseEvent& rMEvt)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - drawinglayer/source
drawinglayer/source/tools/emfphelperdata.cxx | 171 ++-
1 file changed, 91 insertions(+), 80 deletions(-)
New commits:
commit 5ee7cb39238a420f1b2ffc83d5b2dc79e0ee3875
Author: Bartosz Kosiorek
AuthorDate: Sat Jul 3 21:55:33 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 14 09:52:57 2021 +0200
EMF+ tdf#142941 Fixes SrcRect implementation in DrawImage record
Change-Id: Ice82518d50c50fa6eff8bbcc111fcf287d34d77c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118363
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
(cherry picked from commit 3adfb2d35bb34157ce0d1344f2a28b40360728a5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118810
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 7a2007da07ba..164237b043e3 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1434,21 +1434,30 @@ namespace emfplushelper
sal_uInt32 imageAttributesId;
sal_Int32 sourceUnit;
rMS.ReadUInt32(imageAttributesId).ReadInt32(sourceUnit);
-SAL_INFO("drawinglayer.emf", "EMF+\t " << (type ==
EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage") << " image
attributes Id: " << imageAttributesId << " source unit: " << sourceUnit);
+SAL_INFO("drawinglayer.emf",
+"EMF+\t " << (type ==
EmfPlusRecordTypeDrawImage ? "DrawImage"
+
: "DrawImagePoints")
+<< " image attributes Id: " <<
imageAttributesId
+<< " source unit: " << sourceUnit);
SAL_INFO("drawinglayer.emf", "EMF+\t TODO: use image
attributes");
-// For DrawImage and DrawImagePoints, source unit of
measurement type must be 1 pixel
+// Source unit of measurement type must be 1 pixel
if (sourceUnit == UnitTypePixel && maEMFPObjects[flags
& 0xff])
{
-EMFPImage& image = *static_cast(maEMFPObjects[flags & 0xff].get());
+EMFPImage& image
+= *static_cast(maEMFPObjects[flags
& 0xff].get());
float sx, sy, sw, sh;
ReadRectangle(rMS, sx, sy, sw, sh);
::tools::Rectangle aSource(Point(sx, sy), Size(sw
+ 1, sh + 1));
-SAL_INFO("drawinglayer.emf", "EMF+\t " << (type ==
EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage") << " source
rectangle: " << sx << "," << sy << " " << sw << "x" << sh);
-::basegfx::B2DPoint aDstPoint;
-::basegfx::B2DSize aDstSize;
-
+SAL_INFO("drawinglayer.emf",
+"EMF+\t "
+<< (type == EmfPlusRecordTypeDrawImage
? "DrawImage"
+
: "DrawImagePoints")
+<< " source rectangle: " << sx << ","
<< sy << " " << sw << "x"
+<< sh);
+
+float dx(0.), dy(0.), dw(0.), dh(0.);
double fShearX = 0.0;
double fShearY = 0.0;
if (type == EmfPlusRecordTypeDrawImagePoints)
@@ -1457,108 +1466,110 @@ namespace emfplushelper
rMS.ReadUInt32(aCount);
// Number of points used by DrawImagePoints.
Exactly 3 points must be specified.
-if(aCount == 3)
-{
-float x1, y1, x2, y2, x3, y3;
-
-ReadPoint(rMS, x1, y1, flags); //
upper-left point
-ReadPoint(rMS, x2, y2, flags); //
upper-right
-ReadPoint(rMS, x3, y3, flags); //
lower-left
-
-SAL_INFO("drawinglayer.emf",
- "EMF+\t destination points: " <<
x1 << "," << y1 << " "
- <<
x2 << "," << y2 << " "
- <<
x3 << "," << y3);
-float xDstShift = x1;
-float yDstShift = y2;
-float xDstSize = x2 - x1;
-float yDstSize = y3 - y1;
-
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 636742269af45ea82f5d5ebf25a04dc8e152ed34
Author: Caolán McNamara
AuthorDate: Mon Jul 12 17:34:11 2021 +0100
Commit: Eike Rathke
CommitDate: Wed Jul 14 09:15:18 2021 +0200
move freeze/thaw so we don't select while frozen
Change-Id: I4f4b3e5ac3e7e842726780f9c773389f7c39ce7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118793
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 275873be1f32..95ab21cb74ae 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -704,12 +704,12 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, EdModifyHdl,
weld::Entry&, void)
size_t n = maMembers.size();
size_t nSelCount = 0;
-mpChecks->freeze();
-
// This branch is the general case, the other is an optimized variant of
// this one where we can take advantage of knowing we have no hierarchy
if (mbHasDates)
{
+mpChecks->freeze();
+
bool bSomeDateDeletes = false;
for (size_t i = 0; i < n; ++i)
@@ -768,13 +768,19 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, EdModifyHdl,
weld::Entry&, void)
updateMemberParents(nullptr, i);
}
}
+
+mpChecks->thaw();
}
else
{
+mpChecks->freeze();
+
// when there are a lot of rows, it is cheaper to simply clear the
tree and either
// re-initialise or just insert the filtered lines
mpChecks->clear();
+mpChecks->thaw();
+
if (bSearchTextEmpty)
nSelCount = initMembers();
else
@@ -807,9 +813,6 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, EdModifyHdl,
weld::Entry&, void)
}
}
-
-mpChecks->thaw();
-
if ( nSelCount == n )
mxChkToggleAll->set_state( TRISTATE_TRUE );
else if ( nSelCount == 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 15 ++-
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 15 ++-
sdext/source/pdfimport/tree/writertreevisiting.cxx | 28 +
3 files changed, 41 insertions(+), 17 deletions(-)
New commits:
commit fe28633ee6edc5986220c934dfb04aa7b0d065ad
Author: Kevin Suo
AuthorDate: Wed Jun 30 18:17:36 2021 +0800
Commit: Noel Grandin
CommitDate: Wed Jul 14 09:07:09 2021 +0200
tdf81484 Draw and Writer pdf import: SimSun bold font is shown as "outline"
Case 1: As discussed in the bug report, SimSun does not have a
"bold" font. In PDF it uses fill+stroke rendering mode (i.e.,
Text Render Mode is 2), see CoreTextStyle::CoreTextStyle, as a
faux bold (fake bold) feature. For faux bold, the text render
fill color is the same as the stroke color.
Case 2: Also, it is noted that if you apply real "outline"
characters in Writer and export to PDF, on Draw PDF import
the text render mode is also 2, but the text render fill color
is different than the stroke color.
However, I would argue that for this case on PDF export Writer
should set the render mode as 1, not 2, per PDF specs, which is
another issue to be improved.
The old code treated all these two cases as "outline".
This patch:
1) treats render mode 2 as faux bold if the stroke color is the
same as the fill color; and
2) still treat it as outline if the fill color and stroke color
are different.
This way, the real outline remains as outline characters while
the faux bold (fake bold) becomes bold again on pdf import.
This patch Also fixed some incorrect use of
attributes per OpenDocument specification.
This patch depends on change-ID I50a510ab9e5483f859ea2a767ea977ea3f065a2e
which guesses the bold/italic if the font indentifaction had failed
for whatever reason.
Change-Id: Idabb22ea9b01ba53733c3acbd9de843790ebe8ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118156
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index ebce9efc896b..69f70001f6d6 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
+#include
#include
#include
#include
@@ -828,23 +827,28 @@ void DrawXmlFinalizer::visit( TextElement& elem, const
std::list< std::unique_pt
PropertyMap aFontProps;
// family name
+// TODO: tdf#143095: use system font name rather than PSName
+SAL_INFO("sdext.pdfimport", "The font used in xml is: " <<
rFont.familyName);
aFontProps[ "fo:font-family" ] = rFont.familyName;
+aFontProps[ "style:font-family-asia" ] = rFont.familyName;
aFontProps[ "style:font-family-complex" ] = rFont.familyName;
// bold
if( rFont.isBold )
{
aFontProps[ "fo:font-weight" ] = "bold";
-aFontProps[ "fo:font-weight-asian" ] = "bold";
+aFontProps[ "style:font-weight-asian" ] = "bold";
aFontProps[ "style:font-weight-complex" ] = "bold";
}
+
// italic
if( rFont.isItalic )
{
aFontProps[ "fo:font-style" ] = "italic";
-aFontProps[ "fo:font-style-asian" ] = "italic";
+aFontProps[ "style:font-style-asian" ] = "italic";
aFontProps[ "style:font-style-complex" ] = "italic";
}
+
// underline
if( rFont.isUnderline )
{
@@ -852,11 +856,10 @@ void DrawXmlFinalizer::visit( TextElement& elem, const
std::list< std::unique_pt
aFontProps[ "style:text-underline-width" ] = "auto";
aFontProps[ "style:text-underline-color" ] = "font-color";
}
+
// outline
if( rFont.isOutline )
-{
aFontProps[ "style:text-outline" ] = "true";
-}
// size
SetFontsizeProperties(aFontProps, rFont.size);
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index ed2eaf6510b9..d63ab04e97fd 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -147,7 +147,20 @@ void PDFIProcessor::setFont( const FontAttributes& i_rFont
)
FontAttributes aChangedFont( i_rFont );
GraphicsContext& rGC=getCurrentContext();
// for text render modes, please see PDF reference manual
-aChangedFont.isOutline = ( (rGC.TextRenderMode == 1) || (rGC.
TextRenderMode == 2) );
+if (rGC.TextRenderMode == 1)
+{
+aChangedFont.isOutline = true;
+}
+else if (rGC.TextRenderMode == 2)
+{
+// tdf#81484: faux bold is represented as "stroke+fill" (while using
the sa
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx|9 +++--
writerfilter/source/dmapper/DomainMapper.cxx |5 ++
writerfilter/source/dmapper/DomainMapper.hxx |1
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 38 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx |1
writerfilter/source/dmapper/StyleSheetTable.cxx |6 +++
6 files changed, 57 insertions(+), 3 deletions(-)
New commits:
commit 7c7dcdb5132b579485631e620c1a87cd9b3881e3
Author: Justin Luth
AuthorDate: Mon May 24 07:35:42 2021 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 14 09:06:53 2021 +0200
tdf#141964 writerfilter CN: only one style per outline level
This really surprised me. On outline numbering, only one style
can use the level of a numbering rule. Any other style that
has it defined is ignored. First come first served.
[All based on experimentation, no documentation found.]
There are two ways the style can be attached.
The highest priority is if the numbering style itself has
a paragraph style defined (which obviously is exclusive).
The second way is just to assign a list level along
with a numbering rule in the para style.
Surprisingly, this too creates an exclusive lock on the level.
These are some existing unit tests that triggered.
I forget which ones are important or valuable,
but none of the contents were affected,
only the UI use of the style didn't apply numbering in Word:
Example1 -ooxmlexport6 fdo74605.docx RT
pStyle not written out for numbering.
List-number-2 gets ilvl0 before List-number-1,
and loses pStyle for absLevel 1
[NOT REALLY A PROBLEM.
That is also how Word sees it. These aren't chapter numbering,
so the pStyle settings just get dropped.]
Example 2 - ooxmlexport7 fdo76979.docx RT:
Bullet gets the numbering, but not Bullet2
Example 3 - ooxmlexport11 tdf101122_noFillForCustomShape.odt RT:
Heading 9 gets the numbering, but not Heading 10
[Typical LO-originating document.]
Example 4 - ooxmlexport13 tdf95848.docx RT:
Heading 1, so not Heading 2
Example 5 - ooxmlexport14 tdf136929_framesOfParagraph.odt RT:
OOoNum123Start, so not the others (who inherit from start anyway)
Change-Id: Ia27131ae6d31b6cff240477f3546ccf92ea69160
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118707
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 120c312969d2..504b2d3ea802 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -164,9 +164,12 @@
DECLARE_OOXMLEXPORT_TEST(testTdf141966_chapterNumberTortureTest, "tdf141966_chap
xPara.set(getParagraph(3, "First numbered line"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("1st.i.a.1.I"), getProperty(xPara,
"ListLabelString"));
+xPara.set(getParagraph(5, "Outline with listLvl 5"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara,
"ListLabelString"));
+
xPara.set(getParagraph(7, "inheritOnly: inherit outlineLvl and listLvl."),
uno::UNO_QUERY);
-// 2nd.iii in MS Word 2003. 2nd.ii in MS Word 2010/2016 where para5 is
not numbered. Why not?
-CPPUNIT_ASSERT_EQUAL(OUString("2nd.iii"), getProperty(xPara,
"ListLabelString"));
+// 2nd.iii in MS Word 2003. 2nd.ii in MS Word 2010/2016 where para5 is
not numbered.
+CPPUNIT_ASSERT_EQUAL(OUString("2nd.ii"), getProperty(xPara,
"ListLabelString"));
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(xPara,
"NumberingLevel")); // Level 2
xPara.set(getParagraph(9, "outline with Body listLvl(9)."),
uno::UNO_QUERY);
@@ -179,7 +182,7 @@
DECLARE_OOXMLEXPORT_TEST(testTdf141966_chapterNumberTortureTest, "tdf141966_chap
CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara,
"ListLabelString"));
xPara.set(getParagraph(12, "direct numId, inherit listLvl."),
uno::UNO_QUERY);
-//CPPUNIT_ASSERT_EQUAL(OUString("2nd.ii.a.1.I"),
getProperty(xPara, "ListLabelString"));
+CPPUNIT_ASSERT_EQUAL(OUString("2nd.ii.a.1.I"),
getProperty(xPara, "ListLabelString"));
CPPUNIT_ASSERT_EQUAL(sal_Int16(4), getProperty(xPara,
"NumberingLevel")); // Level 5
xPara.set(getParagraph(13, "Style numId0 cancels inherited numbering."),
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 39b118e108f0..5fecd67c07ca 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -4035,6 +4035,11 @@ OUString DomainMapper::GetListStyleName(sal_Int32
nListId) const
return m_pImpl->GetListStyleName( nListId );
}
+void DomainMapper::ValidateListLevel(const OUString& sStyleIdentifierD)
+{
+m_pImpl->Valid
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/customshapes/generate.sh |4 1 file changed, 4 insertions(+) New commits: commit 59577dbb84fae18a3216d57ffec6008af157ce9b Author: Hossein AuthorDate: Mon Jul 5 04:12:27 2021 +0200 Commit: Miklos Vajna CommitDate: Wed Jul 14 09:02:28 2021 +0200 Renamed bash-powered README file to generate.sh * Renamed README file to generate.sh. This file was both a README file and a bash script * Added simple instructions to run the script * A separate README file will be added later Change-Id: Ic2086c9af9c3497edd9cc557c1d9883b9ee0002b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118394 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/oox/source/drawingml/customshapes/README b/oox/source/drawingml/customshapes/generate.sh old mode 100644 new mode 100755 similarity index 86% rename from oox/source/drawingml/customshapes/README rename to oox/source/drawingml/customshapes/generate.sh index 0d4fab9bf6ff..2a0cd3e439b8 --- a/oox/source/drawingml/customshapes/README +++ b/oox/source/drawingml/customshapes/generate.sh @@ -5,6 +5,10 @@ # This file is both a README and also, if run as a shell script, does what # it describes. +# It should be invoked from the libreoffice core top-level source folder: +# ./oox/source/drawingml/customshapes/generate.sh +# The logs will be created in the file: +# ./oox/source/drawingml/customshapes/custom-shapes.log # We want to exit on errors... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
