Re: [LOK] Rendering spreadsheets, threaded rendering

[Miklos Vajna]

Hi Alexander,

On Fri, Mar 06, 2020 at 09:19:04AM +, Alexander Komakhin 
 wrote:
> I'm developing document viewer for corporate mobile OS Aurora. It's
> Linux based(kernel 3.10.49), gcc is 4.9.4, LO 6.1.6.3
> 
> Using paintPartTile to render separate lists of XLS document draws an
> area of empty cells near the content itself, can I somehow tell LO to
> "ensure only data visible"? Also, rendering such big area takes a lot
> of time (using mobile device).

See core.git 91a3f58ec3ac7998688cab665322d26d5aa3b015 for a way to get
this behavior, I guess that still works.

> Btw, are functions paint*Tile reentrant? Can I call them from separate
> threads?

I think you can call these functions from multiple threads, given that
internally they all take the solar mutex at their start. So no harm, but
you won't get any speedup, either.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: common/MessageQueue.cpp common/StringVector.cpp common/StringVector.hpp kit/ChildSession.cpp kit/ForKit.cpp kit/Kit.cpp test/WhiteBoxTests.cpp tools/Connect.cpp tools

[Miklos Vajna (via logerrit)]

 common/MessageQueue.cpp |4 -
 common/StringVector.cpp |   30 
 common/StringVector.hpp |6 +
 kit/ChildSession.cpp|  166 
 kit/ForKit.cpp  |4 -
 kit/Kit.cpp |   18 ++---
 test/WhiteBoxTests.cpp  |   15 
 tools/Connect.cpp   |2 
 tools/KitClient.cpp |6 -
 wsd/Admin.cpp   |   42 ++--
 wsd/ClientSession.cpp   |   72 ++--
 wsd/DocumentBroker.cpp  |2 
 wsd/FileServer.cpp  |7 +-
 wsd/TileCache.cpp   |6 -
 14 files changed, 216 insertions(+), 164 deletions(-)

New commits:
commit a7d3efdd4ea921430442ae427fb4c25a2d9afcc8
Author: Miklos Vajna 
AuthorDate: Mon Mar 9 09:05:30 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 9 09:46:33 2020 +0100

Introduce StringVector::equals()

Allows comparing tokens with C strings without a heap allocation. Do the
same when comparing two tokens from two different StringVectors.

And use it at all places where operator ==() has an argument, which is a
StringVector::operator []() result.

Change-Id: Id36eff96767ab99b235ecbd12fb14446a3efa869
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90201
Reviewed-by: Michael Meeks 
Tested-by: Jenkins CollaboraOffice 

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index 84987b278..5482b4f79 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -366,13 +366,13 @@ std::string TileQueue::removeCallbackDuplicate(const 
std::string& callbackMsg)
 if (queuedTokens.size() < 3)
 continue;
 
-if (!isViewCallback && (queuedTokens[1] == tokens[1] && 
queuedTokens[2] == tokens[2]))
+if (!isViewCallback && (queuedTokens.equals(1, tokens, 1) && 
queuedTokens.equals(2, tokens, 2)))
 {
 LOG_TRC("Remove obsolete callback: " << std::string(it.data(), 
it.size()) << " -> " << LOOLProtocol::getAbbreviatedMessage(callbackMsg));
 getQueue().erase(getQueue().begin() + i);
 break;
 }
-else if (isViewCallback && (queuedTokens[1] == tokens[1] && 
queuedTokens[2] == tokens[2]))
+else if (isViewCallback && (queuedTokens.equals(1, tokens, 1) && 
queuedTokens.equals(2, tokens, 2)))
 {
 // we additionally need to ensure that the payload is about
 // the same viewid (otherwise we'd merge them all views into
diff --git a/common/StringVector.cpp b/common/StringVector.cpp
index 4527e593e..aab884881 100644
--- a/common/StringVector.cpp
+++ b/common/StringVector.cpp
@@ -86,4 +86,34 @@ std::string StringVector::cat(const std::string& separator, 
size_t offset) const
 return ret;
 }
 
+bool StringVector::equals(size_t index, const char* string) const
+{
+if (index >= _tokens.size())
+{
+return false;
+}
+
+const StringToken& token = _tokens[index];
+return _string.compare(token._index, token._length, string) == 0;
+}
+
+bool StringVector::equals(size_t index, const StringVector& other, size_t 
otherIndex)
+{
+if (index >= _tokens.size())
+{
+return false;
+}
+
+if (otherIndex >= other._tokens.size())
+{
+return false;
+}
+
+const StringToken& token = _tokens[index];
+const StringToken& otherToken = other._tokens[otherIndex];
+int ret = _string.compare(token._index, token._length, other._string, 
otherToken._index,
+  otherToken._length);
+return ret == 0;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/StringVector.hpp b/common/StringVector.hpp
index 4255e9d54..5008277fd 100644
--- a/common/StringVector.hpp
+++ b/common/StringVector.hpp
@@ -69,6 +69,12 @@ public:
 
 /// Concats tokens starting from begin, using separator as separator.
 std::string cat(const std::string& separator, size_t begin) const;
+
+/// Compares the nth token with string.
+bool equals(size_t index, const char* string) const;
+
+/// Compares the nth token with the mth token from an other StringVector.
+bool equals(size_t index, const StringVector& other, size_t otherIndex);
 };
 
 #endif
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 3cd8642bd..bc9573030 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -114,7 +114,7 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 updateLastActivityTime();
 }
 
-if (tokens.size() > 0 && tokens[0] == "useractive" && getLOKitDocument() 
!= nullptr)
+if (tokens.size() > 0 && tokens.equals(0, "useractive") && 
getLOKitDocument() != nullptr)
 {
 LOG_DBG("Handling message after inactivity of " << getInactivityMS() 
<< "ms.");
 setIsActive(true);
@@ -183,16 +183,16 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 LOG_TRC("Finished replaying messages.");

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

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/UndoCore.hxx  |2 
 sw/source/core/inc/UndoTable.hxx |   34 +-
 sw/source/core/undo/unoutl.cxx   |8 +-
 sw/source/core/undo/untbl.cxx|  126 +++
 4 files changed, 85 insertions(+), 85 deletions(-)

New commits:
commit 889ad68cffd0f721b77e21ee4a8b6f1a7915fce2
Author: Miklos Vajna 
AuthorDate: Mon Mar 9 08:50:19 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 9 09:53:21 2020 +0100

sw: prefix members of SwUndoMergeTable, SwUndoOutlineLeftRight, ...

... SwUndoSplitTable and SwUndoTableAutoFormat

See tdf#94879 for motivation.

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

diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index c1825d30ab20..7015e3fc1f35 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -211,7 +211,7 @@ public:
 
 class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng
 {
-short const nOffset;
+short const m_nOffset;
 
 public:
 SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset );
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 76dfe3ce7720..efca52be8f9e 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -142,10 +142,10 @@ class SwUndoTableNumFormat;
 class SwUndoTableAutoFormat : public SwUndo
 {
 OUString m_TableStyleName;
-sal_uLong nSttNode;
-std::unique_ptr pSaveTable;
+sal_uLong m_nStartNode;
+std::unique_ptr m_pSaveTable;
 std::vector< std::shared_ptr > m_Undos;
-bool bSaveContentAttr;
+bool m_bSaveContentAttr;
 sal_uInt16 const m_nRepeatHeading;
 
 void UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext);
@@ -308,13 +308,13 @@ public:
 
 class SwUndoSplitTable : public SwUndo
 {
-sal_uLong nTableNode, nOffset;
+sal_uLong m_nTableNode, m_nOffset;
 std::unique_ptr mpSaveRowSpan; // stores row span values at 
the splitting row
-std::unique_ptr pSavTable;
-std::unique_ptr pHistory;
-SplitTable_HeadlineOption const nMode;
-sal_uInt16 nFormulaEnd;
-bool const bCalcNewSize;
+std::unique_ptr m_pSavedTable;
+std::unique_ptr m_pHistory;
+SplitTable_HeadlineOption const m_nMode;
+sal_uInt16 m_nFormulaEnd;
+bool const m_bCalcNewSize;
 
 public:
 SwUndoSplitTable( const SwTableNode& rTableNd, 
std::unique_ptr pRowSp,
@@ -326,19 +326,19 @@ public:
 virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
 virtual void RepeatImpl( ::sw::RepeatContext & ) override;
 
-void SetTableNodeOffset( sal_uLong nIdx ) { nOffset = nIdx - 
nTableNode; }
-SwHistory* GetHistory() { return pHistory.get(); }
+void SetTableNodeOffset( sal_uLong nIdx ) { m_nOffset = nIdx - 
m_nTableNode; }
+SwHistory* GetHistory() { return m_pHistory.get(); }
 void SaveFormula( SwHistory& rHistory );
 };
 
 class SwUndoMergeTable : public SwUndo
 {
-OUString aName;
-sal_uLong nTableNode;
-std::unique_ptr pSavTable, pSavHdl;
-std::unique_ptr pHistory;
-sal_uInt16 const nMode;
-bool const bWithPrev;
+OUString m_aName;
+sal_uLong m_nTableNode;
+std::unique_ptr m_pSaveTable, m_pSaveHdl;
+std::unique_ptr m_pHistory;
+sal_uInt16 const m_nMode;
+bool const m_bWithPrev;
 
 public:
 SwUndoMergeTable( const SwTableNode& rTableNd, const SwTableNode& 
rDelTableNd,
diff --git a/sw/source/core/undo/unoutl.cxx b/sw/source/core/undo/unoutl.cxx
index cac6dc937076..04341d61aa71 100644
--- a/sw/source/core/undo/unoutl.cxx
+++ b/sw/source/core/undo/unoutl.cxx
@@ -25,25 +25,25 @@
 
 SwUndoOutlineLeftRight::SwUndoOutlineLeftRight( const SwPaM& rPam,
 short nOff )
-: SwUndo( SwUndoId::OUTLINE_LR, rPam.GetDoc() ), SwUndRng( rPam ), 
nOffset( nOff )
+: SwUndo( SwUndoId::OUTLINE_LR, rPam.GetDoc() ), SwUndRng( rPam ), 
m_nOffset( nOff )
 {
 }
 
 void SwUndoOutlineLeftRight::UndoImpl(::sw::UndoRedoContext & rContext)
 {
 SwPaM & rPaM( AddUndoRedoPaM(rContext) );
-rContext.GetDoc().OutlineUpDown(rPaM, -nOffset);
+rContext.GetDoc().OutlineUpDown(rPaM, -m_nOffset);
 }
 
 void SwUndoOutlineLeftRight::RedoImpl(::sw::UndoRedoContext & rContext)
 {
 SwPaM & rPaM( AddUndoRedoPaM(rContext) );
-rContext.GetDoc().OutlineUpDown(rPaM,  nOffset);
+rContext.GetDoc().OutlineUpDown(rPaM,  m_nOffset);
 }
 
 void SwUndoOutlineLeftRight::RepeatImpl(::sw::RepeatContext & rContext)
 {
-rContext.GetDoc().OutlineUpDown(rContext.GetRepeatPaM(), nOffset);
+rContext.GetDoc().OutlineUpDown(rContext.GetRepeatPaM(), m_nOffset);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index b841c0420344..de72

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

[Stephan Bergmann (via logerrit)]

 filter/qa/unit/svg.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 23ca55114d89a76d751e534768998fc48d37203c
Author: Stephan Bergmann 
AuthorDate: Mon Mar 9 08:03:14 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 9 10:07:10 2020 +0100

loplugin:unreffun (macOS)

...plus ensuing -Werror,-Wunused-const-variable

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

diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index d9edfd836729..e0538eebeef7 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -21,7 +21,9 @@
 
 using namespace ::com::sun::star;
 
+#if !defined MACOSX
 char const DATA_DIRECTORY[] = "/filter/qa/unit/data/";
+#endif
 
 /// SVG filter tests.
 class SvgFilterTest : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
@@ -33,8 +35,10 @@ public:
 void setUp() override;
 void tearDown() override;
 void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
+#if !defined MACOSX
 uno::Reference& getComponent() { return mxComponent; }
 void load(const OUString& rURL);
+#endif
 };
 
 void SvgFilterTest::setUp()
@@ -52,11 +56,13 @@ void SvgFilterTest::tearDown()
 test::BootstrapFixture::tearDown();
 }
 
+#if !defined MACOSX
 void SvgFilterTest::load(const OUString& rFileName)
 {
 OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + rFileName;
 mxComponent = loadFromDesktop(aURL);
 }
+#endif
 
 void SvgFilterTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

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

New commits:
commit cb5fc86005a85af06d8ad0bf1ac7aab7649c0048
Author: Noel Grandin 
AuthorDate: Sun Mar 8 21:31:12 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 9 10:11:30 2020 +0100

tdf#130878 improvement to previous fix

which does not cause tons of extra pages to show up

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

diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx 
b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 4c8132d30636..63c7649bcb52 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -80,7 +80,8 @@ void OXMLCondPrtExpr::characters( const OUString& rChars )
 
 void OXMLCondPrtExpr::endFastElement( sal_Int32 )
 {
-
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,makeAny(m_aCharBuffer.makeStringAndClear()));
+if (m_aCharBuffer.getLength())
+
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,makeAny(m_aCharBuffer.makeStringAndClear()));
 }
 
 } // namespace rptxml
___
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

[Samuel Mehrbrodt (via logerrit)]

 sw/qa/python/testdocuments/xtextrange.odt |binary
 sw/qa/python/xtextrange.py|   21 +
 sw/source/core/unocore/unotext.cxx|   12 
 3 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 2b7e24334c9b9c69c1ebf03ed66a2143c6aec972
Author: Samuel Mehrbrodt 
AuthorDate: Fri Mar 6 12:39:32 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 9 10:33:04 2020 +0100

tdf#131184 Allow comparing text ranges in table with body text

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

diff --git a/sw/qa/python/testdocuments/xtextrange.odt 
b/sw/qa/python/testdocuments/xtextrange.odt
index 5881ea44a447..70c978349869 100644
Binary files a/sw/qa/python/testdocuments/xtextrange.odt and 
b/sw/qa/python/testdocuments/xtextrange.odt differ
diff --git a/sw/qa/python/xtextrange.py b/sw/qa/python/xtextrange.py
index 9c00ebad51b3..75e4aed79561 100644
--- a/sw/qa/python/xtextrange.py
+++ b/sw/qa/python/xtextrange.py
@@ -91,6 +91,27 @@ class TestXTextRange(unittest.TestCase):
 xTextRange2 = xTextTable.getCellByName("A1")
 self.assertEqual(xTextRange2.getString(), "beforeC1after")
 
+def test_textRangesCompare(self):
+doc = self._uno.getDoc()
+# Bookmark in body text
+bookmark1 = doc.getBookmarks().getByIndex(0).getAnchor()
+
+# Bookmarks in table
+bookmark2 = doc.getBookmarks().getByIndex(1).getAnchor()
+bookmark3 = doc.getBookmarks().getByIndex(2).getAnchor()
+
+res = doc.Text.compareRegionStarts(bookmark1, bookmark2)
+self.assertEqual(res, 1)
+
+res = doc.Text.compareRegionStarts(bookmark2, bookmark1)
+self.assertEqual(res, -1)
+
+res = doc.Text.compareRegionStarts(bookmark2, bookmark3)
+self.assertEqual(res, 1)
+
+res = doc.Text.compareRegionStarts(bookmark1, bookmark3)
+self.assertEqual(res, 1)
+
 if __name__ == '__main__':
 unittest.main()
 
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 68b0576b7ba7..207ff49b94dd 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -996,14 +996,18 @@ bool SwXText::Impl::CheckForOwnMember(
 const SwNode& rSrcNode = rPaM.GetNode();
 const SwStartNode* pTmp = rSrcNode.FindSttNodeByType(eSearchNodeType);
 
-// skip SectionNodes
-while(pTmp && pTmp->IsSectionNode())
+// skip SectionNodes / TableNodes to be able to compare across 
table/section boundaries
+while (pTmp
+   && (pTmp->IsSectionNode() || pTmp->IsTableNode()
+   || (m_eType != CursorType::TableText
+   && pTmp->GetStartNodeType() == SwTableBoxStartNode)))
 {
 pTmp = pTmp->StartOfSectionNode();
 }
 
-//if the document starts with a section
-while(pOwnStartNode->IsSectionNode())
+while (pOwnStartNode->IsSectionNode() || pOwnStartNode->IsTableNode()
+   || (m_eType != CursorType::TableText
+   && pOwnStartNode->GetStartNodeType() == SwTableBoxStartNode))
 {
 pOwnStartNode = pOwnStartNode->StartOfSectionNode();
 }
___
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/core/xmlimp.cxx   |7 ++
 xmloff/source/draw/ximpnote.cxx |   66 ---
 xmloff/source/draw/ximpnote.hxx |4 -
 xmloff/source/draw/ximppage.cxx |  109 +++
 xmloff/source/draw/ximppage.hxx |9 +--
 xmloff/source/draw/ximpstyl.cxx |  111 
 xmloff/source/draw/ximpstyl.hxx |   10 ++-
 7 files changed, 83 insertions(+), 233 deletions(-)

New commits:
commit 2863865da44da2e0baa48a9e8d3fc87641fbd6fb
Author: Noel Grandin 
AuthorDate: Mon Mar 9 10:09:48 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 9 10:52:21 2020 +0100

convert SdXMLGenericPageContext to fastparser

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

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0c3000175878..628054dc1fcd 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -2020,7 +2020,12 @@ const OUString & SvXMLImport::getNameFromToken( 
sal_Int32 nToken )
 
 OUString SvXMLImport::getPrefixAndNameFromToken( sal_Int32 nToken )
 {
-return getNamespacePrefixFromToken(nToken, nullptr) + ":" + 
xTokenHandler->getIdentifier( nToken & TOKEN_MASK );
+OUString rv;
+sal_Int32 nNamespaceToken = ( nToken & NMSP_MASK ) >> NMSP_SHIFT;
+auto aIter( aNamespaceMap.find( nNamespaceToken ) );
+if( aIter != aNamespaceMap.end() )
+rv = (*aIter).second.second + " " + aIter->second.first + ":";
+return rv + xTokenHandler->getIdentifier( nToken & TOKEN_MASK );
 }
 
 OUString SvXMLImport::getNamespacePrefixFromToken(sal_Int32 nToken, const 
SvXMLNamespaceMap* pMap)
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 90d9fe90dd39..8c2aba66fdd5 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -23,72 +23,6 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
-sal_uInt16 nPrfx, const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-uno::Reference< drawing::XShapes > const & rShapes)
-:   SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
-{
-OUString sStyleName, sPageMasterName;
-
-const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-for(sal_Int16 i=0; i < nAttrCount; i++)
-{
-OUString sAttrName = xAttrList->getNameByIndex( i );
-OUString aLocalName;
-sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( 
sAttrName, &aLocalName );
-OUString sValue = xAttrList->getValueByIndex( i );
-const SvXMLTokenMap& rAttrTokenMap = 
GetSdImport().GetMasterPageAttrTokenMap();
-
-switch(rAttrTokenMap.Get(nPrefix, aLocalName))
-{
-case XML_TOK_MASTERPAGE_PAGE_MASTER_NAME:
-{
-sPageMasterName = sValue;
-break;
-}
-case XML_TOK_MASTERPAGE_STYLE_NAME:
-{
-sStyleName = sValue;
-break;
-}
-case XML_TOK_MASTERPAGE_USE_HEADER_NAME:
-{
-maUseHeaderDeclName =  sValue;
-break;
-}
-case XML_TOK_MASTERPAGE_USE_FOOTER_NAME:
-{
-maUseFooterDeclName =  sValue;
-break;
-}
-case XML_TOK_MASTERPAGE_USE_DATE_TIME_NAME:
-{
-maUseDateTimeDeclName =  sValue;
-break;
-}
-
-}
-}
-
-SetStyle( sStyleName );
-
-// now delete all up-to-now contained shapes from this notes page
-uno::Reference< drawing::XShape > xShape;
-while(rShapes->getCount())
-{
-rShapes->getByIndex(0) >>= xShape;
-if(xShape.is())
-rShapes->remove(xShape);
-}
-
-// set page-master?
-if(!sPageMasterName.isEmpty())
-{
-SetPageMaster( sPageMasterName );
-}
-}
-
 SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
 const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList,
 uno::Reference< drawing::XShapes > const & rShapes)
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index 3a1e91857b67..c86a39954aba 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -28,10 +28,6 @@
 class SdXMLNotesContext : public SdXMLGenericPageContext
 {
 public:
-SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-css::uno::Reference< css::drawing::XShapes > const & rShapes);
 SdXMLNotesContext( SdXMLImport& rImport,
 const

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

[Pelin Kuran (via logerrit)]

 basegfx/source/polygon/b3dpolypolygontools.cxx |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit bdb1c72198f60fdd91460e26282134d43bc0e2df
Author: Pelin Kuran 
AuthorDate: Fri Feb 28 17:14:00 2020 +0300
Commit: Michael Stahl 
CommitDate: Mon Mar 9 10:53:26 2020 +0100

tdf43157:Clean up OSL_ASSERT, DBG_ASSERT, etc..

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

diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx 
b/basegfx/source/polygon/b3dpolypolygontools.cxx
index 31581a0be298..74b145957731 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
 #include 
 #include 
 #include 
@@ -27,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // predefines
 #define nMinSegments sal_uInt32(1)
@@ -470,9 +470,11 @@ namespace basegfx::utils
 
 if(nOuterSequenceCount)
 {
-OSL_ENSURE(nOuterSequenceCount == 
rPolyPolygonShape3DSource.SequenceY.getLength()
-&& nOuterSequenceCount == 
rPolyPolygonShape3DSource.SequenceZ.getLength(),
-"UnoPolyPolygonShape3DToB3DPolygon: Not all double 
sequences have the same length (!)");
+assert(nOuterSequenceCount == 
rPolyPolygonShape3DSource.SequenceY.getLength()
+   && nOuterSequenceCount
+  == 
rPolyPolygonShape3DSource.SequenceZ.getLength()&&
+   "UnoPolyPolygonShape3DToB3DPolygon: Not all double 
sequences have the same "
+   "length (!)" );
 
 const css::drawing::DoubleSequence* pInnerSequenceX = 
rPolyPolygonShape3DSource.SequenceX.getConstArray();
 const css::drawing::DoubleSequence* pInnerSequenceY = 
rPolyPolygonShape3DSource.SequenceY.getConstArray();
@@ -482,9 +484,10 @@ namespace basegfx::utils
 {
 basegfx::B3DPolygon aNewPolygon;
 const sal_Int32 
nInnerSequenceCount(pInnerSequenceX->getLength());
-OSL_ENSURE(nInnerSequenceCount == 
pInnerSequenceY->getLength()
-&& nInnerSequenceCount == pInnerSequenceZ->getLength(),
-"UnoPolyPolygonShape3DToB3DPolygon: Not all double 
sequences have the same length (!)");
+assert(nInnerSequenceCount == pInnerSequenceY->getLength()
+   && nInnerSequenceCount == 
pInnerSequenceZ->getLength()
+   && "UnoPolyPolygonShape3DToB3DPolygon: Not all 
double sequences have "
+  "the same length (!)");
 
 const double* pArrayX = pInnerSequenceX->getConstArray();
 const double* pArrayY = pInnerSequenceY->getConstArray();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 62cb87d17ca8cbcccbcadbd36c7697a5074d55ec
Author: Caolán McNamara 
AuthorDate: Fri Mar 6 12:35:53 2020 +
Commit: Michael Stahl 
CommitDate: Mon Mar 9 11:12:06 2020 +0100

failure seen as setting length of -1 and returning null

Change-Id: I84e7b3a4ad63e70499910f09bd4c70a43137fa10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90103
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit beabc0deddce2a5ce0a9f9b20316a7798a08318c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90031
Reviewed-by: Michael Stahl 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 111de9935891..786aa40474d6 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3392,8 +3392,12 @@ public:
 gint length(0);
 const guchar *rawdata = 
gtk_selection_data_get_data_with_length(m_pData,
 
&length);
-css::uno::Sequence aSeq(reinterpret_cast(rawdata), length);
-aRet <<= aSeq;
+// seen here was rawhide == nullptr and length set to -1
+if (rawdata)
+{
+css::uno::Sequence aSeq(reinterpret_cast(rawdata), length);
+aRet <<= aSeq;
+}
 }
 
 gtk_selection_data_free(m_pData);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Tomaž Vajngerl (via logerrit)]

 wsd/LOOLWSD.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4fcb3eeb5506347976135c821a873ae4058a454
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 9 10:05:21 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 9 11:31:30 2020 +0100

Fix build on android

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

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 8ab895ec8..b009bcaa5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -357,7 +357,7 @@ void cleanupDocBrokers()
 LOG_END(logger, true);
 }
 
-#if ENABLE_DEBUG
+#if !MOBILEAPP && ENABLE_DEBUG
 if (LOOLWSD::SingleKit && DocBrokers.size() == 0)
 {
 SigUtil::requestShutdown();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang cui/source dbaccess/source editeng/source extensions/source include/editeng jvmfwk/inc jvmfwk/source reportdesign/source sc/inc sc/source sd/sourc

[Noel Grandin (via logerrit)]

 compilerplugins/clang/plugin.cxx|   24 +
 compilerplugins/clang/test/unusedfields.cxx |   85 
-
 compilerplugins/clang/unusedfields.cxx  |   51 +++
 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  170 
--
 compilerplugins/clang/unusedfields.readonly.results |   42 +-
 compilerplugins/clang/unusedfields.untouched.results|   38 +-
 compilerplugins/clang/unusedfields.writeonly.results|   66 +--
 cui/source/inc/textanim.hxx |1 
 cui/source/inc/transfrm.hxx |3 
 cui/source/tabpages/textanim.cxx|3 
 cui/source/tabpages/transfrm.cxx|6 
 dbaccess/source/filter/xml/xmlComponent.cxx |   22 -
 dbaccess/source/filter/xml/xmlComponent.hxx |4 
 dbaccess/source/filter/xml/xmlHierarchyCollection.cxx   |   11 
 dbaccess/source/filter/xml/xmlHierarchyCollection.hxx   |1 
 editeng/source/uno/unotext2.cxx |   22 -
 extensions/source/bibliography/datman.cxx   |4 
 include/editeng/unotext.hxx |2 
 jvmfwk/inc/fwkbase.hxx  |1 
 jvmfwk/source/fwkbase.cxx   |6 
 reportdesign/source/filter/xml/xmlfilter.hxx|1 
 reportdesign/source/ui/dlg/Navigator.cxx|4 
 sc/inc/cellsuno.hxx |1 
 sc/inc/editutil.hxx |1 
 sc/inc/funcdesc.hxx |1 
 sc/source/core/data/funcdesc.cxx|6 
 sc/source/core/tool/editutil.cxx|3 
 sc/source/filter/xml/XMLTableHeaderFooterContext.cxx|2 
 sc/source/filter/xml/XMLTableHeaderFooterContext.hxx|1 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx |4 
 sc/source/ui/inc/solveroptions.hxx  |1 
 sc/source/ui/inc/tbzoomsliderctrl.hxx   |1 
 sc/source/ui/miscdlgs/solveroptions.cxx |3 
 sc/source/ui/unoobj/cellsuno.cxx|   11 
 sd/source/ui/dlg/dlgpage.cxx|   11 
 sd/source/ui/dlg/prltempl.cxx   |3 
 sd/source/ui/dlg/tpaction.cxx   |3 
 sd/source/ui/inc/GraphicObjectBar.hxx   |1 
 sd/source/ui/inc/MediaObjectBar.hxx |1 
 sd/source/ui/inc/TabControl.hxx |1 
 sd/source/ui/inc/dlgpage.hxx|1 
 sd/source/ui/inc/prltempl.hxx   |1 
 sd/source/ui/inc/tpaction.hxx   |2 
 sd/source/ui/slideshow/PaneHider.cxx|5 
 sd/source/ui/slideshow/PaneHider.hxx|1 
 sd/source/ui/view/GraphicObjectBar.cxx  |5 
 sd/source/ui/view/MediaObjectBar.cxx|5 
 sd/source/ui/view/tabcontr.cxx  |2 
 svx/source/customshapes/EnhancedCustomShape3d.cxx   |3 
 svx/source/customshapes/EnhancedCustomShape3d.hxx   |2 
 sw/source/core/edit/acorrect.cxx|5 
 sw/source/core/view/viewsh.cxx  |   17 -
 sw/source/ui/chrdlg/pardlg.cxx  |2 
 sw/source/ui/index/cnttab.cxx   |   35 --
 sw/source/uibase/inc/swuipardlg.hxx |1 
 ucb/source/ucp/ftp/ftpintreq.cxx|3 
 ucb/source/ucp/ftp/ftpintreq.hxx|1 
 uui/source/masterpassworddlg.cxx|3 
 uui/source/masterpassworddlg.hxx|2 
 uui/source/passworddlg.cxx  |5 
 uui/source/passworddlg.hxx  |3 
 vcl/inc/bitmap/Octree.hxx   |1 
 vcl/inc/unx/saldisp.hxx |1 
 vcl/source/bitmap/BitmapFilterStackBlur.cxx |8 
 vcl/source/bitmap/Octree.cxx 

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2export.cxx   |   13 +
 chart2/qa/extras/data/odt/tdf131143.odt |binary
 include/oox/export/chartexport.hxx  |2 +-
 oox/source/export/chartexport.cxx   |   10 ++
 4 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 45413702b0b71ee56aee57d215b4041d3ea6067b
Author: Balazs Varga 
AuthorDate: Thu Mar 5 11:28:23 2020 +0100
Commit: László Németh 
CommitDate: Mon Mar 9 11:37:27 2020 +0100

tdf#131143 OOXML chart: fix missing data points of scatter chart

If "values-x" property is empty, export X-Y (scatter) chart category
labels in c:xVal/c:strRef/c:strCache/c:pt/c:v to avoid missing data
points at next import.

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index c3bd2283bf4e..323a026594d8 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -49,6 +49,7 @@ public:
 void testCrosses();
 void testScatterChartTextXValues();
 void testScatterXAxisValues();
+void testScatterXAxisCategories();
 void testChartDataTable();
 void testChartExternalData();
 void testEmbeddingsGrabBag();
@@ -171,6 +172,7 @@ public:
 CPPUNIT_TEST(testCrosses);
 CPPUNIT_TEST(testScatterChartTextXValues);
 CPPUNIT_TEST(testScatterXAxisValues);
+CPPUNIT_TEST(testScatterXAxisCategories);
 CPPUNIT_TEST(testChartDataTable);
 CPPUNIT_TEST(testChartExternalData);
 CPPUNIT_TEST(testEmbeddingsGrabBag);
@@ -710,6 +712,17 @@ void Chart2ExportTest::testScatterXAxisValues()
 assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[4]/c:v", "16");
 }
 
+void Chart2ExportTest::testScatterXAxisCategories()
+{
+load("/chart2/qa/extras/data/odt/", "tdf131143.odt");
+
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML 
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:ptCount", "val", "4");
+assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[1]/c:v", "Row 1");
+assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[2]/c:v", "Row 2");
+}
+
 void Chart2ExportTest::testChartDataTable()
 {
 load("/chart2/qa/extras/data/docx/", "testChartDataTable.docx");
diff --git a/chart2/qa/extras/data/odt/tdf131143.odt 
b/chart2/qa/extras/data/odt/tdf131143.odt
new file mode 100644
index ..e8ffeaf5a962
Binary files /dev/null and b/chart2/qa/extras/data/odt/tdf131143.odt differ
diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index ac22a18b8957..951819703a76 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -175,7 +175,7 @@ private:
 void exportSeriesText(
 const css::uno::Reference< css::chart2::data::XDataSequence >& 
xValueSeq );
 void exportSeriesCategory(
-const css::uno::Reference< css::chart2::data::XDataSequence >& 
xValueSeq );
+const css::uno::Reference< css::chart2::data::XDataSequence >& 
xValueSeq, sal_Int32 nValueType = XML_cat );
 void exportSeriesValues(
 const css::uno::Reference< css::chart2::data::XDataSequence >& 
xValueSeq, sal_Int32 nValueType = XML_val );
 void exportShapeProps( const css::uno::Reference< css::beans::XPropertySet 
>& xPropSet );
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index cf586257ccf7..aecfe3948d33 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2304,6 +2304,8 @@ void ChartExport::exportSeries( const 
Reference& xChartType,
 if( xValues.is() )
 exportSeriesValues( xValues, XML_xVal );
 }
+else if( mxCategoriesValues.is() )
+exportSeriesCategory( mxCategoriesValues, XML_xVal 
);
 }
 
 if( eChartType == chart::TYPEID_BUBBLE )
@@ -2429,13 +2431,13 @@ void ChartExport::exportSeriesText( const Reference< 
chart2::data::XDataSequence
 pFS->endElement( FSNS( XML_c, XML_tx ) );
 }
 
-void ChartExport::exportSeriesCategory( const Reference< 
chart2::data::XDataSequence > & xValueSeq )
+void ChartExport::exportSeriesCategory( const Reference< 
chart2::data::XDataSequence > & xValueSeq, sal_Int32 nValueType )
 {
 FSHelperPtr pFS = GetFS();
-pFS->startElement(FSNS(XML_c, XML_cat));
+pFS->startElement(FSNS(XML_c, nValueType));
 
 OUString aCellRange = xValueSeq.is() ? 
xValueSeq->getSourceRangeRepresentation() : OUString();
-const Sequence< Sequence< OUString >> aFinalSplitSource = 
getSplitCategoriesList(aCe

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

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx  |2 ++
 vcl/source/app/salvtables.cxx |4 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |5 +
 3 files changed, 11 insertions(+)

New commits:
commit ba5c5df41a58c690bdef313856aaad5cd859a455
Author: Caolán McNamara 
AuthorDate: Sun Mar 8 20:54:35 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 9 11:50:46 2020 +0100

add capability to remove a menu item

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index aeb656720188..936484a31d0c 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1991,6 +1991,8 @@ public:
 TriState eCheckRadioFalse)
 = 0;
 
+virtual void remove(const OString& rId) = 0;
+
 virtual void clear() = 0;
 
 virtual void insert_separator(int pos, const OUString& rId) = 0;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 6aa99b7706fd..1d5683a7d392 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -735,6 +735,10 @@ public:
 auto nInsertPos = pos == -1 ? MENU_APPEND : pos;
 m_xMenu->InsertSeparator(rId.toUtf8(), nInsertPos);
 }
+virtual void remove(const OString& rId) override
+{
+m_xMenu->RemoveItem(m_xMenu->GetItemPos(m_xMenu->GetItemId(rId)));
+}
 virtual int n_children() const override { return m_xMenu->GetItemCount(); }
 PopupMenu* getMenu() const { return m_xMenu.get(); }
 virtual ~SalInstanceMenu() override
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 35e9f8d53742..23dc0c65825a 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7352,6 +7352,11 @@ public:
 return nLen;
 }
 
+void remove(const OString& rIdent) override
+{
+MenuHelper::remove_item(rIdent);
+}
+
 virtual ~GtkInstanceMenu() override
 {
 clear_extras();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/inc oox/IwyuFilter_oox.yaml oox/source

[Gabor Kelemen (via logerrit)]

 oox/IwyuFilter_oox.yaml   |6 ++
 oox/inc/drawingml/chart/axismodel.hxx |1 -
 oox/inc/drawingml/chart/converterbase.hxx |1 -
 oox/inc/drawingml/customshapegeometry.hxx |2 --
 oox/inc/drawingml/embeddedwavaudiofile.hxx|2 +-
 oox/inc/drawingml/fillproperties.hxx  |1 -
 oox/inc/drawingml/graphicproperties.hxx   |2 --
 oox/inc/drawingml/lineproperties.hxx  |1 -
 oox/inc/drawingml/presetgeometrynames.hxx |1 -
 oox/inc/drawingml/shape3dproperties.hxx   |4 
 oox/inc/drawingml/table/tablecell.hxx |7 +--
 oox/inc/drawingml/table/tablecellcontext.hxx  |2 +-
 oox/inc/drawingml/table/tableproperties.hxx   |2 --
 oox/inc/drawingml/table/tablestylepart.hxx|4 
 oox/inc/drawingml/textbodycontext.hxx |2 --
 oox/inc/drawingml/textfield.hxx   |1 -
 oox/inc/drawingml/textparagraphproperties.hxx |2 --
 oox/inc/drawingml/textparagraphpropertiescontext.hxx  |2 --
 oox/inc/drawingml/textspacing.hxx |2 --
 oox/inc/ooxresid.hxx  |3 +--
 oox/source/docprop/docprophandler.hxx |1 -
 oox/source/docprop/ooxmldocpropimport.cxx |1 +
 oox/source/docprop/ooxmldocpropimport.hxx |1 -
 oox/source/drawingml/chart/axismodel.cxx  |1 +
 oox/source/drawingml/chart/objectformatter.cxx|1 +
 oox/source/drawingml/diagram/constraintlistcontext.hxx|1 -
 oox/source/drawingml/diagram/datamodel.cxx|1 +
 oox/source/drawingml/diagram/datamodel.hxx|3 +--
 oox/source/drawingml/diagram/diagramfragmenthandler.hxx   |3 ++-
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx   |1 -
 oox/source/drawingml/diagram/layoutatomvisitorbase.hxx|3 ---
 oox/source/drawingml/diagram/layoutatomvisitors.hxx   |4 +---
 oox/source/drawingml/diagram/layoutnodecontext.hxx|1 -
 oox/source/drawingml/hyperlinkcontext.hxx |1 -
 oox/source/drawingml/table/tablecontext.cxx   |1 +
 oox/source/drawingml/table/tablestylecellstylecontext.cxx |1 +
 oox/source/drawingml/textcharacterpropertiescontext.cxx   |1 +
 oox/source/drawingml/textparagraphproperties.cxx  |1 +
 oox/source/drawingml/textparagraphpropertiescontext.cxx   |1 +
 oox/source/ppt/animationtypes.hxx |1 -
 oox/source/ppt/commonbehaviorcontext.cxx  |1 +
 oox/source/ppt/commonbehaviorcontext.hxx  |6 +++---
 oox/source/ppt/commontimenodecontext.cxx  |1 +
 oox/source/ppt/commontimenodecontext.hxx  |1 -
 oox/source/ppt/conditioncontext.hxx   |1 -
 oox/source/ppt/extdrawingfragmenthandler.cxx  |1 +
 oox/source/ppt/extdrawingfragmenthandler.hxx  |3 ---
 oox/source/shape/ShapeContextHandler.cxx  |2 ++
 oox/source/shape/ShapeContextHandler.hxx  |3 ---
 oox/source/shape/ShapeDrawingFragmentHandler.cxx  |1 +
 oox/source/shape/ShapeDrawingFragmentHandler.hxx  |2 +-
 51 files changed, 33 insertions(+), 66 deletions(-)

New commits:
commit b114e5659b94c0cc4bf9fe11c7d9e8d41223406d
Author: Gabor Kelemen 
AuthorDate: Sat Mar 7 09:15:39 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 9 11:54:45 2020 +0100

tdf#42949 Fix IWYU warnings in oox/*/*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/oox/IwyuFilter_oox.yaml b/oox/IwyuFilter_oox.yaml
new file mode 100644
index ..8b3931312af3
--- /dev/null
+++ b/oox/IwyuFilter_oox.yaml
@@ -0,0 +1,6 @@
+---
+assumeFilename: oox/source/export/drawingml.cxx
+blacklist:
+oox/source/docprop/docprophandler.hxx:
+# Needed for macro defines
+- oox/token/namespaces.hxx
diff --git a/oox/inc/drawingml/chart/axismodel.hxx 
b/oox/inc/drawingml/chart/axismodel.hxx
index 11cf8dfd910e..8f1f9046aed8 100644
--- a/oox/inc/drawingml/chart/axismodel.hxx
+++ b/oox/inc/drawingml/chart/axismodel.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
 
 #include 
-#include 
 #include 
 
 namespace oox {
diff --git a/oox/inc/drawingml/chart/converterbase.hxx 
b/oox/inc/drawingml/chart/converterbase.hxx
index 183bb16dfc59..9a29783ec027 100644
--- a/oox/inc/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/ch

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

[Balazs Varga (via logerrit)]

 chart2/source/view/axes/VCartesianAxis.cxx  |   39 ++--
 sw/qa/extras/layout/data/testTruncatedAxisLabel.odt |binary
 sw/qa/extras/layout/layout.cxx  |   24 
 3 files changed, 52 insertions(+), 11 deletions(-)

New commits:
commit 7c300296dd727990455449b19b111b9fc49eadad
Author: Balazs Varga 
AuthorDate: Mon Mar 2 13:55:35 2020 +0100
Commit: László Németh 
CommitDate: Mon Mar 9 11:57:29 2020 +0100

tdf#131060 tdf#117088 chart view: fix missing or truncated axis labels

if we have enough space under the horizontal X axis.

Note: allow truncation of vertical X axis labels only if they
are text labels and the position is NEAR_AXIS or OUTSIDE_START.

Regressions from commit 35d062f7879d5414334643cb90bff411726b2168
(tdf#116163: Limit label height in chart if needed)
and commit 26caf1bc59c81704f11225e3e431e412deb8c475
(tdf#114179: Custom size and position of the chart wall)

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

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 49d4d860c435..52dc4bdb20c8 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -76,28 +76,29 @@ static void lcl_ResizeTextShapeToFitAvailableSpace( 
Reference< drawing::XShape >
  const AxisLabelProperties& 
rAxisLabelProperties,
  const OUString& rLabel,
  const tNameSequence& rPropNames,
- const tAnySequence& rPropValues )
+ const tAnySequence& rPropValues,
+ const bool bIsHorizontalAxis )
 {
 uno::Reference< text::XTextRange > xTextRange( xShape2DText, 
uno::UNO_QUERY );
 
 if( !xTextRange.is() )
 return;
 
-const sal_Int32 nFullHeight = 
rAxisLabelProperties.m_aFontReferenceSize.Height;
+const sal_Int32 nFullSize = bIsHorizontalAxis ? 
rAxisLabelProperties.m_aFontReferenceSize.Height : 
rAxisLabelProperties.m_aFontReferenceSize.Width;
 
-if( !nFullHeight || !rLabel.getLength() )
+if( !nFullSize || !rLabel.getLength() )
 return;
 
-sal_Int32 nMaxLabelsHeight = nFullHeight - 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Height - 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Y;
+sal_Int32 nMaxLabelsSize = bIsHorizontalAxis ? 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Height : 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Width;
 const sal_Int32 nAvgCharWidth = xShape2DText->getSize().Width / 
rLabel.getLength();
-const sal_Int32 nTextSize = ShapeFactory::getSizeAfterRotation( 
xShape2DText,
-
rAxisLabelProperties.fRotationAngleDegree ).Height;
+const sal_Int32 nTextSize = bIsHorizontalAxis ? 
ShapeFactory::getSizeAfterRotation(xShape2DText, 
rAxisLabelProperties.fRotationAngleDegree).Height :
+
ShapeFactory::getSizeAfterRotation(xShape2DText, 
rAxisLabelProperties.fRotationAngleDegree).Width;
 
 if( !nAvgCharWidth )
 return;
 
 const OUString sDots = "...";
-const sal_Int32 nCharsToRemove = ( nTextSize - nMaxLabelsHeight ) / 
nAvgCharWidth + 1;
+const sal_Int32 nCharsToRemove = ( nTextSize - nMaxLabelsSize ) / 
nAvgCharWidth + 1;
 sal_Int32 nNewLen = rLabel.getLength() - nCharsToRemove - 
sDots.getLength();
 // Prevent from showing only dots
 if (nNewLen < 0)
@@ -128,6 +129,7 @@ static Reference< drawing::XShape > createSingleLabel(
   , const AxisProperties& rAxisProperties
   , const tNameSequence& rPropNames
   , const tAnySequence& rPropValues
+  , const bool bIsHorizontalAxis
   )
 {
 if(rLabel.isEmpty())
@@ -142,7 +144,7 @@ static Reference< drawing::XShape > createSingleLabel(
 ->createText( xTarget, aLabel, rPropNames, rPropValues, 
aATransformation );
 
 if( rAxisProperties.m_bLimitSpaceForLabels )
-lcl_ResizeTextShapeToFitAvailableSpace(xShape2DText, 
rAxisLabelProperties, aLabel, rPropNames, rPropValues);
+lcl_ResizeTextShapeToFitAvailableSpace(xShape2DText, 
rAxisLabelProperties, aLabel, rPropNames, rPropValues, bIsHorizontalAxis);
 
 LabelPositionHelper::correctPositionForRotation( xShape2DText
 , rAxisProperties.maLabelAlignment.meAlignment, 
rAxisLabelProperties.fRotationAngleDegree, rAxisProperties.m_bComplexCategories 
);
@@ -716,6 +718,21 @@ bool VCartesianAxis::createTextShapes(
 const bool bIsHorizontalAxis = pTickFactory->isHorizontalAxis();
 const bool bIsVerticalAxis = pTickFactory->isVerticalAxis();
 
+if(

[Libreoffice-commits] core.git: .gitpod.dockerfile .gitpod.yml

[Muhammet Kara (via logerrit)]

 .gitpod.dockerfile |   13 +
 .gitpod.yml|2 ++
 2 files changed, 15 insertions(+)

New commits:
commit 053752f8947361ee59b55e8150f681c7fd65aa9a
Author: Muhammet Kara 
AuthorDate: Mon Mar 9 03:50:53 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Mar 9 13:00:32 2020 +0100

Initial commit for Gitpodifying LibreOffice core

After this commit, it will be possible to automatically
create a Gitpod instance from the core repo, simply
by giving its address.

The instance will have all the build dependencies
and the latest core repo cloned. It is suggested to limit
the thread number by 4 by using the autogen.input file.
Otherwise, your compiler processes might get killed during
the build.

'Gitpod launches ready-to-code dev environments
for your GitHub or GitLab project with a single click.'

Change-Id: I7a0e07be6b36063f0527cb03ef032df3412afc7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90197
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
new file mode 100644
index ..e0a9d97efe1d
--- /dev/null
+++ b/.gitpod.dockerfile
@@ -0,0 +1,13 @@
+FROM gitpod/workspace-full
+
+RUN sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ disco main 
restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ disco-updates 
main restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
main restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
universe >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
multiverse >> /etc/apt/sources.list" \
+ && sudo apt-get update \
+ && sudo apt-get install -y \
+build-essential git libkrb5-dev graphviz nasm \
+ && sudo apt-get build-dep -y libreoffice \
+ && sudo rm -rf /var/lib/apt/lists/*
+
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index ..3cce5cbf7661
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,2 @@
+image:
+  file: .gitpod.dockerfile
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

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

New commits:
commit ad85d0503bdce3f4a7f8be3dc571343f5b7afdc6
Author: Stephan Bergmann 
AuthorDate: Mon Mar 9 11:20:36 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 9 13:07:27 2020 +0100

Adapt CLANGSYSINCLUDE to Git-based LLVM builds

...where `llvm-config --version` reports something like "11.0.0git"

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

diff --git a/configure.ac b/configure.ac
index 79041c595948..d17299ecd23f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7306,7 +7306,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 if test -z "$CLANGSYSINCLUDE"; then
 if test -n "$LLVM_CONFIG"; then
 # Path to the clang system headers (no idea if there's 
a better way to get it).
-CLANGSYSINCLUDE=$($LLVM_CONFIG 
--libdir)/clang/$($LLVM_CONFIG --version | sed 's/svn//')/include
+CLANGSYSINCLUDE=$($LLVM_CONFIG 
--libdir)/clang/$($LLVM_CONFIG --version | sed 's/git\|svn//')/include
 fi
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - ios/Mobile

[Tor Lillqvist (via logerrit)]

 ios/Mobile/Info.plist.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 585cf6be86c6535a9cf6b2ab45e9e606788433d2
Author: Tor Lillqvist 
AuthorDate: Mon Mar 9 14:03:25 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Mar 9 14:03:25 2020 +0200

Bump the internal iOS app version number to 4.2.2

Otherwise, when one validates (or uploads) a new build, even just for
TestFlight purposes, one gets an error in Xcode: "The value for key
CFBundleShortVersionString [4.2.1] in the Info.plist file must contain
a higher version than that of the previously approved version
[4.2.1]."

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 291a77a83..628e95e7b 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -410,7 +410,7 @@
 CFBundlePackageType
 APPL
 CFBundleShortVersionString
-4.2.1
+4.2.2
 CFBundleVersion
 @IOSAPP_BUNDLE_VERSION@
 LSRequiresIPhoneOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/chardlg.cxx |2 +-
 include/svtools/ctrlbox.hxx |2 +-
 svtools/source/control/ctrlbox.cxx  |8 ++--
 svx/source/tbxctrls/tbunocontroller.cxx |   10 +-
 vcl/source/app/salvtables.cxx   |2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 633b2f4dffedaf4a162a5fa92eeaeb509efab173
Author: Caolán McNamara 
AuthorDate: Mon Mar 9 10:26:54 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 9 13:25:56 2020 +0100

save/restore the entry text of the fontsize widget

instead of its value, because the min value is 2, but we set
empty text to indicate multiple values are selected in the underlying
text.

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

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index c6e4340be1bb..d8ab1aa1e9d1 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -766,7 +766,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, 
LanguageGroup eLangGrp
 }
 else
 {
-pSizeBox->set_active_text( OUString() );
+pSizeBox->set_entry_text( OUString() );
 if ( eState <= SfxItemState::READONLY )
 {
 pSizeBox->set_sensitive(false);
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 66a9a73cd988..60f1ab0510dc 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -438,7 +438,7 @@ public:
 void connect_focus_out(const Link& rLink) { 
m_aFocusOutHdl = rLink; }
 void connect_key_press(const Link& rLink) { 
m_xComboBox->connect_key_press(rLink); }
 OUString get_active_text() const { return m_xComboBox->get_active_text(); }
-void set_active_text(const OUString& rText) { 
m_xComboBox->set_active_text(rText); }
+void set_entry_text(const OUString& rText);
 void set_sensitive(bool bSensitive) { 
m_xComboBox->set_sensitive(bSensitive); }
 int get_active() const { return m_xComboBox->get_active(); }
 int get_value() const;
diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 04b586a82253..4ad49c2fc976 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -868,6 +868,11 @@ FontSizeBox::FontSizeBox(std::unique_ptr p)
 m_xComboBox->connect_changed(LINK(this, FontSizeBox, ModifyHdl));
 }
 
+void FontSizeBox::set_entry_text(const OUString& rText)
+{
+m_xComboBox->set_entry_text(rText);
+}
+
 IMPL_LINK(FontSizeBox, ReformatHdl, weld::Widget&, rWidget, void)
 {
 FontSizeNames 
aFontSizeNames(Application::GetSettings().GetUILanguageTag().getLanguageType());
@@ -1157,8 +1162,7 @@ void FontSizeBox::SetValue(int nNewValue, FieldUnit 
eInUnit)
 const int nFound = m_xComboBox->find_text(aResult);
 if (nFound != -1)
 m_xComboBox->set_active(nFound);
-else
-m_xComboBox->set_entry_text(aResult);
+m_xComboBox->set_entry_text(aResult);
 }
 
 void FontSizeBox::set_value(int nNewValue)
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx 
b/svx/source/tbxctrls/tbunocontroller.cxx
index e7a937ed79a9..717bb13fab6d 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -133,7 +133,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
 m_xWidget(new FontSizeBox(m_xBuilder->weld_combo_box("fontsizecombobox")))
 {
 m_xWidget->set_value(0);
-m_xWidget->set_active_text("");
+m_xWidget->set_entry_text("");
 m_xWidget->disable_entry_completion();
 
 m_xWidget->connect_changed(LINK(this, SvxFontSizeBox_Impl, SelectHdl));
@@ -217,9 +217,9 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, 
bool bErase )
 {
 // delete value in the display
 m_xWidget->set_value(-1L);
-m_xWidget->set_active_text("");
+m_xWidget->set_entry_text("");
 }
-m_xWidget->save_value();
+m_aCurText = m_xWidget->get_active_text();
 }
 
 void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& 
rCurrentFont )
@@ -260,7 +260,7 @@ IMPL_LINK(SvxFontSizeBox_Impl, KeyInputHdl, const 
KeyEvent&, rKEvt, bool)
 break;
 
 case KEY_ESCAPE:
-m_xWidget->set_active_text(m_aCurText);
+m_xWidget->set_entry_text(m_aCurText);
 if ( typeid( *GetParent() ) != typeid( 
sfx2::sidebar::SidebarToolBox ) )
 ReleaseFocus_Impl();
 bHandled = true;
@@ -273,7 +273,7 @@ IMPL_LINK(SvxFontSizeBox_Impl, KeyInputHdl, const 
KeyEvent&, rKEvt, bool)
 IMPL_LINK_NOARG(SvxFontSizeBox_Impl, FocusOutHdl, weld::Widget&, void)
 {
 if (!m_xWidget->has_focus()) // a combobox can be comprised of different 
subwidget so double-check if none of those has focus
-m_xWidget->set_value(m_xWidget->get_saved_value());

[Libreoffice-commits] core.git: Branch 'private/jmux/win-test-nohang' - 0 commits -

[(via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang compilerplugins/Makefile-clang.mk config_host.mk.in configure.ac distro-configs/Jenkins

[Stephan Bergmann (via logerrit)]

 compilerplugins/Makefile-clang.mk|7 ++-
 compilerplugins/clang/sharedvisitor/analyzer.cxx |2 +-
 config_host.mk.in|1 +
 configure.ac |   10 ++
 distro-configs/Jenkins/linux_clang_dbgutil_64|1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 5ab0f79748cad1069cc0d0c9cd4b57ccb1e14408
Author: Stephan Bergmann 
AuthorDate: Mon Mar 9 11:25:29 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 9 13:48:35 2020 +0100

Add --disable-compiler-plugins-analyzer-pch for 
Jenkins/linux_clang_dbgutil_64

 had been 
a
case I noticed of a "Gerrit Linux clang/dbgutil" build failing due to stale 
PCH
information:

[...]
> [build GEN] compilerplugins/clang/sharedvisitor/makeshared.plugininfo
> fatal error: file '/usr/include/asm-generic/errno.h' has been modified 
since the precompiled header 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/compilerplugins/clang/sharedvisitor/clang.pch'
 was built
> note: please rebuild precompiled header 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/compilerplugins/clang/sharedvisitor/clang.pch'
[...]

and this issue had apparently caused all those Gerrit Jenkins builds to 
fail for
at least a day.  For unmaintained builds like those, I think it is better to
have a more robust setup, where stale PCH information cannot break the 
build.
Also, as those builds do not make compilerplugins.clean and rather share it
across builds, there should not be much of a performance impact when 
disabling
PCH in the analyzer.

(It turns out that compilerplugins/clang/sharedvisitor/analyzer.cxx would 
always
have enabled PCH, as compilerplugins/Makefile-clang.mk always passes in some
definition of LO_CLANG_USE_ANALYZER_PCH.  Fixed that now.)

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

diff --git a/compilerplugins/Makefile-clang.mk 
b/compilerplugins/Makefile-clang.mk
index 65cfa67cb1ec..9d6b46019344 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -47,9 +47,6 @@ endif
 # by gb_ENABLE_PCH like everywhere else, but unsetting this disables PCH.
 LO_CLANG_USE_PCH=1
 
-# Whether to use precompiled headers for the analyzer too. Does not apply to 
compiling sources.
-LO_CLANG_USE_ANALYZER_PCH=1
-
 # The uninteresting rest.
 
 include $(SRCDIR)/solenv/gbuild/gbuild.mk
@@ -275,7 +272,7 @@ $(CLANGOUTDIR)/sharedvisitor/analyzer$(CLANG_EXE_EXT): 
$(CLANGINDIR)/sharedvisit
$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$@),$(true),GEN,1)
$(QUIET)$(COMPILER_PLUGINS_CXX) $(CLANGDEFS) $(CLANGCXXFLAGS) 
$(CLANGWERROR) $(CLANGINCLUDES) \
 -I$(BUILDDIR)/config_host -DCLANGFLAGS='"$(CLANGTOOLDEFS)"' \
--DLO_CLANG_USE_ANALYZER_PCH=$(LO_CLANG_USE_ANALYZER_PCH) \
+-DLO_CLANG_USE_ANALYZER_PCH=$(if $(COMPILER_PLUGINS_ANALYZER_PCH),1,0) 
\
 -c $< -o $(CLANGOUTDIR)/sharedvisitor/analyzer.o -MMD -MT $@ -MP \
 -MF $(CLANGOUTDIR)/sharedvisitor/analyzer.d
$(QUIET)$(COMPILER_PLUGINS_CXX) $(CLANGDEFS) $(CLANGCXXFLAGS) 
$(CLANGOUTDIR)/sharedvisitor/analyzer.o \
@@ -342,7 +339,7 @@ endif
 
 endif
 
-ifdef LO_CLANG_USE_ANALYZER_PCH
+ifeq ($(COMPILER_PLUGINS_ANALYZER_PCH),TRUE)
 # the PCH for usage in sharedvisitor/analyzer
 
 # these are from the invocation in analyzer.cxx
diff --git a/compilerplugins/clang/sharedvisitor/analyzer.cxx 
b/compilerplugins/clang/sharedvisitor/analyzer.cxx
index 7c69e4a9381c..ea519abb0d95 100644
--- a/compilerplugins/clang/sharedvisitor/analyzer.cxx
+++ b/compilerplugins/clang/sharedvisitor/analyzer.cxx
@@ -273,7 +273,7 @@ int main(int argc, char** argv)
 args.end(),
 {   // These must match LO_CLANG_ANALYZER_PCH_CXXFLAGS in 
Makefile-clang.mk .
 "-I" BUILDDIR "/config_host" // plugin sources use e.g. 
config_global.h
-#ifdef LO_CLANG_USE_ANALYZER_PCH
+#if LO_CLANG_USE_ANALYZER_PCH
 ,
 "-include-pch", // use PCH with Clang headers to speed up 
parsing/analysing
 BUILDDIR "/compilerplugins/clang/sharedvisitor/clang.pch"
diff --git a/config_host.mk.in b/config_host.mk.in
index 215212a6f06a..13e5e906a3f6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -78,6 +78,7 @@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@
 export COMMONS_LOGGING_VERSION=@COMMONS_LOGGING_VERSION@
 export COMPATH=@COMPATH@
 export COMPILER_PLUGINS=@COMPILER_PLUGINS@
+export COMPILER_PLUGINS_ANALYZER_PCH=@COMPILER_PLUGINS_ANALYZER_PCH@
 export COMPILER_PLUGINS_COM_IS_CLANG=@COMPILER_PLUGINS_COM_IS_CLANG@
 export COMPILER_PLUGINS_CXX=@COMPILER_PLU

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |   76 ++
 sw/qa/uitest/writer_tests6/tdf107975.py |   81 
 2 files changed, 76 insertions(+), 81 deletions(-)

New commits:
commit 2c5655d72401e6b6e917ece381e879b30680d20f
Author: Xisco Fauli 
AuthorDate: Mon Mar 9 11:13:32 2020 +0100
Commit: Xisco Faulí 
CommitDate: Mon Mar 9 13:50:05 2020 +0100

tdf#107975: move UItest to CppunitTest

Change-Id: I2616f651f13306dd78732937310f204789b470fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90213
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/uitest/writer_tests/data/tdf107975.odt 
b/sw/qa/extras/uiwriter/data3/tdf107975.odt
similarity index 100%
rename from sw/qa/uitest/writer_tests/data/tdf107975.odt
rename to sw/qa/extras/uiwriter/data3/tdf107975.odt
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index d9450881c47f..2a62ac2e9928 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -204,6 +205,81 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126340)
 CPPUNIT_ASSERT_EQUAL(OUString("foo"), getParagraph(1)->getString());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf107975)
+{
+// This test also covers tdf#117185 tdf#110442
+
+load(DATA_DIRECTORY, "tdf107975.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+uno::Reference 
xTextGraphicObjectsSupplier(mxComponent,
+   
   uno::UNO_QUERY);
+uno::Reference xIndexAccess(
+xTextGraphicObjectsSupplier->getGraphicObjects(), uno::UNO_QUERY);
+
+uno::Reference xShape(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
+ getProperty(xShape, 
"AnchorType"));
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+
+//Position the mouse cursor (caret) after "ABC" below the blue image
+dispatchCommand(mxComponent, ".uno:GoRight", {});
+dispatchCommand(mxComponent, ".uno:Paste", {});
+
+// without the fix, it crashes
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(OUString("ABC"), getParagraph(1)->getString());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+
+//try again with anchor at start of doc which is another special case
+xShape.set(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xShapeContent(xShape, uno::UNO_QUERY);
+uno::Reference const xStart = 
pTextDoc->getText()->getStart();
+xShapeContent->attach(xStart);
+
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
+ getProperty(xShape, 
"AnchorType"));
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+
+//Position the mouse cursor (caret) after "ABC" below the blue image
+dispatchCommand(mxComponent, ".uno:GoRight", {});
+dispatchCommand(mxComponent, ".uno:Paste", {});
+
+// without the fix, it crashes
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(OUString("ABC"), getParagraph(1)->getString());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130680)
 {
 load(DATA_DIRECTORY, "tdf130680.odt");
diff --git a/sw/qa/uitest/writer_tests6/tdf107975.py 
b/sw/qa/uitest/writer_tests6/tdf107975.py
deleted file mode 100644
index 9dea24d

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

[Luca Carlon (via logerrit)]

 vcl/inc/qt5/Qt5Frame.hxx |1 
 vcl/inc/qt5/Qt5Graphics.hxx  |4 
 vcl/inc/qt5/Qt5GraphicsBase.hxx  |   30 
 vcl/inc/qt5/Qt5Graphics_Controls.hxx |   40 --
 vcl/inc/qt5/Qt5Painter.hxx   |   10 +
 vcl/inc/qt5/Qt5SvpGraphics.hxx   |4 
 vcl/inc/qt5/Qt5Tools.hxx |   12 +
 vcl/qt5/Qt5Frame.cxx |   60 ++---
 vcl/qt5/Qt5Graphics.cxx  |8 -
 vcl/qt5/Qt5Graphics_Controls.cxx |  220 +++
 vcl/qt5/Qt5Instance.cxx  |4 
 vcl/qt5/Qt5MainWindow.cxx|5 
 vcl/qt5/Qt5SvpGraphics.cxx   |4 
 vcl/qt5/Qt5System.cxx|2 
 vcl/qt5/Qt5Widget.cxx|   55 +---
 15 files changed, 323 insertions(+), 136 deletions(-)

New commits:
commit 358991e3b0a49bb201c2f1e4be900ee99aac9aa8
Author: Luca Carlon 
AuthorDate: Sat Feb 29 13:39:29 2020 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Mar 9 14:19:49 2020 +0100

tdf#127687 Qt5 introduce basic HiDPI scaling

For tdf#124292, Qt's own HiDPI scaling was explicitly disabled,
but it turns out, you can't really scale QStyle painting then.

This patch series had a 2nd approach also used by Gtk+ currently,
which relied on the scaling of ths Cairo surface, which works
surprisingly good, but has to lie about the real DPI value, so
nothing is scaled twice. Also all icons are then scaled instead
of rendered with the proper resolution.

When HiDPI support in Qt is enabled, and the application is
started using QT_SCALE_FACTOR=1.25, Qt simply lowers the reported
resolution, keeps the logical DPI value of 96 and changes the
devicePixelRatio to the specified value. But LO still expects
the real DPI values and sizes, so we have to multiply a lot of
rectangles, sizes and positions.

The current result is far from perfect, which you can see with
the various graphics glitches, but it at least doesn't crash
anymore in the ControlType::Editbox sizing code.

The main problem is all the up and downscaling in the
getNativeControlRegion code, so LO knows the size of the widgets
for the correct layouting, since there seem to be no API to
get the scaled values from Qt / QStyle.

Change-Id: I687b1df6ef27724ce68326d256e9addccd72e759
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86239
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 5a88221565a3..0caf1bc3ef49 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -141,6 +141,7 @@ public:
 QWidget* GetQWidget() const { return m_pQWidget; }
 Qt5MainWindow* GetTopLevelWindow() const { return m_pTopLevel; }
 QWidget* asChild() const;
+qreal devicePixelRatioF() const;
 
 void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 
nExtentsWidth,
 sal_Int32 nExtentsHeight) const;
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index c36d22267fd2..0a66271c34e5 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 
+#include "Qt5GraphicsBase.hxx"
+
 class PhysicalFontCollection;
 class QImage;
 class QPushButton;
@@ -35,7 +37,7 @@ class Qt5FontFace;
 class Qt5Frame;
 class Qt5Painter;
 
-class Qt5Graphics final : public SalGraphics
+class Qt5Graphics final : public SalGraphics, public Qt5GraphicsBase
 {
 friend class Qt5Bitmap;
 friend class Qt5Painter;
diff --git a/vcl/inc/qt5/Qt5GraphicsBase.hxx b/vcl/inc/qt5/Qt5GraphicsBase.hxx
new file mode 100644
index ..ef7955186a6e
--- /dev/null
+++ b/vcl/inc/qt5/Qt5GraphicsBase.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+
+class Qt5GraphicsBase
+{
+qreal m_fDPR;
+
+protected:
+Qt5GraphicsBase()
+: m_fDPR(qApp ? qApp->devicePixelRatio() : 1.0)
+{
+}
+
+void setDevicePixelRatioF(qreal fDPR) { m_fDPR = fDPR; }
+
+public:
+qreal devicePixelRatioF() const { return m_fDPR; }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5Graphics_Controls.hxx 
b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
index f70804cea844..04503c7bdf17 100644
--- a/vcl/inc/qt5/Qt5Graphics_Controls.hxx
+++ b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
@@ -31,13 +31,16 @@
 #include 
 #include 
 
+class Qt5GraphicsBase;
+
 class Qt5Graphics_Controls final : public vcl::WidgetDrawInterface
 {
 std::unique_ptr m_image;
 QRect m_lastPopupRect;
+Qt5GraphicsBase const& m_rGraphics;

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 3 commits - configure.ac sw/Module_sw.mk sw/qa sw/source

[Samuel Mehrbrodt (via logerrit)]

 configure.ac  |2 +-
 sw/Module_sw.mk   |1 -
 sw/qa/python/testdocuments/xtextrange.odt |binary
 sw/qa/python/xtextrange.py|   21 +
 sw/source/core/unocore/unotext.cxx|   12 
 5 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit 712dedad90281ac9562249a99e4038b1fd406be7
Author: Samuel Mehrbrodt 
AuthorDate: Mon Mar 9 14:19:31 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 9 14:19:31 2020 +0100

Release 6.3.5.4

Change-Id: I57e8a35fd78ce416d7c062e82356fd61c80c7d7f

diff --git a/configure.ac b/configure.ac
index 9eca69a31a9a..9eba504f01bf 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],[6.3.5.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.5.4],[],[],[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
commit 5ee554fa3ed5f032173705c15d01843cda189733
Author: Samuel Mehrbrodt 
AuthorDate: Mon Mar 9 14:18:58 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 9 14:18:58 2020 +0100

Disable failing LibreLogo test (no LibreLogo in this branch)

Change-Id: Ie1b48d1fb71cc00d28864d9b8efb777e239b59e3

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index b20207c117ef..9121847c6f01 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -151,7 +151,6 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
UITest_sw_findReplace \
UITest_sw_findSimilarity \
UITest_chapterNumbering \
-   UITest_librelogo \
UITest_options \
UITest_classification \
 ))
commit 92a852b023b3acc44f016ffbe97eefde6ad5373d
Author: Samuel Mehrbrodt 
AuthorDate: Fri Mar 6 12:39:32 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 9 09:56:39 2020 +0100

tdf#131184 Allow comparing text ranges in table with body text

Change-Id: I191d8778d362cd28474eea6d18bfe40044887e30

diff --git a/sw/qa/python/testdocuments/xtextrange.odt 
b/sw/qa/python/testdocuments/xtextrange.odt
index 5881ea44a447..70c978349869 100644
Binary files a/sw/qa/python/testdocuments/xtextrange.odt and 
b/sw/qa/python/testdocuments/xtextrange.odt differ
diff --git a/sw/qa/python/xtextrange.py b/sw/qa/python/xtextrange.py
index e6875fadc097..4acc270246a1 100644
--- a/sw/qa/python/xtextrange.py
+++ b/sw/qa/python/xtextrange.py
@@ -91,6 +91,27 @@ class TestXTextRange(unittest.TestCase):
 xTextRange2 = xTextTable.getCellByName("A1")
 self.assertEqual(xTextRange2.getString(), "beforeC1after")
 
+def test_textRangesCompare(self):
+doc = self._uno.getDoc()
+# Bookmark in body text
+bookmark1 = doc.getBookmarks().getByIndex(0).getAnchor()
+
+# Bookmarks in table
+bookmark2 = doc.getBookmarks().getByIndex(1).getAnchor()
+bookmark3 = doc.getBookmarks().getByIndex(2).getAnchor()
+
+res = doc.Text.compareRegionStarts(bookmark1, bookmark2)
+self.assertEqual(res, 1)
+
+res = doc.Text.compareRegionStarts(bookmark2, bookmark1)
+self.assertEqual(res, -1)
+
+res = doc.Text.compareRegionStarts(bookmark2, bookmark3)
+self.assertEqual(res, 1)
+
+res = doc.Text.compareRegionStarts(bookmark1, bookmark3)
+self.assertEqual(res, 1)
+
 if __name__ == '__main__':
 unittest.main()
 
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 2c62d942aab6..9b5406c8fcb8 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1006,14 +1006,18 @@ bool SwXText::Impl::CheckForOwnMember(
 const SwNode& rSrcNode = rPaM.GetNode();
 const SwStartNode* pTmp = rSrcNode.FindSttNodeByType(eSearchNodeType);
 
-// skip SectionNodes
-while(pTmp && pTmp->IsSectionNode())
+// skip SectionNodes / TableNodes to be able to compare across 
table/section boundaries
+while (pTmp
+   && (pTmp->IsSectionNode() || pTmp->IsTableNode()
+   || (m_eType != CursorType::TableText
+   && pTmp->GetStartNodeType() == SwTableBoxStartNode)))
 {
 pTmp = pTmp->StartOfSectionNode();
 }
 
-//if the document starts with a section
-while(pOwnStartNode->IsSectionNode())
+while (pOwnStartNode->IsSectionNode() || pOwnStartNode->IsTableNode()
+   || (m_eType != CursorType::TableText
+   && pOwnStartNode->GetStartNodeType() == SwTableBoxStartNode))
 {
 pOwnStartNode = pOwnStartNode->StartOfSectionNode();
 }
___
Libr

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

[Miklos Vajna (via logerrit)]

 compilerplugins/clang/plugin.cxx |   18 --
 1 file changed, 18 deletions(-)

New commits:
commit cfc2a227b402930c2fe2c3087a0956c7f9a6d485
Author: Miklos Vajna 
AuthorDate: Mon Mar 9 11:59:11 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 9 14:22:50 2020 +0100

compilerplugins: remove unused getDeclContext()

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

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index d2555eb034c2..d91acf722f1a 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -199,24 +199,6 @@ Stmt* Plugin::getParentStmt( Stmt* stmt )
 return const_cast(parentsRange.begin()->get());
 }
 
-static const Decl* getDeclContext(ASTContext& context, const Stmt* stmt)
-{
-auto it = context.getParents(*stmt).begin();
-
-if (it == context.getParents(*stmt).end())
-  return nullptr;
-
-const Decl *aDecl = it->get();
-if (aDecl)
-  return aDecl;
-
-const Stmt *aStmt = it->get();
-if (aStmt)
-return getDeclContext(context, aStmt);
-
-return nullptr;
-}
-
 static const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* 
stmt)
 {
 auto it = context.getParents(*stmt).begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/jsdialogs' - 3 commits - desktop/source include/vcl sc/source sc/uiconfig sc/UIConfig_scalc.mk sfx2/source vcl/jsdialog vcl/source

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx  |   16 +-
 include/vcl/jsdialog/jsdialogbuilder.hxx |   13 +
 include/vcl/weld.hxx |2 
 sc/UIConfig_scalc.mk |2 
 sc/source/ui/dbgui/validate.cxx  |   11 +
 sc/uiconfig/scalc/ui/erroralerttabpage-mobile.ui |  151 +++
 sc/uiconfig/scalc/ui/validationhelptabpage-mobile.ui |  109 +
 sfx2/source/dialog/tabdlg.cxx|4 
 vcl/jsdialog/jsdialogbuilder.cxx |  117 --
 vcl/source/window/builder.cxx|3 
 10 files changed, 397 insertions(+), 31 deletions(-)

New commits:
commit 9bd44f1c7bda6c9c5225a91594aa0004b13e
Author: Szymon Kłos 
AuthorDate: Mon Mar 9 14:11:06 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 9 14:11:06 2020 +0100

jsdialog: handle nested tab pages

Change-Id: I04d5df55af0df18948730fcd9ee387abce77ac27

diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx 
b/include/vcl/jsdialog/jsdialogbuilder.hxx
index c14e4f40f2a0..107bd05c0bd4 100644
--- a/include/vcl/jsdialog/jsdialogbuilder.hxx
+++ b/include/vcl/jsdialog/jsdialogbuilder.hxx
@@ -26,8 +26,12 @@ public:
 class VCL_DLLPUBLIC JSInstanceBuilder : public SalInstanceBuilder
 {
 vcl::LOKWindowId m_nWindowId;
+/// used in case of tab pages where dialog is not a direct top level
+VclPtr m_aParentDialog;
+bool m_bHasTopLevelDialog;
 
 static std::map& GetLOKWeldWidgetsMap();
+static void InsertWindowToMap(int nWindowId);
 void RememberWidget(const OString &id, weld::Widget* pWidget);
 
 public:
@@ -103,6 +107,7 @@ public:
 virtual void insert(int pos, const OUString& rStr, const OUString* pId,
 const OUString* pIconName, VirtualDevice* 
pImageSurface) override;
 virtual void remove(int pos) override;
+virtual void set_active(int pos) override;
 };
 
 class VCL_DLLPUBLIC JSComboBox : public JSWidget
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 8ef457dd31a7..dafa0432c8f8 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -187,7 +188,8 @@ SfxTabPage::SfxTabPage(TabPageParent pParent, const 
OUString& rUIXMLDescription,
 , pSet( rAttrSet )
 , bHasExchangeSupport ( false )
 , pImpl   ( new TabPageImpl )
-, m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, 
rUIXMLDescription)
+, m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, 
rUIXMLDescription, comphelper::LibreOfficeKit::isActive()
+&& 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
: Application::CreateInterimBuilder(this, 
rUIXMLDescription))
 , m_xContainer(m_xBuilder->weld_container(rID))
 {
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 6f714c360c1f..2fae6e6ac172 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -30,12 +30,21 @@ JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, 
const OUString& rUIR
 dynamic_cast(pParent)->getWidget() : 
nullptr,
 rUIRoot, rUIFile)
 , m_nWindowId(0)
+, m_aParentDialog(nullptr)
+, m_bHasTopLevelDialog(false)
 {
+vcl::Window* pRoot = get_builder().get_widget_root();
+if (pRoot && pRoot->GetParent())
+{
+m_aParentDialog = pRoot->GetParent()->GetParentWithLOKNotifier();
+m_nWindowId = m_aParentDialog->GetLOKWindowId();
+InsertWindowToMap(m_nWindowId);
+}
 }
 
 JSInstanceBuilder::~JSInstanceBuilder()
 {
-if (m_nWindowId)
+if (m_nWindowId && m_bHasTopLevelDialog)
 GetLOKWeldWidgetsMap().erase(m_nWindowId);
 }
 
@@ -50,6 +59,7 @@ std::map& 
JSInstanceBuilder::GetLOKWeldWidgetsMap()
 weld::Widget* JSInstanceBuilder::FindWeldWidgetsMap(vcl::LOKWindowId 
nWindowId, const OString& rWidget)
 {
 const auto it = GetLOKWeldWidgetsMap().find(nWindowId);
+
 if (it != GetLOKWeldWidgetsMap().end())
 {
 auto widgetIt = it->second.find(rWidget);
@@ -60,6 +70,15 @@ weld::Widget* 
JSInstanceBuilder::FindWeldWidgetsMap(vcl::LOKWindowId nWindowId,
 return nullptr;
 }
 
+void JSInstanceBuilder::InsertWindowToMap(int nWindowId)
+{
+WidgetMap map;
+auto it = GetLOKWeldWidgetsMap().find(nWindowId);
+if (it == GetLOKWeldWidgetsMap().end())
+GetLOKWeldWidgetsMap().insert(
+std::map::value_type(nWindowId, map));
+}
+
 void JSInstanceBuilder::RememberWidget(const OString &id, weld::Widget* 
pWidget)
 {
 auto it = GetLOKWeldWidgetsMap().find(m_nWindowId);
@@ -74,8 +93,7 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id,
 ::Dialog* pDialog = m_xBuil

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/ximppage.cxx |   10 --
 xmloff/source/draw/ximppage.hxx |2 --
 2 files changed, 12 deletions(-)

New commits:
commit fca333820d24b0c4542e2f8e190da7a56dd55456
Author: Noel Grandin 
AuthorDate: Mon Mar 9 13:00:40 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 9 14:45:48 2020 +0100

StartElement/EndElement in SdXMLGenericPageContext are superfluous now

after
commit 2176aed0e3a79bd457ad3678490262dae9ea1361 (HEAD -> master)
Date:   Mon Mar 9 10:09:48 2020 +0200
convert SdXMLGenericPageContext to fastparser

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

diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index e3cd009a4139..1c3c555b719d 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -231,11 +231,6 @@ SdXMLGenericPageContext::~SdXMLGenericPageContext()
 {
 }
 
-void SdXMLGenericPageContext::StartElement( const Reference< 
css::xml::sax::XAttributeList >& )
-{
-assert(false);
-}
-
 void SdXMLGenericPageContext::startFastElement( sal_Int32 /*nElement*/, const 
Reference< css::xml::sax::XFastAttributeList >& )
 {
 GetImport().GetShapeImport()->pushGroupForPostProcessing( mxShapes );
@@ -281,11 +276,6 @@ SvXMLImportContextRef 
SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nP
 return xContext;
 }
 
-void SdXMLGenericPageContext::EndElement()
-{
-assert(false);
-}
-
 void SdXMLGenericPageContext::endFastElement(sal_Int32 )
 {
 GetImport().GetShapeImport()->popGroupAndPostProcess();
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index ba2eef58b8f4..daa47f9ec48a 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -64,14 +64,12 @@ public:
 css::uno::Reference< css::drawing::XShapes > const & rShapes);
 virtual ~SdXMLGenericPageContext() override;
 
-virtual void StartElement( const css::uno::Reference< 
css::xml::sax::XAttributeList >& xAttrList ) final  override;
 virtual void SAL_CALL startFastElement( sal_Int32 nElement, const 
css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) 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 >& AttrList ) override;
-virtual void EndElement() final override;
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
 const css::uno::Reference< css::drawing::XShapes >& 
GetLocalShapesContext() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js
 |  149 -
 cypress_test/integration_tests/mobile/writer/apply_font_spec.js
 |   35 +-
 
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js 
|   43 +-
 cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
 |   31 +-
 cypress_test/integration_tests/mobile/writer/insert_field_spec.js  
 |   15 
 cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
 |   15 
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js 
 |7 
 cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js   
 |3 
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js  
 |5 
 cypress_test/integration_tests/mobile/writer/spellchecking_spec.js 
 |7 
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js  
 |   35 +-
 cypress_test/integration_tests/mobile/writer/writer_helper.js  
 |  151 ++
 12 files changed, 254 insertions(+), 242 deletions(-)

New commits:
commit 9396cedd288380d9b6f373a491b80a802cb2cf61
Author: Tamás Zolnai 
AuthorDate: Mon Mar 9 14:00:44 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Mar 9 14:56:56 2020 +0100

cypress: mobile: move writer related helper functions to a separate file.

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

diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index 773c394f6..0e06a7d0e 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -46,105 +46,6 @@ function loadTestDoc(fileName, subFolder, mobile) {
cy.get('.leaflet-tile-loaded', {timeout : 1});
 }
 
-function selectAllMobile() {
-   // Remove selection if exist
-   cy.get('#document-container').click();
-   cy.get('.leaflet-marker-icon')
-   .should('not.exist');
-
-   // Enable editing if it's in read-only mode
-   cy.get('#mobile-edit-button')
-   .then(function(button) {
-   if (button.css('display') !== 'none') {
-   cy.get('#mobile-edit-button')
-   .click();
-   }
-   });
-
-   // Open hamburger menu
-   cy.get('#toolbar-hamburger')
-   .click();
-
-   // Open edit menu
-   cy.get('.ui-header.level-0 .menu-entry-with-icon')
-   .contains('Edit')
-   .click();
-
-   cy.get('.ui-header.level-1 .menu-entry-with-icon')
-   .should('be.visible')
-   .wait(100);
-
-   // Do the selection
-   cy.get('.ui-header.level-1 .menu-entry-with-icon')
-   .contains('Select All')
-   .click();
-
-   cy.get('.leaflet-marker-icon')
-   .should('exist');
-}
-
-function copyTextToClipboard() {
-   // Do a new selection
-   selectAllMobile();
-
-   // Open context menu
-   cy.get('.leaflet-marker-icon')
-   .then(function(marker) {
-   expect(marker).to.have.lengthOf(2);
-   var XPos =  (marker[0].getBoundingClientRect().right + 
marker[1].getBoundingClientRect().left) / 2;
-   var YPos = marker[0].getBoundingClientRect().top - 5;
-   longPressOnDocument(XPos, YPos);
-   });
-
-   // Execute copy
-   cy.get('.ui-header.level-0.mobile-wizard.ui-widget .context-menu-link 
.menu-entry-with-icon', {timeout : 1})
-   .contains('Copy')
-   .click();
-
-   // Close warning about clipboard operations
-   cy.get('.vex-dialog-button-primary.vex-dialog-button.vex-first')
-   .click();
-
-   // Wait until it's closed
-   cy.get('.vex-overlay')
-   .should('not.exist');
-}
-
-function copyTableToClipboard() {
-   // Do a new selection
-   selectAllMobile();
-
-   // Open context menu
-   cy.get('.leaflet-marker-icon')
-   .then(function(markers) {
-   expect(markers.length).to.have.greaterThan(1);
-   for (var i = 0; i < markers.length; i++) {
-   if 
(markers[i].classList.contains('leaflet-selection-marker-start')) {
-   var startPos = 
markers[i].getBoundingClientRect();
-   } else if 
(markers[i].classList.contains('leaflet-selection-marker-end')) {
-   var endPos = 
markers[i].getBoundingClientRect();
-   }
-   }
-
-  

[Libreoffice-commits] core.git: bin/find-mergedlib-can-be-private.py include/vcl

[Noel Grandin (via logerrit)]

 bin/find-mergedlib-can-be-private.py |7 ++-
 include/vcl/spinfld.hxx  |2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit e0720d253460a2715d89c98db01e11c9d429c6d1
Author: Noel Grandin 
AuthorDate: Mon Mar 9 14:12:45 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Mar 9 15:26:54 2020 +0100

make SpinField DLLPUBLIC again

to fix Window --enabled-mergedlibs

Change-Id: I0459798449e63c5e77a7b2e961520317d2383527
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90218
Reviewed-by: Mike Kaganski 
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins

diff --git a/bin/find-mergedlib-can-be-private.py 
b/bin/find-mergedlib-can-be-private.py
index ba09996b4757..ac9d96712391 100755
--- a/bin/find-mergedlib-can-be-private.py
+++ b/bin/find-mergedlib-can-be-private.py
@@ -143,7 +143,12 @@ pool = multiprocessing.Pool(multiprocessing.cpu_count())
 classes_with_exported_symbols = set(pool.map(extract_class, 
list(exported_symbols)))
 classes_with_imported_symbols = set(pool.map(extract_class, 
list(imported_symbols)))
 
+# Some stuff is particular to Windows, so won't be found by a Linux analysis, 
so remove
+# those classes.
+can_be_private_classes = classes_with_exported_symbols - 
classes_with_imported_symbols;
+can_be_private_classes.discard("SpinField")
+
 with open("bin/find-mergedlib-can-be-private.classes.results", "wt") as f:
-for sym in sorted(classes_with_exported_symbols - 
classes_with_imported_symbols):
+for sym in sorted(can_be_private_classes):
 if sym.startswith("std::") or sym.startswith("void std::"): continue
 f.write(sym + "\n")
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 860c44b6245c..eb9e3be59455 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -26,7 +26,7 @@
 #include 
 
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) SpinField : public Edit
+class VCL_DLLPUBLIC SpinField : public Edit
 {
 public:
 explicitSpinField( vcl::Window* pParent, WinBits nWinStyle );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am  |2 -
 cypress_test/data/mobile/calc/focus.ods   |binary
 cypress_test/integration_tests/mobile/calc/calc_helper.js |   24 
 cypress_test/integration_tests/mobile/calc/focus_spec.js  |   27 --
 4 files changed, 41 insertions(+), 12 deletions(-)

New commits:
commit 90c57174663f15dd4c300a069dc7116630a927d0
Author: Tamás Zolnai 
AuthorDate: Mon Mar 9 15:08:33 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Mar 9 15:39:40 2020 +0100

cypress: mobile: avoid hard coded coordinates for calc focus tests.

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

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 5e7c13c7e..e4616f3dc 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -31,7 +31,7 @@ export DISPLAY=$(if 
$(HEADLESS_BUILD),:$(DISPLAY_NUMBER),$(shell echo $$DISPLAY)
 
 if HAVE_LO_PATH
 MOBILE_TEST_FILES= \
-   calc/calc_focus_spec.js \
+   calc/focus_spec.js \
impress/impress_focus_spec.js \
writer/apply_font_spec.js \
writer/apply_paragraph_properties_spec.js \
diff --git a/cypress_test/data/mobile/calc/focus.ods 
b/cypress_test/data/mobile/calc/focus.ods
index 98c5d3a36..ab2f20975 100644
Binary files a/cypress_test/data/mobile/calc/focus.ods and 
b/cypress_test/data/mobile/calc/focus.ods differ
diff --git a/cypress_test/integration_tests/mobile/calc/calc_helper.js 
b/cypress_test/integration_tests/mobile/calc/calc_helper.js
new file mode 100644
index 0..5839efb01
--- /dev/null
+++ b/cypress_test/integration_tests/mobile/calc/calc_helper.js
@@ -0,0 +1,24 @@
+/* global cy expect*/
+
+function clickOnFirstCell() {
+   // Enable editing if it's in read-only mode
+   cy.get('#mobile-edit-button')
+   .then(function(button) {
+   if (button.css('display') !== 'none') {
+   cy.get('#mobile-edit-button')
+   .click();
+   }
+   });
+
+   // Use the tile's edge to find the first cell's position
+   cy.get('.leaflet-tile-container')
+   .then(function(items) {
+   expect(items).to.have.lengthOf(1);
+   var XPos = items[0].getBoundingClientRect().right + 10;
+   var YPos = items[0].getBoundingClientRect().top + 10;
+   cy.get('body')
+   .click(XPos, YPos);
+   });
+}
+
+module.exports.clickOnFirstCell = clickOnFirstCell;
diff --git a/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js 
b/cypress_test/integration_tests/mobile/calc/focus_spec.js
similarity index 66%
rename from cypress_test/integration_tests/mobile/calc/calc_focus_spec.js
rename to cypress_test/integration_tests/mobile/calc/focus_spec.js
index 8d5cada69..801b423f8 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -1,6 +1,7 @@
-/* global describe it cy beforeEach require afterEach*/
+/* global describe it cy beforeEach require afterEach expect*/
 
 var helper = require('../../common/helper');
+var calcHelper = require('./calc_helper');
 
 describe('Calc focus tests', function() {
beforeEach(function() {
@@ -23,18 +24,24 @@ describe('Calc focus tests', function() {
.should('be.eq', 'BODY');
 
// One tap on an other cell -> no focus on the document
-   cy.get('#document-container')
-   .click(120, 120);
+   calcHelper.clickOnFirstCell();
 
-   cy.get('.leaflet-marker-icon.spreadsheet-cell-resize-marker');
+   cy.get('.leaflet-marker-icon.spreadsheet-cell-resize-marker')
+   .should('be.visible');
 
// No focus
cy.document().its('activeElement.tagName')
.should('be.eq', 'BODY');
 
-   // Double tap on a cell gives the focus to the document
-   cy.get('#document-container')
-   .dblclick(20, 20);
+   // Double tap on another cell gives the focus to the document
+   cy.get('.spreadsheet-cell-resize-marker')
+   .then(function(items) {
+   expect(items).to.have.lengthOf(2);
+   var XPos = 
Math.max(items[0].getBoundingClientRect().right, 
items[1].getBoundingClientRect().right) + 10;
+   var YPos = 
Math.max(items[0].getBoundingClientRect().top, 
items[1].getBoundingClientRect().top) - 10;
+   cy.get('body')
+   .dblclick(XPos, YPos

[Libreoffice-commits] core.git: configure.ac

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 435e95410c920eb711b8afeebdaf254304de461d
Author: Jan Holesovsky 
AuthorDate: Mon Mar 9 10:03:05 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Mar 9 15:44:07 2020 +0100

Disable gtk in the build-config when cross-compiling.

Not needed at all and gtk3 is already disabled there.

Change-Id: Ic6f8be17645df22a414ae4b191a97b9bf1c16d1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90206
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index e82bc1b5adf5..eb2befed5276 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4786,6 +4786,7 @@ if test "$cross_compiling" = "yes"; then
 ./configure \
 --disable-cups \
 --disable-gstreamer-1-0 \
+--disable-gtk \
 --disable-gtk3 \
 --disable-pdfimport \
 --disable-postgresql-sdbc \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitpod.yml

[Muhammet Kara (via logerrit)]

 .gitpod.yml |4 
 1 file changed, 4 insertions(+)

New commits:
commit aed83675d184a9e3a3acb9e072d166e9834b35c6
Author: Muhammet Kara 
AuthorDate: Mon Mar 9 15:56:02 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Mar 9 15:54:14 2020 +0100

Install C++ VSCode extension for Gitpod

Change-Id: I631e050316acdcbb42dfbb5e6476a4e8e7cc0f8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90221
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/.gitpod.yml b/.gitpod.yml
index 3cce5cbf7661..d58da0084cac 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,2 +1,6 @@
 image:
   file: .gitpod.dockerfile
+
+vscode:
+  extensions:
+- ms-vscode.cpptools@0.26.2:Pq/tmf2WN3SanVzB4xZc1g==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit a1481e05437c8129d60678f5105ae04b413ae53d
Author: Caolán McNamara 
AuthorDate: Mon Mar 9 12:54:34 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 9 15:59:28 2020 +0100

add more needed menu accel names

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index f44dabce534c..6291fd4226a1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3622,6 +3622,16 @@ namespace
 return vcl::KeyCode(KEY_INSERT, bShift, bMod1, bMod2, bMod3);
 else if (rKey.first == "Delete")
 return vcl::KeyCode(KEY_DELETE, bShift, bMod1, bMod2, bMod3);
+else if (rKey.first == "Return")
+return vcl::KeyCode(KEY_RETURN, bShift, bMod1, bMod2, bMod3);
+else if (rKey.first == "Up")
+return vcl::KeyCode(KEY_UP, bShift, bMod1, bMod2, bMod3);
+else if (rKey.first == "Down")
+return vcl::KeyCode(KEY_DOWN, bShift, bMod1, bMod2, bMod3);
+else if (rKey.first == "Left")
+return vcl::KeyCode(KEY_LEFT, bShift, bMod1, bMod2, bMod3);
+else if (rKey.first == "Right")
+return vcl::KeyCode(KEY_RIGHT, bShift, bMod1, bMod2, bMod3);
 
 assert (rKey.first.getLength() == 1);
 char cChar = rKey.first.toChar();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[LibreOfficiant (via logerrit)]

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

New commits:
commit 5ec3eb9e044f6e736fdff9302c6eb52c76e85391
Author: LibreOfficiant 
AuthorDate: Mon Mar 9 16:18:11 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 9 16:18:11 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to e394800294622c606ca01e3f75c2affc77f547cc
  - faulty link due to an improper uppercase letter

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

diff --git a/helpcontent2 b/helpcontent2
index 4d5bdcb2d5e8..e39480029462 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4d5bdcb2d5e8fd040995ec870003a3f2b117a720
+Subproject commit e394800294622c606ca01e3f75c2affc77f547cc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[LibreOfficiant (via logerrit)]

 source/text/sbasic/shared/property.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e394800294622c606ca01e3f75c2affc77f547cc
Author: LibreOfficiant 
AuthorDate: Mon Mar 9 12:39:08 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 9 16:18:11 2020 +0100

faulty link due to an improper uppercase letter

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

diff --git a/source/text/sbasic/shared/property.xhp 
b/source/text/sbasic/shared/property.xhp
index 052c25aff..b2a4c1b3b 100644
--- a/source/text/sbasic/shared/property.xhp
+++ b/source/text/sbasic/shared/property.xhp
@@ -20,7 +20,7 @@

   
  Property 
Statement
- /text/sbasic/shared/Property.xhp
+ /text/sbasic/shared/property.xhp
   


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

Yukio Siraichi license statement

[Yukio Siraichi]

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Adolfo Jayme Barrientos (via logerrit)]

 connectivity/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c2bbb2cb8c3a5dcdad242454049a1a12ee4d7e2d
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Mar 9 07:19:05 2020 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 9 16:41:06 2020 +0100

Rephrase an ungrammatical string

Reported by Tuomas Hietala.

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

diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc
index 2be7348f065c..c1b4fa30b977 100644
--- a/connectivity/inc/strings.hrc
+++ b/connectivity/inc/strings.hrc
@@ -34,7 +34,7 @@
 #define STR_ILLEGAL_MOVEMENTNC_("STR_ILLEGAL_MOVEMENT", 
"Illegal cursor movement occurred.")
 #define STR_COMMIT_ROW  NC_("STR_COMMIT_ROW", "Please 
commit row '$position$' before update rows or insert new rows.")
 // = common strings
-#define STR_NO_CONNECTION_GIVEN NC_("STR_NO_CONNECTION_GIVEN", 
"It doesn't exist a connection to the database.")
+#define STR_NO_CONNECTION_GIVEN NC_("STR_NO_CONNECTION_GIVEN", 
"No connection to the database exists.")
 #define STR_WRONG_PARAM_INDEX   NC_("STR_WRONG_PARAM_INDEX", 
"You tried to set a parameter at position '$pos$' but there is/are only 
'$count$' parameter(s) allowed. One reason may be that the property 
\"ParameterNameSubstitution\" is not set to TRUE in the data source.")
 #define STR_NO_INPUTSTREAM  NC_("STR_NO_INPUTSTREAM", "The 
input stream was not set.")
 #define STR_NO_ELEMENT_NAME NC_("STR_NO_ELEMENT_NAME", 
"There is no element named '$name$'.")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/inc/converters.hxx|3 ---
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx |6 --
 drawinglayer/source/texture/texture.cxx|   10 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 60b041f1a0bb5312dd4147698bb1a829dc25227b
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 8 17:54:32 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 9 17:17:38 2020 +0100

drawinglayer: move getRandomColorRange to be private to GeoTexSvx

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

diff --git a/drawinglayer/inc/converters.hxx b/drawinglayer/inc/converters.hxx
index acc00f3c4b3c..4f585d5d08db 100644
--- a/drawinglayer/inc/converters.hxx
+++ b/drawinglayer/inc/converters.hxx
@@ -24,7 +24,6 @@
 
 namespace drawinglayer
 {
-
 BitmapEx convertToBitmapEx(
 const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
 const geometry::ViewInformation2D& rViewInformation2D,
@@ -32,8 +31,6 @@ namespace drawinglayer
 sal_uInt32 nDiscreteHeight,
 sal_uInt32 nMaxQuadratPixels);
 
-double getRandomColorRange();
-
 } // end of namespace drawinglayer
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx 
b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index cdcc843a8b17..a93deae3817f 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -196,11 +195,6 @@ namespace drawinglayer::primitive2d
 
 namespace drawinglayer
 {
-double getRandomColorRange()
-{
-return comphelper::rng::uniform_real_distribution(0.0, nextafter(1.0, 
DBL_MAX));
-}
-
 namespace primitive2d
 {
 void 
PolygonStrokePrimitive2D::create2DDecomposition(Primitive2DContainer& 
rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
diff --git a/drawinglayer/source/texture/texture.cxx 
b/drawinglayer/source/texture/texture.cxx
index 8aa121462465..7ca4a4f1b164 100644
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
@@ -26,10 +26,18 @@
 #include 
 #include 
 
-#include 
+#include 
 
 namespace drawinglayer::texture
 {
+namespace
+{
+double getRandomColorRange()
+{
+return comphelper::rng::uniform_real_distribution(0.0, 
nextafter(1.0, DBL_MAX));
+}
+}
+
 GeoTexSvx::GeoTexSvx()
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0f3b02f38394053deca3a4277ffd78c57795f189
Author: Miklos Vajna 
AuthorDate: Mon Mar 9 16:04:41 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 9 18:07:34 2020 +0100

PDF export: use MARK() when writing links

Links can be created using link or widget annotations, this helps
finding the relevant code when reading the debug output. Same for page
objects.

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

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index f5efd314fcb8..e747071adbe1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -618,6 +618,7 @@ void PDFPage::endStream()
 
 bool PDFPage::emit(sal_Int32 nParentObject )
 {
+m_pWriter->MARK("PDFPage::emit");
 // emit page object
 if( ! m_pWriter->updateObject( m_nPageObject ) )
 return false;
@@ -3159,6 +3160,7 @@ bool PDFWriterImpl::emitScreenAnnotations()
 
 bool PDFWriterImpl::emitLinkAnnotations()
 {
+MARK("PDFWriterImpl::emitLinkAnnotations");
 int nAnnots = m_aLinks.size();
 for( int i = 0; i < nAnnots; i++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 solenv/bin/native-code.py |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 7374fa59b929bea6792f80a6a819b2a06582722f
Author: Michael Weghorn 
AuthorDate: Mon Mar 9 15:36:20 2020 +0100
Commit: Michael Weghorn 
CommitDate: Mon Mar 9 18:30:41 2020 +0100

tdf#128308 liblo-native-code: Add some missing services

Those form-related services are needed to handle the bugdoc and
another document with form elements that I was given.

'adb logcat' output for a debug build already showed the cause
of the crashes with messages like:

 W cppuhelper: 31:cppuhelper/source/shlib.cxx:288: unknown constructor name 
"com_sun_star_form_ORadioButtonControl_get_implementation"

Change-Id: I20232e097bedba13b94e3ff01839d55da819e6cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90232
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 29de9541b995..1c8fc22c5b41 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -147,6 +147,7 @@ core_constructor_list = [
 ("com_sun_star_comp_forms_FormOperations_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 
("com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation",
 "#if HAVE_FEATURE_DBCONNECTIVITY"),
+("com_sun_star_comp_form_ORichTextControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_comp_forms_ORichTextModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_comp_forms_OScrollBarModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_comp_forms_OSpinButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
@@ -165,8 +166,10 @@ core_constructor_list = [
 ("com_sun_star_form_OFormsCollection_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_form_OGridControlModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_form_OGroupBoxModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
+("com_sun_star_form_OListBoxControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_form_OListBoxModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_form_ONumericModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
+("com_sun_star_form_ORadioButtonControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_form_ORadioButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 ("com_sun_star_form_XForms_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
 # framework/util/fwk.component
@@ -274,6 +277,8 @@ core_constructor_list = [
 "stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation",
 "stardiv_Toolkit_UnoControlScrollBarModel_get_implementation",
 "stardiv_Toolkit_UnoDateFieldControl_get_implementation",
+"stardiv_Toolkit_UnoListBoxControl_get_implementation",
+"stardiv_Toolkit_UnoRadioButtonControl_get_implementation",
 "stardiv_Toolkit_UnoSpinButtonModel_get_implementation",
 "stardiv_Toolkit_VCLXPointer_get_implementation",
 "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/drawinglayer/processor2d/linegeometryextractor2d.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d9d1f299765e4d84043d9c660b8d4a43c82b153a
Author: Andrea Gelmini 
AuthorDate: Mon Mar 9 15:21:08 2020 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 9 19:50:28 2020 +0100

Fix typo

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

diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx 
b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
index 1b2da32d30ac..4ea00c669bf5 100644
--- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
+++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
@@ -33,7 +33,7 @@ namespace drawinglayer
 {
 /** LineGeometryExtractor2D class
 
-This processor can extract the line geometry from feeded 
primitives. The
+This processor can extract the line geometry from fed primitives. 
The
 hairlines and the fill geometry from fat lines are separated.
  */
 class DRAWINGLAYER_DLLPUBLIC LineGeometryExtractor2D final : public 
BaseProcessor2D
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/drawinglayer/processor2d/hittestprocessor2d.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0f2c49ce997aa884b94ca708a084308d21cdbaa
Author: Andrea Gelmini 
AuthorDate: Mon Mar 9 15:21:07 2020 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 9 19:50:52 2020 +0100

Fix typo

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

diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx 
b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index af0042a7805a..184149e00412 100644
--- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
 {
 /** HitTestProcessor2D class
 
-This processor implements a HitTest with the feeded primitives,
+This processor implements a HitTest with the fed primitives,
 given tolerance and extras
  */
 class DRAWINGLAYER_DLLPUBLIC HitTestProcessor2D final : public 
BaseProcessor2D
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/drawinglayer/processor3d/geometry2dextractor.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3566040fc32a8690bc2e1b7246eb2dcf42316c4f
Author: Andrea Gelmini 
AuthorDate: Mon Mar 9 15:21:12 2020 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 9 19:51:16 2020 +0100

Fix typo

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

diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx 
b/include/drawinglayer/processor3d/geometry2dextractor.hxx
index f7d5f1de2c22..e9b13e1ccfc6 100644
--- a/include/drawinglayer/processor3d/geometry2dextractor.hxx
+++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
 {
 /** Geometry2DExtractingProcessor class
 
-This processor extracts the 2D geometry (projected geometry) of 
all feeded primitives.
+This processor extracts the 2D geometry (projected geometry) of 
all fed primitives.
 It is e.g. used as sub-processor for contour extraction where 3D 
geometry is only
 useful as 2D projected geometry.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/drawinglayer/processor3d/cutfindprocessor3d.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a5dc7a01287046ec7906f78bda38e3f54c3bb17d
Author: Andrea Gelmini 
AuthorDate: Mon Mar 9 15:21:11 2020 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 9 19:51:41 2020 +0100

Fix typo

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

diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx 
b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx
index 7d415fae4ec8..943bad0830f1 100644
--- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx
@@ -31,7 +31,7 @@ namespace drawinglayer
 {
 /** CutFindProcessor class
 
-This processor extracts all cuts of 3D plane geometries in the 
feeded primitives
+This processor extracts all cuts of 3D plane geometries in the fed 
primitives
 with the given cut vector, based on the ViewInformation3D given.
  */
 class DRAWINGLAYER_DLLPUBLIC CutFindProcessor final : public 
BaseProcessor3D
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/drawinglayer/processor2d/textaspolygonextractor2d.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 65a004ccefbb32c497ea2b2a1384c9e139d3bc33
Author: Andrea Gelmini 
AuthorDate: Mon Mar 9 15:21:10 2020 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 9 19:52:27 2020 +0100

Fix typo

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

diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx 
b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
index b41587497b44..e973a372ad01 100644
--- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
+++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
@@ -63,7 +63,7 @@ namespace drawinglayer
 
 /** TextAsPolygonExtractor2D class
 
-This processor extracts text in the feeded primitives to filled 
polygons
+This processor extracts text in the fed primitives to filled 
polygons
  */
 class DRAWINGLAYER_DLLPUBLIC TextAsPolygonExtractor2D final : public 
BaseProcessor2D
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00cd7477e46fefa3c98929cf9cc4ec9a17f76071
Author: Andrea Gelmini 
AuthorDate: Mon Mar 9 15:21:04 2020 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 9 19:53:02 2020 +0100

Fix typo

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

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index 2d8472048ed0..b1c7c47c2386 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -51,7 +51,7 @@ namespace drawinglayer
 /** VclPixelProcessor2D class
 
 This processor derived from VclProcessor2D is the base class for 
rendering
-all feeded primitives to a VCL Window. It is the currently used 
renderer
+all fed primitives to a VCL Window. It is the currently used 
renderer
 for all VCL editing output from the DrawingLayer.
  */
 class VclPixelProcessor2D final : public VclProcessor2D
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx |   75 +---
 1 file changed, 11 insertions(+), 64 deletions(-)

New commits:
commit e1fc2e2dbc556e8bbe072ee3d58b16ca66936ee1
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 8 22:40:12 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 9 20:01:11 2020 +0100

cleanup namespaces in polypolygonprimitive2d.hxx

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

diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx 
b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index f830aacf2c73..e7127129b931 100644
--- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -31,13 +31,10 @@
 #include 
 #include 
 
-
-// PolyPolygonHairlinePrimitive2D class
-
-namespace drawinglayer
+namespace drawinglayer::primitive2d
 {
-namespace primitive2d
-{
+// PolyPolygonHairlinePrimitive2D class
+
 /** PolyPolygonHairlinePrimitive2D class
 
 This primitive defines a multi-PolygonHairlinePrimitive2D and is
@@ -73,16 +70,9 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32 getPrimitive2DID() const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+// PolyPolygonMarkerPrimitive2D class
 
-// PolyPolygonMarkerPrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** PolyPolygonMarkerPrimitive2D class
 
 This primitive defines a multi-PolygonMarkerPrimitive2D and is
@@ -128,16 +118,9 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32 getPrimitive2DID() const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+// PolyPolygonStrokePrimitive2D class
 
-// PolyPolygonStrokePrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** PolyPolygonStrokePrimitive2D class
 
 This primitive defines a multi-PolygonStrokePrimitive2D and is
@@ -184,16 +167,9 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32 getPrimitive2DID() const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+// PolyPolygonColorPrimitive2D class
 
-// PolyPolygonColorPrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** PolyPolygonColorPrimitive2D class
 
 This primitive defines a tools::PolyPolygon filled with a single 
color.
@@ -228,16 +204,9 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32 getPrimitive2DID() const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+// PolyPolygonGradientPrimitive2D class
 
-// PolyPolygonGradientPrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** PolyPolygonColorPrimitive2D class
 
 This primitive defines a tools::PolyPolygon filled with a 
gradient. The
@@ -280,16 +249,9 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32 getPrimitive2DID() const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+// PolyPolygonHatchPrimitive2D class
 
-// PolyPolygonHatchPrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** PolyPolygonHatchPrimitive2D class
 
 This primitive defines a tools::PolyPolygon filled with a hatch. 
The
@@ -338,16 +300,9 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32 getPrimitive2DID() const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+// PolyPolygonGraphicPrimitive2D class
 
-// PolyPolygonGraphicPrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** PolyPolygonGraphicPrimitive2D class
 
 This primitive defines a tools::PolyPolygon filled with bitmap data
@@ -386,16 +341,9 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32 getPrimitive2DID() const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+// PolyPolygonSelectionPrimitive2D class
 
-// PolyPolygonSelectionPrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** PolyPolygonSelectionPrimitive2D class
 
 This primitive defines a tools::PolyPolygon which gets filled with 
a defined color
@@ -448,8 +396,7 @@ namespace drawinglayer
 /// provide unique ID
 virtual sal_uInt32

[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg

[rizmut (via logerrit)]

 icon-themes/sukapura/cmd/32/zoom100percent.png |binary
 icon-themes/sukapura/cmd/32/zoommode.png   |binary
 icon-themes/sukapura/cmd/32/zoomoptimal.png|binary
 icon-themes/sukapura/cmd/lc_zoom100percent.png |binary
 icon-themes/sukapura/cmd/lc_zoommode.png   |binary
 icon-themes/sukapura/cmd/lc_zoomoptimal.png|binary
 icon-themes/sukapura/cmd/sc_zoom100percent.png |binary
 icon-themes/sukapura/cmd/sc_zoommode.png   |binary
 icon-themes/sukapura/cmd/sc_zoomoptimal.png|binary
 icon-themes/sukapura/links.txt |3 ---
 icon-themes/sukapura_svg/cmd/32/zoom100percent.svg |2 +-
 icon-themes/sukapura_svg/cmd/32/zoommode.svg   |1 +
 icon-themes/sukapura_svg/cmd/32/zoomoptimal.svg|2 +-
 icon-themes/sukapura_svg/cmd/lc_zoom100percent.svg |2 +-
 icon-themes/sukapura_svg/cmd/lc_zoommode.svg   |1 +
 icon-themes/sukapura_svg/cmd/lc_zoomoptimal.svg|2 +-
 icon-themes/sukapura_svg/cmd/sc_zoom100percent.svg |7 ---
 icon-themes/sukapura_svg/cmd/sc_zoommode.svg   |9 +
 icon-themes/sukapura_svg/cmd/sc_zoomoptimal.svg|3 ++-
 19 files changed, 21 insertions(+), 11 deletions(-)

New commits:
commit c63e40eabf6886a6e6584be8d5a1cb2b573b86ff
Author: rizmut 
AuthorDate: Mon Mar 9 23:32:34 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 9 20:18:14 2020 +0100

Sukapura: Add "Zoom & Pan" icons, update zoom 100% icons

Change-Id: Ia896ad5c56cdb8b5c8db15e7ea98a77623b77b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90236
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sukapura/cmd/32/zoom100percent.png 
b/icon-themes/sukapura/cmd/32/zoom100percent.png
index 5ad68d09e4b5..b45b4df3ad01 100644
Binary files a/icon-themes/sukapura/cmd/32/zoom100percent.png and 
b/icon-themes/sukapura/cmd/32/zoom100percent.png differ
diff --git a/icon-themes/sukapura/cmd/32/zoommode.png 
b/icon-themes/sukapura/cmd/32/zoommode.png
new file mode 100644
index ..d51dbde9e507
Binary files /dev/null and b/icon-themes/sukapura/cmd/32/zoommode.png differ
diff --git a/icon-themes/sukapura/cmd/32/zoomoptimal.png 
b/icon-themes/sukapura/cmd/32/zoomoptimal.png
index e254719e0fd7..af620f7f7f03 100644
Binary files a/icon-themes/sukapura/cmd/32/zoomoptimal.png and 
b/icon-themes/sukapura/cmd/32/zoomoptimal.png differ
diff --git a/icon-themes/sukapura/cmd/lc_zoom100percent.png 
b/icon-themes/sukapura/cmd/lc_zoom100percent.png
index f9579eee98cb..f47c9011b8ac 100644
Binary files a/icon-themes/sukapura/cmd/lc_zoom100percent.png and 
b/icon-themes/sukapura/cmd/lc_zoom100percent.png differ
diff --git a/icon-themes/sukapura/cmd/lc_zoommode.png 
b/icon-themes/sukapura/cmd/lc_zoommode.png
new file mode 100644
index ..0dcd99b34b2e
Binary files /dev/null and b/icon-themes/sukapura/cmd/lc_zoommode.png differ
diff --git a/icon-themes/sukapura/cmd/lc_zoomoptimal.png 
b/icon-themes/sukapura/cmd/lc_zoomoptimal.png
index 57f9208d0f94..52b37a77dc36 100644
Binary files a/icon-themes/sukapura/cmd/lc_zoomoptimal.png and 
b/icon-themes/sukapura/cmd/lc_zoomoptimal.png differ
diff --git a/icon-themes/sukapura/cmd/sc_zoom100percent.png 
b/icon-themes/sukapura/cmd/sc_zoom100percent.png
index 6840de92709c..dbb1828bad1d 100644
Binary files a/icon-themes/sukapura/cmd/sc_zoom100percent.png and 
b/icon-themes/sukapura/cmd/sc_zoom100percent.png differ
diff --git a/icon-themes/sukapura/cmd/sc_zoommode.png 
b/icon-themes/sukapura/cmd/sc_zoommode.png
new file mode 100644
index ..1adf424dcaf2
Binary files /dev/null and b/icon-themes/sukapura/cmd/sc_zoommode.png differ
diff --git a/icon-themes/sukapura/cmd/sc_zoomoptimal.png 
b/icon-themes/sukapura/cmd/sc_zoomoptimal.png
index fb40f0b45d5b..d064a4be00b1 100644
Binary files a/icon-themes/sukapura/cmd/sc_zoomoptimal.png and 
b/icon-themes/sukapura/cmd/sc_zoomoptimal.png differ
diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt
index 3e8f349d749e..99c3d8bd1ff5 100644
--- a/icon-themes/sukapura/links.txt
+++ b/icon-themes/sukapura/links.txt
@@ -223,7 +223,6 @@ cmd/32/adjust.png cmd/32/zoomoptimal.png
 cmd/32/previewzoom.png cmd/32/zoom.png
 cmd/32/view100.png cmd/32/zoom100percent.png
 cmd/32/zoomminus.png cmd/32/zoomout.png
-cmd/32/zoommode.png cmd/32/zoomoptimal.png
 cmd/32/zoomplus.png cmd/32/zoomin.png
 cmd/32/zoomtoolbox.png cmd/32/zoom.png
 
@@ -231,7 +230,6 @@ cmd/lc_adjust.png cmd/lc_zoomoptimal.png
 cmd/lc_previewzoom.png cmd/lc_zoom.png
 cmd/lc_view100.png cmd/lc_zoom100percent.png
 cmd/lc_zoomminus.png cmd/lc_zoomout.png
-cmd/lc_zoommode.png cmd/lc_zoomoptimal.png
 cmd/lc_zoomplus.png cmd/lc_zoomin.png
 cmd/lc_zoomtoolbox.png cmd/lc_zoom.png
 
@@ -239,7 +237,6 @@ cmd/sc_adjust.png cmd/sc_zoomoptimal.png
 cmd/sc_previewzoom.png cmd/sc_zoom.png
 cmd/sc_view100.png cmd/sc_zoom100percent.png
 cmd/sc_zoomminus.png cmd/sc_zoomout.png
-cmd/sc_zoommode.png cmd/sc_zoomoptimal.pn

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

[Noel Grandin (via logerrit)]

 xmloff/inc/animimp.hxx  |   18 +--
 xmloff/source/draw/animimp.cxx  |  240 +++-
 xmloff/source/draw/ximppage.cxx |8 +
 3 files changed, 128 insertions(+), 138 deletions(-)

New commits:
commit c8dbdd691e8d08d16f421d471eb269804de262d5
Author: Noel Grandin 
AuthorDate: Mon Mar 9 14:08:41 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 9 20:29:33 2020 +0100

use FastParser in XMLAnimationsContext

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

diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 8e2ead46867b..1511994a89c2 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -23,24 +23,22 @@
 #include 
 
 #include 
-
-class AnimImpImpl;
+#include 
 
 // presentations:animations
 
 class XMLAnimationsContext final : public SvXMLImportContext
 {
-std::shared_ptr mpImpl;
-
 public:
+css::uno::Reference< css::beans::XPropertySet > mxLastShape;
+OUString maLastShapeId;
+
+XMLAnimationsContext( SvXMLImport& rImport);
 
-XMLAnimationsContext( SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList);
+virtual void SAL_CALL startFastElement( sal_Int32 nElement, const 
css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) 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 >& AttrList ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index f2178aeb8454..580491ae3eb2 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -27,6 +27,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -315,12 +316,8 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, 
XMLEffectDirection eDirecti
 }
 }
 
-class AnimImpImpl
+namespace
 {
-public:
-Reference< XPropertySet > mxLastShape;
-OUString maLastShapeId;
-
 static constexpr OUStringLiteral gsDimColor = "DimColor";
 static constexpr OUStringLiteral gsDimHide = "DimHide";
 static constexpr OUStringLiteral gsDimPrev = "DimPrevious";
@@ -348,7 +345,7 @@ enum XMLActionKind
 class XMLAnimationsEffectContext : public SvXMLImportContext
 {
 public:
-std::shared_ptr mpImpl;
+rtl::Reference mxAnimationsContext;
 
 XMLActionKind   meKind;
 boolmbTextEffect;
@@ -367,152 +364,141 @@ public:
 public:
 
 XMLAnimationsEffectContext( SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName,
-const Reference< XAttributeList >& xAttrList,
-const std::shared_ptr& pImpl);
+sal_Int32 nElement,
+const Reference< XFastAttributeList >& xAttrList,
+XMLAnimationsContext& rAnimationsContext);
 
-virtual void EndElement() override;
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
/*xAttrList*/ ) override {}
 
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, 
const OUString& rLocalName,
-const Reference< XAttributeList >& xAttrList ) override;
+virtual void SAL_CALL endFastElement(sal_Int32 nElement) 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;
 };
 
 class XMLAnimationsSoundContext : public SvXMLImportContext
 {
 public:
 
-XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const 
OUString& rLocalName, const Reference< XAttributeList >& xAttrList, 
XMLAnimationsEffectContext* pParent );
+XMLAnimationsSoundContext( SvXMLImport& rImport, sal_Int32 nElement, const 
Reference< XFastAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent 
);
+
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
/*xAttrList*/ ) override {}
 };
 
 }
 
-XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, 
sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList 
>& xAttrList, XMLAnimationsEffectContext* pParent )
-: SvXMLImportContext( rImport, nPrfx, rLocalName )
+XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, 
sal_Int32 nElement, const Reference< XFastAttr

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

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx |   17 ++---
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 6340984c367a69d9e29f7198c4bed089e91bcd42
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 8 22:37:11 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 9 20:32:01 2020 +0100

get rid of ImplPrimitive2DIDBlock in polypolygonprimitive2d.cxx

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

diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx 
b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 24946ad3076d..71b36df77937 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -78,8 +78,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonHairlinePrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D)
-
+sal_uInt32 PolyPolygonHairlinePrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D; }
 
 void 
PolyPolygonMarkerPrimitive2D::create2DDecomposition(Primitive2DContainer& 
rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
 {
@@ -135,7 +134,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonMarkerPrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D)
+sal_uInt32 PolyPolygonMarkerPrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D; }
 
 
 void 
PolyPolygonStrokePrimitive2D::create2DDecomposition(Primitive2DContainer& 
rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
@@ -204,7 +203,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonStrokePrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D)
+sal_uInt32 PolyPolygonStrokePrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D; }
 
 
 PolyPolygonColorPrimitive2D::PolyPolygonColorPrimitive2D(
@@ -236,7 +235,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonColorPrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D)
+sal_uInt32 PolyPolygonColorPrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D; }
 
 
 void 
PolyPolygonGradientPrimitive2D::create2DDecomposition(Primitive2DContainer& 
rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
@@ -293,7 +292,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonGradientPrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D)
+sal_uInt32 PolyPolygonGradientPrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D; }
 
 void 
PolyPolygonHatchPrimitive2D::create2DDecomposition(Primitive2DContainer& 
rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
 {
@@ -355,7 +354,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonHatchPrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D)
+sal_uInt32 PolyPolygonHatchPrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D; }
 
 void 
PolyPolygonGraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& 
rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
 {
@@ -460,7 +459,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonGraphicPrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D)
+sal_uInt32 PolyPolygonGraphicPrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D; }
 
 
 void 
PolyPolygonSelectionPrimitive2D::create2DDecomposition(Primitive2DContainer& 
rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
@@ -555,7 +554,7 @@ namespace drawinglayer::primitive2d
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(PolyPolygonSelectionPrimitive2D, 
PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D)
+sal_uInt32 PolyPolygonSelectionPrimitive2D::getPrimitive2DID() const { 
return PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D; }
 
 } // end of namespace
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/firebird/Util.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2ede753a8b7adecbf6ca78745e43e23c7498e289
Author: Julien Nabet 
AuthorDate: Mon Mar 9 18:59:29 2020 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 9 20:54:03 2020 +0100

tdf#130334: Firebird deal with array fields

See https://bugs.documentfoundation.org/show_bug.cgi?id=130334#c11
See 
https://firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25-datatypes-bnrytypes.html#fblangref25-datatypes-array
Change-Id: I27c53b9c771fcdb3b89e66af325a8234c7de08bb

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

diff --git a/connectivity/source/drivers/firebird/Util.cxx 
b/connectivity/source/drivers/firebird/Util.cxx
index 020dffbf2076..090e34ca2781 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -306,12 +306,12 @@ void firebird::mallocSQLVAR(XSQLDA* pSqlda)
 case SQL_TIMESTAMP:
 pVar->sqldata = static_cast(malloc(sizeof(ISC_TIMESTAMP)));
 break;
+// an ARRAY is in fact a BLOB of a specialized type
+// See 
https://firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25-datatypes-bnrytypes.html#fblangref25-datatypes-array
+case SQL_ARRAY:
 case SQL_BLOB:
 pVar->sqldata = static_cast(malloc(sizeof(ISC_QUAD)));
 break;
-case SQL_ARRAY:
-assert(false); // TODO: implement
-break;
 case SQL_TYPE_TIME:
 pVar->sqldata = static_cast(malloc(sizeof(ISC_TIME)));
 break;
@@ -355,6 +355,9 @@ void firebird::freeSQLVAR(XSQLDA* pSqlda)
 case SQL_DOUBLE:
 case SQL_D_FLOAT:
 case SQL_TIMESTAMP:
+// an ARRAY is in fact a BLOB of a specialized type
+// See 
https://firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25-datatypes-bnrytypes.html#fblangref25-datatypes-array
+case SQL_ARRAY:
 case SQL_BLOB:
 case SQL_INT64:
 case SQL_TYPE_TIME:
@@ -366,9 +369,6 @@ void firebird::freeSQLVAR(XSQLDA* pSqlda)
 pVar->sqldata = nullptr;
 }
 break;
-case SQL_ARRAY:
-assert(false); // TODO: implement
-break;
 case SQL_NULL:
 assert(false); // TODO: implement
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 sd/source/ui/view/drtxtob1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b39c08773db9bea776001c6ccf043684c2dfe08d
Author: Jim Raykowski 
AuthorDate: Sun Mar 8 21:47:40 2020 -0800
Commit: Jim Raykowski 
CommitDate: Mon Mar 9 22:24:16 2020 +0100

tdf#131208 Don't try to set cursor focus after style apply

It seems after a style is applied, the outliner view pointer points to
an OutlinerView that has been removed. This results in a crash when
trying to access OutlinerView functions to set cursor focus to the
document. Avoid this by checking if a style has just been applied.

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

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 288e8b3c1ea3..3c8f188abff5 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -827,7 +827,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
 break;
 }
 
-if ( pOLV )
+if ( nSlot != SID_STYLE_APPLY && pOLV )
 {
 pOLV->ShowCursor();
 pOLV->GetWindow()->GrabFocus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

TJ Holt License Statement

[TJ Holt]

Hello team!
I am TJHolt on the IRC, TJ on bugzilla. Here is my license statement.

   All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Henry Castro (via logerrit)]

 vcl/source/window/dialog.cxx |   22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit b546a7a461fd09d93e9b427b771353be9066720f
Author: Henry Castro 
AuthorDate: Tue Dec 10 20:34:51 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 10 02:23:29 2020 +0100

lok: dialog: check if exists a LOK Window Notifier

When the dialog is about to show, it requires to
send to client side the "created" message. However,
in the constructor has already assigned a notifier
from the parent window.

Change-Id: I1120ad1c1c70449048d6739b8564d1c1f6b1c7e3
Reviewed-on: https://gerrit.libreoffice.org/84908
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90243
Tested-by: Jenkins

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 35a4c8cafa47..ecc760625486 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -741,17 +741,25 @@ void Dialog::StateChanged( StateChangedType nType )
 const bool bKitActive = comphelper::LibreOfficeKit::isActive();
 if (bKitActive)
 {
-if (!GetLOKNotifier())
-
SetLOKNotifier(mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr));
+std::vector aItems;
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", GetSizePixel().toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 
 if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
GetLOKNotifier())
 {
-std::vector aItems;
-aItems.emplace_back("type", "dialog");
-aItems.emplace_back("size", GetSizePixel().toString());
-if (!GetText().isEmpty())
-aItems.emplace_back("title", GetText().toUtf8());
 pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
+pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
+}
+else
+{
+vcl::ILibreOfficeKitNotifier* pViewShell = 
mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr);
+if (pViewShell)
+{
+SetLOKNotifier(pViewShell);
+pViewShell->notifyWindow(GetLOKWindowId(), "created", 
aItems);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/firebird/User.cxx  |   11 +--
 connectivity/source/drivers/firebird/User.hxx  |7 +--
 connectivity/source/drivers/firebird/Users.cxx |4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 358d34e12d8f88543ddca8c0e852712e6ef1b10c
Author: Julien Nabet 
AuthorDate: Sat Mar 7 23:15:13 2020 +0100
Commit: Noel Grandin 
CommitDate: Tue Mar 10 07:26:33 2020 +0100

tdf#131212: Implement change user password in Firebird

Command retrieved from 
https://firebirdsql.org/refdocs/langrefupd25-security-sql-user-mgmt.html

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

diff --git a/connectivity/source/drivers/firebird/User.cxx 
b/connectivity/source/drivers/firebird/User.cxx
index 024d7eb4958a..a2e6f71e3bed 100644
--- a/connectivity/source/drivers/firebird/User.cxx
+++ b/connectivity/source/drivers/firebird/User.cxx
@@ -16,15 +16,22 @@ using namespace ::connectivity::sdbcx;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::sdbc;
 
-User::User():
+User::User(const css::uno::Reference< css::sdbc::XConnection >& rConnection):
 OUser(true) // Case Sensitive
+, m_xConnection(rConnection)
 {}
 
-User::User(const OUString& rName):
+User::User(const css::uno::Reference< css::sdbc::XConnection >& rConnection, 
const OUString& rName):
 OUser(rName,
   true) // Case Sensitive
+, m_xConnection(rConnection)
 {}
 
+void User::changePassword(const OUString&, const OUString& newPassword)
+{
+m_xConnection->createStatement()->execute("ALTER USER " + m_Name + " 
PASSWORD '" + newPassword + "'");
+}
+
 //- IRefreshableGroups 
 void User::refreshGroups()
 {
diff --git a/connectivity/source/drivers/firebird/User.hxx 
b/connectivity/source/drivers/firebird/User.hxx
index d2cc091000b9..ff1de34ea5fb 100644
--- a/connectivity/source/drivers/firebird/User.hxx
+++ b/connectivity/source/drivers/firebird/User.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USER_HXX
 
 #include 
+#include 
 
 namespace connectivity
 {
@@ -22,17 +23,19 @@ namespace connectivity
  */
 class User: public ::connectivity::sdbcx::OUser
 {
+css::uno::Reference< css::sdbc::XConnection > m_xConnection;
 
 public:
 /**
  * Create a "new" descriptor, which isn't yet in the database.
  */
-User();
+User(const css::uno::Reference< css::sdbc::XConnection >& 
rConnection);
 /**
  * For a user that already exists in the db.
  */
-User(const OUString& rName);
+User(const css::uno::Reference< css::sdbc::XConnection >& 
rConnection, const OUString& rName);
 
+virtual void SAL_CALL changePassword(const OUString&, const 
OUString& newPassword) override;
 // IRefreshableGroups::
 virtual void refreshGroups() override;
 };
diff --git a/connectivity/source/drivers/firebird/Users.cxx 
b/connectivity/source/drivers/firebird/Users.cxx
index 0423d9c33181..061200fde5d3 100644
--- a/connectivity/source/drivers/firebird/Users.cxx
+++ b/connectivity/source/drivers/firebird/Users.cxx
@@ -47,7 +47,7 @@ void Users::impl_refresh()
 
 ObjectType Users::createObject(const OUString& rName)
 {
-return new User(rName);
+return new User(m_xMetaData->getConnection(), rName);
 }
 
 uno::Reference< XPropertySet > Users::createDescriptor()
@@ -55,7 +55,7 @@ uno::Reference< XPropertySet > Users::createDescriptor()
 // There is some internal magic so that the same class can be used as 
either
 // a descriptor or as a normal user. See VUser.cxx for the details. In our
 // case we just need to ensure we use the correct constructor.
-return new User;
+return new User(m_xMetaData->getConnection());
 }
 
 //- XAppend ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits