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

[Tomaž Vajngerl (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |7 ++--
 sw/source/uibase/uno/unotxdoc.cxx   |   49 
 2 files changed, 40 insertions(+), 16 deletions(-)

New commits:
commit 7da5537f6a43c1b82afc5e0c8d18b8d847293fda
Author: Tomaž Vajngerl 
AuthorDate: Mon Aug 2 22:27:28 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 08:32:57 2021 +0200

indexing: use XML as input that is identical to indexing XML

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index f23f9709416e..dc8b4caf1de4 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -3117,13 +3117,16 @@ void DesktopLOKTest::testRenderSearchResult()
 Scheduler::ProcessEventsToIdle();
 
 unsigned char* pBuffer = nullptr;
-OString aJSON = "{ \"type\" : 1, \"node_index\" : 19 }";
+OString aPayload =
+""
+"ABC"
+"";
 
 int nWidth = 0;
 int nHeight = 0;
 size_t nByteSize = 0;
 
-bool bResult = pDocument->m_pDocumentClass->renderSearchResult(pDocument, 
aJSON.getStr(), , , , );
+bool bResult = pDocument->m_pDocumentClass->renderSearchResult(pDocument, 
aPayload.getStr(), , , , );
 
 CPPUNIT_ASSERT(bResult);
 CPPUNIT_ASSERT(pBuffer);
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 2940c52b8256..51dfac84254c 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -122,7 +122,6 @@
 #include 
 #include 
 
-
 #include 
 #include 
 
@@ -164,7 +163,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 #define TWIPS_PER_PIXEL 15
 
@@ -3397,23 +3396,45 @@ SwXTextDocument::getSearchResultRectangles(const char* 
pPayload)
 {
 std::vector aRectangles;
 
-boost::property_tree::ptree aTree;
-std::stringstream aStream(pPayload);
-boost::property_tree::read_json(aStream, aTree);
+const OString aPayloadString(pPayload);
 
-sw::search::SearchIndexData aData;
+SvMemoryStream aStream(const_cast(aPayloadString.getStr()), 
aPayloadString.getLength(), StreamMode::READ);
+tools::XmlWalker aWalker;
+if (!aWalker.open())
+return aRectangles;
 
-int nType = aTree.get("type");
+if (aWalker.name() == "indexing")
+{
+SwDoc* pDoc = m_pDocShell->GetDoc();
 
-aData.nNodeIndex = sal_uInt32(aTree.get("node_index"));
-aData.eType = sw::search::NodeType(nType);
+sw::search::SearchIndexData aData;
 
-SwDoc* pDoc = m_pDocShell->GetDoc();
+aWalker.children();
+while (aWalker.isValid())
+{
+if (aWalker.name() == "paragraph")
+{
+OString sType = aWalker.attribute("type");
+OString sIndex = aWalker.attribute("index");
+
+if (!sType.isEmpty() && !sIndex.isEmpty())
+{
+aData.nNodeIndex = sIndex.toInt32();
+aData.eType = sw::search::NodeType(sType.toInt32());
 
-sw::search::SearchResultLocator aLocator(pDoc);
-sw::search::LocationResult aResult = aLocator.find(aData);
-if (aResult.mbFound)
-aRectangles = aResult.maRectangles;
+sw::search::SearchResultLocator aLocator(pDoc);
+sw::search::LocationResult aResult = aLocator.find(aData);
+if (aResult.mbFound)
+{
+for (auto const & rRect : aResult.maRectangles)
+aRectangles.push_back(rRect);
+}
+}
+}
+aWalker.next();
+}
+aWalker.parent();
+}
 
 return aRectangles;
 }

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

[Vasily Melenchuk (via logerrit)]

 sw/inc/editsh.hxx |3 +--
 sw/inc/swtypes.hxx|2 --
 sw/source/core/doc/docnum.cxx |1 -
 sw/source/filter/ww8/wrtw8nds.cxx |6 +++---
 sw/source/filter/ww8/ww8atr.cxx   |5 ++---
 5 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 29e5fad7ed64459d04df61b57ecd8eaba6d8bfae
Author: Vasily Melenchuk 
AuthorDate: Fri Aug 6 13:39:46 2021 +0300
Commit: Thorsten Behrens 
CommitDate: Tue Aug 10 08:56:00 2021 +0200

sw: removed unused NO_NUMLEVEL

NO_NUMLEVEL is not used in code for a while.

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

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index ca2c2efcb0ab..cea1eab10691 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -539,8 +539,7 @@ public:
 bool IsNoNum( bool bChkStart = true ) const;
 
 /** @return Num-Level of the node in which point of cursor is.
- @return values can be: NO_NUMBERING,
- 0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1 */
+ @return values can be: NO_NUMBERING, 0..MAXLEVEL-1 */
 sal_uInt8 GetNumLevel() const;
 
 /// Detect highest and lowest level to check moving of outline levels.
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index ff79edb47d02..a091a538d9a9 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -91,8 +91,6 @@ enum class SwLabelType
 
 constexpr sal_uInt8 MAXLEVEL = 10;
 
-constexpr sal_uInt8 NO_NUMLEVEL = 0x20;// "or" with the levels.
-
 //  Values for indents at numbering and bullet lists.
 //  (For more levels the values have to be multiplied with the levels+1;
 //  levels 0 ..4!)
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 430d19220329..b931646aaa2c 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1515,7 +1515,6 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool 
bNext,
 SwNodeIndex aIdx( rPos.nNode );
 if( ! pNd->IsCountedInList() )
 {
-// If NO_NUMLEVEL is switched on, we search the preceding Node with 
Numbering
 bool bError = false;
 do {
 sw::GotoPrevLayoutTextFrame(aIdx, pLayout);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 5eeb9f6001f5..979300ff5ff2 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2969,12 +2969,12 @@ void MSWordExportBase::OutputTextNode( SwTextNode& 
rNode )
 // isn't exported as numbered, but not counted, if no other 
attribute
 // is found in 
 // #i44815# adjust numbering/indents for numbered paragraphs
-//  without number (NO_NUMLEVEL)
+//  without number
 // #i47013# need to check rNode.GetNumRule()!=NULL as well.
 if ( ! rNode.IsCountedInList() && rNode.GetNumRule()!=nullptr )
 {
 // WW8 does not know numbered paragraphs without number
-// (NO_NUMLEVEL). In WW8AttributeOutput::ParaNumRule(), we 
will export
+// In WW8AttributeOutput::ParaNumRule(), we will export
 // the RES_PARATR_NUMRULE as list-id 0, which in WW8 means
 // no numbering. Here, we will adjust the indents to match
 // visually.
@@ -3014,7 +3014,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 }
 
 // new first line indent = 0
-// (first line indent is ignored for NO_NUMLEVEL)
+// (first line indent is ignored)
 if (!bParaRTL)
 aLRSpace.SetTextFirstLineOffset( 0 );
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 7fe5a330a37b..825e70cd4356 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3735,9 +3735,8 @@ void AttributeOutputBase::ParaNumRule( const 
SwNumRuleItem& rNumRule )
 else
 {
 // #i44815# adjust numbering for numbered paragraphs
-// without number (NO_NUMLEVEL). These paragraphs
-// will receive a list id 0, which WW interprets as
-// 'no number'.
+// without number. These paragraphs will receive a
+// list id 0, which WW interprets as 'no number'.
 nNumId = 0;
 }
 }

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

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

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

New commits:
commit a5812749820d5118c3bb4297e5f785635c75f07a
Author: Tünde Tóth 
AuthorDate: Wed Jul 14 14:57:00 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 10 08:37:49 2021 +0200

tdf#143220 XLSX export: fix hyperlink to sheet target

Hyperlink to another sheet didn't work in Excel.

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

diff --git a/sc/qa/unit/data/ods/tdf143220.ods 
b/sc/qa/unit/data/ods/tdf143220.ods
new file mode 100644
index ..6aa1536eae8e
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf143220.ods differ
diff --git a/sc/qa/unit/subsequent_export-test2.cxx 
b/sc/qa/unit/subsequent_export-test2.cxx
index 6cc0ece437d6..8a1dc168fe26 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -190,6 +190,7 @@ public:
 void testTdf142854_GridVisibilityImportXlsxInHeadlessMode();
 void testTdf140431();
 void testTdf142929_filterLessThanXLSX();
+void testTdf143220XLSX();
 
 CPPUNIT_TEST_SUITE(ScExportTest2);
 
@@ -288,6 +289,7 @@ public:
 CPPUNIT_TEST(testTdf142854_GridVisibilityImportXlsxInHeadlessMode);
 CPPUNIT_TEST(testTdf140431);
 CPPUNIT_TEST(testTdf142929_filterLessThanXLSX);
+CPPUNIT_TEST(testTdf143220XLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2355,6 +2357,19 @@ void ScExportTest2::testTdf142929_filterLessThanXLSX()
 xDocSh->DoClose();
 }
 
+void ScExportTest2::testTdf143220XLSX()
+{
+ScDocShellRef xDocSh = loadDoc(u"tdf143220.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, 
m_xSFactory,
+ 
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+assertXPath(pDoc, "/x:worksheet/x:hyperlinks/x:hyperlink", "location", 
"Sheet2!A1");
+
+xDocSh->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 0848745b8d4a..0a7a3baeb953 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -428,15 +428,17 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& 
rRoot, const SvxURLField& rU
aTextMark = aTextMark.replaceAt( nSepPos, 1, "!" );
 }
 
-if(nSepPos != -1)
+if (nSepPos != -1)
 {
-OUString aSheetName( aTextMark.copy(0, nSepPos));
+OUString aSheetName(aTextMark.copy(0, nSepPos));
 
-if ( aSheetName.indexOf(' ') != -1 && aSheetName[0] != '\'')
+if (aSheetName.indexOf(' ') != -1 && aSheetName[0] != '\'')
 {
 aTextMark = "'" + aTextMark.replaceAt(nSepPos, 0, "'");
 }
 }
+else
+aTextMark += "!A1";// tdf#143220 link to sheet not valid 
without cell reference
 
 mxTextMark.reset( new XclExpString( aTextMark, 
XclStrFlags::ForceUnicode, 255 ) );
 }

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

[Tomaž Vajngerl (via logerrit)]

 sw/qa/extras/indexing/IndexingExportTest.cxx |1 +
 sw/source/filter/indexing/IndexingExport.cxx |4 
 2 files changed, 5 insertions(+)

New commits:
commit df3d733724de84a2b54398434b621049a326c4d8
Author: Tomaž Vajngerl 
AuthorDate: Mon Aug 2 15:18:35 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 08:09:05 2021 +0200

indexing: add "type" to the xml for paragraph nodes

The type is either WriterNode (1) or SdrObect (2) as we need to
know for which one the index is refering to.

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

diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx 
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index 41cbfa1c9d79..346ff783d2c4 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -74,6 +74,7 @@ void IndexingExportTest::testIndexingExport_Paragraphs()
 
 assertXPath(pXmlDoc, "/indexing");
 assertXPathContent(pXmlDoc, "/indexing/paragraph[1]", "Title");
+assertXPath(pXmlDoc, "/indexing/paragraph[1]", "type", "1");
 assertXPathContent(pXmlDoc, "/indexing/paragraph[2]", "Heading 1");
 assertXPathContent(pXmlDoc, "/indexing/paragraph[3]", "Heading 2");
 assertXPathContent(pXmlDoc, "/indexing/paragraph[4]", "Paragraph 1");
diff --git a/sw/source/filter/indexing/IndexingExport.cxx 
b/sw/source/filter/indexing/IndexingExport.cxx
index 17a1670bd73c..c7bf032ba83e 100644
--- a/sw/source/filter/indexing/IndexingExport.cxx
+++ b/sw/source/filter/indexing/IndexingExport.cxx
@@ -95,6 +95,7 @@ public:
 = 
pTextNode->GetText().replaceAll(OUStringChar(CH_TXTATR_BREAKWORD), "");
 m_rXmlWriter.startElement("paragraph");
 m_rXmlWriter.attribute("index", pTextNode->GetIndex());
+m_rXmlWriter.attribute("type", "1");
 if (nParentIndex >= 0)
 m_rXmlWriter.attribute("parent", nParentIndex);
 m_rXmlWriter.content(rString);
@@ -121,6 +122,7 @@ public:
 
 m_rXmlWriter.startElement("paragraph");
 m_rXmlWriter.attribute("index", nParagraph);
+m_rXmlWriter.attribute("type", "2");
 m_rXmlWriter.content(sText);
 m_rXmlWriter.endElement();
 }
@@ -136,6 +138,7 @@ public:
 
 m_rXmlWriter.startElement("table");
 m_rXmlWriter.attribute("index", pTableNode->GetIndex());
+m_rXmlWriter.attribute("type", "1");
 m_rXmlWriter.attribute("name", sName);
 
 maNodeStack.push_back(pTableNode);
@@ -145,6 +148,7 @@ public:
 {
 m_rXmlWriter.startElement("section");
 m_rXmlWriter.attribute("index", pSectionNode->GetIndex());
+m_rXmlWriter.attribute("type", "1");
 m_rXmlWriter.attribute("name", 
pSectionNode->GetSection().GetSectionName());
 
 maNodeStack.push_back(pSectionNode);

GSoC - Weekly Report - #9 - Table styles

[Balázs Sántha]

Dear Community!

This week I was still working with my ongoing optimization.
Unfortuantely, it turned out, that some of the unit tests were failing with
the new patch. As I wasn't able to get much detail out from the Jenkins
log, I must have started to debug the problematic unit tests on my own.
After 2-3 days, I finally resolved all of the problems with the tests. One
of the problems was an index out of bound problem, which was causing some
of the crashes in the unit test. Interesting, that I wasn't able to get the
crash, when I tried to trigger it manually with a test document. After all
the test were finally fine, I still wanted to give a full support of the
import of direct character formatting.This was important, as they are lost
now, if they are applied on an empty cell (in a normal situation, these
direct char props are stored in SwpHints, but in empty cells, this isn't
solved). Recently this problem was solved by copying these paras into the
paragraph properties, so in this way, they support the copying of the new
rows. Originally my patch aimed to remove this functionality, as this
operation (copying direct char props into paragraphs) was done for every
cell and was very slow, but for these rare cases, when direct character
formattings are applied on empty cells, I still needed to keep this code in
the writerfilter. Nice thing, that with the modification I made in the
core, we only need to do this, when the cell is empty, which is quite
simple to test.
Furthermore I was trying to cherry-pick and rebase Alex Ivan's table-style
branch from 2013, on top of the recent master, without much success. This
week, I will continue this work, but with a different approach. As I have
already managed to build that branch (on a VirtualMachine), I will be able
to power off his commits, one-by-one, to test and understand his work.

If you have any questions, ideas, thoughts or suggestions, please share
with me!

Regards,
Balázs Sántha, santhab

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

[Bjoern Michaelsen (via logerrit)]

 sw/inc/swtblfmt.hxx  |7 
 sw/source/core/table/swtable.cxx |  312 ++-
 2 files changed, 155 insertions(+), 164 deletions(-)

New commits:
commit fa5202f746b25ea444d120d746a0dc35b8f8cca5
Author: Bjoern Michaelsen 
AuthorDate: Sat Aug 7 11:38:03 2021 +0200
Commit: Bjoern Michaelsen 
CommitDate: Tue Aug 10 08:29:55 2021 +0200

give SwTableBoxFormat::TableBoxAttributeChanged its own function

- ... because at somewhere around growing past 100 LOC it deserved that.
- also make the box a reference there as it should never be a nullptr

Change-Id: Ia14cfb7a88e14fdd02f6011a745c2b008d94bc10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120159
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen 

diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 14b200164b5d..e61049919df1 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -46,16 +46,17 @@ public:
 virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
 };
 
-class SAL_DLLPUBLIC_RTTI SwTableBoxFormat final : public SwFrameFormat
+class SAL_DLLPUBLIC_RTTI SwTableBoxFormat final: public SwFrameFormat
 {
 friend class SwDoc;
 
-SwTableBoxFormat( SwAttrPool& rPool, SwFrameFormat *pDrvdFrame )
-: SwFrameFormat( rPool, OUString(), pDrvdFrame, RES_FRMFMT, 
aTableBoxSetRange )
+SwTableBoxFormat(SwAttrPool& rPool, SwFrameFormat* pDrvdFrame)
+: SwFrameFormat(rPool, OUString(), pDrvdFrame, RES_FRMFMT, 
aTableBoxSetRange)
 {}
 
 // For recognition of changes (especially TableBoxAttribute).
 virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
+void BoxAttributeChanged(SwTableBox& rBox, const SwTableBoxNumFormat* 
pNewFormat, const SwTableBoxFormula* pNewFormula, const SwTableBoxValue* 
pNewValue, const sal_uLong nOldFormat);
 
 public:
 virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index c750aa3d75f9..c17d6882b019 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2116,11 +2116,153 @@ static void ChgNumToText( SwTableBox& rBox, sal_uLong 
nFormat )
 }
 
 }
+void SwTableBoxFormat::BoxAttributeChanged(SwTableBox& rBox, const 
SwTableBoxNumFormat* pNewFormat, const SwTableBoxFormula* pNewFormula, const 
SwTableBoxValue* pNewValue, sal_uLong nOldFormat)
+{
+sal_uLong nNewFormat;
+if(pNewFormat)
+{
+nNewFormat = pNewFormat->GetValue();
+// new formatting
+// is it newer or has the current been removed?
+if( SfxItemState::SET != GetItemState(RES_BOXATR_VALUE, false))
+pNewFormat = nullptr;
+}
+else
+{
+// fetch the current Item
+(void)GetItemState(RES_BOXATR_FORMAT, false, reinterpret_cast());
+nOldFormat = GetTableBoxNumFormat().GetValue();
+nNewFormat = pNewFormat ? pNewFormat->GetValue() : nOldFormat;
+}
+
+// is it newer or has the current been removed?
+if(pNewValue)
+{
+if(GetDoc()->GetNumberFormatter()->IsTextFormat(nNewFormat))
+nOldFormat = 0;
+else
+{
+if(SfxItemState::SET == GetItemState(RES_BOXATR_VALUE, false))
+nOldFormat = getSwDefaultTextFormat();
+else
+nNewFormat = getSwDefaultTextFormat();
+}
+}
+
+// Logic:
+// Value change: -> "simulate" a format change!
+// Format change:
+// Text -> !Text or format change:
+//  - align right for horizontal alignment, if LEFT or JUSTIFIED
+//  - align bottom for vertical alignment, if TOP is set, or 
default
+//  - replace text (color? negative numbers RED?)
+// !Text -> Text:
+//  - align left for horizontal alignment, if RIGHT
+//  - align top for vertical alignment, if BOTTOM is set
+SvNumberFormatter* pNumFormatr = GetDoc()->GetNumberFormatter();
+bool bNewIsTextFormat = pNumFormatr->IsTextFormat(nNewFormat);
+
+if((!bNewIsTextFormat && nOldFormat != nNewFormat) || pNewFormula)
+{
+bool bIsNumFormat = false;
+OUString aOrigText;
+bool bChgText = true;
+double fVal = 0;
+if(!pNewValue && SfxItemState::SET != GetItemState(RES_BOXATR_VALUE, 
false, reinterpret_cast()))
+{
+// so far, no value has been set, so try to evaluate the content
+sal_uLong nNdPos = rBox.IsValidNumTextNd();
+if(ULONG_MAX != nNdPos)
+{
+sal_uInt32 nTmpFormatIdx = nNewFormat;
+OUString aText(GetDoc()->GetNodes()[nNdPos] 
->GetTextNode()->GetRedlineText());
+aOrigText = aText;
+if(aText.isEmpty())
+bChgText = false;
+else
+{
+// Keep Tabs
+

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

[panoskorovesis (via logerrit)]

 include/vcl/filter/SvmWriter.hxx|1 +
 vcl/source/filter/svm/SvmWriter.cxx |   20 
 2 files changed, 21 insertions(+)

New commits:
commit 640508cb3783fa9ba8ecf8acd257356c68b9cf48
Author: panoskorovesis 
AuthorDate: Wed Aug 4 16:13:27 2021 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 09:49:55 2021 +0200

Add Handler for BmpExScale Write

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

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

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 54deb03a52dc..9bf3a3f50bc6 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -60,6 +60,7 @@ public:
 void BmpScaleHandler(MetaBmpScaleAction* pAction);
 void BmpScalePartHandler(MetaBmpScalePartAction* pAction);
 void BmpExHandler(MetaBmpExAction* pAction);
+void BmpExScaleHandler(MetaBmpExScaleAction* pAction);
 void OverlineColorHandler(MetaOverlineColorAction* pAction);
 void TextAlignHandler(MetaTextAlignAction* pAction);
 void MapModeHandler(MetaMapModeAction* pAction);
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index acd14be4ddda..d0e72957ff0a 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -228,6 +228,13 @@ void SvmWriter::MetaActionHandler(MetaAction* pAction, 
ImplMetaWriteData* pData)
 }
 break;
 
+case MetaActionType::BMPEXSCALE:
+{
+auto* pMetaAction = static_cast(pAction);
+BmpExScaleHandler(pMetaAction);
+}
+break;
+
 case MetaActionType::OVERLINECOLOR:
 {
 auto* pMetaAction = static_cast(pAction);
@@ -630,6 +637,19 @@ void SvmWriter::BmpExHandler(MetaBmpExAction* pAction)
 }
 }
 
+void SvmWriter::BmpExScaleHandler(MetaBmpExScaleAction* pAction)
+{
+if (!pAction->GetBitmapEx().GetBitmap().IsEmpty())
+{
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
+VersionCompatWrite aCompat(mrStream, 1);
+WriteDIBBitmapEx(pAction->GetBitmapEx(), mrStream);
+TypeSerializer aSerializer(mrStream);
+aSerializer.writePoint(pAction->GetPoint());
+aSerializer.writeSize(pAction->GetSize());
+}
+}
+
 void SvmWriter::OverlineColorHandler(MetaOverlineColorAction* pAction)
 {
 mrStream.WriteUInt16(static_cast(pAction->GetType()));

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

[panoskorovesis (via logerrit)]

 include/vcl/filter/SvmWriter.hxx|2 +
 vcl/source/filter/svm/SvmWriter.cxx |   42 
 2 files changed, 44 insertions(+)

New commits:
commit 80a3d51f8c09d4c2aaabee95ee134fdd13cac5d2
Author: panoskorovesis 
AuthorDate: Wed Aug 4 16:07:36 2021 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 09:49:14 2021 +0200

Add Handler for BmpScalePart Write

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

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

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 027a3bd580b1..54a968837290 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -58,6 +58,7 @@ public:
 void TextLineHandler(MetaTextLineAction* pAction);
 void BmpHandler(MetaBmpAction* pAction);
 void BmpScaleHandler(MetaBmpScaleAction* pAction);
+void BmpScalePartHandler(MetaBmpScalePartAction* pAction);
 void OverlineColorHandler(MetaOverlineColorAction* pAction);
 void TextAlignHandler(MetaTextAlignAction* pAction);
 void MapModeHandler(MetaMapModeAction* pAction);
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index 97a748ff9505..e38f724aa8a8 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -214,6 +214,13 @@ void SvmWriter::MetaActionHandler(MetaAction* pAction, 
ImplMetaWriteData* pData)
 }
 break;
 
+case MetaActionType::BMPSCALEPART:
+{
+auto* pMetaAction = static_cast(pAction);
+BmpScalePartHandler(pMetaAction);
+}
+break;
+
 case MetaActionType::OVERLINECOLOR:
 {
 auto* pMetaAction = static_cast(pAction);
@@ -589,6 +596,21 @@ void SvmWriter::BmpScaleHandler(MetaBmpScaleAction* 
pAction)
 }
 }
 
+void SvmWriter::BmpScalePartHandler(MetaBmpScalePartAction* pAction)
+{
+if (!pAction->GetBitmap().IsEmpty())
+{
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
+VersionCompatWrite aCompat(mrStream, 1);
+WriteDIB(pAction->GetBitmap(), mrStream, false, true);
+TypeSerializer aSerializer(mrStream);
+aSerializer.writePoint(pAction->GetDestPoint());
+aSerializer.writeSize(pAction->GetDestSize());
+aSerializer.writePoint(pAction->GetSrcPoint());
+aSerializer.writeSize(pAction->GetSrcSize());
+}
+}
+
 void SvmWriter::OverlineColorHandler(MetaOverlineColorAction* pAction)
 {
 mrStream.WriteUInt16(static_cast(pAction->GetType()));
commit 8d73346ae2afa31c4d954843c71d2eb1c2faef5e
Author: panoskorovesis 
AuthorDate: Wed Aug 4 16:02:04 2021 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 09:48:55 2021 +0200

Add Handler for BmpScale Write

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

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

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index d6b771b4f54d..027a3bd580b1 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -57,6 +57,7 @@ public:
 void TextRectHandler(MetaTextRectAction* pAction, ImplMetaWriteData* 
pData);
 void TextLineHandler(MetaTextLineAction* pAction);
 void BmpHandler(MetaBmpAction* pAction);
+void BmpScaleHandler(MetaBmpScaleAction* pAction);
 void OverlineColorHandler(MetaOverlineColorAction* pAction);
 void TextAlignHandler(MetaTextAlignAction* pAction);
 void MapModeHandler(MetaMapModeAction* pAction);
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index 6ed61e7c0e53..97a748ff9505 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -207,6 +207,13 @@ void SvmWriter::MetaActionHandler(MetaAction* pAction, 
ImplMetaWriteData* pData)
 }
 break;
 
+case MetaActionType::BMPSCALE:
+{
+auto* pMetaAction = static_cast(pAction);
+BmpScaleHandler(pMetaAction);
+}
+break;
+
 case MetaActionType::OVERLINECOLOR:
 {
 auto* pMetaAction = static_cast(pAction);
@@ -569,6 +576,19 @@ void SvmWriter::BmpHandler(MetaBmpAction* pAction)
 }
 }
 
+void SvmWriter::BmpScaleHandler(MetaBmpScaleAction* pAction)
+{
+if (!pAction->GetBitmap().IsEmpty())
+{
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
+VersionCompatWrite aCompat(mrStream, 1);
+WriteDIB(pAction->GetBitmap(), mrStream, false, true);
+

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

[panoskorovesis (via logerrit)]

 include/vcl/filter/SvmWriter.hxx|1 +
 vcl/source/filter/svm/SvmWriter.cxx |   19 +++
 2 files changed, 20 insertions(+)

New commits:
commit 23bb4465057ff71e3042fdb10d3a722ff54b861f
Author: panoskorovesis 
AuthorDate: Wed Aug 4 16:10:02 2021 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 09:49:36 2021 +0200

Add Handler for BmpEx Write

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

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

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 54a968837290..54deb03a52dc 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -59,6 +59,7 @@ public:
 void BmpHandler(MetaBmpAction* pAction);
 void BmpScaleHandler(MetaBmpScaleAction* pAction);
 void BmpScalePartHandler(MetaBmpScalePartAction* pAction);
+void BmpExHandler(MetaBmpExAction* pAction);
 void OverlineColorHandler(MetaOverlineColorAction* pAction);
 void TextAlignHandler(MetaTextAlignAction* pAction);
 void MapModeHandler(MetaMapModeAction* pAction);
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index e38f724aa8a8..acd14be4ddda 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -221,6 +221,13 @@ void SvmWriter::MetaActionHandler(MetaAction* pAction, 
ImplMetaWriteData* pData)
 }
 break;
 
+case MetaActionType::BMPEX:
+{
+auto* pMetaAction = static_cast(pAction);
+BmpExHandler(pMetaAction);
+}
+break;
+
 case MetaActionType::OVERLINECOLOR:
 {
 auto* pMetaAction = static_cast(pAction);
@@ -611,6 +618,18 @@ void 
SvmWriter::BmpScalePartHandler(MetaBmpScalePartAction* pAction)
 }
 }
 
+void SvmWriter::BmpExHandler(MetaBmpExAction* pAction)
+{
+if (!pAction->GetBitmapEx().GetBitmap().IsEmpty())
+{
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
+VersionCompatWrite aCompat(mrStream, 1);
+WriteDIBBitmapEx(pAction->GetBitmapEx(), mrStream);
+TypeSerializer aSerializer(mrStream);
+aSerializer.writePoint(pAction->GetPoint());
+}
+}
+
 void SvmWriter::OverlineColorHandler(MetaOverlineColorAction* pAction)
 {
 mrStream.WriteUInt16(static_cast(pAction->GetType()));

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - svx/source sw/qa

[Miklos Vajna (via logerrit)]

 svx/source/xoutdev/_xoutbmp.cxx|3 ++-
 sw/qa/extras/htmlexport/data/ole2.odt  |binary
 sw/qa/extras/htmlexport/htmlexport.cxx |   21 +
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 440ac7b55f3648c1a21f2bf3607cbdceeeac8204
Author: Miklos Vajna 
AuthorDate: Mon Aug 9 16:16:35 2021 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 10 11:50:57 2021 +0200

sw HTML export: avoid writing EMF data with JPG extension

Regression from commit f3b2fc2276ee8a7f64e73d9975d0143d1696362c (sw
XHTML import, improved  handling for images: support more
formats, 2021-07-20), the problem was that now an EMF image was written
with the JPG extension in the HTML export.

Solve the problem by making the "use emf as-is" check more strict in
XOutBitmap::WriteGraphic(): that will be still true in the XHTML case
when the source image is EMF, but the filter name will be JPG in the
HTML case, so that will avoid the unwanted EMF data in the HTML case.

(cherry picked from commit 82a444eabc38b74d762debb6f1af50e93e5b74f1)

Conflicts:
svx/source/xoutdev/_xoutbmp.cxx

Change-Id: I7bced482d677cf121be1ed494a3aaeb319e1c5b4

diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 5bc11f752aba..be5f7790e1f4 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -134,12 +134,13 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& 
rGraphic, OUString& rFileName,
 
 if (rVectorGraphicDataPtr && 
rVectorGraphicDataPtr->getVectorGraphicDataArrayLength())
 {
+// Does the filter name match the original format?
 const bool bIsSvg(rFilterName.equalsIgnoreAsciiCase("svg") && 
VectorGraphicDataType::Svg == 
rVectorGraphicDataPtr->getVectorGraphicDataType());
 const bool bIsWmf(rFilterName.equalsIgnoreAsciiCase("wmf") && 
VectorGraphicDataType::Wmf == 
rVectorGraphicDataPtr->getVectorGraphicDataType());
 bool bIsEmf(rFilterName.equalsIgnoreAsciiCase("emf") && 
VectorGraphicDataType::Emf == 
rVectorGraphicDataPtr->getVectorGraphicDataType());
 if (!bIsEmf)
 {
-bIsEmf = rGraphic.GetGfxLink().IsEMF();
+bIsEmf = rFilterName.equalsIgnoreAsciiCase("emf") && 
rGraphic.GetGfxLink().IsEMF();
 }
 const bool bIsPdf(rFilterName.equalsIgnoreAsciiCase("pdf") && 
VectorGraphicDataType::Pdf == 
rVectorGraphicDataPtr->getVectorGraphicDataType());
 
diff --git a/sw/qa/extras/htmlexport/data/ole2.odt 
b/sw/qa/extras/htmlexport/data/ole2.odt
new file mode 100644
index ..a10cfbb5b542
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/ole2.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index f1fcc3631dae..e5d9b4fdc8b9 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1963,6 +1963,27 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testListsHeading)
"list 1, header 1");
 }
 
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testOleEmfPreviewToHtml)
+{
+// Given a document containing an embedded object, with EMF preview:
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "ole2.odt";
+mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", {});
+
+// When exporting to HTML:
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequence aStoreProperties = {
+comphelper::makePropertyValue("FilterName", OUString("HTML 
(StarWriter)")),
+};
+xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
+
+// Then make sure the  tag has matching file extension and data:
+htmlDocUniquePtr pDoc = parseHtml(maTempFile);
+OUString aPath = getXPath(pDoc, "/html/body/p/img", "src");
+// Without the accompanying fix in place, this test would have failed, as 
aPath was
+// ole_html_3978e5f373402b43.JPG, with EMF data.
+CPPUNIT_ASSERT(aPath.endsWith("gif"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Noel Grandin (via logerrit)]

 include/xmloff/xmlimp.hxx |2 +-
 xmloff/source/core/xmlimp.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0ae13b5df161ec7e12477d5818c70909575c0aa7
Author: Noel Grandin 
AuthorDate: Mon Aug 9 18:19:17 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 09:16:22 2021 +0200

no need to use unique_ptr for NamespaceDefine here

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

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 12020802c329..f8387cc8f81c 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -136,7 +136,7 @@ private:
 
 NamespaceDefine( const OUString& rPrefix, const OUString& 
rNamespaceURI ) : m_aPrefix( rPrefix ), m_aNamespaceURI( rNamespaceURI ) {}
 };
-std::vector< std::unique_ptr< NamespaceDefine > > m_aNamespaceDefines;
+std::vector< NamespaceDefine > m_aNamespaceDefines;
 
 public:
 SvXMLImportFastNamespaceHandler();
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 48a83f7d1b9f..23e7807c7157 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -2102,8 +2102,8 @@ void 
SvXMLImportFastNamespaceHandler::addNSDeclAttributes( rtl::Reference < comp
 {
 for(const auto& aNamespaceDefine : m_aNamespaceDefines)
 {
-OUString& rPrefix = aNamespaceDefine->m_aPrefix;
-OUString& rNamespaceURI = aNamespaceDefine->m_aNamespaceURI;
+const OUString& rPrefix = aNamespaceDefine.m_aPrefix;
+const OUString& rNamespaceURI = aNamespaceDefine.m_aNamespaceURI;
 OUString sDecl;
 if ( rPrefix.isEmpty() )
 sDecl = "xmlns";
@@ -2119,10 +2119,10 @@ void 
SvXMLImportFastNamespaceHandler::registerNamespace( const OUString& rNamesp
 // Elements with default namespace parsed by FastParser have namespace 
prefix.
 // A default namespace needs to be registered with the prefix, to maintain 
the compatibility.
 if ( rNamespacePrefix.isEmpty() )
-m_aNamespaceDefines.push_back( std::make_unique(
+m_aNamespaceDefines.push_back( NamespaceDefine(
 SvXMLImport::getNamespacePrefixFromURI( 
rNamespaceURI ), rNamespaceURI) );
 
-m_aNamespaceDefines.push_back( std::make_unique(
+m_aNamespaceDefines.push_back( NamespaceDefine(
 rNamespacePrefix, rNamespaceURI) );
 }
 

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

[Tibor Nagy (via logerrit)]

 sd/qa/unit/data/pptx/tdf143126.pptx  |binary
 sd/qa/unit/export-tests-ooxml1.cxx   |   16 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   29 +++--
 3 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit 9cda220e98acda221b204b49d5d91ce4375cb2a7
Author: Tibor Nagy 
AuthorDate: Thu Jul 8 16:12:05 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 10 09:22:23 2021 +0200

tdf#143126 PPTX: slideshow setting “Start from” not exported

Follow-up to commit 3d55149dcf19cffefcc19c16a3abbe8851453c5e
(tdf#142913 PPTX: slideshow setting “Start from” not imported).

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

diff --git a/sd/qa/unit/data/pptx/tdf143126.pptx 
b/sd/qa/unit/data/pptx/tdf143126.pptx
new file mode 100644
index ..f5799b60f26b
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf143126.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx 
b/sd/qa/unit/export-tests-ooxml1.cxx
index a450e6d890eb..8c1db529b89c 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -117,6 +117,7 @@ public:
 void testTdf140865Wordart3D();
 void testTdf124457();
 void testPlaceholderFillAndOutlineExport();
+void testTdf143126();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest1);
 
@@ -176,6 +177,7 @@ public:
 CPPUNIT_TEST(testTdf140865Wordart3D);
 CPPUNIT_TEST(testTdf124457);
 CPPUNIT_TEST(testPlaceholderFillAndOutlineExport);
+CPPUNIT_TEST(testTdf143126);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1555,6 +1557,20 @@ void SdOOXMLExportTest1::testTdf124457()
 "repeatCount", "indefinite");
 }
 
+void SdOOXMLExportTest1::testTdf143126()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143126.pptx"), 
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, );
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/presProps.xml");
+
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1");
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:sldRg", "st", "2" );
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:sldRg", "end", "3" );
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest1);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index f30a4d040fc6..e9b219bbcd6e 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1067,6 +1067,7 @@ void PowerPointExport::WritePresentationProps()
 Reference 
xPresentationProps(xPresentationSupplier->getPresentation(),
   uno::UNO_QUERY);
 bool bEndlessVal = 
xPresentationProps->getPropertyValue("IsEndless").get();
+OUString sFirstPage = 
xPresentationProps->getPropertyValue("FirstPage").get();
 
 FSHelperPtr pFS = openFragmentStreamWithSerializer(
 "ppt/presProps.xml",
@@ -1077,8 +1078,32 @@ void PowerPointExport::WritePresentationProps()
 
 pFS->startElementNS(XML_p, XML_presentationPr, PPRNMSS);
 
-pFS->singleElementNS(XML_p, XML_showPr, XML_loop, 
sax_fastparser::UseIf("1", bEndlessVal),
- XML_showNarration, sax_fastparser::UseIf("1", 
bEndlessVal));
+pFS->startElementNS(XML_p, XML_showPr, XML_loop, 
sax_fastparser::UseIf("1", bEndlessVal),
+XML_showNarration, "1");
+
+Reference xDPS(mXModel, 
uno::UNO_QUERY_THROW);
+Reference xDrawPages(xDPS->getDrawPages(), 
uno::UNO_SET_THROW);
+if (!sFirstPage.isEmpty())
+{
+sal_Int32 nStartSlide = 1;
+sal_Int32 nEndSlide = xDrawPages->getCount();
+for (sal_Int32 i = 0; i < nEndSlide; i++)
+{
+Reference xDrawPage;
+xDrawPages->getByIndex(i) >>= xDrawPage;
+Reference xNamed(xDrawPage, 
uno::UNO_QUERY_THROW);
+if (xNamed->getName() == sFirstPage)
+{
+nStartSlide = i + 1;
+break;
+}
+}
+
+pFS->singleElementNS(XML_p, XML_sldRg, XML_st, 
OUString::number(nStartSlide), XML_end,
+ OUString::number(nEndSlide));
+}
+
+pFS->endElementNS(XML_p, XML_showPr);
 
 pFS->endElementNS(XML_p, XML_presentationPr);
 }

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

[panoskorovesis (via logerrit)]

 include/vcl/filter/SvmWriter.hxx|1 +
 vcl/source/filter/svm/SvmWriter.cxx |   20 
 2 files changed, 21 insertions(+)

New commits:
commit b7aaa928e019eb71f41f9a4413b785b86719f7c5
Author: panoskorovesis 
AuthorDate: Wed Aug 4 15:58:04 2021 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 09:48:29 2021 +0200

Add Handler for Bmp Write

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

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

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 93d907a36522..d6b771b4f54d 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -56,6 +56,7 @@ public:
 void StretchTextHandler(MetaStretchTextAction* pAction, ImplMetaWriteData* 
pData);
 void TextRectHandler(MetaTextRectAction* pAction, ImplMetaWriteData* 
pData);
 void TextLineHandler(MetaTextLineAction* pAction);
+void BmpHandler(MetaBmpAction* pAction);
 void OverlineColorHandler(MetaOverlineColorAction* pAction);
 void TextAlignHandler(MetaTextAlignAction* pAction);
 void MapModeHandler(MetaMapModeAction* pAction);
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index c9f4ad52ec97..6ed61e7c0e53 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -199,6 +200,13 @@ void SvmWriter::MetaActionHandler(MetaAction* pAction, 
ImplMetaWriteData* pData)
 }
 break;
 
+case MetaActionType::BMP:
+{
+auto* pMetaAction = static_cast(pAction);
+BmpHandler(pMetaAction);
+}
+break;
+
 case MetaActionType::OVERLINECOLOR:
 {
 auto* pMetaAction = static_cast(pAction);
@@ -549,6 +557,18 @@ void SvmWriter::TextLineHandler(MetaTextLineAction* 
pAction)
 mrStream.WriteUInt32(pAction->GetOverline());
 }
 
+void SvmWriter::BmpHandler(MetaBmpAction* pAction)
+{
+if (!pAction->GetBitmap().IsEmpty())
+{
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
+VersionCompatWrite aCompat(mrStream, 1);
+WriteDIB(pAction->GetBitmap(), mrStream, false, true);
+TypeSerializer aSerializer(mrStream);
+aSerializer.writePoint(pAction->GetPoint());
+}
+}
+
 void SvmWriter::OverlineColorHandler(MetaOverlineColorAction* pAction)
 {
 mrStream.WriteUInt16(static_cast(pAction->GetType()));

[Libreoffice-commits] core.git: distro-configs/LibreOfficeOssFuzz.conf

[Caolán McNamara (via logerrit)]

 distro-configs/LibreOfficeOssFuzz.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f74ad471eee76ecb30f6ec41141c35242426e3be
Author: Caolán McNamara 
AuthorDate: Mon Aug 9 20:43:46 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 10:23:52 2021 +0200

oss-fuzz: can use system ucpp

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

diff --git a/distro-configs/LibreOfficeOssFuzz.conf 
b/distro-configs/LibreOfficeOssFuzz.conf
index 41f03f300ebc..26ba4b9773dc 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -27,6 +27,7 @@
 --disable-xmlhelp
 --disable-zxing
 --with-locales=en
+--with-system-ucpp
 --without-fonts
 --without-java
 --without-webdav

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/search_replace/tdf143759.py |   52 +++
 1 file changed, 52 insertions(+)

New commits:
commit 95d619f92b32a576b0e0417508b66147b7f05afd
Author: Xisco Fauli 
AuthorDate: Tue Aug 10 09:29:48 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 10 11:24:23 2021 +0200

tdf#143759: sc: Add UItest

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

diff --git a/sc/qa/uitest/search_replace/tdf143759.py 
b/sc/qa/uitest/search_replace/tdf143759.py
new file mode 100644
index ..8fd0c79a1501
--- /dev/null
+++ b/sc/qa/uitest/search_replace/tdf143759.py
@@ -0,0 +1,52 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+
+class tdf143759(UITestCase):
+
+   def test_tdf143759(self):
+with self.ui_test.create_doc_in_start_center("calc") as document:
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+enter_text_to_cell(gridwin, "C2", "A")
+enter_text_to_cell(gridwin, "E3", "1")
+enter_text_to_cell(gridwin, "B5", "2")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A1:F6"}))
+
+
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xSearchterm = xDialog.getChild("searchterm")
+xSearchterm.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xSearchterm.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+xSearchterm.executeAction("TYPE", mkPropertyValues({"TEXT":"^$"}))
+
+xRegexp = xDialog.getChild("regexp")
+if get_state_as_dict(xRegexp)['Selected'] == 'false':
+xRegexp.executeAction("CLICK", tuple())
+self.assertEqual("true", get_state_as_dict(xRegexp)['Selected'])
+
+xSelection = xDialog.getChild("selection")
+if get_state_as_dict(xSelection)['Selected'] == 'false':
+xSelection.executeAction("CLICK", tuple())
+self.assertEqual("true", get_state_as_dict(xSelection)['Selected'])
+
+xSearchall = xDialog.getChild("searchall")
+with self.ui_test.execute_dialog_through_action(
+xSearchall, "CLICK", event_name = "ModelessDialogVisible", 
close_button="close") as dialog:
+# Without the fix in place, this test would have failed with
+# AssertionError: 13 != 0
+self.assertEqual(13, 
len(dialog.getChild("results").getChildren()))
+
+xCloseBtn = xDialog.getChild("close")
+self.ui_test.close_dialog_through_button(xCloseBtn)
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:

Re: How to create a lockedCanvas in MSWord?

[Miklos Vajna]

Hi Regina,

On Fri, Jul 30, 2021 at 01:12:26PM +0200, Regina Henschel 
 wrote:
> The lockedCanvas can have child element GvmlGraphicObjectFrame in addition.
> That is TableShape, ChartShape or OLE2Shape, I think. So if someone has a
> test document for that, I could test whether it really works and write a
> unittest with it.

I'm not sure the UI allows table shapes, Word 2007 turns a copy
PowerPoint drawingML table in native table.  Charts are also turned into
native Word charts.  I didn't test, but I assume that OLE2 embedding
would be similar to charts.

So given that UI does not allow creating these, I would not bother about
them too much.

Regards,

Miklos

[Libreoffice-commits] core.git: download.lst external/boost solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 download.lst|4 
 external/boost/0001-Fix-include-inside-boost-namespace.patch.2  |   33 
++
 external/boost/0001-Fix-usage-of-deprecated-Boost.Bind-features.patch.2 |   48 
--
 external/boost/UnpackedTarball_boost.mk |4 
 external/boost/boost_1_63_0.undef.warning.patch.1   |8 
-
 solenv/flatpak-manifest.in  |6 
-
 6 files changed, 44 insertions(+), 59 deletions(-)

New commits:
commit 1f6851c6f6d6fee67c56dd4e6e6013ba000eaf84
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 07:44:53 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 09:15:00 2021 +0200

Upgrade external/boost to latest Boost 1.76.0

*   has been 
generated
(on Fedora 34) with

> $ wget 
https://boostorg.jfrog.io/native/main/release/1.76.0/source/boost_1_76_0.tar.bz2
> $ printf 
'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41 
boost_1_76_0.tar.bz2' | sha256sum -c # cf. 

> boost_1_76_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_76_0.tar.bz2
> Unpacking boost_1_76_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_76_0.tar.xz ...
> Cleaning up ...
> adfa0ca971c56006a8304b6146d1382e6369815d568f6e6a7440fe29995d51b8  
boost_1_76_0.tar.xz
> Done.

*  external/boost/0001-Fix-include-inside-boost-namespace.patch.2 is 
necessary
to fix

> checking for boost/math/constants/constants.hpp... no
> configure: error: Required boost headers not found.
> make[1]: *** [external/libzmf/ExternalProject_libzmf.mk:28: 
workdir/ExternalProject/libzmf/build] Error 1

with recent libstdc++ 12 trunk (presumably since


"libstdc++: Reduce header dependencies on  and ", and with 
other
standard libraries  was likely already included indirectly 
earlier, so
the include nested in namespace boost::math::tools::meta_programming in the
middle of workdir/UnpackedTarball/boost/boost/math/tools/mp.hpp didn't cause
harm).

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

diff --git a/download.lst b/download.lst
index 618f9f0738e6..f6d3eddc8586 100644
--- a/download.lst
+++ b/download.lst
@@ -10,8 +10,8 @@ export APR_TARBALL := apr-1.5.2.tar.gz
 export APR_UTIL_SHA256SUM := 
976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
 export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
 # please repack the tarball using external/boost/repack_tarball.sh
-export BOOST_SHA256SUM := 
cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b
-export BOOST_TARBALL := boost_1_75_0.tar.xz
+export BOOST_SHA256SUM := 
adfa0ca971c56006a8304b6146d1382e6369815d568f6e6a7440fe29995d51b8
+export BOOST_TARBALL := boost_1_76_0.tar.xz
 export BOX2D_SHA256SUM := 
58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
 export BOX2D_TARBALL := box2d-2.3.1.tar.gz
 export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91
diff --git a/external/boost/0001-Fix-include-inside-boost-namespace.patch.2 
b/external/boost/0001-Fix-include-inside-boost-namespace.patch.2
new file mode 100644
index ..ce123dbb4453
--- /dev/null
+++ b/external/boost/0001-Fix-include-inside-boost-namespace.patch.2
@@ -0,0 +1,33 @@
+From 1ec5c98d80de97f9e962c5627e1a0e6096099894 Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer 
+Date: Wed, 28 Jul 2021 19:56:31 +0200
+Subject: [PATCH] Fix #include inside boost namespace
+
+The existing code fails to build if  was not already included.
+---
+ include/boost/math/tools/mp.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/boost/math/tools/mp.hpp b/include/boost/math/tools/mp.hpp
+index 35565646f..dc8440988 100644
+--- a/include/boost/math/tools/mp.hpp
 b/include/boost/math/tools/mp.hpp
+@@ -13,6 +13,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ namespace boost { namespace math { namespace tools { namespace 
meta_programming {
+ 
+@@ -338,7 +339,6 @@ using mp_remove_if_q = mp_remove_if;
+ // Index sequence
+ // Use C++14 index sequence if available
+ #if defined(__cpp_lib_integer_sequence) && (__cpp_lib_integer_sequence >= 
201304)
+-#include 
+ template
+ using index_sequence = std::index_sequence;
+ 
+-- 
+2.31.1
+
diff --git 
a/external/boost/0001-Fix-usage-of-deprecated-Boost.Bind-features.patch.2 
b/external/boost/0001-Fix-usage-of-deprecated-Boost.Bind-features.patch.2
deleted file mode 100644
index 583a9d905214..
--- 

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

[panoskorovesis (via logerrit)]

 include/vcl/filter/SvmWriter.hxx|1 +
 vcl/source/filter/svm/SvmWriter.cxx |   22 ++
 2 files changed, 23 insertions(+)

New commits:
commit d2d22b506c14176b01e09899bcbb1975f292a1c7
Author: panoskorovesis 
AuthorDate: Wed Aug 4 16:18:06 2021 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Aug 10 09:50:18 2021 +0200

Add Handler for BmpExScalePart Write

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

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

diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 9bf3a3f50bc6..c57002e0a5d7 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -61,6 +61,7 @@ public:
 void BmpScalePartHandler(MetaBmpScalePartAction* pAction);
 void BmpExHandler(MetaBmpExAction* pAction);
 void BmpExScaleHandler(MetaBmpExScaleAction* pAction);
+void BmpExScalePartHandler(MetaBmpExScalePartAction* pAction);
 void OverlineColorHandler(MetaOverlineColorAction* pAction);
 void TextAlignHandler(MetaTextAlignAction* pAction);
 void MapModeHandler(MetaMapModeAction* pAction);
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index d0e72957ff0a..bd4557c0c653 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -235,6 +235,13 @@ void SvmWriter::MetaActionHandler(MetaAction* pAction, 
ImplMetaWriteData* pData)
 }
 break;
 
+case MetaActionType::BMPEXSCALEPART:
+{
+auto* pMetaAction = 
static_cast(pAction);
+BmpExScalePartHandler(pMetaAction);
+}
+break;
+
 case MetaActionType::OVERLINECOLOR:
 {
 auto* pMetaAction = static_cast(pAction);
@@ -650,6 +657,21 @@ void SvmWriter::BmpExScaleHandler(MetaBmpExScaleAction* 
pAction)
 }
 }
 
+void SvmWriter::BmpExScalePartHandler(MetaBmpExScalePartAction* pAction)
+{
+if (!pAction->GetBitmapEx().GetBitmap().IsEmpty())
+{
+mrStream.WriteUInt16(static_cast(pAction->GetType()));
+VersionCompatWrite aCompat(mrStream, 1);
+WriteDIBBitmapEx(pAction->GetBitmapEx(), mrStream);
+TypeSerializer aSerializer(mrStream);
+aSerializer.writePoint(pAction->GetDestPoint());
+aSerializer.writeSize(pAction->GetDestSize());
+aSerializer.writePoint(pAction->GetSrcPoint());
+aSerializer.writeSize(pAction->GetSrcSize());
+}
+}
+
 void SvmWriter::OverlineColorHandler(MetaOverlineColorAction* pAction)
 {
 mrStream.WriteUInt16(static_cast(pAction->GetType()));

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

[Mike Kaganski (via logerrit)]

 include/vcl/opengl/OpenGLContext.hxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 3f40147a1cf1a76d69a491989f2ef87b150ec7fa
Author: Mike Kaganski 
AuthorDate: Tue Aug 10 09:21:06 2021 +0200
Commit: Mike Kaganski 
CommitDate: Tue Aug 10 10:27:59 2021 +0200

Delete copy ctors/assignments for DLLEXPORT class

Same as ee405fb2ef36337851801f1bd34411c606d55988 for
GraphicHelper, but this time for OpenGLContext.

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

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 3c48d3687571..428df1266042 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -46,6 +46,14 @@ protected:
 public:
 static rtl::Reference Create();
 virtual ~OpenGLContext();
+
+// Avoid implicitly defined copy constructors/assignments for the 
DLLPUBLIC class (they may
+// require forward-declared classes used internally to be defined in 
places using OpenGLContext)
+OpenGLContext(const OpenGLContext&) = delete;
+OpenGLContext(OpenGLContext&&) = delete;
+OpenGLContext& operator=(const OpenGLContext&) = delete;
+OpenGLContext& operator=(OpenGLContext&&) = delete;
+
 void acquire() { mnRefCount++; }
 void release() { if ( --mnRefCount == 0 ) delete this; }
 void dispose();

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-2-0' - source/ast source/bg source/da source/de source/en-GB source/es source/et source/eu source/fi source/fr source/fy source/gl source/

[Christian Lohmaier (via logerrit)]

 source/ast/helpcontent2/source/text/scalc/01.po|4 
 source/ast/helpcontent2/source/text/swriter/01.po  |6 
 source/ast/sw/messages.po  |7 
 source/bg/svtools/messages.po  |8 
 source/da/helpcontent2/source/text/sbasic/shared/03.po |6 
 source/de/helpcontent2/source/text/shared/optionen.po  |   76 -
 source/de/helpcontent2/source/text/swriter/01.po   |   96 -
 source/en-GB/cui/messages.po   |   74 -
 source/en-GB/dictionaries/mn_MN.po |   12 
 source/en-GB/extras/source/gallery/share.po|8 
 source/en-GB/framework/messages.po |6 
 source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po   |   64 
 source/en-GB/sc/messages.po|   36 
 source/en-GB/scp2/source/ooo.po|8 
 source/en-GB/sd/messages.po|   48 
 source/en-GB/sfx2/classification.po|   36 
 source/en-GB/sfx2/messages.po  |8 
 source/en-GB/starmath/messages.po  |   22 
 source/en-GB/svtools/messages.po   |   18 
 source/en-GB/svx/messages.po   |  146 +-
 source/en-GB/uui/messages.po   |   44 
 source/en-GB/vcl/messages.po   |   16 
 source/es/cui/messages.po  |   14 
 source/es/filter/messages.po   |6 
 source/es/helpcontent2/source/text/sbasic/shared.po|8 
 source/es/helpcontent2/source/text/sbasic/shared/03.po |   26 
 source/es/helpcontent2/source/text/scalc/01.po |   44 
 source/es/helpcontent2/source/text/sdatabase.po|8 
 source/es/helpcontent2/source/text/shared/01.po|   10 
 source/es/helpcontent2/source/text/shared/autokorr.po  |8 
 source/es/helpcontent2/source/text/shared/guide.po |   20 
 source/es/helpcontent2/source/text/simpress/01.po  |6 
 source/es/helpcontent2/source/text/swriter/01.po   |8 
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po  |   26 
 source/es/svx/messages.po  |   29 
 source/es/sw/messages.po   |   42 
 source/et/basctl/messages.po   |   18 
 source/et/chart2/messages.po   |  116 -
 source/et/cui/messages.po  |  298 ++--
 source/et/dbaccess/messages.po |6 
 source/et/desktop/messages.po  |   16 
 source/et/editeng/messages.po  |   16 
 source/et/extensions/messages.po   |   14 
 source/et/filter/messages.po   |   20 
 source/et/helpcontent2/source/text/scalc.po|   14 
 source/et/helpcontent2/source/text/scalc/01.po |   42 
 source/et/helpcontent2/source/text/sdatabase.po|  134 -
 source/et/helpcontent2/source/text/sdraw.po|   28 
 source/et/helpcontent2/source/text/sdraw/00.po |   16 
 source/et/helpcontent2/source/text/sdraw/guide.po  |   10 
 source/et/helpcontent2/source/text/shared.po   |   36 
 source/et/helpcontent2/source/text/shared/01.po|  206 +-
 source/et/helpcontent2/source/text/shared/guide.po |4 
 source/et/helpcontent2/source/text/simpress.po |   56 
 source/et/helpcontent2/source/text/simpress/00.po  |   20 
 source/et/helpcontent2/source/text/simpress/02.po  |   14 
 source/et/helpcontent2/source/text/simpress/04.po  |   18 
 source/et/helpcontent2/source/text/simpress/guide.po   |   50 
 source/et/helpcontent2/source/text/smath.po|8 
 source/et/helpcontent2/source/text/swriter.po  |   40 
 source/et/helpcontent2/source/text/swriter/guide.po|   18 
 source/et/officecfg/registry/data/org/openoffice/Office.po |   16 
 source/et/officecfg/registry/data/org/openoffice/Office/UI.po  |  140 -
 source/et/readlicense_oo/docs.po   |   16 
 source/et/sc/messages.po   |  148 +-
 source/et/scp2/source/ooo.po  

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

[Mert Tumer (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 81055959e06848c917c4df1e4f19e1e5c6e70684
Author: Mert Tumer 
AuthorDate: Fri Aug 6 12:42:16 2021 +0300
Commit: Mert Tumer 
CommitDate: Tue Aug 10 12:27:54 2021 +0200

lok: Avoid redundant call to UpdateConfigurations

We call doc_setView each time we send an event to LOK such as keystroke
and SidebarController::notifyContextChange event is triggered after that
UpdateConfigurations() call causes layout reallocating for whole sidebar
and we end up keep doing it. It takes significant amount of cpu time for
lok case for no reason.

Signed-off-by: Mert Tumer 
Change-Id: I8f456156af841fdeaba1934498863a07a7d4554e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120112
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit b606764ce2a042f2a38c98820d7236661149d20c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120138
Tested-by: Jenkins

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index b81080c546cd..fff93887c3a7 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -355,7 +355,8 @@ void SAL_CALL SidebarController::notifyContextChangeEvent 
(const css::ui::Contex
  // calling with held
  // solarmutex
 // TODO: this call is redundant but mandatory for unit test to update 
context on document loading
-UpdateConfigurations();
+if (!comphelper::LibreOfficeKit::isActive())
+UpdateConfigurations();
 }
 }
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-0' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4246 ++--
 1 file changed, 2139 insertions(+), 2107 deletions(-)

New commits:
commit 2152e8941cf26c394792ba7bd972b4eec5b3c1ab
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 12:42:56 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 12:45:12 2021 +0200

update credits

Change-Id: Iad0175ccc7a1ee903812f34bcacb86e3f90e58b3
(cherry picked from commit 55537c9a62f366230843c1727b0643a06b1a)
(cherry picked from commit 2e2fa3ca1cc652d296a06f08748b33ca50b25d66)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 2ba37f5aedc4..4cf5c381c1f6 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.3.2$Linux_X86_64
 
LibreOffice_project/47f78053abe362b9384784d31a6e56f8511eb1c12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   512
+   531
501
48588
-   26450
+   27360
true
true

@@ -16,9 +16,9 @@
  3577
  3434
  501
- 512
+ 531
  49087
- 26959
+ 27889
  0
  0
  false
@@ -95,7 +95,7 @@


true
-   10251881
+   10252920

true
false
@@ -162,7 +162,7 @@
  
   

-   
+   
 


@@ -340,19 +340,19 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -418,24 +418,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1074,7 +1074,7 @@


 Credits
-1686 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-07-16 16:03:49.
+1690 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-08-06 11:42:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1082,7 +1082,7 @@
  
  
  
- 
+ 
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
@@ -1090,13 +1090,13 @@
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
   
   
-   Caolán 
McNamaraCommits: 31226Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4246 ++--
 1 file changed, 2139 insertions(+), 2107 deletions(-)

New commits:
commit 2e2fa3ca1cc652d296a06f08748b33ca50b25d66
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 12:42:56 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 12:44:31 2021 +0200

update credits

Change-Id: Iad0175ccc7a1ee903812f34bcacb86e3f90e58b3
(cherry picked from commit 55537c9a62f366230843c1727b0643a06b1a)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 2ba37f5aedc4..4cf5c381c1f6 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.3.2$Linux_X86_64
 
LibreOffice_project/47f78053abe362b9384784d31a6e56f8511eb1c12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   512
+   531
501
48588
-   26450
+   27360
true
true

@@ -16,9 +16,9 @@
  3577
  3434
  501
- 512
+ 531
  49087
- 26959
+ 27889
  0
  0
  false
@@ -95,7 +95,7 @@


true
-   10251881
+   10252920

true
false
@@ -162,7 +162,7 @@
  
   

-   
+   
 


@@ -340,19 +340,19 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -418,24 +418,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1074,7 +1074,7 @@


 Credits
-1686 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-07-16 16:03:49.
+1690 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-08-06 11:42:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1082,7 +1082,7 @@
  
  
  
- 
+ 
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
@@ -1090,13 +1090,13 @@
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
   
   
-   Caolán 
McNamaraCommits: 31226Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 31314Joined: 
2000-10-10
   
   
Oliver 
BolteCommits: 

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/dialog/uiregionsw.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0188896ffb39a40e9db02b7e1908e601565e98aa
Author: Caolán McNamara 
AuthorDate: Tue Aug 3 11:19:46 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 13:35:58 2021 +0200

tdf#143626 "protect" always shown checked for sections linked to file

Change-Id: I8a403a25ae5c5e3b6183ba559b0224f2886eb925
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119861
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit c99b55cbcd98ca6c96c901bc7c1129814cfac4ab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120151
Reviewed-by: Xisco Fauli 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sw/source/ui/dialog/uiregionsw.cxx 
b/sw/source/ui/dialog/uiregionsw.cxx
index fd0d32801caa..697e165642a0 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -954,7 +954,6 @@ IMPL_LINK(SwEditRegionDlg, UseFileHdl, weld::Toggleable&, 
rButton, void)
 if( bFile )
 {
 m_xProtectCB->set_state(TRISTATE_TRUE);
-ChangeProtectHdl(*m_xProtectCB);
 m_xFileNameED->grab_focus();
 
 }

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-2' - source/ast source/bg source/da source/de source/en-GB source/es source/et source/eu source/fi source/fr source/fy source/gl source/gu

[Christian Lohmaier (via logerrit)]

 source/ast/helpcontent2/source/text/scalc/01.po|4 
 source/ast/helpcontent2/source/text/swriter/01.po  |6 
 source/ast/sw/messages.po  |7 
 source/bg/svtools/messages.po  |8 
 source/da/helpcontent2/source/text/sbasic/shared/03.po |6 
 source/de/helpcontent2/source/text/shared/optionen.po  |   76 -
 source/de/helpcontent2/source/text/swriter/01.po   |   96 -
 source/en-GB/cui/messages.po   |   74 -
 source/en-GB/dictionaries/mn_MN.po |   12 
 source/en-GB/extras/source/gallery/share.po|8 
 source/en-GB/framework/messages.po |6 
 source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po   |   64 
 source/en-GB/sc/messages.po|   36 
 source/en-GB/scp2/source/ooo.po|8 
 source/en-GB/sd/messages.po|   48 
 source/en-GB/sfx2/classification.po|   36 
 source/en-GB/sfx2/messages.po  |8 
 source/en-GB/starmath/messages.po  |   22 
 source/en-GB/svtools/messages.po   |   18 
 source/en-GB/svx/messages.po   |  146 +-
 source/en-GB/uui/messages.po   |   44 
 source/en-GB/vcl/messages.po   |   16 
 source/es/cui/messages.po  |   14 
 source/es/filter/messages.po   |6 
 source/es/helpcontent2/source/text/sbasic/shared.po|8 
 source/es/helpcontent2/source/text/sbasic/shared/03.po |   26 
 source/es/helpcontent2/source/text/scalc/01.po |   44 
 source/es/helpcontent2/source/text/sdatabase.po|8 
 source/es/helpcontent2/source/text/shared/01.po|   10 
 source/es/helpcontent2/source/text/shared/autokorr.po  |8 
 source/es/helpcontent2/source/text/shared/guide.po |   20 
 source/es/helpcontent2/source/text/simpress/01.po  |6 
 source/es/helpcontent2/source/text/swriter/01.po   |8 
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po  |   26 
 source/es/svx/messages.po  |   29 
 source/es/sw/messages.po   |   42 
 source/et/basctl/messages.po   |   18 
 source/et/chart2/messages.po   |  116 -
 source/et/cui/messages.po  |  298 ++--
 source/et/dbaccess/messages.po |6 
 source/et/desktop/messages.po  |   16 
 source/et/editeng/messages.po  |   16 
 source/et/extensions/messages.po   |   14 
 source/et/filter/messages.po   |   20 
 source/et/helpcontent2/source/text/scalc.po|   14 
 source/et/helpcontent2/source/text/scalc/01.po |   42 
 source/et/helpcontent2/source/text/sdatabase.po|  134 -
 source/et/helpcontent2/source/text/sdraw.po|   28 
 source/et/helpcontent2/source/text/sdraw/00.po |   16 
 source/et/helpcontent2/source/text/sdraw/guide.po  |   10 
 source/et/helpcontent2/source/text/shared.po   |   36 
 source/et/helpcontent2/source/text/shared/01.po|  206 +-
 source/et/helpcontent2/source/text/shared/guide.po |4 
 source/et/helpcontent2/source/text/simpress.po |   56 
 source/et/helpcontent2/source/text/simpress/00.po  |   20 
 source/et/helpcontent2/source/text/simpress/02.po  |   14 
 source/et/helpcontent2/source/text/simpress/04.po  |   18 
 source/et/helpcontent2/source/text/simpress/guide.po   |   50 
 source/et/helpcontent2/source/text/smath.po|8 
 source/et/helpcontent2/source/text/swriter.po  |   40 
 source/et/helpcontent2/source/text/swriter/guide.po|   18 
 source/et/officecfg/registry/data/org/openoffice/Office.po |   16 
 source/et/officecfg/registry/data/org/openoffice/Office/UI.po  |  140 -
 source/et/readlicense_oo/docs.po   |   16 
 source/et/sc/messages.po   |  148 +-
 source/et/scp2/source/ooo.po  

[Libreoffice-commits] translations.git: source/ast source/bg source/da source/de source/en-GB source/es source/et source/eu source/fi source/fr source/fy source/gl source/gug source/hu source/id sourc

[Christian Lohmaier (via logerrit)]

 source/ast/helpcontent2/source/text/scalc/01.po|4 
 source/ast/helpcontent2/source/text/swriter/01.po  |6 
 source/ast/sw/messages.po  |7 
 source/bg/svtools/messages.po  |8 
 source/da/helpcontent2/source/text/sbasic/shared/03.po |6 
 source/de/helpcontent2/source/text/shared/optionen.po  |   76 -
 source/de/helpcontent2/source/text/swriter/01.po   |   96 -
 source/en-GB/cui/messages.po   |   74 -
 source/en-GB/dictionaries/mn_MN.po |   12 
 source/en-GB/extras/source/gallery/share.po|8 
 source/en-GB/framework/messages.po |6 
 source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po   |   64 
 source/en-GB/sc/messages.po|   36 
 source/en-GB/scp2/source/ooo.po|8 
 source/en-GB/sd/messages.po|   48 
 source/en-GB/sfx2/classification.po|   36 
 source/en-GB/sfx2/messages.po  |8 
 source/en-GB/starmath/messages.po  |   22 
 source/en-GB/svtools/messages.po   |   18 
 source/en-GB/svx/messages.po   |  146 +-
 source/en-GB/uui/messages.po   |   44 
 source/en-GB/vcl/messages.po   |   16 
 source/es/cui/messages.po  |   14 
 source/es/filter/messages.po   |6 
 source/es/helpcontent2/source/text/sbasic/shared.po|8 
 source/es/helpcontent2/source/text/sbasic/shared/03.po |   26 
 source/es/helpcontent2/source/text/scalc/01.po |   44 
 source/es/helpcontent2/source/text/sdatabase.po|8 
 source/es/helpcontent2/source/text/shared/01.po|   10 
 source/es/helpcontent2/source/text/shared/autokorr.po  |8 
 source/es/helpcontent2/source/text/shared/guide.po |   20 
 source/es/helpcontent2/source/text/simpress/01.po  |6 
 source/es/helpcontent2/source/text/swriter/01.po   |8 
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po  |   26 
 source/es/svx/messages.po  |   29 
 source/es/sw/messages.po   |   42 
 source/et/basctl/messages.po   |   18 
 source/et/chart2/messages.po   |  116 -
 source/et/cui/messages.po  |  298 ++--
 source/et/dbaccess/messages.po |6 
 source/et/desktop/messages.po  |   16 
 source/et/editeng/messages.po  |   16 
 source/et/extensions/messages.po   |   14 
 source/et/filter/messages.po   |   20 
 source/et/helpcontent2/source/text/scalc.po|   14 
 source/et/helpcontent2/source/text/scalc/01.po |   42 
 source/et/helpcontent2/source/text/sdatabase.po|  134 -
 source/et/helpcontent2/source/text/sdraw.po|   28 
 source/et/helpcontent2/source/text/sdraw/00.po |   16 
 source/et/helpcontent2/source/text/sdraw/guide.po  |   10 
 source/et/helpcontent2/source/text/shared.po   |   36 
 source/et/helpcontent2/source/text/shared/01.po|  206 +-
 source/et/helpcontent2/source/text/shared/guide.po |4 
 source/et/helpcontent2/source/text/simpress.po |   56 
 source/et/helpcontent2/source/text/simpress/00.po  |   20 
 source/et/helpcontent2/source/text/simpress/02.po  |   14 
 source/et/helpcontent2/source/text/simpress/04.po  |   18 
 source/et/helpcontent2/source/text/simpress/guide.po   |   50 
 source/et/helpcontent2/source/text/smath.po|8 
 source/et/helpcontent2/source/text/swriter.po  |   40 
 source/et/helpcontent2/source/text/swriter/guide.po|   18 
 source/et/officecfg/registry/data/org/openoffice/Office.po |   16 
 source/et/officecfg/registry/data/org/openoffice/Office/UI.po  |  140 -
 source/et/readlicense_oo/docs.po   |   16 
 source/et/sc/messages.po   |  148 +-
 source/et/scp2/source/ooo.po  

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 7e0cb994acf62387a4ac916ee82773af3cdf9ca7
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 12:02:50 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Aug 10 12:02:50 2021 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-2-0'
  to 51cf809cfdc1bd1d9038711dea8f95c5bb20eff9
  - update translations for 7.2.0 rc3 / master

and force-fix errors using pocheck

Change-Id: Ifd8f486c7c40d1b9f5e78313bc94496f86698681
(cherry picked from commit 2ec580d39ac7950b584fde730d22fa4f09dd8399)
(cherry picked from commit 636c5cce84b63bcec08aefeecfe37027470e1de9)

diff --git a/translations b/translations
index 43587c6ccbdb..51cf809cfdc1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 43587c6ccbdb8cff898f5f2d4d9b405a723ee107
+Subproject commit 51cf809cfdc1bd1d9038711dea8f95c5bb20eff9

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

[Andreas Heinisch (via logerrit)]

 basic/qa/vba_tests/optional_paramters.vb |   10 +++
 basic/qa/vba_tests/typename.vb   |   10 +++
 basic/source/classes/image.cxx   |   33 ---
 basic/source/comp/symtbl.cxx |   43 ---
 basic/source/inc/image.hxx   |2 -
 basic/source/runtime/runtime.cxx |   20 --
 6 files changed, 101 insertions(+), 17 deletions(-)

New commits:
commit 3bcfb1aac1f43f16c579486264103ebd4f3f829b
Author: Andreas Heinisch 
AuthorDate: Tue Aug 3 20:56:22 2021 +0200
Commit: Andreas Heinisch 
CommitDate: Tue Aug 10 12:23:19 2021 +0200

tdf#143707 - Change strategy to support suffix type characters

In order to support the correct data type of numeric constants,
booleans, and default values for strings, the strategy to transport the
data type character to the runtime has been changed.

The type character will be added after the literal and the string
termination symbol in order to keep compatibility. This allows to
retrieve the correct type in StepLOADNC and in StepPARAM.

Any legacy written images are still possible to process, since if there
is a suffix type character where the data type character was directly
written after the numeric constant, it will be processed in StepLOADNC.

Without this fix, an optional parameter of type Variant, would still
include the suffixe type character, and will not be converted to the
correct type in StepPARAM.

Change-Id: I86c8192c6dc28457053fa7b23a073420e45407b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119945
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 

diff --git a/basic/qa/vba_tests/optional_paramters.vb 
b/basic/qa/vba_tests/optional_paramters.vb
index 9001ab952de9..d47854d2fb69 100644
--- a/basic/qa/vba_tests/optional_paramters.vb
+++ b/basic/qa/vba_tests/optional_paramters.vb
@@ -22,6 +22,12 @@ End Function
 Sub verify_testOptionalsVba()
 On Error GoTo errorHandler
 
+' tdf#143707 - check correct initialization of default value for optionals
+' Without the fix in place, this test would have failed with
+' - Expected: 123
+' - Actual  : 123%
+TestUtil.AssertEqual(TestOptVariantInit(), 123, "TestOptVariantInit()")
+
 ' optionals with variant datatypes
 TestUtil.AssertEqual(TestOptVariant(), 123, "TestOptVariant()")
 TestUtil.AssertEqual(TestOptVariant(123), 246, "TestOptVariant(123)")
@@ -113,6 +119,10 @@ errorHandler:
 TestUtil.ReportErrorHandler("verify_testOptionalsVba", Err, Error$, Erl)
 End Sub
 
+Function TestOptVariantInit(Optional A As Variant = 123)
+TestOptVariantInit = A
+End Function
+
 Function TestOptVariant(Optional A, Optional B As Variant = 123)
 TestOptVariant = OptNumberSum(IsMissing(A), A, IsMissing(B), B)
 End Function
diff --git a/basic/qa/vba_tests/typename.vb b/basic/qa/vba_tests/typename.vb
index 4442cba55e98..98bfd58feda4 100644
--- a/basic/qa/vba_tests/typename.vb
+++ b/basic/qa/vba_tests/typename.vb
@@ -53,7 +53,17 @@ Sub verify_testTypeName()
 TestUtil.AssertEqual(TypeName(TestCurrSign),   "Currency", 
"TypeName(TestCurrSign)")
 TestUtil.AssertEqual(TypeName(TestStrSign),"String",   
"TypeName(TestStrSign)")
 
+' tdf#143707 - check correct initialization of default value for optionals
+' Without the fix in place, this test would have failed with
+' - Expected: Integer
+' - Actual  : String
+TestUtil.AssertEqual(TestOptVariantInit(), "Integer", 
"TestOptVariantInit()")
+
 Exit Sub
 errorHandler:
 TestUtil.ReportErrorHandler("verify_testTypeName", Err, Error$, Erl)
 End Sub
+
+Function TestOptVariantInit(Optional A As Variant = 123)
+TestOptVariantInit = TypeName(A)
+End Function
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 69e30bb11954..73d65e98eab9 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -647,18 +648,18 @@ void SbiImage::AddEnum(SbxObject* pObject) // Register 
enum type
 }
 
 // Note: IDs start with 1
-OUString SbiImage::GetString( short nId ) const
+OUString SbiImage::GetString( short nId, SbxDataType *eType ) const
 {
 if( nId && nId <= short(mvStringOffsets.size()) )
 {
 sal_uInt32 nOff = mvStringOffsets[ nId - 1 ];
 sal_Unicode* pStr = pStrings.get() + nOff;
 
+sal_uInt32 nNextOff = (nId < short(mvStringOffsets.size())) ? 
mvStringOffsets[ nId ] : nStringOff;
+sal_uInt32 nLen = nNextOff - nOff - 1;
 // #i42467: Special treatment for vbNullChar
-if( *pStr == 0 )
+if (*pStr == 0)
 {
-sal_uInt32 nNextOff = (nId < short(mvStringOffsets.size())) ? 
mvStringOffsets[ nId ] : nStringOff;
-sal_uInt32 nLen = nNextOff - nOff - 1;
 if( nLen == 1 )
 {
 

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4246 ++--
 1 file changed, 2139 insertions(+), 2107 deletions(-)

New commits:
commit 55537c9a62f366230843c1727b0643a06b1a
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 12:42:56 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 12:42:56 2021 +0200

update credits

Change-Id: Iad0175ccc7a1ee903812f34bcacb86e3f90e58b3

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 2ba37f5aedc4..4cf5c381c1f6 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.3.2$Linux_X86_64
 
LibreOffice_project/47f78053abe362b9384784d31a6e56f8511eb1c12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   512
+   531
501
48588
-   26450
+   27360
true
true

@@ -16,9 +16,9 @@
  3577
  3434
  501
- 512
+ 531
  49087
- 26959
+ 27889
  0
  0
  false
@@ -95,7 +95,7 @@


true
-   10251881
+   10252920

true
false
@@ -162,7 +162,7 @@
  
   

-   
+   
 


@@ -340,19 +340,19 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -418,24 +418,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1074,7 +1074,7 @@


 Credits
-1686 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-07-16 16:03:49.
+1690 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-08-06 11:42:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1082,7 +1082,7 @@
  
  
  
- 
+ 
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
@@ -1090,13 +1090,13 @@
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
   
   
-   Caolán 
McNamaraCommits: 31226Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 31314Joined: 
2000-10-10
   
   
Oliver 
BolteCommits: 31008Joined: 
2000-09-19
   
  
- 
+ 
   

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 51d8845959c75f8c8a3795e7601f947841d0fa60
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 12:01:14 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Aug 10 12:01:14 2021 +0200

Update git submodules

* Update translations from branch 'master'
  to 2ec580d39ac7950b584fde730d22fa4f09dd8399
  - update translations for 7.2.0 rc3 / master

and force-fix errors using pocheck

Change-Id: Ifd8f486c7c40d1b9f5e78313bc94496f86698681

diff --git a/translations b/translations
index 879d0acff38f..2ec580d39ac7 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 879d0acff38f25a4219a9da35bda3ead3f8b4b63
+Subproject commit 2ec580d39ac7950b584fde730d22fa4f09dd8399

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit d64453c2610c472f19f5758d49195a5faecd6b7b
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 12:02:00 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Aug 10 12:02:00 2021 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-2'
  to 636c5cce84b63bcec08aefeecfe37027470e1de9
  - update translations for 7.2.0 rc3 / master

and force-fix errors using pocheck

Change-Id: Ifd8f486c7c40d1b9f5e78313bc94496f86698681
(cherry picked from commit 2ec580d39ac7950b584fde730d22fa4f09dd8399)

diff --git a/translations b/translations
index 084abfc185b0..636c5cce84b6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 084abfc185b00eb2c42e84c354d4d005f8b9fb3f
+Subproject commit 636c5cce84b63bcec08aefeecfe37027470e1de9

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

[Noel Grandin (via logerrit)]

 comphelper/source/property/propertysetinfo.cxx |  137 +++--
 include/comphelper/propertysetinfo.hxx |   17 +--
 2 files changed, 52 insertions(+), 102 deletions(-)

New commits:
commit d5c8684c05e33e87033d595c98fb50acd42d56a8
Author: Noel Grandin 
AuthorDate: Mon Aug 9 18:35:35 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 12:17:36 2021 +0200

flatten PropertySetInfo a little

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

diff --git a/comphelper/source/property/propertysetinfo.cxx 
b/comphelper/source/property/propertysetinfo.cxx
index fd68b529392a..f21afe3951cd 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -29,35 +29,26 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 
-namespace comphelper
+void PropertySetInfo::addImpl(PropertyMapEntry const * pMap) noexcept
 {
-class PropertyMapImpl final
-{
-public:
-PropertyMapImpl() noexcept;
-
-void add(PropertyMapEntry const * pMap) noexcept;
-void remove( const OUString& aName ) noexcept;
-
-std::vector< Property > const & getProperties() noexcept;
+while (!pMap->maName.isEmpty())
+{
+// check for duplicates
+assert(maPropertyMap.find(pMap->maName) == maPropertyMap.end());
 
-const PropertyMap& getPropertyMap() const noexcept { return maPropertyMap;}
+maPropertyMap[pMap->maName] = pMap;
 
-/// @throws UnknownPropertyException
-Property getPropertyByName( const OUString& aName );
-bool hasPropertyByName( const OUString& aName ) noexcept;
+maProperties.clear();
 
-private:
-PropertyMap maPropertyMap;
-std::vector< Property > maProperties;
-};
+++pMap;
+}
 }
 
-PropertyMapImpl::PropertyMapImpl() noexcept
+PropertySetInfo::PropertySetInfo() noexcept
 {
 }
 
-void PropertyMapImpl::add(PropertyMapEntry const * pMap) noexcept
+PropertySetInfo::PropertySetInfo( PropertyMapEntry const * pMap ) noexcept
 {
 while (!pMap->maName.isEmpty())
 {
@@ -66,20 +57,44 @@ void PropertyMapImpl::add(PropertyMapEntry const * pMap) 
noexcept
 
 maPropertyMap[pMap->maName] = pMap;
 
-maProperties.clear();
+++pMap;
+}
+}
 
-pMap = [1];
+PropertySetInfo::PropertySetInfo(uno::Sequence const& rProps) 
noexcept
+{
+PropertyMapEntry * pEntries(new PropertyMapEntry[rProps.getLength() + 1]);
+PropertyMapEntry * pEntry([0]);
+for (auto const& it : rProps)
+{
+pEntry->maName = it.Name;
+pEntry->mnHandle = it.Handle;
+pEntry->maType = it.Type;
+pEntry->mnAttributes = it.Attributes;
+pEntry->mnMemberId = 0;
+++pEntry;
 }
+pEntry->maName = OUString();
+
+addImpl(pEntries);
+}
+
+PropertySetInfo::~PropertySetInfo() noexcept
+{
 }
 
-void PropertyMapImpl::remove( const OUString& aName ) noexcept
+void PropertySetInfo::add( PropertyMapEntry const * pMap ) noexcept
 {
-maPropertyMap.erase( aName );
+addImpl( pMap );
+}
 
+void PropertySetInfo::remove( const OUString& aName ) noexcept
+{
+maPropertyMap.erase( aName );
 maProperties.clear();
 }
 
-std::vector< Property > const & PropertyMapImpl::getProperties() noexcept
+Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties()
 {
 // maybe we have to generate the properties after
 // a change in the property map or at first call
@@ -101,12 +116,10 @@ std::vector< Property > const & 
PropertyMapImpl::getProperties() noexcept
 ++propIter;
 }
 }
-
-return maProperties;
+return comphelper::containerToSequence(maProperties);
 }
 
-
-Property PropertyMapImpl::getPropertyByName( const OUString& aName )
+Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName )
 {
 PropertyMap::iterator aIter = maPropertyMap.find( aName );
 
@@ -118,73 +131,9 @@ Property PropertyMapImpl::getPropertyByName( const 
OUString& aName )
 return Property( aName, pEntry->mnHandle, pEntry->maType, 
pEntry->mnAttributes );
 }
 
-bool PropertyMapImpl::hasPropertyByName( const OUString& aName ) noexcept
+sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& aName )
 {
 return maPropertyMap.find( aName ) != maPropertyMap.end();
 }
 
-
-PropertySetInfo::PropertySetInfo() noexcept
-: mpImpl(new PropertyMapImpl)
-{
-}
-
-PropertySetInfo::PropertySetInfo( PropertyMapEntry const * pMap ) noexcept
-: mpImpl(new PropertyMapImpl)
-{
-mpImpl->add( pMap );
-}
-
-PropertySetInfo::PropertySetInfo(uno::Sequence const& rProps) 
noexcept
-: mpImpl(new PropertyMapImpl)
-{
-PropertyMapEntry * pEntries(new PropertyMapEntry[rProps.getLength() + 1]);
-PropertyMapEntry * pEntry([0]);
-for (auto const& it : rProps)
-{
-

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

[Miklos Vajna (via logerrit)]

 drawinglayer/source/tools/primitive2dxmldump.cxx   |   36 -
 svx/qa/unit/data/slide-background.odp  |binary
 svx/qa/unit/data/slide-background.png  |binary
 svx/qa/unit/sdr.cxx|   24 ++
 svx/source/sdr/primitive2d/sdrattributecreator.cxx |8 
 5 files changed, 67 insertions(+), 1 deletion(-)

New commits:
commit cd9c016d2f7d8c00017c10d348e7b8fad5d02fa7
Author: Miklos Vajna 
AuthorDate: Tue Aug 3 13:39:20 2021 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 10 12:20:56 2021 +0200

tdf#142436 svx: fix handling of linked background images

Regression from commit 9fb7aaf570c03c8a26d763f1205fb8c890e8211a (Make
linked graphic register into LinkedManager again, 2018-04-13), the
problem was that now SvXMLImport::loadGraphicByURL() produces a Graphic
that has its type set to GraphicType::Default, but when
drawinglayer::primitive2d::createNewSdrFillGraphicAttribute() consumes
this graphic, it expects that the type is either a bitmap or a metafile.

Fix the problem by explicitly loading the image when the default-type,
origin-url-set case happens: this is rendering, so no problem to load
the URL and that will give us the expected graphic type.

This is also meant to keep the original problem fixed, since the Graphic
that is part of the doc model is unchanged.

(cherry picked from commit c88ff9298b25132fc34102230cef0263f045a523)

Conflicts:
drawinglayer/source/tools/primitive2dxmldump.cxx

Change-Id: If5bba09faa23ef35f99152d4b5d30cd9cf67ace8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120140
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120231
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx 
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index ade8cfaed89b..203f6d008d15 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -12,6 +12,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -30,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -164,6 +167,35 @@ void Primitive2dXmlDump::decomposeAndWrite(
 
 switch (nId)
 {
+case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D:
+{
+const BitmapPrimitive2D& rBitmapPrimitive2D
+= dynamic_cast(*pBasePrimitive);
+rWriter.startElement("bitmap");
+
+const BitmapEx 
aBitmapEx(VCLUnoHelper::GetBitmap(rBitmapPrimitive2D.getXBitmap()));
+const Size& rSizePixel(aBitmapEx.GetSizePixel());
+
+rWriter.attribute("height", rSizePixel.getHeight());
+rWriter.attribute("width", rSizePixel.getWidth());
+rWriter.attribute("checksum", 
OString(std::to_string(aBitmapEx.GetChecksum(;
+
+for (tools::Long y = 0; y < rSizePixel.getHeight(); y++)
+{
+rWriter.startElement("data");
+OUString aBitmapData = "";
+for (tools::Long x = 0; x < rSizePixel.getHeight(); x++)
+{
+if (x != 0)
+aBitmapData = aBitmapData + ",";
+aBitmapData = aBitmapData + aBitmapEx.GetPixelColor(x, 
y).AsRGBHexString();
+}
+rWriter.attribute("row", aBitmapData);
+rWriter.endElement();
+}
+rWriter.endElement();
+}
+break;
 case PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D:
 {
 const HiddenGeometryPrimitive2D& rHiddenGeometryPrimitive2D = 
dynamic_cast(*pBasePrimitive);
@@ -302,7 +334,9 @@ void Primitive2dXmlDump::decomposeAndWrite(
 }
 rWriter.attribute("x", aTranslate.getX());
 rWriter.attribute("y", aTranslate.getY());
-rWriter.attribute("text", 
rTextSimplePortionPrimitive2D.getText());
+OUString aText = rTextSimplePortionPrimitive2D.getText();
+// TODO share code with 
sax_fastparser::FastSaxSerializer::write().
+rWriter.attribute("text", aText.replaceAll("
", ""));
 rWriter.attribute("fontcolor", 
convertColorToString(rTextSimplePortionPrimitive2D.getFontColor()));
 
 const drawinglayer::attribute::FontAttribute& aFontAttribute = 
rTextSimplePortionPrimitive2D.getFontAttribute();
diff --git a/svx/qa/unit/data/slide-background.odp 
b/svx/qa/unit/data/slide-background.odp
new file mode 100644
index ..ea62bd63903b
Binary files /dev/null and b/svx/qa/unit/data/slide-background.odp differ

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

[Miklos Vajna (via logerrit)]

 oox/qa/unit/data/smartart-groupshape.pptx |binary
 oox/qa/unit/drawingml.cxx |   19 +++
 oox/source/drawingml/shape.cxx|   17 -
 3 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 0397077f41e5045b5f946a28cf8d6b72679a30cd
Author: Miklos Vajna 
AuthorDate: Fri Aug 6 16:56:30 2021 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 10 12:21:17 2021 +0200

tdf#132696 PPTX import: fix missing SmartArt when it's part of a group shape

Regression from commit e9986153e44d7ec6ca9c5f1373971de74dcbacda (PPTX
import: import SmartArt drawing into single GroupShape, 2019-03-14), the
problem was that oox::ppt::PPTShape::addShape() and
oox::drawingml::Shape::addShape() were not in sync.

PPTShape unconditionally maps SmartArt to shapes, while the shared Shape
class defaults to converting it to a non-editable metafile. The above
commit changed the handling of in-groupshape SmartArts to go via
Shape::addShape() instead of PPTShape::addShape(), which exposed the
underlying problem that the convert-to-metafile mechanism is currently
only working in the DOCX case.

Fix the problem by again ignoring the convert-to-metafile flag for the
PPTX import case.

This also exposed a previously hidden problem:

make -C oox -sr CppunitTest_oox_drawingml 
CPPUNIT_TEST_NAME="testGroupShapeSmartArt testTdf131082"

started to make testTdf131082 fail. The tweak in
Shape::createAndInsert() fixes the testcase failure, but likely there is
a deeper problem there, unrelated to the regression.

Change-Id: I4e1e9645eaa266d0d7560767c3c59ba9549ccdb4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120122
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 030cdbc7f8782eb196f09661bc2f116d790de9be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120145
Reviewed-by: Xisco Fauli 
(cherry picked from commit 84033de1bfe3e6951a1f563d85e40fb6d29ff3be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120149
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120252
Tested-by: Jenkins CollaboraOffice 

diff --git a/oox/qa/unit/data/smartart-groupshape.pptx 
b/oox/qa/unit/data/smartart-groupshape.pptx
new file mode 100644
index ..81dcee1e52a3
Binary files /dev/null and b/oox/qa/unit/data/smartart-groupshape.pptx differ
diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx
index c7e72d458194..e1c665e22e86 100644
--- a/oox/qa/unit/drawingml.cxx
+++ b/oox/qa/unit/drawingml.cxx
@@ -326,6 +326,25 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTableShadow)
 verify(getComponent());
 }
 
+CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testGroupShapeSmartArt)
+{
+// Given a file with a smartart inside a group shape:
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"smartart-groupshape.pptx";
+
+// When loading that file:
+load(aURL);
+
+// Then make sure that the smartart is not just an empty group shape:
+uno::Reference 
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+uno::Reference xGroup(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xSmartArt(xGroup->getByIndex(0), 
uno::UNO_QUERY);
+// Without the accompanying fix in place, this test would have failed, 
because we lost all
+// children of the group shape representing the smartart.
+CPPUNIT_ASSERT_GREATER(static_cast(0), xSmartArt->getCount());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index a9388e8a4a70..6e8ae072af56 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -295,7 +295,12 @@ void Shape::addShape(
 if( meFrameType == FRAMETYPE_DIAGRAM )
 {
 keepDiagramCompatibilityInfo();
-if( !SvtFilterOptions::Get().IsSmartArt2Shape() )
+
+// Check if this is the PPTX import, so far converting 
SmartArt to a non-editable
+// metafile is only imlemented for DOCX.
+bool bPowerPoint = 
dynamic_cast() != nullptr;
+
+if (!SvtFilterOptions::Get().IsSmartArt2Shape() && 
!bPowerPoint)
 convertSmartArtToMetafile( rFilterBase );
 }
 
@@ -964,7 +969,17 @@ Reference< XShape > const & Shape::createAndInsert(
 
 Reference< lang::XMultiServiceFactory > xServiceFact( 
rFilterBase.getModel(), UNO_QUERY_THROW );
 if ( !mxShape.is() )
+{
 mxShape.set( xServiceFact->createInstance( aServiceName ), 
UNO_QUERY_THROW );
+if (aServiceName == "com.sun.star.drawing.GroupShape")
+{
+// TODO 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4246 ++--
 1 file changed, 2139 insertions(+), 2107 deletions(-)

New commits:
commit 825060c2f3cffc6e1275e952421be33a09a777cf
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 12:42:56 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 12:43:45 2021 +0200

update credits

Change-Id: Iad0175ccc7a1ee903812f34bcacb86e3f90e58b3
(cherry picked from commit 55537c9a62f366230843c1727b0643a06b1a)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 2ba37f5aedc4..4cf5c381c1f6 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.3.2$Linux_X86_64
 
LibreOffice_project/47f78053abe362b9384784d31a6e56f8511eb1c12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   512
+   531
501
48588
-   26450
+   27360
true
true

@@ -16,9 +16,9 @@
  3577
  3434
  501
- 512
+ 531
  49087
- 26959
+ 27889
  0
  0
  false
@@ -95,7 +95,7 @@


true
-   10251881
+   10252920

true
false
@@ -162,7 +162,7 @@
  
   

-   
+   
 


@@ -340,19 +340,19 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -418,24 +418,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1074,7 +1074,7 @@


 Credits
-1686 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-07-16 16:03:49.
+1690 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2021-08-06 11:42:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1082,7 +1082,7 @@
  
  
  
- 
+ 
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
@@ -1090,13 +1090,13 @@
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
   
   
-   Caolán 
McNamaraCommits: 31226Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 31314Joined: 
2000-10-10
   
   
Oliver 
BolteCommits: 

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

[Noel Grandin (via logerrit)]

 vcl/inc/impgraph.hxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 41bca9976de53c9e013438118381a646530c5365
Author: Noel Grandin 
AuthorDate: Mon Aug 9 18:57:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 13:29:21 2021 +0200

flatten ImpGraphic a little

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

diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 142627df780d..b7697dbb7b9e 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -25,6 +25,7 @@
 #include 
 #include "graphic/Manager.hxx"
 #include "graphic/GraphicID.hxx"
+#include 
 
 struct ImpSwapInfo
 {
@@ -79,7 +80,7 @@ private:
 // cache checksum computation
 mutable BitmapChecksum   mnChecksum = 0;
 
-std::unique_ptr   mpGraphicID;
+std::optional mxGraphicID;
 GraphicExternalLink  maGraphicExternalLink;
 
 std::chrono::high_resolution_clock::time_point maLastUsed;
@@ -118,9 +119,9 @@ private:
 
 OString getUniqueID()
 {
-if (!mpGraphicID)
-mpGraphicID.reset(new GraphicID(*this));
-return mpGraphicID->getIDString();
+if (!mxGraphicID)
+mxGraphicID.emplace(*this);
+return mxGraphicID->getIDString();
 }
 
 void createSwapInfo();

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

[Noel Grandin (via logerrit)]

 vcl/inc/accel.hxx   |   12 +++---
 vcl/source/window/accel.cxx |   52 +++-
 2 files changed, 27 insertions(+), 37 deletions(-)

New commits:
commit afbade63e0cfbd4f39a3558f31049328c06ea82e
Author: Noel Grandin 
AuthorDate: Mon Aug 9 18:56:13 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 13:32:57 2021 +0200

flatten Accelerator a little

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

diff --git a/vcl/inc/accel.hxx b/vcl/inc/accel.hxx
index fc763bd58f3d..9d597f76fd47 100644
--- a/vcl/inc/accel.hxx
+++ b/vcl/inc/accel.hxx
@@ -20,12 +20,14 @@
 #pragma once
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 
-class ImplAccelData;
 class CommandEvent;
 
 class Accelerator;
@@ -40,12 +42,16 @@ public:
 boolmbEnabled;
 };
 
+typedef ::std::vector< std::unique_ptr > ImplAccelList;
+
 class Accelerator
 {
 friend class ImplAccelManager;
 
 private:
-std::unique_ptr mpData;
+typedef ::std::map< sal_uLong, ImplAccelEntry* > ImplAccelMap;
+ImplAccelMap  maKeyMap; // for keycodes, generated with a code
+ImplAccelList maIdList; // Id-List
 Link maActivateHdl;
 Link maSelectHdl;
 
@@ -54,7 +60,7 @@ private:
 bool*   mpDel;
 
 voidImplInit();
-voidImplCopyData( ImplAccelData& rAccelData );
+voidImplCopyData( const Accelerator& rAccelData );
 voidImplDeleteData();
 voidImplInsertAccel(sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode,
 bool bEnable, Accelerator* pAutoAccel);
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 14861258c352..a20c289f201a 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -19,24 +19,11 @@
 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-
-typedef ::std::map< sal_uLong, ImplAccelEntry* > ImplAccelMap;
-typedef ::std::vector< std::unique_ptr > ImplAccelList;
 
 #define ACCELENTRY_NOTFOUND (sal_uInt16(0x))
 
-class ImplAccelData
-{
-public:
-ImplAccelMap  maKeyMap; // for keycodes, generated with a code
-ImplAccelList maIdList; // Id-List
-};
-
-static sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
+static sal_uInt16 ImplAccelEntryGetIndex( const ImplAccelList* pList, 
sal_uInt16 nId,
sal_uInt16* pIndex = nullptr )
 {
 size_t  nLow;
@@ -124,17 +111,17 @@ void Accelerator::ImplInit()
 
 ImplAccelEntry* Accelerator::ImplGetAccelData( const vcl::KeyCode& rKeyCode ) 
const
 {
-ImplAccelMap::iterator it = mpData->maKeyMap.find( rKeyCode.GetFullCode() 
);
-if( it != mpData->maKeyMap.end() )
+auto it = maKeyMap.find( rKeyCode.GetFullCode() );
+if( it != maKeyMap.end() )
 return it->second;
 else
 return nullptr;
 }
 
-void Accelerator::ImplCopyData( ImplAccelData& rAccelData )
+void Accelerator::ImplCopyData( const Accelerator& rAccelData )
 {
 // copy table
-for (std::unique_ptr& i : rAccelData.maIdList)
+for (const std::unique_ptr& i : rAccelData.maIdList)
 {
 std::unique_ptr pEntry(new ImplAccelEntry( *i ));
 
@@ -147,18 +134,18 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData 
)
 else
 pEntry->mpAutoAccel = nullptr;
 
-mpData->maKeyMap.insert( std::make_pair( 
pEntry->maKeyCode.GetFullCode(), pEntry.get() ) );
-mpData->maIdList.push_back( std::move(pEntry) );
+maKeyMap.insert( std::make_pair( pEntry->maKeyCode.GetFullCode(), 
pEntry.get() ) );
+maIdList.push_back( std::move(pEntry) );
 }
 }
 
 void Accelerator::ImplDeleteData()
 {
 // delete accelerator-entries using the id-table
-for (const std::unique_ptr& pEntry : mpData->maIdList) {
+for (const std::unique_ptr& pEntry : maIdList) {
 delete pEntry->mpAutoAccel;
 }
-mpData->maIdList.clear();
+maIdList.clear();
 }
 
 void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const vcl::KeyCode& 
rKeyCode,
@@ -204,25 +191,23 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, 
const vcl::KeyCode& rKeyC
 {
 OSL_FAIL( "Accelerator::InsertItem(): KeyCode with KeyCode 0 not 
allowed" );
 }
-else if ( !mpData->maKeyMap.insert( std::make_pair( nCode, pEntry.get() ) 
).second )
+else if ( !maKeyMap.insert( std::make_pair( nCode, pEntry.get() ) ).second 
)
 {
 SAL_WARN( "vcl", "Accelerator::InsertItem(): KeyCode (Key: " << nCode 
<< ") already exists" );
 }
 else
-ImplAccelEntryInsert( &(mpData->maIdList), std::move(pEntry) );
+ImplAccelEntryInsert( , std::move(pEntry) );
 }
 
 Accelerator::Accelerator()
 {
 ImplInit();
-mpData.reset(new ImplAccelData);
 }
 
 Accelerator::Accelerator(const Accelerator& rAccel)
 

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

[Tomaž Vajngerl (via logerrit)]

 sfx2/inc/commandpopup/CommandPopup.hxx|   15 -
 sfx2/source/commandpopup/CommandPopup.cxx |   86 +++---
 2 files changed, 69 insertions(+), 32 deletions(-)

New commits:
commit 2f9880af7974b9297b48454070c26d2a4c3b63f0
Author: Tomaž Vajngerl 
AuthorDate: Wed Aug 4 16:17:46 2021 +0900
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 13:33:36 2021 +0200

tdf#142532 search string at any position not just start

In the first implementation, we check if the search string is at
the start of the command string. Mainly this is done to find the
right command with a better accuracy. The problem with this is
that it discards other hits where the search word occurs at an
other position in the command text.

This change adds the command where the search string doesn't occur
at the start of the command string, but it adds those hits to the
end of the list, so the best matches are still added at the
beginning.

Change-Id: I44a15400c84d45b0c8d3b65ec0e1ffee10686e72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119962
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit fc0d2136aee6c1749d780de09df025251703b59e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119983
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Xisco Fauli 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sfx2/inc/commandpopup/CommandPopup.hxx 
b/sfx2/inc/commandpopup/CommandPopup.hxx
index 5d1d74aff860..143f0de25adb 100644
--- a/sfx2/inc/commandpopup/CommandPopup.hxx
+++ b/sfx2/inc/commandpopup/CommandPopup.hxx
@@ -23,6 +23,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 struct CurrentEntry final
 {
 OUString m_aCommandURL;
@@ -56,6 +59,7 @@ private:
 MenuContent m_aMenuContent;
 OUString m_sModuleLongName;
 OUString toLower(OUString const& rString);
+std::unordered_set m_aAdded;
 
 public:
 MenuContentHandler(css::uno::Reference const& xFrame);
@@ -67,9 +71,14 @@ public:
 std::vector& rCommandList);
 
 private:
-void findInMenuRecursive(MenuContent const& rMenuContent, OUString const& 
rText,
- std::unique_ptr& 
rpCommandTreeView,
- std::vector& rCommandList);
+void findInMenuRecursive(
+MenuContent const& rMenuContent, OUString const& rText,
+std::unique_ptr& rpCommandTreeView, 
std::vector& rCommandList,
+std::function const& 
rSearchCriterium);
+
+void addCommandIfPossible(MenuContent const& rMenuContent,
+  std::unique_ptr& 
rpCommandTreeView,
+  std::vector& rCommandList);
 };
 
 class CommandListBox final
diff --git a/sfx2/source/commandpopup/CommandPopup.cxx 
b/sfx2/source/commandpopup/CommandPopup.cxx
index 518e73a132b1..152e5b9959b4 100644
--- a/sfx2/source/commandpopup/CommandPopup.cxx
+++ b/sfx2/source/commandpopup/CommandPopup.cxx
@@ -107,47 +107,75 @@ void MenuContentHandler::findInMenu(OUString const& rText,
 std::unique_ptr& 
rpCommandTreeView,
 std::vector& rCommandList)
 {
-findInMenuRecursive(m_aMenuContent, toLower(rText), rpCommandTreeView, 
rCommandList);
+m_aAdded.clear();
+
+OUString aLowerCaseText = toLower(rText);
+
+auto aTextStartCriterium = [](MenuContent const& rMenuContent, OUString 
const& rSearchText) {
+return rMenuContent.m_aSearchableMenuLabel.startsWith(rSearchText);
+};
+
+findInMenuRecursive(m_aMenuContent, aLowerCaseText, rpCommandTreeView, 
rCommandList,
+aTextStartCriterium);
+
+auto aTextAllCriterium = [](MenuContent const& rMenuContent, OUString 
const& rSearchText) {
+return rMenuContent.m_aSearchableMenuLabel.indexOf(rSearchText) > 0;
+};
+
+findInMenuRecursive(m_aMenuContent, aLowerCaseText, rpCommandTreeView, 
rCommandList,
+aTextAllCriterium);
 }
 
-void MenuContentHandler::findInMenuRecursive(MenuContent const& rMenuContent, 
OUString const& rText,
- std::unique_ptr& 
rpCommandTreeView,
- std::vector& 
rCommandList)
+void MenuContentHandler::findInMenuRecursive(
+MenuContent const& rMenuContent, OUString const& rText,
+std::unique_ptr& rpCommandTreeView, 
std::vector& rCommandList,
+std::function const& 
rSearchCriterium)
 {
 for (MenuContent const& aSubContent : rMenuContent.m_aSubMenuContent)
 {
-if (aSubContent.m_aSearchableMenuLabel.startsWith(rText))
+if (rSearchCriterium(aSubContent, rText))
 {
-OUString sCommandURL = aSubContent.m_aCommandURL;
-util::URL aCommandURL;
-aCommandURL.Complete = sCommandURL;
+addCommandIfPossible(aSubContent, 

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

[Jim Raykowski (via logerrit)]

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

New commits:
commit c52e48d3d79c41fa3febbbd82f5ae69ff885b1e7
Author: Jim Raykowski 
AuthorDate: Sat Aug 7 19:45:04 2021 -0800
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 13:38:08 2021 +0200

tdf#143572 Restore enable undo setting immediatly after object name

is set each time here

This prevents a crash when an object is in text edit mode and a
different object is selected in the navigator to jump to.

Change-Id: I7c0eaa7770f0e3f23e6a62780f18e0a973019c62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120170
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 
(cherry picked from commit 18004b707d2cb92ab88923138d72c5ca1b03301c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120141
Reviewed-by: Xisco Fauli 
(cherry picked from commit 64919f64f5da1ac149b5a0e1079ea8fd2299c574)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120143
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 4494cf35419a..f146b30b6a80 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -711,7 +711,9 @@ void SdPageObjsTLV::Select()
 const bool bUndo = 
pObject->getSdrModelFromSdrObject().IsUndoEnabled();
 pObject->getSdrModelFromSdrObject().EnableUndo(false);
 pObject->SetName(m_xTreeView->get_selected_text(), false);
+pObject->getSdrModelFromSdrObject().EnableUndo(bUndo);
 m_aRowActivatedHdl.Call(*m_xTreeView);
+pObject->getSdrModelFromSdrObject().EnableUndo(false);
 pObject->SetName(OUString(), false);
 pObject->getSdrModelFromSdrObject().EnableUndo(bUndo);
 }

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

[Xisco Fauli (via logerrit)]

 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, 1 insertion(+), 236 deletions(-)

New commits:
commit 53e09765fe19be5f53852e793219d0af687d9795
Author: Xisco Fauli 
AuthorDate: Mon Aug 9 18:27:13 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 10 15:29:24 2021 +0200

Revert "tdf#58521 Enable ContinuousEndnotes compat option for RTF too"

This reverts commit 892488b64f09190896d5a14e3f555ca91b3449e3.

Reason for revert: tdf#143456 shows there are layout problems with this 
compatibility option

This was reverted in libreoffice-7-2 branch only. See 
43d2b3bbacdd6bbe24149ed33c54a180d74c77e4.
Instead, this should have been reverted in master first, and the
cherry-picked the revert to libreoffice-7-2

Change-Id: I3c06001f3f3faeaa4a05a7c9ebd2e175e88ededa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120232
Reviewed-by: Miklos Vajna 
Tested-by: Xisco Fauli 

diff --git a/sw/qa/extras/layout/data/tdf58521-footnotes-endnotes.rtf 
b/sw/qa/extras/layout/data/tdf58521-footnotes-endnotes.rtf
deleted file mode 100644
index fe8a79d9713f..
--- a/sw/qa/extras/layout/data/tdf58521-footnotes-endnotes.rtf
+++ /dev/null
@@ -1,217 +0,0 @@
-{\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 

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

[Xisco Fauli (via logerrit)]

 dev/null|binary
 sw/qa/extras/layout/layout2.cxx |   16 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |2 +-
 writerfilter/source/filter/WriterFilter.cxx |1 -
 4 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit eeda1b35a6e87d5349545464da33d997c52f15e3
Author: Xisco Fauli 
AuthorDate: Mon Aug 9 18:16:33 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Aug 10 15:30:31 2021 +0200

Revert "tdf#58521 DOCX import: enable ContinuousEndnotes compat flag"

This reverts commit f9982c24066d6dd2f938cc20176af0f196bc018f.

Reason for revert: tdf#143456 shows there are layout problems with this 
compatibility option

This was reverted in libreoffice-7-2 branch only. See 
43d2b3bbacdd6bbe24149ed33c54a180d74c77e4.
Instead, this should have been reverted in master first, and the
cherry-pick the revert to libreoffice-7-2

Change-Id: I3a29b77289ef1445fdf4886b32861f6d8e79de21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120150
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/layout/data/tdf58521_endnotes.docx 
b/sw/qa/extras/layout/data/tdf58521_endnotes.docx
deleted file mode 100644
index f709a104c918..
Binary files a/sw/qa/extras/layout/data/tdf58521_endnotes.docx and /dev/null 
differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index a1c94ea2cb39..1db5f1e69214 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -1571,22 +1571,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, 
testUserFieldTypeLanguage)
 "1,234.56");
 }
 
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf58521)
-{
-// This is a testcase for the ContinuousEndnotes compat flag in docx.
-// The document has 2 pages, the endnote anchor is on the first page.
-// The endnote should be on the 2nd page together with the last page 
content.
-createSwDoc(DATA_DIRECTORY, "tdf58521_endnotes.docx");
-xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-
-// Without the accompanying fix in place, this test would have failed with:
-// - Expected: 2
-// - Actual  : 3
-// i.e. there was a separate endnote page
-assertXPath(pXmlDoc, "/root/page", 2);
-assertXPath(pXmlDoc, "/root/page[2]/ftncont", 1);
-}
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index f6d643f7af88..6f784e6174c1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -948,7 +948,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82173_endnoteStyle, 
"tdf82173_endnoteStyle.docx"
 
 DECLARE_OOXMLEXPORT_TEST(testTdf55427_footnote2endnote, 
"tdf55427_footnote2endnote.odt")
 {
-CPPUNIT_ASSERT_EQUAL(5, getPages());
+CPPUNIT_ASSERT_EQUAL(4, getPages());
 uno::Reference 
xPageStyle(getStyles("ParagraphStyles")->getByName("Footnote"), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote style is rose color", 
sal_Int32(0xFF007F), getProperty< sal_Int32 >(xPageStyle, "CharColor") );
 xPageStyle.set(getStyles("ParagraphStyles")->getByName("Endnote"), 
uno::UNO_QUERY);
diff --git a/writerfilter/source/filter/WriterFilter.cxx 
b/writerfilter/source/filter/WriterFilter.cxx
index 68280eadb287..0d9326c41fe0 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -332,7 +332,6 @@ void WriterFilter::setTargetDocument(const 
uno::Reference& xDo
 xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine", 
uno::makeAny(true));
 xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", 
uno::makeAny(true));
 xSettings->setPropertyValue("DisableOffPagePositioning", 
uno::makeAny(true));
-xSettings->setPropertyValue("ContinuousEndnotes", uno::makeAny(true));
 }
 
 void WriterFilter::setSourceDocument(const uno::Reference& 
xDoc)

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

[Stephan Bergmann (via logerrit)]

 sfx2/inc/pch/precompiled_sfx.hxx  |1 -
 sfx2/source/appl/shutdownicon.cxx |   24 
 2 files changed, 8 insertions(+), 17 deletions(-)

New commits:
commit 0a666480276f704d5127f578333659893517abe7
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 13:27:24 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 15:35:52 2021 +0200

Replace a use of boost::logic::tribool with std::call_once

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

diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index fc1d910d520e..dc98200fdf49 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -47,7 +47,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #endif // PCH_LEVEL >= 1
diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index fcebfe809d1e..cbae2881122a 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -20,9 +20,8 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
 #include "shutdownicon.hxx"
 #include 
 #include 
@@ -113,28 +112,20 @@ extern "C" {
 
 namespace {
 
-boost::logic::tribool loaded(boost::logic::indeterminate); // 
loplugin:constvars:ignore
 oslGenericFunction pInitSystray = disabled_initSystray;
 oslGenericFunction pDeInitSystray = disabled_deInitSystray;
 
-bool LoadModule()
+void LoadModule()
 {
-if (boost::logic::indeterminate(loaded))
-{
 #ifdef ENABLE_QUICKSTART_APPLET
 #  ifdef _WIN32
-pInitSystray = win32_init_sys_tray;
-pDeInitSystray = win32_shutdown_sys_tray;
-loaded = true;
+pInitSystray = win32_init_sys_tray;
+pDeInitSystray = win32_shutdown_sys_tray;
 #  elif defined MACOSX
-pInitSystray = aqua_init_systray;
-pDeInitSystray = aqua_shutdown_systray;
-loaded = true;
+pInitSystray = aqua_init_systray;
+pDeInitSystray = aqua_shutdown_systray;
 #  endif // MACOSX
 #endif // ENABLE_QUICKSTART_APPLET
-}
-assert(!boost::logic::indeterminate(loaded));
-return bool(loaded);
 }
 
 }
@@ -145,7 +136,8 @@ void ShutdownIcon::initSystray()
 return;
 m_bInitialized = true;
 
-(void) LoadModule();
+static std::once_flag flag;
+std::call_once(flag, LoadModule);
 m_bVeto = true;
 pInitSystray();
 }

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

[Noel Grandin (via logerrit)]

 sw/source/core/txtnode/ndhints.cxx |   54 -
 1 file changed, 36 insertions(+), 18 deletions(-)

New commits:
commit 4d50939a7b37cbaeceeddebabfc435190e079781
Author: Noel Grandin 
AuthorDate: Tue Aug 10 14:08:11 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 15:35:28 2021 +0200

tdf#136991 Open RTF with colored text

We spend most of the time in MergePortions, and the resorting is
a significant part of that, so only resort if we actually have to.

This shaves 10% off the load time for this document.

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

diff --git a/sw/source/core/txtnode/ndhints.cxx 
b/sw/source/core/txtnode/ndhints.cxx
index cd136f21a9c5..194aafc95db1 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -411,36 +411,54 @@ bool SwpHints::Check(bool bPortionsMerged) const
 
 void SwpHints::Resort() const
 {
-auto & rStartMap = const_cast(this)->m_HintsByStart;
-std::sort(rStartMap.begin(), rStartMap.end(), CompareSwpHtStart);
-auto & rEndMap = const_cast(this)->m_HintsByEnd;
-std::sort(rEndMap.begin(), rEndMap.end(), CompareSwpHtEnd());
-auto & rWhichStartMap = 
const_cast(this)->m_HintsByWhichAndStart;
-std::sort(rWhichStartMap.begin(), rWhichStartMap.end(), 
CompareSwpHtWhichStart());
-m_bStartMapNeedsSorting = false;
-m_bEndMapNeedsSorting = false;
-m_bWhichMapNeedsSorting = false;
+if (m_bStartMapNeedsSorting)
+{
+auto & rStartMap = const_cast(this)->m_HintsByStart;
+std::sort(rStartMap.begin(), rStartMap.end(), CompareSwpHtStart);
+m_bStartMapNeedsSorting = false;
+}
+if (m_bEndMapNeedsSorting)
+{
+auto & rEndMap = const_cast(this)->m_HintsByEnd;
+std::sort(rEndMap.begin(), rEndMap.end(), CompareSwpHtEnd());
+m_bEndMapNeedsSorting = false;
+}
+if (m_bWhichMapNeedsSorting)
+{
+auto & rWhichStartMap = 
const_cast(this)->m_HintsByWhichAndStart;
+std::sort(rWhichStartMap.begin(), rWhichStartMap.end(), 
CompareSwpHtWhichStart());
+m_bWhichMapNeedsSorting = false;
+}
 }
 
 void SwpHints::ResortStartMap() const
 {
-auto & rStartMap = const_cast(this)->m_HintsByStart;
-std::sort(rStartMap.begin(), rStartMap.end(), CompareSwpHtStart);
-m_bStartMapNeedsSorting = false;
+if (m_bStartMapNeedsSorting)
+{
+auto & rStartMap = const_cast(this)->m_HintsByStart;
+std::sort(rStartMap.begin(), rStartMap.end(), CompareSwpHtStart);
+m_bStartMapNeedsSorting = false;
+}
 }
 
 void SwpHints::ResortEndMap() const
 {
-auto & rEndMap = const_cast(this)->m_HintsByEnd;
-std::sort(rEndMap.begin(), rEndMap.end(), CompareSwpHtEnd());
-m_bEndMapNeedsSorting = false;
+if (m_bEndMapNeedsSorting)
+{
+auto & rEndMap = const_cast(this)->m_HintsByEnd;
+std::sort(rEndMap.begin(), rEndMap.end(), CompareSwpHtEnd());
+m_bEndMapNeedsSorting = false;
+}
 }
 
 void SwpHints::ResortWhichMap() const
 {
-m_bWhichMapNeedsSorting = false;
-auto & rWhichStartMap = 
const_cast(this)->m_HintsByWhichAndStart;
-std::sort(rWhichStartMap.begin(), rWhichStartMap.end(), 
CompareSwpHtWhichStart());
+if (m_bWhichMapNeedsSorting)
+{
+auto & rWhichStartMap = 
const_cast(this)->m_HintsByWhichAndStart;
+std::sort(rWhichStartMap.begin(), rWhichStartMap.end(), 
CompareSwpHtWhichStart());
+m_bWhichMapNeedsSorting = false;
+}
 }
 
 size_t SwpHints::GetFirstPosSortedByWhichAndStart( sal_uInt16 nWhich ) const

pointers for updating tests after changing PDF export defaults

[Stéphane Guillou]

Hi all!

Just sending my question here because I can never seem to catch other 
developers on IRC, probably because of time zones.


I am working on this easyhack bug/enhancement: 
https://bugs.documentfoundation.org/show_bug.cgi?id=39667


The change I am proposing is very small (changing two default values in 
the PDF settings, see the attached diff), but changing the default PDF 
export settings expectedly makes some tests fail (details attached).


Specifically, what I am wondering is:

 * when asserting an equality, e.g.:
   CPPUNIT_ASSERT_EQUAL(OString("Im19"), rIDs[0])
   

 o what do strings like "Im19" or "Im12" mean in these contexts?
 * what is the "W array" that is not found in: CPPUNIT_ASSERT(pWArray)
   

 * why could it be that rDocument.Read() fails at:
   CPPUNIT_ASSERT(rDocument.Read(aStream))
   

   (in the load function)

Is there someone with more knowledge about tests and PDFs who could put 
me on the right path?


Thanks in advance!

(I am not subscribed to the dev mailing list so please send a reply to 
me as well as the list! )


--
Stéphane Guillou
http://stragu.gitlab.io/

pdfexport.cxx:2268:Assertion
Test name: (anonymous namespace)::testMultiPagePDF::TestBody
equality assertion failed
- Expected: Im19
- Actual  : Im21

https://opengrok.libreoffice.org/xref/core/vcl/qa/cppunit/pdfexport/pdfexport.cxx?r=4390f233=95984=2214#2214

file: core/vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf

---

pdfexport.cxx:2661:Assertion
Test name: (anonymous 
namespace)::testReexportDocumentWithComplexResources::TestBody
assertion failed
- Expression: pWArray

https://opengrok.libreoffice.org/xref/core/vcl/qa/cppunit/pdfexport/pdfexport.cxx?r=4390f233=95984=2214#2661

File: core/vcl/qa/cppunit/pdfexport/data/ComplexContentDictionary.pdf

---

pdfexport.cxx:2451:Assertion
Test name: (anonymous namespace)::testReexportPDF::TestBody
equality assertion failed
- Expected: Im12
- Actual  : Im14

https://opengrok.libreoffice.org/xref/core/vcl/qa/cppunit/pdfexport/pdfexport.cxx?r=4390f233=95984=2214#2451

File: core/vcl/qa/cppunit/pdfexport/data/PDFWithImages.pdf

---

pdfexport.cxx:135:Assertion
Test name: (anonymous namespace)::testTdf118244_radioButtonGroup::TestBody
assertion failed
- Expression: rDocument.Read(aStream)

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

Load function fails CPP_ASSERT in test:
https://opengrok.libreoffice.org/xref/core/vcl/qa/cppunit/pdfexport/pdfexport.cxx?r=4390f233=95984=2214#912

Load function (with CPP_ASSERT) defined here:
https://opengrok.libreoffice.org/xref/core/vcl/qa/cppunit/pdfexport/pdfexport.cxx?r=4390f233=95984=2214#135

File: core/vcl/qa/cppunit/pdfexport/data/tdf118244_radioButtonGroup.odtdiff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b5cc8182eb46..98bd67787e54 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5054,7 +5054,7 @@
   Determines if PDF are created by using special tags also
   known as Tagged PDF.
 
-false
+true
   
   
 
@@ -5463,7 +5463,7 @@
 
   Specifies if the document is PDF/UA (Universal 
Accessibility) compliant
 
-false
+true
   
   
   

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

[Noel Grandin (via logerrit)]

 vcl/inc/implimagetree.hxx  |2 +-
 vcl/source/image/ImplImageTree.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 45aaabbdfb7968d222d88b1b56788c0bd4c5b27d
Author: Noel Grandin 
AuthorDate: Mon Aug 9 19:00:14 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 16:05:02 2021 +0200

flatten ImplImageTree a little

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

diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 72cdd02d85cf..48773cc42c23 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -92,7 +92,7 @@ private:
 ImplImageTree& operator=(const ImplImageTree&) = delete;
 
 typedef std::unordered_map> IconCache;
-typedef std::unordered_map> 
ScaledIconCache;
+typedef std::unordered_map ScaledIconCache;
 typedef std::unordered_map IconLinkHash;
 
 struct IconSet
diff --git a/vcl/source/image/ImplImageTree.cxx 
b/vcl/source/image/ImplImageTree.cxx
index 227b5981be52..263e63befef1 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -517,9 +517,9 @@ ImplImageTree::IconCache ::getIconCache(const 
ImageRequestParamete
 IconSet  = getCurrentIconSet();
 auto it = rSet.maScaledIconCaches.find(rParameters.mnScalePercentage);
 if ( it != rSet.maScaledIconCaches.end() )
-return *it->second;
-rSet.maScaledIconCaches[rParameters.mnScalePercentage] = 
std::make_unique();
-return *rSet.maScaledIconCaches[rParameters.mnScalePercentage];
+return it->second;
+rSet.maScaledIconCaches.emplace(rParameters.mnScalePercentage, 
IconCache());
+return rSet.maScaledIconCaches[rParameters.mnScalePercentage];
 }
 
 bool ImplImageTree::iconCacheLookup(ImageRequestParameters& rParameters)

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

[Caolán McNamara (via logerrit)]

 solenv/gbuild/platform/unxgcc.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7a3eaef6dd707781c2f4e341aebb9d4c42df780f
Author: Caolán McNamara 
AuthorDate: Tue Aug 10 09:32:31 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 15:01:06 2021 +0200

for DISABLE_DYNLOADING support linking to static .a system libs

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

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 4a96547b48b8..4f6315faec68 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -130,9 +130,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
-Wl$(COMMA)--start-group \
+   -Wl$(COMMA)-Bstatic \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst 
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib)) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
$(T_LIBS) \
+   -Wl$(COMMA)-Bdynamic \
$(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out 
XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(T_STDLIBS_CXX)) \
-Wl$(COMMA)--end-group \
, \

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

[Stephan Bergmann (via logerrit)]

 linguistic/source/lngsvcmgr.cxx |  116 +---
 1 file changed, 51 insertions(+), 65 deletions(-)

New commits:
commit f989bd22cc3c80d3c5119e3de1a269ab9a80bd78
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 10:13:04 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 15:07:35 2021 +0200

Catch exceptions when setting up linguistic extensions

...not only from the createInstance calls, but also from later calls like
XSpellChecker::getLocales.  At least when installing
 
(which
only contains native code for macOS and Windows) on Linux, that getLocales 
call
would cause a RuntimeException, but which was effectively left uncaught and 
thus
caused a crash.

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

diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index b4b8d3836f6e..a0f9822e4779 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -940,7 +940,6 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
 uno::Reference< lang::XSingleComponentFactory > xCompFactory;
 uno::Reference< lang::XSingleServiceFactory > xFactory;
 
-uno::Reference< linguistic2::XSpellChecker > xSvc;
 xCompFactory.set(aCurrent, css::uno::UNO_QUERY);
 if (!xCompFactory.is())
 {
@@ -950,27 +949,24 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
 {
 try
 {
-xSvc.set( ( xCompFactory.is() ? 
xCompFactory->createInstanceWithContext( xContext ) : 
xFactory->createInstance() ), uno::UNO_QUERY );
+uno::Reference< linguistic2::XSpellChecker > xSvc( ( 
xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : 
xFactory->createInstance() ), uno::UNO_QUERY_THROW );
+
+OUStringaImplName;
+std::vector< LanguageType >   aLanguages;
+uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
+if (xInfo.is())
+aImplName = xInfo->getImplementationName();
+SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty 
implementation name" );
+uno::Sequence 
aLocaleSequence(xSvc->getLocales());
+aLanguages = LocaleSeqToLangVec( aLocaleSequence );
+
+pAvailSpellSvcs->push_back( std::make_unique( 
aImplName, aLanguages ) );
 }
 catch (const uno::Exception &)
 {
 SAL_WARN( "linguistic", "createInstance failed" );
 }
 }
-
-if (xSvc.is())
-{
-OUStringaImplName;
-std::vector< LanguageType >   aLanguages;
-uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
-if (xInfo.is())
-aImplName = xInfo->getImplementationName();
-SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty 
implementation name" );
-uno::Sequence aLocaleSequence(xSvc->getLocales());
-aLanguages = LocaleSeqToLangVec( aLocaleSequence );
-
-pAvailSpellSvcs->push_back( std::make_unique( aImplName, 
aLanguages ) );
-}
 }
 }
 
@@ -998,7 +994,6 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 uno::Reference< lang::XSingleComponentFactory > xCompFactory;
 uno::Reference< lang::XSingleServiceFactory > xFactory;
 
-uno::Reference< linguistic2::XProofreader > xSvc;
 xCompFactory.set(aCurrent, css::uno::UNO_QUERY);
 if (!xCompFactory.is())
 {
@@ -1008,13 +1003,24 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 {
 try
 {
-if (xCompFactory.is())
-{
-
xSvc.set(xCompFactory->createInstanceWithContext(xContext), uno::UNO_QUERY);
-}
-else
+uno::Reference< linguistic2::XProofreader > xSvc(
+xCompFactory.is()
+? xCompFactory->createInstanceWithContext(xContext)
+: xFactory->createInstance(),
+uno::UNO_QUERY_THROW);
+
+if (pAvailGrammarSvcs)
 {
-xSvc.set(xFactory->createInstance(), uno::UNO_QUERY);
+OUStringaImplName;
+std::vector< LanguageType >aLanguages;
+uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY 
);
+if (xInfo.is())
+aImplName = xInfo->getImplementationName();
+SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty 
implementation name" );
+uno::Sequence 

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

[Noel Grandin (via logerrit)]

 editeng/source/editeng/eertfpar.cxx |   22 +++---
 editeng/source/rtf/svxrtf.cxx   |   26 +-
 include/editeng/svxrtf.hxx  |3 ++-
 3 files changed, 26 insertions(+), 25 deletions(-)

New commits:
commit 447cec188191e77c09ffc51cc42549def277255b
Author: Noel Grandin 
AuthorDate: Mon Aug 9 18:14:14 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 15:08:37 2021 +0200

no need to use unique_ptr for SvxRTFStyleType here

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

diff --git a/editeng/source/editeng/eertfpar.cxx 
b/editeng/source/editeng/eertfpar.cxx
index 278699dbfcb1..e3f7dba07249 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -374,8 +374,8 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType  
)
 auto const& pS = it->second;
 mpEditEngine->SetStyleSheet(
 EditSelection(aStartPaM, aEndPaM),
-
static_cast(mpEditEngine->GetStyleSheetPool()->Find(pS->sName, 
SfxStyleFamily::All)));
-nOutlLevel = pS->nOutlineNo;
+
static_cast(mpEditEngine->GetStyleSheetPool()->Find(pS.sName, 
SfxStyleFamily::All)));
+nOutlLevel = pS.nOutlineNo;
 }
 }
 
@@ -436,10 +436,10 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType 
 )
 SvxRTFStyleType* EditRTFParser::FindStyleSheet( std::u16string_view rName )
 {
 SvxRTFStyleTbl& rTable = GetStyleTbl();
-for (auto const& iter : rTable)
+for (auto & iter : rTable)
 {
-if (iter.second->sName == rName)
-return iter.second.get();
+if (iter.second.sName == rName)
+return 
 }
 return nullptr;
 }
@@ -458,9 +458,9 @@ SfxStyleSheet* EditRTFParser::CreateStyleSheet( 
SvxRTFStyleType const * pRTFStyl
 SvxRTFStyleTbl::iterator it = GetStyleTbl().find( pRTFStyle->nBasedOn 
);
 if ( it != GetStyleTbl().end())
 {
-SvxRTFStyleType *const pS = it->second.get();
-if ( pS && ( pS !=pRTFStyle ) )
-aParent = pS->sName;
+SvxRTFStyleType const& rS = it->second;
+if (  != pRTFStyle )
+aParent = rS.sName;
 }
 }
 
@@ -492,10 +492,10 @@ void EditRTFParser::CreateStyleSheets()
 // the SvxRTFParser has now created the template...
 if (mpEditEngine->GetStyleSheetPool() && 
mpEditEngine->IsImportRTFStyleSheetsSet())
 {
-for (auto const& elem : GetStyleTbl())
+for (auto & elem : GetStyleTbl())
 {
-SvxRTFStyleType* pRTFStyle = elem.second.get();
-CreateStyleSheet( pRTFStyle );
+SvxRTFStyleType& rRTFStyle = elem.second;
+CreateStyleSheet(  );
 }
 }
 }
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 4b0fd66bb224..4157ca894aa5 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -274,8 +274,8 @@ void SvxRTFParser::ReadStyleTable()
 sal_uInt16 nStyleNo = 0;
 bool bHasStyleNo = false;
 int _nOpenBrakets = 1;  // the first was already detected earlier!!
-std::unique_ptr pStyle(new SvxRTFStyleType(*pAttrPool, 
aWhichMap));
-pStyle->aAttrSet.Put( GetRTFDefaults() );
+std::optional xStyle(SvxRTFStyleType(*pAttrPool, 
aWhichMap));
+xStyle->aAttrSet.Put( GetRTFDefaults() );
 
 bIsInReadStyleTab = true;
 bChkStyleAttr = false;  // Do not check Attribute against the Styles
@@ -310,10 +310,10 @@ void SvxRTFParser::ReadStyleTable()
 }
 break;
 
-case RTF_SBASEDON:  pStyle->nBasedOn = sal_uInt16(nTokenValue); break;
+case RTF_SBASEDON:  xStyle->nBasedOn = sal_uInt16(nTokenValue); break;
 case RTF_SNEXT: break;
 case RTF_OUTLINELEVEL:
-case RTF_SOUTLVL:   pStyle->nOutlineNo = sal_uInt8(nTokenValue);
break;
+case RTF_SOUTLVL:   xStyle->nOutlineNo = sal_uInt8(nTokenValue);
break;
 case RTF_S: nStyleNo = static_cast(nTokenValue);
 bHasStyleNo = true;
 break;
@@ -324,16 +324,16 @@ void SvxRTFParser::ReadStyleTable()
 case RTF_TEXTTOKEN:
 if (bHasStyleNo)
 {
-pStyle->sName = DelCharAtEnd( aToken, ';' );
+xStyle->sName = DelCharAtEnd( aToken, ';' );
 
 if (!m_StyleTable.empty())
 {
 m_StyleTable.erase(nStyleNo);
 }
 // All data from the font is available, so off to the table
-m_StyleTable.insert(std::make_pair(nStyleNo, 
std::move(pStyle)));
-pStyle.reset(new SvxRTFStyleType(*pAttrPool, aWhichMap));
-pStyle->aAttrSet.Put( GetRTFDefaults() );
+  

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

[Mike Kaganski (via logerrit)]

 sc/source/core/data/drwlayer.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 2e5635122b9c59b2f67cd4949f5e259cff2993d5
Author: Mike Kaganski 
AuthorDate: Fri Jul 23 16:55:04 2021 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:32:45 2021 +0200

Use vector instead of unique_ptr

Change-Id: Iea1fb26d9e176283a96d6f0d18dae5b58e55602e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119432
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120222
Reviewed-by: Michael Stahl 

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 27d00144a52d..5b70046e4448 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1550,7 +1550,6 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL 
nCol1,SCROW nRow1,
 if (!nObjCount)
 return;
 
-size_t nDelCount = 0;
 tools::Rectangle aDelRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, 
nTab );
 tools::Rectangle aDelCircle = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, 
nTab );
 aDelCircle.AdjustLeft(-250);
@@ -1558,7 +1557,8 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL 
nCol1,SCROW nRow1,
 aDelCircle.AdjustTop(-70);
 aDelCircle.AdjustBottom(70);
 
-std::unique_ptr ppObj(new SdrObject*[nObjCount]);
+std::vector ppObj;
+ppObj.reserve(nObjCount);
 
 SdrObjListIter aIter( pPage, SdrIterMode::Flat );
 SdrObject* pObject = aIter.Next();
@@ -1574,7 +1574,7 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL 
nCol1,SCROW nRow1,
 {
 aObjRect = pObject->GetLogicRect();
 if(aDelCircle.IsInside(aObjRect))
-   ppObj[nDelCount++] = pObject;
+   ppObj.push_back(pObject);
 }
 else
 {
@@ -1585,10 +1585,10 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, 
SCCOL nCol1,SCROW nRow1,
 {
 ScAnchorType aAnchorType = 
ScDrawLayer::GetAnchorType(*pObject);
 if (aAnchorType == SCA_CELL || aAnchorType == 
SCA_CELL_RESIZE)
-ppObj[nDelCount++] = pObject;
+ppObj.push_back(pObject);
 }
 else
-ppObj[nDelCount++] = pObject;
+ppObj.push_back(pObject);
 }
 }
 }
@@ -1597,11 +1597,11 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, 
SCCOL nCol1,SCROW nRow1,
 }
 
 if (bRecording)
-for (size_t i=1; i<=nDelCount; ++i)
-AddCalcUndo( std::make_unique( 
*ppObj[nDelCount-i] ) );
+for (auto p : ppObj)
+AddCalcUndo(std::make_unique(*p));
 
-for (size_t i=1; i<=nDelCount; ++i)
-pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
+for (auto p : ppObj)
+pPage->RemoveObject(p->GetOrdNum());
 }
 
 void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
@@ -1629,13 +1629,13 @@ void ScDrawLayer::DeleteObjectsInSelection( const 
ScMarkData& rMark )
 const size_t nObjCount = pPage->GetObjCount();
 if (nObjCount)
 {
-size_t nDelCount = 0;
 //  Rectangle around the whole selection
 tools::Rectangle aMarkBound = pDoc->GetMMRect(
 aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
 aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), nTab 
);
 
-std::unique_ptr ppObj(new SdrObject*[nObjCount]);
+std::vector ppObj;
+ppObj.reserve(nObjCount);
 
 SdrObjListIter aIter( pPage, SdrIterMode::Flat );
 SdrObject* pObject = aIter.Next();
@@ -1657,7 +1657,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const 
ScMarkData& rMark )
  
pObjData->maStart.Row()));
 if (bObjectInMarkArea || bObjectAnchoredToMarkedCell)
 {
-ppObj[nDelCount++] = pObject;
+ppObj.push_back(pObject);
 }
 }
 
@@ -1667,11 +1667,11 @@ void ScDrawLayer::DeleteObjectsInSelection( const 
ScMarkData& rMark )
 //  Delete objects (backwards)
 
 if (bRecording)
-for (size_t i=1; i<=nDelCount; ++i)
-AddCalcUndo( std::make_unique( 
*ppObj[nDelCount-i] ) );
+for (auto p : ppObj)
+AddCalcUndo(std::make_unique(*p));
 
-for (size_t i=1; i<=nDelCount; ++i)
-pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
+ 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - config_host.mk.in configure.ac solenv/gbuild

[Thorsten Behrens (via logerrit)]

 config_host.mk.in   |1 -
 configure.ac|1 -
 solenv/gbuild/platform/com_MSC_class.mk |4 
 solenv/gbuild/platform/com_MSC_defs.mk  |   12 +++-
 4 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 88b38027661e5851906c1127401e9492e2aec40a
Author: Thorsten Behrens 
AuthorDate: Tue Aug 3 18:32:16 2021 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:44:05 2021 +0200

Always provision PATH the cygwin way under Windows

With PATH essentially serving the role of LD_LIBRARY_PATH under
Windows, there was the notion that this needs to be provided in
Windows notation, for win32 gnumake.

That was perhaps once true; currently we're always evaluating PATH
inside a shell, not the Makefile. So this since a while only worked
accidentally, due to cygwin transparently converting between DOS and
UNIX PATH vars. It did break though for corner-cases, e.g.
SRCDIR!=BUILDDIR, and BUILDDIR e.g. D:\FOO.

With that simplification, also GNUMAKE_WIN_NATIVE can go.

Change-Id: Ied5a0443dc70e7dc629c0c0620e6ce911d9a73d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119941
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit da36d655608c3da39fd79d95974e1f7404a27aa0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119977
Reviewed-by: Michael Stahl 

diff --git a/config_host.mk.in b/config_host.mk.in
index 42f4511a62e8..29626ec9fc42 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -243,7 +243,6 @@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
 export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@
 export PARALLELISM?=@PARALLELISM@
 @x_GNUCP@ export GNUCOPY=@GNUCP@
-export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@
 export GNUPATCH=@GNUPATCH@
 export GNUTAR=@GNUTAR@
 export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@
diff --git a/configure.ac b/configure.ac
index b3aa9d6cb566..a1dbaaa483fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5919,7 +5919,6 @@ else
 fi
 rm -rf $TESTGMAKEFILEFUNC
 AC_SUBST(HAVE_GNUMAKE_FILE_FUNC)
-AC_SUBST(GNUMAKE_WIN_NATIVE)
 
 _make_ver_check=`$GNUMAKE --version | grep "Built for Windows"`
 STALE_MAKE=
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 4564bc65cdde..505191069005 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -469,11 +469,7 @@ endef
 gb_CppunitTest_UNITTESTFAILED := $(GBUILDDIR)/platform/unittest-failed-WNT.sh
 gb_CppunitTest_PYTHONDEPS := $(call gb_Package_get_target,python3)
 gb_CppunitTest_DEFS := -D_DLL
-ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell 
cygpath -w $(gb_Library_DLLDIR));$(shell cygpath -w 
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if 
$(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll)))
-else
 gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell 
cygpath -u $(gb_Library_DLLDIR)):$(shell cygpath -u 
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if 
$(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll)))
-endif
 gb_CppunitTest_get_filename = test_$(1).dll
 gb_CppunitTest_get_ilibfilename = itest_$(1).lib
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index de856cf79cc6..90922db6b0d6 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -344,21 +344,15 @@ endif
 
 # Helper class
 
-ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_MAKE_CYGPATH := -w
-else
-gb_MAKE_CYGPATH := -u
-endif
-
-gb_Helper_set_ld_path := PATH="$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$$PATH"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -u 
$(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u 
$(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER)):$$PATH"
 
 define gb_Helper_prepend_ld_path
-PATH="$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$(1);$$PATH"
+PATH="$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell 
cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER)):$(1):$$PATH"
 endef
 
 # $(1): one directory pathname to append to the ld path
 define gb_Helper_extend_ld_path
-$(gb_Helper_set_ld_path)';$(shell cygpath $(gb_MAKE_CYGPATH) $(1))'
+$(gb_Helper_set_ld_path)':$(shell cygpath -u $(1))'
 endef
 
 # common macros to build GPG related libraries

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

[Miklos Vajna (via logerrit)]

 editeng/source/editeng/editeng.cxx |4 +-
 editeng/source/editeng/editundo.cxx|   11 +-
 editeng/source/editeng/editundo.hxx|3 +
 editeng/source/editeng/impedit.hxx |2 -
 editeng/source/editeng/impedit5.cxx|3 +
 sd/qa/unit/tiledrendering/data/paste-undo.fodp |   34 
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |   41 +
 7 files changed, 93 insertions(+), 5 deletions(-)

New commits:
commit 04f0cd819066229039203fb36848d907146bbba2
Author: Miklos Vajna 
AuthorDate: Mon Aug 9 19:20:53 2021 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 10 20:12:19 2021 +0200

tdf#142845 editeng: don't update selection when formatting before sd paste

Regression from commit f0c25c751cf8e166a84b289746bce6202a40391d
(tdf#115783 sd: fix lost char attributes during in-table copy,
2018-02-16), the problem was that the formatting before paste also
created an undo action, and executing it alters the selection, which was
not intended.

So in case the textbox contains "world" and we paste "hello", then the
undo will set the cursor at the end of "world", while the expected
result is to just undo the paste and the formatting of "world".

Fix the problem by not altering the selection in the undo of
Outliner::SetCharAttribs(), which is only called by sd/ in the
before-paste case, not anywhere else.

(cherry picked from commit fc4c0747e97bb997cc37263b3e86b07dab21fe25)

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

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index b90ad3127fee..f9207a937c1f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1768,7 +1768,9 @@ const SfxPoolItem& EditEngine::GetParaAttrib( sal_Int32 
nPara, sal_uInt16 nWhich
 void EditEngine::SetCharAttribs(sal_Int32 nPara, const SfxItemSet& rSet)
 {
 EditSelection aSel(pImpEditEngine->ConvertSelection(nPara, 0, nPara, 
GetTextLen(nPara)));
-pImpEditEngine->SetAttribs(aSel, rSet);
+// This is called by sd::View::OnBeginPasteOrDrop(), updating the cursor 
position on undo is not
+// wanted.
+pImpEditEngine->SetAttribs(aSel, rSet, /*nSpecial=*/SetAttribsMode::NONE, 
/*bSetSelection=*/false);
 pImpEditEngine->FormatAndUpdate();
 }
 
diff --git a/editeng/source/editeng/editundo.cxx 
b/editeng/source/editeng/editundo.cxx
index 714dd1b682ed..892183f754af 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -501,6 +501,7 @@ EditUndoSetAttribs::EditUndoSetAttribs(EditEngine* pEE, 
const ESelection& rESel,
 aESel(rESel),
 aNewAttribs(rNewItems),
 nSpecial(SetAttribsMode::NONE),
+m_bSetSelection(true),
 // When EditUndoSetAttribs actually is a RemoveAttribs this could be
 // recognize by the empty itemset, but then it would have to be caught in
 // its own place, which possible a setAttribs does with an empty itemset.
@@ -560,7 +561,10 @@ void EditUndoSetAttribs::Undo()
 }
 if ( bFields )
 pEE->UpdateFieldsOnly();
-ImpSetSelection();
+if (m_bSetSelection)
+{
+ImpSetSelection();
+}
 }
 
 void EditUndoSetAttribs::Redo()
@@ -574,7 +578,10 @@ void EditUndoSetAttribs::Redo()
 else
 pEE->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich );
 
-ImpSetSelection();
+if (m_bSetSelection)
+{
+ImpSetSelection();
+}
 }
 
 void EditUndoSetAttribs::AppendContentInfo(ContentAttribsInfo* pNew)
diff --git a/editeng/source/editeng/editundo.hxx 
b/editeng/source/editeng/editundo.hxx
index 43d2a0d3b911..f87180ba7dd7 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -218,6 +218,8 @@ private:
 InfoArrayType   aPrevAttribs;
 
 SetAttribsMode  nSpecial;
+/// Once the attributes are set / unset, set the selection to the end of 
the formatted range?
+bool m_bSetSelection;
 boolbSetIsRemove;
 boolbRemoveParaAttribs;
 sal_uInt16  nRemoveWhich;
@@ -232,6 +234,7 @@ public:
 SfxItemSet& GetNewAttribs() { return aNewAttribs; }
 
 voidSetSpecial( SetAttribsMode n )  { nSpecial = n; }
+voidSetUpdateSelection( bool bSetSelection )  { 
m_bSetSelection = bSetSelection; }
 voidSetRemoveAttribs( bool b )  { bSetIsRemove = b; }
 voidSetRemoveParaAttribs( bool b )  { bRemoveParaAttribs = 
b; }
 voidSetRemoveWhich( sal_uInt16 n )  { nRemoveWhich = n; }
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index c56b6b284f1a..3855f38da45c 100644
--- 

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

[Rafael Lima (via logerrit)]

 sd/uiconfig/sdraw/ui/notebookbar.ui |  165 +++-
 1 file changed, 163 insertions(+), 2 deletions(-)

New commits:
commit 73fc697d5aac06938cc78f51b4e0d6f3d615447c
Author: Rafael Lima 
AuthorDate: Mon Jul 19 23:58:35 2021 +0200
Commit: Andreas Kainz 
CommitDate: Tue Aug 10 22:47:44 2021 +0200

tdf#136610 Add Clone/Clear Direct Format buttons to LO Draw tabbed interface

Currently LO Draw only shows the "Clone" and "Clear Direct Format" buttons 
in the tabbed interface when a text object is selected (in the Text tab).

With this patch, LO Draw will now show these buttons in the "Draw" tab when 
shapes are selected, as well as in the Home tab (as it is shown in Impress).

Change-Id: I9acf577cc5322d43c18acc366788a5eadda67ff6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119183
Tested-by: Jenkins
Tested-by: Andreas Kainz 
Reviewed-by: Andreas Kainz 

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index c65aced89a03..4c1b5ea4d0aa 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -3359,6 +3359,102 @@
 0
   
 
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+0
+  
+
+
+  
+True
+False
+center
+vertical
+
+  
+True
+True
+center
+True
+both-horiz
+False
+
+  
+True
+False
+.uno:FormatPaintbrush
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+center
+True
+both-horiz
+False
+
+  
+True
+False
+.uno:SetDefault
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+
+  
+  
+False
+True
+2
+  
+
 
   
 True
@@ -8437,7 +8533,7 @@
 both-horiz
 False
 
-  
+  
 True
 False
 .uno:FormatPaintbrush
@@ -8461,7 +8557,7 @@
   

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.2.0.3'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.0.3' created by Christian Lohmaier 
 at 2021-08-10 17:27 +

Tag libreoffice-7.2.0.3
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmEStx4ACgkQ9DSh76/u
rqPOvQ/9HaN2YbshDyu8dCMyAGjZ5wc+qOt90Q1N+KJhj+A4IvbLcYXaLCA9Izwb
UOSW1fG4lHUvRC9A1qk7e/LspyDpyNBeD4IKDBznX2FsdTjwZ6Mj5gJ8lW2fvdY3
zF9v0584dKuT451xDmXDSN3UKokKd9ZYQ8RLLlfmTEx6RnhjJa8fzj89gRavews3
pqJNbKOJfgyNzMNzM9fCRNGMooIe04hSc0Xhqii2D2W0rMmOI8y0NpDguXVI+F+S
51YTszpx284PgBH13r1umCv8wizoQhh1TOlHsJpOhG9eZKDykQiDgWUVs1TWhL7D
14vVibVTrI+qY4WvGzIW3bhj9tLvzf0mDfQpoortbLpA8VSlJ8bzYejuQU7LJF0h
VHo9tx0vVL6qvuXntwjKIDW1HDx2XCQMNhc1I2zue4MFKuz3px55GCsOsQtqJ4B6
vu7oTLco1FUoOllsqEFUpbDrvhJdccca1lNR8ZcDqJuB/7/qQdibfq+vAMWyQWHM
3Hz4uj64gHbiFxBB8XjdUA+pg/2jR+DWM8ym31ot5mGbM678TTJIRLsow9yJSTUr
9aKLcaH5VVtoWOolVtQ6ntoJ5X51t4uuREwFt1Qn3nNuUhksfTc1mwfbp7tK+TAE
KxqdALLMddi5pUXJPcF+dTDe1V6XfM79lMvwqJny4pyAUA45bfw=
=uBgy
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-309:
---
 0 files changed
---

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

[Stephan Bergmann (via logerrit)]

 sfx2/source/appl/shutdownicon.cxx |   49 ++
 1 file changed, 14 insertions(+), 35 deletions(-)

New commits:
commit e229547eb02ab6c9a1fe6abdfc42ce970cedc733
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 18:37:47 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 20:15:42 2021 +0200

Simplify init-/deInitSysTray even further

7e8d46b8988527967825fbb7210747e625ba1975 "INTEGRATION: CWS gtkquickstart" 
had
originally introduced the [m_]p_[De]InitSystray function pointers, for 
dynamic
loading of libqstart_gtklo.so on UNX.  But
3e9c908b73f0fe0978c9980750a06bbc9e02295e "remove Linux ('UNX') systray
'Quickstarter'" removed that again, leaving behind the no longer necessary
function pointer machinery.  And 0a666480276f704d5127f578333659893517abe7
"Replace a use of boost::logic::tribool with std::call_once" tried to clean 
up
that unnecessary machinery a bit, but failed to grasp the bigger picture.

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

diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index cbae2881122a..b6be7cad2fc6 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -20,8 +20,6 @@
 #include 
 #include 
 
-#include 
-
 #include "shutdownicon.hxx"
 #include 
 #include 
@@ -105,41 +103,19 @@ css::uno::Sequence SAL_CALL 
ShutdownIcon::getSupportedServiceNames()
 bool ShutdownIcon::bModalMode = false;
 rtl::Reference ShutdownIcon::pShutdownIcon;
 
-extern "C" {
-static void disabled_initSystray() { }
-static void disabled_deInitSystray() { }
-}
-
-namespace {
-
-oslGenericFunction pInitSystray = disabled_initSystray;
-oslGenericFunction pDeInitSystray = disabled_deInitSystray;
-
-void LoadModule()
-{
-#ifdef ENABLE_QUICKSTART_APPLET
-#  ifdef _WIN32
-pInitSystray = win32_init_sys_tray;
-pDeInitSystray = win32_shutdown_sys_tray;
-#  elif defined MACOSX
-pInitSystray = aqua_init_systray;
-pDeInitSystray = aqua_shutdown_systray;
-#  endif // MACOSX
-#endif // ENABLE_QUICKSTART_APPLET
-}
-
-}
-
 void ShutdownIcon::initSystray()
 {
 if (m_bInitialized)
 return;
 m_bInitialized = true;
 
-static std::once_flag flag;
-std::call_once(flag, LoadModule);
-m_bVeto = true;
-pInitSystray();
+#ifdef ENABLE_QUICKSTART_APPLET
+#  ifdef _WIN32
+win32_init_sys_tray();
+#  elif defined MACOSX
+aqua_init_systray();
+#  endif // MACOSX
+#endif // ENABLE_QUICKSTART_APPLET
 }
 
 void ShutdownIcon::deInitSystray()
@@ -147,12 +123,15 @@ void ShutdownIcon::deInitSystray()
 if (!m_bInitialized)
 return;
 
-if (pDeInitSystray)
-pDeInitSystray();
+#ifdef ENABLE_QUICKSTART_APPLET
+#  ifdef _WIN32
+win32_shutdown_sys_tray();
+#  elif defined MACOSX
+aqua_shutdown_systray();
+#  endif // MACOSX
+#endif // ENABLE_QUICKSTART_APPLET
 
 m_bVeto = false;
-pInitSystray = nullptr;
-pDeInitSystray = nullptr;
 
 m_pFileDlg.reset();
 m_bInitialized = false;

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

[Mike Kaganski (via logerrit)]

 basic/source/classes/image.cxx |   23 +--
 1 file changed, 9 insertions(+), 14 deletions(-)

New commits:
commit 736ef4ab060255b223324b73259af88b9c30f537
Author: Mike Kaganski 
AuthorDate: Tue Aug 10 21:19:32 2021 +0200
Commit: Mike Kaganski 
CommitDate: Tue Aug 10 22:48:48 2021 +0200

No need in this function

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

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 50ccbfa09669..229dc8058518 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -61,11 +61,6 @@ void SbiImage::Clear()
 bError = false;
 }
 
-static bool SbiGood( SvStream const & r )
-{
-return r.good();
-}
-
 // Open Record
 static sal_uInt64 SbiOpenRecord( SvStream& r, FileOffset nSignature, 
sal_uInt16 nElem )
 {
@@ -218,14 +213,14 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 nCount = nMaxStrings;
 }
 MakeStrings( nCount );
-for( size_t i = 0; i < mvStringOffsets.size() && SbiGood( r ); 
i++ )
+for (size_t i = 0; i < mvStringOffsets.size() && r.good(); i++)
 {
 sal_uInt32 nOff;
 r.ReadUInt32( nOff );
 mvStringOffsets[ i ] = static_cast(nOff);
 }
 r.ReadUInt32( nLen );
-if( SbiGood( r ) )
+if (r.good())
 {
 pStrings.reset(new sal_Unicode[ nLen ]);
 nStringSize = static_cast(nLen);
@@ -369,7 +364,7 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 }
 done:
 r.Seek( nLast );
-if( !SbiGood( r ) )
+if (!r.good())
 {
 bError = true;
 }
@@ -410,28 +405,28 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
   .WriteInt32( 0 );
 
 // Name?
-if( !aName.isEmpty() && SbiGood( r ) )
+if (!aName.isEmpty() && r.good())
 {
 nPos = SbiOpenRecord( r, FileOffset::Name, 1 );
 r.WriteUniOrByteString( aName, eCharSet );
 SbiCloseRecord( r, nPos );
 }
 // Comment?
-if( !aComment.isEmpty() && SbiGood( r ) )
+if (!aComment.isEmpty() && r.good())
 {
 nPos = SbiOpenRecord( r, FileOffset::Comment, 1 );
 r.WriteUniOrByteString( aComment, eCharSet );
 SbiCloseRecord( r, nPos );
 }
 // Source?
-if( !aOUSource.isEmpty() && SbiGood( r ) )
+if (!aOUSource.isEmpty() && r.good())
 {
 nPos = SbiOpenRecord( r, FileOffset::Source, 1 );
 r.WriteUniOrByteString( aOUSource, eCharSet );
 SbiCloseRecord( r, nPos );
 }
 // Binary data?
-if (aCode.size() && SbiGood(r))
+if (aCode.size() && r.good())
 {
 nPos = SbiOpenRecord( r, FileOffset::PCode, 1 );
 if ( bLegacy )
@@ -453,7 +448,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
 nPos = SbiOpenRecord( r, FileOffset::StringPool, 
mvStringOffsets.size() );
 // For every String:
 //  sal_uInt32 Offset of the Strings in the Stringblock
-for( size_t i = 0; i < mvStringOffsets.size() && SbiGood( r ); i++ )
+for (size_t i = 0; i < mvStringOffsets.size() && r.good(); i++)
 {
 r.WriteUInt32( mvStringOffsets[ i ] );
 }
@@ -559,7 +554,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
 }
 // Set overall length
 SbiCloseRecord( r, nStart );
-if( !SbiGood( r ) )
+if (!r.good())
 {
 bError = true;
 }

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

[Justin Luth (via logerrit)]

 dev/null   |binary
 sw/qa/extras/layout/layout.cxx |   18 -
 sw/qa/extras/odfexport/data/tdf104254_noHeaderWrapping.odt |binary
 sw/qa/extras/odfexport/odfexport2.cxx  |   10 +++
 sw/qa/extras/ww8export/ww8export3.cxx  |   14 --
 sw/source/core/text/txtfly.cxx |8 ++---
 6 files changed, 13 insertions(+), 37 deletions(-)

New commits:
commit c5abee7aefb088a11fc1618bc1512413e9bde682
Author: Justin Luth 
AuthorDate: Mon Aug 2 14:39:27 2021 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:30:25 2021 +0200

Revert "tdf#104254 sw DOCX import: fix text wrapping in headers"

This reverts 7.2 commit 798b69087119c01a3b51e0bb3240ef35cfededeb.
The change affected not only DOCX compatibilityMode 15,
but also DOC and ODT and older versions of DOCX
and everything else which should not have been affected.

This reverted change of course affected layout.
Some bug documents didn't loop after this layout breakage.
That doesn't mean that those bugs were fixed.
So just revert the tests:

Revert "tdf#96840: sw_ww8export3: Add unittest"
This reverts commit 975488594fc88aaba7298448e0ff727ebca7fe85.

Revert "tdf#64997: sw_ww8export3: Add unittest"
This reverts commit 02af9b8ef1f87bb6bc5fee22ad184681b20f201a.

Change-Id: I54f7b801199bba45d8ca6f82f77e7060c7b3fcf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119887
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: Justin Luth 
Reviewed-by: László Németh 
(cherry picked from commit d03aaef3dcb5d142955457ae9b8ca4469cfafa38)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119973
Tested-by: Justin Luth 
Reviewed-by: Xisco Fauli 
(cherry picked from commit ff91ddf0a3992b58112f3ffc3e76735b9d66e514)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120144
Reviewed-by: Christian Lohmaier 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/layout/data/tdf104254.docx 
b/sw/qa/extras/layout/data/tdf104254.docx
deleted file mode 100644
index a074db337024..
Binary files a/sw/qa/extras/layout/data/tdf104254.docx and /dev/null differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 4940a37e41c4..12fb7c421967 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3253,24 +3253,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124770)
 assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1);
 }
 
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTextWrappingInHeader)
-{
-SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf104254.docx");
-
-std::shared_ptr xMetaFile = 
pDoc->GetDocShell()->GetPreviewMetaFile();
-MetafileXmlDump dumper;
-xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
-CPPUNIT_ASSERT(pXmlDoc);
-assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray", 2);
-
-// Make sure the header image does not block any of the header text.
-// Without the accompanying fix in place, this test would have failed with:
-// - Expected: > 3000
-// - Actual  : 2009
-OUString sTextArrayX = getXPath(pXmlDoc, 
"/metafile/push[1]/push[1]/push[1]/textarray[1]", "x");
-CPPUNIT_ASSERT(sTextArrayX.toUInt32() > 3000);
-}
-
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testContinuousEndnotesInsertPageAtStart)
 {
 // Create a new document with CONTINUOUS_ENDNOTES enabled.
diff --git a/sw/qa/extras/odfexport/data/tdf104254_noHeaderWrapping.odt 
b/sw/qa/extras/odfexport/data/tdf104254_noHeaderWrapping.odt
new file mode 100644
index ..06dde4802b43
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/tdf104254_noHeaderWrapping.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport2.cxx 
b/sw/qa/extras/odfexport/odfexport2.cxx
index bbe5d7f193e7..68571cd8b863 100644
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -39,6 +39,16 @@ DECLARE_ODFEXPORT_TEST(testTdf52065_centerTabs, 
"testTdf52065_centerTabs.odt")
 CPPUNIT_ASSERT_EQUAL(OUString(u"Pečiatka zamestnávateľa"), 
parseDump("//body/txt[4]/Text[4]", "Portion"));
 }
 
+DECLARE_ODFEXPORT_TEST(testTdf104254_noHeaderWrapping, 
"tdf104254_noHeaderWrapping.odt")
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+sal_Int32 nParaHeight = getXPath(pXmlDoc, "//header/txt[1]/infos/bounds", 
"height").toInt32();
+// The wrapping on header images is supposed to be ignored (since OOo for 
MS compat reasons),
+// thus making the text run underneath the image. Before, height was 1104. 
Now it is 552.
+CPPUNIT_ASSERT_MESSAGE("Paragraph should fit on a single line", 
nParaHeight < 600);
+}
+
 DECLARE_ODFEXPORT_TEST(testTdf137199, "tdf137199.docx")
 {
 CPPUNIT_ASSERT_EQUAL(OUString(">1<"), 

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

[Caolán McNamara (via logerrit)]

 include/svtools/brwbox.hxx   |1 
 include/svtools/editbrowsebox.hxx|   26 ++
 reportdesign/source/ui/dlg/GroupsSorting.cxx |4 -
 reportdesign/source/ui/inc/GroupsSorting.hxx |2 
 svtools/source/brwbox/brwbox2.cxx|4 +
 svtools/source/brwbox/ebbcontrols.cxx|   24 ++
 svtools/source/brwbox/editbrowsebox.cxx  |   11 +-
 svx/source/fmcomp/gridcell.cxx   |  103 ++-
 svx/source/inc/gridcell.hxx  |   23 +++---
 9 files changed, 114 insertions(+), 84 deletions(-)

New commits:
commit d48afb9ae5d78d40ad826b4f1ed047b0fb93e1e4
Author: Caolán McNamara 
AuthorDate: Thu Feb 18 17:22:31 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 20:25:49 2021 +0200

Resolves: tdf#143023 explicitly connect to ControlBase focus-[in/out]

instead of listening to the generic vcl::Window/Control focus events.
The thing which really gets/loses focus is now a Widget hosted inside
the ControlBase.

also contains...

fix comment

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

establish that DbCellControl Window member is always a ControlBase

and remove resulting known redundant dynamic_casting

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

EventWindow is always a svt::ControlBase

update DataBrowser has-focus when child widget loses focus

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

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

reportdesigner focus out handler clobbering the preexisting handler

set by the databrowser, so chain one after the other

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

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

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index b865b0957129..c14ecdb84a07 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -588,6 +588,7 @@ public:
 tools::Rectangle   GetControlArea() const;
 virtual boolProcessKey(const KeyEvent& rEvt);
 virtual voidChildFocusIn();
+virtual voidChildFocusOut();
 voidDispatch( sal_uInt16 nId );
 voidSetMode( BrowserMode nMode );
 BrowserMode GetMode( ) const { return m_nCurrentMode; }
diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 34696522bd78..a1badb8cce80 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -171,9 +171,26 @@ namespace svt
 virtual void SetEditableReadOnly(bool bReadOnly);
 
 virtual bool ProcessKey(const KeyEvent& rKEvt);
+
+// chain after the FocusInHdl
+void SetFocusInHdl(const Link& rHdl)
+{
+m_aFocusInHdl = rHdl;
+}
+
+// chain after the FocusOutHdl
+void SetFocusOutHdl(const Link& rHdl)
+{
+m_aFocusOutHdl = rHdl;
+}
+
 protected:
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
 DECL_LINK(FocusInHdl, weld::Widget&, void);
+DECL_LINK(FocusOutHdl, weld::Widget&, void);
+private:
+Link m_aFocusInHdl;
+Link m_aFocusOutHdl;
 };
 
 class SVT_DLLPUBLIC EditControlBase : public ControlBase
@@ -191,6 +208,7 @@ namespace svt
 weld::Entry& get_widget() { return *m_pEntry; }
 
 virtual void connect_changed(const Link& rLink) = 
0;
+virtual void connect_focus_out(const Link& rLink) 
= 0;
 
 protected:
 void InitEditControlBase(weld::Entry* pEntry);
@@ -211,6 +229,11 @@ namespace svt
 m_xWidget->connect_changed(rLink);
 }
 
+virtual void connect_focus_out(const Link& rLink) 
override
+{
+m_xWidget->connect_focus_out(rLink);
+}
+
 protected:
 std::unique_ptr m_xWidget;
 };
@@ 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dbaccess/source formula/source include/formula include/vcl sc/source svx/source sw/source vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/app/AppDetailView.cxx   |1 -
 formula/source/ui/dlg/funcutl.cxx  |8 
 include/formula/funcutl.hxx|5 -
 include/vcl/customweld.hxx |9 +
 sc/source/ui/app/inputwin.cxx  |1 +
 svx/source/dialog/weldeditview.cxx |3 +++
 svx/source/inc/findtextfield.hxx   |2 --
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |6 --
 sw/source/ui/dbui/createaddresslistdialog.cxx  |1 -
 sw/source/uibase/inc/conttree.hxx  |2 --
 vcl/source/app/salvtables.cxx  |9 +
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   16 
 12 files changed, 18 insertions(+), 45 deletions(-)

New commits:
commit 87917d2b05fd2fbc3bf15ab23fbfcc73f54153ed
Author: Caolán McNamara 
AuthorDate: Thu Apr 22 17:26:31 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 20:25:33 2021 +0200

undo blocking emitting focus events during grab_focus

revert...

commit f97dbac73fe149e8fed0932890d0c1d6be4869a3
Author: Caolán McNamara 
Date:   Wed Jun 26 21:00:02 2019 +0100

infinite focus changing in toc biblio page

which blocked calling focus-changed callbacks when grab_focus is called
explicitly analogous to how we block value-changed callbacks setting
values through code but don't block them when the value is changed by
user interaction.

In retrospect that was a poor choice, so revert that and subsequent
workarounds in favour of just not calling gtk_grab_focus if the widget
already has focus.

checked:
a) tdf#138427 focus set to wrong input box
b) tdf#138078 only call GetFocus if we gained focus from an unfocused state
c) tdf#137993 ensure the toplevel vcl::Window is activated
d) tdf#136941 call focus in handler explicitly

Change-Id: I411480e2d627aa9995fb41b0aa17e9fb6d34d73f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114524
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit db1cf111666847ce5ce93d18ae5ae8c29a4c44d6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120079
Reviewed-by: Michael Stahl 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx 
b/dbaccess/source/ui/app/AppDetailView.cxx
index eba80dbfb4ec..6c56c6052282 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -84,7 +84,6 @@ void OTasksWindow::GrabFocus()
 if (!m_xTreeView)
 return;
 m_xTreeView->grab_focus();
-FocusInHdl(*m_xTreeView);
 }
 
 bool OTasksWindow::HasChildPathFocus() const
diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index 361ec4c9ebaa..58c2492c5505 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -357,14 +357,6 @@ bool RefEdit::KeyInput(const KeyEvent& rKEvt)
 return false;
 }
 
-void RefEdit::GrabFocus()
-{
-bool bHadFocus = xEntry->has_focus();
-xEntry->grab_focus();
-if (!bHadFocus && xEntry->has_focus())
-GetFocus();
-}
-
 void RefEdit::GetFocus()
 {
 maGetFocusHdl.Call(*this);
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 4e008181eae7..4ed4b407c480 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -93,7 +93,10 @@ public:
 Modify(*xEntry);
 }
 
-void GrabFocus();
+void GrabFocus()
+{
+xEntry->grab_focus();
+}
 
 void SelectAll()
 {
diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index b19b64bf980e..64f980732dfb 100644
--- a/include/vcl/customweld.hxx
+++ b/include/vcl/customweld.hxx
@@ -63,14 +63,7 @@ public:
 }
 virtual void Show() { m_pDrawingArea->show(); }
 virtual void Hide() { m_pDrawingArea->hide(); }
-void GrabFocus()
-{
-bool bHadFocus = m_pDrawingArea->has_focus();
-m_pDrawingArea->grab_focus();
-// tdf#138078 only call GetFocus if we gained focus from an unfocused 
state
-if (!bHadFocus && m_pDrawingArea->has_focus())
-GetFocus();
-}
+void GrabFocus() { m_pDrawingArea->grab_focus(); }
 bool HasFocus() const { return m_pDrawingArea->has_focus(); }
 bool IsVisible() const { return m_pDrawingArea->get_visible(); }
 bool IsReallyVisible() const { return m_pDrawingArea->is_visible(); }
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6307eee3edd7..fadce637d2c5 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2104,6 +2104,7 @@ void ScTextWnd::StyleUpdated()
 void ScTextWnd::TextGrabFocus()
 {
 GrabFocus();
+GetFocus();
 }
 
 // Position window
diff --git a/svx/source/dialog/weldeditview.cxx 
b/svx/source/dialog/weldeditview.cxx
index 56ce13f12c3a..48819345fa55 100644
--- 

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

[Mike Kaganski (via logerrit)]

 basic/source/classes/image.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e510b3089024e451b57d6150f6f1a5a34594e376
Author: Mike Kaganski 
AuthorDate: Tue Aug 10 18:26:23 2021 +0200
Commit: Mike Kaganski 
CommitDate: Tue Aug 10 20:56:38 2021 +0200

Use nStringSize instead of nStringOff

nStringSize is the actual size of the string block, and is the correct
end position to use to calculate last string length. nStringOff is not
updated during load, so using it makes no sense here.

It was this way ever since 039dbbcb9688971a85b1791f60a55693ff3ba261.

Change-Id: I4fad1bdd6ed4af9dd7d29b5438ec23db0b815806
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120243
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 73d65e98eab9..50ccbfa09669 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -655,7 +655,7 @@ OUString SbiImage::GetString( short nId, SbxDataType *eType 
) const
 sal_uInt32 nOff = mvStringOffsets[ nId - 1 ];
 sal_Unicode* pStr = pStrings.get() + nOff;
 
-sal_uInt32 nNextOff = (nId < short(mvStringOffsets.size())) ? 
mvStringOffsets[ nId ] : nStringOff;
+sal_uInt32 nNextOff = (nId < short(mvStringOffsets.size())) ? 
mvStringOffsets[ nId ] : nStringSize;
 sal_uInt32 nLen = nNextOff - nOff - 1;
 // #i42467: Special treatment for vbNullChar
 if (*pStr == 0)

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

[Miklos Vajna (via logerrit)]

 embeddedobj/source/commonembedding/miscobj.cxx   |   46 +++
 embeddedobj/source/commonembedding/specialobject.cxx |   18 +++
 embeddedobj/source/general/dummyobject.cxx   |   16 ++
 embeddedobj/source/inc/commonembobj.hxx  |   12 
 embeddedobj/source/inc/dummyobject.hxx   |8 ++-
 embeddedobj/source/inc/oleembobj.hxx |9 +++
 embeddedobj/source/inc/specialobject.hxx |5 ++
 embeddedobj/source/msole/olemisc.cxx |   16 ++
 8 files changed, 128 insertions(+), 2 deletions(-)

New commits:
commit 15a524a1ed2bf464b0b727e628bb5af9685f49b9
Author: Miklos Vajna 
AuthorDate: Tue Aug 10 16:37:15 2021 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 10 22:02:00 2021 +0200

embeddedobj: implement XServiceInfo in the various embedded obj 
implementations

This gives UNO clients a reliable way to detect e.g.
OSpecialEmbeddedObject, where it's expected that double-clicking on the
object doesn't do anything.

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

diff --git a/embeddedobj/source/commonembedding/miscobj.cxx 
b/embeddedobj/source/commonembedding/miscobj.cxx
index 8d2cb7332a40..9427e0639b92 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -38,6 +38,7 @@
 
 #include 
 #include 
+#include 
 
 #include "persistence.hxx"
 
@@ -400,6 +401,16 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface( 
const uno::Type& rType
 void* p = static_cast(this);
 return uno::Any(, rType);
 }
+else if (rType == cppu::UnoType::get())
+{
+void* p = static_cast(this);
+return uno::Any(, rType);
+}
+else if (rType == cppu::UnoType::get())
+{
+void* p = static_cast(this);
+return uno::Any(, rType);
+}
 else
 aReturn = ::cppu::queryInterface(
 rType,
@@ -643,4 +654,39 @@ void SAL_CALL OCommonEmbeddedObject::removeEventListener( 
const uno::Reference<
 xListener );
 }
 
+OUString SAL_CALL OCommonEmbeddedObject::getImplementationName()
+{
+return "com.sun.star.comp.embed.OCommonEmbeddedObject";
+}
+
+sal_Bool SAL_CALL OCommonEmbeddedObject::supportsService(const OUString& 
ServiceName)
+{
+return cppu::supportsService(this, ServiceName);
+}
+
+uno::Sequence SAL_CALL 
OCommonEmbeddedObject::getSupportedServiceNames()
+{
+return { "com.sun.star.comp.embed.OCommonEmbeddedObject" };
+}
+
+uno::Sequence SAL_CALL OCommonEmbeddedObject::getTypes()
+{
+static const uno::Sequence aTypes{
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+};
+return aTypes;
+}
+
+uno::Sequence SAL_CALL OCommonEmbeddedObject::getImplementationId()
+{
+return uno::Sequence();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx 
b/embeddedobj/source/commonembedding/specialobject.cxx
index 683fe0aab3f2..809ffce1f2c4 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -51,6 +52,8 @@ uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( 
const uno::Type& rType
 static_cast< embed::XClassifiedObject* 
>( this ),
 static_cast< 
embed::XComponentSupplier* >( this ),
 static_cast< util::XCloseable* >( this 
),
+static_cast< lang::XServiceInfo* >( 
this ),
+static_cast< lang::XTypeProvider* >( 
this ),
 static_cast< 
document::XEventBroadcaster* >( this ) );
 if ( aReturn.hasValue() )
 return aReturn;
@@ -160,4 +163,19 @@ void SAL_CALL OSpecialEmbeddedObject::doVerb( sal_Int32 
nVerbID )
 OCommonEmbeddedObject::doVerb( nVerbID );
 }
 
+OUString SAL_CALL OSpecialEmbeddedObject::getImplementationName()
+{
+return "com.sun.star.comp.embed.OSpecialEmbeddedObject";
+}
+
+sal_Bool SAL_CALL OSpecialEmbeddedObject::supportsService(const OUString& 
ServiceName)
+{
+return cppu::supportsService(this, ServiceName);
+}
+
+uno::Sequence SAL_CALL 
OSpecialEmbeddedObject::getSupportedServiceNames()
+{
+return { "com.sun.star.comp.embed.OSpecialEmbeddedObject" };
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/general/dummyobject.cxx 

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

[Ankur Khandelwal (via logerrit)]

 chart2/source/inc/ModifyListenerCallBack.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 19b3b3b8a516fd7e76fba72ced43be539d01209a
Author: Ankur Khandelwal 
AuthorDate: Mon Aug 9 18:12:25 2021 +0530
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:25:28 2021 +0200

tdf#143148 Replaced #include guards with #pragma once.

Replace include guards with #pragma once in header file.

Change-Id: I078f97ef5f7ab44ee915c78ab5f4569bde9f6640
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120208
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx 
b/chart2/source/inc/ModifyListenerCallBack.hxx
index 5e6926d6295e..87011db56b24 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
-#define INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
+#pragma once
 
 #include 
 #include 
@@ -55,6 +54,4 @@ private: //member
 
 } // namespace chart
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Mike Kaganski (via logerrit)]

 sc/source/core/data/drwlayer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99420dc0b80df22d12519efca05803898fbfcfbd
Author: Mike Kaganski 
AuthorDate: Fri Jul 23 17:48:00 2021 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:33:11 2021 +0200

tdf#143515: avoid memory leak in ScDrawLayer::DeleteObjectsInArea

... and in ScDrawLayer::DeleteObjectsInSelection.
We are calling SdrObjList::RemoveObject, which orphans the object.
Let the undo object own the SdrObject, and dispose it when needed.

Was that way ever since d0484bcdcbffd42d242647a2fdc1a203d176b775
"initial import".

Change-Id: I5f2cb9d8ed0e02d45d2699af4a228c7fd097008c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119435
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120223
Reviewed-by: Michael Stahl 

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 5b70046e4448..1ead0b8fe872 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1598,7 +1598,7 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL 
nCol1,SCROW nRow1,
 
 if (bRecording)
 for (auto p : ppObj)
-AddCalcUndo(std::make_unique(*p));
+AddCalcUndo(std::make_unique(*p));
 
 for (auto p : ppObj)
 pPage->RemoveObject(p->GetOrdNum());
@@ -1668,7 +1668,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const 
ScMarkData& rMark )
 
 if (bRecording)
 for (auto p : ppObj)
-AddCalcUndo(std::make_unique(*p));
+AddCalcUndo(std::make_unique(*p));
 
 for (auto p : ppObj)
 pPage->RemoveObject(p->GetOrdNum());

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/makeshared.cxx  |5 -
 ucb/source/ucp/cmis/cmis_content.cxx  |   14 --
 ucb/source/ucp/cmis/cmis_repo_content.cxx |   16 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit 7bae79e234b12c56ecb11e10cb6318be873be846
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 20:51:45 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 21:58:46 2021 +0200

Use boost::make_shared

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

diff --git a/compilerplugins/clang/makeshared.cxx 
b/compilerplugins/clang/makeshared.cxx
index 9b512371d635..816d1269fac3 100644
--- a/compilerplugins/clang/makeshared.cxx
+++ b/compilerplugins/clang/makeshared.cxx
@@ -37,11 +37,6 @@ public:
 virtual bool preRun() override
 {
 StringRef fn(handler.getMainFileName());
-// uses boost::shared_ptr and we trigger because we're not looking 
specifically for std::shared_ptr
-if (loplugin::isSamePathname(fn, SRCDIR 
"/ucb/source/ucp/cmis/cmis_repo_content.cxx"))
-return false;
-if (loplugin::isSamePathname(fn, SRCDIR 
"/ucb/source/ucp/cmis/cmis_content.cxx"))
-return false;
 // TODO something weird with protected base classes going on here
 if (loplugin::isSamePathname(fn, SRCDIR 
"/sc/source/filter/excel/xeextlst.cxx"))
 return false;
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx 
b/ucb/source/ucp/cmis/cmis_content.cxx
index b5fb4ac3bda3..f4ad780444bc 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -10,6 +10,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -371,25 +373,25 @@ namespace cmis
 // reset the skip, so user gets a chance to cancel
 bSkipInitialPWAuth = false;
 
libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback);
-oauth2Data.reset( new libcmis::OAuth2Data(
+oauth2Data = boost::make_shared(
 GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
 GDRIVE_SCOPE, GDRIVE_REDIRECT_URI,
-GDRIVE_CLIENT_ID, GDRIVE_CLIENT_SECRET ) );
+GDRIVE_CLIENT_ID, GDRIVE_CLIENT_SECRET );
 }
 if ( m_aURL.getBindingUrl().startsWith( 
ALFRESCO_CLOUD_BASE_URL ) )
-oauth2Data.reset( new libcmis::OAuth2Data(
+oauth2Data = boost::make_shared(
 ALFRESCO_CLOUD_AUTH_URL, ALFRESCO_CLOUD_TOKEN_URL,
 ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
-ALFRESCO_CLOUD_CLIENT_ID, 
ALFRESCO_CLOUD_CLIENT_SECRET ) );
+ALFRESCO_CLOUD_CLIENT_ID, 
ALFRESCO_CLOUD_CLIENT_SECRET );
 if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
 {
 // reset the skip, so user gets a chance to cancel
 bSkipInitialPWAuth = false;
 
libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback);
-oauth2Data.reset( new libcmis::OAuth2Data(
+oauth2Data = boost::make_shared(
 ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL,
 ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
-ONEDRIVE_CLIENT_ID, ONEDRIVE_CLIENT_SECRET ) );
+ONEDRIVE_CLIENT_ID, ONEDRIVE_CLIENT_SECRET );
 }
 try
 {
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx 
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 87a3f38dc792..33ded7b33c76 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -166,23 +170,23 @@ namespace cmis
 if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL )
 {
 libcmis::SessionFactory::setOAuth2AuthCodeProvider( 
AuthProvider::copyWebAuthCodeFallback );
-oauth2Data.reset( new libcmis::OAuth2Data(
+oauth2Data = boost::make_shared(
 GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
 GDRIVE_SCOPE, GDRIVE_REDIRECT_URI,
-GDRIVE_CLIENT_ID, GDRIVE_CLIENT_SECRET ) );
+GDRIVE_CLIENT_ID, GDRIVE_CLIENT_SECRET );
 }

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

[Caolán McNamara (via logerrit)]

 include/svtools/editbrowsebox.hxx |9 ++
 svtools/source/brwbox/ebbcontrols.cxx |1 
 svx/source/fmcomp/gridcell.cxx|  103 +-
 svx/source/inc/gridcell.hxx   |   23 +++
 4 files changed, 61 insertions(+), 75 deletions(-)

New commits:
commit e77d6b92c51a8adf517fd283cf8984345bc3f8ce
Author: Caolán McNamara 
AuthorDate: Wed Aug 4 12:44:37 2021 +0100
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:52:56 2021 +0200

Resolves: tdf#143023 explicitly connect to ControlBase focus-[in/out]

instead of listening to the generic vcl::Window/Control focus events.
The thing which really gets/loses focus is now a Widget hosted inside
the ControlBase.

also contains...

fix comment

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

establish that DbCellControl Window member is always a ControlBase

and remove resulting known redundant dynamic_casting

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

EventWindow is always a svt::ControlBase

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

diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 0a9067d73733..052fe1d26092 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -172,18 +172,25 @@ namespace svt
 
 virtual bool ProcessKey(const KeyEvent& rKEvt);
 
-// chain after the FocusOutHdl
+// chain after the FocusInHdl
 void SetFocusInHdl(const Link& rHdl)
 {
 m_aFocusInHdl = rHdl;
 }
 
+// chain after the FocusOutHdl
+void SetFocusOutHdl(const Link& rHdl)
+{
+m_aFocusOutHdl = rHdl;
+}
+
 protected:
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
 DECL_LINK(FocusInHdl, weld::Widget&, void);
 DECL_LINK(FocusOutHdl, weld::Widget&, void);
 private:
 Link m_aFocusInHdl;
+Link m_aFocusOutHdl;
 };
 
 class SVT_DLLPUBLIC EditControlBase : public ControlBase
diff --git a/svtools/source/brwbox/ebbcontrols.cxx 
b/svtools/source/brwbox/ebbcontrols.cxx
index 3b1819e94923..32ad1e52c748 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -362,6 +362,7 @@ namespace svt
 
 IMPL_LINK_NOARG(ControlBase, FocusOutHdl, weld::Widget&, void)
 {
+m_aFocusOutHdl.Call(nullptr);
 
static_cast(GetParent())->GetParent()->ChildFocusOut();
 }
 
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index cb5129e89326..f768d4cb134b 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -801,16 +801,12 @@ void DbCellControl::implAdjustReadOnly( const Reference< 
XPropertySet >& _rxMode
 if ( !(m_pWindow && _rxModel.is()) )
 return;
 
-ControlBase* pEditWindow = dynamic_cast(m_pWindow.get());
-if ( pEditWindow )
+bool bReadOnly = m_rColumn.IsReadOnly();
+if ( !bReadOnly )
 {
-bool bReadOnly = m_rColumn.IsReadOnly();
-if ( !bReadOnly )
-{
-_rxModel->getPropertyValue( i_bReadOnly ? 
OUString(FM_PROP_READONLY) : OUString(FM_PROP_ISREADONLY)) >>= bReadOnly;
-}
-pEditWindow->SetEditableReadOnly(bReadOnly);
+_rxModel->getPropertyValue( i_bReadOnly ? OUString(FM_PROP_READONLY) : 
OUString(FM_PROP_ISREADONLY)) >>= bReadOnly;
 }
+m_pWindow->SetEditableReadOnly(bReadOnly);
 }
 
 void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& 
_rxModel )
@@ -1920,7 +1916,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const 
Reference< XPropertySe
 rPaintFormatter.SetFormat( sFormatString, aAppLanguage );
 }
 
-VclPtr DbNumericField::createField(BrowserDataWin* pParent, bool 
bSpinButton, const Reference& /*rxModel*/)
+VclPtr DbNumericField::createField(BrowserDataWin* pParent, 
bool bSpinButton, const Reference& /*rxModel*/)
 {
 return VclPtr::Create(pParent, bSpinButton);
 }
@@ -2040,7 +2036,7 @@ void DbCurrencyField::implAdjustGenericFieldSetting( 
const Reference< XPropertyS
 rPaintCurrencyFormatter.SetCurrencySymbol(aStr);
 }
 
-VclPtr DbCurrencyField::createField(BrowserDataWin* pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*rxModel*/)
+VclPtr DbCurrencyField::createField(BrowserDataWin* pParent, 
bool bSpinButton, const Reference< XPropertySet >& /*rxModel*/)
 {
 return VclPtr::Create(pParent, bSpinButton);
 }
@@ -2123,7 +2119,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn )
 

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

[Caolán McNamara (via logerrit)]

 shell/source/backends/kf5be/kf5backend.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 626cf243134961511b71351d65e4161d7c25c45e
Author: Caolán McNamara 
AuthorDate: Tue Aug 10 16:34:03 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 20:24:00 2021 +0200

drop final boost::noncopyable use

we replaced all the others, so replace this one too

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

diff --git a/shell/source/backends/kf5be/kf5backend.cxx 
b/shell/source/backends/kf5be/kf5backend.cxx
index e448c124d88a..e9e10e60fd27 100644
--- a/shell/source/backends/kf5be/kf5backend.cxx
+++ b/shell/source/backends/kf5be/kf5backend.cxx
@@ -23,7 +23,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -50,13 +49,16 @@
 
 namespace
 {
-class Service : public cppu::WeakImplHelper,
-private boost::noncopyable
+class Service : public cppu::WeakImplHelper
 {
 public:
 Service();
 
 private:
+// noncopyable until we have good reasons...
+Service(const Service&) = delete;
+Service& operator=(const Service&) = delete;
+
 virtual ~Service() override {}
 
 virtual OUString SAL_CALL getImplementationName() override

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

[Emircan Agac (via logerrit)]

 store/source/storbios.hxx |5 +
 store/source/storcach.hxx |5 +
 store/source/stordata.hxx |5 +
 store/source/stordir.hxx  |5 +
 store/source/storlckb.hxx |5 +
 store/source/storpage.hxx |5 +
 6 files changed, 6 insertions(+), 24 deletions(-)

New commits:
commit 1788dbb32fd212a716ffca4facfc421c59f9ef5a
Author: Emircan Agac 
AuthorDate: Thu Aug 5 17:25:03 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Aug 10 20:59:22 2021 +0200

tdf#143148:Use pragma once in store

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

diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 6ba09a876e50..3cea84bb2494 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORBIOS_HXX
-#define INCLUDED_STORE_SOURCE_STORBIOS_HXX
+#pragma once
 
 #include 
 #include 
@@ -186,6 +185,4 @@ inline bool OStorePageBIOS::isValid() const
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORBIOS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 7032ade7b2dd..cd4672e1980b 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORCACH_HXX
-#define INCLUDED_STORE_SOURCE_STORCACH_HXX
+#pragma once
 
 #include 
 
@@ -106,6 +105,4 @@ storeError PageCache_createInstance (
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORCACH_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index 7662bbe3bdbe..7b5b8a0b8467 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORDATA_HXX
-#define INCLUDED_STORE_SOURCE_STORDATA_HXX
+#pragma once
 
 #include 
 
@@ -746,6 +745,4 @@ private:
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORDATA_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index f9845bc295eb..6d0011124378 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORDIR_HXX
-#define INCLUDED_STORE_SOURCE_STORDIR_HXX
+#pragma once
 
 #include 
 
@@ -110,6 +109,4 @@ SAL_CALL query (OStoreObject *pHandle, SAL_UNUSED_PARAMETER 
OStoreDirectory_Impl
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORDIR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index b31bcd28de6e..7d4231dc08f3 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORLCKB_HXX
-#define INCLUDED_STORE_SOURCE_STORLCKB_HXX
+#pragma once
 
 #include 
 
@@ -135,6 +134,4 @@ SAL_CALL query (OStoreObject *pHandle, SAL_UNUSED_PARAMETER 
OStoreLockBytes*)
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORLCKB_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 4a03c736c495..46c61763964b 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORPAGE_HXX
-#define INCLUDED_STORE_SOURCE_STORPAGE_HXX
+#pragma once
 
 #include 
 #include 
@@ -153,6 +152,4 @@ SAL_CALL query (OStoreObject *pHandle, SAL_UNUSED_PARAMETER 
OStorePageManager*)
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORPAGE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx|8 
 cui/source/customize/cfgutil.cxx   |2 ++
 cui/source/inc/acccfg.hxx  |5 +
 cui/source/inc/cfgutil.hxx |5 +
 filter/source/msfilter/msvbahelper.cxx |4 ++--
 include/sfx2/minfitem.hxx  |7 +--
 sfx2/source/control/minfitem.cxx   |4 
 7 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit c54da86b850e079b4d6f0249fe7c5956ed5c400a
Author: Caolán McNamara 
AuthorDate: Tue Aug 10 19:47:45 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 22:12:04 2021 +0200

add some --disable-scripting fixes

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

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index d850da88f70b..2701e7204f34 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -61,6 +61,8 @@
 #include 
 #include 
 #include 
+#include 
+
 // namespaces
 
 using namespace css;
@@ -824,7 +826,9 @@ 
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage,
weld::DialogController* 
pController,
const SfxItemSet& aSet)
 : SfxTabPage(pPage, pController, "cui/ui/accelconfigpage.ui", 
"AccelConfigPage", )
+#if HAVE_FEATURE_SCRIPTING
 , m_pMacroInfoItem()
+#endif
 , aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG))
 , aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG))
 , aFilterAllStr(SfxResId(STR_SFX_FILTERNAME_ALL))
@@ -1514,12 +1518,16 @@ void SfxAcceleratorConfigPage::Reset(const SfxItemSet* 
rSet)
 
 RadioHdl(*m_xOfficeButton);
 
+#if HAVE_FEATURE_SCRIPTING
 const SfxPoolItem* pMacroItem = nullptr;
 if (SfxItemState::SET == rSet->GetItemState(SID_MACROINFO, true, 
))
 {
 m_pMacroInfoItem = _cast(*pMacroItem);
 m_xGroupLBox->SelectMacro(m_pMacroInfoItem);
 }
+#else
+(void)rSet;
+#endif
 }
 
 sal_Int32 SfxAcceleratorConfigPage::MapKeyCodeToPos(const vcl::KeyCode& aKey) 
const
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 685af57c83b7..dc6b073eea6d 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1022,6 +1022,7 @@ IMPL_LINK(CuiConfigGroupListBox, ExpandingHdl, const 
weld::TreeIter&, rIter, boo
 return true;
 }
 
+#if HAVE_FEATURE_SCRIPTING
 void CuiConfigGroupListBox::SelectMacro( const SfxMacroInfoItem *pItem )
 {
 SelectMacro( pItem->GetBasicManager()->GetName(),
@@ -1097,6 +1098,7 @@ void CuiConfigGroupListBox::SelectMacro( 
std::u16string_view rBasic,
 }
 } while (m_xTreeView->iter_next_sibling(*xIter));
 }
+#endif
 
 /*
  * Implementation of SvxScriptSelectorDialog
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ee9e56222113..e9207d5a1add 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -28,9 +28,12 @@
 #include 
 #include 
 #include 
+#include 
 #include "cfgutil.hxx"
 
+#if HAVE_FEATURE_SCRIPTING
 class SfxMacroInfoItem;
+#endif
 class CuiConfigFunctionListBox;
 class SfxAcceleratorConfigPage;
 class SfxStringItem;
@@ -76,7 +79,9 @@ enum class StartFileDialogType
 class SfxAcceleratorConfigPage : public SfxTabPage
 {
 private:
+#if HAVE_FEATURE_SCRIPTING
 const SfxMacroInfoItem* m_pMacroInfoItem;
+#endif
 std::unique_ptr m_pFileDlg;
 
 OUString aLoadAccelConfigStr;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 15d82db18e8d..8040b90afa8f 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -31,10 +31,13 @@
 #include 
 #include 
 #include 
+#include 
 
 class Button;
 class SaveInData;
+#if HAVE_FEATURE_SCRIPTING
 class SfxMacroInfoItem;
+#endif
 
 struct SfxStyleInfo_Impl
 {
@@ -225,8 +228,10 @@ public:
 voidSetFunctionListBox( CuiConfigFunctionListBox *pBox )
 { m_pFunctionListBox = pBox; }
 voidGroupSelected();
+#if HAVE_FEATURE_SCRIPTING
 voidSelectMacro(const SfxMacroInfoItem*);
 voidSelectMacro(std::u16string_view, const OUString&);
+#endif
 voidSetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
 
diff --git a/filter/source/msfilter/msvbahelper.cxx 
b/filter/source/msfilter/msvbahelper.cxx
index 3f28fb1385ff..d682eb954e85 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -224,6 +224,8 @@ static bool hasMacro( SfxObjectShell const * pShell, const 
OUString& sLibrary, O
 
 #endif
 
+#if HAVE_FEATURE_SCRIPTING
+
 OUString getDefaultProjectName( SfxObjectShell const * pShell )
 {
 OUString aPrjName;
@@ -236,8 +238,6 @@ OUString getDefaultProjectName( SfxObjectShell const * 

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

[Michael Meeks (via logerrit)]

 vcl/README.lifecycle  |   12 ++--
 vcl/source/window/window.cxx  |5 +++--
 vcl/source/window/window2.cxx |2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 82613b809e858bebb13425c4b264f5f0ce964684
Author: Michael Meeks 
AuthorDate: Mon Aug 2 13:38:31 2021 +0100
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:16:15 2021 +0200

vcl: avoid native widget pieces for disposed BorderWindow.

Fixes crash around help windows:
vcl::Window::IsCompoundControl() const
vcl/source/window/window2.cxx:1200
vcl::Window::Show(bool, ShowFlags)
vcl/source/window/window.cxx:2243 (discriminator 3)
vcl::Window::Show(bool, ShowFlags)
vcl/source/window/window.cxx:2298
HelpTextWindow::ImplShow()
vcl/source/app/help.cxx:371
Scheduler::ProcessTaskScheduling()
vcl/source/app/scheduler.cxx:495

Change-Id: Ia0205813f3e9d306314577d59d6cdd1bdfa0ee71
Signed-off-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119854
Tested-by: Jenkins
(cherry picked from commit ab281c561f7fa7a3512875a22423693dca84316a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119868
Reviewed-by: Michael Stahl 

diff --git a/vcl/README.lifecycle b/vcl/README.lifecycle
index a309b65ef9ea..9933e40f0955 100644
--- a/vcl/README.lifecycle
+++ b/vcl/README.lifecycle
@@ -73,8 +73,8 @@ to lingering pointers to freed objects.
VclPtr pButton;
...
assert (pButton == nullptr || !pButton);// null
-   assert (pButton && !pButton->IsDisposed()); // alive
-   assert (pButton &&  pButton->IsDisposed()); // disposed
+   assert (pButton && !pButton->isDisposed()); // alive
+   assert (pButton &&  pButton->isDisposed()); // disposed
 
 ** ScopedVclPtr - making disposes easier
 
@@ -189,8 +189,6 @@ ways and often both.
 
 -- What remains to be done ? --
 
-   * Cleanup DogTags
-
* Expand the VclPtr pattern to many other less
  than safe VCL types.
 
@@ -214,12 +212,6 @@ ways and often both.
  in 'get()' calls - to avoid needing explicit 'clear'
  code in destructors.
 
-   * VclBuilder 'makeFoo' methods
-   + these should return VclPtr<> types and have their
- signatures adjusted en-masse.
-   + currently we use a VclPtr<> constructor with
- SAL_NO_ACQUIRE inside the builder.
-
 -- FAQ / debugging hints --
 
 ** Compile with dbgutil
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 88c618dd1254..e08e31763566 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2272,7 +2272,8 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
 // inherit native widget flag for form controls
 // required here, because frames never show up in the child hierarchy 
- which should be fixed...
 // eg, the drop down of a combobox which is a system floating window
-if( mpWindowImpl->mbFrame && GetParent() && 
GetParent()->IsCompoundControl() &&
+if( mpWindowImpl->mbFrame && GetParent() && !GetParent()->isDisposed() 
&&
+GetParent()->IsCompoundControl() &&
 GetParent()->IsNativeWidgetEnabled() != IsNativeWidgetEnabled() &&
 !(GetStyle() & WB_TOOLTIPWIN) )
 {
@@ -3692,7 +3693,7 @@ void Window::EnableNativeWidget( bool bEnable )
 
 bool Window::IsNativeWidgetEnabled() const
 {
-return ImplGetWinData()->mbEnableNativeWidget;
+return mpWindowImpl && ImplGetWinData()->mbEnableNativeWidget;
 }
 
 Reference< css::rendering::XCanvas > WindowOutputDevice::ImplGetCanvas( bool 
bSpriteCanvas ) const
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 5477e98be940..8f3d624c5d3f 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1190,7 +1190,7 @@ GetFocusFlags Window::GetGetFocusFlags() const
 
 bool Window::IsCompoundControl() const
 {
-return mpWindowImpl->mbCompoundControl;
+return mpWindowImpl && mpWindowImpl->mbCompoundControl;
 }
 
 bool Window::IsWait() const

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

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/gtk/gtkinst.hxx |2 
 vcl/unx/gtk3/gtkinst.cxx|  338 
 2 files changed, 5 insertions(+), 335 deletions(-)

New commits:
commit 958a39425faa7c5ec3c422ac0de9fac7f79cad8e
Author: Caolán McNamara 
AuthorDate: Tue Jul 6 12:07:42 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 20:25:04 2021 +0200

gtk4: remove training wheels

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

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 5fb0b67b2b8f..581b1fe212c5 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -290,10 +290,8 @@ public:
 virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() 
override;
 virtual OpenGLContext* CreateOpenGLContext() override;
 virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const 
OUString& rUIRoot, const OUString& rUIFile) override;
-#if !GTK_CHECK_VERSION(4, 0, 0)
 virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const 
OUString& rUIRoot, const OUString& rUIFile,
 bool bAllowCycleFocusOut, 
sal_uInt64 nLOKWindowId = 0) override;
-#endif
 virtual weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, 
VclMessageType eMessageType, VclButtonsType eButtonType, const OUString 
) override;
 virtual weld::Window* GetFrameWeld(const 
css::uno::Reference& rWindow) override;
 
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 6122cff7c871..238e2aa72571 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22474,338 +22474,6 @@ void GtkInstanceWidget::help_hierarchy_foreach(const 
std::function(pParent);
 GtkWidget* pBuilderParent = pParentWidget ? pParentWidget->getWidget() : 
nullptr;
 return new GtkInstanceBuilder(pBuilderParent, rUIRoot, rUIFile, nullptr, 
true);
@@ -22864,6 +22532,7 @@ gboolean 
GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, G
 pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), 
xTemp.get());
 return true;
 }
+#endif
 
 weld::Builder* GtkInstance::CreateInterimBuilder(vcl::Window* pParent, const 
OUString& rUIRoot, const OUString& rUIFile,
  bool bAllowCycleFocusOut, 
sal_uInt64)
@@ -22881,12 +22550,15 @@ weld::Builder* 
GtkInstance::CreateInterimBuilder(vcl::Window* pParent, const OUS
 return nullptr;
 
 GtkWidget *pWindow = static_cast(pEnvData->pWidget);
+#if !GTK_CHECK_VERSION(4, 0, 0)
 gtk_widget_show_all(pWindow);
+#else
+gtk_widget_show(pWindow);
+#endif
 
 // build the widget tree as a child of the GtkEventBox GtkGrid parent
 return new GtkInstanceBuilder(pWindow, rUIRoot, rUIFile, 
xEmbedWindow.get(), bAllowCycleFocusOut);
 }
-#endif
 
 weld::MessageDialog* GtkInstance::CreateMessageDialog(weld::Widget* pParent, 
VclMessageType eMessageType, VclButtonsType eButtonsType, const OUString 
)
 {

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

[Caolán McNamara (via logerrit)]

 sw/source/core/doc/docfmt.cxx |   10 +-
 sw/source/core/txtnode/chrfmt.cxx |4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 83000b23e3e5817e0d3b44caf775edc3c5c97082
Author: Caolán McNamara 
AuthorDate: Tue Aug 10 16:41:29 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 20:24:16 2021 +0200

boost::make_tuple->std::make_tuple

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

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index aa9d21c9015c..dd39a58237c3 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2067,27 +2067,27 @@ SwFrameFormats::~SwFrameFormats()
 SwFrameFormats::const_iterator SwFrameFormats::find( const value_type& x ) 
const
 {
 ByTypeAndName::iterator it = m_TypeAndNameIndex.find(
-boost::make_tuple(x->GetName(), x->Which(), x) );
+std::make_tuple(x->GetName(), x->Which(), x) );
 return m_Array.project<0>( it );
 }
 
 SwFrameFormats::ByTypeAndName::const_iterator
 SwFrameFormats::findByTypeAndName( sal_uInt16 type, const OUString& name ) 
const
 {
-return m_TypeAndNameIndex.find( boost::make_tuple(name, type) );
+return m_TypeAndNameIndex.find( std::make_tuple(name, type) );
 }
 
 std::pair
 SwFrameFormats::findRangeByName( const OUString& rName ) const
 {
-auto it = m_TypeAndNameIndex.lower_bound( boost::make_tuple(rName, 
sal_uInt16(0)) );
-auto itEnd = m_TypeAndNameIndex.upper_bound( boost::make_tuple(rName, 
SAL_MAX_UINT16) );
+auto it = m_TypeAndNameIndex.lower_bound( std::make_tuple(rName, 
sal_uInt16(0)) );
+auto itEnd = m_TypeAndNameIndex.upper_bound( std::make_tuple(rName, 
SAL_MAX_UINT16) );
 return { it, itEnd };
 }
 
 SwFrameFormat* SwFrameFormats::FindFormatByName( const OUString& rName ) const
 {
-auto it = m_TypeAndNameIndex.lower_bound( boost::make_tuple(rName, 
sal_uInt16(0)) );
+auto it = m_TypeAndNameIndex.lower_bound( std::make_tuple(rName, 
sal_uInt16(0)) );
 if (it != m_TypeAndNameIndex.end() && (*it)->GetName() == rName)
 return *it;
 return nullptr;
diff --git a/sw/source/core/txtnode/chrfmt.cxx 
b/sw/source/core/txtnode/chrfmt.cxx
index fc434e953d54..321e28c16e94 100644
--- a/sw/source/core/txtnode/chrfmt.cxx
+++ b/sw/source/core/txtnode/chrfmt.cxx
@@ -54,13 +54,13 @@ SwCharFormats::~SwCharFormats()
 SwCharFormats::const_iterator SwCharFormats::find(const SwCharFormat* x) const
 {
 ByName::iterator it
-= m_NameIndex.find(boost::make_tuple(x->GetName(), 
const_cast(x)));
+= m_NameIndex.find(std::make_tuple(x->GetName(), 
const_cast(x)));
 return m_Array.project<0>(it);
 }
 
 SwCharFormats::ByName::const_iterator SwCharFormats::findByName(const 
OUString& name) const
 {
-return m_NameIndex.find(boost::make_tuple(name));
+return m_NameIndex.find(std::make_tuple(name));
 }
 
 SwCharFormat* SwCharFormats::FindFormatByName(const OUString& rName) const

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

[Caolán McNamara (via logerrit)]

 slideshow/source/inc/tools.hxx |1 -
 vcl/source/outdev/textline.cxx |6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ad09c49b34f78770fa2510381dbc8b555baf05a1
Author: Caolán McNamara 
AuthorDate: Tue Aug 10 16:51:09 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 20:24:34 2021 +0200

use o3tl::hash_combine

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

diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index f4210e477ea2..edfefe246fe4 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -70,7 +70,6 @@ namespace slideshow
 return d + (d >> 3);
 }
 
-// xxx todo: remove with boost::hash when 1.33 is available
 template 
 struct hash
 {
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 7d78f30fe326..127e1ce4a139 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -34,7 +34,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #define UNDERLINE_LAST  LINESTYLE_BOLDWAVE
@@ -90,8 +90,8 @@ namespace {
 size_t operator() ( const Key& rKey ) const
 {
 size_t aSeed = 0;
-boost::hash_combine(aSeed, rKey.m_aFirst);
-boost::hash_combine(aSeed, rKey.m_aSecond);
+o3tl::hash_combine(aSeed, rKey.m_aFirst);
+o3tl::hash_combine(aSeed, rKey.m_aSecond);
 return aSeed;
 }
 };

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

[Yildiray (via logerrit)]

 sdext/source/pdfimport/filterdet.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ab0bb71280999ef7c11c341f5269ea98019fe4c3
Author: Yildiray 
AuthorDate: Tue Aug 10 18:32:25 2021 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Aug 10 22:05:40 2021 +0200

tdf#143148 Use pragma once in sdext

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

diff --git a/sdext/source/pdfimport/filterdet.hxx 
b/sdext/source/pdfimport/filterdet.hxx
index 6ed195d3bb03..6c7d58ca048c 100644
--- a/sdext/source/pdfimport/filterdet.hxx
+++ b/sdext/source/pdfimport/filterdet.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_FILTERDET_HXX
-#define INCLUDED_SDEXT_SOURCE_PDFIMPORT_FILTERDET_HXX
+#pragma once
 
 #include 
 #include 
@@ -100,6 +99,4 @@ bool checkDocChecksum( const OUString& rInPDFFileURL,
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Caolán McNamara (via logerrit)]

 extensions/source/scanner/grid.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6f151d719ad0b4f0ee6e7a460f6b4af212df3bb2
Author: Caolán McNamara 
AuthorDate: Tue Aug 10 16:27:10 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 10 18:30:38 2021 +0200

use rtl::math::expm1 instead of boost::math::expm1

similar to:

commit 1a1dbff33db8a6f2f55a5d92483a03670a610f6a
Date:   Mon Feb 13 18:22:28 2017 +0100

get rid of boost::math::log1p() and use rtl::math::log1p()

... which in turn uses the compiler's std::log1p()

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

diff --git a/extensions/source/scanner/grid.cxx 
b/extensions/source/scanner/grid.cxx
index 38046f67b7d2..536ead40b069 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -19,9 +19,8 @@
 
 #include 
 #include 
+#include 
 #include 
-#include 
-#include 
 
 #include 
 #include 
@@ -650,7 +649,7 @@ void GridWindow::ChangeMode(ResetType nType)
 {
 for( int i = 0; i < m_nValues; i++ )
 {
-m_pNewYValues[ i ] = m_fMinY + 
(m_fMaxY-m_fMinY)*(boost::math::expm1((m_pXValues[i]-m_fMinX)/(m_fMaxX-m_fMinX)))/(M_E-1.0);
+m_pNewYValues[ i ] = m_fMinY + 
(m_fMaxY-m_fMinY)*(rtl::math::expm1((m_pXValues[i]-m_fMinX)/(m_fMaxX-m_fMinX)))/(M_E-1.0);
 }
 }
 break;

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.2.0.3'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.0.3' created by Christian Lohmaier 
 at 2021-08-10 17:27 +

Tag libreoffice-7.2.0.3
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmEStxsACgkQ9DSh76/u
rqPK6w//WankoMnIqkEtliqMhR7YChr4DDyYLAAFXpstVvIzu7ORX96wQ7Xfkk+9
8CbLeiiMVDx14voBsR935j9NX2gkHnymvaIZEJ1mHJxjtpSP3y0yzBDF634I/4/Q
IUhvyAmzFoiPRFhlNWm5/5Ol3SXo7Zu4x8TqikDs7bBmj1wpOBFkHKgchwTWjAJP
cG0pYskvSNhVN4X5xNNjEtIj/+zDgrPL9leG091K65ZfEOcSUxbEqlYHmQKv4W1g
CexCiPq4S+j7zXuJOnb9K4g+/HeFD5/eOX0jygDS/WEHWEYmUq3KlkjmEBeR+IZd
NrdAXk9/ijN6pSV6b5m9xPmUBimW8DIJFHku2KN60IurT2kNJK7Y4cQBqvn1l/xD
bRscfLhwqhvJYLyHYNb2QYjt3j5f56D+HB5OcC1s+ySvclsrWfAHRQ5aifel9ZFn
uoosstRGqCMtxYwRtJJ7PC3e4QtipjOHiNC23uMaj/nWMY2Lv7/i1kJn/5s4b4ym
YTQjaYxhOS7yo98KbNfI7yzQ+9165o0ZjpHxwdg/ccCMbZOONMmZM8DwUX0ywwOg
/+WMQlYn5qhXychezFXKljg7/sTyAOIj0nTNNTpbam6YUrrOiKiNVJ3M4CtjBmbI
5im4eDUTmxz5cZtH4sgQEfHfIIxPNpbE/g/AXqh7zN0q6cGFJGU=
=cii0
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-12:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.2.0.3'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.0.3' created by Christian Lohmaier 
 at 2021-08-10 17:27 +

Tag libreoffice-7.2.0.3
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmEStx4ACgkQ9DSh76/u
rqPXhQ//SSgX9MIdHSPAcvXy6zcIi8HDedZmg2DYNacChmto+i9fTQtsu0lYFSQN
zbch48n+65hxX4hC48yOr3tqfxBbI0ryH5U8x2+yOmmP0UyPgZZRMmTQYvtHguXU
RCKzPrNeXkPy8MvL7ph79hW/CoKiF8ZpC84agLaGAavMzL7rp45aeCAUAGEqPVYs
9EhSlZGv3aCKLtTVutdKVd+78XS7k8Ksj36tkaQeoiMi4oEC1vdYLdna2Z3HE1pQ
Yi8F8pMeozRpJnY0KlzKXW0ZvcSxJePwa29LqYH/bGg6xfzTabsJWeN64WBcSs/n
14BH7chGaXObq4mks4batP2azKYviM8I+WxlTibe2j2u7GhPGyYaqRaGik0l6xJO
hyCLtKiS+X7mjjTLwaGRrnJxMilpQJFgwxz/+hWIpvIKGS3P9RXiYR4DTn/6izTN
4Wccw7+8+rz35qAb84Vm3ldPkzA4xGkvGkCidvieH5F/4oBANgqeItC5jtDzSdcU
9M4GwVOG6ghubCLfoOBt+gu4bY6tOdP/gsxgzkiUWhe6IpmqGmVLLbCXuhVL+Lzj
UYh47f52VeW6u4yzqBer3b9btqHkF7SxFJXb5I7pkOKdnipsznG4bF6ng0A8SDYz
aUJL6cA8jfG4+H/DMghXrKQcrpfrULgdH98VXddJIDJ5VDyS3mw=
=r6Os
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-12:
---
 0 files changed
---

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.2.0.3'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.2.0.3' created by Christian Lohmaier 
 at 2021-08-10 17:27 +

Tag libreoffice-7.2.0.3
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmEStx4ACgkQ9DSh76/u
rqMCLQ/9EdYqsm3pqUjh6dYzQEcuwNcr7qcoZa67DtF1P7bSZ5vHndnMWtV/Kihw
EuQocRLe9+Yif6KNPF+U2FgpaoVOoG79IngQbuH7F/A83035hBRmK0p2ny1oZd9t
//gwCySbRx5rl6ja3rVZpXCaygdn4+zrmYpyQuT0ZMJZgICiJAlGpQQwgQhyLO6C
IayIa3SRwkJX5rqZG0A43AcTLRigF4ryDy7MxsyGux4+dAi9I3X5pPGv0gzyEmfY
uUHAEHqvt1PCVL7RhxAqQaTo6wan1sb7zl5U7R8ay7AafxLRCTuwMk6t6ZBD/XH5
8abDaG1mW+4SV0NfBi2ZF2/+aIGk2TFvp+WGvJi7QCIUIPQx1ZqqWn+NHejsiMYG
v19go8h1hwP6JVbD3FjrrV6l+2VfNkPijjGnrR9EPwJgCO9oC97H8eOhprVFFySZ
PbDpQlINpPlYxR+mrAMynj5tCHhneJWU/VMSz8lm5c6rDJGtgnDnyh5o7g9aLisC
7zM3GcRyGhryQq029h5HzapT11L4UToJOMTniYWM3mgQswkqFUm+bdwmSSLOdHrr
e/2ew3VaUpFAl6DZ+HpUMzlqHOKJLn+lMWXWFLRQekDz0hCz/v23GmxFmw+P8Zf0
gmOJdArRGW8/HttEPp479UiSdg0D4PEhEb/P+Ry10sQIiUXBoh4=
=UwI0
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-10:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-0' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit f34268b2a474c669072c788c8975b109eacbf930
Author: Christian Lohmaier 
AuthorDate: Tue Aug 10 19:28:21 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Aug 10 19:28:21 2021 +0200

bump product version to 7.2.0.3.0+

Change-Id: If30218525bbea1a780629453e6db4372ee5ecce9

diff --git a/configure.ac b/configure.ac
index 59761742e0fa..926b5da703fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.0.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.0.3.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: external/boost pch/inc writerfilter/inc writerfilter/source

[Stephan Bergmann (via logerrit)]

 external/boost/include/boost/logic/tribool.hpp|   31 
 pch/inc/pch/precompiled_system.hxx|1 
 writerfilter/inc/pch/precompiled_writerfilter.hxx |1 
 writerfilter/source/rtftok/rtfsdrimport.cxx   |   34 +++---
 4 files changed, 17 insertions(+), 50 deletions(-)

New commits:
commit eb8ce706d41fcf2af3b0eec5cee2a12075f0
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 16:29:39 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 21:39:50 2021 +0200

Clean up remaining uses of boost::logic::tribool

obFitShapeToText and obRelFlipV can just as well be modelled with
std::optional, and obFlipH and obFlipV apparently only need two states
anyway (as for a boost::logic::tribool x, bool(x == true) is true iff x has 
the
value true)

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

diff --git a/external/boost/include/boost/logic/tribool.hpp 
b/external/boost/include/boost/logic/tribool.hpp
deleted file mode 100644
index cbb8993dba96..
--- a/external/boost/include/boost/logic/tribool.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/* generated by bin/gen-boost-headers, do not edit! */
-#pragma once
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"  /* first! for GCC */
-#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 
5
-#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#pragma GCC diagnostic ignored "-Wdeprecated-copy"
-#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor"
-#pragma GCC diagnostic ignored "-Wextra"
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#pragma GCC diagnostic ignored "-Winvalid-constexpr"
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wnonnull"
-#pragma GCC diagnostic ignored "-Wparentheses"
-#pragma GCC diagnostic ignored "-Wplacement-new"
-#pragma GCC diagnostic ignored "-Wreturn-type"
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
-#pragma GCC diagnostic ignored "-Wtype-limits"
-#pragma GCC diagnostic ignored "-Wundef"
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#pragma GCC diagnostic ignored "-Wunused-macros"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#include_next 
-#pragma GCC diagnostic pop
diff --git a/pch/inc/pch/precompiled_system.hxx 
b/pch/inc/pch/precompiled_system.hxx
index 0f9afc9f9b0a..a7aa9bcf0095 100644
--- a/pch/inc/pch/precompiled_system.hxx
+++ b/pch/inc/pch/precompiled_system.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx 
b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 115207af85e6..40941cb37cd9 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -34,7 +34,6 @@
 #include 
 #include 
 #include 
-#include 
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include 
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 2eeb8598c09f..ec67b056959d 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -9,6 +9,7 @@
 
 #include "rtfsdrimport.hxx"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -42,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -194,7 +194,7 @@ void 
RTFSdrImport::applyProperty(uno::Reference const& xShape,
 uno::Reference xPropertySet(xShape, uno::UNO_QUERY);
 sal_Int16 nHoriOrient = 0;
 sal_Int16 nVertOrient = 0;
-boost::logic::tribool obFitShapeToText(boost::logic::indeterminate);
+std::optional obFitShapeToText;
 bool bFilled = true;
 
 if (aKey == u"posh")
@@ -256,12 +256,12 @@ void 
RTFSdrImport::applyProperty(uno::Reference const& xShape,
 xPropertySet->setPropertyValue("HoriOrient", 
uno::makeAny(nHoriOrient));
 if (nVertOrient != 0 && xPropertySet.is())
 xPropertySet->setPropertyValue("VertOrient", 
uno::makeAny(nVertOrient));
-if (!boost::logic::indeterminate(obFitShapeToText) && xPropertySet.is())
+if (obFitShapeToText.has_value() && xPropertySet.is())
 {
 xPropertySet->setPropertyValue(
-"SizeType", uno::makeAny(obFitShapeToText ? text::SizeType::MIN : 
text::SizeType::FIX));
-

Yıldıray Üsküdar license statement

[yıldıray üsküdar]

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

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 9dd52c920703b41072d82e8a1ea5c45931684bf0
Author: Caolán McNamara 
AuthorDate: Thu Feb 18 14:56:01 2021 +
Commit: Michael Stahl 
CommitDate: Tue Aug 10 19:56:51 2021 +0200

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

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

Change-Id: Ib41d96afcfa86bcd1075b9512d4cfab593afa66d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/52
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit c56e0c791a79dc414108e1b2fbf0f7eb38657f10)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120078
Reviewed-by: Michael Stahl 

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

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

[Eike Rathke (via logerrit)]

 basic/source/sbx/sbxscan.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e89404f00b25cfddd4098b4b2cf900d190617221
Author: Eike Rathke 
AuthorDate: Wed Aug 11 01:16:16 2021 +0200
Commit: Eike Rathke 
CommitDate: Wed Aug 11 02:34:36 2021 +0200

There is no LANGUAGE_ENGLISH {en} locale but LANGUAGE_ENGLISH_US {en-US}

The known fallback locale is en-US so this worked by chance..

Change-Id: I81ee2aff0cc35b4c8d501dfb6846f0709f1417ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120301
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index a632a689a42f..08f43ab475fa 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -720,7 +720,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
 else
 {
 aFmtStr = OUString::createFromAscii(pInfo->mpOOoFormat);
-pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH, eLangType, true);
+pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
 }
 pFormatter->GetOutputString( nNumber, nIndex, rRes,  );
 }
@@ -737,7 +737,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
 if( floor( nNumber ) != nNumber )
 {
 aFmtStr = "H:MM:SS AM/PM";
-pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, 
nType, nIndex, LANGUAGE_ENGLISH, eLangType, true);
+pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, 
nType, nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
 OUString aTime;
 pFormatter->GetOutputString( nNumber, nIndex, aTime, 
 );
 rRes += " " + aTime;
@@ -747,7 +747,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
 {
 // long time only
 aFmtStr = "H:MM:SS AM/PM";
-pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH, eLangType, true);
+pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
 pFormatter->GetOutputString( nNumber, nIndex, rRes,  
);
 }
 }
@@ -783,7 +783,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
 }
 else
 {
-pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH, eLangType, true);
+pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
 pFormatter->GetOutputString( nNumber, nIndex, rRes,  );
 }
 

[Libreoffice-commits] core.git: chart2/source cui/source desktop/source editeng/source extensions/source o3tl/qa reportdesign/source sc/qa sc/source sd/qa sd/source sfx2/source svx/source sw/source vc

[Tomaž Vajngerl (via logerrit)]

 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx |3 -
 chart2/source/controller/main/ChartWindow.cxx|4 +
 cui/source/tabpages/chardlg.cxx  |3 -
 cui/source/tabpages/tpbitmap.cxx |5 +
 desktop/source/lib/init.cxx  |5 +
 editeng/source/editeng/impedit.cxx   |8 ++
 editeng/source/items/paperinf.cxx|4 -
 extensions/source/propctrlr/fontdialog.cxx   |5 +
 o3tl/qa/test-unit_conversion.cxx |2 
 reportdesign/source/ui/dlg/Condition.cxx |2 
 reportdesign/source/ui/misc/UITools.cxx  |2 
 sc/qa/unit/tiledrendering/tiledrendering.cxx |6 +-
 sc/source/filter/rtf/rtfparse.cxx|3 -
 sc/source/ui/view/drawview.cxx   |4 +
 sc/source/ui/view/gridwin4.cxx   |4 +
 sc/source/ui/view/gridwin_dbgutil.cxx|2 
 sc/source/ui/view/viewdata.cxx   |5 +
 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx|   28 
+-
 sd/source/core/annotations/Annotation.cxx|2 
 sd/source/core/drawdoc.cxx   |2 
 sd/source/ui/view/Outliner.cxx   |4 -
 sd/source/ui/view/sdview.cxx |4 +
 sd/source/ui/view/sdwindow.cxx   |4 +
 sfx2/source/control/unoctitm.cxx |2 
 sfx2/source/view/ipclient.cxx|2 
 svx/source/sdr/overlay/overlayobjectlist.cxx |2 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx   |   25 
+++-
 svx/source/svdraw/sdrpagewindow.cxx  |2 
 svx/source/svdraw/svdmrkv.cxx|   20 
---
 svx/source/tbxctrls/grafctrl.cxx |   21 
++-
 sw/source/uibase/dochdl/swdtflvr.cxx |   11 ++-
 sw/source/uibase/shells/textsh.cxx   |3 -
 vcl/source/treelist/transfer.cxx |2 
 33 files changed, 110 insertions(+), 91 deletions(-)

New commits:
commit fa339b3adb53300ae68913bed87e18caf9f2e262
Author: Tomaž Vajngerl 
AuthorDate: Tue Aug 10 08:10:19 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Aug 11 06:41:17 2021 +0200

convert some LogicToLogic calls to use o3tl::convert instead

If a LogicToLogic uses fixed units, we can use o3tl::convert
instead. We can also do the same for all other cases where
LogicToLogic is used, but that needs additional investigation to
determine if it is safe to do so.

Note:
MapUnit::Pixel is converted to o3tl::Length::pt because it assumed
72 PPI for a logical pixel, which corresponds with the conversion
rate of a point (72 PPI).
Today, 96 PPI is standard, which is also used for o3tl::Length:px.

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

diff --git 
a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 4dfabee4836f..e48875d7c7a2 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -408,7 +408,8 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& 
rSymbol )
 if( xProp->getPropertyValue( "SizePixel" ) >>= aAWTPixelSize )
 {
 Size aPixelSize(aAWTPixelSize.Width,aAWTPixelSize.Height);
-Size aNewSize = OutputDevice::LogicToLogic(aPixelSize, 
MapMode(MapUnit::MapPixel), MapMode(MapUnit::Map100thMM));
+Size aNewSize = o3tl::convert(aPixelSize, 
o3tl::Length::pt, o3tl::Length::mm100);
+
 aSize = awt::Size( aNewSize.Width(), aNewSize.Height() );
 
 if( aSize.Width == 0 && aSize.Height == 0 )
diff --git a/chart2/source/controller/main/ChartWindow.cxx 
b/chart2/source/controller/main/ChartWindow.cxx
index ad5afd131b96..556cc81dcdeb 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -296,7 +296,9 @@ void ChartWindow::LogicInvalidate(const tools::Rectangle* 
pRectangle)
 if 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/uiconfig

[Rafael Lima (via logerrit)]

 sd/uiconfig/sdraw/ui/notebookbar.ui |  165 +++-
 1 file changed, 163 insertions(+), 2 deletions(-)

New commits:
commit 3bec2da07a29029489257028adf77e52ad168906
Author: Rafael Lima 
AuthorDate: Mon Jul 19 23:58:35 2021 +0200
Commit: Andreas Kainz 
CommitDate: Wed Aug 11 00:20:15 2021 +0200

tdf#136610 Add Clone/Clear Direct Format buttons to LO Draw tabbed interface

Currently LO Draw only shows the "Clone" and "Clear Direct Format" buttons 
in the tabbed interface when a text object is selected (in the Text tab).

With this patch, LO Draw will now show these buttons in the "Draw" tab when 
shapes are selected, as well as in the Home tab (as it is shown in Impress).

Change-Id: I9acf577cc5322d43c18acc366788a5eadda67ff6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119183
Tested-by: Jenkins
Tested-by: Andreas Kainz 
Reviewed-by: Andreas Kainz 
(cherry picked from commit 73fc697d5aac06938cc78f51b4e0d6f3d615447c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120249

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index c65aced89a03..4c1b5ea4d0aa 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -3359,6 +3359,102 @@
 0
   
 
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+0
+  
+
+
+  
+True
+False
+center
+vertical
+
+  
+True
+True
+center
+True
+both-horiz
+False
+
+  
+True
+False
+.uno:FormatPaintbrush
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+center
+True
+both-horiz
+False
+
+  
+True
+False
+.uno:SetDefault
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+
+  
+  
+False
+True
+2
+  
+
 
   
 True
@@ -8437,7 +8533,7 @@
 both-horiz
 False
 
-  
+  
 

Re: Can I submit patches from my colleagues?

[Hossein Nourikhah]

Hello Jeff,

On Thu, Aug 5, 2021 at 4:17 PM Jeff Huang  
wrote:

Can I submit patches from my colleagues to LibreOffice Gerrit?
This is our company license statement:
https://lists.freedesktop.org/archives/libreoffice/2020-February/084572.html
If I can do this, how can I do? Thank you.


Yes, you can submit the patches from your colleagues. There are two 
options:


1. Submit patches by yourself on behalf of them with your own email 
address, and add this note in the commit description:


Co-authored-by: ... (Other person's name and email address)

2. Add multiple addresses to your Gerrit account, and submit the patches 
using the email address you want. This is OK as long as the other email 
is available in your Gerrit account. Every email address should be 
verified by the owner.


On the other hand, we would be happy to see the people submit their 
patches by themselves. The disadvantage of using a proxy for sending 
patches is that there would be an indirect communication between the 
reviewer(s) and the author. As you know, the author should get involved 
in the submission process to do the changes and fixes suggested by the 
reviewers before the submission is accepted and merged.


Regards,
Hossein

--
Hossein Nourikhah, Ph.D.
Developer Community Architect
The Document Foundation (TDF)
Email: hoss...@libreoffice.org
Wiki:  https://wiki.documentfoundation.org/User:Hossein
IRC:   hossein at libreoffice-dev room in LiberaChat Network
   irc://irc.libera.chat/#libreoffice-dev

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/shells/basesh.cxx |   49 +++--
 1 file changed, 26 insertions(+), 23 deletions(-)

New commits:
commit 0ff5eb97b89f89e770d4397bf76f24fb7cd76b57
Author: Jim Raykowski 
AuthorDate: Sun Aug 8 21:43:25 2021 -0800
Commit: Jim Raykowski 
CommitDate: Wed Aug 11 07:10:20 2021 +0200

tdf#143577 check node is a text node before use as such

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

diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 4a0691d36f99..0ef37aeb3a00 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -199,25 +199,26 @@ void SwBaseShell::ExecDelete(SfxRequest )
 case SID_DELETE:
 if (rSh.GetViewOptions()->IsShowOutlineContentVisibilityButton())
 {
+// Disallow if the cursor is at the end of a paragraph and the 
document model
+// node at this position is an outline node with folded 
content or the next node
+// is an outline node with folded content.
 if (rSh.IsEndPara())
 {
 SwNodeIndex aIdx(rSh.GetCursor()->GetNode());
-// disallow if this is an outline node having folded 
content
-bool bVisible = true;
-
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
-if (!bVisible)
-return;
-// disallow if the next text node is an outline node 
having folded content
-++aIdx;
-SwNodeType aNodeType;
-while ((aNodeType = aIdx.GetNode().GetNodeType()) != 
SwNodeType::Text)
-++aIdx;
 if (aIdx.GetNode().IsTextNode())
 {
-bVisible = true;
+bool bVisible = true;
 
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
 if (!bVisible)
-return;
+break;
+++aIdx;
+if (aIdx.GetNode().IsTextNode())
+{
+bVisible = true;
+
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
+if (!bVisible)
+break;
+}
 }
 }
 }
@@ -227,21 +228,23 @@ void SwBaseShell::ExecDelete(SfxRequest )
 case FN_BACKSPACE:
 if (rSh.GetViewOptions()->IsShowOutlineContentVisibilityButton())
 {
+// Disallow if the cursor is at the start of a paragraph and 
the document model
+// node at this position is an outline node with folded 
content or the previous
+// node is a content node without a layout frame.
 if (rSh.IsSttPara())
 {
 SwNodeIndex aIdx(rSh.GetCursor()->GetNode());
-// disallow if this is a folded outline node
-bool bVisible = true;
-
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
-if (!bVisible)
-return;
-// disallow if previous text node does not have a layout 
frame
---aIdx;
-SwNodeType aNodeType;
-while ((aNodeType = aIdx.GetNode().GetNodeType()) != 
SwNodeType::Text)
+if (aIdx.GetNode().IsTextNode())
+{
+bool bVisible = true;
+
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
+if (!bVisible)
+break;
 --aIdx;
-if (aIdx.GetNode().IsContentNode() && 
!aIdx.GetNode().GetContentNode()->getLayoutFrame(nullptr))
-return;
+if (aIdx.GetNode().IsContentNode() &&
+
!aIdx.GetNode().GetContentNode()->getLayoutFrame(nullptr))
+break;
+}
 }
 }
 if( rSh.IsNoNum() )

Ankur Khandelwal license statement

[Ankur Khandelwal]

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

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

[Noel Grandin (via logerrit)]

 extensions/source/propctrlr/eformshelper.cxx|   12 ++--
 extensions/source/propctrlr/propertyhandler.cxx |   12 ++--
 include/comphelper/listenernotification.hxx |5 ++---
 3 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit c23730471c487b8f01eddfa3845b49316c0db94d
Author: Noel Grandin 
AuthorDate: Mon Aug 9 17:52:30 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 10 17:11:55 2021 +0200

can return OInterfaceIteratorHelper2 by value here

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

diff --git a/extensions/source/propctrlr/eformshelper.cxx 
b/extensions/source/propctrlr/eformshelper.cxx
index 94f8e7a4b969..36f5f2a2b44d 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -241,10 +241,10 @@ namespace pcr
 {
 if ( !_bDoListen )
 {
-std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > 
pListenerIterator = m_aPropertyListeners.createIterator();
-while ( pListenerIterator->hasMoreElements() )
+::comphelper::OInterfaceIteratorHelper2 aListenerIterator = 
m_aPropertyListeners.createIterator();
+while ( aListenerIterator.hasMoreElements() )
 {
-PropertyEventTranslation* pTranslator = dynamic_cast< 
PropertyEventTranslation* >( pListenerIterator->next() );
+PropertyEventTranslation* pTranslator = dynamic_cast< 
PropertyEventTranslation* >( aListenerIterator.next() );
 OSL_ENSURE( pTranslator, 
"EFormsHelper::impl_toggleBindingPropertyListening_throw: invalid listener 
element in my container!" );
 if ( !pTranslator )
 continue;
@@ -275,10 +275,10 @@ namespace pcr
 }
 else
 {
-std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > 
pListenerIterator = m_aPropertyListeners.createIterator();
-while ( pListenerIterator->hasMoreElements() )
+::comphelper::OInterfaceIteratorHelper2 aListenerIterator = 
m_aPropertyListeners.createIterator();
+while ( aListenerIterator.hasMoreElements() )
 {
-Reference< XPropertyChangeListener > xListener( 
pListenerIterator->next(), UNO_QUERY );
+Reference< XPropertyChangeListener > xListener( 
aListenerIterator.next(), UNO_QUERY );
 impl_switchBindingListening_throw( true, xListener );
 }
 }
diff --git a/extensions/source/propctrlr/propertyhandler.cxx 
b/extensions/source/propctrlr/propertyhandler.cxx
index c47f4e88..a1817393324f 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -79,10 +79,10 @@ namespace pcr
 return;
 
 // remove all old property change listeners
-std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > 
removeListener = m_aPropertyListeners.createIterator();
-std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > 
readdListener = m_aPropertyListeners.createIterator();  // will copy the 
container as needed
-while ( removeListener->hasMoreElements() )
-removePropertyChangeListener( static_cast< 
XPropertyChangeListener* >( removeListener->next() ) );
+::comphelper::OInterfaceIteratorHelper2 removeListener = 
m_aPropertyListeners.createIterator();
+::comphelper::OInterfaceIteratorHelper2 readdListener = 
m_aPropertyListeners.createIterator();  // will copy the container as needed
+while ( removeListener.hasMoreElements() )
+removePropertyChangeListener( static_cast< 
XPropertyChangeListener* >( removeListener.next() ) );
 OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: 
derived classes are expected to forward the removePropertyChangeListener call 
to their base class (me)!" );
 
 // remember the new component, and give derived classes the chance to 
react on it
@@ -90,8 +90,8 @@ namespace pcr
 onNewComponent();
 
 // add the listeners, again
-while ( readdListener->hasMoreElements() )
-addPropertyChangeListener( static_cast< XPropertyChangeListener* 
>( readdListener->next() ) );
+while ( readdListener.hasMoreElements() )
+addPropertyChangeListener( static_cast< XPropertyChangeListener* 
>( readdListener.next() ) );
 }
 
 void PropertyHandler::onNewComponent()
diff --git a/include/comphelper/listenernotification.hxx 
b/include/comphelper/listenernotification.hxx
index 688571304938..15f1ca64b980 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -79,10 +79,9 @@ namespace comphelper
 
 /** creates an iterator for 

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

[Stephan Bergmann (via logerrit)]

 linguistic/source/lngsvcmgr.cxx |   23 ++-
 1 file changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 6b8df9d79f89242a503b93b3c9e9f279eeda2105
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 10:29:29 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 17:13:58 2021 +0200

pAvailGrammarSvcs can never be null here

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

diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index a0f9822e4779..9e0100538809 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1009,19 +1009,16 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 : xFactory->createInstance(),
 uno::UNO_QUERY_THROW);
 
-if (pAvailGrammarSvcs)
-{
-OUStringaImplName;
-std::vector< LanguageType >aLanguages;
-uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY 
);
-if (xInfo.is())
-aImplName = xInfo->getImplementationName();
-SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty 
implementation name" );
-uno::Sequence 
aLocaleSequence(xSvc->getLocales());
-aLanguages = LocaleSeqToLangVec( aLocaleSequence );
-
-pAvailGrammarSvcs->push_back( std::make_unique( 
aImplName, aLanguages ) );
-}
+OUStringaImplName;
+std::vector< LanguageType >aLanguages;
+uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
+if (xInfo.is())
+aImplName = xInfo->getImplementationName();
+SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty 
implementation name" );
+uno::Sequence 
aLocaleSequence(xSvc->getLocales());
+aLanguages = LocaleSeqToLangVec( aLocaleSequence );
+
+pAvailGrammarSvcs->push_back( std::make_unique( 
aImplName, aLanguages ) );
 }
 catch (const uno::Exception &)
 {

[Libreoffice-bugs] [Bug 108897] [META] XLSX (OOXML) bug tracker

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=108897
Bug 108897 depends on bug 64086, which changed state.

Bug 64086 Summary: Fileopen: named cell ranges from MSO are not imported in 
charts (because not supported in LO)
https://bugs.documentfoundation.org/show_bug.cgi?id=64086

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 109178] [META] Cell names bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=109178
Bug 109178 depends on bug 64086, which changed state.

Bug 64086 Summary: Fileopen: named cell ranges from MSO are not imported in 
charts (because not supported in LO)
https://bugs.documentfoundation.org/show_bug.cgi?id=64086

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 143790] Crash upon Copy / Paste a simple PDF content from a file on a NAS drive

[bugzilla-daemon]

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

Nina_Shtygailo  changed:

   What|Removed |Added

 CC||fedenevanin...@gmail.com

--- Comment #3 from Nina_Shtygailo  ---
no repro in 

Version: 7.1.5.2 (x64) / LibreOffice Community
Build ID: 85f04e9f809797b8199d13c421bd8a2b025d52b5
CPU threads: 4; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win
Locale: en-US (ru_RU); UI: en-US
Calc: CL

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 143781] [META] Development- and code-related bug reports

[bugzilla-daemon]

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

Aron Budea  changed:

   What|Removed |Added

 Depends on||62525


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=62525
[Bug 62525] Convert manual refcounting / copy-on-write implementations to
cow_wrapper
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 62525] Convert manual refcounting / copy-on-write implementations to cow_wrapper

[bugzilla-daemon]

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

Aron Budea  changed:

   What|Removed |Added

 Blocks||143781


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=143781
[Bug 143781] [META] Development- and code-related bug reports
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 106547] [META] OOXML SmartArt bug tracker

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=106547
Bug 106547 depends on bug 132696, which changed state.

Bug 132696 Summary: FILEOPEN PPTX: some rectangular shapes are missing 
(SmartArt)
https://bugs.documentfoundation.org/show_bug.cgi?id=132696

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 109178] [META] Cell names bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=109178
Bug 109178 depends on bug 66250, which changed state.

Bug 66250 Summary: Use a Named range as data source for Chart
https://bugs.documentfoundation.org/show_bug.cgi?id=66250

   What|Removed |Added

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

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 108538] [META] Chart feature enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=108538
Bug 108538 depends on bug 66250, which changed state.

Bug 66250 Summary: Use a Named range as data source for Chart
https://bugs.documentfoundation.org/show_bug.cgi?id=66250

   What|Removed |Added

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

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 108539] [META] Chart data table bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=108539
Bug 108539 depends on bug 66250, which changed state.

Bug 66250 Summary: Use a Named range as data source for Chart
https://bugs.documentfoundation.org/show_bug.cgi?id=66250

   What|Removed |Added

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

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 66250] Use a Named range as data source for Chart

[bugzilla-daemon]

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

Balázs Varga  changed:

   What|Removed |Added

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

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 142757] FILEOPEN: DOC/DOCX: document has more pages and hangs at import time

[bugzilla-daemon]

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

--- Comment #10 from Dániel Arató (NISZ)  ---
(In reply to Justin L from comment #9)
> However, that commit just triggered an existing layout condition that we
> can't handle. So the revert just masks this again. Oh well, there are so
> many crash/freeze bug reports that there isn't much point in leaving this
> one open. And no point for adding a unit test because there has not been a
> true fix.

Should we set this bug to WONTFIX perhaps?

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 143536] Index (alphabetical): tab fill characters should be ommitted if index entry has no associated page numbers

[bugzilla-daemon]

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

Dieter  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 Ever confirmed|0   |1
 CC||dgp-m...@gmx.de
 Whiteboard| QA:needsComment|

--- Comment #1 from Dieter  ---
I can't confirm the problem with

Version: 7.2.0.1 (x64) / LibreOffice Community
Build ID: 32efc3b7f3a71cfa6a7fa3f6c208333df48656cc
CPU threads: 4; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win
Locale: de-DE (de_DE); UI: en-GB
Calc: CL

In the index dialog, you can delete the tab or only the filling characters.
Please specify the problem and add a sample document.
=> NEEDINFO

-- 
You are receiving this mail because:
You are the assignee for the bug.