[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-2' - configure.ac

[Christian Lohmaier]

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

New commits:
commit 8f88dc6cc7d8820d177d42ca892a4e1cf82fbdb2
Author: Christian Lohmaier 
Date:   Wed Sep 27 20:03:26 2017 +0200

bump product version to 5.4.2.2.0+

Change-Id: I6828e632f1db705f302643d11585813504bf74f4

diff --git a/configure.ac b/configure.ac
index 756e65333dca..0bf8535c0da1 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],[5.4.2.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.2.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-5.4.2.2' created by Christian Lohmaier 
 at 2017-09-27 18:02 +

Tag libreoffice-5.4.2.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZy+fNAAoJEPQ0oe+v7q6jBrUQAKK2k7stQ2bW1nF4YqQtI/0d
XqPlONOwIuFNvXptD2cCnZAiMUeMk6YOJwZIO3eiyV8d3HclKCa1o1QkGY5QWZv6
bmsQ9LCFze01mVKzgW4NEPgm+e8ah/mXVR1RJDbXBXJ+ghawGNKB97oEMn8f/iOe
7MrXCf2u5rJmINM2Haf8mSrgyw1K6ynWJ4leRNOGiEPTKqOu7MRxbfwhkPM7GTFx
+d4vzjQ69Tu6s8s4eNzwo66Suc/OT/ERtXhKkMAgY7GLi/E9maIK9463U4jJlg7T
mElzpo9ZGeMfhZl+oKppe9R9j9peX4pT+Q6GkuYhCOZ+vVX794BCSGy9u2qYKqjK
vgAToiFvQkRStFnhgDK5ytXKiO5Mj1tTC1Z6etpuRxMkoWsMvdX4ZuUFowuUjgoM
yfi6gqm0CDXs1kcIpxjYGpqUE5HkonfQ7uGJyKKBi/zuEJwP3EfCdN13wsgjWgal
SBAQOSNYKjt4a8leX1fcZZeScUwr9pkYsz3PkzrXSjc92J+kHtzC11W67OCJiwWY
rIb3MjVzU3jx52dfsxcgMU905XJnWf4S0u7bfxyD6OsTBnecyE9QT5+uAoE1zcoY
+1rbYbyhgealvad+ApFScjhEEtFi0ljZBVVmUoqdxvmw9DRD3hPmLkQBWDX3ekM7
bIKHPi9VBfpeCryKbptf
=PGJR
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.4.2.2' created by Christian Lohmaier 
 at 2017-09-27 18:02 +

Tag libreoffice-5.4.2.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZy+fBAAoJEPQ0oe+v7q6j05kP/0x5+3SmCqAvlNbF/+R4JHE4
/nXo0EAdVMZ/eQfuoMc/9s1Iif+sd80rJsl0XRQOeczERc85c+sdZneX/EHAq+TK
SXHUZW/eioSIz4SBLxYf5PBtOPvxXGwQdqgkxOieaURPCk73/HuNPqStIlZrqgTh
pUgRbbRzEnaxZaueKewsBODEPio7JF0yeZa3g4VDtCqEs5AsgwnoHKgLOHBx0j1+
M1Iz4irxzXiNOepLOzlf/Rmp4x0YcUh7dVmS1HT81A/7Oq+LTuDx8wqf1o0Z96ip
YuAYbKnzk0f+HP64y+HNoVg6K9bEuxoFu+3zkpqBMtEuHkbLSM2sn7PNjuTU8vBT
TEGHDStUgvm+s2e0xcFu2TgBn31AJCNYdllgq1zsZ2zHUBcryLAM2YsBvA3Aq8a2
CSrWdyF6PLvqSU+PBfIsyJ94M0w7UeeOfXly3Y4ZP2cHmOBklmIDWRlzANxPdG5O
LNgohvZENYfB9euucDb467Nv/FvqcFMNKL+vrDzswD6J9ANJDMLVKLv98GzeZFSY
meUcpgAj1x6DjQbUT+A4fBt+sYuvp+hrzou6lmjX4TR7qssUmGNYgsxFSx/QOiYZ
8PC1BXE1cgryCUpYaELtgwiaOlmCSpseUeD7hTyBn8AvxSnxn28UfytK3HYag8ne
20vEnjNeWGQiPIHKZL79
=h9Nm
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.4.2.2' created by Christian Lohmaier 
 at 2017-09-27 18:02 +

Tag libreoffice-5.4.2.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZy+e8AAoJEPQ0oe+v7q6j0PEP/jphAmKU+fmNwrZalei9uWZe
dKyygaE0W8569/KL3JBXHSGCsfl+BbAi76q6B+2KY6kSk86rsQq42qExWNUX7VRe
CkeaJUUfmsgOxVcNgeyni5DbVuWHjjuItBoiEA5Qa9s9HK+kAJ0r83U4CFBBrekU
Am1BhxqvZjjrRyUFru955mjEs8gaf8UYnKTt2fKCesUSPQQAetLkTYQsZWxSZMRw
H/3HXS0VE286uCiQKh9rau+isfejTi/J/fDq6wJV5BBSbH5l0cFskjVq8KPEmY6D
fdQSeCsGKRSQnbiJ6/XvZ4B5i4SiS6toybuYzTcQvbr2CcbsH4NbB93IOFcFcpA4
BQoH0Q0r4J5R6doO5hznz6r17F7tSenIs7Ggz2KHMuc8cT8d7SAJYI0Pv0c2sqaW
s0FFd135uTbtBw5AkG+K4fNIIt0slxcBJhK4iqDk5jnX/lDYOAw3979Gx7moojXW
AUbQ5Ay8/Kfkn4awfjreCxxVIjze7Yu7BLfxeJuL0xS1hbmWgPSapCEYg4EpwKI6
zDDD8a92yje0X1yWyJM4VCq13HDAcThZp06W7sIE9DLjp3cpXwLQq9Z3EpF89IiT
NqucnvQc2F8u3HQl/JPq45iue5J16hiqBmMvy9KrZ3oM1v9o+DSAISJdEkFntsVG
+ctDbF01g6A8w+Cx50N0
=2GIp
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.4.2.2' created by Christian Lohmaier 
 at 2017-09-27 18:02 +

Tag libreoffice-5.4.2.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZy+fFAAoJEPQ0oe+v7q6jkC4P/2AGeju4Z69xpQLTXs55zLNp
BoGH5+olurnN2MI5+PxlaymMXrEKOCBPHgzE8NE1PEHF7y/lygTVKGqqKAzOdfqV
gQ9choX9+EapoVUqH1rDwG+Nt0/HF+gSx7m3iylk8N8CeX0Xih3Z3eW49h3zB5nR
BxbQlAeG0/VAviJfkYhVJcQOoVnQ5J/ZiUgkgYcw2X/my709jJWOAsu59/Ahi20Q
I0aEzpdPPTi3gOy9IaTn2S4AYMY+IO5Urnvz5G5oatIJXqD4ARD4dKobWKcNBbG1
ALKrnFqUIyP7Tq7FnJ0XfmXYWmCLn+17PZJL+iBCER38a6JvkbC0okpeOul4pDdL
HolDIryfyjFHJSYgz4eklKrohIO1snNucvmjo7YfkEHdn1ExWZgljN0t1gDPnwuI
qdg1Pb2rwIHmePzEZ61h0TYDAWS1ydy6PogsjCE+F0oGugQlJIylGqTwp+MSk362
Facr/6+ogyb21RAP47YNTt/1k2fYamuHNRt8oIRwPohfE1PE6KglVjj0pdOb69TL
ha7qE0QySQwHa9e60wTH/lnZgXIgT3hWMfsoWbUSUWiXeY4asxhYv4Ou5sq+hZ1K
4R3xGB8xOTE3QokSYUXtEaSQe/nzh4YtxITRIVE29zYoqFbQyiRumD1UqrzcMrB7
/xD6O7StoezT6HVsyQhF
=EMVu
-END PGP SIGNATURE-

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

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

[Michael Stahl]

 sc/qa/unit/subsequent_export-test.cxx |   22 ++
 xmloff/source/draw/shapeexport.cxx|   22 +++---
 2 files changed, 37 insertions(+), 7 deletions(-)

New commits:
commit e03ca0f635fd79dbac772a6abf8f2b2a7a36868f
Author: Michael Stahl 
Date:   Wed Sep 20 17:45:14 2017 +0200

tdf#112005 xmloff: ODF export: export embedded object text *first*

... before adding any attributes, so that the attributes don't
erroneously get added to the paragraph element.

Also fix the problem that if you set "ODF format version" to 1.1 or 1.2,
export asserts in SvXMLNamespaceMap::GetQNameByKey() because the "loext"
namespace isn't registered, and creates an invalid  element.

Change-Id: I637f9d3ff746d877ced480e35ef53f4545a06a4b
(cherry picked from commit 86f256596c8566e80993e1cf6035bc3534b6f816)
Reviewed-on: https://gerrit.libreoffice.org/42568
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f67f4c377dde9659251829e738173a7ceb975236)
Reviewed-on: https://gerrit.libreoffice.org/42747
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 26ac932a7765..4e692e570784 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -126,6 +126,7 @@ public:
 void testLandscapeOrientationXLSX();
 
 void testInlineArrayXLS();
+void testEmbeddedChartODS();
 void testEmbeddedChartXLS();
 void testCellAnchoredGroupXLS();
 
@@ -235,6 +236,7 @@ public:
 CPPUNIT_TEST(testAllRowsHiddenXLSX);
 CPPUNIT_TEST(testLandscapeOrientationXLSX);
 CPPUNIT_TEST(testInlineArrayXLS);
+CPPUNIT_TEST(testEmbeddedChartODS);
 CPPUNIT_TEST(testEmbeddedChartXLS);
 CPPUNIT_TEST(testCellAnchoredGroupXLS);
 
@@ -323,6 +325,8 @@ void ScExportTest::registerNamespaces(xmlXPathContextPtr& 
pXmlXPathCtx)
 { BAD_CAST("office"), 
BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:office:1.0") },
 { BAD_CAST("table"), 
BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:table:1.0") },
 { BAD_CAST("text"), 
BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:text:1.0") },
+{ BAD_CAST("style"), 
BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:style:1.0") },
+{ BAD_CAST("draw"), 
BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0") },
 { BAD_CAST("xlink"), BAD_CAST("http://www.w3c.org/1999/xlink;) },
 { BAD_CAST("xdr"), 
BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing;) 
},
 { BAD_CAST("x"), 
BAD_CAST("http://schemas.openxmlformats.org/spreadsheetml/2006/main;) },
@@ -1922,6 +1926,24 @@ void ScExportTest::testInlineArrayXLS()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testEmbeddedChartODS()
+{
+ScDocShellRef xShell = loadDoc("embedded-chart.", FORMAT_XLS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pTempFile(
+ScBootstrapFixture::exportTo(xShell.get(), FORMAT_ODS));
+
+xmlDocPtr pDoc = XPathHelper::parseExport(pTempFile, m_xSFactory, 
"content.xml");
+CPPUNIT_ASSERT(pDoc);
+assertXPath(pDoc,
+
"/office:document-content/office:body/office:spreadsheet/table:table[2]/table:table-row[7]/table:table-cell[2]/draw:frame/draw:object",
+"notify-on-update-of-ranges",
+"Chart1.B3:Chart1.B5 Chart1.C2:Chart1.C2 Chart1.C3:Chart1.C5");
+
+xShell->DoClose();
+}
+
 void ScExportTest::testEmbeddedChartXLS()
 {
 ScDocShellRef xShell = loadDoc("embedded-chart.", FORMAT_XLS);
diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 399544cae531..0f2194966dbb 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1505,6 +1505,13 @@ bool XMLShapeExport::ImpExportPresentationAttributes( 
const uno::Reference< bean
 
 void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& 
xShape, TextPNS eExtensionNS )
 {
+if (eExtensionNS == TextPNS::EXTENSION)
+{
+if (mrExport.getDefaultVersion() <= SvtSaveOptions::ODFVER_012)
+{
+return; // do not export to ODF 1.1/1.2
+}
+}
 uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY );
 if( xText.is() )
 {
@@ -2770,6 +2777,14 @@ void XMLShapeExport::ImpExportOLE2Shape(
 
 if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
 {
+// tdf#112005 export text *before* adding any attributes
+if (!bIsEmptyPresObj && supportsText(eShapeType))
+{
+// #i118485# Add text export, the draw OLE shape allows text 
now
+// fdo#58571 chart objects don't allow text:p
+

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

[Michael Stahl]

 sw/source/core/doc/DocumentRedlineManager.cxx |   69 +++---
 sw/source/core/inc/DocumentRedlineManager.hxx |1 
 2 files changed, 31 insertions(+), 39 deletions(-)

New commits:
commit 835ccbcb594b6744683ce7248ef23548c328e4f5
Author: Michael Stahl 
Date:   Fri Sep 15 13:51:04 2017 +0200

ofz#3301 sw: DeleteAndJoin found yet another way to delete new redline

Not only can that happen in CompressRedlines(), it can also happen
in the SwComparePosition::Outside case when the DeleteRedline()
decides in particular circumstances to split up the inserted
new redline.

Arguably it's wrong to split up the new redline in this case;
not sure if that ever happens in a legitimate use case though.

Avoid this by removing the hack to temporarily insert the new redline
and instead create a temporary SwUnoCursor that will be corrected
on behalf of the new redline, while the new redline is parked on a
safe node.

This not only avoids the crash on this file but also makes the
"corrupted redline table" assertions go away.

Change-Id: I478f4cfc53a19d2cf2f0937f631962f80b1815ff
Reviewed-on: https://gerrit.libreoffice.org/42407
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit aa67a58c114338e90c589e5916f94a77f89cd727)
Reviewed-on: https://gerrit.libreoffice.org/42453
Reviewed-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 90cc40202ab8..de092e9b2a0c 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -575,6 +576,32 @@ namespace
 }
 }
 }
+
+/// in case some text is deleted, ensure that the not-yet-inserted
+/// SwRangeRedline has its positions corrected not to point to deleted node
+class TemporaryRedlineUpdater
+{
+private:
+SwRangeRedline & m_rRedline;
+std::shared_ptr m_pCursor;
+public:
+TemporaryRedlineUpdater(SwDoc & rDoc, SwRangeRedline & rRedline)
+: m_rRedline(rRedline)
+, m_pCursor(rDoc.CreateUnoCursor(*rRedline.GetPoint(), false))
+{
+if (m_rRedline.HasMark())
+{
+m_pCursor->SetMark();
+*m_pCursor->GetMark() = *m_rRedline.GetMark();
+*m_rRedline.GetMark() = 
SwPosition(rDoc.GetNodes().GetEndOfContent());
+}
+*m_rRedline.GetPoint() = 
SwPosition(rDoc.GetNodes().GetEndOfContent());
+}
+~TemporaryRedlineUpdater()
+{
+static_cast(m_rRedline) = *m_pCursor;
+}
+};
 }
 
 namespace sw
@@ -1223,20 +1250,11 @@ bool DocumentRedlineManager::AppendRedline( 
SwRangeRedline* pNewRedl, bool bCall
 {
 mpRedlineTable->Remove( n );
 bDec = true;
-// We insert temporarily so that pNew is
-// also dealt with when moving the indices.
 if( bCallDelete )
 {
-::comphelper::FlagGuard 
g(m_isForbidCompressRedlines);
-//Insert may delete pNewRedl, in which 
case it sets pNewRedl to nullptr
-mpRedlineTable->Insert( pNewRedl );
+TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
-if (pNewRedl && 
!mpRedlineTable->Remove(pNewRedl))
-{
-assert(false); // can't happen
-pNewRedl = nullptr;
-}
-bCompress = true; // delayed compress
+n = 0;  // re-initialize
 }
 delete pRedl;
 }
@@ -1258,18 +1276,8 @@ bool DocumentRedlineManager::AppendRedline( 
SwRangeRedline* pNewRedl, bool bCall
 
 if( bCallDelete )
 {
-// We insert temporarily so that pNew is
-// also dealt with when moving the indices.
-  

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

[Stephan Bergmann]

 sw/source/core/crsr/bookmrk.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14e2a82002042a3fe4d8866b635ee84a436a7a7c
Author: Stephan Bergmann 
Date:   Wed Sep 27 17:13:10 2017 +0200

loplugin:constparams

Change-Id: I14673c52584214bef157f2db2e1fdd57c4667d4a

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 7a2b17004248..64a116aac1f7 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -65,7 +65,7 @@ namespace
 }
 }
 
-void lcl_AssertFieldMarksSet(Fieldmark* const pField,
+void lcl_AssertFieldMarksSet(Fieldmark const * const pField,
 const sal_Unicode aStartMark,
 const sal_Unicode aEndMark)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/crsr/bookmrk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7e76b983301b02dd7020636905b764b981b1fff0
Author: Stephan Bergmann 
Date:   Wed Sep 27 17:18:16 2017 +0200

Silence --disable-assert-always-abort warnings

Change-Id: I34fbba0253d307021a5b090143eb357809c144ec

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 64a116aac1f7..8ea7445ea676 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -72,10 +72,10 @@ namespace
 if (aEndMark != CH_TXT_ATR_FORMELEMENT)
 {
 SwPosition const& rStart(pField->GetMarkStart());
-
assert(rStart.nNode.GetNode().GetTextNode()->GetText()[rStart.nContent.GetIndex()]
 == aStartMark);
+
assert(rStart.nNode.GetNode().GetTextNode()->GetText()[rStart.nContent.GetIndex()]
 == aStartMark); (void) rStart; (void) aStartMark;
 }
 SwPosition const& rEnd(pField->GetMarkEnd());
-
assert(rEnd.nNode.GetNode().GetTextNode()->GetText()[rEnd.nContent.GetIndex() - 
1] == aEndMark);
+
assert(rEnd.nNode.GetNode().GetTextNode()->GetText()[rEnd.nContent.GetIndex() - 
1] == aEndMark); (void) rEnd;
 }
 
 void lcl_SetFieldMarks(Fieldmark* const pField,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/app/inputhdl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86910087fa41956aad6a22943bfbeb158e205dcd
Author: Eike Rathke 
Date:   Wed Sep 27 18:58:07 2017 +0200

Resolves: tdf#112523 do not use anything Ascii in UI context

Change-Id: I0854f7b1e6e0bf51d8b4c7d846fad9b0ff25e763

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 017456c90123..a3df618d8cd6 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1292,7 +1292,7 @@ namespace {
 
 bool needToExtendSelection(const OUString& rSelectedText, const OUString& 
rInsertText)
 {
-return !rInsertText.startsWithIgnoreAsciiCase(rSelectedText);
+return !ScGlobal::GetpTransliteration()->isMatch( rSelectedText, 
rInsertText);
 }
 
 void completeFunction( EditView* pView, const OUString& rInsert, bool& 
rParInserted )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sd/source/ui/func/fuolbull.cxx |   18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 0d45001d0112df2820c18fed648e648c94d2e5a3
Author: Caolán McNamara 
Date:   Tue Sep 26 14:42:04 2017 +0100

dynamic_cast followed by static_cast

Change-Id: I9c208cfedd87f04489c6bab4399c438e6aee1cbe
Reviewed-on: https://gerrit.libreoffice.org/42862
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 24803eb84020..03deeed1b511 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -99,12 +99,10 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
 
 std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
 
-if( dynamic_cast< const OutlineView *>( mpView ) !=  
nullptr)
+if (OutlineView* pView = 
dynamic_cast(mpView))
 {
-pOLV = static_cast(mpView)
-->GetViewByWindow(mpViewShell->GetActiveWindow());
-
-aGuard.reset( new OutlineViewModelChangeGuard( 
static_cast(*mpView) ) );
+pOLV = 
pView->GetViewByWindow(mpViewShell->GetActiveWindow());
+aGuard.reset(new OutlineViewModelChangeGuard(*pView));
 }
 
 if( pOLV )
@@ -235,14 +233,10 @@ void 
FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
 
 OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
 std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
+if (OutlineView* pView = dynamic_cast(mpView))
 {
-if( dynamic_cast< const OutlineView *>( mpView ) !=  nullptr)
-{
-pOLV = static_cast(mpView)
-->GetViewByWindow(mpViewShell->GetActiveWindow());
-
-aGuard.reset( new OutlineViewModelChangeGuard( 
static_cast(*mpView) ) );
-}
+pOLV = pView->GetViewByWindow(mpViewShell->GetActiveWindow());
+aGuard.reset(new OutlineViewModelChangeGuard(*pView));
 }
 
 SdrOutliner* pOwner = bInMasterView ? mpView->GetTextEditOutliner() : 
nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-2' - vcl/source

[Caolán McNamara]

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

New commits:
commit 3136d9ac3dd7d974abff657724f7c60fd1d4a720
Author: Caolán McNamara 
Date:   Sun Sep 17 17:38:39 2017 +0100

detect corrupted job setup

Change-Id: I0d3b4850c3d4c015a0a7e5d36d87113a749c7e0f
Reviewed-on: https://gerrit.libreoffice.org/42388
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index ecea840d2393..57c02b95b557 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -236,7 +236,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 
 sal_uInt16 nSystem = 0;
 rIStream.ReadUInt16( nSystem );
-const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
+size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
 if (nRead > rIStream.remainingSize())
 {
 SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() <<
@@ -245,7 +245,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 }
 sal_uInt64 const nFirstPos = rIStream.Tell();
 std::unique_ptr pTempBuf(new char[nRead]);
-rIStream.ReadBytes(pTempBuf.get(), nRead);
+nRead = rIStream.ReadBytes(pTempBuf.get(), nRead);
 if (nRead >= sizeof(ImplOldJobSetupData))
 {
 ImplOldJobSetupData* pData = 
reinterpret_cast(pTempBuf.get());
@@ -275,11 +275,19 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 rJobData.SetPaperHeight( (long)SVBT32ToUInt32( 
pOldJobData->nPaperHeight ) );
 if ( rJobData.GetDriverDataLen() )
 {
-const sal_uInt8* pDriverData = 
reinterpret_cast(pOldJobData) + nOldJobDataSize;
-sal_uInt8* pNewDriverData = static_cast(
-rtl_allocateMemory( rJobData.GetDriverDataLen() ));
-memcpy( pNewDriverData, pDriverData, 
rJobData.GetDriverDataLen() );
-rJobData.SetDriverData( pNewDriverData );
+const char* pDriverData = reinterpret_cast(pOldJobData) + nOldJobDataSize;
+const char* pDriverDataEnd = pDriverData + 
rJobData.GetDriverDataLen();
+if (pDriverDataEnd > pTempBuf.get() + nRead)
+{
+SAL_WARN("vcl", "corrupted job setup");
+}
+else
+{
+sal_uInt8* pNewDriverData = static_cast(
+rtl_allocateMemory( rJobData.GetDriverDataLen() ));
+memcpy( pNewDriverData, pDriverData, 
rJobData.GetDriverDataLen() );
+rJobData.SetDriverData( pNewDriverData );
+}
 }
 if( nSystem == JOBSET_FILE605_SYSTEM )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |   27 +++
 1 file changed, 27 insertions(+)

New commits:
commit 5a0f4d00d2e74785f2bffafc5daf85a3839d3961
Author: Caolán McNamara 
Date:   Wed Sep 27 14:43:03 2017 +0100

ofz#3499 oom in tiff reader

Change-Id: I2b9e98ed3a6749e2ee83a566ec857c1080e452f3
Reviewed-on: https://gerrit.libreoffice.org/42861
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 1521432eca84..ecda46305201 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1407,6 +1407,33 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 bStatus = false;
 }
 }
+else if (nCompression == 2 || nCompression == 3 || 
nCompression == 4)
+{
+if (nCompression == 3 && nGroup3Options & 0xfffa)
+bStatus = false;
+else if (nCompression == 4 && nGroup4Options & 0x)
+bStatus = false;
+sal_uInt32 np = nPlanes - 1;
+if (np >= SAL_N_ELEMENTS(aMap))
+bStatus = false;
+sal_Int32 ny = nImageLength - 1;
+sal_uInt32 nStrip(0);
+nDiv = GetRowsPerStrip();
+if (bStatus)
+bStatus = nDiv != 0;
+if (bStatus)
+{
+nStrip = ny / nDiv + np * nStripsPerPlane;
+if (nStrip >= aStripOffsets.size())
+bStatus = false;
+}
+if (bStatus)
+{
+auto nStart = aStripOffsets[nStrip];
+if (nStart > nEndOfFile)
+bStatus = false;
+}
+}
 }
 
 if ( bStatus )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 external/libpng/UnpackedTarball_libpng.mk |4 
 external/libpng/libpng-osx.patch.1|   16 
 2 files changed, 20 insertions(+)

New commits:
commit 8d2a287da3abb0576512406227d0a3acd602123e
Author: Tor Lillqvist 
Date:   Wed Sep 27 21:35:27 2017 +0300

Avoid warning: 'inflateValidate' is only available on macOS 10.13 or newer

Change-Id: I0f828239ed5aff164ba1f4e486017db0e6c93a4a

diff --git a/external/libpng/UnpackedTarball_libpng.mk 
b/external/libpng/UnpackedTarball_libpng.mk
index dca4e4b5cfe9..2a8ad3f84406 100644
--- a/external/libpng/UnpackedTarball_libpng.mk
+++ b/external/libpng/UnpackedTarball_libpng.mk
@@ -15,4 +15,8 @@ $(eval $(call gb_UnpackedTarball_add_files,libpng,.,\
external/libpng/configs/pnglibconf.h \
 ))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libpng,\
+   external/libpng/libpng-osx.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libpng/libpng-osx.patch.1 
b/external/libpng/libpng-osx.patch.1
new file mode 100644
index ..0e9d7336a762
--- /dev/null
+++ b/external/libpng/libpng-osx.patch.1
@@ -0,0 +1,16 @@
+-*- Mode: Diff -*-
+
+Avoid warning: 'inflateValidate' is only available on macOS 10.13 or newer 
[-Wunguarded-availability-new]
+
+--- a/pngrutil.c
 b/pngrutil.c
+@@ -419,7 +419,8 @@
+   }
+ 
+ #if ZLIB_VERNUM >= 0x1290 && \
+-   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
++   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) && \
++   !(defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED 
< 101300)
+   if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
+  /* Turn off validation of the ADLER32 checksum in IDAT chunks */
+  ret = inflateValidate(_ptr->zstream, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Gersona licence statement

[gersona ANDRIANARIJAONA]

I'm glad I'm going to contribute to product I love
For the need of formalities, now that

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/uiconfig

[Yousuf Philips]

 sc/uiconfig/scalc/toolbar/standardbar.xml |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 8a808dcb220e068f224266c0dab3fe8dd16a2964
Author: Yousuf Philips 
Date:   Sat Sep 23 11:41:48 2017 +0400

tdf#86083 Restore old operation buttons but have them hidden

Change-Id: I7d006d3d5e22ade59ddfe46f21fbc777a1c75dac
Reviewed-on: https://gerrit.libreoffice.org/42684
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit 7dc82cc2e424b6acddb1aa06338f51db20e6a21e)
Reviewed-on: https://gerrit.libreoffice.org/42687
Reviewed-by: Eike Rathke 

diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml 
b/sc/uiconfig/scalc/toolbar/standardbar.xml
index cdb3aa37fac8..637ececb13c9 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -48,7 +48,13 @@
  
  
  
+ 
+ 
+ 
  
+ 
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sc/source/core/data/formulacell.cxx |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 05b3614cac57abc414955f8b1047cf5ca168580e
Author: Tor Lillqvist 
Date:   Wed Sep 27 19:42:10 2017 +0300

If we are going to avoid repeated calls to pDocument->GetRecursionHelper(),

do it from the start of the function then.

Change-Id: I4699fbd9c70f6ec0110d202062631e8861095aa0

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 22ef81ca2495..d75a93582b15 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1464,6 +1464,8 @@ public:
 
 void ScFormulaCell::Interpret()
 {
+ScRecursionHelper& rRecursionHelper = pDocument->GetRecursionHelper();
+
 #if DEBUG_CALCULATION
 static bool bDebugCalculationInit = true;
 if (bDebugCalculationInit)
@@ -1475,7 +1477,7 @@ void ScFormulaCell::Interpret()
 DebugCalculationStacker aDebugEntry( aPos, pDocument);
 #endif
 
-if (!IsDirtyOrInTableOpDirty() || 
pDocument->GetRecursionHelper().IsInReturn())
+if (!IsDirtyOrInTableOpDirty() || rRecursionHelper.IsInReturn())
 return; // no double/triple processing
 
 //FIXME:
@@ -1496,20 +1498,19 @@ void ScFormulaCell::Interpret()
 aResult.SetResultError( FormulaError::NONE );
 
 // Start or add to iteration list.
-if (!pDocument->GetRecursionHelper().IsDoingIteration() ||
-
!pDocument->GetRecursionHelper().GetRecursionInIterationStack().top()->bIsIterCell)
-pDocument->GetRecursionHelper().SetInIterationReturn( true);
+if (!rRecursionHelper.IsDoingIteration() ||
+
!rRecursionHelper.GetRecursionInIterationStack().top()->bIsIterCell)
+rRecursionHelper.SetInIterationReturn( true);
 
 return;
 }
 // no multiple interprets for GetErrCode, IsValue, GetValue and
 // different entry point recursions. Would also lead to premature
 // convergence in iterations.
-if (pDocument->GetRecursionHelper().GetIteration() && nSeenInIteration ==
-pDocument->GetRecursionHelper().GetIteration())
+if (rRecursionHelper.GetIteration() && nSeenInIteration ==
+rRecursionHelper.GetIteration())
 return ;
 
-ScRecursionHelper& rRecursionHelper = pDocument->GetRecursionHelper();
 bool bOldRunning = bRunning;
 if (rRecursionHelper.GetRecursionCount() > MAXRECURSION)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libutllo.so error

[Eike Rathke]

Hi Xavier,

I don't know, and it doesn't help if you exclude the mailing list in
personal mails. Including again.

On Tuesday, 2017-09-26 14:48:13 +0200, Xavier van wijmeersch wrote:

> Hi Eike
> 
> Boost locale is in place.  But now I tryed to build with without system
> boost and I have clean build. The only thing that still not working is,
> when trying to acces tools options view its still craching lo. I did like
> you suggest, but no luck. The only thing and its a gues, i build a snapshot
> off gcc 8.0,  maybe this may have corrupt some links?
> 
> Xavier
> Op 25-sep.-2017 15:16 schreef "Eike Rathke" :
> 
> > Hi Xavier,
> >
> > On Sunday, 2017-09-24 15:55:01 +0200, Xavier van wijmeersch wrote:
> >
> > > This error i have about several days, when trying to build a daily
> > > master and v5.4.2.0
> >
> > > /home/libreofficekde4/unotools/source/i18n/resmgr.cxx:107: undefined
> > reference to
> > > `boost::locale::generator::add_messages_path(std::__cxx11::basic_string > std::char_traits, std::allocator > const&)'
> >
> > In 5.4.2 that can't be because unotools/source/i18n/resmgr.cxx doesn't
> > even exist in that branch.
> >
> > For master make sure you have boost-locale or libboost-locale-dev and
> > its lib installed and libboost_locale.so is available. Actually
> > ./autogen.sh and ./configure should test for that.. but maybe wasn't
> > detected correctly in your case?
> >
> > Did you somehow merge branches or otherwise corrupt the build tree?
> > I suggest
> >
> > make clean && ./g checkout master && make
> > or
> > make clean && ./g checkout libreoffice-5-4-2 && make
> >
> >
> >   Eike
> >
> > --
> > LibreOffice Calc developer. Number formatter stricken i18n
> > transpositionizer.
> > GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563
> > 2D3A
> > Care about Free Software, support the FSFE https://fsfe.org/support/?erack
> >

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - configure.ac

[Tor Lillqvist]

 configure.ac |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 208008c9dd928c9b2ec375594f9a5b66c3f8d9ff
Author: Tor Lillqvist 
Date:   Tue Sep 19 22:06:10 2017 +0300

Accept macOS 10.13

Change-Id: I9dfc9e8ec6906e0fee4314410d970e02c881e94d
Reviewed-on: https://gerrit.libreoffice.org/42869
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index f75141b48fd7..97a8662ca899 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2736,7 +2736,7 @@ if test $_os = Darwin; then
 
 AC_MSG_CHECKING([what Mac OS X SDK to use])
 
-for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12; do
+for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12 10.13; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 with_macosx_sdk="${_macosx_sdk}"
@@ -2770,8 +2770,11 @@ if test $_os = Darwin; then
 10.12)
 MACOSX_SDK_VERSION=101200
 ;;
+10.13)
+MACOSX_SDK_VERSION=101300
+;;
 *)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.8--12])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.8--13])
 ;;
 esac
 
@@ -2806,8 +2809,11 @@ if test $_os = Darwin; then
 10.12)
 MAC_OS_X_VERSION_MIN_REQUIRED="101200"
 ;;
+10.13)
+MAC_OS_X_VERSION_MIN_REQUIRED="101300"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.8--12])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.8--13])
 ;;
 esac
 
@@ -2846,8 +2852,11 @@ if test $_os = Darwin; then
 10.12)
 MAC_OS_X_VERSION_MAX_ALLOWED="101200"
 ;;
+10.13)
+MAC_OS_X_VERSION_MAX_ALLOWED="101300"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.8--12])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.8--13])
 ;;
 esac
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf565ecf45bcdd3e098576731a2f815d6de2792f
Author: Caolán McNamara 
Date:   Wed Sep 27 20:28:23 2017 +0100

ofz#3504 Null-dereference READ

Change-Id: I2e2ad8e9fbbcdb8bc3d60da8b5ddde71b935805e
Reviewed-on: https://gerrit.libreoffice.org/42875
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 547a54504121..0e24c1b7fbd1 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -666,7 +666,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP 
nStartCp, WW8_CP nEndCp,
 }
 else
 {
-if (!m_aFieldStack.empty() && End_Field())
+if (!m_aFieldStack.empty() && End_Field() && 
!aChunks.empty())
 aChunks.back().SetEndPos(nStart+1);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/UnitOAuth.cpp test/UnitWOPI.cpp test/WopiTestServer.hpp

[Jan Holesovsky]

 test/UnitOAuth.cpp  |   18 +-
 test/UnitWOPI.cpp   |   14 ++
 test/WopiTestServer.hpp |   22 ++
 3 files changed, 29 insertions(+), 25 deletions(-)

New commits:
commit 043528f8396fc8e5699628ece33ab7b95372e53a
Author: Jan Holesovsky 
Date:   Wed Sep 27 19:57:22 2017 +0200

WopiTestServer: Share more code.

Change-Id: Ied539169f96608adb7095682bd8f0b7a70d28491
Reviewed-on: https://gerrit.libreoffice.org/42879
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/test/UnitOAuth.cpp b/test/UnitOAuth.cpp
index dfba4aa1..dcd2de65 100644
--- a/test/UnitOAuth.cpp
+++ b/test/UnitOAuth.cpp
@@ -98,20 +98,12 @@ public:
 case Phase::LoadToken:
 case Phase::LoadHeader:
 {
-Poco::URI wopiURL(helpers::getTestServerURI() +
-((_phase == Phase::LoadToken)? 
"/wopi/files/0?access_token=s3hn3ct0k3v":
-   
"/wopi/files/1?access_header=Authorization: Basic basic=="));
-//wopiURL.setPort(_wopiSocket->address().port());
-std::string wopiSrc;
-Poco::URI::encode(wopiURL.toString(), ":/?", wopiSrc);
-Poco::URI loolUri(helpers::getTestServerURI());
-
-LOG_INF("Connecting to the fake WOPI server: /lool/" << 
wopiSrc << "/ws");
-
-std::unique_ptr ws(new UnitWebSocket("/lool/" + 
wopiSrc + "/ws"));
-assert(ws.get());
+if (_phase == Phase::LoadToken)
+initWebsocket("/wopi/files/0?access_token=s3hn3ct0k3v");
+else
+initWebsocket("/wopi/files/1?access_header=Authorization: 
Basic basic==");
 
-helpers::sendTextFrame(*ws->getLOOLWebSocket(), "load url=" + 
wopiSrc, testName);
+helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + 
_wopiSrc, testName);
 
 if (_phase == Phase::LoadToken)
 _phase = Phase::LoadHeader;
diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp
index fade8d0f..a1c7cbda 100644
--- a/test/UnitWOPI.cpp
+++ b/test/UnitWOPI.cpp
@@ -36,8 +36,6 @@ class UnitWOPI : public WopiTestServer
 bool _finishedSaveUnmodified;
 bool _finishedSaveModified;
 
-std::unique_ptr _ws;
-
 public:
 UnitWOPI() :
 _phase(Phase::LoadAndSave),
@@ -78,17 +76,9 @@ public:
 {
 case Phase::LoadAndSave:
 {
-Poco::URI wopiURL(helpers::getTestServerURI() + 
"/wopi/files/0?access_token=anything");
-std::string wopiSrc;
-Poco::URI::encode(wopiURL.toString(), ":/?", wopiSrc);
-Poco::URI loolUri(helpers::getTestServerURI());
-
-LOG_INF("Connecting to the fake WOPI server: /lool/" << 
wopiSrc << "/ws");
-
-_ws.reset(new UnitWebSocket("/lool/" + wopiSrc + "/ws"));
-assert(_ws.get());
+initWebsocket("/wopi/files/0?access_token=anything");
 
-helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + 
wopiSrc, testName);
+helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + 
_wopiSrc, testName);
 helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "save 
dontTerminateEdit=1 dontSaveIfUnmodified=0", testName);
 
 _phase = Phase::Modify;
diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index 5ac79e81..a3851b5d 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -9,6 +9,7 @@
 
 #include "config.h"
 
+#include "helpers.hpp"
 #include "Log.hpp"
 #include "Unit.hpp"
 #include "UnitHTTP.hpp"
@@ -20,11 +21,32 @@
 
 class WopiTestServer : public UnitWSD
 {
+protected:
+/// The WOPISrc URL.
+std::string _wopiSrc;
+
+/// Websocket to communicate.
+std::unique_ptr _ws;
+
 public:
 WopiTestServer() : UnitWSD()
 {
 }
 
+void initWebsocket(std::string wopiName)
+{
+Poco::URI wopiURL(helpers::getTestServerURI() + wopiName);
+
+_wopiSrc = "";
+Poco::URI::encode(wopiURL.toString(), ":/?", _wopiSrc);
+Poco::URI loolUri(helpers::getTestServerURI());
+
+LOG_INF("Connecting to the fake WOPI server: /lool/" << _wopiSrc << 
"/ws");
+
+_ws.reset(new UnitWebSocket("/lool/" + _wopiSrc + "/ws"));
+assert(_ws.get());
+}
+
 virtual void assertCheckFileInfoRequest(const Poco::Net::HTTPRequest& 
request) = 0;
 
 virtual void assertGetFileRequest(const Poco::Net::HTTPRequest& request) = 
0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/UnitOAuth.cpp test/UnitWOPI.cpp

[Jan Holesovsky]

 test/UnitOAuth.cpp |   13 -
 test/UnitWOPI.cpp  |   13 -
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit f2ef8d02fa56f74dc010c3a036e599f74fe7b180
Author: Jan Holesovsky 
Date:   Wed Sep 27 20:13:16 2017 +0200

Speed-up the WOPI tests.

Change-Id: Ib61c5b90703e4266dbad935cd632b8be50a4ac44
Reviewed-on: https://gerrit.libreoffice.org/42880
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/test/UnitOAuth.cpp b/test/UnitOAuth.cpp
index dcd2de65..f88a4b55 100644
--- a/test/UnitOAuth.cpp
+++ b/test/UnitOAuth.cpp
@@ -26,7 +26,7 @@ class UnitOAuth : public WopiTestServer
 {
 LoadToken,  // loading the document with Bearer token
 LoadHeader, // loading the document with Basic auth
-Finish  // assert all went fine and finish
+Polling // just wait for the results
 } _phase;
 
 bool _finishedToken;
@@ -82,6 +82,9 @@ public:
 assertRequest(request, 1);
 _finishedHeader = true;
 }
+
+if (_finishedToken && _finishedHeader)
+exitTest(TestResult::Ok);
 }
 
 void assertPutFileRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
@@ -104,17 +107,17 @@ public:
 initWebsocket("/wopi/files/1?access_header=Authorization: 
Basic basic==");
 
 helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + 
_wopiSrc, testName);
+SocketPoll::wakeupWorld();
 
 if (_phase == Phase::LoadToken)
 _phase = Phase::LoadHeader;
 else
-_phase = Phase::Finish;
+_phase = Phase::Polling;
 break;
 }
-case Phase::Finish:
+case Phase::Polling:
 {
-CPPUNIT_ASSERT(_finishedToken && _finishedHeader);
-exitTest(TestResult::Ok);
+// just wait for the results
 break;
 }
 }
diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp
index a1c7cbda..59f6282e 100644
--- a/test/UnitWOPI.cpp
+++ b/test/UnitWOPI.cpp
@@ -24,7 +24,7 @@ class UnitWOPI : public WopiTestServer
 LoadAndSave,
 Modify,
 SaveModified,
-Finish
+Polling
 } _phase;
 
 enum class SavingPhase
@@ -66,6 +66,9 @@ public:
 CPPUNIT_ASSERT_EQUAL(std::string("true"), 
request.get("X-LOOL-WOPI-IsModifiedByUser"));
 _finishedSaveModified = true;
 }
+
+if (_finishedSaveUnmodified && _finishedSaveModified)
+exitTest(TestResult::Ok);
 }
 
 void invokeTest() override
@@ -83,6 +86,7 @@ public:
 
 _phase = Phase::Modify;
 _savingPhase = SavingPhase::Unmodified;
+SocketPoll::wakeupWorld();
 break;
 }
 case Phase::Modify:
@@ -97,14 +101,13 @@ public:
 {
 helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "save 
dontTerminateEdit=0 dontSaveIfUnmodified=0", testName);
 
-_phase = Phase::Finish;
+_phase = Phase::Polling;
 _savingPhase = SavingPhase::Modified;
 break;
 }
-case Phase::Finish:
+case Phase::Polling:
 {
-CPPUNIT_ASSERT(_finishedSaveUnmodified && 
_finishedSaveModified);
-exitTest(TestResult::Ok);
+// just wait for the results
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - external/curl

[Tor Lillqvist]

 external/curl/UnpackedTarball_curl.mk |8 
 external/curl/curl-osx.patch.1|  285 ++
 2 files changed, 293 insertions(+)

New commits:
commit 31991ee5ad2481458b2ba9d53cf91fa47e40a6f8
Author: Tor Lillqvist 
Date:   Tue Sep 19 22:28:24 2017 +0300

connectx() is available only on Mac OS X 10.11 and newer

Compiling against the 10.13 SDK with --with-macosx-version-min-
required set to 10.8, 10.9, or 10.10 (or defaulted, meaning 10.8)
causes a compilation error now. Earlier SDKs did not catch it if you
were using connectx() even if targeting pre-10.11.

Try the approach from https://github.com/curl/curl/pull/1336/commits .

Change-Id: Id33f4ddd2aae70488f383535225bd6045a1efeec
Reviewed-on: https://gerrit.libreoffice.org/42870
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 51e67dc56a0e..546f4aa38aa9 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -32,4 +32,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
 ))
 endif
 
+ifeq ($(OS),MACOSX)
+ifneq ($(filter 1080 1090 101000,$(MAC_OS_X_VERSION_MIN_REQUIRED)),)
+$(eval $(call gb_UnpackedTarball_add_patches,curl,\
+   external/curl/curl-osx.patch.1 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/curl/curl-osx.patch.1 b/external/curl/curl-osx.patch.1
new file mode 100644
index ..7694a1dcda2c
--- /dev/null
+++ b/external/curl/curl-osx.patch.1
@@ -0,0 +1,285 @@
+From efebf4d4f882a57a98a0653d21d543cd4132d23d Mon Sep 17 00:00:00 2001
+From: Palo Markovic 
+Date: Sat, 18 Mar 2017 16:37:02 +1300
+Subject: [PATCH] macOS: Fixed crash on 10.8 caused by missing connectx()
+ function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The connectx() function call appeared in Darwin 15.0.0
+That covers OS X 10.11, iOS 9 and tvOS 9.
+
+Because connectx is not declared with weak_import attribute it’s not possible
+to build libcurl on OS X 10.11 and later and target systems which don’t have
+_connectx symbol declared in libsystem_kernel.dylib (i.e. OS 10.8 and earlier).
+
+Solution is to use connectx only on platforms that officially support it
+i.e. by defining CFLAGS="-mmacosx-version-min=10.11" in configure step.
+
+Note: It is possible to conditionally use connectx() in libcurl targeting
+range of systems based on availability determined during runtime using dlsym().
+
+[Bug: https://github.com/curl/curl/issues/1330]
+---
+ lib/connect.c|  2 +-
+ lib/curl_setup.h | 16 
+ lib/url.c|  2 +-
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 197eff242f..33251914b8 100644
+--- a/lib/connect.c
 b/lib/connect.c
+@@ -1075,7 +1075,7 @@ static CURLcode singleipconnect(struct connectdata *conn,
+   /* Connect TCP sockets, bind UDP */
+   if(!isconnected && (conn->socktype == SOCK_STREAM)) {
+ if(conn->bits.tcp_fastopen) {
+-#if defined(CONNECT_DATA_IDEMPOTENT) /* OS X */
++#if defined(HAVE_DARWIN_CONNECTX) /* Darwin */
+   sa_endpoints_t endpoints;
+   endpoints.sae_srcif = 0;
+   endpoints.sae_srcaddr = NULL;
+diff --git a/lib/curl_setup.h b/lib/curl_setup.h
+index 0fe3633ec7..8643e1fd28 100644
+--- a/lib/curl_setup.h
 b/lib/curl_setup.h
+@@ -762,4 +762,20 @@ endings either CRLF or LF so 't' is appropriate.
+ #  endif
+ # endif
+ 
++/* Detect Darwin connectx() function availability.
++ * The connectx() function call appeared in Darwin 15.0.0
++ * but it's not declared using availability attribute.
++ */
++#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
++#  if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
++#define HAVE_DARWIN_CONNECTX 1
++#  endif
++#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
++#  if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 9)
++#define HAVE_DARWIN_CONNECTX 1
++#  endif
++#elif defined(CONNECT_DATA_IDEMPOTENT)  /* Fallback for other Darwin OS */
++#  define HAVE_DARWIN_CONNECTX 1
++#endif
++
+ #endif /* HEADER_CURL_SETUP_H */
+diff --git a/lib/url.c b/lib/url.c
+index 03feaa20f7..08fbe5132b 100644
+--- a/lib/url.c
 b/lib/url.c
+@@ -2834,7 +2834,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption 
option,
+ data->set.tcp_keepintvl = va_arg(param, long);
+ break;
+   case CURLOPT_TCP_FASTOPEN:
+-#if defined(CONNECT_DATA_IDEMPOTENT) || defined(MSG_FASTOPEN)
++#if defined(HAVE_DARWIN_CONNECTX) || defined(MSG_FASTOPEN)
+ data->set.tcp_fastopen = (0 != va_arg(param, long))?TRUE:FALSE;
+ #else
+ result = CURLE_NOT_BUILT_IN;
+From 45756a8a23967570da1390f9b1475c1db38a52d1 Mon Sep 17 00:00:00 2001
+From: Palo Markovic 
+Date: Sat, 25 Mar 2017 13:20:51 +1300
+Subject: [PATCH] macOS: moved 

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog' - sfx2/source

[Pranav Kant]

 sfx2/source/view/lokhelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48840cf8a4333ff15fda281173f9dfa354ff4318
Author: Pranav Kant 
Date:   Thu Sep 28 10:18:03 2017 +0530

const-ify

Change-Id: Ic0a0d50a8f8e4316d6cf254de04c08c0de533d78

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 08a89eac49a8..6a576fb0549b 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -179,7 +179,7 @@ void SfxLokHelper::notifyDialogChild(const OUString& 
rDialogID, const OUString&
 }
 }
 
-void SfxLokHelper::notifyInvalidation(SfxViewShell* pThisView, const OString& 
rPayload)
+void SfxLokHelper::notifyInvalidation(const SfxViewShell* pThisView, const 
OString& rPayload)
 {
 OStringBuffer aBuf;
 aBuf.append(rPayload);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog' - include/sfx2 sfx2/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit e6b6cdf475594939ef24a0b4f3211213fd2589ee
Author: Pranav Kant 
Date:   Thu Sep 28 10:18:03 2017 +0530

const-ify

Change-Id: Ic0a0d50a8f8e4316d6cf254de04c08c0de533d78

diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index 432628c89132..f1810ec98ab7 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -45,7 +45,7 @@ public:
 /// Emits a LOK_CALLBACK_DIALOG_CHILD
 static void notifyDialogChild(const OUString& rDialogID, const OUString& 
rAction, const Point& rPos);
 /// Emits a LOK_CALLBACK_INVALIDATE_TILES, but tweaks it according to 
setOptionalFeatures() if needed.
-static void notifyInvalidation(SfxViewShell* pThisView, const OString& 
rPayload);
+static void notifyInvalidation(const SfxViewShell* pThisView, const 
OString& rPayload);
 /// A special value to signify 'infinity'.
 /// This value is chosen such that sal_Int32 will not overflow when 
manipulated.
 static const long MaxTwips = 1e9;
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 08a89eac49a8..6a576fb0549b 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -179,7 +179,7 @@ void SfxLokHelper::notifyDialogChild(const OUString& 
rDialogID, const OUString&
 }
 }
 
-void SfxLokHelper::notifyInvalidation(SfxViewShell* pThisView, const OString& 
rPayload)
+void SfxLokHelper::notifyInvalidation(const SfxViewShell* pThisView, const 
OString& rPayload)
 {
 OStringBuffer aBuf;
 aBuf.append(rPayload);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
 |   18 
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
   |  305 +-
 setup_native/source/win32/customactions/regactivex/regactivex.cxx  
   |   12 
 setup_native/source/win32/customactions/sellang/sorttree.cxx   
   |   12 
 setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx 
   |2 
 setup_native/source/win32/customactions/shellextensions/checkpatches.cxx   
   |9 
 setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx 
   |6 
 setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx  
   |6 
 setup_native/source/win32/customactions/shellextensions/upgrade.cxx
   |  100 +--
 setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx   
   |8 
 setup_native/source/win32/customactions/tools/checkversion.cxx 
   |   16 
 11 files changed, 228 insertions(+), 266 deletions(-)

New commits:
commit 0fa21336428b286d69684cfbb7b845f123657041
Author: Mike Kaganski 
Date:   Wed Sep 27 10:02:59 2017 +0300

setup_native: use more Unicode in MSI custom actions

Change-Id: Id47ea566c9cf508116216625fe00013e8326b165
Reviewed-on: https://gerrit.libreoffice.org/42839
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git 
a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
 
b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
index 1e942230524a..4ea57b8e3087 100644
--- 
a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++ 
b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -42,10 +42,10 @@
 */
 typedef BOOL (__stdcall * CloseServiceHandle_t)(SC_HANDLE);
 typedef BOOL (__stdcall * ControlService_t)(SC_HANDLE, DWORD, 
LPSERVICE_STATUS);
-typedef SC_HANDLE (__stdcall * OpenSCManager_t)(LPCSTR, LPCSTR, DWORD);
-typedef SC_HANDLE (__stdcall * OpenService_t)(SC_HANDLE, LPCSTR, DWORD);
+typedef SC_HANDLE (__stdcall * OpenSCManager_t)(LPCWSTR, LPCWSTR, DWORD);
+typedef SC_HANDLE (__stdcall * OpenService_t)(SC_HANDLE, LPCWSTR, DWORD);
 typedef BOOL (__stdcall * QueryServiceStatus_t)(SC_HANDLE, LPSERVICE_STATUS);
-typedef BOOL (__stdcall * StartService_t)(SC_HANDLE, DWORD, LPCSTR*);
+typedef BOOL (__stdcall * StartService_t)(SC_HANDLE, DWORD, LPCWSTR*);
 
 static CloseServiceHandle_t CloseServiceHandle_ = nullptr;
 static ControlService_t ControlService_ = nullptr;
@@ -54,7 +54,7 @@ static OpenService_t OpenService_ = nullptr;
 static QueryServiceStatus_t QueryServiceStatus_ = nullptr;
 static StartService_t StartService_ = nullptr;
 
-const char * const INDEXING_SERVICE_NAME = "cisvc";
+const wchar_t * const INDEXING_SERVICE_NAME = L"cisvc";
 
 bool StopIndexingService(SC_HANDLE hService)
 {
@@ -150,18 +150,16 @@ void StartIndexingService(SC_HANDLE hService)
 
 extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE)
 {
-// MessageBoxW(NULL, L"Restarting Indexing Service", L"Message", MB_OK | 
MB_ICONINFORMATION);
-
-HMODULE hAdvapi32 = LoadLibrary("advapi32.dll");
+HMODULE hAdvapi32 = LoadLibraryW(L"advapi32.dll");
 
 if (hAdvapi32)
 {
 CloseServiceHandle_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, 
"CloseServiceHandle"));
 ControlService_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, "ControlService"));
-OpenSCManager_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, "OpenSCManagerA"));
-OpenService_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, "OpenServiceA"));
+OpenSCManager_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, "OpenSCManagerW"));
+OpenService_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, "OpenServiceW"));
 QueryServiceStatus_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, 
"QueryServiceStatus"));
-StartService_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, "StartServiceA"));
+StartService_ = 
reinterpret_cast(GetProcAddress(hAdvapi32, "StartServiceW"));
 }
 
 /* On systems other than Windows 2000/XP the service API
diff --git 
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx 
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index c6434e35106e..efcfb0dd705d 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -31,40 +31,40 @@
 #include 
 #include 
 
-static const CHAR* g_Extensions[] =
+static const WCHAR* g_Extensions[] =
 {
-".doc", // Microsoft Word Text [0]
-".dot", // Microsoft Word Template
-".wps", // Kingsoft Writer Document
-".wpt", // Kingsoft Writer Template
-".rtf", // rtf text
-

[Libreoffice-commits] core.git: Branch 'feature/lok_dialog' - 197 commits - accessibility/inc accessibility/source basctl/source basegfx/source basegfx/test canvas/source canvas/workben chart2/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit 937b2720393c4b1e42e39b6b7c796784343dfcd1
Author: Pranav Kant 
Date:   Fri Aug 18 15:26:26 2017 +0530

lokdialog: lok header changes

Change-Id: I1947dc84c91e2e01072fbff3e97aa94d514ecb5a

diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 10e0f0f199d0..d4e891af218a 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -156,6 +156,25 @@ public:
 }
 
 /**
+ * Renders a dialog with give dialog id and writes the width and height of 
the rendered dialog
+ *
+ * Client must truncate pBuffer according to the nWidth and nHeight 
returned after the call.
+ *
+ * @param pDialogId Unique dialog id to be painted
+ * @param pBuffer Buffer with enough memory allocated to render any dialog
+ * @param nWidth output parameter returning the width of the rendered 
dialog.
+ * @param nHeight output parameter returning the height of the rendered 
dialog
+ */
+void paintDialog(const char* pDialogId,
+ unsigned char* pBuffer,
+ int& nWidth,
+ int& nHeight)
+{
+return mpDoc->pClass->paintDialog(mpDoc, pDialogId, pBuffer,
+  , );
+}
+
+/**
  * Gets the tile mode: the pixel format used for the pBuffer of 
paintTile().
  *
  * @return an element of the LibreOfficeKitTileMode enum.
@@ -236,6 +255,22 @@ public:
 }
 
 /**
+ * Posts a mouse event to the dialog with given id.
+ *
+ * @param aDialogId Dialog id where mouse event is to be posted
+ * @param nType Event type, like down, move or up.
+ * @param nX horizontal position in document coordinates
+ * @param nY vertical position in document coordinates
+ * @param nCount number of clicks: 1 for single click, 2 for double click
+ * @param nButtons: which mouse buttons: 1 for left, 2 for middle, 4 right
+ * @param nModifier: which keyboard modifier: (see include/vcl/vclenum.hxx 
for possible values)
+ */
+void postDialogMouseEvent(const char* pDialogId, int nType, int nX, int 
nY, int nCount, int nButtons, int nModifier)
+{
+mpDoc->pClass->postDialogMouseEvent(mpDoc, pDialogId, nType, nX, nY, 
nCount, nButtons, nModifier);
+}
+
+/**
  * Posts an UNO command to the document.
  *
  * Example argument string:
commit df962e48a56b4a3ac81d0aca18cc326fb4e9f759
Author: Pranav Kant 
Date:   Wed Aug 16 08:46:40 2017 +0530

CD_DIALOG_INVALIDATE -> DIALOG

Change-Id: Ifdda1c868e19700013a0742a0a547c0a4e040fba

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 936c4d13e244..49b2b62639f4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -782,7 +782,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_SET_PART:
 case LOK_CALLBACK_TEXT_VIEW_SELECTION:
 case LOK_CALLBACK_INVALIDATE_HEADER:
-case LOK_CALLBACK_DIALOG_INVALIDATE:
+case LOK_CALLBACK_DIALOG:
 {
 const auto& pos = std::find_if(m_queue.rbegin(), m_queue.rend(),
 [type] (const queue_type::value_type& elem) { return 
(elem.first == type); });
commit dc995d2262abb378d084e88baba0eacf3c6856ce
Author: Pranav Kant 
Date:   Tue Aug 15 18:54:02 2017 +0530

lokdialog: Smoother mouse move on floating windows

Do away with an early hack to create the floating window with every
invalidate.

This gets rid of persistent blinking when moving the mouse over a
listbox, for example.

Change-Id: Ida9367156605edc9835529f83529363ad97beaee

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
index b711c3bc034e..c7f5bfe39e10 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@@ -598,34 +598,34 @@ void gtv_lok_dialog_child_invalidate(GtvLokDialog* 
dialog, int nX, int nY)
 
 GtvLokDialogPrivate* priv = getPrivate(dialog);
 // remove any existing floating windows, for now
-if (priv->pFloatingWin)
-gtk_widget_destroy(priv->pFloatingWin);
-
-priv->pFloatingWin = gtk_window_new(GTK_WINDOW_POPUP);
-GtkWidget* pDrawingArea = gtk_drawing_area_new();
-gtk_container_add(GTK_CONTAINER(priv->pFloatingWin), pDrawingArea);
-
-gtk_window_set_transient_for(GTK_WINDOW(priv->pFloatingWin), 
GTK_WINDOW(dialog));
-gtk_window_set_destroy_with_parent(GTK_WINDOW(priv->pFloatingWin), true);
-
-gtk_widget_add_events(pDrawingArea,
-  GDK_BUTTON_PRESS_MASK
-  |GDK_POINTER_MOTION_MASK
-  |GDK_BUTTON_RELEASE_MASK
-

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

[Samuel Mehrbrodt]

 sc/source/filter/inc/scflt.hxx|8 
 sw/source/filter/html/css1atr.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 49145c2fd51d763f60d428600119bb7a0f440af2
Author: Samuel Mehrbrodt 
Date:   Tue Sep 26 17:33:21 2017 +0200

Typo: Grafic -> Graphic

Change-Id: Ic5d8ff346dfe66efb9a99e2d23c9cff514e5352a
Reviewed-on: https://gerrit.libreoffice.org/42818
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index f1640a3ed8f4..506ddf624c98 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -475,8 +475,8 @@ struct Sc10ColAttr
 // GraphHeader
 struct Sc10GraphHeader
 {
-sal_uInt8   Typ;// Type of grafic (Ole-object, Image 
(Bitmap of MetaFile), Chart-object)
-sal_Int16   CarretX;// Cell Position of grafic
+sal_uInt8   Typ;// Type of graphic (Ole-object, Image 
(Bitmap of MetaFile), Chart-object)
+sal_Int16   CarretX;// Cell Position of graphic
 sal_Int16   CarretY;
 sal_Int16   CarretZ;
 sal_Int32   x;  // x,y distance to cell border in pixels 
(pixels, as graphics are stored in window)
@@ -484,8 +484,8 @@ struct Sc10GraphHeader
 sal_Int32   w;  // w,h width and height in pixels
 sal_Int32   h;
 sal_uInt8   IsRelPos;   // position relative to cell, or absolute 
in the table
-sal_uInt8   DoPrint;// print grafic?
-sal_uInt16  FrameType;  // Frame type around grafic (none, simple, 
double, simple thick, double thick)
+sal_uInt8   DoPrint;// print graphic?
+sal_uInt16  FrameType;  // Frame type around graphic (none, 
simple, double, simple thick, double thick)
 sal_uInt8   IsTransparent;  // show background?
 Sc10Color   FrameColor; // FrameColor as RGB value
 Sc10Color   BackColor;  // BackGroundColor as RGB value
diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index f49cdbb50066..db3ab306ec1f 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3149,7 +3149,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const 
SfxPoolItem& rHt,
 OUString aGraphicInBase64;
 OUString aGraphicAsLink;
 
-// Embedded Grafic -> export WriteEmbedded
+// Embedded Graphic -> export WriteEmbedded
 const Graphic* pGrf = nullptr;
 if( rHTMLWrt.mbEmbedImages || aLink.isEmpty())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 dtrans/source/win32/dtobj/DOTransferable.cxx |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 079eee6fdb3883029cf3bf4ca861ed2a7c06058d
Author: Stephan Bergmann 
Date:   Wed Sep 27 08:46:07 2017 +0200

loplugin:unnecessarycatchthrow (clang-cl)

Change-Id: Ie564d16cbd23929cea0e54d38a451b4bfa4fbe84

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx 
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 4303c69b3fb7..311e3a2320b9 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -230,14 +230,8 @@ Any SAL_CALL CDOTransferable::getTransferData( const 
DataFlavor& aFlavor )
 // check CF_DIB availability as an alternative
 fetc.setClipformat(CF_DIB);
 
-try
-{
-clipDataStream = getClipboardData( fetc );
-}
-catch( UnsupportedFlavorException& )
-{
-throw; // pass through, tried all possibilities
-}
+clipDataStream = getClipboardData( fetc );
+// pass UnsupportedFlavorException out, tried all possibilities
 }
 else
 throw; // pass through exception
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e827d227c92c338fb75f076b6d3f3a7b52b9f767
Author: Stephan Bergmann 
Date:   Wed Sep 27 08:46:29 2017 +0200

loplugin:redundantcast (clang-cl)

Change-Id: I37e7e217d89fb51cdfe28ec37be901e20068c309

diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx 
b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index a7b8c231cbca..8d659582c642 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -33,17 +33,17 @@
 // Unicode-only defines to break dependence on UNICODE define
 #if !defined ListView_InsertColumnW
 #define ListView_InsertColumnW(hwnd, iCol, pcol) \
-(int)SNDMSG((hwnd), LVM_INSERTCOLUMNW, (WPARAM)(int)(iCol), 
reinterpret_cast(const_cast(pcol)))
+(int)SNDMSG((hwnd), LVM_INSERTCOLUMNW, (WPARAM)(int)(iCol), 
reinterpret_cast(pcol))
 #endif
 
 #if !defined ListView_InsertItemW
 #define ListView_InsertItemW(hwnd, pitem)   \
-(int)SNDMSG((hwnd), LVM_INSERTITEMW, 0, 
reinterpret_cast(const_cast(pitem)))
+(int)SNDMSG((hwnd), LVM_INSERTITEMW, 0, reinterpret_cast(pitem))
 #endif
 
 #if !defined ListView_SetItemW
 #define ListView_SetItemW(hwnd, pitem) \
-(BOOL)SNDMSG((hwnd), LVM_SETITEMW, 0, 
reinterpret_cast(const_cast(pitem)))
+(BOOL)SNDMSG((hwnd), LVM_SETITEMW, 0, reinterpret_cast(pitem))
 #endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/tools/fract.hxx  |9 
 tools/source/generic/fract.cxx   |   24 +
 vcl/source/app/unohelp2.cxx  |   10 
 xmlscript/source/xml_helper/xml_impctx.cxx   |   11 
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx   |  175 ---
 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx |   16 -
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx   |   21 -
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |   20 -
 xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx |   19 -
 9 files changed, 143 insertions(+), 162 deletions(-)

New commits:
commit 595309903211ed5986ba0d2ef4d3b21bdfad10d9
Author: Noel Grandin 
Date:   Tue Sep 26 12:47:54 2017 +0200

loplugin:flatten in vcl..xmlsecurity

Change-Id: I730fc0b3b6b7ac1803d75b5d9e007b15395888c6
Reviewed-on: https://gerrit.libreoffice.org/42826
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index a69dc1f8135e..80d829964819 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.cxx
@@ -71,18 +71,12 @@ namespace vcl { namespace unohelper {
 // css::datatransfer::XTransferable
 uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& 
rFlavor )
 {
-uno::Any aAny;
-
 SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
-if ( nT == SotClipboardFormatId::STRING )
-{
-aAny <<= maText;
-}
-else
+if ( nT != SotClipboardFormatId::STRING )
 {
 throw datatransfer::UnsupportedFlavorException();
 }
-return aAny;
+return uno::Any(maText);
 }
 
 uno::Sequence< datatransfer::DataFlavor > 
TextDataObject::getTransferDataFlavors(  )
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx 
b/xmlscript/source/xml_helper/xml_impctx.cxx
index 79d7889698b7..a51a99a57ed9 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -375,16 +375,13 @@ void DocumentHandlerImpl::initialize(
 {
 MGuard guard( m_pMutex );
 Reference< xml::input::XRoot > xRoot;
-if (arguments.getLength() == 1 &&
-(arguments[ 0 ] >>= xRoot) &&
-xRoot.is())
-{
-m_xRoot = xRoot;
-}
-else
+if (arguments.getLength() != 1 ||
+!(arguments[ 0 ] >>= xRoot) ||
+!xRoot.is())
 {
 throw RuntimeException( "missing root instance!" );
 }
+m_xRoot = xRoot;
 }
 
 // XNamespaceMapping
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 5135761f8d49..4bc7152f957b 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -216,16 +216,15 @@ Reference< xml::input::XElement > 
ProgressBarElement::startChildElement(
 Reference< xml::input::XAttributes > const & xAttributes )
 {
 // event
-if (m_xImport->isEventElement( nUid, rLocalName ))
-{
-return new EventElement(
-nUid, rLocalName, xAttributes, this, m_xImport.get() );
-}
-else
+if (!m_xImport->isEventElement( nUid, rLocalName ))
 {
 throw xml::sax::SAXException( "expected event element!", Reference< 
XInterface >(), Any() );
 }
+
+return new EventElement(
+nUid, rLocalName, xAttributes, this, m_xImport.get() );
 }
+
 void ProgressBarElement::endElement()
 {
 ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), 
"com.sun.star.awt.UnoControlProgressBarModel" );
@@ -258,15 +257,14 @@ Reference< xml::input::XElement > 
ScrollBarElement::startChildElement(
 Reference< xml::input::XAttributes > const & xAttributes )
 {
 // event
-if (m_xImport->isEventElement( nUid, rLocalName ))
-{
-return new EventElement( nUid, rLocalName, xAttributes, this, 
m_xImport.get() );
-}
-else
+if (!m_xImport->isEventElement( nUid, rLocalName ))
 {
 throw xml::sax::SAXException("expected event element!", Reference< 
XInterface >(), Any() );
 }
+
+return new EventElement( nUid, rLocalName, xAttributes, this, 
m_xImport.get() );
 }
+
 void ScrollBarElement::endElement()
 {
 ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), 
getControlModelName( "com.sun.star.awt.UnoControlScrollBarModel" , _xAttributes 
) );
@@ -308,14 +306,12 @@ Reference< xml::input::XElement > 
SpinButtonElement::startChildElement(
 Reference< xml::input::XAttributes > const & xAttributes )
 {
 // event
-if (m_xImport->isEventElement( nUid, rLocalName ))
-{
-return new EventElement( nUid, rLocalName, xAttributes, this, 
m_xImport.get() );
-}
-else
+

[Libreoffice-commits] core.git: toolkit/source ucb/source unoxml/source vbahelper/source

[Noel Grandin]

 toolkit/source/controls/controlmodelcontainerbase.cxx |   67 -
 toolkit/source/controls/tabpagecontainer.cxx  |   33 ++--
 toolkit/source/controls/unocontrolmodel.cxx   |7 
 ucb/source/ucp/file/prov.cxx  |6 
 ucb/source/ucp/ftp/ftpcontentprovider.cxx |5 
 ucb/source/ucp/tdoc/tdoc_provider.cxx |   78 +-
 ucb/source/ucp/webdav-neon/NeonInputStream.cxx|6 
 ucb/source/ucp/webdav-neon/webdavcontent.cxx  |   71 -
 unoxml/source/rdf/CBlankNode.cxx  |5 
 unoxml/source/rdf/CLiteral.cxx|   15 --
 unoxml/source/rdf/CURI.cxx|   29 +---
 unoxml/source/rdf/librdf_repository.cxx   |  130 --
 vbahelper/source/msforms/vbacontrols.cxx  |   22 +--
 vbahelper/source/vbahelper/vbaapplicationbase.cxx |   40 ++---
 vbahelper/source/vbahelper/vbacommandbarcontrols.cxx  |8 -
 vbahelper/source/vbahelper/vbacommandbars.cxx |   30 +---
 vbahelper/source/vbahelper/vbahelper.cxx  |6 
 17 files changed, 265 insertions(+), 293 deletions(-)

New commits:
commit 467724410dc470ec259131f97abd836fe9b021a1
Author: Noel Grandin 
Date:   Tue Sep 26 12:01:53 2017 +0200

loplugin:flatten in toolkit..vbahelper

Change-Id: I6d4be3e1cc29b2b91d5c39b757ff3b903c47112d
Reviewed-on: https://gerrit.libreoffice.org/42794
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 551dda47a63c..291894605b49 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1827,48 +1827,47 @@ ControlModelContainerBase::updateUserFormChildren( 
const Reference< XNameContain
 if ( Operation < Insert || Operation > Remove )
 throw IllegalArgumentException();
 
-if ( xAllChildren.is() )
+if ( !xAllChildren.is() )
+throw IllegalArgumentException();
+
+if ( Operation == Remove )
 {
-if ( Operation == Remove )
-{
-Reference< XControlModel > xOldModel( xAllChildren->getByName( 
aName ), UNO_QUERY );
-xAllChildren->removeByName( aName );
+Reference< XControlModel > xOldModel( xAllChildren->getByName( aName 
), UNO_QUERY );
+xAllChildren->removeByName( aName );
 
-Reference< XNameContainer > xChildContainer( xOldModel, UNO_QUERY 
);
-if ( xChildContainer.is() )
-{
-Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY );
-// container control is being removed from this container, 
reset the
-// global list of containees
-if ( xProps.is() )
-xProps->setPropertyValue(  GetPropertyName( 
BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( uno::Reference< XNameContainer 
>() ) );
-Sequence< OUString > aChildNames = 
xChildContainer->getElementNames();
-for ( sal_Int32 index=0; index< aChildNames.getLength(); 
++index )
-updateUserFormChildren( xAllChildren, aChildNames[ index 
], Operation,  Reference< XControlModel > () );
-}
+Reference< XNameContainer > xChildContainer( xOldModel, UNO_QUERY );
+if ( xChildContainer.is() )
+{
+Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY );
+// container control is being removed from this container, reset 
the
+// global list of containees
+if ( xProps.is() )
+xProps->setPropertyValue(  GetPropertyName( 
BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( uno::Reference< XNameContainer 
>() ) );
+Sequence< OUString > aChildNames = 
xChildContainer->getElementNames();
+for ( sal_Int32 index=0; index< aChildNames.getLength(); ++index )
+updateUserFormChildren( xAllChildren, aChildNames[ index ], 
Operation,  Reference< XControlModel > () );
 }
-else if ( Operation == Insert )
+}
+else if ( Operation == Insert )
+{
+xAllChildren->insertByName( aName, uno::makeAny( xTarget ) );
+Reference< XNameContainer > xChildContainer( xTarget, UNO_QUERY );
+if ( xChildContainer.is() )
 {
-xAllChildren->insertByName( aName, uno::makeAny( xTarget ) );
-Reference< XNameContainer > xChildContainer( xTarget, UNO_QUERY );
-if ( xChildContainer.is() )
+// container control is being added from this container, reset the
+// global list of containees to point to the correct global list
+Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY );
+if ( 

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

[Noel Grandin]

 extensions/source/bibliography/datman.cxx |4 
 extensions/source/bibliography/datman.hxx |1 -
 include/oox/core/recordparser.hxx |1 -
 oox/source/core/recordparser.cxx  |2 +-
 4 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit c1a204e71e5c9d7391469fd1dd9d79948df6eef9
Author: Noel Grandin 
Date:   Tue Sep 26 16:44:22 2017 +0200

readonly maPublicId in RecordInputSource

since
commit 3381981e76873304b171f7df900561dac681d2af
Date:   Thu Jan 17 07:06:10 2008 +
#i1# Bring module to HEAD.

Change-Id: I2ea7e1e3c284c03be369fc7cb29fa70b3d671009
Reviewed-on: https://gerrit.libreoffice.org/42834
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/oox/core/recordparser.hxx 
b/include/oox/core/recordparser.hxx
index 637890aa0361..e0069a6ebe9f 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -44,7 +44,6 @@ namespace prv {
 struct RecordInputSource
 {
 BinaryInputStreamRef mxInStream;
-OUString maPublicId;
 OUString maSystemId;
 };
 
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 0f6e463d693d..e0d7858e211e 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -80,7 +80,7 @@ sal_Int32 SAL_CALL Locator::getLineNumber()
 OUString SAL_CALL Locator::getPublicId()
 {
 checkDispose();
-return mpParser->getInputSource().maPublicId;
+return OUString();
 }
 
 OUString SAL_CALL Locator::getSystemId()
commit 290507945df40b3890396835ef99185e6ed70f31
Author: Noel Grandin 
Date:   Tue Sep 26 16:37:28 2017 +0200

readonly xBibCursor in BibDataManager

since
commit 95117e7fefa9ae82431dcdffd1e58495730f6f54
Date:   Mon Sep 18 15:18:56 2000 +
initial import

Change-Id: Ia7e57f1e0e2b19c6eb5b66ada9cc062f202b453a
Reviewed-on: https://gerrit.libreoffice.org/42833
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/extensions/source/bibliography/datman.cxx 
b/extensions/source/bibliography/datman.cxx
index 22d4e8fae122..161b24048040 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1422,10 +1422,6 @@ void BibDataManager::propertyChange(const 
beans::PropertyChangeEvent& evt)
 }
 else
 aUID = evt.NewValue;
-
-Reference< XRowLocate > xLocate(xBibCursor, UNO_QUERY);
-DBG_ASSERT(xLocate.is(), "BibDataManager::propertyChange : invalid 
cursor !");
-xLocate->moveToBookmark(aUID);
 }
 }
 catch (const Exception&)
diff --git a/extensions/source/bibliography/datman.hxx 
b/extensions/source/bibliography/datman.hxx
index d24e20170781..f988e29f9fad 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -92,7 +92,6 @@ private:
 OUString aDataSourceURL;
 OUString aQuoteChar;
 css::uno::AnyaUID;
-css::uno::Reference< css::sdbc::XResultSet >  
xBibCursor;
 
 ::comphelper::OInterfaceContainerHelper2   m_aLoadListeners;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

gpg4libre: Advanced autoconf question

[David Ostrovsky]

I'm working on porting gpg4libre to native Windows build: [1].

You can find the status here: [2]. libgpg-error and lubassuan can be
built right naow. gpgme configure script is failing with two different
problems:

- 1 Detection of glib
- 2 Detection whether or not the provided compiler supports C++11.

I documented the confiuration breakages here: [3] and my analysis.
I will be on vacation in the next weeks, and wonder if you can have
an idea, how to rectify those problems, or, even better, just fix
them ;-)

* [1] https://gerrit.libreoffice.org/#/q/topic:gpg4libre-win32
* [2] https://wiki.documentfoundation.org/Development/msvc-x86_64#Ongoi
ng_efforts_to_build_gpgme_on_Windows
* [3] https://wiki.documentfoundation.org/Development/msvc-x86_64#gpgme
pp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: gpg4libre: Advanced autoconf question

[Miklos Vajna]

Hi,

On Wed, Sep 27, 2017 at 09:14:34AM +0200, David Ostrovsky  
wrote:
> - 2 Detection whether or not the provided compiler supports C++11.

In the context of msvc and autoconf, this may be related:

https://sourceforge.net/p/libepubgen/code/ci/49f6461d4751d3b16e32ab8f9c93a3856b33be49/

I.e. maybe your problem is the same that configure should not draw
conclustions about C++11 support based on __cplusplus when it comes to
MSVC.

Regards,

Miklos


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

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

[Muhammet Kara]

 cui/source/dialogs/SpellDialog.cxx |2 +-
 cui/source/inc/SpellDialog.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 98a912d1f1217f4b7e83ed7162a2ece6372191f0
Author: Muhammet Kara 
Date:   Tue Sep 26 09:19:34 2017 +

Replace sal_uLong with sal_uInt32 in SpellDialog

It is now consistent with the param type of TextEngine::SetAttrib

Change-Id: I3b0ef3fe01ee26cce8c3ec078f9ae93317d6ccdc
Reviewed-on: https://gerrit.libreoffice.org/42787
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 42c91096d9c1..26fee0bcdca5 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1749,7 +1749,7 @@ void SentenceEditWindow_Impl::SetAlternatives( const 
Reference< XSpellAlternativ
 }
 
 
-void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong 
nPara, sal_uInt16 nStart, sal_uInt16 nEnd )
+void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uInt32 
nPara, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
 GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd);
 }
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index fb67c063ed9e..06b7f4623205 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -84,7 +84,7 @@ public:
 voidInit(VclPtr const );
 voidSetModifyHdl(const Link& rLink) override { 
m_aModifyLink = rLink;}
 
-voidSetAttrib( const TextAttrib& rAttr, sal_uLong nPara, 
sal_uInt16 nStart, sal_uInt16 nEnd );
+voidSetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, 
sal_uInt16 nStart, sal_uInt16 nEnd );
 voidSetText( const OUString& rStr ) override;
 
 boolMarkNextError( bool bIgnoreCurrentError, const 
css::uno::Reference& );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos]

 sw/source/core/doc/docnew.cxx   |1 +
 sw/source/uibase/dbui/dbmgr.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 79a425900e31bda83cde1bee150c1234931cb8bd
Author: Szymon Kłos 
Date:   Mon Sep 25 19:04:05 2017 +0200

tdf#112634 Don't remove embedded database before close

Change-Id: Iaa60160d40b0f7b5dceba319bc3813d124c34cc1
Reviewed-on: https://gerrit.libreoffice.org/42762
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 86e5085692c8..8fa20bd5df18 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -524,6 +524,7 @@ SwDoc::~SwDoc()
 // Remove the revoke listener here first, so that we don't remove the 
data source from the document.
 mpDBManager->releaseRevokeListener();
 SwDBManager::RevokeDataSource(maDBData.sDataSource);
+SwDBManager::RevokeDataSource(mpDBManager->getEmbeddedName());
 }
 else if (!mpDBManager->getEmbeddedName().isEmpty())
 {
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 1c3d6a56679f..483ffd686a0e 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3221,7 +3221,7 @@ void SwDBManager::CommitLastRegistrations()
 {
 for (auto aIt = m_aUncommitedRegistrations.begin(); aIt != 
m_aUncommitedRegistrations.end();)
 {
-if (aIt->first == m_pDoc->GetDocShell())
+if (aIt->first == m_pDoc->GetDocShell() || aIt->first == nullptr)
 {
 m_aNotUsedConnections.push_back(aIt->second);
 aIt = m_aUncommitedRegistrations.erase(aIt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/README.scheduler vcl/win

[Jan-Marek Glogowski]

 vcl/README.scheduler|8 
 vcl/inc/osx/salinst.h   |2 ++
 vcl/osx/salinst.cxx |   23 +--
 vcl/win/app/salinst.cxx |   28 +++-
 4 files changed, 34 insertions(+), 27 deletions(-)

New commits:
commit ce8bbb782b806e429ffb44226162967bed244d94
Author: Jan-Marek Glogowski 
Date:   Tue Aug 29 09:40:01 2017 +0200

Don't wait-yield non-main threads in the main thread

This prevents blocking the main thread by a yielding non-main thread.
The current solution is to wait on a condition, which is set by the
main thread on wakeup.

Change-Id: I8d680bb51a36ce1e0d3d4713d47d8e2ef93d7297
Reviewed-on: https://gerrit.libreoffice.org/42808
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/README.scheduler b/vcl/README.scheduler
index 7e0d6ca8b467..ac4a0dd698d4 100644
--- a/vcl/README.scheduler
+++ b/vcl/README.scheduler
@@ -122,6 +122,14 @@ basically the same we're doing with the LO scheduler as a 
system event.
 The gen X11 backend has some levels of redirection, but needs quite some work
 to get this fixed.
 
+== General: non-main thread yield ==
+
+Yielding from a non-main thread must not wait in the main thread, as this
+may block the main thread until some events happen.
+
+Currently we wait on an extra conditional, which is cleared by the main event
+loop.
+
 == MacOS implementation details ==
 
 Generally the Scheduler is handled as expected, except on resize, which is
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 65db0d0b0f2a..0e30dfafb693 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -72,6 +72,8 @@ class AquaSalInstance : public SalInstance
 {}
 };
 
+bool RunInMainYield( bool bHandleAllCurrentEvents );
+
 public:
 SalYieldMutex*  mpSalYieldMutex;// 
Sal-Yield-Mutex
 OUStringmaDefaultPrinter;
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index e3e101cbc13e..f55e9b4aa297 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -525,6 +525,13 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 };
 }
 
+bool AquaSalInstance::RunInMainYield( bool bHandleAllCurrentEvents )
+{
+OSX_SALDATA_RUNINMAIN_UNION( DoYield( false, bHandleAllCurrentEvents), 
boolean )
+assert( false && "Don't call this from the main thread!" );
+return false;
+
+}
 static bool isWakeupEvent( NSEvent *pEvent )
 {
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -645,13 +652,17 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 if ( bHadEvent )
 maWaitingYieldCond.set();
 }
-else if( bWait )
+else
 {
-// #i103162#
-// wait until the main thread has dispatched an event
-maWaitingYieldCond.reset();
-SolarMutexReleaser aReleaser;
-maWaitingYieldCond.wait();
+bHadEvent = RunInMainYield( bHandleAllCurrentEvents );
+if ( !bHadEvent && bWait )
+{
+// #i103162#
+// wait until the main thread has dispatched an event
+maWaitingYieldCond.reset();
+SolarMutexReleaser aReleaser;
+maWaitingYieldCond.wait();
+}
 }
 
 // we get some apple events way too early
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 23e48532d3b9..b77e84eac739 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -572,31 +572,16 @@ bool WinSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 SolarMutexReleaser aReleaser;
 if ( !IsMainThread() )
 {
-if ( bWait )
+// If you change the SendMessageW function, you might need to update
+// the PeekMessage( ... PM_QS_POSTMESSAGE) calls!
+bDidWork = SendMessageW( mhComWnd, SAL_MSG_THREADYIELD,
+ (WPARAM) false, (LPARAM) 
bHandleAllCurrentEvents );
+if ( !bDidWork && bWait )
 {
 maWaitingYieldCond.reset();
 maWaitingYieldCond.wait();
 bDidWork = true;
 }
-else {
-// #97739# A SendMessage call blocks until the called thread 
(here: the main thread)
-// returns. During a yield however, messages are processed in the 
main thread that might
-// result in a new message loop due to opening a dialog. Thus, 
SendMessage would not
-// return which will block this thread!
-// Solution: just give up the time slice and hope that messages 
are processed
-// by the main thread anyway (where all windows are created)
-// If the mainthread is not currently handling messages, then our 
SendMessage would
-// also do nothing, so this seems to be reasonable.
-
-// #i18883# only sleep if potential deadlock scenario, ie, when a 
dialog is open
-if( 

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

[Noel Grandin]

 vcl/inc/win/saldata.hxx |2 +-
 vcl/win/app/salinst.cxx |   30 +++---
 vcl/win/app/saltimer.cxx|   10 +-
 vcl/win/gdi/salprn.cxx  |4 ++--
 vcl/win/window/salframe.cxx |   12 ++--
 5 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 7c52d86f7b05fe7e0178f6d98a12a531b88a32ff
Author: Noel Grandin 
Date:   Wed Sep 20 09:06:34 2017 +0200

rename mpFirstInstance->mpInstance

Change-Id: I472df5821cb74a16d5ea00a1939b0e1bdf9072aa
Reviewed-on: https://gerrit.libreoffice.org/42518
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 245d986915b1..db6771c8095e 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -87,7 +87,7 @@ public:
 HHOOK   mhSalObjMsgHook;// hook to get interesting 
msg for SalObject
 HWNDmhWantLeaveMsg; // window handle, that 
want a MOUSELEAVE message
 AutoTimer*  mpMouseLeaveTimer;  // Timer for MouseLeave 
Test
-WinSalInstance* mpFirstInstance;// pointer of first 
instance
+WinSalInstance* mpInstance;
 WinSalFrame*mpFirstFrame;   // pointer of first frame
 WinSalObject*   mpFirstObject;  // pointer of first object 
window
 WinSalVirtualDevice*mpFirstVD;  // first VirDev
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index b77e84eac739..487cf7fb09d2 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -137,7 +137,7 @@ void SalYieldMutex::BeforeReleaseHandler()
 /// this function to avoid deadlock
 void SalYieldMutex::doAcquire( sal_uInt32 nLockCount )
 {
-WinSalInstance* pInst = GetSalData()->mpFirstInstance;
+WinSalInstance* pInst = GetSalData()->mpInstance;
 if ( pInst && pInst->IsMainThread() )
 {
 if ( pInst->mbNoYieldLock )
@@ -170,7 +170,7 @@ void SalYieldMutex::doAcquire( sal_uInt32 nLockCount )
 
 sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll )
 {
-WinSalInstance* pInst = GetSalData()->mpFirstInstance;
+WinSalInstance* pInst = GetSalData()->mpInstance;
 if ( pInst && pInst->mbNoYieldLock && pInst->IsMainThread() )
 return 1;
 
@@ -183,7 +183,7 @@ sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll )
 
 bool SalYieldMutex::tryToAcquire()
 {
-WinSalInstance* pInst = GetSalData()->mpFirstInstance;
+WinSalInstance* pInst = GetSalData()->mpInstance;
 if ( pInst )
 {
 if ( pInst->mbNoYieldLock && pInst->IsMainThread() )
@@ -197,20 +197,20 @@ bool SalYieldMutex::tryToAcquire()
 
 void ImplSalYieldMutexAcquireWithWait( sal_uInt32 nCount )
 {
-WinSalInstance* pInst = GetSalData()->mpFirstInstance;
+WinSalInstance* pInst = GetSalData()->mpInstance;
 if ( pInst )
 pInst->mpSalYieldMutex->acquire( nCount );
 }
 
 bool ImplSalYieldMutexTryToAcquire()
 {
-WinSalInstance* pInst = GetSalData()->mpFirstInstance;
+WinSalInstance* pInst = GetSalData()->mpInstance;
 return pInst ? pInst->mpSalYieldMutex->tryToAcquire() : false;
 }
 
 void ImplSalYieldMutexRelease()
 {
-WinSalInstance* pInst = GetSalData()->mpFirstInstance;
+WinSalInstance* pInst = GetSalData()->mpInstance;
 if ( pInst )
 {
 GdiFlush();
@@ -220,11 +220,11 @@ void ImplSalYieldMutexRelease()
 
 bool SalYieldMutex::IsCurrentThread() const
 {
-if ( !GetSalData()->mpFirstInstance->mbNoYieldLock )
+if ( !GetSalData()->mpInstance->mbNoYieldLock )
 // For the Windows backend, the LO identifier is the system thread ID
 return m_nThreadId == GetCurrentThreadId();
 else
-return GetSalData()->mpFirstInstance->IsMainThread();
+return GetSalData()->mpInstance->IsMainThread();
 }
 
 void SalData::initKeyCodeMap()
@@ -270,7 +270,7 @@ SalData::SalData()
 mhSalObjMsgHook = nullptr;  // hook to get interesting msg for SalObject
 mhWantLeaveMsg = nullptr;   // window handle, that want a MOUSELEAVE 
message
 mpMouseLeaveTimer = nullptr; // Timer for MouseLeave Test
-mpFirstInstance = nullptr;  // pointer of first instance
+mpInstance = nullptr;  // pointer of first instance
 mpFirstFrame = nullptr; // pointer of first frame
 mpFirstObject = nullptr;// pointer of first object window
 mpFirstVD = nullptr;// first VirDev
@@ -436,7 +436,7 @@ SalInstance* CreateSalInstance()
 WinSalInstance* pInst = new WinSalInstance;
 
 // init instance (only one instance in this version !!!)
-pSalData->mpFirstInstance   = pInst;
+pSalData->mpInstance   = pInst;
 pInst->mhInst= pSalData->mhInst;
 pInst->mhComWnd  = hComWnd;
 
@@ -455,8 +455,8 @@ void DestroySalInstance( SalInstance* pInst )
 ImplFreeSalGDI();
 
 // reset instance
-if ( 

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

[Noel Grandin]

 cui/source/customize/cfgutil.cxx|   14 --
 cui/source/inc/cfgutil.hxx  |   11 ---
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   12 
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |1 -
 4 files changed, 38 deletions(-)

New commits:
commit 7ef34163216d575f43dfef6fa734ee06d2fe13af
Author: Noel Grandin 
Date:   Wed Sep 27 09:25:17 2017 +0200

loplugin:unusedmethods

Change-Id: I5d75baa2af046f377b49e967783fb06cd9e885ef
Reviewed-on: https://gerrit.libreoffice.org/42841
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 2a8e591b82dc..02a34d9daf34 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1265,8 +1265,6 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, 
pButton, void )
 }
 else if (pButton == m_pOKButton)
 {
-GetAddHdl().Call( *this );
-
 // If we are displaying Slot API commands then this the dialog is being
 // run from Tools/Configure and we should not close it
 if ( !m_bShowSlots )
@@ -1293,12 +1291,6 @@ SvxScriptSelectorDialog::SetRunLabel()
 m_pOKButton->SetText(CuiResId(RID_SVXSTR_SELECTOR_RUN));
 }
 
-void
-SvxScriptSelectorDialog::SetDialogDescription( const OUString& rDescription )
-{
-m_pDialogDescription->SetText( rDescription );
-}
-
 OUString
 SvxScriptSelectorDialog::GetScriptURL() const
 {
@@ -1320,10 +1312,4 @@ SvxScriptSelectorDialog::GetScriptURL() const
 return result;
 }
 
-OUString
-SvxScriptSelectorDialog::GetSelectedDisplayName()
-{
-return m_pCommands->GetEntryText( m_pCommands->FirstSelected() );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 528b26f04b0e..3b2b190ed26e 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -192,7 +192,6 @@ class SvxScriptSelectorDialog : public ModalDialog
 OUString   m_sDefaultDesc;
 SfxStylesInfo_Impl m_aStylesInfo;
 bool   m_bShowSlots;
-Linkm_aAddHdl;
 
 DECL_LINK( ClickHdl, Button *, void );
 DECL_LINK( SelectHdl, SvTreeListBox*, void );
@@ -210,18 +209,8 @@ public:
 virtual ~SvxScriptSelectorDialog() override;
 virtual void dispose() override;
 
-voidSetAddHdl( const Link& rLink ) 
{ m_aAddHdl = rLink; }
-const Link& GetAddHdl() const { return 
m_aAddHdl; }
-
-voidSetImageProvider(SaveInData* provider)
-{
-m_pCategories->SetImageProvider(provider);
-}
-
 OUStringGetScriptURL() const;
-OUStringGetSelectedDisplayName();
 voidSetRunLabel();
-voidSetDialogDescription(const OUString& rDescription);
 };
 
 #endif
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 147790f9f5db..dd69d19c1f5f 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -122,18 +122,6 @@ bool ConditionAtom::compareResult(sal_Int32 nOperator, 
sal_Int32 nFirst, sal_Int
 }
 }
 
-bool ConditionAtom::compareResult(sal_Int32 nOperator, const OUString& sFirst, 
const OUString& sSecond)
-{
-switch (nOperator)
-{
-case XML_equ: return sFirst == sSecond;
-case XML_neq: return sFirst != sSecond;
-default:
-SAL_WARN("oox.drawingml", "unsupported operator: " << nOperator);
-return false;
-}
-}
-
 const dgm::Point* ConditionAtom::getPresNode() const
 {
 const DiagramData::PointsNameMap& rPoints = 
mrLayoutNode.getDiagram().getData()->getPointsPresNameMap();
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 92ef240e6785..f4928565c048 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -184,7 +184,6 @@ public:
 virtual const std::vector& getChildren() const override;
 private:
 static bool compareResult(sal_Int32 nOperator, sal_Int32 nFirst, sal_Int32 
nSecond);
-static bool compareResult(sal_Int32 nOperator, const OUString& sFirst, 
const OUString& sSecond);
 const dgm::Point* getPresNode() const;
 sal_Int32 getNodeCount() const;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/scheduler-fixes' - 47 commits - compilerplugins/clang configure.ac cppuhelper/source cui/source cui/uiconfig dtrans/source extensions/source filter

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit 2fca5f4fe2a4fd9961b98c6af1a5f4a14d3c9760
Author: Jan-Marek Glogowski 
Date:   Tue Sep 26 19:06:51 2017 +0200

tdf#112605 OSX refactor SalAquaTimer

Drops all the static calls and variables from SalAquaTimer
and moves all timer handling logic inside the class.

This also fixes the leak in in timerElapsed.

Change-Id: Ie7a1a8fffb70b8579ec6876eed10a275d2f06d27

diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index 86964115d648..ad6adf9d00ed 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -43,6 +43,12 @@ public:
 
 class AquaSalTimer : public SalTimer
 {
+NSTimer*m_pRunningTimer;
+sal_uInt32  m_nTimerStartTicks;  ///< system ticks at timer start % 
SAL_MAX_UINT32
+
+void queueDispatchTimerEvent( bool bAtStart );
+void callTimerCallback();
+
 public:
 AquaSalTimer();
 virtual ~AquaSalTimer() override;
@@ -50,13 +56,18 @@ public:
 void Start( sal_uLong nMS ) override;
 void Stop() override;
 
-static void handleStartTimerEvent( NSEvent* pEvent );
-static void handleDispatchTimerEvent();
+void handleStartTimerEvent( NSEvent* pEvent );
+void handleDispatchTimerEvent( NSEvent* pEvent );
+void handleTimerElapsed();
 
-static NSTimer* pRunningTimer;
-static bool bDispatchTimer;
+inline bool IsTimerElapsed() const;
 };
 
+inline bool AquaSalTimer::IsTimerElapsed() const
+{
+return 0 != m_nTimerStartTicks;
+}
+
 #endif // INCLUDED_VCL_INC_OSX_SALTIMER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index a57879802f52..0d50fdbce585 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -426,11 +426,13 @@ bool AquaSalInstance::IsMainThread() const
 
 void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
 {
+AquaSalTimer *pTimer = static_cast( 
ImplGetSVData()->maSchedCtx.mpSalTimer );
 int nSubtype = [pEvent subtype];
 switch( nSubtype )
 {
 case AppStartTimerEvent:
-AquaSalTimer::handleStartTimerEvent( pEvent );
+if ( pTimer )
+pTimer->handleStartTimerEvent( pEvent );
 break;
 case AppEndLoopEvent:
 [NSApp stop: NSApp];
@@ -450,7 +452,8 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 break;
 }
 case DispatchTimerEvent:
-AquaSalTimer::handleDispatchTimerEvent();
+if ( pTimer )
+pTimer->handleDispatchTimerEvent( pEvent );
 break;
 #if !HAVE_FEATURE_MACOSX_SANDBOX
 case AppleRemoteControlEvent: // Defined in 

@@ -598,12 +601,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 {
 SolarMutexReleaser aReleaser;
 
-NSDate* pDt = AquaSalTimer::pRunningTimer ? 
[AquaSalTimer::pRunningTimer fireDate] : [NSDate distantFuture];
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 // 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12
 pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask
 SAL_WNODEPRECATED_DECLARATIONS_POP
-untilDate: pDt
+untilDate: [NSDate distantFuture]
 inMode: NSDefaultRunLoopMode
 dequeue: YES];
 if( pEvent )
@@ -682,14 +684,9 @@ bool AquaSalInstance::AnyInput( VclInputFlags nType )
 
 if( nType & VclInputFlags::TIMER )
 {
-if( AquaSalTimer::pRunningTimer )
-{
-NSDate* pDt = [AquaSalTimer::pRunningTimer fireDate];
-if( pDt && [pDt timeIntervalSinceNow] < 0 )
-{
-return true;
-}
-}
+AquaSalTimer *pTimer = static_cast( 
ImplGetSVData()->maSchedCtx.mpSalTimer );
+if (pTimer && pTimer->IsTimerElapsed())
+return true;
 }
 
 unsigned/*NSUInteger*/ nEventMask = 0;
diff --git a/vcl/osx/salnstimer.mm b/vcl/osx/salnstimer.mm
index c9b657dcd776..9647bb6b87c1 100644
--- a/vcl/osx/salnstimer.mm
+++ b/vcl/osx/salnstimer.mm
@@ -27,16 +27,12 @@
 
 @implementation TimerCallbackCaller
 
--(void)timerElapsed:(NSTimer*)pTimer
+-(void)timerElapsed:(NSTimer*)pNSTimer
 {
-(void)pTimer;
-// nil the timer, as it is just invalidated after the firing function
-AquaSalTimer::pRunningTimer = nil;
-const AquaSalInstance *pInst = GetSalData()->mpFirstInstance;
-if (pInst->mbIsLiveResize)
-AquaSalTimer::handleDispatchTimerEvent();
-else
-ImplNSAppPostEvent( AquaSalInstance::DispatchTimerEvent, YES );
+(void) pNSTimer;
+AquaSalTimer *pTimer = static_cast( 
ImplGetSVData()->maSchedCtx.mpSalTimer );
+if (pTimer)
+pTimer->handleTimerElapsed();
 }
 
 @end
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index e442fcf05335..9c5bb7a7db9e 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -20,6 +20,7 @@
 #include 
 

[Libreoffice-commits] core.git: ios/README qadevOOo/tests

[Andrea Gelmini]

 ios/README   |   12 ++--
 qadevOOo/tests/java/ifc/i18n/_XCalendar.java |4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b50f595b34585f2927adfd44b4eaaafb8f600972
Author: Andrea Gelmini 
Date:   Wed Sep 27 10:56:29 2017 +0200

Fix typos

Change-Id: I9a33e4fbdeb33d907597e4e58ddb2e8cb285adaa
Reviewed-on: https://gerrit.libreoffice.org/42830
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/ios/README b/ios/README
index ba9c5d5c95bc..ef5155133c54 100644
--- a/ios/README
+++ b/ios/README
@@ -7,7 +7,7 @@ prelink all LO libraries into one to facilitate easier linking
 a swift based UI, very much work in progress
 
 -- support
-the arm64 and simulator are the only supported processsors,
+the arm64 and simulator are the only supported processors,
 old 32 bit iPhones are not supported.
 
 The swift app are done for 3 structures
@@ -16,14 +16,14 @@ The swift app are done for 3 structures
   arm64 + optimized libraries
 
 -- SETUP
-Due to the 3 modes, at lease 3 workdir are needed together with a 
-seperate UI workdir.
+Due to the 3 modes, at least 3 workdirs are needed together with a
+separated UI workdir.
 
-Because the main work is done on the UI, where it is convinient to
-swift fast between arm64 and simulator, it is advanteous to compile
+Because the main work is done on the UI, where it is convenient to
+switch fast between arm64 and simulator, it is advantageous to compile
 the 3 configurations of LO first, and then link against those.
 
-Due to the multiple workdirs a distint directory setup is needed
+Due to the multiple workdirs a distinct directory setup is needed
./core - libreoffice git clone (name can be changed)
./ios-arm64 - workdir for production, autogen.input:
 standard +
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java 
b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 2aaeb921f060..d24f201229ca 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -345,7 +345,7 @@ public class _XCalendar extends MultiMethodTest {
 res &= (aValue == newValue);
 if (!res){
 log.println("the returned value is not the expected value:");
-log.println("expexted: " + newValue + "  returned value: " + 
aValue);
+log.println("expected: " + newValue + "  returned value: " + 
aValue);
 }
 tRes.tested("getValue()", res);
 }
@@ -369,7 +369,7 @@ public class _XCalendar extends MultiMethodTest {
 res &= (aValue > newValue);
 if (!res){
 log.println("the returned value is not the expected value:");
-log.println("expexted: " + newValue + "  returned value: " + 
aValue);
+log.println("expected: " + newValue + "  returned value: " + 
aValue);
 }
 tRes.tested("addValue()", res);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang embeddedobj/source forms/source framework/source i18npool/source scripting/source sd/source sfx2/source stoc/source sw/source

[Noel Grandin]

 compilerplugins/clang/flatten.cxx |2 
 embeddedobj/source/general/dummyobject.cxx|   33 -
 embeddedobj/source/msole/oleembed.cxx |  104 ++---
 embeddedobj/source/msole/olepersist.cxx   |  200 --
 forms/source/xforms/NameContainer.hxx |   25 -
 forms/source/xforms/binding.cxx   |   26 -
 forms/source/xforms/collection.hxx|   35 -
 forms/source/xforms/namedcollection.hxx   |6 
 framework/source/fwe/helper/propertysetcontainer.cxx  |   83 +---
 framework/source/fwi/uielement/itemcontainer.cxx  |   56 +-
 framework/source/fwi/uielement/rootitemcontainer.cxx  |   54 +-
 framework/source/uiconfiguration/windowstateconfiguration.cxx |  175 
 framework/source/uielement/menubarwrapper.cxx |   12 
 framework/source/uielement/statusbarwrapper.cxx   |   23 -
 i18npool/source/indexentry/indexentrysupplier_default.cxx |   21 -
 i18npool/source/textconversion/textconversion_ko.cxx  |  142 +++
 i18npool/source/textconversion/textconversion_zh.cxx  |   56 +-
 scripting/source/dlgprov/dlgprov.cxx  |   64 +--
 sd/source/ui/presenter/PresenterTextView.cxx  |   19 
 sfx2/source/doc/DocumentMetadataAccess.cxx|   62 +--
 stoc/source/implementationregistration/implreg.cxx|  107 ++---
 stoc/source/servicemanager/servicemanager.cxx |   39 -
 sw/source/ui/vba/vbasystem.cxx|   30 -
 23 files changed, 646 insertions(+), 728 deletions(-)

New commits:
commit cc1ed7fbce20f90650f96acc2846b6f232c8ab0f
Author: Noel Grandin 
Date:   Wed Sep 27 09:11:35 2017 +0200

loplugin:flatten in various

Change-Id: I42dca691ffadbddad38a7e8f978b1da9d5d9a7b0
Reviewed-on: https://gerrit.libreoffice.org/42842
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/flatten.cxx 
b/compilerplugins/clang/flatten.cxx
index 4ca9d4fc4382..aeb72714b6f8 100644
--- a/compilerplugins/clang/flatten.cxx
+++ b/compilerplugins/clang/flatten.cxx
@@ -344,7 +344,7 @@ std::string Flatten::getSourceAsString(SourceRange range)
 return std::string( p1, p2 - p1);
 }
 
-loplugin::Plugin::Registration< Flatten > X("flatten", false);
+loplugin::Plugin::Registration< Flatten > X("flatten", true);
 
 }
 
diff --git a/embeddedobj/source/general/dummyobject.cxx 
b/embeddedobj/source/general/dummyobject.cxx
index fa44b4db4286..935ad015fb0b 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -293,34 +293,29 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
 
 if ( m_bWaitSaveCompleted )
 {
-if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
-saveCompleted( m_xParentStorage != xStorage || m_aEntryName != 
sEntName );
-else
+if ( nEntryConnectionMode != embed::EntryInitModes::NO_INIT )
 throw embed::WrongStateException(
 "The object waits for saveCompleted() call!",
 static_cast< ::cppu::OWeakObject* >(this) );
-}
 
-if ( nEntryConnectionMode == embed::EntryInitModes::DEFAULT_INIT
-  || nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
-{
-if ( xStorage->hasByName( sEntName ) )
-
-{
-m_xParentStorage = xStorage;
-m_aEntryName = sEntName;
-m_nObjectState = embed::EmbedStates::LOADED;
-}
-else
-throw lang::IllegalArgumentException( "Wrong entry is provided!",
-static_cast< ::cppu::OWeakObject* >(this),
-2 );
+saveCompleted( m_xParentStorage != xStorage || m_aEntryName != 
sEntName );
 
 }
-else
+
+if ( nEntryConnectionMode != embed::EntryInitModes::DEFAULT_INIT
+&& nEntryConnectionMode != embed::EntryInitModes::NO_INIT )
 throw lang::IllegalArgumentException( "Wrong connection mode is 
provided!",
 static_cast< ::cppu::OWeakObject* >(this),
 3 );
+
+if ( !xStorage->hasByName( sEntName ) )
+throw lang::IllegalArgumentException( "Wrong entry is provided!",
+static_cast< ::cppu::OWeakObject* >(this),
+2 );
+
+m_xParentStorage = xStorage;
+m_aEntryName = sEntName;
+m_nObjectState = embed::EmbedStates::LOADED;
 }
 
 
diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index b00cea109890..e8139480b39d 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ 

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

[Tor Lillqvist]

 sc/qa/unit/parallelism.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit e5b76044326f8dd5d59d7b9e51fbcda706836115
Author: Tor Lillqvist 
Date:   Wed Sep 27 10:53:54 2017 +0300

Test also SUMIFS where no row matches

Change-Id: Ifd4ab6f1760a5088744cb728a3e0c970388d8283

diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 1bd725ad38b1..bccae4e830b8 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -103,7 +103,11 @@ void ScParallelismTest::testSUMIFS()
 
 for (auto i = 1; i < 1000; i++)
 {
-/*A*/ m_pDoc->SetValue(0, i, 0, i/10 + 1000);
+/*A*/
+if (i%19)
+m_pDoc->SetValue(0, i, 0, i/10 + 1000);
+else
+m_pDoc->SetValue(0, i, 0, 123456);
 /*B*/ m_pDoc->SetValue(1, i, 0, i%10);
 /*C*/ m_pDoc->SetValue(2, i, 0, i%5);
 
@@ -161,7 +165,10 @@ void ScParallelismTest::testSUMIFS()
 for (auto i = 1; i < 1000; i++)
 {
 OString sMessage = "At row " + OString::number(i+1);
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(), 
m_pDoc->GetValue(5, 10+i%10, 0), m_pDoc->GetValue(15, i, 0), 1e-10);
+if ((10+i%10)%19)
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(), 
m_pDoc->GetValue(5, 10+i%10, 0), m_pDoc->GetValue(15, i, 0), 1e-10);
+else
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(), 0, 
m_pDoc->GetValue(15, i, 0), 1e-10);
 }
 
 m_pDoc->DeleteTab(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/flatten.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 298abfd91b19d89ce9af1610ea497dfe4d536fca
Author: Noel Grandin 
Date:   Wed Sep 27 11:04:57 2017 +0200

disable flatten loplugin

 sberg, new plugin flatten just went active
 noelgrandin, with a measure to avoid extending lifetime of 
(problematic) local vars?
 sberg, no
 noelgrandin, how can you make it active then?
 sberg, ok, will disable

Change-Id: I595d1a50ff34417faf73b14f9dc92e2a43d2

diff --git a/compilerplugins/clang/flatten.cxx 
b/compilerplugins/clang/flatten.cxx
index aeb72714b6f8..4ca9d4fc4382 100644
--- a/compilerplugins/clang/flatten.cxx
+++ b/compilerplugins/clang/flatten.cxx
@@ -344,7 +344,7 @@ std::string Flatten::getSourceAsString(SourceRange range)
 return std::string( p1, p2 - p1);
 }
 
-loplugin::Plugin::Registration< Flatten > X("flatten", true);
+loplugin::Plugin::Registration< Flatten > X("flatten", false);
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/oox/ppt/slidetransition.hxx |1 -
 oox/source/ppt/slidetransition.cxx  |   14 ++
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit f8ae36322d524d1aa755af144852701c25ebe7a2
Author: Noel Grandin 
Date:   Tue Sep 26 16:47:40 2017 +0200

readonly mnFadeColor in SlideTransition

since
commit c714b43b0137ad253f51e1c65417c9874b8509e5
Date:   Mon Jul 20 13:12:31 2015 +0200
loplugin:unusedmethods oox

Change-Id: Ibece5543b2012bd5a18d82058faa8554ed155777
Reviewed-on: https://gerrit.libreoffice.org/42835
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/oox/ppt/slidetransition.hxx 
b/include/oox/ppt/slidetransition.hxx
index e11298a0a04e..8986016f30aa 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -66,7 +66,6 @@ namespace oox { namespace ppt {
 ::sal_Int16 mnTransitionSubType;
 bool  mbTransitionDirectionNormal;
 css::presentation::AnimationSpeed mnAnimationSpeed;
-::sal_Int32 mnFadeColor;
 bool  mbMode; /**< 
http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html
 Mode property */
 ::sal_Int32 mnAdvanceTime;
 };
diff --git a/oox/source/ppt/slidetransition.cxx 
b/oox/source/ppt/slidetransition.cxx
index a0ac34848d79..f739c63cb7af 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -45,7 +45,6 @@ namespace oox { namespace ppt {
 , mnTransitionSubType( 0 )
 , mbTransitionDirectionNormal( true )
 , mnAnimationSpeed( AnimationSpeed_FAST )
-, mnFadeColor( 0 )
 , mbMode( true )
 , mnAdvanceTime( -1 )
 {
@@ -57,7 +56,6 @@ namespace oox { namespace ppt {
 , mnTransitionSubType( 0 )
 , mbTransitionDirectionNormal( true )
 , mnAnimationSpeed( AnimationSpeed_FAST )
-, mnFadeColor( 0 )
 , mbMode( true )
 , mnAdvanceTime( -1 )
 {
@@ -78,11 +76,11 @@ namespace oox { namespace ppt {
 aProps.setProperty( PROP_TransitionSubtype, mnTransitionSubType);
 aProps.setProperty( PROP_TransitionDirection, 
mbTransitionDirectionNormal);
 aProps.setProperty( PROP_Speed, mnAnimationSpeed);
-aProps.setProperty( PROP_TransitionFadeColor, mnFadeColor);
-if( mnAdvanceTime != -1 ) {
-aProps.setProperty( PROP_Duration, mnAdvanceTime/1000);
-aProps.setProperty( PROP_Change, static_cast(1));
-}
+aProps.setProperty( PROP_TransitionFadeColor, sal_Int32(0));
+if( mnAdvanceTime != -1 ) {
+aProps.setProperty( PROP_Duration, mnAdvanceTime/1000);
+aProps.setProperty( PROP_Change, static_cast(1));
+}
 }
 catch( Exception& )
 {
@@ -98,7 +96,7 @@ namespace oox { namespace ppt {
 xFilter->setTransition( mnTransitionType );
 xFilter->setSubtype( mnTransitionSubType );
 xFilter->setDirection( mbTransitionDirectionNormal );
-xFilter->setFadeColor( mnFadeColor );
+xFilter->setFadeColor( 0 );
 xFilter->setMode( mbMode );
 }
 catch( Exception& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/unusedfields.readonly.results  |  210 ---
 compilerplugins/clang/unusedfields.untouched.results |   22 +
 compilerplugins/clang/unusedfields.writeonly.results |   38 ---
 3 files changed, 28 insertions(+), 242 deletions(-)

New commits:
commit 31baba076f6058d675588b2715a3322455c87500
Author: Noel Grandin 
Date:   Wed Sep 27 09:33:03 2017 +0200

update unusedfields loplugin results

Change-Id: I4bdf5701fe9a4dec618440db1fe69e5aad7a60bb

diff --git a/compilerplugins/clang/unusedfields.readonly.results 
b/compilerplugins/clang/unusedfields.readonly.results
index 536a9d72bb98..f819f56a312b 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -64,12 +64,6 @@ connectivity/source/drivers/evoab2/EApi.h:130
 (anonymous) code char *
 connectivity/source/drivers/evoab2/EApi.h:131
 (anonymous) country char *
-connectivity/source/drivers/mork/MResultSet.hxx:82
-connectivity::mork::OResultSet m_nFetchSize sal_Int32
-connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx:83
-connectivity::mozab::ProfileAccess m_ProductProfileList class 
connectivity::mozab::ProductStruct [4]
-connectivity/source/drivers/postgresql/pq_statics.hxx:112
-pq_sdbc_driver::ReflectionImplementations table struct 
ImplementationStatics
 connectivity/source/inc/dbase/DIndexIter.hxx:36
 connectivity::dbase::OIndexIterator m_pOperator file::OBoolOperator *
 connectivity/source/inc/dbase/DIndexIter.hxx:37
@@ -146,37 +140,9 @@ cppu/source/uno/check.cxx:134
 (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:138
 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/inc/autocdlg.hxx:229
-StringChangeList aNewEntries DoubleStringArray
-cui/source/inc/autocdlg.hxx:230
-StringChangeList aDeletedEntries DoubleStringArray
 cui/source/inc/cuicharmap.hxx:86
 SvxCharacterMap m_pFavCharView VclPtr [16]
-cui/source/inc/cuitabarea.hxx:381
-SvxGradientTabPage m_aXFStyleItem class XFillStyleItem
-cui/source/inc/cuitabarea.hxx:451
-SvxHatchTabPage m_aXFStyleItem class XFillStyleItem
-cui/source/inc/cuitabarea.hxx:530
-SvxBitmapTabPage m_aXFStyleItem class XFillStyleItem
-cui/source/inc/cuitabarea.hxx:606
-SvxPatternTabPage m_aXFStyleItem class XFillStyleItem
-cui/source/inc/cuitabarea.hxx:702
-SvxColorTabPage aXFStyleItem class XFillStyleItem
-cui/source/inc/cuitabline.hxx:266
-SvxLineDefTabPage aXLStyle class XLineStyleItem
-cui/source/inc/cuitabline.hxx:267
-SvxLineDefTabPage aXWidth class XLineWidthItem
-cui/source/inc/cuitabline.hxx:347
-SvxLineEndDefTabPage aXLStyle class XLineStyleItem
-cui/source/inc/cuitabline.hxx:348
-SvxLineEndDefTabPage aXWidth class XLineWidthItem
-cui/source/inc/numpages.hxx:98
-SvxSingleNumPickTabPage sNumCharFmtName class rtl::OUString
-cui/source/inc/numpages.hxx:167
-SvxNumPickTabPage aNumSettingsArrays SvxNumSettingsArr_Impl [16]
-cui/source/inc/numpages.hxx:212
-SvxBitmapPickTabPage sNumCharFmtName class rtl::OUString
-cui/source/options/optcolor.cxx:257
+cui/source/options/optcolor.cxx:250
 ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
 cui/source/options/optpath.cxx:79
 OptPath_Impl m_aDefOpt class SvtDefaultOptions
@@ -186,48 +152,16 @@ cui/source/options/personalization.hxx:85
 SelectPersonaDialog m_vResultList VclPtr [9]
 cui/source/options/personalization.hxx:86
 SelectPersonaDialog m_vSearchSuggestions VclPtr [6]
-dbaccess/source/core/api/resultcolumn.hxx:39
-dbaccess::OResultColumn m_isSigned ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:40
-dbaccess::OResultColumn m_isCurrency ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:41
-dbaccess::OResultColumn m_bSearchable ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:42
-dbaccess::OResultColumn m_isCaseSensitive ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:44
-dbaccess::OResultColumn m_isWritable ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:45
-dbaccess::OResultColumn m_isDefinitelyWritable ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:46
-dbaccess::OResultColumn m_isAutoIncrement ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:47
-dbaccess::OResultColumn m_isNullable ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:48
-dbaccess::OResultColumn m_sColumnLabel ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:49
-dbaccess::OResultColumn m_nColumnDisplaySize ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:50
-dbaccess::OResultColumn m_nColumnType ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:51
-dbaccess::OResultColumn m_nPrecision ::boost::optional
-dbaccess/source/core/api/resultcolumn.hxx:52
-dbaccess::OResultColumn m_nScale ::boost::optional
 

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

[Miklos Vajna]

 comphelper/source/misc/sequenceashashmap.cxx|1 
 include/comphelper/sequenceashashmap.hxx|   85 
 sw/source/core/doc/DocumentRedlineManager.cxx   |   69 ---
 sw/source/core/inc/DocumentRedlineManager.hxx   |1 
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |4 -
 5 files changed, 106 insertions(+), 54 deletions(-)

New commits:
commit f7445e1014815a9eb02e2c22257bbce32dc43589
Author: Miklos Vajna 
Date:   Tue Sep 26 21:02:24 2017 +0200

tdf#75757 comphelper: avoid STL inheritance in SequenceAsHashMap

Change-Id: I5c7d107a05deb06749b4d04246ba183adfafb14d
Reviewed-on: https://gerrit.libreoffice.org/42829
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/comphelper/source/misc/sequenceashashmap.cxx 
b/comphelper/source/misc/sequenceashashmap.cxx
index 9c51ad19bf69..707512f42d21 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -26,7 +26,6 @@
 namespace comphelper{
 
 SequenceAsHashMap::SequenceAsHashMap()
-: SequenceAsHashMapBase()
 {
 }
 
diff --git a/include/comphelper/sequenceashashmap.hxx 
b/include/comphelper/sequenceashashmap.hxx
index 270601af7c67..b4b2991948ae 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -40,14 +40,9 @@ namespace comphelper{
 such name sequences very easy ...
  */
 
-struct SequenceAsHashMapBase : public std::unordered_map<
-OUString,
-css::uno::Any ,
-OUStringHash >
-{
-};
+using SequenceAsHashMapBase = std::unordered_map;
 
-class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap : public 
SequenceAsHashMapBase
+class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap
 {
 
 public:
@@ -221,8 +216,8 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC 
SequenceAsHashMap : public SequenceAs
 TValueType getUnpackedValueOrDefault(const OUString& sKey,
  const TValueType&  aDefault) 
const
 {
-const_iterator pIt = find(sKey);
-if (pIt == end())
+auto pIt = m_aMap.find(sKey);
+if (pIt == m_aMap.end())
 return aDefault;
 
 TValueType aValue = TValueType();
@@ -249,8 +244,8 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC 
SequenceAsHashMap : public SequenceAs
  */
 css::uno::Any getValue(const OUString& sKey) const
 {
-const_iterator pIt = find(sKey);
-if (pIt == end())
+auto pIt = m_aMap.find(sKey);
+if (pIt == m_aMap.end())
 return css::uno::Any();
 
 return pIt->second;
@@ -281,7 +276,7 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC 
SequenceAsHashMap : public SequenceAs
 bool createItemIfMissing(const OUString& sKey  ,
  const TValueType&  aValue)
 {
-if (find(sKey) == end())
+if (m_aMap.find(sKey) == m_aMap.end())
 {
 (*this)[sKey] = css::uno::toAny(aValue);
 return true;
@@ -320,6 +315,72 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC 
SequenceAsHashMap : public SequenceAs
 the map containing all items for the update.
  */
 void update(const SequenceAsHashMap& rSource);
+
+css::uno::Any& operator[](const OUString& rKey)
+{
+return m_aMap[rKey];
+}
+
+using iterator = SequenceAsHashMapBase::iterator;
+using const_iterator = SequenceAsHashMapBase::const_iterator;
+
+void clear()
+{
+m_aMap.clear();
+}
+
+size_t size() const
+{
+return m_aMap.size();
+}
+
+bool empty() const
+{
+return m_aMap.empty();
+}
+
+iterator begin()
+{
+return m_aMap.begin();
+}
+
+const_iterator begin() const
+{
+return m_aMap.begin();
+}
+
+iterator end()
+{
+return m_aMap.end();
+}
+
+const_iterator end() const
+{
+return m_aMap.end();
+}
+
+iterator find(const OUString& rKey)
+{
+return m_aMap.find(rKey);
+}
+
+const_iterator find(const OUString& rKey) const
+{
+return m_aMap.find(rKey);
+}
+
+iterator erase(iterator it)
+{
+return m_aMap.erase(it);
+}
+
+size_t erase(const OUString& rKey)
+{
+return m_aMap.erase(rKey);
+}
+
+private:
+SequenceAsHashMapBase m_aMap;
 };
 
 } // namespace comphelper
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 

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

[Michael Stahl]

 sw/source/ui/frmdlg/frmpage.cxx |   17 ++---
 sw/source/uibase/app/docst.cxx  |1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit fb64cf127dc6398f5d18d186a93966837db0bb1e
Author: Michael Stahl 
Date:   Tue Sep 26 16:56:31 2017 +0200

tdf#112574 sw: don't insert RES_ANCHOR into style item sets

Styles don't have anchors, only frames have anchors.

When using "New Style from Selection", clear the RES_ANCHOR from
the style item set.

Also, don't insert it in SwFramePage::DeactivatePage().

This was always broken and reportedly crashes since commit
e07feb9457f2ffb373ae69b73dda290140e4005f

Change-Id: I9320dbbcae980dfa0b00459b8cd808553d1a04f4
(cherry picked from commit 17fe1e19e01f8b23bcd23cc7c1789e8f7064d06e)
Reviewed-on: https://gerrit.libreoffice.org/42820
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 3a85effb9647..2de3bbd44bc1 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1750,13 +1750,16 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * 
_pSet)
 {
 FillItemSet( _pSet );
 
-//FillItemSet doesn't set the anchor into the set when it matches
-//the original. But for the other pages we need the current anchor.
-SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
-: getFrameDlgParentShell();
-RndStdIds eAnchorId = GetAnchor();
-SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
-_pSet->Put( aAnc );
+if (!m_bFormat) // tdf#112574 no anchor in styles
+{
+//FillItemSet doesn't set the anchor into the set when it matches
+//the original. But for the other pages we need the current anchor.
+SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
+: getFrameDlgParentShell();
+RndStdIds eAnchorId = GetAnchor();
+SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
+_pSet->Put( aAnc );
+}
 }
 
 return DeactivateRC::LeavePage;
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 147212a01181..ffb866c9bda3 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -1226,6 +1226,7 @@ SfxStyleFamily SwDocShell::MakeByExample( const OUString 
, SfxStyleFamily
 
 SfxItemSet aSet(GetPool(), aFrameFormatSetRange );
 pCurrWrtShell->GetFlyFrameAttr( aSet );
+aSet.ClearItem(RES_ANCHOR); // tdf#112574 no anchor in styles
 
 SwFrameFormat* pFFormat = 
pCurrWrtShell->GetSelectedFrameFormat();
 pFrame->SetDerivedFrom( pFFormat );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Michael Stahl]

 sw/source/ui/frmdlg/frmpage.cxx |   17 ++---
 sw/source/uibase/app/docst.cxx  |1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 2f1ef1d7e3caa806e5f5abddb3ac3761538b935b
Author: Michael Stahl 
Date:   Tue Sep 26 16:56:31 2017 +0200

tdf#112574 sw: don't insert RES_ANCHOR into style item sets

Styles don't have anchors, only frames have anchors.

When using "New Style from Selection", clear the RES_ANCHOR from
the style item set.

Also, don't insert it in SwFramePage::DeactivatePage().

This was always broken and reportedly crashes since commit
e07feb9457f2ffb373ae69b73dda290140e4005f

Change-Id: I9320dbbcae980dfa0b00459b8cd808553d1a04f4
(cherry picked from commit 17fe1e19e01f8b23bcd23cc7c1789e8f7064d06e)
Reviewed-on: https://gerrit.libreoffice.org/42819
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index eab95eee09fc..8239a71c6419 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1749,13 +1749,16 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * 
_pSet)
 {
 FillItemSet( _pSet );
 
-//FillItemSet doesn't set the anchor into the set when it matches
-//the original. But for the other pages we need the current anchor.
-SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
-: getFrameDlgParentShell();
-RndStdIds eAnchorId = (RndStdIds)GetAnchor();
-SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
-_pSet->Put( aAnc );
+if (!m_bFormat) // tdf#112574 no anchor in styles
+{
+//FillItemSet doesn't set the anchor into the set when it matches
+//the original. But for the other pages we need the current anchor.
+SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
+: getFrameDlgParentShell();
+RndStdIds eAnchorId = (RndStdIds)GetAnchor();
+SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
+_pSet->Put( aAnc );
+}
 }
 
 return DeactivateRC::LeavePage;
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index ee02b382a861..9d61b36877b0 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -1219,6 +1219,7 @@ SfxStyleFamily SwDocShell::MakeByExample( const OUString 
, SfxStyleFamily
 
 SfxItemSet aSet(GetPool(), aFrameFormatSetRange );
 pCurrWrtShell->GetFlyFrameAttr( aSet );
+aSet.ClearItem(RES_ANCHOR); // tdf#112574 no anchor in styles
 
 SwFrameFormat* pFFormat = 
pCurrWrtShell->GetSelectedFrameFormat();
 pFrame->SetDerivedFrom( pFFormat );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 cui/source/tabpages/backgrnd.cxx |2 +-
 include/vcl/alpha.hxx|5 +++--
 include/vcl/bitmap.hxx   |   14 ++
 vcl/source/gdi/bitmap.cxx|4 ++--
 vcl/source/gdi/bitmapex.cxx  |4 ++--
 5 files changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 404630c6052919c1a0b5dab405084c2a39fc2f5c
Author: Noel Grandin 
Date:   Wed Sep 27 11:36:18 2017 +0200

simplify Bitmap operator==/IsEqual (stage1)

It looks like operator== is actually only useful internally. So inline
that, and rename the other call sites to use IsEqual().

As a second stage, I will rename IsEqual to operator==, the intention
being to make it obvious how the call sites are modified.

Change-Id: I37f2920a8cafaffb25e8c5c16e6559546206684b
Reviewed-on: https://gerrit.libreoffice.org/42846
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 6d483aecb0f1..e93ab92180f7 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -683,7 +683,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* 
rCoreSet )
 {
 const Graphic* pGraphic = rOldItem.GetGraphic();
 if (pGraphic)
-bModifyBrush = pGraphic->GetBitmap() != 
aBgdGraphic.GetBitmap();
+bModifyBrush = 
!pGraphic->GetBitmap().IsEqual(aBgdGraphic.GetBitmap());
 }
 if (bModifyBrush)
 {
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 6e6609d8fd31..f4cd32936d63 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -44,8 +44,9 @@ public:
 AlphaMask&  operator=( const AlphaMask& rAlphaMask ) { return 
static_cast( Bitmap::operator=( rAlphaMask ) ); }
 AlphaMask&  operator=( AlphaMask&& rAlphaMask ) { return 
static_cast( Bitmap::operator=( std::move(rAlphaMask) ) ); }
 booloperator!() const { return Bitmap::operator!(); }
-booloperator==( const AlphaMask& rAlphaMask ) const { return 
Bitmap::operator==( rAlphaMask ); }
-booloperator!=( const AlphaMask& rAlphaMask ) const { return 
Bitmap::operator!=( rAlphaMask ); }
+booloperator==( const AlphaMask& rAlphaMask ) const = delete;
+booloperator!=( const AlphaMask& rAlphaMask ) const = delete;
+boolIsEqual( const AlphaMask& rAlphaMask ) const { return 
Bitmap::IsEqual(rAlphaMask); }
 
 voidSetPrefMapMode( const MapMode& rMapMode ) { 
Bitmap::SetPrefMapMode( rMapMode ); }
 
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 98bd21ded439..321c4969e3e7 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -224,8 +224,8 @@ public:
 Bitmap& operator=( const Bitmap& rBitmap );
 Bitmap& operator=( Bitmap&& rBitmap );
 inline bool operator!() const;
-inline bool operator==( const Bitmap& rBitmap ) const;
-inline bool operator!=( const Bitmap& rBitmap ) const;
+booloperator==( const Bitmap& rBitmap ) const = delete;
+booloperator!=( const Bitmap& rBitmap ) const = delete;
 
 boolIsEqual( const Bitmap& rBmp ) const;
 
@@ -732,16 +732,6 @@ inline bool Bitmap::operator!() const
 return( mxImpBmp == nullptr );
 }
 
-inline bool Bitmap::operator==( const Bitmap& rBitmap ) const
-{
-return( rBitmap.mxImpBmp == mxImpBmp );
-}
-
-inline bool Bitmap::operator!=( const Bitmap& rBitmap ) const
-{
-return( rBitmap.mxImpBmp != mxImpBmp );
-}
-
 inline bool Bitmap::IsEmpty() const
 {
 return( mxImpBmp == nullptr );
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index bce74703689c..aef5cf4b2428 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -779,7 +779,7 @@ bool Bitmap::CopyPixel( const tools::Rectangle& rRectDst,
 
 if( !aRectDst.IsEmpty() )
 {
-if( pBmpSrc && ( *pBmpSrc != *this ) )
+if( pBmpSrc && ( pBmpSrc->mxImpBmp != mxImpBmp ) )
 {
 Bitmap* pSrc = const_cast(pBmpSrc);
 const Size  aCopySizePix( pSrc->GetSizePixel() );
@@ -958,7 +958,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const 
tools::Rectangle& rRectDst, const t
 
 if( !aRectDst.IsEmpty() )
 {
-if( pBmpSrc && ( *pBmpSrc != *this ) )
+if( pBmpSrc && ( pBmpSrc->mxImpBmp != mxImpBmp ) )
 {
 Bitmap* pSrc = const_cast(pBmpSrc);
 const Size  aCopySizePix( pSrc->GetSizePixel() );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 99cf6846b243..4a15547435cf 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ 

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

[Szymon Kłos]

 sw/source/uibase/dbui/dbtree.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 176b161ac654c50eb5c128ebdb681fcf20509b35
Author: Szymon Kłos 
Date:   Wed Sep 27 12:07:32 2017 +0200

tdf#112634 Don't show broken connections in database tree

Don't show connections if are broken. Done in the UI because
internally this database is needed for export purposes.

Change-Id: Ifa5d10a74874e38676b946a5e3be1e3b336e6410
Reviewed-on: https://gerrit.libreoffice.org/42849
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index c0a3176855d7..221527a3db90 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -361,6 +361,11 @@ void  SwDBTreeList::RequestingChildren(SvTreeListEntry* 
pParent)
 }
 }
 }
+else
+{
+// Defunct connection entry
+RemoveEntry(pParent);
+}
 }
 catch (const Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac ios/CustomTarget_setup.mk ios/LibreOfficeKit ios/LibreOfficeLight ios/Module_ios.mk

[jan Iversen]

 config_host.mk.in   |2 
 configure.ac|   24 ++---
 ios/CustomTarget_setup.mk   |   79 
 ios/LibreOfficeKit/lo_kit.xcconfig.in   |   32 
 ios/LibreOfficeLight/lo_app.xcconfig.in |   32 
 ios/Module_ios.mk   |3 -
 6 files changed, 88 insertions(+), 84 deletions(-)

New commits:
commit 9313fb9b5b872d7c888993ac186effcdcf9f8f57
Author: jan Iversen 
Date:   Wed Sep 27 13:51:39 2017 +0200

iOS, remove xcconfig generation from configure.ac

Moved generation of the xcconfig files out of configure.ac
and into the regular ios make.

Change-Id: If675eac9e86c4c4a0ff98f84815b0a83555d90a8

diff --git a/config_host.mk.in b/config_host.mk.in
index d8a7b9c14083..874d68d46431 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -618,6 +618,8 @@ export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@
 export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
+export XCODE_DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
+export XCODE_CLANG_CXX_LIBRARY=@XCODE_CLANG_CXX_LIBRARY@
 export XCODE_ARCHS=@XCODE_ARCHS@
 export XCODEBUILD_SDK=@XCODEBUILD_SDK@
 export XINERAMA_LINK=@XINERAMA_LINK@
diff --git a/configure.ac b/configure.ac
index 4ecca6e36641..08f6863ae5ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2872,21 +2872,13 @@ if test $_os = iOS; then
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=9.3
-if test "$host_cpu" = "arm64"; then
-XCODE_ARCHS=x86_64
-BITNESS=-fembed-bitcode
-else
-XCODE_ARCHS=i386
-fi
+XCODE_ARCHS=x86_64
+BITNESS=-fembed-bitcode
 else
 platform=iPhoneOS
 versionmin=-miphoneos-version-min=9.3
-if test "$host_cpu" = "arm64"; then
-XCODE_ARCHS=arm64
-BITNESS=-fembed-bitcode
-else
-XCODE_ARCHS=arm
-fi
+XCODE_ARCHS=arm64
+BITNESS=-fembed-bitcode
 fi
 xcode_developer=`xcode-select -print-path`
 
@@ -4412,9 +4404,7 @@ if test "$cross_compiling" = "yes"; then
 bin/officeotron.sh.in \
 instsetoo_native/util/openoffice.lst.in \
 config_host/*.in \
-sysui/desktop/macosx/Info.plist.in \
-ios/LibreOfficeKit/lo_kit.xcconfig.in \
-ios/LibreOfficeLight/lo_app.xcconfig.in) \
+sysui/desktop/macosx/Info.plist.in) \
 | (cd CONF-FOR-BUILD && tar xf -)
 cp configure CONF-FOR-BUILD
 test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 
2>/dev/null
@@ -12377,9 +12367,7 @@ AC_CONFIG_FILES([config_host.mk
  bin/odfvalidator.sh
  bin/officeotron.sh
  instsetoo_native/util/openoffice.lst
- sysui/desktop/macosx/Info.plist
- ios/LibreOfficeKit/lo_kit.xcconfig
- ios/LibreOfficeLight/lo_app.xcconfig])
+ sysui/desktop/macosx/Info.plist])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_dconf.h])
diff --git a/ios/CustomTarget_setup.mk b/ios/CustomTarget_setup.mk
new file mode 100644
index ..d0c64d799d32
--- /dev/null
+++ b/ios/CustomTarget_setup.mk
@@ -0,0 +1,79 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#- Env 
+IOSGEN := $(SRCDIR)/ios/generated
+IOSKIT := $(IOSGEN)/loKit.xcconfig
+IOSAPP := $(IOSGEN)/loApp.xcconfig
+
+
+#- Top level  -
+$(eval $(call gb_CustomTarget_CustomTarget,ios/setup))
+
+$(call gb_CustomTarget_get_target,ios/setup): $(IOSKIT) $(IOSAPP)
+
+
+#- Generate xcconfig files  ---
+$(IOSKIT) : $(BUILDDIR)/config_host.mk
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+   @mkdir -p $(IOSGEN);
+   @echo "// Xcode configuration properties" > $(IOSKIT)
+   @echo "// To avoid confusion, the LO-specific ones that aren't as such 
used" >> $(IOSKIT)
+   @echo "// Xcode (but only expanded in option values) are prefixed with" 
>> $(IOSKIT)
+   @echo "// LO_.\n" >> $(IOSKIT)
+   @echo "LO_BUILDDIR = $(BUILDDIR)" >> $(IOSKIT)
+   @echo "LO_INSTDIR = $(INSTDIR)" >> $(IOSKIT)
+   @echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSKIT)
+   @echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSKIT)
+   @echo "\n// These are 

[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - 14 commits - common/Log.cpp configure.ac discovery.xml loleaflet/dist loleaflet/po loleaflet/src Makefile.am wsd/DocumentBroker.cpp wsd/LOO

[Andras Timar]

 Makefile.am|1 
 common/Log.cpp |6 
 configure.ac   |   34 -
 discovery.xml  |   17 
 loleaflet/dist/loleaflet.css   |2 
 loleaflet/dist/loleaflet.html  |4 
 loleaflet/dist/menubar.css |9 
 loleaflet/dist/toolbar.css |   30 
 loleaflet/dist/toolbar/toolbar.js  |   21 
 loleaflet/po/help-ab.po|  110 +--
 loleaflet/po/help-ar.po|  179 ++---
 loleaflet/po/help-be.po|8 
 loleaflet/po/help-bg.po|  217 +-
 loleaflet/po/help-kn.po|   52 -
 loleaflet/po/help-oc.po|   10 
 loleaflet/po/help-uz.po|   15 
 loleaflet/po/ui-ab.po  |   72 +-
 loleaflet/po/ui-ar.po  | 1119 -
 loleaflet/po/ui-be.po  |   22 
 loleaflet/po/ui-bg.po  | 1117 
 loleaflet/po/ui-cs.po  |   63 +
 loleaflet/po/ui-de.po  |6 
 loleaflet/po/ui-es.po  |  224 +++---
 loleaflet/po/ui-gd.po  |   93 +-
 loleaflet/po/ui-sv.po  |   27 
 loleaflet/src/map/handler/Map.Mouse.js |   34 -
 wsd/DocumentBroker.cpp |5 
 wsd/LOOLWSD.cpp|   10 
 28 files changed, 1777 insertions(+), 1730 deletions(-)

New commits:
commit 81f6ea29bb2c24293393ac914c1332362c27f9f7
Author: Andras Timar 
Date:   Thu Aug 24 14:55:19 2017 +0200

Bump version to 5.4.1.2

Change-Id: I44608c4738acb67d75e5d37e6c0cdf967564cc62

diff --git a/configure.ac b/configure.ac
index a9369005..ec36ae8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libreoffice-online], [5.4.0.2], [libreoffice@lists.freedesktop.org])
+AC_INIT([libreoffice-online], [5.4.1.2], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 1032de5128f9ba303b883e189542041f3469dc47
Author: Andras Timar 
Date:   Thu Aug 24 14:41:25 2017 +0200

loolconfig does not exist in this branch

Change-Id: Iecff21c69e96489387952a322251d0eedec9cdad

diff --git a/Makefile.am b/Makefile.am
index 55707fa1..21a9428c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,6 @@ AM_LDFLAGS += -lssl -lcrypto
 else
 loolwsd_fuzzer_LDADD = -lssl -lcrypto
 loolwsd_LDADD = -lssl -lcrypto
-loolconfig_LDADD = -lssl -lcrypto
 endif
 
 loolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 
-DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)
commit 23ea77b893c18683ca97c74a8cb8e3f3d3706014
Author: Aron Budea 
Date:   Sat Aug 12 07:07:02 2017 +0200

Add dlopen check again to fix build

That unneeded dlopen check isn't unneeded.
Regression from 4be7a6cb166161a5c981f706b460a191984a4c80

Change-Id: I8fc451d16c3fa95696995d884743af675d42804d
Reviewed-on: https://gerrit.libreoffice.org/41077
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit 7455705517033acc24e91df0d5cf9a825f0562a0)
Reviewed-on: https://gerrit.libreoffice.org/41078
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 1586ee5bef3821f301ce2c9348745fc8f7e34f6a)

diff --git a/configure.ac b/configure.ac
index 98470f75..a9369005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,12 @@ AS_IF([test `uname -s` = Linux],
   [AS_IF([test -n "$with_cppunit_libs"],
  [LDFLAGS="$LDFLAGS -Wl,-rpath,${with_cppunit_libs}"])])
 
+AS_IF([test `uname -s` != Darwin],
+  [AC_SEARCH_LIBS([dlopen],
+  [dl dld],
+  [],
+  [AC_MSG_ERROR([dlopen not found])])])
+
 AC_SEARCH_LIBS([png_create_write_struct],
[png],
[],
commit c5eaa5ebeb7a9d20e771d3e928c428a4f6e3d969
Author: Jan Holesovsky 
Date:   Thu Aug 10 09:50:36 2017 +0200

We don't need that new autoconf.

Also check for C++11 support, and remove an unneeded dlopen check (we check 
for
dlopen earlier in the configure.ac).

Change-Id: I76c25a25d22987ad6a1de309c3edd6ef2ea2b64d
Reviewed-on: https://gerrit.libreoffice.org/40951
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 8508e78f6b114570a9900eb23ee4af185db249d0)

diff --git a/configure.ac b/configure.ac
index 51fd6c64..98470f75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
 # -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil -*-
 # Process this file with 

[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - 4 commits - configure.ac loleaflet/dist loleaflet/src loolwsd-systemplate-setup

[Andras Timar]

 configure.ac|2 +-
 loleaflet/dist/menubar.css  |2 +-
 loleaflet/src/control/Control.Scroll.js |8 ++--
 loolwsd-systemplate-setup   |2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit fac62cbeef0565a9e7e743cabdd9a9d5b2d6bdde
Author: Andras Timar 
Date:   Wed Sep 27 14:08:14 2017 +0200

Bump version to 5.4.2.2

Change-Id: Ib68dc57c9df50bed8ef808f8a430a5876819a9c6

diff --git a/configure.ac b/configure.ac
index ec36ae8a..8aab94d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libreoffice-online], [5.4.1.2], [libreoffice@lists.freedesktop.org])
+AC_INIT([libreoffice-online], [5.4.2.2], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 5472a94aaf037344b51d150d036cb97715cb61e9
Author: Henry Castro 
Date:   Thu Sep 21 11:21:13 2017 -0400

loleaflet: resolves: no row header in revision history

_onUpdateScrollOffset is triggered when the client window is resized or
when it is loading a new document. However, there are some cases when
the offset is 0, it means to update row and columns.

Change-Id: If4c4bb4f50335c642004ceb7723c8b5eb949cada
Reviewed-on: https://gerrit.libreoffice.org/42752
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 
(cherry picked from commit 7e674e29c2614a3f3af941938f8062bd66fa5ff2)
Signed-off-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.Scroll.js 
b/loleaflet/src/control/Control.Scroll.js
index 3bbb5c5c..d11a9bc6 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -221,9 +221,13 @@ L.Control.Scroll = L.Control.extend({
// used on window resize
if (this._map._docLayer._docType === 'spreadsheet') {
var offset = new L.Point(e.x - this._prevScrollX, e.y - 
this._prevScrollY);
-   if (!offset.equals(new L.Point(0, 0))) {
-   this._onUpdateRowColumnHeaders({x: e.x, y: e.y, 
offset: offset});
+   if (offset.x === 0) {
+   offset.x = 1;
}
+   if (offset.y === 0) {
+   offset.y = 1;
+   }
+   this._onUpdateRowColumnHeaders({x: e.x, y: e.y, offset: 
offset});
}
this._ignoreScroll = null;
$('.scroll-container').mCustomScrollbar('stop');
commit 6d6beb19cd113f9546603950a1edea57412f3891
Author: Andras Timar 
Date:   Fri Sep 22 17:04:29 2017 +0200

no error if systemplate dir is existing

Change-Id: I10aba648688ba92150efa41449190a3ba425f03c
Reviewed-on: https://gerrit.libreoffice.org/42662
Reviewed-by: pranavk 
Tested-by: pranavk 
(cherry picked from commit ac0cf36843fe522b08a5e32033b787bbae545cf1)
Signed-off-by: Andras Timar 

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 729220c3..790bbb38 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -9,7 +9,7 @@ INSTDIR=$2
 
 test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
 
-mkdir $CHROOT || exit 1
+mkdir -p $CHROOT || exit 1
 
 CHROOT=`cd $CHROOT && /bin/pwd`
 INSTDIR=`cd $INSTDIR && /bin/pwd`
commit dac787994ecc407c86620148780ece79893e8a05
Author: Henry Castro 
Date:   Tue Sep 19 21:46:09 2017 -0400

loleaflet: fix background color of the top level menu items

Change-Id: I548c700a16664e8acfc6010c1be549e6176f2383
(cherry picked from commit 7f75603d15efc74d92e50996674338c6d98c2a34)
Signed-off-by: Andras Timar 

diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index d3a35fce..1d8e5eec 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -69,7 +69,7 @@
 background: #538ecd;
 color: #fff;
 }
-.lo-menu > li {
+.lo-menu > li, .lo-menu > li > a.disabled {
 background: #efefef; /* top-level menus remain greyish */
 }
 .lo-menu > li > a:hover, .lo-menu > li > a:focus, .lo-menu > li > a:active, 
.lo-menu > li > a.highlighted {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-5.4.2.2'

[Andras Timar]

Tag 'libreoffice-5.4.2.2' created by Andras Timar  
at 2017-09-27 12:10 +

libreoffice-5.4.2.2

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

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

[Olivier Hallot]

 sfx2/source/appl/sfxhelp.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit c2999602e2463cb11dbce1f71f0bcb304494a2f4
Author: Olivier Hallot 
Date:   Mon Sep 25 15:06:50 2017 -0300

Simplify call to external helponline

add indentation

chnage helponline.l.org -> help.l.org for good.

Change-Id: Ie52a0f0a716c56da1a9553a805e25ebcabcb1490
Reviewed-on: https://gerrit.libreoffice.org/42764
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 7773c29b9a50..cc06ba7550e0 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -54,6 +54,7 @@
 #include 
 #include 
 #include 
+#include "openuriexternally.hxx"
 
 #include "newhelp.hxx"
 #include 
@@ -530,16 +531,13 @@ static bool impl_showOnlineHelp( const OUString& rURL )
 if ( rURL.getLength() <= aInternal.getLength() || 
!rURL.startsWith(aInternal) )
 return false;
 
-OUString aHelpLink( "http://helponline.libreoffice.org/help.html?;  );
+OUString aHelpLink( "https://help.libreoffice.org/help.html?;  );
 
 aHelpLink += rURL.copy( aInternal.getLength() );
 aHelpLink = aHelpLink.replaceAll("%2F","/");
 try
 {
-Reference< XSystemShellExecute > xSystemShell(
-
SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
-
-xSystemShell->execute( aHelpLink, OUString(), 
SystemShellExecuteFlags::URIS_ONLY );
+sfx2::openUriExternally(aHelpLink, false);
 return true;
 }
 catch (const Exception&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerperfect/qa/unit/EPUBExportTest.cxx   |2 ++
 writerperfect/qa/unit/data/writer/epubexport/meta.fodt |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 3d3643491c9b3af082103bbd6bd18994d24cc568
Author: Miklos Vajna 
Date:   Wed Sep 27 12:07:02 2017 +0200

EPUB export: improve metadata tests

This was the last uncovered piece in the ODF -> librevenge converter
part.

Change-Id: Ie9482f30c873deb3ddd601e1183b66706e913f14
Reviewed-on: https://gerrit.libreoffice.org/42848
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index d79a196c7863..374d9f730c23 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -292,6 +292,8 @@ void EPUBExportTest::testMeta()
 // This was "Unknown Author",  was not handled.
 assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator", "A U 
Thor");
 assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title", 
"Title");
+assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language", 
"hu");
+assertXPathContent(mpXmlDoc, 
"/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']", 
"2017-09-27T09:51:19Z");
 }
 
 void EPUBExportTest::testParaNamedstyle()
diff --git a/writerperfect/qa/unit/data/writer/epubexport/meta.fodt 
b/writerperfect/qa/unit/data/writer/epubexport/meta.fodt
index 4e46fe79fcda..8b1af3e44f5a 100644
--- a/writerperfect/qa/unit/data/writer/epubexport/meta.fodt
+++ b/writerperfect/qa/unit/data/writer/epubexport/meta.fodt
@@ -3,6 +3,8 @@
   
 A U Thor
 Title
+hu
+2017-09-27T09:51:19.243117081
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 vcl/osx/salinst.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 155795b9c129584febd9771014078adb6fe25932
Author: Jan-Marek Glogowski 
Date:   Wed Sep 27 14:44:56 2017 +0200

tdf#112288 compare event timestamp with sys uptime

This is a "brown paperbag" fixup. untilDate is actually used as
a timeout for nextEventMatchingMask, not as a maximum event age.
So manually compare the event timestamp with the system uptime.

Change-Id: I912bedc0cba45c5cc231679c1b6139fa012492ed

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index f55e9b4aa297..855dac645e41 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -589,7 +589,7 @@ bool AquaSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 {
 // handle available events
 NSEvent* pEvent = nil;
-NSDate *now = [[NSDate alloc] init];
+NSTimeInterval now = [[NSProcessInfo processInfo]systemUptime];
 do
 {
 SolarMutexReleaser aReleaser;
@@ -598,7 +598,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 // 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12
 pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask
 SAL_WNODEPRECATED_DECLARATIONS_POP
-untilDate: now
+untilDate: nil
 inMode: NSDefaultRunLoopMode
 dequeue: YES];
 if( pEvent )
@@ -611,7 +611,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
 [NSApp updateWindows];
 
-if ( !bHandleAllCurrentEvents || !pEvent )
+if ( !bHandleAllCurrentEvents || !pEvent || now < [pEvent 
timestamp] )
 break;
 }
 while( true );
@@ -744,7 +744,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 if( nType & VclInputFlags::KEYBOARD)
 nEventMask |= NSKeyDownMask | NSKeyUpMask | NSFlagsChangedMask;
 if( nType & VclInputFlags::OTHER)
-nEventMask |= NSTabletPoint;
+nEventMask |= NSTabletPoint | NSApplicationDefinedMask;
 SAL_WNODEPRECATED_DECLARATIONS_POP
 // TODO: VclInputFlags::PAINT / more VclInputFlags::OTHER
 if( !bool(nType) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/DocumentBroker.cpp wsd/reference.txt wsd/Storage.cpp wsd/Storage.hpp

[Jan Holesovsky]

 wsd/DocumentBroker.cpp |3 +++
 wsd/Storage.cpp|1 +
 wsd/Storage.hpp|9 -
 wsd/reference.txt  |   11 +++
 4 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 5fe34b8e84ad4550f9cc4c80ef436e30a73d5a2a
Author: Jan Holesovsky 
Date:   Mon Sep 25 19:16:48 2017 +0200

PutFile ext: X-LOOL-WOPI-IsModifiedByUser header to indicate modifications.

Change-Id: I5d69903211045969d678df695717eae7452e7f04
Reviewed-on: https://gerrit.libreoffice.org/42852
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 7ee65646..e8cc862d 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -808,6 +808,9 @@ bool DocumentBroker::sendUnoSave(const std::string& 
sessionId, bool dontTerminat
 // arguments end
 oss << "}";
 
+assert(_storage);
+_storage->setUserModified(_isModified);
+
 const auto saveArgs = oss.str();
 LOG_TRC(".uno:Save arguments: " << saveArgs);
 const auto command = "uno .uno:Save " + saveArgs;
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 526d8783..dc2e6ac5 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -684,6 +684,7 @@ StorageBase::SaveResult 
WopiStorage::saveLocalFileToStorage(const Authorization&
 
Poco::DateTimeFormatter::format(Poco::DateTime(_fileInfo._modifiedTime),
 
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT));
 }
+request.set("X-LOOL-WOPI-IsModifiedByUser", _isUserModified? "true": 
"false");
 
 request.setContentType("application/octet-stream");
 request.setContentLength(size);
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index badaa306..0d5a6cbb 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -78,7 +78,8 @@ public:
 _jailPath(jailPath),
 _fileInfo("", "lool", Poco::Timestamp::fromEpochTime(0), 0),
 _isLoaded(false),
-_forceSave(false)
+_forceSave(false),
+_isUserModified(false)
 {
 LOG_DBG("Storage ctor: " << uri.toString());
 }
@@ -94,6 +95,9 @@ public:
 /// even if document turned out to be changed in storage
 void forceSave() { _forceSave = true; }
 
+/// To be able to set the WOPI extension header appropriately.
+void setUserModified(bool isUserModified) { _isUserModified = 
isUserModified; }
+
 /// Returns the basic information about the file.
 const FileInfo& getFileInfo() const { return _fileInfo; }
 
@@ -129,6 +133,9 @@ protected:
 bool _isLoaded;
 bool _forceSave;
 
+/// The document has been modified by the user.
+bool _isUserModified;
+
 static bool FilesystemEnabled;
 static bool WopiEnabled;
 /// Allowed/denied WOPI hosts, if any and if WOPI is enabled.
diff --git a/wsd/reference.txt b/wsd/reference.txt
index 2206f89a..0df894d6 100644
--- a/wsd/reference.txt
+++ b/wsd/reference.txt
@@ -62,3 +62,14 @@ WatermarkText
 
 Note that it is possible to just hide print,save,export options while still
 being able to access them from WOPI hosts using PostMessage API (see 
loleaflet/reference.html)
+
+PutFile headers
+---
+
+PutFile additionally indicates whether the user has modified the document
+before the save, or if they just pressed the Save button without any
+modification.  The following header:
+
+   X-LOOL-WOPI-IsModifiedByUser
+
+will have the value 'true' or 'false' accordingly.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Grzegorz Araminowicz]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   42 ++--
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |   13 ++
 oox/source/drawingml/diagram/layoutnodecontext.cxx  |   24 +++
 3 files changed, 35 insertions(+), 44 deletions(-)

New commits:
commit 7e0cb70d7fb9024f5ebf1ea988df90f0ee30baf2
Author: Grzegorz Araminowicz 
Date:   Thu Aug 24 17:26:38 2017 +0200

SmartArt: correct behaviour of if/else nodes

else block is taken only if none of conditions in 'choose' was satisfied

Change-Id: Ie668f15c665327098e8e63b2c92cd291711e4567
Reviewed-on: https://gerrit.libreoffice.org/41533
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index dd69d19c1f5f..920648706fa0 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -98,9 +98,20 @@ void ChooseAtom::accept( LayoutAtomVisitor& rVisitor )
 rVisitor.visit(*this);
 }
 
-ConditionAtom::ConditionAtom(const LayoutNode& rLayoutNode, const Reference< 
XFastAttributeList >& xAttributes) :
+const std::vector& ChooseAtom::getChildren() const
+{
+for (const auto& pChild : mpChildNodes)
+{
+const ConditionAtomPtr pCond = 
std::dynamic_pointer_cast(pChild);
+if (pCond && pCond->getDecision())
+return pCond->getChildren();
+}
+return maEmptyChildren;
+}
+
+ConditionAtom::ConditionAtom(const LayoutNode& rLayoutNode, bool isElse, const 
Reference< XFastAttributeList >& xAttributes) :
 LayoutAtom(rLayoutNode),
-mbElse( false )
+mIsElse(isElse)
 {
 maIter.loadFromXAttr( xAttributes );
 maCond.loadFromXAttr( xAttributes );
@@ -156,36 +167,33 @@ sal_Int32 ConditionAtom::getNodeCount() const
 return nCount;
 }
 
-const std::vector& ConditionAtom::getChildren() const
+bool ConditionAtom::getDecision() const
 {
-bool bDecisionVar = true;
+if (mIsElse)
+return true;
+
 switch (maCond.mnFunc)
 {
 case XML_var:
 {
 const dgm::Point* pPoint = getPresNode();
 if (pPoint && maCond.mnArg == XML_dir)
-bDecisionVar = compareResult(maCond.mnOp, pPoint->mnDirection, 
maCond.mnVal);
+return compareResult(maCond.mnOp, pPoint->mnDirection, 
maCond.mnVal);
 break;
 }
 
 case XML_cnt:
-bDecisionVar = compareResult(maCond.mnOp, getNodeCount(), 
maCond.msVal.toInt32());
-break;
+return compareResult(maCond.mnOp, getNodeCount(), 
maCond.msVal.toInt32());
 
 case XML_maxDepth:
-bDecisionVar = compareResult(maCond.mnOp, 
mrLayoutNode.getDiagram().getData()->getMaxDepth(), maCond.msVal.toInt32());
-break;
+return compareResult(maCond.mnOp, 
mrLayoutNode.getDiagram().getData()->getMaxDepth(), maCond.msVal.toInt32());
 
 default:
 SAL_WARN("oox.drawingml", "unknown function " << maCond.mnFunc);
 break;
 }
 
-if (bDecisionVar)
-return mpChildNodes;
-else
-return mpElseChildNodes;
+return true;
 }
 
 void ConditionAtom::accept( LayoutAtomVisitor& rVisitor )
@@ -193,14 +201,6 @@ void ConditionAtom::accept( LayoutAtomVisitor& rVisitor )
 rVisitor.visit(*this);
 }
 
-void ConditionAtom::addChild( const LayoutAtomPtr & pNode )
-{
-if( mbElse )
-mpElseChildNodes.push_back( pNode );
-else
-mpChildNodes.push_back( pNode );
-}
-
 void ConstraintAtom::accept( LayoutAtomVisitor& rVisitor )
 {
 rVisitor.visit(*this);
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index f4928565c048..117326b625ab 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -176,21 +176,17 @@ class ConditionAtom
 : public LayoutAtom
 {
 public:
-explicit ConditionAtom(const LayoutNode& rLayoutNode, const 
css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
+explicit ConditionAtom(const LayoutNode& rLayoutNode, bool isElse, const 
css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
 virtual void accept( LayoutAtomVisitor& ) override;
-void readElseBranch()
-{ mbElse=true; }
-virtual void addChild( const LayoutAtomPtr & pNode ) override;
-virtual const std::vector& getChildren() const override;
+bool getDecision() const;
 private:
 static bool compareResult(sal_Int32 nOperator, sal_Int32 nFirst, sal_Int32 
nSecond);
 const dgm::Point* getPresNode() const;
 sal_Int32 getNodeCount() const;
 
-bool  mbElse;
+bool  mIsElse;
 IteratorAttr  maIter;
 ConditionAttr maCond;
-std::vector< LayoutAtomPtr > mpElseChildNodes;
 };
 
 typedef std::shared_ptr< ConditionAtom > 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/ClientSession.cpp

[Jan Holesovsky]

 wsd/ClientSession.cpp |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit fd607d3ba878b7317b6f3efe628ed553f4531bee
Author: Jan Holesovsky 
Date:   Wed Sep 27 10:15:30 2017 +0200

Don't crash when the parameters are missing.

Change-Id: I96ace7ad7757e7e0c74dd9f361c78ecff6171a96
Reviewed-on: https://gerrit.libreoffice.org/42854
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index ce4ed3a6..b5e78b7e 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -63,7 +63,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 {
 LOG_TRC(getName() << ": handling incoming [" << 
getAbbreviatedMessage(buffer, length) << "].");
 const std::string firstLine = getFirstLine(buffer, length);
-const auto tokens = LOOLProtocol::tokenize(firstLine.data(), 
firstLine.size());
+const std::vector tokens = 
LOOLProtocol::tokenize(firstLine.data(), firstLine.size());
 
 auto docBroker = getDocumentBroker();
 if (!docBroker)
@@ -83,6 +83,12 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 
 if (tokens[0] == "loolclient")
 {
+if (tokens.size() < 1)
+{
+sendTextFrame("error: cmd=loolclient kind=badprotocolversion");
+return false;
+}
+
 const auto versionTuple = ParseVersion(tokens[1]);
 if (std::get<0>(versionTuple) != ProtocolMajorVersionNumber ||
 std::get<1>(versionTuple) != ProtocolMinorVersionNumber)
@@ -216,14 +222,20 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 {
 int dontTerminateEdit = 1;
 int dontSaveIfUnmodified = 1;
-getTokenInteger(tokens[1], "dontTerminateEdit", dontTerminateEdit);
-getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
+if (tokens.size() > 1)
+getTokenInteger(tokens[1], "dontTerminateEdit", dontTerminateEdit);
+
+if (tokens.size() > 2)
+getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
+
 docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, 
dontSaveIfUnmodified != 0);
 }
 else if (tokens[0] == "savetostorage")
 {
 int force = 0;
-getTokenInteger(tokens[1], "force", force);
+if (tokens.size() > 1)
+getTokenInteger(tokens[1], "force", force);
+
 if (docBroker->saveToStorage(getId(), true, "" /* This is irrelevant 
when success is true*/, true))
 {
 docBroker->broadcastMessage("commandresult: { \"command\": 
\"savetostorage\", \"success\": true }");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - test/UnitOAuth.cpp test/WopiTestServer.hpp

[Jan Holesovsky]

 test/UnitOAuth.cpp  |  106 
 test/WopiTestServer.hpp |  115 
 2 files changed, 135 insertions(+), 86 deletions(-)

New commits:
commit 233d2ef3c4197dba2b00212407418525a71ab9e0
Author: Jan Holesovsky 
Date:   Tue Sep 26 16:12:58 2017 +0200

Separate the fake wopi server to an own class.

Change-Id: Ibb1b06c491be0065aa12a05a43959165d6c86398
Reviewed-on: https://gerrit.libreoffice.org/42853
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/test/UnitOAuth.cpp b/test/UnitOAuth.cpp
index 7a52c1ee..baf05c0e 100644
--- a/test/UnitOAuth.cpp
+++ b/test/UnitOAuth.cpp
@@ -9,24 +9,18 @@
 
 #include "config.h"
 
-//#include "Exceptions.hpp"
+#include "WopiTestServer.hpp"
 #include "Log.hpp"
 #include "Unit.hpp"
 #include "UnitHTTP.hpp"
 #include "helpers.hpp"
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 
-using Poco::DateTimeFormatter;
-using Poco::DateTimeFormat;
 using Poco::Net::OAuth20Credentials;
 
-class UnitOAuth : public UnitWSD
+class UnitOAuth : public WopiTestServer
 {
 enum class Phase
 {
@@ -46,6 +40,7 @@ public:
 {
 }
 
+/// The actual assert of the authentication.
 void assertRequest(const Poco::Net::HTTPRequest& request, int fileIndex)
 {
 // check that the request contains the Authorization: header
@@ -68,91 +63,30 @@ public:
 }
 }
 
-/// Here we act as a WOPI server, so that we have a server that responds to
-/// the wopi requests without additional expensive setup.
-virtual bool handleHttpRequest(const Poco::Net::HTTPRequest& request, 
std::shared_ptr& socket) override
+void assertCheckFileInfoRequest(const Poco::Net::HTTPRequest& request) 
override
 {
-static const std::string hello("Hello, world");
-
-Poco::URI uriReq(request.getURI());
-LOG_INF("Fake wopi host request: " << uriReq.toString());
+std::string path = Poco::URI(request.getURI()).getPath();
+assertRequest(request, (path == "/wopi/files/0")? 0: 1);
+}
 
-// CheckFileInfo
-if (uriReq.getPath() == "/wopi/files/0" || uriReq.getPath() == 
"/wopi/files/1")
+void assertGetFileRequest(const Poco::Net::HTTPRequest& request) override
+{
+std::string path = Poco::URI(request.getURI()).getPath();
+if (path == "/wopi/files/0/contents")
 {
-LOG_INF("Fake wopi host request, handling CheckFileInfo: " << 
uriReq.getPath());
-
-assertRequest(request, (uriReq.getPath() == "/wopi/files/0")? 0: 
1);
-
-Poco::LocalDateTime now;
-Poco::JSON::Object::Ptr fileInfo = new Poco::JSON::Object();
-fileInfo->set("BaseFileName", "hello.txt");
-fileInfo->set("Size", hello.size());
-fileInfo->set("Version", "1.0");
-fileInfo->set("OwnerId", "test");
-fileInfo->set("UserId", "test");
-fileInfo->set("UserFriendlyName", "test");
-fileInfo->set("UserCanWrite", "true");
-fileInfo->set("PostMessageOrigin", "localhost");
-fileInfo->set("LastModifiedTime", DateTimeFormatter::format(now, 
DateTimeFormat::ISO8601_FORMAT));
-
-std::ostringstream jsonStream;
-fileInfo->stringify(jsonStream);
-std::string responseString = jsonStream.str();
-
-const std::string mimeType = "application/json; charset=utf-8";
-
-std::ostringstream oss;
-oss << "HTTP/1.1 200 OK\r\n"
-<< "Last-Modified: " << 
Poco::DateTimeFormatter::format(Poco::Timestamp(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
-<< "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
-<< "Content-Length: " << responseString.size() << "\r\n"
-<< "Content-Type: " << mimeType << "\r\n"
-<< "\r\n"
-<< responseString;
-
-socket->send(oss.str());
-socket->shutdown();
-
-return true;
+assertRequest(request, 0);
+_finishedToken = true;
 }
-// GetFile
-else if (uriReq.getPath() == "/wopi/files/0/contents" || 
uriReq.getPath() == "/wopi/files/1/contents")
+else
 {
-LOG_INF("Fake wopi host request, handling GetFile: " << 
uriReq.getPath());
-
-if (uriReq.getPath() == "/wopi/files/0/contents")
-{
-assertRequest(request, 0);
-_finishedToken = true;
-}
-else
-{
-assertRequest(request, 1);
-_finishedHeader = true;
-}
-
-const std::string mimeType = "text/plain; charset=utf-8";
-
-std::ostringstream oss;
-oss << "HTTP/1.1 200 OK\r\n"
-<< "Last-Modified: " 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - test/Makefile.am test/UnitOAuth.cpp test/UnitWOPI.cpp test/WopiTestServer.hpp

[Jan Holesovsky]

 test/Makefile.am|7 +-
 test/UnitOAuth.cpp  |   13 ++--
 test/UnitWOPI.cpp   |  129 
 test/WopiTestServer.hpp |   22 ++--
 4 files changed, 159 insertions(+), 12 deletions(-)

New commits:
commit ee4a934179e2320e5d35ef1797b017e9ebd375b6
Author: Jan Holesovsky 
Date:   Wed Sep 27 14:13:43 2017 +0200

PutFile ext: X-LOOL-WOPI-IsModifiedByUser unit test.

Change-Id: I0b1ffc74dbbc771f0dcb68f87d46af3ba469ae9e
Reviewed-on: https://gerrit.libreoffice.org/42855
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/test/Makefile.am b/test/Makefile.am
index 8f611d2e..d834dcb2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,8 @@ noinst_LTLIBRARIES = \
unit-timeout.la unit-prefork.la \
unit-storage.la \
unit-admin.la unit-tilecache.la \
-   unit-fuzz.la unit-oob.la unit-oauth.la
+   unit-fuzz.la unit-oob.la unit-oauth.la \
+   unit-wopi.la
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
 AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION) $(ZLIB_LIBS)
@@ -63,6 +64,8 @@ unit_storage_la_SOURCES = UnitStorage.cpp
 unit_tilecache_la_SOURCES = UnitTileCache.cpp
 unit_oauth_la_SOURCES = UnitOAuth.cpp
 unit_oauth_la_LIBADD = $(CPPUNIT_LIBS)
+unit_wopi_la_SOURCES = UnitWOPI.cpp
+unit_wopi_la_LIBADD = $(CPPUNIT_LIBS)
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -76,7 +79,7 @@ check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, 
UnitHTTPServerResponse&) ,
-TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-oauth.la # 
unit-storage.la # unit-admin.la
+TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-oauth.la 
unit-wopi.la # unit-storage.la # unit-admin.la
 else
 TESTS = ${top_builddir}/test/test
 endif
diff --git a/test/UnitOAuth.cpp b/test/UnitOAuth.cpp
index baf05c0e..dfba4aa1 100644
--- a/test/UnitOAuth.cpp
+++ b/test/UnitOAuth.cpp
@@ -26,7 +26,7 @@ class UnitOAuth : public WopiTestServer
 {
 LoadToken,  // loading the document with Bearer token
 LoadHeader, // loading the document with Basic auth
-Polling // let the loading progress, and when it succeeds, finish
+Finish  // assert all went fine and finish
 } _phase;
 
 bool _finishedToken;
@@ -84,9 +84,9 @@ public:
 }
 }
 
-bool wopiServerFinish() override
+void assertPutFileRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
 {
-return _finishedToken && _finishedHeader;
+// nothing to assert
 }
 
 void invokeTest() override
@@ -116,12 +116,13 @@ public:
 if (_phase == Phase::LoadToken)
 _phase = Phase::LoadHeader;
 else
-_phase = Phase::Polling;
+_phase = Phase::Finish;
 break;
 }
-case Phase::Polling:
+case Phase::Finish:
 {
-// let handleHttpRequest() perform the checks...
+CPPUNIT_ASSERT(_finishedToken && _finishedHeader);
+exitTest(TestResult::Ok);
 break;
 }
 }
diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp
new file mode 100644
index ..fade8d0f
--- /dev/null
+++ b/test/UnitWOPI.cpp
@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "config.h"
+
+#include "WopiTestServer.hpp"
+#include "Log.hpp"
+#include "Unit.hpp"
+#include "UnitHTTP.hpp"
+#include "helpers.hpp"
+#include 
+#include 
+
+class UnitWOPI : public WopiTestServer
+{
+enum class Phase
+{
+LoadAndSave,
+Modify,
+SaveModified,
+Finish
+} _phase;
+
+enum class SavingPhase
+{
+Unmodified,
+Modified
+} _savingPhase;
+
+bool _finishedSaveUnmodified;
+bool _finishedSaveModified;
+
+std::unique_ptr _ws;
+
+public:
+UnitWOPI() :
+_phase(Phase::LoadAndSave),
+_finishedSaveUnmodified(false),
+_finishedSaveModified(false)
+{
+}
+
+void assertCheckFileInfoRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
+{
+// nothing to assert in CheckFileInfo
+}
+
+void assertGetFileRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
+{
+// nothing to assert in GetFile
+}
+
+void assertPutFileRequest(const 

[Libreoffice-commits] core.git: Branch 'private/jmux/scheduler-fixes' - 18 commits - comphelper/source compilerplugins/clang config_host.mk.in configure.ac cui/source embeddedobj/source forms/source f

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit e338f3e6abcdc68730a485701e9cdf78f9397aad
Author: Jan-Marek Glogowski 
Date:   Tue Sep 26 19:06:51 2017 +0200

tdf#112605 OSX refactor SalAquaTimer

Drops all the static calls and variables from SalAquaTimer
and moves all timer handling logic inside the class.

This also fixes the leak in in timerElapsed.

Change-Id: Ie7a1a8fffb70b8579ec6876eed10a275d2f06d27

diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index 86964115d648..ad6adf9d00ed 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -43,6 +43,12 @@ public:
 
 class AquaSalTimer : public SalTimer
 {
+NSTimer*m_pRunningTimer;
+sal_uInt32  m_nTimerStartTicks;  ///< system ticks at timer start % 
SAL_MAX_UINT32
+
+void queueDispatchTimerEvent( bool bAtStart );
+void callTimerCallback();
+
 public:
 AquaSalTimer();
 virtual ~AquaSalTimer() override;
@@ -50,13 +56,18 @@ public:
 void Start( sal_uLong nMS ) override;
 void Stop() override;
 
-static void handleStartTimerEvent( NSEvent* pEvent );
-static void handleDispatchTimerEvent();
+void handleStartTimerEvent( NSEvent* pEvent );
+void handleDispatchTimerEvent( NSEvent* pEvent );
+void handleTimerElapsed();
 
-static NSTimer* pRunningTimer;
-static bool bDispatchTimer;
+inline bool IsTimerElapsed() const;
 };
 
+inline bool AquaSalTimer::IsTimerElapsed() const
+{
+return 0 != m_nTimerStartTicks;
+}
+
 #endif // INCLUDED_VCL_INC_OSX_SALTIMER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 89e3ae6d4e82..1b08a29461e6 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -426,11 +426,13 @@ bool AquaSalInstance::IsMainThread() const
 
 void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
 {
+AquaSalTimer *pTimer = static_cast( 
ImplGetSVData()->maSchedCtx.mpSalTimer );
 int nSubtype = [pEvent subtype];
 switch( nSubtype )
 {
 case AppStartTimerEvent:
-AquaSalTimer::handleStartTimerEvent( pEvent );
+if ( pTimer )
+pTimer->handleStartTimerEvent( pEvent );
 break;
 case AppEndLoopEvent:
 [NSApp stop: NSApp];
@@ -450,7 +452,8 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 break;
 }
 case DispatchTimerEvent:
-AquaSalTimer::handleDispatchTimerEvent();
+if ( pTimer )
+pTimer->handleDispatchTimerEvent( pEvent );
 break;
 #if !HAVE_FEATURE_MACOSX_SANDBOX
 case AppleRemoteControlEvent: // Defined in 

@@ -598,12 +601,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 {
 SolarMutexReleaser aReleaser;
 
-NSDate* pDt = AquaSalTimer::pRunningTimer ? 
[AquaSalTimer::pRunningTimer fireDate] : [NSDate distantFuture];
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 // 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12
 pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask
 SAL_WNODEPRECATED_DECLARATIONS_POP
-untilDate: pDt
+untilDate: [NSDate distantFuture]
 inMode: NSDefaultRunLoopMode
 dequeue: YES];
 if( pEvent )
@@ -682,14 +684,9 @@ bool AquaSalInstance::AnyInput( VclInputFlags nType )
 
 if( nType & VclInputFlags::TIMER )
 {
-if( AquaSalTimer::pRunningTimer )
-{
-NSDate* pDt = [AquaSalTimer::pRunningTimer fireDate];
-if( pDt && [pDt timeIntervalSinceNow] < 0 )
-{
-return true;
-}
-}
+AquaSalTimer *pTimer = static_cast( 
ImplGetSVData()->maSchedCtx.mpSalTimer );
+if (pTimer && pTimer->IsTimerElapsed())
+return true;
 }
 
 unsigned/*NSUInteger*/ nEventMask = 0;
diff --git a/vcl/osx/salnstimer.mm b/vcl/osx/salnstimer.mm
index c9b657dcd776..9647bb6b87c1 100644
--- a/vcl/osx/salnstimer.mm
+++ b/vcl/osx/salnstimer.mm
@@ -27,16 +27,12 @@
 
 @implementation TimerCallbackCaller
 
--(void)timerElapsed:(NSTimer*)pTimer
+-(void)timerElapsed:(NSTimer*)pNSTimer
 {
-(void)pTimer;
-// nil the timer, as it is just invalidated after the firing function
-AquaSalTimer::pRunningTimer = nil;
-const AquaSalInstance *pInst = GetSalData()->mpFirstInstance;
-if (pInst->mbIsLiveResize)
-AquaSalTimer::handleDispatchTimerEvent();
-else
-ImplNSAppPostEvent( AquaSalInstance::DispatchTimerEvent, YES );
+(void) pNSTimer;
+AquaSalTimer *pTimer = static_cast( 
ImplGetSVData()->maSchedCtx.mpSalTimer );
+if (pTimer)
+pTimer->handleTimerElapsed();
 }
 
 @end
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index e442fcf05335..9c5bb7a7db9e 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -20,6 +20,7 @@
 #include 
 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - wsd/DocumentBroker.cpp wsd/reference.txt wsd/Storage.cpp wsd/Storage.hpp

[Jan Holesovsky]

 wsd/DocumentBroker.cpp |3 +++
 wsd/Storage.cpp|2 ++
 wsd/Storage.hpp|9 -
 wsd/reference.txt  |   11 +++
 4 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 97109d44021c94db0fe2ef5b67844baf2f5e1902
Author: Jan Holesovsky 
Date:   Mon Sep 25 19:16:48 2017 +0200

PutFile ext: X-LOOL-WOPI-IsModifiedByUser header to indicate modifications.

Change-Id: I5d69903211045969d678df695717eae7452e7f04
Reviewed-on: https://gerrit.libreoffice.org/42856
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 9d6bff46..884e132b 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -774,6 +774,9 @@ bool DocumentBroker::sendUnoSave(const std::string& 
sessionId, bool dontTerminat
 // arguments end
 oss << "}";
 
+assert(_storage);
+_storage->setUserModified(_isModified);
+
 const auto saveArgs = oss.str();
 LOG_TRC(".uno:Save arguments: " << saveArgs);
 const auto command = "uno .uno:Save " + saveArgs;
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index afe69a87..eab3db3c 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -643,6 +643,8 @@ StorageBase::SaveResult 
WopiStorage::saveLocalFileToStorage(const std::string& a
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
uriObject.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
 request.set("X-WOPI-Override", "PUT");
+request.set("X-LOOL-WOPI-IsModifiedByUser", _isUserModified? "true": 
"false");
+
 request.setContentType("application/octet-stream");
 request.setContentLength(size);
 addStorageDebugCookie(request);
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index a3fbe637..58cb0545 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -70,7 +70,8 @@ public:
 _localStorePath(localStorePath),
 _jailPath(jailPath),
 _fileInfo("", "lool", Poco::Timestamp::fromEpochTime(0), 0),
-_isLoaded(false)
+_isLoaded(false),
+_isUserModified(false)
 {
 LOG_DBG("Storage ctor: " << uri.toString());
 }
@@ -82,6 +83,9 @@ public:
 
 bool isLoaded() const { return _isLoaded; }
 
+/// To be able to set the WOPI extension header appropriately.
+void setUserModified(bool isUserModified) { _isUserModified = 
isUserModified; }
+
 /// Returns the basic information about the file.
 const FileInfo& getFileInfo() const { return _fileInfo; }
 
@@ -116,6 +120,9 @@ protected:
 FileInfo _fileInfo;
 bool _isLoaded;
 
+/// The document has been modified by the user.
+bool _isUserModified;
+
 static bool FilesystemEnabled;
 static bool WopiEnabled;
 /// Allowed/denied WOPI hosts, if any and if WOPI is enabled.
diff --git a/wsd/reference.txt b/wsd/reference.txt
index f6ad3985..1137bff6 100644
--- a/wsd/reference.txt
+++ b/wsd/reference.txt
@@ -61,3 +61,14 @@ WatermarkText
 
 Note that it is possible to just hide print,save,export options while still
 being able to access them from WOPI hosts using PostMessage API (see 
loleaflet/reference.html)
+
+PutFile headers
+---
+
+PutFile additionally indicates whether the user has modified the document
+before the save, or if they just pressed the Save button without any
+modification.  The following header:
+
+   X-LOOL-WOPI-IsModifiedByUser
+
+will have the value 'true' or 'false' accordingly.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - common/Unit.hpp wsd/LOOLWSD.cpp

[Jan Holesovsky]

 common/Unit.hpp |6 ++
 wsd/LOOLWSD.cpp |   10 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit acaa12c0a6b5dc789dc289b16ad117ed6c1d9102
Author: Jan Holesovsky 
Date:   Wed Aug 9 22:02:29 2017 +0200

wsd: Fix the OAuth unit test.

Trying to combine the Poco's http server together with our polling loop 
leads
only to problem; so instead let's introduce a hook where we can do the WOPI
serving directly in the unit test.

Change-Id: Id3fec6ff93c3ad652aa4e0fc6309c5b7639728cb
Reviewed-on: https://gerrit.libreoffice.org/42857
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/common/Unit.hpp b/common/Unit.hpp
index 5f8d20ea..335a3c81 100644
--- a/common/Unit.hpp
+++ b/common/Unit.hpp
@@ -102,6 +102,12 @@ public:
 return false;
 }
 
+/// Custom response to a http request.
+virtual bool handleHttpRequest(const Poco::Net::HTTPRequest& /*request*/, 
std::shared_ptr& /*socket*/)
+{
+return false;
+}
+
 /// If the test times out this gets invoked, the default just exits.
 virtual void timeout();
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index ec9fe37c..9aa3f986 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1636,14 +1636,18 @@ private:
 std::vector reqPathSegs;
 requestUri.getPathSegments(reqPathSegs);
 
-// File server
-if (reqPathSegs.size() >= 1 && reqPathSegs[0] == "loleaflet")
+if (UnitWSD::get().handleHttpRequest(request, socket))
 {
+// Unit testing, nothing to do here
+}
+else if (reqPathSegs.size() >= 1 && reqPathSegs[0] == "loleaflet")
+{
+// File server
 handleFileServerRequest(request, message);
 }
-// Admin connections
 else if (reqPathSegs.size() >= 2 && reqPathSegs[0] == "lool" && 
reqPathSegs[1] == "adminws")
 {
+// Admin connections
 LOG_INF("Admin request: " << request.getURI());
 if (AdminSocketHandler::handleInitialRequest(_socket, request))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - test/WopiTestServer.hpp

[Jan Holesovsky]

 test/WopiTestServer.hpp |  115 
 1 file changed, 115 insertions(+)

New commits:
commit 8956c57491838a06919494c3cfa9c71acaeb9dff
Author: Jan Holesovsky 
Date:   Tue Sep 26 16:12:58 2017 +0200

Separate the fake wopi server to an own class.

Change-Id: Ibb1b06c491be0065aa12a05a43959165d6c86398
Reviewed-on: https://gerrit.libreoffice.org/42858
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
new file mode 100644
index ..17f6966b
--- /dev/null
+++ b/test/WopiTestServer.hpp
@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "config.h"
+
+#include "Log.hpp"
+#include "Unit.hpp"
+#include "UnitHTTP.hpp"
+#include 
+#include 
+#include 
+#include 
+#include 
+
+class WopiTestServer : public UnitWSD
+{
+public:
+WopiTestServer() : UnitWSD()
+{
+}
+
+virtual void assertCheckFileInfoRequest(const Poco::Net::HTTPRequest& 
request) = 0;
+
+virtual void assertGetFileRequest(const Poco::Net::HTTPRequest& request) = 
0;
+
+virtual bool wopiServerFinish() = 0;
+
+protected:
+/// Here we act as a WOPI server, so that we have a server that responds to
+/// the wopi requests without additional expensive setup.
+virtual bool handleHttpRequest(const Poco::Net::HTTPRequest& request, 
std::shared_ptr& socket) override
+{
+static const std::string hello("Hello, world");
+
+Poco::URI uriReq(request.getURI());
+LOG_INF("Fake wopi host request: " << uriReq.toString());
+
+// CheckFileInfo
+if (uriReq.getPath() == "/wopi/files/0" || uriReq.getPath() == 
"/wopi/files/1")
+{
+LOG_INF("Fake wopi host request, handling CheckFileInfo: " << 
uriReq.getPath());
+
+assertCheckFileInfoRequest(request);
+
+Poco::LocalDateTime now;
+Poco::JSON::Object::Ptr fileInfo = new Poco::JSON::Object();
+fileInfo->set("BaseFileName", "hello.txt");
+fileInfo->set("Size", hello.size());
+fileInfo->set("Version", "1.0");
+fileInfo->set("OwnerId", "test");
+fileInfo->set("UserId", "test");
+fileInfo->set("UserFriendlyName", "test");
+fileInfo->set("UserCanWrite", "true");
+fileInfo->set("PostMessageOrigin", "localhost");
+fileInfo->set("LastModifiedTime", 
Poco::DateTimeFormatter::format(now, Poco::DateTimeFormat::ISO8601_FORMAT));
+
+std::ostringstream jsonStream;
+fileInfo->stringify(jsonStream);
+std::string responseString = jsonStream.str();
+
+const std::string mimeType = "application/json; charset=utf-8";
+
+std::ostringstream oss;
+oss << "HTTP/1.1 200 OK\r\n"
+<< "Last-Modified: " << 
Poco::DateTimeFormatter::format(Poco::Timestamp(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "User-Agent: " << HTTP_AGENT_STRING << "\r\n"
+<< "Content-Length: " << responseString.size() << "\r\n"
+<< "Content-Type: " << mimeType << "\r\n"
+<< "\r\n"
+<< responseString;
+
+socket->send(oss.str());
+socket->shutdown();
+
+return true;
+}
+// GetFile
+else if (uriReq.getPath() == "/wopi/files/0/contents" || 
uriReq.getPath() == "/wopi/files/1/contents")
+{
+LOG_INF("Fake wopi host request, handling GetFile: " << 
uriReq.getPath());
+
+assertGetFileRequest(request);
+
+const std::string mimeType = "text/plain; charset=utf-8";
+
+std::ostringstream oss;
+oss << "HTTP/1.1 200 OK\r\n"
+<< "Last-Modified: " << 
Poco::DateTimeFormatter::format(Poco::Timestamp(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "User-Agent: " << HTTP_AGENT_STRING << "\r\n"
+<< "Content-Length: " << hello.size() << "\r\n"
+<< "Content-Type: " << mimeType << "\r\n"
+<< "\r\n"
+<< hello;
+
+socket->send(oss.str());
+socket->shutdown();
+
+if (wopiServerFinish())
+exitTest(TestResult::Ok);
+
+return true;
+}
+
+return false;
+}
+
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - wsd/ClientSession.cpp

[Jan Holesovsky]

 wsd/ClientSession.cpp |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 5d61ef57e8953c490bc2b9985e22bb187992a52a
Author: Jan Holesovsky 
Date:   Wed Sep 27 10:15:30 2017 +0200

Don't crash when the parameters are missing.

Change-Id: I96ace7ad7757e7e0c74dd9f361c78ecff6171a96
Reviewed-on: https://gerrit.libreoffice.org/42859
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 033a963e..89262c7e 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -63,7 +63,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 {
 LOG_TRC(getName() << ": handling incoming [" << 
getAbbreviatedMessage(buffer, length) << "].");
 const std::string firstLine = getFirstLine(buffer, length);
-const auto tokens = LOOLProtocol::tokenize(firstLine.data(), 
firstLine.size());
+const std::vector tokens = 
LOOLProtocol::tokenize(firstLine.data(), firstLine.size());
 
 auto docBroker = getDocumentBroker();
 if (!docBroker)
@@ -83,6 +83,12 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 
 if (tokens[0] == "loolclient")
 {
+if (tokens.size() < 1)
+{
+sendTextFrame("error: cmd=loolclient kind=badprotocolversion");
+return false;
+}
+
 const auto versionTuple = ParseVersion(tokens[1]);
 if (std::get<0>(versionTuple) != ProtocolMajorVersionNumber ||
 std::get<1>(versionTuple) != ProtocolMinorVersionNumber)
@@ -208,8 +214,12 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 {
 int dontTerminateEdit = 1;
 int dontSaveIfUnmodified = 1;
-getTokenInteger(tokens[1], "dontTerminateEdit", dontTerminateEdit);
-getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
+if (tokens.size() > 1)
+getTokenInteger(tokens[1], "dontTerminateEdit", dontTerminateEdit);
+
+if (tokens.size() > 2)
+getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
+
 docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, 
dontSaveIfUnmodified != 0);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - test/Makefile.am test/UnitWOPI.cpp test/WopiTestServer.hpp

[Jan Holesovsky]

 test/Makefile.am|7 +-
 test/UnitWOPI.cpp   |  129 
 test/WopiTestServer.hpp |   22 ++--
 3 files changed, 152 insertions(+), 6 deletions(-)

New commits:
commit aba676d2682fd7353f50a37eb3643681fb12c8e4
Author: Jan Holesovsky 
Date:   Wed Sep 27 14:13:43 2017 +0200

PutFile ext: X-LOOL-WOPI-IsModifiedByUser unit test.

Change-Id: I0b1ffc74dbbc771f0dcb68f87d46af3ba469ae9e
Reviewed-on: https://gerrit.libreoffice.org/42860
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/test/Makefile.am b/test/Makefile.am
index 754f0f12..ab1c2c92 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,8 @@ noinst_LTLIBRARIES = \
 unit-timeout.la unit-prefork.la \
 unit-storage.la \
 unit-admin.la unit-tilecache.la \
-   unit-fuzz.la unit-oob.la
+   unit-fuzz.la unit-oob.la \
+   unit-wopi.la
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
 AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION) $(ZLIB_LIBS)
@@ -60,6 +61,8 @@ unit_timeout_la_SOURCES = UnitTimeout.cpp
 unit_prefork_la_SOURCES = UnitPrefork.cpp
 unit_storage_la_SOURCES = UnitStorage.cpp
 unit_tilecache_la_SOURCES = UnitTileCache.cpp
+unit_wopi_la_SOURCES = UnitWOPI.cpp
+unit_wopi_la_LIBADD = $(CPPUNIT_LIBS)
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -73,7 +76,7 @@ check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, 
UnitHTTPServerResponse&) ,
-TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la # unit-storage.la # 
unit-admin.la
+TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-wopi.la # 
unit-storage.la # unit-admin.la
 else
 TESTS = ${top_builddir}/test/test
 endif
diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp
new file mode 100644
index ..fade8d0f
--- /dev/null
+++ b/test/UnitWOPI.cpp
@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "config.h"
+
+#include "WopiTestServer.hpp"
+#include "Log.hpp"
+#include "Unit.hpp"
+#include "UnitHTTP.hpp"
+#include "helpers.hpp"
+#include 
+#include 
+
+class UnitWOPI : public WopiTestServer
+{
+enum class Phase
+{
+LoadAndSave,
+Modify,
+SaveModified,
+Finish
+} _phase;
+
+enum class SavingPhase
+{
+Unmodified,
+Modified
+} _savingPhase;
+
+bool _finishedSaveUnmodified;
+bool _finishedSaveModified;
+
+std::unique_ptr _ws;
+
+public:
+UnitWOPI() :
+_phase(Phase::LoadAndSave),
+_finishedSaveUnmodified(false),
+_finishedSaveModified(false)
+{
+}
+
+void assertCheckFileInfoRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
+{
+// nothing to assert in CheckFileInfo
+}
+
+void assertGetFileRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
+{
+// nothing to assert in GetFile
+}
+
+void assertPutFileRequest(const Poco::Net::HTTPRequest& request) override
+{
+if (_savingPhase == SavingPhase::Unmodified)
+{
+CPPUNIT_ASSERT_EQUAL(std::string("false"), 
request.get("X-LOOL-WOPI-IsModifiedByUser"));
+_finishedSaveUnmodified = true;
+}
+else if (_savingPhase == SavingPhase::Modified)
+{
+CPPUNIT_ASSERT_EQUAL(std::string("true"), 
request.get("X-LOOL-WOPI-IsModifiedByUser"));
+_finishedSaveModified = true;
+}
+}
+
+void invokeTest() override
+{
+constexpr char testName[] = "UnitWOPI";
+
+switch (_phase)
+{
+case Phase::LoadAndSave:
+{
+Poco::URI wopiURL(helpers::getTestServerURI() + 
"/wopi/files/0?access_token=anything");
+std::string wopiSrc;
+Poco::URI::encode(wopiURL.toString(), ":/?", wopiSrc);
+Poco::URI loolUri(helpers::getTestServerURI());
+
+LOG_INF("Connecting to the fake WOPI server: /lool/" << 
wopiSrc << "/ws");
+
+_ws.reset(new UnitWebSocket("/lool/" + wopiSrc + "/ws"));
+assert(_ws.get());
+
+helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + 
wopiSrc, testName);
+helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "save 
dontTerminateEdit=1 dontSaveIfUnmodified=0", testName);
+
+_phase = Phase::Modify;
+_savingPhase 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - 2 commits - debian/changelog loolwsd.spec.in Makefile.am

[Andras Timar]

 Makefile.am  |1 +
 debian/changelog |6 ++
 loolwsd.spec.in  |2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ebedb6f5d66e15b8c49e01099e9d4cf6660fb19b
Author: Andras Timar 
Date:   Wed Sep 27 16:01:02 2017 +0200

Bump version for packages 2.1.2-14

Change-Id: I317e6ac9eec56eb6b64309a87539c0a7d1673af4

diff --git a/debian/changelog b/debian/changelog
index 7838c628..5ff49e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.2-14) unstable; urgency=medium
+
+  * see the git log: http://col.la/coolcd
+
+ -- Andras Timar   Thu, 27 Sep 2017 15:40:00 +0200
+
 loolwsd (2.1.2-13) unstable; urgency=medium
 
   * see the git log: http://col.la/coolcd
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a9ca698f..939e82bb 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:13%{?dist}
+Release:14%{?dist}
 Vendor: Collabora
 Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
commit 7c0c92e6cfcd3c2c9dba9503157ee2fb6d399b8c
Author: Andras Timar 
Date:   Wed Sep 27 15:55:44 2017 +0200

add test/WopiTestServer.hpp to Makefile.am

Change-Id: I9a4b10f0d1f12ed85d31f3dbbc1deb747ff35a2d

diff --git a/Makefile.am b/Makefile.am
index 4d2e10e7..d5d59014 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,6 +181,7 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers) 
$(kit_headers) \
  bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h \
+ test/WopiTestServer.hpp \
  test/countloolkits.hpp \
  test/helpers.hpp
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/2.1.2-14'

[Andras Timar]

Tag '2.1.2-14' created by Andras Timar  at 
2017-09-27 14:01 +

2.1.2-14

Changes since 2.1.2-13-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

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

New commits:
commit 77abad7c75c5ff4325ba47f49a8bc9a7ab9e12b0
Author: Christian Lohmaier 
Date:   Tue Sep 26 23:17:01 2017 +0200

Updated core
Project: translations  61b143658f1ba3f75de5af20ee0a90c4d579613f

update translations for 5.4.2 rc2

and force-fix errors using pocheck

Change-Id: I2bf9a01383ba02af3558088146c45070bb130624
(cherry picked from commit dc3f22ad37b3c020be4487ba0eeec17ae80af8b0)

diff --git a/translations b/translations
index 507239da66f7..61b143658f1b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 507239da66f7bde16e1a9baab59b8b8fb4b80a02
+Subproject commit 61b143658f1ba3f75de5af20ee0a90c4d579613f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - translations

[Christian Lohmaier]

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

New commits:
commit 0b4c948f31d62f64f9b85a4ac6686e51a1ecbe27
Author: Christian Lohmaier 
Date:   Tue Sep 26 23:17:01 2017 +0200

Updated core
Project: translations  dc3f22ad37b3c020be4487ba0eeec17ae80af8b0

update translations for 5.4.2 rc2

and force-fix errors using pocheck

Change-Id: I2bf9a01383ba02af3558088146c45070bb130624

diff --git a/translations b/translations
index 9817722981ae..dc3f22ad37b3 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 9817722981ae2fc901c9a08dc7b5bbfec5ca2295
+Subproject commit dc3f22ad37b3c020be4487ba0eeec17ae80af8b0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-2' - xmloff/source

[Michael Stahl]

 xmloff/source/core/xmlexp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 97e4321b21c5d22fbd66bdcb406e264b293fc48c
Author: Michael Stahl 
Date:   Tue Sep 19 21:43:23 2017 +0200

xmloff: fix stack-use-after-return in SvXMLExport::exportDoc()

PropertySetInfo(PropertyMapEntry const * pMap) stores the pointers,
and its lifetime is controlled by refcounting, so the lifetime
of aInfoMap can't be automatic.

ERROR: AddressSanitizer: stack-use-after-return on address ...
... is located in stack of thread T46
at offset 224 in frame SvXMLExport::exportDoc(xmloff::token::XMLTokenEnum)

This frame has 39 object(s):
  ...
  [224, 288) 'aInfoMap' <== Memory access at offset 224 is inside this 
variable

Change-Id: I4eaa9d38bab708b222d999b0982100d7ef97e95c
(cherry picked from commit ee599ea46365adc37f4d495d9ff9778c25c04c92)
Reviewed-on: https://gerrit.libreoffice.org/42504
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 89a5b2c31b4c9d5e068e9d1aef2eac50d70df80e)
Reviewed-on: https://gerrit.libreoffice.org/42748
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index bfb18b8e0853..6c38127b9462 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1284,7 +1284,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum 
::xmloff::token::XMLTokenEnum eClass )
 {
 try
 {
-::comphelper::PropertyMapEntry const aInfoMap[] =
+static ::comphelper::PropertyMapEntry const aInfoMap[] =
 {
 { OUString("Class"), 0,
 ::cppu::UnoType::get(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - Makefile.am

[Andras Timar]

 Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7d8b1cd2d20bf56d0e6a466896658d70959b0c54
Author: Andras Timar 
Date:   Wed Sep 27 15:55:44 2017 +0200

add test/WopiTestServer.hpp to Makefile.am

Change-Id: I9a4b10f0d1f12ed85d31f3dbbc1deb747ff35a2d

diff --git a/Makefile.am b/Makefile.am
index c6186e37..42298d78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,6 +181,7 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers) 
$(kit_headers) \
  bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h \
+ test/WopiTestServer.hpp \
  test/countloolkits.hpp \
  test/helpers.hpp
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/inc/IDocumentMarkAccess.hxx  |5 +
 sw/inc/IMark.hxx|5 +
 sw/qa/core/macros-test.cxx  |6 +
 sw/qa/core/uwriter.cxx  |9 +-
 sw/qa/extras/uiwriter/uiwriter.cxx  |   25 +---
 sw/source/core/crsr/annotationmark.cxx  |2 
 sw/source/core/crsr/bookmrk.cxx |   49 
 sw/source/core/crsr/crbm.cxx|2 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   22 +++
 sw/source/core/doc/docbm.cxx|   20 --
 sw/source/core/inc/MarkManager.hxx  |4 -
 sw/source/core/inc/annotationmark.hxx   |2 
 sw/source/core/inc/bookmrk.hxx  |8 +-
 sw/source/core/undo/rolbck.cxx  |3 
 sw/source/core/unocore/unobkm.cxx   |2 
 sw/source/core/unocore/unoobj2.cxx  |2 
 sw/source/filter/basflt/fltshell.cxx|2 
 sw/source/filter/html/swhtml.cxx|3 
 sw/source/uibase/dbui/dbmgr.cxx |3 
 sw/source/uibase/dochdl/swdtflvr.cxx|3 
 20 files changed, 119 insertions(+), 58 deletions(-)

New commits:
commit 421a23bb36bbf51edfabc58b7d2cd28ad37719d0
Author: Michael Stahl 
Date:   Wed Sep 27 15:55:43 2017 +0200

tdf#112679 sw: fix copying of fieldmarks

Aha, now we know that the reason for the defensive programming
in lcl_AssureFieldMarksSet() was that there are actually 2
different use-cases for it: usually a new mark is inserted,
so there are no dummy characters and they must be inserted.

However when copying text, the dummy characters are copied too,
so they must not be inserted, or we get duplicate fieldmarks.

This also reverts commit d4036d3a89b65a4912f62e3930eb1a31cd90a16b
which fixed the problem only for CHECKBOX_FIELDMARK in a
different way.

(regression from bb069fe7b8b6a24f9ff4df4c7052961e17ea3a8c)

Change-Id: I3c99b8c6d720951655198e682018794337859373

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 6bd844d0c59f..ff0a13cccbc4 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -72,12 +72,15 @@ class IDocumentMarkAccess
@param eMark
[in] the type of the new mark.
 
+   @param eMode
+   [in] is the new mark part of a text copy operation
+
@returns
a pointer to the new mark (name might have changed).
 */
 virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM,
 const OUString& rProposedName,
-MarkType eMark) = 0;
+MarkType eMark, ::sw::mark::InsertMode eMode) = 0;
 
 virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
 const OUString& rName,
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 9ae6fb81d486..f4b38a9a189b 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -31,6 +31,11 @@ struct SwPosition;
 
 namespace sw { namespace mark
 {
+enum class InsertMode
+{
+New,
+CopyText,
+};
 
 class SW_DLLPUBLIC IMark
 : virtual public SwModify // inherited as interface
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index cc75587a04dd..4c712f8da7a0 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -207,7 +207,8 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
 aPaM.Move(fnMoveForward, GoInDoc);
 IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
 sw::mark::IMark *pMark =
-rIDMA.makeMark(aPaM, "test", 
IDocumentMarkAccess::MarkType::BOOKMARK);
+rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK,
+::sw::mark::InsertMode::New);
 CPPUNIT_ASSERT(pMark);
 // select so pMark start position is on a node that is fully deleted
 aPaM.Move(fnMoveBackward, GoInNode);
@@ -241,7 +242,8 @@ void SwMacrosTest::testBookmarkDeleteTdf90816()
 aPaM.Move(fnMoveBackward, GoInContent);
 IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
 sw::mark::IMark *pMark =
-rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK);
+rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK,
+::sw::mark::InsertMode::New);
 CPPUNIT_ASSERT(pMark);
 
 // delete the same selection as the bookmark
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 2363e6d5fa95..98ed54f2d2fb 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1549,19 +1549,22 @@ void SwDocTest::testMarkMove()
 m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "Paragraph 
1");
   

[Libreoffice-commits] online.git: 5 commits - Makefile.am test/Makefile.am test/UnitOAuth.cpp test/UnitWOPI.cpp test/WopiTestServer.hpp wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/reference.txt w

[Andras Timar]

 Makefile.am |1 
 test/Makefile.am|7 +-
 test/UnitOAuth.cpp  |  115 +-
 test/UnitWOPI.cpp   |  129 
 test/WopiTestServer.hpp |  129 
 wsd/ClientSession.cpp   |   20 +--
 wsd/DocumentBroker.cpp  |3 +
 wsd/Storage.cpp |1 
 wsd/Storage.hpp |9 ++-
 wsd/reference.txt   |   11 
 10 files changed, 328 insertions(+), 97 deletions(-)

New commits:
commit 67ebb9a48ed3131749858b070ec4d3c81906530a
Author: Andras Timar 
Date:   Wed Sep 27 15:55:44 2017 +0200

add test/WopiTestServer.hpp to Makefile.am

Change-Id: I9a4b10f0d1f12ed85d31f3dbbc1deb747ff35a2d

diff --git a/Makefile.am b/Makefile.am
index f83fb463..5e0d64b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,6 +187,7 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers) 
$(kit_headers) \
  bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h \
+ test/WopiTestServer.hpp \
  test/countloolkits.hpp \
  test/test.hpp \
  test/helpers.hpp
commit 3141cfc99ba2e2fb3878e95373a2fa48a76205a5
Author: Jan Holesovsky 
Date:   Wed Sep 27 14:13:43 2017 +0200

PutFile ext: X-LOOL-WOPI-IsModifiedByUser unit test.

Change-Id: I0b1ffc74dbbc771f0dcb68f87d46af3ba469ae9e
Reviewed-on: https://gerrit.libreoffice.org/42855
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/test/Makefile.am b/test/Makefile.am
index 57094967..7ee4bcf2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,8 @@ noinst_LTLIBRARIES = \
unit-timeout.la unit-prefork.la \
unit-storage.la unit-client.la \
unit-admin.la unit-tilecache.la \
-   unit-fuzz.la unit-oob.la unit-oauth.la
+   unit-fuzz.la unit-oob.la unit-oauth.la \
+   unit-wopi.la
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
 AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION) $(ZLIB_LIBS)
@@ -77,6 +78,8 @@ unit_storage_la_SOURCES = UnitStorage.cpp
 unit_tilecache_la_SOURCES = UnitTileCache.cpp
 unit_oauth_la_SOURCES = UnitOAuth.cpp
 unit_oauth_la_LIBADD = $(CPPUNIT_LIBS)
+unit_wopi_la_SOURCES = UnitWOPI.cpp
+unit_wopi_la_LIBADD = $(CPPUNIT_LIBS)
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -90,7 +93,7 @@ check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, 
UnitHTTPServerResponse&) ,
-TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-oauth.la
+TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-oauth.la 
unit-wopi.la
 # TESTS = unit-client.la
 # TESTS += unit-admin.la
 # TESTS += unit-storage.la
diff --git a/test/UnitOAuth.cpp b/test/UnitOAuth.cpp
index baf05c0e..dfba4aa1 100644
--- a/test/UnitOAuth.cpp
+++ b/test/UnitOAuth.cpp
@@ -26,7 +26,7 @@ class UnitOAuth : public WopiTestServer
 {
 LoadToken,  // loading the document with Bearer token
 LoadHeader, // loading the document with Basic auth
-Polling // let the loading progress, and when it succeeds, finish
+Finish  // assert all went fine and finish
 } _phase;
 
 bool _finishedToken;
@@ -84,9 +84,9 @@ public:
 }
 }
 
-bool wopiServerFinish() override
+void assertPutFileRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
 {
-return _finishedToken && _finishedHeader;
+// nothing to assert
 }
 
 void invokeTest() override
@@ -116,12 +116,13 @@ public:
 if (_phase == Phase::LoadToken)
 _phase = Phase::LoadHeader;
 else
-_phase = Phase::Polling;
+_phase = Phase::Finish;
 break;
 }
-case Phase::Polling:
+case Phase::Finish:
 {
-// let handleHttpRequest() perform the checks...
+CPPUNIT_ASSERT(_finishedToken && _finishedHeader);
+exitTest(TestResult::Ok);
 break;
 }
 }
diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp
new file mode 100644
index ..fade8d0f
--- /dev/null
+++ b/test/UnitWOPI.cpp
@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can 

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

[Tor Lillqvist]

 sc/source/core/inc/interpre.hxx  |4 ++--
 sc/source/core/tool/interpr1.cxx |4 ++--
 sc/source/core/tool/interpr4.cxx |8 
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ff51bd725da01b9ad4fef268b08b6a5b22516d81
Author: Tor Lillqvist 
Date:   Wed Aug 16 12:25:17 2017 +0300

Make pGlobalStack and bGlobalStackInUse thread_local

Change-Id: Ie196510f68d7bd0a129b92886dbff8af35c81fe8
Reviewed-on: https://gerrit.libreoffice.org/41659
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 401a920d8afe..299104fbb8e8 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -191,8 +191,8 @@ private:
 static ScCalcConfig& GetOrCreateGlobalConfig();
 static ScCalcConfig *mpGlobalConfig;
 
-static ScTokenStack*pGlobalStack;
-static bool bGlobalStackInUse;
+static thread_local std::unique_ptr  pGlobalStack;
+static thread_local bool   bGlobalStackInUse;
 
 ScCalcConfig maCalcConfig;
 formula::FormulaTokenIterator aCode;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e6d9d8a8b7ca..a637c98c390e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -77,8 +77,8 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
 
 ScCalcConfig *ScInterpreter::mpGlobalConfig = nullptr;
-ScTokenStack* ScInterpreter::pGlobalStack = nullptr;
-bool ScInterpreter::bGlobalStackInUse = false;
+thread_local std::unique_ptr ScInterpreter::pGlobalStack;
+thread_local bool ScInterpreter::bGlobalStackInUse = false;
 
 using namespace formula;
 using ::std::unique_ptr;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 0f48a2696f0c..f490a56a513e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3823,8 +3823,8 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, 
ScDocument* pDoc,
 {
 bGlobalStackInUse = true;
 if (!pGlobalStack)
-pGlobalStack = new ScTokenStack;
-pStackObj = pGlobalStack;
+pGlobalStack.reset(new ScTokenStack);
+pStackObj = pGlobalStack.get();
 }
 else
 {
@@ -3835,7 +3835,7 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, 
ScDocument* pDoc,
 
 ScInterpreter::~ScInterpreter()
 {
-if ( pStackObj == pGlobalStack )
+if ( pStackObj == pGlobalStack.get() )
 bGlobalStackInUse = false;
 else
 delete pStackObj;
@@ -3868,7 +3868,7 @@ void ScInterpreter::MergeCalcConfig()
 void ScInterpreter::GlobalExit()
 {
 OSL_ENSURE(!bGlobalStackInUse, "who is still using the TokenStack?");
-DELETEZ(pGlobalStack);
+pGlobalStack.reset();
 }
 
 namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 9105 ++--
 1 file changed, 4559 insertions(+), 4546 deletions(-)

New commits:
commit 1880373663888bfefcb9beb48f71ac14a9da2f34
Author: Christian Lohmaier 
Date:   Wed Sep 27 16:59:22 2017 +0200

update credits

Change-Id: I1f87134063f3a503069cc08bec362a988b8a72ce

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 172eaa26c21c..01fb19b19d2e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.0.3$Linux_X86_64
 
LibreOffice_project/7556cbc6811c9d992f4064ab9287069087d7f62c2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.1.2$Linux_X86_64
 
LibreOffice_project/ea7cb86e6eeb2bf3a5af73a8fac5703215272012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
679
@@ -71,7 +71,7 @@
false
false
true
-   6990031
+   7113569
false
false
false
@@ -317,23 +317,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -356,84 +359,63 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  

   
-  
-   
-  
-  
-   
+  
+   
   
-  
+  

   
-  
+  

   
   
@@ -802,7 +784,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1065,7 +1047,7 @@

   
  Credits
-1269 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-22 19:59:10.
+1282 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-24 17:26:38.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1092,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 22432Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 22634Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 14747Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 14922Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1103,16 +1085,16 @@
  
  
   
-   *Noel 

[Libreoffice-commits] core.git: Branch 'feature/kde5' - vcl/unx

[Katarina Behrens]

 vcl/unx/kde5/KDE5SalInstance.cxx |8 
 vcl/unx/kde5/KDE5SalInstance.hxx |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 928c505f5bf5cab7d9b23ece2a520a861727ae20
Author: Katarina Behrens 
Date:   Wed Sep 27 17:00:58 2017 +0200

Convert KDE5SalInstance to SvpSalInstance

Change-Id: I72da846525128a689d92598b64e6a70062ff1c69

diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index b8d3471a44c6..38629113295c 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -34,7 +34,7 @@
 using namespace com::sun::star;
 
 KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex)
-: X11SalInstance(pMutex)
+:SvpSalInstance( pMutex )
 {
 ImplSVData* pSVData = ImplGetSVData();
 delete pSVData->maAppData.mpToolkitName;
@@ -54,13 +54,13 @@ uno::Reference< ui::dialogs::XFilePicker2 > 
KDE5SalInstance::createFilePicker(
 return uno::Reference< ui::dialogs::XFilePicker2 >(
 kdeXLib->createFilePicker(xMSF) );
 else*/
-return X11SalInstance::createFilePicker( xMSF );
+return SalInstance::createFilePicker( xMSF );
 }
 
-SalX11Display* KDE5SalInstance::CreateDisplay() const
+/*SalX11Display* KDE5SalInstance::CreateDisplay() const
 {
 return new SalKDE5Display( QX11Info::display() );
-}
+}*/
 
 bool KDE5SalInstance::IsMainThread() const
 {
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 233d6fd7430b..5c0247518246 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -19,15 +19,15 @@
 
 #pragma once
 
-#include 
+#include 
 
 class SalYieldMutex;
 class SalFrame;
 
-class KDE5SalInstance : public X11SalInstance
+class KDE5SalInstance : public SvpSalInstance
 {
 protected:
-virtual SalX11Display* CreateDisplay() const override;
+//virtual SalX11Display* CreateDisplay() const override;
 
 public:
 explicit KDE5SalInstance(SalYieldMutex* pMutex);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 9105 ++--
 1 file changed, 4559 insertions(+), 4546 deletions(-)

New commits:
commit b59d0d305731d597653f301617a5b6c646be4633
Author: Christian Lohmaier 
Date:   Wed Sep 27 16:59:22 2017 +0200

update credits

Change-Id: I1f87134063f3a503069cc08bec362a988b8a72ce
(cherry picked from commit 1880373663888bfefcb9beb48f71ac14a9da2f34)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 172eaa26c21c..01fb19b19d2e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.0.3$Linux_X86_64
 
LibreOffice_project/7556cbc6811c9d992f4064ab9287069087d7f62c2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.1.2$Linux_X86_64
 
LibreOffice_project/ea7cb86e6eeb2bf3a5af73a8fac5703215272012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
679
@@ -71,7 +71,7 @@
false
false
true
-   6990031
+   7113569
false
false
false
@@ -317,23 +317,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -356,84 +359,63 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  

   
-  
-   
-  
-  
-   
+  
+   
   
-  
+  

   
-  
+  

   
   
@@ -802,7 +784,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1065,7 +1047,7 @@

   
  Credits
-1269 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-22 19:59:10.
+1282 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-24 17:26:38.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1092,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 22432Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 22634Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 14747Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 14922Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 9105 ++--
 1 file changed, 4559 insertions(+), 4546 deletions(-)

New commits:
commit cf2e1fd7f1b2655949b4bdb9512c585130a8bb42
Author: Christian Lohmaier 
Date:   Wed Sep 27 16:59:22 2017 +0200

update credits

Change-Id: I1f87134063f3a503069cc08bec362a988b8a72ce
(cherry picked from commit 1880373663888bfefcb9beb48f71ac14a9da2f34)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 172eaa26c21c..01fb19b19d2e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.0.3$Linux_X86_64
 
LibreOffice_project/7556cbc6811c9d992f4064ab9287069087d7f62c2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.1.2$Linux_X86_64
 
LibreOffice_project/ea7cb86e6eeb2bf3a5af73a8fac5703215272012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
679
@@ -71,7 +71,7 @@
false
false
true
-   6990031
+   7113569
false
false
false
@@ -317,23 +317,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -356,84 +359,63 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  

   
-  
-   
-  
-  
-   
+  
+   
   
-  
+  

   
-  
+  

   
   
@@ -802,7 +784,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1065,7 +1047,7 @@

   
  Credits
-1269 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-22 19:59:10.
+1282 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-24 17:26:38.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1092,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 22432Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 22634Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 14747Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 14922Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 

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

[Takeshi Abe]

 svx/source/dialog/svxruler.cxx |   17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 0745016139072bfb8dceec840736f64f927deefd
Author: Takeshi Abe 
Date:   Wed Sep 27 19:26:09 2017 +0900

svx: Simplify SvxRuler_Impl's ctor with std::unique_ptr

Change-Id: I1d663adebaf9c95e12543ab8c2f22e8094632b99
Reviewed-on: https://gerrit.libreoffice.org/42850
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 01b6a2370323..0cded751496f 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -129,7 +129,7 @@ struct SvxRuler_Impl {
 long   lLastLMargin;
 long   lLastRMargin;
 SvxProtectItem aProtectItem;
-SfxBoolItem* pTextRTLItem;
+std::unique_ptr pTextRTLItem;
 sal_uInt16 nControlerItems;
 sal_uInt16 nIdx;
 sal_uInt16 nColLeftPix;
@@ -143,22 +143,16 @@ struct SvxRuler_Impl {
   // false means relative to 
SvxRuler::GetLeftFrameMargin()
 
 SvxRuler_Impl() :
-pPercBuf(nullptr), pBlockBuf(nullptr), nPercSize(0), nTotalDist(0),
+nPercSize(0), nTotalDist(0),
 lOldWinPos(0), lMaxLeftLogic(0), lMaxRightLogic(0),
 lLastLMargin(0), lLastRMargin(0), aProtectItem(SID_RULER_PROTECT),
-pTextRTLItem(nullptr), nControlerItems(0), nIdx(0),
+nControlerItems(0), nIdx(0),
 nColLeftPix(0), nColRightPix(0),
 bIsTableRows(false),
 bIsTabsRelativeToIndent(true)
 {
 }
 
-~SvxRuler_Impl()
-{
-nPercSize = 0; nTotalDist = 0;
-pPercBuf = nullptr;
-delete pTextRTLItem;
-}
 void SetPercSize(sal_uInt16 nSize);
 
 };
@@ -754,10 +748,9 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem)
 {
 if(bActive && bHorz)
 {
-delete mxRulerImpl->pTextRTLItem;
-mxRulerImpl->pTextRTLItem = nullptr;
+mxRulerImpl->pTextRTLItem.reset();
 if(pItem)
-mxRulerImpl->pTextRTLItem = new SfxBoolItem(*pItem);
+mxRulerImpl->pTextRTLItem.reset(new SfxBoolItem(*pItem));
 SetTextRTL(mxRulerImpl->pTextRTLItem && 
mxRulerImpl->pTextRTLItem->GetValue());
 StartListening_Impl();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 9105 ++--
 1 file changed, 4559 insertions(+), 4546 deletions(-)

New commits:
commit 547d4f2f4e1137533eb0463ba04ce96dd6905bb0
Author: Christian Lohmaier 
Date:   Wed Sep 27 16:59:22 2017 +0200

update credits

Change-Id: I1f87134063f3a503069cc08bec362a988b8a72ce
(cherry picked from commit 1880373663888bfefcb9beb48f71ac14a9da2f34)
(cherry picked from commit cf2e1fd7f1b2655949b4bdb9512c585130a8bb42)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 172eaa26c21c..01fb19b19d2e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.0.3$Linux_X86_64
 
LibreOffice_project/7556cbc6811c9d992f4064ab9287069087d7f62c2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.1.2$Linux_X86_64
 
LibreOffice_project/ea7cb86e6eeb2bf3a5af73a8fac5703215272012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
679
@@ -71,7 +71,7 @@
false
false
true
-   6990031
+   7113569
false
false
false
@@ -317,23 +317,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -356,84 +359,63 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  
-   
-  
-  

   
-  
-   
-  
-  
-   
+  
+   
   
-  
+  

   
-  
+  

   
   
@@ -802,7 +784,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1065,7 +1047,7 @@

   
  Credits
-1269 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-22 19:59:10.
+1282 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-08-24 17:26:38.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1092,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 22432Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 22634Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 14747Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 14922Joined: 

[Libreoffice-bugs] [Bug 104522] [META] DOCX header & footer-related issues

[bugzilla-daemon]

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

 Depends on||112694


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=112694
[Bug 112694] FILEOPEN: DOCX - Top margin imported incorrectly and header
incorrectly activated
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112695] impress not listening on bluetooth or tcp 1599 for remote connection

[bugzilla-daemon]

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

--- Comment #1 from hgkamath  ---
The bluetooth pairing between android and win10 works. 
One can do other things like bluetooth file transfer if required.
Upon android-impress-remote connect, one can see in win10/settings/devices
window quick textual updates on the status of the paired android device,
indicating a bluetooth connect, and it subsequently disconnecting, perhaps
because the bluetooth service was not available.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112696] Crash in: SwFEShell::IsGroupSelected()

[bugzilla-daemon]

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

Xisco Faulí  changed:

   What|Removed |Added

   Keywords||haveBacktrace

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112691] Cannot create specific formats for tabs

[bugzilla-daemon]

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

--- Comment #1 from Xavier Van Wijmeersch  ---
Have look at this page, its explains how to do it
https://forum.openoffice.org/en/forum/viewtopic.php?f=9=65782
and this one
https://superuser.com/questions/971530/change-page-orientation-of-one-specific-page

best regards

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 86838] Letter page format size prints portrait pages as landscape on OS X ( Brother and HP printers)

[bugzilla-daemon]

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

Ken Weiss  changed:

   What|Removed |Added

 Status|RESOLVED|VERIFIED

--- Comment #56 from Ken Weiss  ---
I am running Mac OS Sierra 10.12.6 and LibreOffice 5.4.1.2 on an iMac (3.1 GHz
Core i7).

The landscape printing problem still occurs on single page documents (letter
portrait format) but oddly enough does not occur on a multipage document
formatted the same way.

It may or may not be relevant that the multipage document is a newsletter with
pages formatted as two columns and using a variety of fonts.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112695] impress not listening on bluetooth or tcp 1599 for remote connection

[bugzilla-daemon]

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

hgkamath  changed:

   What|Removed |Added

Summary|impress does not listen on  |impress not listening on
   |tcp 159 for remote  |bluetooth or tcp 1599 for
   |connection  |remote connection

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112696] Crash in: SwFEShell::IsGroupSelected()

[bugzilla-daemon]

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

Xisco Faulí  changed:

   What|Removed |Added

   Keywords||bibisected, bisected,
   ||regression
   Priority|medium  |high
 Status|UNCONFIRMED |NEW
 CC||l...@deller.id.au
Version|6.0.0.0.alpha0+ Master  |4.1 all versions
 Ever confirmed|0   |1
   Severity|normal  |major

--- Comment #1 from Xisco Faulí  ---
Regression introduced by:

author  Luke Deller  2013-04-27 21:06:11 (GMT)
committer   David Tardon    2013-04-28 11:52:12
(GMT)
commit  57082b1243e86694b72c5e4fad013bf207bfe81a (patch)
tree2e461c166beecb5b569c966a2aeceb90995a4b85
parent  2094610175140023cf8f904f8506c189e36dec06 (diff)
fdo#60910: discard UNO shape object in SdrObject::SetPage
The creation of the UNO shape in SdrObject::getUnoShape is influenced
by pPage, so when the page changes we need to discard the cached UNO
shape so that a new one will be created with the new page.

This replaces my first shot at a fix for fdo#60910 which reinstated a
line to discard the custom shape engine (and consequently the UNO shape) in
SdrObjCustomShape::InvalidateRenderGeometry.  That worked but did more
discarding than was necessary.

Bisected with: bibisect-41max and reverted locally as well.

Adding Cc: to Luke Deller

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 91850] Roundtripping drawing in .docx results in Mirror image in Word ( but not Writer)

[bugzilla-daemon]

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

Luke  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #6 from Luke  ---
This has been fixed sometime in the past month or so.

Works for me in  Version: 6.0.0.0.alpha0+ (x64)
Build ID: 892c719fffa06de4c7aeab497326cad7bae9e5c6

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 104520] [META] DOCX (OOXML) bug tracker

[bugzilla-daemon]

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

Bug 91850 Summary: Roundtripping drawing in .docx results in Mirror image in 
Word (but not Writer)
https://bugs.documentfoundation.org/show_bug.cgi?id=91850

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112696] Crash in: SwFEShell::IsGroupSelected()

[bugzilla-daemon]

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

--- Comment #2 from Xisco Faulí  ---
Created attachment 136567
  --> https://bugs.documentfoundation.org/attachment.cgi?id=136567=edit
gdb backtrace

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112694] New: FILEOPEN: DOCX - Top margin imported incorrectly and header incorrectly activated

[bugzilla-daemon]

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

Bug ID: 112694
   Summary: FILEOPEN: DOCX - Top margin imported incorrectly and
header incorrectly activated
   Product: LibreOffice
   Version: 5.0.6.3 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Keywords: bibisectRequest, regression
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: philip...@hotmail.com
Blocks: 104522

steps:
1. open
http://download.microsoft.com/documents/rus/microsoft4you/How_to_license_the_operating_system_Windows_8_new.docx
2. scroll to page 2
3. notice the header is active and has a purple line in it when it shouldnt
4. also notice that the top margin is set to 0.25 rather than 0.76

regression as this didnt happen in 4.4

Version: 6.0.0.0.alpha0+
Build ID: 892c719fffa06de4c7aeab497326cad7bae9e5c6
CPU threads: 2; OS: Linux 4.4; UI render: default; VCL: gtk2; 
TinderBox: Linux-rpm_deb-x86_64@70-TDF, Branch:master, Time:
2017-09-27_03:02:09
Locale: en-US (en_US.UTF-8); Calc: group


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=104522
[Bug 104522] [META] DOCX header & footer-related issues
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112696] Crash in: SwFEShell::IsGroupSelected()

[bugzilla-daemon]

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

Xisco Faulí  changed:

   What|Removed |Added

 CC||xiscofa...@libreoffice.org
Crash report or||["SwFEShell::IsGroupSelecte
crash signature||d()"]

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112696] New: Crash in: SwFEShell::IsGroupSelected()

[bugzilla-daemon]

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

Bug ID: 112696
   Summary: Crash in: SwFEShell::IsGroupSelected()
   Product: LibreOffice
   Version: 6.0.0.0.alpha0+ Master
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: xiscofa...@libreoffice.org

Steps to reproduce:
1. Open writer
2. View - Toolbars - Form Control
3. Make sure the wizard button is enabled
4. Click on more controls button
5. Add a Group Form
6. Add a new field and click Next until the wizard finishes
7. DO NOT DESELECT THE FORM
8. Right click - Group - Group
9. CRASH

Reproduced in

Version: 6.0.0.0.alpha0+
Build ID: 465092047d5fa6ec6dd369372e712d76554570ff
CPU threads: 4; OS: Linux 4.10; UI render: default; VCL: gtk3; 
Locale: ca-ES (ca_ES.UTF-8); Calc: group

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112523] Calc function names in the Polish language version.

[bugzilla-daemon]

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

Eike Rathke  changed:

   What|Removed |Added

 Status|UNCONFIRMED |ASSIGNED
Version|5.3.6.1 release |4.3 all versions
   Assignee|libreoffice-b...@lists.free |er...@redhat.com
   |desktop.org |
 Ever confirmed|0   |1

--- Comment #1 from Eike Rathke  ---
Investigating.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-ux-advise] [Bug 89736] Ability to add a heading/title above on the endnote page

[bugzilla-daemon]

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

Heiko Tietze  changed:

   What|Removed |Added

  Component|LibreOffice |Writer

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Libreoffice-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise