date:20170402

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

2017-04-02 Thread Jochen Nitschke

 formula/source/core/api/FormulaCompiler.cxx |2 +-
 include/formula/token.hxx   |   10 +-
 sc/inc/token.hxx|2 +-
 sc/qa/unit/ucalc_formula.cxx|   10 +-
 sc/qa/unit/ucalc_sharedformula.cxx  |2 +-
 sc/source/core/tool/interpr4.cxx|5 ++---
 sc/source/filter/excel/xeformula.cxx|2 +-
 7 files changed, 12 insertions(+), 21 deletions(-)

New commits:
commit b7b2c95fbc376ecea60b91e3e04fd52428258137
Author: Jochen Nitschke 
Date:   Sat Apr 1 10:05:30 2017 +0200

remove hack for non DBG_UTIL builds

always use a 8bit enum for StackVar

correct StackVar types for opcode opSep and opClose in unit test
and test them.

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

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index b70af7dc3152..09e355302105 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -318,7 +318,7 @@ bool isPotentialRangeType( FormulaToken* pToken, bool bRPN, 
bool bRight )
 return true;
 default:
 // Separators are not part of RPN and right opcodes need to be
-// other StackVarEnum types or functions and thus svByte.
+// other StackVar types or functions and thus svByte.
 return !bRPN && !bRight && isPotentialRangeLeftOp( 
pToken->GetOpCode());
 }
 }
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 2de988e551b6..19d1b1bb5bdf 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -44,7 +44,7 @@ enum class FormulaError : sal_uInt16;
 namespace formula
 {
 
-enum StackVarEnum
+enum StackVar : sal_uInt8
 {
 svByte,
 svDouble,
@@ -80,14 +80,6 @@ enum StackVarEnum
 svUnknown   // unknown StackType
 };
 
-#ifndef DBG_UTIL
-// save memory since compilers tend to int an enum
-typedef sal_uInt8 StackVar;
-#else
-// have enum names in debugger
-typedef StackVarEnum StackVar;
-#endif
-
 // Only to be used for debugging output. No guarantee of stability of the
 // return value.
 inline std::string StackVarEnumToString(StackVar const e)
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 147bba46730d..7c082010ea93 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -320,7 +320,7 @@ public:
 {
 return xUpperLeft ?
 xUpperLeft->GetType() :
-
static_cast(formula::svUnknown);
+formula::svUnknown;
 }
 const formula::FormulaConstTokenRef& GetUpperLeftToken() const { return 
xUpperLeft; }
 void Assign( const ScMatrixCellResultToken & r );
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index a10f552933e6..81e2f2121185 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1068,11 +1068,11 @@ void Test::testFormulaCompilerJumpReordering()
 TokenCheck aCheckRPN[] =
 {
 { ocPush,  svSingleRef },
-{ ocIf,static_cast(0) },
+{ ocIf,svUnknown   }, // type is context dependent, don't test 
it
 { ocPush,  svDouble},
-{ ocSep,   static_cast(0) },
+{ ocSep,   svSep   },
 { ocPush,  svString},
-{ ocClose, static_cast(0) },
+{ ocClose, svSep   },
 };
 
 sal_uInt16 nLen = pCode->GetCodeLen();
@@ -1083,7 +1083,7 @@ void Test::testFormulaCompilerJumpReordering()
 {
 const FormulaToken* p = ppTokens[i];
 CPPUNIT_ASSERT_EQUAL(aCheckRPN[i].meOp, p->GetOpCode());
-if (aCheckRPN[i].meOp == ocPush)
+if (aCheckRPN[i].meOp != ocIf )
 CPPUNIT_ASSERT_EQUAL(static_cast(aCheckRPN[i].meType), 
static_cast(p->GetType()));
 }
 
@@ -1099,7 +1099,7 @@ void Test::testFormulaCompilerJumpReordering()
 { ocPush,  svSingleRef },
 { ocPush,  svDouble},
 { ocPush,  svString},
-{ ocIf,static_cast(0) },
+{ ocIf,svUnknown   }, // type is context dependent, don't test 
it
 };
 
 nLen = pCode->GetCodeLen();
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx 
b/sc/qa/unit/ucalc_sharedformula.cxx
index ecd253d86b66..1659c8b46166 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1005,7 +1005,7 @@ void Test::testSharedFormulasDeleteColumns()
 const ScTokenArray* pCode = pFC->GetCode();
 CPPUNIT_ASSERT(pCode && pCode->GetLen() == 1);
 const FormulaToken* pToken = pC

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

2017-04-02 Thread Arnaud Versini

 sw/source/core/inc/swcache.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d7869e561100efee7e4bd747934d6757e67dc0d9
Author: Arnaud Versini 
Date:   Sun Apr 2 14:40:19 2017 +0200

Avoid redundant inline warning in swcache

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

diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 5e6a81d07781..f3e1a327b22a 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -169,8 +169,8 @@ public:
 void Lock();
 void Unlock();
 #else
-inline void Lock() { ++m_nLock; }
-inline void Unlock() { --m_nLock; }
+void Lock() { ++m_nLock; }
+void Unlock() { --m_nLock; }
 #endif
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Noel Grandin

 sw/inc/fmtruby.hxx   |   15 ++---
 sw/inc/unosett.hxx   |5 +
 sw/qa/extras/htmlimport/htmlimport.cxx   |   15 +
 sw/qa/extras/mailmerge/mailmerge.cxx |   10 +++
 sw/qa/extras/odfexport/odfexport.cxx |   40 ++
 sw/qa/extras/odfimport/odfimport.cxx |   24 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   30 ++
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx|   65 +++
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx|   31 +++
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|   10 +++
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|   30 ++
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx|   10 +++
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|   75 +++
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   26 +
 sw/qa/extras/rtfexport/rtfexport.cxx |   50 ++
 sw/qa/extras/rtfimport/rtfimport.cxx |   52 ++
 sw/qa/extras/ww8export/ww8export.cxx |   30 ++
 sw/source/core/fields/docufld.cxx|2 
 sw/source/core/layout/atrfrm.cxx |   14 ++---
 sw/source/core/text/porlay.cxx   |8 +-
 sw/source/core/text/pormulti.cxx |   16 ++---
 sw/source/core/text/pormulti.hxx |7 +-
 sw/source/core/txtnode/fmtatr2.cxx   |6 +-
 sw/source/core/unocore/unodraw.cxx   |2 
 sw/source/core/unocore/unoobj.cxx|2 
 sw/source/core/unocore/unoport.cxx   |2 
 sw/source/core/unocore/unosett.cxx   |4 -
 sw/source/core/unocore/unostyle.cxx  |4 -
 sw/source/filter/html/htmlform.cxx   |4 -
 sw/source/filter/ww8/docxattributeoutput.cxx |   10 +--
 sw/source/filter/ww8/rtfattributeoutput.cxx  |   10 +--
 sw/source/filter/ww8/wrtw8nds.cxx|   10 +--
 sw/source/filter/ww8/ww8par3.cxx |   13 +---
 sw/source/filter/ww8/ww8par5.cxx |   13 ++--
 sw/source/ui/vba/vbaparagraphformat.cxx  |6 +-
 sw/source/ui/vba/vbaparagraphformat.hxx  |5 +
 sw/source/uibase/uno/unotxvw.cxx |2 
 37 files changed, 579 insertions(+), 79 deletions(-)

New commits:
commit 4809096a1f60d9ef57a494ba6ae8fb8541361572
Author: Noel Grandin 
Date:   Fri Mar 31 13:49:52 2017 +0200

use actual UNO enums in sw

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

diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index dcf5575ce873..646a26f7df43 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_INC_FMTRUBY_HXX
 
 #include 
+#include 
 
 class SwTextRuby;
 
@@ -27,12 +28,12 @@ class SW_DLLPUBLIC SwFormatRuby : public SfxPoolItem
 {
 friend class SwTextRuby;
 
-OUString sRubyText;  ///< The ruby txt.
-OUString sCharFormatName;  ///< Name of the charformat.
-SwTextRuby* pTextAttr;///< The TextAttribute.
-sal_uInt16 nCharFormatId;  ///< PoolId of the charformat.
+OUString sRubyText; ///< The ruby txt.
+OUString sCharFormatName;   ///< Name of the charformat.
+SwTextRuby* pTextAttr;  ///< The TextAttribute.
+sal_uInt16 nCharFormatId;   ///< PoolId of the charformat.
 sal_uInt16 nPosition;   ///< Position of the 
Ruby-character.
-sal_uInt16 nAdjustment; ///< Specific adjustment of the 
Ruby-ch.
+css::text::RubyAdjust nAdjustment;  ///< Specific adjustment of the 
Ruby-ch.
 
 public:
 SwFormatRuby( const OUString& rRubyText );
@@ -68,8 +69,8 @@ public:
 sal_uInt16 GetPosition() const  { return nPosition; }
 void SetPosition( sal_uInt16 nNew ) { nPosition = nNew; }
 
-sal_uInt16 GetAdjustment() const{ return nAdjustment; }
-void SetAdjustment( sal_uInt16 nNew )   { nAdjustment = nNew; }
+css::text::RubyAdjust GetAdjustment() const   { return nAdjustment; }
+void SetAdjustment( css::text::RubyAdjust nNew )  { nAdjustment = nNew; }
 };
 
 #endif
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 0c2e9c796e95..96668f3680c0 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -257,7 +258,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4
 sal_Int32   nSepLineWidth;
 sal_Int32   nSepLineColor;
 sal_Int8nSepLineHeightRelative;
-sal_Int8nSepLineVertAlign;//style::VerticalAlignment
+css::style::VerticalAlignment nSepLineVertAlign;
 boolbSepLineIsOn;
 sal_I

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

2017-04-02 Thread Noel Grandin

 sc/inc/conditio.hxx |3 ++-
 sc/inc/dpobject.hxx |8 
 sc/inc/dpoutput.hxx |5 +++--
 sc/inc/dpsave.hxx   |8 
 sc/inc/dpsdbtab.hxx |6 --
 sc/inc/dptabres.hxx |   10 ++
 sc/inc/dptabsrc.hxx |   13 -
 sc/inc/generalfunction.hxx  |   26 +-
 sc/inc/miscuno.hxx  |   10 --
 sc/inc/scabstdlg.hxx|2 +-
 sc/qa/unit/subsequent_filters-test.cxx  |   14 --
 sc/qa/unit/ucalc_pivottable.cxx |2 +-
 sc/source/core/data/conditio.cxx|4 ++--
 sc/source/core/data/dpobject.cxx|   20 ++--
 sc/source/core/data/dpoutput.cxx|4 ++--
 sc/source/core/data/dpsave.cxx  |   13 ++---
 sc/source/core/data/dpsdbtab.cxx|1 -
 sc/source/core/data/dptabres.cxx|9 -
 sc/source/core/data/dptabsrc.cxx|   23 +++
 sc/source/filter/excel/xepivot.cxx  |4 ++--
 sc/source/filter/excel/xepivotxml.cxx   |6 ++
 sc/source/filter/excel/xipivot.cxx  |4 ++--
 sc/source/filter/xml/XMLExportDataPilot.cxx |1 +
 sc/source/filter/xml/xmlcelli.cxx   |2 +-
 sc/source/filter/xml/xmldpimp.cxx   |6 +++---
 sc/source/filter/xml/xmldpimp.hxx   |6 --
 sc/source/filter/xml/xmldrani.cxx   |3 +--
 sc/source/ui/attrdlg/scdlgfact.cxx  |2 +-
 sc/source/ui/attrdlg/scdlgfact.hxx  |2 +-
 sc/source/ui/dbgui/pvfundlg.cxx |2 +-
 sc/source/ui/inc/dbfunc.hxx |2 +-
 sc/source/ui/inc/pvfundlg.hxx   |4 +++-
 sc/source/ui/unoobj/dapiuno.cxx |6 +++---
 sc/source/ui/unoobj/fmtuno.cxx  |6 +++---
 sc/source/ui/unoobj/miscuno.cxx |4 ++--
 sc/source/ui/vba/vbavalidation.cxx  |2 +-
 sc/source/ui/view/cellsh1.cxx   |2 +-
 sc/source/ui/view/dbfunc3.cxx   |9 -
 sc/source/ui/view/gridwin.cxx   |4 ++--
 sc/source/ui/view/gridwin2.cxx  |   11 ++-
 40 files changed, 146 insertions(+), 123 deletions(-)

New commits:
commit fcad02149f3a9964f36522d97faaf303fc321788
Author: Noel Grandin 
Date:   Fri Mar 31 13:07:32 2017 +0200

use actual UNO enums in sc

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

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 277078c4aac1..bba11bc12378 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -31,6 +31,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -270,7 +271,7 @@ public:
 
 virtual ScFormatEntry* Clone(ScDocument* pDoc) const override;
 
-static ScConditionMode GetModeFromApi(sal_Int32 nOperator);
+static ScConditionMode GetModeFromApi(css::sheet::ConditionOperator 
nOperator);
 
 virtual void endRendering() override;
 virtual void startRendering() override;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 1b3031f662bc..2baea36b7654 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -173,10 +173,10 @@ public:
 boolIsDuplicated( long nDim );
 longGetDimCount();
 voidGetHeaderPositionData(const ScAddress& rPos, 
css::sheet::DataPilotTableHeaderData& rData);
-longGetHeaderDim( const ScAddress& rPos, sal_uInt16& 
rOrient );
+longGetHeaderDim( const ScAddress& rPos, 
css::sheet::DataPilotFieldOrientation& rOrient );
 boolGetHeaderDrag( const ScAddress& rPos, bool bMouseLeft, 
bool bMouseTop,
long nDragDim,
-   tools::Rectangle& rPosRect, sal_uInt16& 
rOrient, long& rDimPos );
+   tools::Rectangle& rPosRect, 
css::sheet::DataPilotFieldOrientation& rOrient, long& rDimPos );
 boolIsFilterButton( const ScAddress& rPos );
 
 double GetPivotData(
@@ -241,14 +241,14 @@ public:
 
 static void ConvertOrientation(
 ScDPSaveData& rSaveData,
-const ScPivotFieldVector& rFields, sal_uInt16 nOrient,
+const ScPivotFieldVector& rFields, 
css::sheet::DataPilotFieldOrientation nOrient,
 const css::uno::Reference< css::sheet::XDimensionsSupplier>& xSource,
 const ScDPLabelDataVector& rLabels,
 const ScPivotFieldVector* pRefColFields = nullptr,
 const ScPivotFieldVector* pRefRowFields = nullptr,
 const ScPivotFieldVector* pRefPageFields = nullptr );
 
-static bool

[Libreoffice-commits] online.git: net/Socket.hpp net/WebSocketHandler.hpp

2017-04-02 Thread Ashod Nakashian

 net/Socket.hpp   |   16 ++--
 net/WebSocketHandler.hpp |2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 8932a1e92e9dbe61841a92d970751ecc41f32a80
Author: Ashod Nakashian 
Date:   Mon Apr 3 01:02:35 2017 -0400

wsd: remove LOOL_CHECK_THREADS

isCorrectThread now always checks
with ENABLE_DEBUG.

Change-Id: I2b5747f3ab18c8ebdbc92e7ffc86a2469b8c7d13
Reviewed-on: https://gerrit.libreoffice.org/36038
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 7d227732..9cf83c49 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -195,7 +195,7 @@ public:
 #endif
 }
 
-virtual bool isCorrectThread(bool hard = false)
+virtual bool isCorrectThread()
 {
 #if ENABLE_DEBUG
 const bool sameThread = std::this_thread::get_id() == _owner;
@@ -204,12 +204,8 @@ public:
 _owner << " but called from 0x" << 
std::this_thread::get_id() << " (" <<
 std::dec << Util::getThreadId() << ").");
 
-if (hard)
-return sameThread;
-else
-return !getenv("LOOL_CHECK_THREADS") || sameThread;
+return sameThread;
 #else
-(void)hard;
 return true;
 #endif
 }
@@ -455,7 +451,7 @@ public:
 {
 assert(socket);
 assert(isCorrectThread());
-assert(socket->isCorrectThread(true));
+assert(socket->isCorrectThread());
 auto it = std::find(_pollSockets.begin(), _pollSockets.end(), socket);
 assert(it != _pollSockets.end());
 
@@ -650,7 +646,7 @@ public:
 /// Send data to the socket peer.
 void send(const char* data, const int len, const bool flush = true)
 {
-assert(isCorrectThread(true));
+assert(isCorrectThread());
 if (data != nullptr && len > 0)
 {
 _outBuffer.insert(_outBuffer.end(), data, data + len);
@@ -732,7 +728,7 @@ protected:
 HandleResult handlePoll(std::chrono::steady_clock::time_point now,
 const int events) override
 {
-assert(isCorrectThread(true));
+assert(isCorrectThread());
 
 _socketHandler->checkTimeout(now);
 
@@ -800,7 +796,7 @@ protected:
 /// Override to write data out to socket.
 virtual void writeOutgoingData()
 {
-assert(isCorrectThread(true));
+assert(isCorrectThread());
 assert(!_outBuffer.empty());
 do
 {
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 0cf63a36..8d689de3 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -330,7 +330,7 @@ protected:
 if (!socket || data == nullptr || len == 0)
 return -1;
 
-assert(socket->isCorrectThread(true));
+assert(socket->isCorrectThread());
 std::vector& out = socket->_outBuffer;
 
 out.push_back(flags);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Common.hpp common/IoUtil.cpp common/LOOLWebSocket.hpp kit/Kit.cpp net/WebSocketHandler.hpp test/helpers.hpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp

2017-04-02 Thread Ashod Nakashian

 common/Common.hpp|6 --
 common/IoUtil.cpp|   21 -
 common/LOOLWebSocket.hpp |   18 +-
 kit/Kit.cpp  |8 +---
 net/WebSocketHandler.hpp |   26 +++---
 test/helpers.hpp |   18 +-
 wsd/DocumentBroker.cpp   |4 ++--
 wsd/DocumentBroker.hpp   |3 ---
 8 files changed, 12 insertions(+), 92 deletions(-)

New commits:
commit 95d51493aa6f480948f07354f079e1b8d556108c
Author: Ashod Nakashian 
Date:   Mon Apr 3 00:45:40 2017 -0400

wsd: remove nextmessage

This was a workaround to Poco's limitation
of requiring socket receiveFrame be given
preallocated buffer, which couldn't be
exceeded by a larger payload. This meant
the receiver had to know the maximum
payload in advance.

Since only the Kit uses Poco sockets,
and the Kit never receives large payloads,
this preamble is now obsolete.

100% (94/94) of old-style tests PASS.

Change-Id: I76776f89497409e5755e335a3e25553e91cf0876
Reviewed-on: https://gerrit.libreoffice.org/36037
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/common/Common.hpp b/common/Common.hpp
index ab4e1bdd..09bafad3 100644
--- a/common/Common.hpp
+++ b/common/Common.hpp
@@ -25,12 +25,6 @@ constexpr int WS_SEND_TIMEOUT_MS = 1000;
 /// which can be 1500 bytes long.
 constexpr long READ_BUFFER_SIZE = 64 * 1024;
 
-/// Size beyond which messages will be sent preceded with
-/// 'nextmessage' frame to let the receiver know in advance
-/// the size of the larger coming message. All messages up to,
-/// but not including, this size are considered small messages.
-constexpr int LARGE_MESSAGE_SIZE = READ_BUFFER_SIZE - 512;
-
 /// Message larger than this will be dropped as invalid
 /// or as intentionally flooding the server.
 constexpr int MAX_MESSAGE_SIZE = 2 * 1024 * READ_BUFFER_SIZE;
diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp
index f94d0b3c..da9a4242 100644
--- a/common/IoUtil.cpp
+++ b/common/IoUtil.cpp
@@ -143,27 +143,6 @@ void SocketProcessor(const std::shared_ptr& 
ws,
 }
 }
 }
-else
-{
-int size = 0;
-Poco::StringTokenizer tokens(firstLine, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-// Check if it is a "nextmessage:" and in that case read the 
large
-// follow-up message separately, and handle that only.
-if (tokens.count() == 2 && tokens[0] == "nextmessage:" &&
-LOOLProtocol::getTokenInteger(tokens[1], "size", size) && 
size > 0)
-{
-LOG_TRC("SocketProcessor [" << name << "]: Getting large 
message of " << size << " bytes.");
-if (size > MAX_MESSAGE_SIZE)
-{
-LOG_ERR("SocketProcessor [" << name << "]: 
Large-message size (" << size << ") over limit or invalid.");
-}
-else
-{
-payload.resize(size);
-continue;
-}
-}
-}
 
 LOG_CHECK(n > 0);
 
diff --git a/common/LOOLWebSocket.hpp b/common/LOOLWebSocket.hpp
index 24bc7a0e..784a0915 100644
--- a/common/LOOLWebSocket.hpp
+++ b/common/LOOLWebSocket.hpp
@@ -161,23 +161,7 @@ public:
 static const Poco::Timespan waitZero(0);
 std::unique_lock lock(_mutexWrite);
 
-if (length >= LARGE_MESSAGE_SIZE)
-{
-const std::string nextmessage = "nextmessage: size=" + 
std::to_string(length);
-const int size = nextmessage.size();
-
-if (Poco::Net::WebSocket::sendFrame(nextmessage.data(), size) == 
size)
-{
-LOG_TRC("Sent long message preample: " + nextmessage);
-}
-else
-{
-LOG_WRN("Failed to send long message preample.");
-return -1;
-}
-}
-
-int result = Poco::Net::WebSocket::sendFrame(buffer, length, flags);
+const int result = Poco::Net::WebSocket::sendFrame(buffer, length, 
flags);
 
 lock.unlock();
 
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 35a48673..40a9a2df 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -659,7 +659,7 @@ public:
 return;
 }
 
-LOG_TRC("Sending render-tile response (" + 
std::to_string(output.size()) + " bytes) for: " + response);
+LOG_TRC("Sending render-tile response (" << output.size() << " bytes) 
for: " << response);
 ws->sendFrame(output.data(), output.size(), WebSocket::FRAME_BINARY);
 }
 
@@ -741,7 +741,8 @@ public:
 if (hash != 0 && tiles[tileIndex].getOldHash() == hash)
 {
 // The tile content is identical to what the client already 
has, so s

[Libreoffice-commits] online.git: net/WebSocketHandler.hpp

2017-04-02 Thread Ashod Nakashian

 net/WebSocketHandler.hpp |   31 +--
 1 file changed, 17 insertions(+), 14 deletions(-)

New commits:
commit b52a8ac6e2806e3ebdc73726040eb70a908a40cc
Author: Ashod Nakashian 
Date:   Sun Apr 2 23:27:06 2017 -0400

wsd: const correctness and avoid unnecessary shared_ptr promotion

Change-Id: I4352d82e7b5c6873837e73ec04d894dce9a716b7
Reviewed-on: https://gerrit.libreoffice.org/36036
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index a7cae8f4..1c6caf46 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -126,15 +126,9 @@ public:
 sendFrame(socket, buf.data(), buf.size(), flags);
 }
 
-/// Implementation of the SocketHandlerInterface.
-virtual bool handleOneIncomingMessage()
+bool handleOneIncomingMessage(const std::shared_ptr& socket)
 {
-auto socket = _socket.lock();
-if (socket == nullptr)
-{
-LOG_ERR("No socket associated with WebSocketHandler 0x" << 
std::hex << this << std::dec);
-return false;
-}
+assert(socket && "Expected a valid socket instance.");
 
 // websocket fun !
 const size_t len = socket->_inBuffer.size();
@@ -148,9 +142,9 @@ public:
 return false;
 
 unsigned char *p = reinterpret_cast(&socket->_inBuffer[0]);
-bool fin = p[0] & 0x80;
-WSOpCode code = static_cast(p[0] & 0x0f);
-bool hasMask = p[1] & 0x80;
+const bool fin = p[0] & 0x80;
+const WSOpCode code = static_cast(p[0] & 0x0f);
+const bool hasMask = p[1] & 0x80;
 size_t payloadLen = p[1] & 0x7f;
 size_t headerLen = 2;
 
@@ -204,7 +198,8 @@ public:
 socket->_inBuffer.erase(socket->_inBuffer.begin(), 
socket->_inBuffer.begin() + headerLen + payloadLen);
 
 // FIXME: fin, aggregating payloads into _wsPayload etc.
-LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket message code " 
<< code << " fin? " << fin << ", payload length: " << _wsPayload.size());
+LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket message code " 
<< code <<
+" fin? " << fin << ", mask? " << hasMask << " payload length: 
" << _wsPayload.size());
 
 switch (code)
 {
@@ -254,8 +249,16 @@ public:
 /// Implementation of the SocketHandlerInterface.
 virtual SocketHandlerInterface::SocketOwnership handleIncomingMessage() 
override
 {
-while (handleOneIncomingMessage())
-; // can have multiple msgs in one recv'd packet.
+auto socket = _socket.lock();
+if (socket == nullptr)
+{
+LOG_ERR("No socket associated with WebSocketHandler 0x" << 
std::hex << this << std::dec);
+}
+else
+{
+while (handleOneIncomingMessage(socket))
+; // can have multiple msgs in one recv'd packet.
+}
 
 return SocketHandlerInterface::SocketOwnership::UNCHANGED;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/Socket.hpp

2017-04-02 Thread Ashod Nakashian

 net/Socket.hpp |   54 ++
 1 file changed, 26 insertions(+), 28 deletions(-)

New commits:
commit 78d1cc4ac5ec421777085abf2835425954378105
Author: Ashod Nakashian 
Date:   Sun Apr 2 21:33:36 2017 -0400

wsd: process callbacks before poll handlers

Callbacks are used to initialize handlers,
as is the case with addSession on DocumentBroker.

If the socket gets data before the callback is
invoked, the handler will fail since the expected
initialization hasn't happened yet.

This race indeed happens (rarely) with addSession.

100% (94/94) of old-style tests PASS.

Change-Id: Id9b4f63b45c5564add252e1671b7b0b08aff8150
Reviewed-on: https://gerrit.libreoffice.org/36035
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/net/Socket.hpp b/net/Socket.hpp
index e3d9569d..7d227732 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -327,32 +327,7 @@ public:
 LOG_TRC("Poll completed with " << rc << " live polls max (" <<
 timeoutMaxMs << "ms)" << ((rc==0) ? "(timedout)" : ""));
 
-// Fire the callback and remove dead fds.
-std::chrono::steady_clock::time_point newNow =
-std::chrono::steady_clock::now();
-for (int i = static_cast(size) - 1; i >= 0; --i)
-{
-Socket::HandleResult res = Socket::HandleResult::SOCKET_CLOSED;
-try
-{
-res = _pollSockets[i]->handlePoll(newNow, _pollFds[i].revents);
-}
-catch (const std::exception& exc)
-{
-LOG_ERR("Error while handling poll for socket #" <<
-_pollFds[i].fd << " in " << _name << ": " << 
exc.what());
-}
-
-if (res == Socket::HandleResult::SOCKET_CLOSED ||
-res == Socket::HandleResult::MOVED)
-{
-LOG_DBG("Removing socket #" << _pollFds[i].fd << " (of " <<
-_pollSockets.size() << ") from " << _name);
-_pollSockets.erase(_pollSockets.begin() + i);
-}
-}
-
-// Process the wakeup pipe (always the last entry).
+// First process the wakeup pipe (always the last entry).
 if (_pollFds[size].revents)
 {
 std::vector invoke;
@@ -399,6 +374,31 @@ public:
 "] wakeup hook: " << exc.what());
 }
 }
+
+// Fire the poll callbacks and remove dead fds.
+std::chrono::steady_clock::time_point newNow =
+std::chrono::steady_clock::now();
+for (int i = static_cast(size) - 1; i >= 0; --i)
+{
+Socket::HandleResult res = Socket::HandleResult::SOCKET_CLOSED;
+try
+{
+res = _pollSockets[i]->handlePoll(newNow, _pollFds[i].revents);
+}
+catch (const std::exception& exc)
+{
+LOG_ERR("Error while handling poll for socket #" <<
+_pollFds[i].fd << " in " << _name << ": " << 
exc.what());
+}
+
+if (res == Socket::HandleResult::SOCKET_CLOSED ||
+res == Socket::HandleResult::MOVED)
+{
+LOG_DBG("Removing socket #" << _pollFds[i].fd << " (of " <<
+_pollSockets.size() << ") from " << _name);
+_pollSockets.erase(_pollSockets.begin() + i);
+}
+}
 }
 
 /// Write to a wakeup descriptor
@@ -430,8 +430,6 @@ public:
 if (newSocket)
 {
 std::lock_guard lock(_mutex);
-// Beware - _thread may not be created & started yet.
-newSocket->setThreadOwner(_thread.get_id());
 LOG_DBG("Inserting socket #" << newSocket->getFD() << " into " << 
_name);
 _newSockets.emplace_back(newSocket);
 wakeup();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Ashod Nakashian

 wsd/DocumentBroker.cpp |3 +++
 wsd/LOOLWSD.cpp|   16 
 wsd/LOOLWSD.hpp|4 +++-
 3 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit c81db872352443cb0c3ac0f7c0d68f27fcd34963
Author: Ashod Nakashian 
Date:   Sun Apr 2 19:56:42 2017 -0400

wsd: do child housekeeping on finishing DocBroker thread

Change-Id: I109737b79759986cb2a1cbfc6d711ee2f19ff59d
Reviewed-on: https://gerrit.libreoffice.org/36034
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index ae7f6e71..a89e3862 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -260,6 +260,9 @@ void DocumentBroker::pollThread()
 _poll->poll(std::min(flushTimeoutMs - elapsedMs, POLL_TIMEOUT_MS / 5));
 }
 
+// Cleanup.
+LOOLWSD::doHousekeeping();
+
 LOG_INF("Finished docBroker polling thread for docKey [" << _docKey << 
"].");
 }
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 2cc7bf51..6b2d633b 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1101,6 +1101,11 @@ bool LOOLWSD::checkAndRestoreForKit()
 
 void PrisonerPoll::wakeupHook()
 {
+LOOLWSD::doHousekeeping();
+}
+
+void LOOLWSD::doHousekeeping()
+{
 if (!LOOLWSD::checkAndRestoreForKit())
 {
 // No children have died.
@@ -1136,11 +1141,6 @@ void PrisonerPoll::wakeupHook()
 cleanupDocBrokers();
 }
 
-void LOOLWSD::triggerChildAndDocHousekeeping()
-{
-PrisonerPoll.wakeup();
-}
-
 bool LOOLWSD::createForKit()
 {
 #ifdef KIT_IN_PROCESS
@@ -2428,9 +2428,9 @@ int LOOLWSD::innerMain()
 UnitWSD::get().invokeTest();
 
 // This timeout affects the recovery time of prespawned children.
-int msWait = UnitWSD::isUnitTesting() ?
-UnitWSD::get().getTimeoutMilliSeconds() / 4 :
-SocketPoll::DefaultPollTimeoutMs * 4;
+const int msWait = UnitWSD::isUnitTesting() ?
+   UnitWSD::get().getTimeoutMilliSeconds() / 4 :
+   SocketPoll::DefaultPollTimeoutMs * 4;
 mainWait.poll(msWait);
 
 // Wake the prisoner poll to spawn some children, if necessary.
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index b86b23ac..072a4a88 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -100,7 +100,9 @@ public:
 /// Return true when successfull.
 static bool createForKit();
 
-static void triggerChildAndDocHousekeeping();
+/// Checks forkit (and respawns), rebalances
+/// child kit processes and cleans up DocBrokers.
+static void doHousekeeping();
 
 protected:
 void initialize(Poco::Util::Application& self) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/Socket.hpp

2017-04-02 Thread Ashod Nakashian

 net/Socket.hpp |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 6e596d11f3ebe09ad1b50c395f920b591805f4b6
Author: Ashod Nakashian 
Date:   Sun Apr 2 19:56:13 2017 -0400

wsd: catch exceptions from callbacks and wakup hook

Change-Id: Ib4579a34c91cfe43e5bd7038b175175a9ab0036a
Reviewed-on: https://gerrit.libreoffice.org/36033
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 200c389b..e3d9569d 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -377,9 +377,27 @@ public:
 }
 
 for (size_t i = 0; i < invoke.size(); ++i)
-invoke[i]();
+{
+try
+{
+invoke[i]();
+}
+catch (const std::exception& exc)
+{
+LOG_ERR("Exception while invoking poll [" << _name <<
+"] callback: " << exc.what());
+}
+}
 
-wakeupHook();
+try
+{
+wakeupHook();
+}
+catch (const std::exception& exc)
+{
+LOG_ERR("Exception while invoking poll [" << _name <<
+"] wakeup hook: " << exc.what());
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/Socket.cpp net/Socket.hpp

2017-04-02 Thread Ashod Nakashian

 net/Socket.cpp |   13 ++---
 net/Socket.hpp |6 ++
 2 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit d7858b08b90f989b0fe08c1f0309e4cd7f82c409
Author: Ashod Nakashian 
Date:   Sun Apr 2 18:43:21 2017 -0400

wsd: fix race in setting SocketPoll owner thread id

Change-Id: Idace925ab02425ed66ac07efc22ab933d229d42e
Reviewed-on: https://gerrit.libreoffice.org/36032
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 3a07470c..bac3a741 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -52,16 +52,8 @@ SocketPoll::SocketPoll(const std::string& threadName)
 throw std::runtime_error("Failed to allocate pipe for SocketPoll [" + 
threadName + "] waking.");
 }
 
-{
-std::lock_guard lock(getPollWakeupsMutex());
-getWakeupsArray().push_back(_wakeup[1]);
-}
-
-#if ENABLE_DEBUG
-_owner = std::this_thread::get_id();
-LOG_DBG("Thread affinity of " << _name << " set to 0x" <<
-std::hex << _owner << "." << std::dec);
-#endif
+std::lock_guard lock(getPollWakeupsMutex());
+getWakeupsArray().push_back(_wakeup[1]);
 }
 
 SocketPoll::~SocketPoll()
@@ -92,7 +84,6 @@ void SocketPoll::startThread()
 try
 {
 _thread = std::thread(&SocketPoll::pollingThreadEntry, this);
-_owner = _thread.get_id();
 }
 catch (const std::exception& exc)
 {
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 9977f481..200c389b 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -493,6 +493,12 @@ private:
 Util::setThreadName(_name);
 LOG_INF("Starting polling thread [" << _name << "].");
 
+#if ENABLE_DEBUG
+_owner = std::this_thread::get_id();
+LOG_DBG("Thread affinity of " << _name << " set to 0x" <<
+std::hex << _owner << "." << std::dec);
+#endif
+
 // Invoke the virtual implementation.
 pollingThread();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Ashod Nakashian

 wsd/DocumentBroker.cpp |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit bd82bf4c4b7ed57d55cd1cf05ea681517b8c1bf3
Author: Ashod Nakashian 
Date:   Sun Apr 2 17:50:17 2017 -0400

wsd: set DocBroker poll thread once

Change-Id: Ic6397893b2b9b04c6715c393c3f176785b1e2b77
Reviewed-on: https://gerrit.libreoffice.org/36031
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 259ca5aa..ae7f6e71 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -155,7 +155,7 @@ DocumentBroker::DocumentBroker(const std::string& uri,
 _cursorPosY(0),
 _cursorWidth(0),
 _cursorHeight(0),
-_poll(new DocumentBrokerPoll("docbrk_poll", *this)),
+_poll(new DocumentBrokerPoll("docbroker_" + _docId, *this)),
 _stop(false),
 _tileVersion(0),
 _debugRenderedTileCount(0)
@@ -180,8 +180,6 @@ bool DocumentBroker::isCorrectThread()
 // The inner heart of the DocumentBroker - our poll loop.
 void DocumentBroker::pollThread()
 {
-Util::setThreadName("docbroker_" + _docId);
-
 LOG_INF("Starting docBroker polling thread for docKey [" << _docKey << 
"].");
 
 _threadStart = std::chrono::steady_clock::now();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Ashod Nakashian

 net/Socket.cpp  |5 -
 net/Socket.hpp  |   15 ---
 wsd/LOOLWSD.cpp |4 +---
 3 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit d6577654bdc45892d9546ecfccdccd549b01921a
Author: Ashod Nakashian 
Date:   Sun Apr 2 17:49:14 2017 -0400

wsd: initialization and logging

Change-Id: Icd82a966b94875a65ddb3817c88a3c4c7bedd4ff
Reviewed-on: https://gerrit.libreoffice.org/36030
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 2b9899f8..3a07470c 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -43,7 +43,8 @@ SocketPoll::SocketPoll(const std::string& threadName)
 : _name(threadName),
   _stop(false),
   _threadStarted(false),
-  _threadFinished(false)
+  _threadFinished(false),
+  _owner(std::this_thread::get_id())
 {
 // Create the wakeup fd.
 if (::pipe2(_wakeup, O_CLOEXEC | O_NONBLOCK) == -1)
@@ -56,9 +57,11 @@ SocketPoll::SocketPoll(const std::string& threadName)
 getWakeupsArray().push_back(_wakeup[1]);
 }
 
+#if ENABLE_DEBUG
 _owner = std::this_thread::get_id();
 LOG_DBG("Thread affinity of " << _name << " set to 0x" <<
 std::hex << _owner << "." << std::dec);
+#endif
 }
 
 SocketPoll::~SocketPoll()
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 94d4cc34..9977f481 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -47,15 +47,14 @@ public:
 
 Socket() :
 _fd(socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0)),
-_sendBufferSize(DefaultSendBufferSize)
+_sendBufferSize(DefaultSendBufferSize),
+_owner(std::this_thread::get_id())
 {
 init();
 }
 
 virtual ~Socket()
 {
-// TODO: Should we shutdown here or up to the client?
-
 LOG_TRC("#" << getFD() << " Socket dtor.");
 
 // Doesn't block on sockets; no error handling needed.
@@ -231,11 +230,13 @@ protected:
 _sendBufferSize = DefaultSendBufferSize;
 #if ENABLE_DEBUG
 _owner = std::this_thread::get_id();
-LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex << 
_owner << "." << std::dec);
+LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex <<
+_owner << "." << std::dec);
 
 const int oldSize = getSocketBufferSize();
 setSocketBufferSize(0);
-LOG_TRC("#" << _fd << ": Buffer size: " << getSendBufferSize() << " 
(was " << oldSize << ")");
+LOG_TRC("#" << _fd << ": Buffer size: " << getSendBufferSize() <<
+" (was " << oldSize << ")");
 #endif
 }
 
@@ -323,8 +324,8 @@ public:
 rc = ::poll(&_pollFds[0], size + 1, std::max(timeoutMaxMs,0));
 }
 while (rc < 0 && errno == EINTR);
-LOG_TRC("Poll completed with " << rc << " live polls max (" << 
timeoutMaxMs << "ms)"
-<< ((rc==0) ? "(timedout)" : ""));
+LOG_TRC("Poll completed with " << rc << " live polls max (" <<
+timeoutMaxMs << "ms)" << ((rc==0) ? "(timedout)" : ""));
 
 // Fire the callback and remove dead fds.
 std::chrono::steady_clock::time_point newNow =
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 05c6e1da..2cc7bf51 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1322,9 +1322,7 @@ static std::shared_ptr 
createNewClientSession(const WebSocketHand
 // In case of WOPI, if this session is not set as readonly, it might 
be set so
 // later after making a call to WOPI host which tells us the 
permission on files
 // (UserCanWrite param).
-auto session = std::make_shared(id, docBroker, 
uriPublic, isReadOnly);
-
-return session;
+return std::make_shared(id, docBroker, uriPublic, 
isReadOnly);
 }
 catch (const std::exception& exc)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Util.cpp net/Socket.cpp net/Socket.hpp

2017-04-02 Thread Ashod Nakashian

 common/Util.cpp |   12 ++--
 net/Socket.cpp  |2 ++
 net/Socket.hpp  |   21 ++---
 3 files changed, 22 insertions(+), 13 deletions(-)

New commits:
commit e0822f851647b17fca3043c8f17e52ebe8090aa2
Author: Ashod Nakashian 
Date:   Sun Apr 2 17:38:05 2017 -0400

wsd: better thread affinity logging

Change-Id: I9e4bc3fe864aa409dc4874a9d6fc4ab22bfea592
Reviewed-on: https://gerrit.libreoffice.org/36029
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/common/Util.cpp b/common/Util.cpp
index 8e9552b6..3260d130 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -265,13 +265,13 @@ namespace Util
 strncpy(ThreadName, s.c_str(), 31);
 ThreadName[31] = '\0';
 if (prctl(PR_SET_NAME, reinterpret_cast(s.c_str()), 0, 
0, 0) != 0)
-{
-LOG_SYS("Cannot set thread name to " << s << ".");
-}
+LOG_SYS("Cannot set thread name of " << getThreadId() << " (0x" <<
+std::hex << std::this_thread::get_id() <<
+std::dec << ") to [" << s << "].");
 else
-{
-LOG_INF("Thread " << std::hex << std::this_thread::get_id() << 
std::dec << " is now called " << s);
-}
+LOG_INF("Thread " << getThreadId() << " (0x" <<
+std::hex << std::this_thread::get_id() <<
+std::dec << ") is now called [" << s << "].");
 }
 
 const char *getThreadName()
diff --git a/net/Socket.cpp b/net/Socket.cpp
index 39906bf7..2b9899f8 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -57,6 +57,8 @@ SocketPoll::SocketPoll(const std::string& threadName)
 }
 
 _owner = std::this_thread::get_id();
+LOG_DBG("Thread affinity of " << _name << " set to 0x" <<
+std::hex << _owner << "." << std::dec);
 }
 
 SocketPoll::~SocketPoll()
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 4d723d99..94d4cc34 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -185,7 +185,12 @@ public:
 void setThreadOwner(const std::thread::id &id)
 {
 #if ENABLE_DEBUG
-   _owner = id;
+if (id != _owner)
+{
+LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex <<
+id << " (was 0x" << _owner << ")." << std::dec);
+_owner = id;
+}
 #else
(void)id;
 #endif
@@ -196,8 +201,10 @@ public:
 #if ENABLE_DEBUG
 const bool sameThread = std::this_thread::get_id() == _owner;
 if (!sameThread)
-LOG_WRN("#" << _fd << " invoked from foreign thread. Expected: " <<
-std::hex << _owner << std::dec);
+LOG_WRN("#" << _fd << " Invoked from foreign thread. Expected: 0x" 
<< std::hex <<
+_owner << " but called from 0x" << 
std::this_thread::get_id() << " (" <<
+std::dec << Util::getThreadId() << ").");
+
 if (hard)
 return sameThread;
 else
@@ -224,12 +231,12 @@ protected:
 _sendBufferSize = DefaultSendBufferSize;
 #if ENABLE_DEBUG
 _owner = std::this_thread::get_id();
+LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex << 
_owner << "." << std::dec);
 
 const int oldSize = getSocketBufferSize();
 setSocketBufferSize(0);
 LOG_TRC("#" << _fd << ": Buffer size: " << getSendBufferSize() << " 
(was " << oldSize << ")");
 #endif
-
 }
 
 private:
@@ -291,9 +298,9 @@ public:
 bool isCorrectThread() const
 {
 if (std::this_thread::get_id() != _owner)
-LOG_WRN("Incorrect thread affinity. Expected: 0x" << std::hex << 
_owner <<
-" but called from " << std::this_thread::get_id() << 
std::dec <<
-", stop: " << _stop);
+LOG_WRN("Incorrect thread affinity for " << _name << ". Expected: 
0x" << std::hex <<
+_owner << " (" << std::dec << Util::getThreadId() << ") 
but called from 0x" <<
+std::hex << std::this_thread::get_id() << std::dec << ", 
stop: " << _stop);
 
 return _stop || std::this_thread::get_id() == _owner;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/Kit.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp

2017-04-02 Thread Ashod Nakashian

 kit/Kit.cpp|   20 +++-
 wsd/DocumentBroker.cpp |8 +---
 wsd/DocumentBroker.hpp |6 ++
 3 files changed, 26 insertions(+), 8 deletions(-)

New commits:
commit c9365ad67961aee7b4be0b23883c973c38c088e1
Author: Ashod Nakashian 
Date:   Sun Apr 2 15:55:56 2017 -0400

wsd: log the DocBroker ID in the Kit as well

This matches the document between WSD and kit,
making logs much easier to read.

Change-Id: If55a9eb84b4a22d2dc4dd53f5f6ab322ebc3646e
Reviewed-on: https://gerrit.libreoffice.org/36028
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 6131ba40..35a48673 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -445,12 +445,14 @@ public:
 Document(const std::shared_ptr& loKit,
  const std::string& jailId,
  const std::string& docKey,
+ const std::string& docId,
  const std::string& url,
  std::shared_ptr tileQueue,
  const std::shared_ptr& ws)
   : _loKit(loKit),
 _jailId(jailId),
 _docKey(docKey),
+_docId(docId),
 _url(url),
 _tileQueue(std::move(tileQueue)),
 _ws(ws),
@@ -461,7 +463,9 @@ public:
 _stop(false),
 _isLoading(0)
 {
-LOG_INF("Document ctor for url [" << _url << "] on child [" << _jailId 
<< "].");
+LOG_INF("Document ctor for [" << _docKey <<
+"] url [" << _url << "] on child [" << _jailId <<
+"] and id [" << _docId << "].");
 assert(_loKit);
 
 _callbackThread.start(*this);
@@ -469,8 +473,10 @@ public:
 
 ~Document()
 {
-LOG_INF("~Document dtor for url [" << _url << "] on child [" << 
_jailId <<
-"]. There are " << _sessions.size() << " views.");
+LOG_INF("~Document dtor for [" << _docKey <<
+"] url [" << _url << "] on child [" << _jailId <<
+"] and id [" << _docId << "]. There are " <<
+_sessions.size() << " views.");
 
 // Wait for the callback worker to finish.
 _stop = true;
@@ -1357,7 +1363,7 @@ private:
 
 void run() override
 {
-Util::setThreadName("lok_handler");
+Util::setThreadName("lokit_" + _docId);
 
 LOG_DBG("Thread started.");
 
@@ -1515,7 +1521,10 @@ private:
 private:
 std::shared_ptr _loKit;
 const std::string _jailId;
+/// URL-based key. May be repeated during the lifetime of WSD.
 const std::string _docKey;
+/// Short numerical ID. Unique during the lifetime of WSD.
+const std::string _docId;
 const std::string _url;
 std::string _jailedUrl;
 std::string _renderOpts;
@@ -1795,6 +1804,7 @@ void lokit_main(const std::string& childRoot,
 {
 const std::string& sessionId = tokens[1];
 const std::string& docKey = tokens[2];
+const std::string& docId = tokens[3];
 
 std::string url;
 URI::decode(docKey, url);
@@ -1802,7 +1812,7 @@ void lokit_main(const std::string& childRoot,
 
 if (!document)
 {
-document = std::make_shared(loKit, 
jailId, docKey, url, queue, ws);
+document = std::make_shared(loKit, 
jailId, docKey, docId, url, queue, ws);
 }
 
 // Validate and create session.
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 494f21f3..259ca5aa 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -133,6 +133,8 @@ public:
 }
 };
 
+std::atomic DocumentBroker::DocBrokerId(1);
+
 DocumentBroker::DocumentBroker(const std::string& uri,
const Poco::URI& uriPublic,
const std::string& docKey,
@@ -140,6 +142,7 @@ DocumentBroker::DocumentBroker(const std::string& uri,
 _uriOrig(uri),
 _uriPublic(uriPublic),
 _docKey(docKey),
+_docId(Util::encodeId(DocBrokerId++, 3)),
 _childRoot(childRoot),
 _cacheRoot(getCachePath(uriPublic.toString())),
 _lastSaveTime(std::chrono::steady_clock::now()),
@@ -177,8 +180,7 @@ bool DocumentBroker::isCorrectThread()
 // The inner heart of the DocumentBroker - our poll loop.
 void DocumentBroker::pollThread()
 {
-static std::atomic DocBrokerId(1);
-Util::setThreadName("docbroker_" + Util::encodeId(DocBrokerId++, 3));
+Util::setThreadName("docbroker_" + _docId);
 
 LOG_INF("Starting docBroker polling thread for docKey [" << _docKey << 
"].");
 
@@ -770,7 +772,7 @@ size_t DocumentBroker::addSession(const 
std::shared_ptr& session)
 const auto count = _sessions.size();
 
 // Request a new session from the child kit.
-const std::string aMessage = "session " + id + ' ' + _docKey;
+const std::string aMessage = "session " + id

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

2017-04-02 Thread Ashod Nakashian

 test/httpwstest.cpp |   23 +--
 1 file changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 9936ac18697887ae927830258e4c16e0c4726905
Author: Ashod Nakashian 
Date:   Sun Apr 2 14:48:59 2017 -0400

wsd: fix alertAllUsers test

Issue the fake disk space error
only after fully loading the doc.

This prevents handling the error
while loading, which terminates
the session.

Change-Id: I5acd9454b1aa9fb5d1f886fb23a76a2d808d4852
Reviewed-on: https://gerrit.libreoffice.org/36027
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 22fce917..55272f45 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -2334,28 +2334,15 @@ void HTTPWSTest::testAlertAllUsers()
 const auto testname = "alertAllUsers ";
 try
 {
-std::string docPath[2];
-std::string docURL[2];
-
-getDocumentPathAndURL("Example.odt", docPath[0], docURL[0], testname);
-getDocumentPathAndURL("hello.odt", docPath[1], docURL[1], testname);
-
-Poco::Net::HTTPRequest* request[2];
-
-for (int i = 0; i < 2; i++)
-{
-request[i] = new 
Poco::Net::HTTPRequest(Poco::Net::HTTPRequest::HTTP_GET, docURL[i]);
-}
-
 std::shared_ptr socket[4];
-for (int i = 0; i < 2; i++)
-{
-socket[i] = connectLOKit(_uri, *(request[i%2]), _response);
-sendTextFrame(socket[i], "load url=" + docURL[i%2], testname);
-}
 
+socket[0] = loadDocAndGetSocket("hello.odt", _uri, testname);
+socket[1] = loadDocAndGetSocket("Example.odt", _uri, testname);
+
+// Simulate disk full.
 sendTextFrame(socket[0], "uno .uno:fakeDiskFull", testname);
 
+// Assert that both clients get the error.
 for (int i = 0; i < 2; i++)
 {
 const std::string response = assertResponseString(socket[i], 
"error:", testname);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Caolán McNamara

 sw/inc/shellio.hxx   |4 +--
 sw/source/filter/ww8/ww8par.cxx  |   22 ++
 sw/source/filter/ww8/ww8scan.cxx |2 -
 vcl/source/gdi/gfxlink.cxx   |4 +--
 vcl/workben/fftester.cxx |   47 ---
 5 files changed, 57 insertions(+), 22 deletions(-)

New commits:
commit 74917d23782413aa0f129bcf9e6bf5a1c496d23b
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 21:05:48 2017 +0100

split up doc testing for three major variants

Change-Id: Iac1b5cb1c209ba27d185c8a7ba1e59c663553d77

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 283422710fc2..298f4c465647 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -177,13 +177,13 @@ protected:
 #define SW_STREAM_READER1
 #define SW_STORAGE_READER   2
 
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString 
&rUrl, const OUString &rFltName);
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(SvStream &rStream, 
const OUString &rFltName);
 extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream &rStream);
 
 class SW_DLLPUBLIC Reader
 {
 friend class SwReader;
-friend bool TestImportDOC(const OUString &rUrl, const OUString &rFltName);
+friend bool TestImportDOC(SvStream &rStream, const OUString &rFltName);
 friend bool TestImportRTF(SvStream &rStream);
 rtl::Reference mxTemplate;
 OUString aTemplateNm;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 108bf115eee5..f86a2c263a2d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6190,16 +6190,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL 
ImportDOC()
 return new WW8Reader;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString 
&rURL, const OUString &rFltName)
+bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName)
 {
 Reader *pReader = ImportDOC();
 
-SvFileStream aFileStream(rURL, StreamMode::READ);
 tools::SvRef xStorage;
-pReader->pStrm = &aFileStream;
+pReader->pStrm = &rStream;
 if (rFltName != "WW6")
 {
-xStorage = tools::SvRef(new SotStorage(aFileStream));
+xStorage = tools::SvRef(new SotStorage(rStream));
 pReader->pStg = xStorage.get();
 }
 pReader->SetFltName(rFltName);
@@ -6223,6 +6222,21 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL 
TestImportDOC(const OUString &rURL
 return bRet;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW8(SvStream &rStream)
+{
+return TestImportDOC(rStream, "CWW8");
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW6(SvStream &rStream)
+{
+return TestImportDOC(rStream, "CWW6");
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW2(SvStream &rStream)
+{
+return TestImportDOC(rStream, "WW6");
+}
+
 sal_uLong WW8Reader::OpenMainStream( tools::SvRef& rRef, 
sal_uInt16& rBuffSize )
 {
 sal_uLong nRet = ERR_SWG_READ_ERROR;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 3364acdf3f58..fc441fdee489 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -87,7 +87,7 @@ namespace
 const wwSprmSearcher *wwSprmParser::GetWW2SprmSearcher()
 {
 //double lock me
-// WW7- Sprms
+// WW2 Sprms
 static const SprmInfoRow aSprms[] =
 {
 {  0, { 0, L_FIX} }, // "Default-sprm", will be skipped
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 63e33e14b735..636970f6ee48 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -323,26 +323,47 @@ try_again:
 SvFileStream aFileStream(out, StreamMode::READ);
 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
 }
-else if ( (strcmp(argv[2], "doc") == 0) ||
-  (strcmp(argv[2], "ww8") == 0) ||
-  (strcmp(argv[2], "ww6") == 0) ||
-  (strcmp(argv[2], "ww2") == 0) )
+else if ((strcmp(argv[2], "doc") == 0) || (strcmp(argv[2], "ww8") 
== 0))
 {
-static WFilterCall pfnImport(nullptr);
+static FFilterCall pfnImport(nullptr);
 if (!pfnImport)
 {
 osl::Module aLibrary;
 aLibrary.loadRelative(&thisModule, "libmswordlo.so", 
SAL_LOADMODULE_LAZY);
-pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("TestImportDOC"));
+pfnImport = reinterpret_cast(
+aLibrary.getFunctionSymbol("TestImportWW8"));
+aLibrary.release();
+}
+SvFileStream aFileStream(out, StreamMode::READ);
+ret = (int) (*pfnImport)(aFileStream);
+}
+else if (strcmp(argv[2], "ww6") == 0)
+{
+static FFilterCa

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

2017-04-02 Thread Caolán McNamara

 vcl/source/gdi/gfxlink.cxx |   28 +---
 1 file changed, 9 insertions(+), 19 deletions(-)

New commits:
commit edf79cacbeaef0080588f00e90e6c1b35a70d17e
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 19:12:35 2017 +0100

SwapOutData url is always a file url

so can just use SvFileStream here and not go through ucb

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

diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 60d6493e2c71..8921aaf081f3 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -21,13 +21,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -269,22 +266,15 @@ std::shared_ptr GfxLink::GetSwapInData() const
 
 std::shared_ptr pData;
 
-std::unique_ptr xIStm(::utl::UcbStreamHelper::CreateStream( 
mpSwapOutData->maURL, StreamMode::READWRITE ));
-if( xIStm )
-{
-pData = o3tl::make_shared_array(mnSwapInDataSize);
-xIStm->ReadBytes( pData.get(), mnSwapInDataSize );
-bool bError = ( ERRCODE_NONE != xIStm->GetError() );
-sal_uInt64 const nActReadSize = xIStm->Tell();
-if (nActReadSize != mnSwapInDataSize)
-{
-bError = true;
-}
-xIStm.reset();
-
-if( bError )
-pData.reset();
-}
+SvFileStream aFileStream(mpSwapOutData->maURL, StreamMode::READWRITE);
+pData = o3tl::make_shared_array(mnSwapInDataSize);
+aFileStream.ReadBytes(pData.get(), mnSwapInDataSize);
+bool bError = (ERRCODE_NONE != aFileStream.GetError());
+sal_uInt64 const nActReadSize = aFileStream.Tell();
+if (nActReadSize != mnSwapInDataSize)
+bError = true;
+if (bError)
+pData.reset();
 return pData;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/shared/01/password_dlg.xhp |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 5469ccc6ecc354020edf0b7e7b8c1e4c0f074517
Author: Gabor Kelemen 
Date:   Fri Mar 31 00:25:08 2017 +0200

Fix one ahelp to work with multiple bookmarks

Change-Id: Ibfe212d879ad7ebc4d275e2818c8779064235634
Reviewed-on: https://gerrit.libreoffice.org/35952
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/shared/01/password_dlg.xhp 
b/source/text/shared/01/password_dlg.xhp
index 6db900501..22d483136 100644
--- a/source/text/shared/01/password_dlg.xhp
+++ b/source/text/shared/01/password_dlg.xhp
@@ -42,20 +42,16 @@
 
 
 
-
 
-Password
- Type a password. A 
password is case sensitive.
+Password
+ Type a password. A password is case 
sensitive.
+
 
 
 
-
-Confirm
+Confirm
  Re-enter the password.
- Undoing password protection
+ Undoing password protection
  To remove a password, open the document, then save 
without password.
 
  Click to show or hide the file 
sharing password options.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit d80b0c4d9452d0f9750c12c34b76b63dee32dfb8
Author: Gabor Kelemen 
Date:   Fri Mar 31 00:25:08 2017 +0200

Updated core
Project: help  5469ccc6ecc354020edf0b7e7b8c1e4c0f074517

Fix one ahelp to work with multiple bookmarks

Change-Id: Ibfe212d879ad7ebc4d275e2818c8779064235634
Reviewed-on: https://gerrit.libreoffice.org/35952
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index cf89d14c283d..5469ccc6ecc3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cf89d14c283d391bc3441f9a5e4f0c915af76706
+Subproject commit 5469ccc6ecc354020edf0b7e7b8c1e4c0f074517
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 9c5fac2f2e5cc2b49de1bd8a6280267e830d1269
Author: Gabor Kelemen 
Date:   Fri Mar 31 00:13:47 2017 +0200

Updated core
Project: help  cf89d14c283d391bc3441f9a5e4f0c915af76706

tdf#102930 Mail Merge Wizard: Drop obsolete Wizard help pages

The 6th, 7th, 8th pages of the wizard are now gone.
Usable content was moved to the new save/print/email dialogs
and to the toolbars help pages.

Change-Id: I911c86f0ab0e159ed3666e32c8d45582c23b1627
Reviewed-on: https://gerrit.libreoffice.org/35951
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 20abdd0a447e..cf89d14c283d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 20abdd0a447ec3a330326ccd84257a0af6ce6f95
+Subproject commit cf89d14c283d391bc3441f9a5e4f0c915af76706
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 AllLangHelp_swriter.mk |3 
 source/text/swriter/01/mailmerge06.xhp |   54 
 source/text/swriter/01/mailmerge07.xhp |   59 -
 source/text/swriter/01/mailmerge08.xhp |  111 -
 4 files changed, 227 deletions(-)

New commits:
commit cf89d14c283d391bc3441f9a5e4f0c915af76706
Author: Gabor Kelemen 
Date:   Fri Mar 31 00:13:47 2017 +0200

tdf#102930 Mail Merge Wizard: Drop obsolete Wizard help pages

The 6th, 7th, 8th pages of the wizard are now gone.
Usable content was moved to the new save/print/email dialogs
and to the toolbars help pages.

Change-Id: I911c86f0ab0e159ed3666e32c8d45582c23b1627
Reviewed-on: https://gerrit.libreoffice.org/35951
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index 61d27f466..cc37c7366 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -181,9 +181,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
 helpcontent2/source/text/swriter/01/mailmerge03 \
 helpcontent2/source/text/swriter/01/mailmerge04 \
 helpcontent2/source/text/swriter/01/mailmerge05 \
-helpcontent2/source/text/swriter/01/mailmerge06 \
-helpcontent2/source/text/swriter/01/mailmerge07 \
-helpcontent2/source/text/swriter/01/mailmerge08 \
 helpcontent2/source/text/swriter/01/mm_copyto \
 helpcontent2/source/text/swriter/01/mm_cusaddlis \
 helpcontent2/source/text/swriter/01/mm_cusgrelin \
diff --git a/source/text/swriter/01/mailmerge06.xhp 
b/source/text/swriter/01/mailmerge06.xhp
deleted file mode 100644
index 20a033de6..0
--- a/source/text/swriter/01/mailmerge06.xhp
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-   
-
-
-
-Mail Merge Wizard - Prepare Merge
-/text/swriter/01/mailmerge06.xhp
-
-
-UFI: Mail Merge Wizard page 6
-
-
-
-
-
-Mail Merge Wizard - 
Edit Document
-Browse through the document previews, exclude single recipients, and 
edit the main document.
-
-
-Recipient
-Enter the address record number of a recipient to 
preview the mail merge document for the recipient.
-
-
-
-
-Use the browse buttons to scroll through the address 
records.
-
-Exclude this recipient
-Excludes the current recipient from this mail 
merge.
-
-Edit Document
-Minimizes the wizard so that you can edit the main 
mail merge document for all recipients. To return to the wizard, click 
the Return to Mail Merge Wizard button.
-Mail Merge Wizard - Personalize 
document
-
-
diff --git a/source/text/swriter/01/mailmerge07.xhp 
b/source/text/swriter/01/mailmerge07.xhp
deleted file mode 100644
index 534a87478..0
--- a/source/text/swriter/01/mailmerge07.xhp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-   
-
-
-
-Mail Merge Wizard - Personalize
-/text/swriter/01/mailmerge07.xhp
-
-
-UFI: Mail Merge Wizard page 7
-
-
-
-
-
-Mail Merge Wizard - 
Personalize Document
-Edit 
documents for each recipient.
-
-The 
Mail Merge Wizard creates a single merged document with page breaks between 
each recipient. When you reach this page of the wizard, the names and the 
addresses of the recipients are contained in the document.
-
-Edit individual document
-Minimizes the wizard so that you can edit the mail 
merge document for a single recipient. After you made your changes, 
click the Return to Mail Merge Wizard button.
-
-Search for
-Enter the text that you want to search for in the 
merged document, for example, the name of a recipient.
-
-Find
-Click to start the search.
-
-Whole words only
-Searches for whole words only and not parts of larger 
words.
-
-Backwards
-Searches from the current cursor position to the top 
of the document.
-
-Match case
-Distinguishes between uppercase and lowercase 
characters in the search.
-Mail Merge Wizard - Save, print or send
-
-
diff --git a/source/text/swriter/01/mailmerge08.xhp 
b/source/text/swriter/01/mailmerge08.xhp
deleted file mode 100644
index d55a7ac71..0
--- a/source/text/swriter/01/mailmerge08.xhp
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-   
-
-
-
-Mail Merge Wizard - Save, Print & 
Send
-/text/swriter/01/mailmerge08.xhp
-
-
-UFI: Mail Merge Wizard page 8
-
-
-
-
-
-Mail Merge Wizard - 
Save, Print or Send
-Specifies the output options for mail merge documents.
-
-The 
appearance of this page depends on the option that you select. After you 
specify the settings, click Finish to exit the wizard.
-
-Save starting document
-Saves the starting document that contains the 
database fields.
-
-Save starting document
-Saves the current document.
-
-Save merged document
-Saves the merged document.
-
-Save as single document
-Saves the merged document as a single 
file.
-
-Save as individual documents
-Saves the merged document as a separate file for each 
recipient. The file names of the documents are constructed from the name that 
you enter, followed by an underscore, and the number of the current 
record.
-
-From
-Selects a range of records s

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

2017-04-02 Thread Gabor Kelemen

 AllLangHelp_swriter.mk  |1 
 source/text/shared/02/12090100.xhp  |   11 ---
 source/text/swriter/01/mm_cusaddfie.xhp |   48 
 3 files changed, 6 insertions(+), 54 deletions(-)

New commits:
commit 20abdd0a447ec3a330326ccd84257a0af6ce6f95
Author: Gabor Kelemen 
Date:   Fri Mar 31 00:11:37 2017 +0200

tdf#102930 Mail Merge Wizard: Drop duplicated page

This is the same as the mm_newaddblo.xhp file

Change-Id: Iafa9297c54042ba10a7bfff41a5ac4de13ada25d
Reviewed-on: https://gerrit.libreoffice.org/35950
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index a657fbcfb..61d27f466 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -185,7 +185,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
 helpcontent2/source/text/swriter/01/mailmerge07 \
 helpcontent2/source/text/swriter/01/mailmerge08 \
 helpcontent2/source/text/swriter/01/mm_copyto \
-helpcontent2/source/text/swriter/01/mm_cusaddfie \
 helpcontent2/source/text/swriter/01/mm_cusaddlis \
 helpcontent2/source/text/swriter/01/mm_cusgrelin \
 helpcontent2/source/text/swriter/01/mm_emabod \
diff --git a/source/text/swriter/01/mm_cusaddfie.xhp 
b/source/text/swriter/01/mm_cusaddfie.xhp
deleted file mode 100644
index c14c965f6..0
--- a/source/text/swriter/01/mm_cusaddfie.xhp
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-   
-
-
-
-New Address Block
-/text/swriter/01/mm_cusaddfie.xhp
-
-
-UFI: New Address Block dialog for mail 
merge
-
-
-
-New Address Block
-UFI: was Custom Address Field in the mockup, so wrong file 
name...Specify the placement of address data fields in an address 
block of a mail merge 
document.
-Address Elements
-Select a field and drag the field to the other 
list.
->
-Adds the selected field from the Address Elements 
list to the other list. You can add the same field more than 
once.
-<
-Removes the selected field from the other 
list.
-Drag address element to the field below
-Arrange the fields by drag-and-drop or use the arrow 
buttons.
-Preview
-Displays a preview of the first database record with 
the current address block layout.
-(Arrow Buttons)
-Select an item in the list and click an arrow button 
to move the item.
-
-
commit 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b
Author: Gabor Kelemen 
Date:   Thu Mar 30 23:57:55 2017 +0200

tdf#102930 Mail Merge Wizard: Standard Filter dialog ahelps

Appears from the Select Address List dialog, Filter button.
ahelps need to be the literal dot to work with multiple bookmarks

Change-Id: Id906881098601f49643e0298949d7bcbbd618d57
Reviewed-on: https://gerrit.libreoffice.org/35949
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/shared/02/12090100.xhp 
b/source/text/shared/02/12090100.xhp
index 9b80d0db9..4e2833962 100644
--- a/source/text/shared/02/12090100.xhp
+++ b/source/text/shared/02/12090100.xhp
@@ -29,8 +29,9 @@

 
 
+
 Standard Filter
-  Specifies the logical 
conditions to filter your table data. This dialog is available for 
spreadsheet documents, database tables and database forms. The dialog for 
databases does not contain the More Options button.
+  Specifies the logical conditions to filter your table 
data. This dialog is available for spreadsheet documents, database 
tables and database forms. The dialog for databases does not contain the 
More Options button.
   
  
   
@@ -48,7 +49,7 @@
 
 
 Operator
-  For the following 
arguments, you can choose between the logical operators AND / 
OR.
+  For the following arguments, you can choose between 
the logical operators AND / OR.
 
 
 
@@ -56,7 +57,7 @@
 
 
 Field name
-  Specifies the 
field names from the current table to set them in the argument. You 
will see the column identifiers if no text is available for the field 
names.
+  Specifies the field names from the current table to 
set them in the argument. You will see the column identifiers if no 
text is available for the field names.
 
 
 
@@ -64,7 +65,7 @@
 
 
 Condition
-  Specifies the 
comparative operators through which the entries in the 
Field name and Value fields can be 
linked.
+  Specifies the comparative 
operators through which the entries in the Field name and 
Value fields can be linked.
 
 
 
@@ -73,7 +74,7 @@
 
 Value
-  Specifies a value 
to filter the field.
+  Specifies a value to filter the 
field.
   The Value list box contains all possible values for 
the specified Field name . Choose the value to be used in the 
filter. You can also choose the - empty - or -not empty 
- entries..
   If you use the filter function in database tables or forms, then 
type the value in the Value text box to be used for 
filtering.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 02cf765edcb5afaac45ce41b1613bcfbfaafa907
Author: Gabor Kelemen 
Date:   Fri Mar 31 00:11:37 2017 +0200

Updated core
Project: help  20abdd0a447ec3a330326ccd84257a0af6ce6f95

tdf#102930 Mail Merge Wizard: Drop duplicated page

This is the same as the mm_newaddblo.xhp file

Change-Id: Iafa9297c54042ba10a7bfff41a5ac4de13ada25d
Reviewed-on: https://gerrit.libreoffice.org/35950
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 5bffaa7cecbc..20abdd0a447e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b
+Subproject commit 20abdd0a447ec3a330326ccd84257a0af6ce6f95
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit ed92b1633f9b7e04585a167e5d708164be879ade
Author: Gabor Kelemen 
Date:   Thu Mar 30 23:57:55 2017 +0200

Updated core
Project: help  5bffaa7cecbcb102764ce195be2cb5fd03de4d6b

tdf#102930 Mail Merge Wizard: Standard Filter dialog ahelps

Appears from the Select Address List dialog, Filter button.
ahelps need to be the literal dot to work with multiple bookmarks

Change-Id: Id906881098601f49643e0298949d7bcbbd618d57
Reviewed-on: https://gerrit.libreoffice.org/35949
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 9edd4f385d69..5bffaa7cecbc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9edd4f385d6968697cbff1972ee2dc941baddd7c
+Subproject commit 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit e1d05a6dbb5d4b926cb7ca6602af244ef733525b
Author: Gabor Kelemen 
Date:   Thu Mar 30 23:55:55 2017 +0200

Updated core
Project: help  9edd4f385d6968697cbff1972ee2dc941baddd7c

tdf#102930 Mail Merge Wizard: Form Letter page

A referred template has changed name

Change-Id: I750eb370e6c10b682e13d4e5b9fa46c81c6e0a51
Reviewed-on: https://gerrit.libreoffice.org/35948
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index e1e4484d95b5..9edd4f385d69 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e1e4484d95b54d7993342c199fad929fd09f2405
+Subproject commit 9edd4f385d6968697cbff1972ee2dc941baddd7c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/guide/form_letters_main.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9edd4f385d6968697cbff1972ee2dc941baddd7c
Author: Gabor Kelemen 
Date:   Thu Mar 30 23:55:55 2017 +0200

tdf#102930 Mail Merge Wizard: Form Letter page

A referred template has changed name

Change-Id: I750eb370e6c10b682e13d4e5b9fa46c81c6e0a51
Reviewed-on: https://gerrit.libreoffice.org/35948
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/guide/form_letters_main.xhp 
b/source/text/swriter/guide/form_letters_main.xhp
index dc633075d..7db1ee66b 100644
--- a/source/text/swriter/guide/form_letters_main.xhp
+++ b/source/text/swriter/guide/form_letters_main.xhp
@@ -48,7 +48,7 @@
 You see the New dialog.
  
  
-Select Business Correspondence in the 
left list, and then Modern letter in the right 
list. Click OK to close the Templates dialog, and click 
Next in the wizard.removed the next two 
paras
+Select Business Correspondence in the 
left list, and then "Modern" business letter in the 
right list. Click OK to close the Templates dialog, and click 
Next in the wizard.
  
  
 Select Letter and click Next.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/00/0406.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e1e4484d95b54d7993342c199fad929fd09f2405
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:22:43 2017 +0200

tdf#102930 Mail Merge Wizard: now available from the toolbar

Change-Id: I82305033c3ed7c47ea4abfdd0d636f007718ea72
Reviewed-on: https://gerrit.libreoffice.org/35947
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/00/0406.xhp 
b/source/text/swriter/00/0406.xhp
index 79b3e287b..58bf2452d 100644
--- a/source/text/swriter/00/0406.xhp
+++ b/source/text/swriter/00/0406.xhp
@@ -74,9 +74,9 @@
 Choose Tools - Update - All 
Charts
 
 
-Choose Tools - Mail Merge Wizard
-
-Click Mail Merge icon on the Table Data 
bar:
+Choose Tools - Mail Merge Wizard
+Click the Mail Merge icon on the Mail 
Merge bar:
+Click the Mail Merge icon on the Table 
Data bar:
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit d5af070ebf625ca8d0a01338c822fc1e630e343b
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:22:43 2017 +0200

Updated core
Project: help  e1e4484d95b54d7993342c199fad929fd09f2405

tdf#102930 Mail Merge Wizard: now available from the toolbar

Change-Id: I82305033c3ed7c47ea4abfdd0d636f007718ea72
Reviewed-on: https://gerrit.libreoffice.org/35947
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 20cb80d65291..e1e4484d95b5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 20cb80d652911121c3c9ad24eaa635a18e3293a0
+Subproject commit e1e4484d95b54d7993342c199fad929fd09f2405
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/main0200.xhp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 20cb80d652911121c3c9ad24eaa635a18e3293a0
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:21:23 2017 +0200

tdf#102930 Mail Merge Wizard: Update Toolbars page

Add Mail Merge Toolbar to the list of toolbars

Change-Id: I1b8ade2800b882ac1a132f78de5a40a10a2a07c1
Reviewed-on: https://gerrit.libreoffice.org/35946
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/main0200.xhp b/source/text/swriter/main0200.xhp
index 8c2d7da6f..4ae5d136a 100644
--- a/source/text/swriter/main0200.xhp
+++ b/source/text/swriter/main0200.xhp
@@ -85,6 +85,9 @@
 
 
 
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit d005d988edd6d9841085ce8b87887377c05a6003
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:21:23 2017 +0200

Updated core
Project: help  20cb80d652911121c3c9ad24eaa635a18e3293a0

tdf#102930 Mail Merge Wizard: Update Toolbars page

Add Mail Merge Toolbar to the list of toolbars

Change-Id: I1b8ade2800b882ac1a132f78de5a40a10a2a07c1
Reviewed-on: https://gerrit.libreoffice.org/35946
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index dd10747d1e91..20cb80d65291 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd10747d1e916283958261d640758df40be1341f
+Subproject commit 20cb80d652911121c3c9ad24eaa635a18e3293a0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mm_seladdlis.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dd10747d1e916283958261d640758df40be1341f
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:19:45 2017 +0200

tdf#102930 Mail Merge Wizard: Select Address List window

Add missin ahelp, drop old comment

Change-Id: I4451b922ef6e980afed1089023e61300a5fc94ce
Reviewed-on: https://gerrit.libreoffice.org/35945
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_seladdlis.xhp 
b/source/text/swriter/01/mm_seladdlis.xhp
index 0ebfc27f7..7bf4747cf 100644
--- a/source/text/swriter/01/mm_seladdlis.xhp
+++ b/source/text/swriter/01/mm_seladdlis.xhp
@@ -30,9 +30,9 @@
 
 
 
-ufi: added help id for the table 
control, else the Help button does not work
+
 Select Address List
-Select the address list that you want to use for mail merge, then click 
OK.
+Select the address list that you want to use for 
mail merge, then click 
OK.
 
 Add
 Select the database file that contains the addresses 
that you want to use as an address list. If the file contains more than 
one table, the Select Table 
dialog opens.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit a7b916d848c5cb1652a80ecc31b92e046db8dcc0
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:19:45 2017 +0200

Updated core
Project: help  dd10747d1e916283958261d640758df40be1341f

tdf#102930 Mail Merge Wizard: Select Address List window

Add missin ahelp, drop old comment

Change-Id: I4451b922ef6e980afed1089023e61300a5fc94ce
Reviewed-on: https://gerrit.libreoffice.org/35945
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 4164e519b7b4..dd10747d1e91 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4164e519b7b4008de321da83e3e30c22576a603b
+Subproject commit dd10747d1e916283958261d640758df40be1341f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 8f74029f92cd16a5e0b73be71930974801ee4087
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:16:28 2017 +0200

Updated core
Project: help  4164e519b7b4008de321da83e3e30c22576a603b

tdf#102930 Mail Merge Wizard: Select Address Block dialog

Sync to current UI, add missing ahelp

Change-Id: Icb4b25c0787fc157ed7506597999297e312341a9
Reviewed-on: https://gerrit.libreoffice.org/35944
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 816cf63ac88d..4164e519b7b4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 816cf63ac88d263220b33db62cdd94d044f9cc9d
+Subproject commit 4164e519b7b4008de321da83e3e30c22576a603b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mm_seladdblo.xhp |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 4164e519b7b4008de321da83e3e30c22576a603b
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:16:28 2017 +0200

tdf#102930 Mail Merge Wizard: Select Address Block dialog

Sync to current UI, add missing ahelp

Change-Id: Icb4b25c0787fc157ed7506597999297e312341a9
Reviewed-on: https://gerrit.libreoffice.org/35944
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_seladdblo.xhp 
b/source/text/swriter/01/mm_seladdblo.xhp
index a32840138..12b2818d7 100644
--- a/source/text/swriter/01/mm_seladdblo.xhp
+++ b/source/text/swriter/01/mm_seladdblo.xhp
@@ -32,26 +32,35 @@
 
 
 Select Address Block
-Select, edit, or delete an address block layout for mail merge.
-Select the address block which you want to use
+Select, edit, or delete an address block layout for 
mail 
merge.
+
+
+Select your preferred address block
 Select the block in the list that you want to use for 
mail merge addresses, and click OK.
-
+
+
 Never include country/region
 Excludes country or regional information from the 
address block.
+
 
 Always include country/region
 Includes country or regional information in the 
address block.
+
 
 Only include country/region if it is not:
 Only includes country or regional information in the 
address block if the value differs from the value that you enter in the text 
box.
+
 
 Enter the country/region string that shall not be 
printed.
+
 
 New
 Opens the New Address Block dialog where 
you can define a new address block layout.
+
 
 Edit
-Opens the New Address Block dialog where 
you can edit the selected address block layout.
+Opens the Edit Address Block dialog where 
you can edit the selected address block layout.
+
 
 Delete
 Deletes the selected address block 
layout.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mm_newaddlis.xhp |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 816cf63ac88d263220b33db62cdd94d044f9cc9d
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:14:41 2017 +0200

tdf#102930 Mail Merge Wizard: New Address List dialog

Add missing bookmarks and ahelp

Change-Id: I12ba0d1cf080819cb89bcbe668a1034cdb17fb36
Reviewed-on: https://gerrit.libreoffice.org/35943
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_newaddlis.xhp 
b/source/text/swriter/01/mm_newaddlis.xhp
index 87b926ff3..7b058c220 100644
--- a/source/text/swriter/01/mm_newaddlis.xhp
+++ b/source/text/swriter/01/mm_newaddlis.xhp
@@ -32,17 +32,33 @@
 
 
 New Address List
-Enter new addresses or edit the addresses for mail merge documents. When you 
click OK, a dialog prompts you for the location to save the 
address list.
+Enter new addresses or edit the addresses for mail merge documents. 
When you click OK, a dialog prompts you for the location to save 
the address list.
+
+
 Address Information
 Enter or edit the field contents for each mail merge 
recipient.
+
+
+
+
+
+
 Show Entry Number
 Click the buttons to navigate through the records or 
enter a record number to display a record.
+
+
 New
 Adds a new blank record to the address 
list.
+
+
 Delete
 Deletes the selected record.
+
+
 Find
 Opens the Find Entry dialog. You can leave 
the dialog open while you edit the entries.
+
+
 Customize
 Opens the Customize Address List dialog 
where you can rearrange, rename, add, and delete fields.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 82c97a22a95d5885922607ab1dec0431501068ae
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:14:41 2017 +0200

Updated core
Project: help  816cf63ac88d263220b33db62cdd94d044f9cc9d

tdf#102930 Mail Merge Wizard: New Address List dialog

Add missing bookmarks and ahelp

Change-Id: I12ba0d1cf080819cb89bcbe668a1034cdb17fb36
Reviewed-on: https://gerrit.libreoffice.org/35943
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index c891d9d6469d..816cf63ac88d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c891d9d6469d04a68ebc06a0a772244f1aacecc9
+Subproject commit 816cf63ac88d263220b33db62cdd94d044f9cc9d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 912783cc8440acbfeaef7b5ec40c3d5ce699b298
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:08:17 2017 +0200

Updated core
Project: help  c891d9d6469d04a68ebc06a0a772244f1aacecc9

tdf#102930 Mail Merge Wizard help: Match Field window

Sync with current UI, add bookmarks

Change-Id: I728668d4d11cf368a7bed46b6c680dc44731ccbd
Reviewed-on: https://gerrit.libreoffice.org/35942
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index b52dc2fc13f3..c891d9d6469d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b52dc2fc13f392ee22b81f9ce76001a76a51c2e8
+Subproject commit c891d9d6469d04a68ebc06a0a772244f1aacecc9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mm_emabod.xhp |   18 +-
 source/text/swriter/01/mm_matfie.xhp |   12 
 2 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit c891d9d6469d04a68ebc06a0a772244f1aacecc9
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:08:17 2017 +0200

tdf#102930 Mail Merge Wizard help: Match Field window

Sync with current UI, add bookmarks

Change-Id: I728668d4d11cf368a7bed46b6c680dc44731ccbd
Reviewed-on: https://gerrit.libreoffice.org/35942
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_matfie.xhp 
b/source/text/swriter/01/mm_matfie.xhp
index b1f956a41..fdb50a084 100644
--- a/source/text/swriter/01/mm_matfie.xhp
+++ b/source/text/swriter/01/mm_matfie.xhp
@@ -32,10 +32,14 @@
 
 
 Match Fields
-Matches the logical field names of the layout dialog to the field 
names in your database when you create new address blocks or salutations.
-Matches to:
-Select a field name in your database for each logical 
field element.
-Preview
+Matches the logical field names of the layout dialog 
to the field names in your database when you create new address blocks or salutations.
+
+
+Matches to field:
+Select a field name in your database for each logical 
address element.
+
+
+Address block preview
 Displays a preview of the values of the first data 
record.
 
 
commit b52dc2fc13f392ee22b81f9ce76001a76a51c2e8
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:06:39 2017 +0200

tdf#102930 Mail Merge Wizard: fix E-mail Message window page

Add missing bookmarks and ahelp

Change-Id: I1341200f32e586303b693494c2e45067457e760c
Reviewed-on: https://gerrit.libreoffice.org/35941
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_emabod.xhp 
b/source/text/swriter/01/mm_emabod.xhp
index 71c76fe15..33562ab33 100644
--- a/source/text/swriter/01/mm_emabod.xhp
+++ b/source/text/swriter/01/mm_emabod.xhp
@@ -32,32 +32,32 @@
 
 
 E-Mail Message
-Type 
the message and the salutation for files that you send as e-mail attachments.
+Type the message and the salutation for files that 
you send as e-mail 
attachments.
 
 This e-mail should contain a salutation
 Adds a salutation to the e-mail.
-
+
 Insert personalized salutation
 Adds a personalized salutation. To use the default 
salutation, clear this check box.
-
+
 Female
 Select the personalized greeting for a female 
recipient.
-
+
 New
 Opens the Custom Salutation dialog for a 
female recipient.
-
+
 Male
 Select the personalized greeting for a male 
recipient.
-
+
 New
 Opens the Custom Salutation dialog for a 
male recipient.
-
+
 Field name
 Select the field name of the address database field 
that contains the gender information.
-
+
 Field value
 Select the field value that indicates the gender of 
the recipient.
-
+
 General salutation
 Select the default greeting to use if a personalized 
salutation cannot be created.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 6a2472d59d71a483ffd4a61e89033879294f9336
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:06:39 2017 +0200

Updated core
Project: help  b52dc2fc13f392ee22b81f9ce76001a76a51c2e8

tdf#102930 Mail Merge Wizard: fix E-mail Message window page

Add missing bookmarks and ahelp

Change-Id: I1341200f32e586303b693494c2e45067457e760c
Reviewed-on: https://gerrit.libreoffice.org/35941
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index c9e5b786f194..b52dc2fc13f3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc
+Subproject commit b52dc2fc13f392ee22b81f9ce76001a76a51c2e8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mm_finent.xhp |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:05:43 2017 +0200

tdf#102930 Mail Merge Wizard help: Find Entry dialog

Add missing bookmarks and ahelps

Change-Id: Ib70d18f137060a5f13863c32be3a629509a24808
Reviewed-on: https://gerrit.libreoffice.org/35940
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_finent.xhp 
b/source/text/swriter/01/mm_finent.xhp
index 003eb32bb..7e15ce775 100644
--- a/source/text/swriter/01/mm_finent.xhp
+++ b/source/text/swriter/01/mm_finent.xhp
@@ -30,13 +30,22 @@
 
 
 
+
 Find Entry
-Searches for a record or recipient in the mail merge address 
list.
+Searches for a record or recipient in the mail merge address 
list.
+
+
 Find
 Enter the search term.
+
+
 Find only in
 Restricts the search to one data field. 

-Select the data field where you want to search for the 
text.
+
+
+Select the data field where you want to search for 
the text.
+
+
 Find
 Displays the next record that contains the search 
text.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 2fa96b5bf5865f38629c6b541a50bb161d68ed46
Author: Gabor Kelemen 
Date:   Thu Mar 30 22:05:43 2017 +0200

Updated core
Project: help  c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc

tdf#102930 Mail Merge Wizard help: Find Entry dialog

Add missing bookmarks and ahelps

Change-Id: Ib70d18f137060a5f13863c32be3a629509a24808
Reviewed-on: https://gerrit.libreoffice.org/35940
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 05690a67949a..c9e5b786f194 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 05690a67949aafbe69949226a26834a3a55c51df
+Subproject commit c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit c0e25869f249b2fca27dc690051479e00881bcb3
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:12:26 2017 +0200

Updated core
Project: help  05690a67949aafbe69949226a26834a3a55c51df

tdf#102930 Mail Merge Wizard help: Custom Address List page

Add missing bookmarks

Change-Id: Id1a0a49bb7fc20a491f12cf344b5c22a45d6bc02
Reviewed-on: https://gerrit.libreoffice.org/35939
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index ca3d69f1840b..05690a67949a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ca3d69f1840b71b899c0ab8b1671f314b799eeae
+Subproject commit 05690a67949aafbe69949226a26834a3a55c51df
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mm_cusaddlis.xhp |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 05690a67949aafbe69949226a26834a3a55c51df
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:12:26 2017 +0200

tdf#102930 Mail Merge Wizard help: Custom Address List page

Add missing bookmarks

Change-Id: Id1a0a49bb7fc20a491f12cf344b5c22a45d6bc02
Reviewed-on: https://gerrit.libreoffice.org/35939
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_cusaddlis.xhp 
b/source/text/swriter/01/mm_cusaddlis.xhp
index d82a19c5c..fb89f8882 100644
--- a/source/text/swriter/01/mm_cusaddlis.xhp
+++ b/source/text/swriter/01/mm_cusaddlis.xhp
@@ -30,15 +30,24 @@
 
 
 
+
 Customize Address List
 Customizes the address list for mail merge documents.
+
+
 Address list elements
 Select the fields that you want to move, delete, or 
rename.
 
+
+
 Add
 Inserts a new text field.
+
+
 Delete
 Deletes the selected field.
+
+
 Rename
 Renames the selected text field.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mm_copyto.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca3d69f1840b71b899c0ab8b1671f314b799eeae
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:05:29 2017 +0200

tdf#102930 Update link on Mail Merge - Copy To window page

That functionality is described on a new page now

Change-Id: Id0a7b3905f8382f937e244e075d71f6a9bb97fb5
Reviewed-on: https://gerrit.libreoffice.org/35938
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mm_copyto.xhp 
b/source/text/swriter/01/mm_copyto.xhp
index 939c5f1f2..752ab8812 100644
--- a/source/text/swriter/01/mm_copyto.xhp
+++ b/source/text/swriter/01/mm_copyto.xhp
@@ -32,7 +32,7 @@
 
 
 Copy To
-Specify additional e-mail recipients for the mail merge document.
+Specify additional e-mail recipients for the mail merge 
document.
 
 CC
 Enter the recipients of e-mail copies, separated by a 
semicolon (;).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 0ce151b16475bea31ce01ab83f1dedf78b5af5f6
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:05:29 2017 +0200

Updated core
Project: help  ca3d69f1840b71b899c0ab8b1671f314b799eeae

tdf#102930 Update link on Mail Merge - Copy To window page

That functionality is described on a new page now

Change-Id: Id0a7b3905f8382f937e244e075d71f6a9bb97fb5
Reviewed-on: https://gerrit.libreoffice.org/35938
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index f819eb227c33..ca3d69f1840b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f819eb227c337fc59416649218be6354d287de37
+Subproject commit ca3d69f1840b71b899c0ab8b1671f314b799eeae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 4494a6318f3f90f2faa854d5e4298f7a65a95c3c
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:04:01 2017 +0200

Updated core
Project: help  f819eb227c337fc59416649218be6354d287de37

tdf#102930 Update Mail Merge Wizard Page 5 help

Sync to current UI, improve readability

Change-Id: Ib756f8998ed88a63b8f2927677638dd6110a86f4
Reviewed-on: https://gerrit.libreoffice.org/35937
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index a5b29c05af7c..f819eb227c33 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a5b29c05af7c8cc038f953bda2995f8d99be5e04
+Subproject commit f819eb227c337fc59416649218be6354d287de37
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit dca0372ac1eb5e80961d51a8376fdfb8c6958a57
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:02:47 2017 +0200

Updated core
Project: help  a5b29c05af7c8cc038f953bda2995f8d99be5e04

tdf#102930 Update Mail Merge Wizard Page 4 help

Add missing bookmarks, improve readability

Change-Id: If8f2afcfb049d01beceb788dc4beb21dbfcb6032
Reviewed-on: https://gerrit.libreoffice.org/35936
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 854375b6e711..a5b29c05af7c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 854375b6e711cd114e537215b55c6bfdd8d654b0
+Subproject commit a5b29c05af7c8cc038f953bda2995f8d99be5e04
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mailmerge04.xhp |   27 ---
 source/text/swriter/01/mailmerge05.xhp |   33 ++---
 2 files changed, 38 insertions(+), 22 deletions(-)

New commits:
commit f819eb227c337fc59416649218be6354d287de37
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:04:01 2017 +0200

tdf#102930 Update Mail Merge Wizard Page 5 help

Sync to current UI, improve readability

Change-Id: Ib756f8998ed88a63b8f2927677638dd6110a86f4
Reviewed-on: https://gerrit.libreoffice.org/35937
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mailmerge05.xhp 
b/source/text/swriter/01/mailmerge05.xhp
index 441b7a459..6ea99d0dd 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.xhp
@@ -22,7 +22,7 @@
 
 
 
-Mail Merge Wizard - Layout
+Mail Merge Wizard - Adjust Layout
 /text/swriter/01/mailmerge05.xhp
 
 
@@ -32,28 +32,39 @@
 
 
 
-Mail Merge Wizard - 
Adjust Layout
+Mail Merge Wizard - 
Adjust layout
 Specify the position of the address blocks and 
salutations on the documents.
 
+Address 
Block Position
+
+From top
+Enter the amount of space to leave between the top 
edge of the page and the top edge of the address block.
 
-Align to text body
+Align to text body
 Aligns the frame that contains the address block to 
the left page margin.
 
-From left
+From left
 Enter the amount of space to leave between the left 
edge of the page and the left edge of the address block.
-
-From top
-Enter the amount of space to leave between the top 
edge of the page and the top edge of the address block.
+Salutation Position
 
-Up
+Up
 Moves the salutation up.
 
-Down
+Down
 Moves the salutation down.
+
+
+Preview area
+Provides a preview of the salutation positioning on 
the page.
+
 
-Zoom
+Zoom
 Select a magnification for the print 
preview.
 Use 
the commands in the context menu of the preview to move the view up and 
down.
-Mail Merge Wizard - Edit document
+Press the 
Finish button and use the Mail Merge Toolbar to finish 
the mail merge process.
+
 
+
+Mail Merge Wizard 
overview
+
 
commit a5b29c05af7c8cc038f953bda2995f8d99be5e04
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:02:47 2017 +0200

tdf#102930 Update Mail Merge Wizard Page 4 help

Add missing bookmarks, improve readability

Change-Id: If8f2afcfb049d01beceb788dc4beb21dbfcb6032
Reviewed-on: https://gerrit.libreoffice.org/35936
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mailmerge04.xhp 
b/source/text/swriter/01/mailmerge04.xhp
index 7f7e14c94..0803df5a5 100644
--- a/source/text/swriter/01/mailmerge04.xhp
+++ b/source/text/swriter/01/mailmerge04.xhp
@@ -32,36 +32,37 @@
 
 
 
-Mail Merge Wizard - 
Create a Salutation
-Specify the properties for the salutation. If the 
mail merge database contains gender information, you can specify different 
salutations based on the gender of the recipient.
+Mail Merge Wizard - 
Create salutation
+Specify the properties for the salutation. If 
the mail merge database contains gender information, you can specify different 
salutations based on the gender of the recipient.
 
 
 This document should contain a salutation
 Adds a salutation.
-
+
 Insert personalized salutation
 Adds a personalized salutation to the mail merge 
document. To use the default salutation, clear this check 
box.
-
+
 Female
 Select the personalized greeting for a female 
recipient.
-
+
 New
 Opens the Custom Salutation (Female 
recipient) dialog.
-
+
 Male
 Select the personalized greeting for a male 
recipient.
-
+
 New
 Opens the Custom Salutation (Male 
recipient) dialog.
-
+
 Field name
 Select the field name of the address database field 
that contains the gender information.
-
+
 Field value
 Select the field value that indicates the gender of 
the recipient.
-
+
 General salutation
 Select the default salutation that is used when you 
do not specify a personalized salutation.
+
 Preview
 Displays a preview of the 
salutation.
 
@@ -71,6 +72,10 @@
 
 (Browse buttons)
 Use the browse buttons to preview the information 
from the previous or next data record.
-Mail Merge Wizard - Adjust layout
+Next 
step: Mail Merge Wizard - Adjust layout
+Alternatively 
you can press the Finish button and use the Mail Merge Toolbar to finish 
the mail merge process.
+
+Mail Merge Wizard 
overview
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mailmerge02.xhp |   11 +++
 source/text/swriter/01/mailmerge03.xhp |   17 -
 2 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 854375b6e711cd114e537215b55c6bfdd8d654b0
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:01:02 2017 +0200

tdf#102930 Update Mail Merge Wizard Page 3 help

Sync to current UI, improve readability

Change-Id: I03807f06cc2dc99aa4999bad94ebbe3c81c356d3
Reviewed-on: https://gerrit.libreoffice.org/35935
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mailmerge03.xhp 
b/source/text/swriter/01/mailmerge03.xhp
index 36326ffd9..2f408bf28 100644
--- a/source/text/swriter/01/mailmerge03.xhp
+++ b/source/text/swriter/01/mailmerge03.xhp
@@ -33,17 +33,18 @@
 
 
 Mail Merge Wizard - 
Addresses
-Specify the recipients for the mail merge document as well as the 
layout of the address block.
+Specify the recipients for the mail merge document as 
well as the layout of the address block.
 
-The Mail 
Merge wizard opens to this page if you start the wizard in a text document that 
already contains address database fields. If the wizard opens directly to this 
page, the Select address list button is called Select 
different address list.
-The title 
of this page is Address block for letters and Address 
list for e-mail messages.
+The Mail 
Merge wizard opens to this page if you start the wizard in a text document that 
already contains address database fields. If the wizard opens directly to this 
page, the Select Address List button is called Select 
Different Address List.
+The title 
of this page is Insert address block for letters and Select 
address list for e-mail messages.
 
-Select address list
+Select Address List
 Opens the Select Address List dialog, 
where you can choose a data source for the addresses, add new addresses, or 
type in a new address list.
 When 
you edit some records in a Calc spreadsheet data source that is currently in 
use for a mail merge, those changes are not visible in the mail 
merge.ufi: see i9899
 
 This document shall contain an address block
 Adds an address block to the mail merge 
document.
+
 Select the address block layout that you want to 
use.
 
 Suppress lines with just empty fields
@@ -54,10 +55,16 @@
 
 Match fields
 Opens the Match Fields 
dialog.
+
+Shows a preview of the address block template filled with 
data.
 
 
 (Browse buttons)
 Use the browse buttons to preview the information 
from the previous or next data record.
-Mail Merge Wizard - Create a 
salutation
+Next 
step: Mail Merge Wizard - Create salutation
+Alternatively 
you can press the Finish button and use the Mail Merge Toolbar to finish 
the mail merge process.
+
+Mail Merge Wizard 
overview
+
 
 
commit dd49e9fa8338f442e30fc78afea7cac0e8831540
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:00:02 2017 +0200

tdf#102930 Update Mail Merge Wizard Page 2 help

Sync to current UI

Change-Id: I390c0676d07b543e7c6ee56c5046e4aa0be55549
Reviewed-on: https://gerrit.libreoffice.org/35934
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mailmerge02.xhp 
b/source/text/swriter/01/mailmerge02.xhp
index 4dfe070ac..bbe2fac26 100644
--- a/source/text/swriter/01/mailmerge02.xhp
+++ b/source/text/swriter/01/mailmerge02.xhp
@@ -24,20 +24,23 @@

 
 
-Mail Merge Wizard - Document Type
+Mail Merge Wizard - Select document 
type
 /text/swriter/01/mailmerge02.xhp
 
 
 
 
 
-Mail Merge Wizard - 
Document Type
-Specify the type of mail merge document to create. 
+Mail Merge Wizard - 
Select document type
+Specify the type of mail merge document to 
create.
 
 Letter
 Creates a printable mail merge 
document.
 E-mail message
 Creates mail merge documents that 
you can send as an e-mail message or an e-mail attachment.
-Mail Merge Wizard - Addresses
+Next 
step: Mail Merge Wizard - Addresses
+
+Mail Merge Wizard 
overview
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 307064696e8330a6dd102b509ef65db31137efca
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:00:02 2017 +0200

Updated core
Project: help  dd49e9fa8338f442e30fc78afea7cac0e8831540

tdf#102930 Update Mail Merge Wizard Page 2 help

Sync to current UI

Change-Id: I390c0676d07b543e7c6ee56c5046e4aa0be55549
Reviewed-on: https://gerrit.libreoffice.org/35934
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 2c3f721d7dd1..dd49e9fa8338 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2c3f721d7dd152efbe6261ea697643c84ce11b12
+Subproject commit dd49e9fa8338f442e30fc78afea7cac0e8831540
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit cd4de872c4afc7196b594b30aa7971c0c6527514
Author: Gabor Kelemen 
Date:   Thu Mar 30 21:01:02 2017 +0200

Updated core
Project: help  854375b6e711cd114e537215b55c6bfdd8d654b0

tdf#102930 Update Mail Merge Wizard Page 3 help

Sync to current UI, improve readability

Change-Id: I03807f06cc2dc99aa4999bad94ebbe3c81c356d3
Reviewed-on: https://gerrit.libreoffice.org/35935
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index dd49e9fa8338..854375b6e711 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd49e9fa8338f442e30fc78afea7cac0e8831540
+Subproject commit 854375b6e711cd114e537215b55c6bfdd8d654b0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 93216a173efa93fe1aaf8d6a570e01d044f8792e
Author: Gabor Kelemen 
Date:   Thu Mar 30 20:57:18 2017 +0200

Updated core
Project: help  2c3f721d7dd152efbe6261ea697643c84ce11b12

tdf#102930 Update Mail Merge Wizard Page 1 help

Sync to current UI

Change-Id: Id53cae534a152ab68df9bf02ed5bebfe4d26b139
Reviewed-on: https://gerrit.libreoffice.org/35933
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 5ebea3473f90..2c3f721d7dd1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5ebea3473f90837a9e3293f7173497caf8f9a7ee
+Subproject commit 2c3f721d7dd152efbe6261ea697643c84ce11b12
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mailmerge01.xhp |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 2c3f721d7dd152efbe6261ea697643c84ce11b12
Author: Gabor Kelemen 
Date:   Thu Mar 30 20:57:18 2017 +0200

tdf#102930 Update Mail Merge Wizard Page 1 help

Sync to current UI

Change-Id: Id53cae534a152ab68df9bf02ed5bebfe4d26b139
Reviewed-on: https://gerrit.libreoffice.org/35933
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mailmerge01.xhp 
b/source/text/swriter/01/mailmerge01.xhp
index 28b879ed1..27dc765f2 100644
--- a/source/text/swriter/01/mailmerge01.xhp
+++ b/source/text/swriter/01/mailmerge01.xhp
@@ -22,7 +22,7 @@
 
 
 
-Mail Merge Wizard - Starting Document
+Mail Merge Wizard - Select starting 
Document
 /text/swriter/01/mailmerge01.xhp
 
 
@@ -32,8 +32,8 @@
 
 
 
-Mail Merge Wizard - 
Starting Document
-Specify the document that you want to use as a base for the mail 
merge document.
+Mail Merge Wizard - 
Select starting document
+Specify the document that you want to use as a base 
for the mail merge document.
 
 
 Use the current document
@@ -52,12 +52,15 @@
 Select the template that you want to create your mail 
merge document with.
 
 Browse
-Opens the Templates and Documents 
dialog.
+Opens a template selector dialog.
 
 Start from a recently saved starting document
 Use an existing mail merge document as the base for a 
new mail merge document.
 
 Select the document.
-Mail Merge Wizard - Document type
+Next 
step: Mail Merge Wizard - Select document type
+
+Mail Merge Wizard 
overview
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit d92c650b5a7b8499cf80386230e626ca64889a88
Author: Gabor Kelemen 
Date:   Thu Mar 30 20:18:08 2017 +0200

Updated core
Project: help  5ebea3473f90837a9e3293f7173497caf8f9a7ee

tdf#102930 Add new pages for Mail Merge rewamp

Add new pages for the Mail Merge toolbar, Save merged document,
Print merged document, E-Mail merged document windows.
Content is mostly salvaged from mailmerge06-07-08 pages.

Change-Id: I423df1bb358ce1a2d2ac63c8fd2b6e289f0ae7b8
Reviewed-on: https://gerrit.libreoffice.org/35932
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 7f8eec4aea12..5ebea3473f90 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7f8eec4aea1271f18ba55c771a8d81171ebbba48
+Subproject commit 5ebea3473f90837a9e3293f7173497caf8f9a7ee
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 AllLangHelp_swriter.mk   |4 +
 source/text/swriter/01/mm_emailmergeddoc.xhp |   89 +++
 source/text/swriter/01/mm_printmergeddoc.xhp |   71 +
 source/text/swriter/01/mm_savemergeddoc.xhp  |   65 +++
 source/text/swriter/mailmergetoolbar.xhp |   68 
 5 files changed, 297 insertions(+)

New commits:
commit 5ebea3473f90837a9e3293f7173497caf8f9a7ee
Author: Gabor Kelemen 
Date:   Thu Mar 30 20:18:08 2017 +0200

tdf#102930 Add new pages for Mail Merge rewamp

Add new pages for the Mail Merge toolbar, Save merged document,
Print merged document, E-Mail merged document windows.
Content is mostly salvaged from mailmerge06-07-08 pages.

Change-Id: I423df1bb358ce1a2d2ac63c8fd2b6e289f0ae7b8
Reviewed-on: https://gerrit.libreoffice.org/35932
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index abdf488e8..a657fbcfb 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -189,10 +189,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
 helpcontent2/source/text/swriter/01/mm_cusaddlis \
 helpcontent2/source/text/swriter/01/mm_cusgrelin \
 helpcontent2/source/text/swriter/01/mm_emabod \
+helpcontent2/source/text/swriter/01/mm_emailmergeddoc \
 helpcontent2/source/text/swriter/01/mm_finent \
 helpcontent2/source/text/swriter/01/mm_matfie \
 helpcontent2/source/text/swriter/01/mm_newaddblo \
 helpcontent2/source/text/swriter/01/mm_newaddlis \
+helpcontent2/source/text/swriter/01/mm_printmergeddoc \
+helpcontent2/source/text/swriter/01/mm_savemergeddoc \
 helpcontent2/source/text/swriter/01/mm_seladdblo \
 helpcontent2/source/text/swriter/01/mm_seladdlis \
 helpcontent2/source/text/swriter/01/mm_seltab \
@@ -412,6 +415,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
 helpcontent2/source/text/swriter/menu/insert_header_footer \
 helpcontent2/source/text/swriter/menu/insert_footnote_endnote \
 helpcontent2/source/text/swriter/menu/insert_frame \
+helpcontent2/source/text/swriter/mailmergetoolbar \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/source/text/swriter/01/mm_emailmergeddoc.xhp 
b/source/text/swriter/01/mm_emailmergeddoc.xhp
new file mode 100644
index 0..387ee4602
--- /dev/null
+++ b/source/text/swriter/01/mm_emailmergeddoc.xhp
@@ -0,0 +1,89 @@
+
+
+
+
+
+  
+Send merged document as e-mail
+/text/swriter/01/mm_emailmergeddoc.xhp
+  
+
+
+
+
+
+
+
+
+Send merged 
document as e-mail
+Sends the mail merge output as e-mail messages 
to all or some recipients.
+
+
+E-mail 
options
+
+
+To
+Select the database field that contains the e-mail address of the 
recipient.
+
+
+Copy 
to
+Opens the Copy To 
dialog where you can specify one or more CC or BCC 
addresses.
+
+
+Subject
+Enter the subject line for the e-mail messages.
+
+
+Send 
as
+Select the mail format for the e-mail messages.
+The Plain text and 
HTML message formats are sent in the body of the message, whereas the *.odt, 
*.doc, and *.pdf formats are sent as attachments.
+
+
+Properties
+Opens the E-Mail 
Message dialog where you can enter the e-mail message for the mail merge 
files that are sent as attachments.
+
+
+Name of 
the attachment
+Shows the name of the attachment.
+
+Send 
records
+
+
+Send 
all documents
+Select to send e-mails to all recipients.
+
+
+
+From
+Selects a range of records starting at the record number in the 
From box and ending at the record number in the To 
box.
+
+
+From
+Enter the number of the first record to include in the mail 
merge.
+
+
+To
+Enter the number of the last record to include in the mail 
merge.
+
+
+Send 
Documents
+Click to start sending e-mails.
+
+
+
diff --git a/source/text/swriter/01/mm_printmergeddoc.xhp 
b/source/text/swriter/01/mm_printmergeddoc.xhp
new file mode 100644
index 0..f22fee7bd
--- /dev/null
+++ b/source/text/swriter/01/mm_printmergeddoc.xhp
@@ -0,0 +1,71 @@
+
+
+
+
+
+  
+Print merged document
+/text/swriter/01/mm_printmergeddoc.xhp
+  
+
+
+
+
+
+
+
+
+Print 
merged document
+Prints the mail merge output for all or some 
recipients.
+
+
+Printer 
options
+
+Printer
+Select the printer.
+
+
+Properties
+Changes the printer properties.
+
+Print 
records
+
+Print 
all documents
+Prints documents for all recipients.
+
+
+From
+Selects a range of records starting at the record number in the 
From box and ending at the record number in the To 
box.
+
+
+From
+Enter the number of the first record to include in the mail 
merge.
+
+
+To
+Enter the number of the last record to include in the mail 
merge.
+
+
+Print 
Documents
+Prints the mail merge documents.
+
+
+
+
+
diff --git a/source/text/swriter/01/mm_savemergeddoc.xhp 
b/source/text/swriter/01/mm_savemergeddoc.xhp
new file mode 100644
index 0..3451bb256
--- /dev/null
+++ b/source/text/swriter/01/mm_s

[Libreoffice-commits] core.git: helpcontent2

2017-04-02 Thread Gabor Kelemen

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

New commits:
commit 0e8a9efb19cb7b6fa92018e0567bf73139d0f95c
Author: Gabor Kelemen 
Date:   Thu Mar 9 00:02:16 2017 +0100

Updated core
Project: help  7f8eec4aea1271f18ba55c771a8d81171ebbba48

tdf#102930 Update Mail Merge Wizard pages - 00

- Remove embeds for dropped wizard pages.
- Drop redundant bookmarks
- Improve text a bit for better readability

Change-Id: I04b4fd9936719a52368e56c8804328b528a782a4
Reviewed-on: https://gerrit.libreoffice.org/35931
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 0d1048bd6a3a..7f8eec4aea12 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0d1048bd6a3ad7ca6b6827c74c70e4c65ea32c54
+Subproject commit 7f8eec4aea1271f18ba55c771a8d81171ebbba48
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Gabor Kelemen

 source/text/swriter/01/mailmerge00.xhp |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 7f8eec4aea1271f18ba55c771a8d81171ebbba48
Author: Gabor Kelemen 
Date:   Thu Mar 9 00:02:16 2017 +0100

tdf#102930 Update Mail Merge Wizard pages - 00

- Remove embeds for dropped wizard pages.
- Drop redundant bookmarks
- Improve text a bit for better readability

Change-Id: I04b4fd9936719a52368e56c8804328b528a782a4
Reviewed-on: https://gerrit.libreoffice.org/35931
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/mailmerge00.xhp 
b/source/text/swriter/01/mailmerge00.xhp
index afbed6074..64e90bfe5 100644
--- a/source/text/swriter/01/mailmerge00.xhp
+++ b/source/text/swriter/01/mailmerge00.xhp
@@ -30,31 +30,29 @@
 
 
 
-
 
-
 
-UFI: inserted help idsUFI: moved 
DSBFormLetter ID to shared/main0212Mail Merge Wizard
+Mail Merge 
Wizard
 Starts the Mail Merge Wizard to create form letters 
or send e-mail messages to many recipients.
 
 
   
 
+Before starting 
the Mail Merge Wizard you might want to review the whole process of creating a 
mail merge:
 
 
 
 
 
 
-
-
-
 
 
 
-Mail Merge Wizard - Starting document
-
-
-Configurable Mail Merge 
dialog
+First step: Mail Merge Wizard - Select starting 
document.
+
+
+
+Configurable Mail Merge 
dialog
+
 
 
___
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_cgmfuzzer.mk vcl/Module_vcl.mk vcl/workben

2017-04-02 Thread Caolán McNamara

 Makefile.in |2 -
 Repository.mk   |1 
 vcl/Executable_cgmfuzzer.mk |   47 
 vcl/Module_vcl.mk   |1 
 vcl/workben/cgmfuzzer.cxx   |   30 
 5 files changed, 80 insertions(+), 1 deletion(-)

New commits:
commit 462d1f78845834548a59e843875de215e144e77c
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 1 20:54:54 2017 +0100

add cgm fuzzer

Change-Id: Id3bf2bc3c50421bb46e6fbdf3c492bdd2e3a976c

diff --git a/Makefile.in b/Makefile.in
index a505d37d9a4c..e19aef53e5c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(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 Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_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 AllLangResTarget_sd Executable_pptfuzzer 
Executable_rtffuzzer
+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 Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_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 AllLangResTarget_sd Executable_pptfuzzer 
Executable_rtffuzzer Executable_cgmfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index e66677b87dc1..7dbaed79adce 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -118,6 +118,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,olefuzzer) \
$(call gb_Helper_optional,FUZZERS,pptfuzzer) \
$(call gb_Helper_optional,FUZZERS,rtffuzzer) \
+   $(call gb_Helper_optional,FUZZERS,cgmfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_cgmfuzzer.mk b/vcl/Executable_cgmfuzzer.mk
new file mode 100644
index ..4b7a5a772bbc
--- /dev/null
+++ b/vcl/Executable_cgmfuzzer.mk
@@ -0,0 +1,47 @@
+# -*- 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/.
+#
+
+include $(SRCDIR)/vcl/commonfuzzer.mk
+
+$(eval $(call gb_Executable_Executable,cgmfuzzer))
+
+$(eval $(call gb_Executable_use_api,cgmfuzzer,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,cgmfuzzer,\
+   $(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,cgmfuzzer,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,cgmfuzzer,\
+   $(fuzzer_libraries) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,cgmf

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

2017-04-02 Thread Caolán McNamara

 sc/source/filter/starcalc/scflt.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 785ef3623447cb06f8d0987b9abc86960e848a39
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 17:45:38 2017 +0100

move this work to end of Sc10Import::Import

Change-Id: I28413f710642c904fbe7508a14272ab31bf4df3f

diff --git a/sc/source/filter/starcalc/scflt.cxx 
b/sc/source/filter/starcalc/scflt.cxx
index 2d7128be907b..509d8013eba3 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -938,9 +938,6 @@ Sc10Import::Sc10Import(SvStream& rStr, ScDocument* 
pDocument ) :
 
 Sc10Import::~Sc10Import()
 {
-pDoc->CalcAfterLoad();
-pDoc->UpdateAllCharts();
-
 delete pFontCollection;
 delete pNameCollection;
 delete pPatternCollection;
@@ -988,6 +985,9 @@ sal_uLong Sc10Import::Import()
 pPrgrsBar = nullptr;
 #endif
 
+pDoc->CalcAfterLoad();
+pDoc->UpdateAllCharts();
+
 return nError;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Tamás Zolnai

 editeng/source/items/svxitems.src  |8 ++
 editeng/source/items/textitem.cxx  |  119 +
 include/editeng/charrotateitem.hxx |   56 +++--
 include/editeng/editrids.hrc   |2 
 4 files changed, 166 insertions(+), 19 deletions(-)

New commits:
commit 1e30d2aface12a31687e5a27126e2061efd4b0cd
Author: TamÃ¡s Zolnai 
Date:   Sun Apr 2 15:21:14 2017 +0200

Add SvxTextRotateItem inherited from SvxCharRotatItem

I will be use it later for text rotation inside a table.

Change-Id: I4cbaf05953b0e71331d2f3fdb45b7c4254a2b8cc
Reviewed-on: https://gerrit.libreoffice.org/36021
Reviewed-by: TamÃ¡s Zolnai 
Tested-by: TamÃ¡s Zolnai 

diff --git a/editeng/source/items/svxitems.src 
b/editeng/source/items/svxitems.src
index 087ee07bb6cd..47da1c953d5c 100644
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -889,6 +889,14 @@ String RID_SVXITEMS_CHARROTATE_FITLINE
 {
 Text [ en-US ] = "Fit to line";
 };
+String RID_SVXITEMS_TEXTROTATE_OFF
+{
+Text [ en-US ] = "Text is not rotated";
+};
+String RID_SVXITEMS_TEXTROTATE
+{
+Text [ en-US ] = "Text is rotated by $(ARG1)Â°";
+};
 String RID_SVXITEMS_CHARSCALE
 {
 Text [ en-US ] = "Characters scaled $(ARG1)%";
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 72fc2c210f66..e1d24094c8a7 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2833,13 +2833,114 @@ sal_uInt16 SvxTwoLinesItem::GetVersion( sal_uInt16 
nFFVer ) const
 
 
 /*
+|*class SvxTextRotateItem
+*/
+
+SvxTextRotateItem::SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nW)
+: SfxUInt16Item(nW, nValue)
+{
+}
+
+SfxPoolItem* SvxTextRotateItem::Clone(SfxItemPool*) const
+{
+return new SvxTextRotateItem(GetValue(), Which());
+}
+
+SfxPoolItem* SvxTextRotateItem::Create(SvStream& rStrm, sal_uInt16) const
+{
+sal_uInt16 nVal;
+rStrm.ReadUInt16(nVal);
+return new SvxTextRotateItem(nVal, Which());
+}
+
+SvStream& SvxTextRotateItem::Store(SvStream & rStrm, sal_uInt16) const
+{
+rStrm.WriteUInt16(GetValue());
+return rStrm;
+}
+
+sal_uInt16 SvxTextRotateItem::GetVersion(sal_uInt16 nFFVer) const
+{
+return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
+}
+
+bool SvxTextRotateItem::GetPresentation(
+SfxItemPresentation /*ePres*/,
+MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
+OUString &rText, const IntlWrapper*) const
+{
+if (!GetValue())
+rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE_OFF);
+else
+{
+rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE);
+rText = rText.replaceFirst("$(ARG1)",
+OUString::number(GetValue() / 10));
+}
+return true;
+}
+
+bool SvxTextRotateItem::QueryValue(css::uno::Any& rVal,
+sal_uInt8 nMemberId) const
+{
+nMemberId &= ~CONVERT_TWIPS;
+bool bRet = true;
+switch (nMemberId)
+{
+case MID_ROTATE:
+rVal <<= (sal_Int16)GetValue();
+break;
+default:
+bRet = false;
+break;
+}
+return bRet;
+}
+
+bool SvxTextRotateItem::PutValue(const css::uno::Any& rVal, sal_uInt8 
nMemberId)
+{
+nMemberId &= ~CONVERT_TWIPS;
+bool bRet = true;
+switch (nMemberId)
+{
+case MID_ROTATE:
+{
+sal_Int16 nVal = 0;
+if ((rVal >>= nVal) && (0 == nVal || 900 == nVal || 2700 == nVal))
+SetValue((sal_uInt16)nVal);
+else
+bRet = false;
+break;
+}
+default:
+bRet = false;
+}
+return bRet;
+}
+
+bool SvxTextRotateItem::operator==(const SfxPoolItem& rItem) const
+{
+assert(SfxPoolItem::operator==(rItem));
+return SfxUInt16Item::operator==(rItem);
+}
+
+void SvxTextRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("SvxTextRotateItem"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), 
BAD_CAST(OString::number(Which()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), 
BAD_CAST(OString::number(GetValue()).getStr()));
+xmlTextWriterEndElement(pWriter);
+}
+
+
+/*
 |*class SvxCharRotateItem
 */
 
 SvxCharRotateItem::SvxCharRotateItem( sal_uInt16 nValue,
bool bFitIntoLine,
const sal_uInt16 nW )
-: SfxUInt16Item( nW, nValue ), bFitToLine( bFitIntoLine )
+: SvxTextRotateItem(nValue, nW), bFitToLine( bFitIntoLine )
 {
 }
 
@@ -2889,12 +2990,11 @@ bool SvxCharRotateItem::GetPresentation(
 bool SvxCharRotateItem::QueryValue( css::uno::Any& rVal,

[Libreoffice-commits] libmspub.git: src/lib

2017-04-02 Thread David Tardon

 src/lib/MSPUBParser.cpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c6de50a17e7636c20bef03e7336f9782c8fc3850
Author: David Tardon 
Date:   Thu Mar 30 15:21:39 2017 +0200

WaE: this statement may fall through

Change-Id: I9530e1d24ee589af1f72728ea9b045e29cacf7c7

diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 1af392e..95d3769 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -2078,6 +2078,7 @@ boost::shared_ptr MSPUBParser::getNewFill(const 
std::map(new 
PatternFill(m_escherDelayIndices[*ptr_bgPxId - 1], m_collector, fill, back));
 }
+return boost::shared_ptr();
   }
   case BACKGROUND:
   default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/experimental

2017-04-02 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
|   17 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift   
|7 ++--
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
 |5 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h 
|4 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c 
|4 +-
 5 files changed, 9 insertions(+), 28 deletions(-)

New commits:
commit a52f3310a6d84fcfffcc49016bbec35bfb6ee5e8
Author: jan Iversen 
Date:   Wed Mar 22 16:32:02 2017 +0100

iOS LibreOfficeLight Activate LibreOfficeKit

Prepare for viewing functionality.

Change-Id: I4960938fdc7bf6955096c96cc7f56792c64c6641

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index cf301c36063e..69d042885342 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
397E09031E597BD8001374E0 /* Main.storyboard in Resources */ = 
{isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */; 
};
-   397E09061E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09041E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld */; };
397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ = 
{isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */; 
};
397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* 
LibreOfficeLightTests.swift */; };
397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* 
LibreOfficeLightUITests.swift */; };
@@ -58,7 +57,6 @@
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = 
SOURCE_ROOT; };
397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.storyboard; name = en; path = 
en.lproj/Main.storyboard; sourceTree = ""; };
-   397E09051E597BD8001374E0 /* LibreOfficeLight.xcdatamodel */ = 
{isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = 
LibreOfficeLight.xcdatamodel; sourceTree = ""; };
397E09071E597BD8001374E0 /* Assets.xcassets */ = {isa = 
PBXFileReference; lastKnownFileType = folder.assetcatalog; name = 
Assets.xcassets; path = LibreOfficeLight/Assets.xcassets; sourceTree = 
SOURCE_ROOT; };
397E090C1E597BD8001374E0 /* Info.plist */ = {isa = 
PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = 
LibreOfficeLight/Info.plist; sourceTree = SOURCE_ROOT; };
397E09111E597BD8001374E0 /* LibreOfficeLightTests.xctest */ = 
{isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 
0; path = LibreOfficeLightTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -118,7 +116,6 @@
397275391E77D9F1006ACDCC /* 
LibreOfficeLight.entitlements */,
39B084E21E5F0A9600682A59 /* lo.xcconfig */,
397E09071E597BD8001374E0 /* Assets.xcassets */,
-   397E09041E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld */,
397E090C1E597BD8001374E0 /* Info.plist */,
396F92F61E7AE62400A28C82 /* Settings.bundle */,
);
@@ -362,7 +359,6 @@
buildActionMask = 2147483647;
files = (
392ED9B31E5E4B03005C8435 /* 
ViewPrintManager.swift in Sources */,
-   397E09061E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld in Sources */,
3992D85D1E5B764A00BEA987 /* SideMenu.swift in 
Sources */,

[Libreoffice-commits] core.git: chart2/source editeng/source extensions/source forms/source include/toolkit include/vcl reportdesign/source sc/source svx/source sw/source toolkit/source vcl/source xml

2017-04-02 Thread Caolán McNamara

 chart2/source/view/main/DummyXShape.cxx  |6 
 editeng/source/items/textitem.cxx|   10 -
 editeng/source/uno/unofdesc.cxx  |8 
 extensions/source/propctrlr/fontdialog.cxx   |9 
 extensions/source/propctrlr/formcomponenthandler.cxx |4 
 forms/source/component/Grid.cxx  |   10 -
 include/toolkit/helper/vclunohelper.hxx  |7 
 include/vcl/unohelp.hxx  |8 
 reportdesign/source/ui/misc/UITools.cxx  |3 
 sc/source/filter/excel/xlstyle.cxx   |6 
 sc/source/filter/oox/stylesbuffer.cxx|4 
 svx/source/fmcomp/fmgridif.cxx   |   12 -
 sw/source/filter/html/htmlform.cxx   |4 
 sw/source/filter/html/htmlforw.cxx   |4 
 sw/source/filter/ww8/ww8par3.cxx |4 
 toolkit/source/controls/unocontrolmodel.cxx  |7 
 toolkit/source/helper/vclunohelper.cxx   |  177 ---
 vcl/source/app/unohelp.cxx   |  167 +
 xmloff/source/style/postuhdl.cxx |5 
 19 files changed, 232 insertions(+), 223 deletions(-)

New commits:
commit 2f33a8cd231d3842a1e5521e3a61d8e73517137b
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 12:35:41 2017 +0100

coverity#1403662 Mixing enum types

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

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index b066f39a2d2d..322a21ec000e 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -741,13 +741,13 @@ struct FontAttribSetter
 else if(rPropName == "CharWeight")
 {
 float fWeight = rProp.second.get();
-FontWeight eFontWeight = VCLUnoHelper::ConvertFontWeight(fWeight);
+FontWeight eFontWeight = 
vcl::unohelper::ConvertFontWeight(fWeight);
 mrFont.SetWeight(eFontWeight);
 }
 else if(rPropName == "ChartWidth")
 {
 float fWidth = rProp.second.get();
-FontWidth eFontWidth = VCLUnoHelper::ConvertFontWidth(fWidth);
+FontWidth eFontWidth = vcl::unohelper::ConvertFontWidth(fWidth);
 mrFont.SetAverageFontWidth(eFontWidth);
 }
 }
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 597086e3a4d7..72fc2c210f66 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -22,11 +22,11 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -512,7 +512,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 rVal <<= (bool)GetBoolValue();
 break;
 case MID_POSTURE:
-rVal <<= VCLUnoHelper::ConvertFontSlant(GetValue());
+rVal <<= vcl::unohelper::ConvertFontSlant(GetValue());
 break;
 }
 return true;
@@ -537,7 +537,7 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 
 eSlant = (awt::FontSlant)nValue;
 }
-SetValue(VCLUnoHelper::ConvertFontSlant(eSlant));
+SetValue(vcl::unohelper::ConvertFontSlant(eSlant));
 }
 }
 return true;
@@ -649,7 +649,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 break;
 case MID_WEIGHT:
 {
-rVal <<= (float)( VCLUnoHelper::ConvertFontWeight( GetValue() ) );
+rVal <<= (float)( vcl::unohelper::ConvertFontWeight( GetValue() ) 
);
 }
 break;
 }
@@ -674,7 +674,7 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 return false;
 fValue = (float)nValue;
 }
-SetValue( VCLUnoHelper::ConvertFontWeight((float)fValue) );
+SetValue( vcl::unohelper::ConvertFontWeight((float)fValue) );
 }
 break;
 }
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 48dbeb4ddcc9..3d0b90ed3d02 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -31,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -48,7 +48,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const 
awt::FontDescriptor& rDesc, vcl:
 rFont.SetPitch( (FontPitch)rDesc.Pitch );
 rFont.SetOrientation( (short)(rDesc.Orientation*10) );

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

2017-04-02 Thread Caolán McNamara

 filter/source/graphicfilter/icgm/class1.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit fb41ebff32371ee7a7e07f671f7c769a8bb18718
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 16:50:38 2017 +0100

ofz: more check bounds on read

Change-Id: I70018ee2ab282c11547f5bf9d81b2ee74c74aa04

diff --git a/filter/source/graphicfilter/icgm/class1.cxx 
b/filter/source/graphicfilter/icgm/class1.cxx
index 0d297bbe0a10..895dd8247d0b 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -192,6 +192,10 @@ void CGM::ImplDoClass1()
 {
 sal_uInt32 nCharSetType = ImplGetUI16();
 sal_uInt32 nSize = ImplGetUI(1);
+
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+throw css::uno::Exception("attempt to read past end of 
input", nullptr);
+
 pElement->aFontList.InsertCharSet( (CharSetType)nCharSetType, 
mpSource + mnParaSize, nSize );
 mnParaSize += nSize;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Caolán McNamara

 filter/source/graphicfilter/icgm/class4.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit adb597102e6d8c8688510881f2142a999ada03ce
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 16:46:02 2017 +0100

signed/unsigned comparison warnings

Change-Id: I384c5bd3e87b3615fdcd31768f920d6679946ba7

diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index f1cf2881a4fc..68e63844843b 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -186,7 +186,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (mpEndValidSource - (mpSource + mnParaSize) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[mnParaSize + nSize] = 0;
@@ -224,7 +224,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16(4);
 sal_uInt32 nSize = ImplGetUI(1);
 
-if (mpEndValidSource - (mpSource + mnParaSize) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
@@ -242,7 +242,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (mpEndValidSource - (mpSource + mnParaSize) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Caolán McNamara

 filter/source/graphicfilter/icgm/actimpr.cxx |   31 ---
 filter/source/graphicfilter/icgm/cgm.cxx |6 ++---
 filter/source/graphicfilter/icgm/class1.cxx  |2 -
 filter/source/graphicfilter/icgm/outact.hxx  |5 +---
 4 files changed, 20 insertions(+), 24 deletions(-)

New commits:
commit 66147965d538bfce810598f34b272a85067d759b
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 15:07:18 2017 +0100

ofz: drop hard-coded limit

Change-Id: I175b2db73a29c7e83003ad0638818e7876d552d4

diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx 
b/filter/source/graphicfilter/icgm/actimpr.cxx
index fea8420bf8c8..755f6b8b9afe 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -60,10 +60,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const 
uno::Reference< frame::XMod
 mnCurrentPage = 0;
 mnGroupActCount = mnGroupLevel = 0;
 mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] ();
-maPoints.resize(0x2000);
-maFlags.resize(0x2000);
 
-mnIndex = 0;
 mpGradient = nullptr;
 
 if ( mpCGM->mbStatus )
@@ -893,16 +890,17 @@ void CGMImpressOutAct::AppendText( char* pString, 
sal_uInt32 /*nSize*/, FinalFla
 
 void CGMImpressOutAct::BeginFigure()
 {
-if ( mnIndex )
+if (!maPoints.empty())
 EndFigure();
 
 BeginGroup();
-mnIndex = 0;
+maPoints.clear();
+maFlags.clear();
 }
 
 void CGMImpressOutAct::CloseRegion()
 {
-if ( mnIndex > 2 )
+if (maPoints.size() > 2)
 {
 NewRegion();
 DrawPolyPolygon( maPolyPolygon );
@@ -912,12 +910,13 @@ void CGMImpressOutAct::CloseRegion()
 
 void CGMImpressOutAct::NewRegion()
 {
-if ( mnIndex > 2 )
+if (maPoints.size() > 2)
 {
-tools::Polygon aPolygon(mnIndex, maPoints.data(), maFlags.data());
+tools::Polygon aPolygon(maPoints.size(), maPoints.data(), 
maFlags.data());
 maPolyPolygon.Insert( aPolygon );
 }
-mnIndex = 0;
+maPoints.clear();
+maFlags.clear();
 }
 
 void CGMImpressOutAct::EndFigure()
@@ -926,7 +925,8 @@ void CGMImpressOutAct::EndFigure()
 DrawPolyPolygon( maPolyPolygon );
 maPolyPolygon.Clear();
 EndGroup();
-mnIndex = 0;
+maPoints.clear();
+maFlags.clear();
 }
 
 void CGMImpressOutAct::RegPolyLine( tools::Polygon& rPolygon, bool bReverse )
@@ -938,19 +938,18 @@ void CGMImpressOutAct::RegPolyLine( tools::Polygon& 
rPolygon, bool bReverse )
 {
 for ( sal_uInt16 i = 0; i <  nPoints; i++ )
 {
-maPoints[ mnIndex + i ] = rPolygon.GetPoint( nPoints - i - 1 );
-maFlags[ mnIndex + i ] = rPolygon.GetFlags( nPoints - i - 1 );
+maPoints.push_back(rPolygon.GetPoint(nPoints - i - 1));
+maFlags.push_back(rPolygon.GetFlags(nPoints - i - 1));
 }
 }
 else
 {
 for ( sal_uInt16 i = 0; i <  nPoints; i++ )
 {
-maPoints[ mnIndex + i ] = rPolygon.GetPoint( i );
-maFlags[ mnIndex + i ] = rPolygon.GetFlags( i );
+maPoints.push_back(rPolygon.GetPoint(i));
+maFlags.push_back(rPolygon.GetFlags(i));
 }
 }
-mnIndex = mnIndex + nPoints;
 }
 }
 
diff --git a/filter/source/graphicfilter/icgm/outact.hxx 
b/filter/source/graphicfilter/icgm/outact.hxx
index 8b8b62f61ccc..3a8d7e8b91fa 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -45,7 +45,6 @@ class CGMImpressOutAct
 sal_uInt32  mnGroupLevel;
 sal_uInt32* mpGroupLevel;
 
-sal_uInt16  mnIndex;// figure
 std::vector  maFlags;
 std::vector  maPoints;
 tools::PolyPolygon  maPolyPolygon;
commit 4cd4ec2855fd51bb97812e90dc469c55882933f4
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 15:01:10 2017 +0100

convert to std::vector

Change-Id: Icd442975cbc084a67bdd3e7f24113f499981db60

diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx 
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 66ff8df07ba9..fea8420bf8c8 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -60,8 +60,8 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const 
uno::Reference< frame::XMod
 mnCurrentPage = 0;
 mnGroupActCount = mnGroupLevel = 0;
 mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] ();
-mpPoints = new Point[ 0x2000 ];
-mpFlags = new PolyFlags[ 0x2000 ];
+maPoints.resize(0x2000);
+maFlags.resize(0x2000);
 
 mnIndex = 0;
 mpGradient = nullptr;
@@ -91,8 +91,6 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const 
uno::Reference< frame::XMod
 
 CGMImpressOutAct::~CGMImpressOutAct()
 {
-delete[] mpPoints;
-delete[] mpFlags;
 delete[] mpGroupLevel;
 delete mpGradient;
 }
@@ -916

[Libreoffice-commits] core.git: 3 commits - filter/Configuration_filter.mk filter/source writerperfect/Library_wpftcalc.mk writerperfect/Library_wpftimpress.mk writerperfect/qa writerperfect/source

2017-04-02 Thread osnola

 filter/Configuration_filter.mk  |2 
 filter/source/config/fragments/filters/PowerPoint3.xcu  |2 
 filter/source/config/fragments/filters/StarOffice_Presentation.xcu  |   29 +++
 filter/source/config/fragments/types/StarOffice_Presentation.xcu|   27 ++
 filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu|2 
 filter/source/config/fragments/types/impress_PowerPoint3.xcu|2 
 writerperfect/Library_wpftcalc.mk   |1 
 writerperfect/Library_wpftimpress.mk|2 
 writerperfect/qa/unit/DrawingImportTest.cxx |2 
 writerperfect/qa/unit/PresentationImportTest.cxx|2 
 writerperfect/qa/unit/SpreadsheetImportTest.cxx |2 
 writerperfect/qa/unit/TextImportTest.cxx|2 
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx   |   41 +++-
 writerperfect/source/common/DocumentHandler.cxx |6 
 writerperfect/source/common/WPXSvInputStream.cxx|   24 +-
 writerperfect/source/impress/MWAWPresentationImportFilter.cxx   |2 
 writerperfect/source/impress/StarOfficePresentationImportFilter.cxx |   95 
++
 writerperfect/source/impress/StarOfficePresentationImportFilter.hxx |   42 
 writerperfect/source/impress/wpftimpress.component  |5 
 19 files changed, 263 insertions(+), 27 deletions(-)

New commits:
commit 0e261a6908c2521a9967069095239eeb02810b8c
Author: osnola 
Date:   Sun Apr 2 09:56:42 2017 +0200

libmwaw import filter improvements

  + correct a small mistake
  + add pot the file extension (the file extension for PowerPoint 95
 template)

Change-Id: I4ad18088ccb9777e1b34f393effbe2d24468804e

diff --git a/filter/source/config/fragments/filters/PowerPoint3.xcu 
b/filter/source/config/fragments/filters/PowerPoint3.xcu
index d61a360d4eb0..d1d19e6d2845 100644
--- a/filter/source/config/fragments/filters/PowerPoint3.xcu
+++ b/filter/source/config/fragments/filters/PowerPoint3.xcu
@@ -14,7 +14,7 @@
 com.sun.star.comp.Impress.MWAWPresentationImportFilter
 
 
-Microsoft PowerPoint 1-4
+Microsoft PowerPoint 1-4 and 95's
 
 
 0
diff --git a/filter/source/config/fragments/types/impress_PowerPoint3.xcu 
b/filter/source/config/fragments/types/impress_PowerPoint3.xcu
index 45cbb2855c2f..4c6885943b76 100644
--- a/filter/source/config/fragments/types/impress_PowerPoint3.xcu
+++ b/filter/source/config/fragments/types/impress_PowerPoint3.xcu
@@ -11,7 +11,7 @@
 com.sun.star.comp.Impress.MWAWPresentationImportFilter
 
 
-ppt
+ppt pot
 
 
 PowerPoint 3
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx 
b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
index 3b77605a2c6e..a1b2d7f06145 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
@@ -58,7 +58,7 @@ bool 
MWAWPresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &r
 case MWAWDocument::MWAW_T_CLARISWORKS:
 rTypeName = "impress_ClarisWorks";
 break;
-case MWAWDocument::MWAW_T_RESERVED9:
+case MWAWDocument::MWAW_T_RESERVED8:
 rTypeName = "impress_PowerPoint3";
 break;
 default:
commit 8988c925ce07395478fbbb10d25fd6c0a10fead5
Author: osnola 
Date:   Sun Apr 2 09:53:44 2017 +0200

libstaroffice import filter improvements

  + add support for presentation file (i.e. the file created will 
StarImpress
 are now open as presentation).
  + modify the OLE parser to be similar to the librevenge OLE parser,
ie. the librevenge parser ignores the first character of a filename if
this is a control character...

Change-Id: I913a70cba29839d43dac58d5e00dbebfc4d28abc

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index cbb951f3fe28..52483dc58ccf 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -600,6 +600,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xc
impress_OOXML_Presentation_Template \
impress_OOXML_Presentation_AutoPlay \
impress_ClarisWorks \
+   StarOffice_Presentation \
MWAW_Presentation \
impress_PowerPoint3 \
 ))
@@ -625,6 +626,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filter
impress_OOXML_Template \
impress_OOXML_AutoPlay \
ClarisWorks_Impress \
+   StarOffice_Presentation \
MWAW_Presentation \
PowerPoint3 \
 ))
diff --git a/filter/source/config/fragments/filters/StarOffice_Presentation.xcu 
b/fil

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

2017-04-02 Thread Caolán McNamara

 filter/source/graphicfilter/icgm/cgm.cxx|8 
 filter/source/graphicfilter/icgm/class1.cxx |   13 +++--
 filter/source/graphicfilter/icgm/class4.cxx |6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit af45b3d48e3a027c14317db944a8d67de063352f
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 12:03:38 2017 +0100

ofz: more check bounds on read

Change-Id: I92b10aeab34cb6a78deff1d4b54545c8f506113c

diff --git a/filter/source/graphicfilter/icgm/cgm.cxx 
b/filter/source/graphicfilter/icgm/cgm.cxx
index 8caba71e88a0..6f0d171abfa5 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -99,7 +99,7 @@ sal_uInt32 CGM::GetBackGroundColor()
 sal_uInt32 CGM::ImplGetUI16( sal_uInt32 /*nAlign*/ )
 {
 sal_uInt8* pSource = mpSource + mnParaSize;
-if (pSource + 2 > mpEndValidSource)
+if (mpEndValidSource - pSource < 2)
 throw css::uno::Exception("attempt to read past end of input", 
nullptr);
 mnParaSize += 2;
 return ( pSource[ 0 ] << 8 ) +  pSource[ 1 ];
@@ -113,7 +113,7 @@ sal_uInt8 CGM::ImplGetByte( sal_uInt32 nSource, sal_uInt32 
nPrecision )
 sal_Int32 CGM::ImplGetI( sal_uInt32 nPrecision )
 {
 sal_uInt8* pSource = mpSource + mnParaSize;
-if (pSource + nPrecision > mpEndValidSource)
+if (mpEndValidSource - pSource < nPrecision)
 throw css::uno::Exception("attempt to read past end of input", 
nullptr);
 mnParaSize += nPrecision;
 switch( nPrecision )
@@ -145,7 +145,7 @@ sal_Int32 CGM::ImplGetI( sal_uInt32 nPrecision )
 sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
 {
 sal_uInt8* pSource = mpSource + mnParaSize;
-if (pSource + nPrecision > mpEndValidSource)
+if (mpEndValidSource - pSource < nPrecision)
 throw css::uno::Exception("attempt to read past end of input", 
nullptr);
 mnParaSize += nPrecision;
 switch( nPrecision )
@@ -200,7 +200,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, 
sal_uInt32 nRealSize )
 const bool bCompatible = false;
 #endif
 
-if (mpSource + mnParaSize + nRealSize > mpEndValidSource)
+if (mpEndValidSource - (mpSource + mnParaSize) < nRealSize)
 throw css::uno::Exception("attempt to read past end of input", 
nullptr);
 
 if ( bCompatible )
diff --git a/filter/source/graphicfilter/icgm/class1.cxx 
b/filter/source/graphicfilter/icgm/class1.cxx
index 641355924f74..4d41add2448c 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -176,8 +176,11 @@ void CGM::ImplDoClass1()
 {
 while ( mnParaSize < mnElementSize )
 {
-sal_uInt32 nSize;
-nSize = ImplGetUI( 1 );
+sal_uInt32 nSize = ImplGetUI(1);
+
+if (mpEndValidSource - (mpSource + mnParaSize) < nSize)
+throw css::uno::Exception("attempt to read past end of 
input", nullptr);
+
 pElement->aFontList.InsertName( mpSource + mnParaSize, nSize );
 mnParaSize += nSize;
 }
@@ -187,10 +190,8 @@ void CGM::ImplDoClass1()
 {
 while ( mnParaSize < mnElementSize )
 {
-sal_uInt32 nCharSetType;
-sal_uInt32 nSize;
-nCharSetType = ImplGetUI16();
-nSize = ImplGetUI( 1 );
+sal_uInt32 nCharSetType = ImplGetUI16();
+sal_uInt32 nSize = ImplGetUI(1);
 pElement->aFontList.InsertCharSet( (CharSetType)nCharSetType, 
mpSource + mnParaSize, nSize );
 mnParaSize += nSize;
 }
diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index d8397a26395c..f1cf2881a4fc 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -186,7 +186,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (mpSource + mnParaSize + nSize > mpEndValidSource)
+if (mpEndValidSource - (mpSource + mnParaSize) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[mnParaSize + nSize] = 0;
@@ -224,7 +224,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16(4);
 sal_uInt32 nSize = ImplGetUI(1);
 
-if (mpSource + mnParaSize + nSize > mpEndValidSource)
+if (mpEndValidSource - (mpSource + mnParaSize) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
@@ -242,7 +242,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16( 4 );
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (mpSource

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

2017-04-02 Thread Zdeněk Crhonek

 basic/qa/cppunit/test_vba.cxx |4 ++
 basic/qa/vba_tests/day.vb |   62 +
 basic/qa/vba_tests/error.vb   |   62 +
 basic/qa/vba_tests/exp.vb |   62 +
 basic/qa/vba_tests/fix.vb |   70 ++
 5 files changed, 260 insertions(+)

New commits:
commit d9dc5dcd39740e82034823bb3a5c50ae56be6af8
Author: ZdenÄk Crhonek 
Date:   Sat Apr 1 17:45:15 2017 +0200

add VBA tests- FIX,EXP,ERROR,DAY functions

Change-Id: I339abf03f88a0b8135184a892f5200ad381310bd
Reviewed-on: https://gerrit.libreoffice.org/36010
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 1f113cf79c86..8e5a5ecc4f8d 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -74,6 +74,10 @@ void VBATest::testMiscVBAFunctions()
 "dateadd.vb",
 "datediff.vb",
 "datepart.vb",
+"day.vb",
+"error.vb",
+"exp.vb",
+"fix.vb",
 #ifndef WIN32 // missing 64bit Currency marshalling.
 "win32compat.vb", // windows compatibility hooks.
 #endif
diff --git a/basic/qa/vba_tests/day.vb b/basic/qa/vba_tests/day.vb
new file mode 100644
index ..408d7b81d9e1
--- /dev/null
+++ b/basic/qa/vba_tests/day.vb
@@ -0,0 +1,62 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testday()
+If failCount <> 0 And passCount > 0 Then
+doUnitTest = result
+Else
+doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testday() As String
+
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+Dim testName As String
+Dim TestDateTime As Date
+Dim TestStr As String
+Dim date1, date2   'variables for test
+testName = "Test day function"
+On Error GoTo errorHandler
+
+date2 = 12
+date1 = Day("12.2.1969") '2/12/1969
+TestLog_ASSERT date1 = date2, "the return day is: " & date1
+
+result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & 
"Tests failed: " & failCount & Chr$(10)
+verify_testday = result
+
+Exit Function
+errorHandler:
+TestLog_ASSERT (False), testName & ": hit error handler"
+End Function
+
+Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional 
testComment As String)
+
+If assertion = True Then
+passCount = passCount + 1
+Else
+Dim testMsg As String
+If Not IsMissing(testId) Then
+testMsg = testMsg + " : " + testId
+End If
+If Not IsMissing(testComment) And Not (testComment = "") Then
+testMsg = testMsg + " (" + testComment + ")"
+End If
+
+result = result & Chr$(10) & " Failed: " & testMsg
+failCount = failCount + 1
+End If
+
+End Sub
+
diff --git a/basic/qa/vba_tests/error.vb b/basic/qa/vba_tests/error.vb
new file mode 100644
index ..8787c891c824
--- /dev/null
+++ b/basic/qa/vba_tests/error.vb
@@ -0,0 +1,62 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testError()
+If failCount <> 0 And passCount > 0 Then
+doUnitTest = result
+Else
+doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testError() As String
+
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+Dim testName As String
+Dim TestDateTime As Date
+Dim TestStr As String
+Dim date1, date2
+testName = "Test Error function"
+On Error GoTo errorHandler
+
+date2 = Error(62)   
'https://help.libreoffice.org/3.3/Basic/Error_Function_Runtime
+date1 = "Input past end of file"
+TestLog_ASSERT date1 = date2, "the return Error is: " & date1
+
+result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & 
"Tests failed: " & failCount & Chr$(10)
+verify_testError = result
+
+Exit Function
+errorHandler:
+TestLog_ASSERT (False), testName & ": hit error handler"
+End Function
+
+Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional 
testComment As String)
+
+If assertion = True Then
+passCount = passCount + 1
+Else
+Dim testMsg As String
+If Not IsMissing(testId) Then
+testMsg = testMsg + " : " + testId
+End If
+If Not IsMissing(testComment) And Not (testComment = "") Then
+testMsg = testMsg + " (" + testComment + ")"
+End If
+
+result = result & Chr$(10) & " Failed: " & testMsg
+failCount = failCount + 1
+End If
+
+End Sub
+
diff --git a/basic/qa/vba_tests/exp.vb b/basic/qa/vba_tests/exp.vb
new file mode 100644
index

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

2017-04-02 Thread Caolán McNamara

 vcl/source/filter/wmf/winwmf.cxx |   17 -
 vcl/workben/fftester.cxx |2 --
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit e9bd695a063e111cdc002b73a6a5cccbc52ef4d3
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 11:52:06 2017 +0100

ofz: avoid oom

Change-Id: Ibffae78a1186492300c237e85089702491cf4a0f

diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 94783f8879d4..0ce2ff3eccac 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1131,18 +1131,25 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 }
 nEMFRec++;
 
-if( pEMFStream && nCurRecSize + 34 > nLen )
+if (pEMFStream && nCurRecSize + 34 > nLen)
 {
 nEMFRecCount = 0x;
 pEMFStream.reset();
 }
 
-if( pEMFStream )
+if (pEMFStream && nCurRecSize > 
pWMF->remainingSize())
 {
-std::unique_ptr pBuf(new sal_Int8[ 
nCurRecSize ]);
-sal_uInt32 nCount = 
pWMF->ReadBytes(pBuf.get(), nCurRecSize);
+SAL_WARN("vcl.wmf", "emf record size claims to 
be larger than remaining data");
+nEMFRecCount = 0x;
+pEMFStream.reset();
+}
+
+if (pEMFStream)
+{
+std::vector aBuf(nCurRecSize);
+sal_uInt32 nCount = 
pWMF->ReadBytes(aBuf.data(), nCurRecSize);
 if( nCount == nCurRecSize )
-pEMFStream->WriteBytes(pBuf.get(), nCount);
+pEMFStream->WriteBytes(aBuf.data(), 
nCount);
 }
 }
 }
commit 4f2825f590f4d4921d9336961fd727e76b525b92
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 11:49:12 2017 +0100

align fftester and wmffuzzer

Change-Id: Ib0017cfd290b41fc886b5516d2f50ee219185d5a

diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 3b7a1619d45e..63e33e14b735 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -115,8 +115,6 @@ try_again:
 GDIMetaFile aGDIMetaFile;
 SvFileStream aFileStream(out, StreamMode::READ);
 ret = (int) ReadWindowMetafile(aFileStream, aGDIMetaFile);
-BitmapEx aTarget;
-(void)aGDIMetaFile.CreateThumbnail(aTarget);
 }
 else if (strcmp(argv[2], "jpg") == 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Caolán McNamara

 filter/source/graphicfilter/icgm/actimpr.cxx |2 +-
 filter/source/graphicfilter/icgm/class4.cxx  |   25 -
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit fb05611064e12c8eda09bc32c42544cde8c2ab49
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 11:31:10 2017 +0100

ofz: check bounds on read

Change-Id: I07779bec876b90e36f20a81d6dbf06ae727edf85

diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index c74333123c6b..d8397a26395c 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -178,15 +178,18 @@ void CGM::ImplDoClass4()
 case 0x04 : /*Text*/
 {
 FloatPoint  aFloatPoint;
-sal_uInt32  nType, nSize;
 
 if ( mbFigure )
 mpOutAct->CloseRegion();
 
 ImplGetPoint ( aFloatPoint, true );
-nType = ImplGetUI16( 4 );
-nSize = ImplGetUI( 1 );
-mpSource[ mnParaSize + nSize ] = 0;
+sal_uInt32 nType = ImplGetUI16( 4 );
+sal_uInt32 nSize = ImplGetUI( 1 );
+
+if (mpSource + mnParaSize + nSize > mpEndValidSource)
+throw css::uno::Exception("attempt to read past end of 
input", nullptr);
+
+mpSource[mnParaSize + nSize] = 0;
 
 awt::Size aSize;
 awt::Point aPoint( (long)aFloatPoint.X, (long)aFloatPoint.Y );
@@ -200,7 +203,6 @@ void CGM::ImplDoClass4()
 {
 double  dx, dy;
 FloatPoint  aFloatPoint;
-sal_uInt32  nType, nSize;
 
 if ( mbFigure )
 mpOutAct->CloseRegion();
@@ -219,8 +221,11 @@ void CGM::ImplDoClass4()
 ImplMapDouble( dy );
 
 ImplGetPoint ( aFloatPoint, true );
-nType = ImplGetUI16( 4 );
-nSize = ImplGetUI( 1 );
+sal_uInt32 nType = ImplGetUI16(4);
+sal_uInt32 nSize = ImplGetUI(1);
+
+if (mpSource + mnParaSize + nSize > mpEndValidSource)
+throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
 
@@ -234,10 +239,12 @@ void CGM::ImplDoClass4()
 
 case 0x06 : /*Append Text*/
 {
-sal_uInt32 nSize;
 sal_uInt32 nType = ImplGetUI16( 4 );
+sal_uInt32 nSize = ImplGetUI( 1 );
+
+if (mpSource + mnParaSize + nSize > mpEndValidSource)
+throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
-nSize = ImplGetUI( 1 );
 mpSource[ mnParaSize + nSize ] = 0;
 
 mpOutAct->AppendText( reinterpret_cast(mpSource) + 
mnParaSize, nSize, (FinalFlag)nType );
commit 647ff1add92a4d6473515462d4e5939b99b76d27
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 2 01:58:25 2017 +0100

ofz: use safer ctor

Change-Id: I23d23a73442a22ecced0c0287b42a7c667ebfa7e

diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx 
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 0a63a8ea15dc..6d7b1364b22b 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -805,7 +805,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, 
awt::Size& rTextSize, cha
 uno::Any aFirstQuery( maXShape->queryInterface( 
cppu::UnoType::get()));
 if( aFirstQuery >>= xText )
 {
-OUString aStr( OUString::createFromAscii( pString ) );
+OUString aStr(pString, rtl_str_getLength(pString), 
RTL_TEXTENCODING_ASCII_US);
 
 uno::Reference< text::XTextCursor >  aXTextCursor( 
xText->createTextCursor() );
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/pivotcharts' - chart2/qa sc/source

2017-04-02 Thread Tomaž Vajngerl

 chart2/qa/extras/PivotChartTest.cxx|   38 +
 sc/source/ui/unoobj/PivotChartDataProvider.cxx |   10 +++---
 2 files changed, 44 insertions(+), 4 deletions(-)

New commits:
commit 2f9a1a499dd4909acb621cbc7976a59c031e2a56
Author: TomaÅ¾ Vajngerl 
Date:   Sun Apr 2 11:32:18 2017 +0200

fix crash when there are no row fields + test

Change-Id: I56852e953e32767fcf7d93f5cfcfd0fe7642443a

diff --git a/chart2/qa/extras/PivotChartTest.cxx 
b/chart2/qa/extras/PivotChartTest.cxx
index 4cf872599d18..245f5e1ac3a5 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -64,7 +64,11 @@ bool lclCheckSequence(std::vector const & reference,
   double delta)
 {
 if (reference.size() != size_t(values.getLength()))
+{
+printf ("Sequence size differs - reference is %ld but actual is %ld\n",
+reference.size(), size_t(values.getLength()));
 return false;
+}
 
 for (size_t i = 0; i < reference.size(); ++i)
 {
@@ -233,6 +237,40 @@ void PivotChartTest::testChangePivotTable()
 
 CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 2));
 }
+
+// Modify the pivot table
+{
+uno::Reference xDataPilotTable = 
lclGetPivotTableByName(1, "DataPilot1", mxComponent);
+uno::Reference 
xDataPilotDescriptor(xDataPilotTable, UNO_QUERY_THROW);
+
+lclModifyOrientation(xDataPilotDescriptor, "Service Month", 
sheet::DataPilotFieldOrientation_HIDDEN);
+}
+
+// Check the pivot chart again as we expect it has been updated when we 
updated the pivot table
+
+CPPUNIT_ASSERT(xChartDoc.is());
+
+// Check the first data series
+{
+std::vector aReference { 10162.033139 };
+xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 
0)->getData();
+CPPUNIT_ASSERT(lclCheckSequence(aReference, xSequence, 1E-3));
+CPPUNIT_ASSERT_EQUAL(OUString("Big"), lclGetLabel(xChartDoc, 0));
+}
+// Check the second data series
+{
+std::vector aReference { 16614.523063 };
+xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 
1)->getData();
+CPPUNIT_ASSERT(lclCheckSequence(aReference, xSequence, 1E-3));
+CPPUNIT_ASSERT_EQUAL(OUString("Medium"), lclGetLabel(xChartDoc, 1));
+}
+// Check the third data series
+{
+std::vector aReference { 27944.146101 };
+xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 
2)->getData();
+CPPUNIT_ASSERT(lclCheckSequence(aReference, xSequence, 1E-3));
+CPPUNIT_ASSERT_EQUAL(OUString("Small"), lclGetLabel(xChartDoc, 2));
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(PivotChartTest);
diff --git a/sc/source/ui/unoobj/PivotChartDataProvider.cxx 
b/sc/source/ui/unoobj/PivotChartDataProvider.cxx
index 954453193387..7fe660c4a77d 100644
--- a/sc/source/ui/unoobj/PivotChartDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotChartDataProvider.cxx
@@ -564,10 +564,12 @@ uno::Reference 
PivotChartDataProvider::createPivotCha
 
 {
 std::vector aFirstCategories;
-std::copy (m_aCategoriesColumnOrientation[0].begin(),
-   m_aCategoriesColumnOrientation[0].end(),
-   std::back_inserter(aFirstCategories));
-
+if (!m_aCategoriesColumnOrientation.empty())
+{
+std::copy(m_aCategoriesColumnOrientation[0].begin(),
+  m_aCategoriesColumnOrientation[0].end(),
+  std::back_inserter(aFirstCategories));
+}
 uno::Reference xResult = 
newLabeledDataSequence();
 setLabeledDataSequenceValues(xResult, "categories", "Categories", 
aFirstCategories);
 aLabeledSequences.push_back(xResult);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/pivotcharts' - chart2/qa

2017-04-02 Thread Tomaž Vajngerl

 chart2/qa/extras/PivotChartTest.cxx |   93 ++--
 1 file changed, 38 insertions(+), 55 deletions(-)

New commits:
commit ef792a6e88d8d388a0cc9631b1fcb060026abbc7
Author: TomaÅ¾ Vajngerl 
Date:   Sun Apr 2 11:18:27 2017 +0200

chart2: simplify pivot chart tests

Change-Id: I58ffe4b63a74e329272da3a371d6afebe1412975

diff --git a/chart2/qa/extras/PivotChartTest.cxx 
b/chart2/qa/extras/PivotChartTest.cxx
index f0f5b8911222..4cf872599d18 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -40,6 +40,9 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
+namespace
+{
+
 void lclModifyOrientation(uno::Reference 
xDescriptor,
   OUString sFieldName,
   sheet::DataPilotFieldOrientation eOrientation)
@@ -82,70 +85,62 @@ OUString lclGetLabel(Reference 
xChartDoc, sal_Int32 nSer
 return xLabelDataSequence->getData()[0].get();
 }
 
+uno::Reference lclGetPivotTableByName(sal_Int32 
nIndex, OUString sPivotTableName,
+   
uno::Reference const & xComponent)
+{
+uno::Reference xDoc(xComponent, 
UNO_QUERY_THROW);
+uno::Reference 
xSheetIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW);
+uno::Any aAny = xSheetIndexAccess->getByIndex(nIndex);
+uno::Reference xSheet;
+CPPUNIT_ASSERT(aAny >>= xSheet);
+uno::Reference 
xDataPilotTablesSupplier(xSheet, uno::UNO_QUERY_THROW);
+uno::Reference xDataPilotTables = 
xDataPilotTablesSupplier->getDataPilotTables();
+return 
uno::Reference(xDataPilotTables->getByName(sPivotTableName),
 UNO_QUERY_THROW);
+}
+
+} // end anonymous namespace
+
 void PivotChartTest::testRoundtrip()
 {
 uno::Sequence xSequence;
 Reference xChartDoc;
 
-load("/chart2/qa/extras/data/ods/", "PivotChart.ods");
-
-xChartDoc = Reference(getPivotChartDocFromSheet(1, 
mxComponent), uno::UNO_QUERY);
-
 std::vector aReference1 { 10162.033139, 16614.523063, 27944.146101 
};
 OUString aExpectedLabel1("Exp.");
 
 std::vector aReference2 { 101879.458079, 178636.929704, 
314626.484864 };
 OUString aExpectedLabel2("Rev.");
 
+load("/chart2/qa/extras/data/ods/", "PivotChart.ods");
+
+xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
 CPPUNIT_ASSERT(xChartDoc.is());
+// Check the data series
 {
-Reference xDataSequence = 
getDataSequenceFromDocByRole(xChartDoc, "values-y", 0);
-xSequence = xDataSequence->getData();
-
+xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 
0)->getData();
 CPPUNIT_ASSERT(lclCheckSequence(aReference1, xSequence, 1E-4));
-
-Reference xLabelDataSequence = 
getLabelDataSequenceFromDoc(xChartDoc, 0);
-xSequence = xLabelDataSequence->getData();
-
-CPPUNIT_ASSERT_EQUAL(aExpectedLabel1, xSequence[0].get());
+CPPUNIT_ASSERT_EQUAL(aExpectedLabel1, lclGetLabel(xChartDoc, 0));
 }
 {
-Reference xDataSequence = 
getDataSequenceFromDocByRole(xChartDoc, "values-y", 1);
-xSequence = xDataSequence->getData();
-
+xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 
1)->getData();
 CPPUNIT_ASSERT(lclCheckSequence(aReference2, xSequence, 1E-4));
-
-Reference xLabelDataSequence = 
getLabelDataSequenceFromDoc(xChartDoc, 1);
-xSequence = xLabelDataSequence->getData();
-
-CPPUNIT_ASSERT_EQUAL(aExpectedLabel2, xSequence[0].get());
+CPPUNIT_ASSERT_EQUAL(aExpectedLabel2, lclGetLabel(xChartDoc, 1));
 }
 
 reload("calc8");
 
-xChartDoc = Reference(getPivotChartDocFromSheet(1, 
mxComponent), uno::UNO_QUERY);
+xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
 CPPUNIT_ASSERT(xChartDoc.is());
+// Check again the data series
 {
-Reference xDataSequence = 
getDataSequenceFromDocByRole(xChartDoc, "values-y", 0);
-xSequence = xDataSequence->getData();
-
+xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 
0)->getData();
 CPPUNIT_ASSERT(lclCheckSequence(aReference1, xSequence, 1E-4));
-
-Reference xLabelDataSequence = 
getLabelDataSequenceFromDoc(xChartDoc, 0);
-xSequence = xLabelDataSequence->getData();
-
-CPPUNIT_ASSERT_EQUAL(aExpectedLabel1, xSequence[0].get());
+CPPUNIT_ASSERT_EQUAL(aExpectedLabel1, lclGetLabel(xChartDoc, 0));
 }
 {
-Reference xDataSequence = 
getDataSequenceFromDocByRole(xChartDoc, "values-y", 1);
-xSequence = xDataSequence->getData();
-
+xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 
1)->getData();
 CPPUNIT_ASSERT(lclCheckSequence(aReference2, xSequence, 1E-4));
-
-Reference xLabelDataSequence = 
getLabelDataSequenceFromDoc(xChartDoc, 1);
-xSequence = xLabelDataSequence->getData();
-
-CPPUNIT_ASSERT_EQUAL(aExpectedLabel2, xSequence[0].get());
+CPPUNIT_ASSERT_EQUAL(aExpectedLabel2, lclGetLabe

[Libreoffice-commits] core.git: Branch 'feature/pivotcharts' - chart2/qa offapi/com offapi/UnoApi_offapi.mk sc/inc sc/Library_sc.mk sc/source

2017-04-02 Thread Tomaž Vajngerl

 chart2/qa/extras/PivotChartTest.cxx |   64 ++-
 chart2/qa/extras/charttest.hxx  |   61 +++
 chart2/qa/extras/data/ods/PivotChart_PivotTableOnly.ods |binary
 dev/null|binary
 offapi/UnoApi_offapi.mk |3 
 offapi/com/sun/star/table/XTablePivotChart.idl  |   31 +
 offapi/com/sun/star/table/XTablePivotCharts.idl |   59 +++
 offapi/com/sun/star/table/XTablePivotChartsSupplier.idl |   40 ++
 sc/Library_sc.mk|3 
 sc/inc/ChartTools.hxx   |   50 ++
 sc/inc/TablePivotChart.hxx  |   72 
 sc/inc/TablePivotCharts.hxx |   77 
 sc/inc/cellsuno.hxx |6 
 sc/source/ui/unoobj/ChartTools.cxx  |  127 +++
 sc/source/ui/unoobj/TablePivotChart.cxx |   78 
 sc/source/ui/unoobj/TablePivotCharts.cxx|  279 
 sc/source/ui/unoobj/cellsuno.cxx|   17 
 sc/source/ui/unoobj/chartuno.cxx|   48 --
 18 files changed, 951 insertions(+), 64 deletions(-)

New commits:
commit b0f0f3f727516ba8f9b39e20308d76edf3a63500
Author: TomaÅ¾ Vajngerl 
Date:   Sun Apr 2 10:44:11 2017 +0200

Add table pivot chart supplier API, update tests

This adds the XTablePivotChartSupplier and related interfaces so
we can access, create, delete pivot charts from UNO in a sheet
document. With this we now distinguish between normal charts
and pivot charts. This was mainly needed because we can't extend
the "published" interfaces of TableChartSupplier.

Updated the test framework in chart2 to use the new interfaces.

Added an extensive test, which uses the API to create a new pivot
chart when there was none, and checks that the pivot chart updates
when the pivot table updates.

Change-Id: I05891b44aac7bb780e04e31292eac244af0443d4

diff --git a/chart2/qa/extras/PivotChartTest.cxx 
b/chart2/qa/extras/PivotChartTest.cxx
index b54888ef2a2f..f0f5b8911222 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -17,6 +17,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -73,6 +76,12 @@ bool lclCheckSequence(std::vector const & reference,
 return true;
 }
 
+OUString lclGetLabel(Reference xChartDoc, sal_Int32 
nSeriesIndex)
+{
+Reference xLabelDataSequence = 
getLabelDataSequenceFromDoc(xChartDoc, nSeriesIndex);
+return xLabelDataSequence->getData()[0].get();
+}
+
 void PivotChartTest::testRoundtrip()
 {
 uno::Sequence xSequence;
@@ -80,7 +89,7 @@ void PivotChartTest::testRoundtrip()
 
 load("/chart2/qa/extras/data/ods/", "PivotChart.ods");
 
-xChartDoc = Reference(getChartDocFromSheet(1, 
mxComponent), uno::UNO_QUERY);
+xChartDoc = Reference(getPivotChartDocFromSheet(1, 
mxComponent), uno::UNO_QUERY);
 
 std::vector aReference1 { 10162.033139, 16614.523063, 27944.146101 
};
 OUString aExpectedLabel1("Exp.");
@@ -114,7 +123,7 @@ void PivotChartTest::testRoundtrip()
 
 reload("calc8");
 
-xChartDoc = Reference(getChartDocFromSheet(1, 
mxComponent), uno::UNO_QUERY);
+xChartDoc = Reference(getPivotChartDocFromSheet(1, 
mxComponent), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xChartDoc.is());
 {
 Reference xDataSequence = 
getDataSequenceFromDocByRole(xChartDoc, "values-y", 0);
@@ -140,17 +149,28 @@ void PivotChartTest::testRoundtrip()
 }
 }
 
-
 void PivotChartTest::testChangePivotTable()
 {
 uno::Sequence xSequence;
 Reference xChartDoc;
 
-load("/chart2/qa/extras/data/ods/", "PivotChart2.ods");
+load("/chart2/qa/extras/data/ods/", "PivotChart_PivotTableOnly.ods");
+
+// Check that we don't have any pivot chart in the document
+uno::Reference xTablePivotCharts = 
getTablePivotChartsFromSheet(1, mxComponent);
+uno::Reference xIndexAccess(xTablePivotCharts, 
UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(0, xIndexAccess->getCount());
+
+// Create a new pivot chart
+xTablePivotCharts->addNewByName("Chart", awt::Rectangle{0, 0, 9000, 9000}, 
"DataPilot1");
+CPPUNIT_ASSERT_EQUAL(1, xIndexAccess->getCount());
 
-xChartDoc = Reference(getChartDocFromSheet(1, 
mxComponent), uno::UNO_QUERY);
+// Get the pivot chart document so we ca access its data
+xChartDoc.set(getPivotChartDocFromSheet(xTablePivotCharts, 0));
 
 CPPUNIT_ASSERT(xChartDoc.is());
+
+// Check first data series
 {
 std::vector aReference { 10162.033139, 16614.523063, 
27944.146101 };
 OUString aExpectedLabel("Exp.");
@@ -159,10 +179,10 @@ void PivotChartTest::testChangePivotTable()
 xSequence = xDataSequence->getData();
 CPPUNIT_ASSERT(lclCheckSequence(aReference, xSequence, 1E-4));
 
-Reference x

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

2017-04-02 Thread Tamás Zolnai

 cui/source/tabpages/chardlg.cxx|4 ++--
 include/editeng/charrotateitem.hxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 334e6e2f1ad3da319be0849ec426aa64b18cb599
Author: TamÃ¡s Zolnai 
Date:   Tue Mar 28 19:24:49 2017 +0200

Typo: TopToBotton -> TopToBottom

Change-Id: I1b4d3ab9ec1d1383d76a56c9662ffeeb9fe69655
Reviewed-on: https://gerrit.libreoffice.org/36014
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Zolnai 

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index b8448130ed87..f0ee84891b5b 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2971,7 +2971,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
 static_cast( rSet->Get( nWhich 
));
 if (rItem.IsBottomToTop())
 m_p90degRB->Check();
-else if (rItem.IsTopToBotton())
+else if (rItem.IsTopToBottom())
 m_p270degRB->Check();
 else
 {
@@ -3128,7 +3128,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet )
 if (m_p90degRB->IsChecked())
 aItem.SetBottomToTop();
 else if (m_p270degRB->IsChecked())
-aItem.SetTopToBotton();
+aItem.SetTopToBottom();
 rSet->Put( aItem );
 bModified = true;
 }
diff --git a/include/editeng/charrotateitem.hxx 
b/include/editeng/charrotateitem.hxx
index 95e86c3a01aa..fd08402b0e41 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -67,9 +67,9 @@ public:
 virtual bool operator==( const SfxPoolItem& ) const override;
 
 // our currently only degree values
-void SetTopToBotton()   { SetValue( 2700 ); }
+void SetTopToBottom()   { SetValue( 2700 ); }
 void SetBottomToTop()   { SetValue(  900 ); }
-bool IsTopToBotton() const  { return 2700 == GetValue(); }
+bool IsTopToBottom() const  { return 2700 == GetValue(); }
 bool IsBottomToTop() const  { return  900 == GetValue(); }
 
 bool IsFitToLine() const{ return bFitToLine; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Tamás Zolnai

 cui/source/inc/border.hxx  |1 +
 cui/source/tabpages/border.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit b1e5e3725642e2d75a4ba73f9258863d65382489
Author: TamÃ¡s Zolnai 
Date:   Sat Apr 1 22:30:42 2017 +0200

Hide useless label for adjacent cells on border tabpage

This adjacent cell settings is used only for Calc documents.
Check box was hidden, but label was not.

Change-Id: I6dcf3bb4ee316c9f3d653fc4f8f9dbcaf393e416
Reviewed-on: https://gerrit.libreoffice.org/36013
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Zolnai 

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7e5d12c596fc..c784d2917e3d 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -100,6 +100,7 @@ private:
 // #i29550#
 VclPtr   m_pMergeAdjacentBordersCB;
 VclPtr   m_pRemoveAdjcentCellBordersCB;
+VclPtr  m_pRemoveAdjcentCellBordersFT;
 
 std::vector  m_aShadowImgVec;
 std::vector  m_aBorderImgVec;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0c1a5dbe874f..0f496ec233be 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -134,6 +134,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, 
const SfxItemSet& rCore
 get(m_pMergeWithNextCB, "mergewithnext");
 get(m_pMergeAdjacentBordersCB, "mergeadjacent");
 get(m_pRemoveAdjcentCellBordersCB, "rmadjcellborders");
+get(m_pRemoveAdjcentCellBordersFT, "rmadjcellbordersft");
 
 static const sal_uInt16 pnBorderImgIds[] =
 {
@@ -349,7 +350,10 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, 
const SfxItemSet& rCore
 m_pRemoveAdjcentCellBordersCB->Enable( false );
 }
 else
+{
 m_pRemoveAdjcentCellBordersCB->Hide();
+m_pRemoveAdjcentCellBordersFT->Hide();
+}
 }
 
 SvxBorderTabPage::~SvxBorderTabPage()
@@ -385,6 +389,7 @@ void SvxBorderTabPage::dispose()
 m_pMergeWithNextCB.clear();
 m_pMergeAdjacentBordersCB.clear();
 m_pRemoveAdjcentCellBordersCB.clear();
+m_pRemoveAdjcentCellBordersFT.clear();
 SfxTabPage::dispose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-02 Thread Katarina Behrens

 sc/source/ui/unoobj/fielduno.cxx |   20 +-
 sc/source/ui/unoobj/linkuno.cxx  |   72 +++
 sc/source/ui/unoobj/notesuno.cxx |6 +--
 3 files changed, 49 insertions(+), 49 deletions(-)

New commits:
commit 38ea5fbff177fafa1f445b6f48f353b43e0f5f40
Author: Katarina Behrens 
Date:   Fri Mar 31 16:29:37 2017 +0200

Translate some German comments in sc

Change-Id: I7e920c7b3912db243444e7b17280d739c0e642a5

diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index c2ae2cab2454..5b75e72f42a5 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -167,7 +167,7 @@ class ScUnoEditEngine : public ScEditEngineDefaulter
 sal_uInt16  nFieldCount;
 sal_Int32   mnFieldType;
 std::unique_ptr
-pFound; // lokale Kopie
+pFound; // local copy
 sal_Int32   nFieldPar;
 sal_Int32   nFieldPos;
 sal_uInt16  nFieldIndex;
@@ -489,7 +489,7 @@ uno::Reference 
ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In
 
 sal_Int32 nPar = aTempEngine.GetFieldPar();
 sal_Int32 nPos = aTempEngine.GetFieldPos();
-ESelection aSelection( nPar, nPos, nPar, nPos+1 );  // Field is 1 
character
+ESelection aSelection( nPar, nPos, nPar, nPos+1 );  // Field size is 1 
character
 
 sal_Int32 eRealType = pData->GetClassId();
 uno::Reference xRet(
@@ -705,11 +705,11 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const 
OUString& rName)
 
 if (mpEditSource)
 {
-//! Feld-Funktionen muessen an den Forwarder !!!
+//! Field functions have to be passed to the forwarder !!!
 ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine();
 ScUnoEditEngine aTempEngine(pEditEngine);
 
-//  Typ egal (in Zellen gibts nur URLs)
+//  don't care about the type (only URLs can be found in the cells)
 const SvxFieldData* pField = aTempEngine.FindByPos(
 aSelection.nStartPara, aSelection.nStartPos, 
text::textfield::Type::UNSPECIFIED);
 OSL_ENSURE(pField,"getPropertyValue: Feld nicht gefunden");
@@ -730,7 +730,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const 
OUString& rName)
 else
 throw beans::UnknownPropertyException();
 }
-else// noch nicht eingefuegt
+else// not inserted yet
 {
 const SvxFieldData* pField = getData();
 if (!pField)
@@ -1023,7 +1023,7 @@ void ScEditFieldObj::setPropertyValueSheet(const 
OUString& rName, const uno::Any
 ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine();
 ScUnoEditEngine aTempEngine(pEditEngine);
 
-//  Typ egal (in Zellen gibts nur URLs)
+//  don't care about the type (only URLs can be found in the cells)
 SvxFieldData* pField = aTempEngine.FindByPos(
 aSelection.nStartPara, aSelection.nStartPos, 
text::textfield::Type::UNSPECIFIED);
 OSL_ENSURE(pField,"setPropertyValue: Feld nicht gefunden");
@@ -1132,8 +1132,8 @@ void ScEditFieldObj::DeleteField()
 aSelection.nEndPara = aSelection.nStartPara;
 aSelection.nEndPos  = aSelection.nStartPos;
 
-//! Broadcast, um Selektion in anderen Objekten anzupassen
-//! (auch bei anderen Aktionen)
+//! Broadcast in order to adjust selection in other objects
+//! (also for other actions)
 }
 }
 
@@ -1151,11 +1151,11 @@ OUString SAL_CALL ScEditFieldObj::getPresentation( 
sal_Bool bShowCommand )
 if (!mpEditSource)
 return OUString();
 
-//! Feld-Funktionen muessen an den Forwarder !!!
+//! Field functions have to be passed to the forwarder !!!
 ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine();
 ScUnoEditEngine aTempEngine(pEditEngine);
 
-//  Typ egal (in Zellen gibts nur URLs)
+//  don't care about the type (only URLs can be found in the cells)
 const SvxFieldData* pField = aTempEngine.FindByPos(
 aSelection.nStartPara, aSelection.nStartPos, 
text::textfield::Type::UNSPECIFIED);
 OSL_ENSURE(pField,"getPresentation: Feld nicht gefunden");
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 5c6cf4d14279..90b8ed94582b 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -51,7 +51,7 @@ using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::uno::RuntimeException;
 using ::std::vector;
 
-//  fuer Sheet- und Area-Links benutzt:
+//  used for sheet- and area link:
 static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap()
 {
 static const SfxItemPropertyMapEntry aSheetLinkMap_Impl[] =
@@ -124,7 +124,7 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const
 }
 }
 }
-return nullptr;// nicht gefunden
+return nullptr;// not found
 }
 
 // XNamed
@@ -132,13 +1

78 matches

Mail list logo