[Libreoffice-commits] core.git: compilerplugins/clang editeng/qa libreofficekit/qa lingucomponent/source solenv/CompilerTest_compilerplugins_clang.mk tools/source xmlscript/source xmlsecurity/qa xmlse

[Noel Grandin]

 compilerplugins/clang/oncevar.cxx  |6 +-
 compilerplugins/clang/test/oncevar.cxx |   12 ++--
 editeng/qa/unit/core-test.cxx  |2 +-
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx|3 +--
 lingucomponent/source/languageguessing/guesslang.cxx   |3 +--
 solenv/CompilerTest_compilerplugins_clang.mk   |1 +
 tools/source/stream/stream.cxx |3 +--
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |3 +--
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx  |3 +--
 xmlsecurity/qa/unit/signing/signing.cxx|3 +--
 xmlsecurity/source/component/documentdigitalsignatures.cxx |9 +++--
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |   12 
 xmlsecurity/source/helper/documentsignaturemanager.cxx |5 ++---
 xmlsecurity/source/helper/xmlsignaturehelper.cxx   |9 +++--
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx   |3 +--
 15 files changed, 32 insertions(+), 45 deletions(-)

New commits:
commit 71112060e0930fc58087c3762e836b1e12b60f75
Author: Noel Grandin 
Date:   Tue Jun 13 10:27:38 2017 +0200

loplugin:oncevar various

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

diff --git a/compilerplugins/clang/oncevar.cxx 
b/compilerplugins/clang/oncevar.cxx
index 9d03512012c1..1fa6cd53acf0 100644
--- a/compilerplugins/clang/oncevar.cxx
+++ b/compilerplugins/clang/oncevar.cxx
@@ -63,6 +63,10 @@ public:
 // TODO taking local reference to variable
 if (fn == SRCDIR "/sc/source/filter/excel/xechart.cxx")
  return;
+// macros managing to generate to a valid warning
+if (fn == SRCDIR "/solenv/bin/concat-deps.c")
+ return;
+
 TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
 for (auto const & varDecl : maVarDeclSet)
@@ -272,7 +276,7 @@ bool OnceVar::VisitDeclRefExpr( const DeclRefExpr* 
declRefExpr )
 return true;
 }
 
-loplugin::Plugin::Registration< OnceVar > X("oncevar", false);
+loplugin::Plugin::Registration< OnceVar > X("oncevar", true);
 
 }
 
diff --git a/compilerplugins/clang/test/oncevar.cxx 
b/compilerplugins/clang/test/oncevar.cxx
index 214293f185e5..32ff42d4479d 100644
--- a/compilerplugins/clang/test/oncevar.cxx
+++ b/compilerplugins/clang/test/oncevar.cxx
@@ -11,12 +11,12 @@
 
 /*int foo() { return 1; }*/
 
-void call_value(int);   // expected-error {{extern prototype 
in main file without definition [loplugin:externandnotdefined]}}
-void call_const_ref(int const &);   // expected-error {{extern prototype 
in main file without definition [loplugin:externandnotdefined]}}
-void call_ref(int &);   // expected-error {{extern prototype 
in main file without definition [loplugin:externandnotdefined]}}
-void call_value(OUString);  // expected-error {{extern prototype 
in main file without definition [loplugin:externandnotdefined]}}
-void call_const_ref(OUString const &);  // expected-error {{extern prototype 
in main file without definition [loplugin:externandnotdefined]}}
-void call_ref(OUString &);  // expected-error {{extern prototype 
in main file without definition [loplugin:externandnotdefined]}}
+void call_value(int);
+void call_const_ref(int const &);
+void call_ref(int &);
+void call_value(OUString);
+void call_const_ref(OUString const &);
+void call_ref(OUString &);
 
 int main() {
 /* TODO
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 0ae12f9bcd70..637342ddf13a 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -402,7 +402,7 @@ void Test::testAutocorrect()
 // consider field contents as text for auto quotes
 {
 OUString sInput("T\x01");
-sal_Unicode cNextChar('"');
+sal_Unicode const cNextChar('"');
 const sal_Unicode EXPECTED[] = { 'T', 0x01, 0x0201d };
 OUString sExpected(EXPECTED, SAL_N_ELEMENTS(EXPECTED));
 
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 88b5ec5d8016..3d9301b7549f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -1843,9 +1843,8 @@ static void openDocumentCallback (GObject* source_object, 
GAsyncResult* res, gpo
 
 if (!lok_doc_view_open_document_finish(pDocView, res, &error))
 {
-GtkDialogFlags eFlags = GTK_DIALOG_DESTROY_WITH_PARENT;
 GtkWidget* pDialog = 
gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView))),
-eFlags,
+
GTK_DIAL

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

[Mohammed Abdul Azeem]

 include/sax/fastattribs.hxx  |   17 +++--
 sc/source/filter/xml/xmlbodyi.cxx|7 +++
 sc/source/filter/xml/xmlcelli.cxx|7 +++
 sc/source/filter/xml/xmlexternaltabi.cxx |6 +++---
 sc/source/filter/xml/xmlrowi.cxx |7 +++
 sc/source/filter/xml/xmltabi.cxx |7 +++
 xmloff/source/core/xmlictxt.cxx  |   14 +-
 7 files changed, 31 insertions(+), 34 deletions(-)

New commits:
commit d6da9e495d7ca32de6cda1a94cb4c8cd26b240cc
Author: Mohammed Abdul Azeem 
Date:   Wed Jun 28 21:45:39 2017 +0530

Using range-for instead of iterator loop:

It's much easier to write and looks cleaner. And
this doesn't affect performance, I think.

Change-Id: Ia946b068979b9cef04ac2479c9179a70b6775dea
Reviewed-on: https://gerrit.libreoffice.org/39370
Tested-by: Jenkins 
Reviewed-by: Mohammed Abdul Azeem 

diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 958899015372..70ddc4c8bb85 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -123,22 +123,27 @@ public:
 return mnIdx != rhs.mnIdx;
 }
 
-sal_Int32 getToken()
+const FastAttributeIter& operator*() const
+{
+return *this;
+}
+
+sal_Int32 getToken() const
 {
 assert(mnIdx < mrList.maAttributeTokens.size());
 return mrList.maAttributeTokens[mnIdx];
 }
-bool isEmpty()
+bool isEmpty() const
 {
 assert(mnIdx < mrList.maAttributeTokens.size());
 return mrList.AttributeValueLength(mnIdx) < 1;
 }
-sal_Int32 toInt32()
+sal_Int32 toInt32() const
 {
 assert(mnIdx < mrList.maAttributeTokens.size());
 return rtl_str_toInt32(mrList.getFastAttributeValue(mnIdx), 10);
 }
-OUString toString()
+OUString toString() const
 {
 assert(mnIdx < mrList.maAttributeTokens.size());
 return OUString(mrList.getFastAttributeValue(mnIdx),
@@ -146,12 +151,12 @@ public:
 RTL_TEXTENCODING_UTF8);
 }
 
-const char* toCString()
+const char* toCString() const
 {
 assert(mnIdx < mrList.maAttributeTokens.size());
 return mrList.getFastAttributeValue(mnIdx);
 }
-bool isString(const char *str)
+bool isString(const char *str) const
 {
 assert(mnIdx < mrList.maAttributeTokens.size());
 return !strcmp(str, mrList.getFastAttributeValue(mnIdx));
diff --git a/sc/source/filter/xml/xmlbodyi.cxx 
b/sc/source/filter/xml/xmlbodyi.cxx
index 2a21d52899f9..4aec839b76e7 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -92,11 +92,10 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
 if( !xAttrList.is() )
 return;
 
-sax_fastparser::FastAttributeList *pAttribList;
-assert( dynamic_cast< sax_fastparser::FastAttributeList *>( 
xAttrList.get() ) != nullptr );
-pAttribList = static_cast< sax_fastparser::FastAttributeList *>( 
xAttrList.get() );
+sax_fastparser::FastAttributeList *pAttribList =
+static_cast< sax_fastparser::FastAttributeList *>( xAttrList.get() );
 
-for ( auto it = pAttribList->begin(); it != pAttribList->end(); ++it)
+for( auto &it : *pAttribList )
 {
 sal_Int32 nToken = it.getToken();
 if( NAMESPACE_TOKEN( XML_NAMESPACE_TABLE ) == ( nToken & NMSP_MASK ) )
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 0de5664fcba2..d7e9f3107b75 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -159,11 +159,10 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( 
ScXMLImport& rImport,
 std::unique_ptr xCurrencySymbol;
 if( xAttrList.is() )
 {
-sax_fastparser::FastAttributeList *pAttribList;
-assert( dynamic_cast< sax_fastparser::FastAttributeList *>( 
xAttrList.get() ) != nullptr );
-pAttribList = static_cast< sax_fastparser::FastAttributeList *>( 
xAttrList.get() );
+sax_fastparser::FastAttributeList *pAttribList =
+static_cast< sax_fastparser::FastAttributeList *>( xAttrList.get() 
);
 
-for ( auto it = pAttribList->begin(); it != pAttribList->end(); ++it)
+for( auto &it : *pAttribList )
 {
 switch ( it.getToken() )
 {
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx 
b/sc/source/filter/xml/xmlexternaltabi.cxx
index e8c0ef5db247..e6edaa66461b 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -54,7 +54,7 @@ 
ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext(
 {
 sax_fastparser::FastAttributeList *pAttribList = static_cast< 
sax_fastparser::FastAttributeList *>( xAt

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

[Justin Luth]

 writerfilter/source/dmapper/StyleSheetTable.cxx |   34 +++-
 1 file changed, 22 insertions(+), 12 deletions(-)

New commits:
commit 803a17533f25d9174c6a19aa913a6713980c193d
Author: Justin Luth 
Date:   Thu Jun 22 17:53:00 2017 -0400

revert related tdf#82173 writerfilter: ignore case when mapping styles

and added the missing lowercase "footnote reference" mapping.

Word can create both Heading1 and heading1 styles in the same
document. So case CAN be important.

Unfortunately, these mappings precede git history, so it will require
trial and error to judge which mappings are obsolete or simply invalid.
At least one of the existing mappings was not really correct anyway
(Endnote Text"->"Endnote Symbol") so reverting the change
to prevent other unanticipated regressions.

Change-Id: Ia8669c975debcb3074e758b42c24fb65233f8369
Reviewed-on: https://gerrit.libreoffice.org/39132
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 699f605a52a6..27e0ade07925 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -46,22 +46,11 @@
 
 using namespace ::com::sun::star;
 
-namespace {
-
-/** Functor for case-insensitive string comparison, usable in maps etc. */
-struct IgnoreCaseCompare
-{
-bool operator()( const OUString& rName1, const OUString& rName2 ) const
-{ return rName1.compareToIgnoreAsciiCase( rName2 ) < 0; }
-};
-
-} // namespace
-
 namespace writerfilter {
 namespace dmapper
 {
 
-typedef ::std::map< OUString, OUString, IgnoreCaseCompare> StringPairMap_t;
+typedef ::std::map< OUString, OUString> StringPairMap_t;
 
 
 StyleSheetEntry::StyleSheetEntry() :
@@ -1302,6 +1291,15 @@ const StyleSheetEntryPtr 
StyleSheetTable::FindParentStyleSheet(const OUString& _
 static const sal_Char* const aStyleNamePairs[] =
 {
 "Normal", "Standard",
+"heading 1",  "Heading 1",
+"heading 2",  "Heading 2",
+"heading 3",  "Heading 3",
+"heading 4",  "Heading 4",
+"heading 5",  "Heading 5",
+"heading 6",  "Heading 6",
+"heading 7",  "Heading 7",
+"heading 8",  "Heading 8",
+"heading 9",  "Heading 9",
 "Heading1",   "Heading 1",
 "Heading2",   "Heading 2",
 "Heading3",   "Heading 3",
@@ -1339,6 +1337,15 @@ static const sal_Char* const aStyleNamePairs[] =
 "TOC 8", "Contents 8",
 "TOC 9", "Contents 9",
 "TOCHeading","Contents Heading",
+"toc 1", "Contents 1",
+"toc 2", "Contents 2",
+"toc 3", "Contents 3",
+"toc 4", "Contents 4",
+"toc 5", "Contents 5",
+"toc 6", "Contents 6",
+"toc 7", "Contents 7",
+"toc 8", "Contents 8",
+"toc 9", "Contents 9",
 "TOC1", "Contents 1",
 "TOC2", "Contents 2",
 "TOC3", "Contents 3",
@@ -1352,12 +1359,15 @@ static const sal_Char* const aStyleNamePairs[] =
 "Footnote Text", "Footnote",
 "Annotation Text",   "",
 "Header","Header",
+"header","Header",
 "Footer","Footer",
+"footer","Footer",
 "Index Heading", "Index Heading",
 "Caption",   "",
 "Table of Figures",  "",
 "Envelope Address",  "Addressee",
 "Envelope Return",   "Sender",
+"footnote reference","Footnote Characters",
 "Footnote Reference","Footnote Characters",
 "Annotation Reference",  "",
 "Line Number",   "Line numbering",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/inc/conditio.hxx|1 -
 sc/source/core/data/colorscale.cxx |   26 +-
 2 files changed, 1 insertion(+), 26 deletions(-)

New commits:
commit 068755d9313b61a1e4691c27eea122116d3623df
Author: Markus Mohrhard 
Date:   Tue Jun 27 19:29:02 2017 +0200

no need to manually keep track of listener range

Change-Id: I833a2336f0c0ce8cc61eab4c56e1ffac3e36ae62
Reviewed-on: https://gerrit.libreoffice.org/39319
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 631d0449cc13..8dff0355a648 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -89,7 +89,6 @@ enum ScConditionMode
 class ScFormulaListener : public SvtListener
 {
 private:
-std::vector maCells;
 mutable bool mbDirty;
 ScDocument* mpDoc;
 std::function maCallbackFunction;
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 4bc29e669006..5b2a942e8ca9 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -52,8 +52,6 @@ void ScFormulaListener::startListening(ScTokenArray* pArr, 
const ScRange& rRange
 ScRange aRange(aCell, aCell2);
 if (aRange.IsValid())
 mpDoc->StartListeningArea(aRange, false, this);
-
-maCells.push_back(aRange);
 }
 break;
 case formula::svDoubleRef:
@@ -81,7 +79,6 @@ void ScFormulaListener::startListening(ScTokenArray* pArr, 
const ScRange& rRange
 }
 }
 mpDoc->StartListeningArea(aRange1, false, this);
-maCells.push_back(aRange1);
 }
 }
 break;
@@ -101,33 +98,12 @@ void ScFormulaListener::setCallback(const 
std::function& aCallback)
 maCallbackFunction = aCallback;
 }
 
-namespace {
-
-struct StopListeningCell
-{
-StopListeningCell(ScDocument* pDoc, SvtListener* pListener):
-mpDoc(pDoc), mpListener(pListener) {}
-
-// TODO: moggi: use EndListeningArea
-void operator()(const ScRange& rRange)
-{
-mpDoc->EndListeningArea(rRange, false, mpListener);
-}
-
-private:
-ScDocument* mpDoc;
-SvtListener* mpListener;
-};
-
-}
-
 void ScFormulaListener::stopListening()
 {
 if (mpDoc->IsClipOrUndo())
 return;
 
-std::for_each(maCells.begin(), maCells.end(), StopListeningCell(mpDoc, 
this));
-maCells.clear();
+this->EndListeningAll();
 }
 
 ScFormulaListener::~ScFormulaListener()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 80731 - Incorrect syntax does compile, MID without end bracket

[Kaganski Mike]

On 6/28/2017 2:03 PM, Stephan Bergmann wrote:
> On 06/28/2017 12:12 PM, Pierre Lepage wrote:
>> The solution brings a lot of hassle for customers of the LibreOffice 
>> suite whose work relies on the performance of StarBasic macros written 
>> by third parties. Macros containing code in error by the absence of a 
>> closing parenthesis suddenly cease to function. For this reason, the 
>> patch has not been released. Here I want to explore a transitional 
>> solution by getting your feedback first. This is to include in 
>> StarBasic options dialog accessible to the client a "StarBasic Pragma 
>> Strict" option (checkbox) by which the client consciously activates 
>> the solution (the patch that has not been published!). This check box 
>> would be available for a few years with a warning to prompt 
>> programmers and customers to require their programmer to correct their 
>> default code on the closing parenthesis.
> 
> Another option might be to have some form of such a pragma in individual 
> BASIC source files, instead of as an IDE option.  (And have the pragma 
> enabled in the "REM * BASIC ** Sub Main ... End Sub" boilerplate 
> that is automatically present in a fresh source file.)  That way, users 
> could enable it for their own, new code, while (implicitly) keeping it 
> off for non-conforming old, 3rd-party code.

I'd suggest also a special handling of "Compile" IDE command. It should 
always use strict parsing method. As it is a developer's tool, used when 
something is created anew, it would help all developers catch the 
problem early even when they don't know the strict option (wherever it be).

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: android/Bootstrap

[Ximeng Zu]

 android/Bootstrap/src/org/libreoffice/kit/Document.java |   21 
 1 file changed, 21 insertions(+)

New commits:
commit c746468607d020be10366f2ad2df6dddf947c656
Author: Ximeng Zu 
Date:   Wed Jun 28 15:52:10 2017 -0500

Add LOKit Enums to Document.java

Added LOKit callback enums to Document.java.

Change-Id: I46b7b5fe0ceb40a89fd121082706acdf539ff916
Reviewed-on: https://gerrit.libreoffice.org/39375
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index cd8297c21978..de92cd731eae 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -54,6 +54,8 @@ public class Document {
 
 /**
  * Callback message types
+ * Refer to 
http://opengrok.libreoffice.org/xref/core/include/LibreOfficeKit/LibreOfficeKitEnums.h
+ * for more details about each callback.
  */
 public static final int CALLBACK_INVALIDATE_TILES = 0;
 public static final int CALLBACK_INVALIDATE_VISIBLE_CURSOR = 1;
@@ -71,6 +73,25 @@ public class Document {
 public static final int CALLBACK_DOCUMENT_SIZE_CHANGED = 13;
 public static final int CALLBACK_SET_PART = 14;
 public static final int CALLBACK_SEARCH_RESULT_SELECTION = 15;
+public static final int LOK_CALLBACK_UNO_COMMAND_RESULT = 16;
+public static final int LOK_CALLBACK_CELL_CURSOR = 17;
+public static final int LOK_CALLBACK_MOUSE_POINTER = 18;
+public static final int LOK_CALLBACK_CELL_FORMULA = 19;
+public static final int LOK_CALLBACK_DOCUMENT_PASSWORD = 20;
+public static final int LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY = 21;
+public static final int LOK_CALLBACK_ERROR = 22;
+public static final int LOK_CALLBACK_CONTEXT_MENU = 23;
+public static final int LOK_CALLBACK_INVALIDATE_VIEW_CURSOR = 24;
+public static final int LOK_CALLBACK_TEXT_VIEW_SELECTION = 25;
+public static final int LOK_CALLBACK_CELL_VIEW_CURSOR = 26;
+public static final int LOK_CALLBACK_GRAPHIC_VIEW_SELECTION = 27;
+public static final int LOK_CALLBACK_VIEW_CURSOR_VISIBLE = 28;
+public static final int LOK_CALLBACK_VIEW_LOCK = 29;
+public static final int LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED = 30;
+public static final int LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED = 31;
+public static final int LOK_CALLBACK_COMMENT = 32;
+public static final int LOK_CALLBACK_INVALIDATE_HEADER = 33;
+public static final int LOK_CALLBACK_CELL_ADDRESS = 34;
 
 /**
  * Set text selection types
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Weekly update - Solving MABs for Android Viewer - Ximeng Zu

[Ximeng Zu]

Hello everyone,

 

I spent my last week experimenting with Calc headers. Since a fetch-headers
call would double the page size, I looked into working around this "bug". It
turned out to be too much overhead in coding as well as app performance.
There was also this offset between main view and header views. We managed to
solve it by fixing the zoom to 1x in Calc document. The patch is pushed onto
gerrit now. Next step is to add more controls to Calc UI as in LOOL.

 

Ximeng Zu

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-18'

[Christian Lohmaier]

Tag 'cp-5.3-18' created by Andras Timar  at 
2017-06-28 20:40 +

cp-5.3-18

Changes since cp-5.3-10:
Christian Lohmaier (1):
  update translations for 5.3.3 rc2

---
 source/am/cui/source/options.po|8 
 source/am/cui/source/tabpages.po   |8 
 source/am/cui/uiconfig/ui.po   |8 
 source/am/fpicker/source/office.po |   10 
 source/am/officecfg/registry/data/org/openoffice/Office.po |6 
 source/am/sc/source/ui/src.po  |8 
 source/am/sfx2/source/dialog.po|   12 
 source/am/svtools/source/dialogs.po|8 
 source/am/svtools/source/misc.po   |8 
 source/am/svx/source/stbctrls.po   |8 
 source/am/svx/uiconfig/ui.po   |   10 
 source/bg/sc/uiconfig/scalc/ui.po  |   20 
 source/bg/sfx2/source/dialog.po|   12 
 source/bg/svx/source/dialog.po |   30 
 source/bg/svx/source/form.po   |   10 
 source/bg/svx/source/stbctrls.po   |8 
 source/bg/svx/source/tbxctrls.po   |6 
 source/bg/svx/uiconfig/ui.po   |  289 
 source/bg/sw/source/ui/utlui.po|   21 
 source/bg/sw/source/uibase/utlui.po|6 
 source/bg/sw/uiconfig/swriter/ui.po|5 
 source/br/cui/uiconfig/ui.po   |   70 -
 source/br/extensions/source/bibliography.po|   12 
 source/br/extensions/source/propctrlr.po   |  152 ++--
 source/br/sc/source/ui/src.po  |   12 
 source/ca/helpcontent2/source/text/scalc/00.po |   20 
 source/ca/helpcontent2/source/text/scalc/01.po |8 
 source/ca/helpcontent2/source/text/scalc/guide.po  |   10 
 source/ca/helpcontent2/source/text/shared/01.po|6 
 source/ca/helpcontent2/source/text/shared/guide.po |5 
 source/ca/helpcontent2/source/text/shared/optionen.po  |8 
 source/ca/helpcontent2/source/text/simpress/guide.po   |   10 
 source/ca/helpcontent2/source/text/swriter/01.po   |   13 
 source/ca/helpcontent2/source/text/swriter/guide.po|   25 
 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/ca/sc/uiconfig/scalc/ui.po  |6 
 source/ca/svx/uiconfig/ui.po   |   12 
 source/cy/cui/uiconfig/ui.po   |8 
 source/cy/sfx2/source/dialog.po|   12 
 source/cy/sfx2/uiconfig/ui.po  |   15 
 source/cy/svtools/source/dialogs.po|8 
 source/cy/svtools/source/misc.po   |8 
 source/cy/svx/source/stbctrls.po   |   10 
 source/cy/svx/uiconfig/ui.po   |   10 
 source/da/cui/uiconfig/ui.po   |8 
 source/da/helpcontent2/source/text/scalc/01.po |   12 
 source/da/sfx2/source/dialog.po|   14 
 source/da/sfx2/uiconfig/ui.po  |   17 
 source/da/svtools/source/dialogs.po|   10 
 source/da/svtools/source/java.po   |   12 
 source/da/svtools/source/misc.po   |   10 
 source/da/svx/source/stbctrls.po   |8 
 source/da/svx/uiconfig/ui.po   |   12 
 source/de/editeng/source/items.po  |   10 
 source/de/formula/source/core/resource.po  |8 
 source/de/helpcontent2/source/auxiliary.po |6 
 source/de/helpcontent2/source/text/sbasic/shared/01.po |   10 
 source/de/helpcontent2/source/text/scalc.po|6 
 source/de/helpcontent2/source/text/scalc/00.po |6 
 source/de/helpcontent2/source/text/scalc/01.po |  100 +-
 source/de/helpcontent2/source/text/scalc/guide.po  |   34 
 source/de/helpcontent2/source/text/schart/01.po|6 
 source/de/helpcontent2/source/text/shared/00.po|   10 
 source/de/helpcontent2/source/text/shared/01.po|   12 
 source/de/helpcontent2/source/text/shared/explorer/database.po |8 
 source/de/helpcontent2/source/text/shared/guide.po |   16 
 source/de/helpcontent2/source/text/shared/optionen.po

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-18'

[Andras Timar]

Tag 'cp-5.3-18' created by Andras Timar  at 
2017-06-28 20:40 +

cp-5.3-18

Changes since cp-5.3-17-44:
---
 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/cp-5.3-18'

[Andras Timar]

Tag 'cp-5.3-18' created by Andras Timar  at 
2017-06-28 20:40 +

cp-5.3-18

Changes since libreoffice-5-3-branch-point-28:
---
 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/cp-5.3-18'

[Olivier R]

Tag 'cp-5.3-18' created by Andras Timar  at 
2017-06-28 20:40 +

cp-5.3-18

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - configure.ac

[Andras Timar]

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

New commits:
commit 3196fb8da4849a79352c97560f06a42a6092970c
Author: Andras Timar 
Date:   Wed Jun 28 22:39:53 2017 +0200

Bump version to 5.3-18

Change-Id: I2a46962eab6ca8ab5170437fad5b19c7377bcaf8

diff --git a/configure.ac b/configure.ac
index a15bd9b2c70a..8bed5aa0644e 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([Collabora Office],[5.3.10.17],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.18],[],[],[https://collaboraoffice.com/])
 
 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: filter/source include/svx sw/qa sw/source

[Szymon Kłos]

 filter/source/msfilter/escherex.cxx  |4 +++
 filter/source/msfilter/msdffimp.cxx  |   34 ++-
 include/svx/msdffdef.hxx |7 ++
 sw/qa/extras/ww8export/data/tdf91687.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx|   10 +
 sw/source/filter/ww8/wrtw8esh.cxx|7 +-
 6 files changed, 56 insertions(+), 6 deletions(-)

New commits:
commit d72e0cadceb0b43928a9b4f18d75c9d5d30afdda
Author: Szymon Kłos 
Date:   Mon Jun 19 15:32:16 2017 +0200

Watermark: tdf#91687 correct size in the .doc

Export:
* Watermarks saved using Writer were very small in the MSO.
  Export fUsegtextFStretch property in the Geometry Text
  Boolean Properties.
* tdf#91687: SnapRect contains size of Watermark after rotation.
  We have to export size without rotation.

Import:
* When import set height depending on used font and width.
  Text will keep the ratio. Remember the padding for export.

* added unit test
* introduced enum to avoid magic numbers for stretch and best fit
  properties.

Change-Id: I3427afe78488d499f13c543ca401c096161aaf34
Reviewed-on: https://gerrit.libreoffice.org/38979
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index bf0450fe513b..674da67383c7 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3482,6 +3482,10 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 if ( pOutlinerParaObject && 
pOutlinerParaObject->IsVertical() )
 nTextPathFlags |= 0x2000;
 }
+
+// Use gtextFStretch for Watermark like MSO does
+nTextPathFlags |= use_gtextFStretch | gtextFStretch;
+
 if ( nTextPathFlags != nTextPathFlagsOrg )
 AddOpt( DFF_Prop_gtextFStrikethrough, 
nTextPathFlags );
 }
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 06b9fc1dde61..148a8977959c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4334,7 +4334,8 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 pRet = new SdrObjCustomShape();
 pRet->SetModel( pSdrModel );
 
-bool bIsFontwork = ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x4000 ) != 0;
+sal_uInt32 ngtextFStrikethrough = GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 );
+bool bIsFontwork = ( ngtextFStrikethrough & 0x4000 ) != 0;
 
 // in case of a FontWork, the text is set by the escher 
import
 if ( bIsFontwork )
@@ -4359,16 +4360,16 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 
 // SJ: applying fontattributes for Fontwork :
 if ( IsHardAttribute( DFF_Prop_gtextFItalic ) )
-aSet.Put( SvxPostureItem( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x0010 ) != 0 ? ITALIC_NORMAL : 
ITALIC_NONE, EE_CHAR_ITALIC ) );
+aSet.Put( SvxPostureItem( ( ngtextFStrikethrough & 
0x0010 ) != 0 ? ITALIC_NORMAL : ITALIC_NONE, EE_CHAR_ITALIC ) );
 
 if ( IsHardAttribute( DFF_Prop_gtextFBold ) )
-aSet.Put( SvxWeightItem( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x0020 ) != 0 ? WEIGHT_BOLD : 
WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
+aSet.Put( SvxWeightItem( ( ngtextFStrikethrough & 
0x0020 ) != 0 ? WEIGHT_BOLD : WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
 
 // SJ TODO: Vertical Writing is not correct, instead
 // this should be replaced through "CharacterRotation"
 // by 90 degrees, therefore a new Item has to be
 // supported by svx core, api and xml file format
-
static_cast(pRet)->SetVerticalWriting( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x2000 ) != 0 );
+
static_cast(pRet)->SetVerticalWriting( ( 
ngtextFStrikethrough & 0x2000 ) != 0 );
 
 if ( SeekToContent( DFF_Prop_gtextUNICODE, rSt ) )
 {
@@ -4403,12 +4404,35 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 if ( nTextWidth != 100 )
 aSet.Put( SvxCharScaleWidthItem( 
(sal_uInt16)nTextWidth, EE_CHAR_FONTWIDTH ) );
 }
-if ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 
) & 0x1000

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - filter/source include/svx sw/qa sw/source

[Szymon Kłos]

 filter/source/msfilter/escherex.cxx  |4 +++
 filter/source/msfilter/msdffimp.cxx  |   34 ++-
 include/svx/msdffdef.hxx |7 ++
 sw/qa/extras/ww8export/data/tdf91687.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx|   10 +
 sw/source/filter/ww8/wrtw8esh.cxx|7 +-
 6 files changed, 56 insertions(+), 6 deletions(-)

New commits:
commit 617c577b372deebfb4050713a79c97cc512b16aa
Author: Szymon Kłos 
Date:   Mon Jun 19 15:32:16 2017 +0200

Watermark: tdf#91687 correct size in the .doc

Export:
* Watermarks saved using Writer were very small in the MSO.
  Export fUsegtextFStretch property in the Geometry Text
  Boolean Properties.
* tdf#91687: SnapRect contains size of Watermark after rotation.
  We have to export size without rotation.

Import:
* When import set height depending on used font and width.
  Text will keep the ratio. Remember the padding for export.

* added unit test
* introduced enum to avoid magic numbers for stretch and best fit
  properties.

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

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index b8b5b831bd99..e349bc76c4fd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3492,6 +3492,10 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 if ( pOutlinerParaObject && 
pOutlinerParaObject->IsVertical() )
 nTextPathFlags |= 0x2000;
 }
+
+// Use gtextFStretch for Watermark like MSO does
+nTextPathFlags |= use_gtextFStretch | gtextFStretch;
+
 if ( nTextPathFlags != nTextPathFlagsOrg )
 AddOpt( DFF_Prop_gtextFStrikethrough, 
nTextPathFlags );
 }
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 81d9ae86c8bf..de9f0d489111 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4333,7 +4333,8 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 pRet = new SdrObjCustomShape();
 pRet->SetModel( pSdrModel );
 
-bool bIsFontwork = ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x4000 ) != 0;
+sal_uInt32 ngtextFStrikethrough = GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 );
+bool bIsFontwork = ( ngtextFStrikethrough & 0x4000 ) != 0;
 
 // in case of a FontWork, the text is set by the escher 
import
 if ( bIsFontwork )
@@ -4358,16 +4359,16 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 
 // SJ: applying fontattributes for Fontwork :
 if ( IsHardAttribute( DFF_Prop_gtextFItalic ) )
-aSet.Put( SvxPostureItem( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x0010 ) != 0 ? ITALIC_NORMAL : 
ITALIC_NONE, EE_CHAR_ITALIC ) );
+aSet.Put( SvxPostureItem( ( ngtextFStrikethrough & 
0x0010 ) != 0 ? ITALIC_NORMAL : ITALIC_NONE, EE_CHAR_ITALIC ) );
 
 if ( IsHardAttribute( DFF_Prop_gtextFBold ) )
-aSet.Put( SvxWeightItem( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x0020 ) != 0 ? WEIGHT_BOLD : 
WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
+aSet.Put( SvxWeightItem( ( ngtextFStrikethrough & 
0x0020 ) != 0 ? WEIGHT_BOLD : WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
 
 // SJ TODO: Vertical Writing is not correct, instead
 // this should be replaced through "CharacterRotation"
 // by 90 degrees, therefore a new Item has to be
 // supported by svx core, api and xml file format
-
static_cast(pRet)->SetVerticalWriting( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 ) & 0x2000 ) != 0 );
+
static_cast(pRet)->SetVerticalWriting( ( 
ngtextFStrikethrough & 0x2000 ) != 0 );
 
 if ( SeekToContent( DFF_Prop_gtextUNICODE, rSt ) )
 {
@@ -4402,12 +4403,35 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 if ( nTextWidth != 100 )
 aSet.Put( SvxCharScaleWidthItem( 
(sal_uInt16)nTextWidth, EE_CHAR_FONTWIDTH ) );
 }
-if ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 
) & 0

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

[Muhammet Kara]

 cui/source/customize/acccfg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 91c838a4c9d0d7a8438e2e76a3636dc67a6221bb
Author: Muhammet Kara 
Date:   Wed Jun 28 11:15:48 2017 +0300

Use SvTreeListBox's own method: RemoveEntry

Change-Id: I3d0c605450dc2b847ac3fa46b9d050720a7a1a03
Reviewed-on: https://gerrit.libreoffice.org/39350
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 
(cherry picked from commit 8cf31f15b3c8af2c5453c980e23cfc31cf34f519)
Reviewed-on: https://gerrit.libreoffice.org/39372

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ce1c0d552004..73ed7747c48a 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1544,7 +1544,7 @@ SvTreeListEntry* 
SfxAcceleratorConfigPage::applySearchFilter(OUString& rSearchTe
 
 if (!textSearch.SearchForward( aStr, &aStartPos, &aEndPos ))
 {
-rListBox->GetModel()->Remove(pEntry);
+rListBox->RemoveEntry(pEntry);
 }
 else if (!pFirstMatch)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 sc/qa/unit/tiledrendering/tiledrendering.cxx |   67 +++
 sc/source/ui/view/tabvwshb.cxx   |3 +
 sfx2/source/view/viewfrm.cxx |   26 +-
 3 files changed, 94 insertions(+), 2 deletions(-)

New commits:
commit 0ac92837d31c4065be4a41e2a2541811c9f6be00
Author: Henry Castro 
Date:   Wed Jun 28 10:26:21 2017 -0400

sc lok: disable Undo/Redo state if conflict with other views

Change-Id: I5bc5be2b17925ec3a203f9704f62a8c80ac5fc9d
Reviewed-on: https://gerrit.libreoffice.org/39363
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 3778f4be1093..c90032a8c0ca 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -83,6 +83,7 @@ public:
 void testUndoRepairDispatch();
 void testInsertGraphicInvalidations();
 void testDocumentSizeWithTwoViews();
+void testDisableUndoRepair();
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
 CPPUNIT_TEST(testRowColumnSelections);
@@ -109,6 +110,7 @@ public:
 CPPUNIT_TEST(testUndoRepairDispatch);
 CPPUNIT_TEST(testInsertGraphicInvalidations);
 CPPUNIT_TEST(testDocumentSizeWithTwoViews);
+CPPUNIT_TEST(testDisableUndoRepair);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1347,6 +1349,71 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void ScTiledRenderingTest::testDisableUndoRepair()
+{
+comphelper::LibreOfficeKit::setActive();
+ScModelObj* pModelObj = createDoc("cursor-away.ods");
+CPPUNIT_ASSERT(pModelObj);
+
+// view #1
+int nView1 = SfxLokHelper::getView();
+SfxViewShell* pView1 = SfxViewShell::Current();
+
+// view #2
+SfxLokHelper::createView();
+int nView2 = SfxLokHelper::getView();
+SfxViewShell* pView2 = SfxViewShell::Current();
+CPPUNIT_ASSERT(pView1 != pView2);
+{
+SfxItemSet aSet1(pView1->GetPool(), svl::Items{});
+SfxItemSet aSet2(pView2->GetPool(), svl::Items{});
+pView1->GetSlotState(SID_UNDO, nullptr, &aSet1);
+pView2->GetSlotState(SID_UNDO, nullptr, &aSet2);
+CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED, 
aSet1.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED, 
aSet2.GetItemState(SID_UNDO));
+}
+
+// text edit a cell in view #1
+SfxLokHelper::setView(nView1);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'h', 0);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 'h', 0);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+{
+SfxItemSet aSet1(pView1->GetPool(), svl::Items{});
+SfxItemSet aSet2(pView2->GetPool(), svl::Items{});
+pView1->GetSlotState(SID_UNDO, nullptr, &aSet1);
+pView2->GetSlotState(SID_UNDO, nullptr, &aSet2);
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet1.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem* 
>(aSet1.GetItem(SID_UNDO)));
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet2.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* 
>(aSet2.GetItem(SID_UNDO)));
+CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item* >(aSet2.GetItem(SID_UNDO))->GetValue());
+}
+
+// text edit a cell in view #2
+SfxLokHelper::setView(nView2);
+pModelObj->setPart(1);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'c', 0);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 'c', 0);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+Scheduler::ProcessEventsToIdle();
+{
+SfxItemSet aSet1(pView1->GetPool(), svl::Items{});
+SfxItemSet aSet2(pView2->GetPool(), svl::Items{});
+pView1->GetSlotState(SID_UNDO, nullptr, &aSet1);
+pView2->GetSlotState(SID_UNDO, nullptr, &aSet2);
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet1.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* 
>(aSet1.GetItem(SID_UNDO)));
+CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item* >(aSet1.GetItem(SID_UNDO))->GetValue());
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet2.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem* 
>(aSet2.GetItem(SID_UNDO)));
+}
+}
+
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index a9a46d5bd50a..1077f9c1aac9 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.

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

[Stephan Bergmann]

 include/svx/xmleohlp.hxx  |3 +--
 sc/source/filter/xml/xmlwrap.cxx  |4 ++--
 sd/source/filter/xml/sdxmlwrp.cxx |5 ++---
 svx/source/xml/xmleohlp.cxx   |5 +
 sw/source/filter/xml/swxml.cxx|3 +--
 sw/source/filter/xml/wrtxml.cxx   |3 +--
 6 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 6e02af978d456e078659bc25cf290f5c876d59a9
Author: Stephan Bergmann 
Date:   Wed Jun 28 16:44:42 2017 +0200

SvXMLEmbeddedObjectHelper::Create bDirect parameter is unused

...ever since 63d13cb2ee2c4725599714f6184bcd6e77a1eab7 "#87246#: OLE object
support through SAX interface"

Change-Id: Ib1d63a3a6adf64e2b5d3a16df5a7c6473d46abfb
Reviewed-on: https://gerrit.libreoffice.org/39364
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index cb8183fb20a6..51227dbb8b0d 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -102,8 +102,7 @@ public:
 static SvXMLEmbeddedObjectHelper*   Create(
 const css::uno::Reference < 
css::embed::XStorage >&,
 ::comphelper::IEmbeddedHelper& rDocPersist,
-SvXMLEmbeddedObjectHelperMode eCreateMode,
-bool bDirect = true );
+SvXMLEmbeddedObjectHelperMode eCreateMode 
);
 static SvXMLEmbeddedObjectHelper*   Create(
 ::comphelper::IEmbeddedHelper& rDocPersist,
 SvXMLEmbeddedObjectHelperMode eCreateMode 
);
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 979c3cda75c1..538bdcd60ebe 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -443,7 +443,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, 
ErrCode& rError )
 pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, 
SvXMLGraphicHelperMode::Read );
 xGrfContainer = pGraphicHelper;
 
-pObjectHelper = SvXMLEmbeddedObjectHelper::Create(xStorage, 
mrDocShell, SvXMLEmbeddedObjectHelperMode::Read, false);
+pObjectHelper = SvXMLEmbeddedObjectHelper::Create(xStorage, 
mrDocShell, SvXMLEmbeddedObjectHelperMode::Read);
 xObjectResolver = pObjectHelper;
 }
 uno::Sequence aStylesArgs(4);
@@ -874,7 +874,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly)
 
 if( pObjSh )
 {
-pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, 
*pObjSh, SvXMLEmbeddedObjectHelperMode::Write, false );
+pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, 
*pObjSh, SvXMLEmbeddedObjectHelperMode::Write );
 xObjectResolver = pObjectHelper;
 }
 
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index 01cba586eb44..38ef1d3f6341 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -555,8 +555,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
 xGraphicResolver = pGraphicHelper;
 pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
 xStorage, *pDoc->GetPersist(),
-SvXMLEmbeddedObjectHelperMode::Read,
-false );
+SvXMLEmbeddedObjectHelperMode::Read );
 xObjectResolver = pObjectHelper;
 }
 
@@ -868,7 +867,7 @@ bool SdXMLFilter::Export()
 // create helper for graphic and ole export if we have a storage
 if( xStorage.is() )
 {
-pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, 
*mrDocShell.GetDoc()->GetPersist(), SvXMLEmbeddedObjectHelperMode::Write, false 
);
+pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, 
*mrDocShell.GetDoc()->GetPersist(), SvXMLEmbeddedObjectHelperMode::Write );
 xObjectResolver = pObjectHelper;
 
 pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, 
SvXMLGraphicHelperMode::Write, false );
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 3b6af7b87fa4..c21fe6c11e51 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -548,11 +548,8 @@ void SvXMLEmbeddedObjectHelper::Init(
 SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create(
 const uno::Reference < embed::XStorage >& rRootStorage,
 ::comphelper::IEmbeddedHelper& rDocPersist,
-SvXMLEmbeddedObjectHelperMode eCreateMode,
-bool bDirect )
+SvXMLEmbeddedObjectHelperMode eCreateMode )
 {
-(void)bDirect;
-
 SvXMLEmbeddedObjectHelper* pThis = new SvXMLEmbeddedObjectHelper;
 
 pThis->acquire();
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 61bd0949f002..1f891c9cc002 100644
--- a/sw/source/

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

[Stephan Bergmann]

 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit bb6277394c03f0bbb2906a0e262127e8c7942495
Author: Stephan Bergmann 
Date:   Tue Jun 27 17:10:20 2017 +0200

In DatabaseMetaData::getIndexInfo, isPrimary has always been ignored

...ever since the code's introduction with
e28033fdfad9750ebe96885b9514adee629acf88 "Apply sdbc-postgresql.diff"

Change-Id: Ia0a1581c0284d96c73367ac6ea52fb0bab8e3c88
Reviewed-on: https://gerrit.libreoffice.org/39310
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 554635ec0ed9..14d725fde1e0 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -2409,7 +2409,7 @@ css::uno::Reference< XResultSet > 
DatabaseMetaData::getIndexInfo(
 static const sal_Int32 C_INDEXNAME = 3;
 static const sal_Int32 C_IS_CLUSTERED = 4;
 static const sal_Int32 C_IS_UNIQUE = 5;
-static const sal_Int32 C_IS_PRIMARY = 6;
+// C_IS_PRIMARY = 6
 static const sal_Int32 C_COLUMNS = 7;
 
 static const sal_Int32 R_TABLE_SCHEM = 1;
@@ -2454,8 +2454,6 @@ css::uno::Reference< XResultSet > 
DatabaseMetaData::getIndexInfo(
 OUString currentTable = xRow->getString( C_TABLENAME );
 OUString currentIndexName = xRow->getString( C_INDEXNAME );
 bool isNonUnique = ! xRow->getBoolean( C_IS_UNIQUE );
-bool isPrimary = xRow->getBoolean( C_IS_PRIMARY );
-(void)isPrimary;
 sal_Int32 indexType =  xRow->getBoolean( C_IS_CLUSTERED ) ?
 css::sdbc::IndexType::CLUSTERED :
 css::sdbc::IndexType::HASHED;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |   14 ++
 sw/source/uibase/shells/annotsh.cxx|8 
 sw/source/uibase/shells/basesh.cxx |6 +++---
 3 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 6c6c3e9ea7255d411fbf950d6c5712b094f69436
Author: Henry Castro 
Date:   Wed Jun 28 11:40:06 2017 -0400

sw lok: rename return values UNDO_CONFLICT to SID_REPAIRPACKAGE

To be consistent with sc, sd and sw

Change-Id: I273101de6e59be08eb61b1a77647bc1dd26ff387
Reviewed-on: https://gerrit.libreoffice.org/39369
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index e719a368558e..8bf0f359c288 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1684,7 +1684,7 @@ void SwTiledRenderingTest::testUndoRepairResult()
 SfxLokHelper::setView(nView2);
 comphelper::dispatchCommand(".uno:Undo", {}, xListener);
 Scheduler::ProcessEventsToIdle();
-CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT), 
pResult2->m_nDocRepair);
+CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
pResult2->m_nDocRepair);
 
 mxComponent->dispose();
 mxComponent.clear();
@@ -1719,7 +1719,7 @@ void SwTiledRenderingTest::testRedoRepairResult()
 SfxLokHelper::setView(nView2);
 comphelper::dispatchCommand(".uno:Redo", {}, xListener);
 Scheduler::ProcessEventsToIdle();
-CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT), 
pResult2->m_nDocRepair);
+CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
pResult2->m_nDocRepair);
 
 mxComponent->dispose();
 mxComponent.clear();
@@ -1740,9 +1740,8 @@ void checkUndoRepairStates(SwXTextDocument* 
pXTextDocument, SwView* pView1, SwVi
 // second view, undo conflict
 pView2->GetState(aItemSet2);
 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet2.GetItemState(SID_UNDO));
-const SfxUInt32Item *pSetItem = dynamic_cast(aItemSet2.GetItem(SID_UNDO));
-CPPUNIT_ASSERT(pSetItem);
-CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT), 
pSetItem->GetValue());
+CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item * 
>(aItemSet2.GetItem(SID_UNDO)));
+CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item * >(aItemSet2.GetItem(SID_UNDO))->GetValue());
 };
 
 }
@@ -1795,9 +1794,8 @@ void SwTiledRenderingTest::testDisableUndoRepair()
 // first view, undo conflict
 pView1->GetState(aItemSet1);
 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, 
aItemSet1.GetItemState(SID_UNDO));
-const SfxUInt32Item *pSetItem = dynamic_cast(aItemSet1.GetItem(SID_UNDO));
-CPPUNIT_ASSERT(pSetItem);
-CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT), 
pSetItem->GetValue());
+CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item * 
>(aItemSet1.GetItem(SID_UNDO)));
+CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item * >(aItemSet1.GetItem(SID_UNDO))->GetValue());
 }
 
 // Insert a character in the first view.
diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index 99d421fe64fd..2b432510ae08 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1512,7 +1512,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq)
 rSh.GetLastUndoInfo(nullptr, &nUndoId);
 if (nUndoId == SwUndoId::CONFLICT)
 {
-rReq.SetReturnValue( SfxUInt32Item(nId, 
static_cast(nUndoId)) );
+rReq.SetReturnValue( SfxUInt32Item(nId, 
static_cast(SID_REPAIRPACKAGE)) );
 break;
 }
 
@@ -1543,7 +1543,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq)
 (void)rSh.GetFirstRedoInfo(nullptr, &nUndoId);
 if (nUndoId == SwUndoId::CONFLICT)
 {
-rReq.SetReturnValue( SfxUInt32Item(nId, 
static_cast(nUndoId)) );
+rReq.SetReturnValue( SfxUInt32Item(nId, 
static_cast(SID_REPAIRPACKAGE)) );
 break;
 }
 
@@ -1604,7 +1604,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
 }
 else if (nUndoId == SwUndoId::CONFLICT)
 {
-rSet.Put( SfxUInt32Item(nWhich, 
static_cast(nUndoId)) );
+rSet.Put( SfxUInt32Item(nWhich, 
static_cast(SID_REPAIRPACKAGE)) );
 }
 else
 rSet.DisableItem(nWhich);
@@ -1621,7 +1621,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
 }
 else if (nUndoId == SwUndoId::CONFLICT)
 {
-rSet.Put( SfxUInt32Item(nWhich, 
static_cast(nUndoId)) );
+rSet.Put( SfxUInt32Item(nWhich, 
static_cast(SID_REPAIRPACKAGE)) );

[GSoC] QuarkXPress import, Week 4

[Alex P]

Reverse engineering progress:
- Finally finished deobfuscation of QXP 4 objects and pages.
- Refactored object parsing and improved size identification in QXP 4.
- Dashes and stripes.
- Text path properties.
- Identified OLE picture boxes.

Looks like reverse engineering of QuarkXPress 3-4 formats is almost
completed, the only important pieces left are picture bitmap data and QXP 4
bezier data, colors. The last one seems to be much more complicated than in
3.3, but hopefully we will finish it soon.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/source/ui/view/viewdata.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0016602d20da3c60fb35dfaf0e6639cadbe64428
Author: Eike Rathke 
Date:   Wed Jun 28 18:54:15 2017 +0200

assert(nTab < static_cast(maTabData.size())); cause of tdf#108796

Have a dev friendly abort instead of a deep throw in case of the unexpected.

Change-Id: Id07135cd7234767480032356636c668d20be3ff3

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index f2d79b8fd4b4..16f8f2c0480f 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -543,9 +543,10 @@ void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
 
 void ScViewData::DeleteTab( SCTAB nTab )
 {
+assert(nTab < static_cast(maTabData.size()));
 delete maTabData.at(nTab);
-
 maTabData.erase(maTabData.begin() + nTab);
+
 if (static_cast(nTabNo) >= maTabData.size())
 {
 EnsureTabDataSize(1);
commit c9591f3b6153614c9849b8afbdcacbecc99c1f7c
Author: Eike Rathke 
Date:   Wed Jun 28 18:51:16 2017 +0200

Resolves: tdf#108796 let ScViewData::InsertTabs() insert the correct amount

... at the correct position. This only ever worked by chance, if at all, and
now surfaced after

commit 73dec49802ef8fc42c5719efaa42a33cde68e569
Date:   Tue Mar 7 10:46:12 2017 +0100

Change-Id: I9bd0aeb5a471bd644c1497306effe9045c1daa97

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index cb7335a216ba..f2d79b8fd4b4 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -527,7 +527,7 @@ void ScViewData::InsertTab( SCTAB nTab )
 
 void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
 {
-if( nTab+nNewSheets >= static_cast(maTabData.size()))
+if (nTab >= static_cast(maTabData.size()))
 maTabData.resize(nTab+nNewSheets, nullptr);
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara]

 cui/source/customize/acccfg.cxx|   71 +
 cui/source/inc/acccfg.hxx  |   69 +++--
 cui/uiconfig/ui/accelconfigpage.ui |  196 ++---
 3 files changed, 209 insertions(+), 127 deletions(-)

New commits:
commit 1ec4082d7adb1cbce0b4eed3c45fe2fcba258333
Author: Muhammet Kara 
Date:   Tue Jun 13 11:44:22 2017 +0300

Implement search feature in the Kayboard tab

of the Customize dialog.

Once you type a search term in the box, non-matching functions
are filtered out in the current category. The filter operation
takes place, and updates as you type.

If user changes category while there is still a search term
in the box, the filter is also applied to the newly selected
category.

Change-Id: I5ef086af60e0f339af6a113fa6a52555d4f765d9
Reviewed-on: https://gerrit.libreoffice.org/38814
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 3667beb986e8c03c925566a585b0504c7943fede)
Reviewed-on: https://gerrit.libreoffice.org/39356
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 23bb736d3319..ce1c0d552004 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -58,6 +58,11 @@
 #include 
 #include 
 
+// include search util
+#include 
+#include 
+#include 
+
 // include other projects
 #include 
 #include 
@@ -753,6 +758,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( 
vcl::Window* pParent, const
 aSize = LogicToPixel(Size(80, 91), MapUnit::MapAppFont);
 m_pKeyBox->set_width_request(aSize.Width());
 m_pKeyBox->set_height_request(aSize.Height());
+get(m_pSearchEdit, "searchEntry");
 
 aFilterAllStr = SfxResId( STR_SFX_FILTERNAME_ALL );
 
@@ -769,6 +775,9 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( 
vcl::Window* pParent, const
 m_pOfficeButton->SetClickHdl( LINK( this, SfxAcceleratorConfigPage, 
RadioHdl  ));
 m_pModuleButton->SetClickHdl( LINK( this, SfxAcceleratorConfigPage, 
RadioHdl  ));
 
+m_pSearchEdit->SetUpdateDataHdl ( LINK( this, SfxAcceleratorConfigPage, 
SearchUpdateHdl ));
+m_pSearchEdit->EnableUpdateData();
+
 // initialize Entriesbox
 
m_pEntriesBox->SetStyle(m_pEntriesBox->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
 m_pEntriesBox->SetSelectionMode(SelectionMode::Single);
@@ -790,6 +799,11 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( 
vcl::Window* pParent, const
 nNewTab = nNewTab + 5; // additional space
 m_pEntriesBox->SetTab( 1, nNewTab );
 
+//Initialize search util
+m_options.AlgorithmType2 = util::SearchAlgorithms2::ABSOLUTE;
+m_options.transliterateFlags |= TransliterationFlags::IGNORE_CASE;
+m_options.searchFlag |= (util::SearchFlags::REG_NOT_BEGINOFLINE |
+util::SearchFlags::REG_NOT_ENDOFLINE);
 // initialize GroupBox
 m_pGroupLBox->SetFunctionListBox(m_pFunctionBox);
 
@@ -835,6 +849,7 @@ void SfxAcceleratorConfigPage::dispose()
 m_pGroupLBox.clear();
 m_pFunctionBox.clear();
 m_pKeyBox.clear();
+m_pSearchEdit.clear();
 m_pLoadButton.clear();
 m_pSaveButton.clear();
 m_pResetButton.clear();
@@ -1031,6 +1046,11 @@ void SfxAcceleratorConfigPage::ResetConfig()
 m_pEntriesBox->Clear();
 }
 
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SearchUpdateHdl, Edit&, void)
+{
+m_pGroupLBox->GetSelectHdl().Call( m_pGroupLBox );
+}
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load, Button*, void)
 {
 // ask for filename, where we should load the new config data from
@@ -1109,6 +1129,19 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, 
SvTreeListBox*, pListBox, void )
 else if ( pListBox == m_pGroupLBox )
 {
 m_pGroupLBox->GroupSelected();
+
+// Pause redraw (Do not redraw at each removal)
+m_pFunctionBox->SetUpdateMode(false);
+// Apply the search filter to the functions list
+OUString aSearchTerm( m_pSearchEdit->GetText() );
+SvTreeListEntry* aMatchFound = applySearchFilter(aSearchTerm, 
m_pFunctionBox);
+// Resume redraw
+m_pFunctionBox->SetUpdateMode(true);
+if (aMatchFound)
+m_pFunctionBox->Select(aMatchFound);
+else
+m_pKeyBox->Clear();
+
 if ( !m_pFunctionBox->FirstSelected() )
 m_pChangeButton->Enable( false );
 }
@@ -1486,4 +1519,42 @@ OUString 
SfxAcceleratorConfigPage::GetLabel4Command(const OUString& sCommand)
 return sCommand;
 }
 
+/*
+ * Remove entries which doesn't contain the search term
+ */
+SvTreeListEntry* SfxAcceleratorConfigPage::applySearchFilter(OUString& 
rSearchTerm, SvTreeListBox* rListBox)
+{
+if ( rSearchTerm.isEmpty() || !rListBox )
+{
+return nullptr;
+}
+
+SvTreeListEntry* pFirstMatch = nullptr;
+SvTreeListEntry* pEntry = rListBox->First();
+
+m_options.searchString = rSearchTer

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

[Markus Mohrhard]

 sc/source/core/data/docpool.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit b9587cdb099f24d36e4f81685ef4cd0efef0bdba
Author: Markus Mohrhard 
Date:   Wed Jun 28 16:49:42 2017 +0200

make it possible for calc tests to use ScDocument without BootstrapFixture

Change-Id: Ie5fd57240ff3dbe8613ecb363331f7783dc08cf4
Reviewed-on: https://gerrit.libreoffice.org/39365
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index f0845342489a..729ad9486e7f 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -195,6 +195,11 @@ ScDocumentPool::ScDocumentPool()
 aItemInfos, nullptr, false/*bLoadRefCounts*/ ),
 mnCurrentMaxKey(0)
 {
+// this is a hack for unit tests that need to have a ScDocument
+// but don't want to depend on BootstrapFixture
+if (!pVersionMap1)
+InitVersionMaps();
+
 //  latin font from GetDefaultFonts is not used, 
DEFAULTFONT_LATIN_SPREADSHEET instead
 vcl::Font aStdFont = OutputDevice::GetDefaultFont( 
DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US,
 
GetDefaultFontFlags::OnlyOne );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 solenv/gdb/libreoffice/sw.py |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4f743419a04375160437a910254c45dea396f70d
Author: Michael Stahl 
Date:   Wed Jun 28 18:08:03 2017 +0200

gdb pretty-printers: fix BigPtrArrayPrinter after recent std::isation

Change-Id: Ie98f080fbb0efb807dcb2fb7893811f68e831a8f

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index cfb3cec3eeb7..031963f5c789 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -194,10 +194,10 @@ class BigPtrArrayPrinter(object):
 class _iterator(six.Iterator):
 
 def __init__(self, array):
-self.blocks = array['m_ppInf']
+self.blocks = array['m_vpInf']['_M_impl']['_M_start']
 self.count = array['m_nSize']
 self.pos = 0
-self.block_count = array['m_nBlock']
+self.block_count = array['m_vpInf']['_M_impl']['_M_finish'] - 
array['m_vpInf']['_M_impl']['_M_start']
 self.block_pos = 0
 self.block = None
 self.indent = ""
@@ -246,7 +246,7 @@ class BigPtrArrayPrinter(object):
 raise StopIteration()
 
 name = str(self.pos)
-node = self.block['pData'][self.pos - self.block['nStart']]
+node = self.block['mvData']['_M_elems'][self.pos - 
self.block['nStart']]
 value =  self._node_value(node)
 if self.pos == self.block['nEnd']:
 self._next_block()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

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

New commits:
commit 419295f17974378a7ca79db7ea393df82a3f4f05
Author: Justin Luth 
Date:   Tue Jun 27 10:17:14 2017 -0400

sw:findtxt - whitespace cleanup

Change-Id: I4294617a1cc6cf123dd4bb8efd8c233ba782fdfe
Reviewed-on: https://gerrit.libreoffice.org/39360
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 01fb86ba1253..4f91d9d62e0a 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -155,12 +155,12 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const 
nStart, sal_Int32& rEnd,
 if ( bEmpty )
 aReplaced.push_back( nAkt );
 buf[nAkt] = '\x7f';
-   }
+}
 }
 break;
-default:
-OSL_FAIL( "unknown case in lcl_CleanStr" );
-break;
+default:
+OSL_FAIL( "unknown case in lcl_CleanStr" );
+break;
 }
 }
 ++n;
___
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' - xmlsecurity/source

[Samuel Mehrbrodt]

 xmlsecurity/source/gpg/CertificateImpl.cxx  |7 +--
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 4cdf803af7bc548cb614eb843ab216e264e485c9
Author: Samuel Mehrbrodt 
Date:   Wed Jun 28 09:12:35 2017 +0200

gpg4libre: Don't call production code inside an assert()

Won't work in non-debug builds

Change-Id: I64f9c416890ddd02ec8efc0f59ded145cc17896a
Reviewed-on: https://gerrit.libreoffice.org/39345
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 9a884b3d055ffdedbadb64c7f14e6d38078dedb1)
Reviewed-on: https://gerrit.libreoffice.org/39353
Reviewed-by: Katarina Behrens 

diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx 
b/xmlsecurity/source/gpg/CertificateImpl.cxx
index 20fa35c52d5d..03fa49cdef68 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.cxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
@@ -217,14 +217,17 @@ void CertificateImpl::setCertificate(GpgME::Context* ctx, 
const GpgME::Key& key)
 if (err)
 throw RuntimeException("The GpgME library failed to retrieve the 
public key");
 
-assert(data_out.seek(0,SEEK_SET) == 0);
+off_t result = data_out.seek(0,SEEK_SET);
+(void) result;
+assert(result == 0);
 int len=0, curr=0; char buf;
 while( (curr=data_out.read(&buf, 1)) )
 len += curr;
 
 // write bits to sequence of bytes
 m_aBits.realloc(len);
-assert(data_out.seek(0,SEEK_SET) == 0);
+result = data_out.seek(0,SEEK_SET);
+assert(result == 0);
 if( data_out.read(m_aBits.getArray(), len) != len )
 throw RuntimeException("The GpgME library failed to read the key");
 }
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx 
b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 5f9af66cfb8f..1667af6f59ad 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -212,7 +212,9 @@ SAL_CALL XMLSignature_GpgImpl::generate(
 rCtx.setArmor(false);
 GpgME::SigningResult sign_res=rCtx.sign(data_in, data_out,
 GpgME::Detached);
-assert(data_out.seek(0,SEEK_SET) == 0);
+off_t result = data_out.seek(0,SEEK_SET);
+(void) result;
+assert(result == 0);
 int len=0, curr=0; char buf;
 while( (curr=data_out.read(&buf, 1)) )
 len += curr;
@@ -224,7 +226,8 @@ SAL_CALL XMLSignature_GpgImpl::generate(
 xmlChar* signature = static_cast(xmlMalloc(len + 1));
 if(signature == nullptr)
 throw RuntimeException("The GpgME library failed to initialize for the 
OpenPGP protocol.");
-assert(data_out.seek(0,SEEK_SET) == 0);
+result = data_out.seek(0,SEEK_SET);
+assert(result == 0);
 if( data_out.read(signature, len) != len )
 throw RuntimeException("The GpgME library failed to initialize for the 
OpenPGP protocol.");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 basctl/source/basicide/baside2.cxx  |2 +-
 basctl/source/basicide/basides1.cxx |2 +-
 basctl/source/basicide/basobj2.cxx  |9 +++--
 basctl/source/inc/basobj.hxx|6 +++---
 sfx2/source/appl/appserv.cxx|7 +++
 5 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit e9bae752fe762e82137e709a39f74e4db0b9af31
Author: Stephan Bergmann 
Date:   Wed Jun 28 17:15:36 2017 +0200

ChooseMacro rMacroDesc parameter is unused

...ever since 49751c87652bdd9de8aeca244b4644811f4b0956 "INTEGRATION: CWS 
tbe11"

Change-Id: I038616f5e69bbf1fa04c2fff3ca63e381549aa89

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 0c9568f9eadf..1d2c0cf8dbdf 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -337,7 +337,7 @@ void ModulWindow::BasicExecute()
 if ( !pMethod )
 {
 // If not in a method then prompt the user
-ChooseMacro( uno::Reference< frame::XModel >(), false, 
OUString() );
+ChooseMacro( uno::Reference< frame::XModel >(), false );
 return;
 }
 if ( pMethod )
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index a1c9304139ec..a9c9187a5ad4 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -268,7 +268,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
 break;
 case SID_BASICIDE_CHOOSEMACRO:
 {
-ChooseMacro( nullptr, false, OUString() );
+ChooseMacro( nullptr, false );
 }
 break;
 case SID_BASICIDE_CREATEMACRO:
diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 59267871fc17..13b84b029ff0 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -43,12 +43,11 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
 extern "C" {
-SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* 
pOnlyInDocument_AsXModel, void* pDocFrame_AsXFrame, sal_Bool bChooseOnly, 
rtl_uString* pMacroDesc )
+SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* 
pOnlyInDocument_AsXModel, void* pDocFrame_AsXFrame, sal_Bool bChooseOnly )
 {
-OUString aMacroDesc( pMacroDesc );
 Reference< frame::XModel > aDocument( static_cast< frame::XModel* >( 
pOnlyInDocument_AsXModel ) );
 Reference< frame::XFrame > aDocFrame( static_cast< frame::XFrame* >( 
pDocFrame_AsXFrame ) );
-OUString aScriptURL = basctl::ChooseMacro( aDocument, aDocFrame, 
bChooseOnly, aMacroDesc );
+OUString aScriptURL = basctl::ChooseMacro( aDocument, aDocFrame, 
bChooseOnly );
 rtl_uString* pScriptURL = aScriptURL.pData;
 rtl_uString_acquire( pScriptURL );
 
@@ -235,10 +234,8 @@ namespace
 
 OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
   const uno::Reference< frame::XFrame >& xDocFrame,
-  bool bChooseOnly, const OUString& rMacroDesc )
+  bool bChooseOnly )
 {
-(void)rMacroDesc;
-
 EnsureIde();
 
 GetExtraData()->ChoosingMacro() = true;
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 9ebbe0f949b8..8b10c60035ff 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -75,11 +75,11 @@ namespace basctl
 
 OUStringChooseMacro(
 const css::uno::Reference< css::frame::XModel >& rxLimitToDocument, 
const css::uno::Reference< css::frame::XFrame >& xDocFrame,
-bool bChooseOnly, const OUString& rMacroDesc );
+bool bChooseOnly );
 inline OUString ChooseMacro(
 const css::uno::Reference< css::frame::XModel >& rxLimitToDocument,
-bool bChooseOnly, const OUString& rMacroDesc )
-{ return ChooseMacro(rxLimitToDocument, css::uno::Reference< 
css::frame::XFrame >(), bChooseOnly, rMacroDesc); }
+bool bChooseOnly )
+{ return ChooseMacro(rxLimitToDocument, css::uno::Reference< 
css::frame::XFrame >(), bChooseOnly); }
 
 /// @throws css::container::NoSuchElementException
 /// @throws css::uno::RuntimeException
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index efdd469b424e..a4a8b84dae44 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1181,13 +1181,13 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 
 #ifndef DISABLE_DYNLOADING
 
-typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, void*, sal_Bool, 
rtl_uString*);
+typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, void*, sal_Bool);
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
-extern "C" rtl_uString* basicide_choose_macro(void*, void*, sal_Bool, 
rtl_uString*);
+extern "C" rtl_uString* basicide_choose_macro(

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

[Markus Mohrhard]

 sc/qa/unit/data/xlsx/page_scale.xlsx   |binary
 sc/qa/unit/subsequent_filters-test.cxx |   20 
 2 files changed, 20 insertions(+)

New commits:
commit be00e2a73d10483b675a080f4899f8bf85d331db
Author: Markus Mohrhard 
Date:   Wed Jun 28 04:17:57 2017 +0200

add test for tdf#65848

Change-Id: I6a75fdf0eb615a80d76f9298d3dad8ecbec7c66e
Reviewed-on: https://gerrit.libreoffice.org/39335
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/xlsx/page_scale.xlsx 
b/sc/qa/unit/data/xlsx/page_scale.xlsx
new file mode 100644
index ..070f218d6d04
Binary files /dev/null and b/sc/qa/unit/data/xlsx/page_scale.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 38e83104aa83..d41e0eb0a912 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -238,6 +238,8 @@ public:
 void testTdf100709XLSX();
 void testTdf97598XLSX();
 
+void testPageScalingXLSX();
+
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
 CPPUNIT_TEST(testBasicCellContentODS);
@@ -358,6 +360,8 @@ public:
 CPPUNIT_TEST(testTdf100709XLSX);
 CPPUNIT_TEST(testTdf97598XLSX);
 
+CPPUNIT_TEST(testPageScalingXLSX);
+
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3892,6 +3896,22 @@ void ScFiltersTest::testCondFormatXLSB()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testPageScalingXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("page_scale.", FORMAT_XLSX);
+ScDocument& rDoc = xDocSh->GetDocument();
+
+OUString aStyleName = rDoc.GetPageStyle(0);
+ScStyleSheetPool* pStylePool = rDoc.GetStyleSheetPool();
+SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStyleName, 
SfxStyleFamily::Page );
+CPPUNIT_ASSERT(pStyleSheet);
+
+SfxItemSet& rSet = pStyleSheet->GetItemSet();
+sal_uInt16 nVal = static_cast(rSet.Get(ATTR_PAGE_SCALE)).GetValue();
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(90), nVal);
+
+xDocSh->DoClose();
+}
 
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/inc/swevent.hxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e7c6301e707fcc461bdda5ac74c7499f568ff716
Author: Michael Stahl 
Date:   Wed Jun 28 16:30:28 2017 +0200

tdf#108826 sw: also handle RES_REMOVE_UNO_OBJECT in SwCallMouseEvent

This is sent from SwUndoFlyBase::DelFly(); the SwFrameFormat isn't
deleted in this case but it's no longer part of the document, so
an UI class like SwCallMouseEvent should stop pointing to it.

Change-Id: I05349271d14bb1948ea30528cd85c68ed638f28e

diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 3eb0fb8bfa23..8cb2e2b55c5e 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -130,9 +130,11 @@ struct SwCallMouseEvent
 {
 assert(EVENT_OBJECT_IMAGE == eType || EVENT_OBJECT_URLITEM == eType || 
EVENT_OBJECT_IMAGEMAP == eType);
 SwClient::Modify(pOldValue, pNewValue);
-if (!GetRegisteredIn() ||
-(RES_FMT_CHG == pOldValue->Which()
- && static_cast(pOldValue)->pChangedFormat == 
PTR.pFormat))
+if (!GetRegisteredIn()
+|| (RES_FMT_CHG == pOldValue->Which()
+&& static_cast(pOldValue)->pChangedFormat 
== PTR.pFormat)
+|| (RES_REMOVE_UNO_OBJECT == pOldValue->Which()
+&& static_cast(pOldValue)->pObject == 
PTR.pFormat))
 {
 Clear();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Eike Rathke]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8bd2d900ae67fe7c7253fbc6d04d3e5b73eaf12
Author: Eike Rathke 
Date:   Wed Jun 28 16:03:59 2017 +0200

Change ~Styles to St~yles to resolve clash with ~Sheet, tdf#91820 follow-up

Calc has that menu since

commit b46552194dc41d0f3eabea373c36181878e8729f
Date:   Fri Jun 2 14:53:07 2017 +0400

tdf#91820 Move cells styles to their own main menu entry

Change-Id: I4434def6d69b64cb3ebb711134a16a0c634c6a3e

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index eb377b8f2387..f21ec5ac9d74 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3507,7 +3507,7 @@
   
   
 
-  ~Styles
+  St~yles
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/source/uitest/uno/uiobject_uno.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 4cfcc3de24d13efb2690d133f963df58e1479cfc
Author: Stephan Bergmann 
Date:   Wed Jun 28 16:12:05 2017 +0200

Call ~Idle with SolarMutex locked

...may be the cause for rather frequent UITest failures on Jenkins bot
lo_tb_master_linux_dbg, like
 during
UITest_calc_demo:

> Thread 1 (Thread 0x2b2622036700 (LWP 12315)):
> #0  0x2b2604d495eb in Task::~Task() (this=0x2b2622034f90, 
__in_chrg=) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/vcl/source/app/scheduler.cxx:362
> #1  0x2b2604d7cddc in Timer::~Timer() (this=0x2b2622034f90, 
__in_chrg=) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/vcl/source/app/timer.cxx:73
> #2  0x2b26047eb25a in Idle::~Idle() (this=0x2b2622034f90, 
__in_chrg=) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/vcl/idle.hxx:30
> #3  0x2b2604e900fd in UIObjectUnoObj::executeAction(rtl::OUString 
const&, com::sun::star::uno::Sequence 
const&) (this=0x304ce50, rAction="TYPE", rPropValues=uno::Sequence of length 1 
= {...}) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/vcl/source/uitest/uno/uiobject_uno.cxx:118
> aIdle = { = { = {_vptr.Task = 0x2b2605888c10 , mpSchedulerData = 0x0, mpDebugName = 0x2b2605264160 "UI Test Idle 
Handler", mePriority = HIGH, mbActive = false}, maInvokeHandler = {function_ = 
0x2b2604e8fa66 <(anonymous 
namespace)::ExecuteWrapper::LinkStubExecuteActionHdl(void*, Timer*)>, instance_ 
= 0x2de91c0}, mnTimeout = 1, mbAuto = false}, }
> func = {> = {},  = {static _M_max_size = 16, static _M_max_align 
= 8, _M_functor = {_M_unused = {_M_object = 0x27aafc0, _M_const_object = 
0x27aafc0, _M_function_pointer = 0x27aafc0, _M_member_pointer = (void 
(std::_Undefined_class::*)(std::_Undefined_class * const)) 0x27aafc0, this 
adjustment 38138176}, _M_pod_data = 
"\300\257z\002\000\000\000\000@\361E\002\000\000\000"}, _M_manager = 
0x2b2604e90ac7 
&)::__lambda0>::_M_manager(std::_Any_data
 &, const std::_Any_data &, std::_Manager_operation)>}, _M_invoker = 
0x2b2604e90aa5 &)::__lambda0>::_M_invoke(const
 std::_Any_data &)>}
> lk = {_M_device = 0x304cef0, _M_owns = true}
> pWrapper = 0x2de91c0
> #4  0x2b261d76951d in gcc3::callVirtualMethod(void*, unsigned int, 
void*, _typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int, 
unsigned long*, double*) (pThis=0x304cea0, nVtableIndex=4, pRegisterReturn=0x0, 
pReturnTypeRef=0x16b42c0, bSimpleReturn=true, pStack=0x2b2622035160, nStack=0, 
pGPR=0x2b26220352d0, pFPR=0x2b2622035300) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:133
> data = {pMethod = 47442291130818, pStack = 0x2b2622035160, nStack 
= 0, pGPR = 0x2b26220352d0, pFPR = 0x2b2622035300, rax = 47442779394304, rdx = 
47442779394256, xmm0 = 2.3439542265158875e-310, xmm1 = 2.343984744210869e-310}
> pMethod = 47442301612736
> #5  0x2b261d76815c in 
cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy*, 
bridges::cpp_uno::shared::VtableSlot, typelib_TypeDescriptionReference*, 
sal_Int32, typelib_MethodParameter*, void*, void**, uno_Any**) 
(pThis=0x27ade30, aVtableSlot=..., pReturnTypeRef=0x16b42c0, nParams=2, 
pParams=0x27b0850, pUnoReturn=0x0, pUnoArgs=0x2eecbc0, ppUnoExc=0x2b2622035488) 
at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:237
> pStack = 0x2b2622035160
> pFPR = {2.3439847442227266e-310, 2.3439819402763736e-310, 
8.4879831638610893e-314, 2.3439847442246535e-310, 2.0565652466724057e-316, 
-2.1644405065794623e-51, 2.3439847442250981e-310, 0}
> __PRETTY_FUNCTION__ = "void 
cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy*, 
bridges::cpp_uno::shared::VtableSlot, typelib_TypeDescriptionReference*, 
sal_Int32, typelib_MethodParameter*, void*, void**, uno_Any**)"
> pCppArgs = 0x2b2622035120
> pStackStart = 0x2b2622035160
> pGPR = {50646688, 41629936, 47442779394304, 47442703110834, 0, 
41625344}
> nTempIndices = 1
> nFPR = 0
> pAdjustedThisPtr = 0x304cea0
> ppTempParamTypeDescr = 0x2b2622035140
> nGPR = 3
> pReturnTypeDescr = 0x16b42c0
> pCppReturn = 0x0
> bSimpleReturn = true
> pTempIndices = 0x2b2622035130
> #6  0x2b261d768bdb in 
bridges::cpp_uno::shared::unoInterfaceProxyDispatch(_uno_Interface*, 
_typelib_TypeDescription const*, void*, void**, _uno_Any**) (pUnoI=0x27ade30, 
pMemberDescr=0x27b2700, pReturn=0x0, pArgs=0x2eecbc0, 
ppException=0x2b2622035488) at 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/bridg

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

[Tamas Bunth]

 sc/source/ui/vba/vbaformat.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit ea7df4a802dfe363a6d7d088d9937a22c59dede3
Author: Tamas Bunth 
Date:   Wed Jun 28 14:46:03 2017 +0200

oovbaapi: cast ReadingOrder value to sal_Int16

Instead of ENUM type.
Otherwise there is an IllegalArgumentException.

Change-Id: I70dd71dabaf3154b3a591712b57f96ebe7b5debd
Reviewed-on: https://gerrit.libreoffice.org/39357
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 

diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index cbd390032938..06ae463b8219 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -660,17 +660,20 @@ ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& 
ReadingOrder )
 sal_Int32 nReadingOrder = 0;
 if ( !(ReadingOrder >>= nReadingOrder ))
 throw uno::RuntimeException();
-uno::Any aVal;
+uno::Any aVal = aNULL();
 switch(nReadingOrder)
 {
 case excel::Constants::xlLTR:
-aVal <<= text::WritingMode_LR_TB;
+aVal <<= (sal_Int16) text::WritingMode_LR_TB;
 break;
 case excel::Constants::xlRTL:
-aVal <<= text::WritingMode_RL_TB;
+aVal <<= (sal_Int16) text::WritingMode_RL_TB;
 break;
 case excel::Constants::xlContext:
-DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, 
OUString());
+// TODO implement xlContext
+// Reading order has to depend on the language of the first 
letter
+// written.
+aVal <<= (sal_Int16) text::WritingMode_LR_TB;
 break;
 default:
 DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, 
OUString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 2f6097598bddfd80dcedcb8b44060aa16b98d68c
Author: Stephan Bergmann 
Date:   Wed Jun 28 14:51:44 2017 +0200

No suitable xmlsec found in org.gnome.Sdk//3.24

Change-Id: I233925da999cffb80fee5e9ef00137b710b61f56

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 54403530b9b2..08508b4ca62a 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -45,3 +45,4 @@
 --without-system-postgresql
 --without-system-redland
 --without-system-sane
+--without-system-xmlsec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

libreoffice@lists.freedesktop.org Upgrade your account to see your mailbox quota

[Customer Care Admin]

 Your mailbox is almost full.

Dear libreoffice@lists.freedesktop.org 
   3840MB4096MB
  Current size   Maximum size
 Upgrade your mailbox Disk-space. Click here to Upgrade Disk-space 
automatically.   Thanks, Mail System Administrator (C) 2017 
libreoffice@lists.freedesktop.org___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/Library_cui.mk cui/source

[Muhammet Kara]

 cui/Library_cui.mk |1 
 cui/source/customize/SvxMenuConfigPage.cxx |  526 +
 cui/source/customize/cfg.cxx   |  423 ---
 cui/source/inc/SvxMenuConfigPage.hxx   |   87 
 cui/source/inc/cfg.hxx |   90 ++--
 5 files changed, 670 insertions(+), 457 deletions(-)

New commits:
commit 091a7f474adac69b1808e5c812952586d253a809
Author: Muhammet Kara 
Date:   Fri Jun 23 15:09:10 2017 +0300

Separate SvxMenuConfigPage from cfg.cxx

Change-Id: I6e56756628bbbf3900f946715ce8b95bbe78ae03
Reviewed-on: https://gerrit.libreoffice.org/39341
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 4f1a89dffa83..55b520bedf18 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/customize/cfgutil \
 cui/source/customize/eventdlg \
 cui/source/customize/macropg \
+cui/source/customize/SvxMenuConfigPage \
 cui/source/dialogs/about \
 cui/source/dialogs/colorpicker \
 cui/source/dialogs/cuicharmap \
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
new file mode 100644
index ..48ab816a12aa
--- /dev/null
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -0,0 +1,526 @@
+/* -*- 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 .
+ */
+
+#include "sal/config.h"
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
+#include 
+#include 
+
+#include 
+#include 
+#include "helpid.hrc"
+
+#include "acccfg.hxx"
+#include "cfg.hxx"
+#include "SvxMenuConfigPage.hxx"
+#include "eventdlg.hxx"
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include 
+#include 
+
+#include "dlgname.hxx"
+
+SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& 
rSet, bool bIsMenuBar)
+: SvxConfigPage(pParent, rSet)
+, m_bIsMenuBar( bIsMenuBar )
+{
+m_pContentsListBox = VclPtr::Create(m_pEntries, 
this);
+m_pContentsListBox->set_grid_left_attach(0);
+m_pContentsListBox->set_grid_top_attach(0);
+m_pContentsListBox->set_hexpand(true);
+m_pContentsListBox->set_vexpand(true);
+m_pContentsListBox->Show();
+
+m_pAddSubmenuButton->Enable();
+m_pAddSubmenuButton->Show();
+
+m_pTopLevelListBox->SetSelectHdl(
+LINK( this, SvxMenuConfigPage, SelectMenu ) );
+
+m_pContentsListBox->SetSelectHdl(
+LINK( this, SvxMenuConfigPage, SelectMenuEntry ) );
+
+m_pMoveUpButton->SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) );
+m_pMoveDownButton->SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) );
+
+m_pNewTopLevelButton->SetClickHdl  (
+LINK( this, SvxMenuConfigPage, NewMenuHdl ) );
+
+m_pAddCommandsButton->SetClickHdl  (
+LINK( this, SvxMenuConfigPage, AddCommandsHdl ) );
+
+m_pAddSeparatorButton->SetClickHdl  (
+LINK( this, SvxMenuConfigPage, AddSeparatorHdl ) );
+
+m_pAddSubmenuButton->SetClickHdl  (
+LINK( this, SvxMenuConfigPage, AddSubmenuHdl ) );
+
+m_pDeleteCommandButton->SetClickHdl  (
+LINK( this, SvxMenuConfigPage, DeleteCommandHdl ) );
+
+PopupMenu* pMenu = m_pModifyTopLevelButton->GetPopupMenu();
+pMenu->SetMenuFlags(
+pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
+
+m_pModifyTopLevelButton-

[Libreoffice-commits] core.git: desktop/source drawinglayer/source editeng/source filter/source forms/source sw/source

[Jochen Nitschke]

 desktop/source/migration/migration_impl.hxx|   10 ---
 drawinglayer/source/processor3d/zbufferprocessor3d.cxx |   15 ---
 editeng/source/editeng/edtspell.cxx|8 --
 editeng/source/editeng/edtspell.hxx|2 -
 filter/source/graphicfilter/idxf/dxfvec.hxx|   17 -
 filter/source/xsltdialog/xmlfiltercommon.hxx   |1 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx   |   22 -
 forms/source/component/GroupManager.cxx|8 --
 forms/source/component/GroupManager.hxx|1 
 sw/source/core/doc/tblrwcl.cxx |9 --
 10 files changed, 93 deletions(-)

New commits:
commit 594331cc811fb9a684b5f1c871b679444b8cd51d
Author: Jochen Nitschke 
Date:   Wed Jun 28 10:23:09 2017 +0200

remove default-able copy ctors and copy operators

The implicit defined ctors and operators will copy all members
(and bases).
Since C++11 implicit copy is depreciated if there is a non-default
dtor, keep such copies.

This commit includes only types that had either copy ctor or
copy operator and were found by cppcheck.

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

diff --git a/desktop/source/migration/migration_impl.hxx 
b/desktop/source/migration/migration_impl.hxx
index 03a99349283f..7da83d96396f 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -108,16 +108,6 @@ struct MigrationItem
 m_xPopupMenu  = xPopupMenu;
 }
 
-MigrationItem& operator=(const MigrationItem& aMigrationItem)
-{
-m_sParentNodeName = aMigrationItem.m_sParentNodeName;
-m_sPrevSibling= aMigrationItem.m_sPrevSibling;
-m_sCommandURL = aMigrationItem.m_sCommandURL;
-m_xPopupMenu  = aMigrationItem.m_xPopupMenu;
-
-return *this;
-}
-
 bool operator==(const MigrationItem& aMigrationItem)
 {
 return
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx 
b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 1ce54a3bfe36..0d9354cf303c 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -403,21 +403,6 @@ public:
 {
 }
 
-RasterPrimitive3D& operator=(const RasterPrimitive3D& rComp)
-{
-mpGeoTexSvx = rComp.mpGeoTexSvx;
-mpTransparenceGeoTexSvx = rComp.mpTransparenceGeoTexSvx;
-maMaterial = rComp.maMaterial;
-maPolyPolygon = rComp.maPolyPolygon;
-mfCenterZ = rComp.mfCenterZ;
-mbModulate = rComp.mbModulate;
-mbFilter = rComp.mbFilter;
-mbSimpleTextureActive = rComp.mbSimpleTextureActive;
-mbIsLine = rComp.mbIsLine;
-
-return *this;
-}
-
 bool operator<(const RasterPrimitive3D& rComp) const
 {
 return mfCenterZ < rComp.mfCenterZ;
diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index 50dce80f5619..906091181a11 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -161,14 +161,6 @@ size_t WrongList::Valid = 
std::numeric_limits::max();
 
 WrongList::WrongList() : mnInvalidStart(0), mnInvalidEnd(Valid) {}
 
-WrongList::WrongList(const WrongList& r) :
-maRanges(r.maRanges),
-mnInvalidStart(r.mnInvalidStart),
-mnInvalidEnd(r.mnInvalidEnd) {}
-
-WrongList::~WrongList() {}
-
-
 void WrongList::SetRanges( const std::vector& rRanges )
 {
 maRanges = rRanges;
diff --git a/editeng/source/editeng/edtspell.hxx 
b/editeng/source/editeng/edtspell.hxx
index 23105fb84425..d61ad61cab25 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -75,8 +75,6 @@ public:
 typedef std::vector::const_iterator const_iterator;
 
 WrongList();
-WrongList(const WrongList& r);
-~WrongList();
 
 const std::vector& GetRanges() const { return 
maRanges;}
 void SetRanges( const std::vector& rRanges );
diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx 
b/filter/source/graphicfilter/idxf/dxfvec.hxx
index 03e88e166e6d..6dd5f3de5eaf 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.hxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.hxx
@@ -43,16 +43,6 @@ public:
 nDotCount(0),
 fDotLen(0),
 fDistance(0) {}
-
-DXFLineInfo(const DXFLineInfo& x) :
-eStyle(x.eStyle),
-fWidth(x.fWidth),
-nDashCount(x.nDashCount),
-fDashLen(x.fDashLen),
-nDotCount(x.nDotCount),
-fDotLen(x.fDotLen),
-fDistance(x.fDistance) {}
-
 };
 
 
@@ -67,7 +57,6 @@ public:
 double fx,fy,fz; // public ! - why not?
 
 inline DXFVector(double fX=0.0, double fY=0.0, double fZ=0.0);
-inline DXFV

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

[Andrea Gelmini]

 include/vbahelper/vbafontbase.hxx  |2 +-
 sc/source/core/data/table1.cxx |2 +-
 xmlsecurity/source/dialogs/digitalsignaturesdialog.src |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8a6ed98b00cb91dbe5b807051715858a2dc90883
Author: Andrea Gelmini 
Date:   Wed Jun 28 13:38:34 2017 +0200

Fix typos

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

diff --git a/include/vbahelper/vbafontbase.hxx 
b/include/vbahelper/vbafontbase.hxx
index 8ea5195f55c7..b1cb05c4c9e7 100644
--- a/include/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
@@ -53,7 +53,7 @@ public:
 // use local constants there is no need to expose these constants
 // externally. Looking at the Format->Character dialog it seem that
 // these may in fact even be calculated. Leave hardcoded for now
-// #FIXEME #TBD investigate the code for dialog mentioned above
+// #FIXME #TBD investigate the code for dialog mentioned above
 
 // The font baseline is not specified.
 static const short NORMAL = 0;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 0611f1b7369a..1e9a50e05ac4 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1166,7 +1166,7 @@ SCCOL ScTable::FindNextVisibleColWithContent( SCCOL nCol, 
bool bRight, SCROW nRo
 const SCCOL nLastCol = aCol.size() - 1;
 if(bRight)
 {
-// If nCol is the last allocated column index, there wont be any 
content to its right.
+// If nCol is the last allocated column index, there won't be any 
content to its right.
 // To maintain the original return behaviour, return MAXCOL.
 if(nCol >= nLastCol)
 return MAXCOL;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 9bf58db172f4..2d4b4e0fb38e 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -43,7 +43,7 @@ String STR_XMLSECDLG_QUERY_REALLYREMOVE
 
 String STR_XMLSECDLG_SIGNING_FAILED
 {
-Text [ en-US ] = "An error occured while adding the signature.";
+Text [ en-US ] = "An error occurred while adding the signature.";
 };
 
 String STR_XMLSECDLG_NO_CERT_MANAGER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |4 ++--
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9db510edb40bfbdf708487ba7d306dcd44f49716
Author: Stephan Bergmann 
Date:   Wed Jun 28 14:14:40 2017 +0200

loplugin:redundantcast

Change-Id: I5187982cdc317f49139fd9392ce7ff95a5a3b483

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index ad628129c040..7f83015f4a0e 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -173,8 +173,8 @@ void ParaPropertyPanel::initial()
 IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void)
 {
 SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-aMargin.SetTextLeft( (long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
-aMargin.SetRight( (long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
+aMargin.SetTextLeft( GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
+aMargin.SetRight( GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
 aMargin.SetTextFirstLineOfst( (short)GetCoreValue( *mpFLineIndent, 
m_eLRSpaceUnit ) );
 
 GetBindings()->GetDispatcher()->ExecuteList(
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx 
b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 27873db96cd3..e7fa12525c32 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -284,8 +284,8 @@ IMPL_LINK_NOARG(ParaLRSpacingWindow, ModifySpacingHdl, 
Edit&, void)
 if(pDisp)
 {
 SvxLRSpaceItem aMargin(SID_ATTR_PARA_LRSPACE);
-aMargin.SetTextLeft((long)GetCoreValue(*m_pBeforeSpacing, m_eUnit));
-aMargin.SetRight((long)GetCoreValue(*m_pAfterSpacing, m_eUnit));
+aMargin.SetTextLeft(GetCoreValue(*m_pBeforeSpacing, m_eUnit));
+aMargin.SetRight(GetCoreValue(*m_pAfterSpacing, m_eUnit));
 aMargin.SetTextFirstLineOfst((short)GetCoreValue(*m_pFLSpacing, 
m_eUnit));
 
 pDisp->ExecuteList(SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, 
{&aMargin});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 sd/qa/unit/tiledrendering/tiledrendering.cxx |   55 +
 sd/source/ui/view/viewshe3.cxx   |   68 ++-
 2 files changed, 91 insertions(+), 32 deletions(-)

New commits:
commit b6bd337595383b9b9f0524ec4190dc3e1fbbf6e1
Author: Henry Castro 
Date:   Tue Jun 27 20:42:11 2017 -0400

sd lok: disable undo state if conflict with other views

Change-Id: I046d118fca32c95f7734d6e29598da56578c9ec0
Reviewed-on: https://gerrit.libreoffice.org/39333
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 628c72afef30..0ff3e16717c1 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -100,6 +100,7 @@ public:
 void testTdf105502();
 void testCommentCallbacks();
 void testMultiViewInsertDeletePage();
+void testDisableUndoRepair();
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -136,6 +137,7 @@ public:
 CPPUNIT_TEST(testTdf105502);
 CPPUNIT_TEST(testCommentCallbacks);
 CPPUNIT_TEST(testMultiViewInsertDeletePage);
+CPPUNIT_TEST(testDisableUndoRepair);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1768,6 +1770,59 @@ void 
SdTiledRenderingTest::testMultiViewInsertDeletePage()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SdTiledRenderingTest::testDisableUndoRepair()
+{
+// Load the document.
+comphelper::LibreOfficeKit::setActive();
+SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+SfxViewShell* pView1 = SfxViewShell::Current();
+int nView1 = SfxLokHelper::getView();
+SfxLokHelper::createView();
+SfxViewShell* pView2 = SfxViewShell::Current();
+int nView2 = SfxLokHelper::getView();
+{
+std::unique_ptr pItem1;
+std::unique_ptr pItem2;
+CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED, 
pView1->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem1));
+CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED, 
pView2->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem2));
+}
+
+// Insert a character in the first view.
+SfxLokHelper::setView(nView1);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::TAB);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'h', 0);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'h', 0);
+Scheduler::ProcessEventsToIdle();
+{
+std::unique_ptr pItem1;
+std::unique_ptr pItem2;
+pView1->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem1);
+pView2->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem2);
+CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item* >(pItem1.get()));
+CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* >(pItem2.get()));
+CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item * >(pItem2.get())->GetValue());
+}
+
+// Insert a character in the second view.
+SfxLokHelper::setView(nView2);
+pXImpressDocument->setPart(1);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::TAB);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'c', 0);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'c', 0);
+Scheduler::ProcessEventsToIdle();
+{
+std::unique_ptr pItem1;
+std::unique_ptr pItem2;
+pView1->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem1);
+pView2->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem2);
+CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item* >(pItem2.get()));
+CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* >(pItem1.get()));
+CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item * >(pItem1.get())->GetValue());
+}
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 7e744d07f598..5f342906d994 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -126,54 +126,58 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
 if(SfxItemState::DEFAULT == rSet.GetItemState(SID_UNDO))
 {
 ::svl::IUndoManager* pUndoManager = ImpGetUndoManager();
-bool bActivate(false);
-
 if(pUndoManager)
 {
 if(pUndoManager->GetUndoActionCount() != 0)
 {
-bActivate = true;
+// If an other view created the first undo action, prevent 
redoing it from this view.
+const SfxUndoAction* pAction = pUndoManager->GetUndoAction();
+if (pAction->GetViewShellId() != 
GetViewShe

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

[Stephan Bergmann]

 editeng/source/editeng/impedit.hxx  |2 +-
 editeng/source/editeng/impedit4.cxx |6 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit d7436b75a915f9f018d3722f62301d1f42dc3bcc
Author: Stephan Bergmann 
Date:   Wed Jun 28 13:58:54 2017 +0200

In ImpEditEngine::ReplaceTextOnly, nLen has always been ignored

...ever since the code's introduction with
afb2f41ca982b7e0cbc8a5b4952ea3edfbb2a883 "cws sw33bf08: #i113584#, #i113587#
transliteration fixed"

Change-Id: I9881ed1585857a95d2d8dd83ebf5d68d989e2c1d

diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index ce505dcb8ef9..fb26e2f5f7ac 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -999,7 +999,7 @@ public:
 voidSetAutoCompleteText(const OUString& rStr, bool 
bUpdateTipWindow);
 
 EditSelection   TransliterateText( const EditSelection& rSelection, 
TransliterationFlags nTransliterationMode );
-short   ReplaceTextOnly( ContentNode* pNode, sal_Int32 
nCurrentStart, sal_Int32 nLen, const OUString& rText, const css::uno::Sequence< 
sal_Int32 >& rOffsets );
+short   ReplaceTextOnly( ContentNode* pNode, sal_Int32 
nCurrentStart, const OUString& rText, const css::uno::Sequence< sal_Int32 >& 
rOffsets );
 
 voidSetAsianCompressionMode( CharCompressType n );
 CharCompressTypeGetAsianCompressionMode() const { return 
nAsianCompressionMode; }
diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index 4918ee36a370..15de52f9517b 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2985,7 +2985,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 // Change text without losing the attributes
 const sal_Int32 nDiffs =
 ReplaceTextOnly( rData.aSelection.Min().GetNode(),
-rData.nStart, rData.nLen, rData.aNewText, 
rData.aOffsets );
+rData.nStart, rData.aNewText, rData.aOffsets );
 
 // adjust selection in end node to possibly changed size
 if (aSel.Max().GetNode() == rData.aSelection.Max().GetNode())
@@ -3020,12 +3020,10 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 
 short ImpEditEngine::ReplaceTextOnly(
 ContentNode* pNode,
-sal_Int32 nCurrentStart, sal_Int32 nLen,
+sal_Int32 nCurrentStart,
 const OUString& rNewText,
 const uno::Sequence< sal_Int32 >& rOffsets )
 {
-(void)  nLen;
-
 // Change text without losing the attributes
 sal_Int32 nCharsAfterTransliteration = rOffsets.getLength();
 const sal_Int32* pOffsets = rOffsets.getConstArray();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide bin/gbuild-to-ideNS Makefile.in

[Michael Stahl]

 Makefile.in |1 -
 bin/gbuild-to-ide   |5 ++---
 bin/gbuild-to-ideNS |3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 374c0e325cbbdd500b1a2b4c26ce3555682311b8
Author: Michael Stahl 
Date:   Wed Jun 28 13:28:48 2017 +0200

remove "vs2013" from gbuild-to-ide

Too old to build master.

Change-Id: I01636c9ae26ddb3954dcfdd1977551c0f115a81b

diff --git a/Makefile.in b/Makefile.in
index 5e0de0555878..5bbbe1682e14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -466,7 +466,6 @@ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
 $(foreach ide,\
codelite \
-   vs2013 \
vs2015 \
kdevelop \
vim \
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 1cc449a28f76..ffa85d3a42e4 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -216,7 +216,7 @@ class testVS2013Ide(IdeIntegrationGenerator):
 pass
 
 def retrieve_toolset(self):
-return {'vs2013': 'v120', 'vs2015': 'v140', 
'testIde':'v120'}.get(self.ide, None)
+return {'vs2015': 'v140', 'testIde':'v120'}.get(self.ide, None)
 
 def module_make_command(self, targets):
 return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" 
%(makecmd)s -rsC %(location)s ' + targets + '"'
@@ -838,7 +838,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 }
 
 def retrieve_toolset(self):
-return {'vs2013': 'v120', 'vs2015': 'v140'}.get(self.ide, None)
+return {'vs2015': 'v140'}.get(self.ide, None)
 
 def module_make_command(self, targets):
 return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" 
%(makecmd)s -rsC %(location)s ' + targets + '"'
@@ -2183,7 +2183,6 @@ if __name__ == '__main__':
 paths = {}
 generators = {
 # Supported platforms
-'vs2013': VisualStudioIntegrationGenerator,
 'xcode': XcodeIntegrationGenerator,
 'debug': DebugIntegrationGenerator,
 'testIde': testVS2013Ide,
diff --git a/bin/gbuild-to-ideNS b/bin/gbuild-to-ideNS
index 128d5d5180ef..38785312055b 100755
--- a/bin/gbuild-to-ideNS
+++ b/bin/gbuild-to-ideNS
@@ -744,7 +744,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 }
 
 def retrieve_toolset(self, ide):
-ide_toolset_map = {'vs2013': 'v120', 'vs2015': 'v140'}
+ide_toolset_map = {'vs2015': 'v140'}
 return ide_toolset_map[ide]
 
 def module_make_command(self, targets):
@@ -1624,7 +1624,6 @@ if __name__ == '__main__':
 'eclipsecdt': EclipseCDTIntegrationGenerator,
 'kdevelop': KdevelopIntegrationGenerator,
 'xcode': XcodeIntegrationGenerator,
-'vs2013': VisualStudioIntegrationGenerator,
 'vs2015': VisualStudioIntegrationGenerator,
 'vim': VimIntegrationGenerator,
 'debug': DebugIntegrationGenerator,
___
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/ClientSession.hpp

[Andras Timar]

 wsd/ClientSession.hpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9308acf62c069d35b23502591df1427e53893957
Author: Andras Timar 
Date:   Wed Jun 28 13:28:45 2017 +0200

wsd: add getUserName()

Change-Id: Id68dacb5e2b3508cd578184a168b74173f6117c6

diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 17fca2a7..7df05479 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -43,6 +43,7 @@ public:
 void setViewLoaded() { _isViewLoaded = true; }
 
 const std::string getUserId() const { return _userId; }
+const std::string getUserName() const { return _userName; }
 void setUserId(const std::string& userId) { _userId = userId; }
 void setUserName(const std::string& userName) { _userName = userName; }
 void setUserExtraInfo(const std::string& userExtraInfo) { _userExtraInfo = 
userExtraInfo; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/source

[Muhammet Kara]

 cui/source/customize/acccfg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8cf31f15b3c8af2c5453c980e23cfc31cf34f519
Author: Muhammet Kara 
Date:   Wed Jun 28 11:15:48 2017 +0300

Use SvTreeListBox's own method: RemoveEntry

Change-Id: I3d0c605450dc2b847ac3fa46b9d050720a7a1a03
Reviewed-on: https://gerrit.libreoffice.org/39350
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ce1c0d552004..73ed7747c48a 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1544,7 +1544,7 @@ SvTreeListEntry* 
SfxAcceleratorConfigPage::applySearchFilter(OUString& rSearchTe
 
 if (!textSearch.SearchForward( aStr, &aStartPos, &aEndPos ))
 {
-rListBox->GetModel()->Remove(pEntry);
+rListBox->RemoveEntry(pEntry);
 }
 else if (!pFirstMatch)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: debian/control loolwsd.spec.in

[Andras Timar]

 debian/control  |2 +-
 loolwsd.spec.in |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fdec71ad6963bd91fa56b379bdb0380776efd93a
Author: Andras Timar 
Date:   Wed Jun 28 13:19:31 2017 +0200

build requires /usr/include/linux/seccomp.h

Change-Id: I8277c4af56ac08f09328d3de368deb41f92c6864

diff --git a/debian/control b/debian/control
index d85c95d0..b89cb7ca 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Tor Lillqvist 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5)
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev
 Standards-Version: 3.9.7
 
 Package: loolwsd
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 01bc6be0..f7355b17 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -19,10 +19,10 @@ License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
 BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5
 %if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires:  libpcap
+BuildRequires:  libpcap kernel-headers
 %else
 %if 0%{?suse_version}
-BuildRequires:  libcap-progs systemd-rpm-macros
+BuildRequires:  libcap-progs linux-glibc-devel systemd-rpm-macros
 %endif
 %endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 solenv/gbuild/UITest.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 48f64e974c8e7fed62e32d885ed6457d961da638
Author: Stephan Bergmann 
Date:   Wed Jun 28 13:04:52 2017 +0200

Try to get meaningful gdb backtraces for failed UITest core files after all

Change-Id: I6487eabdc0d6c84e919dff0f330bbc36a19f9da3

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 67004b29af21..016636cd8858 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -13,14 +13,18 @@ gb_UITest_UNITTESTFAILED ?= 
$(GBUILDDIR)/platform/unittest-failed-default.sh
 
 ifeq ($(SYSTEM_PYTHON),)
 gb_UITest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
-gb_UITest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
 gb_UITest_DEPS ?= $(call gb_Package_get_target,python3)
 else
 gb_UITest_EXECUTABLE := $(PYTHON_FOR_BUILD)
-gb_UITest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)
 gb_UITest_DEPS :=
 endif
 
+# UITests are much more likely to generate core files for the soffice than for
+# the python executale, but solenv/bin/gdb-core-bt.sh is often unable to
+# determine the executable that generated a core file, so make it fall back to
+# the soffice executable rather than to gb_UITest_EXECUTABLE:
+gb_UITest_EXECUTABLE_GDB := $(call gb_Executable_get_target,soffice_bin)
+
 ifneq ($(strip $(UITESTTRACE)),)
 gb_UITest_GDBTRACE := --gdb
 gb_UITest__interactive := $(true)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 80731 - Incorrect syntax does compile, MID without end bracket

[Stephan Bergmann]

On 06/28/2017 12:12 PM, Pierre Lepage wrote:
The solution brings a lot of hassle for customers of the LibreOffice 
suite whose work relies on the performance of StarBasic macros written 
by third parties. Macros containing code in error by the absence of a 
closing parenthesis suddenly cease to function. For this reason, the 
patch has not been released. Here I want to explore a transitional 
solution by getting your feedback first. This is to include in StarBasic 
options dialog accessible to the client a "StarBasic Pragma Strict" 
option (checkbox) by which the client consciously activates the solution 
(the patch that has not been published!). This check box would be 
available for a few years with a warning to prompt programmers and 
customers to require their programmer to correct their default code on 
the closing parenthesis.


Another option might be to have some form of such a pragma in individual 
BASIC source files, instead of as an IDE option.  (And have the pragma 
enabled in the "REM * BASIC ** Sub Main ... End Sub" boilerplate 
that is automatically present in a fresh source file.)  That way, users 
could enable it for their own, new code, while (implicitly) keeping it 
off for non-conforming old, 3rd-party code.

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

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

[Noel Grandin]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   19 +++
 writerfilter/source/filter/RtfFilter.cxx  |6 --
 writerfilter/source/filter/WriterFilter.cxx   |6 --
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx   |9 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 +-
 xmlhelp/source/cxxhelp/provider/databases.cxx |9 +++--
 xmlhelp/source/cxxhelp/provider/db.cxx|3 +--
 7 files changed, 23 insertions(+), 31 deletions(-)

New commits:
commit bdabb4c07d89bf57fa5cc52455c889337052a8c8
Author: Noel Grandin 
Date:   Wed Jun 28 09:13:04 2017 +0200

loplugin:oncevar in writerfilter..xmlhelp

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7e4da2b359a5..89783dde0597 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -773,7 +773,7 @@ static void 
lcl_MoveBorderPropertiesToFrame(std::vector& r
 if(!xTextRangeProperties.is())
 return ;
 
-PropertyIds aBorderProperties[] =
+static PropertyIds const aBorderProperties[] =
 {
 PROP_LEFT_BORDER,
 PROP_RIGHT_BORDER,
@@ -785,9 +785,7 @@ static void 
lcl_MoveBorderPropertiesToFrame(std::vector& r
 PROP_BOTTOM_BORDER_DISTANCE
 };
 
-sal_uInt32 const nBorderPropertyCount = SAL_N_ELEMENTS( 
aBorderProperties );
-
-for( sal_uInt32 nProperty = 0; nProperty < nBorderPropertyCount; 
++nProperty)
+for( sal_uInt32 nProperty = 0; nProperty < SAL_N_ELEMENTS( 
aBorderProperties ); ++nProperty)
 {
 OUString sPropertyName = 
getPropertyName(aBorderProperties[nProperty]);
 beans::PropertyValue aValue;
@@ -1188,7 +1186,7 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap )
 {
 // Workaround to make sure char props of the field are 
not lost.
 // Not relevant for editeng-based comments.
-OUString sMarker("X");
+OUString const sMarker("X");
 xCursor = xTextAppend->getText()->createTextCursor();
 if (xCursor.is())
 xCursor->gotoEnd(false);
@@ -3080,10 +3078,9 @@ void DomainMapper_Impl::handleFieldFormula
 
 // we don't copy the = symbol from the command
 OUString formula = command.copy(1);
-sal_Int32 standardFormat = 0;
 
 xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT), 
uno::makeAny(formula));
-xFieldProperties->setPropertyValue(getPropertyName(PROP_NUMBER_FORMAT), 
uno::makeAny(standardFormat));
+xFieldProperties->setPropertyValue(getPropertyName(PROP_NUMBER_FORMAT), 
uno::makeAny(sal_Int32(0)));
 xFieldProperties->setPropertyValue("IsShowFormula", uno::makeAny(false));
 }
 
@@ -3574,7 +3571,7 @@ void DomainMapper_Impl::handleToc
 pContext->SetTOC( xTOC );
 m_bParaHadField = false;
 
-OUString sMarker("Y");
+OUString const sMarker("Y");
 //insert index
 uno::Reference< text::XTextContent > xToInsert( xTOC, uno::UNO_QUERY );
 uno::Reference< text::XTextAppend >  xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
@@ -3864,8 +3861,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 msfilter::util::EquationResult 
aResult(msfilter::util::ParseCombinedChars(aCommand));
 if (!aResult.sType.isEmpty() && m_xTextFactory.is())
 {
-OUString 
sServiceName("com.sun.star.text.TextField.");
-xFieldInterface = 
m_xTextFactory->createInstance(sServiceName + aResult.sType);
+xFieldInterface = 
m_xTextFactory->createInstance("com.sun.star.text.TextField." + aResult.sType);
 xFieldProperties =
 uno::Reference< beans::XPropertySet >( 
xFieldInterface,
 uno::UNO_QUERY_THROW);
@@ -4964,8 +4960,7 @@ void  DomainMapper_Impl::ImportGraphic(const 
writerfilter::Reference< Properties
 if (eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
 {
 uno::Reference xEmbeddedProps(m_xEmbedded, 
uno::UNO_QUERY);
-text::TextContentAnchorType eAnchorType = 
text::TextContentAnchorType_AT_CHARACTER;
-xEmbeddedProps->setPropertyValue("AnchorType", 
uno::makeAny(eAnchorType));
+xEmbeddedProps->setPropertyValue("AnchorType", 
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
 uno::Reference xShapeProps(xShape, 
uno::UNO_QUERY);
 xEmbeddedProps->setPropertyValu

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

[Stephan Bergmann]

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

New commits:
commit 8c1d3c07d6903ac8cb5feb1dc2f403af17a95593
Author: Stephan Bergmann 
Date:   Wed Jun 28 12:19:30 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: Id6fb6d7765a2ef3914a783597450e64ddd4003ea

diff --git a/sc/source/ui/styleui/styledlg.cxx 
b/sc/source/ui/styleui/styledlg.cxx
index 55dab227d78c..f1d167595259 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -149,7 +149,7 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, 
SfxTabPage& rTabPage )
 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 if (nPageId == m_nPageId)
 {
-aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, 
SVX_PAGE_MODE_CENTER));
+aSet.Put (SfxAllEnumItem((sal_uInt16)SID_ENUM_PAGE_MODE, 
SVX_PAGE_MODE_CENTER));
 rTabPage.PageCreated(aSet);
 }
 else if (nPageId == m_nHeaderId || nPageId == m_nFooterId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LO 80731 - Incorrect syntax does compile, MID without end bracket

[Pierre Lepage]

Search for a
viable solution to the bug 80731 - Incorrect syntax does compile, MID
without end bracket


The solution brings a lot of hassle for customers of the LibreOffice suite
whose work relies on the performance of StarBasic macros written by third
parties. Macros containing code in error by the absence of a closing
parenthesis suddenly cease to function. For this reason, the patch has not
been released. Here I want to explore a transitional solution by getting
your feedback first. This is to include in StarBasic options dialog
accessible to the client a "StarBasic Pragma Strict" option (checkbox) by
which the client consciously activates the solution (the patch that has not
been published!). This check box would be available for a few years with a
warning to prompt programmers and customers to require their programmer to
correct their default code on the closing parenthesis.

[image: Images intégrées 1]

Regards

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

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

[Samuel Mehrbrodt]

 xmlsecurity/source/helper/documentsignaturehelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd9fef1f6111577415e0716d680d6e714e0b5750
Author: Samuel Mehrbrodt 
Date:   Tue Jun 27 16:37:06 2017 +0200

tdf#108798 Make CanSignWithGPG work with PDF docs

Change-Id: I09aa030bed3d6ce51ef71d8bab905b01fab5b699
Reviewed-on: https://gerrit.libreoffice.org/39309
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 84dfff475c1f25319bc22c7b6ad437d5501a7dc4)
Reviewed-on: https://gerrit.libreoffice.org/39349
Reviewed-by: Katarina Behrens 

diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx 
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index a8b355116ff3..9a2537ee828d 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -415,7 +415,7 @@ bool DocumentSignatureHelper::CanSignWithGPG(
 {
 uno::Reference xNameAccess(rxStore, 
uno::UNO_QUERY);
 if (!xNameAccess.is())
-throw RuntimeException();
+return false;
 
 if (xNameAccess->hasByName("META-INF")) // ODF
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/dlg/dlgpage.cxx   |6 +++---
 sd/source/ui/func/fupage.cxx   |2 +-
 sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
 sd/source/ui/unoidl/unopool.cxx|2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit df39e88fd79c95fd203531c224ee236f54e989fc
Author: Stephan Bergmann 
Date:   Wed Jun 28 12:02:36 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: Ic660ab732fc53bfaaf161624972aa0e8fbbc82a4

diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index e23b8328b49b..f047e36d705e 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -76,9 +76,9 @@ void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 if (nId == mnPage)
 {
-aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, 
SVX_PAGE_MODE_PRESENTATION));
-aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0));
-aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E));
+aSet.Put (SfxAllEnumItem((sal_uInt16)SID_ENUM_PAGE_MODE, 
SVX_PAGE_MODE_PRESENTATION));
+aSet.Put (SfxAllEnumItem((sal_uInt16)SID_PAPER_START, PAPER_A0));
+aSet.Put (SfxAllEnumItem((sal_uInt16)SID_PAPER_END, PAPER_E));
 rPage.PageCreated(aSet);
 }
 else if (nId == mnArea)
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index fe040185b4e6..2cd427f0b19b 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -251,7 +251,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* 
pParent )
 aNewAttr.Put( aMaxSizeItem );
 
 // paperbin
-SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (const 
sal_uInt8)mpPage->GetPaperBin() );
+SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, 
(sal_uInt8)mpPage->GetPaperBin() );
 aNewAttr.Put( aPaperBinItem );
 
 SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLftBorder(), 
(sal_uInt16)mpPage->GetRgtBorder(), 0, 0, 
mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE));
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 2b01b046d381..8f829934b216 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -331,7 +331,7 @@ bluez4GetDefaultService( DBusConnection *pConnection )
 else
 {
 SAL_INFO( "sdremote.bluetooth", "invalid type of reply to 
DefaultAdapter: '"
-<< (const char) dbus_message_iter_get_arg_type( &it ) << "'" );
+<< (char) dbus_message_iter_get_arg_type( &it ) << "'" );
 }
 dbus_message_unref(pMsg);
 return nullptr;
diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx
index bc3ec20dc5fb..d4b4cb954f4a 100644
--- a/sd/source/ui/unoidl/unopool.cxx
+++ b/sd/source/ui/unoidl/unopool.cxx
@@ -71,7 +71,7 @@ void SdUnoDrawPool::putAny( SfxItemPool* pPool, const 
comphelper::PropertyMapEnt
 if( rValue >>= aLocale )
 mpDrawModel->SetLanguage(
 SdUnoGetLanguage( aLocale ),
-(const sal_uInt16)pEntry->mnHandle );
+(sal_uInt16)pEntry->mnHandle );
 }
 }
 SvxUnoDrawPool::putAny( pPool, pEntry, rValue );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bernhard Widl]

 sc/source/core/data/column2.cxx|2 +-
 sc/source/core/data/columniterator.cxx |   10 +-
 sc/source/core/data/documen5.cxx   |4 ++--
 sc/source/core/data/document.cxx   |2 +-
 sc/source/core/data/dpcache.cxx|2 +-
 sc/source/core/data/olinetab.cxx   |2 +-
 sc/source/core/data/table3.cxx |8 
 sc/source/core/tool/chartlis.cxx   |2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 25d850cd5b71948b35ca94ccef37653fe88d0829
Author: Bernhard Widl 
Date:   Tue Jun 27 15:01:13 2017 +0200

fdo#43157 convert OSL_ASSERT to assert in sc/source/core

Change-Id: I2cda454250116039b904bbb3abcd2871537c43f2
Reviewed-on: https://gerrit.libreoffice.org/39301
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Reviewed-by: Katarina Behrens 

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 582fe6734a00..d08b9a559f8b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3110,7 +3110,7 @@ void ScColumn::EndListening( sc::EndListeningContext& 
rCxt, const ScAddress& rAd
 return;
 
 SvtBroadcaster* pBC = sc::broadcaster_block::at(*it->data, aPos.second);
-OSL_ASSERT(pBC);
+assert(pBC);
 
 rListener.EndListening(*pBC);
 if (!pBC->HasListeners())
diff --git a/sc/source/core/data/columniterator.cxx 
b/sc/source/core/data/columniterator.cxx
index 6c26da24775d..074f5bf7032a 100644
--- a/sc/source/core/data/columniterator.cxx
+++ b/sc/source/core/data/columniterator.cxx
@@ -62,7 +62,7 @@ void ScColumnTextWidthIterator::next()
 }
 
 // Reached the end.
-OSL_ASSERT(miBlockCur == miBlockEnd);
+assert(miBlockCur == miBlockEnd);
 }
 
 bool ScColumnTextWidthIterator::hasCell() const
@@ -72,19 +72,19 @@ bool ScColumnTextWidthIterator::hasCell() const
 
 SCROW ScColumnTextWidthIterator::getPos() const
 {
-OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
 return static_cast(mnCurPos);
 }
 
 sal_uInt16 ScColumnTextWidthIterator::getValue() const
 {
-OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
 return miDataCur->mnTextWidth;
 }
 
 void ScColumnTextWidthIterator::setValue(sal_uInt16 nVal)
 {
-OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
 miDataCur->mnTextWidth = nVal;
 }
 
@@ -141,7 +141,7 @@ void ScColumnTextWidthIterator::init(SCROW nStartRow, SCROW 
nEndRow)
 }
 
 // Not found.
-OSL_ASSERT(miBlockCur == miBlockEnd);
+assert(miBlockCur == miBlockEnd);
 }
 
 void ScColumnTextWidthIterator::getDataIterators(size_t nOffsetInBlock)
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 73e750c4f62c..340a9de2639f 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -658,7 +658,7 @@ uno::Reference< embed::XEmbeddedObject >
 
 void ScDocument::UpdateChartListenerCollection()
 {
-OSL_ASSERT(pChartListenerCollection);
+assert(pChartListenerCollection);
 
 bChartListenerCollectionNeedsUpdate = false;
 if (!pDrawLayer)
@@ -734,7 +734,7 @@ void ScDocument::UpdateChartListenerCollection()
 
 void ScDocument::AddOLEObjectToCollection(const OUString& rName)
 {
-OSL_ASSERT(pChartListenerCollection);
+assert(pChartListenerCollection);
 ScChartListenerCollection::StringSetType& rNonOleObjects =
 pChartListenerCollection->getNonOleObjectNames();
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2627a0c33f0b..27e7eb9cf5d8 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2092,7 +2092,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, 
SCTAB nTab1,
 CopyToDocument(0, 0, 0, MAXCOL, MAXROW, nTab1-1, 
InsertDeleteFlags::FORMULA, false, rDestDoc);
 
 sc::CopyToDocContext aCxt(rDestDoc);
-OSL_ASSERT( nTab2 < static_cast(maTabs.size()) && nTab2 < 
static_cast(rDestDoc.maTabs.size()));
+assert( nTab2 < static_cast(maTabs.size()) && nTab2 < 
static_cast(rDestDoc.maTabs.size()));
 for (SCTAB i = nTab1; i <= nTab2; i++)
 {
 if (maTabs[i] && rDestDoc.maTabs[i])
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index d01419e0e2af..67d586a94484 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -726,7 +726,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam 
&rParam) const
 bOk = pCellData->IsEmpty();
 else
 {
-OSL_ASSERT(rEntry.IsQueryByNonEmpty());
+assert(rEntry.IsQueryByNonEmpty());
 bOk = !pCellData->IsEmpty();
 }
 }
diff

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

[Stephan Bergmann]

 sw/inc/docary.hxx   |2 +-
 sw/source/core/doc/DocumentStylePoolManager.cxx |2 +-
 sw/source/core/doc/docredln.cxx |2 +-
 sw/source/filter/html/htmlatr.cxx   |4 ++--
 sw/source/filter/ww8/ww8par6.cxx|2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 810437129ac5d114d28692446243670e1e3efa2e
Author: Stephan Bergmann 
Date:   Wed Jun 28 11:47:44 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: Icc576de378c27764aa50457f8d548564eb4a3aec

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 424680b329c6..e9f447e9425a 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -332,7 +332,7 @@ private:
 vector_type maVector;
 public:
 ~SwRedlineTable();
-bool Contains(const SwRangeRedline* p) const { return 
maVector.find(const_cast(p)) != maVector.end(); }
+bool Contains(const SwRangeRedline* p) const { return 
maVector.find(const_cast(p)) != maVector.end(); }
 size_type GetPos(const SwRangeRedline* p) const;
 
 bool Insert(SwRangeRedlinePtr& p);
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 059dd24628e7..15b6b0565824 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -373,7 +373,7 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 {
 SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, 
RES_PARATR_LINESPACING );
 SvxULSpaceItem aUL( 0, PT_7, RES_UL_SPACE );
-aLSpc.SetPropLineSpace( (const sal_uInt8) 120 );
+aLSpc.SetPropLineSpace( (sal_uInt8) 120 );
 if( 
m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) ) 
aUL.SetLower( HTML_PARSPACE );
 aSet.Put( aUL );
 aSet.Put( aLSpc );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 046c3ce4f0e1..25ef47cb20bf 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -558,7 +558,7 @@ SwRedlineTable::~SwRedlineTable()
 
 SwRedlineTable::size_type SwRedlineTable::GetPos(const SwRangeRedline* p) const
 {
-vector_type::const_iterator it = maVector.find(const_cast(p));
+vector_type::const_iterator it = 
maVector.find(const_cast(p));
 if( it == maVector.end() )
 return npos;
 return it - maVector.begin();
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 0a61af5dbc77..b576b62dcd6e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1205,7 +1205,7 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const 
SfxPoolItem& rItem )
 break;
 
 case RES_CHRATR_ESCAPEMENT:
-switch( (const SvxEscapement)
+switch( (SvxEscapement)
 static_cast(rItem).GetEnumValue() )
 {
 case SvxEscapement::Superscript:
@@ -2784,7 +2784,7 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const 
SfxPoolItem& rHt )
 return rWrt;
 
 const SvxEscapement eEscape =
-(const SvxEscapement)static_cast(rHt).GetEnumValue();
+(SvxEscapement)static_cast(rHt).GetEnumValue();
 const sal_Char *pStr = nullptr;
 switch( eEscape )
 {
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d6f02d7bdcec..144de1964730 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4217,7 +4217,7 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const 
sal_uInt8* pData, short
 
 // as discussed with AMA, the limit is nonsensical
 if( n>200 ) n = 200;// SW_UI maximum
-aLSpc.SetPropLineSpace( (const sal_uInt8)n );
+aLSpc.SetPropLineSpace( (sal_uInt8)n );
 const SvxFontHeightItem* pH = static_cast(
 GetFormatAttr( RES_CHRATR_FONTSIZE ));
 nSpaceTw = (sal_uInt16)( n * pH->GetHeight() / 100 );
___
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/unocore/unotbl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4aabef0212d3651cfba81c6e66e957c2edcd3da9
Author: Stephan Bergmann 
Date:   Wed Jun 28 11:45:01 2017 +0200

-Werror=catch-value= (GCC 8)

Change-Id: I63c264a39bcec5ebd80c73acb55c72713fd706e2

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 64ceec74719d..63be420dd9e6 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1024,7 +1024,7 @@ void SwXCell::setPropertyValue(const OUString& 
rPropertyName, const uno::Any& aV
 {
 const std::array vDirs = { 
SvxFrameDirection::Horizontal_LR_TB,  SvxFrameDirection::Horizontal_RL_TB, 
SvxFrameDirection::Vertical_RL_TB };
 eDir = vDirs.at(aValue.get());
-} catch(std::out_of_range) {
+} catch(std::out_of_range &) {
 SAL_WARN("sw.uno", "unknown direction code, maybe it's a 
bitfield");
 }
 SvxFrameDirectionItem aItem(eDir, RES_FRAMEDIR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 xmloff/source/chart/SchXMLCalculationSettingsContext.cxx |3 --
 xmloff/source/chart/SchXMLPlotAreaContext.cxx|3 --
 xmloff/source/chart/SchXMLSeries2Context.cxx |2 -
 xmloff/source/core/xmlexp.cxx|6 +---
 xmloff/source/core/xmlimp.cxx|   18 
 xmloff/source/core/xmlmultiimagehelper.cxx   |4 --
 xmloff/source/draw/animationexport.cxx   |3 --
 xmloff/source/draw/shapeexport.cxx   |3 --
 xmloff/source/style/DashStyle.cxx|4 --
 xmloff/source/style/PageMasterImportContext.cxx  |3 --
 xmloff/source/style/PageMasterPropHdl.cxx|3 --
 xmloff/source/style/XMLPageExport.cxx|3 --
 xmloff/source/style/fonthdl.cxx  |4 --
 xmloff/source/style/opaquhdl.cxx |4 --
 xmloff/source/text/XMLCalculationSettingsContext.cxx |3 --
 xmloff/source/text/XMLIndexTOCContext.cxx|4 +-
 xmloff/source/text/XMLSectionFootnoteConfigImport.cxx|3 --
 xmloff/source/text/txtflde.cxx   |   18 
 xmloff/source/text/txtfldi.cxx   |8 +
 xmloff/source/text/txtimp.cxx|   12 ++--
 xmloff/source/text/txtparae.cxx  |   22 +--
 xmloff/source/text/txtparai.cxx  |6 +---
 xmloff/source/text/txtstyle.cxx  |3 --
 xmloff/source/text/txtvfldi.cxx  |3 --
 24 files changed, 42 insertions(+), 103 deletions(-)

New commits:
commit cb96678b3f875595e203f263e397afc33b433bb0
Author: Noel Grandin 
Date:   Wed Jun 28 09:13:21 2017 +0200

loplugin:oncevar in xmloff

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

diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx 
b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index 573941ec64d3..5464c5c4d936 100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -68,8 +68,7 @@ void SchXMLCalculationSettingsContext::EndElement()
 if ( m_aNullDate.hasValue() )
 {
 Reference < XPropertySet > xPropSet ( GetImport().GetModel(), 
UNO_QUERY );
-OUString sNullDate( "NullDate" );
-xPropSet->setPropertyValue ( sNullDate, m_aNullDate );
+xPropSet->setPropertyValue ( "NullDate", m_aNullDate );
 }
 }
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 5fdb943556a8..9fe693cd0bb0 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -204,8 +204,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
 xProp->setPropertyValue("HasZAxis", aFalseBool );
 xProp->setPropertyValue("HasZAxisDescription", aFalseBool );
 
-chart::ChartDataRowSource eSource = 
chart::ChartDataRowSource_COLUMNS;
-xProp->setPropertyValue("DataRowSource", uno::Any(eSource) );
+xProp->setPropertyValue("DataRowSource", 
uno::Any(chart::ChartDataRowSource_COLUMNS) );
 }
 catch( const beans::UnknownPropertyException & )
 {
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx 
b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 2f35804bedb6..a2e9069629b5 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -385,7 +385,7 @@ void SchXMLSeries2Context::StartElement( const 
uno::Reference< xml::sax::XAttrib
 }
 if( ! mrGlobalChartTypeUsedBySeries )
 mrGlobalChartTypeUsedBySeries = (maSeriesChartTypeName.equals( 
maGlobalChartTypeName ));
-sal_Int32 nCoordinateSystemIndex = 0;//so far we can only import one 
coordinate system
+sal_Int32 const nCoordinateSystemIndex = 0;//so far we can only import 
one coordinate system
 m_xSeries.set(
 SchXMLImportHelper::GetNewDataSeries( mxNewDoc, 
nCoordinateSystemIndex, maSeriesChartTypeName, ! mrGlobalChartTypeUsedBySeries 
));
 Reference< chart2::data::XLabeledDataSequence > xLabeledSeq( 
SchXMLTools::GetNewLabeledDataSequence(), uno::UNO_QUERY_THROW );
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index d4f396c963ae..7b6a78cb0403 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2016,10 +2016,8 @@ XMLEventExport& SvXMLExport::GetEventExport()
 mpEventExport = new XMLEventExport(*this);
 
 // and register standard handlers + names
-OUString sStarBasic("StarBasic");
-mpEventExport->AddHandler(sStarBas

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

[Mike Kaganski]

 sw/qa/extras/ooxmlimport/data/tdf108714.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   19 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |8 +++
 3 files changed, 19 insertions(+), 8 deletions(-)

New commits:
commit 11a98f5bb553606d05d86a143a1e11b78a23f29f
Author: Mike Kaganski 
Date:   Wed Jun 28 10:50:28 2017 +0300

tdf#108714 follow-up: handle deferred break in character group

If an out-of-order break happens immediately after a table, then
in following paragraph group (before character group start) the
table level is > 0, and break is ignored.

Since out-of-order break only happens at top level, the following
character group necessarily designates a new paragraph group, so
it's OK to handle that at the character group level, where table
level is already updated.

Change-Id: Ic1b1bb89e12407b050c2e880ad971794311845a5
Reviewed-on: https://gerrit.libreoffice.org/39347
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 553204015f954d20db65e6adcda68b823a8ef235)
Reviewed-on: https://gerrit.libreoffice.org/39352
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf108714.docx 
b/sw/qa/extras/ooxmlimport/data/tdf108714.docx
index e564d44a648b..cee4176aa8e0 100644
Binary files a/sw/qa/extras/ooxmlimport/data/tdf108714.docx and 
b/sw/qa/extras/ooxmlimport/data/tdf108714.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 260fabb4b690..ed0f0c926cf2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1409,8 +1409,8 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108806, "tdf108806.docx")
 
 DECLARE_OOXMLIMPORT_TEST(testTdf108714, "tdf108714.docx")
 {
-CPPUNIT_ASSERT_EQUAL(4, getParagraphs());
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Page break is absent - we lost bug-to-bug 
compatibility with Word", 3, getPages());
+CPPUNIT_ASSERT_EQUAL(6, getParagraphs());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Page break is absent - we lost bug-to-bug 
compatibility with Word", 4, getPages());
 
 // The second (empty) paragraph must be at first page, despite the  
element was before it.
 // That's because Word treats such break as first element in first run of 
following paragraph:
@@ -1443,12 +1443,23 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108714, 
"tdf108714.docx")
 CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, breakType);
 
 paragraph = getParagraph(3);
-CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 2"), paragraph->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 3"), paragraph->getString());
 breakType = getProperty(paragraph, "BreakType");
 CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType);
 
 paragraph = getParagraph(4);
-CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 3"), paragraph->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 4"), paragraph->getString());
+breakType = getProperty(paragraph, "BreakType");
+CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType);
+
+// A table with immediately following break
+uno::Reference table = getParagraphOrTable(5);
+getCell(table, "A1", "Paragraph 5 in table");
+breakType = getProperty(table, "BreakType");
+CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, breakType);
+
+paragraph = getParagraph(6);
+CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 6"), paragraph->getString());
 breakType = getProperty(paragraph, "BreakType");
 CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType);
 }
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 042998559336..84d2a65ad6e0 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -371,6 +371,10 @@ void OOXMLFastContextHandler::startCharacterGroup()
 mpParserState->setInCharacterGroup(true);
 mpParserState->resolveCharacterProperties(*mpStream);
 }
+
+// tdf#108714 : if we have a postponed break information,
+// then apply it now, before any other paragraph content.
+mpParserState->resolvePostponedBreak(*mpStream);
 }
 }
 
@@ -397,10 +401,6 @@ void OOXMLFastContextHandler::startParagraphGroup()
 {
 mpStream->startParagraphGroup();
 mpParserState->setInParagraphGroup(true);
-
-// tdf#108714 : if we have a postponed break information,
-// then apply it now, before any other paragraph content.
-mpParserState->resolvePostponedBreak(*mpStream);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 xmlsecurity/source/gpg/CertificateImpl.cxx  |7 +--
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 9a884b3d055ffdedbadb64c7f14e6d38078dedb1
Author: Samuel Mehrbrodt 
Date:   Wed Jun 28 09:12:35 2017 +0200

gpg4libre: Don't call production code inside an assert()

Won't work in non-debug builds

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

diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx 
b/xmlsecurity/source/gpg/CertificateImpl.cxx
index 20fa35c52d5d..03fa49cdef68 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.cxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
@@ -217,14 +217,17 @@ void CertificateImpl::setCertificate(GpgME::Context* ctx, 
const GpgME::Key& key)
 if (err)
 throw RuntimeException("The GpgME library failed to retrieve the 
public key");
 
-assert(data_out.seek(0,SEEK_SET) == 0);
+off_t result = data_out.seek(0,SEEK_SET);
+(void) result;
+assert(result == 0);
 int len=0, curr=0; char buf;
 while( (curr=data_out.read(&buf, 1)) )
 len += curr;
 
 // write bits to sequence of bytes
 m_aBits.realloc(len);
-assert(data_out.seek(0,SEEK_SET) == 0);
+result = data_out.seek(0,SEEK_SET);
+assert(result == 0);
 if( data_out.read(m_aBits.getArray(), len) != len )
 throw RuntimeException("The GpgME library failed to read the key");
 }
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx 
b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 8de25b9a4f14..8cec0ceb6fe7 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -205,7 +205,9 @@ SAL_CALL XMLSignature_GpgImpl::generate(
 rCtx.setArmor(false);
 GpgME::SigningResult sign_res=rCtx.sign(data_in, data_out,
 GpgME::Detached);
-assert(data_out.seek(0,SEEK_SET) == 0);
+off_t result = data_out.seek(0,SEEK_SET);
+(void) result;
+assert(result == 0);
 int len=0, curr=0; char buf;
 while( (curr=data_out.read(&buf, 1)) )
 len += curr;
@@ -217,7 +219,8 @@ SAL_CALL XMLSignature_GpgImpl::generate(
 xmlChar* signature = static_cast(xmlMalloc(len + 1));
 if(signature == nullptr)
 throw RuntimeException("The GpgME library failed to initialize for the 
OpenPGP protocol.");
-assert(data_out.seek(0,SEEK_SET) == 0);
+result = data_out.seek(0,SEEK_SET);
+assert(result == 0);
 if( data_out.read(signature, len) != len )
 throw RuntimeException("The GpgME library failed to initialize for the 
OpenPGP protocol.");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/qa/extras/ooxmlimport/data/tdf108714.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   19 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |8 +++
 3 files changed, 19 insertions(+), 8 deletions(-)

New commits:
commit 553204015f954d20db65e6adcda68b823a8ef235
Author: Mike Kaganski 
Date:   Wed Jun 28 10:50:28 2017 +0300

tdf#108714 follow-up: handle deferred break in character group

If an out-of-order break happens immediately after a table, then
in following paragraph group (before character group start) the
table level is > 0, and break is ignored.

Since out-of-order break only happens at top level, the following
character group necessarily designates a new paragraph group, so
it's OK to handle that at the character group level, where table
level is already updated.

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

diff --git a/sw/qa/extras/ooxmlimport/data/tdf108714.docx 
b/sw/qa/extras/ooxmlimport/data/tdf108714.docx
index e564d44a648b..cee4176aa8e0 100644
Binary files a/sw/qa/extras/ooxmlimport/data/tdf108714.docx and 
b/sw/qa/extras/ooxmlimport/data/tdf108714.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 97dd9128b9ea..4cb380910a30 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1315,8 +1315,8 @@ DECLARE_OOXMLIMPORT_TEST(testVmlAdjustments, 
"vml-adjustments.docx")
 
 DECLARE_OOXMLIMPORT_TEST(testTdf108714, "tdf108714.docx")
 {
-CPPUNIT_ASSERT_EQUAL(4, getParagraphs());
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Page break is absent - we lost bug-to-bug 
compatibility with Word", 3, getPages());
+CPPUNIT_ASSERT_EQUAL(6, getParagraphs());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Page break is absent - we lost bug-to-bug 
compatibility with Word", 4, getPages());
 
 // The second (empty) paragraph must be at first page, despite the  
element was before it.
 // That's because Word treats such break as first element in first run of 
following paragraph:
@@ -1349,12 +1349,23 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108714, 
"tdf108714.docx")
 CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, breakType);
 
 paragraph = getParagraph(3);
-CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 2"), paragraph->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 3"), paragraph->getString());
 breakType = getProperty(paragraph, "BreakType");
 CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType);
 
 paragraph = getParagraph(4);
-CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 3"), paragraph->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 4"), paragraph->getString());
+breakType = getProperty(paragraph, "BreakType");
+CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType);
+
+// A table with immediately following break
+uno::Reference table = getParagraphOrTable(5);
+getCell(table, "A1", "Paragraph 5 in table");
+breakType = getProperty(table, "BreakType");
+CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, breakType);
+
+paragraph = getParagraph(6);
+CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 6"), paragraph->getString());
 breakType = getProperty(paragraph, "BreakType");
 CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType);
 }
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index e208e60b4920..6ec8820f5293 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -345,6 +345,10 @@ void OOXMLFastContextHandler::startCharacterGroup()
 mpParserState->setInCharacterGroup(true);
 mpParserState->resolveCharacterProperties(*mpStream);
 }
+
+// tdf#108714 : if we have a postponed break information,
+// then apply it now, before any other paragraph content.
+mpParserState->resolvePostponedBreak(*mpStream);
 }
 }
 
@@ -371,10 +375,6 @@ void OOXMLFastContextHandler::startParagraphGroup()
 {
 mpStream->startParagraphGroup();
 mpParserState->setInParagraphGroup(true);
-
-// tdf#108714 : if we have a postponed break information,
-// then apply it now, before any other paragraph content.
-mpParserState->resolvePostponedBreak(*mpStream);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |2 +-
 chart2/source/controller/dialogs/res_DataLabel.cxx|2 +-
 dbaccess/source/shared/registrationhelper.cxx |4 ++--
 dbaccess/source/ui/dlg/dlgattr.cxx|2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5f53dfc5058b76756ab18143aeb5ca695da674af
Author: Stephan Bergmann 
Date:   Wed Jun 28 10:57:32 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: Ie7fa59f573791fca0530294ef5a5e0863e1285b1

diff --git a/dbaccess/source/shared/registrationhelper.cxx 
b/dbaccess/source/shared/registrationhelper.cxx
index 490962e55ccf..26e3cc3f16dc 100644
--- a/dbaccess/source/shared/registrationhelper.cxx
+++ b/dbaccess/source/shared/registrationhelper.cxx
@@ -135,8 +135,8 @@ uno::Reference< uno::XInterface > 
OModuleRegistration::getComponentFactory(
 {
 if (pImplName->equals(_rImplementationName))
 {
-const FactoryInstantiation FactoryInstantiationFunction = 
reinterpret_cast(*pFactoryFunction);
-const ComponentInstantiation ComponentInstantiationFunction = 
reinterpret_cast(*pComponentFunction);
+const FactoryInstantiation FactoryInstantiationFunction = 
reinterpret_cast(*pFactoryFunction);
+const ComponentInstantiation ComponentInstantiationFunction = 
reinterpret_cast(*pComponentFunction);
 
 xReturn = FactoryInstantiationFunction( _rxServiceManager, 
*pImplName, ComponentInstantiationFunction, *pServices, nullptr);
 if (xReturn.is())
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx 
b/dbaccess/source/ui/dlg/dlgattr.cxx
index bb5ab1608474..af6113372c5b 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -64,7 +64,7 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, 
SfxTabPage& rTabPage )
 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 if (nPageId == m_nNumberFormatId)
 {
-aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(), 
(const sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
+aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(), 
(sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
 rTabPage.PageCreated(aSet);
 }
 }
commit 764c3805e9fe5d9194cbaa38766e44f9993fb31b
Author: Stephan Bergmann 
Date:   Wed Jun 28 10:49:31 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: Id2f60099d062b5aa1baf8ed1a1d5145663ae8bdd

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index b1880afb25b4..e1fbd2aac208 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -592,7 +592,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, 
SfxTabPage &rPage)
 break;
 
 case RID_SVXPAGE_NUMBERFORMAT:
-   aSet.Put (SvxNumberInfoItem( m_pNumberFormatter, (const 
sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
+   aSet.Put (SvxNumberInfoItem( m_pNumberFormatter, 
(sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
 rPage.PageCreated(aSet);
 break;
 case TP_XERRORBAR:
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index c75d8c4808c1..433d3ce1ce21 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -192,7 +192,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, 
Button *, pButton, void )
 m_pCBPercent->Check();
 
 SfxItemSet aNumberSet = 
NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( *m_pPool );
-aNumberSet.Put (SvxNumberInfoItem( m_pNumberFormatter, (const 
sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
+aNumberSet.Put (SvxNumberInfoItem( m_pNumberFormatter, 
(sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
 
 bool bPercent = ( pButton == m_pPB_NumberFormatForPercent );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 filter/source/msfilter/svdfppt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9963d0e303b65eb8fc90bb0bc8a175ab1347c928
Author: Stephan Bergmann 
Date:   Wed Jun 28 10:43:12 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: I1366d093e38dbd849d0f635f704953c5c8f47129

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index ad37201db3a9..53511043376d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7404,7 +7404,7 @@ void ApplyCellAttributes( const SdrObject* pObj, 
Reference< XCell >& xCell )
 
 //set textHorizontalAdjust and TextWritingMode attr
 const sal_Int32 eHA(static_cast(pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
-const SvxFrameDirection eDirection = (const 
SvxFrameDirection)(static_cast(pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
+const SvxFrameDirection eDirection = 
(SvxFrameDirection)(static_cast(pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
 xPropSet->setPropertyValue(  "TextHorizontalAdjust" , Any( eHA ) );
 if ( eDirection == SvxFrameDirection::Vertical_RL_TB )
 {//vertical writing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sc/source/filter/oox/revisionfragment.cxx  |3 ---
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |3 +--
 sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx |2 --
 sc/source/filter/xml/XMLTrackedChangesContext.cxx  |1 -
 sc/source/filter/xml/xmlannoi.cxx  |5 +
 sc/source/filter/xml/xmlannoi.hxx  |4 +---
 sc/source/filter/xml/xmlcelli.cxx  |3 +--
 sc/source/filter/xml/xmldpimp.hxx  |2 +-
 sc/source/filter/xml/xmldrani.hxx  |2 +-
 sc/source/filter/xml/xmlexternaltabi.hxx   |4 ++--
 sc/source/filter/xml/xmlimprt.cxx  |1 -
 sc/source/filter/xml/xmlimprt.hxx  |3 ---
 12 files changed, 8 insertions(+), 25 deletions(-)

New commits:
commit 2294215d32a5f015dc9b2f9414f58a4356bf2d6d
Author: Noel Grandin 
Date:   Wed Jun 21 15:42:17 2017 +0200

loplugin:unusedfields in sc part2

and mark some fields as being needed to be imported to the model

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

diff --git a/sc/source/filter/oox/revisionfragment.cxx 
b/sc/source/filter/oox/revisionfragment.cxx
index f9dc8c085361..ec95dcffab13 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -305,7 +305,6 @@ struct RevisionLogFragment::Impl
 {
 ScChangeTrack& mrChangeTrack;
 
-sal_Int32 mnRevIndex;
 sal_Int32 mnSheetIndex;
 
 RevisionType meType;
@@ -323,7 +322,6 @@ struct RevisionLogFragment::Impl
 
 explicit Impl( ScChangeTrack& rChangeTrack ) :
 mrChangeTrack(rChangeTrack),
-mnRevIndex(-1),
 mnSheetIndex(-1),
 meType(REV_UNKNOWN),
 mbEndOfList(false) {}
@@ -391,7 +389,6 @@ void RevisionLogFragment::finalizeImport() {}
 
 void RevisionLogFragment::importCommon( const AttributeList& rAttribs )
 {
-mpImpl->mnRevIndex   = rAttribs.getInteger(XML_rId, -1);
 mpImpl->mnSheetIndex = rAttribs.getInteger(XML_sId, -1);
 }
 
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx 
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 36d317623ec8..f76cb2214a31 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -173,8 +173,7 @@ 
ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() :
 pCurrentAction(nullptr),
 sIDPrefix(SC_CHANGE_ID_PREFIX),
 nMultiSpanned(0),
-nMultiSpannedSlaveCount(0),
-bChangeTrack(false)
+nMultiSpannedSlaveCount(0)
 {
 nPrefixLength = sIDPrefix.getLength();
 }
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx 
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index f0628f59de49..0f1d18f5cf5e 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -184,7 +184,6 @@ class ScXMLChangeTrackingImportHelper
 sal_uInt32  nPrefixLength;
 sal_Int16   nMultiSpanned;
 sal_Int16   nMultiSpannedSlaveCount;
-boolbChangeTrack;
 
 private:
 void ConvertInfo(const ScMyActionInfo& aInfo, OUString& rUser, DateTime& 
aDateTime);
@@ -200,7 +199,6 @@ public:
 ScXMLChangeTrackingImportHelper();
 ~ScXMLChangeTrackingImportHelper();
 
-void SetChangeTrack(bool bValue) { bChangeTrack = bValue; }
 void SetProtection(const css::uno::Sequence& rProtect) { 
aProtect = rProtect; }
 void StartChangeAction(const ScChangeActionType nActionType);
 
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx 
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index ccd6f814a0ab..669944978636 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -392,7 +392,6 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( 
ScXMLImport& rImport,
 pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
 {
 rImport.LockSolarMutex();
-pChangeTrackingImportHelper->SetChangeTrack(true);
 
 sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
 for( sal_Int16 i=0; i < nAttrCount; ++i )
diff --git a/sc/source/filter/xml/xmlannoi.cxx 
b/sc/source/filter/xml/xmlannoi.cxx
index 87ea27d814fe..5abb51937c4f 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -44,11 +44,9 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& 
rImport,
   sal_uInt16 nPrfx,
   const OUString& rLName,
   const 
uno::Reference& xAttrList,
-  ScXMLAnnotationData& rAnnotationData,
-

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

[Stephan Bergmann]

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |6 +++---
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2b0e4671f8ecaba8db3f63a71dead7f8f2a67e19
Author: Stephan Bergmann 
Date:   Wed Jun 28 10:35:00 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: I3863df89052b46aa28f1acdefa6745e153ca8370

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index ef308e354797..ad628129c040 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -173,9 +173,9 @@ void ParaPropertyPanel::initial()
 IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void)
 {
 SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, 
m_eLRSpaceUnit ) );
-aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit 
) );
-aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, 
m_eLRSpaceUnit ) );
+aMargin.SetTextLeft( (long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
+aMargin.SetRight( (long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
+aMargin.SetTextFirstLineOfst( (short)GetCoreValue( *mpFLineIndent, 
m_eLRSpaceUnit ) );
 
 GetBindings()->GetDispatcher()->ExecuteList(
 SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, { &aMargin });
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx 
b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 542fcfe034dd..27873db96cd3 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -284,9 +284,9 @@ IMPL_LINK_NOARG(ParaLRSpacingWindow, ModifySpacingHdl, 
Edit&, void)
 if(pDisp)
 {
 SvxLRSpaceItem aMargin(SID_ATTR_PARA_LRSPACE);
-aMargin.SetTextLeft((const long)GetCoreValue(*m_pBeforeSpacing, 
m_eUnit));
-aMargin.SetRight((const long)GetCoreValue(*m_pAfterSpacing, m_eUnit));
-aMargin.SetTextFirstLineOfst((const short)GetCoreValue(*m_pFLSpacing, 
m_eUnit));
+aMargin.SetTextLeft((long)GetCoreValue(*m_pBeforeSpacing, m_eUnit));
+aMargin.SetRight((long)GetCoreValue(*m_pAfterSpacing, m_eUnit));
+aMargin.SetTextFirstLineOfst((short)GetCoreValue(*m_pFLSpacing, 
m_eUnit));
 
 pDisp->ExecuteList(SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, 
{&aMargin});
 }
___
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

[Andras Timar]

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

New commits:
commit 6a3995f0764da5687bb2e1202d75c79015c41838
Author: Andras Timar 
Date:   Wed Jun 28 10:25:59 2017 +0200

Updated core
Project: translations  f3390ac0c16dcebcdd148cf7d1549c77995b90ea

Updated Slovenian translation

Change-Id: I4a3d7f470adb8ca01da3208ff8b56de752c48c27

diff --git a/translations b/translations
index 07764d62453d..f3390ac0c16d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 07764d62453dddf771ee1692a65e19588f87edc5
+Subproject commit f3390ac0c16dcebcdd148cf7d1549c77995b90ea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4' - source/sl

[Andras Timar]

 source/sl/helpcontent2/source/text/sbasic/shared.po   |6 
 source/sl/helpcontent2/source/text/shared/00.po   |   88 +-
 source/sl/helpcontent2/source/text/shared/01.po   |8 
 source/sl/helpcontent2/source/text/shared/optionen.po |8 
 source/sl/helpcontent2/source/text/swriter.po |4 
 source/sl/helpcontent2/source/text/swriter/00.po  |   70 +++
 source/sl/helpcontent2/source/text/swriter/01.po  |   80 -
 source/sl/helpcontent2/source/text/swriter/guide.po   |   40 ++--
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/sl/sfx2/source/view.po |4 
 source/sl/svx/uiconfig/ui.po  |4 
 source/sl/sw/uiconfig/swriter/ui.po   |4 
 source/sl/xmlsecurity/source/dialogs.po   |   18 +-
 source/sl/xmlsecurity/uiconfig/ui.po  |   17 +
 14 files changed, 188 insertions(+), 167 deletions(-)

New commits:
commit f3390ac0c16dcebcdd148cf7d1549c77995b90ea
Author: Andras Timar 
Date:   Wed Jun 28 10:25:59 2017 +0200

Updated Slovenian translation

Change-Id: I4a3d7f470adb8ca01da3208ff8b56de752c48c27

diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po 
b/source/sl/helpcontent2/source/text/sbasic/shared.po
index 0e6fe62fce5..fcc65d8a47a 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2017-06-19 21:33+0200\n"
-"PO-Revision-Date: 2017-06-20 01:11+0200\n"
+"POT-Creation-Date: 2017-06-27 10:36+0200\n"
+"PO-Revision-Date: 2017-06-28 00:02+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -182,7 +182,7 @@ msgctxt ""
 "0003.xhp\n"
 "par_id3153381\n"
 "help.text"
-msgid "You can set the locale used for controlling the formatting numbers, 
dates and currencies in $[officename] Basic in %PRODUCTNAME - 
Preferences Tools - 
Options - Language Settings - 
Languages. In Basic format codes, the decimal point (.) is 
always used as placeholder for the decimal separator defined in 
your locale and will be replaced by the corresponding character."
+msgid "You can set the locale used for controlling the formatting numbers, 
dates and currencies in $[officename] Basic in %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages. In Basic format codes, the decimal point (.) is 
always used as placeholder for the decimal separator defined in 
your locale and will be replaced by the corresponding character."
 msgstr "Področne nastavitve, ki se uporabljajo za obliko števil, datumov in 
valute v $[officename] Basicu, lahko nastavite v %PRODUCTNAME – 
NastavitveOrodja – 
Možnosti – Nastavitve jezika – 
Jeziki. V kodah zapisov Basica je decimalna pika (.) vedno 
uporabljena kot ograda za desetiško ločilo, določeno z vašo 
področno nastavitvijo in bo kasneje zamenjana z ustreznim znakom."
 
 #: 0003.xhp
diff --git a/source/sl/helpcontent2/source/text/shared/00.po 
b/source/sl/helpcontent2/source/text/shared/00.po
index ff89bfa998f..3362e9dbae1 100644
--- a/source/sl/helpcontent2/source/text/shared/00.po
+++ b/source/sl/helpcontent2/source/text/shared/00.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2017-06-19 21:33+0200\n"
-"PO-Revision-Date: 2017-06-19 23:51+0200\n"
+"POT-Creation-Date: 2017-06-27 10:36+0200\n"
+"PO-Revision-Date: 2017-06-28 09:27+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -8982,8 +8982,8 @@ msgctxt ""
 "00040500.xhp\n"
 "par_id3148998\n"
 "help.text"
-msgid "Icon"
-msgstr "Ikona"
+msgid "Icon"
+msgstr "Ikona"
 
 #: 00040500.xhp
 msgctxt ""
@@ -9134,7 +9134,7 @@ msgctxt ""
 "00040500.xhp\n"
 "par_id3154366\n"
 "help.text"
-msgid "Choose 
Format - Cell - Asian Typography tab "
+msgid "Choose 
Format - Cell - Asian Typography tab"
 msgstr "Izberite 
Oblika – Celica – zavihek Azijska 
tipografija"
 
 #: 00040500.xhp
@@ -9174,8 +9174,8 @@ msgctxt ""
 "00040500.xhp\n"
 "par_id3155995\n"
 "help.text"
-msgid "Icon"
-msgstr "Ikona"
+msgid "Icon"
+msgstr "Ikona"
 
 #: 00040500.xhp
 msgctxt ""
@@ -9318,7 +9318,7 @@ msgctxt ""
 "00040500.xhp\n"
 "par_id3148455\n"
 "help.text"
-msgid "Choose 
Format - Cells - Borders tab "
+msgid "Choose 
Format - Cells - Borders tab"
 msgstr "Izberite 
Oblika – Celice – zavihek Obrobe"
 
 #: 00040500.xhp
@@ -9326,15 +9326,15 @@ msgctxt ""
 "00040500.xh

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

[Stephan Bergmann]

 editeng/source/items/frmitems.cxx |4 ++--
 editeng/source/items/paraitem.cxx |2 +-
 editeng/source/items/textitem.cxx |6 +++---
 editeng/source/rtf/rtfitem.cxx|6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit d358fc1a455de153a197081948a271f612a495c3
Author: Stephan Bergmann 
Date:   Wed Jun 28 10:24:53 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: I2a43ce3ca6af87ac53dd534c0c37150a000e7013

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index b98cd2507942..28c56dcd3bf6 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1562,7 +1562,7 @@ sal_uInt16 SvxShadowItem::GetEnumValue() const
 
 void SvxShadowItem::SetEnumValue( sal_uInt16 nVal )
 {
-SetLocation( (const SvxShadowLocation)nVal );
+SetLocation( (SvxShadowLocation)nVal );
 }
 
 void SvxShadowItem::dumpAsXml(xmlTextWriterPtr pWriter) const
@@ -3021,7 +3021,7 @@ SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, 
sal_uInt16 nVersion )
 rStrm.ReadSChar( eBreak );
 if( FMTBREAK_NOAUTO > nVersion )
 rStrm.ReadSChar( bDummy );
-return new SvxFormatBreakItem( (const SvxBreak)eBreak, Which() );
+return new SvxFormatBreakItem( (SvxBreak)eBreak, Which() );
 }
 
 
diff --git a/editeng/source/items/paraitem.cxx 
b/editeng/source/items/paraitem.cxx
index 71db51db0178..164b00a2d92c 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -444,7 +444,7 @@ sal_uInt16 SvxAdjustItem::GetEnumValue() const
 
 void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal )
 {
-SetAdjust( (const SvxAdjust)nVal );
+SetAdjust( (SvxAdjust)nVal );
 }
 
 
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index bb6b66e2ad31..690b54a8d55e 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -468,7 +468,7 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, 
sal_uInt16) const
 {
 sal_uInt8 nPosture;
 rStrm.ReadUChar( nPosture );
-return new SvxPostureItem( (const FontItalic)nPosture, Which() );
+return new SvxPostureItem( (FontItalic)nPosture, Which() );
 }
 
 
@@ -2099,7 +2099,7 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, 
sal_uInt16) const
 {
 sal_uInt8 cMap;
 rStrm.ReadUChar( cMap );
-return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() );
+return new SvxCaseMapItem( (SvxCaseMap)cMap, Which() );
 }
 
 
@@ -2275,7 +2275,7 @@ sal_uInt16 SvxEscapementItem::GetEnumValue() const
 
 void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal )
 {
-SetEscapement( (const SvxEscapement)nVal );
+SetEscapement( (SvxEscapement)nVal );
 }
 
 bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 71a831752a24..4ce7e8cfb5c0 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -441,7 +441,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
 if( nTokenValue > 200 ) // Data value for PropLnSp
 nTokenValue = 200;  // is one BYTE !!!
 
-aLSpace.SetPropLineSpace( (const sal_uInt8)nTokenValue );
+aLSpace.SetPropLineSpace( (sal_uInt8)nTokenValue );
 aLSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
 
 pSet->Put( aLSpace );
@@ -479,7 +479,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
 CalcValue();
 
 if (eLnSpc != SvxLineSpaceRule::Auto)
-aLSpace.SetLineHeight( (const sal_uInt16)nTokenValue );
+aLSpace.SetLineHeight( (sal_uInt16)nTokenValue );
 
 aLSpace.SetLineSpaceRule(eLnSpc);
 pSet->Put(aLSpace);
@@ -660,7 +660,7 @@ SET_FONTALIGNMENT:
 //   if( IsCalcValue() )
 //   CalcValue();
 SvxFontHeightItem aTmpItem(
-(const sal_uInt16)nTokenValue, 100,
+(sal_uInt16)nTokenValue, 100,
 SID_ATTR_CHAR_FONTHEIGHT );
 SetScriptAttr( eCharType, *pSet, aTmpItem );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sfx2/source/doc/sfxbasemodel.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 10613d46cbad88a55e511b8739cd1158fea0c785
Author: Stephan Bergmann 
Date:   Wed Jun 28 10:11:51 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: Ie5d3358bc81ec15a56ecbceb605f066753b8d472

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 2c90f8280363..faba052f4ec2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1999,7 +1999,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const 
datatransfer::DataFlavor& aFla
 
 if (xMetaFile)
 {
-aAny <<= reinterpret_cast< const sal_uInt64 >(
+aAny <<= reinterpret_cast< sal_uInt64 >(
 GraphicHelper::getEnhMetaFileFromGDI_Impl( 
xMetaFile.get() ) );
 }
 }
@@ -2038,7 +2038,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const 
datatransfer::DataFlavor& aFla
 if (xMetaFile)
 {
 Size aMetaSize = xMetaFile->GetPrefSize();
-aAny <<= reinterpret_cast< const sal_uInt64 >(
+aAny <<= reinterpret_cast< sal_uInt64 >(
 GraphicHelper::getWinMetaFileFromGDI_Impl(
 xMetaFile.get(), aMetaSize ) );
 }
___
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' - xmlsecurity/source

[Samuel Mehrbrodt]

 xmlsecurity/source/gpg/SecurityEnvironment.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 40c2e584df0cbef84d21c03ca889078a3b093a0f
Author: Samuel Mehrbrodt 
Date:   Fri Jun 23 10:18:01 2017 +0200

tdf#108692 gpg4libre: List all gpg keys

Change-Id: I7300da36215233fa91b7a04a42b1c9bf907ad78b
(cherry picked from commit 91ffe409e35479d024f629fe1b5ce474993a0f54)
Reviewed-on: https://gerrit.libreoffice.org/39163
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx 
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 9892ec6ac5c8..bc7611fa7968 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -65,6 +65,7 @@ OUString 
SecurityEnvironmentGpg::getSecurityEnvironmentInformation()
 Sequence< Reference < XCertificate > > 
SecurityEnvironmentGpg::getPersonalCertificates()
 {
 CertificateImpl* xCert;
+std::list< GpgME::Key > keyList;
 std::list< CertificateImpl* > certsList;
 
 m_ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
@@ -74,13 +75,19 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironmentGpg::getPersonalCertif
 if (err)
 break;
 if (!k.isInvalid()) {
-xCert = new CertificateImpl();
-xCert->setCertificate(m_ctx.get(),k);
-certsList.push_back(xCert);
+// We can't create CertificateImpl here as 
CertificateImpl::setCertificate uses GpgME API
+// which interrupts our key listing here. So first get the keys 
from GpgME, then create the CertificateImpls
+keyList.push_back(k);
 }
 }
 m_ctx->endKeyListing();
 
+for (auto const& key : keyList) {
+xCert = new CertificateImpl();
+xCert->setCertificate(m_ctx.get(),key);
+certsList.push_back(xCert);
+}
+
 Sequence< Reference< XCertificate > > 
xCertificateSequence(certsList.size());
 std::list< CertificateImpl* >::iterator xcertIt;
 int i;
___
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' - xmlsecurity/inc xmlsecurity/source

[Samuel Mehrbrodt]

 xmlsecurity/inc/documentsignaturehelper.hxx|3 ++
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |5 +++-
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |   19 +
 xmlsecurity/source/helper/documentsignaturemanager.cxx |1 
 4 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 8b9f00fced21014bed6695b962084c8af0249dbc
Author: Samuel Mehrbrodt 
Date:   Mon Jun 26 12:32:48 2017 +0200

tdf#108711 GPG key selection should only be possible for ODF >= 1.2 
documents

gpg4libre

Change-Id: I6dbdaefddacf55c9381d156ada20cb3f25d4b3cb
Reviewed-on: https://gerrit.libreoffice.org/39263
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit e2378bbf4539455e445205ad868c43246ec423ed)
Reviewed-on: https://gerrit.libreoffice.org/39287
Reviewed-by: Thorsten Behrens 

diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx 
b/xmlsecurity/inc/documentsignaturehelper.hxx
index c2b5b85e34a2..a8f3cb1f5d40 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -81,6 +81,9 @@ namespace DocumentSignatureHelper
 DocumentSignatureAlgorithm getDocumentAlgorithm(
 const OUString & sODFVersion, const SignatureInformation & sigInfo);
 
+bool CanSignWithGPG(const css::uno::Reference < css::embed::XStorage >& 
rxStore,
+const OUString& sOdfVersion);
+
 bool checkIfAllFilesAreSigned( const ::std::vector< OUString > & 
sElementList,
 const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm 
alg);
 
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 5f4464b8b957..2b950e62777e 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -25,6 +25,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -400,7 +401,9 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, 
Button*, void)
 {
 std::vector> 
xSecContexts;
 xSecContexts.push_back(maSignatureManager.getSecurityContext());
-xSecContexts.push_back(maSignatureManager.getGpgSecurityContext());
+// Gpg signing is only possible with ODF >= 1.2 documents
+if 
(DocumentSignatureHelper::CanSignWithGPG(maSignatureManager.mxStore, 
m_sODFVersion))
+xSecContexts.push_back(maSignatureManager.getGpgSecurityContext());
 
 ScopedVclPtrInstance< CertificateChooser > aChooser( this, mxCtx, 
xSecContexts );
 if ( aChooser->Execute() == RET_OK )
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx 
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 1d8d1c0d72cb..a8b355116ff3 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -408,6 +408,25 @@ SignatureStreamHelper 
DocumentSignatureHelper::OpenSignatureStream(
 return aHelper;
 }
 
+/** Check whether the current file can be signed with GPG (only ODF >= 1.2 can 
currently) */
+bool DocumentSignatureHelper::CanSignWithGPG(
+const Reference < css::embed::XStorage >& rxStore,
+const OUString& sOdfVersion)
+{
+uno::Reference xNameAccess(rxStore, 
uno::UNO_QUERY);
+if (!xNameAccess.is())
+throw RuntimeException();
+
+if (xNameAccess->hasByName("META-INF")) // ODF
+{
+return !isODFPre_1_2(sOdfVersion);
+}
+
+return false;
+}
+
+
+
 //sElementList contains all files which are expected to be signed. Only those 
files must me signed,
 //no more, no less.
 //The DocumentSignatureAlgorithm indicates if the document was created with 
OOo 2.x. Then
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index ee863e4c2530..41f7e5594cf2 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -269,7 +269,6 @@ bool DocumentSignatureManager::add(const 
uno::Reference&
 if (xServiceInfo->getImplementationName() == 
"com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl")
 {
 // GPG keys only really have PGPKeyId and PGPKeyPacket
-// TODO: prevent selection of gpg keys for pdfs and ooxml early on!
 if (!mxStore.is())
 {
 SAL_WARN("xmlsecurity.helper", "cannot sign pdfs with GPG keys");
___
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.0.1'

[Andras Timar]

Tag 'libreoffice-5.4.0.1' created by Andras Timar  
at 2017-06-28 08:07 +

libreoffice-5.4.0.1

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

Re: [ODF] attribute draw:name for dr3d-objects not allowed

[Thorsten Behrens]

Regina Henschel wrote:
> Shall I propose in the TC, that the draw:name attribute is allowed
> for 3D-objects too?
>
Hi Regina,

thx for spotting - yes please, let's add it to ODF, seems rather an
oversight to me.

Cheers,

-- Thorsten


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

[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - 17 commits - common/Protocol.cpp configure.ac debian/control .gitignore loleaflet/dist loleaflet/reference.html Makefile.am test/httpwstest

[Andras Timar]

 .gitignore|3 ++
 Makefile.am   |4 ++
 common/Protocol.cpp   |3 +-
 configure.ac  |2 -
 debian/control|2 -
 loleaflet/dist/toolbar/toolbar.js |4 --
 loleaflet/reference.html  |4 +-
 test/httpwstest.cpp   |   56 +++---
 wsd/DocumentBroker.cpp|   22 +++---
 wsd/FileServer.cpp|8 +++--
 wsd/LOOLWSD.cpp   |4 +-
 wsd/Storage.cpp   |4 +-
 12 files changed, 87 insertions(+), 29 deletions(-)

New commits:
commit f2b7928629d0929826ef2b8c0a4af7f7427ff40d
Author: Andras Timar 
Date:   Wed Jun 28 08:53:09 2017 +0200

Bump version to 5.4.0.1

Change-Id: I3f8a2066c584a559c7b267a6355e633b583a057f

diff --git a/configure.ac b/configure.ac
index 446c1f08..b3f72066 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([libreoffice-online], [5.4.0.0.beta2], 
[libreoffice@lists.freedesktop.org])
+AC_INIT([libreoffice-online], [5.4.0.1], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax -Wno-portability])
commit 504cdba7545d3d04b5b0e057d656d4152e4d872c
Author: Pranav Kant 
Date:   Thu Jun 22 17:04:59 2017 +0530

Update PostMessageOrigin if SSL termination is on too

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 6d6db2b6..f26c5a57 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -414,6 +414,14 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 Object::Ptr wopiInfo = new Object();
 if (!wopifileinfo->_postMessageOrigin.empty())
 {
+// Update the scheme to https if ssl or ssl termination is on
+if (wopifileinfo->_postMessageOrigin.substr(0, 7) == "http://"; &&
+(LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()))
+{
+wopifileinfo->_postMessageOrigin.replace(0, 4, "https");
+LOG_DBG("Updating PostMessageOrgin scheme to HTTPS. Updated 
origin is [" << wopifileinfo->_postMessageOrigin << "].");
+}
+
 wopiInfo->set("PostMessageOrigin", 
wopifileinfo->_postMessageOrigin);
 }
 
commit 25d27d3764c0c4de8aa95b26e6068e3cb12c
Author: Andras Timar 
Date:   Mon Jun 26 11:43:23 2017 +0200

tdf#108753 postinstall script uses setcap, package should depend on 
libcap2-bin

Change-Id: I60ed36ad83d31925055ff5529da89c5c93f84403
(cherry picked from commit f55d3583bec6d579b3aedef226552c070c022c0d)
Signed-off-by: Andras Timar 

diff --git a/debian/control b/debian/control
index 1f38edf1..d85c95d0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, 
libdbus-glib-1-2, cpio, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, 
libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
commit 8c9953c321dcf474212e92e3e7913a8bddea6c69
Author: Michael Meeks 
Date:   Tue Jun 20 21:49:02 2017 +0100

Protocol - only match complete token names.

Change-Id: I027e29da8cc6c48a0d896fa41516934a3ff71b43
(cherry picked from commit 8fb48811eccbf8f6d77919ce91c3cd918de15f56)
Signed-off-by: Andras Timar 

diff --git a/common/Protocol.cpp b/common/Protocol.cpp
index 0aa50c47..be1a0b4c 100644
--- a/common/Protocol.cpp
+++ b/common/Protocol.cpp
@@ -188,8 +188,9 @@ namespace LOOLProtocol
 auto pos = message.find(name);
 while (pos != std::string::npos)
 {
+bool spaceBefore = pos == 0 || message[pos-1] == ' ';
 const auto beg = pos + name.size();
-if (message[beg] == '=')
+if (spaceBefore && message[beg] == '=')
 {
 const auto end = message.find_first_of(" \n", beg);
 value = message.substr(beg + 1, end - beg - 1);
commit 742e03529d8cb13c55a8f6124c584d8963bcda74
Author: Pranav Kant 
Date:   Tue Jun 20 17:14:11 2017 +0530

Its Host_PostmessageReady, not Host_PostMessageReady according to specs

https://wopi.readthedocs.io/en/latest

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

[Stephan Bergmann]

 filter/source/graphicfilter/egif/egif.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 90cd07ee2f287059fc21e3f1ddf92ee08ac4f5c2
Author: Stephan Bergmann 
Date:   Wed Jun 28 10:00:18 2017 +0200

-Werror=ignored-qualifiers (GCC 8)

Change-Id: I65b906cf312a436b1b36a909402e5dfca96af3d7

diff --git a/filter/source/graphicfilter/egif/egif.cxx 
b/filter/source/graphicfilter/egif/egif.cxx
index ee4e824b9930..ba08f15718a2 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -338,8 +338,8 @@ void GIFWriter::WriteLoopExtension( const Animation& 
rAnimation )
 if( nLoopCount )
 nLoopCount--;
 
-const sal_uInt8 cLoByte = (const sal_uInt8) nLoopCount;
-const sal_uInt8 cHiByte = (const sal_uInt8) ( nLoopCount >> 8 );
+const sal_uInt8 cLoByte = (sal_uInt8) nLoopCount;
+const sal_uInt8 cHiByte = (sal_uInt8) ( nLoopCount >> 8 );
 
 m_rGIF.WriteUChar( 0x21 );
 m_rGIF.WriteUChar( 0xff );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamas Bunth]

 sc/source/ui/vba/vbafont.cxx |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 101971ab1c32ad386149bdc1797045b3f43dbe20
Author: Tamas Bunth 
Date:   Tue Jun 27 11:49:43 2017 +0200

oovbaapi: do not use properties for formControl

UnderLine, CharContoured and ColorIndex does not work for formControl,
(WrappedTargetRuntimeException), disable it for now.

Change-Id: Ibc16d91bf90011131386c30a218690c0f4e74797
Reviewed-on: https://gerrit.libreoffice.org/39291
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 

diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index da38074e316d..36ef891c0b94 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -70,6 +70,9 @@ ScVbaFont::getSize()
 void SAL_CALL
 ScVbaFont::setColorIndex( const uno::Any& _colorindex )
 {
+if(mbFormControl)
+return;
+
 sal_Int32 nIndex = 0;
 _colorindex >>= nIndex;
 // #FIXME  xlColorIndexAutomatic & xlColorIndexNone are not really
@@ -87,6 +90,8 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex )
 uno::Any SAL_CALL
 ScVbaFont::getColorIndex()
 {
+if(mbFormControl)
+return uno::Any( (sal_Int32) 0 );
 if ( GetDataSet() )
 if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR) == 
SfxItemState::DONTCARE )
 return aNULL();
@@ -187,6 +192,9 @@ ScVbaFont::getBold()
 void SAL_CALL
 ScVbaFont::setUnderline( const uno::Any& aValue )
 {
+if(mbFormControl)
+return;
+
 // default
 sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
 aValue >>= nValue;
@@ -226,6 +234,10 @@ ScVbaFont::getUnderline()
 return aNULL();
 
 sal_Int32 nValue = awt::FontUnderline::NONE;
+
+if(mbFormControl)
+return uno::makeAny( nValue );
+
 mxFont->getPropertyValue("CharUnderline") >>= nValue;
 switch ( nValue )
 {
@@ -293,7 +305,8 @@ ScVbaFont::getColor()
 void  SAL_CALL
 ScVbaFont::setOutlineFont( const uno::Any& aValue )
 {
-mxFont->setPropertyValue("CharContoured", aValue );
+if(!mbFormControl)
+mxFont->setPropertyValue("CharContoured", aValue );
 }
 
 uno::Any SAL_CALL
@@ -302,7 +315,7 @@ ScVbaFont::getOutlineFont()
 if ( GetDataSet() )
 if (  GetDataSet()->GetItemState( ATTR_FONT_CONTOUR) == 
SfxItemState::DONTCARE )
 return aNULL();
-return mxFont->getPropertyValue("CharContoured");
+return mbFormControl ? uno::Any( false ) : 
mxFont->getPropertyValue("CharContoured");
 }
 
 OUString
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |2 +-
 xmlsecurity/source/gpg/SecurityEnvironment.cxx |   14 ++
 xmlsecurity/source/gpg/SecurityEnvironment.hxx |3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 0d7b437260ec991ee70769e7fb1002973e431f12
Author: Samuel Mehrbrodt 
Date:   Tue Jun 27 16:33:59 2017 +0200

tdf#108794 gpg4libre: Use key id to get the right key

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

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 6f6ea28a40d1..5cb148db7aa1 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -687,7 +687,7 @@ uno::Reference 
DigitalSignaturesDialog::getCertificate(c
 if (!xCert.is())
 xCert = xSecEnv->getCertificate( rInfo.ouX509IssuerName, 
xmlsecurity::numericStringToBigInteger( rInfo.ouX509SerialNumber ) );
 if (!xCert.is())
-xCert = xGpgSecEnv->getCertificate( rInfo.ouX509IssuerName, 
xmlsecurity::numericStringToBigInteger( rInfo.ouX509SerialNumber ) );
+xCert = xGpgSecEnv->getCertificate( rInfo.ouGpgKeyID, 
xmlsecurity::numericStringToBigInteger("") );
 
 SAL_WARN_IF( !xCert.is(), "xmlsecurity.dialogs", "Certificate not found 
and can't be created!" );
 
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx 
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 37abf3a1..45c89f1545d0 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -16,6 +16,7 @@
 
 #include 
 #include 
+#include "xmlsec-wrapper.h"
 
 using namespace css;
 using namespace css::security;
@@ -97,18 +98,23 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironmentGpg::getPersonalCertif
 return xCertificateSequence;
 }
 
-Reference< XCertificate > SecurityEnvironmentGpg::getCertificate( const 
OUString& issuerName, const Sequence< sal_Int8 >& /*serialNumber*/ )
+Reference< XCertificate > SecurityEnvironmentGpg::getCertificate( const 
OUString& keyId, const Sequence< sal_Int8 >& /*serialNumber*/ )
 {
 CertificateImpl* xCert=nullptr;
 
+//xmlChar* pSignatureValue=xmlNodeGetContent(cur);
+OString ostr = OUStringToOString( keyId , RTL_TEXTENCODING_UTF8 );
+const xmlChar* strKeyId = reinterpret_cast(ostr.getStr());
+if(xmlSecBase64Decode(strKeyId, const_cast(strKeyId), 
xmlStrlen(strKeyId)) < 0)
+throw RuntimeException("Base64 decode failed");
+
 m_ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
-OString ostr = OUStringToOString( issuerName , RTL_TEXTENCODING_UTF8 );
-GpgME::Error err = m_ctx->startKeyListing(ostr.getStr(), true);
+GpgME::Error err = m_ctx->startKeyListing("", true);
 while (!err) {
 GpgME::Key k = m_ctx->nextKey(err);
 if (err)
 break;
-if (!k.isInvalid()) {
+if (!k.isInvalid() && strcmp(k.keyID(), reinterpret_cast(strKeyId)) == 0) {
 xCert = new CertificateImpl();
 xCert->setCertificate(m_ctx.get(), k);
 m_ctx->endKeyListing();
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx 
b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
index 66d79bb8643e..2af512bc746b 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
@@ -55,7 +55,8 @@ public:
 
 virtual css::uno::Sequence< css::uno::Reference< 
css::security::XCertificate > > SAL_CALL getPersonalCertificates() override;
 
-virtual css::uno::Reference< css::security::XCertificate > SAL_CALL 
getCertificate( const OUString& issuerName, const css::uno::Sequence< sal_Int8 
>& serialNumber ) override;
+/** We reinterpret the first parameter (originally issuerName) as keyId. 
We have no other way to identify a gpg key. */
+virtual css::uno::Reference< css::security::XCertificate > SAL_CALL 
getCertificate( const OUString& keyId, const css::uno::Sequence< sal_Int8 >& 
serialNumber ) override;
 
 virtual css::uno::Sequence< css::uno::Reference< 
css::security::XCertificate > > SAL_CALL buildCertificatePath(
 const css::uno::Reference< css::security::XCertificate >& beginCert ) 
override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 connectivity/source/drivers/dbase/DTable.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 7931ef2abbcef22de5c26738e4dd8d1d8ca5
Author: Takeshi Abe 
Date:   Wed Jun 28 12:08:22 2017 +0900

connectivity: Fix memory leak at finding non-empty file

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

diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index 97bed39062b8..6da1f893e6fc 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -55,6 +55,7 @@
 
 #include 
 #include 
+#include 
 
 using namespace ::comphelper;
 using namespace connectivity;
@@ -1057,13 +1058,10 @@ bool ODbaseTable::CreateImpl()
 if (aContent.isDocument())
 {
 // Only if the file exists with length > 0 raise an error
-SvStream* pFileStream = createStream_simpleError( 
aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE), StreamMode::READ);
+std::unique_ptr pFileStream(createStream_simpleError( 
aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE), StreamMode::READ));
 
 if (pFileStream && pFileStream->Seek(STREAM_SEEK_TO_END))
-{
 return false;
-}
-delete pFileStream;
 }
 }
 catch(const Exception&) // an exception is thrown when no file exists
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Barth]

 sw/source/core/view/viewsh.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 89494fc501142f83a4ae387394d939d25252f796
Author: Christian Barth 
Date:   Mon Jun 26 21:08:28 2017 +0200

tdf#107880: Make use of ScopedVclPtr

Make the use of VclPtr exception safe by using
ScopedVclPtr when disposeAndClear() is called
in same method.

Change-Id: I684eb7fb92c2bf16c30e74dce8e691dfca1a1f45
Signed-off-by: Christian Barth 
Reviewed-on: https://gerrit.libreoffice.org/39321
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 7cbcd8b4a689..a763e979ff88 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -326,7 +326,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 
 pRegion->Compress();
 
-VclPtr pVout;
+ScopedVclPtr pVout;
 while ( !pRegion->empty() )
 {
 SwRect aRect( pRegion->back() );
@@ -420,7 +420,6 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 lcl_PaintTransparentFormControls(*this, aRect); // 
i#107365
 }
 
-pVout.disposeAndClear();
 delete pRegion;
 Imp()->DelRegion();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits