[Libreoffice-commits] core.git: uitest/demo_ui
uitest/demo_ui/char_dialog.py | 37 +
1 file changed, 37 insertions(+)
New commits:
commit 02f43b0ad3865ef7af17fe51bc87680ffe881dc0
Author: Markus Mohrhard
Date: Sat Jun 25 10:25:47 2016 +0200
uitest: add special char widget demo
Change-Id: I513ae293cfed488723e221a7eec37f103efefa92
diff --git a/uitest/demo_ui/char_dialog.py b/uitest/demo_ui/char_dialog.py
new file mode 100644
index 000..0cf545f
--- /dev/null
+++ b/uitest/demo_ui/char_dialog.py
@@ -0,0 +1,37 @@
+# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest_helper import UITest
+
+from helper import mkPropertyValues
+from UITestCase import UITestCase
+
+import time
+
+class CharDialogText(UITestCase):
+
+def test_select_char(self):
+self.ui_test.create_doc_in_start_center("calc")
+
+self.ui_test.execute_dialog_through_command(".uno:InsertSymbol")
+xCharDialog = self.xUITest.getTopFocusWindow()
+print(xCharDialog.getChildren())
+
+time.sleep(5)
+
+xCharSet = xCharDialog.getChild("showcharset")
+
+xCharSet.executeAction("SELECT", mkPropertyValues({"COLUMN": "2",
"ROW": "2"}))
+
+time.sleep(5)
+
+xCancelBtn = xCharDialog.getChild("cancel")
+xCancelBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/node.hxx|2 +-
starmath/source/node.cxx |6 --
2 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 3fd21b123fb2338b9f1ed0b483a86ae878a6d769
Author: Takeshi Abe
Date: Fri Jun 24 20:08:29 2016 +0900
starmath: Remove unused definition
Change-Id: I46674e606ad7ef586597c926a21dd745ee762011
Reviewed-on: https://gerrit.libreoffice.org/26634
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index f6f684d..7d9b0df 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -130,7 +130,7 @@ public:
virtual boolIsVisible() const;
virtual sal_uInt16 GetNumSubNodes() const;
-virtual SmNode *GetSubNode(sal_uInt16 nIndex);
+virtual SmNode *GetSubNode(sal_uInt16 nIndex) = 0;
const SmNode * GetSubNode(sal_uInt16 nIndex) const
{
return const_cast(this)->GetSubNode(nIndex);
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index ed06440..eb3224a 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -88,12 +88,6 @@ sal_uInt16 SmNode::GetNumSubNodes() const
}
-SmNode * SmNode::GetSubNode(sal_uInt16 /*nIndex*/)
-{
-return nullptr;
-}
-
-
const SmNode * SmNode::GetLeftMost() const
// returns leftmost node of current subtree.
//! (this assumes the one with index 0 is always the leftmost subnode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/node.hxx|7 +--
starmath/source/node.cxx | 12
2 files changed, 5 insertions(+), 14 deletions(-)
New commits:
commit 84bbe3a104e5ffca8a62c50b0fe6e2029764319a
Author: Takeshi Abe
Date: Sat Jun 25 19:21:18 2016 +0900
starmath: Drop unnecessary definitions
Change-Id: I709e612fd03dfa50d6f7bcfa4545fcd23f0ebe60
Reviewed-on: https://gerrit.libreoffice.org/26654
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 7d9b0df..fa79f55 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -127,9 +127,12 @@ public:
virtual ~SmNode();
-virtual boolIsVisible() const;
+/**
+ * Returns true if this is a instance of SmVisibleNode's subclass, false
otherwise.
+ */
+virtual boolIsVisible() const = 0;
-virtual sal_uInt16 GetNumSubNodes() const;
+virtual sal_uInt16 GetNumSubNodes() const = 0;
virtual SmNode *GetSubNode(sal_uInt16 nIndex) = 0;
const SmNode * GetSubNode(sal_uInt16 nIndex) const
{
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index eb3224a..f378e4d 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -76,18 +76,6 @@ SmNode::~SmNode()
}
-bool SmNode::IsVisible() const
-{
-return false;
-}
-
-
-sal_uInt16 SmNode::GetNumSubNodes() const
-{
-return 0;
-}
-
-
const SmNode * SmNode::GetLeftMost() const
// returns leftmost node of current subtree.
//! (this assumes the one with index 0 is always the leftmost subnode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - include/xmloff sw/inc sw/source xmloff/source
include/xmloff/txtparae.hxx | 29 +
sw/inc/redline.hxx |6 -
sw/inc/redline.hxx.gch |binary
sw/source/core/unocore/unoredline.cxx |6 +++--
xmloff/source/text/XMLRedlineExport.cxx | 37 +---
xmloff/source/text/XMLRedlineExport.hxx |8 +++---
xmloff/source/text/txtparae.cxx | 13 ++-
7 files changed, 66 insertions(+), 33 deletions(-)
New commits:
commit 39816f01c52176d6a262e7684ab9535d9f0ebb61
Author: Rosemary Sebastian
Date: Sat Jun 25 10:55:35 2016 +0530
Get text positions with changes applied
Change-Id: I5ceaad492380d00e55c84cfcf0d66a7c3f4cf9c1
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 92fae21..fd13ff1 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -93,6 +93,8 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public
XMLStyleExport
/// may be NULL (if no redlines should be exported; e.g. in block mode)
XMLRedlineExport*pRedlineExport;
sal_uInt32 nParaIdx;
+sal_uInt32 nParaDelCount;
+sal_uInt32 nTextDelCount;
boolbProgress;
@@ -249,7 +251,7 @@ public:
void exportUndoTextRangeEnumeration(
const css::uno::Reference< css::container::XEnumeration > & rRangeEnum,
-const sal_uInt32& rParaIdx,
+sal_uInt32 nParagraphIdx,
bool bAutoStyles );
void exportTextRangeEnumeration(
const css::uno::Reference< css::container::XEnumeration > & rRangeEnum,
@@ -304,7 +306,7 @@ protected:
TextPNS eExtensionNS = TextPNS::ODF);
void exportUndoParagraph(
const css::uno::Reference< css::text::XTextContent > & rTextContent,
-const sal_uInt32& rParaIdx,
+sal_uInt32 nParaIdx,
bool bAutoStyles, bool bProgress,
MultiPropertySetHelper& rPropSetHelper);
void exportParagraph(
@@ -542,9 +544,9 @@ public:
void exportTitleAndDescription( const css::uno::Reference<
css::beans::XPropertySet > & rPropSet,
const css::uno::Reference<
css::beans::XPropertySetInfo > & rPropSetInfo );
-void setParaIdx(sal_uInt32 rParaIdx)
+void setParaIdx(sal_uInt32 nParagraphIdx)
{
-nParaIdx = rParaIdx;
+nParaIdx = nParagraphIdx;
}
sal_uInt32 getParaIdx()
@@ -552,6 +554,25 @@ public:
return nParaIdx;
}
+void setTextDelCount(sal_uInt32 nTextDeleteCount )
+{
+nTextDelCount = nTextDeleteCount;
+}
+
+sal_uInt32 getTextDelCount()
+{
+return nTextDelCount;
+}
+
+void setParaDelCount(sal_uInt32 nParagraphDelCount)
+{
+nParaDelCount = nParagraphDelCount;
+}
+
+sal_uInt32 getParaDelCount()
+{
+return nParaDelCount;
+}
// This method exports the given XText
void exportTrackedChanges(
const css::uno::Reference< css::text::XText > & rText,
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 5588b94..2ebe5cc 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -114,6 +114,7 @@ class SW_DLLPUBLIC SwRedlineData
DateTime aStamp;
RedlineType_t eType;
sal_uInt16 nAuthor, nSeqNo;
+OUString sUndoType;
public:
SwRedlineData( RedlineType_t eT, sal_uInt16 nAut );
@@ -151,6 +152,7 @@ public:
void SetComment( const OUString& rS ) { sComment = rS; }
void SetUndoStart( const sal_uInt32& rUndoStart ) { nUndoStart =
rUndoStart; }
void SetUndoEnd( const sal_uInt32& rUndoEnd ) { nUndoEnd = rUndoEnd; }
+void SetUndoType( const OUString& rUndoType ) { sUndoType =
rUndoType; }
void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; }
void SetAutoFormatFlag()
@@ -166,7 +168,8 @@ public:
pNext->CanCombine( *rCmp.pNext ))) &&
(( !pExtraData && !rCmp.pExtraData ) ||
( pExtraData && rCmp.pExtraData &&
-*pExtraData == *rCmp.pExtraData ));
+*pExtraData == *rCmp.pExtraData )) &&
+nUndoEnd == rCmp.nUndoStart - 1;
}
// ExtraData gets copied, the pointer is therefore not taken over by
@@ -247,6 +250,7 @@ public:
void SetUndoStart( const sal_uInt32& rUndoStart ) {
pRedlineData->SetUndoStart( rUndoStart ); }
void SetUndoEnd( const sal_uInt32& rUndoEnd ) { pRedlineData->SetUndoEnd(
rUndoEnd ); }
+void SetUndoType( const OUString& rUndoType ) { pRedlineData->SetUndoType(
rUndoType ); }
void SetComment( const OUString& rS ) { pRedlineData->SetComment( rS ); }
/** ExtraData gets copied, the pointer is therefore not taken over by
diff --git a/sw/inc/redline.hxx.gch b/sw/inc/redline.hxx.gch
new file mode 100644
index 000..1fac9bb
Binary files /dev/null and b/sw/inc/redl
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/ColorPanel.hxx | 58 --
1 file changed, 58 deletions(-)
New commits:
commit 59246096295ab94f9e2f47260100f83501fc1bc2
Author: Rishabh Kumar
Date: Sat Jun 25 13:18:40 2016 +0530
Remove dead code
Change-Id: Ie4aaf3c64e827bafbd3c2477b47752dabd48ad1a
Reviewed-on: https://gerrit.libreoffice.org/26653
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/svx/source/sidebar/ColorPanel.hxx
b/svx/source/sidebar/ColorPanel.hxx
deleted file mode 100644
index 3e7f085..000
--- a/svx/source/sidebar/ColorPanel.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_COLORPANEL_HXX
-#define INCLUDED_SVX_SOURCE_SIDEBAR_COLORPANEL_HXX
-
-#include
-#include
-
-
-namespace svx { namespace sidebar {
-
-
-/** This demo panel shows the colors that are available from the
-StyleSettings.
-*/
-class ColorPanel
-: public ValueSet
-{
-public:
-ColorPanel (vcl::Window* pParent);
-virtual ~ColorPanel();
-
-// From vcl::Window
-virtual void Resize();
-virtual void DataChanged (const DataChangedEvent& rEvent);
-
-private:
-int mnPreferredColumnCount;
-
-/** Depending on the given number of columns and the item size
-calculate the number of rows that are necessary to display all
-items.
-*/
-int CalculateRowCount (const Size& rItemSize, int nColumnCount);
-void Fill();
-};
-
-} } // end of namespace svx::sidebar
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
Markus Mohrhard wrote >> + Most Pressing Bugs: >> http://tdf.io/mostressingbugs >> + tdf#100295 - LibODev-5.2.0.0.b2 does not run in Windows_XP (32 >> or 64 bit) >> + Interest in fixing ? (or is this a 'feature' ?) >> + Tor - thinks a feature. >> + last time - 10% of Windows market (Michael) >>+ compares vs. Mac install base. >> + can we bibisect for Windows to find what killed it. >> + could be related to breakpad ? (Cloph) >>+ a duplicate with more info in it out there. >>+ perhaps Moggi had a look ? >> > > I think I mentioned it before. Currently I assume that it is a problem > with > libcurl. Unless you specify that you want to compile against the correct > SDK version libcurl uses a vista function unconditionally. So this has > been > an old problem (and would have crashed on XP if the corresponding ucp > component got loaded) but is now causing a crash already during start as > our minidump uploaded has a libcurl dependency. > > There is a patch to fix it by telling the libcurl build to compile against > the old version but as I have no XP I can not test if it really helps. Markus -- happy to test on Win XP sp3 , but would need cloph to roll it up in a 32-bit release build configuration. Might also take care of tdf#95183 and tdf#95184. Should probably have a 64-bit build as well to check for any regression against Vista onward. But, how much longer do we drag along Windows XP? Check for Updates broken on XP since 5.0. It seems like introduction of Error Reporting alone for 5.2 is justification to end support of XP sp3 at 5.1? What will be the next feature that can't be implemented, or breaks in vs2015 build because of retaining an XP compliant build target? Kind of expect anything done for incremental updates--tdf#68274--is going to be pushing us forward to Windows 7 anyhow. Stuart -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4186986p4187101.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/db.fods | 1675 + 1 file changed, 1675 insertions(+) New commits: commit e945944274e3dbb675e03f2a3f2303506c7c758c Author: ZdenÄk Crhonek Date: Sat Jun 25 08:24:22 2016 +0200 add DB() test case Change-Id: Idc995d974ddfcc565464a1d41eaa02aefbfd017e Reviewed-on: https://gerrit.libreoffice.org/26651 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/db.fods b/sc/qa/unit/data/functions/fods/db.fods new file mode 100644 index 000..b01725b --- /dev/null +++ b/sc/qa/unit/data/functions/fods/db.fods @@ -0,0 +1,1675 @@ + + +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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis: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: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:form x="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.spreadsheet"> + 2016-06-23T12:52:01.93800P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/0325b22a2a2b537a71f53b7c5d3e6c13fef68911 + + + 0 + 0 + 34873 + 15388 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 90 + 60 + true + + + 4 + 13 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 90 + 60 + true + + + Sheet2 + 1241 + 0 + 90 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + en + US + + + + + + nl + NL + + + + + + true + true + 3 + 1 + true + 1 + true + jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg== + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + + + + + + + + + ( + + ) + + + + + - + + + + + + + + + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + (
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/if.fods | 2493 + 1 file changed, 2493 insertions(+) New commits: commit 822aac91426848ae36fb5a6bd5ee55db6b60de6a Author: ZdenÄk Crhonek Date: Sat Jun 25 08:27:48 2016 +0200 add IF() test case Change-Id: I87342daedda6b8683c07516074ec964b70e43421 Reviewed-on: https://gerrit.libreoffice.org/26652 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/if.fods b/sc/qa/unit/data/functions/fods/if.fods new file mode 100644 index 000..a2ee76a --- /dev/null +++ b/sc/qa/unit/data/functions/fods/if.fods @@ -0,0 +1,2493 @@ + + +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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis: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: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:form x="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.spreadsheet"> + 2016-06-25T07:16:38.437590147P0D1LibreOffice/5.1.3.2$Linux_X86_64 LibreOffice_project/10m0$Build-2 + + + 0 + 0 + 41364 + 13095 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 4 + 25 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet2 + 1185 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + en + US + + + + + + 3 + 1 + true + 1 + true + qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + +$ + + + + +$( + + ) + + +$- + + + + + + + + + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + + + £ + + + + + - + £ + +
[Libreoffice-commits] core.git: svx/inc
svx/inc/uiobject.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bf9fd0da729cf8250d54821219a569ff095a3435
Author: Markus Mohrhard
Date: Sat Jun 25 17:48:51 2016 +0200
loplugin:privatebase
Change-Id: Ide542c847304087e555b1742274e509184a0edce
diff --git a/svx/inc/uiobject.hxx b/svx/inc/uiobject.hxx
index 2e90385..f511f46 100644
--- a/svx/inc/uiobject.hxx
+++ b/svx/inc/uiobject.hxx
@@ -11,7 +11,7 @@
class SvxShowCharSet;
-class SvxShowCharSetUIObject : WindowUIObject
+class SvxShowCharSetUIObject : public WindowUIObject
{
VclPtr mxCharSet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/_bmpmask.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit c924baf95fe47ea642924b3bc47cd81bf4e89d10
Author: Katarina Behrens
Date: Fri Jun 24 22:21:01 2016 +0200
tdf#100343: Refresh ValueSets after changing their value
yet another RenderContext regression
Change-Id: I77061f6047fee4be2b70739ff2523a24a847ef12
Reviewed-on: https://gerrit.libreoffice.org/26647
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 73f0821..c3c711f 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -567,24 +567,28 @@ void SvxBmpMask::PipetteClicked()
m_pCbx1->Check();
pData->CbxHdl(m_pCbx1);
m_pQSet1->SetItemColor( 1, aPipetteColor );
+m_pQSet1->SetFormat();
}
else if( m_pQSet2->GetSelectItemId() == 1 )
{
m_pCbx2->Check();
pData->CbxHdl(m_pCbx2);
m_pQSet2->SetItemColor( 1, aPipetteColor );
+m_pQSet2->SetFormat();
}
else if( m_pQSet3->GetSelectItemId() == 1 )
{
m_pCbx3->Check();
pData->CbxHdl(m_pCbx3);
m_pQSet3->SetItemColor( 1, aPipetteColor );
+m_pQSet3->SetFormat();
}
else if( m_pQSet4->GetSelectItemId() == 1 )
{
m_pCbx4->Check();
pData->CbxHdl(m_pCbx4);
m_pQSet4->SetItemColor( 1, aPipetteColor );
+m_pQSet4->SetFormat();
}
m_pTbxPipette->CheckItem( m_pTbxPipette->GetItemId(0), false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2016-26-06_01:58:57 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loolwsd/loolwsd.xml.in
loolwsd/loolwsd.xml.in |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 08324536499528414a05015b44e620b37a45b60d Author: Ashod Nakashian Date: Sat Jun 25 08:19:54 2016 -0400 loolwsd: disable webdav in config and add defaulting comment Change-Id: Id79263c8a9190d294868249e61c747d1454cddf5 Reviewed-on: https://gerrit.libreoffice.org/2 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/loolwsd.xml.in b/loolwsd/loolwsd.xml.in index 96c80dc..0bd3383 100644 --- a/loolwsd/loolwsd.xml.in +++ b/loolwsd/loolwsd.xml.in @@ -1,6 +1,7 @@ + @@ -44,7 +45,7 @@ 0 -localhost +localhost ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp | 48 ++--
1 file changed, 46 insertions(+), 2 deletions(-)
New commits:
commit 7d4d7f47ac7f4fa0d9d18766b159f06d2f238d53
Author: Ashod Nakashian
Date: Sat Jun 25 08:20:56 2016 -0400
bccu#1909 - loolwsd command line options vs. config file and package
upgrades
Default config entries and values are now set before loading
the config file from disk. This ensures that an upgrade
to the server with new config entries will not break the
server when the XML is not upgrade, rather, the server
will fallback to the defaults when it fails to find the
entry in the XML.
This, of course, requires adding new entries to the
default entries every time config entries are changed.
Change-Id: Iac849dc41fc7410a3c9093b0d6e91d96182b86fd
Reviewed-on: https://gerrit.libreoffice.org/26667
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 490176a..6766b98 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -77,6 +77,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1185,6 +1186,18 @@ static std::string UnitTestLibrary;
unsigned int LOOLWSD::NumPreSpawnedChildren = 0;
+class AppConfigMap : public Poco::Util::MapConfiguration
+{
+public:
+AppConfigMap(const std::map& map)
+{
+for (const auto& pair : map)
+{
+setRaw(pair.first, pair.second);
+}
+}
+};
+
LOOLWSD::LOOLWSD()
{
}
@@ -1208,12 +1221,43 @@ void LOOLWSD::initialize(Application& self)
throw std::runtime_error("Failed to load wsd unit test library.");
}
+auto& conf = config();
+
+// Add default values of new entries here.
+static const std::map DefAppConfig = {
+{ "tile_cache_path", "/usr/local/var/cache/loolwsd" },
+{ "sys_template_path", "systemplate" },
+{ "lo_template_path", "/opt/collaboraoffice5.0" },
+{ "child_root_path", "jails" },
+{ "lo_jail_subpath", "lo" },
+{ "server_name", "" },
+{ "file_server_root_path", "../loleaflet/../" },
+{ "num_prespawn_children", "1" },
+{ "per_document.max_concurrency", "4" },
+{ "loleaflet_html", "loleaflet.html" },
+{ "logging.color", "true" },
+{ "logging.level", "trace" },
+{ "ssl.cert_file_path", "/etc/loolwsd/cert.pem" },
+{ "ssl.key_file_path", "/etc/loolwsd/key.pem" },
+{ "ssl.ca_file_path", "/etc/loolwsd/ca-chain.cert.pem" },
+{ "storage.filesystem[@allow]", "false" },
+{ "storage.wopi[@allow]", "true" },
+{ "storage.wopi.host[0][@allow]", "true" },
+{ "storage.wopi.host[0]", "localhost" },
+{ "storage.wopi.max_file_size", "0" },
+{ "storage.webdav[@allow]", "false" },
+};
+
+// Set default values, in case they are missing from the config file.
+AutoPtr pDefConfig(new AppConfigMap(DefAppConfig));
+conf.addWriteable(pDefConfig, PRIO_SYSTEM); // Lowest priority
+
// Load default configuration files, if present.
-if (loadConfiguration() == 0)
+if (loadConfiguration(PRIO_DEFAULT) == 0)
{
// Fallback to the default path.
const std::string configPath = LOOLWSD_CONFIGDIR "/loolwsd.xml";
-loadConfiguration(configPath);
+loadConfiguration(configPath, PRIO_DEFAULT);
}
// This overrides whatever is in the config file,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp
loolwsd/LOOLWSD.cpp | 20 ++--
loolwsd/LOOLWSD.hpp | 33 -
2 files changed, 50 insertions(+), 3 deletions(-)
New commits:
commit 8798943f08f9faa33468e9415e396ec77c779a6e
Author: Ashod Nakashian
Date: Sat Jun 25 12:31:22 2016 -0400
bccu#1909 - loolwsd command line options vs. config file and package
upgrades
Support overriding config settings via the command-line.
By using --o:name=value (or --override:name=value) the
setting called 'name' can be replaced by 'value'.
Ex. --o:per_document.max_concurrency=12
The above will override the max_concurrency to 12,
regardless of what the XML has set.
Change-Id: If7ffa5dcdc9ce2a8d1a89c8203b8ba870cb624ac
Reviewed-on: https://gerrit.libreoffice.org/26668
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 6766b98..8ce6303 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1260,6 +1260,10 @@ void LOOLWSD::initialize(Application& self)
loadConfiguration(configPath, PRIO_DEFAULT);
}
+// Override any settings passed on the command-line.
+AutoPtr pOverrideConfig(new AppConfigMap(_overrideSettings));
+conf.addWriteable(pOverrideConfig, PRIO_APPLICATION); // Highest priority
+
// This overrides whatever is in the config file,
// which forces admins to set this flag on the command-line.
config().setBool("storage.filesystem[@allow]", AllowLocalStorage);
@@ -1316,10 +1320,10 @@ void LOOLWSD::initialize(Application& self)
if (NumPreSpawnedChildren == 0)
{
// Default to 1 child.
-NumPreSpawnedChildren = config().getUInt("num_prespawn_children", 1);
+NumPreSpawnedChildren = getUIntConfigValue(conf,
"num_prespawn_children", 1);
}
-const auto maxConcurrency =
config().getInt("per_document.max_concurrency", 4);
+const auto maxConcurrency = getUIntConfigValue(conf,
"per_document.max_concurrency", 4);
if (maxConcurrency > 0)
{
setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);
@@ -1438,6 +1442,11 @@ void LOOLWSD::defineOptions(OptionSet& optionSet)
.required(false)
.repeatable(false));
+optionSet.addOption(Option("override", "o", "Override any setting by
providing fullxmlpath=value.")
+.required(false)
+.repeatable(true)
+.argument("xmlpath"));
+
#if ENABLE_DEBUG
optionSet.addOption(Option("unitlib", "", "Unit testing library path.")
.required(false)
@@ -1494,6 +1503,13 @@ void LOOLWSD::handleOption(const std::string& optionName,
NoCapsForKit = true;
else if (optionName == "careerspan")
careerSpanSeconds = std::stoi(value);
+else if (optionName == "override")
+{
+std::string optName;
+std::string optValue;
+LOOLProtocol::parseNameValuePair(value, optName, optValue);
+_overrideSettings[optName] = optValue;
+}
static const char* clientPort = getenv("LOOL_TEST_CLIENT_PORT");
if (clientPort)
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index 8de18e4..248b240 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -66,10 +66,37 @@ private:
void displayHelp();
Poco::Process::PID createForKit();
+static
+bool getSafeUIntConfig(Poco::Util::LayeredConfiguration& config, const
std::string& name, unsigned int& value)
+{
+try
+{
+value = config.getUInt(name);
+return true;
+}
+catch (Poco::SyntaxException)
+{
+}
+
+return false;
+}
+
+static
+unsigned int getUIntConfigValue(Poco::Util::LayeredConfiguration& config,
const std::string& name, const unsigned int def)
+{
+unsigned int value = def;
+if (getSafeUIntConfig(config, name, value) ||
+getSafeUIntConfig(config, name + "[@default]", value))
+{
+return value;
+}
+
+return def;
+}
+
/// Reads and processes path entries with the given property
/// from the configuration.
/// Converts relative paths to absolute.
-//TODO: Move to a better namespace.
std::string getPathFromConfig(const std::string& property) const
{
auto path = config().getString(property);
@@ -88,6 +115,10 @@ private:
return path;
}
+
+private:
+/// Settings passed from the command-line to override those in the config
file.
+std::map _overrideSettings;
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp loolwsd/loolwsd.xml.in
loolwsd/LOOLWSD.cpp| 97 -
loolwsd/LOOLWSD.hpp|3 +
loolwsd/loolwsd.xml.in |2 -
3 files changed, 11 insertions(+), 91 deletions(-)
New commits:
commit 6501a21114a9d9f258d96d500ae48af5df29d7ec
Author: Ashod Nakashian
Date: Sat Jun 25 18:03:41 2016 -0400
bccu#1909 - loolwsd command line options vs. config file and package
upgrades
Remove command-line arguments in favor of the config file.
Settings can be overridden using the command-line flag
--override (or --o) followed by the full XML path=value.
Change-Id: I902a145f4d2bd0256e31a3e70b0382c0261aecc8
Reviewed-on: https://gerrit.libreoffice.org/26669
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8ce6303..c48e514 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1282,46 +1282,14 @@ void LOOLWSD::initialize(Application& self)
// Allow UT to manipulate before using configuration values.
UnitWSD::get().configure(config());
-if (Cache.empty())
-{
-Cache = getPathFromConfig("tile_cache_path");
-}
-
-if (SysTemplate.empty())
-{
-SysTemplate = getPathFromConfig("sys_template_path");
-}
-
-if (LoTemplate.empty())
-{
-LoTemplate = getPathFromConfig("lo_template_path");
-}
-
-if (ChildRoot.empty())
-{
-ChildRoot = getPathFromConfig("child_root_path");
-}
-
-if (LoSubPath.empty())
-{
-LoSubPath = getPathFromConfig("lo_jail_subpath");
-}
-
-if (ServerName.empty())
-{
-ServerName = config().getString("server_name");
-}
-
-if (FileServerRoot.empty())
-{
-FileServerRoot = getPathFromConfig("file_server_root_path");
-}
-
-if (NumPreSpawnedChildren == 0)
-{
-// Default to 1 child.
-NumPreSpawnedChildren = getUIntConfigValue(conf,
"num_prespawn_children", 1);
-}
+Cache = getPathFromConfig("tile_cache_path");
+SysTemplate = getPathFromConfig("sys_template_path");
+LoTemplate = getPathFromConfig("lo_template_path");
+ChildRoot = getPathFromConfig("child_root_path");
+LoSubPath = getPathFromConfig("lo_jail_subpath");
+ServerName = config().getString("server_name");
+FileServerRoot = getPathFromConfig("file_server_root_path");
+NumPreSpawnedChildren = getUIntConfigValue(conf, "num_prespawn_children",
1);
const auto maxConcurrency = getUIntConfigValue(conf,
"per_document.max_concurrency", 4);
if (maxConcurrency > 0)
@@ -1398,41 +1366,6 @@ void LOOLWSD::defineOptions(OptionSet& optionSet)
.repeatable(false)
.argument("port number"));
-optionSet.addOption(Option("cache", "", "Path to a directory where to keep
the tile cache (default: " + std::string(LOOLWSD_CACHEDIR) + ").")
-.required(false)
-.repeatable(false)
-.argument("directory"));
-
-optionSet.addOption(Option("systemplate", "", "Path to a template tree
with shared libraries etc to be used as source for chroot jails for child
processes.")
-.required(false)
-.repeatable(false)
-.argument("directory"));
-
-optionSet.addOption(Option("lotemplate", "", "Path to a LibreOffice
installation tree to be copied (linked) into the jails for child processes.
Should be on the same file system as systemplate.")
-.required(false)
-.repeatable(false)
-.argument("directory"));
-
-optionSet.addOption(Option("childroot", "", "Path to the directory under
which the chroot jails for the child processes will be created. Should be on
the same file system as systemplate and lotemplate.")
-.required(false)
-.repeatable(false)
-.argument("directory"));
-
-optionSet.addOption(Option("losubpath", "", "Relative path where the
LibreOffice installation will be copied inside a jail (default: '" + LoSubPath
+ "').")
-.required(false)
-.repeatable(false)
-.argument("relative path"));
-
-optionSet.addOption(Option("fileserverroot", "", "Path to the directory
that should be considered root for the file server (default: '../loleaflet/').")
-.required(false)
-.repeatable(false)
-.argument("directory"));
-
-optionSet.addOption(Option("numprespawns", "", "Number of child processes
to keep started in advance and waiting for new clients.")
-.required(false)
-.repeatable(false)
-.argument("number"));
-
optionSet.addOption(Option("admincreds", "", "Admin 'us
[Libreoffice-commits] online.git: loolwsd/FileServer.hpp loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp loolwsd/loolwsd.xml.in loolwsd/Makefile.am
loolwsd/FileServer.hpp |4 ++--
loolwsd/LOOLWSD.cpp| 41 +
loolwsd/LOOLWSD.hpp|2 --
loolwsd/Makefile.am|5 +++--
loolwsd/loolwsd.xml.in |6 ++
5 files changed, 16 insertions(+), 42 deletions(-)
New commits:
commit d281813c06eef8ac00a57ff7de70013619a4f1a1
Author: Ashod Nakashian
Date: Sat Jun 25 20:10:48 2016 -0400
bccu#1909 - loolwsd command line options vs. config file and package
upgrades
Removed admin-console creds and allow-local-storage.
Change-Id: If281b6320caee5d28007063591325eb98ba8e01b
Reviewed-on: https://gerrit.libreoffice.org/26670
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/FileServer.hpp b/loolwsd/FileServer.hpp
index 2d23a74..7c19e10 100644
--- a/loolwsd/FileServer.hpp
+++ b/loolwsd/FileServer.hpp
@@ -82,8 +82,8 @@ public:
Log::info("Invalid JWT token, let the administrator re-login");
}
-const auto user = config.getString("admin_console_username", "");
-const auto pass = config.getString("admin_console_password", "");
+const auto user = config.getString("admin_console.username", "");
+const auto pass = config.getString("admin_console.password", "");
if (user.empty() || pass.empty())
{
Log::error("Admin Console credentials missing. Denying access
until set.");
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index c48e514..8e87bde 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -854,6 +854,10 @@ public:
}
}
}
+else
+{
+Log::error("Unknown resource: " + request.getURI());
+}
}
catch (const Exception& exc)
{
@@ -1173,9 +1177,7 @@ std::string LOOLWSD::ChildRoot;
std::string LOOLWSD::LoSubPath = "lo";
std::string LOOLWSD::ServerName;
std::string LOOLWSD::FileServerRoot;
-std::string LOOLWSD::AdminCreds;
std::string LOOLWSD::LOKitVersion;
-bool LOOLWSD::AllowLocalStorage = false;
bool LOOLWSD::SSLEnabled =
#if ENABLE_SSL
true;
@@ -1264,21 +1266,6 @@ void LOOLWSD::initialize(Application& self)
AutoPtr pOverrideConfig(new AppConfigMap(_overrideSettings));
conf.addWriteable(pOverrideConfig, PRIO_APPLICATION); // Highest priority
-// This overrides whatever is in the config file,
-// which forces admins to set this flag on the command-line.
-config().setBool("storage.filesystem[@allow]", AllowLocalStorage);
-
-if (!AdminCreds.empty())
-{
-// Set the Admin Console credentials, if provided.
-StringTokenizer tokens(AdminCreds, "/",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
-if (tokens.count() == 2)
-{
-config().setString("admin_console_username", tokens[0]);
-config().setString("admin_console_password", tokens[1]);
-}
-}
-
// Allow UT to manipulate before using configuration values.
UnitWSD::get().configure(config());
@@ -1366,15 +1353,6 @@ void LOOLWSD::defineOptions(OptionSet& optionSet)
.repeatable(false)
.argument("port number"));
-optionSet.addOption(Option("admincreds", "", "Admin 'username/password'
used to access the admin console.")
-.required(false)
-.repeatable(false)
-.argument("credentials"));
-
-optionSet.addOption(Option("allowlocalstorage", "", "When true will allow
highly insecure loading of files from local storage.")
-.required(false)
-.repeatable(false));
-
optionSet.addOption(Option("override", "o", "Override any setting by
providing fullxmlpath=value.")
.required(false)
.repeatable(true)
@@ -1411,10 +1389,6 @@ void LOOLWSD::handleOption(const std::string& optionName,
DisplayVersion = true;
else if (optionName == "port")
ClientPortNumber = std::stoi(value);
-else if (optionName == "admincreds")
-AdminCreds = value;
-else if (optionName == "allowlocalstorage")
-AllowLocalStorage = true;
#if ENABLE_DEBUG
else if (optionName == "unitlib")
UnitTestLibrary = value;
@@ -1522,18 +1496,13 @@ int LOOLWSD::main(const std::vector&
/*args*/)
ChildRoot += '/';
if (FileServerRoot.empty())
-FileServerRoot =
Path(Application::instance().commandPath()).parent().parent().toString();
+FileServerRoot =
Poco::Path(Application::instance().commandPath()).parent().parent().toString();
FileServerRoot = Poco::Path(FileServerRoot).absolute().toString();
Log::debug("FileServerRoot: " + FileServerRoot);
if (ClientPortNumber == MasterPortNumber)
throw IncompatibleOptionsException("port");
-if (AdminCreds.empty())
-{
-
[Libreoffice-commits] core.git: 5 commits - uitest/calc_tests uitest/connection.py uitest/demo_ui uitest/helper.py uitest/impress_tests uitest/libreoffice uitest/main.py uitest/test_main.py uitest/uih
uitest/UITestCase.py| 36
uitest/calc_tests/about_test.py |2
uitest/calc_tests/create_chart.py |2
uitest/calc_tests/create_range_name.py |2
uitest/calc_tests/function_wizard.py|2
uitest/calc_tests/gridwin.py|2
uitest/calc_tests/gridwindow.py |4
uitest/connection.py| 139
uitest/demo_ui/char_dialog.py |8 -
uitest/demo_ui/checkbox.py |2
uitest/demo_ui/combobox.py |2
uitest/demo_ui/edit.py |2
uitest/demo_ui/gridwin.py |2
uitest/demo_ui/listbox.py |2
uitest/demo_ui/radiobutton.py |2
uitest/demo_ui/spinfield.py |2
uitest/demo_ui/tabcontrol.py|4
uitest/demo_ui/tabdialog.py |2
uitest/demo_ui/treelist.py |4
uitest/helper.py| 38
uitest/impress_tests/start.py |2
uitest/libreoffice/connection.py| 139
uitest/libreoffice/uno/eventlistener.py | 50 +++
uitest/main.py | 75 -
uitest/test_main.py | 13 ++
uitest/uihelper/calc.py | 15 ---
uitest/uitest/config.py | 10 ++
uitest/uitest/debug.py | 16 +++
uitest/uitest/framework.py | 36
uitest/uitest/uihelper/calc.py | 15 +++
uitest/uitest_helper.py |2
uitest/writer_tests/start.py|2
32 files changed, 301 insertions(+), 333 deletions(-)
New commits:
commit 6402c19c9b4d51dd7feaa3129b6f15b20704d356
Author: Markus Mohrhard
Date: Sun Jun 26 03:26:22 2016 +0200
uitest: move the EventListener to an own file in the new dir structure
Change-Id: I8d6c2d9f2a9386d8eec64780b7d197c9675764aa
diff --git a/uitest/helper.py b/uitest/helper.py
index b993041..9b24bee 100644
--- a/uitest/helper.py
+++ b/uitest/helper.py
@@ -18,44 +18,6 @@ except ImportError:
print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
raise
-try:
-from com.sun.star.document import XDocumentEventListener
-except ImportError:
-print("UNO API class not found: try to set URE_BOOTSTRAP variable")
-print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
-raise
-
-class EventListener(XDocumentEventListener,unohelper.Base):
-
-def __init__(self, xContext, eventNames):
-self.xGEB = xContext.ServiceManager.createInstanceWithContext(
-"com.sun.star.frame.GlobalEventBroadcaster", xContext)
-self.xContext = xContext
-self.executed = False
-self.eventExecuted = []
-if isinstance(eventNames, str):
-self.eventNames = [eventNames]
-elif isinstance(eventNames, list):
-self.eventNames = eventNames
-
-def __enter__(self):
-self.xGEB.addDocumentEventListener(self)
-return self
-
-def __exit__(self, type, value, traceback):
-self.xGEB.removeDocumentEventListener(self)
-
-def documentEventOccured(self, event):
-if event.EventName in self.eventNames:
-self.executed = True
-self.eventExecuted.append(event.EventName)
-
-def hasExecuted(self, eventName):
-return eventName in self.eventExecuted
-
-def disposing(event):
-pass
-
def mkPropertyValue(name, value):
""" Create a UNO ProertyValue from two input values.
"""
diff --git a/uitest/libreoffice/uno/eventlistener.py
b/uitest/libreoffice/uno/eventlistener.py
new file mode 100644
index 000..63eb0e6
--- /dev/null
+++ b/uitest/libreoffice/uno/eventlistener.py
@@ -0,0 +1,50 @@
+# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+try:
+import pyuno
+import uno
+import unohelper
+from com.sun.star.document import XDocumentEventListener
+except ImportError:
+print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
+print("PYTHONPATH=/installation/opt/program")
+print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
+raise
+
+class EventListener(XDocumentEventListener,unohelper.Base):
+
+def __init__(self, xContext, eventNames):
+self.xGEB = xContext.ServiceManager.createInstanceWithContext(
+"com.sun.star.frame.GlobalEventBroadcaster", xContext)
+self.xContext = xContext
+self.executed = False
+self.eventExecuted = []
+if isinstance(eventNames, str):
+self.eventNames = [eventNames]
+elif isinstance(eve
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwptools.cxx |2 +-
lotuswordpro/source/filter/lwptools.hxx | 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit feb6a07259c57ab00118f197ef2b3e1d5575c48e
Author: Jochen Nitschke
Date: Wed Jun 15 18:40:38 2016 +0200
lwp: pass numbers by value
and add const to LtTm refenrence
Change-Id: I3515db0fa1b79ce73592de6cba0ec79c39a9e9f4
Reviewed-on: https://gerrit.libreoffice.org/26315
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/lotuswordpro/source/filter/lwptools.cxx
b/lotuswordpro/source/filter/lwptools.cxx
index cf04d1d..045768b 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -224,7 +224,7 @@ OUString LwpTools::convertToFileUrl(const OString &fileName)
return uUrlFileName;
}
-OUString LwpTools::DateTimeToOUString(LtTm & dt)
+OUString LwpTools::DateTimeToOUString(const LtTm &dt)
{
OUString aResult = OUString::number(dt.tm_year) + "-" +
OUString::number(dt.tm_mon) + "-" + OUString::number(dt.tm_mday) +
"T" + OUString::number(dt.tm_hour) + ":" + OUString::number(dt.tm_min)
+ ":" + OUString::number(dt.tm_sec);
diff --git a/lotuswordpro/source/filter/lwptools.hxx
b/lotuswordpro/source/filter/lwptools.hxx
index 9e2e72d..457b2ac 100644
--- a/lotuswordpro/source/filter/lwptools.hxx
+++ b/lotuswordpro/source/filter/lwptools.hxx
@@ -91,15 +91,15 @@ public:
static bool IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len);
inline static double ConvertFromUnits(sal_Int32 nUnits);
-inline static double ConvertToMetric(const double& fInch);
+inline static double ConvertToMetric(double fInch);
inline static double ConvertFromUnitsToMetric(sal_Int32 nUnits);
-inline static bool IsOddNumber(sal_uInt16& nNumber);
-inline static bool IsEvenNumber(sal_uInt16& nNumber);
+inline static bool IsOddNumber(sal_uInt16 nNumber);
+inline static bool IsEvenNumber(sal_uInt16 nNumber);
static bool isFileUrl(const OString& fileName);
static OUString convertToFileUrl(const OString& fileName);
-static OUStringDateTimeToOUString(LtTm& dt);
+static OUStringDateTimeToOUString(const LtTm& dt);
static XFDateStyle* GetSystemDateStyle(bool bLongFormat);
static XFTimeStyle* GetSystemTimeStyle();
@@ -109,7 +109,7 @@ inline double LwpTools::ConvertFromUnits(sal_Int32 nUnits)
{
return (double)nUnits/UNITS_PER_INCH;
}
-inline double LwpTools::ConvertToMetric(const double& fInch)
+inline double LwpTools::ConvertToMetric(double fInch)
{
return fInch*CM_PER_INCH;
}
@@ -118,11 +118,11 @@ inline double
LwpTools::ConvertFromUnitsToMetric(sal_Int32 nUnits)
double fInch = ConvertFromUnits(nUnits);
return ConvertToMetric(fInch);
}
-inline bool LwpTools::IsOddNumber(sal_uInt16& nNumber)
+inline bool LwpTools::IsOddNumber(sal_uInt16 nNumber)
{
return (nNumber%2) != 0;
}
-inline bool LwpTools::IsEvenNumber(sal_uInt16& nNumber)
+inline bool LwpTools::IsEvenNumber(sal_uInt16 nNumber)
{
return (nNumber%2) == 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
