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

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

 sw/qa/extras/uiwriter/uiwriter2.cxx |   33 +++
 sw/source/core/undo/unredln.cxx |   50 
 2 files changed, 67 insertions(+), 16 deletions(-)

New commits:
commit 586bd08fa2655ad90ef4777626ad8f17d6a2c4ce
Author: László Németh 
AuthorDate: Wed Nov 25 18:06:54 2020 +0100
Commit: László Németh 
CommitDate: Thu Nov 26 08:54:50 2020 +0100

tdf#137503 sw ChangesInMargin: fix Undo/Redo of deleted paragraph

Tracked deletion of paragraph(s) consists of several hidden
redlines in "Show changes in margin" mode. Fix Undo by setting
them all visible with recovering the original deletion range.

Follow-up of commit 469f472fb31c4ef1a57f8ec54ba750c1332feec2
(tdf#138479 tdf#137769 sw ChangesInMargin: fix Undo in paragraphs).

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 28019c51df0b..4bbaeee20341 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1924,6 +1924,39 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137684)
 CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137503)
+{
+load(DATA_DIRECTORY, "tdf132160.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// switch on "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+SwWrtShell* const pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+
+// select and delete the first two paragraphs
+pWrtShell->EndPara(/*bSelect=*/true);
+pWrtShell->EndPara(/*bSelect=*/true);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, 
/*bBasicCall=*/false);
+dispatchCommand(mxComponent, ".uno:Delete", {});
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("The"));
+
+// this would crash due to bad redline range
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Encryption "));
+
+// this would crash due to bad redline range
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("The"));
+
+// switch off "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138135)
 {
 load(DATA_DIRECTORY, "tdf132160.odt");
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index d870935c6613..6865beba6cd6 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -93,28 +93,46 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & 
rContext)
 
 // fix PaM for deletions shown in margin
 bool bIsDeletion = dynamic_cast(this);
+sal_uInt32 nMaxId = SAL_MAX_UINT32;
 if ( bIsDeletion )
 {
-SwRedlineTable::size_type nCurRedlinePos = 0;
-const SwRedlineTable& rTable = 
rDoc.getIDocumentRedlineAccess().GetRedlineTable();
-SwRangeRedline * pRedline(rTable[nCurRedlinePos]);
-// search last redline by its biggest id
-// TODO handle multiple nodes
-for( SwRedlineTable::size_type n = 1; n < rTable.size(); ++n )
+// Nodes of the deletion range are in the newest invisible redlines.
+// Set all redlines visible and recover the original deletion range.
+for (sal_uInt32 nNodes = 0; nNodes <  m_nEndNode - m_nSttNode + 1; ++ 
nNodes)
 {
-SwRangeRedline *pRed(rTable[n]);
-if ( pRedline->GetId() < pRed->GetId() )
+SwRedlineTable::size_type nCurRedlinePos = 0;
+const SwRedlineTable& rTable = 
rDoc.getIDocumentRedlineAccess().GetRedlineTable();
+SwRangeRedline * pRedline(rTable[nCurRedlinePos]);
+
+// search last but nNodes redline by its nth biggest id
+for( SwRedlineTable::size_type n = 1; n < rTable.size(); ++n )
 {
-nCurRedlinePos = n;
-pRedline = pRed;
+SwRangeRedline *pRed(rTable[n]);
+if ( pRedline->GetId() < pRed->GetId() && pRed->GetId() < 
nMaxId )
+{
+nCurRedlinePos = n;
+pRedline = pRed;
+}
 }
-}
 
-if ( !pRedline->IsVisible() )
-{
-pRedline->Show(0, rTable.GetPos(pRedline), /*bForced=*/true);
-pRedline->Show(1, rTable.GetPos(pRedline), /*bForced=*/true);
-rPam = *pRedline;
+nMaxId = 

[Libreoffice-commits] core.git: include/vcl offapi/com sfx2/source vcl/osx vcl/source vcl/unx

[Samuel Mehrbrodt (via logerrit)]

 include/vcl/print.hxx |3 +++
 offapi/com/sun/star/view/PrintOptions.idl |4 
 sfx2/source/doc/printhelper.cxx   |9 +
 vcl/osx/salprn.cxx|7 +--
 vcl/source/gdi/print3.cxx |   16 
 vcl/unx/generic/print/genprnpsp.cxx   |8 +---
 6 files changed, 26 insertions(+), 21 deletions(-)

New commits:
commit 2e2c162b7a816d990415fca434e6d3d5600b2858
Author: Samuel Mehrbrodt 
AuthorDate: Wed Nov 25 16:22:11 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 26 08:51:57 2020 +0100

Add 'SinglePrintJobs' to PrintOptions

So that this option can be set via UNO API

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

diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 6d3adf0e00d7..631b2f5b83fe 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -168,6 +168,7 @@ private:
 boolmbPrintFile;
 boolmbInPrintPage;
 boolmbNewJobSetup;
+boolmbSinglePrintJobs;
 
 VCL_DLLPRIVATE void ImplInitData();
 VCL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
@@ -316,6 +317,8 @@ public:
 voidSetCopyCount( sal_uInt16 nCopy, bool bCollate 
);
 sal_uInt16  GetCopyCount() const { return mnCopyCount; }
 boolIsCollateCopy() const { return mbCollateCopy; }
+voidSetSinglePrintJobs(bool bSinglePrintJobs) { 
mbSinglePrintJobs = bSinglePrintJobs; }
+boolIsSinglePrintJobs() const { return 
mbSinglePrintJobs; }
 
 boolIsPrinting() const { return mbPrinting; }
 
diff --git a/offapi/com/sun/star/view/PrintOptions.idl 
b/offapi/com/sun/star/view/PrintOptions.idl
index eea96f98937e..4ed8b23baaf0 100644
--- a/offapi/com/sun/star/view/PrintOptions.idl
+++ b/offapi/com/sun/star/view/PrintOptions.idl
@@ -76,6 +76,10 @@ published service PrintOptions
 /** if set, specifies name of the printer to use.
  */
 [optional, property] string PrinterName;
+
+/** advises the printer to create a single print job for each copy.
+ */
+[optional, property] boolean SinglePrintJobs;
 };
 
 
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e0c2cc75ad77..e2ce74172288 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -696,6 +696,15 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< 
beans::PropertyValue >&
 aCheckedArgs[nProps++].Value <<= bTemp;
 }
 
+else if ( rProp.Name == "SinglePrintJobs" )
+{
+bool bTemp;
+if ( !(rProp.Value >>= bTemp) )
+throw css::lang::IllegalArgumentException();
+aCheckedArgs[nProps].Name = "SinglePrintJobs";
+aCheckedArgs[nProps++].Value <<= bTemp;
+}
+
 // Pages-Property
 else if ( rProp.Name == "Pages" )
 {
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 6fd92fd4c5d6..bec30a35b562 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -380,12 +380,7 @@ bool AquaSalInfoPrinter::StartJob( const OUString* 
i_pFileName,
 bShowProgressPanel = false;
 
 // possibly create one job for collated output
-bool bSinglePrintJobs = false;
-beans::PropertyValue* pSingleValue = i_rController.getValue( OUString( 
"PrintCollateAsSingleJobs" ) );
-if( pSingleValue )
-{
-pSingleValue->Value >>= bSinglePrintJobs;
-}
+bool bSinglePrintJobs = i_rController.getPrinter()->IsSinglePrintJobs();
 
 // FIXME: jobStarted() should be done after the print dialog has ended (if 
there is one)
 // how do I know when that might be ?
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 04ac1f5a92e6..1cc0ce8c1c93 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -509,8 +509,7 @@ bool 
Printer::PreparePrintJob(std::shared_ptr xController,
 }
 else if (aDlg.isSingleJobs())
 {
-xController->setValue( "PrintCollateAsSingleJobs",
-css::uno::makeAny( true ) );
+xController->getPrinter()->SetSinglePrintJobs(true);
 }
 }
 catch (const std::bad_alloc&)
@@ -585,12 +584,7 @@ bool Printer::StartJob( const OUString& i_rJobName, 
std::shared_ptrgetValue("PrintCollateAsSingleJobs");
-if( pSingleValue )
-{
-pSingleValue->Value >>= bSinglePrintJobs;
-}
+bool bSinglePrintJobs = i_xController->getPrinter()->IsSinglePrintJobs();
 
 css::beans::PropertyValue* pFileValue = 
i_xController->getValue("Loca

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

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

 sw/inc/docary.hxx   |5 -
 sw/qa/extras/uiwriter/uiwriter2.cxx |   67 ++--
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   21 -
 sw/source/core/doc/docredln.cxx |   10 --
 sw/source/core/undo/unredln.cxx |   48 +--
 5 files changed, 85 insertions(+), 66 deletions(-)

New commits:
commit 469f472fb31c4ef1a57f8ec54ba750c1332feec2
Author: László Németh 
AuthorDate: Wed Nov 25 10:55:13 2020 +0100
Commit: László Németh 
CommitDate: Thu Nov 26 08:32:30 2020 +0100

tdf#138479 tdf#137769 sw ChangesInMargin: fix Undo in paragraphs

Fix Undo of embedded tracked deletions in paragraphs, for example
Undo of deletions Lorem->Loem->Lm resulted only Loem, moreover
a crash in the case of typing (not tracked) text before the
tracked deletions.

Now the last tracked deletion is chosen by the biggest
SwRangeRedline ID during Undo instead of the lost/modified
redline range in case of hidden redlines of the ChangesInMargin
mode.

Note: revert commit 4ad0459494303745b377c848c681a747f294fc64
(tdf#138135: sw ChangesInMargin: join characters at backspac) to
avoid crash on extra Undo (tdf#137769). Showing deleted
character sequence in margin needs grouping of hidden redlines,
as for managing tracked changes.

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

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 4a3e2031420e..9b4a6e80ea26 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -259,11 +259,8 @@ public:
  @param tableIndex position in SwRedlineTable to start searching at, will 
be updated with the index of the returned
redline (or the next redline after the given position 
if not found)
  @param next true: redline starts at position and ends after, false: 
redline starts before position and ends at or after
- @param visibletrue: redline must be visible false: redline must be 
not visible
 */
-const SwRangeRedline* FindAtPosition( const SwPosition& startPosition,
-  size_type& tableIndex,
-  bool next = true, bool visible = 
true ) const;
+const SwRangeRedline* FindAtPosition( const SwPosition& startPosition, 
size_type& tableIndex, bool next = true ) const;
 
 boolempty() const { return maVector.empty(); }
 size_type   size() const { return maVector.size(); }
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 48a6aa3fdc99..28019c51df0b 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1946,11 +1946,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138135)
 }
 CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("support"));
 
-// single Undo undoes the deletion of the whole word
-//
-// This was only a 1-character Undo because of missing
-// joining of the deleted characters
-dispatchCommand(mxComponent, ".uno:Undo", {});
+// TODO group redlines for managing tracked changes/showing in margin
+for (int i = 0; i <= 10; ++i)
+dispatchCommand(mxComponent, ".uno:Undo", {});
 
 CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Encryption"));
 
@@ -2008,10 +2006,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137771)
 assertXPath(pXmlDoc, "/metafile/push/push/push/line", 13);
 
 // This was the content of the next  (missing deletion on margin)
-assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[16]/text", 
" saved.");
+assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[16]/text", 
" s");
 
 // this would crash due to bad redline range
-dispatchCommand(mxComponent, ".uno:Undo", {});
+for (int i = 0; i < 6; ++i)
+{
+dispatchCommand(mxComponent, ".uno:Undo", {});
+}
 CPPUNIT_ASSERT(getParagraph(1)->getString().endsWith("to be saved."));
 
 // switch off "Show changes in margin" mode
@@ -2019,6 +2020,58 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137771)
 CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138479)
+{
+SwDoc* const pDoc = createDoc();
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwWrtShell* const pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+pWrtShell->Insert("Lorem");
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem"), getParagraph(1)->getString());
+
+//turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowDelete
+  

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

[Bjoern Michaelsen (via logerrit)]

 sw/inc/fmtcol.hxx|   15 ++-
 sw/inc/ndtxt.hxx |   12 
 sw/inc/paratr.hxx|   25 +++--
 sw/source/core/attr/swatrset.cxx |   15 ---
 sw/source/core/para/paratr.cxx   |   17 -
 sw/source/core/undo/rolbck.cxx   |4 ++--
 6 files changed, 47 insertions(+), 41 deletions(-)

New commits:
commit 089bb2f3bd2b5fc8118caaa6b7c6b82dd36a094e
Author: Bjoern Michaelsen 
AuthorDate: Sun Nov 22 21:15:13 2020 +0100
Commit: Bjoern Michaelsen 
CommitDate: Thu Nov 26 08:25:14 2020 +0100

Refactor SwFormatDrop

... and get rid of the SwClientNotifyCall.

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

diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 20b5409f21e0..07f157f13bf2 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -22,6 +22,7 @@
 #include "swdllapi.h"
 #include "format.hxx"
 #include "hintids.hxx"
+#include "paratr.hxx"
 #include 
 #include 
 
@@ -31,7 +32,7 @@
 class SwAttrPool;
 namespace sw{ class DocumentStylePoolManager; }
 
-class SAL_DLLPUBLIC_RTTI SwFormatColl : public SwFormat
+class SAL_DLLPUBLIC_RTTI SwFormatColl: public SwFormat
 {
 protected:
 SwFormatColl( SwAttrPool& rPool, const char* pFormatName,
@@ -52,7 +53,9 @@ private:
 };
 
 /// Represents the style of a paragraph.
-class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
+class SW_DLLPUBLIC SwTextFormatColl
+: public SwFormatColl
+, public sw::FormatDropDefiner
 {
 friend class SwDoc;
 friend class ::sw::DocumentStylePoolManager;
@@ -66,7 +69,6 @@ class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
 SwTextFormatColl *mpNextTextFormatColl;
 
 protected:
-
 SwTextFormatColl( SwAttrPool& rPool, const char* pFormatCollName,
 SwTextFormatColl* pDerFrom = nullptr,
 sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
@@ -91,8 +93,6 @@ protected:
 virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
 
 public:
-
-
 inline void SetNextTextFormatColl(SwTextFormatColl& rNext);
 SwTextFormatColl& GetNextTextFormatColl() const { return 
*mpNextTextFormatColl; }
 
@@ -133,6 +133,11 @@ public:
 bool AreListLevelIndentsApplicable() const;
 
 void dumpAsXml(xmlTextWriterPtr pWriter) const;
+virtual void FormatDropNotify(const SwFormatDrop& rDrop) override
+{
+if(HasWriterListeners() && !IsModifyLocked())
+CallSwClientNotify(sw::LegacyModifyHint(&rDrop, &rDrop));
+};
 };
 
 class SwGrfFormatColl final : public SwFormatColl
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 190649642ffb..5733a5f2c3d6 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -22,12 +22,13 @@
 #include 
 
 #include "swdllapi.h"
-#include "node.hxx"
-#include "hintids.hxx"
-#include "ndhints.hxx"
-#include "SwNumberTreeTypes.hxx"
 #include "IDocumentContentOperations.hxx"
+#include "SwNumberTreeTypes.hxx"
+#include "hintids.hxx"
 #include "modeltoviewhelper.hxx"
+#include "ndhints.hxx"
+#include "node.hxx"
+#include "paratr.hxx"
 
 #include 
 #include 
@@ -79,6 +80,7 @@ typedef o3tl::sorted_vector< sal_Int32 > SwSoftPageBreakList;
 class SW_DLLPUBLIC SwTextNode
 : public SwContentNode
 , public ::sfx2::Metadatable
+, public sw::FormatDropDefiner
 {
 friend class SwContentNode;
 /// For creating the first TextNode.
@@ -805,6 +807,8 @@ public:
 
 /// In MS Word, the font underline setting of the paragraph end position 
won't affect the formatting of numbering, so we ignore it
 static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
+void FormatDropNotify(const SwFormatDrop& rDrop) override
+{ TriggerNodeUpdate(sw::LegacyModifyHint(&rDrop, &rDrop)); };
 };
 
 inline SwpHints & SwTextNode::GetSwpHints()
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 1c6bcf4de0fc..d9712028198c 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -39,18 +39,29 @@
 #include 
 #include 
 
+class SwTextNode;
 class IntlWrapper;
 
 #define DROP_WHOLEWORD ((sal_uInt16)0x0001)
 
+class SwFormatDrop;
+
+namespace sw {
+class SW_DLLPUBLIC FormatDropDefiner {
+protected:
+virtual ~FormatDropDefiner() {};
+public:
+virtual void FormatDropNotify(const SwFormatDrop&) =0;
+};
+}
+
 /** If SwFormatDrop is a Client, it is the CharFormat that describes the font 
for the
DropCaps. If it is not a Client, formatting uses the CharFormat of the 
paragraph.
If the CharFormat is modified, this change is propagated to the paragraphs
via the Modify of SwFormatDrop. */
 class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient
 {
-sw::BroadcastingModify* m_pDefinedIn;   /**< Modify-Object, that 
contains DropCaps.
-  Can only be 

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

[Miklos Vajna (via logerrit)]

 vcl/qa/cppunit/GraphicTest.cxx|   30 ++
 vcl/qa/cppunit/data/roundtrip.wmf |binary
 2 files changed, 30 insertions(+)

New commits:
commit 6bb0e09e2423ae00e06e6b7ae2c5a0af6ca100a1
Author: Miklos Vajna 
AuthorDate: Wed Nov 25 18:01:08 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 26 07:37:29 2020 +0100

WMF export: just write the source data as is for from-WMF graphics

This was already working on master since commit
5868745db74ae930edb0058490076d82aaeafbe9 (emfplus: make VectorFormats
Emf/Wmf/Svg work, 2017-06-12), but a matching testcase was missing.

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

diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index 50ff4a133f86..df9711b54a35 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -49,6 +50,7 @@ private:
 void testSwapping();
 void testSwappingVectorGraphic();
 void testSwappingPageNumber();
+void testWMFRoundtrip();
 
 CPPUNIT_TEST_SUITE(GraphicTest);
 CPPUNIT_TEST(testUnloadedGraphic);
@@ -59,6 +61,7 @@ private:
 CPPUNIT_TEST(testSwapping);
 CPPUNIT_TEST(testSwappingVectorGraphic);
 CPPUNIT_TEST(testSwappingPageNumber);
+CPPUNIT_TEST(testWMFRoundtrip);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -468,6 +471,33 @@ void GraphicTest::testSwappingPageNumber()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), 
aGraphic.getVectorGraphicData()->getPageIndex());
 }
 
+void GraphicTest::testWMFRoundtrip()
+{
+// Load a WMF file.
+test::Directories aDirectories;
+OUString aURL = 
aDirectories.getURLFromSrc("vcl/qa/cppunit/data/roundtrip.wmf");
+SvFileStream aStream(aURL, StreamMode::READ);
+sal_uInt64 nExpectedSize = aStream.TellEnd();
+GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
+Graphic aGraphic = rGraphicFilter.ImportUnloadedGraphic(aStream);
+
+// Save as WMF.
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+sal_uInt16 nFormat = 
rGraphicFilter.GetExportFormatNumberForShortName(u"WMF");
+SvStream& rOutStream = *aTempFile.GetStream(StreamMode::READWRITE);
+rGraphicFilter.ExportGraphic(aGraphic, OUString(), rOutStream, nFormat);
+
+// Check if we preserved the WMF data perfectly.
+sal_uInt64 nActualSize = rOutStream.TellEnd();
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 6475
+// - Actual  : 2826
+// i.e. we lost some of the WMF data on roundtrip.
+CPPUNIT_ASSERT_EQUAL(nExpectedSize, nActualSize);
+}
+
 } // namespace
 
 CPPUNIT_TEST_SUITE_REGISTRATION(GraphicTest);
diff --git a/vcl/qa/cppunit/data/roundtrip.wmf 
b/vcl/qa/cppunit/data/roundtrip.wmf
new file mode 100644
index ..83210546c373
Binary files /dev/null and b/vcl/qa/cppunit/data/roundtrip.wmf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data3/tdf138130.docx |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx|   30 +
 2 files changed, 30 insertions(+)

New commits:
commit 7893e24c82c97de9c066f6e09df0ac107a6d97dd
Author: Xisco Fauli 
AuthorDate: Wed Nov 25 17:04:16 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 26 00:26:23 2020 +0100

tdf#138130: sw_uiwriter: Add unittest

Change-Id: If7eca097e83003d657cc39ae617eaccabcf62a5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106610
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106633

diff --git a/sw/qa/extras/uiwriter/data3/tdf138130.docx 
b/sw/qa/extras/uiwriter/data3/tdf138130.docx
new file mode 100644
index ..a570dec4b08a
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf138130.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index da425a13e071..36b971e6a5ec 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -868,6 +868,36 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf117601)
 CPPUNIT_ASSERT(xCellB1->getString().endsWith("test1"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf138130)
+{
+load(DATA_DIRECTORY, "tdf138130.docx");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+uno::Reference xShape = getShape(1);
+
+awt::Point aPos = xShape->getPosition();
+
+//select shape and change the anchor
+dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:SetAnchorToPage", {});
+Scheduler::ProcessEventsToIdle();
+
+//position has changed
+CPPUNIT_ASSERT(aPos.X < xShape->getPosition().X);
+CPPUNIT_ASSERT(aPos.Y < xShape->getPosition().Y);
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(aPos.X, xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(aPos.Y, xShape->getPosition().Y);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf128782)
 {
 load(DATA_DIRECTORY, "tdf128782.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data3/tdf138130.docx |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx|   30 +
 2 files changed, 30 insertions(+)

New commits:
commit a45ea4f7939e7ca2e5c071ad209c957702b527e6
Author: Xisco Fauli 
AuthorDate: Wed Nov 25 17:04:16 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Nov 25 23:08:13 2020 +0100

tdf#138130: sw_uiwriter: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/data3/tdf138130.docx 
b/sw/qa/extras/uiwriter/data3/tdf138130.docx
new file mode 100644
index ..a570dec4b08a
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf138130.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 38b9e6e7115a..4f8c046356f8 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1598,6 +1598,36 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf117601)
 CPPUNIT_ASSERT(xCellB1->getString().endsWith("test1"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf138130)
+{
+load(DATA_DIRECTORY, "tdf138130.docx");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+uno::Reference xShape = getShape(1);
+
+awt::Point aPos = xShape->getPosition();
+
+//select shape and change the anchor
+dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:SetAnchorToPage", {});
+Scheduler::ProcessEventsToIdle();
+
+//position has changed
+CPPUNIT_ASSERT(aPos.X < xShape->getPosition().X);
+CPPUNIT_ASSERT(aPos.Y < xShape->getPosition().Y);
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(aPos.X, xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(aPos.Y, xShape->getPosition().Y);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf136385)
 {
 load(DATA_DIRECTORY, "tdf136385.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 avmedia/source/win/player.cxx |4 +---
 avmedia/source/win/player.hxx |2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 8f4d36009d789f645ab700bfcd20f8e268ce8cee
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 17:45:08 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 22:58:16 2020 +0100

Player::processEvent return value is unused

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

diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index b3e621cbc56d..7990e7aecdfe 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -191,7 +191,7 @@ void Player::setNotifyWnd( HWND nNotifyWnd )
 }
 
 
-long Player::processEvent()
+void Player::processEvent()
 {
 long nCode;
 LONG_PTR nParam1, nParam2;
@@ -214,8 +214,6 @@ long Player::processEvent()
 
 mpME->FreeEventParams( nCode, nParam1, nParam2 );
 }
-
-return 0;
 }
 
 
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index ed34981e96ae..84e2689c0397 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -60,7 +60,7 @@ public:
 boolcreate( const OUString& rURL );
 
 voidsetNotifyWnd( HWND nNotifyWnd );
-longprocessEvent();
+voidprocessEvent();
 
 const IVideoWindow* getVideoWindow() const;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data3/tdf138130.docx |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx|   30 +
 2 files changed, 30 insertions(+)

New commits:
commit f3e7e5a6aa4d3eafb584f5d22c1a31bb0a3dd496
Author: Xisco Fauli 
AuthorDate: Wed Nov 25 17:04:16 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Nov 25 22:05:45 2020 +0100

tdf#138130: sw_uiwriter: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/data3/tdf138130.docx 
b/sw/qa/extras/uiwriter/data3/tdf138130.docx
new file mode 100644
index ..a570dec4b08a
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf138130.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index de5892c4b7bf..972cc6af88b5 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1599,6 +1599,36 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf117601)
 CPPUNIT_ASSERT(xCellB1->getString().endsWith("test1"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf138130)
+{
+load(DATA_DIRECTORY, "tdf138130.docx");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+uno::Reference xShape = getShape(1);
+
+awt::Point aPos = xShape->getPosition();
+
+//select shape and change the anchor
+dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:SetAnchorToPage", {});
+Scheduler::ProcessEventsToIdle();
+
+//position has changed
+CPPUNIT_ASSERT(aPos.X < xShape->getPosition().X);
+CPPUNIT_ASSERT(aPos.Y < xShape->getPosition().Y);
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(aPos.X, xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(aPos.Y, xShape->getPosition().Y);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf136385)
 {
 load(DATA_DIRECTORY, "tdf136385.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 editeng/source/editeng/editdbg.cxx|2 +-
 sw/source/filter/ww8/WW8TableInfo.cxx |   16 
 vcl/workben/vcldemo.cxx   |2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit cd4b94a430e570122cb607e1778edcadd0623cde
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 11:00:23 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 21:42:03 2020 +0100

Use sal_Int64 to printf tools::Long values

(The "%l" format specifiers had now caused -Werror,-Wformat with clang-cl 
for a
Windows 64-bit build.)

Change-Id: I86b9617310f7348d72172cc7a29f0976c7030dd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106576
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 9e0de138a5afaa7132ee535a15741effc983d2b0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106612

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index cee32beafcc2..3598036e2240 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -454,7 +454,7 @@ void EditEngine::DumpData(const EditEngine* pEE, bool 
bInfoBox)
 fprintf( fp, "\nControl: %x", unsigned( pEE->GetControlWord() ) );
 fprintf( fp, "\nRefMapMode: %i", int( 
pEE->pImpEditEngine->pRefDev->GetMapMode().GetMapUnit() ) );
 fprintf( fp, "\nPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64, 
sal_Int64(pEE->GetPaperSize().Width()), sal_Int64(pEE->GetPaperSize().Height()) 
);
-fprintf( fp, "\nMaxAutoPaperSize: %li x %li", 
pEE->GetMaxAutoPaperSize().Width(), pEE->GetMaxAutoPaperSize().Height() );
+fprintf( fp, "\nMaxAutoPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64, 
sal_Int64(pEE->GetMaxAutoPaperSize().Width()), 
sal_Int64(pEE->GetMaxAutoPaperSize().Height()) );
 fprintf( fp, "\nMinAutoPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64 , 
sal_Int64(pEE->GetMinAutoPaperSize().Width()), 
sal_Int64(pEE->GetMinAutoPaperSize().Height()) );
 fprintf( fp, "\nUpdate: %i", pEE->GetUpdateMode() );
 fprintf( fp, "\nNumber of Views: %" SAL_PRI_SIZET "i", pEE->GetViewCount() 
);
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx 
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 03f376fbeec9..907e4131cec0 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -998,15 +998,15 @@ std::string CellInfo::toString() const
 static char sBuffer[256];
 
 snprintf(sBuffer, sizeof(sBuffer),
- "",
- left(),
- right(),
- top(),
- bottom(),
+ sal_Int64(left()),
+ sal_Int64(right()),
+ sal_Int64(top()),
+ sal_Int64(bottom()),
  m_pNodeInfo);
 
 return sBuffer;
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 09b1f47608e0..12ce11b58ed4 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1794,7 +1794,7 @@ public:
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect) override
 {
 mrRenderer.SetSizePixel(GetSizePixel());
-fprintf(stderr, "DemoWin::Paint(%ld,%ld,%ld,%ld)\n", rRect.getX(), 
rRect.getY(), rRect.getWidth(), rRect.getHeight());
+fprintf(stderr, "DemoWin::Paint(%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 
",%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ")\n", sal_Int64(rRect.getX()), 
sal_Int64(rRect.getY()), sal_Int64(rRect.getWidth()), 
sal_Int64(rRect.getHeight()));
 if (mrRenderer.getIterCount() == 0)
 mrRenderer.drawToDevice(rRenderContext, GetSizePixel(), false);
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 extensions/source/scanner/twain32shim.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8de92fa9bc7b284cb151ec57205bbccda379e379
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 17:54:52 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 21:41:29 2020 +0100

TW_IMAGEINFO::ImageWidth,ImageHeight are of type TW_INT32

...and for TW_IMAGEINFO::XResolution,YResolution of type TW_FIX32 it appears
more natural to also convert them to TW_INT32 here, rather than to long

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

diff --git a/extensions/source/scanner/twain32shim.cxx 
b/extensions/source/scanner/twain32shim.cxx
index 30cbba8558e4..0a34fa13ce7e 100644
--- a/extensions/source/scanner/twain32shim.cxx
+++ b/extensions/source/scanner/twain32shim.cxx
@@ -35,9 +35,9 @@
 
 namespace
 {
-long FixToLong(const TW_FIX32& rFix)
+TW_INT32 FixToInt32(const TW_FIX32& rFix)
 {
-return static_cast(floor(rFix.Whole + rFix.Frac / 65536. + 0.5));
+return static_cast(floor(rFix.Whole + rFix.Frac / 65536. + 0.5));
 }
 
 const wchar_t sTwainWndClass[] = L"TwainClass";
@@ -387,14 +387,14 @@ void ImpTwain::ImplXfer()
 {
 TW_IMAGEINFO aInfo;
 HANDLE hDIB = nullptr;
-long nWidth, nHeight, nXRes, nYRes;
+TW_INT32 nWidth, nHeight, nXRes, nYRes;
 
 if (m_pDSM(&m_aAppId, &m_aSrcId, DG_IMAGE, DAT_IMAGEINFO, MSG_GET, 
&aInfo) == TWRC_SUCCESS)
 {
 nWidth = aInfo.ImageWidth;
 nHeight = aInfo.ImageLength;
-nXRes = FixToLong(aInfo.XResolution);
-nYRes = FixToLong(aInfo.YResolution);
+nXRes = FixToInt32(aInfo.XResolution);
+nYRes = FixToInt32(aInfo.YResolution);
 }
 else
 nWidth = nHeight = nXRes = nYRes = -1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 avmedia/source/win/framegrabber.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ff75b172cc86374969a986ee94cac0931d95a5cd
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 17:50:21 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 21:40:56 2020 +0100

BITMAPINFOHEADER::biWidth,biHeight are of type LONG

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

diff --git a/avmedia/source/win/framegrabber.cxx 
b/avmedia/source/win/framegrabber.cxx
index 4fd0d8b519b2..249648f04f96 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -138,7 +138,8 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
FrameGrabber::grabFrame( double fMe
 ( fLength > 0.0 ) && ( fMediaTime >= 0.0 ) && ( fMediaTime <= 
fLength ) )
 {
 AM_MEDIA_TYPE   aMediaType;
-longnWidth = 0, nHeight = 0, nSize = 0;
+LONGnWidth = 0, nHeight = 0;
+longnSize = 0;
 
 if( SUCCEEDED( pDet->get_StreamMediaType( &aMediaType ) ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 basic/source/comp/symtbl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d000f0246a64ff75fa57094a5de46c93fd08481d
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 10:21:37 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 21:40:35 2020 +0100

Use sal_Int32 to print SbxLONG value

(The "%ld" format specifier had now caused -Werror,-Wformat with clang-cl 
for a
Windows 64-bit build.)

Change-Id: I741a3e3526a63162dbd75c018dfe7157f06819f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106575
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit da212b3e090d1832388834b135c8f358747f4b96)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106611

diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 46b3b924798e..a4e7befe94b1 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 
 // All symbol names are laid down int the symbol-pool's stringpool, so that
 // all symbols are handled in the same case. On saving the code-image, the
@@ -70,7 +69,8 @@ short SbiStringPool::Add( double n, SbxDataType t )
 // tdf#131296 - store numeric value including its type character
 // See GetSuffixType in basic/source/comp/scanner.cxx for type 
characters
 case SbxINTEGER: snprintf( buf, sizeof(buf), "%d%%", 
static_cast(n) ); break;
-case SbxLONG:snprintf( buf, sizeof(buf), "%ld&", 
static_cast(n) ); break;
+case SbxLONG:
+snprintf( buf, sizeof(buf), "%" SAL_PRIdINT32 "&", 
static_cast(n) ); break;
 case SbxSINGLE:  snprintf( buf, sizeof(buf), "%.6g!", 
static_cast(n) ); break;
 case SbxDOUBLE:  snprintf( buf, sizeof(buf), "%.16g", n ); break; // 
default processing in SbiRuntime::StepLOADNC - no type character
 case SbxCURRENCY: snprintf(buf, sizeof(buf), "%.16g@", n); break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sfx2/source/view/viewsh.cxx |   14 -
 sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |   33 
 sw/source/uibase/docvw/edtwin2.cxx  |   11 
 4 files changed, 56 insertions(+), 2 deletions(-)

New commits:
commit 3ed2f733f81b348e4be1c46c019e9588a6062bd2
Author: Miklos Vajna 
AuthorDate: Tue Nov 24 17:26:32 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 25 21:15:35 2020 +0100

sw tiled rendering: fix paint->invalidation loop when paint is started by 
vcl

SwViewShell::PaintTile() already calls
comphelper::LibreOfficeKit::setTiledPainting(), so by the time it would
rearch SwViewShell::Paint(), callbacks (e.g. invalidations) are ignored
during paint.

Do the same for SwEditWin::Paint(), where we processed invalidations
during paint, potentially leading to paint->invalidation loops.

Conflicts:
sw/qa/extras/tiledrendering/tiledrendering.cxx
sw/source/uibase/docvw/edtwin2.cxx

Change-Id: I8280f5c2571beeae6c0f2986d275dde3c2d33161
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106543
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106601
Reviewed-by: Andras Timar 

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index dcbdc9ceef3a..cae5f15fe4b7 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1488,8 +1488,18 @@ void SfxViewShell::libreOfficeKitViewCallback(int nType, 
const char* pPayload) c
 if (!comphelper::LibreOfficeKit::isActive())
 return;
 
-if (comphelper::LibreOfficeKit::isTiledPainting() && nType != 
LOK_CALLBACK_FORM_FIELD_BUTTON)
-return;
+if (comphelper::LibreOfficeKit::isTiledPainting())
+{
+switch (nType)
+{
+case LOK_CALLBACK_FORM_FIELD_BUTTON:
+case LOK_CALLBACK_TEXT_SELECTION:
+break;
+default:
+// Reject e.g. invalidate during paint.
+return;
+}
+}
 
 if (pImpl->m_bTiledSearching)
 {
diff --git a/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt 
b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt
new file mode 100644
index ..b42c5cc51588
Binary files /dev/null and 
b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 3d922d088309..ac481a9f7148 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -128,6 +128,7 @@ public:
 void testDropDownFormFieldButtonEditing();
 void testDropDownFormFieldButtonNoSelection();
 void testDropDownFormFieldButtonNoItem();
+void testTablePaintInvalidate();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -196,6 +197,7 @@ public:
 CPPUNIT_TEST(testDropDownFormFieldButtonEditing);
 CPPUNIT_TEST(testDropDownFormFieldButtonNoSelection);
 CPPUNIT_TEST(testDropDownFormFieldButtonNoItem);
+CPPUNIT_TEST(testTablePaintInvalidate);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2737,6 +2739,37 @@ void 
SwTiledRenderingTest::testDropDownFormFieldButtonNoItem()
 }
 }
 
+void SwTiledRenderingTest::testTablePaintInvalidate()
+{
+// Load a document with a table in it.
+SwXTextDocument* pXTextDocument = createDoc("table-paint-invalidate.odt");
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+
pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback,
 this);
+// Enter the table.
+pWrtShell->Down(/*bSelect=*/false);
+Scheduler::ProcessEventsToIdle();
+m_nInvalidations = 0;
+
+// Paint a tile.
+size_t nCanvasWidth = 256;
+size_t nCanvasHeight = 256;
+std::vector aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
+ScopedVclPtrInstance pDevice(DeviceFormat::DEFAULT);
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, 
nCanvasHeight),
+Fraction(1.0), Point(), 
aPixmap.data());
+pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, 
m_aInvalidation.getX(),
+  m_aInvalidation.getY(), /*nTileWidth=*/1000,
+  /*nTileHeight=*/1000);
+Scheduler::ProcessEventsToIdle();
+
+// Without the accompanying fix in place, this test would have failed with
+// - Expected: 0
+// - Actual  : 5
+// i.e. paint generated an invalidation, which caused a loop.
+CPPUNIT_ASSERT_EQUAL(0, m_nInvalidations);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPP

Minutes from the UX/design meeting 2020-Nov-25

[Heiko Tietze]

Present: Sascha, Muhammet, Heiko
Comments:

Tickets/Topic

 * Tight integration
   + mkara wants to discuss what we can do to make it working
   + state is that a temporary address is used with extensions
 frozen at the time when the project was done
   + implemented API is not fully compatible yet (Muhammet)
   + several options on the table; fall-back solution is to run
 a script that updates the temp site every day but ideally
 we get it running on the actual extension site;
 will take care of this (Muhammet)
   + Hard feature freeze was Nov 16, UI freeze is Dec 14
   + will abandon the patch to make it exerimental (Heiko)
   => update next design meeting, Dec/03

 * Escape chart mode after Insert > Chart
   + https://bugs.documentfoundation.org/show_bug.cgi?id=137891
   + cannot reproduce, escape closes the module and allows to
delete (Heiko, Muhammet)
   + different behaviour between Windows and Linux (7.0.2) (Sascha) - but not
 on 7.2 (Heiko)
   + pressing escape multiple times is weird (Sascha)
 + only once required on Windows but two or three times on Linux
 + Chart Area is selected on Linux but not on Windows
 + sidebar is blank with no chart element selected
 + sidebar is not reliably refreshed
   => WFM, escaping the chart mode per ESC is possible with master
 (and on Windows)

 * Loss of nominated Chart data series Labels when target cells hidden or
   grouped & collapsed
   + https://bugs.documentfoundation.org/show_bug.cgi?id=134059
   => assigned and patch has been submitted

 * Unwanted scroll to bottom when changing language of document
   (CTRL+A Language change)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=137603
   + remember current position on select all (instead of going
 to the end) (Heiko)
   + MS Word does left/up to first character, right/down to the end;
 LibreOffice always goes to the end, actually SelectAll changes the
 cursor position
   + API might be affected when we change the behavior (Muhammet)
   + also an option to change the view immediately with SelectAll (Sascha)
   + same situation for sentence/paragraph selection (currently the cursor
 goes to the end)
   + we may also keep the view position after SelectAll and any
 operation (Muhammet)
 + would dislike the separation of cursor position and view (Heiko)
 + only manually scrolling, eg. SelectAll + scroll to p10, should be kept
   => ideally keep the cursor position, otherwise scroll to cursor

 * Anchor decoration in Toggle formatting marks on mode (to so they exact
   location of the anchor)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=138351
   + change the anchor color/symbol?
   + using a blueish symbol sounds like a plan (Sascha)
   + might be worth to make it depended to the icon theme since
 not all users want the icon to be obtrusive (Heiko)
   => recommend color to icon designers




OpenPGP_signature
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andrea Gelmini (via logerrit)]

 0 files changed

New commits:
commit 35000da925d9afd5d8c4f7f98155c28883c2e5e0
Author: Andrea Gelmini 
AuthorDate: Wed Nov 25 12:36:09 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Nov 25 21:00:30 2020 +0100

Removed executable bits on odt file

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

diff --git a/sw/qa/extras/rtfexport/data/tdf137894.odt 
b/sw/qa/extras/rtfexport/data/tdf137894.odt
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: XML entity reference

[Noel Grandin]

FastParser uses libxml2 internally,
   http://xmlsoft.org/html/libxml-entities.html
to do most of the work.

Something like this:
https://gerrit.libreoffice.org/c/core/+/106630
would be a starting point.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Mark Hung (via logerrit)]

 sw/qa/extras/rtfexport/data/tdf137894.odt   |binary
 sw/qa/extras/rtfexport/rtfexport5.cxx   |   16 ++
 sw/source/filter/ww8/rtfattributeoutput.cxx |  138 
 sw/source/filter/ww8/rtfattributeoutput.hxx |6 -
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |4 
 5 files changed, 95 insertions(+), 69 deletions(-)

New commits:
commit efe85aa1ef4034ae70c50a256b491737199b8747
Author: Mark Hung 
AuthorDate: Sun Nov 22 19:32:32 2020 +0800
Commit: Xisco Fauli 
CommitDate: Wed Nov 25 18:17:43 2020 +0100

tdf#137894 separate associated character properties

in ww8filter/RtfAttributeOutput and treat \dbch as
CJK and \hich Western in order to roundtrip the
RTF document.

ww8filter mix all the associated style, including
properties for CJK and CTL scripts.

Both RtfAttributeOutput::CharFontCJK and
RtfAttributeOutput::CharFontCTL output \dbch,
that result in incorrect assocation.

CharFontCTL should use \rtlch, but it was already in
RtfAttributeOutput::MoveCharacterProperties.

To make the order correct, I separate the
associated character properties that were
stored in m_aSyltesAssoc into m_aSyltesAssocRtlch,
and m_aSyltesAssocDbch by their script types.

Note that it is not clear what associated character
properties that we should adopt for \hich and \ltrch.

In theory RTL scripts can output high ANSI chars too,
so \hich may get properties from either Western or
CTL scripts. However, examining Hebrew RTF documents,
I didn't see any sign that \hich is used in that way.

Use RTL as CTL might be a problem for Mongolian,
Manchu and Xibe. They are CTL but top-to-bottom (aka LTR)
. But I don't think they will be expressed
as high ANSI chars either.

Change-Id: I214edbb00a67c2ffe19c5a37254c8988a0828f40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106355
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit f97af19460fbd7483a0e1c1d0137e814f5390e69)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106523
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/rtfexport/data/tdf137894.odt 
b/sw/qa/extras/rtfexport/data/tdf137894.odt
new file mode 100755
index ..79c7eb178a7f
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/tdf137894.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx 
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index a48adfa653cd..0d921ed6c7b6 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -1260,6 +1260,22 @@ DECLARE_RTFEXPORT_TEST(testTdf138210, "tdf138210.rtf")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf137894, "tdf137894.odt")
+{
+lang::Locale locale1(getProperty(getRun(getParagraph(1), 1), 
"CharLocaleAsian"));
+CPPUNIT_ASSERT_EQUAL(OUString("ja"), locale1.Language);
+CPPUNIT_ASSERT_EQUAL(OUString("MS UI Gothic"),
+ getProperty(getRun(getParagraph(1), 1), 
"CharFontNameAsian"));
+CPPUNIT_ASSERT_EQUAL(20.f, getProperty(getRun(getParagraph(1), 1), 
"CharHeightAsian"));
+CPPUNIT_ASSERT_EQUAL(OUString("Mangal"),
+ getProperty(getRun(getParagraph(1), 1), 
"CharFontNameComplex"));
+CPPUNIT_ASSERT_EQUAL(20.f, getProperty(getRun(getParagraph(1), 1), 
"CharHeightComplex"));
+lang::Locale locale2(
+getProperty(getRun(getParagraph(2), 1), 
"CharLocaleComplex"));
+CPPUNIT_ASSERT_EQUAL(OUString("he"), locale2.Language);
+CPPUNIT_ASSERT_EQUAL(32.f, getProperty(getRun(getParagraph(2), 1), 
"CharHeightComplex"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9e76b3d3fd48..23dc3af728e2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -423,49 +423,58 @@ void RtfAttributeOutput::EndRunProperties(const 
SwRedlineData* /*pRedlineData*/)
 
 OString RtfAttributeOutput::MoveCharacterProperties(bool aAutoWriteRtlLtr)
 {
-const OString aAssoc = m_aStylesAssoc.makeStringAndClear();
+const OString aAssocHich = m_aStylesAssocHich.makeStringAndClear();
+const OString aAssocDbch = m_aStylesAssocDbch.makeStringAndClear();
+const OString aAssocRtlch = m_aStylesAssocRtlch.makeStringAndClear();
+const OString aAssocLtrch = m_aStylesAssocLtrch.makeStringAndClear();
 const OString aNormal = m_aStyles.makeStringAndClear();
 OStringBuffer aBuf;
 
 if (aAutoWriteRtlLtr && !m_bControlLtrRtl)
 {
-m_bControlLtrRtl = !aAssoc.isEmpty();
+m_bControlLtrRtl = !aAssocRtlch.isEmpty();
 m_bIsRTL = false;
 m_nScript = i18n::ScriptType::LATIN;
 }
 
-if (m_bControlLtrRtl)
+if (m_bIsRTL)
 {
-  

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

[Tibor Nagy (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf123621.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx   |2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |   11 +++
 sw/source/core/layout/anchoreddrawobject.cxx |   12 ++--
 4 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 92f1c430e4e77e71e7c914ad567d4970e5b2cd95
Author: Tibor Nagy 
AuthorDate: Thu Jul 9 09:54:15 2020 +0200
Commit: Xisco Fauli 
CommitDate: Wed Nov 25 18:08:10 2020 +0100

tdf#138130, tdf#123621 sw: fix textbox position according to DOCX

i.e. when spAutoFit is present in DOCX, and size of
the textbox is relative.

See also commit cab956c480eb4f619580285c7b9a15b9e6d9b780
(tdf#112312 DOCX legacy shape export: keep fixed size).

Co-authored-by: Attila Szűcs (NISZ)

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

This commit also includes:

Clean-up of commit I29af97001954ad353a386164b68cd22f6230e3e5

Change-Id: I1963a5d899da2d122e60c4d87ca32aba4fb1f32a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102449
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106589

diff --git a/sw/qa/extras/ooxmlexport/data/tdf123621.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123621.docx
new file mode 100644
index ..471b6ef71e95
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123621.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index f209ed442175..87a5223ccd2b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -236,7 +236,7 @@ DECLARE_OOXMLEXPORT_TEST(testMceNested, "mce-nested.docx")
 // Vertical position of the shape was incorrect due to incorrect nested 
mce handling.
 uno::Reference xShape(getShape(1), uno::UNO_QUERY);
 // positionV's posOffset from the bugdoc, was 0.
-CPPUNIT_ASSERT(6985 <= getProperty(xShape, 
"VertOrientPosition"));
+CPPUNIT_ASSERT(6879 <= getProperty(xShape, 
"VertOrientPosition"));
 // This was -1 (default), make sure the background color is set.
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty(xShape, 
"FillColor"));
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 1950b8349697..1fd8ad4a7d84 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -30,6 +30,17 @@ protected:
 }
 };
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf123621, "tdf123621.docx")
+{
+xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+assertXPathContent(pXmlDocument, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor"
+"/wp:positionV/wp:posOffset", "1080135");
+}
+
+
 DECLARE_OOXMLEXPORT_TEST(testTdf14_followPgStyle, 
"tdf14_followPgStyle.odt")
 {
 CPPUNIT_ASSERT_EQUAL(2, getPages());
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 2cbe4bab0f3b..a908300b0e0c 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -681,8 +682,15 @@ SwRect SwAnchoredDrawObject::GetObjBoundRect() const
 nTargetWidth = nWidth * (*GetDrawObj( )->GetRelativeWidth());
 }
 
-long nTargetHeight = aCurrObjRect.GetHeight( );
-if ( GetDrawObj( )->GetRelativeHeight( ) )
+bool bCheck = GetDrawObj()->GetRelativeHeight();
+if (bCheck)
+{
+auto pObjCustomShape = dynamic_cast(GetDrawObj());
+bCheck = !pObjCustomShape || !pObjCustomShape->IsAutoGrowHeight();
+}
+
+long nTargetHeight = aCurrObjRect.GetHeight();
+if (bCheck)
 {
 long nHeight = 0;
 if (GetDrawObj()->GetRelativeHeightRelation() == 
text::RelOrientation::FRAME)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sal/rtl

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx |   21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 711e69e333faaf0570ddf2cb1fc721bc59cc61bc
Author: Eike Rathke 
AuthorDate: Wed Nov 25 13:54:31 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Nov 25 17:45:39 2020 +0100

Related: tdf#136272 accept 1.79769313486232e+308 as DBL_MAX

This does not solve writing the badly rounded value, which still
has to be fixed, but at least be able to read/convert it back as
double max value.

This is not even used in the bug scenario because the "fake"
condition in that number format is discarded anyway because it was
only written to satisfy ODF, but it helps in case a
1.7976931348623157e+308 value was entered/used on purpose.

Change-Id: I413dd93d5a3c4df609fd42a3133d6d82c34afff0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106586
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit ee2cc952eeb5385ee37485c822d7ad7abd8fb989)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106526

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index af3e52f2bf9d..c58c646bbc2e 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -976,7 +976,26 @@ double stringToDouble(CharT const * pBegin, CharT const * 
pEnd,
 errno = 0;
 fVal = strtod_nolocale(buf, &pCharParseEnd);
 if (errno == ERANGE)
-eStatus = rtl_math_ConversionStatus_OutOfRange;
+{
+// Check for the dreaded rounded to 15 digits max value
+// 1.79769313486232e+308 for 1.7976931348623157e+308 we wrote
+// everywhere, accept with or without plus sign in exponent.
+const char* b = buf;
+if (b[0] == '-')
+++b;
+if (((pCharParseEnd - b == 21) || (pCharParseEnd - b == 20))
+&& !strncmp( b, "1.79769313486232", 16)
+&& (b[16] == 'e' || b[16] == 'E')
+&& (((pCharParseEnd - b == 21) && !strncmp( b+17, 
"+308", 4))
+ || ((pCharParseEnd - b == 20) && !strncmp( b+17, 
"308", 3
+{
+fVal = (buf < b) ? -DBL_MAX : DBL_MAX;
+}
+else
+{
+eStatus = rtl_math_ConversionStatus_OutOfRange;
+}
+}
 p = bufmap[pCharParseEnd - buf];
 bSign = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

[Stephan Bergmann (via logerrit)]

 external/firebird/ExternalProject_firebird.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 823059c8f046927c3193da5acd78053f3269b753
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 14:27:54 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 17:17:11 2020 +0100

external/firebird: Pass --enable-developer into configure

...instead of merely forcing the Make target to Debug.  That way, a future
patch set of in-progress 
"firebird: update to 3.0.7" will be able to know in the gen/examples sub-
directory Make that the top-level Make was targeting Debug, not Release.  
(Which
it will presumably need to know to fix the macOS build.)

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

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 8f8a8230227f..b143e750103d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -68,6 +68,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
+   $(if $(ENABLE_DEBUG),--enable-developer) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
@@ -80,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& LC_ALL=C $(MAKE) \
-   $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if 
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+   SHELL='$(SHELL)' $(if $(filter 
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
MATHLIB="$(if 
$(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call 
gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
$(if $(filter MACOSX,$(OS)), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf136453.fodt |   66 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   51 +++
 sw/source/core/undo/undel.cxx |3 -
 3 files changed, 119 insertions(+), 1 deletion(-)

New commits:
commit 26a79bc2dd2666c718a1ee09373f636fc5116009
Author: Michael Stahl 
AuthorDate: Tue Oct 27 16:33:30 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 25 17:03:04 2020 +0100

tdf#136453 sw_redlinehide: SwUndoDelete: only create extra frames...

... at the start if the section nodes were at the start.

m_bBackSp and m_bJoinNext can't both be true.

(regression from 740f1796504f66408b692225a9676c9ee3d63722)

Change-Id: I999ed3809ca8f527bc3e754b229df02da4576825
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104891
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit c4967928475f2be20ac2d79e3fa84ac435a7e560)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104920
Tested-by: Michael Stahl 
(cherry picked from commit 0e0c7616bace9f64079fe9c19c06aca823815666)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106529
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/qa/extras/uiwriter/data/tdf136453.fodt 
b/sw/qa/extras/uiwriter/data/tdf136453.fodt
new file mode 100644
index ..2234957e1db8
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf136453.fodt
@@ -0,0 +1,66 @@
+
+http://www.w3.org/TR/css3-text/"; 
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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:d
 r3d="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:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+
+
+
+
+
+   
+   
+   foo
+   bar
+   
+baz
+   
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index f2e88e03b3c5..bdac0ce90ebf 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1135,6 +1135,57 @@ void SwUiWriterTest::testWatermarkDOCX()
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), pWatermark->GetTransparency());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf136453)
+{
+load(DATA_DIRECTORY, "tdf136453.fodt");
+
+SwXTextDocument *const 
pTextDoc(dynamic_cast(mxComponent.get()));
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* const pDoc(pTextDoc->GetDocShell()->GetDoc());
+SwWrtShell *const pWrtShell(pDoc->GetDocShell()->GetWrtShell());
+
+sal_uLong const nNodes(pDoc->GetNodes().Count());
+
+pWrtShell->SttEndDoc(false);
+pWrtShell->SetMark();
+pWrtShell->Up(true, 1);
+pWrtShell->SttPara(true);
+pWrtShell->Delete();
+
+// one paragraph deleted, section is gone
+CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count());
+
+pWrtShell->Undo();
+
+CPPUNIT_ASSERT_EQUAL(nNodes, pDoc->GetNodes().Count());
+
+// check that every node has 1 frame
+xmlDocPtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/body/txt", 3);
+assertXPath(pXmlDoc, "/root/page[1]/body/section", 1);
+assertXPath(pXmlDoc, "/root/page[1]/body/section/txt", 1);
+
+pWrtShell->Redo();
+
+// one pa

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-7-0+backports' - dictionaries .gitreview helpcontent2 translations

[Michael Weghorn (via logerrit)]

 .gitreview   |2 +-
 dictionaries |2 +-
 helpcontent2 |2 +-
 translations |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 30bca0aaff75703e03120e321436967c4127ec2c
Author: Michael Weghorn 
AuthorDate: Wed Nov 25 16:50:28 2020 +0100
Commit: Michael Weghorn 
CommitDate: Wed Nov 25 16:55:23 2020 +0100

Adapt .gitreview for distro/lhm/libreoffice-7-0+backports

Change-Id: I095c0c480b4ec9b97761fb923634d5af086a117c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106596
Tested-by: Michael Weghorn 
Reviewed-by: Michael Weghorn 

diff --git a/.gitreview b/.gitreview
index 40471b035aec..fe86641af384 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-7-0
+defaultbranch=distro/lhm/libreoffice-7-0+backports
 
diff --git a/dictionaries b/dictionaries
index eb64f7240b16..7417829a9350 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit eb64f7240b16745adc6650f017de4be5f7464811
+Subproject commit 7417829a9350fe6a52b30cf134950b0d55867843
diff --git a/helpcontent2 b/helpcontent2
index c9675a9cdcbe..295d7dc808b2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c9675a9cdcbe6228f697fbe08f8171f59206710a
+Subproject commit 295d7dc808b2a22709586cf9c86fb4219a494496
diff --git a/translations b/translations
index 60c5bafea5ac..a98a81ee9754 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 60c5bafea5acf84c0147812a50516136a4225d88
+Subproject commit a98a81ee9754921c9e3d306481e5db92514d7435
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-7-1+backports' - dictionaries .gitreview helpcontent2 translations

[Michael Weghorn (via logerrit)]

 .gitreview   |2 +-
 dictionaries |2 +-
 helpcontent2 |2 +-
 translations |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8303359a6c40f3f787af12c53c35737f9850ceb3
Author: Michael Weghorn 
AuthorDate: Wed Nov 25 16:53:44 2020 +0100
Commit: Michael Weghorn 
CommitDate: Wed Nov 25 16:54:40 2020 +0100

Adapt .gitreview for distro/lhm/libreoffice-7-1+backports branch

Change-Id: I756f53d67672cd9e1bd046a6cdfbc59810e8e1a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106597
Tested-by: Michael Weghorn 
Reviewed-by: Michael Weghorn 

diff --git a/.gitreview b/.gitreview
index c993b24c468a..9914cae2e3b3 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-7-1
+defaultbranch=distro/lhm/libreoffice-7-1+backports
 
diff --git a/dictionaries b/dictionaries
index 6a731d77bb72..7417829a9350 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 6a731d77bb72141fe956b8b524b221c164ab05ee
+Subproject commit 7417829a9350fe6a52b30cf134950b0d55867843
diff --git a/helpcontent2 b/helpcontent2
index c07e293f4827..295d7dc808b2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c07e293f482776df8f57cf1b7aea014c81ee2438
+Subproject commit 295d7dc808b2a22709586cf9c86fb4219a494496
diff --git a/translations b/translations
index b7419adb2aee..a98a81ee9754 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b7419adb2aeeb4347bd04e24ce5f3f5c3c2db270
+Subproject commit a98a81ee9754921c9e3d306481e5db92514d7435
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 9c185db28394802d609e76f26b3e3afca6830991
Author: Alain Romedenne 
AuthorDate: Wed Nov 25 16:08:32 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 16:08:32 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 51923f0e54c44e9fa8a3d35092938f5a228256fd
  - Deprecated tags for ChDir, ChDrive, CurDir

« Some DOS-specific file and directory functions are no longer provided 
in StarOffice 7, or their function is only limited. For example, support for 
the ChDir, ChDrive and CurDir functions is not provided. Some DOS-specific 
properties are no longer used in functions that expect file properties as 
parameters (for example, to differentiate from concealed files and system 
files). This change became necessary to ensure the greatest possible level of 
platform independence for StarOffice. »
- as of page 54 of "StarOffice 7 Basic Programmer's Guide" cf. 
http://www.staroffice.com/SO7/so-7-ga-en-BASIC_GUIDE.PDF - 2003

« The functions ChDir and ChDrive, although present in Basic, do 
nothing and will likely be removed from the language. Their original purpose 
was to change the current drive and directory, but this was a system wide 
change, which is dangerous in multitasking environments like we use today. The 
initial current directory is dependent upon the operating system and how LO was 
opened. The initial values, therefore, cannot be assumed.  »
- as of page 172 of Andrew Pitonyak's "OOo Macros Explained v.4" cf. 
http://www.pitonyak.org/OOME_4_0.odt - 2018


Typo in syntax of Dir Function
- add reference to CurDir

Change-Id: I3826f953ba24c3bf631cf15357c0717593ead514
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106009
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index f1630841a1cc..51923f0e54c4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f1630841a1ccff7db1cef14577590517ee21aecf
+Subproject commit 51923f0e54c44e9fa8a3d35092938f5a228256fd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/03020401.xhp |   34 +++
 source/text/sbasic/shared/03020402.xhp |   12 +++-
 source/text/sbasic/shared/03020403.xhp |   41 +---
 source/text/sbasic/shared/03020404.xhp |   48 -
 4 files changed, 65 insertions(+), 70 deletions(-)

New commits:
commit 51923f0e54c44e9fa8a3d35092938f5a228256fd
Author: Alain Romedenne 
AuthorDate: Thu Nov 19 10:35:14 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Nov 25 16:08:32 2020 +0100

Deprecated tags for ChDir, ChDrive, CurDir

« Some DOS-specific file and directory functions are no longer provided in 
StarOffice 7, or their function is only limited. For example, support for the 
ChDir, ChDrive and CurDir functions is not provided. Some DOS-specific 
properties are no longer used in functions that expect file properties as 
parameters (for example, to differentiate from concealed files and system 
files). This change became necessary to ensure the greatest possible level of 
platform independence for StarOffice. »
- as of page 54 of "StarOffice 7 Basic Programmer's Guide" cf. 
http://www.staroffice.com/SO7/so-7-ga-en-BASIC_GUIDE.PDF - 2003

« The functions ChDir and ChDrive, although present in Basic, do nothing 
and will likely be removed from the language. Their original purpose was to 
change the current drive and directory, but this was a system wide change, 
which is dangerous in multitasking environments like we use today. The initial 
current directory is dependent upon the operating system and how LO was opened. 
The initial values, therefore, cannot be assumed.  »
- as of page 172 of Andrew Pitonyak's "OOo Macros Explained v.4" cf. 
http://www.pitonyak.org/OOME_4_0.odt - 2018


Typo in syntax of Dir Function
- add reference to CurDir

Change-Id: I3826f953ba24c3bf631cf15357c0717593ead514
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106009
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/03020401.xhp 
b/source/text/sbasic/shared/03020401.xhp
index eea88c05f..220fb4d8d 100644
--- a/source/text/sbasic/shared/03020401.xhp
+++ b/source/text/sbasic/shared/03020401.xhp
@@ -27,44 +27,42 @@
 
 
 
-
 
 
   ChDir statement
 
 
-
-ChDir 
Statement
+ChDir 
Statement
 Changes the 
current directory or drive.
 
 
-
-This statement 
currently does not work as documented. See https://bz.apache.org/ooo/show_bug.cgi?id=30692";>this issue for 
more information.
+
+Some DOS-specific file 
and directory functions are no longer provided in %PRODUCTNAME, or their 
function is only limited. For example, support for the 
ChDir, ChDrive and 
CurDir functions is not provided. Some DOS-specific 
properties are no longer used in functions that expect file properties as 
parameters (for example, to differentiate from concealed files and system 
files). This ensures the greatest possible level of platform independence for 
%PRODUCTNAME. Therefore this feature is subject to removal in a future 
release.
 
 
-Syntax:
+
 
 ChDir Text As 
String
 
 
-Parameters:
+
  
Text: Any string expression that specifies the directory path or 
drive.
 If you only want to 
change the current drive, enter the drive letter followed by a 
colon.
 
 
 
-
-Example:
+  
+
 
-Sub ExampleChDir
-Dim sDir1 As String , sDir2 As String
-sDir1 = "c:\Test"
-sDir2 = "d:\Private"
-ChDir( sDir1 )
-MsgBox CurDir
-ChDir( sDir2 )
-MsgBox CurDir
-End Sub
+Sub 
ExampleChDir
+Dim sDir1 As 
String , sDir2 As String
+sDir1 = 
"c:\Test"
+sDir2 = 
"d:\Private"
+ChDir( 
sDir1 )
+MsgBox 
CurDir
+ChDir( 
sDir2 )
+MsgBox 
CurDir
+End 
Sub
 
 
 
diff --git a/source/text/sbasic/shared/03020402.xhp 
b/source/text/sbasic/shared/03020402.xhp
index 21087ed3e..59f89e055 100644
--- a/source/text/sbasic/shared/03020402.xhp
+++ b/source/text/sbasic/shared/03020402.xhp
@@ -27,24 +27,22 @@
 
 
 
-
 
 
   ChDrive statement
 
 
-
-ChDrive 
Statement
+ChDrive 
Statement
 Changes the 
current drive.
 
-
+
 
-Syntax:
+
 
 ChDrive Text As 
String
 
 
-Parameters:
+
  
Text: Any string expression that contains the drive letter of the 
new drive. If you want, you can use URL 
notation.
 The drive must 
be assigned a capital letter. Under Windows, the letter that you assign the 
drive is restricted by the settings in LASTDRV. If the drive argument is a 
multiple-character string, only the first letter is relevant. If you attempt to 
access a non-existent drive, an error occurs that you can respond to with the 
OnError statement.
 
@@ -52,7 +50,7 @@
 
 
 
-Example:
+
 
 Sub ExampleChDrive
 ChDrive "D" 
' Only possible if a drive 'D' exists.
diff --git a/source/text/sbasic/shared/03020403.xhp 
b/source/text/sbasic/shared/03020403.xhp
index c238a5d1e..af7c1b381 100644
--- a/source/text/sbasic/shared/03020403.xhp
+++ b/source/text/sbasic/shared/03020403.xhp
@@ -27,29 +27,28 @@
 
 
 
-
 
 
 

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

[Stephan Bergmann (via logerrit)]

 include/sfx2/app.hxx|2 +-
 include/sfx2/objsh.hxx  |2 +-
 sfx2/source/appl/appdde.cxx |   15 +++
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 9a68ae949c8db91fad463df6d84e4eb89b3be4f7
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 11:20:59 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 15:59:41 2020 +0100

SfxObjectShell::DdeExecute and SfxApplication::DdeExecute should return bool

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

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 9714ad8e13d5..26b14e2ca2d4 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -120,7 +120,7 @@ public:
 
 // DDE
 #if defined(_WIN32)
-static long DdeExecute( const OUString& rCmd );
+static bool DdeExecute( const OUString& rCmd );
 #endif
 boolInitializeDde();
 const DdeService*   GetDdeService() const;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index c4ec915588b4..8d3897b29d07 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -532,7 +532,7 @@ public:
 
 #if defined(_WIN32)
 // DDE-Interface
-longDdeExecute( const OUString& rCmd );
+boolDdeExecute( const OUString& rCmd );
 virtual boolDdeGetData( const OUString& rItem,
 const OUString& rMimeType,
 css::uno::Any & rValue );
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 9c2e21dcc426..0746c19755d2 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -297,7 +297,7 @@ bool SfxAppEvent_Impl( const OUString& rCmd, const 
OUString& rEvent,
 relevant SfxApplication subclass in BASIC syntax. Return values can
 not be transferred, unfortunately.
 */
-long SfxApplication::DdeExecute( const OUString&   rCmd )  // Expressed in our 
BASIC-Syntax
+bool SfxApplication::DdeExecute( const OUString&   rCmd )  // Expressed in our 
BASIC-Syntax
 {
 // Print or Open-Event?
 if ( !( SfxAppEvent_Impl( rCmd, "Print", ApplicationEvent::Type::Print ) ||
@@ -310,10 +310,10 @@ long SfxApplication::DdeExecute( const OUString&   rCmd ) 
 // Expressed in our B
 if( !pRet )
 {
 SbxBase::ResetError();
-return 0;
+return false;
 }
 }
-return 1;
+return true;
 }
 
 /*  [Description]
@@ -323,7 +323,7 @@ long SfxApplication::DdeExecute( const OUString&   rCmd )  
// Expressed in our B
 
 The base implementation does nothing and returns 0.
 */
-long SfxObjectShell::DdeExecute( const OUString&   rCmd )  // Expressed in our 
BASIC-Syntax
+bool SfxObjectShell::DdeExecute( const OUString&   rCmd )  // Expressed in our 
BASIC-Syntax
 {
 #if !HAVE_FEATURE_SCRIPTING
 (void) rCmd;
@@ -334,10 +334,10 @@ long SfxObjectShell::DdeExecute( const OUString&   rCmd ) 
 // Expressed in our B
 if( !pRet )
 {
 SbxBase::ResetError();
-return 0;
+return false;
 }
 #endif
-return 1;
+return true;
 }
 
 /*  [Description]
@@ -537,8 +537,7 @@ bool SfxDdeDocTopic_Impl::Put( const DdeData* pData )
 
 bool SfxDdeDocTopic_Impl::Execute( const OUString* pStr )
 {
-long nRet = pStr ? pSh->DdeExecute( *pStr ) : 0;
-return 0 != nRet;
+return pStr && pSh->DdeExecute( *pStr );
 }
 
 bool SfxDdeDocTopic_Impl::MakeItem( const OUString& rItem )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 xmloff/source/draw/animationexport.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 21d36af1fd3037f1f425dd8303b50b8848d729ce
Author: Luboš Luňák 
AuthorDate: Tue Nov 24 15:04:24 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Nov 25 15:50:41 2020 +0100

save properly fadecolor also for fadeovercolor (tdf#138353)

As far as I can tell .odp spec doesn't recognize 'fadeovercolor'
as a subtype of 'fade' (it's an LO extension?). But it's already
saved by LO if used, so save the color properly as well. Reading
it already works too.

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

diff --git a/xmloff/source/draw/animationexport.cxx 
b/xmloff/source/draw/animationexport.cxx
index 92238ebf71e0..0c750a3130a2 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -605,7 +605,9 @@ void AnimationsExporterImpl::exportTransitionNode()
 if( !bDirection )
 mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, 
XML_REVERSE );
 
-if( (nTransition == TransitionType::FADE) && ((nSubtype == 
TransitionSubType::FADETOCOLOR) || (nSubtype == 
TransitionSubType::FADEFROMCOLOR) ))
+if( (nTransition == TransitionType::FADE)
+&& ((nSubtype == TransitionSubType::FADETOCOLOR) || (nSubtype 
== TransitionSubType::FADEFROMCOLOR)
+|| (nSubtype == TransitionSubType::FADEOVERCOLOR)))
 {
 ::sax::Converter::convertColor( sTmp, nFadeColor );
 mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, 
sTmp.makeStringAndClear() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 cui/source/options/optgdlg.cxx |   47 ++---
 cui/source/options/optgdlg.hxx |1 
 2 files changed, 27 insertions(+), 21 deletions(-)

New commits:
commit abea897baeca5682cdad79a7c9703940afc0b39c
Author: Luboš Luňák 
AuthorDate: Tue Nov 24 12:41:08 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Nov 25 15:50:15 2020 +0100

clean up enabling/disabling GUI options related to Skia

This should properly enable/disable 'force Skia software rendering'
and 'use hardware acceleration' checkboxes when Skia is enabled or
disabled.
Technically the two options are duplicates, since 'use hardware
acceleration' is the exact opposite of 'force Skia software
rendering'. But the implementation of the hw accel option is so tied
to the implementation of the canvas module that it's simpler
to ignore it for Skia.

Change-Id: Ia7c54140aec72d6ef75b7ba53ce83037311f0caf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106491
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit feafba7cc94247f45a82ee4f82f1b0a5f2f61656)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106525

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6b71b125e078..0dc33f2c64ba 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -551,11 +551,6 @@ CanvasSettings::CanvasSettings() :
 
 bool CanvasSettings::IsHardwareAccelerationAvailable() const
 {
-if (SkiaHelper::isVCLSkiaEnabled() && Application::GetToolkitName() != 
"gtk3")
-{
-mbHWAccelAvailable = false;
-return false;
-}
 #if HAVE_FEATURE_OPENGL
 if (OpenGLWrapper::isVCLOpenGLEnabled() && Application::GetToolkitName() 
!= "gtk3")
 {
@@ -716,8 +711,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 
 m_xMoreIcons->set_from_icon_name("cmd/sc_additionsdialog.png");
 m_xMoreIcons->connect_clicked(LINK(this, OfaViewTabPage, 
OnMoreIconsClick));
-
-UpdateSkiaStatus();
 }
 
 OfaViewTabPage::~OfaViewTabPage()
@@ -779,6 +772,10 @@ void OfaViewTabPage::UpdateSkiaStatus()
 // FIXME: should really add code to show a 'lock' icon here.
 
m_xUseSkia->set_sensitive(!officecfg::Office::Common::VCL::UseSkia::isReadOnly());
 m_xForceSkiaRaster->set_sensitive(m_xUseSkia->get_active() && 
!officecfg::Office::Common::VCL::ForceSkiaRaster::isReadOnly());
+
+// Technically the 'use hardware acceleration' option could be used to 
mean !forceSkiaRaster, but the implementation
+// of the option is so tied to the implementation of the canvas module 
that it's simpler to ignore it.
+UpdateHardwareAccelStatus();
 #else
 HideSkiaWidgets();
 #endif
@@ -1058,20 +1055,8 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 m_xContextMenuShortcutsLB->set_active(bContextMenuShortcutsNonDefault ? 
eContextMenuShortcuts + 1 : 0);
 m_xContextMenuShortcutsLB->save_value();
 
-{ // #i95644# HW accel (unified to disable mechanism)
-if(pCanvasSettings->IsHardwareAccelerationAvailable())
-{
-
m_xUseHardwareAccell->set_active(pCanvasSettings->IsHardwareAccelerationEnabled());
-
m_xUseHardwareAccell->set_sensitive(!pCanvasSettings->IsHardwareAccelerationRO());
-}
-else
-{
-m_xUseHardwareAccell->set_active(false);
-m_xUseHardwareAccell->set_sensitive(false);
-}
-
-m_xUseHardwareAccell->save_state();
-}
+UpdateHardwareAccelStatus();
+m_xUseHardwareAccell->save_state();
 
 { // #i95644# AntiAliasing
 if(mpDrawinglayerOpt->IsAAPossibleOnThisSystem())
@@ -1086,6 +1071,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 
 m_xUseAntiAliase->save_state();
 }
+
 m_xUseSkia->set_active(mpSkiaConfig->useSkia());
 m_xForceSkiaRaster->set_active(mpSkiaConfig->forceSkiaRaster());
 
@@ -1097,6 +1083,25 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 m_xForceSkiaRaster->save_state();
 
 OnAntialiasingToggled(*m_xFontAntiAliasing);
+UpdateSkiaStatus();
+}
+
+void OfaViewTabPage::UpdateHardwareAccelStatus()
+{
+// #i95644# HW accel (unified to disable mechanism)
+if(pCanvasSettings->IsHardwareAccelerationAvailable())
+{
+
m_xUseHardwareAccell->set_active(pCanvasSettings->IsHardwareAccelerationEnabled());
+
m_xUseHardwareAccell->set_sensitive(!pCanvasSettings->IsHardwareAccelerationRO());
+}
+else
+{
+m_xUseHardwareAccell->set_active(false);
+m_xUseHardwareAccell->set_sensitive(false);
+}
+#if HAVE_FEATURE_SKIA
+m_xUseHardwareAccell->set_sensitive(!m_xUseSkia->get_active());
+#endif
 }
 
 struct LanguageConfig_Impl
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 93dc5280b98e..0944bb674932 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -125,6 +125,7 

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

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx |   21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

New commits:
commit ee2cc952eeb5385ee37485c822d7ad7abd8fb989
Author: Eike Rathke 
AuthorDate: Wed Nov 25 13:54:31 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Nov 25 15:47:34 2020 +0100

Related: tdf#136272 accept 1.79769313486232e+308 as DBL_MAX

This does not solve writing the badly rounded value, which still
has to be fixed, but at least be able to read/convert it back as
double max value.

This is not even used in the bug scenario because the "fake"
condition in that number format is discarded anyway because it was
only written to satisfy ODF, but it helps in case a
1.7976931348623157e+308 value was entered/used on purpose.

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

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index af3e52f2bf9d..c58c646bbc2e 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -976,7 +976,26 @@ double stringToDouble(CharT const * pBegin, CharT const * 
pEnd,
 errno = 0;
 fVal = strtod_nolocale(buf, &pCharParseEnd);
 if (errno == ERANGE)
-eStatus = rtl_math_ConversionStatus_OutOfRange;
+{
+// Check for the dreaded rounded to 15 digits max value
+// 1.79769313486232e+308 for 1.7976931348623157e+308 we wrote
+// everywhere, accept with or without plus sign in exponent.
+const char* b = buf;
+if (b[0] == '-')
+++b;
+if (((pCharParseEnd - b == 21) || (pCharParseEnd - b == 20))
+&& !strncmp( b, "1.79769313486232", 16)
+&& (b[16] == 'e' || b[16] == 'E')
+&& (((pCharParseEnd - b == 21) && !strncmp( b+17, 
"+308", 4))
+ || ((pCharParseEnd - b == 20) && !strncmp( b+17, 
"308", 3
+{
+fVal = (buf < b) ? -DBL_MAX : DBL_MAX;
+}
+else
+{
+eStatus = rtl_math_ConversionStatus_OutOfRange;
+}
+}
 p = bufmap[pCharParseEnd - buf];
 bSign = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 include/vcl/jsdialog/executor.hxx |2 ++
 include/vcl/toolkit/edit.hxx  |2 ++
 include/vcl/weld.hxx  |2 ++
 vcl/jsdialog/executor.cxx |   14 ++
 vcl/source/control/edit.cxx   |   10 ++
 5 files changed, 30 insertions(+)

New commits:
commit 708a8b7f1d869580741787e71a9248757bb1541e
Author: Szymon Kłos 
AuthorDate: Mon Nov 2 12:24:49 2020 +0100
Commit: Szymon Kłos 
CommitDate: Wed Nov 25 15:47:01 2020 +0100

jsdialog: execute checkbox action

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

diff --git a/include/vcl/jsdialog/executor.hxx 
b/include/vcl/jsdialog/executor.hxx
index e49190f31e5f..5dde733a3823 100644
--- a/include/vcl/jsdialog/executor.hxx
+++ b/include/vcl/jsdialog/executor.hxx
@@ -22,6 +22,8 @@ public:
 
 static void trigger_changed(weld::ComboBox& rComboBox) { 
rComboBox.signal_changed(); }
 
+static void trigger_toggled(weld::ToggleButton& rButton) { 
rButton.signal_toggled(); }
+
 static void trigger_row_activated(weld::TreeView& rTreeView)
 {
 rTreeView.signal_row_activated();
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 04285ee63778..a4c07aeebede 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1301,6 +1301,8 @@ public:
 
 class VCL_DLLPUBLIC ToggleButton : virtual public Button
 {
+friend class ::LOKTrigger;
+
 protected:
 Link m_aToggleHdl;
 TriState m_eSavedValue = TRISTATE_FALSE;
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 9863d0c2edb9..93dae7db3a2d 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -97,6 +97,20 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 }
 }
 }
+else if (sControlType == "checkbox")
+{
+auto pCheckButton = dynamic_cast(pWidget);
+if (pCheckButton)
+{
+if (sAction == "change")
+{
+bool bChecked = rData["data"] == "true";
+pCheckButton->set_state(bChecked ? TRISTATE_TRUE : 
TRISTATE_FALSE);
+
LOKTrigger::trigger_toggled(*static_cast(pCheckButton));
+return true;
+}
+}
+}
 else if (sControlType == "drawingarea")
 {
 auto pArea = dynamic_cast(pWidget);
commit 6581a8a322cc2b83385722ae3042a885a7423f19
Author: Szymon Kłos 
AuthorDate: Mon Nov 2 12:14:50 2020 +0100
Commit: Szymon Kłos 
CommitDate: Wed Nov 25 15:46:49 2020 +0100

jsdialog: export placeholder text for edit fields

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

diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx
index 655171a98ea0..6cad804c208e 100644
--- a/include/vcl/toolkit/edit.hxx
+++ b/include/vcl/toolkit/edit.hxx
@@ -242,6 +242,8 @@ public:
 void SetForceControlBackground(bool b) { mbForceControlBackground = b; }
 
 bool IsPassword() const { return mbPassword; }
+
+virtual void DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0484797de298..5699124a9cde 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -62,6 +62,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2924,4 +2925,13 @@ FactoryFunction Edit::GetUITestFactory() const
 return EditUIObject::create;
 }
 
+
+void Edit::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
+{
+Control::DumpAsPropertyTree(rJsonWriter);
+
+if (!maPlaceholderText.isEmpty())
+rJsonWriter.put("placeholder", maPlaceholderText);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx  |   22 ---
 include/vcl/jsdialog/executor.hxx|6 ++
 include/vcl/weld.hxx |2 
 vcl/inc/jsdialog/jsdialogbuilder.hxx |   23 +++
 vcl/inc/salvtables.hxx   |2 
 vcl/jsdialog/executor.cxx|   52 +
 vcl/jsdialog/jsdialogbuilder.cxx |  105 +--
 7 files changed, 171 insertions(+), 41 deletions(-)

New commits:
commit 0de158b4eb6d48d2c1a7cfcd638a73d7b69d45a7
Author: Szymon Kłos 
AuthorDate: Fri Oct 30 10:51:08 2020 +0100
Commit: Szymon Kłos 
CommitDate: Wed Nov 25 15:46:32 2020 +0100

jsdialog: implement TreeView

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 06d0a1de31d2..bc8b46a94c43 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -441,24 +441,6 @@ std::vector 
desktop::jsonToPropertyValuesVector(const char
 }
 
 
-static StringMap jsonToStringMap(const char* pJSON)
-{
-StringMap aArgs;
-if (pJSON && pJSON[0] != '\0')
-{
-std::stringstream aStream(pJSON);
-boost::property_tree::ptree aTree;
-boost::property_tree::read_json(aStream, aTree);
-
-for (const auto& rPair : aTree)
-{
-aArgs[OUString::fromUtf8(rPair.first.c_str())] = 
OUString::fromUtf8(rPair.second.get_value(".").c_str());
-}
-}
-return aArgs;
-}
-
-
 static boost::property_tree::ptree unoAnyToPropertyTree(const uno::Any& 
anyItem)
 {
 boost::property_tree::ptree aTree;
@@ -3710,7 +3692,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned long
 {
 SolarMutexGuard aGuard;
 
-StringMap aMap(jsonToStringMap(pArguments));
+StringMap aMap(jsdialog::jsonToStringMap(pArguments));
 VclPtr pWindow = vcl::Window::FindLOKWindow(nWindowId);
 
 if (!pWindow && nWindowId >= 10 /* why unsigned? */)
@@ -5686,7 +5668,7 @@ static void 
doc_sendFormFieldEvent(LibreOfficeKitDocument* pThis, const char* pA
 if (doc_getDocumentType(pThis) != LOK_DOCTYPE_TEXT)
 return;
 
-StringMap aMap(jsonToStringMap(pArguments));
+StringMap aMap(jsdialog::jsonToStringMap(pArguments));
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
diff --git a/include/vcl/jsdialog/executor.hxx 
b/include/vcl/jsdialog/executor.hxx
index 1cfa24c28a8a..e49190f31e5f 100644
--- a/include/vcl/jsdialog/executor.hxx
+++ b/include/vcl/jsdialog/executor.hxx
@@ -22,6 +22,11 @@ public:
 
 static void trigger_changed(weld::ComboBox& rComboBox) { 
rComboBox.signal_changed(); }
 
+static void trigger_row_activated(weld::TreeView& rTreeView)
+{
+rTreeView.signal_row_activated();
+}
+
 static void trigger_clicked(weld::Toolbar& rToolbar, const OString& rIdent)
 {
 rToolbar.signal_clicked(rIdent);
@@ -36,6 +41,7 @@ public:
 namespace jsdialog
 {
 VCL_DLLPUBLIC bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, 
StringMap& rData);
+VCL_DLLPUBLIC StringMap jsonToStringMap(const char* pJSON);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 10686ffe705e..04285ee63778 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -782,6 +782,8 @@ public:
 */
 class VCL_DLLPUBLIC TreeView : virtual public Container
 {
+friend class ::LOKTrigger;
+
 public:
 typedef std::pair iter_col;
 typedef std::pair iter_string;
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 91640f7a4ccd..8c379857e4b3 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -22,6 +22,7 @@
 class ToolBox;
 class ComboBox;
 class VclMultiLineEdit;
+class SvTabListBox;
 
 typedef std::map WidgetMap;
 
@@ -108,8 +109,9 @@ public:
 weld_drawing_area(const OString& id, const a11yref& rA11yImpl = nullptr,
   FactoryFunction pUITestFactoryFunction = nullptr,
   void* pUserData = nullptr) override;
-std::unique_ptr weld_toolbar(const OString& id) override;
-std::unique_ptr weld_text_view(const OString& id) override;
+virtual std::unique_ptr weld_toolbar(const OString& id) 
override;
+virtual std::unique_ptr weld_text_view(const OString& id) 
override;
+virtual std::unique_ptr weld_tree_view(const OString& id) 
override;
 
 static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
 VclMessageType 
eMessageType,
@@ -145,6 +147,7 @@ public:
 notifyDialogState();
 }
 
+using BaseInstanceClass::set_sensitive;
 virtual void set_sensitive(bool sensitive) override
 {

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.4.1' created by Christian Lohmaier 
 at 2020-11-25 14:27 +

Tag libreoffice-7.0.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl++ac8ACgkQ9DSh76/u
rqO9fw//bIJYTCLGw0bnrMPfxPMlzgXOkOGq+R+wDVfLYUcJ52mOr0QWrr65DnuJ
mXF9FbEJeW0NSrNCNhpu4l30PFI0e+2Ngay67fFlkLl/0r/ZROKVLaJ9tF8Z+R1X
bRK8l1kZvwPcCkHQDuOSbBmAQNFm4TSUXiaCqUSUswZSkvx/ib0LUXGAOzgeRqDe
mThj5BqJt3oiJ3pApBz9LEqq7o1SLYuwv+WvQ3XRPjgtNILotko7Q3gB13G11SXt
NE8mEFTJRrISfObzDdgywiG2mBbuQDVL3BBUnUWWv6BUQp40my3S5Lz6w8E3I5xs
sWGViEsMBw4Q2wI3JIVfMRPFZTvGbvb5af8jCjQB8Zpr/FdkX0hLDl3UXgJUGfbL
eQoZzopSMK5O0so1lgCI0gZvHBv1G+TJaT2Up/tC/btoixLEYMl8zUWdagVKE+dx
ybcFHJPDVfGXiaBLEXJ1ZKb325f/rbdt80KmmqT4TqdGExQOcbTmiZlDnz7TrVpj
XmWmnzMuLpqvRJYLPFkLUwBu8vY8Wh2CFieNbyTUI83oFm1TGO5tNnQfZYRJuXln
hqxhqyV9rbBmUJlxu0DHmUoYGbYDf78Z/2BKZAp79bCvirX2vxidON/LF+aAWsI4
9MsrVpw8DHLbQGO2Ijt43mcnzM4+NHrd5FqXF/8oERdhVVop7Dc=
=quim
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-21:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.4.1' created by Christian Lohmaier 
 at 2020-11-25 14:27 +

Tag libreoffice-7.0.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl++ac8ACgkQ9DSh76/u
rqOTDg//dEiKNnC7UqRRvcrtuNBIVrcaZFcAC9SUN0sYWEM2yLXpInrof2+oDUhH
wj1VPtLFt+mCxQ/XsDkk4NHxK96o//3aj1iUd1GdQydvUcH1uKfv/RAcQhGf7Vtq
MSOEcYi75fY0af0H7kZStbcwqLZOy1xxKqEERdiGRCtdtFj01d30VR0ZpWn6H2zQ
pFhrBUSkI8+NVBv5OD5aOZGyEumdwDrNYUrGr5giDk9+wH1cfqfQhPuDSmHUuy3a
ZfWO0cOSDvIkq7C5LhlZ16svMmnv8ak+j+I6+kqP2jE9KJFDFCwZ7390uoTO8cRJ
a8n5uGXokbVrQjQUN0B73n7fUa1Z75VTk4AeDB7Bn8N2gFJBmGqxSqP8cgsz0N9v
C53As7ai1vSkiC8vQ2Fz/2EnuPr7kONWobR+R4Ug/qaw1a5DdiW+vNOukuk5xGBH
eICS0EeqBVsEUMFUPBWHEFUoE8MPhu46hXTwWUQ8lFLA8yBHzqouuaJC0lx3kf1G
rNufd7hB2mFFptBVoK2qstw5iniO6lP7dZnd5V1osr3UvOuIM8YPdKPIXfwbU3l0
7pboyYUMBqJ56DAZqaSmnEA0p435wBE1JyStj7niPYlGRZJQIP6QW3aN0ShKzr5e
ZAaUPAG6fW+EfGv4fVS7otflgK1lnoxmcX1vXvhYr19rYqKmopU=
=V796
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-76:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.4.1' created by Christian Lohmaier 
 at 2020-11-25 14:27 +

Tag libreoffice-7.0.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl++acsACgkQ9DSh76/u
rqNV/Q//XQROLU64pVVoSz4LmdHl/PU8Ssxbp0orXv/i5YpL7Q4JE/3W2JLLMfvp
zsaTIE3phH63jGfn0U12NRZVFiMYFm8phGaGrJVKdjX8XOAyaNAnDUzvEpgWXK93
A7NyaiPVB0EGmJz/TxR36+CoeKntTHMu9u7Lv/xuPLfeMiFKh4QJKzsRl9sbShrc
1LBtkKappbJj07ektcpCq3djpwPvN4p3K/KALDvrXoAfikdvIaBPH9HLeJJdNRs0
mwA7rcMsyLVac9cuo+kSTFhUXOOeFkJmvzKVOpDT7TlB28SMQhDQ9LqjETHe7TOP
ZCdaxkLHzp5VJkPLcyhj2nV8V4Ui32Izmy1HMAh29n5Tu2LTIkYuuinakC2eeSmm
c6Pu4ZzpxEa/wdOW9T8yVD9eL8TCOF/OxPB7r5AroLbfGQlvYhKrRLQdLZCOdWAF
SADyywr5CCMUBJty428hlDEDPVhA31jnfq/7b1GfOcqiyG2dxaT9z3v7hfG9AItn
mvXcOpXkAV1VUG/a+X9h+LvzEzAZAnObgoKSB+HX1kfO5uP8VUn09t6cYG9J0Q1H
8DrBy6Y9uToICT6zEzW+4PHNV8Cim+5edrsxJEKdX4GKRF9ulUx8K/+q96IvJOyP
WXmJ01kDG4+LVADYgdlylDVy2y/L/rxNCPCkz2UDk1Bm4zt536s=
=0K7W
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.4.1' created by Christian Lohmaier 
 at 2020-11-25 14:27 +

Tag libreoffice-7.0.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl++ac8ACgkQ9DSh76/u
rqNIeQ//daDF9mN3KRxpC5iqVL0N3UqUfE+tKAGzpGgAGykv2vckJzYZHkTmdwi1
oUf/e/0CmLd2vSzwIwt/HoRTwAjXHOrwps36LkL2IvREzqTEbUujAZSo/k5rjzx2
RFZKJvgwLW81iOIyu9jmDAuMehkVavdRcXnMvVe8V1CRDsbPbgXeckaasN9QnyMI
qRaSlXLcVKoadQSb7IZlTffxrhnHajGQc4jsjesZY87cCjv2e0jyaK5oc6mWQv+O
mMvSHhA9oIB5xWFB3CjAFEfW270xJGdsjsyDP/OwidyraienFaRomqrECzRDaFMe
5AxhRIEQ0j1pa/XY4PVRr33eL0q44slbrso3Il0AAelXr2flxCQ7tq1dnPMW33gB
zu8Aem0MIgB2IOYt+icwZJ2XiuhEkoBE9gRVfvyrjXHl6EPAqQKBVDwiGjuFEZtU
5zn761wphPr5CcfXI3prEAYLyrwJH/VBGRiJTNt4ScWIar8L9wl/LU+odrtLpaTx
9qsxKfJzhAKkIt5Uocjp3h1mSEcx2kqU2Y2Xmn4N2FtldHU+ptyJRIUdxA8if2p6
3Q9Oo+iG9WXh1eA5DyDPKdkcaGVEQJREJM/rX6HnHIDu2ZsD2EhbTJ6x+lnWNyw8
dvt9C0bS/3MlAAjrliCLEtkASU8B8/kWqB2Yk1e+5JXFB6sdRBA=
=Lb0X
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-1152:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit a2e4f6c0db7518fd51c3df1c6573056311dbb755
Author: Christian Lohmaier 
AuthorDate: Wed Nov 25 15:27:48 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 25 15:27:48 2020 +0100

bump product version to 7.0.4.1.0+

Change-Id: I5f0c286217a18866295e043fb51ea632a9cd8805

diff --git a/configure.ac b/configure.ac
index 82f590b9098e..e4ef8bec2b3e 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.0.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.4.1.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 mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 35977939ba091386a8f2278c5bfecee91f5e1ac2
Author: Christian Lohmaier 
AuthorDate: Wed Nov 25 15:26:15 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 25 15:26:15 2020 +0100

bump product version to 7.0.5.0.0+

Change-Id: I3b57ab8271e712227fec602abc8a670608e55f62

diff --git a/configure.ac b/configure.ac
index 82f590b9098e..8006a535baad 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.0.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.5.0.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 mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-7-0-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-4' available with the following commits:
commit 8c4ccf5e5449d0cfe5550dc1c331e7493cf95fdc
Author: Christian Lohmaier 
Date:   Wed Nov 25 15:22:15 2020 +0100

Branch libreoffice-7-0-4

This is 'libreoffice-7-0-4' - the stable branch for the 7.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-7-0-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-4' available with the following commits:
commit 3be33ee115c893022c7d88272e24d66385fa3c53
Author: Christian Lohmaier 
Date:   Wed Nov 25 15:21:53 2020 +0100

Branch libreoffice-7-0-4

This is 'libreoffice-7-0-4' - the stable branch for the 7.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic8332ae42724f28d6f5b52be56e760c23653c084

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-7-0-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-4' available with the following commits:
commit d02893f3e5a97466e7669d2677919814ad6eecdc
Author: Christian Lohmaier 
Date:   Wed Nov 25 15:21:53 2020 +0100

Branch libreoffice-7-0-4

This is 'libreoffice-7-0-4' - the stable branch for the 7.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ie673c98356389621afd79cb893ef001bc57a51d3

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-7-0-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-4' available with the following commits:
commit 1efad555fb184ccc8ce745357c1ed7a3e08f738a
Author: Christian Lohmaier 
Date:   Wed Nov 25 15:21:53 2020 +0100

Branch libreoffice-7-0-4

This is 'libreoffice-7-0-4' - the stable branch for the 7.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ibf350fcea8b1a6c38377e6ba40e03151fcfc5625

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit adb2e4e192392faef628f9c6b7e21e1cd63f2fcc
Author: Johnny_M 
AuthorDate: Wed Nov 25 15:13:57 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 15:13:57 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to f1630841a1ccff7db1cef14577590517ee21aecf
  - tdf#132643 Translate German section IDs

Change-Id: I50aa0373a0cc46acb77e778e43853c5b612c8a77
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106497
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9a08414ea984..f1630841a1cc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9a08414ea9849dc786d4cdd3c3adb73b9bb22771
+Subproject commit f1630841a1ccff7db1cef14577590517ee21aecf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/scalc/main0105.xhp |2 +-
 source/text/scalc/main0203.xhp |4 ++--
 source/text/scalc/main0214.xhp |4 ++--
 source/text/shared/00/00040501.xhp |6 +++---
 source/text/shared/01/0526.xhp |8 
 source/text/shared/02/0320.xhp |6 +++---
 source/text/shared/main0226.xhp|4 ++--
 source/text/swriter/main0105.xhp   |2 +-
 source/text/swriter/main0205.xhp   |4 ++--
 source/text/swriter/main0215.xhp   |4 ++--
 source/text/swriter/main0216.xhp   |4 ++--
 11 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit f1630841a1ccff7db1cef14577590517ee21aecf
Author: Johnny_M 
AuthorDate: Tue Nov 24 13:06:48 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Nov 25 15:13:57 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I50aa0373a0cc46acb77e778e43853c5b612c8a77
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106497
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/main0105.xhp b/source/text/scalc/main0105.xhp
index f6b8b8c93..98660083a 100644
--- a/source/text/scalc/main0105.xhp
+++ b/source/text/scalc/main0105.xhp
@@ -59,7 +59,7 @@
 
 Conditional Formatting
 
-
+
 
 
 
diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp
index c76ad74e5..10fd6c71a 100644
--- a/source/text/scalc/main0203.xhp
+++ b/source/text/scalc/main0203.xhp
@@ -55,9 +55,9 @@
 
 
 
-
+
 
-
+
 
 
 
diff --git a/source/text/scalc/main0214.xhp b/source/text/scalc/main0214.xhp
index cf56ede1a..c5317bc00 100644
--- a/source/text/scalc/main0214.xhp
+++ b/source/text/scalc/main0214.xhp
@@ -43,9 +43,9 @@
 
 
 
-
+
 
-
+
 
 
 
diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index 68d8b1983..1461e06db 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -420,11 +420,11 @@
 
 
 
-
+
 Choose Format - 
Anchor.
-
+
 On Form 
Design bar, click
-
+
 
 
 
diff --git a/source/text/shared/01/0526.xhp 
b/source/text/shared/01/0526.xhp
index d464f103e..2f55def0f 100644
--- a/source/text/shared/01/0526.xhp
+++ b/source/text/shared/01/0526.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 Anchor
 Sets the anchoring options for the selected object.
@@ -38,15 +38,15 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/02/0320.xhp 
b/source/text/shared/02/0320.xhp
index 24f82202c..3942caa9c 100644
--- a/source/text/shared/02/0320.xhp
+++ b/source/text/shared/02/0320.xhp
@@ -25,7 +25,7 @@
   
 
 
-
+
 anchors; changing
 
 
@@ -35,11 +35,11 @@
  The Change Anchor icon is only visible when an object 
such as a graphic or control field or frame is selected.
 Further 
information about the anchoring is contained in the Anchoring help section.
 
-
+
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp
index 1347c4ec4..e0ad26c05 100644
--- a/source/text/shared/main0226.xhp
+++ b/source/text/shared/main0226.xhp
@@ -48,9 +48,9 @@
 
 
 
-
+
 
-
+
 
 
 
diff --git a/source/text/swriter/main0105.xhp b/source/text/swriter/main0105.xhp
index 39a49b1a3..e6f9850e9 100644
--- a/source/text/swriter/main0105.xhp
+++ b/source/text/swriter/main0105.xhp
@@ -67,7 +67,7 @@
 Opens a submenu to link 
and unlink frames, and edit properties of a selected 
frame.When a submenu is made for Frame and Object, then 
the heading and text can be replaced with the embed.
 
 
-
+
 
 
 Rotate or Flip
diff --git a/source/text/swriter/main0205.xhp b/source/text/swriter/main0205.xhp
index 637598587..45608413c 100644
--- a/source/text/swriter/main0205.xhp
+++ b/source/text/swriter/main0205.xhp
@@ -53,9 +53,9 @@
 
 
 
-
+
 
-
+
 
 
 
diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp
index 2c40a12ed..3dd6d2c1b 100644
--- a/source/text/swriter/main0215.xhp
+++ b/source/text/swriter/main0215.xhp
@@ -74,9 +74,9 @@
 
 
 
-
+
 
-
+
 
 
 
diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp
index 2960c1209..7a4347237 100644
--- a/source/text/swriter/main0216.xhp
+++ b/source/text/swriter/main0216.xhp
@@ -74,8 +74,8 @@
 
 
 
-
+
 
-
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 7afa913e51580a8e0156eb9039673f18b3bfa9ae
Author: Johnny_M 
AuthorDate: Wed Nov 25 15:12:24 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 15:12:24 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9a08414ea9849dc786d4cdd3c3adb73b9bb22771
  - tdf#132643 Translate German section IDs

Change-Id: I046a265977ea9d3b5620f88e930fd1cf6adaa83f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106498
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 028eb9f6fad0..9a08414ea984 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 028eb9f6fad0f3f6a1ddae93419f25d6477e8e47
+Subproject commit 9a08414ea9849dc786d4cdd3c3adb73b9bb22771
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/01/0301.xhp |2 +-
 source/text/smath/00/0004.xhp  |2 +-
 source/text/smath/main0203.xhp |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9a08414ea9849dc786d4cdd3c3adb73b9bb22771
Author: Johnny_M 
AuthorDate: Tue Nov 24 13:22:41 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Nov 25 15:12:24 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I046a265977ea9d3b5620f88e930fd1cf6adaa83f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106498
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0301.xhp 
b/source/text/shared/01/0301.xhp
index b8759d836..e2d4430a1 100644
--- a/source/text/shared/01/0301.xhp
+++ b/source/text/shared/01/0301.xhp
@@ -67,7 +67,7 @@
 Fit width
 Displays the complete width of the document page. The top and bottom 
edges of the page may not be visible.
 
-
+
 
 
 
diff --git a/source/text/smath/00/0004.xhp 
b/source/text/smath/00/0004.xhp
index d3d159088..6c459a3cd 100644
--- a/source/text/smath/00/0004.xhp
+++ b/source/text/smath/00/0004.xhp
@@ -52,7 +52,7 @@
 Shift+F3
 
 On the Tools 
bar, click
-
+
 
 
 
diff --git a/source/text/smath/main0203.xhp b/source/text/smath/main0203.xhp
index b9a3ee708..33c4d8145 100644
--- a/source/text/smath/main0203.xhp
+++ b/source/text/smath/main0203.xhp
@@ -38,8 +38,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit e9a2150192f85390e3495529c412d6c2bde84066
Author: Johnny_M 
AuthorDate: Wed Nov 25 15:11:13 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 15:11:13 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 028eb9f6fad0f3f6a1ddae93419f25d6477e8e47
  - tdf#132643 Translate German section IDs

Change-Id: I47ee5d386bfbea809141bf9205fd46bc8a567cc3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106496
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 0fbef58eff28..028eb9f6fad0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0fbef58eff28ccecd50f4eb9114d50391b929ad3
+Subproject commit 028eb9f6fad0f3f6a1ddae93419f25d6477e8e47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/01/06040200.xhp |2 +-
 source/text/shared/01/06040300.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 028eb9f6fad0f3f6a1ddae93419f25d6477e8e47
Author: Johnny_M 
AuthorDate: Tue Nov 24 12:22:09 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Nov 25 15:11:13 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I47ee5d386bfbea809141bf9205fd46bc8a567cc3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106496
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/06040200.xhp 
b/source/text/shared/01/06040200.xhp
index 86ee9e821..8c1de803d 100644
--- a/source/text/shared/01/06040200.xhp
+++ b/source/text/shared/01/06040200.xhp
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 Replacement table
 Lists the entries for automatically 
replacing words, abbreviations or word parts while you type. To add an entry, 
enter text in the Replace and With boxes, and then 
click New. To edit an entry, select it, change the text in the 
With box, and then click Replace. To delete an entry, 
select it, and then click Delete.
diff --git a/source/text/shared/01/06040300.xhp 
b/source/text/shared/01/06040300.xhp
index 59346c997..676266b12 100644
--- a/source/text/shared/01/06040300.xhp
+++ b/source/text/shared/01/06040300.xhp
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 Replacements and exceptions for language:
 Select the language for which you want to 
create or edit the replacement rules. $[officename] first searches for 
exceptions that are defined for the language at the current cursor position in 
the document, and then searches the remaining languages.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 419117bb7a047688e901ec6755cf80290fba3310
Author: Johnny_M 
AuthorDate: Wed Nov 25 15:10:35 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 15:10:35 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0fbef58eff28ccecd50f4eb9114d50391b929ad3
  - tdf#132643 Translate German section IDs

Change-Id: I77808d264cabc71755b44437987a958ce26e0177
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106494
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index fef003f8fcda..0fbef58eff28 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fef003f8fcda4ddacd4aafd96bfaf83a4ff632e4
+Subproject commit 0fbef58eff28ccecd50f4eb9114d50391b929ad3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/scalc/01/0214.xhp   |2 +-
 source/text/scalc/01/02140100.xhp   |2 +-
 source/text/shared/00/00040501.xhp  |4 ++--
 source/text/shared/01/0507.xhp  |2 +-
 source/text/shared/01/05070600.xhp  |4 ++--
 source/text/shared/01/05100700.xhp  |2 +-
 source/text/shared/02/0511.xhp  |2 +-
 source/text/shared/main0204.xhp |2 +-
 source/text/swriter/01/0510.xhp |2 +-
 source/text/swriter/main0204.xhp|2 +-
 source/text/swriter/main0215.xhp|4 ++--
 source/text/swriter/main0216.xhp|4 ++--
 12 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 0fbef58eff28ccecd50f4eb9114d50391b929ad3
Author: Johnny_M 
AuthorDate: Tue Nov 24 12:18:18 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Nov 25 15:10:35 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I77808d264cabc71755b44437987a958ce26e0177
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106494
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/0214.xhp 
b/source/text/scalc/01/0214.xhp
index bd8e6b3c7..76d867937 100644
--- a/source/text/scalc/01/0214.xhp
+++ b/source/text/scalc/01/0214.xhp
@@ -41,7 +41,7 @@
  
   
   The 
$[officename] Calc context menus have additional options for filling the 
cells.
-  
+  
   
   
   
diff --git a/source/text/scalc/01/02140100.xhp 
b/source/text/scalc/01/02140100.xhp
index 7859a6099..aef7a17d6 100644
--- a/source/text/scalc/01/02140100.xhp
+++ b/source/text/scalc/01/02140100.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
 
 Down
   Fills a selected range of at least two 
rows with the contents of the top cell of the range.
diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index c54b2c462..68d8b1983 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -403,11 +403,11 @@
 
 
 
-
+
 Choose Format - 
Align - Bottom ($[officename] Writer, $[officename] Calc).
 Choose Shape - 
Align - Bottom (objects selected) ($[officename] Draw).
 On Align 
bar ($[officename] Impress, $[officename] Draw), click
-
+
 
 
 
diff --git a/source/text/shared/01/0507.xhp 
b/source/text/shared/01/0507.xhp
index b60d47364..916b8e6da 100644
--- a/source/text/shared/01/0507.xhp
+++ b/source/text/shared/01/0507.xhp
@@ -46,6 +46,6 @@
 
 
 
-
+
 
 
diff --git a/source/text/shared/01/05070600.xhp 
b/source/text/shared/01/05070600.xhp
index 63164d030..0b51adde5 100644
--- a/source/text/shared/01/05070600.xhp
+++ b/source/text/shared/01/05070600.xhp
@@ -27,14 +27,14 @@
 
 
 
-
+
 
 
 Align 
Bottom
 Vertically aligns the bottom edges of the selected objects. If only one 
object is selected in Draw or Impress, the bottom edge of the object is aligned 
to the lower page margin.
 
 
-
+
 
 Objects are 
aligned to the bottom edge of the bottom most object in the selection. 

 
diff --git a/source/text/shared/01/05100700.xhp 
b/source/text/shared/01/05100700.xhp
index 9158db8fb..5e247a6b1 100644
--- a/source/text/shared/01/05100700.xhp
+++ b/source/text/shared/01/05100700.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 Bottom
 Aligns the contents of the cell to the bottom edge of 
the cell.
diff --git a/source/text/shared/02/0511.xhp 
b/source/text/shared/02/0511.xhp
index 97c2bc90d..b0b86c9bf 100644
--- a/source/text/shared/02/0511.xhp
+++ b/source/text/shared/02/0511.xhp
@@ -50,6 +50,6 @@
 
 
 
-
+
 
 
diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp
index ac831eec1..42f4d1487 100644
--- a/source/text/shared/main0204.xhp
+++ b/source/text/shared/main0204.xhp
@@ -51,7 +51,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/0510.xhp 
b/source/text/swriter/01/0510.xhp
index b99cc249a..4f3b59c8e 100644
--- a/source/text/swriter/01/0510.xhp
+++ b/source/text/swriter/01/0510.xhp
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp
index 67e81d75d..4b3318cd7 100644
--- a/source/text/swriter/main0204.xhp
+++ b/source/text/swriter/main0204.xhp
@@ -51,7 +51,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp
index 855fa89b0..2c40a12ed 100644
--- a/source/text/swriter/main0215.xhp
+++ b/source/text/swriter/main0215.xhp
@@ -56,8 +56,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp
index 35396a96e..2960c1209 100644
--- a/source/text/swriter/main0216.xhp
+++ b/source/text/swriter/main0216.xhp
@@ -59,8 +59,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 420d81d470e5a7339bb91b85c3457b95036aa85d
Author: Johnny_M 
AuthorDate: Wed Nov 25 15:09:06 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 15:09:06 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to fef003f8fcda4ddacd4aafd96bfaf83a4ff632e4
  - tdf#132643 Translate German section IDs

Change-Id: I4a34f3345d8d7f818bfc05146322a3b0622a3901
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106495
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9de74d37e3c4..fef003f8fcda 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9de74d37e3c43abade70259dc70dccb021be5583
+Subproject commit fef003f8fcda4ddacd4aafd96bfaf83a4ff632e4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/01/0604.xhp |2 +-
 source/text/shared/01/06040300.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fef003f8fcda4ddacd4aafd96bfaf83a4ff632e4
Author: Johnny_M 
AuthorDate: Tue Nov 24 12:20:16 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Nov 25 15:09:06 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I4a34f3345d8d7f818bfc05146322a3b0622a3901
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106495
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0604.xhp 
b/source/text/shared/01/0604.xhp
index 6f69d3075..2b984edc8 100644
--- a/source/text/shared/01/0604.xhp
+++ b/source/text/shared/01/0604.xhp
@@ -43,7 +43,7 @@
 
 
 The 
AutoCorrect settings are applied when you press the Spacebar after you enter a 
word.
-To turn on or 
to turn off the AutoCorrect feature, in $[officename] Calc choose Tools - 
AutoInput, and in $[officename] Writer choose Tools - AutoCorrect 
- While Typing. To apply the AutoCorrect settings to an entire text 
document, choose Tools - AutoCorrect - Apply.
+To turn on or 
to turn off the AutoCorrect feature, in $[officename] Calc choose Tools - 
AutoInput, and in $[officename] Writer choose Tools - AutoCorrect 
- While Typing. To apply the AutoCorrect settings to an entire text 
document, choose Tools - AutoCorrect - Apply.
 
 
 
diff --git a/source/text/shared/01/06040300.xhp 
b/source/text/shared/01/06040300.xhp
index 4ff59e338..59346c997 100644
--- a/source/text/shared/01/06040300.xhp
+++ b/source/text/shared/01/06040300.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 Exceptions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 7f74e99263578a10e5be73d60127f08e9399e3ee
Author: Johnny_M 
AuthorDate: Wed Nov 25 15:06:53 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 15:06:53 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9de74d37e3c43abade70259dc70dccb021be5583
  - tdf#132643 Translate German section IDs

Change-Id: I5fb3e7ca85678a98c941f10c742b92c0240dd9a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106493
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 7b4dc63ec204..9de74d37e3c4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7b4dc63ec204f64a80f181ba1ff005a78791f60c
+Subproject commit 9de74d37e3c43abade70259dc70dccb021be5583
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/scalc/00/0412.xhp|8 
 source/text/scalc/01/1205.xhp|2 +-
 source/text/scalc/01/12050100.xhp|2 +-
 source/text/scalc/01/12080300.xhp|4 ++--
 source/text/scalc/01/12080400.xhp|4 ++--
 source/text/scalc/main0105.xhp   |2 +-
 source/text/scalc/main0218.xhp   |8 
 source/text/shared/00/00040502.xhp   |   10 +-
 source/text/shared/01/0529.xhp   |4 ++--
 source/text/shared/01/05290100.xhp   |2 +-
 source/text/shared/01/05290200.xhp   |2 +-
 source/text/shared/main0226.xhp  |4 ++--
 source/text/simpress/main_format.xhp |2 +-
 source/text/swriter/main0105.xhp |2 +-
 14 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 9de74d37e3c43abade70259dc70dccb021be5583
Author: Johnny_M 
AuthorDate: Tue Nov 24 12:11:05 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Nov 25 15:06:53 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I5fb3e7ca85678a98c941f10c742b92c0240dd9a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106493
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/00/0412.xhp 
b/source/text/scalc/00/0412.xhp
index c6de85323..b7a8723aa 100644
--- a/source/text/scalc/00/0412.xhp
+++ b/source/text/scalc/00/0412.xhp
@@ -118,11 +118,11 @@
 Choose Data - Group and Outline.
 Choose Data - Group and Outline - Hide 
Details.
 Choose Data - Group and Outline - Show 
Details.
-
+
 Choose 
Data - Group and Outline - Group.
 F12
 On 
Tools bar, click
-
+
 
 
 
@@ -136,11 +136,11 @@
 
 
 
-
+
 Choose 
Data - Group and Outline - Ungroup.
 CommandCtrl+F12
 On 
Tools bar, click
-
+
 
 
 
diff --git a/source/text/scalc/01/1205.xhp 
b/source/text/scalc/01/1205.xhp
index 9824d7b7a..be438446d 100644
--- a/source/text/scalc/01/1205.xhp
+++ b/source/text/scalc/01/1205.xhp
@@ -37,7 +37,7 @@
   
 
   For example, 
you can generate a sales summary for a certain postal code based on data from a 
client database.
-  
+  
   
   
   Delete
diff --git a/source/text/scalc/01/12050100.xhp 
b/source/text/scalc/01/12050100.xhp
index eee540078..fe96b4548 100644
--- a/source/text/scalc/01/12050100.xhp
+++ b/source/text/scalc/01/12050100.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 1st, 2nd, 3rd Group
diff --git a/source/text/scalc/01/12080300.xhp 
b/source/text/scalc/01/12080300.xhp
index 71a5f386e..b9a21da65 100644
--- a/source/text/scalc/01/12080300.xhp
+++ b/source/text/scalc/01/12080300.xhp
@@ -32,7 +32,7 @@
 
 
 
-  
+  
   
   
 
@@ -40,7 +40,7 @@
   
   Defines the selected cell range as a group of 
rows or columns.
   
-  
+  
 
   When you 
group a cell range, and outline icon appears in the margins next to the group. 
To hide or show the group, click the icon. To ungroup the selection, choose 
Data – Group and Outline - Ungroup.
   Include
diff --git a/source/text/scalc/01/12080400.xhp 
b/source/text/scalc/01/12080400.xhp
index 92a4d8f50..f34436406 100644
--- a/source/text/scalc/01/12080400.xhp
+++ b/source/text/scalc/01/12080400.xhp
@@ -32,13 +32,13 @@
 
   
   
-  
+  
 
 Ungroup
   
   Ungroups the 
selection. In a nested group, the last rows or columns that were added are 
removed from the group.
   
-  
+  
 
   Deactivate for
   Rows
diff --git a/source/text/scalc/main0105.xhp b/source/text/scalc/main0105.xhp
index e7e284a4c..f6b8b8c93 100644
--- a/source/text/scalc/main0105.xhp
+++ b/source/text/scalc/main0105.xhp
@@ -64,7 +64,7 @@
 
 
 
-
+
 
 
 Control
diff --git a/source/text/scalc/main0218.xhp b/source/text/scalc/main0218.xhp
index 5f5938f1b..6f09fd96a 100644
--- a/source/text/scalc/main0218.xhp
+++ b/source/text/scalc/main0218.xhp
@@ -63,11 +63,11 @@
 
 Goal Seek
 
-
+
 
-
-
+
+
 
-
+
 
 
diff --git a/source/text/shared/00/00040502.xhp 
b/source/text/shared/00/00040502.xhp
index 2a50c44fb..eb5bf397c 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -410,15 +410,15 @@
 
 
 Click 
Fontwork icon on Drawing bar.
-
+
 Choose Format 
- Group.
 Open context menu - 
choose Group.
 
-
+
 Choose Format 
- Group - Group (text documents, spreadsheets).
 Choose Shape 
- Group - Group (drawing documents).
 Open context menu - 
choose Group - Group (form objects).
-
+
 
 
 
@@ -431,11 +431,11 @@
 
 
 
-
+
 Choose Format 
- Group - Ungroup (text documents, spreadsheets).
 Choose Shape 
- Group - Ungroup (drawing documents).
 Open context menu - 
choose Ungroup.
-
+
 
 

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

[Noel Grandin (via logerrit)]

 xmloff/source/text/XMLTextMarkImportContext.cxx |   15 ++-
 xmloff/source/text/XMLTextMarkImportContext.hxx |   10 --
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 7a72585d923da5d72c4fde4f7bc9e74b3472efb3
Author: Noel Grandin 
AuthorDate: Tue Nov 24 20:57:48 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 25 15:04:28 2020 +0100

fastparser in XMLTextMarkImportContext

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

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 080009a8e6f6..f759c1b6fe8d 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -56,10 +56,8 @@ using namespace ::xmloff::token;
 
 XMLFieldParamImportContext::XMLFieldParamImportContext(
 SvXMLImport& rImport,
-XMLTextImportHelper& rHlp,
-sal_uInt16 nPrefix,
-const OUString& rLocalName ) :
-SvXMLImportContext(rImport, nPrefix, rLocalName),
+XMLTextImportHelper& rHlp ) :
+SvXMLImportContext(rImport),
 rHelper(rHlp)
 {
 }
@@ -427,12 +425,11 @@ void XMLTextMarkImportContext::endFastElement(sal_Int32 )
 }
 }
 
-SvXMLImportContextRef XMLTextMarkImportContext::CreateChildContext( sal_uInt16 
nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< 
css::xml::sax::XAttributeList >&  )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLTextMarkImportContext::createFastChildContext(
+sal_Int32 ,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >&  )
 {
-return new XMLFieldParamImportContext(GetImport(), m_rHelper,
-nPrefix, rLocalName);
+return new XMLFieldParamImportContext(GetImport(), m_rHelper);
 }
 
 
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx 
b/xmloff/source/text/XMLTextMarkImportContext.hxx
index d0e8f03a2e81..a5817b193947 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -42,9 +42,7 @@ class XMLFieldParamImportContext : public SvXMLImportContext
 public:
 XMLFieldParamImportContext(
 SvXMLImport& rImport,
-XMLTextImportHelper& rHlp,
-sal_uInt16 nPrfx,
-const OUString& rLocalName );
+XMLTextImportHelper& rHlp );
 
 virtual void SAL_CALL startFastElement(
 sal_Int32 nElement,
@@ -91,9 +89,9 @@ protected:
 const css::uno::Reference & xAttrList) 
override;
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< 
css::xml::sax::XAttributeList >& xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 
 public:
 static css::uno::Reference< css::text::XTextContent > CreateAndInsertMark(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 vcl/inc/bitmap/impoctree.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 09582f3856cd9870eeb52c57ba61864c5b1e0259
Author: Noel Grandin 
AuthorDate: Tue Nov 24 19:13:28 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 25 15:00:32 2020 +0100

tdf#138326 impress template thumbnails are blurred

regression from
commit 548d77d0c06f7088dd3eb408797aa1fc1d7eb277
Author: Noel 
Date:   Fri Nov 13 10:23:36 2020 +0200
tools::Long->sal_uInt16 in ImpErrorQuad

Change-Id: I29403afcb7d88dee27f1565793ffbd7ad4c53a17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106545
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit caf72d1f20547a94e29c0943eb94fa52aec430a4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106524

diff --git a/vcl/inc/bitmap/impoctree.hxx b/vcl/inc/bitmap/impoctree.hxx
index 50083e38d6a0..7c464dbb9758 100644
--- a/vcl/inc/bitmap/impoctree.hxx
+++ b/vcl/inc/bitmap/impoctree.hxx
@@ -24,9 +24,9 @@
 
 class ImpErrorQuad
 {
-sal_uInt16 nRed;
-sal_uInt16 nGreen;
-sal_uInt16 nBlue;
+sal_uInt32 nRed;
+sal_uInt32 nGreen;
+sal_uInt32 nBlue;
 
 public:
 ImpErrorQuad()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thomas Viehmann (via logerrit)]

 vcl/inc/unx/gtk/gtksalmenu.hxx  |2 +-
 vcl/unx/gtk3/gtk3gtksalmenu.cxx |   22 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 5270d6901ba69f411b595fa9e2d123169905ab72
Author: Thomas Viehmann 
AuthorDate: Mon Nov 23 21:03:28 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Nov 25 14:56:33 2020 +0100

tdf#138425 vcl/gtk activate main menu in UpdateFull

VCL GTK (in contrast to X11 and apparently Windows) pre-activates popup
menus in GtkSalMenu::UpdateFull by calling GtkSalMenu::ActivateAllSubmenus.
Before this patch, this, called on the main menu, would not activate
the main menu itself (which does get activated in X11 eventually).
This patch changes the logic to also activate the main menu.

This patch deals only with gtk3. A followup patch would do the analogous
change in the VCL Qt5 plugin in Qt5Menu::DoFullMenuUpdate.

I haven't discovered yet where this type of functionality is currently
tested, so sadly I don't have an idea how to test this and so didn't include
a test case.

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

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d9aa403de9bd..d4857fe7e87a 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -112,7 +112,7 @@ public:
 boolPrepUpdate();
 virtual voidUpdate() override;  // Update this menu only.
 // Update full menu hierarchy from this menu.
-voidUpdateFull () { 
ActivateAllSubmenus(mpVCLMenu); Update(); }
+voidUpdateFull () { 
ActivateAllSubmenus(mpVCLMenu); }
 // Clear ActionGroup and MenuModel from full menu hierarchy
 voidClearActionGroupAndMenuModel();
 GtkSalMenu* GetTopLevel();
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 195e8ce071d2..72ad6e40d6bd 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1205,23 +1205,23 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
 
 void GtkSalMenu::ActivateAllSubmenus(Menu* pMenuBar)
 {
-for (GtkSalMenuItem* pSalItem : maItems)
+// We can re-enter this method via the new event loop that gets created
+// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so use the 
InActivateCallback
+// flag to detect that and skip some startup work.
+if (!mbInActivateCallback)
 {
-if ( pSalItem->mpSubMenu != nullptr )
+mbInActivateCallback = true;
+pMenuBar->HandleMenuActivateEvent(GetMenu());
+mbInActivateCallback = false;
+for (GtkSalMenuItem* pSalItem : maItems)
 {
-// We can re-enter this method via the new event loop that gets 
created
-// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so 
use the InActivateCallback
-// flag to detect that and skip some startup work.
-if (!pSalItem->mpSubMenu->mbInActivateCallback)
+if ( pSalItem->mpSubMenu != nullptr )
 {
-pSalItem->mpSubMenu->mbInActivateCallback = true;
-
pMenuBar->HandleMenuActivateEvent(pSalItem->mpSubMenu->GetMenu());
-pSalItem->mpSubMenu->mbInActivateCallback = false;
 pSalItem->mpSubMenu->ActivateAllSubmenus(pMenuBar);
-pSalItem->mpSubMenu->Update();
-
pMenuBar->HandleMenuDeActivateEvent(pSalItem->mpSubMenu->GetMenu());
 }
 }
+Update();
+pMenuBar->HandleMenuDeActivateEvent(GetMenu());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/redlnitr.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f9ba4668d857e8d3576d11c2d64317a4e42081d4
Author: Caolán McNamara 
AuthorDate: Wed Nov 25 10:10:56 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 25 14:54:51 2020 +0100

crashtesting: null deref on load of ooo72915-2.odt

since...

commit aacaa2aa91f705d64b929b5cff2872f160021b9f
Date:   Tue Nov 3 22:11:59 2020 +0100

sw_fieldmarkhide: let CheckParaRedlineMerge() hide fieldmarks

HideIterator finds the next delete redline or fieldmark, whichever is
closer.

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

diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index a79ce4878a89..3a6a2749f8a4 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -134,11 +134,12 @@ public:
 sal_Unicode const magic(m_eFieldmarkMode == 
sw::FieldmarkMode::ShowResult
 ? CH_TXT_ATR_FIELDSTART
 : CH_TXT_ATR_FIELDSEP);
-sal_Int32 const 
nPos(m_pEndPos->nNode.GetNode().GetTextNode()->GetText().indexOf(
-magic, m_pEndPos->nContent.GetIndex()));
+SwTextNode* pTextNode = m_pEndPos->nNode.GetNode().GetTextNode();
+sal_Int32 const nPos = pTextNode ? pTextNode->GetText().indexOf(
+magic, m_pEndPos->nContent.GetIndex()) : -1;
 if (nPos != -1)
 {
-
m_oNextFieldmarkHide.emplace(*m_pEndPos->nNode.GetNode().GetTextNode(), nPos);
+m_oNextFieldmarkHide.emplace(*pTextNode, nPos);
 sw::mark::IFieldmark const*const pFieldmark(
 m_eFieldmarkMode == sw::FieldmarkMode::ShowResult
 ? m_rIDMA.getFieldmarkAt(*m_oNextFieldmarkHide)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/xml/XMLTableShapeResizer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 153a3587461ba8f14ac849d2f99d3985c0138cf3
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 16:43:39 2020 +
Commit: Christian Lohmaier 
CommitDate: Wed Nov 25 14:45:23 2020 +0100

crashtesting: make tdf129410-1.ods not crash on load

Give its multiple anonymous ChartListeners unique names

Maybe ScMyOLEFixer::FixupOLEs should instead skip calling
CreateChartListener if getPropertyValue(sPersistName) >>= sName succeeded
but has an empty sName result.

Change-Id: I0741694ee692aaa22e0441a5e09748eb67e8dbf4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106066
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106363
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx 
b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 105bbb7cbeb5..1f9bc5cc774f 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -87,7 +87,8 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc,
 *pRefTokens, aRangeStr, pDoc, cSep, pDoc->GetGrammar());
 if (!pRefTokens->empty())
 {
-ScChartListener* pCL(new ScChartListener(rName, pDoc, 
std::move(pRefTokens)));
+OUString sName = !rName.isEmpty() ? rName : 
pCollection->getUniqueName("OLEFixer ");
+ScChartListener* pCL(new ScChartListener(sName, pDoc, 
std::move(pRefTokens)));
 
 //for loading binary files e.g.
 //if we have the flat filter we need to set the dirty flag thus the 
visible charts get repainted
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 shell/source/unix/exec/shellexec.cxx |4 
 shell/source/win32/SysShExec.cxx |3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5afef364af6a40c20e56ae97161fdffd17cee080
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:13:12 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:23:59 2020 +0100

Better handling of Java files

Change-Id: Ifa662be39ac7d35241ee31956e2556b7ba3b5a02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106558
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 696739056f37430154d6333b8f7228d1c44d09b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106521

diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 7d4e9cb36fb6..bbd614a66355 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -136,6 +136,10 @@ void SAL_CALL ShellExec::execute( const OUString& 
aCommand, const OUString& aPar
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + aCommand 
+ ">", {}, 0);
+} else if (pathname.endsWithIgnoreAsciiCase(".class")
+   || pathname.endsWithIgnoreAsciiCase(".jar"))
+{
+dir = true;
 }
 }
 
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 4cf00a70e3ed..660729339521 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -336,7 +336,8 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
 }
 if (!(checkExtension(ext, env)
   && checkExtension(
-  ext, 
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY")))
+  ext,
+  
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.CLASS;.JAR")))
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + 
aCommand + ">", {}, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 cui/source/options/optgdlg.cxx |   47 ++---
 cui/source/options/optgdlg.hxx |1 
 2 files changed, 27 insertions(+), 21 deletions(-)

New commits:
commit feafba7cc94247f45a82ee4f82f1b0a5f2f61656
Author: Luboš Luňák 
AuthorDate: Tue Nov 24 12:41:08 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Nov 25 14:21:03 2020 +0100

clean up enabling/disabling GUI options related to Skia

This should properly enable/disable 'force Skia software rendering'
and 'use hardware acceleration' checkboxes when Skia is enabled or
disabled.
Technically the two options are duplicates, since 'use hardware
acceleration' is the exact opposite of 'force Skia software
rendering'. But the implementation of the hw accel option is so tied
to the implementation of the canvas module that it's simpler
to ignore it for Skia.

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6b71b125e078..0dc33f2c64ba 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -551,11 +551,6 @@ CanvasSettings::CanvasSettings() :
 
 bool CanvasSettings::IsHardwareAccelerationAvailable() const
 {
-if (SkiaHelper::isVCLSkiaEnabled() && Application::GetToolkitName() != 
"gtk3")
-{
-mbHWAccelAvailable = false;
-return false;
-}
 #if HAVE_FEATURE_OPENGL
 if (OpenGLWrapper::isVCLOpenGLEnabled() && Application::GetToolkitName() 
!= "gtk3")
 {
@@ -716,8 +711,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 
 m_xMoreIcons->set_from_icon_name("cmd/sc_additionsdialog.png");
 m_xMoreIcons->connect_clicked(LINK(this, OfaViewTabPage, 
OnMoreIconsClick));
-
-UpdateSkiaStatus();
 }
 
 OfaViewTabPage::~OfaViewTabPage()
@@ -779,6 +772,10 @@ void OfaViewTabPage::UpdateSkiaStatus()
 // FIXME: should really add code to show a 'lock' icon here.
 
m_xUseSkia->set_sensitive(!officecfg::Office::Common::VCL::UseSkia::isReadOnly());
 m_xForceSkiaRaster->set_sensitive(m_xUseSkia->get_active() && 
!officecfg::Office::Common::VCL::ForceSkiaRaster::isReadOnly());
+
+// Technically the 'use hardware acceleration' option could be used to 
mean !forceSkiaRaster, but the implementation
+// of the option is so tied to the implementation of the canvas module 
that it's simpler to ignore it.
+UpdateHardwareAccelStatus();
 #else
 HideSkiaWidgets();
 #endif
@@ -1058,20 +1055,8 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 m_xContextMenuShortcutsLB->set_active(bContextMenuShortcutsNonDefault ? 
eContextMenuShortcuts + 1 : 0);
 m_xContextMenuShortcutsLB->save_value();
 
-{ // #i95644# HW accel (unified to disable mechanism)
-if(pCanvasSettings->IsHardwareAccelerationAvailable())
-{
-
m_xUseHardwareAccell->set_active(pCanvasSettings->IsHardwareAccelerationEnabled());
-
m_xUseHardwareAccell->set_sensitive(!pCanvasSettings->IsHardwareAccelerationRO());
-}
-else
-{
-m_xUseHardwareAccell->set_active(false);
-m_xUseHardwareAccell->set_sensitive(false);
-}
-
-m_xUseHardwareAccell->save_state();
-}
+UpdateHardwareAccelStatus();
+m_xUseHardwareAccell->save_state();
 
 { // #i95644# AntiAliasing
 if(mpDrawinglayerOpt->IsAAPossibleOnThisSystem())
@@ -1086,6 +1071,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 
 m_xUseAntiAliase->save_state();
 }
+
 m_xUseSkia->set_active(mpSkiaConfig->useSkia());
 m_xForceSkiaRaster->set_active(mpSkiaConfig->forceSkiaRaster());
 
@@ -1097,6 +1083,25 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 m_xForceSkiaRaster->save_state();
 
 OnAntialiasingToggled(*m_xFontAntiAliasing);
+UpdateSkiaStatus();
+}
+
+void OfaViewTabPage::UpdateHardwareAccelStatus()
+{
+// #i95644# HW accel (unified to disable mechanism)
+if(pCanvasSettings->IsHardwareAccelerationAvailable())
+{
+
m_xUseHardwareAccell->set_active(pCanvasSettings->IsHardwareAccelerationEnabled());
+
m_xUseHardwareAccell->set_sensitive(!pCanvasSettings->IsHardwareAccelerationRO());
+}
+else
+{
+m_xUseHardwareAccell->set_active(false);
+m_xUseHardwareAccell->set_sensitive(false);
+}
+#if HAVE_FEATURE_SKIA
+m_xUseHardwareAccell->set_sensitive(!m_xUseSkia->get_active());
+#endif
 }
 
 struct LanguageConfig_Impl
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 93dc5280b98e..0944bb674932 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -125,6 +125,7 @@ private:
 DECL_STATIC_LINK(OfaViewTabPage, OnMoreIconsClick, weld::Button&, void);
 void UpdateSkiaStatus();
 void HideSki

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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/numpages.cxx |6 +++---
 include/svtools/valueset.hxx |2 +-
 svtools/source/control/valueset.cxx  |   20 +---
 svx/source/tbxctrls/bulletsnumbering.cxx |2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 5d5f10b3fa7c59c25f1b85d909db6909548ee111
Author: Caolán McNamara 
AuthorDate: Mon Nov 23 16:40:23 2020 +
Commit: Christian Lohmaier 
CommitDate: Wed Nov 25 14:14:56 2020 +0100

tdf#138430 toolbar bullet dropdown should have a scrolledwindow

as should the matching dialog pages

Change-Id: Ib327d3c02d1bc5ae11a6a76d52c9e17803f05534
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106436
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index c271ebaaa858..b921e6cde953 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -163,7 +163,7 @@ 
SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(weld::Container* pPage, weld::D
 , bModified(false)
 , bPreset(false)
 , nNumItemId(SID_ATTR_NUMBERING_RULE)
-, m_xExamplesVS(new SvxNumValueSet(nullptr))
+, m_xExamplesVS(new 
SvxNumValueSet(m_xBuilder->weld_scrolled_window("valuesetwin")))
 , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*m_xExamplesVS))
 {
 SetExchangeSupport();
@@ -342,7 +342,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container* 
pPage, weld::DialogC
 , bModified(false)
 , bPreset(false)
 , nNumItemId(SID_ATTR_NUMBERING_RULE)
-, m_xExamplesVS(new SvxNumValueSet(nullptr))
+, m_xExamplesVS(new 
SvxNumValueSet(m_xBuilder->weld_scrolled_window("valuesetwin")))
 , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*m_xExamplesVS))
 {
 SetExchangeSupport();
@@ -491,7 +491,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(weld::Container* 
pPage, weld::DialogControl
 , nNumItemId(SID_ATTR_NUMBERING_RULE)
 , bModified(false)
 , bPreset(false)
-, m_xExamplesVS(new SvxNumValueSet(nullptr))
+, m_xExamplesVS(new 
SvxNumValueSet(m_xBuilder->weld_scrolled_window("valuesetwin")))
 , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*m_xExamplesVS))
 {
 SetExchangeSupport();
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index b27885d9b72b..d5c991d86a02 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -256,7 +256,7 @@ private:
 SVT_DLLPRIVATE void QueueReformat();
 SVT_DLLPRIVATE void SetFirstLine(sal_uInt16 nNewFirstLine); // set 
mnFirstLine and update scrollbar to match
 SVT_DLLPRIVATE void RecalcScrollBar();
-SVT_DLLPRIVATE void TurnOffScrollBar();
+SVT_DLLPRIVATE bool TurnOffScrollBar();
 SVT_DLLPRIVATE void TurnOnScrollBar();
 DECL_DLLPRIVATE_LINK(ImplScrollHdl, weld::ScrolledWindow&, void);
 
diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 4070630fe44a..8e679562ad48 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -539,14 +539,15 @@ void ValueSet::RemoveItem( sal_uInt16 nItemId )
 QueueReformat();
 }
 
-void ValueSet::TurnOffScrollBar()
+bool ValueSet::TurnOffScrollBar()
 {
 if (mxScrolledWindow->get_vpolicy() == VclPolicyType::NEVER)
-return;
+return false;
 mxScrolledWindow->set_vpolicy(VclPolicyType::NEVER);
 weld::DrawingArea* pDrawingArea = GetDrawingArea();
 Size aPrefSize(pDrawingArea->get_preferred_size());
 pDrawingArea->set_size_request(aPrefSize.Width() + GetScrollWidth(), 
aPrefSize.Height());
+return true;
 }
 
 void ValueSet::TurnOnScrollBar()
@@ -561,11 +562,16 @@ void ValueSet::TurnOnScrollBar()
 
 void ValueSet::RecalcScrollBar()
 {
-// reset scrolled window state to initial value
-// so it will get configured to the right adjustment
-WinBits nStyle = GetStyle();
-if (mxScrolledWindow && (nStyle & WB_VSCROLL))
-TurnOffScrollBar();
+if (!mxScrolledWindow)
+return;
+const bool bScrollAllowed = GetStyle() & WB_VSCROLL;
+if (!bScrollAllowed)
+return;
+// reset scrolled window state to initial value so it will get configured
+// to the right adjustment on the next format which we toggle on to happen
+// if the scrolledwindow wasn't in its initial state already
+if (TurnOffScrollBar())
+mbFormat = true;
 }
 
 void ValueSet::Clear()
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx 
b/svx/source/tbxctrls/bulletsnumbering.cxx
index 430ca197457d..d30a6aabcfd0 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -68,7 +68,7 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl& 
rController,
 : WeldToolbarPopup(rController.getFrameInterface(), pParent, 
"svx/ui/numberi

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

[Stephan Bergmann (via logerrit)]

 svl/source/svdde/ddecli.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e41ca15fd67581dbf69322e6a18595d00ab7a151
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 11:24:10 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:10:00 2020 +0100

DdeInitializeW, DdeGetLastError, etc. use UINT as status return type

(As a follow-up, DdeConnection::GetError should probably also be changed 
from
returning tools::Long to something like sal_uInt32.)

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

diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index a4d611e38741..852d7db9e2e5 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -52,7 +52,7 @@ void ImpDeinitInstData()
 struct DdeImp
 {
 HCONV   hConv;
-longnStatus;
+UINTnStatus;
 };
 
 HDDEDATA CALLBACK DdeInternal::CliCallback( UINT nCode, UINT nCbType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 winaccessibility/source/UAccCOM/AccTextBase.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0a94c20e2c3ae327105d8435959e53947d4b82d8
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:56:07 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:09:03 2020 +0100

Strength-reduce ReplaceOneChar parameter from string to single character

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

diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx 
b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index 12401e56dc0a..796526b06225 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -973,7 +973,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::put_XInterface(hyper pXInterface
 LEAVE_PROTECTED_BLOCK
 }
 
-static OUString ReplaceOneChar(OUString const & oldOUString, OUString const & 
replacedChar, OUString const & replaceStr)
+static OUString ReplaceOneChar(OUString const & oldOUString, sal_Unicode 
replacedChar, OUString const & replaceStr)
 {
 auto s = oldOUString;
 int iReplace = s.lastIndexOf(replacedChar);
@@ -991,11 +991,11 @@ static OUString ReplaceOneChar(OUString const & 
oldOUString, OUString const & re
 static OUString ReplaceFourChar(OUString const & oldOUString)
 {
 auto s = oldOUString;
-s = ReplaceOneChar(s, "\\", "");
-s = ReplaceOneChar(s, ";", "\\;");
-s = ReplaceOneChar(s, "=", "\\=");
-s = ReplaceOneChar(s, ",", "\\,");
-s = ReplaceOneChar(s, ":", "\\:");
+s = ReplaceOneChar(s, '\\', "");
+s = ReplaceOneChar(s, ';', "\\;");
+s = ReplaceOneChar(s, '=', "\\=");
+s = ReplaceOneChar(s, ',', "\\,");
+s = ReplaceOneChar(s, ':', "\\:");
 return s;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 include/o3tl/safeint.hxx   |5 +
 vcl/win/gdi/DWriteTextRenderer.cxx |5 -
 vcl/win/gdi/winlayout.cxx  |7 +--
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit b1404b5919f8c18bde715f68b229d2c030de5b2a
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 11:06:00 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:08:20 2020 +0100

-Wc++11-narrowing (clang-cl)

MSVC seems not to mind, but a Windows 64-bit build with clang-cl fails with
"error: non-constant-expression cannot be narrowed from type 'tools::Long' 
(aka
'long long') to 'LONG' (aka 'long') in initializer list".  But adding 
explicit
casts would have the downside of preventing tools like
-fsanitize=implict-conversion (if we ever use that on Windows) from 
detecting
truncation, so introduce o3tl::narrowing.

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

diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index 6d8d1304fdf3..a5c212244c7c 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -234,6 +234,11 @@ make_unsigned(T value)
 return value;
 }
 
+// An implicit conversion from T2 to T1, useful in places where an explicit 
conversion from T2 to
+// T1 is needed (e.g., in list initialization, if the implicit conversion 
would be narrowing) but
+// tools like -fsanitize=implict-conversion should still be able to detect 
truncation:
+template constexpr T1 narrowing(T2 value) { return 
value; }
+
 }
 
 #endif
diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx 
b/vcl/win/gdi/DWriteTextRenderer.cxx
index da8eab0e6ce0..185925ae7967 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -30,6 +30,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 namespace
@@ -190,7 +191,9 @@ bool D2DWriteTextOutRenderer::Ready() const
 
 HRESULT D2DWriteTextOutRenderer::BindDC(HDC hDC, tools::Rectangle const & 
rRect)
 {
-RECT const rc = { rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom() 
};
+RECT const rc = {
+o3tl::narrowing(rRect.Left()), 
o3tl::narrowing(rRect.Top()),
+o3tl::narrowing(rRect.Right()), 
o3tl::narrowing(rRect.Bottom()) };
 return CHECKHR(mpRT->BindDC(hDC, &rc));
 }
 
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 7863a3c353d2..398196438fb7 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -21,6 +21,8 @@
 #include 
 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -594,8 +596,9 @@ void WinSalGraphics::DrawTextLayout(const GenericSalLayout& 
rLayout)
 // we are making changes to the DC, make sure we got a new one
 assert(aDC->getCompatibleHDC() != hDC);
 
-RECT aWinRect = { aRect.Left(), aRect.Top(), aRect.Left() + 
aRect.GetWidth(),
-  aRect.Top() + aRect.GetHeight() };
+RECT aWinRect = { o3tl::narrowing(aRect.Left()), 
o3tl::narrowing(aRect.Top()),
+  o3tl::narrowing(aRect.Left() + 
aRect.GetWidth()),
+  o3tl::narrowing(aRect.Top() + 
aRect.GetHeight()) };
 ::FillRect(aDC->getCompatibleHDC(), &aWinRect,
static_cast(::GetStockObject(WHITE_BRUSH)));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 winaccessibility/source/UAccCOM/AccActionBase.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69372bf111c0a85e754d72248bcd22b455f11938
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 11:16:36 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:07:44 2020 +0100

UNOIDL long vs. C++ sal_Int32 confustion

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

diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx 
b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index e3a93ecedf84..c75e0d423c2c 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -166,7 +166,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccActionBase::get_keyBinding(
 if( !binding.is() )
 return E_FAIL;
 
-long nCount = binding->getAccessibleKeyBindingCount();
+sal_Int32 nCount = binding->getAccessibleKeyBindingCount();
 
 *keyBinding = static_cast(::CoTaskMemAlloc(nCount*sizeof(BSTR)));
 
@@ -174,7 +174,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccActionBase::get_keyBinding(
 if(*keyBinding == nullptr)
 return E_FAIL;
 
-for( int index = 0;index < nCount;index++ )
+for( sal_Int32 index = 0;index < nCount;index++ )
 {
 auto const wString = comphelper::GetkeyBindingStrByXkeyBinding(
 binding->getAccessibleKeyBinding(index));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 editeng/source/editeng/editdbg.cxx|2 +-
 sw/source/filter/ww8/WW8TableInfo.cxx |   16 
 vcl/workben/vcldemo.cxx   |2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 9e0de138a5afaa7132ee535a15741effc983d2b0
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 11:00:23 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:07:07 2020 +0100

Use sal_Int64 to printf tools::Long values

(The "%l" format specifiers had now caused -Werror,-Wformat with clang-cl 
for a
Windows 64-bit build.)

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

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index cee32beafcc2..3598036e2240 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -454,7 +454,7 @@ void EditEngine::DumpData(const EditEngine* pEE, bool 
bInfoBox)
 fprintf( fp, "\nControl: %x", unsigned( pEE->GetControlWord() ) );
 fprintf( fp, "\nRefMapMode: %i", int( 
pEE->pImpEditEngine->pRefDev->GetMapMode().GetMapUnit() ) );
 fprintf( fp, "\nPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64, 
sal_Int64(pEE->GetPaperSize().Width()), sal_Int64(pEE->GetPaperSize().Height()) 
);
-fprintf( fp, "\nMaxAutoPaperSize: %li x %li", 
pEE->GetMaxAutoPaperSize().Width(), pEE->GetMaxAutoPaperSize().Height() );
+fprintf( fp, "\nMaxAutoPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64, 
sal_Int64(pEE->GetMaxAutoPaperSize().Width()), 
sal_Int64(pEE->GetMaxAutoPaperSize().Height()) );
 fprintf( fp, "\nMinAutoPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64 , 
sal_Int64(pEE->GetMinAutoPaperSize().Width()), 
sal_Int64(pEE->GetMinAutoPaperSize().Height()) );
 fprintf( fp, "\nUpdate: %i", pEE->GetUpdateMode() );
 fprintf( fp, "\nNumber of Views: %" SAL_PRI_SIZET "i", pEE->GetViewCount() 
);
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx 
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 03f376fbeec9..907e4131cec0 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -998,15 +998,15 @@ std::string CellInfo::toString() const
 static char sBuffer[256];
 
 snprintf(sBuffer, sizeof(sBuffer),
- "",
- left(),
- right(),
- top(),
- bottom(),
+ sal_Int64(left()),
+ sal_Int64(right()),
+ sal_Int64(top()),
+ sal_Int64(bottom()),
  m_pNodeInfo);
 
 return sBuffer;
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 68a04d1384a9..cca89f8a2ecc 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1794,7 +1794,7 @@ public:
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect) override
 {
 mrRenderer.SetSizePixel(GetSizePixel());
-fprintf(stderr, "DemoWin::Paint(%ld,%ld,%ld,%ld)\n", rRect.getX(), 
rRect.getY(), rRect.getWidth(), rRect.getHeight());
+fprintf(stderr, "DemoWin::Paint(%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 
",%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ")\n", sal_Int64(rRect.getX()), 
sal_Int64(rRect.getY()), sal_Int64(rRect.getWidth()), 
sal_Int64(rRect.getHeight()));
 if (mrRenderer.getIterCount() == 0)
 mrRenderer.drawToDevice(rRenderContext, GetSizePixel(), false);
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/stringviewparam.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit e4c841f7999538522e9453dde9a2d021df5cf149
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 10:16:40 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:06:35 2020 +0100

Ignore unparsed function template bodies in loplugin:stringviewparam

Otherwise, clang-cl would have reported a false positive at

> In file included from 
C:/lo-clang/core/canvas/source/directx/dx_bitmapcanvashelper.cxx:36:
> C:/lo-clang/core/include\canvas/canvastools.hxx(501,42): error: replace 
function parameter of type 'const rtl::OUString &' with 'std::u16string_view' 
[loplugin:stringviewparam]
> bool lookup( const OUString& rName,
>  ^

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

diff --git a/compilerplugins/clang/stringviewparam.cxx 
b/compilerplugins/clang/stringviewparam.cxx
index c359c1a9dc82..3056b6412930 100644
--- a/compilerplugins/clang/stringviewparam.cxx
+++ b/compilerplugins/clang/stringviewparam.cxx
@@ -454,6 +454,10 @@ private:
 {
 return false;
 }
+if (decl->getBody() == nullptr) // unparsed template
+{
+return false;
+}
 if (auto const d = dyn_cast(decl))
 {
 if (d->isVirtual())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 basic/source/comp/symtbl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da212b3e090d1832388834b135c8f358747f4b96
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 10:21:37 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:05:36 2020 +0100

Use sal_Int32 to print SbxLONG value

(The "%ld" format specifier had now caused -Werror,-Wformat with clang-cl 
for a
Windows 64-bit build.)

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

diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 46b3b924798e..a4e7befe94b1 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 
 // All symbol names are laid down int the symbol-pool's stringpool, so that
 // all symbols are handled in the same case. On saving the code-image, the
@@ -70,7 +69,8 @@ short SbiStringPool::Add( double n, SbxDataType t )
 // tdf#131296 - store numeric value including its type character
 // See GetSuffixType in basic/source/comp/scanner.cxx for type 
characters
 case SbxINTEGER: snprintf( buf, sizeof(buf), "%d%%", 
static_cast(n) ); break;
-case SbxLONG:snprintf( buf, sizeof(buf), "%ld&", 
static_cast(n) ); break;
+case SbxLONG:
+snprintf( buf, sizeof(buf), "%" SAL_PRIdINT32 "&", 
static_cast(n) ); break;
 case SbxSINGLE:  snprintf( buf, sizeof(buf), "%.6g!", 
static_cast(n) ); break;
 case SbxDOUBLE:  snprintf( buf, sizeof(buf), "%.16g", n ); break; // 
default processing in SbiRuntime::StepLOADNC - no type character
 case SbxCURRENCY: snprintf(buf, sizeof(buf), "%.16g@", n); break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 shell/source/unix/exec/shellexec.cxx |4 
 shell/source/win32/SysShExec.cxx |3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ec5adc39cbea6d754ef68ab3d03fb16066b27e40
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:13:12 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:04:57 2020 +0100

Better handling of Java files

Change-Id: Ifa662be39ac7d35241ee31956e2556b7ba3b5a02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106558
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 696739056f37430154d6333b8f7228d1c44d09b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106520
Reviewed-by: Michael Stahl 

diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 58c5ef4661d8..3ac5fad2e0af 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -150,6 +150,10 @@ void SAL_CALL ShellExec::execute( const OUString& 
aCommand, const OUString& aPar
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + aCommand 
+ ">", {}, 0);
+} else if (pathname.endsWithIgnoreAsciiCase(".class")
+   || pathname.endsWithIgnoreAsciiCase(".jar"))
+{
+dir = true;
 }
 }
 
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 93eeaee36f03..c98940be64a1 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -331,7 +331,8 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
 }
 if (!(checkExtension(ext, env)
   && checkExtension(
-  ext, 
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY")))
+  ext,
+  
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.CLASS;.JAR")))
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + 
aCommand + ">", {}, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/cppunittester

[Stephan Bergmann (via logerrit)]

 sal/cppunittester/cppunittester.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39c9596eb7746c16e68e71d76777be58fc94b7c9
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 10:14:57 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 14:04:32 2020 +0100

Silence false loplugin:stringviewparam in conditional code (clang-cl)

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

diff --git a/sal/cppunittester/cppunittester.cxx 
b/sal/cppunittester/cppunittester.cxx
index 468b54ca9ecc..c6fd3b9a269e 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -370,7 +370,7 @@ void reportResourceUsage(const OUString& rPath)
 resource_file << "KernelSpace = " << nKernelSpace << std::endl;
 }
 #else
-void reportResourceUsage(const OUString& /*rPath*/)
+void reportResourceUsage([[maybe_unused]] const OUString& /*rPath*/)
 {
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svtools/editbrowsebox.hxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 6911ac40f668895089d4ae4de90edba95e283433
Author: Caolán McNamara 
AuthorDate: Mon Nov 23 11:37:09 2020 +
Commit: Christian Lohmaier 
CommitDate: Wed Nov 25 14:03:20 2020 +0100

tdf#137662 set focus in combo/list box on click

backport the part of

commit d2f1cd004310b9ea6654d17fddc11cb08e884c90
Date:   Fri Jun 26 20:57:29 2020 +0100

that sets the correct focus on click

Change-Id: Ia053925f5e541642720892dfe2edc27995e84a61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106414
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 5614659d0756..04c931d82fdd 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -339,6 +339,13 @@ namespace svt
 public:
 ComboBoxControl(vcl::Window* pParent);
 
+virtual void GetFocus() override
+{
+if (m_xWidget)
+m_xWidget->grab_focus();
+InterimItemWindow::GetFocus();
+}
+
 weld::ComboBox& get_widget() { return *m_xWidget; }
 
 // sets a link to call when the selection is changed by the user
@@ -400,6 +407,13 @@ namespace svt
 public:
 ListBoxControl(vcl::Window* pParent);
 
+virtual void GetFocus() override
+{
+if (m_xWidget)
+m_xWidget->grab_focus();
+InterimItemWindow::GetFocus();
+}
+
 weld::ComboBox& get_widget() { return *m_xWidget; }
 
 // sets a link to call when the selection is changed by the user
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'distro/lhm/libreoffice-7-1+backports'

[Caolán McNamara (via logerrit)]

New branch 'distro/lhm/libreoffice-7-1+backports' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 xmloff/source/text/XMLTextListBlockContext.cxx |  179 +
 xmloff/source/text/XMLTextListBlockContext.hxx |5 
 xmloff/source/text/XMLTextListItemContext.cxx  |   28 +--
 xmloff/source/text/XMLTextListItemContext.hxx  |6 
 4 files changed, 199 insertions(+), 19 deletions(-)

New commits:
commit c1fa005db7a75f54b6651c85ecf897c5857e61f3
Author: Noel Grandin 
AuthorDate: Tue Nov 24 20:55:27 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 25 13:49:28 2020 +0100

fastparser in XMLTextListItemContext

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

diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx 
b/xmloff/source/text/XMLTextListBlockContext.cxx
index 57065a923a0c..71eb988a9e24 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -38,6 +38,185 @@ using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
 
+// OD 2008-05-07 #refactorlists#
+// add optional parameter  and its handling
+XMLTextListBlockContext::XMLTextListBlockContext(
+SvXMLImport& rImport,
+XMLTextImportHelper& rTxtImp,
+const Reference< xml::sax::XFastAttributeList > & xAttrList,
+const bool bRestartNumberingAtSubList )
+:   SvXMLImportContext( rImport )
+,   mrTxtImport( rTxtImp )
+,   msListStyleName()
+,   mxParentListBlock( )
+,   mnLevel( 0 )
+,   mbRestartNumbering( false )
+,   mbSetDefaults( false )
+,   msListId()
+,   msContinueListId()
+{
+static const char s_PropNameDefaultListId[] = "DefaultListId";
+{
+// get the parent list block context (if any); this is a bit ugly...
+XMLTextListBlockContext * pLB(nullptr);
+XMLTextListItemContext  * pLI(nullptr);
+XMLNumberedParaContext  * pNP(nullptr);
+rTxtImp.GetTextListHelper().ListContextTop(pLB, pLI, pNP);
+mxParentListBlock = pLB;
+}
+// Inherit style name from parent list, as well as the flags whether
+// numbering must be restarted and formats have to be created.
+OUString sParentListStyleName;
+if( mxParentListBlock.is() )
+{
+XMLTextListBlockContext *pParent = mxParentListBlock.get();
+msListStyleName = pParent->msListStyleName;
+sParentListStyleName = msListStyleName;
+mxNumRules = pParent->GetNumRules();
+mnLevel = pParent->GetLevel() + 1;
+mbRestartNumbering = pParent->IsRestartNumbering() ||
+ bRestartNumberingAtSubList;
+mbSetDefaults = pParent->mbSetDefaults;
+msListId = pParent->GetListId();
+msContinueListId = pParent->GetContinueListId();
+}
+
+bool bIsContinueNumberingAttributePresent( false );
+for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
+{
+OUString sValue = aIter.toString();
+switch( aIter.getToken() )
+{
+case XML_ELEMENT(XML, XML_ID):
+//FIXME: there is no UNO API for lists
+// xml:id is also the list ID (#i92221#)
+if ( mnLevel == 0 ) // root  element
+{
+msListId = sValue;
+}
+break;
+case XML_ELEMENT(TEXT, XML_CONTINUE_NUMBERING):
+mbRestartNumbering = !IsXMLToken(sValue, XML_TRUE);
+bIsContinueNumberingAttributePresent = true;
+break;
+case XML_ELEMENT(TEXT, XML_STYLE_NAME):
+msListStyleName = sValue;
+break;
+case XML_ELEMENT(TEXT, XML_CONTINUE_LIST):
+if ( mnLevel == 0 ) // root  element
+{
+msContinueListId = sValue;
+}
+break;
+default:
+XMLOFF_WARN_UNKNOWN("xmloff", aIter);
+}
+}
+
+// Remember this list block.
+mrTxtImport.GetTextListHelper().PushListContext( this );
+
+mxNumRules = XMLTextListsHelper::MakeNumRule(GetImport(), mxNumRules,
+sParentListStyleName, msListStyleName,
+mnLevel, &mbRestartNumbering, &mbSetDefaults );
+if( !mxNumRules.is() )
+return;
+
+if ( mnLevel != 0 ) // root  element
+return;
+
+XMLTextListsHelper& rTextListsHelper( mrTxtImport.GetTextListHelper() );
+// Inconsistent behavior regarding lists (#i92811#)
+OUString sListStyleDefaultListId;
+{
+uno::Reference< beans::XPropertySet > xNumRuleProps( mxNumRules, 
UNO_QUERY );
+if ( xNumRuleProps.is() )
+{
+uno::Reference< beans::XPropertySetInfo > xNumRulePropSetInfo(
+xNumRuleProps->getPropertySetInfo());
+if (xNumRulePropSetInfo.is() &&
+xNumRulePropSetInfo->hasPropertyByName(
+ s_PropNameDefaultListId))
+{
+xNumRuleProps->getPropertyValue(s_PropNameDefaultListId)
+   

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 52314eab412914850953bdfd6ed9a9a0b90bb206
Author: Christian Lohmaier 
AuthorDate: Wed Nov 25 13:41:31 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 13:41:31 2020 +0100

Update git submodules

* Update translations from branch 'libreoffice-7-0'
  to 60c5bafea5acf84c0147812a50516136a4225d88
  - update translations for 7.0.4 rc1

and force-fix errors using pocheck

Change-Id: I14fb846e0ef6fbb92b944a25f9470530c172910f

diff --git a/translations b/translations
index a032756b2ded..60c5bafea5ac 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a032756b2ded48180d4db2996486c59d644bc6e3
+Subproject commit 60c5bafea5acf84c0147812a50516136a4225d88
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/eszka' - 2 commits - sc/source vcl/source

[Szymon Kłos (via logerrit)]

 sc/source/ui/attrdlg/scdlgfact.cxx |5 
 sc/source/ui/attrdlg/scdlgfact.hxx |3 
 sc/source/ui/view/cellsh1.cxx  |  231 +++--
 vcl/source/window/builder.cxx  |5 
 4 files changed, 135 insertions(+), 109 deletions(-)

New commits:
commit 2f9e09a6efedbdfe811bc1d2aba687d653af4efe
Author: Szymon Kłos 
AuthorDate: Wed Nov 25 13:39:28 2020 +0100
Commit: Szymon Kłos 
CommitDate: Wed Nov 25 13:39:28 2020 +0100

jsdialog: enable Pivot Table dialogs

Change-Id: Ic467c95f0d56d28e6c6590d488e2a0b10f65e803

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d141dace9e98..7067a05c5c77 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -166,6 +166,11 @@ weld::Builder* Application::CreateBuilder(weld::Widget* 
pParent, const OUString
 bUseJSBuilder = true;
 }
 
+if (comphelper::LibreOfficeKit::isActive() &&
+(rUIFile == "modules/scalc/ui/pivottablelayoutdialog.ui"
+|| rUIFile == "modules/scalc/ui/selectsource.ui"))
+bUseJSBuilder = true;
+
 if (bUseJSBuilder)
 return JSInstanceBuilder::CreateDialogBuilder(pParent, 
VclBuilderContainer::getUIRootDir(), rUIFile);
 else
commit 06aae3931d88705cb34e82654ad6fff8437d28a0
Author: Szymon Kłos 
AuthorDate: Mon Nov 23 12:02:07 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon Nov 23 12:02:07 2020 +0100

Make Pivot table data source dialog async

Change-Id: I573038935e31c5393293197c1a9706110a970837

diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index ab717e1ee05e..cb9d07c008ad 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -110,6 +110,11 @@ short AbstractScDataPilotSourceTypeDlg_Impl::Execute()
 return m_xDlg->run();
 }
 
+bool AbstractScDataPilotSourceTypeDlg_Impl::StartExecuteAsync(AsyncContext 
&rCtx)
+{
+return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
+}
+
 short AbstractScDataPilotServiceDlg_Impl::Execute()
 {
 return m_xDlg->run();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 4f8987bc4e1a..582d189ef4c0 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -181,13 +181,14 @@ public:
 
 class AbstractScDataPilotSourceTypeDlg_Impl  :public 
AbstractScDataPilotSourceTypeDlg
 {
-std::unique_ptr m_xDlg;
+std::shared_ptr m_xDlg;
 public:
 explicit 
AbstractScDataPilotSourceTypeDlg_Impl(std::unique_ptr 
p)
 : m_xDlg(std::move(p))
 {
 }
 virtual short Execute() override;
+virtual bool StartExecuteAsync(AsyncContext &) override;
 virtual bool IsDatabase() const override;
 virtual bool IsExternal() const override;
 virtual bool IsNamedRange() const override;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e715c721c721..11d9b5aa743a 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2780,6 +2780,23 @@ bool isDPSourceValid(const ScDPObject& rDPObj)
 return true;
 }
 
+void RunPivotLayoutDialog(ScModule* pScMod,
+  ScTabViewShell* pTabViewShell,
+  std::unique_ptr& pNewDPObject)
+{
+bool bHadNewDPObject = pNewDPObject != nullptr;
+pTabViewShell->SetDialogDPObject( std::move(pNewDPObject) );
+if ( bHadNewDPObject )
+{
+//  start layout dialog
+
+sal_uInt16 nId  = ScPivotLayoutWrapper::GetChildWindowId();
+SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
+SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
+pScMod->SetRefDialog( nId, pWnd == nullptr );
+}
+}
+
 }
 
 void ScCellShell::ExecuteDataPilotDialog()
@@ -2789,21 +2806,21 @@ void ScCellShell::ExecuteDataPilotDialog()
 ScViewData* pData = GetViewData();
 ScDocument* pDoc = pData->GetDocument();
 
-std::unique_ptr pNewDPObject;
-
 // ScPivot is no longer used...
 ScDPObject* pDPObj = pDoc->GetDPAtCursor(
 pData->GetCurX(), pData->GetCurY(),
 pData->GetTabNo() );
 if ( pDPObj )   // on an existing table?
 {
+std::unique_ptr pNewDPObject;
+
 if (isDPSourceValid(*pDPObj))
 pNewDPObject.reset(new ScDPObject(*pDPObj));
+
+RunPivotLayoutDialog(pScMod, pTabViewShell, pNewDPObject);
 }
 else// create new table
 {
-const char* pSrcErrorId = nullptr;
-
 //  select database range or data
 pTabViewShell->GetDBData( true, SC_DB_OLD );
 ScMarkData& rMark = GetViewData()->GetMarkData();
@@ -2820,7 +2837,7 @@ void ScCellShell::ExecuteDataPilotDialog()
 
 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
 
-ScopedVclPtr pTypeDlg(
+VclPtr pTypeDlg(
 pFact->CreateScDataPilotSourceTypeDlg(

XML entity reference

[Dante Doménech]

Hello. I have already been studying the code of
SvXMLImportContext
SvXMLImport
FastParser
for a while. However I can not find the code supposed to process the
entity references.
It should be somewhere between the read of the data and the characters() method.
Does anyone know where can I find that code?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/redlnitr.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ac65359fe7d829f746699509decd6238f6a8f20d
Author: Caolán McNamara 
AuthorDate: Wed Nov 25 10:10:56 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 25 12:51:01 2020 +0100

crashtesting: null deref on load of ooo72915-2.odt

since...

commit aacaa2aa91f705d64b929b5cff2872f160021b9f
Date:   Tue Nov 3 22:11:59 2020 +0100

sw_fieldmarkhide: let CheckParaRedlineMerge() hide fieldmarks

HideIterator finds the next delete redline or fieldmark, whichever is
closer.

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

diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index a79ce4878a89..3a6a2749f8a4 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -134,11 +134,12 @@ public:
 sal_Unicode const magic(m_eFieldmarkMode == 
sw::FieldmarkMode::ShowResult
 ? CH_TXT_ATR_FIELDSTART
 : CH_TXT_ATR_FIELDSEP);
-sal_Int32 const 
nPos(m_pEndPos->nNode.GetNode().GetTextNode()->GetText().indexOf(
-magic, m_pEndPos->nContent.GetIndex()));
+SwTextNode* pTextNode = m_pEndPos->nNode.GetNode().GetTextNode();
+sal_Int32 const nPos = pTextNode ? pTextNode->GetText().indexOf(
+magic, m_pEndPos->nContent.GetIndex()) : -1;
 if (nPos != -1)
 {
-
m_oNextFieldmarkHide.emplace(*m_pEndPos->nNode.GetNode().GetTextNode(), nPos);
+m_oNextFieldmarkHide.emplace(*pTextNode, nPos);
 sw::mark::IFieldmark const*const pFieldmark(
 m_eFieldmarkMode == sw::FieldmarkMode::ShowResult
 ? m_rIDMA.getFieldmarkAt(*m_oNextFieldmarkHide)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/scriptforge/SF_Utils.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a9c3c918a3efb0d2f8f40e79f7032124d17b6f5
Author: Jean-Pierre Ledure 
AuthorDate: Tue Nov 24 15:43:40 2020 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Wed Nov 25 12:37:45 2020 +0100

ScriptForge - (SF_Utils) Increment version number

Start 7.2

Change-Id: Ic09246b985038730a96c870226e2d4ce25ff24d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106530
Tested-by: Jean-Pierre Ledure 
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/scriptforge/SF_Utils.xba 
b/wizards/source/scriptforge/SF_Utils.xba
index 67aa32f29c77..a3933be731d5 100644
--- a/wizards/source/scriptforge/SF_Utils.xba
+++ b/wizards/source/scriptforge/SF_Utils.xba
@@ -21,7 +21,7 @@ REM 
= GLOBAL
 Global _SF_As Variant  '  SF_Root (Basic) object)
 
 ''' ScriptForge version
-Const SF_Version = "7.1"
+Const SF_Version = "7.2"
 
 ''' Standard symbolic names for VarTypes
 ' V_EMPTY = 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/inc svx/IwyuFilter_svx.yaml svx/qa svx/source

[Gabor Kelemen (via logerrit)]

 svx/IwyuFilter_svx.yaml|   
33 +-
 svx/inc/formnavi.hrc   |   
 2 
 svx/inc/frmsel.hrc |   
 1 
 svx/inc/galbrws2.hxx   |   
 2 
 svx/inc/galobj.hxx |   
 1 
 svx/inc/sdr/contact/viewcontactofpageobj.hxx   |   
 1 
 svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx  |   
 2 
 svx/inc/spacing.hrc|   
 2 
 svx/inc/svxerr.hrc |   
 2 
 svx/qa/unit/gallery/test_gallery.cxx   |   
 1 
 svx/source/customshapes/EnhancedCustomShape2d.cxx  |   
 2 
 svx/source/customshapes/EnhancedCustomShape3d.cxx  |   
 1 
 svx/source/dialog/ClassificationEditView.hxx   |   
 3 
 svx/source/dialog/dlgctrl.cxx  |   
 2 
 svx/source/dialog/srchdlg.cxx  |   
 1 
 svx/source/engine3d/view3d1.cxx|   
 2 
 svx/source/fmcomp/gridcell.cxx |   
 1 
 svx/source/fmcomp/gridctrl.cxx |   
 1 
 svx/source/form/datanavi.cxx   |   
 1 
 svx/source/form/fmscriptingenv.cxx |   
 7 --
 svx/source/form/fmshimp.cxx|   
 1 
 svx/source/form/tbxform.cxx|   
 1 
 svx/source/gallery2/galbrws1.cxx   |   
 4 -
 svx/source/gallery2/galbrws1.hxx   |   
 1 
 svx/source/gallery2/gallery1.cxx   |   
 1 
 svx/source/gallery2/gallerybinaryengine.cxx|   
 1 
 svx/source/gallery2/gallerybinaryengineentry.cxx   |   
 7 --
 svx/source/gallery2/galleryobjectcollection.cxx|   
 1 
 svx/source/gallery2/galmisc.cxx|   
 1 
 svx/source/gallery2/galtheme.cxx   |   
15 
 svx/source/inc/StylesPreviewToolBoxControl.hxx |   
 5 -
 svx/source/inc/datalistener.hxx|   
 1 
 svx/source/inc/filtnav.hxx |   
 1 
 svx/source/inc/findtextfield.hxx   |   
 2 
 svx/source/inc/fmexch.hxx  |   
 1 
 svx/source/inc/fmexpl.hxx  |   
 1 
 svx/source/inc/svdpdf.hxx  |   
 1 
 svx/source/items/e3ditem.cxx   |   
 1 
 svx/source/sdr/primitive2d/sdrattributecreator.cxx |   
 2 
 svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx   |   
 2 
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx   |   
 1 
 svx/source/sdr/properties/customshapeproperties.cxx|   
 2 
 svx/source/sidebar/effect/EffectPropertyPanel.cxx  |   
 2 
 svx/source/sidebar/inspector/InspectorTextPanel.cxx|   
 1 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx|   
 2 
 svx/source/sidebar/text/TextPropertyPanel.cxx  |   
 2 
 svx/source/svdraw/svdattr.cxx  |   
 5 -
 svx/source/svdraw/svdedtv2.cxx |   
 2 
 svx/source/svdraw/svdotextdecomposition.cxx|   
 1 
 svx/source/svdraw/svdpdf.cxx   |   
 1 
 svx/source/tbxctrls/StylesPreviewWindow.cxx|   
 4 -
 svx/source/tbxctrls/colrctrl.cxx   |   
 1 
 svx/source/tbxctrls/fillctrl.cxx   |   
 1 
 svx/source/tbxctrls/lboxctrl.cxx   |   
 1 
 svx/source/tbxctrls/linemetricbox.hxx  |   
 2 
 svx/source/tbxctrls/linewidthctrl.cxx  |   
 1 
 svx/source/tbxctrls/tbcontrl.cxx   |   
 1 
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx |   
 1 
 svx/source/unodraw/unopage.cxx

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

[Stephan Bergmann (via logerrit)]

 embeddedobj/source/msole/olecomponent.cxx |3 +--
 embeddedobj/source/msole/olecomponent.hxx |2 +-
 embeddedobj/source/msole/oleembed.cxx |2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c638985dd3a63cdf76b2af67cd890f656a9c38eb
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:50:15 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 11:27:00 2020 +0100

Remove unused OleComponent::SetHostName aContName parameter

Unused ever since the code was introduced in
5ea5c0afebd272d5f44e6524c0f67b5317639919 "#112923# embedded object for MS 
OLE".
(The accompanying

  // TODO: use aContName and aEmbDocName in m_pOleObject->SetHostNames()

comment was removed when a307ad7ae029a0a62404996a63954e7026001ce3 "OLE: show
title of parent document in MSO" started to use the aEmbDocName parameter, 
which
had previously been unused too.)

Change-Id: I0fbb20dbf526a3fdbdc4a3e76e64fa80e8460480
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106571
Reviewed-by: Szymon Kłos 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index ea5bb265aa2c..4a123d5ca0ab 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1079,8 +1079,7 @@ void OleComponent::ExecuteVerb( sal_Int32 nVerbID )
 }
 
 
-void OleComponent::SetHostName( const OUString&,
-const OUString& aEmbDocName )
+void OleComponent::SetHostName( const OUString& aEmbDocName )
 {
 if ( !m_pNativeImpl->m_pOleObject )
 throw embed::WrongStateException(); // TODO: the object is in wrong 
state
diff --git a/embeddedobj/source/msole/olecomponent.hxx 
b/embeddedobj/source/msole/olecomponent.hxx
index 7cfcce4fd13a..3ff53291c01f 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -112,7 +112,7 @@ public:
 css::uno::Sequence< css::embed::VerbDescriptor > GetVerbList();
 
 void ExecuteVerb( sal_Int32 nVerbID );
-void SetHostName( const OUString& aContName, const OUString& aEmbDocName );
+void SetHostName( const OUString& aEmbDocName );
 void SetExtent( const css::awt::Size& aVisAreaSize, sal_Int64 nAspect );
 
 css::awt::Size GetExtent( sal_Int64 nAspect );
diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index b22ece2f7cea..91b19bcdd78c 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -875,7 +875,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
 
 
 m_pOleComponent->ExecuteVerb( nVerbID );
-m_pOleComponent->SetHostName( OUString(), m_aContainerName );
+m_pOleComponent->SetHostName( m_aContainerName );
 
 //  the STAMPIT related solution =
 bool bModifiedOnExecution = 
m_aVerbExecutionController.EndControlExecution_WasModified();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/qa/core/undo/data/textbox-cut-undo.docx |binary
 sw/qa/core/undo/undo.cxx   |   34 +
 sw/source/core/undo/undobj1.cxx|7 +
 3 files changed, 41 insertions(+)

New commits:
commit bce74af0eb8b9fff8c9b6b99c4a314d98f626570
Author: Miklos Vajna 
AuthorDate: Mon Nov 23 21:02:44 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Nov 25 11:21:26 2020 +0100

tdf#138253 sw textbox: fix content of draw format on undo

Regression from commit da4f9b77a6cd39b1ae5babdd476d1575c8b9371c
(tdf#135149 sw: fix deleting textbox of as-char shapes, 2020-09-07), the
crash was caused by a user-after-free triggered from the X11 clipboard
code. This could happen beause the clipboard document had a draw frame
format, which has an SwNode pointer, but the SwNode instance was outside
that clipboard document, and the owning document is already gone. So by
the time the clipboard document would be deleted, the SwNodeIndex can't
de-register itself.

The root cause was that the doc model was corrupted after a cut of a
textbox + undo: the textbox pointers of the fly/draw formats were OK,
but not the SwFormatContent of the draw format.

(cherry picked from commit 42e8e16cf93dcf944e5c1106f76aaa32057c0397)

Conflicts:
sw/source/core/layout/atrfrm.cxx

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

diff --git a/sw/qa/core/undo/data/textbox-cut-undo.docx 
b/sw/qa/core/undo/data/textbox-cut-undo.docx
new file mode 100644
index ..35f0e857173e
Binary files /dev/null and b/sw/qa/core/undo/data/textbox-cut-undo.docx differ
diff --git a/sw/qa/core/undo/undo.cxx b/sw/qa/core/undo/undo.cxx
index aeacffc78e9b..e43d154f3a66 100644
--- a/sw/qa/core/undo/undo.cxx
+++ b/sw/qa/core/undo/undo.cxx
@@ -10,11 +10,17 @@
 #include 
 
 #include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 char const DATA_DIRECTORY[] = "/sw/qa/core/undo/data/";
 
@@ -50,6 +56,34 @@ CPPUNIT_TEST_FIXTURE(SwCoreUndoTest, testTextboxCutSave)
 xStorable->storeToURL(maTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreUndoTest, testTextboxCutUndo)
+{
+load(DATA_DIRECTORY, "textbox-cut-undo.docx");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwDocShell* pDocShell = pTextDoc->GetDocShell();
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+SwDoc* pDoc = pDocShell->GetDoc();
+SwView* pView = pDoc->GetDocShell()->GetView();
+
+pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, 
SfxCallMode::SYNCHRON);
+pView->StopShellTimer();
+rtl::Reference pTransfer = new SwTransferable(*pWrtShell);
+pTransfer->Cut();
+SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(0), rSpzFrameFormats.size());
+
+pWrtShell->Undo();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), rSpzFrameFormats.size());
+
+const SwNodeIndex* pIndex1 = 
rSpzFrameFormats[0]->GetContent().GetContentIdx();
+const SwNodeIndex* pIndex2 = 
rSpzFrameFormats[1]->GetContent().GetContentIdx();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 5
+// - Actual  : 8
+// i.e. the draw frame format had a wrong node index in its content.
+CPPUNIT_ASSERT_EQUAL(pIndex1->GetIndex(), pIndex2->GetIndex());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 0f969713862a..2398ea8dad09 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -130,6 +130,13 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & 
rContext, bool bShowSelFrame)
 pSdrObject->setUnoShape(nullptr);
 }
 }
+if (m_pFrameFormat->Which() == RES_DRAWFRMFMT)
+{
+// This is a draw format and we just set the fly format's textbox 
pointer to this draw
+// format.  Sync the draw format's content with the fly format's 
content.
+SwFrameFormat* pFlyFormat = 
m_pFrameFormat->GetOtherTextBoxFormat();
+m_pFrameFormat->SetFormatAttr(pFlyFormat->GetContent());
+}
 }
 
 m_pFrameFormat->MakeFrames();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Ayhan Yalçınsoy (via logerrit)]

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

New commits:
commit 6b8d498576a51a56b4e0961d92a50ebf0337efff
Author: Ayhan Yalçınsoy 
AuthorDate: Wed Nov 25 11:04:14 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 11:04:14 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7b4dc63ec204f64a80f181ba1ff005a78791f60c
  - tdf#138203: removed '...' characters from the menu etnires on help page

Change-Id: Ie699ceb22cf0f83a8df08eb66e5414e5ac5cda82
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106519
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index cc9d63e60d84..7b4dc63ec204 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cc9d63e60d848b0560778b4de098581923bbc6a2
+Subproject commit 7b4dc63ec204f64a80f181ba1ff005a78791f60c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ayhan Yalçınsoy (via logerrit)]

 source/text/sdraw/main_format.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7b4dc63ec204f64a80f181ba1ff005a78791f60c
Author: Ayhan Yalçınsoy 
AuthorDate: Wed Nov 25 10:46:32 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Nov 25 11:04:14 2020 +0100

tdf#138203: removed '...' characters from the menu etnires on help page

Change-Id: Ie699ceb22cf0f83a8df08eb66e5414e5ac5cda82
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106519
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sdraw/main_format.xhp 
b/source/text/sdraw/main_format.xhp
index c0b4bca05..cb14055b6 100644
--- a/source/text/sdraw/main_format.xhp
+++ b/source/text/sdraw/main_format.xhp
@@ -49,7 +49,7 @@
 
 Area
 
-Text 
Attributes...
+Text 
Attributes
 
 Layer
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 sw/source/core/doc/docredln.cxx |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 56e7c74b2994ead8b1f376b65549ad8a623018cd
Author: Jan Holesovsky 
AuthorDate: Tue Nov 24 15:34:55 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Wed Nov 25 11:02:35 2020 +0100

lok: Don't even iterate through the redlines when they are disabled.

It is not necessary, when we are not issuing any output anyway.

Change-Id: Id952549befb1bef04a2dd9237d286922939eaae2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106509
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 8f44a939ad09d0365607ae8960e2abfe77e3fe72)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106517
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index ab57f1bb6b50..8a0f8d4b3597 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -341,14 +341,22 @@ void lcl_LOKInvalidateStartEndFrames(SwShellCursor& 
rCursor)
 FRM_CNTNT, &rCursor.GetEndPos());
 }
 
+bool lcl_LOKRedlineNotificationEnabled()
+{
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (comphelper::LibreOfficeKit::isActive() && !bDisableRedlineComments)
+return true;
+
+return false;
+}
+
 } // anonymous namespace
 
 /// Emits LOK notification about one addition / removal of a redline item.
 void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, 
SwRangeRedline* pRedline)
 {
 // Disable since usability is very low beyond some small number of changes.
-static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
-if (!comphelper::LibreOfficeKit::isActive() || bDisableRedlineComments)
+if (!lcl_LOKRedlineNotificationEnabled())
 return;
 
 boost::property_tree::ptree aRedline;
@@ -1044,7 +1052,7 @@ SwRangeRedline::~SwRangeRedline()
 
 void MaybeNotifyRedlineModification(SwRangeRedline& rRedline, SwDoc& rDoc)
 {
-if (!comphelper::LibreOfficeKit::isActive())
+if (!lcl_LOKRedlineNotificationEnabled())
 return;
 
 const SwRedlineTable& rRedTable = 
rDoc.getIDocumentRedlineAccess().GetRedlineTable();
@@ -1060,7 +1068,7 @@ void MaybeNotifyRedlineModification(SwRangeRedline& 
rRedline, SwDoc& rDoc)
 
 void SwRangeRedline::MaybeNotifyRedlinePositionModification(tools::Long nTop)
 {
-if (!comphelper::LibreOfficeKit::isActive())
+if (!lcl_LOKRedlineNotificationEnabled())
 return;
 
 if(!m_oLOKLastNodeTop || *m_oLOKLastNodeTop != nTop)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5e4c771c0b89452ab55d1ab30dbb1634f15d3775
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:45:24 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 10:53:58 2020 +0100

loplugin:stringviewparam (clang-cl)

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

diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index de00d18a1930..1672a21c7868 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -36,6 +36,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -56,7 +57,7 @@ using ::com::sun::star::util::DateTime ;
 If the type name is not found then pair.first and pair.second are -1.
 */
 static std::pair< sal_Int32, sal_Int32 >
-findTypeInDN(const OUString& rRawString, const OUString& sTypeName)
+findTypeInDN(const OUString& rRawString, std::u16string_view sTypeName)
 {
 std::pair< sal_Int32, sal_Int32 > retVal;
 bool bInEscape = false;
@@ -160,7 +161,7 @@ findTypeInDN(const OUString& rRawString, const OUString& 
sTypeName)
 
 static OUString replaceTagSWithTagST(OUString const & oldDN)
 {
-std::pair pairIndex = findTypeInDN(oldDN, "S");
+std::pair pairIndex = findTypeInDN(oldDN, u"S");
 
 if (pairIndex.first != -1)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configmgr/source fpicker/source jvmfwk/plugins sc/qa xmlsecurity/source

[Stephan Bergmann (via logerrit)]

 configmgr/source/winreg.cxx   |2 +-
 fpicker/source/win32/VistaFilePickerImpl.cxx  |2 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx   |4 ++--
 sc/qa/unit/subsequent_export-test.cxx |3 ++-
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e8227dc4af54c39e871b12f2e846fa54cff11581
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:41:33 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 10:53:32 2020 +0100

loplugin:stringview (clang-cl)

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

diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index 6e4690500996..e5a92d094435 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -226,7 +226,7 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString const & 
aKeyName, TempFile &aFil
 if(nCommandSeparator != -1)
 {
 OUString aNodeOp = 
aNextPathPart.copy(nCommandSeparator + 1);
-writeAttributeValue(aFileHandle, 
aNextPathPart.copy(0, nCommandSeparator - 1));
+writeAttributeValue(aFileHandle, 
aNextPathPart.subView(0, nCommandSeparator - 1));
 aFileHandle.writeString("\" oor:op=\"");
 writeAttributeValue(aFileHandle, aNodeOp);
 }
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index d6e10115ac82..7d3b4d014450 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -996,7 +996,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const 
RequestRef& rRequest)
 {
 const sal_Int32 idx = sFilter.indexOf('.');
 if (idx >= 0)
-aFileURL += sFilter.copy(idx);
+aFileURL += sFilter.subView(idx);
 }
 }
 }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index f47b0a3ee4fd..94affa946402 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -482,7 +482,7 @@ static void load_msvcr(OUString const & jvm_dll, 
std::u16string_view msvcr)
 }
 
 if (LoadLibraryW(
-o3tl::toW(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr(
+o3tl::toW(OUString(OUString::Concat(jvm_dll.subView(0, slash+1)) + 
msvcr).getStr(
 return;
 
 // Then check if msvcr71.dll is in the parent folder of where
@@ -494,7 +494,7 @@ static void load_msvcr(OUString const & jvm_dll, 
std::u16string_view msvcr)
 return;
 
 (void)LoadLibraryW(
-o3tl::toW(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr()));
+o3tl::toW(OUString(OUString::Concat(jvm_dll.subView(0, slash+1)) + 
msvcr).getStr()));
 }
 
 // Check if the jvm DLL imports msvcr71.dll, and in that case try
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 36d85d8f2343..02b51df285d5 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3520,7 +3520,8 @@ void ScExportTest::testSupBookVirtualPathXLS()
 
 OUString aFormula = toString(rDoc, aPos, *pCode, rDoc.GetGrammar());
 #ifdef _WIN32
-aFormula = aFormula.copy(0, 9) + aFormula.copy(12); // strip drive letter, 
e.g. 'C:/'
+aFormula = OUString::Concat(aFormula.subView(0, 9)) + aFormula.subView(12);
+// strip drive letter, e.g. 'C:/'
 #endif
 OUString aExpectedFormula = 
"'file:///home/timar/Documents/external.xls'#$Sheet1.A1";
 if (aFormula != aExpectedFormula)
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 0e619b2802f8..de00d18a1930 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -164,7 +164,8 @@ static OUString replaceTagSWithTagST(OUString const & oldDN)
 
 if (pairIndex.first != -1)
 {
-return oldDN.copy(0, 
pairIndex.first)+"ST"+oldDN.copy(pairIndex.second);
+return OUString::Concat(oldDN.subView(0, pairIndex.first))+"ST"
++oldDN.subView(pairIndex.second);
 }
 return oldDN;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

[Stephan Bergmann (via logerrit)]

 shell/source/unix/exec/shellexec.cxx |4 
 shell/source/win32/SysShExec.cxx |3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 696739056f37430154d6333b8f7228d1c44d09b3
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:13:12 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 10:51:36 2020 +0100

Better handling of Java files

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

diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 7d4e9cb36fb6..bbd614a66355 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -136,6 +136,10 @@ void SAL_CALL ShellExec::execute( const OUString& 
aCommand, const OUString& aPar
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + aCommand 
+ ">", {}, 0);
+} else if (pathname.endsWithIgnoreAsciiCase(".class")
+   || pathname.endsWithIgnoreAsciiCase(".jar"))
+{
+dir = true;
 }
 }
 
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 4cf00a70e3ed..660729339521 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -336,7 +336,8 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
 }
 if (!(checkExtension(ext, env)
   && checkExtension(
-  ext, 
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY")))
+  ext,
+  
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.CLASS;.JAR")))
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + 
aCommand + ">", {}, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thomas Viehmann (via logerrit)]

 vcl/inc/unx/gtk/gtksalmenu.hxx  |2 +-
 vcl/unx/gtk3/gtk3gtksalmenu.cxx |   22 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit cbc18cc904c652a936c4b68fba4d975bd89b5abd
Author: Thomas Viehmann 
AuthorDate: Mon Nov 23 21:03:28 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Nov 25 10:50:07 2020 +0100

tdf#138425 vcl/gtk activate main menu in UpdateFull

VCL GTK (in contrast to X11 and apparently Windows) pre-activates popup
menus in GtkSalMenu::UpdateFull by calling GtkSalMenu::ActivateAllSubmenus.
Before this patch, this, called on the main menu, would not activate
the main menu itself (which does get activated in X11 eventually).
This patch changes the logic to also activate the main menu.

This patch deals only with gtk3. A followup patch would do the analogous
change in the VCL Qt5 plugin in Qt5Menu::DoFullMenuUpdate.

I haven't discovered yet where this type of functionality is currently
tested, so sadly I don't have an idea how to test this and so didn't include
a test case.

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

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d9aa403de9bd..d4857fe7e87a 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -112,7 +112,7 @@ public:
 boolPrepUpdate();
 virtual voidUpdate() override;  // Update this menu only.
 // Update full menu hierarchy from this menu.
-voidUpdateFull () { 
ActivateAllSubmenus(mpVCLMenu); Update(); }
+voidUpdateFull () { 
ActivateAllSubmenus(mpVCLMenu); }
 // Clear ActionGroup and MenuModel from full menu hierarchy
 voidClearActionGroupAndMenuModel();
 GtkSalMenu* GetTopLevel();
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 195e8ce071d2..72ad6e40d6bd 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1205,23 +1205,23 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
 
 void GtkSalMenu::ActivateAllSubmenus(Menu* pMenuBar)
 {
-for (GtkSalMenuItem* pSalItem : maItems)
+// We can re-enter this method via the new event loop that gets created
+// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so use the 
InActivateCallback
+// flag to detect that and skip some startup work.
+if (!mbInActivateCallback)
 {
-if ( pSalItem->mpSubMenu != nullptr )
+mbInActivateCallback = true;
+pMenuBar->HandleMenuActivateEvent(GetMenu());
+mbInActivateCallback = false;
+for (GtkSalMenuItem* pSalItem : maItems)
 {
-// We can re-enter this method via the new event loop that gets 
created
-// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so 
use the InActivateCallback
-// flag to detect that and skip some startup work.
-if (!pSalItem->mpSubMenu->mbInActivateCallback)
+if ( pSalItem->mpSubMenu != nullptr )
 {
-pSalItem->mpSubMenu->mbInActivateCallback = true;
-
pMenuBar->HandleMenuActivateEvent(pSalItem->mpSubMenu->GetMenu());
-pSalItem->mpSubMenu->mbInActivateCallback = false;
 pSalItem->mpSubMenu->ActivateAllSubmenus(pMenuBar);
-pSalItem->mpSubMenu->Update();
-
pMenuBar->HandleMenuDeActivateEvent(pSalItem->mpSubMenu->GetMenu());
 }
 }
+Update();
+pMenuBar->HandleMenuDeActivateEvent(GetMenu());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[diwanshu885 (via logerrit)]

 framework/source/uielement/toolbarmanager.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2f13fcb67269f99b890f5bb4c63117805e375692
Author: diwanshu885 
AuthorDate: Tue Nov 24 11:49:17 2020 +0530
Commit: Heiko Tietze 
CommitDate: Wed Nov 25 10:35:49 2020 +0100

tdf#131441 Disable "UNDOCKTOOLBAR" when toolbar is locked

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

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 2dceb5bb1116..9515dad96cdf 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1538,7 +1538,10 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox const 
* pToolBar)
 pMenu->EnableItem(MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false);
 Reference< XDockableWindow > xDockable( 
VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
 if( xDockable.is() )
+{
 pMenu->CheckItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, 
xDockable->isLocked());
+pMenu->EnableItem(MENUITEM_TOOLBAR_UNDOCKTOOLBAR, 
!xDockable->isLocked());
+}
 }
 else
 pMenu->EnableItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 xmloff/source/text/XMLTextListBlockContext.cxx |   19 +++---
 xmloff/source/text/XMLTextListBlockContext.hxx |6 ++--
 xmloff/source/text/XMLTextListItemContext.cxx  |   32 -
 xmloff/source/text/XMLTextListItemContext.hxx  |4 ---
 4 files changed, 24 insertions(+), 37 deletions(-)

New commits:
commit 6993d5d0f1079fe720a7da004b70b57361c99fc6
Author: Noel Grandin 
AuthorDate: Tue Nov 24 20:45:40 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 25 10:15:10 2020 +0100

fastparser in XMLTextListBlockContext

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

diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx 
b/xmloff/source/text/XMLTextListBlockContext.cxx
index 3fcdca9d25a9..57065a923a0c 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
@@ -247,26 +248,24 @@ void XMLTextListBlockContext::endFastElement(sal_Int32 )
 mrTxtImport.GetTextListHelper().SetListItem( nullptr );
 }
 
-SvXMLImportContextRef XMLTextListBlockContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const Reference< xml::sax::XAttributeList > & xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLTextListBlockContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
 SvXMLImportContext *pContext = nullptr;
 
-const SvXMLTokenMap& rTokenMap =
-mrTxtImport.GetTextListBlockElemTokenMap();
 bool bHeader = false;
-switch( rTokenMap.Get( nPrefix, rLocalName ) )
+switch( nElement )
 {
-case XML_TOK_TEXT_LIST_HEADER:
+case XML_ELEMENT(TEXT, XML_LIST_HEADER):
 bHeader = true;
 [[fallthrough]];
-case XML_TOK_TEXT_LIST_ITEM:
+case XML_ELEMENT(TEXT, XML_LIST_ITEM):
 pContext = new XMLTextListItemContext( GetImport(), mrTxtImport,
-nPrefix, rLocalName,
   xAttrList, bHeader );
 break;
+default:
+XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
 }
 
 
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx 
b/xmloff/source/text/XMLTextListBlockContext.hxx
index c5c0182997c1..c26ef5a6ccba 100644
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.hxx
@@ -60,9 +60,9 @@ public:
 
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
-SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & 
xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 
 sal_Int16 GetLevel() const { return mnLevel; }
 bool IsRestartNumbering() const { return mbRestartNumbering; }
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx 
b/xmloff/source/text/XMLTextListItemContext.cxx
index 7f7886648e16..f11744d2de9a 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include "XMLTextListItemContext.hxx"
+#include 
 
 
 using namespace ::com::sun::star;
@@ -41,37 +42,25 @@ using namespace ::xmloff::token;
 XMLTextListItemContext::XMLTextListItemContext(
 SvXMLImport& rImport,
 XMLTextImportHelper& rTxtImp,
-const sal_uInt16 nPrfx,
-const OUString& rLName,
-const Reference< xml::sax::XAttributeList > & 
xAttrList,
+const Reference< xml::sax::XFastAttributeList > & 
xAttrList,
 const bool bIsHeader )
-: SvXMLImportContext( rImport, nPrfx, rLName ),
+: SvXMLImportContext( rImport ),
   rTxtImport( rTxtImp ),
   nStartValue( -1 ),
   mnSubListCount( 0 ),
   mxNumRulesOverride()
 {
-sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-for( sal_Int16 i=0; i < nAttrCount; i++ )
+for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
 {
-const OUString& rAttrName = xAttrList->getNameByIndex( i );
-const OUString& rValue = xAttrList->getValueByIndex( i );
-
-OUString aLocalName;
-sal_uInt16 nPrefix =
-GetImport().GetNamespaceMap().GetKeyByAttrName( 

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

[Noel Grandin (via logerrit)]

 xmloff/source/text/XMLIndexBibliographyEntryContext.cxx |7 +--
 xmloff/source/text/XMLIndexBibliographyEntryContext.hxx |4 --
 xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx  |4 --
 xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx  |2 -
 xmloff/source/text/XMLIndexSimpleEntryContext.cxx   |6 +--
 xmloff/source/text/XMLIndexSimpleEntryContext.hxx   |4 --
 xmloff/source/text/XMLIndexSpanEntryContext.cxx |6 +--
 xmloff/source/text/XMLIndexSpanEntryContext.hxx |4 --
 xmloff/source/text/XMLIndexTabStopEntryContext.cxx  |6 +--
 xmloff/source/text/XMLIndexTabStopEntryContext.hxx  |4 --
 xmloff/source/text/XMLIndexTemplateContext.cxx  |   31 ++--
 xmloff/source/text/XMLIndexTemplateContext.hxx  |7 +--
 12 files changed, 29 insertions(+), 56 deletions(-)

New commits:
commit b3dd7ebdab8015735dd07afdf518500bbc69a1b3
Author: Noel Grandin 
AuthorDate: Tue Nov 24 20:33:25 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 25 10:14:50 2020 +0100

fastparser in XMLIndexTemplateContext

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

diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx 
b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index 343b86dcded3..af5886fe559d 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -40,13 +40,10 @@ using ::com::sun::star::xml::sax::XAttributeList;
 
 XMLIndexBibliographyEntryContext::XMLIndexBibliographyEntryContext(
 SvXMLImport& rImport,
-XMLIndexTemplateContext& rTemplate,
-sal_uInt16 nPrfx,
-const OUString& rLocalName ) :
+XMLIndexTemplateContext& rTemplate ) :
 XMLIndexSimpleEntryContext(rImport,
"TokenBibliographyDataField",
-   rTemplate,
-   nPrfx, rLocalName),
+   rTemplate),
 nBibliographyInfo(BibliographyDataField::IDENTIFIER),
 bBibliographyInfoOK(false)
 {
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx 
b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
index f364fe4e657e..97546c0759dd 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
@@ -48,9 +48,7 @@ public:
 
 XMLIndexBibliographyEntryContext(
 SvXMLImport& rImport,
-XMLIndexTemplateContext& rTemplate,
-sal_uInt16 nPrfx,
-const OUString& rLocalName );
+XMLIndexTemplateContext& rTemplate );
 
 virtual ~XMLIndexBibliographyEntryContext() override;
 
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx 
b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index 50233bd18ae0..d394a78add77 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -45,13 +45,11 @@ using ::com::sun::star::xml::sax::XAttributeList;
 XMLIndexChapterInfoEntryContext::XMLIndexChapterInfoEntryContext(
 SvXMLImport& rImport,
 XMLIndexTemplateContext& rTemplate,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
 bool bT ) :
 XMLIndexSimpleEntryContext(rImport,
(bT ? OUString("TokenEntryNumber")
: OUString("TokenChapterInfo")),
-   rTemplate, nPrfx, rLocalName),
+   rTemplate),
 nChapterInfo(ChapterFormat::NAME_NUMBER),
 bChapterInfoOK(false),
 bTOC( bT ),
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx 
b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index 34d750347c33..13608a3b6009 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
@@ -49,8 +49,6 @@ public:
 XMLIndexChapterInfoEntryContext(
 SvXMLImport& rImport,
 XMLIndexTemplateContext& rTemplate,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
 bool bTOC );
 
 virtual ~XMLIndexChapterInfoEntryContext() override;
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx 
b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index 51f68b5f54d3..1317331ade71 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -41,10 +41,8 @@ using ::xmloff::token::XML_STYLE_NAME;
 XMLIndexSimpleEntryContext::XMLIndexSimpleEntryContext(
 SvXMLImport& rImport,
 const OUString& rEntry,
-XMLIndexTemplateContext& rTemplate,
-sal_uInt16 nPrfx,
-const OUString& rLocalName )
-:   SvXMLImportContext(rImport, nPr

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

[Caolán McNamara (via logerrit)]

 sfx2/uiconfig/ui/tabbarcontents.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 810bb0a96afcc2764ffc62c419343e464a85013a
Author: Caolán McNamara 
AuthorDate: Tue Nov 24 15:46:49 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 25 09:55:25 2020 +0100

center the button for narrower Colibre theme icon

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

diff --git a/sfx2/uiconfig/ui/tabbarcontents.ui 
b/sfx2/uiconfig/ui/tabbarcontents.ui
index 080ee8b83e53..ba2822692be4 100644
--- a/sfx2/uiconfig/ui/tabbarcontents.ui
+++ b/sfx2/uiconfig/ui/tabbarcontents.ui
@@ -92,6 +92,7 @@
 True
 Sidebar Settings
 center
+center
 3
 image6
 none
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/control/ivctrl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 21a0d9db670364e841e06692d3863e4e217f70a0
Author: Caolán McNamara 
AuthorDate: Thu Nov 12 14:46:03 2020 +
Commit: Miklos Vajna 
CommitDate: Wed Nov 25 09:35:53 2020 +0100

tdf#131970 enable tab-cycling between VerticalTabControl members

Related: tdf#131970 icon-switcher should be in single-selection mode

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

diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index 82e2bbc0c08b..b995ddfded5c 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -447,7 +447,9 @@ VerticalTabControl::VerticalTabControl(vcl::Window* pParent)
  WB_ALIGN_LEFT | 
WB_NOHSCROLL))
 , m_xBox(VclPtr::Create(this))
 {
+SetStyle(GetStyle() | WB_DIALOGCONTROL);
 SetType(WindowType::VERTICALTABCONTROL);
+m_xChooser->SetSelectionMode(SelectionMode::Single);
 m_xChooser->SetClickHdl(LINK(this, VerticalTabControl, ChosePageHdl_Impl));
 m_xChooser->set_width_request(110);
 m_xChooser->set_height_request(400);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung (via logerrit)]

 sw/qa/extras/rtfexport/data/tdf137894.odt   |binary
 sw/qa/extras/rtfexport/rtfexport5.cxx   |   16 ++
 sw/source/filter/ww8/rtfattributeoutput.cxx |  138 
 sw/source/filter/ww8/rtfattributeoutput.hxx |6 -
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |4 
 5 files changed, 95 insertions(+), 69 deletions(-)

New commits:
commit f97af19460fbd7483a0e1c1d0137e814f5390e69
Author: Mark Hung 
AuthorDate: Sun Nov 22 19:32:32 2020 +0800
Commit: Miklos Vajna 
CommitDate: Wed Nov 25 09:20:27 2020 +0100

tdf#137894 separate associated character properties

in ww8filter/RtfAttributeOutput and treat \dbch as
CJK and \hich Western in order to roundtrip the
RTF document.

ww8filter mix all the associated style, including
properties for CJK and CTL scripts.

Both RtfAttributeOutput::CharFontCJK and
RtfAttributeOutput::CharFontCTL output \dbch,
that result in incorrect assocation.

CharFontCTL should use \rtlch, but it was already in
RtfAttributeOutput::MoveCharacterProperties.

To make the order correct, I separate the
associated character properties that were
stored in m_aSyltesAssoc into m_aSyltesAssocRtlch,
and m_aSyltesAssocDbch by their script types.

Note that it is not clear what associated character
properties that we should adopt for \hich and \ltrch.

In theory RTL scripts can output high ANSI chars too,
so \hich may get properties from either Western or
CTL scripts. However, examining Hebrew RTF documents,
I didn't see any sign that \hich is used in that way.

Use RTL as CTL might be a problem for Mongolian,
Manchu and Xibe. They are CTL but top-to-bottom (aka LTR)
. But I don't think they will be expressed
as high ANSI chars either.

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

diff --git a/sw/qa/extras/rtfexport/data/tdf137894.odt 
b/sw/qa/extras/rtfexport/data/tdf137894.odt
new file mode 100755
index ..79c7eb178a7f
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/tdf137894.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx 
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index a48adfa653cd..0d921ed6c7b6 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -1260,6 +1260,22 @@ DECLARE_RTFEXPORT_TEST(testTdf138210, "tdf138210.rtf")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf137894, "tdf137894.odt")
+{
+lang::Locale locale1(getProperty(getRun(getParagraph(1), 1), 
"CharLocaleAsian"));
+CPPUNIT_ASSERT_EQUAL(OUString("ja"), locale1.Language);
+CPPUNIT_ASSERT_EQUAL(OUString("MS UI Gothic"),
+ getProperty(getRun(getParagraph(1), 1), 
"CharFontNameAsian"));
+CPPUNIT_ASSERT_EQUAL(20.f, getProperty(getRun(getParagraph(1), 1), 
"CharHeightAsian"));
+CPPUNIT_ASSERT_EQUAL(OUString("Mangal"),
+ getProperty(getRun(getParagraph(1), 1), 
"CharFontNameComplex"));
+CPPUNIT_ASSERT_EQUAL(20.f, getProperty(getRun(getParagraph(1), 1), 
"CharHeightComplex"));
+lang::Locale locale2(
+getProperty(getRun(getParagraph(2), 1), 
"CharLocaleComplex"));
+CPPUNIT_ASSERT_EQUAL(OUString("he"), locale2.Language);
+CPPUNIT_ASSERT_EQUAL(32.f, getProperty(getRun(getParagraph(2), 1), 
"CharHeightComplex"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9e76b3d3fd48..23dc3af728e2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -423,49 +423,58 @@ void RtfAttributeOutput::EndRunProperties(const 
SwRedlineData* /*pRedlineData*/)
 
 OString RtfAttributeOutput::MoveCharacterProperties(bool aAutoWriteRtlLtr)
 {
-const OString aAssoc = m_aStylesAssoc.makeStringAndClear();
+const OString aAssocHich = m_aStylesAssocHich.makeStringAndClear();
+const OString aAssocDbch = m_aStylesAssocDbch.makeStringAndClear();
+const OString aAssocRtlch = m_aStylesAssocRtlch.makeStringAndClear();
+const OString aAssocLtrch = m_aStylesAssocLtrch.makeStringAndClear();
 const OString aNormal = m_aStyles.makeStringAndClear();
 OStringBuffer aBuf;
 
 if (aAutoWriteRtlLtr && !m_bControlLtrRtl)
 {
-m_bControlLtrRtl = !aAssoc.isEmpty();
+m_bControlLtrRtl = !aAssocRtlch.isEmpty();
 m_bIsRTL = false;
 m_nScript = i18n::ScriptType::LATIN;
 }
 
-if (m_bControlLtrRtl)
+if (m_bIsRTL)
 {
-m_bControlLtrRtl = false;
-
-/*
-   You would have thought that
-   m_rExport.Strm() << (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : 
OOO_STRING

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

[Miklos Vajna (via logerrit)]

 sfx2/source/view/viewsh.cxx |   14 -
 sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |   33 
 sw/source/uibase/docvw/edtwin2.cxx  |   11 
 4 files changed, 56 insertions(+), 2 deletions(-)

New commits:
commit 2d18f5e3fb0ea44b538db9ccea3c87a16693e6b2
Author: Miklos Vajna 
AuthorDate: Tue Nov 24 17:26:32 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Nov 25 09:13:35 2020 +0100

sw tiled rendering: fix paint->invalidation loop when paint is started by 
vcl

SwViewShell::PaintTile() already calls
comphelper::LibreOfficeKit::setTiledPainting(), so by the time it would
rearch SwViewShell::Paint(), callbacks (e.g. invalidations) are ignored
during paint.

Do the same for SwEditWin::Paint(), where we processed invalidations
during paint, potentially leading to paint->invalidation loops.

Conflicts:
sw/qa/extras/tiledrendering/tiledrendering.cxx
sw/source/uibase/docvw/edtwin2.cxx

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

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 14cbd2c10a08..d7790fcdb6f5 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1474,8 +1474,18 @@ void SfxViewShell::libreOfficeKitViewCallback(int nType, 
const char* pPayload) c
 if (!comphelper::LibreOfficeKit::isActive())
 return;
 
-if (comphelper::LibreOfficeKit::isTiledPainting() && nType != 
LOK_CALLBACK_FORM_FIELD_BUTTON)
-return;
+if (comphelper::LibreOfficeKit::isTiledPainting())
+{
+switch (nType)
+{
+case LOK_CALLBACK_FORM_FIELD_BUTTON:
+case LOK_CALLBACK_TEXT_SELECTION:
+break;
+default:
+// Reject e.g. invalidate during paint.
+return;
+}
+}
 
 if (pImpl->m_bTiledSearching)
 {
diff --git a/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt 
b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt
new file mode 100644
index ..b42c5cc51588
Binary files /dev/null and 
b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 1f48de38d086..2f52c97efec1 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -131,6 +131,7 @@ public:
 void testDropDownFormFieldButtonNoSelection();
 void testDropDownFormFieldButtonNoItem();
 void testSpellOnlineRenderParameter();
+void testTablePaintInvalidate();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -200,6 +201,7 @@ public:
 CPPUNIT_TEST(testDropDownFormFieldButtonNoSelection);
 CPPUNIT_TEST(testDropDownFormFieldButtonNoItem);
 CPPUNIT_TEST(testSpellOnlineRenderParameter);
+CPPUNIT_TEST(testTablePaintInvalidate);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2760,6 +2762,37 @@ void 
SwTiledRenderingTest::testSpellOnlineRenderParameter()
 CPPUNIT_ASSERT_EQUAL(!bSet, pOpt->IsOnlineSpell());
 }
 
+void SwTiledRenderingTest::testTablePaintInvalidate()
+{
+// Load a document with a table in it.
+SwXTextDocument* pXTextDocument = createDoc("table-paint-invalidate.odt");
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+
pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback,
 this);
+// Enter the table.
+pWrtShell->Down(/*bSelect=*/false);
+Scheduler::ProcessEventsToIdle();
+m_nInvalidations = 0;
+
+// Paint a tile.
+size_t nCanvasWidth = 256;
+size_t nCanvasHeight = 256;
+std::vector aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
+ScopedVclPtrInstance pDevice(DeviceFormat::DEFAULT);
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, 
nCanvasHeight),
+Fraction(1.0), Point(), 
aPixmap.data());
+pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, 
m_aInvalidation.getX(),
+  m_aInvalidation.getY(), /*nTileWidth=*/1000,
+  /*nTileHeight=*/1000);
+Scheduler::ProcessEventsToIdle();
+
+// Without the accompanying fix in place, this test would have failed with
+// - Expected: 0
+// - Actual  : 5
+// i.e. paint generated an invalidation, which caused a loop.
+CPPUNIT_ASSERT_EQUAL(0, m_nInvalidations);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/uibase/d

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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx |4 ++
 vcl/source/pdf/PDFiumLibrary.cxx |   41 +++
 xmlsecurity/source/helper/pdfsignaturehelper.cxx |   27 +++
 3 files changed, 52 insertions(+), 20 deletions(-)

New commits:
commit 2c9f4c6a5e1a9ce5ef501c8f5a7f5cd421bf86f7
Author: Miklos Vajna 
AuthorDate: Tue Nov 24 21:03:59 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Nov 25 09:13:12 2020 +0100

pdfium: add sig getters: ByteRange, DocMDPPermission, Contents and SubFilter

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

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 8d139889591a..e14c855780b7 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -242,6 +242,10 @@ public:
 PDFiumSignature(FPDF_SIGNATURE pSignature);
 
 FPDF_SIGNATURE getPointer() { return mpSignature; }
+std::vector getByteRange();
+int getDocMDPPermission();
+std::vector getContents();
+OString getSubFilter();
 };
 
 class VCL_DLLPUBLIC PDFiumDocument final
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 3e9ae64dc950..a1d618e33105 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -196,6 +196,47 @@ PDFiumSignature::PDFiumSignature(FPDF_SIGNATURE pSignature)
 {
 }
 
+std::vector PDFiumSignature::getByteRange()
+{
+int nByteRangeLen = FPDFSignatureObj_GetByteRange(mpSignature, nullptr, 0);
+std::vector aByteRange(nByteRangeLen);
+if (nByteRangeLen <= 0)
+{
+return aByteRange;
+}
+
+FPDFSignatureObj_GetByteRange(mpSignature, aByteRange.data(), 
aByteRange.size());
+return aByteRange;
+}
+
+int PDFiumSignature::getDocMDPPermission()
+{
+return FPDFSignatureObj_GetDocMDPPermission(mpSignature);
+}
+
+std::vector PDFiumSignature::getContents()
+{
+int nContentsLen = FPDFSignatureObj_GetContents(mpSignature, nullptr, 0);
+std::vector aContents(nContentsLen);
+if (aContents.empty())
+{
+return aContents;
+}
+
+FPDFSignatureObj_GetContents(mpSignature, aContents.data(), 
aContents.size());
+return aContents;
+}
+
+OString PDFiumSignature::getSubFilter()
+{
+int nSubFilterLen = FPDFSignatureObj_GetSubFilter(mpSignature, nullptr, 0);
+std::vector aSubFilterBuf(nSubFilterLen);
+FPDFSignatureObj_GetSubFilter(mpSignature, aSubFilterBuf.data(), 
aSubFilterBuf.size());
+// Buffer is NUL-terminated.
+OString aSubFilter(aSubFilterBuf.data(), aSubFilterBuf.size() - 1);
+return aSubFilter;
+}
+
 PDFiumDocument::PDFiumDocument(FPDF_DOCUMENT pPdfDocument)
 : mpPdfDocument(pPdfDocument)
 {
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx 
b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index a9ab7a84546c..062dba819adf 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -132,16 +132,13 @@ struct Signature
 void GetByteRangesFromPDF(std::unique_ptr& 
pSignature,
   std::vector>& rByteRanges)
 {
-int nByteRangeLen = 
FPDFSignatureObj_GetByteRange(pSignature->getPointer(), nullptr, 0);
-if (nByteRangeLen <= 0)
+std::vector aByteRange = pSignature->getByteRange();
+if (aByteRange.empty())
 {
 SAL_WARN("xmlsecurity.helper", "GetByteRangesFromPDF: no byte ranges");
 return;
 }
 
-std::vector aByteRange(nByteRangeLen);
-FPDFSignatureObj_GetByteRange(pSignature->getPointer(), aByteRange.data(), 
aByteRange.size());
-
 size_t nByteRangeOffset = 0;
 for (size_t i = 0; i < aByteRange.size(); ++i)
 {
@@ -183,7 +180,7 @@ int GetMDPPerm(const std::vector& rSignatures)
 
 for (const auto& rSignature : rSignatures)
 {
-int nPerm = 
FPDFSignatureObj_GetDocMDPPermission(rSignature.m_pSignature->getPointer());
+int nPerm = rSignature.m_pSignature->getDocMDPPermission();
 if (nPerm != 0)
 {
 return nPerm;
@@ -346,24 +343,14 @@ bool ValidateSignature(SvStream& rStream, const 
Signature& rSignature,
const std::set& rSignatureEOFs,
const std::vector& rTrailerEnds)
 {
-int nContentsLen
-= FPDFSignatureObj_GetContents(rSignature.m_pSignature->getPointer(), 
nullptr, 0);
-if (nContentsLen <= 0)
+std::vector aContents = 
rSignature.m_pSignature->getContents();
+if (aContents.empty())
 {
 SAL_WARN("xmlsecurity.helper", "ValidateSignature: no contents");
 return false;
 }
-std::vector aContents(nContentsLen);
-FPDFSignatureObj_GetContents(rSignature.m_pSignature->getPointer(), 
aContents.data(),
- aContents.size());
-
-int nSubFilterLen
-= FP

[Libreoffice-commits] core.git: helpcontent2

[Ayhan Yalçınsoy (via logerrit)]

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

New commits:
commit b22e2548a4ac7a4395b3e50b82f23a46cbd6104a
Author: Ayhan Yalçınsoy 
AuthorDate: Wed Nov 25 09:11:26 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Nov 25 09:11:26 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to cc9d63e60d848b0560778b4de098581923bbc6a2
  - tdf#138203: fixed identical menu on help pages

Change-Id: I97ded684de5025e2747f8b30a9ec4bb0e2278e29
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106439
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index bb3b17ed7577..cc9d63e60d84 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bb3b17ed7577aca011955a97e40edfd795e70cd3
+Subproject commit cc9d63e60d848b0560778b4de098581923bbc6a2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ayhan Yalçınsoy (via logerrit)]

 source/text/sdraw/guide/align_arrange.xhp |2 +-
 source/text/sdraw/main_format.xhp |2 +-
 source/text/shared/01/0522.xhp|2 +-
 source/text/shared/01/0599.xhp|2 +-
 source/text/swriter/01/05060100.xhp   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit cc9d63e60d848b0560778b4de098581923bbc6a2
Author: Ayhan Yalçınsoy 
AuthorDate: Tue Nov 24 08:01:44 2020 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Wed Nov 25 09:11:26 2020 +0100

tdf#138203: fixed identical menu on help pages

Change-Id: I97ded684de5025e2747f8b30a9ec4bb0e2278e29
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106439
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/sdraw/guide/align_arrange.xhp 
b/source/text/sdraw/guide/align_arrange.xhp
index 10f97b812..137335396 100644
--- a/source/text/sdraw/guide/align_arrange.xhp
+++ b/source/text/sdraw/guide/align_arrange.xhp
@@ -84,7 +84,7 @@
 Select an object 
to align it to the page or select multiple objects to align them relative to 
each other.
 
 
-Choose Shape - Align and select one of the alignment 
options.
+Choose Shape - Align Objects and select one of the alignment 
options.
 
 
 Distributing Objects
diff --git a/source/text/sdraw/main_format.xhp 
b/source/text/sdraw/main_format.xhp
index 5c1c61bd3..c0b4bca05 100644
--- a/source/text/sdraw/main_format.xhp
+++ b/source/text/sdraw/main_format.xhp
@@ -49,7 +49,7 @@
 
 Area
 
-Text
+Text 
Attributes...
 
 Layer
 
diff --git a/source/text/shared/01/0522.xhp 
b/source/text/shared/01/0522.xhp
index 74531ace5..9ba95917f 100644
--- a/source/text/shared/01/0522.xhp
+++ b/source/text/shared/01/0522.xhp
@@ -34,7 +34,7 @@
 
 
 
-Text
+Text Attributes
  Sets 
the layout and anchoring properties for text in the selected drawing or text 
object.
   
   
diff --git a/source/text/shared/01/0599.xhp 
b/source/text/shared/01/0599.xhp
index 90602022c..51cb487d9 100644
--- a/source/text/shared/01/0599.xhp
+++ b/source/text/shared/01/0599.xhp
@@ -24,7 +24,7 @@

 
 
-Text
+Text Attributes
 /text/shared/01/0599.xhp
 
 
diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index a533b9576..f7c46643f 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -143,6 +143,6 @@
 The green 
rectangle represents the selected object and the red rectangle represents the 
alignment reference point. If you anchor the object as a character, the 
reference rectangle changes to a red line.
 
 Format - 
Anchor
-Format - 
Align
+Format - Align 
Text
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 include/vcl/toolkit/svtabbx.hxx |2 
 vcl/inc/salvtables.hxx  |  358 +
 vcl/source/app/salvtables.cxx   | 2446 +++-
 vcl/source/treelist/svtabbx.cxx |   49 
 4 files changed, 1608 insertions(+), 1247 deletions(-)

New commits:
commit 01e54822635b965c068094493294c579af4c4161
Author: Szymon Kłos 
AuthorDate: Tue Nov 24 16:31:40 2020 +0100
Commit: Szymon Kłos 
CommitDate: Wed Nov 25 09:03:43 2020 +0100

Move SalInstanceTreeView decl to header file

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

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 4fca8ff49cc5..cb7ccc7b12e3 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -24,6 +24,9 @@
 #include 
 #include 
 #include "messagedialog.hxx"
+#include 
+#include 
+#include 
 
 class SalInstanceBuilder : public weld::Builder
 {
@@ -1297,4 +1300,359 @@ public:
 virtual ~SalInstanceTextView() override;
 };
 
+class SalInstanceTreeView : public SalInstanceContainer, public virtual 
weld::TreeView
+{
+private:
+// owner for UserData
+std::vector> m_aUserData;
+VclPtr m_xTreeView;
+SvLBoxButtonData m_aCheckButtonData;
+SvLBoxButtonData m_aRadioButtonData;
+// currently expanding parent that logically, but not currently physically,
+// contain placeholders
+o3tl::sorted_vector m_aExpandingPlaceHolderParents;
+// which columns should be custom rendered
+o3tl::sorted_vector m_aCustomRenders;
+bool m_bTogglesAsRadio;
+int m_nSortColumn;
+
+DECL_LINK(SelectHdl, SvTreeListBox*, void);
+DECL_LINK(DeSelectHdl, SvTreeListBox*, void);
+DECL_LINK(DoubleClickHdl, SvTreeListBox*, bool);
+DECL_LINK(ExpandingHdl, SvTreeListBox*, bool);
+DECL_LINK(EndDragHdl, HeaderBar*, void);
+DECL_LINK(HeaderBarClickedHdl, HeaderBar*, void);
+DECL_LINK(ToggleHdl, SvLBoxButtonData*, void);
+DECL_LINK(ModelChangedHdl, SvTreeListBox*, void);
+DECL_LINK(StartDragHdl, SvTreeListBox*, bool);
+DECL_STATIC_LINK(SalInstanceTreeView, FinishDragHdl, SvTreeListBox*, void);
+DECL_LINK(EditingEntryHdl, SvTreeListEntry*, bool);
+typedef std::pair IterString;
+DECL_LINK(EditedEntryHdl, IterString, bool);
+DECL_LINK(VisibleRangeChangedHdl, SvTreeListBox*, void);
+DECL_LINK(CompareHdl, const SvSortData&, sal_Int32);
+DECL_LINK(PopupMenuHdl, const CommandEvent&, bool);
+DECL_LINK(TooltipHdl, const HelpEvent&, bool);
+DECL_LINK(CustomRenderHdl, svtree_render_args, void);
+DECL_LINK(CustomMeasureHdl, svtree_measure_args, Size);
+
+// Each row has a cell for the expander image, (and an optional cell for a
+// checkbutton if enable_toggle_buttons has been called) which precede
+// index 0
+int to_internal_model(int col) const;
+
+int to_external_model(int col) const;
+
+bool IsDummyEntry(SvTreeListEntry* pEntry) const;
+
+SvTreeListEntry* GetPlaceHolderChild(SvTreeListEntry* pEntry) const;
+
+static void set_font_color(SvTreeListEntry* pEntry, const Color& rColor);
+
+void AddStringItem(SvTreeListEntry* pEntry, const OUString& rStr, int 
nCol);
+
+void do_insert(const weld::TreeIter* pParent, int pos, const OUString* 
pStr,
+   const OUString* pId, const OUString* pIconName,
+   const VirtualDevice* pImageSurface, bool bChildrenOnDemand, 
weld::TreeIter* pRet,
+   bool bIsSeparator);
+
+void update_checkbutton_column_width(SvTreeListEntry* pEntry);
+
+void InvalidateModelEntry(SvTreeListEntry* pEntry);
+
+void do_set_toggle(SvTreeListEntry* pEntry, TriState eState, int col);
+
+static TriState do_get_toggle(SvTreeListEntry* pEntry, int col);
+
+TriState get_toggle(SvTreeListEntry* pEntry, int col) const;
+
+void set_toggle(SvTreeListEntry* pEntry, TriState eState, int col);
+
+bool get_text_emphasis(SvTreeListEntry* pEntry, int col) const;
+
+void set_header_item_width(const std::vector& rWidths);
+
+public:
+SalInstanceTreeView(SvTabListBox* pTreeView, SalInstanceBuilder* pBuilder, 
bool bTakeOwnership);
+
+virtual void connect_query_tooltip(const Link& rLink) override;
+
+virtual void columns_autosize() override;
+
+virtual void freeze() override;
+
+virtual void thaw() override;
+
+virtual void set_column_fixed_widths(const std::vector& rWidths) 
override;
+
+virtual void set_column_editables(const std::vector& rEditables) 
override;
+
+virtual void set_centered_column(int nCol) override;
+
+virtual int get_column_width(int nColumn) const override;
+
+virtual OUString get_column_title(int nColumn) const override;
+
+virtual void set_column_title(int nColumn, const OUString& rTitle) 
override;
+
+virtual void set_column_custom_renderer(int nColumn, bool bEnable) 
override;
+
+virtual void queue_draw()