date:20171220

[Libreoffice-commits] core.git: 2 commits - include/LibreOfficeKit libreofficekit/source

2017-12-20 Thread Pranav Kant

 include/LibreOfficeKit/LibreOfficeKitEnums.h |   32 +++
 libreofficekit/source/gtk/lokdocview.cxx |  110 ---
 2 files changed, 114 insertions(+), 28 deletions(-)

New commits:
commit 71cd37fad9792038279969c82e0cb209df06f024
Author: Pranav Kant 
Date:   Thu Dec 21 13:20:26 2017 +0530

lokdocview: Handle INVALIDATE_HEADER cb

With this calc gtktiledviewer or any other lok client shouldn't crash
anymore when a new view is opened.

And while at it, update documentation of callbacks.

Change-Id: I436c3b424dd4e2e6b8c312b0d3ba43d7006e944b

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 9cf635bb4c40..46be3f25fea8 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -514,11 +514,12 @@ typedef enum
  * The column/row header is no more valid because of a column/row insertion
  * or a similar event. Clients must query a new column/row header set.
  *
- * The payload says if we are invalidating a row or column header.
+ * The payload says if we are invalidating a row or column header. So,
+ * payload values can be: "row", "column", "all".
  */
 LOK_CALLBACK_INVALIDATE_HEADER = 33,
 /**
- * The text content of the address field in Calc.
+ * The text content of the address field in Calc. Eg: "A7"
  */
 LOK_CALLBACK_CELL_ADDRESS = 34,
 /**
@@ -539,7 +540,32 @@ typedef enum
  */
 LOK_CALLBACK_RULER_UPDATE = 35,
 /**
- * Dialog invalidation
+ * Window related callbacks are emitted under this category. It includes
+ * external windows like dialogs, autopopups for now.
+ *
+ * The payload format is:
+ *
+ * {
+ *"id": "unique integer id of the dialog",
+ *"action": "",
+ *"type": ""
+ *"rectangle": "x, y, width, height"
+ * }
+ *
+ * "type" tells the type of the window the action is associated with
+ *  - "dialog" - window is a dialog
+ *  - "child" - window is a floating window (combo boxes, etc.)
+ *
+ * "action" can take following values:
+ * - "created" - window is created in the backend, client can render it now
+ * - "title_changed" - window's title is changed
+ * - "size_changed" - window's size is changed
+ * - "invalidate" - the area as described by "rectangle" is invalidated
+ *Clients must request the new area
+ * - "cursor_invalidate" - cursor is invalidated. New position is in 
"rectangle"
+ * - "cursor_visible" - cursor visible status is changed. Status is 
availabe
+ *in "visible" field
+ * - "close" - window is closed
  */
 LOK_CALLBACK_WINDOW = 36,
 }
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 9070cb902236..f2609149de06 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -275,6 +275,7 @@ enum
 COMMENT,
 RULER,
 WINDOW,
+INVALIDATE_HEADER,
 
 LAST_SIGNAL
 };
@@ -428,6 +429,8 @@ callbackTypeToString (int nType)
 return "LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED";
 case LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED:
 return "LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED";
+case LOK_CALLBACK_INVALIDATE_HEADER:
+return "LOK_CALLBACK_INVALIDATE_HEADER";
 case LOK_CALLBACK_COMMENT:
 return "LOK_CALLBACK_COMMENT";
 case LOK_CALLBACK_RULER_UPDATE:
@@ -1410,6 +1413,9 @@ callback (gpointer pData)
 case LOK_CALLBACK_WINDOW:
 g_signal_emit(pCallback->m_pDocView, doc_view_signals[WINDOW], 0, 
pCallback->m_aPayload.c_str());
 break;
+case LOK_CALLBACK_INVALIDATE_HEADER:
+g_signal_emit(pCallback->m_pDocView, 
doc_view_signals[INVALIDATE_HEADER], 0, pCallback->m_aPayload.c_str());
+break;
 default:
 g_assert(false);
 break;
@@ -3198,6 +3204,22 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  G_TYPE_NONE, 1,
  G_TYPE_STRING);
 
+/**
+ * The key ruler related properties on change are reported by this.
+ *
+ * The payload format is:
+ *
+ * {
+ *  "margin1": "...",
+ *  "margin2": "...",
+ *  "leftOffset": "...",
+ *  "pageOffset": "...",
+ *  "pageWidth": "...",
+ *  "unit": "..."
+ *  }
+ *
+ * Here all aproperties are same as described in svxruler.
+ */
 doc_view_signals[RULER] =
 g_signal_new("ruler",
  G_TYPE_FROM_CLASS(pGObjectClass),
@@ -3209,9 +3231,32 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  G_TYPE_STRING);
 
 /**
- * LOKDocView::window
- * @pDocView: the #LOKDocView on which the signal is emitted
- * @pPayload: JSON containing the information, including id, about th

[Libreoffice-commits] core.git: bridges/source compilerplugins/clang sax/source solenv/clang-format solenv/CompilerTest_compilerplugins_clang.mk sot/source svl/source tools/source

2017-12-20 Thread Noel Grandin

 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |2 
 compilerplugins/clang/convertlong.cxx   |  142 ++
 compilerplugins/clang/convertuintptr.cxx|  106 ---
 compilerplugins/clang/droplong.cxx  |  190 
 compilerplugins/clang/test/convertlong.cxx  |   41 
 compilerplugins/clang/test/convertuintptr.cxx   |   20 --
 compilerplugins/clang/test/droplong.cxx |   27 --
 sax/source/tools/converter.cxx  |2 
 solenv/CompilerTest_compilerplugins_clang.mk|3 
 solenv/clang-format/blacklist   |2 
 sot/source/sdstor/storage.cxx   |8 
 sot/source/sdstor/ucbstorage.cxx|   10 -
 svl/source/items/itemset.cxx|2 
 svl/source/numbers/zforscan.cxx |2 
 tools/source/generic/poly.cxx   |2 
 tools/source/zcodec/zcodec.cxx  |2 
 16 files changed, 199 insertions(+), 362 deletions(-)

New commits:
commit 783120996aba341519393dd0100520707249d208
Author: Noel Grandin 
Date:   Wed Dec 20 15:53:21 2017 +0200

new loplugin: convertlong

merge the droplong and convertuintptr into one new plugin.
Limit the analysis to looking at var decl's, since that seems to be
safest proposition, even if that too needs some careful analysis.

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

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 038f101a7edf..762d1392b34e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -56,7 +56,7 @@ static OUString toUNOname( char const * p )
 while (*p != 'E')
 {
 // read chars count
-long n = (*p++ - '0');
+int n = (*p++ - '0');
 while ('0' <= *p && '9' >= *p)
 {
 n *= 10;
diff --git a/compilerplugins/clang/convertlong.cxx 
b/compilerplugins/clang/convertlong.cxx
new file mode 100644
index ..4d713aeecf2b
--- /dev/null
+++ b/compilerplugins/clang/convertlong.cxx
@@ -0,0 +1,142 @@
+/* -*- 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/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "plugin.hxx"
+#include "check.hxx"
+
+/**
+  plugin to help to when converting code from
+
+ sal_uIntPtr/sal_uLong/sal_Long/long/unsigned long
+
+  to something more precise.
+ */
+namespace
+{
+class ConvertLong : public RecursiveASTVisitor, public 
loplugin::Plugin
+{
+public:
+explicit ConvertLong(loplugin::InstantiationData const& data)
+: Plugin(data)
+{
+}
+
+virtual void run() override
+{
+std::string fn(compiler.getSourceManager()
+   
.getFileEntryForID(compiler.getSourceManager().getMainFileID())
+   ->getName());
+loplugin::normalizeDotDotInFilePath(fn);
+// using sal_uIntPtr as in-between type when converting void* to 
rtl_TextEncoding
+if (fn == SRCDIR "/sal/osl/unx/thread.cxx")
+return;
+// too much magic
+if (fn == SRCDIR "/sal/rtl/alloc_arena.cxx")
+return;
+if (fn == SRCDIR "/sal/rtl/alloc_cache.cxx")
+return;
+// TODO not sure what is going on here
+if (fn == SRCDIR "/tools/source/generic/bigint.cxx")
+return;
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+
+bool VisitVarDecl(VarDecl const*);
+bool TraverseFunctionDecl(FunctionDecl*);
+
+private:
+bool isInterestingType(QualType qt);
+};
+
+bool ConvertLong::TraverseFunctionDecl(FunctionDecl* functionDecl)
+{
+// ignore template stuff
+if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate)
+{
+return true;
+}
+return RecursiveASTVisitor::TraverseFunctionDecl(functionDecl);
+}
+
+bool ConvertLong::VisitVarDecl(VarDecl const* varDecl)
+{
+if (ignoreLocation(varDecl))
+return true;
+StringRef fileName{ 
compiler.getSourceManager().getFilename(varDecl->getLocation()) };
+if (loplugin::hasPathnamePrefix(fileName, SRCDIR 
"/include/tools/bigint.hxx"))
+return true;
+if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/include/tools/solar.h"))
+return true;
+if (loplugin::hasPathnamePrefix(fileName, SRCDIR 
"/include/o3tl/string_view.hxx"))
+return true;
+if (

How to check Uno objects types with Basic macro ?

2017-12-20 Thread Patrick Gelin

Hi,

I'm using basic macros with LibreOffice 5.4.2.2. I would like to check that
a basic Object is a document Section. I find out  XTypeProvider interface

 
, but no exemples hjow to use it. I've never use UNO interface, so could
anybody send me a OOo Basic snippet code to show how to do ?

By the way, do you know a good book/PDF to download about UNO interface
and/or IDL language ? 

Thank you !
Patrick



--
Sent from: http://nabble.documentfoundation.org/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2017-12-20 Thread Tommy


Tommy wrote:

Michael Meeks wrote:

.
    + 5.4.4 RC2 status
.

no bugfix list has been published yet about RC1 and RC2 in the wiki

https://wiki.documentfoundation.org/ReleasePlan/5.4#5.4.4_release




nevermoind. it's fixed now

---
Questa email è stata esaminata alla ricerca di virus da AVG.
http://www.avg.com


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

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

2017-12-20 Thread Noel Grandin

 cui/source/inc/postdlg.hxx  |6 -
 idl/source/prj/database.cxx |  161 +++-
 include/svx/svxids.hrc  |   48 ++
 sc/source/ui/view/cellsh1.cxx   |4 
 sw/source/core/docnode/ndtbl1.cxx   |4 
 sw/source/core/unocore/unostyle.cxx |2 
 sw/source/core/unocore/unotbl.cxx   |3 
 sw/source/ui/frmdlg/column.cxx  |3 
 sw/source/ui/misc/pgfnote.cxx   |3 
 sw/source/ui/misc/pggrid.cxx|3 
 sw/source/uibase/frmdlg/colex.cxx   |3 
 sw/source/uibase/misc/redlndlg.cxx  |2 
 sw/source/uibase/shells/tabsh.cxx   |3 
 sw/source/uibase/shells/textfld.cxx |2 
 sw/source/uibase/shells/textsh.cxx  |2 
 sw/source/uibase/uiview/viewtab.cxx |5 -
 sw/source/uibase/utlui/uitool.cxx   |   18 +---
 17 files changed, 144 insertions(+), 128 deletions(-)

New commits:
commit 24158311c115c2db6dd05a751f75a5c084e2c0d1
Author: Noel Grandin 
Date:   Wed Dec 20 13:30:21 2017 +0200

TypedWhichId in svx part 1

and teach the idl compiler how to ignore the TypeWhichId part
of the define

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

diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 678602a85feb..9c33e4ab9dd6 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -34,9 +34,9 @@
 over this list with links.
 
 [Items]
-
-
-
+
+
+
 */
 
 class SvxPostItDialog : public SfxModalDialog
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 46c7b576f5bd..62340e70cb0b 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -146,105 +146,120 @@ bool SvIdlDataBase::ReadIdFile( const OString& 
rOFileName )
 aIdFileList.push_back( rFileName );
 AddDepFile( aFullName );
 SvTokenStream aTokStm( aFullName );
-if( aTokStm.GetStream().GetError() == ERRCODE_NONE )
-{
-SvToken& rTok = aTokStm.GetToken_Next();
+if( aTokStm.GetStream().GetError() != ERRCODE_NONE )
+return false;
+
+SvToken& rTok = aTokStm.GetToken_Next();
 
-while( !rTok.IsEof() )
+while( !rTok.IsEof() )
+{
+if( rTok.IsChar() && rTok.GetChar() == '#' )
 {
-if( rTok.IsChar() && rTok.GetChar() == '#' )
+rTok = aTokStm.GetToken_Next();
+if( rTok.Is( SvHash_define() ) )
 {
 rTok = aTokStm.GetToken_Next();
-if( rTok.Is( SvHash_define() ) )
+OString aDefName;
+if( !rTok.IsIdentifier() )
+throw SvParseException( "unexpected token after define", 
rTok );
+aDefName = rTok.GetString();
+
+sal_uLong nVal = 0;
+bool bOk = true;
+while( bOk )
 {
 rTok = aTokStm.GetToken_Next();
-OString aDefName;
-if( !rTok.IsIdentifier() )
-throw SvParseException( "unexpected token after 
define", rTok );
-aDefName = rTok.GetString();
-
-sal_uLong nVal = 0;
-bool bOk = true;
-while( bOk )
+if (rTok.GetTokenAsString().startsWith("TypedWhichId"))
 {
 rTok = aTokStm.GetToken_Next();
-if( rTok.IsIdentifier() )
-{
-sal_uLong n;
-if( FindId( rTok.GetString(), &n ) )
-nVal += n;
-else
-bOk = false;
-}
-else if( rTok.IsChar() )
-{
-if( rTok.GetChar() == '-'
-  || rTok.GetChar() == '/'
-  || rTok.GetChar() == '*'
-  || rTok.GetChar() == '&'
-  || rTok.GetChar() == '|'
-  || rTok.GetChar() == '^'
-  || rTok.GetChar() == '~' )
-{
-throw SvParseException( "unknown operator '" + 
OString(rTok.GetChar()) + "'in define", rTok );
-}
-if( rTok.GetChar() != '+'
-  && rTok.GetChar() != '('
-  && rTok.GetChar() != ')' )
-// only + is allowed, parentheses are 
immaterial
-// because + is commutative
-break;
-}
-else if( rTok.IsInteger() )
+if( !rTok.IsChar() ||

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

2017-12-20 Thread Yousuf Philips

 sw/uiconfig/swriter/toolbar/standardbar.xml  |3 ++-
 sw/uiconfig/swriter/toolbar/textstylebar.xml |9 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 490287a1b22411f4ac32127c93228e06dad4ff22
Author: Yousuf Philips 
Date:   Tue Dec 19 03:56:19 2017 +0400

Writer: Restore old symbol button and add new numbering styles

Change-Id: I458ad3fe6c19cd5c65a4beb4758e0ac9aba630a4
Reviewed-on: https://gerrit.libreoffice.org/46757
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index fa35697ffd94..5b97d40f10b7 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -61,8 +61,9 @@
  
  
  
+ 
+ 
  
- 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml 
b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 7aa997f75984..8b1706705b27 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -73,9 +73,12 @@
  
  
  
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca1bcb40ea27492c0f3a452c4a318b540a9ff09c
Author: Yousuf Philips 
Date:   Thu Dec 21 03:45:37 2017 +0400

Fix labels for page-related group button entries

Change-Id: Ia6ed455cc7b5e41895950a22b8d75284c847ebee
Reviewed-on: https://gerrit.libreoffice.org/46873
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 0cff97f27ebb..6069f30543a8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1114,7 +1114,7 @@
   
   
 
-  Page Column Type
+  Page Columns
 
 
   1
@@ -3245,7 +3245,7 @@
   
   
 
-  Page Margin
+  Page Margins
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Eike Rathke

 sc/source/core/tool/token.cxx |   33 +++--
 1 file changed, 31 insertions(+), 2 deletions(-)

New commits:
commit b366adcf5aca8bb22ccd0dd270ab08e9c8976b5b
Author: Eike Rathke 
Date:   Wed Dec 20 21:32:55 2017 +0100

Invert logic, include only known good, tdf#114251 related

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

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index bb7ecc9650a9..6979ed459bb7 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1670,11 +1670,18 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
 // All the rest, special commands, separators, error codes, ...
 switch (eOp)
 {
+default:
+// Default is off, no vectorization.
+// Mentioning some specific values below to indicate why.
+
 case ocName:
 // Named expression would need "recursive" handling of its
 // token array for vector state in
 // ScFormulaCell::InterpretFormulaGroup() and below.
 
+case ocDBArea:
+// Certainly not a vectorization of the entire area..
+
 case ocTableRef:
 // May result in a single cell or range reference, depending on
 // context.
@@ -1692,8 +1699,30 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
 mbOpenCLEnabled = false;
 CheckForThreading(eOp);
 break;
-default:
-;   // nothing
+
+// Known good, don't change state.
+case ocStop:
+case ocExternal:
+case ocOpen:
+case ocClose:
+case ocSep:
+case ocArrayOpen:
+case ocArrayRowSep:
+case ocArrayColSep:
+case ocArrayClose:
+case ocMissing:
+case ocBad:
+case ocSpaces:
+case ocSkip:
+case ocPercentSign:
+case ocErrNull:
+case ocErrDivZero:
+case ocErrValue:
+case ocErrRef:
+case ocErrName:
+case ocErrNum:
+case ocErrNA:
+break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Eike Rathke

 include/formula/opcode.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f6c2fd1ce58a8f34483177c0b240c53a7866faf9
Author: Eike Rathke 
Date:   Wed Dec 20 22:04:50 2017 +0100

Remove unused ocExternalRef

Change-Id: Ie32411637f2f2dbedfc8e4272e952ecc1d72ac49

diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 88527b9244ee..a96707b30bd1 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -33,7 +33,6 @@ enum OpCode : sal_uInt16
 ocStop  = SC_OPCODE_STOP,
 ocExternal  = SC_OPCODE_EXTERNAL,
 ocName  = SC_OPCODE_NAME,
-ocExternalRef   = SC_OPCODE_EXTERNAL_REF,
 // Jump commands
 ocIf= SC_OPCODE_IF,
 ocIfError   = SC_OPCODE_IF_ERROR,
@@ -527,7 +526,6 @@ inline std::string OpCodeEnumToString(OpCode eCode)
 case ocStop: return "Stop";
 case ocExternal: return "External";
 case ocName: return "Name";
-case ocExternalRef: return "ExternalRef";
 case ocIf: return "If";
 case ocIfError: return "IfError";
 case ocIfNA: return "IfNA";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

some information for comparison

2017-12-20 Thread malerviertel

Hi all,

to get an impression of the progress of your fork to the original cppunit as 
well as http://cppunit.sourceforge.net/cppunit2/features.html I am missing a 
feature list or a roadmap. Apart from 
https://cgit.freedesktop.org/libreoffice/cppunit/tree/TODO and 
https://cgit.freedesktop.org/libreoffice/cppunit/log/ I found no compact survey 
concerning the (future) development.
Where are these facts located?

Many thanks for any hint in advance
Thomas

BTW: Many thanks for 'riding this famous horse' as well ...!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-12-20 Thread Armin Le Grand

 sw/source/core/layout/pagechg.cxx |  116 ++
 1 file changed, 106 insertions(+), 10 deletions(-)

New commits:
commit 0b53f794ffb2550288610b9488f11fd21ab85aae
Author: Armin Le Grand 
Date:   Wed Dec 20 09:51:52 2017 +0100

Make used Pages alive in AssertFlyPages

There is a case where docs are created/exist that have an empty
2nd page with a single, page-anchored Frame (e.g. graphic), not
using a PageBreak. Persistence works in this case due to method
AssertFlyPages adding the missing page at end, but when multiple of
these docs get serialized (e.g. MailMerge) the problem exists for
in-between pages, too, and needs to be corrected. Also need to
correct the Pages for the Frames when Pages in that situation were
corrected.

Change-Id: I7c8bbbf0668438af98bc615e5b7c472ea6eee906
Reviewed-on: https://gerrit.libreoffice.org/46855
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 68dfd632b5ec..79abcfdf6f56 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -216,12 +216,14 @@ SwPageFrame::SwPageFrame( SwFrameFormat *pFormat, 
SwFrame* pSib, SwPageDesc *pPg
 }
 
 // create and insert body area if it is not a blank page
-SwDoc *pDoc = pFormat->GetDoc();
-m_bEmptyPage = pFormat == pDoc->GetEmptyPageFormat();
-if ( m_bEmptyPage )
+SwDoc* pDoc(pFormat->GetDoc());
+m_bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat());
+
+if(m_bEmptyPage)
+{
 return;
+}
 
-m_bEmptyPage = false;
 Calc(pRenderContext); // so that the PrtArea is correct
 SwBodyFrame *pBodyFrame = new SwBodyFrame( pDoc->GetDfltFrameFormat(), 
this );
 pBodyFrame->ChgSize( getFramePrintArea().SSize() );
@@ -571,6 +573,28 @@ void SwPageFrame::UpdateAttr_( const SfxPoolItem *pOld, 
const SfxPoolItem *pNew,
 {
 case RES_FMT_CHG:
 {
+// state of m_bEmptyPage needs to be determined newly
+const bool bNewState(GetFormat() == 
GetFormat()->GetDoc()->GetEmptyPageFormat());
+
+if(m_bEmptyPage != bNewState)
+{
+// copy new state
+m_bEmptyPage = bNewState;
+
+if(nullptr == GetLower())
+{
+// if we were an empty page before there is not yet a 
BodyArea in the
+// form of a SwBodyFrame, see constructor
+SwViewShell* pSh(getRootFrame()->GetCurrShell());
+vcl::RenderContext* pRenderContext(pSh ? pSh->GetOut() : 
nullptr);
+Calc(pRenderContext); // so that the PrtArea is correct
+SwBodyFrame* pBodyFrame = new SwBodyFrame(GetFormat(), 
this);
+pBodyFrame->ChgSize(getFramePrintArea().SSize());
+pBodyFrame->Paste(this);
+pBodyFrame->InvalidatePos();
+}
+}
+
 // If the frame format is changed, several things might also 
change:
 // 1. columns:
 assert(pOld && pNew); //FMT_CHG Missing Format
@@ -1486,19 +1510,81 @@ void SwRootFrame::AssertFlyPages()
 const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats();
 
 // what page targets the "last" Fly?
-sal_uInt16 nMaxPg = 0;
+// note the needed pages in a set
+sal_uInt16 nMaxPg(0);
+std::set< sal_uInt16 > neededPages;
 
 for ( size_t i = 0; i < pTable->size(); ++i )
 {
 const SwFormatAnchor &rAnch = (*pTable)[i]->GetAnchor();
-if ( !rAnch.GetContentAnchor() && nMaxPg < rAnch.GetPageNum() )
-nMaxPg = rAnch.GetPageNum();
+if(!rAnch.GetContentAnchor())
+{
+const sal_uInt16 nPageNum(rAnch.GetPageNum());
+
+// calc MaxPage (as before)
+nMaxPg = std::max(nMaxPg, nPageNum);
+
+// note as needed page
+neededPages.insert(nPageNum);
+}
 }
+
 // How many pages exist at the moment?
-SwPageFrame *pPage = static_cast(Lower());
-while ( pPage && pPage->GetNext() &&
-!static_cast(pPage->GetNext())->IsFootnotePage() )
+// And are there EmptyPages that are needed?
+SwPageFrame* pPage(static_cast(Lower()));
+SwPageFrame* pPrevPage(nullptr);
+SwPageFrame* pFirstRevivedEmptyPage(nullptr);
+
+while(pPage) // moved two while-conditions to break-statements (see below)
 {
+const sal_uInt16 nPageNum(pPage->GetPhyPageNum());
+
+if(pPage->IsEmptyPage() &&
+nullptr != pPrevPage &&
+neededPages.find(nPageNum) != neededPages.end())
+{
+// This is an empty page, but it *is* needed since a SwFrame
+// is anchored at it directly. Initially these SwFrames are
+// not fully initialized. Need to change the format of this SwFrame
+

[Libreoffice-commits] core.git: sal/CppunitTest_sal_rtl.mk sal/qa

2017-12-20 Thread Jan Holesovsky

 sal/CppunitTest_sal_rtl.mk |1 -
 sal/qa/rtl/alloc/rtl_alloc.cxx |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fadbccc3176044b3642716f5b388a793165da05a
Author: Jan Holesovsky 
Date:   Tue Dec 19 10:42:40 2017 +0100

Don't use -I$(SRCDIR), people have various strange stuff in the SRCDIR.

For me, the build failed because of a file named 'new' ;-)

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

diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk
index c4629a2c33db..43533fc5ab1c 100644
--- a/sal/CppunitTest_sal_rtl.mk
+++ b/sal/CppunitTest_sal_rtl.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl,\
 
 $(eval $(call gb_CppunitTest_set_include,sal_rtl,\
-I$(SRCDIR)/sal/qa/inc \
-   -I$(SRCDIR) \
$$(INCLUDE) \
 ))
 
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 6a4c1648ff53..0e9b7c0f47a8 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-#include 
+#include "../../../rtl/strimp.hxx"
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Eike Rathke

 sc/source/core/tool/token.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit b34c0cd9ada297e9565b1a93fcaa2a96333e1881
Author: Eike Rathke 
Date:   Wed Dec 20 19:44:51 2017 +0100

Exclude more special OpCode values from vectorization

Namely those that have some reference assigned.

Change-Id: Icd5f79612295f13d552a256233b8f1298e3e5359

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index d13f1a2c4308..bb7ecc9650a9 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1674,6 +1674,19 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
 // Named expression would need "recursive" handling of its
 // token array for vector state in
 // ScFormulaCell::InterpretFormulaGroup() and below.
+
+case ocTableRef:
+// May result in a single cell or range reference, depending on
+// context.
+
+case ocColRowName:
+// The associated reference is the name cell with which to
+// create the implicit intersection.
+
+case ocColRowNameAuto:
+// Auto column/row names lead to references computed in
+// interpreter.
+
 SAL_INFO("sc.opencl", "opcode " << 
formula::FormulaCompiler().GetOpCodeMap(sheet::FormulaLanguage::ENGLISH)->getSymbol(eOp)
 << " disables vectorisation for formula group");
 meVectorState = FormulaVectorDisabledByOpCode;
 mbOpenCLEnabled = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Aron Budea

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

New commits:
commit f2f5ebcee462472b27b610f53abc7f9a6378462b
Author: Aron Budea 
Date:   Wed Dec 20 12:06:39 2017 +0100

tdf#104229: properly switch to def sidebar deck on status change

regression since a64999511ae654131d997eec9a3d78478cfc1c75

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

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index b0610ae203d9..5752120038a4 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -307,7 +307,7 @@ void SAL_CALL SidebarController::statusChanged (const 
css::frame::FeatureStateEv
 
 // Force the current deck to update its panel list.
 if ( ! mbIsDocumentReadOnly)
-msCurrentDeckId = gsDefaultDeckId;
+SwitchToDefaultDeck();
 
 mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
 maAsynchronousDeckSwitch.CancelRequest();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread tagezi

 sfx2/source/appl/sfxhelp.cxx   |9 -
 sfx2/uiconfig/ui/helpmanual.ui |2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 400b70f85fdf0ae5a6d606eb3fff683b9f1ce7ab
Author: tagezi 
Date:   Tue Dec 5 16:01:32 2017 +0200

tdf#114204 - Clarify the "Local Help not installed" message

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

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4d5a2b240a01..bce03be37adb 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -650,7 +651,13 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 
 if ( !impl_hasHelpInstalled() )
 {
-ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),"onlinehelpmanual","sfx/ui/helpmanual.ui");
+ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),
+"onlinehelpmanual", "sfx/ui/helpmanual.ui");
+
+LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
+OUString sLocaleString = SvtLanguageTable::GetLanguageString( 
aLangTag.getLanguageType() );
+OUString sPrimTex = aQueryBox->get_primary_text();
+aQueryBox->set_primary_text(sPrimTex.replaceAll("$UILOCALE", 
sLocaleString));
 short OnlineHelpBox = aQueryBox->Execute();
 
 if(OnlineHelpBox == RET_OK)
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index f3847c880a92..e750ed0c7a96 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -9,7 +9,7 @@
 False
 dialog
 True
-The %PRODUCTNAME built-in help is not 
installed on your computer.
+The %PRODUCTNAME built-in help for 
current UI language ($UILOCALE) is not installed on your computer.
 You may either install it from our 
website or your systemâs repositories, or read an online version.
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_htmlfuzzer.mk vcl/Module_vcl.mk vcl/workben

2017-12-20 Thread Caolán McNamara

 Makefile.in  |2 -
 Repository.mk|1 
 vcl/Executable_htmlfuzzer.mk |   49 ---
 vcl/Module_vcl.mk|1 
 vcl/workben/htmlfuzzer.cxx   |   33 
 5 files changed, 1 insertion(+), 85 deletions(-)

New commits:
commit 111db5b992ae5870e76313f76e633a4edcccf010
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 17:30:58 2017 +

remove html fuzzer

still not ready after all

This reverts commit 6fc7f85de7f0bfa8ee36f867e321a8816ad1e385.

diff --git a/Makefile.in b/Makefile.in
index 8c777a67f4ee..9ac31060e27f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -483,7 +483,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Rdb_services udkapi offapi Library_gie 
Library_icg Library_reflection Library_invocadapt Library_bootstrap 
Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno 
instsetoo_native more_fonts StaticLibrary_boost_locale 
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc 
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math 
Library_forui Library_binaryurp Library_io Library_invocation 
Library_namingservice Library_proxyfac Library_uuresolver Module_ure Execu
 table_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer 
Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer 
Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer 
Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer 
Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer 
Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer 
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer 
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer 
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer 
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer 
Executable_pptxfuzzer Executable_mmlfuzzer Executable_mtpfuzzer 
Executable_htmlfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Rdb_services udkapi offapi Library_gie 
Library_icg Library_reflection Library_invocadapt Library_bootstrap 
Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno 
instsetoo_native more_fonts StaticLibrary_boost_locale 
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc 
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math 
Library_forui Library_binaryurp Library_io Library_invocation 
Library_namingservice Library_proxyfac Library_uuresolver Module_ure Execu
 table_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer 
Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer 
Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer 
Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer 
Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer 
Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer 
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer 
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer 
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer 
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer 
Executable_pptxfuzzer Executable_mmlfuzzer Executable_mtpfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index cc540ef4139e..4e9728adc5c6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -142,7 +142,6 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,pptxfuzzer) \
$(call

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

2017-12-20 Thread Stephan Bergmann

 compilerplugins/clang/salcall.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 50f35e5b65bf69d7b3f2b703c5367574db165196
Author: Stephan Bergmann 
Date:   Wed Dec 20 13:15:08 2017 +0100

Fix for compilerplugins/clang/test/salcall.cxx with clang-cl

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

diff --git a/compilerplugins/clang/salcall.cxx 
b/compilerplugins/clang/salcall.cxx
index 3ff786d2ee87..2c33008ae276 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -498,6 +498,9 @@ bool SalCall::isSalCallFunction(FunctionDecl const* 
functionDecl, SourceLocation
 }
 }
 
+#if defined _WIN32
+auto const macroExpansion = SM.getExpansionLoc(endLoc);
+#endif
 endLoc = SM.getSpellingLoc(endLoc);
 
 // Ctors/dtors/conversion functions don't have a return type, start 
searching for "SAL_CALL"
@@ -515,7 +518,17 @@ bool SalCall::isSalCallFunction(FunctionDecl const* 
functionDecl, SourceLocation
 #endif
 startLoc = SM.getSpellingLoc(startLoc);
 
-#if !defined _WIN32
+#if defined _WIN32
+if (macroRange.isValid()
+&& !compat::isPointWithin(SM, startLoc, macroRange.getBegin(), 
macroRange.getEnd()))
+{
+// endLoc is within a macro body but startLoc is not; two source 
ranges, first is from
+// startLoc to the macro invocation, second is the leading part of 
the corresponding
+// macro definition's replacement text:
+ranges.emplace_back(startLoc, macroExpansion);
+startLoc = macroRange.getBegin();
+}
+#else
 // When the SAL_CALL macro expands to nothing, it may even precede the 
function
 // declaration's source range, so go back one token (unless the 
declaration is known to
 // start with a token that must precede a possible "SAL_CALL", like 
"virtual" or
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/clientnb.cpp net/Ssl.cpp tools/map.cpp wsd/FileServer.cpp

2017-12-20 Thread Pranav Kant

 net/Ssl.cpp|8 
 net/clientnb.cpp   |2 +-
 tools/map.cpp  |2 +-
 wsd/FileServer.cpp |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9cbef1416049ddd0998f0d574e6a53d2af216287
Author: Pranav Kant 
Date:   Wed Dec 20 22:25:04 2017 +0530

loplugin:nullptr

Change-Id: I5f0dc970e8522b63570faa0ba05ab19dd0f45d5a

diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index 5f6eaa4d..b56b7352 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -80,7 +80,7 @@ SslContext::SslContext(const std::string& certFilePath,
 int errCode = 0;
 if (!caFilePath.empty())
 {
-errCode = SSL_CTX_load_verify_locations(_ctx, caFilePath.c_str(), 
0);
+errCode = SSL_CTX_load_verify_locations(_ctx, caFilePath.c_str(), 
nullptr);
 if (errCode != 1)
 {
 std::string msg = getLastErrorMsg();
@@ -248,9 +248,9 @@ void SslContext::initDH()
 // OpenSSL v1.1.0 has public API changes
 // p, g and length of the Diffie-Hellman param can't be set directly 
anymore,
 // instead DH_set0_pqg and DH_set_length are used
-BIGNUM* p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), 0);
-BIGNUM* g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), 0);
-if ((DH_set0_pqg(dh, p, NULL, g) == 0) || (DH_set_length(dh, 160) == 0))
+BIGNUM* p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), nullptr);
+BIGNUM* g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), nullptr);
+if ((DH_set0_pqg(dh, p, nullptr, g) == 0) || (DH_set_length(dh, 160) == 0))
 #else
 dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), 0);
 dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), 0);
diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index ba13d94b..a4581c3d 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -225,7 +225,7 @@ struct Client : public Poco::Util::Application
 
 std::vector res;
 
-std::srand(std::time(0));
+std::srand(std::time(nullptr));
 
 std::vector data;
 for (size_t i = 1; i < (1 << 14); ++i)
diff --git a/tools/map.cpp b/tools/map.cpp
index db627daa..b72ab336 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -595,7 +595,7 @@ int main(int argc, char **argv)
 else
 appOrPid = arg;
 }
-if (appOrPid == NULL && forPid == 0)
+if (appOrPid == nullptr && forPid == 0)
 help = true;
 
 if (help)
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 73308421..9f788818 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -331,7 +331,7 @@ void FileServerRequestHandler::readDirToHash(const 
std::string &basePath, const
 LOG_TRC("Pre-reading directory: " << basePath << path << "\n");
 workingdir = opendir((basePath + path).c_str());
 
-while ((currentFile = readdir(workingdir)) != NULL)
+while ((currentFile = readdir(workingdir)) != nullptr)
 {
 if (currentFile->d_name[0] == '.')
 continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_htmlfuzzer.mk vcl/Module_vcl.mk vcl/workben

2017-12-20 Thread Caolán McNamara

 Makefile.in  |2 -
 Repository.mk|1 
 vcl/Executable_htmlfuzzer.mk |   49 +++
 vcl/Module_vcl.mk|1 
 vcl/workben/htmlfuzzer.cxx   |   33 
 5 files changed, 85 insertions(+), 1 deletion(-)

New commits:
commit 6fc7f85de7f0bfa8ee36f867e321a8816ad1e385
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 6 14:22:39 2017 +

add html fuzzer

Change-Id: I03a61421c477642548d9814610faeb570bd34c8d
Reviewed-on: https://gerrit.libreoffice.org/45970
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/Makefile.in b/Makefile.in
index 9ac31060e27f..8c777a67f4ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -483,7 +483,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Rdb_services udkapi offapi Library_gie 
Library_icg Library_reflection Library_invocadapt Library_bootstrap 
Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno 
instsetoo_native more_fonts StaticLibrary_boost_locale 
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc 
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math 
Library_forui Library_binaryurp Library_io Library_invocation 
Library_namingservice Library_proxyfac Library_uuresolver Module_ure Execu
 table_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer 
Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer 
Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer 
Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer 
Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer 
Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer 
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer 
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer 
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer 
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer 
Executable_pptxfuzzer Executable_mmlfuzzer Executable_mtpfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Rdb_services udkapi offapi Library_gie 
Library_icg Library_reflection Library_invocadapt Library_bootstrap 
Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno 
instsetoo_native more_fonts StaticLibrary_boost_locale 
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc 
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math 
Library_forui Library_binaryurp Library_io Library_invocation 
Library_namingservice Library_proxyfac Library_uuresolver Module_ure Execu
 table_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer 
Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer 
Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer 
Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer 
Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer 
Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer 
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer 
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer 
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer 
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer 
Executable_pptxfuzzer Executable_mmlfuzzer Executable_mtpfuzzer 
Executable_htmlfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index 4e9728adc5c6..cc540ef4139e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -142,6 +142,7 @@ $(eval $(call 
gb_Helper_register_executable

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

2017-12-20 Thread Maxim Monastirsky

 framework/source/uielement/toolbarmanager.cxx |1 -
 vcl/source/window/toolbox2.cxx|2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 861086a21449acb168e52e4eab606692200d2622
Author: Maxim Monastirsky 
Date:   Mon Oct 9 21:13:25 2017 +0300

Related: tdf#79657 Different approach to disable the context menu

... in the overflow toolbar. Using ToolBoxMenuType::NONE
is wrong as it might affect the layout. Can be easily triggered
here by adding FloatWinPopupFlags::GrabFocus to StartPopupMode
(which likely will be needed to fully solve tdf#79657).

Another case was fixed in 91053763a7189c8ac03a59dc996e6333404f846e
("Fix sub-toolbar tearoff for .uno:ChooseControls"), but without
providing a solution for the context menu.

Change-Id: I4a0b4560fe49106613fa2337b5dd83eb7fa29f47
Reviewed-on: https://gerrit.libreoffice.org/46837
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 842e1f06d067..5c69e7f0dac8 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1560,7 +1560,6 @@ IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, 
pToolBar, void )
 pOverflowToolBar->SetOutStyle( pToolBar->GetOutStyle() );
 m_aOverflowManager.set( new ToolBarManager( m_xContext, m_xFrame, 
OUString(), pOverflowToolBar ) );
 m_aOverflowManager->FillOverflowToolbar( pToolBar );
-pOverflowToolBar->SetMenuType( ToolBoxMenuType::NONE );
 
 ::Size aActSize( pOverflowToolBar->GetSizePixel() );
 ::Size aSize( pOverflowToolBar->CalcWindowSizePixel() );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index c636b4023be0..f181da0a99d9 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1718,7 +1718,7 @@ IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu, 
void*, void)
 
 void ToolBox::ExecuteCustomMenu( const tools::Rectangle& rRect )
 {
-if( IsMenuEnabled() )
+if ( IsMenuEnabled() && !ImplIsInPopupMode() )
 {
 UpdateCustomMenu();
 // handle custom menu asynchronously
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/FileUtil.cpp common/IoUtil.cpp common/Log.cpp common/MessageQueue.cpp common/Protocol.cpp common/Session.cpp common/SigUtil.cpp common/SpookyV2.cpp common/Unit

2017-12-20 Thread Pranav Kant

 common/FileUtil.cpp  |2 +-
 common/IoUtil.cpp|4 ++--
 common/Log.cpp   |2 +-
 common/MessageQueue.cpp  |6 +++---
 common/Protocol.cpp  |2 +-
 common/Session.cpp   |4 ++--
 common/SigUtil.cpp   |4 ++--
 common/SpookyV2.cpp  |2 +-
 common/Unit.cpp  |4 ++--
 common/UnitHTTP.cpp  |2 +-
 common/Util.cpp  |2 +-
 kit/ChildSession.cpp |   10 +-
 kit/DummyLibreOfficeKit.cpp  |2 +-
 kit/ForKit.cpp   |   22 +++---
 kit/Kit.cpp  |   28 ++--
 net/DelaySocket.cpp  |4 ++--
 net/Socket.cpp   |4 ++--
 net/Ssl.cpp  |4 ++--
 net/clientnb.cpp |4 ++--
 test/DeltaTests.cpp  |   10 +-
 test/TileCacheTests.cpp  |   24 
 test/TileQueueTests.cpp  |   14 +++---
 test/UnitAdmin.cpp   |   14 +++---
 test/UnitClient.cpp  |   10 +-
 test/UnitFuzz.cpp|   12 ++--
 test/UnitOAuth.cpp   |   12 ++--
 test/UnitOOB.cpp |   14 +++---
 test/UnitPrefork.cpp |6 +++---
 test/UnitStorage.cpp |   12 ++--
 test/UnitTileCache.cpp   |   12 ++--
 test/UnitTimeout.cpp |8 
 test/UnitWOPI.cpp|   12 ++--
 test/UnitWOPISaveAs.cpp  |   12 ++--
 test/WhiteBoxTests.cpp   |2 +-
 test/httpcrashtest.cpp   |8 
 test/httpwserror.cpp |   10 +-
 test/httpwstest.cpp  |   16 
 test/integration-http-server.cpp |8 
 test/test.cpp|4 ++--
 tools/Config.cpp |6 +++---
 tools/Connect.cpp|   10 +-
 tools/KitClient.cpp  |8 
 tools/Stress.cpp |6 +++---
 tools/Tool.cpp   |8 
 tools/map.cpp|2 +-
 wsd/Admin.cpp|   20 ++--
 wsd/AdminModel.cpp   |   12 ++--
 wsd/Auth.cpp |6 +++---
 wsd/ClientSession.cpp|   14 +++---
 wsd/DocumentBroker.cpp   |   10 +-
 wsd/FileServer.cpp   |8 
 wsd/LOOLWSD.cpp  |   30 +++---
 wsd/Storage.cpp  |   12 ++--
 wsd/TestStubs.cpp|2 +-
 wsd/TileCache.cpp|   12 ++--
 55 files changed, 249 insertions(+), 249 deletions(-)

New commits:
commit f63858433b44507c5a95a79af00dd004a09f00fa
Author: Pranav Kant 
Date:   Wed Dec 20 18:36:26 2017 +0530

loplugin:includeform

Change-Id: Ib62a7aa61062f00698aa3e8a144438de5c57e53d

diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp
index af6dfef5..afb0395e 100644
--- a/common/FileUtil.cpp
+++ b/common/FileUtil.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "config.h"
+#include 
 
 #include "FileUtil.hpp"
 
diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp
index c93023af..58fc274e 100644
--- a/common/IoUtil.cpp
+++ b/common/IoUtil.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "config.h"
+#include 
 
 #include "IoUtil.hpp"
 
@@ -29,7 +29,7 @@
 
 #include "Common.hpp"
 #include "Protocol.hpp"
-#include 
+#include "LOOLWebSocket.hpp"
 #include "Log.hpp"
 #include "Util.hpp"
 
diff --git a/common/Log.cpp b/common/Log.cpp
index 0b19d88f..5a4f121f 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "config.h"
+#include 
 
 #include 
 #include 
diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index a53ae988..1f1d805f 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "config.h"
+#include 
 
 #include "MessageQueue.hpp"
 
@@ -18,8 +18,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include "Protocol.hpp"
+#include "Log.hpp"
 #include 
 
 using Poco::StringTokenizer;
diff --git a/common/Protocol.cpp b/common/Protocol.cpp
index b5e04665..a4c089b2 100644
--- a/common/Protocol.cpp
+++ b/common/Protocol.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "config.h"
+#include 
 
 #include "Protocol.hpp"
 
diff --git a/common/Session.cpp b/common/Session.cpp
index 6a3dc585..6070955c 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-0' - source/sl

2017-12-20 Thread Andras Timar

 source/sl/cui/messages.po |4 
 source/sl/extras/source/autocorr/emoji.po | 3948 +-
 source/sl/helpcontent2/source/text/scalc/01.po|4 
 source/sl/helpcontent2/source/text/sdraw.po   |   74 
 source/sl/helpcontent2/source/text/shared/01.po   |  220 
 source/sl/helpcontent2/source/text/shared/02.po   |4 
 source/sl/helpcontent2/source/text/shared/guide.po|6 
 source/sl/helpcontent2/source/text/shared/optionen.po |4 
 source/sl/helpcontent2/source/text/smath.po   |   68 
 source/sl/helpcontent2/source/text/swriter/guide.po   |4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   49 
 11 files changed, 4091 insertions(+), 294 deletions(-)

New commits:
commit 46ad5ef5969eaa0cb76b0c031068b97370e40f0f
Author: Andras Timar 
Date:   Wed Dec 20 16:15:16 2017 +0100

Updated Slovenian translation

Change-Id: I8b96fdfc2d6248a51c1981122d6d3392e4505dc5

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index 115c21cc572..721b5100c42 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2017-12-19 08:42+0100\n"
+"POT-Creation-Date: 2017-12-20 12:06+0100\n"
 "PO-Revision-Date: 2017-12-19 21:54+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/extras/source/autocorr/emoji.po 
b/source/sl/extras/source/autocorr/emoji.po
index 3df1ceb6304..8145ded722b 100644
--- a/source/sl/extras/source/autocorr/emoji.po
+++ b/source/sl/extras/source/autocorr/emoji.po
@@ -1,16 +1,16 @@
 #. extracted from extras/source/autocorr/emoji
 msgid ""
 msgstr ""
-"Project-Id-Version: LibreOffice 5.2\n"
+"Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2017-09-23 12:04+0200\n"
-"PO-Revision-Date: 2016-11-22 22:40+0200\n"
+"POT-Creation-Date: 2017-12-20 12:06+0100\n"
+"PO-Revision-Date: 2017-12-20 15:50+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1706,8 +1706,8 @@ msgctxt ""
 "emoji.ulf\n"
 "LIGHTNING\n"
 "LngText.text"
-msgid "lighting"
-msgstr "strela"
+msgid "lightning3"
+msgstr "strela3"
 
 #. â (U+02608), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -1715,8 +1715,8 @@ msgctxt ""
 "emoji.ulf\n"
 "THUNDERSTORM\n"
 "LngText.text"
-msgid "storm"
-msgstr "nevihta"
+msgid "storm2"
+msgstr "nevihta2"
 
 #. â (U+02609), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -2057,8 +2057,8 @@ msgctxt ""
 "emoji.ulf\n"
 "MERCURY\n"
 "LngText.text"
-msgid "Mercury"
-msgstr "Merkur"
+msgid "mercury"
+msgstr "merkur"
 
 #. â (U+02640), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -2075,8 +2075,8 @@ msgctxt ""
 "emoji.ulf\n"
 "EARTH\n"
 "LngText.text"
-msgid "Earth"
-msgstr "Zemlja"
+msgid "earth"
+msgstr "zemlja"
 
 #. â (U+02642), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -2093,8 +2093,8 @@ msgctxt ""
 "emoji.ulf\n"
 "JUPITER\n"
 "LngText.text"
-msgid "Jupiter"
-msgstr "Jupiter"
+msgid "jupiter"
+msgstr "jupiter"
 
 #. â (U+02644), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -2102,8 +2102,8 @@ msgctxt ""
 "emoji.ulf\n"
 "SATURN\n"
 "LngText.text"
-msgid "Saturn"
-msgstr "Saturn"
+msgid "saturn"
+msgstr "saturn"
 
 #. â (U+02645), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -2111,8 +2111,8 @@ msgctxt ""
 "emoji.ulf\n"
 "URANUS\n"
 "LngText.text"
-msgid "Uranus"
-msgstr "Uran"
+msgid "uranus"
+msgstr "uran"
 
 #. â (U+02646), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -2120,8 +2120,8 @@ msgctxt ""
 "emoji.ulf\n"
 "NEPTUNE\n"
 "LngText.text"
-msgid "Neptune"
-msgstr "Neptun"
+msgid "neptune"
+msgstr "neptun"
 
 #. â (U+02647), see http://wiki.documentfoundation.org/Emoji
 #: emoji.ulf
@@ -2129,8 +2129,8 @@ msgctxt ""
 "emoji.ulf\n"
 "PLUTO\n"
 "LngText.text"
-msgid "Pluto"
-msgstr "Pluton"
+msgid "pluto"
+msgstr "pluton"

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

2017-12-20 Thread Andras Timar

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

New commits:
commit 8d604bbbf8e8906f6e41c7cae808423d2dcae163
Author: Andras Timar 
Date:   Wed Dec 20 16:15:16 2017 +0100

Updated core
Project: translations  46ad5ef5969eaa0cb76b0c031068b97370e40f0f

Updated Slovenian translation

Change-Id: I8b96fdfc2d6248a51c1981122d6d3392e4505dc5

diff --git a/translations b/translations
index 8654a1943dfd..46ad5ef5969e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8654a1943dfdf029b56c00373461fafbbd489a0f
+Subproject commit 46ad5ef5969eaa0cb76b0c031068b97370e40f0f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Caolán McNamara

 sw/source/core/frmedt/feshview.cxx  |   53 
 vcl/source/window/builder.cxx   |2 -
 vcl/source/window/menubarwindow.cxx |3 +-
 3 files changed, 28 insertions(+), 30 deletions(-)

New commits:
commit 8af88c48060d2b07255793c9be65f4d085b7b48b
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 15:05:16 2017 +

coverity#1426738 Dereference null return value

Change-Id: I85957928c2f7fa742d379f289192c05e3f4177a8

diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index 6a8877263b43..f7f933f28a95 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -313,7 +313,7 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst )
 sal_uInt16 nId = pMenu->GetItemId(i);
 
 MenuItemData* pParentItemData = 
pMenu->GetItemList()->GetData(nId);
-
+assert(pParentItemData);
 mpParentPopup->InsertItem(nId, pParentItemData->aText, 
pParentItemData->nBits, pParentItemData->sIdent);
 mpParentPopup->SetHelpId(nId, pParentItemData->aHelpId);
 mpParentPopup->SetHelpText(nId, 
pParentItemData->aHelpText);
@@ -370,6 +370,7 @@ void MenuBarWindow::KillActivePopup()
 {
 sal_uInt16 nId = mpParentPopup->GetItemId(i);
 MenuItemData* pParentItemData = 
mpParentPopup->GetItemList()->GetData(nId);
+assert(pParentItemData);
 pParentItemData->pSubMenu = nullptr;
 }
 }
commit 110544a8039398c66582ba592310e1a58c076970
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 15:01:58 2017 +

reversed assert

Change-Id: I018417df11a41ebb1c453a51a70368b0eae8f6d4

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 536f07cd1b6a..d0410235ad67 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1644,7 +1644,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 #else
 bool ok = pModule->loadRelative(&thisModule, sModule);
 #endif
-assert(ok || "bad module name in .ui"); (void)ok;
+assert(ok && "bad module name in .ui"); (void)ok;
 aI = m_aModuleMap.insert(std::make_pair(sModule, 
std::unique_ptr(pModule))).first;
 }
 customMakeWidget pFunction = 
reinterpret_cast(aI->second->getFunctionSymbol(sFunction));
commit 6069c7590abf8150595cc748a7dfcbb535b13d72
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 14:59:42 2017 +

coverity#1426742 IsTextBox will be false here unless pVirtO is non-null

Change-Id: I794243a47b1693b8b4454da02efea934535cec48

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 255f7c35a2db..bfd7a0a1bf8b 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1533,7 +1533,7 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, 
GotoObjFlags eType, bool
 // Ignore TextBoxes of draw shapes here, so that
 // SwFEShell::SelectObj() won't jump back on this list, meaning
 // we never jump to the next draw shape.
-(pObj && pObj->IsTextBox()) ||
+(pVirtO && pVirtO->IsTextBox()) ||
 ( eType == GotoObjFlags::DrawSimple && lcl_IsControlGroup( 
pObj ) ) ||
 ( eType == GotoObjFlags::DrawControl && !lcl_IsControlGroup( 
pObj ) ) ||
 ( pFilter && !pFilter->includeObject( *pObj ) ) )
commit 2795b4187939a25db54cd871a124b5527ac2ce92
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 14:55:29 2017 +

replace pVirtO null check with just pVirtO

Change-Id: Ie9ef7736bec84085cdfab41b13059b9cec821ff2

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 34d60c9fdd40..255f7c35a2db 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1528,9 +1528,8 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, 
GotoObjFlags eType, bool
 {
 SdrObject* pObj = aObjIter.Next();
 SwVirtFlyDrawObj *pVirtO = dynamic_cast(pObj);
-bool bFlyFrame = pVirtO !=  nullptr;
-if( ( bNoFly && bFlyFrame ) ||
-( bNoDraw && !bFlyFrame ) ||
+if( ( bNoFly && pVirtO ) ||
+( bNoDraw && !pVirtO ) ||
 // Ignore TextBoxes of draw shapes here, so that
 // SwFEShell::SelectObj() won't jump back on this list, meaning
 // we never jump to the next draw shape.
@@ -1539,7 +1538,7 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, 
GotoObjFlags eType, bool
 ( eType == GotoObjFlags::DrawControl && !lcl_IsControlGroup( 
pObj ) ) ||
 ( pFilter && !pFilter->includeObject( *pObj ) )

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - cui/source include/svx sc/source svx/source sw/inc sw/qa sw/source

2017-12-20 Thread Tor Lillqvist

 cui/source/tabpages/tabline.cxx  |1 +
 include/svx/svdobj.hxx   |   16 ++--
 include/svx/svdpage.hxx  |   21 ++---
 sc/source/ui/unoobj/cellsuno.cxx |1 +
 svx/source/svdraw/svdobj.cxx |   16 
 svx/source/svdraw/svdpage.cxx|   17 -
 sw/inc/section.hxx   |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |1 +
 sw/source/core/docnode/ndsect.cxx|2 +-
 9 files changed, 37 insertions(+), 40 deletions(-)

New commits:
commit a17bc0a113f56c1c70f64b735f14ace86c3e1bc1
Author: Tor Lillqvist 
Date:   Wed Dec 20 15:02:46 2017 +0200

Make some functions that show up in a profile inline and handle fallout

Improves the loading time for a pathological customer document
measurably: from 1min 4s to 1min 0s on my machine.

Change-Id: If525c57bde152a71f6f50c4f0683d6d9df483a1b
Reviewed-on: https://gerrit.libreoffice.org/46853
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 65a2e5268074..4412b50b82aa 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -30,6 +30,7 @@
 #include "dlgname.hxx"
 #include 
 #include 
+#include 
 #include 
 #include "svx/drawitem.hxx"
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 304f403cdfd4..390afe887459 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -470,13 +471,24 @@ public:
 /// SdrObjList is changed, the bObjOrdNumsDirty flag is set on the SdrPage
 /// and the next GetOrdNum() call recalculates the order number of all
 /// SdrObjects in the SdrObjList.
-sal_uInt32 GetOrdNum() const;
+sal_uInt32 GetOrdNum() const
+{
+if (pObjList != nullptr)
+{
+if (pObjList->IsObjOrdNumsDirty())
+pObjList->RecalcObjOrdNums();
+}
+else
+const_cast(this)->nOrdNum = 0;
+
+return nOrdNum;
+}
 
 // Warning: this method should only be used if you really know what you're 
doing
 sal_uInt32 GetOrdNumDirect() const { return nOrdNum;}
 
 // setting the order number should only happen from the model or from the 
page
-void SetOrdNum(sal_uInt32 nNum);
+void SetOrdNum(sal_uInt32 nNum) { nOrdNum = nNum; }
 
 // GrabBagItem for interim interop purposes
 void GetGrabBagItem(css::uno::Any& rVal) const;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 700aa0fc5216..4a08e6a7eec5 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,7 +35,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -45,6 +45,8 @@ namespace sdr { namespace contact { class ViewContact; }}
 class SdrPage;
 class SdrModel;
 class SfxItemPool;
+class SfxPoolItem;
+class SdrObject;
 class SdrPageView;
 class SdrLayerAdmin;
 class SetOfByte;
@@ -153,8 +155,21 @@ public:
 /// convert attributes of the style to hard formatting
 void BurnInStyleSheetAttributes();
 
-size_t GetObjCount() const;
-SdrObject* GetObj(size_t nNum) const;
+size_t GetObjCount() const
+{
+return maList.size();
+}
+
+SdrObject* GetObj(size_t nNum) const
+{
+if (nNum >= maList.size())
+{
+OSL_ASSERT(nNum
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 09e0a3486fa7..daf0e77209e4 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -776,22 +776,6 @@ OUString SdrObject::GetDescription() const
 return OUString();
 }
 
-sal_uInt32 SdrObject::GetOrdNum() const
-{
-if (pObjList!=nullptr) {
-if (pObjList->IsObjOrdNumsDirty()) {
-pObjList->RecalcObjOrdNums();
-}
-} else const_cast(this)->nOrdNum=0;
-return nOrdNum;
-}
-
-
-void SdrObject::SetOrdNum(sal_uInt32 nNum)
-{
-nOrdNum = nNum;
-}
-
 void SdrObject::GetGrabBagItem(css::uno::Any& rVal) const
 {
 if (pGrabBagItem != nullptr)
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index e6d961b3a87e..13e04f27c6bc 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -672,23 +672,6 @@ void SdrObjList::BurnInStyleSheetAttributes()
 }
 }
 
-size_t SdrObjList::GetObjCount() const
-{
-return maList.size();
-}
-
-
-SdrObject* SdrObjList::GetObj(size_t nNum) const
-{
-if (nNum >= maList.size())
-{
-OSL_ASSERT(nNum
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
commit 9675f307fbd7961b3d00f810dad3eacc9920e07d
Author: Tor Lillqvist 
Date:   Wed Dec 20 13:28:53 20

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

2017-12-20 Thread Caolán McNamara

 sc/source/filter/orcus/interface.cxx |   38 ++-
 1 file changed, 29 insertions(+), 9 deletions(-)

New commits:
commit 15a744bc09d8e6a14fe9179640a1257515f45d13
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 14:25:05 2017 +

coverity#1426736 Uninitialized scalar field

and

coverity#1426737 Uninitialized scalar field
coverity#1426740 Uninitialized scalar field
coverity#1426741 Uninitialized scalar field
coverity#1426743 Uninitialized scalar field

Change-Id: I770b03e54758178f8fdf7128644ddb8c37bf1e83

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 6809aae2599a..e3a82305f90c 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -177,24 +177,44 @@ void ScOrcusNamedExpression::define_name(const char* 
p_name, size_t n_name, cons
 pNames->insert(pRange, false);
 }
 
-ScOrcusFactory::CellStoreToken::CellStoreToken( const ScAddress& rPos, Type 
eType ) :
-maPos(rPos), meType(eType)
+ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress& rPos, Type 
eType)
+: maPos(rPos)
+, meType(eType)
+, mnIndex1(0)
+, mnIndex2(0)
+, meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
 {
 rtl::math::setNan(&mfValue);
 }
 
-ScOrcusFactory::CellStoreToken::CellStoreToken( const ScAddress& rPos, double 
fValue ) :
-maPos(rPos), meType(Type::Numeric), mfValue(fValue) {}
+ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress& rPos, double 
fValue)
+: maPos(rPos)
+, meType(Type::Numeric)
+, mfValue(fValue)
+, mnIndex1(0)
+, mnIndex2(0)
+, meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
+{
+}
 
-ScOrcusFactory::CellStoreToken::CellStoreToken( const ScAddress& rPos, 
uint32_t nIndex ) :
-maPos(rPos), meType(Type::String), mnIndex1(nIndex)
+ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress& rPos, uint32_t 
nIndex)
+: maPos(rPos)
+, meType(Type::String)
+, mnIndex1(nIndex)
+, mnIndex2(0)
+, meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
 {
 rtl::math::setNan(&mfValue);
 }
 
-ScOrcusFactory::CellStoreToken::CellStoreToken(
-const ScAddress& rPos, const OUString& rFormula, 
formula::FormulaGrammar::Grammar eGrammar ) :
-maPos(rPos), meType(Type::Formula), maStr1(rFormula), meGrammar(eGrammar)
+ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress& rPos, const 
OUString& rFormula,
+formula::FormulaGrammar::Grammar eGrammar)
+: maPos(rPos)
+, meType(Type::Formula)
+, maStr1(rFormula)
+, mnIndex1(0)
+, mnIndex2(0)
+, meGrammar(eGrammar)
 {
 rtl::math::setNan(&mfValue);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Caolán McNamara

 oox/source/export/drawingml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bb911509930054e50bc48292cd5a087762707953
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 13:27:37 2017 +

coverity#1426744 Uninitialized scalar variable

Change-Id: I2043f4d3c393d39eb9d3936ba5dbcbf27c54ce48

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 9e161bb16615..17fc99acbc7f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2414,7 +2414,7 @@ void DrawingML::WriteText( const Reference< XInterface >& 
rXIface, const OUStrin
 }
 
 bool bOverridingCharHeight = false;
-sal_Int32 nCharHeight;
+sal_Int32 nCharHeight = -1;
 
 while( enumeration->hasMoreElements() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Pranav Kant

 desktop/source/lib/init.cxx  |   11 +++---
 include/vcl/window.hxx   |7 
 vcl/source/window/window.cxx |   68 ---
 3 files changed, 6 insertions(+), 80 deletions(-)

New commits:
commit ace646b20ee88fdca2780365039e90cb1542262b
Author: Pranav Kant 
Date:   Wed Dec 20 17:58:05 2017 +0530

lokdialog: Use Application::Post{Mouse,Key}Event() to post to main thread

... instead of custom machinery there to post to main thread. This also
now posts window key events to the main thread instead of processing
them on the lok thread.

Change-Id: Ided1efb3f237a1838fa50bb8d74752be714c3032

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 670032a18211..f87caa5b0787 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -73,6 +73,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2269,10 +2270,10 @@ static void 
doc_postWindowKeyEvent(LibreOfficeKitDocument* /*pThis*/, unsigned n
 switch (nType)
 {
 case LOK_KEYEVENT_KEYINPUT:
-pWindow->LOKKeyInput(aEvent);
+Application::PostKeyEvent(VclEventId::WindowKeyInput, pWindow, 
&aEvent);
 break;
 case LOK_KEYEVENT_KEYUP:
-pWindow->LOKKeyUp(aEvent);
+Application::PostKeyEvent(VclEventId::WindowKeyUp, pWindow, 
&aEvent);
 break;
 default:
 assert(false);
@@ -2449,13 +2450,13 @@ static void 
doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned
 switch (nType)
 {
 case LOK_MOUSEEVENT_MOUSEBUTTONDOWN:
-pWindow->LogicMouseButtonDown(aEvent);
+Application::PostMouseEvent(VclEventId::WindowMouseButtonDown, 
pWindow, &aEvent);
 break;
 case LOK_MOUSEEVENT_MOUSEBUTTONUP:
-pWindow->LogicMouseButtonUp(aEvent);
+Application::PostMouseEvent(VclEventId::WindowMouseButtonUp, 
pWindow, &aEvent);
 break;
 case LOK_MOUSEEVENT_MOUSEMOVE:
-pWindow->LogicMouseMove(aEvent);
+Application::PostMouseEvent(VclEventId::WindowMouseMove, pWindow, 
&aEvent);
 break;
 default:
 assert(false);
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 0f2bc9024ea3..b7cab1b6dbc9 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1220,13 +1220,6 @@ public:
 /// Dialog / window tunneling related methods.
 Size PaintActiveFloatingWindow(VirtualDevice& rDevice) const;
 
-void LogicMouseButtonDown(const MouseEvent& rMouseEvent);
-void LogicMouseButtonUp(const MouseEvent& rMouseEvent);
-void LogicMouseMove(const MouseEvent& rMouseEvent);
-
-void LOKKeyInput(const KeyEvent& rKeyEvent);
-void LOKKeyUp(const KeyEvent& rKeyEvent);
-
 /** @name Accessibility
  */
 ///@{
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index efe76df74b7c..cb6b48077c80 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3231,74 +3231,6 @@ VclPtr Window::GetParentWithLOKNotifier()
 return pWindow;
 }
 
-struct LOKAsyncEvent
-{
-VclPtr mpWindow;
-SalEvent mnEvent;
-MouseEvent maMouseEvent;
-};
-
-static void LOKAsyncEventLink( void* pEvent, void* )
-{
-LOKAsyncEvent* pLOKEv = static_cast(pEvent);
-if (!pLOKEv->mpWindow->IsDisposed())
-{
-ImplWindowFrameProc(pLOKEv->mpWindow, pLOKEv->mnEvent, 
&pLOKEv->maMouseEvent);
-}
-delete pLOKEv;
-}
-
-void Window::LogicMouseButtonDown(const MouseEvent& rMouseEvent)
-{
-// When we're not doing tiled rendering, then positions must be passed as 
pixels.
-assert(comphelper::LibreOfficeKit::isActive());
-
-LOKAsyncEvent* pEv = new LOKAsyncEvent;
-pEv->mpWindow = ImplIsFloatingWindow() ? ImplGetBorderWindow() : this;
-pEv->mnEvent = SalEvent::ExternalMouseButtonDown;
-pEv->maMouseEvent = rMouseEvent;
-Application::PostUserEvent( Link(pEv, LOKAsyncEventLink) );
-
-}
-
-void Window::LogicMouseButtonUp(const MouseEvent& rMouseEvent)
-{
-// When we're not doing tiled rendering, then positions must be passed as 
pixels.
-assert(comphelper::LibreOfficeKit::isActive());
-
-LOKAsyncEvent* pEv = new LOKAsyncEvent;
-pEv->mpWindow = ImplIsFloatingWindow() ? ImplGetBorderWindow() : this;
-pEv->mnEvent = SalEvent::ExternalMouseButtonUp;
-pEv->maMouseEvent = rMouseEvent;
-Application::PostUserEvent( Link(pEv, LOKAsyncEventLink) );
-}
-
-void Window::LogicMouseMove(const MouseEvent& rMouseEvent)
-{
-// When we're not doing tiled rendering, then positions must be passed as 
pixels.
-assert(comphelper::LibreOfficeKit::isActive());
-
-LOKAsyncEvent* pEv = new LOKAsyncEvent;
-pEv->mpWindow = ImplIsFloatingWindow() ? ImplGetBorderWindow() : this;
-pEv->mnEvent = SalEvent::ExternalMouseMove;
-pEv->maMouseEvent = rMouseEvent;
-Application:

New Defects reported by Coverity Scan for LibreOffice

2017-12-20 Thread scan-admin


Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

10 new defect(s) introduced to LibreOffice found with Coverity Scan.
5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 10 of 10 defect(s)


** CID 1426744:  Uninitialized variables  (UNINIT)
/oox/source/export/drawingml.cxx: 2417 in 
oox::drawingml::DrawingML::WriteText(const 
com::sun::star::uno::Reference &, const 
rtl::OUString &, bool, bool, int)()



*** CID 1426744:  Uninitialized variables  (UNINIT)
/oox/source/export/drawingml.cxx: 2417 in 
oox::drawingml::DrawingML::WriteText(const 
com::sun::star::uno::Reference &, const 
rtl::OUString &, bool, bool, int)()
2411 delete pParaObj;
2412 }
2413 return;
2414 }
2415 
2416 bool bOverridingCharHeight = false;
>>> CID 1426744:  Uninitialized variables  (UNINIT)
>>> Declaring variable "nCharHeight" without initializer.
2417 sal_Int32 nCharHeight;
2418 
2419 while( enumeration->hasMoreElements() )
2420 {
2421 Reference< XTextContent > paragraph;
2422 Any any ( enumeration->nextElement() );

** CID 1426743:  Uninitialized members  (UNINIT_CTOR)
/sc/source/filter/orcus/interface.cxx: 184 in 
ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress &, 
ScOrcusFactory::CellStoreToken::Type)()



*** CID 1426743:  Uninitialized members  (UNINIT_CTOR)
/sc/source/filter/orcus/interface.cxx: 184 in 
ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress &, 
ScOrcusFactory::CellStoreToken::Type)()
178 }
179 
180 ScOrcusFactory::CellStoreToken::CellStoreToken( const ScAddress& rPos, 
Type eType ) :
181 maPos(rPos), meType(eType)
182 {
183 rtl::math::setNan(&mfValue);
>>> CID 1426743:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "meGrammar" is not initialized in this 
>>> constructor nor in any functions that it calls.
184 }
185 
186 ScOrcusFactory::CellStoreToken::CellStoreToken( const ScAddress& rPos, 
double fValue ) :
187 maPos(rPos), meType(Type::Numeric), mfValue(fValue) {}
188 
189 ScOrcusFactory::CellStoreToken::CellStoreToken( const ScAddress& rPos, 
uint32_t nIndex ) :

** CID 1426742:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/core/frmedt/feshview.cxx: 1571 in SwFEShell::GetBestObject(bool, 
GotoObjFlags, bool, const svx::ISdrObjectFilter *)()



*** CID 1426742:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/core/frmedt/feshview.cxx: 1571 in SwFEShell::GetBestObject(bool, 
GotoObjFlags, bool, const svx::ISdrObjectFilter *)()
1565 default: break;
1566 }
1567 }
1568 aCurPos = pFly->getFrameArea().Pos();
1569 }
1570 else
>>> CID 1426742:  Null pointer dereferences  (FORWARD_NULL)
>>> Passing null pointer "pObj" to "GetCurrentBoundRect", which 
>>> dereferences it. (The dereference happens because this is a virtual 
>>> function call.)
1571 aCurPos = pObj->GetCurrentBoundRect().TopLeft();
1572 
1573 // Special case if another object is on same Y.
1574 if( aCurPos != aPos &&  // only when it is not me
1575 aCurPos.getY() == aPos.getY() &&  // Y positions equal
1576 (bNext? (aCurPos.getX() > aPos.getX()) :  // lies next 
to me

** CID 1426741:  Uninitialized members  (UNINIT_CTOR)
/sc/source/filter/orcus/interface.cxx: 193 in 
ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress &, unsigned 
int)()



*** CID 1426741:  Uninitialized members  (UNINIT_CTOR)
/sc/source/filter/orcus/interface.cxx: 193 in 
ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress &, unsigned 
int)()
187 maPos(rPos), meType(Type::Numeric), mfValue(fValue) {}
188 
189 ScOrcusFactory::CellStoreToken::CellStoreToken( const ScAddress& rPos, 
uint32_t nIndex ) :
190 maPos(rPos), meType(Type::String), mnIndex1(nIndex)
191 {
192 rtl::math::setNan(&mfValue);
>>> CID 1426741:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "meGrammar" is not initialized in this 
>>> constructor nor in any functions that it calls.
193 }
194 
195 ScOrcusFactory::CellStoreToken::CellStoreToken(
196 const ScAddress& rPos,

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

2017-12-20 Thread Tor Lillqvist

 svx/source/svdraw/svdpage.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8ab6440cf04c6d8412bf0f6850e6f12aee38966a
Author: Tor Lillqvist 
Date:   Wed Dec 20 15:00:36 2017 +0200

Bin mysterious pointless '// HACK' comment

Change-Id: I40509707bd98be6891f4158428163fa722c6e4d3

diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index d19628b4e93c..3a1d4a7619c0 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -22,7 +22,6 @@
 
 #include 
 
-// HACK
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Katarina Behrens

 sd/source/ui/unoidl/UnoDocumentSettings.cxx |   31 ++--
 1 file changed, 29 insertions(+), 2 deletions(-)

New commits:
commit a07477790204c9392a31d5060ecb5478b7c001c6
Author: Katarina Behrens 
Date:   Mon Nov 27 11:21:03 2017 +0100

tdf#79077: Load/save PapersizeFromSetup bit into ODF for sd

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

diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx 
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 84a7ad50412f..44262f34c2c8 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -136,8 +136,8 @@ enum SdDocumentSettingsPropertyHandles
 HANDLE_PRINTHIDENPAGES, HANDLE_PRINTFITPAGE, HANDLE_PRINTTILEPAGE, 
HANDLE_PRINTBOOKLET, HANDLE_PRINTBOOKLETFRONT,
 HANDLE_PRINTBOOKLETBACK, HANDLE_PRINTQUALITY, HANDLE_COLORTABLEURL, 
HANDLE_DASHTABLEURL, HANDLE_LINEENDTABLEURL, HANDLE_HATCHTABLEURL,
 HANDLE_GRADIENTTABLEURL, HANDLE_BITMAPTABLEURL, HANDLE_FORBIDDENCHARS, 
HANDLE_APPLYUSERDATA, HANDLE_PAGENUMFMT,
-HANDLE_PRINTERNAME, HANDLE_PRINTERJOB, HANDLE_PARAGRAPHSUMMATION, 
HANDLE_CHARCOMPRESS, HANDLE_ASIANPUNCT, HANDLE_UPDATEFROMTEMPLATE,
-HANDLE_PRINTER_INDEPENDENT_LAYOUT
+HANDLE_PRINTERNAME, HANDLE_PRINTERJOB, HANDLE_PRINTERPAPERSIZE, 
HANDLE_PARAGRAPHSUMMATION, HANDLE_CHARCOMPRESS, HANDLE_ASIANPUNCT,
+HANDLE_UPDATEFROMTEMPLATE, HANDLE_PRINTER_INDEPENDENT_LAYOUT
 // #i33095#
 ,HANDLE_LOAD_READONLY, HANDLE_MODIFY_PASSWD, HANDLE_SAVE_VERSION
 ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL, HANDLE_EMBED_FONTS
@@ -171,6 +171,7 @@ enum SdDocumentSettingsPropertyHandles
 { OUString("DefaultTabStop"),HANDLE_TABSTOP, 
::cppu::UnoType::get(),0,  0 },
 { OUString("PrinterName"),   HANDLE_PRINTERNAME, 
::cppu::UnoType::get(), 0,  0 },
 { OUString("PrinterSetup"),  HANDLE_PRINTERJOB,  
cppu::UnoType>::get(),  0, MID_PRINTER },
+{ OUString("PrinterPaperFromSetup"), HANDLE_PRINTERPAPERSIZE,
cppu::UnoType::get(),0,  MID_PRINTER },
 
 { OUString("IsPrintPageName"),   HANDLE_PRINTPAGENAME,   
cppu::UnoType::get(),0,  MID_PRINTER },
 { OUString("IsPrintDate"),   HANDLE_PRINTDATE,   
cppu::UnoType::get(),0,  MID_PRINTER },
@@ -744,9 +745,11 @@ DocumentSettings::_setPropertyValues(const 
PropertyMapEntry** ppEntries,
 aStream.Seek ( STREAM_SEEK_TO_BEGIN );
 std::unique_ptr pItemSet;
 
+bool bPreferPrinterPapersize = false;
 if( pPrinter )
 {
 pItemSet.reset(pPrinter->GetOptions().Clone());
+bPreferPrinterPapersize = 
pPrinter->GetPrinterSettingsPreferred();
 }
 else
 {
@@ -757,6 +760,7 @@ DocumentSettings::_setPropertyValues(const 
PropertyMapEntry** ppEntries,
 }
 
 pPrinter = SfxPrinter::Create ( aStream, 
std::move(pItemSet) );
+pPrinter->SetPrinterSettingsPreferred( 
bPreferPrinterPapersize );
 
 MapMode aMM (pPrinter->GetMapMode());
 aMM.SetMapUnit(MapUnit::Map100thMM);
@@ -770,6 +774,22 @@ DocumentSettings::_setPropertyValues(const 
PropertyMapEntry** ppEntries,
 }
 break;
 
+case HANDLE_PRINTERPAPERSIZE:
+{
+bool bPreferPrinterPapersize;
+if( *pValues >>= bPreferPrinterPapersize )
+{
+bOk = true;
+if( pDocSh->GetCreateMode() != 
SfxObjectCreateMode::EMBEDDED )
+{
+SfxPrinter *pTempPrinter = pDocSh->GetPrinter( 
true );
+if (pTempPrinter)
+pTempPrinter->SetPrinterSettingsPreferred( 
bPreferPrinterPapersize );
+}
+}
+}
+break;
+
 case HANDLE_PARAGRAPHSUMMATION :
 {
 bool bIsSummationOfParagraphs = false;
@@ -1122,6 +1142,13 @@ DocumentSettings::_getPropertyValues(
 }
 break;
 
+case HANDLE_PRINTERPAPERSIZE:
+{
+SfxPrinter *pTempPrinter = pDocSh->GetPrinter( false );
+*pValue <<= pTempPrinter && 
pTempPrinter->GetPrinterSettingsPreferred();
+}
+break;
+
 case HANDLE_PARAGRAPHSUMM

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

2017-12-20 Thread Katarina Behrens

 include/vcl/jobdata.hxx |2 ++
 include/vcl/print.hxx   |5 -
 svtools/source/dialogs/prnsetup.cxx |5 +
 vcl/inc/printerinfomanager.hxx  |2 --
 vcl/source/gdi/jobset.cxx   |1 +
 vcl/source/gdi/print.cxx|   23 +--
 vcl/source/gdi/print3.cxx   |2 +-
 vcl/unx/generic/print/genprnpsp.cxx |2 ++
 vcl/unx/generic/printer/jobdata.cxx |1 +
 9 files changed, 33 insertions(+), 10 deletions(-)

New commits:
commit 45429e4518fb265dc817d96f41ad4238a5d09c65
Author: Katarina Behrens 
Date:   Wed Nov 22 14:39:39 2017 +0100

tdf#79077: Cleanup PapersizeFromSetup related code

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

diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx
index 311351894a94..65a050f80423 100644
--- a/include/vcl/jobdata.hxx
+++ b/include/vcl/jobdata.hxx
@@ -44,6 +44,7 @@ struct VCL_DLLPUBLIC JobData
 int m_nPDFDevice;   // 0: no override, -1 PostScript, 
+1: Automatically PDF, +2: Explicitly PDF
 orientation m_eOrientation;
 OUStringm_aPrinterName;
+boolm_bPapersizeFromSetup;
 const PPDParser*m_pParser;
 PPDContext  m_aContext;
 
@@ -59,6 +60,7 @@ struct VCL_DLLPUBLIC JobData
 m_nColorDevice( 0 ),
 m_nPDFDevice( 0 ),
 m_eOrientation( orientation::Portrait ),
+m_bPapersizeFromSetup( false ),
 m_pParser( nullptr ) {}
 
 JobData& operator=(const psp::JobData& rRight);
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index a4846becd1bb..59724e73223f 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -292,7 +292,7 @@ public:
 boolSetJobSetup( const JobSetup& rSetup );
 const JobSetup& GetJobSetup() const { return maJobSetup; }
 
-boolSetup( vcl::Window* pWindow, bool 
bPapersizeFromSetup = false );
+boolSetup( vcl::Window* pWindow );
 boolSetPrinterProps( const Printer* pPrinter );
 
 /** SetPrinterOptions is used internally only now
@@ -328,6 +328,9 @@ public:
 sal_uInt16  GetPaperBinCount() const;
 OUStringGetPaperBinName( sal_uInt16 nPaperBin ) const;
 
+boolGetPrinterSettingsPreferred() const;
+voidSetPrinterSettingsPreferred( bool 
bPaperSizeFromSetup );
+
 const Size& GetPaperSizePixel() const { return 
maPaperSize; }
 SizeGetPaperSize() const { return PixelToLogic( 
maPaperSize ); }
 const Point&GetPageOffsetPixel() const { return 
maPageOffset; }
diff --git a/svtools/source/dialogs/prnsetup.cxx 
b/svtools/source/dialogs/prnsetup.cxx
index d3a46048b2dc..d7a8b06a7900 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -293,10 +293,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl, 
Button*, void)
 {
 if ( !mpTempPrinter )
 mpTempPrinter = VclPtr::Create( mpPrinter->GetJobSetup() );
-// 2nd argument: whether paper size and orientation from printer settings
-// override document settings, iow whether matching listboxes are editable
-// (this is a printer setup dialog, so they definitely should be editable)
-mpTempPrinter->Setup( this, true );
+mpTempPrinter->Setup( this );
 }
 
 
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 7691fbeebc6c..d820cfcc6057 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -52,11 +52,9 @@ struct PrinterInfo : JobData
 // a list of special features separated by ',' not used by psprint
 // but assigned from the outside (currently for 
"fax","pdf=","autoqueue","external_dialog")
 OUString m_aFeatures;
-bool m_bPapersizeFromSetup;
 
 PrinterInfo()
 : JobData()
-, m_bPapersizeFromSetup(false)
 {}
 };
 
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index fe7cbb2936d9..782fe81c959e 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -178,6 +178,7 @@ bool ImplJobSetup::operator==( const ImplJobSetup& 
rImplJobSetup ) const
  mePaperFormat == rImplJobSetup.mePaperFormat   &&
  mnPaperWidth  == rImplJobSetup.mnPaperWidth&&
  mnPaperHeight == rImplJobSetup.mnPaperHeight   &&
+ mbPapersizeFromSetup == rImplJobSetup.mbPapersizeFromSetup &&
  mnDriverDataLen   == rImplJobSetup.mnDriverDataLen &&
  maValueMap== rImplJobSetup.maValueMap  &&
  memcmp( mpDriverData, rImplJobSetup.mpDriverData, mnDriverDataLen )

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

2017-12-20 Thread Caolán McNamara

 sw/source/filter/html/htmltab.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 30b6545eb626a8ae91a0d3dd9f50b93efd180475
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 20 10:09:21 2017 +

ofz: Null-deref

Change-Id: I42a0fc6d73caaffd3fe183805dde449c09243cf9
Reviewed-on: https://gerrit.libreoffice.org/46836
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index f1a869b55b14..0f5f5ae162b1 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3606,10 +3606,9 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, 
bool bReadOptions,
 SwTextNode *const pOldTextNd = (!bAppended && !bForceFrame) ?
 pSavePos->nNode.GetNode().GetTextNode() : nullptr;
 
-if (pOldTextNd)
+SwFrameFormat *pFrameFormat = (pOldTextNd && pSwTable) ? 
pSwTable->GetFrameFormat() : nullptr;
+if (pFrameFormat)
 {
-SwFrameFormat *pFrameFormat = pSwTable->GetFrameFormat();
-
 const SfxPoolItem* pItem2;
 if( SfxItemState::SET == pOldTextNd->GetSwAttrSet()
 .GetItemState( RES_PAGEDESC, false, &pItem2 ) &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About the kikongo speller (kituba)

2017-12-20 Thread Németh László

Hi,

2017-12-19 12:37 GMT+01:00 Eike Rathke :

> Hi Cyrille,
>
> On Tuesday, 2017-12-12 14:43:05 +0100, Cyrille wrote:
>
> > I come back to you because I think the dictionary is now mature. I would
> > like to know if it is possible to propose it to the github hunspell repo
> >  or
> > better as a new package for Debian/Ubuntu.
>
> It looks like that github page lists dictionaries that are available as
> Debian and Ubuntu packages, so probably trying to add it as a Debian
> package would be best.
>
> > Currently I did already a
> > plugin for firefox and an extension for Libreoffice (even if it is not
> > necessary on Ubuntu if you have the hunspell installed). I did it first
> > for Windows. But I would like to know if it is possible to install it
> > for all applications on Windows too (But maybe I'm not in the right
> > place to ask my question?).
>
> I don't know details, but I think Windows doesn't have a concept of
> central dictionaries.
>

I'm afraid of it, too. (It seems, Microsoft has opened his spell checking
API:
https://msdn.microsoft.com/en-us/library/windows/desktop/hh869853(v=vs.85).aspx,
so maybe it's possible to use it for spell checker developments. If I right
remember, some years ago this API documentation was a product sold by MS).
Mozilla Firefox and Google Chrome use dictionary extensions created by the
users on their add-on sites, so you can add also Kikongo dictionary to them.

If I right think, as an extension to the (future?) Kikongo LibreOffice
localization, you can add your dictionary to the dictionaries/ LibreOffice
repository. This way, Kikongo localization packages of LibreOffice will
contain the spelling and hyphenation dictionaries, too.

Best regards,
László

>
> Maybe best ask László Németh who might know, also other details, see
> https://hunspell.github.io/
>
>   Eike
>
> --
> LibreOffice Calc developer. Number formatter stricken i18n
> transpositionizer.
> GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563
> 2D3A
> Care about Free Software, support the FSFE https://fsfe.org/support/?erack
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-12-20 Thread Aron Budea

 chart2/qa/extras/chart2import.cxx |   30 ++
 chart2/qa/extras/data/pptx/tdf105517.pptx |binary
 oox/source/drawingml/clrscheme.cxx|6 +-
 3 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 1006025df2b6d02ef0762dde227456717d30b1dc
Author: Aron Budea 
Date:   Fri Nov 3 02:08:00 2017 +0100

tdf#105517: overwrite existing scheme colors in vector

Theme overrides stopped working once ClrScheme::maClrScheme was
changed to vector, and colors were always appended to it.

Regression from f3121049828596b369e3ea844355d61666e49795.

Reviewed-on: https://gerrit.libreoffice.org/44242
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 021081823aeebcfa395662d0c04535a243977c2e)

Change-Id: Iae850dcabf57b12d8a564e84acf38d9988cfe963
Reviewed-on: https://gerrit.libreoffice.org/46845
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index ca690298827e..b0f98a642f85 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -63,6 +63,7 @@ public:
 void testFdo54361();
 void testFdo54361_1();
 void testTdf86624(); // manually placed legends
+void testTdf105517();
 void testTdf106217();
 void testAutoBackgroundXLSX();
 void testChartAreaStyleBackgroundXLSX();
@@ -127,6 +128,7 @@ public:
 CPPUNIT_TEST(testFdo54361);
 CPPUNIT_TEST(testFdo54361_1);
 CPPUNIT_TEST(testTdf86624);
+CPPUNIT_TEST(testTdf105517);
 CPPUNIT_TEST(testTdf106217);
 CPPUNIT_TEST(testAutoBackgroundXLSX);
 CPPUNIT_TEST(testChartAreaStyleBackgroundXLSX);
@@ -743,6 +745,34 @@ void Chart2ImportTest::testTdf86624()
 CPPUNIT_ASSERT(aPos.Y > 4000); // real value for ms is above 7000
 }
 
+void Chart2ImportTest::testTdf105517()
+{
+load("/chart2/qa/extras/data/pptx/", "tdf105517.pptx");
+Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference 
xCoordContainer(xChartDoc->getFirstDiagram(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCoordContainer.is());
+Reference 
xChartTypeContainer(xCoordContainer->getCoordinateSystems()[0], uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartTypeContainer.is());
+Reference 
xDSContainer(xChartTypeContainer->getChartTypes()[0], uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDSContainer.is());
+Reference xPropSet1(xDSContainer->getDataSeries()[0], 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xPropSet1.is());
+
+long lineColor;
+xPropSet1->getPropertyValue("Color") >>= lineColor;
+// incorrect line color was 0x4a7ebb due to not handling themeOverride
+CPPUNIT_ASSERT_EQUAL(lineColor, long(0xeaa700));
+
+Reference xPropSet2(xDSContainer->getDataSeries()[1], 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xPropSet2.is());
+
+xPropSet2->getPropertyValue("Color") >>= lineColor;
+// incorrect line color was 0x98b855
+CPPUNIT_ASSERT_EQUAL(lineColor, long(0x1e69a8));
+}
+
 void Chart2ImportTest::testTdf106217()
 {
 load("/chart2/qa/extras/data/pptx/", "tdf106217.pptx");
diff --git a/chart2/qa/extras/data/pptx/tdf105517.pptx 
b/chart2/qa/extras/data/pptx/tdf105517.pptx
new file mode 100644
index ..ff9d747f0349
Binary files /dev/null and b/chart2/qa/extras/data/pptx/tdf105517.pptx differ
diff --git a/oox/source/drawingml/clrscheme.cxx 
b/oox/source/drawingml/clrscheme.cxx
index 2f8e93701e97..f32c1ac0e822 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -82,7 +82,11 @@ bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, 
sal_Int32& rColor ) const
 
 void ClrScheme::setColor( sal_Int32 nSchemeClrToken, sal_Int32 nColor )
 {
-maClrScheme.push_back(std::pair(nSchemeClrToken, 
nColor));
+const auto aIter = std::find_if(maClrScheme.begin(), maClrScheme.end(), 
find_by_token(nSchemeClrToken) );
+if ( aIter != maClrScheme.end() )
+aIter->second = nColor;
+else
+maClrScheme.push_back(std::pair(nSchemeClrToken, 
nColor));
 }
 
 bool ClrScheme::getColorByIndex(size_t nIndex, sal_Int32& rColor) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Christian Lohmaier

Tag 'libreoffice-6.0.0.1' created by Christian Lohmaier 
 at 2017-12-20 12:09 +

Tag libreoffice-6.0.0.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaOlMGAAoJEPQ0oe+v7q6jVWgP/i4y64k3P4iAr0Bw2cuFsgIq
msOYBlPjjAWfd12jqFeZ0OXTlo1HS+nct37rJV9LRCHTiC2suKwnFAnInm02mje+
dTbvYm4m4+t2g1ZshBCs2KwnziqPk89Etr8g30tGku1mme03DGRUDeNh1NdTtNQ2
e9+Wvju5eFC83DylajtMX8Gdqsz9dv0etysMXpDJLwJ6lBwfSu551VHWVjeb+k3f
0pEcwQZ9EH1j7kz1btCrsLNdTM0RN27mtPbUlaPOJIoz0Xhwwwm5/sqtlJehDMp9
sSnnf7CQWwC0AoA2gQvObYYxo5MbTZsPBaZtqD5jrOGH9ljLI6misTyoDGdY/E0e
c6y5eqCNMitEu6J/kteuq75ZKR2sI2gH5GGeauiLnCCl2yequmOpMwtHUlamLfpY
+qYQ8iVzTXNlcNDN9U/NYXzxx8XaiUzl7ZKoJVI9UtjwBjxG1TxiYo2rE0awJUa3
uGKWAGkHbLnOGnWu0bn9AnR4lpcROUuvi96DQZrGTdxPN/WMkJ+4sNlYNuUbVVWa
ZBT3yqxTg08IrQCa8Be77E6NA5U9kzisQdHwIbGWhlA3PxBjnfnvvk1CiaL3AmAZ
kPRxKm0tbKjtExp5GMT2OxVol1Y5mwZNY0MgqGDMf7nVSYb2U/epkASzywcQ223e
V/V+LoPP/c7qgCAWXaep
=ZTH3
-END PGP SIGNATURE-

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

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

2017-12-20 Thread Christian Lohmaier

Tag 'libreoffice-6.0.0.1' created by Christian Lohmaier 
 at 2017-12-20 12:09 +

Tag libreoffice-6.0.0.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaOlMJAAoJEPQ0oe+v7q6jk5QP/0Kxp7gAoNPC2+Q3D7iUHs1V
1hcOUpoH/ZhAWP/21HfBf6CxW0kgyl64cAFhEFXazz9h2GCnmjqMd7nwZeXN2A4Z
PVSi+xxOYhhU2RCmDLBeplDnRRJrS+ow4saPRPsPA9HhIzqIDc0SaQQmGMgPXK/T
uB+/VeSmMrEFv2RMTWND5nCoihtHsw0kQiOvW1SI5TTlLhbnS0WK+Ij2xmVrrm+d
ptnPXUstUm++JIBoPpBPCKOifFCntmb3mXeBFB41W03uXHv5/PqILrqgsypjBSBr
cEepH/32EgPWNelJWWoDUBRPBLT5m94Sm4usdBLB2KeH/byX/FiyfOeTYAOD0MUq
VXYEVvMiHff6QL9EQrrwZiexNfmVyACcbINfjDktFOxqJFYgvJyMEExM/KnIwQ36
TMzQf1TzXhqDFa44UqJDDXWkhpYMixIcwM4rtKPJ8ojQmF70KXpAvUTTQ2Um0XBU
/6q/gpyQM+t/FEa9lEbq26/3M0ayfqiS34iPaKZuYTfAmu7BFwsk5GoP4ULmFMW7
vw19ml7JLhJg0ChIu0OJBKuMJ/JdZMqStoVebiQSn03jUx62Jevr7MOUBqSL2ZK0
c0ShylTcWvs+PsL0hijiOz65blQKLktyklitxr0+2YppB5aL45kZqpf1RoCiDbBj
pl5ctXCBNLosYmz0weYu
=A3nm
-END PGP SIGNATURE-

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

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

2017-12-20 Thread Christian Lohmaier

Tag 'libreoffice-6.0.0.1' created by Christian Lohmaier 
 at 2017-12-20 12:09 +

Tag libreoffice-6.0.0.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaOlMCAAoJEPQ0oe+v7q6jzUEP/ijBEQvKou2n+tb31h1LS/c2
F/jmIPV+KXRQTnBZA2QGDNg7nU8aSIXpHfxLlCc/gpsn7X/MxelpX69Cp3FtZxmF
cNtpGc73ZSP4PROhKOb3jjrtEp7L3BohczYL1trI6Ku9YwZb9o1DxpEIFcJBy0Y2
ia2eumORwqOW0Fwcmgi0KdFtmtdrgdPC82cJ4HzNlZZludb18IC37grtqTpMf99x
beetchEaqTCK4q8DzPOau2y/fWTrZ65CgUKteLHwYOELqSnfBOQvLvc7uXx5neGZ
qZGJ2EEau5bFie6GcP2pES+8fpt+vm0RBXSjUMfJS4rFIfy+NVDpmdo8prEroqIw
1UT9odKkc9hKlbXvHzMIO93giOGF0uvv5jdStRcUFyNZjKNViGe/nb6OsNoAooQp
VmA+PdtCQUheJwj/Uu/v8QdSM770PF5Dr1ynoWlhOfyOcSWnryLbggrQ4zBaF+yZ
qtWqzs+OyazcVglBo2XsGYXqL/q8lGBtStymMOTTgOCRIO2vOFbCq//eWUYwoiVW
tTPsJEaiPbU9soBwNerRsoHEJaxCq0pOKSMLANCDnaw0SEpKiwDl129/wetk7bje
jFoFt6+NF5dGeN1jUdQ81el7WxKoTTMKxmY6iZnFywVBVNdAnePZsShc3N4vKV5w
9AETKlhyEi9vfyAX4rn6
=6Teb
-END PGP SIGNATURE-

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

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

2017-12-20 Thread Christian Lohmaier

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

New commits:
commit 1afa282027ba53a1bf1e3b64f8fb2271f6c9f62b
Author: Christian Lohmaier 
Date:   Wed Dec 20 13:10:35 2017 +0100

bump product version to 6.0.0.1.0+

Change-Id: Ic7a87fdb4eb56490b189171908299e41a69a75b3

diff --git a/configure.ac b/configure.ac
index 6ae4b7183d6c..9b3ccf68730d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.0.0.beta2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.0.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Christian Lohmaier

Tag 'libreoffice-6.0.0.1' created by Christian Lohmaier 
 at 2017-12-20 12:09 +

Tag libreoffice-6.0.0.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaOlMMAAoJEPQ0oe+v7q6jYtMQAMUvBiC3RIGU8YciWRcZ5rNh
Dc8Si8OB3dmp69hHgUqbzJ+zQlj2V+y6LjrnuQ4IBtgJOuS7Jd6rZ1xGln73lv0d
YpjKvLKYyDhHE/DW6LHUWXiYSSbDJX6vnqkaOKDEVyCPVoRx7cV78hKRLhYCRbwV
sTUpBvtEyuoXRsCFiWOynhHNDLQpKmw37MNaMemGxQVKYG8OKYNg19BWEUuUYa0Y
a/VCfhf/f8U+FumY11fmvGtxTqcatFd6UgAQ5HlYWqpTr7xzdMffqZYqLvZ8t+ow
BX8raMZfH4Q92vJkuYBk7j15RbDCpTAKlgdMVPuej0ZvwwR4KqAyxgTZfcSEUhOb
OyXwXo3mHJ08tGfcdu4PIQQbnyEXIqwzVJYQhSsTIzUYWueVBD+U/x/apkVPmcGl
OA/e2TdG8f3cE/FEBARX7Apng67U3FU+4RC8Ls3DTS8iFcFY+75t6iJ87CeGAnZC
8mVHfBhPP4NfpP3HW42RHP/J2zLNkQb9maBrUSY/xMVL183tjT22mbtaX98wAGo4
BMnjX3wMXgw2IYtF70dBnrP6Z8x1YDCwhEi6vErDm9J3PVNjsc139oFRyHWzAVP4
iLtjGavRcMzxr7h6MELugJln35Ok9ru302hQ1C6q6vkYrErXhV97/KRO6yqhRVLX
wHfLUNXyIO8zq1BniKAb
=gMxk
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license

2017-12-20 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2622 +++-
 1 file changed, 1390 insertions(+), 1232 deletions(-)

New commits:
commit 363a2069501e2cbdb4c50c65034f0597d651f3aa
Author: Christian Lohmaier 
Date:   Wed Dec 20 13:04:36 2017 +0100

update credits

Change-Id: I86df8d4ff4e2241583e41bceb37dce61ed90acad
(cherry picked from commit c6c1c7e6031f8b438cb8ad8b3eaf79abc2771ff6)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ba5da83caf0b..f5718e9ee50a 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   690
+   520
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 690
+ 520
  42464
- 22015
+ 21846
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7292632
+   7422304
false
false
false
@@ -317,7 +317,7 @@
  
  
   
-   
+   
   
   

@@ -328,6 +328,9 @@
   

   
+  
+   
+  
   

   
@@ -395,16 +398,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -412,9 +415,6 @@
   

   
-  
-   
-  
   

   
@@ -1044,14 +1044,14 @@

   
  Credits
-1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-12-11 16:20:17.
+1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-10-27 18:02:35.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1071,10 +1071,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 23201Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 23250Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15377Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15411Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1082,35 +1082,35 @@
  
  
   
-   *Noel GrandinCommits: 
8414Joined: 2011-12-12
+   *Noel GrandinCommits: 
8479Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8070Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8072Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6699Joined: 
2010-07-29
+   Miklos 
Vajn

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang embeddedobj/source shell/source

2017-12-20 Thread Stephan Bergmann

 compilerplugins/clang/salcall.cxx  |1 -
 embeddedobj/source/msole/xdialogcreator.cxx|6 +++---
 embeddedobj/source/msole/xdialogcreator.hxx|6 +++---
 shell/source/backends/wininetbe/wininetbackend.cxx |4 ++--
 shell/source/backends/wininetbe/wininetbackend.hxx |4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 1bbefac109ee1989e09fe5c59c1752be8715da5a
Author: Stephan Bergmann 
Date:   Wed Dec 20 11:59:16 2017 +0100

Remove redundant, duplicated getSpellingLoc call

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

diff --git a/compilerplugins/clang/salcall.cxx 
b/compilerplugins/clang/salcall.cxx
index 663c9c8f45b6..3ff786d2ee87 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -516,7 +516,6 @@ bool SalCall::isSalCallFunction(FunctionDecl const* 
functionDecl, SourceLocation
 startLoc = SM.getSpellingLoc(startLoc);
 
 #if !defined _WIN32
-startLoc = SM.getSpellingLoc(startLoc);
 // When the SAL_CALL macro expands to nothing, it may even precede the 
function
 // declaration's source range, so go back one token (unless the 
declaration is known to
 // start with a token that must precede a possible "SAL_CALL", like 
"virtual" or
commit fd2c1c5915fdcb23c2af5a3f4c0efe130174838d
Author: Stephan Bergmann 
Date:   Wed Dec 20 09:20:13 2017 +0100

loplugin:salcall (clang-cl)

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

diff --git a/embeddedobj/source/msole/xdialogcreator.cxx 
b/embeddedobj/source/msole/xdialogcreator.cxx
index bcf02a0972f3..d8338cbacfd4 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -105,7 +105,7 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const 
uno::Sequence< sal_In
 }
 
 
-uno::Sequence< OUString > SAL_CALL 
MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames()
+uno::Sequence< OUString > 
MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames()
 {
 uno::Sequence< OUString > aRet(2);
 aRet[0] = "com.sun.star.embed.MSOLEObjectSystemCreator";
@@ -114,13 +114,13 @@ uno::Sequence< OUString > SAL_CALL 
MSOLEDialogObjectCreator::impl_staticGetSuppo
 }
 
 
-OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName()
+OUString MSOLEDialogObjectCreator::impl_staticGetImplementationName()
 {
 return OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator");
 }
 
 
-uno::Reference< uno::XInterface > SAL_CALL 
MSOLEDialogObjectCreator::impl_staticCreateSelfInstance(
+uno::Reference< uno::XInterface > 
MSOLEDialogObjectCreator::impl_staticCreateSelfInstance(
 const uno::Reference< lang::XMultiServiceFactory >& 
xServiceManager )
 {
 return uno::Reference< uno::XInterface >( *new MSOLEDialogObjectCreator( 
xServiceManager ) );
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx 
b/embeddedobj/source/msole/xdialogcreator.hxx
index 02a8059c094c..b858930b3646 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -42,11 +42,11 @@ public:
 OSL_ENSURE( xFactory.is(), "No service manager is provided!" );
 }
 
-static css::uno::Sequence< OUString > SAL_CALL 
impl_staticGetSupportedServiceNames();
+static css::uno::Sequence< OUString > 
impl_staticGetSupportedServiceNames();
 
-static OUString SAL_CALL impl_staticGetImplementationName();
+static OUString impl_staticGetImplementationName();
 
-static css::uno::Reference< css::uno::XInterface > SAL_CALL
+static css::uno::Reference< css::uno::XInterface >
 impl_staticCreateSelfInstance(
 const css::uno::Reference< css::lang::XMultiServiceFactory >& 
xServiceManager );
 
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx 
b/shell/source/backends/wininetbe/wininetbackend.cxx
index b1006803d065..bed1e270cf6d 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -341,7 +341,7 @@ css::uno::Any WinInetBackend::getPropertyValue(
 }
 }
 
-OUString SAL_CALL WinInetBackend::getBackendName() {
+OUString WinInetBackend::getBackendName() {
 return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ;
 }
 
@@ -350,7 +350,7 @@ OUString SAL_CALL WinInetBackend::getImplementationName()
 return getBackendName() ;
 }
 
-uno::Sequence SAL_CALL WinInetBackend::getBackendServiceNames()
+uno::Sequence WinInetBackend::getBackendServiceNames()
 {
 uno::Sequence aServiceNameList { 
"com.sun.star.configuration.backend.WinInetBackend" };
 
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx 
b/shell/sour

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

2017-12-20 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2622 +++-
 1 file changed, 1390 insertions(+), 1232 deletions(-)

New commits:
commit 34e317458bffadac94656a2e035e5e7921bb2281
Author: Christian Lohmaier 
Date:   Wed Dec 20 13:04:36 2017 +0100

update credits

Change-Id: I86df8d4ff4e2241583e41bceb37dce61ed90acad
(cherry picked from commit c6c1c7e6031f8b438cb8ad8b3eaf79abc2771ff6)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ba5da83caf0b..f5718e9ee50a 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   690
+   520
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 690
+ 520
  42464
- 22015
+ 21846
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7292632
+   7422304
false
false
false
@@ -317,7 +317,7 @@
  
  
   
-   
+   
   
   

@@ -328,6 +328,9 @@
   

   
+  
+   
+  
   

   
@@ -395,16 +398,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -412,9 +415,6 @@
   

   
-  
-   
-  
   

   
@@ -1044,14 +1044,14 @@

   
  Credits
-1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-12-11 16:20:17.
+1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-10-27 18:02:35.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1071,10 +1071,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 23201Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 23250Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15377Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15411Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1082,35 +1082,35 @@
  
  
   
-   *Noel GrandinCommits: 
8414Joined: 2011-12-12
+   *Noel GrandinCommits: 
8479Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8070Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8072Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6699Joined: 
2010-07-29
+   Miklos 
Vajn

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

2017-12-20 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2622 +++-
 1 file changed, 1390 insertions(+), 1232 deletions(-)

New commits:
commit c6c1c7e6031f8b438cb8ad8b3eaf79abc2771ff6
Author: Christian Lohmaier 
Date:   Wed Dec 20 13:04:36 2017 +0100

update credits

Change-Id: I86df8d4ff4e2241583e41bceb37dce61ed90acad

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ba5da83caf0b..f5718e9ee50a 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   690
+   520
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 690
+ 520
  42464
- 22015
+ 21846
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7292632
+   7422304
false
false
false
@@ -317,7 +317,7 @@
  
  
   
-   
+   
   
   

@@ -328,6 +328,9 @@
   

   
+  
+   
+  
   

   
@@ -395,16 +398,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -412,9 +415,6 @@
   

   
-  
-   
-  
   

   
@@ -1044,14 +1044,14 @@

   
  Credits
-1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-12-11 16:20:17.
+1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-10-27 18:02:35.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1071,10 +1071,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 23201Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 23250Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15377Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15411Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1082,35 +1082,35 @@
  
  
   
-   *Noel GrandinCommits: 
8414Joined: 2011-12-12
+   *Noel GrandinCommits: 
8479Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8070Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8072Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6699Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6713Joined: 
2010-07-29
   
   
-   Michael 
StahlC

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

2017-12-20 Thread Noel Grandin

 sw/inc/hintids.hxx   |   21 +
 sw/qa/extras/uiwriter/uiwriter.cxx   |   10 +-
 sw/source/core/doc/docfmt.cxx|2 +-
 sw/source/core/doc/doclay.cxx|3 ++-
 sw/source/core/doc/textboxhelper.cxx |2 +-
 5 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit fcfd55ffd7b3288db0fb42b21bed54bbef2b7ad7
Author: Noel Grandin 
Date:   Tue Dec 19 11:28:46 2017 +0200

convert RES_FMT constants to TypedWhichId

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

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index bb20ee86704d..ef869ddfe559 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -259,18 +259,15 @@ RES_FRMATR_END
 #define RES_UNKNOWNATR_END (151)
 
 // Format IDs
-enum RES_FMT
-{
-RES_FMT_BEGIN = RES_UNKNOWNATR_END,
-RES_CHRFMT = RES_FMT_BEGIN, // 151
-RES_FRMFMT, // 152
-RES_FLYFRMFMT,  // 153
-RES_TXTFMTCOLL, // 154
-RES_GRFFMTCOLL, // 155
-RES_DRAWFRMFMT, // 156
-RES_CONDTXTFMTCOLL, // 157
-RES_FMT_END
-};
+#define RES_FMT_BEGIN RES_UNKNOWNATR_END
+#define RES_CHRFMT
TypedWhichId(RES_FMT_BEGIN)  // 151
+#define RES_FRMFMTTypedWhichId(152)
+#define RES_FLYFRMFMT TypedWhichId(153)
+#define RES_TXTFMTCOLLTypedWhichId(154)
+#define RES_GRFFMTCOLLTypedWhichId(155)
+#define RES_DRAWFRMFMTTypedWhichId(156)
+#define RES_CONDTXTFMTCOLL
TypedWhichId(157)
+#define RES_FMT_END 158
 
 // ID's for Messages in the Formats
 #define RES_MSG_BEGIN RES_FMT_END
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 9641350c13e0..6d6469c376d4 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -,14 +,14 @@ void SwUiWriterTest::testShapeTextboxSelect()
 SdrObject* pObject = pPage->GetObj(1);
 SwContact* pTextBox = static_cast(pObject->GetUserCall());
 // First, make sure that pTextBox is a fly frame (textbox of a shape).
-CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, 
static_cast(pTextBox->GetFormat()->Which()));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_FLYFRMFMT), 
pTextBox->GetFormat()->Which());
 
 // Then select it.
 pWrtShell->SelectObj(Point(), 0, pObject);
 const SdrMarkList& rMarkList = 
pWrtShell->GetDrawView()->GetMarkedObjectList();
 SwDrawContact* pShape = 
static_cast(rMarkList.GetMark(0)->GetMarkedSdrObj()->GetUserCall());
 // And finally make sure the shape got selected, not just the textbox 
itself.
-CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, 
static_cast(pShape->GetFormat()->Which()));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_DRAWFRMFMT), 
pShape->GetFormat()->Which());
 }
 
 void SwUiWriterTest::testShapeTextboxDelete()
@@ -4569,7 +4569,7 @@ void SwUiWriterTest::testTdf84695()
 SdrObject* pObject = pPage->GetObj(1);
 SwContact* pTextBox = static_cast(pObject->GetUserCall());
 // First, make sure that pTextBox is a fly frame (textbox of a shape).
-CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, 
static_cast(pTextBox->GetFormat()->Which()));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_FLYFRMFMT), 
pTextBox->GetFormat()->Which());
 
 // Then select it.
 pWrtShell->SelectObj(Point(), 0, pObject);
@@ -4593,7 +4593,7 @@ void SwUiWriterTest::testTdf84695NormalChar()
 SdrObject* pObject = pPage->GetObj(1);
 SwContact* pTextBox = static_cast(pObject->GetUserCall());
 // First, make sure that pTextBox is a fly frame (textbox of a shape).
-CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, 
static_cast(pTextBox->GetFormat()->Which()));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_FLYFRMFMT), 
pTextBox->GetFormat()->Which());
 
 // Then select it.
 pWrtShell->SelectObj(Point(), 0, pObject);
@@ -4616,7 +4616,7 @@ void SwUiWriterTest::testTdf84695Tab()
 SdrObject* pObject = pPage->GetObj(0);
 SwContact* pShape = static_cast(pObject->GetUserCall());
 // First, make sure that pShape is a draw shape.
-CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, 
static_cast(pShape->GetFormat()->Which()));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_DRAWFRMFMT), 
pShape->GetFormat()->Which());
 
 // Then select it.
 pWrtShell->SelectObj(Point(), 0, pObject);
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 8cd67e260830..532c492e5ca2 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -306,7 +306,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
 if (GetIDocumentUndoRedo().DoesUndo())
 {
 SwUndoResetAttr* pUndo = new SwUndoResetAttr( rRg,
-static_cast(bText

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

2017-12-20 Thread Jan-Marek Glogowski

 sfx2/source/sidebar/SidebarController.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b170b28f0cd2be86268e103efff8dcaaa470e96
Author: Jan-Marek Glogowski 
Date:   Tue Oct 17 19:52:58 2017 +0200

tdf#99537 set expand for re-used sidebar panels

When re-using a panel, reset the expand state from the stored
state in the PanelContexDescriptor.

Change-Id: I00851982bbd36cacdc57459bb6e5be9fcc719e81
Reviewed-on: https://gerrit.libreoffice.org/43466
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit ce2e94a98f5fc85bef7623a0227b3a95d8093288)

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 58117bd336db..0195c496fccc 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -616,6 +616,7 @@ void SidebarController::CreatePanels(const ::rtl::OUString& 
rDeckId, const Conte
 if (pPanel != nullptr)
 {
 aNewPanels[nWriteIndex] = pPanel;
+pPanel->SetExpanded( rPanelContexDescriptor.mbIsInitiallyVisible );
 ++nWriteIndex;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Katarina Behrens

 vcl/uiconfig/ui/printerpaperpage.ui |   40 
 vcl/unx/generic/print/prtsetup.cxx  |   16 +-
 vcl/unx/generic/print/prtsetup.hxx  |3 ++
 3 files changed, 45 insertions(+), 14 deletions(-)

New commits:
commit 75fc4934c3aafcd83d9bbee63d8d24cbddae8ea0
Author: Katarina Behrens 
Date:   Fri Oct 27 18:02:35 2017 +0200

tdf#79077: copy 'paper from printer setup' toggle

into printer properties dialog, it is rather badly accessible
(almost invisible) in File > Print > Options tabpage

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

diff --git a/vcl/uiconfig/ui/printerpaperpage.ui 
b/vcl/uiconfig/ui/printerpaperpage.ui
index 90d72859708d..c8d834a1e1e5 100644
--- a/vcl/uiconfig/ui/printerpaperpage.ui
+++ b/vcl/uiconfig/ui/printerpaperpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -16,52 +16,52 @@
   
 True
 False
-1
 _Paper size:
 True
+1
   
   
 0
-0
+1
   
 
 
   
 True
 False
-1
 _Orientation:
 True
+1
   
   
 0
-1
+2
   
 
 
   
 True
 False
-1
 _Duplex:
 True
+1
   
   
 0
-2
+3
   
 
 
   
 True
 False
-1
 Paper tray:
 True
+1
   
   
 0
-3
+4
   
 
 
@@ -71,7 +71,7 @@
   
   
 1
-0
+1
   
 
 
@@ -85,7 +85,7 @@
   
   
 1
-1
+2
   
 
 
@@ -95,7 +95,7 @@
   
   
 1
-2
+3
   
 
 
@@ -105,7 +105,21 @@
   
   
 1
-3
+4
+  
+
+
+  
+Use only paper size from printer 
preferences
+True
+True
+False
+True
+  
+  
+0
+0
+2
   
 
   
diff --git a/vcl/unx/generic/print/prtsetup.cxx 
b/vcl/unx/generic/print/prtsetup.cxx
index 3faddbf3e7b8..dc667fbc9825 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -152,6 +152,7 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
 : TabPage(pParent->m_pTabControl, "PrinterPaperPage", 
"vcl/ui/printerpaperpage.ui")
 , m_pParent( pParent )
 {
+get(m_pCbFromSetup, "papersizefromsetup");
 get(m_pPaperText, "paperft");
 get(m_pPaperBox, "paperlb");
 get(m_pOrientBox, "orientlb");
@@ -164,6 +165,8 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
 m_pOrientBox->SetSelectHdl( LINK( this, RTSPaperPage, SelectHdl ) );
 m_pDuplexBox->SetSelectHdl( LINK( this, RTSPaperPage, SelectHdl ) );
 m_pSlotBox->SetSelectHdl( LINK( this, RTSPaperPage, SelectHdl ) );
+m_pCbFromSetup->SetToggleHdl( LINK( this, RTSPaperPage, CheckBoxHdl ) );
+
 
 sal_Int32 nPos = 0;
 
@@ -189,6 +192,7 @@ void RTSPaperPage::dispose()
 {
 m_pParent.clear();
 m_pPaperText.clear();
+m_pCbFromSetup.clear();
 m_pPaperBox.clear();
 m_pOrientBox.clear();
 m_pDuplexText.clear();
@@ -242,9 +246,11 @@ void RTSPaperPage::update()
 m_pSlotBox->Enable( false );
 }
 
+if ( m_pParent->m_aJobData.m_bPapersizeFromSetup )
+m_pCbFromSetup->Check( m_pParent->m_aJobData.m_bPapersizeFromSetup );
 // disable those, unless user wants to use papersize from printer prefs
 // as they have no influence on what's going to be printed anyway
-if (!m_pParent->m_aJobData.m_bPapersizeFromSetup)
+else
 {
 m_pPaperBox->Enable( false );
 m_pOrientBox->Enable( false );
@@ -283,6 +289,14 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void )
 m_pParent->SetDataModified( true );
 }
 
+IMPL_LINK( RTSPaperPage, CheckBoxHdl, CheckBox&, /*cBox*/, void )
+{
+bool bFromSetup = m_pCbFromSetup->IsChecked();
+m_pParent->m_aJobData.m_bPapersizeFromSetup = bFromSetup;
+m_pPaperBox->Enable( bFromSetup );
+m_pOrientBox->Enable( bFromSetup );
+m_pParent->SetDataModified( true );
+}
 /*
  * RTSDevicePage
  */
diff --git a/vcl/unx/generic/print/prtsetup.hxx 
b/vcl/unx/generic/print/prtsetup.hxx
index ff4d3fb01df7..924d4c54b27f 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -78,6 +78,8 @@ class RTSPaperPage : public TabPage
 {
 VclPtr  m_pParent;
 
+VclPtr   m_pCbFromSetup;
+
 VclPtr  m_pPaperText;
 VclPtrm_pPaperBox;
 
@@ -90,6 +92,7 @@ class RTSPaperPage : public TabPage
 VclPtrm_pSlotBox;
 
 DECL_LINK( SelectHdl, ListBox&, void );
+DECL_LINK( CheckBoxHdl, CheckBox&, void );
 public:
 explicit RTSPaperPage( RTSDialog* );
 virtual ~RTSPaper

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

2017-12-20 Thread Christian Lohmaier

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

New commits:
commit 73dbb05701f255bd0d1ad4b82cfab93effb11d6a
Author: Christian Lohmaier 
Date:   Wed Dec 20 12:13:10 2017 +0100

Updated core
Project: translations  8654a1943dfdf029b56c00373461fafbbd489a0f

update translations for 6.0 rc1

Change-Id: I8421ed204e28c33dbe09d83f2f3882ba422391dd
(cherry picked from commit b3a5620ad5ed08bdb77738d8cb2b8e08495606c7)

diff --git a/translations b/translations
index 3f36de41a705..8654a1943dfd 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3f36de41a705801f0c061ecd3e311a72ff504abe
+Subproject commit 8654a1943dfdf029b56c00373461fafbbd489a0f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

2017-12-20 Thread Christian Lohmaier

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

New commits:
commit ed8435ac4cdd2970e7d467f5e122b9c007526407
Author: Christian Lohmaier 
Date:   Wed Dec 20 12:13:10 2017 +0100

Updated core
Project: translations  b3a5620ad5ed08bdb77738d8cb2b8e08495606c7

update translations for 6.0 rc1

Change-Id: I8421ed204e28c33dbe09d83f2f3882ba422391dd

diff --git a/translations b/translations
index 9a856d562eba..b3a5620ad5ed 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 9a856d562ebae5d1ae691ec623cf4ebb23299930
+Subproject commit b3a5620ad5ed08bdb77738d8cb2b8e08495606c7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Andras Timar

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

New commits:
commit 4e941d07ad74b7a1cb0b03f1bede8cfb39ff7992
Author: Andras Timar 
Date:   Wed Dec 20 12:04:27 2017 +0100

Updated core
Project: translations  3f36de41a705801f0c061ecd3e311a72ff504abe

Updated Slovenian translation

Change-Id: Ic42d61061b9de8c3204385df2c2df8641a8708c5

diff --git a/translations b/translations
index fcb3a9f517e1..3f36de41a705 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fcb3a9f517e17cb90c309a6bc0c38ce2029508ed
+Subproject commit 3f36de41a705801f0c061ecd3e311a72ff504abe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-0' - source/sl

2017-12-20 Thread Andras Timar

 source/sl/cui/messages.po  |  123 +--
 source/sl/helpcontent2/source/text/sbasic/shared.po|   73 -
 source/sl/helpcontent2/source/text/scalc/01.po |   62 -
 source/sl/helpcontent2/source/text/sdraw.po|   32 
 source/sl/helpcontent2/source/text/shared.po   |   68 -
 source/sl/helpcontent2/source/text/shared/00.po|8 
 source/sl/helpcontent2/source/text/shared/01.po|  216 ++---
 source/sl/helpcontent2/source/text/shared/02.po|   44 -
 source/sl/helpcontent2/source/text/shared/05.po|8 
 source/sl/helpcontent2/source/text/shared/autopi.po|   96 +-
 source/sl/helpcontent2/source/text/shared/explorer/database.po |   10 
 source/sl/helpcontent2/source/text/shared/guide.po |   34 
 source/sl/helpcontent2/source/text/shared/optionen.po  |   43 -
 source/sl/helpcontent2/source/text/simpress.po |  306 
 source/sl/helpcontent2/source/text/simpress/04.po  |  306 
 source/sl/helpcontent2/source/text/simpress/guide.po   |  284 +++
 source/sl/helpcontent2/source/text/swriter/00.po   |4 
 source/sl/helpcontent2/source/text/swriter/01.po   |4 
 source/sl/helpcontent2/source/text/swriter/guide.po|   16 
 source/sl/officecfg/registry/data/org/openoffice/Office.po |   20 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |  212 -
 source/sl/sc/messages.po   |8 
 source/sl/sd/messages.po   |  374 
+-
 source/sl/sfx2/messages.po |  323 +---
 source/sl/svtools/messages.po  |4 
 source/sl/svx/messages.po  |   15 
 source/sl/sw/messages.po   |   72 -
 27 files changed, 1623 insertions(+), 1142 deletions(-)

New commits:
commit 3f36de41a705801f0c061ecd3e311a72ff504abe
Author: Andras Timar 
Date:   Wed Dec 20 12:04:27 2017 +0100

Updated Slovenian translation

Change-Id: Ic42d61061b9de8c3204385df2c2df8641a8708c5

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index 5958d4d87c9..115c21cc572 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2017-12-06 23:00+0100\n"
-"PO-Revision-Date: 2017-12-07 09:25+0200\n"
+"POT-Creation-Date: 2017-12-19 08:42+0100\n"
+"PO-Revision-Date: 2017-12-19 21:54+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -7721,72 +7721,72 @@ msgctxt "optgeneralpage|label1"
 msgid "Help"
 msgstr "PomoÄ"
 
-#: optgeneralpage.ui:77
+#: optgeneralpage.ui:76
 msgctxt "optgeneralpage|filedlg"
 msgid "_Use %PRODUCTNAME dialogs"
 msgstr "_Uporabi pogovorna okna %PRODUCTNAME"
 
-#: optgeneralpage.ui:111
+#: optgeneralpage.ui:110
 msgctxt "optgeneralpage|label2"
 msgid "Open/Save Dialogs"
 msgstr "Pogovorna okna Odpri/Shrani"
 
-#: optgeneralpage.ui:137
+#: optgeneralpage.ui:136
 msgctxt "optgeneralpage|printdlg"
 msgid "Use %PRODUCTNAME _dialogs"
 msgstr "Uporabi pogovorna o_kna %PRODUCTNAME"
 
-#: optgeneralpage.ui:152
+#: optgeneralpage.ui:151
 msgctxt "optgeneralpage|label3"
 msgid "Print Dialogs"
 msgstr "Pogovorna okna za tiskanje"
 
-#: optgeneralpage.ui:178
+#: optgeneralpage.ui:177
 msgctxt "optgeneralpage|docstatus"
 msgid "_Printing sets \"document modified\" status"
 msgstr "_Tiskanje povzroÄi stanje Â»dokument spremenjenÂ«"
 
-#: optgeneralpage.ui:193
+#: optgeneralpage.ui:192
 msgctxt "optgeneralpage|label4"
 msgid "Document Status"
 msgstr "Stanje dokumenta"
 
-#: optgeneralpage.ui:226
+#: optgeneralpage.ui:225
 msgctxt "optgeneralpage|label6"
 msgid "_Interpret as years between "
 msgstr "_TolmaÄi kot letnice med "
 
-#: optgeneralpage.ui:252
+#: optgeneralpage.ui:251
 msgctxt "optgeneralpage|toyear"
 msgid "and "
 msgstr "in "
 
-#: optgeneralpage.ui:267
+#: optgeneralpage.ui:266
 msgctxt "optgeneralpage|label5"
 msgid "Year (Two Digits)"
 msgstr "Letnica (dvomestna)"
 
-#: optgeneralpage.ui:293
+#: optgeneralpage.ui:292
 msgctxt "optgeneralpage|collectusageinfo"
 msgid "Collect usage data and send it to The Document Foundation"
 msgstr "Zbiraj podatke o uporabi in jih poÅ¡lji The Document Foundation"
 
-#: optgeneralpage.ui:308
+#: optgeneralpage.ui:307
 msgctxt "optgeneralpage|label7"
 msgid "Help Improve %PRODUCTNAME"
 msgstr "Pomagajte izboljÅ¡ati %PRODUCTNAME"
 
-#: optgeneralpage.ui:339
+#: optgeneralpage.ui:338
 msgctxt "optgeneralpage|quicklaunch"
 msgid "Load %PRODUCTNAME during system start-up"
 msgstr "NaloÅ¾i %PRODUC

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

2017-12-20 Thread Caolán McNamara

 sw/source/filter/html/htmlgrin.cxx |7 +++
 sw/source/filter/html/swhtml.cxx   |   12 +++-
 sw/source/filter/html/swhtml.hxx   |2 ++
 3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit e192796dde1c1d94aa05a70b55e04c0f778f4389
Author: CaolÃ¡n McNamara 
Date:   Tue Dec 19 21:14:22 2017 +

ofz: Null-deref

reuse the safety check used elsewhere

Change-Id: Ic7d613fea1d93e76a03183a02127499a5d8dd15d
Reviewed-on: https://gerrit.libreoffice.org/46825
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 53ec083588ce..4f163ec49cf8 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1335,13 +1335,12 @@ void SwHTMLParser::StripTrailingPara()
 bool bSetSmallFont = false;
 
 SwContentNode* pCNd = m_pPam->GetContentNode();
+sal_uLong nNodeIdx = m_pPam->GetPoint()->nNode.GetIndex();
 if( !m_pPam->GetPoint()->nContent.GetIndex() )
 {
-if( pCNd && pCNd->StartOfSectionIndex()+2 <
-pCNd->EndOfSectionIndex() )
+if( pCNd && pCNd->StartOfSectionIndex() + 2 <
+pCNd->EndOfSectionIndex() && CanRemoveNode(nNodeIdx))
 {
-sal_uLong nNodeIdx = m_pPam->GetPoint()->nNode.GetIndex();
-
 const SwFrameFormats& rFrameFormatTable = 
*m_xDoc->GetSpzFrameFormats();
 
 for( auto pFormat : rFrameFormatTable )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 3860c6407aaf..2e22f5345037 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -559,6 +559,12 @@ SvParserState SwHTMLParser::CallParser()
 return eRet;
 }
 
+bool SwHTMLParser::CanRemoveNode(sal_uLong nNodeIdx) const
+{
+const SwNode *pPrev = m_xDoc->GetNodes()[nNodeIdx - 1];
+return pPrev->IsContentNode() || (pPrev->IsEndNode() && 
pPrev->StartOfSectionNode()->IsSectionNode());
+}
+
 void SwHTMLParser::Continue( HtmlTokenId nToken )
 {
 #ifdef DBG_UTIL
@@ -749,11 +755,7 @@ if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false 
).nNode.GetIndex() )
 
 if( IsNewDoc() )
 {
-const SwNode *pPrev = m_xDoc->GetNodes()[nNodeIdx -1];
-if( !m_pPam->GetPoint()->nContent.GetIndex() &&
-( pPrev->IsContentNode() ||
-  (pPrev->IsEndNode() &&
-  pPrev->StartOfSectionNode()->IsSectionNode()) ) )
+if (!m_pPam->GetPoint()->nContent.GetIndex() && 
CanRemoveNode(nNodeIdx))
 {
 SwContentNode* pCNd = m_pPam->GetContentNode();
 if( pCNd && pCNd->StartOfSectionIndex()+2 <
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 198cc2ab739b..a023d3549cfa 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -860,6 +860,8 @@ private:
 
 // Remove empty paragraph at the PaM position
 void StripTrailingPara();
+// If removing an empty node would corrupt the document
+bool CanRemoveNode(sal_uLong nNodeIdx) const;
 
 // Are there fly frames in the current paragraph?
 bool HasCurrentParaFlys( bool bNoSurroundOnly = false,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Andrea Gelmini

 vcl/source/window/menu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bda25ca1b9ce0393cd98ca6963429872fd34f30
Author: Andrea Gelmini 
Date:   Tue Dec 19 12:24:22 2017 +0100

Fix typo

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

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 983a25a11ad6..368008bb91d6 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -122,7 +122,7 @@ void ImplClosePopupToolBox( const VclPtr& pWin 
)
 }
 
 // TODO: Move to common code with the same function in toolbox
-// Draw the ">>" - more indictor at the coordinates
+// Draw the ">>" - more indicator at the coordinates
 void lclDrawMoreIndicator(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect)
 {
 rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac cui/source include/comphelper shell/source svl/source sw/source

2017-12-20 Thread Andrea Gelmini

 configure.ac   |2 +-
 cui/source/dialogs/screenshotannotationdlg.cxx |2 +-
 include/comphelper/propertycontainerhelper.hxx |4 ++--
 shell/source/unix/exec/shellexec.cxx   |2 +-
 svl/source/numbers/zforscan.cxx|2 +-
 sw/source/filter/ww8/ww8par.cxx|2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit e4404de89548bcf7e632b31f4c3461733e2684d3
Author: Andrea Gelmini 
Date:   Tue Dec 19 21:31:10 2017 +0100

Fix typos

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

diff --git a/configure.ac b/configure.ac
index 4e00de777ec4..f88481b6c45e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6060,7 +6060,7 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 dnl The only reason why libstdc++ headers fail with Clang in C++11 
mode is because they
 dnl use the __float128 type that Clang doesn't know (libstdc++ 
checks whether __float128
 dnl is available during its build, but it's usually built using 
GCC, and so c++config.h
-dnl hardcodes __float128 being supported). At least for some older 
libstc++, the only
+dnl hardcodes __float128 being supported). At least for some older 
libstdc++, the only
 dnl place where __float128 is used is in a template 
specialization, -D__float128=void
 dnl will avoid the problem there while still causing a problem if 
somebody actually uses
 dnl the type. (But some later libstdc++ are known to use 
__float128 also in algorithm ->
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index c2f74ed949db..f8f0377bd00b 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -164,7 +164,7 @@ private:
 Bitmap  maDimmedDialogBitmap;
 SizemaParentDialogSize;
 
-// VirtualDevice for buffered interation paints
+// VirtualDevice for buffered interaction paints
 VclPtr   mpVirtualBufferDevice;
 
 // all detected children
diff --git a/include/comphelper/propertycontainerhelper.hxx 
b/include/comphelper/propertycontainerhelper.hxx
index cd2f65b72f00..2e60c97c4ea9 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -134,10 +134,10 @@ protected:
 voidrevokeProperty( sal_Int32 _nHandle );
 
 
-/// checkes whether a property with the given handle has been registered
+/// checks whether a property with the given handle has been registered
 boolisRegisteredProperty( sal_Int32 _nHandle ) const;
 
-/// checkes whether a property with the given name has been registered
+/// checks whether a property with the given name has been registered
 boolisRegisteredProperty( const OUString& _rName ) const;
 
 
diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 095acec189b1..d12b5778ba3d 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -100,7 +100,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, 
const OUString& aPar
 
 if (comphelper::LibreOfficeKit::isActive())
 {
-SAL_WARN("shell", "Unusual - shell attemp to launch " << aCommand << " 
with params " << aParameter << " under lok");
+SAL_WARN("shell", "Unusual - shell attempt to launch " << aCommand << 
" with params " << aParameter << " under lok");
 return;
 }
 
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index a78dbfdc0530..8f0a7b71f9ac 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -3028,7 +3028,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 {
 continue; // for
 }
-// DM might be splitted into D and M
+// DM might be split into D and M
 if ( sStrArray[i].getLength() < sOldCurSymbol.getLength() 
&&
  pChrCls->uppercase( sStrArray[i], 0, 1 )[0] ==
  sOldCurString[0] )
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1cf72a50e519..1a35d257e596 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5106,7 +5106,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const 
*pGloss)
 {
 // inserting into an existing document:
 // As only complete paragraphs are inserted, the current one
-// needs to be splitted - once or even twice.
+// needs to be split - once or even twice.
 const SwPosition* pPos = m_pPaM->GetPoint();

[Libreoffice-commits] core.git: extensions/source include/connectivity odk/examples officecfg/README qadevOOo/tests sw/source xmloff/source

2017-12-20 Thread Andrea Gelmini

 extensions/source/propctrlr/cellbindinghelper.hxx |2 +-
 include/connectivity/parameters.hxx   |2 +-
 odk/examples/java/Spreadsheet/EuroAdaption.java   |2 +-
 officecfg/README  |2 +-
 qadevOOo/tests/java/ifc/text/_XTextCursor.java|2 +-
 qadevOOo/tests/java/mod/_fwk/Frame.java   |2 +-
 sw/source/core/frmedt/tblsel.cxx  |2 +-
 xmloff/source/forms/formcellbinding.hxx   |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 3ee517d480b60c0db59bf43f6f52c27f7368d883
Author: Andrea Gelmini 
Date:   Tue Dec 19 22:05:58 2017 +0100

Fix typos

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

diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx 
b/extensions/source/propctrlr/cellbindinghelper.hxx
index a2f73741fed1..2523b1f7e23e 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -214,7 +214,7 @@ namespace pcr
 */
 boolisSpreadsheetDocumentWhichSupplies( const OUString& 
_rService ) const;
 
-/** checkes whether a given component supports a given servive
+/** checks whether a given component supports a given servive
 */
 static bool doesComponentSupport(
 const css::uno::Reference< css::uno::XInterface >& 
_rxComponent,
diff --git a/include/connectivity/parameters.hxx 
b/include/connectivity/parameters.hxx
index e5ba530bfcc4..3f0491963dc0 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -231,7 +231,7 @@ namespace dbtools
 void clearParameters();
 
 private:
-/// checkes whether the object is already initialized, and not yet 
disposed
+/// checks whether the object is already initialized, and not yet 
disposed
 boolisAlive() const { return m_xComponent.get().is() && 
m_xInnerParamUpdate.is(); }
 
 /** creates a filter expression from a master-detail link where the 
detail denotes a column name
diff --git a/odk/examples/java/Spreadsheet/EuroAdaption.java 
b/odk/examples/java/Spreadsheet/EuroAdaption.java
index f3e73d38a15c..209e772ab075 100644
--- a/odk/examples/java/Spreadsheet/EuroAdaption.java
+++ b/odk/examples/java/Spreadsheet/EuroAdaption.java
@@ -216,7 +216,7 @@ public class EuroAdaption {
 xCellProp.setPropertyValue( "NumberFormat",
 Integer.valueOf( 
iNewNumberFormat ) );
 
-// interate over all cells from the cellrange with an
+// iterate over all cells from the cellrange with an
 // content and use the DM/EUR factor
 XCellRangesQuery xCellRangesQuery = 
UnoRuntime.queryInterface(
 XCellRangesQuery.class, xCellRange );
diff --git a/officecfg/README b/officecfg/README
index 33ba54ccc6cf..f8861307d0db 100644
--- a/officecfg/README
+++ b/officecfg/README
@@ -7,5 +7,5 @@ See also:
 
 AcceleratorKeyChecker.fodt in the util folder is a tool written in Basic that 
check menus for
 entries that use the same accelerator key. The tool goes through the menus 
using the accessibility
-api and checkes the accelerator keys. For information on how to use the tool 
open the fodt file
+api and checks the accelerator keys. For information on how to use the tool 
open the fodt file
 in LibreOffice.
diff --git a/qadevOOo/tests/java/ifc/text/_XTextCursor.java 
b/qadevOOo/tests/java/ifc/text/_XTextCursor.java
index 20abffb723c7..87369a7ec426 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextCursor.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextCursor.java
@@ -222,7 +222,7 @@ public class _XTextCursor extends MultiMethodTest {
 
 /**
  * Restores the text of the component to the
- * state it was before this interafce test.
+ * state it was before this interface test.
  */
 @Override
 public void after() {
diff --git a/qadevOOo/tests/java/mod/_fwk/Frame.java 
b/qadevOOo/tests/java/mod/_fwk/Frame.java
index 388176a14275..cb18c9659e19 100644
--- a/qadevOOo/tests/java/mod/_fwk/Frame.java
+++ b/qadevOOo/tests/java/mod/_fwk/Frame.java
@@ -91,7 +91,7 @@ public class Frame extends TestCase {
 /**
  * Disposes the document created and finally disposes
  * the frame containing the document (for case when the frame
- * contains no model after some interafce manipulations).
+ * contains no model after some interface manipulations).
  */
 @Override
 protected void cleanup( TestParameters Param, PrintWriter log) {
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 8c61f32042d4..83164e9e1058 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx

[Libreoffice-commits] core.git: framework/source hwpfilter/source include/oox officecfg/registry sc/source svgio/source

2017-12-20 Thread Andrea Gelmini

 framework/source/dispatch/dispatchprovider.cxx|2 +-
 hwpfilter/source/grammar.cxx  |2 +-
 include/oox/core/fragmenthandler.hxx  |2 +-
 officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs |2 +-
 sc/source/ui/view/tabview4.cxx|2 +-
 svgio/source/svgreader/svgnode.cxx|2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ca9897cf772ab09874f8d1e4881a0c79aa94748a
Author: Andrea Gelmini 
Date:   Tue Dec 19 21:55:26 2017 +0100

Fix typos

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

diff --git a/framework/source/dispatch/dispatchprovider.cxx 
b/framework/source/dispatch/dispatchprovider.cxx
index d0ccf5082b24..0d5d76f09bb8 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -321,7 +321,7 @@ css::uno::Reference< css::frame::XDispatch > 
DispatchProvider::implts_queryFrame
 //  Our owner frame should handle this URL. But we can't do it for all of 
them.
 //  So we ask the internal set controller first. If he disagree we try to 
find a registered
 //  protocol handler. If this failed too - we check for a loadable content 
and in case of true
-//  we load it into the frame by returning specilized dispatch object.
+//  we load it into the frame by returning specialized dispatch object.
 
 else if (
  (sTargetFrameName==SPECIALTARGET_SELF)  ||
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 20f9d04b19f4..4eca314da16f 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -512,7 +512,7 @@ yyparse(YYPARSE_PARAM_ARG)
 
 /* Push a new state, which is found in  yystate  .  */
 /* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
+   have just been pushed. So pushing a state here events the stacks.  */
 yynewstate:
 
   *++yyssp = sal::static_int_cast(yystate);
diff --git a/include/oox/core/fragmenthandler.hxx 
b/include/oox/core/fragmenthandler.hxx
index e8107a1dae82..93666aa344e8 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -117,7 +117,7 @@ public:
 // XML stream handling 
 
 /** Opens the fragment stream referred by the own fragment path. Derived
-classes may provide specilized stream implementations. */
+classes may provide specialized stream implementations. */
 virtual css::uno::Reference< css::io::XInputStream >
 openFragmentStream() const;
 
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs 
b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
index 55445a5b871f..1cfa98041643 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
@@ -24,7 +24,7 @@
   
 
   
-Provides window state settings to be set globally for 
OpenOfficre.org.
+Provides window state settings to be set globally for 
OpenOffice.org.
   
   
 
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 9eb1ebd51c02..a366f99be4a0 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -388,7 +388,7 @@ void ScTabView::UpdateScrollBars( HeaderType eHeaderType )
 boolbLayoutRTL = pDoc->IsLayoutRTL( nTab );
 SCCOL   nUsedX;
 SCROW   nUsedY;
-pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cachen !!!
+pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cached !!!
 
 SCCOL nVisXL = 0;
 SCCOL nVisXR = 0;
diff --git a/svgio/source/svgreader/svgnode.cxx 
b/svgio/source/svgreader/svgnode.cxx
index 160774ad35e4..f953ec5667c0 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -495,7 +495,7 @@ namespace svgio
 // in a defs node (which gets not decomposed by itself), 
but you never
 // know
 
-// also not directly used are Markers and Patterns, only 
indirecty used
+// also not directly used are Markers and Patterns, only 
indirectly used
 // by reference
 
 // #i121656# also do not decompose nodes which have 
display="none" set
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Noel Grandin

 chart2/source/controller/dialogs/res_DataLabel.cxx |2 
 chart2/source/controller/dialogs/res_Trendline.cxx |1 
 chart2/source/controller/dialogs/tp_PolarOptions.cxx   |2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx   |2 
 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx  |   17 
 chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx  |4 
 chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx  |5 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |2 
 chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx|   26 -
 chart2/source/inc/chartview/ChartSfxItemIds.hxx|  190 
+-
 10 files changed, 129 insertions(+), 122 deletions(-)

New commits:
commit 18c40a087f7846a2fc16e7dc6d8bb325d28e99b0
Author: Noel Grandin 
Date:   Tue Dec 19 16:09:23 2017 +0200

convert chart2 to TypedWhichId

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

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index e7cc81283bab..25ea30bc51b4 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -161,7 +161,7 @@ DataLabelResources::DataLabelResources(VclBuilderContainer* 
pWindow, vcl::Window
 
 if( rInAttrs.GetItemState(SCHATTR_DATADESCR_NO_PERCENTVALUE, true, 
&pPoolItem) == SfxItemState::SET )
 {
-bool bForbidPercentValue = static_cast< const SfxBoolItem & >( 
rInAttrs.Get( SCHATTR_DATADESCR_NO_PERCENTVALUE )).GetValue();
+bool bForbidPercentValue = rInAttrs.Get( 
SCHATTR_DATADESCR_NO_PERCENTVALUE ).GetValue();
 if( bForbidPercentValue )
 m_pCBPercent->Enable(false);
 }
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 9ac6b1bb9414..67589fa8980c 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx 
b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index b675531b7062..39b8b3d9a9a0 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -21,9 +21,11 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx 
b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index fac9c8bb2979..fa2590da00d1 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -22,10 +22,12 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index eee760d7cf23..13c8c2246ab3 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -443,19 +443,19 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 
nWhichId, SfxItemSet & rOutI
 
 bool lcl_isDateAxis( const SfxItemSet & rItemSet )
 {
-sal_Int32 nAxisType = static_cast< const SfxInt32Item & >( rItemSet.Get( 
SCHATTR_AXISTYPE )).GetValue();//css::chart2::AxisType
+sal_Int32 nAxisType = rItemSet.Get( SCHATTR_AXISTYPE 
).GetValue();//css::chart2::AxisType
 return (nAxisType == chart2::AxisType::DATE);
 }
 
 bool lcl_isAutoMajor( const SfxItemSet & rItemSet )
 {
-bool bRet = static_cast< const SfxBoolItem & >( rItemSet.Get( 
SCHATTR_AXIS_AUTO_STEP_MAIN )).GetValue();
+bool bRet = rItemSet.Get( SCHATTR_AXIS_AUTO_STEP_MAIN ).GetValue();
 return bRet;
 }
 
 bool lcl_isAutoMinor( const SfxItemSet & rItemSet )
 {
-bool bRet = static_cast< const SfxBoolItem & >( rItemSet.Get( 
SCHATTR_AXIS_AUTO_STEP_HELP )).GetValue();
+bool bRet = rItemSet.Get( SCHATTR_AXIS_AUTO_STEP_HELP ).GetValue();
 return bRet;
 }
 
@@ -484,8 +484,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 
nWhichId, const SfxItemSet
 
 case SCHATTR_AXIS_MAX:
 // only if auto if false
-if( ! (static_cast< const SfxBoolItem & >(
-   rItemSet.Get( SCHATTR_AXIS_AUTO_MAX )).GetValue() ))
+if( ! (rItemSet.Get( SCHATTR_AXIS_AUTO_MAX ).GetValue() ))
 {
 rItemSet.Get( nWhichId ).QueryValue( aValue );
 
@@ -508,8 +507,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 
nWhich

Re: Clang baseline bump

2017-12-20 Thread Stephan Bergmann


On 12/14/2017 09:33 AM, Stephan Bergmann wrote:

If there are no objections, I will do the following changes on master:

* note in README.md that Clang < 3.5 is known not to work to compile LO 
on Linux; and


done with 
 
"Document that Clang 3.4.2 is known to be too old"


* make the relevant changes so that --enable-compiler-plugins requires 
at least Clang 3.8.0.


done with 
 
"Bump --enable-compiler-plugins to Clang 3.8.0"

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

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

2017-12-20 Thread Mike Kaganski

 fpicker/source/office/fpsmartcontent.cxx |   20 ++--
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 7f0241c4bb85bf9a3794d5a8f8e918a92adbd3f1
Author: Mike Kaganski 
Date:   Wed Dec 20 05:32:49 2017 +0200

loplugin:unusedindex

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

diff --git a/fpicker/source/office/fpsmartcontent.cxx 
b/fpicker/source/office/fpsmartcontent.cxx
index 1f176efcf0ef..d5aead5af3fc 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -264,13 +264,10 @@ namespace svt
 bool bRet = false;
 try
 {
-Sequence< ContentInfo > aInfo = 
m_pContent->queryCreatableContentsInfo();
-const ContentInfo* pInfo = aInfo.getConstArray();
-sal_Int32 nCount = aInfo.getLength();
-for ( sal_Int32 i = 0; i < nCount; ++i, ++pInfo )
+for ( auto const& rInfo : m_pContent->queryCreatableContentsInfo() 
)
 {
 // Simply look for the first KIND_FOLDER...
-if ( pInfo->Attributes & ContentInfoAttribute::KIND_FOLDER )
+if ( rInfo.Attributes & ContentInfoAttribute::KIND_FOLDER )
 {
 bRet = true;
 break;
@@ -295,15 +292,12 @@ namespace svt
 {
 OUString sFolderType;
 
-Sequence< ContentInfo > aInfo = 
m_pContent->queryCreatableContentsInfo();
-const ContentInfo* pInfo = aInfo.getConstArray();
-sal_Int32 nCount = aInfo.getLength();
-for ( sal_Int32 i = 0; i < nCount; ++i, ++pInfo )
+for ( auto const& rInfo : m_pContent->queryCreatableContentsInfo() 
)
 {
 // Simply look for the first KIND_FOLDER...
-if ( pInfo->Attributes & ContentInfoAttribute::KIND_FOLDER )
+if ( rInfo.Attributes & ContentInfoAttribute::KIND_FOLDER )
 {
-sFolderType = pInfo->Type;
+sFolderType = rInfo.Type;
 break;
 }
 }
@@ -312,9 +306,7 @@ namespace svt
 {
 ucbhelper::Content aCreated;
 Sequence< OUString > aNames { "Title" };
-Sequence< Any > aValues( 1 );
-Any* pValues = aValues.getArray();
-pValues[0] <<= _rTitle;
+Sequence< Any > aValues { Any(_rTitle) };
 m_pContent->insertNewContent( sFolderType, aNames, aValues, 
aCreated );
 
 aCreatedUrl = aCreated.getURL();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Jim Raykowski

 sw/source/ui/table/tautofmt.cxx|   20 +---
 sw/source/uibase/shells/basesh.cxx |9 -
 2 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 416f7578d6332b5b5a4445f26307d73925188e41
Author: Jim Raykowski 
Date:   Tue Oct 31 15:48:07 2017 -0800

tdf#107555 Apply 'Default Style' table style to newly inserted tables

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

diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index e5b19273c717..bce5d4b06581 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -262,6 +262,16 @@ void SwAutoFormatDlg::UpdateChecks( const 
SwTableAutoFormat& rFormat, bool bEnab
 m_pBtnAlignment->Check( rFormat.IsJustify() );
 }
 
+static void lcl_SetProperties( SwTableAutoFormat* pTableAutoFormat, bool bVal )
+{
+pTableAutoFormat->SetFont( bVal );
+pTableAutoFormat->SetJustify( bVal );
+pTableAutoFormat->SetFrame( bVal );
+pTableAutoFormat->SetBackground( bVal );
+pTableAutoFormat->SetValueFormat( bVal );
+pTableAutoFormat->SetWidthHeight( bVal );
+}
+
 void SwAutoFormatDlg::FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) 
const
 {
 if( 255 != nIndex )
@@ -274,7 +284,8 @@ void SwAutoFormatDlg::FillAutoFormatOfIndex( 
SwTableAutoFormat*& rToFill ) const
 else
 {
 delete rToFill;
-rToFill = nullptr;
+rToFill = new SwTableAutoFormat( SwViewShell::GetShellRes()->aStrNone 
);
+lcl_SetProperties( rToFill, false );
 }
 }
 
@@ -482,12 +493,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl, ListBox&, 
void)
 nIndex = 255;
 
 SwTableAutoFormat aTmp( SwViewShell::GetShellRes()->aStrNone );
-aTmp.SetFont( false );
-aTmp.SetJustify( false );
-aTmp.SetFrame( false );
-aTmp.SetBackground( false );
-aTmp.SetValueFormat( false );
-aTmp.SetWidthHeight( false );
+lcl_SetProperties( &aTmp, false );
 
 if( nOldIdx != nIndex )
 m_pWndPreview->NotifyChange( aTmp );
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 58ee634b334b..9d907536b750 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -107,6 +107,10 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+
 FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END;
 
 // These variables keep the state of Gallery (slot SID_GALLERY_BG_BRUSH)
@@ -2684,7 +2688,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 {
 // record before shell change
 _rRequest.AppendItem( SfxStringItem( FN_INSERT_TABLE, 
aTableName ) );
-if ( !aAutoName.isEmpty() )
+if ( !aAutoName.isEmpty() && aAutoName != 
SwViewShell::GetShellRes()->aStrNone )
 _rRequest.AppendItem( SfxStringItem( FN_PARAM_2, aAutoName 
) );
 _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_COLUMN, 
nCols ) );
 _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_ROW, nRows 
) );
@@ -2704,6 +2708,9 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 if( !aTableName.isEmpty() && !rSh.GetTableStyle( aTableName ) )
 rSh.GetTableFormat()->SetName( aTableName );
 
+if( pTAFormat == nullptr )
+rSh.SetTableStyle( SwStyleNameMapper::GetUIName( 
RES_POOLTABSTYLE_DEFAULT, OUString() ) );
+
 rSh.EndAllAction();
 rTempView.AutoCaption(TABLE_CAP);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svx/source sw/CppunitTest_sw_uibase_unit.mk sw/inc sw/Module_sw.mk sw/qa sw/source

2017-12-20 Thread Miklos Vajna

 svx/source/dialog/fntctrl.cxx|   34 ++
 sw/CppunitTest_sw_uibase_unit.mk |   31 +++
 sw/Module_sw.mk  |4 +++
 sw/inc/dbmgr.hxx |   17 +++
 sw/qa/unit/uibase.cxx|   44 +++
 sw/source/uibase/dbui/dbmgr.cxx  |   18 +--
 6 files changed, 118 insertions(+), 30 deletions(-)

New commits:
commit 226804c8f7d2306562380283edfd919a88863807
Author: Miklos Vajna 
Date:   Tue Dec 19 21:22:02 2017 +0100

svx: CleanAndCheckEmpty() can be in the anonymous namespace

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

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index f41889f3b766..39e07301 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -122,6 +122,22 @@ void setFont(const SvxFont& rNewFont, SvxFont& rImplFont)
 rImplFont.SetAlignment(ALIGN_BASELINE);
 }
 
+/*
+ * removes line feeds and carriage returns from string
+ * returns if param is empty
+ */
+bool CleanAndCheckEmpty(OUString& rText)
+{
+bool bEmpty = true;
+for (sal_Int32 i = 0; i < rText.getLength(); ++i)
+{
+if (0xa == rText[i] || 0xd == rText[i])
+rText = rText.replaceAt(i, 1, " ");
+else
+bEmpty = false;
+}
+return bEmpty;
+}
 } // end anonymous namespace
 
 class FontPrevWin_Impl
@@ -612,24 +628,6 @@ void SvxFontPrevWindow::UseResourceText()
 pImpl->mbUseResText = true;
 }
 
-/*
- * removes line feeds and carriage returns from string
- * returns if param is empty
- */
-bool CleanAndCheckEmpty(OUString& rText)
-{
-bool bEmpty = true;
-for (sal_Int32 i = 0; i < rText.getLength(); ++i)
-{
-if (0xa == rText[i] || 0xd == rText[i])
-rText = rText.replaceAt(i, 1, " ");
-else
-bEmpty = false;
-}
-return bEmpty;
-}
-
-
 void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&)
 {
 ApplySettings(rRenderContext);
commit 28ddaf520da56701508acc258cf1d90f26134d28
Author: Miklos Vajna 
Date:   Tue Dec 19 21:21:32 2017 +0100

tdf#98168 sw: add mail merge from xlsx testcase

Commit 83b43ef2223b66484e0e90e7b614886e06f955b5 (sw mail merge: add
support for the new 'writer' connectivity driver, 2017-07-18) fixed
this, with:

> If we are at it, also accept xlsx next to xls.

But there was no test for that part.

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

diff --git a/sw/CppunitTest_sw_uibase_unit.mk b/sw/CppunitTest_sw_uibase_unit.mk
new file mode 100644
index ..03a780a156ce
--- /dev/null
+++ b/sw/CppunitTest_sw_uibase_unit.mk
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_uibase_unit))
+
+$(eval $(call gb_CppunitTest_use_external,sw_uibase_unit,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_uibase_unit))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_uibase_unit, \
+sw/qa/unit/uibase \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_uibase_unit, \
+   sal \
+   sw \
+   tl \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_uibase_unit,\
+-I$(SRCDIR)/sw/inc \
+$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 472eac81ad93..4ef524d1fd94 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -48,6 +48,10 @@ $(eval $(call gb_Module_add_targets,sw,\
 
 endif
 
+$(eval $(call gb_Module_add_check_targets,sw,\
+CppunitTest_sw_uibase_unit \
+))
+
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sw_uwriter) \
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 098e1a26f7f7..932d3c165eed 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -473,6 +473,23 @@ public:
 void RevokeNotUsedConnections();
 };
 
+namespace sw
+{
+enum class DBConnURIType
+{
+UNKNOWN = 0,
+ODB,
+CALC,
+DBASE,
+FLAT,
+MSJET,
+MSACE,
+WRITER
+};
+
+DBConnURIType SW_DLLPUBLIC GetDBunoType(const INetURLObject &rURL);
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/unit/uibase.cxx b/sw/qa/unit/uibase.cxx
new file mode 100644
index ..188916da35a2
--- /dev/null
+++ b/sw/qa/unit/uibase.cxx
@@ -0,0 +1,44 @@
+/* -*- M

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist

2017-12-20 Thread Pranav Kant

 loleaflet/dist/loleaflet.css |   23 ---
 1 file changed, 23 deletions(-)

New commits:
commit 0aa18b3a263e9a9091e60804ec12d25ebb3915ec
Author: Pranav Kant 
Date:   Tue Dec 19 20:48:13 2017 +0530

Remove dialog bar custom styling

Branding rules should be provided by separate files.

This is basically a revert of 0bf56306caa3bf896d034bf9d074efb5a62d90a6

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

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 75e2a33a..7c054c33 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -334,29 +334,6 @@ body {
text-indent: 1px;
 }
 
-.lokdialog_container .ui-dialog-titlebar.ui-widget-header {
-   background: #5c3dcc;
-   border: none;
-}
-
-.lokdialog_container.ui-dialog .ui-dialog-title {
-   margin-bottom: 0;
-}
-
-.lokdialog_container .ui-state-default .ui-icon {
-   background-image: 
url(../node_modules/jquery-ui/themes/ui-lightness/images/ui-icons_ff_256x240.png);
-   border: none;
-}
-
-.lokdialog_container.ui-dialog .ui-state-default {
-   background: none;
-   border: none;
-}
-
-.lokdialog_container.ui-dialog .ui-state-default.ui-state-hover {
-   border: 1px solid #fff;
-}
-
 .lokdialog_container.ui-dialog.ui-widget-content {
padding: 0px;
overflow: hidden;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread Tor Lillqvist

 sw/source/core/docnode/nodes.cxx |   82 +++
 1 file changed, 40 insertions(+), 42 deletions(-)

New commits:
commit ae71020598362784b39eb4f67178166754db6fe0
Author: Tor Lillqvist 
Date:   Tue Dec 19 16:38:05 2017 +0200

Remove unnecessary nested block level

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

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 79c8076c11b1..510cbd938e33 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -2212,57 +2212,55 @@ void SwNodes::ForEach( const SwNodeIndex& rStart, const 
SwNodeIndex& rEnd,
 
 void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, bool bDel )
 {
-{
 #ifndef NDEBUG
-SwNode *const pFirst((*this)[nDelPos]);
+SwNode *const pFirst((*this)[nDelPos]);
 #endif
-for (sal_uLong nCnt = 0; nCnt < nSz; nCnt++)
-{
-SwNode* pNode = ((*this)[ nDelPos + nCnt ]);
-SwTextNode * pTextNd = pNode->GetTextNode();
+for (sal_uLong nCnt = 0; nCnt < nSz; nCnt++)
+{
+SwNode* pNode = ((*this)[ nDelPos + nCnt ]);
+SwTextNode * pTextNd = pNode->GetTextNode();
 
-if (pTextNd)
+if (pTextNd)
+{
+pTextNd->RemoveFromList();
+// remove RndStdIds::FLY_AS_CHAR *before* adjusting SwNodeIndex
+// so their anchor still points to correct node when deleted!
+// NOTE: this will call RemoveNode() recursively!
+// so adjust our indexes to account for removed nodes
+sal_uLong const nPos = pTextNd->GetIndex();
+SwpHints *const pHints(pTextNd->GetpSwpHints());
+if (pHints)
 {
-pTextNd->RemoveFromList();
-// remove RndStdIds::FLY_AS_CHAR *before* adjusting SwNodeIndex
-// so their anchor still points to correct node when deleted!
-// NOTE: this will call RemoveNode() recursively!
-// so adjust our indexes to account for removed nodes
-sal_uLong const nPos = pTextNd->GetIndex();
-SwpHints *const pHints(pTextNd->GetpSwpHints());
-if (pHints)
+std::vector flys;
+for (size_t i = 0; i < pHints->Count(); ++i)
 {
-std::vector flys;
-for (size_t i = 0; i < pHints->Count(); ++i)
+SwTextAttr *const pHint(pHints->Get(i));
+if (RES_TXTATR_FLYCNT == pHint->Which())
 {
-SwTextAttr *const pHint(pHints->Get(i));
-if (RES_TXTATR_FLYCNT == pHint->Which())
-{
-flys.push_back(pHint);
-}
+flys.push_back(pHint);
 }
-for (SwTextAttr * pHint : flys)
-{
-pTextNd->DeleteAttribute(pHint);
-}   // pHints may be dead now
-sal_uLong const nDiff = nPos - pTextNd->GetIndex();
-if (nDiff)
-{
-nDelPos -= nDiff;
-}
-assert(pTextNd == (*this)[nDelPos + nCnt]);
-assert(pFirst == (*this)[nDelPos]);
 }
+for (SwTextAttr * pHint : flys)
+{
+pTextNd->DeleteAttribute(pHint);
+}   // pHints may be dead now
+sal_uLong const nDiff = nPos - pTextNd->GetIndex();
+if (nDiff)
+{
+nDelPos -= nDiff;
+}
+assert(pTextNd == (*this)[nDelPos + nCnt]);
+assert(pFirst == (*this)[nDelPos]);
 }
-SwTableNode* pTableNode = pNode->GetTableNode();
-if (pTableNode)
-{
-// The node that is deleted is a table node.
-// Need to make sure that all the redlines that are
-// related to this table are removed from the
-// 'Extra Redlines' array
-pTableNode->RemoveRedlines();
-}
+}
+SwTableNode* pTableNode = pNode->GetTableNode();
+if (pTableNode)
+{
+// The node that is deleted is a table node.
+// Need to make sure that all the redlines that are
+// related to this table are removed from the
+// 'Extra Redlines' array
+pTableNode->RemoveRedlines();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreo

63 matches

Mail list logo