date:20170327

[Libreoffice-commits] online.git: test/run_unit.sh.in

2017-03-27 Thread Andras Timar

 test/run_unit.sh.in |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 2a64ae7bc08cfd89f9323027721b458ebf19dd3b
Author: Andras Timar 
Date:   Tue Mar 28 08:51:14 2017 +0200

use SSL certs from build dir in unit tests

Change-Id: If0bf245d8acb6873802c9054cb8bb30aa1005ad4

diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 54e4d3fd..df6fb155 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -74,6 +74,8 @@ if test "z$tst" == "z"; then
  --o:storage.filesystem[@allow]=true \
  --o:logging.level=trace \
  
--o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
+ 
--o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
+ 
--o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
  --o:admin_console.username=admin 
--o:admin_console.password=admin \
  > "$tst_log" 2>&1 &
  echo "  executing test"
@@ -103,6 +105,8 @@ else # newer unit tests.
--o:storage.filesystem[@allow]=true \
--o:logging.level=trace \

--o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
+   
--o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
+   
--o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin 
--o:admin_console.password=admin \
--unitlib=".libs/$tst.so" > "$tst_log" 
2>&1; then
 echo "Test $tst passed."
@@ -117,6 +121,8 @@ else # newer unit tests.
 echo " --o:storage.filesystem[@allow]=true \\"
 echo " --o:logging.level=trace \\"
 echo " 
--o:ssl.key_file_path=\"${abs_top_builddir}/etc/key.pem\" \\"
+echo " 
--o:ssl.cert_file_path=\"${abs_top_builddir}/etc/cert.pem\" \\"
+echo " 
--o:ssl.ca_file_path=\"${abs_top_builddir}/etc/ca-chain.cert.pem\" \\"
 echo " --o:admin_console.username=admin 
--o:admin_console.password=admin \\"
 echo " --unitlib=\".libs/$tst.so\""
 echo "="
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Noel Grandin

 sc/sdi/cellsh.sdi |8 
 sw/sdi/_viewsh.sdi|   21 -
 sw/sdi/viewsh.sdi |   19 ---
 sw/sdi/wviewsh.sdi|   19 ---
 sw/source/uibase/uiview/view0.cxx |8 +---
 sw/source/uibase/web/wview.cxx|3 ---
 6 files changed, 1 insertion(+), 77 deletions(-)

New commits:
commit b3549aacabffad3c4c66d901938d59e4789eef22
Author: Noel Grandin 
Date:   Mon Mar 27 10:41:37 2017 +0200

remove unused interfaces from sdi files

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

diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index c4c484cdc559..3d36d479b145 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -413,14 +413,6 @@ interface CellMovement
 }
 
 
-interface RangeSelection
-{
-import CellSelection;
-import FormatForSelection;
-import TableFont ".Font";
-import BaseSelection;
-}
-
 interface Cell
 {
 import CellSelection;
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 991262d924e0..8c85e38b7b19 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -871,24 +871,3 @@ interface BaseTextEditView
 ]
 }
 
-interface GlobalContents
-{
-UINT16  TypeFN_COLL_TYPE
-(
-UINT16  PositionFN_COLL_TYPE
-)
-
-// Areaname, Index-Titel or Empty String
-String  Title FN_COLL_TITLE
-(
-UINT16  PositionFN_COLL_TITLE
-)
-
-// Without a FileName an area of the text is inserted at this location.
-BOOLInsertDocument  FN_COLL_ADD
-(
-UINT16  PositionFN_COLL_ADD,
-UINT16  FileNameFN_PARAM_1
-)
-}
-
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index fe1357d9801a..93987042363c 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -16,25 +16,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-interface TextInTable
-{
-import Text;
-import TextTable;
-}
-
-interface ListInTable
-{
-import Text;
-import TextList;
-import TextTable;
-}
-
-interface ListInText
-{
-import TextList;
-import Text;
-}
-
 interface TextEditView : BaseTextEditView
 {
  // Slots, which are not needed in the WebDocShell
diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi
index f7995e072932..b9c0bcea9cfb 100644
--- a/sw/sdi/wviewsh.sdi
+++ b/sw/sdi/wviewsh.sdi
@@ -16,25 +16,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-interface WebTextInTable
-{
-import WebText;
-import WebTable;
-}
-
-interface WebListInTable
-{
-import WebText;
-import WebList;
-import WebTable;
-}
-
-interface WebListInText
-{
-import WebList;
-import WebText;
-}
-
 interface WebEditView : BaseTextEditView
 {
 SID_DRAW_TEXT_MARQUEE // status()
diff --git a/sw/source/uibase/uiview/view0.cxx 
b/sw/source/uibase/uiview/view0.cxx
index 160df2edd845..6c14a72f9c6c 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -57,15 +57,9 @@
 #include "shells.hrc"
 
 #define SwView
-#define GlobalContents
 #define Text
 #define TextDrawText
-#define TextInTable
-#define ListInText
-#define ListInTable
-#define WebTextInTable
-#define WebListInText
-#define WebListInTable
+
 #include 
 #include "swslots.hxx"
 #include 
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 8608ea5ba0dc..40dfde61e1e9 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -65,9 +65,6 @@
 // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define SwWebView
 #define Text
-#define TextInTable
-#define ListInText
-#define ListInTable
 #include 
 
 SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: idl/source include/sfx2 officecfg/registry sfx2/sdi sfx2/source

2017-03-27 Thread Noel Grandin

 idl/source/objects/slot.cxx  |2 
 include/sfx2/sfxsids.hrc |   18 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   28 -
 sfx2/sdi/appslots.sdi|   23 
 sfx2/sdi/docslots.sdi|5 
 sfx2/sdi/frmslots.sdi|   20 
 sfx2/sdi/sfx.sdi |  232 
--
 sfx2/source/view/viewfrm.cxx |7 
 8 files changed, 6 insertions(+), 329 deletions(-)

New commits:
commit 2fc5ef74c5200bdb82cdbbc812d7ac05a9a489dd
Author: Noel Grandin 
Date:   Mon Mar 27 08:12:58 2017 +0200

remove unhandled SID commands from sfx2

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

diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 110c6fa3aef0..1c21a4ad039e 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -480,7 +480,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const 
OString& rPrefix,
 
 if ( m == rBase.GetSlotList().size() )
 {
-OSL_FAIL("Invalid EnumSlot!");
+OSL_FAIL(OString("Invalid EnumSlot! " + aSId).getStr());
 xEnumSlot = new SvMetaSlot( *this );
 sal_uLong nValue;
 if ( rBase.FindId(aSId , &nValue) )
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 81b113b58160..1d90b87e3d38 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -49,7 +49,6 @@
 #define SID_PASTE_SPECIAL   (SID_SFX_START + 311)
 #define SID_CLIPBOARD_FORMAT_ITEMS  (SID_SFX_START + 312)
 
-#define SID_VERSION_VISIBLE (SID_SFX_START + 313)
 #define SID_PASTE_UNFORMATTED   (SID_SFX_START + 314)
 #define SID_PRINTER_NOTFOUND_WARN   (SID_SFX_START + 320)
 #define SID_PRINTER_NAME(SID_SFX_START + 322)
@@ -62,10 +61,8 @@
 
 #define SID_MAIL_RECIPIENT  (SID_SFX_START + 334)
 #define SID_MAIL_TEXT   (SID_SFX_START + 335)
-#define SID_MAIL_ATTACH (SID_SFX_START + 336)
 #define SID_MAIL_PRIORITY   (SID_SFX_START + 337)
 
-#define SID_MAIL_ATTACH_FILE(SID_SFX_START + 375)
 #define SID_MAIL_PREPAREEXPORT  (SID_SFX_START + 385)
 
 #define SID_MAIL_EXPORT_FINISHED(SID_SFX_START + 388)
@@ -79,7 +76,6 @@
 // 360-400 see SID_MAIL_...
 
 // default-ids for help
-#define SID_HELPONHELP  (SID_SFX_START + 400)
 #define SID_HELPINDEX   (SID_SFX_START + 401)
 #define SID_EXTENDEDHELP(SID_SFX_START + 402)
 #define SID_HELPBALLOONS(SID_SFX_START + 403)
@@ -91,7 +87,6 @@
 #define SID_DOCUMENTATION   (SID_SFX_START + 423)
 #define SID_SHOW_LICENSE(SID_SFX_START + 1683)
 #define SID_SHOW_CREDITS(SID_SFX_START + 1711)
-#define SID_HELP_TUTORIALS  (SID_SFX_START + 1695)
 
 // default-ids for document
 #define SID_NEWDOC  (SID_SFX_START + 500)
@@ -112,8 +107,6 @@
 #define SID_CLOSEDOC_SAVE   (SID_SFX_START +   1)
 #define SID_CLOSEDOC_FILENAME   (SID_SFX_START +   2)
 #define SID_PRINTDOC(SID_SFX_START + 504)
-#define SID_PRINT_FIRST_PAGE(SID_SFX_START +   1)
-#define SID_PRINT_LAST_PAGE (SID_SFX_START +   2)
 #define SID_PRINT_COPIES(SID_SFX_START +   3)
 #define SID_PRINT_PAGES (SID_SFX_START +1589)
 #define SID_PRINT_COLLATE   (SID_SFX_START +1590)
@@ -148,8 +141,6 @@
 #define SID_BROWSE_FORWARD  (SID_SFX_START + 1300)
 #define SID_BROWSE_BACKWARD (SID_SFX_START + 1301)
 #define SID_CREATELINK  (SID_SFX_START + 1309)
-#define SID_BOOKMARK_TITLE  (SID_SFX_START + 1310)
-#define SID_BOOKMARK_URL(SID_SFX_START + 1311)
 #define SID_EDITDOC (SID_SFX_START + 1312)
 #define SID_BROWSER_MODE(SID_SFX_START + 1313)
 // FREE (was SID_PLUGINS_ACTIVE)  (SID_SFX_START + 1314)
@@ -183,10 +174,8 @@
 #define SID_OFFICE_CHECK_PLZ(SID_SFX_START + 1610)
 #define SID_CURRENT_URL (SID_SFX_START + 1613)
 
-#define SID_TIPWINDOW   (SID_SFX_START + 1632)
 #define SID_CHARSET (SID_SFX_START + 1633)
 #define SID_OVERWRITE   (SID_SFX_START + 1634)
-#define SID_PARTWIN (SID_SFX_

[Libreoffice-commits] core.git: basctl/sdi include/svx officecfg/registry sd/inc sd/sdi svx/sdi

2017-03-27 Thread Noel Grandin

 basctl/sdi/baside.sdi|6 
 include/svx/svxids.hrc   |   15 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   47 --
 sd/inc/app.hrc   |1 
 sd/sdi/_drvwsh.sdi   |5 
 svx/sdi/svx.sdi  |  186 
--
 6 files changed, 2 insertions(+), 258 deletions(-)

New commits:
commit f5738518a6ff5321d4d35d9bed4a640ae0a6ae9a
Author: Noel Grandin 
Date:   Mon Mar 27 10:16:02 2017 +0200

remove unhandled SID commands from svx

In this case, also remove those unhandled commands which are present in
a *Commands.xcu file, but not in any other kind of .xcu file.

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

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index f4993919e5ae..6433eccfc53a 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -282,12 +282,6 @@ shell basctl_Shell
 StateMethod = GetState;
 ]
 
-SID_BASICIDE_NEWJAVAMODULE
-[
-ExecMethod  = ExecuteGlobal;
-StateMethod = GetState;
-]
-
 SID_BASICIDE_NEWDIALOG
 [
 ExecMethod  = ExecuteGlobal;
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 2ba5f668067d..e042d4e156bf 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -80,7 +80,6 @@
 #define SID_POLY_MERGE  (SID_SFX_START + 679)
 #define SID_POLY_SUBSTRACT  (SID_SFX_START + 680)
 #define SID_POLY_INTERSECT  (SID_SFX_START + 681)
-#define SID_POLY_FORMEN (SID_SFX_START + 682)
 #define SID_DISTRIBUTE_DLG  (SID_SFX_START + 683)
 #define SID_EQUALIZEWIDTH   (SID_SFX_START + 684)
 #define SID_EQUALIZEHEIGHT  (SID_SFX_START + 685)
@@ -125,7 +124,6 @@
 #define SID_BASICIDE_STAT_POS   ( SID_BASICIDE_START + 38 )
 #define SID_BASICIDE_STAT_DATE  ( SID_BASICIDE_START + 39 )
 #define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 )
-#define SID_BASICIDE_NEWJAVAMODULE  ( SID_BASICIDE_START + 41 )
 #define SID_OPTIONS_TREEDIALOG  ( SID_BASICIDE_START + 862)
 
 // StarBase-Id's
@@ -145,7 +143,6 @@
 #define SID_ENTER_GROUP (SID_SD_START+96)
 #define SID_LEAVE_GROUP (SID_SD_START+97)
 #define SID_SIZE_PAGE_WIDTH (SID_SD_START+98)
-#define SID_INSERT_IMAGE(SID_SD_START+105)
 #define SID_INSERT_MATH (SID_SD_START+106)
 #define SID_SIZE_VISAREA(SID_SD_START+114)
 #define SID_ATTR_SYMBOLTYPE (SID_SD_START+115)  //wird vom 
Chart und von SvxLineTabPage genutzt
@@ -284,7 +281,6 @@
 #define SID_BEZIER_MOVE ( SID_SVX_START + 121 )
 #define SID_BEZIER_CLOSE( SID_SVX_START + 122 )
 #define SID_BEZIER_SMOOTH   ( SID_SVX_START + 123 )
-#define SID_BEZIER_APPEND   ( SID_SVX_START + 124 )
 #define SID_BEZIER_EDIT ( SID_SVX_START + 126 )
 #define SID_BEZIER_CUTLINE  ( SID_SVX_START + 127 )
 #define SID_OBJECT_SELECT   ( SID_SVX_START + 128 )
@@ -351,8 +347,6 @@
 #define SID_INSERT_SPINBUTTON   ( SID_SVX_START + 194 )
 #define SID_INSERT_HSCROLLBAR   ( SID_SVX_START + 195 )
 #define SID_INSERT_VSCROLLBAR   ( SID_SVX_START + 196 )
-#define SID_INSERT_PREVIEW  ( SID_SVX_START + 197 )
-#define SID_INSERT_URLBUTTON( SID_SVX_START + 198 )
 #define SID_INSERT_SELECT   ( SID_SVX_START + 199 )
 #define SID_DIALOG_TESTMODE ( SID_SVX_START + 200 )
 #define SID_FRAME_LINESTYLE ( SID_SVX_START + 201 )
@@ -487,12 +481,11 @@
 #define SID_DRAWTBX_LINES   ( SID_SVX_START + 401 )
 #define SID_BACKGRND_DESTINATION( SID_SVX_START + 404 )
 #define SID_ATTR_FLASH  ( SID_SVX_START + 406 )
-#define SID_ATTR_3D_LIGHT   ( SID_SVX_START + 407 
) /* Slots mit --> koennen demnaechst entfallen */
-#define SID_ATTR_3D_START   SID_ATTR_3D_LIGHT
 
 // CAUTION! Range <413 .. 413> used by EditEngine (!)
 
-#define SID_RULER_PROTECT   ( SID_SVX_START + 415 )
+#define SID_ATTR_3D_START   ( SID_SVX_START + 415 )
+#define SID_RULER_PROTECT

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

2017-03-27 Thread Jean-Baptiste Faure

 include/unotools/eventcfg.hxx   |2 ++
 unotools/source/config/eventcfg.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 7c0054f1b7c3c475bff7a5adfdea0feaecf20748
Author: Jean-Baptiste Faure 
Date:   Mon Mar 27 22:08:26 2017 +0200

tdf#105843 : restore Application Start and Stop events

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

diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 4a855994f552..fe68e3e679dc 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
@@ -31,6 +31,8 @@
 
 enum class GlobalEventId
 {
+STARTAPP,
+CLOSEAPP,
 DOCCREATED,
 CREATEDOC,
 LOADFINISHED,
diff --git a/unotools/source/config/eventcfg.cxx 
b/unotools/source/config/eventcfg.cxx
index 998c4312f837..2e47efdd2905 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -46,6 +46,8 @@ using namespace ::com::sun::star;
 
 static o3tl::enumarray pEventAsciiNames =
 {
+"OnStartApp",
+"OnCloseApp",
 "OnCreate",
 "OnNew",
 "OnLoadFinished",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Ashod Nakashian

 net/Socket.cpp |2 -
 wsd/DocumentBroker.cpp |2 -
 wsd/LOOLWSD.cpp|   54 ++---
 3 files changed, 14 insertions(+), 44 deletions(-)

New commits:
commit fbf3b87626ab67d112813d5a207db5cb780ce701
Author: Ashod Nakashian 
Date:   Tue Mar 28 01:07:07 2017 -0400

wsd: simplify and cleanup session creation

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

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 008070e3..cb863b1f 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -47,7 +47,7 @@ SocketPoll::SocketPoll(const std::string& threadName)
 // Create the wakeup fd.
 if (::pipe2(_wakeup, O_CLOEXEC | O_NONBLOCK) == -1)
 {
-throw std::runtime_error("Failed to allocate pipe for SocketPoll 
waking.");
+throw std::runtime_error("Failed to allocate pipe for SocketPoll [" + 
threadName + "] waking.");
 }
 
 {
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 83e00329..65e57fed 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -732,7 +732,7 @@ std::string DocumentBroker::getJailRoot() const
 
 size_t DocumentBroker::queueSession(std::shared_ptr& session)
 {
-Util::assertIsLocked(_mutex);
+std::unique_lock lock(_mutex);
 
 _sessions.emplace(session->getId(), session);
 _poll->wakeup();
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f8d6aa03..544901c0 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1261,9 +1261,7 @@ static std::shared_ptr 
findOrCreateDocBroker(WebSocketHandler& w
 LOG_DBG("Found DocumentBroker with docKey [" << docKey << "].");
 docBroker = it->second;
 
-// Avoid notifying the client - either we catch and stop the
-// destruction when we add the session, -or- the client
-// re-connects.
+// Destroying the document? Let the client reconnect.
 if (docBroker->isMarkedToDestroy())
 {
 LOG_WRN("DocBroker with docKey [" << docKey << "] that is marked 
to be destroyed. Rejecting client request.");
@@ -1309,28 +1307,6 @@ static std::shared_ptr 
findOrCreateDocBroker(WebSocketHandler& w
 return docBroker;
 }
 
-/// Remove DocumentBroker session and instance from DocBrokers.
-static void removeDocBrokerSession(const std::shared_ptr& 
docBroker, const std::string& id = "")
-{
-LOG_CHECK_RET(docBroker && "Null docBroker instance", );
-
-const auto docKey = docBroker->getDocKey();
-LOG_DBG("Removing docBroker [" << docKey << "]" << (id.empty() ? "" : (" 
and session [" + id + "].")));
-
-std::unique_lock docBrokersLock(DocBrokersMutex);
-auto lock = docBroker->getLock();
-
-if (!id.empty())
-docBroker->removeSession(id);
-
-if (docBroker->getSessionsCount() == 0 || !docBroker->isAlive())
-{
-LOG_INF("Removing unloaded DocumentBroker for docKey [" << docKey << 
"].");
-DocBrokers.erase(docKey);
-docBroker->terminateChild(lock, "", true);
-}
-}
-
 static std::shared_ptr createNewClientSession(const 
WebSocketHandler* ws,
  const 
std::string& id,
  const Poco::URI& 
uriPublic,
@@ -1340,10 +1316,14 @@ static std::shared_ptr 
createNewClientSession(const WebSocketHand
 LOG_CHECK_RET(docBroker && "Null docBroker instance", nullptr);
 try
 {
-auto lock = docBroker->getLock();
-
-if (docBroker->isMarkedToDestroy())
-LOG_WRN("DocBroker is marked to destroy, attempting to add session 
anyway.");
+const std::string fs = 
FileUtil::checkDiskSpaceOnRegisteredFileSystems();
+if (!fs.empty())
+{
+LOG_WRN("File system of [" << fs << "] is dangerously low on disk 
space.");
+const std::string diskfullMsg = "error: cmd=internal 
kind=diskfull";
+// Alert all other existing sessions also
+Util::alertAllUsers(diskfullMsg);
+}
 
 // Now we have a DocumentBroker and we're ready to process client 
commands.
 if (ws)
@@ -1360,23 +1340,11 @@ static std::shared_ptr 
createNewClientSession(const WebSocketHand
 
 docBroker->queueSession(session);
 
-lock.unlock();
-
-const std::string fs = 
FileUtil::checkDiskSpaceOnRegisteredFileSystems();
-if (!fs.empty())
-{
-LOG_WRN("File system of [" << fs << "] is dangerously low on disk 
space.");
-const std::string diskfullMsg = "error: cmd=internal 
kind=diskfull";
-// Alert all other existing sessions also
-Util::alertAllUsers(diskfullMsg);
-}
-
 return session;
 }
 catch (const std::exception& exc)
 {
 LOG_WRN("Exception while preparing session [" << id << "]: " << 
exc.what());
-

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

2017-03-27 Thread Ashod Nakashian

 wsd/DocumentBroker.cpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 99844c1c924e6c2de8011c9f680151f228e74f61
Author: Ashod Nakashian 
Date:   Tue Mar 28 01:05:18 2017 -0400

wsd: protect DocBrokers session member

It is accessed from the PrisonerPoll
when cleaning up.

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 32f55aae..83e00329 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -525,6 +525,8 @@ bool DocumentBroker::saveToStorageInternal(const 
std::string& sessionId,
 return true;
 }
 
+std::unique_lock lock(_mutex);
+
 const auto it = _sessions.find(sessionId);
 if (it == _sessions.end())
 {
___
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-03-27 Thread Ashod Nakashian

 wsd/DocumentBroker.cpp |3 +++
 wsd/LOOLWSD.cpp|   23 +--
 wsd/LOOLWSD.hpp|2 ++
 3 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 1a6f6e9a65559756ead5c61804744e520ea749d3
Author: Ashod Nakashian 
Date:   Mon Mar 27 21:46:16 2017 -0400

wsd: trigger child and doc housekeeping upon terminating kit

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 384e66cf..32f55aae 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1304,6 +1304,9 @@ void 
DocumentBroker::terminateChild(std::unique_lock& lock, const st
 // Stop the polling thread.
 _poll->stop();
 _stop = true;
+
+// Trigger cleanup.
+LOOLWSD::triggerChildAndDocHousekeeping();
 }
 
 void DocumentBroker::closeDocument(const std::string& reason)
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 4e2c923a..f8d6aa03 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1112,9 +1112,6 @@ bool LOOLWSD::checkAndRestoreForKit()
 
 void PrisonerPoll::wakeupHook()
 {
-/// FIXME: we should do this less frequently
-/// currently the prisoner poll wakes up quite
-/// a lot.
 if (!LOOLWSD::checkAndRestoreForKit())
 {
 // No children have died.
@@ -1144,6 +1141,18 @@ void PrisonerPoll::wakeupHook()
 #endif
 }
 }
+
+std::unique_lock docBrokersLock(DocBrokersMutex, 
std::defer_lock);
+if (docBrokersLock.try_lock())
+{
+cleanupDocBrokers();
+}
+}
+
+void LOOLWSD::triggerChildAndDocHousekeeping()
+{
+PrisonerPoll.wakeup();
+
 }
 
 bool LOOLWSD::createForKit()
@@ -2451,7 +2460,7 @@ int LOOLWSD::innerMain()
 UnitWSD::get().invokeTest();
 
 // This timeout affects the recovery time of prespawned children.
-mainWait.poll(SocketPoll::DefaultPollTimeoutMs);
+mainWait.poll(SocketPoll::DefaultPollTimeoutMs * 4);
 
 // Wake the prisoner poll to spawn some children, if necessary.
 PrisonerPoll.wakeup();
@@ -2462,12 +2471,6 @@ int LOOLWSD::innerMain()
 UnitWSD::get().getTimeoutMilliSeconds())
 UnitWSD::get().timeout();
 
-std::unique_lock docBrokersLock(DocBrokersMutex, 
std::defer_lock);
-if (docBrokersLock.try_lock())
-{
-cleanupDocBrokers();
-}
-
 #if ENABLE_DEBUG
 if (careerSpanSeconds > 0 && time(nullptr) > startTimeSpan + 
careerSpanSeconds)
 {
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 2461a0d5..d20314c1 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -99,6 +99,8 @@ public:
 /// Return true when successfull.
 static bool createForKit();
 
+static void triggerChildAndDocHousekeeping();
+
 protected:
 void initialize(Poco::Util::Application& self) override;
 void defineOptions(Poco::Util::OptionSet& options) override;
___
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-03-27 Thread Ashod Nakashian

 wsd/DocumentBroker.cpp |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 06249045006c438e41ec7037778fcc57017735ec
Author: Ashod Nakashian 
Date:   Mon Mar 27 20:50:30 2017 -0400

wsd: flush sockets using timed loops

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 97b81fdd..384e66cf 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -248,8 +248,17 @@ void DocumentBroker::pollThread()
 }
 
 // Flush socket data.
-for (int i = 0; i < 7 && _poll->getSocketCount() > 0; ++i)
-_poll->poll(POLL_TIMEOUT_MS / 5);
+const int flushTimeoutMs = POLL_TIMEOUT_MS * 2; // ~1000ms
+const auto flushStartTime = std::chrono::steady_clock::now();
+while (_poll->getSocketCount())
+{
+const auto now = std::chrono::steady_clock::now();
+const int elapsedMs = 
std::chrono::duration_cast(now - 
flushStartTime).count();
+if (elapsedMs > flushTimeoutMs)
+break;
+
+_poll->poll(std::min(flushTimeoutMs - elapsedMs, POLL_TIMEOUT_MS / 5));
+}
 
 // Terminate properly while we can.
 auto lock = getLock();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Takeshi Abe

 starmath/source/parse.cxx |   38 ++
 1 file changed, 14 insertions(+), 24 deletions(-)

New commits:
commit 98b4bea591cdca48871db25c3be9e48600f45439
Author: Takeshi Abe 
Date:   Sat Mar 25 13:50:55 2017 +0900

starmath: Refrain from skipping an extra token at missing "}"

which is for closing "stack {".

Change-Id: I2161507634fdb33583053168acfcb87754765652
Reviewed-on: https://gerrit.libreoffice.org/35784
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3effa80d1ed4..d090cfecf93e 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2073,33 +2073,23 @@ SmStructureNode *SmParser::DoStack()
 {
 std::unique_ptr pSNode(new SmTableNode(m_aCurToken));
 NextToken();
-if (m_aCurToken.eType == TLGROUP)
+if (m_aCurToken.eType != TLGROUP)
+return DoError(SmParseError::LgroupExpected);
+SmNodeArray aExprArr;
+do
 {
-sal_uInt16 n = 0;
-
-do
-{
-NextToken();
-m_aNodeStack.emplace_front(DoAlign());
-n++;
-}
-while (m_aCurToken.eType == TPOUND);
-
-SmNodeArray ExpressionArray(n);
-for (auto rIt = ExpressionArray.rbegin(), rEnd = 
ExpressionArray.rend(); rIt != rEnd; ++rIt)
-{
-*rIt = popOrZero(m_aNodeStack);
-}
-
-if (m_aCurToken.eType != TRGROUP)
-Error(SmParseError::RgroupExpected);
-
-pSNode->SetSubNodes(ExpressionArray);
-
 NextToken();
-return pSNode.release();
+aExprArr.push_back(DoAlign());
 }
-return DoError(SmParseError::LgroupExpected);
+while (m_aCurToken.eType == TPOUND);
+
+if (m_aCurToken.eType == TRGROUP)
+NextToken();
+else
+aExprArr.push_back(DoError(SmParseError::RgroupExpected));
+
+pSNode->SetSubNodes(aExprArr);
+return pSNode.release();
 }
 
 SmStructureNode *SmParser::DoMatrix()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: localization of ui

2017-03-27 Thread aronsoyol

Hi baigal

Did you want to make a pure traditional Mongolian UI for LO?, that is a
great idea .

We have released a original version of LO, which called DelehiOffice. it
have a good compatibility with text layout of traditional Mongolian.

I guess you probably heard of it. you can download from following url

http://www.mongolfont.com/office/



2017-03-28 12:49 GMT+09:00 aronsoyol :

> Hi
> I think that the Mongolian baiti is belongs to Microsoft. and available on
> Windows
>
> 2016-11-01 9:00 GMT+09:00 toki :
>
>> On 30/10/2016 13:24, baigali wrote:
>>
>> > But i specified the UI font as Mongolian Baiti, which exist in any
>> windows system above win7,in file officecfg/registry/data/org/openoffice
>>
>> Is _Mongolian Baiti_ the name of the font?
>> If so, can you tell me where I can obtain a copy of it.
>> If it is gratis, I'll test it on my Linux box.
>>
>> I've a theory as to why it is getting substituted.
>> If my theory is right, then the bug is not in LibO per se.
>>
>> jonathon
>>
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>>
>
>
> --
> Aron
>



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

Re: localization of ui

2017-03-27 Thread aronsoyol

Hi
I think that the Mongolian baiti is belongs to Microsoft. and available on
Windows

2016-11-01 9:00 GMT+09:00 toki :

> On 30/10/2016 13:24, baigali wrote:
>
> > But i specified the UI font as Mongolian Baiti, which exist in any
> windows system above win7,in file officecfg/registry/data/org/openoffice
>
> Is _Mongolian Baiti_ the name of the font?
> If so, can you tell me where I can obtain a copy of it.
> If it is gratis, I'll test it on my Linux box.
>
> I've a theory as to why it is getting substituted.
> If my theory is right, then the bug is not in LibO per se.
>
> jonathon
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>


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

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

2017-03-27 Thread Michael Stahl

 sw/inc/accmap.hxx |5 ++-
 sw/source/core/access/acccell.cxx |2 -
 sw/source/core/access/acccell.hxx |3 +-
 sw/source/core/access/acccontext.cxx  |   42 ++
 sw/source/core/access/acccontext.hxx  |   12 ++--
 sw/source/core/access/accdoc.cxx  |   18 +++-
 sw/source/core/access/accdoc.hxx  |4 +-
 sw/source/core/access/accembedded.cxx |2 -
 sw/source/core/access/accembedded.hxx |2 -
 sw/source/core/access/accfootnote.cxx |2 -
 sw/source/core/access/accfootnote.hxx |2 -
 sw/source/core/access/accframebase.cxx|2 -
 sw/source/core/access/accframebase.hxx|2 -
 sw/source/core/access/accgraphic.cxx  |2 -
 sw/source/core/access/accgraphic.hxx  |2 -
 sw/source/core/access/accheaderfooter.cxx |4 +-
 sw/source/core/access/accheaderfooter.hxx |4 +-
 sw/source/core/access/accmap.cxx  |   39 +++
 sw/source/core/access/accnotextframe.cxx  |2 -
 sw/source/core/access/accnotextframe.hxx  |2 -
 sw/source/core/access/accpage.cxx |2 -
 sw/source/core/access/accpage.hxx |3 +-
 sw/source/core/access/accpara.cxx |2 -
 sw/source/core/access/accpara.hxx |2 -
 sw/source/core/access/accpreview.cxx  |4 +-
 sw/source/core/access/accpreview.hxx  |2 -
 sw/source/core/access/acctable.cxx|   12 +---
 sw/source/core/access/acctable.hxx|6 ++--
 sw/source/core/access/acctextframe.cxx|2 -
 sw/source/core/access/acctextframe.hxx|3 +-
 sw/source/core/inc/viewimp.hxx|4 ++
 sw/source/core/view/viewimp.cxx   |8 ++---
 32 files changed, 129 insertions(+), 74 deletions(-)

New commits:
commit aba392d1a07b8b0d40583d7e893a409cf96f1725
Author: Michael Stahl 
Date:   Fri Mar 24 13:04:32 2017 +0100

tdf#58624 sw: fix ~SwAccessibleContext() use-after-free race

As seen in JunitTest_toolkit_unoapi_1:

Method doAccessibleAction() finished with state OK
LOG> doAccessibleAction(): COMPLETED.OK
debug:27272:12:  -SwAccessibleParagraph mutexwait 0x3fd9f50
debug:27272:9:  SwAccessibleContext::Dispose 0x3872620 11SwRootFrame
debug:27272:9:  SwAccessibleContext::DisposeChildren 0x4047c80 0x386d600 
11SwPageFrame
debug:27272:9:  SwAccessibleContext::DisposeChildren xAcc 0
debug:27272:9:  SwAccessibleContext::DisposeChildren 0x4047c80 0x386cef0 
11SwBodyFrame
debug:27272:9:  SwAccessibleContext::DisposeChildren xAcc 0
debug:27272:9:  SwAccessibleContext::DisposeChildren 0x4047c80 0x3878fe0 
11SwTextFrame
debug:27272:9:  SwAccessibleContext::DisposeChildren xAcc 0
debug:27272:9:  SwAccessibleMap::RemoveContext erase 0x3872620
debug:27272:9:  ~SwAccessibleMap: frame entry 0x3878fe0
debug:27272:9:  ~SwAccessibleMap: mpFrameMap 0x3eb64a0
debug:27272:9:  ~SwAccessibleMap: mpShapeMap 0
soffice.bin: sw/source/core/access/accmap.cxx:1726: virtual 
SwAccessibleMap::~SwAccessibleMap(): Assertion `(!mpFrameMap || 
mpFrameMap->empty()) && "Frame map should be empty after disposing the root 
frame"'

The problem here is that thread 12 is blocked on SolarMutex in
~SwAccessibleParagraph(), while thread 9 is in ~SwAccessibleMap().

This means that in SwAccessibleContext::DisposeChildren(), the
WeakReference to the SwAccessibleParagraph cannot create a
uno::Reference because its reference count is 0, so
SwAccessibleContext::Dispose() is not called on it and it remains
in the SwAccessibleMap::mpFrameMap.

This triggers the assert and later on ~SwAccessibleContext() would
access the deleted SwAccessibleMap and crash.

To fix this, introduce a weak reference from SwAccessibleContext to
SwAccessibleMap; use a std::weak_ptr because that is not derived from
OWeakObject.

The weak_ptr is only used in the dtor ~SwAccessibleContext(); as
long as the ref-count of SwAccessibleContext is > 0 it is guaranteed
that the SwAccessibleContext::m_pMap is either null or valid
as the recursive Dispose() will work fine.

It is possible that additional temporary owning references could delay
the destruction of SwAccessibleMap, and the order of destruction
of Writer documents is very fragile, so rely on the SolarMutex lock
to prevent that; the only shared_ptr that owns SwAccessibleMap while
SolarMutex is not locked is the one in SwViewShellImp.

(An alternative fix would be to represent the 3 lifecycle stages of
SwAccessibleContext by adding a C++-pointer to the
SwAccessibleMap::mpFrameMap, so that DisposeChildren() can, if
the WeakReference is no longer valid due to ref-count 0, use the
pointer and clear SwAccessibleContext::m_pMap - this and the
corresponding call to SwAccessibleMap::RemoveContext() from
~SwAccessibleContext() under a mut

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

2017-03-27 Thread Jean-Pierre Ledure

 wizards/source/access2base/Application.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c317670eb6b5d29f0447feff0c33d528a88f4c8a
Author: Jean-Pierre Ledure 
Date:   Sun Mar 26 12:34:21 2017 +0200

Access2Base Missing parentheses - tdf#106710

Due to more severe Basic interpreter on final parentheses
missing parentheses were revealed
(complement to commit cc16dfb11dfc275317bb535a62b11935c562b670)

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

diff --git a/wizards/source/access2base/Application.xba 
b/wizards/source/access2base/Application.xba
index 783fca73541e..3383e7bd009a 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1147,7 +1147,7 @@ Const cstThisSub = "OpenDatabase"
Set oBaseContext = 
CreateUnoService("com.sun.star.sdb.DatabaseContext")
sDbNames() = oBaseContext.getElementNames()
bFound = False
-   For i = 0 To UBound(sDbNames()  '  Enumerate registered 
databases and check non case-sensitive equality
+   For i = 0 To UBound(sDbNames()) '  Enumerate registered 
databases and check non case-sensitive equality
If UCase(sDbNames(i)) = UCase(pvDatabaseURL) Then
sDatabaseURL = sDbNames(i)
Set oBaseSource = oBaseContext.getByName(sDatabaseURL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Jean-Pierre Ledure

 wizards/source/access2base/Application.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 648ab6fcab8b9e8642c6f5cbac9c9e44579de746
Author: Jean-Pierre Ledure 
Date:   Sun Mar 26 12:34:21 2017 +0200

Access2Base Missing parentheses - tdf#106710

Due to more severe Basic interpreter on final parentheses
missing parentheses were revealed
(complement to commit cc16dfb11dfc275317bb535a62b11935c562b670)

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

diff --git a/wizards/source/access2base/Application.xba 
b/wizards/source/access2base/Application.xba
index 9fc7308955cb..6bd29a6d86f4 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1301,7 +1301,7 @@ Const cstThisSub = "OpenDatabase"
Set oBaseContext = 
CreateUnoService("com.sun.star.sdb.DatabaseContext")
sDbNames() = oBaseContext.getElementNames()
bFound = False
-   For i = 0 To UBound(sDbNames()  '  Enumerate registered 
databases and check non case-sensitive equality
+   For i = 0 To UBound(sDbNames()) '  Enumerate registered 
databases and check non case-sensitive equality
If UCase(sDbNames(i)) = UCase(pvDatabaseURL) Then
sDatabaseURL = sDbNames(i)
Set oBaseSource = oBaseContext.getByName(sDatabaseURL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/qa

2017-03-27 Thread Tor Lillqvist

 libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |4 +
 libreofficekit/qa/unit/tiledrendering.cxx   |   26 ++--
 2 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit c0b5e7ec7112f228b31389a4a3cc9b40d7c181cb
Author: Tor Lillqvist 
Date:   Mon Mar 27 23:38:13 2017 +0300

Use symbolic names for keys from css::awt::Key

Change-Id: Iee2f4540cddeb05fcf0ae2ecadf7de8fbb4e3a0d

diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk 
b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
index 5b1727efbe98..ead598f965e5 100644
--- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
+++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
@@ -33,6 +33,10 @@ $(eval $(call 
gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\
 ))
 endif
 
+$(eval $(call gb_CppunitTest_use_api,libreofficekit_tiledrendering,\
+offapi \
+))
+
 $(eval $(call gb_CppunitTest_use_configuration,libreofficekit_tiledrendering))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx 
b/libreofficekit/qa/unit/tiledrendering.cxx
index a4e84ee8d122..a805121992e5 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -19,6 +19,8 @@
 #include 
 #include 
 
+#include 
+
 #if defined __clang__ && defined __linux__
 #include 
 #include 
@@ -263,16 +265,16 @@ void TiledRenderingTest::testDocumentLoadLanguage(Office* 
pOffice)
 // assert that '.' is the decimal separator
 insertString(*pDocument, "1.5");
 
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, 1027); // right arrow
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, 1027);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::RIGHT);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, css::awt::Key::RIGHT);
 processEventsToIdle();
 
 insertString(*pDocument, "=2*A1");
 
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, 1280); // enter
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, 1280);
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, 1025); // up arrow
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, 1025);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::RETURN);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, css::awt::Key::RETURN);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::UP);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, css::awt::Key::UP);
 processEventsToIdle();
 
 // we've got a meaningful result
@@ -290,16 +292,16 @@ void TiledRenderingTest::testDocumentLoadLanguage(Office* 
pOffice)
 // with cs-CZ, the decimal separator is ',' instead, assert that
 insertString(*pDocument, "1,5");
 
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, 1027); // right arrow
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, 1027);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::RIGHT);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, css::awt::Key::RIGHT);
 processEventsToIdle();
 
 insertString(*pDocument, "=2*A1");
 
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, 1280); // enter
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, 1280);
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, 1025); // up arrow
-pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, 1025);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::RETURN);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, css::awt::Key::RETURN);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::UP);
+pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, css::awt::Key::UP);
 processEventsToIdle();
 
 // we've got a meaningful result
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Chr . Rossmanith

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

New commits:
commit f900888ba51803d924bb5129978aa891879ecc59
Author: Chr. Rossmanith 
Date:   Sun Feb 19 21:00:41 2017 +0100

tdf#105641: no javascript in svg export for selection of objects

Change-Id: I9150449770b7cef0c424277f87a21e00e123b9ea
Reviewed-on: https://gerrit.libreoffice.org/34432
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 21e4da0fcff6..31c21943d974 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -847,7 +847,7 @@ bool SVGFilter::implExportDocument()
 implExportMasterPages( mMasterPageTargets, 0, 
mMasterPageTargets.size() - 1 );
 implExportDrawPages( mSelectedPages, 0, nLastPage );
 
-if( mbPresentation )
+if( mbPresentation && !mbExportShapeSelection )
 {
 implGenerateScript();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-03-27 Thread Gabor Kelemen

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

New commits:
commit 66997eb1f896eb49e6099c18cfe81981e99e05c6
Author: Gabor Kelemen 
Date:   Sun Mar 12 22:44:04 2017 +0100

Updated core
Project: help  16d658196f9963a5eed6071c5c3db5c85520650e

tdf#99967 (related) Drop Web Wizard help pages

Change-Id: Ib2d9b3fc7d06a82492e9c62b96f82d83854d8d9d
Reviewed-on: https://gerrit.libreoffice.org/35110
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/helpcontent2 b/helpcontent2
index 8df2786662ea..16d658196f99 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8df2786662eab8d39cbd5cd8b7f6ac2d5e710246
+Subproject commit 16d658196f9963a5eed6071c5c3db5c85520650e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Gabor Kelemen

 AllLangHelp_shared.mk   |   11 
 source/text/shared/00/0401.xhp  |2 
 source/text/shared/autopi/0100.xhp  |1 
 source/text/shared/autopi/webwizard00.xhp   |   52 ---
 source/text/shared/autopi/webwizard01.xhp   |   42 ---
 source/text/shared/autopi/webwizard02.xhp   |   53 ---
 source/text/shared/autopi/webwizard03.xhp   |   50 --
 source/text/shared/autopi/webwizard04.xhp   |   76 
 source/text/shared/autopi/webwizard05.xhp   |   48 -
 source/text/shared/autopi/webwizard05bi.xhp |   43 ---
 source/text/shared/autopi/webwizard05is.xhp |   37 -
 source/text/shared/autopi/webwizard06.xhp   |   59 -
 source/text/shared/autopi/webwizard07.xhp   |   71 --
 source/text/shared/autopi/webwizard07fc.xhp |   55 
 14 files changed, 600 deletions(-)

New commits:
commit 16d658196f9963a5eed6071c5c3db5c85520650e
Author: Gabor Kelemen 
Date:   Sun Mar 12 22:44:04 2017 +0100

tdf#99967 (related) Drop Web Wizard help pages

Change-Id: Ib2d9b3fc7d06a82492e9c62b96f82d83854d8d9d
Reviewed-on: https://gerrit.libreoffice.org/35110
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 2899038e0..e5f29dd00 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -582,17 +582,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/autopi/01170300 \
 helpcontent2/source/text/shared/autopi/01170400 \
 helpcontent2/source/text/shared/autopi/01170500 \
-helpcontent2/source/text/shared/autopi/webwizard00 \
-helpcontent2/source/text/shared/autopi/webwizard01 \
-helpcontent2/source/text/shared/autopi/webwizard02 \
-helpcontent2/source/text/shared/autopi/webwizard03 \
-helpcontent2/source/text/shared/autopi/webwizard04 \
-helpcontent2/source/text/shared/autopi/webwizard05 \
-helpcontent2/source/text/shared/autopi/webwizard05bi \
-helpcontent2/source/text/shared/autopi/webwizard05is \
-helpcontent2/source/text/shared/autopi/webwizard06 \
-helpcontent2/source/text/shared/autopi/webwizard07 \
-helpcontent2/source/text/shared/autopi/webwizard07fc \
 helpcontent2/source/text/shared/explorer/database/0200 \
 helpcontent2/source/text/shared/explorer/database/0202 \
 helpcontent2/source/text/shared/explorer/database/02010100 \
diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index e4aefae04..022f796d0 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -163,8 +163,6 @@
 
 Click Use Wizard to Create 
Report in a database file window.
 
-Choose File - Wizards - Web 
Page
-
 In form design, click the Group 
Box icon on the toolbar and use the mouse to create a frame.
 
 In form design, click the Group 
Box icon on the toolbar and use the mouse to create a frame - Wizards 
page 1
diff --git a/source/text/shared/autopi/0100.xhp 
b/source/text/shared/autopi/0100.xhp
index 0c7f79982..2f21c62e0 100644
--- a/source/text/shared/autopi/0100.xhp
+++ b/source/text/shared/autopi/0100.xhp
@@ -50,7 +50,6 @@
 
 Agenda
 
-
 Document Converter
 
 Euro Converter
diff --git a/source/text/shared/autopi/webwizard00.xhp 
b/source/text/shared/autopi/webwizard00.xhp
deleted file mode 100644
index cdf78952c..0
--- a/source/text/shared/autopi/webwizard00.xhp
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-   
-
- 
-   
-
-
-Web Wizard
-/text/shared/autopi/webwizard00.xhp
-
-
-
-
-
-
-Web 
Wizard
-The Web Wizard helps you to maintain a web site 
on an Internet server. The Web Wizard converts files in a local folder 
to a web format and uploads the files to the server. The wizard also uses one 
of the supplied templates to create an index page that contains hyperlinks to 
the uploaded files.
-
-
-
-
-The Web 
Wizard uses the File Transfer Protocol (FTP) to upload files to a server. You 
cannot use the wizard to upload the files if you connect to the internet 
through a proxy server.
-The 
wizard involves the following steps:
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/text/shared/autopi/webwizard01.xhp 
b/source/text/shared/autopi/webwizard01.xhp
deleted file mode 100644
index c079e462d..0
--- a/source/text/shared/autopi/webwizard01.xhp
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-   
-
- 
-   
-
-  
- Web Wizard - Introduction
- /text/shared/autopi/webwizard01.xhp
-  
-   
-   
-  UFI: removed help id
-Web Wizard - 
Introduction
- You can use the Web Wizard to maintain web pages on a 
server. You can also load previously saved Web Wizard settings to 
maintain an existing web page. These settings include information about the 
local folder and the FTP server.
-  
-
-Choose Web Wizard settin

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

2017-03-27 Thread Caolán McNamara

 vcl/source/gdi/dibtools.cxx |   82 
 1 file changed, 46 insertions(+), 36 deletions(-)

New commits:
commit fa4120f270f64dae43b316fdd1bc41b48e2296d3
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 13:45:40 2017 +0100

ofz#948 optimize the edge-case of converting masks to 1bit during dib load

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

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 5b672ed42912..576c38871918 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -318,9 +318,10 @@ bool ImplReadDIBPalette(SvStream& rIStm, BitmapPalette& 
rPal, bool bQuad)
 
 namespace
 {
-sal_uInt8 SanitizePaletteIndex(sal_uInt8 nIndex, bool bHasPalette, 
sal_uInt16 nPaletteEntryCount)
+sal_uInt8 SanitizePaletteIndex(sal_uInt8 nIndex, BitmapPalette& rPalette, 
bool bForceToMonoWhileReading)
 {
-if (bHasPalette && nIndex >= nPaletteEntryCount)
+const sal_uInt16 nPaletteEntryCount = rPalette.GetEntryCount();
+if (nPaletteEntryCount && nIndex >= nPaletteEntryCount)
 {
 auto nSanitizedIndex = nIndex % nPaletteEntryCount;
 SAL_WARN_IF(nIndex != nSanitizedIndex, "vcl", "invalid colormap 
index: "
@@ -328,11 +329,17 @@ namespace
 << nPaletteEntryCount);
 nIndex = nSanitizedIndex;
 }
+
+if (nPaletteEntryCount && bForceToMonoWhileReading)
+{
+return static_cast(rPalette[nIndex].GetLuminance() >= 
255);
+}
+
 return nIndex;
 }
 }
 
-bool ImplDecodeRLE( sal_uInt8* pBuffer, DIBV5Header& rHeader, 
BitmapWriteAccess& rAcc, bool bRLE4 )
+bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header& rHeader, 
BitmapWriteAccess& rAcc, BitmapPalette& rPalette, bool 
bForceToMonoWhileReading, bool bRLE4)
 {
 Scanline pRLE = pBuffer;
 Scanline pEndRLE = pBuffer + rHeader.nSizeImage;
@@ -343,8 +350,6 @@ bool ImplDecodeRLE( sal_uInt8* pBuffer, DIBV5Header& 
rHeader, BitmapWriteAccess&
 sal_uLong   nX = 0UL;
 sal_uInt8   cTmp;
 boolbEndDecoding = false;
-const bool bHasPalette = rAcc.HasPalette();
-const sal_uInt16 nPaletteEntryCount = rAcc.GetPaletteEntryCount();
 
 do
 {
@@ -370,10 +375,10 @@ bool ImplDecodeRLE( sal_uInt8* pBuffer, DIBV5Header& 
rHeader, BitmapWriteAccess&
 cTmp = *pRLE++;
 
 if( nX < nWidth )
-rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(cTmp >> 4, bHasPalette, nPaletteEntryCount));
+rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(cTmp >> 4, rPalette, bForceToMonoWhileReading));
 
 if( nX < nWidth )
-rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(cTmp & 0x0f, bHasPalette, nPaletteEntryCount));
+rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(cTmp & 0x0f, rPalette, bForceToMonoWhileReading));
 }
 
 if( nRunByte & 1 )
@@ -382,7 +387,7 @@ bool ImplDecodeRLE( sal_uInt8* pBuffer, DIBV5Header& 
rHeader, BitmapWriteAccess&
 return false;
 
 if( nX < nWidth )
-rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(*pRLE >> 4, bHasPalette, nPaletteEntryCount));
+rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(*pRLE >> 4, rPalette, bForceToMonoWhileReading));
 
 pRLE++;
 }
@@ -403,7 +408,7 @@ bool ImplDecodeRLE( sal_uInt8* pBuffer, DIBV5Header& 
rHeader, BitmapWriteAccess&
 return false;
 
 if( nX < nWidth )
-rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(*pRLE, bHasPalette, nPaletteEntryCount));
+rAcc.SetPixelIndex(nY, nX++, 
SanitizePaletteIndex(*pRLE, rPalette, bForceToMonoWhileReading));
 
 pRLE++;
 }
@@ -450,19 +455,19 @@ bool ImplDecodeRLE( sal_uInt8* pBuffer, DIBV5Header& 
rHeader, BitmapWriteAccess&
 for( sal_uLong i = 0UL; i < nRunByte; i++ )
 {
 if( nX < nWidth )
-rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp 
>> 4, bHasPalette, nPaletteEntryCount));
+rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp 
>> 4, rPalette, bForceToMonoWhileReading));
 
 if( nX < nWidth )
-rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp 
& 0x0f, bHasPalette, nPaletteEntryCount));
+rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp 
& 0x0f, rPalette, bForceToMonoWhileRea

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/bin

2017-03-27 Thread Bryan Quigley

 config_host.mk.in |1 
 configure.ac  |   42 +++---
 solenv/bin/modules/installer.pm   |6 ++-
 solenv/bin/modules/installer/systemactions.pm |7 +++-
 4 files changed, 14 insertions(+), 42 deletions(-)

New commits:
commit f927282853407ff6bcf1dc58b1dc86dcb015be0f
Author: Bryan Quigley 
Date:   Mon Mar 13 10:49:03 2017 -0400

Remove last use of md5sum (in building)

Switch to using sha256sum for checking if files change.  Not for
security, just so we don't need to check for md5sum.

We also change the Windows installer to rely on the perm md5
digest instead of the environment variable.  The code to do this was
already in directory.pm

Change-Id: I24aed542c6201abf030fdd62116aec3f8ea3513b
Reviewed-on: https://gerrit.libreoffice.org/35140
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/config_host.mk.in b/config_host.mk.in
index ae7792504735..5796b56d184b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -376,7 +376,6 @@ export MARIADB_LIBS=$(gb_SPACE)@MARIADB_LIBS@
 export LIBMARIADB=@LIBMARIADB@
 export LIBMARIADB_PATH=@LIBMARIADB_PATH@
 export BUNDLE_MARIADB=@BUNDLE_MARIADB@
-export MD5SUM=@MD5SUM@
 export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
 export MDDS_LIBS=$(gb_SPACE)@MDDS_LIBS@
 export MERGELIBS=@MERGELIBS@
diff --git a/configure.ac b/configure.ac
index c81983c042c9..d6eb7765a28d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11867,38 +11867,6 @@ AC_SUBST(WGET)
 AC_SUBST(CURL)
 
 #
-# check for md5sum
-#
-MD5SUM=
-
-for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum 
/opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
-if test "$i" = "md5"; then
-eval "$i -x" > /dev/null 2>&1
-else
-eval "$i --version" > /dev/null 2>&1
-fi
-ret=$?
-if test $ret -eq 0; then
-MD5SUM=$i
-break
-fi
-done
-
-if test "$MD5SUM" = "md5"; then
-if md5 -r < /dev/null > /dev/null 2>/dev/null; then
-MD5SUM="$MD5SUM -r"
-elif md5 -n < /dev/null > /dev/null 2>/dev/null; then
-MD5SUM="$MD5SUM -n"
-fi
-fi
-
-if test -z "$MD5SUM"; then
-AC_MSG_ERROR([no md5sum found!])
-fi
-
-AC_SUBST(MD5SUM)
-
-#
 # check for sha256sum
 #
 SHA256SUM=
@@ -12694,12 +12662,12 @@ AC_SUBST(LO_PATH)
 
 libo_FUZZ_SUMMARY
 
-# Generate a configuration md5 we can use for deps
+# Generate a configuration sha256 we can use for deps
 if test -f config_host.mk; then
-config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
+config_sha256=`$SHA256SUM config_host.mk | sed "s/ .*//"`
 fi
 if test -f config_host_lang.mk; then
-config_lang_md5=`$MD5SUM config_host_lang.mk | sed "s/ .*//"`
+config_lang_sha256=`$SHA256SUM config_host_lang.mk | sed "s/ .*//"`
 fi
 
 CFLAGS=$my_original_CFLAGS
@@ -12757,7 +12725,7 @@ fi
 # touch the config timestamp file
 if test ! -f config_host.mk.stamp; then
 echo > config_host.mk.stamp
-elif test "$config_md5" = `$MD5SUM config_host.mk | sed "s/ .*//"`; then
+elif test "$config_sha256" = `$SHA256SUM config_host.mk | sed "s/ .*//"`; then
 echo "Host Configuration unchanged - avoiding scp2 stamp update"
 else
 echo > config_host.mk.stamp
@@ -12766,7 +12734,7 @@ fi
 # touch the config lang timestamp file
 if test ! -f config_host_lang.mk.stamp; then
 echo > config_host_lang.mk.stamp
-elif test "$config_lang_md5" = `$MD5SUM config_host_lang.mk | sed "s/ .*//"`; 
then
+elif test "$config_lang_sha256" = `$SHA256SUM config_host_lang.mk | sed "s/ 
.*//"`; then
 echo "Language Configuration unchanged - avoiding scp2 stamp update"
 else
 echo > config_host_lang.mk.stamp
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index a29beb09efb2..3d88b9986e14 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -466,8 +466,10 @@ sub run {
 if (length($loglanguagestring) > $installer::globals::max_lang_length)
 {
 my $number_of_languages = 
installer::systemactions::get_number_of_langs($loglanguagestring);
-chomp(my $shorter = `echo $loglanguagestring | $ENV{'MD5SUM'} | 
sed -e "s/ .*//g"`);
-my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+#replace this in the same it was done in 
installer/windows/directory.pm
+#chomp(my $shorter = `echo $loglanguagestring | $ENV{'MD5SUM'} | 
sed -e "s/ .*//g"`);
+#my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+my $id = 
installer::windows::msiglobal::calculate_id($loglanguagestring, 8); # taking 
only the first 8 digits
 $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id;
 }
 
diff --git a/solenv/bin/modules/installer/systemactions.pm 
b/solenv/bin/modules/installer/systemactions.pm
index 0c17b48436e7..4a5ff8d008b4 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++

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

2017-03-27 Thread Umang Jain

 sd/source/ui/docshell/docshel4.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 29c066ee3c0bf307ca14851dd35e314ab1a3f20b
Author: Umang Jain 
Date:   Tue Mar 14 02:54:33 2017 +0530

Resolves tdf#106321: End text edit mode before exporting

Change-Id: I5b6c4428d7ab2f230d57402edffa274aceac097f
Reviewed-on: https://gerrit.libreoffice.org/35150
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 71a96c2705ab..00b7d463329b 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -644,6 +644,13 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
 
 mpDoc->SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP );
 
+if ( mpViewShell )
+{
+::sd::View* pView = mpViewShell->GetView();
+if ( pView->IsTextEdit() )
+pView->SdrEndTextEdit();
+}
+
 bRet = xFilter->Export();
 if( !bRet )
 mpDoc->SetSwapGraphicsMode( nOldSwapMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Michael Meeks

 net/Ssl.cpp |8 +++-
 net/Ssl.hpp |   16 
 wsd/LOOLWSD.cpp |   23 +--
 wsd/LOOLWSD.hpp |4 
 4 files changed, 36 insertions(+), 15 deletions(-)

New commits:
commit e26079eecb78947f2394fcad8092483890946773
Author: Michael Meeks 
Date:   Mon Mar 27 20:14:16 2017 +0100

tdf#106797 - avoid locking up / crashing on exceptions from main.

diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index 6e266c70..74f606cf 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -9,6 +9,7 @@
 
 #include "config.h"
 
+#include 
 #include "Ssl.hpp"
 
 #include 
@@ -25,7 +26,6 @@ extern "C"
 };
 }
 
-std::atomic SslContext::RefCount(0);
 std::unique_ptr SslContext::Instance;
 std::vector> SslContext::Mutexes;
 
@@ -132,6 +132,12 @@ SslContext::~SslContext()
 CONF_modules_free();
 }
 
+void SslContext::uninitialize()
+{
+assert (Instance);
+Instance.reset();
+}
+
 void SslContext::lock(int mode, int n, const char* /*file*/, int /*line*/)
 {
 if (mode & CRYPTO_LOCK)
diff --git a/net/Ssl.hpp b/net/Ssl.hpp
index 2c1cabd7..7c13474a 100644
--- a/net/Ssl.hpp
+++ b/net/Ssl.hpp
@@ -31,19 +31,11 @@ public:
const std::string& keyFilePath,
const std::string& caFilePath)
 {
-if (++RefCount == 1)
-{
-Instance.reset(new SslContext(certFilePath, keyFilePath, 
caFilePath));
-}
+assert (!Instance);
+Instance.reset(new SslContext(certFilePath, keyFilePath, caFilePath));
 }
 
-static void uninitialize()
-{
-if (--RefCount == 0)
-{
-Instance.reset();
-}
-}
+static void uninitialize();
 
 static SSL* newSsl()
 {
@@ -59,6 +51,7 @@ private:
 
 void initDH();
 void initECDH();
+void shutdown();
 
 std::string getLastErrorMsg();
 
@@ -71,7 +64,6 @@ private:
 static void dynlockDestroy(struct CRYPTO_dynlock_value* lock, const char* 
file, int line);
 
 private:
-static std::atomic RefCount;
 static std::unique_ptr Instance;
 static std::vector> Mutexes;
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index bdad1aaf..4e2c923a 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2343,7 +2343,7 @@ bool LOOLWSD::handleShutdownRequest()
 return false;
 }
 
-int LOOLWSD::main(const std::vector& /*args*/)
+int LOOLWSD::innerMain()
 {
 #ifndef FUZZER
 SigUtil::setUserSignals();
@@ -2425,6 +2425,7 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 {
 const auto msg = "Failed to fork child processes.";
 LOG_FTL(msg);
+std::cerr << msg << std::endl;
 throw std::runtime_error(msg);
 }
 
@@ -2519,7 +2520,11 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 LOG_INF("Removing jail [" << path << "].");
 FileUtil::removeFile(path, true);
 }
+return Application::EXIT_OK;
+}
 
+void LOOLWSD::cleanup()
+{
 // Finally, we no longer need SSL.
 if (LOOLWSD::isSSLEnabled())
 {
@@ -2529,14 +2534,28 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 SslContext::uninitialize();
 #endif
 }
+}
+
+int LOOLWSD::main(const std::vector& /*args*/)
+{
+int returnValue;
+
+try {
+returnValue = innerMain();
+} catch (...) {
+cleanup();
+throw;
+}
+
+cleanup();
 
-int returnValue = Application::EXIT_OK;
 UnitWSD::get().returnValue(returnValue);
 
 LOG_INF("Process [loolwsd] finished.");
 return returnValue;
 }
 
+
 void UnitWSD::testHandleRequest(TestRequest type, UnitHTTPServerRequest& /* 
request */, UnitHTTPServerResponse& /* response */)
 {
 switch (type)
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 94ff1475..2461a0d5 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -103,8 +103,12 @@ protected:
 void initialize(Poco::Util::Application& self) override;
 void defineOptions(Poco::Util::OptionSet& options) override;
 void handleOption(const std::string& name, const std::string& value) 
override;
+int innerMain();
 int main(const std::vector& args) override;
 
+/// Handle various global static destructors.
+void cleanup();
+
 private:
 static Util::RuntimeConstant SSLEnabled;
 static Util::RuntimeConstant SSLTermination;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 2 commits - debian/changelog debian/control debian/loolwsd.service debian/rules loleaflet/src loolwsd.spec.in

2017-03-27 Thread Andras Timar

 debian/changelog   |6 ++
 debian/control |2 +-
 debian/loolwsd.service |   13 +
 debian/rules   |4 
 loleaflet/src/admin/AdminSocketSettings.js |4 ++--
 loleaflet/src/core/Socket.js   |4 ++--
 loolwsd.spec.in|   14 +++---
 7 files changed, 31 insertions(+), 16 deletions(-)

New commits:
commit b5a7d436285690c606b65dc1cb65067fe5191076
Author: Andras Timar 
Date:   Mon Mar 27 20:40:09 2017 +0200

Revert "Use hub link for git log"

This reverts commit 460da71ce23639b275e95f53fd2a5c8a1ddc2901.
hub link does not work for me

diff --git a/loleaflet/src/admin/AdminSocketSettings.js 
b/loleaflet/src/admin/AdminSocketSettings.js
index 537d1487..5a7ec207 100644
--- a/loleaflet/src/admin/AdminSocketSettings.js
+++ b/loleaflet/src/admin/AdminSocketSettings.js
@@ -70,7 +70,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
var loolwsdVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-online/' + h + '">' + h + '';
+   h = 'https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' + 
h + '';

$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h + 
')');
}
else {
@@ -81,7 +81,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-core/' + h + '">' + h + '';
+   h = 'https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h 
+ '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 787a487e..ea8f15e9 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -176,7 +176,7 @@ L.Socket = L.Class.extend({
var loolwsdVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-online/' + h + '">' + h + '';
+   h = 'https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' + 
h + '';

$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h + 
')');
}
else {
@@ -192,7 +192,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-core/' + h + '">' + h + '';
+   h = 'https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h 
+ '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
commit 43aea3642b77fb75b04ed6cb490168361e5f55a5
Author: Andras Timar 
Date:   Mon Mar 27 20:35:04 2017 +0200

Collabora Online packaging

Change-Id: Iecf3620d8b4d780aa095ebd4b823e5260b92db6f

diff --git a/debian/changelog b/debian/changelog
index 56cbc556..42db8d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.0-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool21
+
+ -- Andras Timar   Wed, 29 Mar 2017 11:40:00 +0200
+
 loolwsd (1.8.2-1) unstable; urgency=medium
 
   * Fix crash in Impress.
diff --git a/debian/control b/debian/control
index c4dc9c60..c4c841ec 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
li

[Libreoffice-commits] core.git: configure.ac download.lst writerperfect/qa

2017-03-27 Thread David Tardon

 configure.ac|2 +-
 download.lst|6 +++---
 writerperfect/qa/unit/WpftCalcFilterTest.cxx|1 +
 writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 |binary
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2753797c98d56a51666b3a6c75e1eb43495c5134
Author: David Tardon 
Date:   Mon Mar 27 19:00:39 2017 +0200

upload libwps 0.4.6

Change-Id: Icd1ce144733d2f5e907a19bb6ef307d50becb49d
Reviewed-on: https://gerrit.libreoffice.org/35769
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 12ab4421f004..c81983c042c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7751,7 +7751,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.5])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.6])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 3428fbbd9687..15e211bc8d71 100644
--- a/download.lst
+++ b/download.lst
@@ -223,9 +223,9 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
 export WPG_SHA256SUM := 
29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59
 export WPG_VERSION_MICRO := 1
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_SHA256SUM := 
9192ad0c0ad22bfc24ace884286820029c0decc26ad37e0bed0efbd91ff72ea9
-export WPS_VERSION_MICRO := 5
-export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
+export WPS_SHA256SUM := 
e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0
+export WPS_VERSION_MICRO := 6
+export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_SHA256SUM := 
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx 
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 29c3111be937..7a7dc531826c 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -38,6 +38,7 @@ void WpftCalcFilterTest::test()
 const writerperfect::test::WpftOptionalMap_t aWpsOptional
 {
 {"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
+{"Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6)},
 };
 
 doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libmwaw/");
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123
new file mode 100755
index ..1d3a7e752cb1
Binary files /dev/null and 
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - configure.ac sw/qa sw/source

2017-03-27 Thread Andras Timar

 configure.ac  |2 +-
 sw/qa/extras/ww8import/data/tdf106799.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |   15 +++
 sw/source/filter/ww8/ww8par.cxx   |4 +++-
 4 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit edec1e5e9c3ce19408e71eb71404ece2e55f83b6
Author: Andras Timar 
Date:   Mon Mar 27 21:13:32 2017 +0200

Bump version to 5.1-24

Change-Id: I8fc85d5189c9ee8bddd1a83fa57c1f4fe096e5df

diff --git a/configure.ac b/configure.ac
index aa6a23245e49..2ca0f717ab72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.1.10.23],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.1.10.24],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 334b06f5a44f9a5a4e08a8c9c8929a75c363fd96
Author: Mike Kaganski 
Date:   Mon Mar 27 17:35:45 2017 +0300

tdf#106799 WW8: Accept TTP Mark without Cell Mark

Paragraph mark of inner table (0x0D) sometimes has
sprmPFInnerTtp, but no sprmPFInnerTableCell. This still counts
as cell end (at least, MS Word treats it that way).

Unit test included.

Reviewed-on: https://gerrit.libreoffice.org/35763
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 59af9cbbccee600408c89e872d548d153523ab1f)

Change-Id: I5589cdd486c03ca4567d61882826cc7c245a40c9

diff --git a/sw/qa/extras/ww8import/data/tdf106799.doc 
b/sw/qa/extras/ww8import/data/tdf106799.doc
new file mode 100644
index ..0637e8cce692
Binary files /dev/null and b/sw/qa/extras/ww8import/data/tdf106799.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 3220a523740a..a3c809cd2dac 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -562,6 +562,21 @@ DECLARE_WW8IMPORT_TEST(testTdf106291, "tdf106291.doc")
 CPPUNIT_ASSERT(cellHeight.toInt32() > 200); // height might depend on font 
size
 }
 
+DECLARE_WW8IMPORT_TEST(testTdf106799, "tdf106799.doc")
+{
+sal_Int32 nCellWidths[3][4] = { { 9530, 0, 0, 0 },{ 2382, 2382, 2382, 2384 
},{ 2382, 2382, 2382, 2384 } };
+sal_Int32 nCellTxtLns[3][4] = { { 1, 0, 0, 0 },{ 1, 0, 0, 0},{ 1, 1, 1, 1 
} };
+// Table was distorted because of missing sprmPFInnerTableCell at 
paragraph marks (0x0D) with sprmPFInnerTtp
+for (sal_Int32 nRow : { 0, 1, 2 })
+for (sal_Int32 nCell : { 0, 1, 2, 3 })
+{
+OString cellXPath("/root/page/body/tab/row/cell/tab/row[" + 
OString::number(nRow+1) + "]/cell[" + OString::number(nCell+1) + "]/");
+CPPUNIT_ASSERT_EQUAL_MESSAGE(cellXPath.getStr(), 
nCellWidths[nRow][nCell], parseDump(cellXPath + "infos/bounds", 
"width").toInt32());
+if (nCellTxtLns[nRow][nCell] != 0)
+CPPUNIT_ASSERT_EQUAL_MESSAGE(cellXPath.getStr(), 
nCellTxtLns[nRow][nCell], parseDump(cellXPath + "txt/Text", 
"nLength").toInt32());
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 71e1acabd799..4ffe803ea3bf 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3679,7 +3679,9 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
 bParaMark = false;
 }
 }
-else if (m_bWasTabCellEnd)
+// tdf#106799: We expect TTP marks to be also cell marks,
+// but sometimes sprmPFInnerTtp comes without 
sprmPFInnerTableCell
+else if (m_bWasTabCellEnd || m_bWasTabRowEnd)
 {
 TabCellEnd();
 bParaMark = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread dennisroczek

 sc/source/ui/drawfunc/futext.cxx |  121 +++
 1 file changed, 24 insertions(+), 97 deletions(-)

New commits:
commit c77dbe640437ca87cb188acbfacf94793bd83629
Author: dennisroczek 
Date:   Thu Mar 2 21:10:32 2017 +

tdf#39468 translate German source code comments

Change-Id: Ic10f7543daed77a516155f7130838a1e8558243f
Reviewed-on: https://gerrit.libreoffice.org/34833
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index c4c426e75181..f672ce2894c3 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -41,8 +41,8 @@
 // Create default drawing objects via keyboard
 #include "scresid.hxx"
 
-//  Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
-//! fusel,fuconstr,futext - zusammenfassen!
+// maximum of mouse movement which allows to start Drag&Drop
+//! fusel,fuconstr,futext - combined!
 #define SC_MAXDRAGMOVE  3
 
 static void lcl_InvalidateAttribs( SfxBindings& rBindings )
@@ -101,12 +101,6 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, 
SdrObject* pObj )
 }
 }
 
-/*
-|*
-|* Basisklasse fuer Textfunktionen
-|*
-\/
-
 FuText::FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq) :
 FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq),
@@ -114,23 +108,11 @@ FuText::FuText(ScTabViewShell* pViewSh, vcl::Window* 
pWin, ScDrawView* pViewP,
 {
 }
 
-/*
-|*
-|* Destruktor
-|*
-\/
-
 FuText::~FuText()
 {
 //  StopEditMode(); // in Deactivate !
 }
 
-/*
-|*
-|* MouseButtonDown-event
-|*
-\/
-
 bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
 {
 // remember button state for creation of own MouseEvents
@@ -138,7 +120,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
 bool bStraightEnter = true;
 
 if ( pView->MouseButtonDown(rMEvt, pWindow) )
-return true; // Event von der SdrView ausgewertet
+return true; // event handled from SdrView
 
 if ( pView->IsTextEdit() )
 {
@@ -146,13 +128,13 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
 {
 if( !IsSizingOrMovingNote(rMEvt) )
 {
-StopEditMode();// Danebengeklickt, Ende mit Edit
+StopEditMode();// Clicked outside, ending edit
 bStraightEnter = false;
 }
 }
 else
 {
-StopEditMode();// Clicked outside, ending edit.
+StopEditMode();// Clicked outside, ending edit
 pView->UnmarkAll();
 bStraightEnter = false;
 }
@@ -164,9 +146,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
 if ( rMEvt.IsLeft() )
 {
 SdrHdl* pHdl = pView->PickHandle(aMDPos);
-
 const size_t nHdlNum = pView->GetHdlNum(pHdl);
-
 if (pHdl != nullptr)
 {
 if (pView->HasMarkablePoints() && pView->IsPointMarkable(*pHdl))
@@ -210,7 +190,6 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
 
 //  vertical flag:
 //  deduced from slot ids only if text object has no content
-
 sal_uInt16 nSlotID = aSfxRequest.GetSlot();
 bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
 OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
@@ -218,15 +197,15 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
 bVertical = pOPO->IsVertical(); // content wins
 pO->SetVertical( bVertical );
 
-//!??   ohne uebergebenen Outliner stimmen die Defaults nicht 
???!?
+//!?? the default values are not correct when result is 
without outliner ???!?
 if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) )
 {
-//  EditEngine-UndoManager anmelden
+// subscribe EditEngine-UndoManager
 pViewShell->SetDrawTextUndo( &pO->GetUndoManager() );
 
 OutlinerView* pOLV = pView->GetTextEditOutlinerView();
 if ( pOLV->MouseButtonDown(rMEvt) )
-return true; // Event an den Outliner
+return true; // Event to the Outliner
 }
 }
 else
@@ -306,9 +285,8 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEv

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

2017-03-27 Thread Bernhard Widl

 include/tubes/manager.hxx |2 +-
 tubes/source/manager.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d5fc2acf2354d72fb32e1cbae620d604c904cff
Author: Bernhard Widl 
Date:   Mon Mar 27 18:40:08 2017 +0200

tdf#89329: use unique_ptr for pImpl in tubes/manager

Change-Id: Ic70883b58c9b3a0b56e6c07594a2758e04e7f5ee
Reviewed-on: https://gerrit.libreoffice.org/35767
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/include/tubes/manager.hxx b/include/tubes/manager.hxx
index 2ea14fce3888..063cf975e587 100644
--- a/include/tubes/manager.hxx
+++ b/include/tubes/manager.hxx
@@ -145,7 +145,7 @@ public:
 TUBES_DLLPUBLIC static void addSuffixToNames( const char* pName );
 
 private:
-static TeleManagerImpl* pImpl;
+static std::unique_ptr pImpl;
 
 static ::osl::Mutex&GetMutex();
 };
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index a742e2811491..08dacfb3ed58 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -436,7 +436,7 @@ bool TeleManager::init( bool bListen )
 
 void TeleManager::finalize()
 {
-delete pImpl;
+pImpl.reset();
 }
 
 bool TeleManager::createAccountManager()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-03-27 Thread Olivier Hallot

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

New commits:
commit 92893d7cb556d612457d13dd6f3f0d60d8e0d3e3
Author: Olivier Hallot 
Date:   Mon Mar 27 15:23:10 2017 -0300

Updated core
Project: help  8df2786662eab8d39cbd5cd8b7f6ac2d5e710246

Fix and improve help contents in LibreLogo

Unit #33628624 (uk)
Unit #33628659 (uk)
Unit #33628628 (uk)

Change-Id: Id4e911c58bd353f8aa46020c185bb6763fbd1bf9
Reviewed-on: https://gerrit.libreoffice.org/35772
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 53e3c2005412..8df2786662ea 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 53e3c20054125974e4df3f41f629f38a1e1a6ca8
+Subproject commit 8df2786662eab8d39cbd5cd8b7f6ac2d5e710246
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-03-27 Thread Olivier Hallot

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

New commits:
commit a2426b96d59bdf8a9168eb60fa942d6f6fd76001
Author: Olivier Hallot 
Date:   Mon Mar 27 15:31:42 2017 -0300

Updated core
Project: help  53e3c20054125974e4df3f41f629f38a1e1a6ca8

Fix help content

Unit #100823576 (uk)

Change-Id: I5a7acdda04e5f85d48978e8a39c6903c528dcd11
Reviewed-on: https://gerrit.libreoffice.org/35774
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 2334c028345b..53e3c2005412 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2334c028345bc719027801c0385f54690d713af5
+Subproject commit 53e3c20054125974e4df3f41f629f38a1e1a6ca8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Olivier Hallot

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

New commits:
commit 8df2786662eab8d39cbd5cd8b7f6ac2d5e710246
Author: Olivier Hallot 
Date:   Mon Mar 27 15:23:10 2017 -0300

Fix and improve help contents in LibreLogo

Unit #33628624 (uk)
Unit #33628659 (uk)
Unit #33628628 (uk)

Change-Id: Id4e911c58bd353f8aa46020c185bb6763fbd1bf9
Reviewed-on: https://gerrit.libreoffice.org/35772
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/swriter/librelogo/LibreLogo.xhp 
b/source/text/swriter/librelogo/LibreLogo.xhp
index 8619c4c33..a95d80315 100644
--- a/source/text/swriter/librelogo/LibreLogo.xhp
+++ b/source/text/swriter/librelogo/LibreLogo.xhp
@@ -218,7 +218,7 @@
 Shape 
grouping
  ; PICTURE [ 
LibreLogo_commands ] PICTURE [ FORWARD 100 CIRCLE 100 ] ; tree-like 
grouped shape
 See also 
âGroupâ in LibreOffice Writer Help.
- TO tree 
location   PENUP POSITION location HEADING 0 PENDOWN   PICTURE [ 
FORWARD 100 CIRCLE 100 ] ; tree-like grouped shape END  PICTURE 
[ tree [30, 50] tree [100, 50] ] ; grouped shapes in a grouped 
shape
+ TO tree 
location   PENUP POSITION location HEADING 0 PENDOWN   PICTURE [ 
FORWARD 100 CIRCLE 100 ] ; tree-like grouped shape END  PICTURE 
[ tree [230, 400] tree [300, 400] ] ; grouped shapes in a grouped 
shape
 Starting new 
line shapes
  PICTURE ; start a 
new line shape FORWARD 10 PICTURE FORWARD 10 ; two line 
shapes
 Saving SVG 
images
@@ -226,7 +226,7 @@
 Saving 
SVG/SMIL animations (drawings with SLEEP commands)
  PICTURE 
âanimation.svgâ [ CIRCLE 5 SLEEP 1000 CIRCLE 99 ] ; save as an SVG/SMIL 
animation (see also SLEEP) PICTURE âanimation2.svgâ [ CIRCLE 5 SLEEP 
1000 CIRCLE 99 SLEEP 2000 ] ; as above, but using SLEEP after the last object 
will result looping: after 2 seconds the SVG animation restarts in 
SMIL-conformant browsers
 Consistency 
at the left border
-Use picture to keep 
the consistency of positions and line shapes at the left border of 
Writer:
+Use PICTURE to keep 
the consistency of positions and line shapes at the left border of 
Writer:
  PICTURE [ CIRCLE 20 
POSITION [-100, 100] CIRCLE 20 ]
 Loops
 REPEAT
@@ -257,7 +257,7 @@
 Subroutines
 TO, 
END
 New word (or 
procedure).
- TO triangle   
REPEAT [ FORWARD 100 RIGHT 120 ] FILL END  REPEAT 10 [ triangle 
PENUP POSITION ANY PENDOWN ]
+ TO triangle   
REPEAT 2 [ FORWARD 100 RIGHT 120 ] FILL END  REPEAT 10 [ 
triangle PENUP POSITION ANY PENDOWN ]
 OUTPUT
 Return value of the 
function.
  TO 
randomletter   OUTPUT RANDOM âqwertzuiopasdfghjklyxcvbnmâ 
END  PRINT randomletter + randomletter + randomletter ; print 
3-letter random character sequence
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Olivier Hallot

 source/text/shared/00/00040500.xhp |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 53e3c20054125974e4df3f41f629f38a1e1a6ca8
Author: Olivier Hallot 
Date:   Mon Mar 27 15:31:42 2017 -0300

Fix help content

Unit #100823576 (uk)

Change-Id: I5a7acdda04e5f85d48978e8a39c6903c528dcd11
Reviewed-on: https://gerrit.libreoffice.org/35774
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/shared/00/00040500.xhp 
b/source/text/shared/00/00040500.xhp
index a2cb5fca0..713d79e93 100644
--- a/source/text/shared/00/00040500.xhp
+++ b/source/text/shared/00/00040500.xhp
@@ -93,7 +93,7 @@
 
 
 Choose 
Format - Paragraph - Asian Typography tab (not in HTML)
-Choose Format - Cell - Asian 
Typography tab 
+Choose Format - Cell - Asian 
Typography tab
 
 Choose 
View - Styles and Formatting - open context menu of an entry and 
click Modify/New - Asian Typography tab
 
@@ -143,19 +143,19 @@
 Choose 
Format - Paragraph - Borders tab
 Choose 
Format - Image - Borders tab
 Choose 
Format - Frame and Object - Properties - Borders tab
-Choose 
Format - Page - Borders tab
+Choose 
Format - Image - Properties - Borders tab
 Choose 
Format - Character - Borders tab
 Choose 
View - Styles and Formatting - open context menu of an entry and 
choose Modify/New - Borders tab
 Choose 
Format - Page - Header - More button
 Choose 
Format - Page - Footer - More button
-Choose Format - Cells - 
Borders tab 
+Choose Format - Cells - 
Borders tab
 
 
 
 
-Menu Format - Paragraph 
- Border tab - Spacing to contents 
+Menu Format - Paragraph 
- Border tab - Spacing to contents
 
-Menu Format - Page - Border - 
Spacing to contents 
+Menu Format - Page - Border - 
Spacing to contents
 
 
 
@@ -169,7 +169,7 @@
 Choose 
Format - Page - Footer - More button
 Choose 
View - Styles and Formatting - open context menu of an entry and 
choose Modify/New - Background tab
 Choose 
Insert/Edit - Section - Background tab
-Choose Format - Cells - 
Background tab 
+Choose Format - Cells - 
Background tab
 
 
 
@@ -213,10 +213,10 @@
 
 
 
- 
- 
- 
- 
+
+
+
+
 On the Drawing bar, 
click
 
 
@@ -262,7 +262,7 @@
 
 
 Choose 
Format - Bullets and Numbering. Open Options tab 
page
-Open Styles and 
Formatting - Presentation Styles - context menu of an Outline Style - 
choose New/Modify 
+Open Styles and 
Formatting - Presentation Styles - context menu of an Outline Style - 
choose New/Modify
 
 Open Styles and 
Formatting - List Styles - context menu of an entry - choose 
New/Modify
 
@@ -270,7 +270,7 @@
 
 
 Choose 
Format - Bullets and Numbering - Bullets tab
-Open Styles and Formatting - 
Presentation Styles - context menu of an Outline Style - choose 
New/Modify 
+Open Styles and Formatting - 
Presentation Styles - context menu of an Outline Style - choose 
New/Modify
 
 Open Styles and Formatting - List 
Styles - context menu of an entry - choose New/Modify
 
@@ -278,7 +278,7 @@
 
 
 Choose 
Format - Bullets and Numbering - Numbering tab
-Open Styles and 
Formatting - Presentation Styles - context menu of an Outline Style - 
choose New/Modify 
+Open Styles and 
Formatting - Presentation Styles - context menu of an Outline Style - 
choose New/Modify
 
 Open Styles and 
Formatting - List Styles - context menu of an entry - choose 
New/Modify
 
@@ -293,16 +293,16 @@
 
 
 Choose 
Format - Bullets and Numbering. Open Position tab 
page
-Choose Tools - Outline 
Numbering - Position tab 
+Choose Tools - Outline 
Numbering - Position tab
 
 Open Styles and Formatting - 
List Styles - context menu of an entry - choose New/Modify
 
 
 
 
-Menu Format - Image - 
Crop tab 
+Menu Format - Image - 
Crop tab
 
- 
+
 Icon on the Image 
toolbar:
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Tor Lillqvist

 include/formula/token.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c5c82c81ec184999feb982140547bd1351150655
Author: Tor Lillqvist 
Date:   Mon Mar 27 21:32:25 2017 +0300

No std::to_string in the silly C++ library we still use on Android

Change-Id: I03a3bd999e4f423f6b5422417109e789dc5b5397

diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 8747517ac481..7856d787d660 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -117,7 +117,9 @@ inline std::string StackVarEnumToString(StackVar const e)
 case svSep:   return "Sep";
 case svUnknown:   return "Unknown";
 }
-return std::to_string(static_cast(e));
+std::ostringstream os;
+os << static_cast(e);
+return os.str();
 }
 
 class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Mike Kaganski

 sw/qa/extras/ww8import/data/tdf106799.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |   15 +++
 sw/source/filter/ww8/ww8par.cxx   |4 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 59af9cbbccee600408c89e872d548d153523ab1f
Author: Mike Kaganski 
Date:   Mon Mar 27 17:35:45 2017 +0300

tdf#106799 WW8: Accept TTP Mark without Cell Mark

Paragraph mark of inner table (0x0D) sometimes has
sprmPFInnerTtp, but no sprmPFInnerTableCell. This still counts
as cell end (at least, MS Word treats it that way).

Unit test included.

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

diff --git a/sw/qa/extras/ww8import/data/tdf106799.doc 
b/sw/qa/extras/ww8import/data/tdf106799.doc
new file mode 100644
index ..0637e8cce692
Binary files /dev/null and b/sw/qa/extras/ww8import/data/tdf106799.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index c50ab96722f8..1a2ec45af6fb 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -108,6 +108,21 @@ DECLARE_WW8IMPORT_TEST( testTdf105570, "tdf105570.doc" )
 CPPUNIT_ASSERT_EQUAL( sal_uInt16(0), 
pTableNd->GetTable().GetRowsToRepeat() );
 }
 
+DECLARE_WW8IMPORT_TEST(testTdf106799, "tdf106799.doc")
+{
+sal_Int32 nCellWidths[3][4] = { { 9530, 0, 0, 0 },{ 2382, 2382, 2382, 2384 
},{ 2382, 2382, 2382, 2384 } };
+sal_Int32 nCellTxtLns[3][4] = { { 1, 0, 0, 0 },{ 1, 0, 0, 0},{ 1, 1, 1, 1 
} };
+// Table was distorted because of missing sprmPFInnerTableCell at 
paragraph marks (0x0D) with sprmPFInnerTtp
+for (sal_Int32 nRow : { 0, 1, 2 })
+for (sal_Int32 nCell : { 0, 1, 2, 3 })
+{
+OString cellXPath("/root/page/body/tab/row/cell/tab/row[" + 
OString::number(nRow+1) + "]/cell[" + OString::number(nCell+1) + "]/");
+CPPUNIT_ASSERT_EQUAL_MESSAGE(cellXPath.getStr(), 
nCellWidths[nRow][nCell], parseDump(cellXPath + "infos/bounds", 
"width").toInt32());
+if (nCellTxtLns[nRow][nCell] != 0)
+CPPUNIT_ASSERT_EQUAL_MESSAGE(cellXPath.getStr(), 
nCellTxtLns[nRow][nCell], parseDump(cellXPath + "txt/Text", 
"nLength").toInt32());
+}
+}
+
 // tests should only be added to ww8IMPORT *if* they fail round-tripping in 
ww8EXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3bd36395c5e4..908dcd0f7b71 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3673,7 +3673,9 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
 bParaMark = false;
 }
 }
-else if (m_bWasTabCellEnd)
+// tdf#106799: We expect TTP marks to be also cell marks,
+// but sometimes sprmPFInnerTtp comes without 
sprmPFInnerTableCell
+else if (m_bWasTabCellEnd || m_bWasTabRowEnd)
 {
 TabCellEnd();
 bParaMark = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Olivier Hallot

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

New commits:
commit 2334c028345bc719027801c0385f54690d713af5
Author: Olivier Hallot 
Date:   Mon Mar 27 14:54:55 2017 -0300

Remove dashes in HC text

Change-Id: I3e4c0c4a0eb3ad717803cbe670d289313c987b78
Reviewed-on: https://gerrit.libreoffice.org/35771
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/swriter/guide/auto_spellcheck.xhp 
b/source/text/swriter/guide/auto_spellcheck.xhp
index cdb0155b7..7f94d818a 100644
--- a/source/text/swriter/guide/auto_spellcheck.xhp
+++ b/source/text/swriter/guide/auto_spellcheck.xhp
@@ -46,7 +46,7 @@
 Right-click a word with a red wavy underline, and then 
choose a suggested replacement word from the list, or from the 
AutoCorrect submenu.
  
   
-  If you choose a word from the AutoCorrect submenu, the underlined word and the 
replacement word are automatically added to the AutoCorrect list for the 
current language. To view the AutoCorrect list, choose Tools â AutoCorrect â AutoCorrect Options, and then 
click the Replace tab.
+  If you choose a word from the AutoCorrect submenu, the underlined word and the 
replacement word are automatically added to the AutoCorrect list for the 
current language. To view the AutoCorrect list, choose Tools - AutoCorrect - AutoCorrect Options, and then 
click the Replace tab.
   You can also add the underlined word to your custom dictionary by 
choosing Add.
   To Exclude Words From the Spellcheck
@@ -58,7 +58,7 @@
 Click the Language control on the Status bar to open a 
menu.
  
  
-Choose âNone (Do not check spelling)â.
+Choose "None (Do not check spelling)".
  
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-03-27 Thread Olivier Hallot

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

New commits:
commit 3632df3df311ec709e86544329cd0a8a87614c70
Author: Olivier Hallot 
Date:   Mon Mar 27 14:54:55 2017 -0300

Updated core
Project: help  2334c028345bc719027801c0385f54690d713af5

Remove dashes in HC text

Change-Id: I3e4c0c4a0eb3ad717803cbe670d289313c987b78
Reviewed-on: https://gerrit.libreoffice.org/35771
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 656de6691cfb..2334c028345b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 656de6691cfb75fceec812a4bf220448eb91eeff
+Subproject commit 2334c028345bc719027801c0385f54690d713af5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

add powerfull and user friendly functionality to libreoffice

2017-03-27 Thread Jerome

Hi,

My idea is to add a "dynamic short variable" to libreoffice.
This variable should be able to:
1 catch a selected value (currentValue) from a field
2 be used inside a property field for a form field
3 be easy t use/call

exemple:

I do a form from base software.
I add a form (named "my_form"), who has a table (named "my_field"), and
a sub-form, then inside this sub-form i add a table field, and inside
each column, i add listbox field.
But... my listbox field has to populate choices from first selection
table form value, and second column of sub-form table has to populate
listbox field from the selection of the first column listbox field.
Then, for make it easy, i should use this dynamic short variable inside
the SQL field property.
Like:
SELECT NAME, ID FROM TEST WHERE REFKEY=@"my_document"."my_form"."my_field"@

easy ti use, and very powerfull, almost user friend.

Thank you for reading and consideration.

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

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

2017-03-27 Thread Caolán McNamara

 filter/source/graphicfilter/itiff/ccidecom.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b79d0136b5246dcea637074cc742c37e8afa0cb9
Author: CaolÃ¡n McNamara 
Date:   Wed Mar 1 09:36:50 2017 +

ofz#668: more complete fix

This reverts commit f01a975cb22d33a386bfd8db4ea6b4b77aceca1b.

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

diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx 
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 125d9c85d5e4..b5f3ab4cf529 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -627,7 +627,9 @@ void CCIDecompressor::StartDecompression( SvStream & 
rIStream )
 
 bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong 
nTargetBits, bool bLastLine )
 {
-bool b2D;
+//Read[1|2]DScanlineData take a sal_uInt16, so its either limit here or 
expand there
+if (nTargetBits > SAL_MAX_UINT16)
+return false;
 
 if ( nEOLCount >= 5 )   // RTC (Return To Controller)
 return true;
@@ -682,6 +684,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * 
pTarget, sal_uLong nTarget
 if ( nOptions & CCI_OPTION_BYTEALIGNROW )
 nInputBitsBufSize &= 0xfff8;
 
+bool b2D;
 // is it a 2D row?
 if ( nOptions & CCI_OPTION_2D )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 include/svx/svdoashp.hxx   |1 +
 svx/source/svdraw/svdoashp.cxx |   22 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit b3020a00e8542fa54c055206eaf8a0f5bb8c709e
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 10:31:06 2017 +0100

ofz#946 NbcAdjustTextFrameWidthAndHeight calling itself

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

diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index e978be4ede64..43c9c1bf4394 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -76,6 +76,7 @@ class SVX_DLLPUBLIC SdrObjCustomShape : public SdrTextObj
 private:
 // fObjectRotation is containing the object rotation in degrees.
 double fObjectRotation;
+bool mbAdjustingTextFrameWidthAndHeight;
 
 protected:
 virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() 
override;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 0f90e4dad7dc..f01c49107472 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -833,10 +833,11 @@ sdr::properties::BaseProperties* 
SdrObjCustomShape::CreateObjectSpecificProperti
 return new sdr::properties::CustomShapeProperties(*this);
 }
 
-SdrObjCustomShape::SdrObjCustomShape() :
-SdrTextObj(),
-fObjectRotation( 0.0 ),
-mpLastShadowGeometry(nullptr)
+SdrObjCustomShape::SdrObjCustomShape()
+: SdrTextObj()
+, fObjectRotation(0.0)
+, mbAdjustingTextFrameWidthAndHeight(false)
+, mpLastShadowGeometry(nullptr)
 {
 bClosedObj = true; // custom shapes may be filled
 bTextFrame = true;
@@ -2429,10 +2430,12 @@ Rectangle SdrObjCustomShape::ImpCalculateTextFrame( 
const bool bHgt, const bool
 
 bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
 {
-Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt );
-bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != maRect );
-if ( bRet )
+Rectangle aNewTextRect = ImpCalculateTextFrame(bHgt, bWdt);
+const bool bRet = !aNewTextRect.IsEmpty() && aNewTextRect != maRect;
+if (bRet && !mbAdjustingTextFrameWidthAndHeight)
 {
+mbAdjustingTextFrameWidthAndHeight = true;
+
 // taking care of handles that should not been changed
 std::vector< SdrCustomShapeInteraction > aInteractionHandles( 
GetInteractionHandles() );
 
@@ -2453,9 +2456,12 @@ bool 
SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
 }
 }
 InvalidateRenderGeometry();
+
+mbAdjustingTextFrameWidthAndHeight = false;
 }
 return bRet;
 }
+
 bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight()
 {
 Rectangle aNewTextRect = ImpCalculateTextFrame( true/*bHgt*/, true/*bWdt*/ 
);
@@ -2767,6 +2773,8 @@ SdrObjCustomShape& SdrObjCustomShape::operator=(const 
SdrObjCustomShape& rObj)
 return *this;
 SdrTextObj::operator=( rObj );
 fObjectRotation = rObj.fObjectRotation;
+mbAdjustingTextFrameWidthAndHeight = 
rObj.mbAdjustingTextFrameWidthAndHeight;
+assert(!mbAdjustingTextFrameWidthAndHeight);
 InvalidateRenderGeometry();
 return *this;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Miklos Vajna

 include/vcl/filter/pdfdocument.hxx |4 ++-
 vcl/source/filter/ipdf/pdfdocument.cxx |   29 ++
 vcl/source/gdi/pdfwriter_impl.cxx  |   36 ++---
 3 files changed, 52 insertions(+), 17 deletions(-)

New commits:
commit 2ba9d58d5978c94352c4c6cf9c47aa3de79d05fe
Author: Miklos Vajna 
Date:   Mon Mar 27 15:39:04 2017 +0200

tdf#106693 vcl PDF export, norefxobj: handle multiple refs in copied dicts

When copying font definitions the dictionary has multiple values where
the type is a reference. Improve PDFWriterImpl::copyExternalResource(),
so that multiple references are copied correctly as well.

With this the bugdoc (from comment 5) text appears in the output.

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

diff --git a/include/vcl/filter/pdfdocument.hxx 
b/include/vcl/filter/pdfdocument.hxx
index 9ccbb43d0225..d6b44e88d027 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -80,10 +80,12 @@ public:
 sal_uInt64 GetDictionaryOffset();
 void SetDictionaryLength(sal_uInt64 nDictionaryLength);
 sal_uInt64 GetDictionaryLength();
-PDFDictionaryElement* GetDictionary() const;
+PDFDictionaryElement* GetDictionary();
 void SetDictionary(PDFDictionaryElement* pDictionaryElement);
 /// Get access to the parsed key-value items from the object dictionary.
 const std::map& GetDictionaryItems() const;
+/// Same as GetDictionaryItems(), but entries are sorted by file offset.
+std::vector< std::pair > 
GetDictionaryItemsByOffset();
 void SetArray(PDFArrayElement* pArrayElement);
 void SetStream(PDFStreamElement* pStreamElement);
 /// Access to the stream of the object, if it has any.
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 926ebb0500fd..1a85c4f3fd5e 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -1933,7 +1933,7 @@ bool PDFNumberElement::Read(SvStream& rStream)
 return false;
 }
 if (!rtl::isAsciiDigit(static_cast(ch)) && ch != '-'
-&& ch != '.')
+&& ch != '.')
 {
 rStream.SeekRel(-1);
 return false;
@@ -1941,7 +1941,7 @@ bool PDFNumberElement::Read(SvStream& rStream)
 while (!rStream.IsEof())
 {
 if (!rtl::isAsciiDigit(static_cast(ch)) && ch != '-'
-&& ch != '.')
+&& ch != '.')
 {
 rStream.SeekRel(-1);
 m_nLength = rStream.Tell() - m_nOffset;
@@ -2446,8 +2446,10 @@ sal_uInt64 PDFObjectElement::GetArrayLength()
 return m_nArrayLength;
 }
 
-PDFDictionaryElement* PDFObjectElement::GetDictionary() const
+PDFDictionaryElement* PDFObjectElement::GetDictionary()
 {
+if (m_aDictionary.empty())
+PDFDictionaryElement::Parse(m_rDoc.GetElements(), this, m_aDictionary);
 return m_pDictionaryElement;
 }
 
@@ -2456,6 +2458,25 @@ void 
PDFObjectElement::SetDictionary(PDFDictionaryElement* pDictionaryElement)
 m_pDictionaryElement = pDictionaryElement;
 }
 
+std::vector< std::pair > 
PDFObjectElement::GetDictionaryItemsByOffset()
+{
+std::vector< std::pair > aRet;
+
+for (const auto& rItem : m_aDictionary)
+aRet.push_back(rItem);
+
+PDFDictionaryElement* pDictionary = GetDictionary();
+if (!pDictionary)
+return aRet;
+
+std::sort(aRet.begin(), aRet.end(), [pDictionary](const std::pair& a, const std::pair& b) -> bool
+{
+return pDictionary->GetKeyOffset(a.first) < 
pDictionary->GetKeyOffset(b.first);
+});
+
+return aRet;
+}
+
 const std::map& PDFObjectElement::GetDictionaryItems() 
const
 {
 return m_aDictionary;
@@ -2841,7 +2862,7 @@ bool PDFNameElement::Read(SvStream& rStream)
 while (!rStream.IsEof())
 {
 if (rtl::isAsciiWhiteSpace(static_cast(ch)) || ch == '/'
-|| ch == '[' || ch == ']' || ch == '<' || ch == '>' || ch == '(')
+|| ch == '[' || ch == ']' || ch == '<' || ch == '>' || ch == 
'(')
 {
 rStream.SeekRel(-1);
 m_aValue = aBuf.makeStringAndClear();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index eb9d00cac010..7d435e404837 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10863,10 +10863,11 @@ sal_Int32 
PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter
 {
 aLine.append("<<");
 
-// Complex case: can't copy the dictionary byte array as is, as it 
contains a reference.
+// Complex case: can't copy the dictionary byte array as is, as it may 
contain references.
 bool bDone = false;
-const std::map& rItems = 
rObject.GetDictionaryItems();
-for (const auto& rItem : rItems)
+std::v

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

2017-03-27 Thread Tor Lillqvist

 i18npool/source/breakiterator/breakiterator_unicode.cxx |2 -
 include/formula/token.hxx   |   32 
 sc/source/core/opencl/formulagroupcl.cxx|   32 
 sc/source/core/tool/token.cxx   |2 -
 4 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 4bb389319ec4510e16a519d229a45222a04f
Author: Tor Lillqvist 
Date:   Mon Mar 27 15:33:53 2017 +0300

loplugin:redundantinline

Change-Id: I3b82d6c6d970545a64b97f84c2c6da8271551a4c

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 3f9dce9c81ba..2256755e85be 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -65,7 +65,7 @@ class OOoRuleBasedBreakIterator : public 
RuleBasedBreakIterator
 public:
 #if (U_ICU_VERSION_MAJOR_NUM < 58)
 // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
-inline void publicSetBreakType(int32_t type)
+void publicSetBreakType(int32_t type)
 {
 setBreakType(type);
 };
commit 88637db0efc1dc56e34627e71e26cc5aab5dc803
Author: Tor Lillqvist 
Date:   Mon Mar 27 15:08:19 2017 +0300

Move StackVarEnumToString to  and use in a SAL_INFO

Once StackVarEnum has been changed to a scoped enum, we should
probably add an operator<< for it, too.

Is 'std::string FooToString(Foo e)' a good return type, signature, and
naming pattern for functions to turn enums into strings? Would return
type OUString be better? Is there some consistent existing convention?
For use only in SAL_INFO and friends, probably just an operator<< is
enough?

Change-Id: I89abbcb37ba2ab925b0a9d7fc6294d8f9ee5aebd

diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 7b6e1a77a6b8..8747517ac481 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -88,6 +88,38 @@ typedef sal_uInt8 StackVar;
 typedef StackVarEnum StackVar;
 #endif
 
+inline std::string StackVarEnumToString(StackVar const e)
+{
+switch (e)
+{
+case svByte:  return "Byte";
+case svDouble:return "Double";
+case svString:return "String";
+case svSingleRef: return "SingleRef";
+case svDoubleRef: return "DoubleRef";
+case svMatrix:return "Matrix";
+case svIndex: return "Index";
+case svJump:  return "Jump";
+case svExternal:  return "External";
+case svFAP:   return "FAP";
+case svJumpMatrix:return "JumpMatrix";
+case svRefList:   return "RefList";
+case svEmptyCell: return "EmptyCell";
+case svMatrixCell:return "MatrixCell";
+case svHybridCell:return "HybridCell";
+case svExternalSingleRef: return "ExternalSingleRef";
+case svExternalDoubleRef: return "ExternalDoubleRef";
+case svExternalName:  return "ExternalName";
+case svSingleVectorRef:   return "SingleVectorRef";
+case svDoubleVectorRef:   return "DoubleVectorRef";
+case svError: return "Error";
+case svMissing:   return "Missing";
+case svSep:   return "Sep";
+case svUnknown:   return "Unknown";
+}
+return std::to_string(static_cast(e));
+}
+
 class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
 {
 OpCode  eOp;
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index bf91fcd995c1..a1112e499dbc 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -97,38 +97,6 @@ namespace sc { namespace opencl {
 
 namespace {
 
-std::string StackVarEnumToString(StackVar const e)
-{
-switch (e)
-{
-case svByte:  return "Byte";
-case svDouble:return "Double";
-case svString:return "String";
-case svSingleRef: return "SingleRef";
-case svDoubleRef: return "DoubleRef";
-case svMatrix:return "Matrix";
-case svIndex: return "Index";
-case svJump:  return "Jump";
-case svExternal:  return "External";
-case svFAP:   return "FAP";
-case svJumpMatrix:return "JumpMatrix";
-case svRefList:   return "RefList";
-case svEmptyCell: return "EmptyCell";
-case svMatrixCell:return "MatrixCell";
-case svHybridCell:return "HybridCell";
-case svExternalSingleRef: return "ExternalSingleRef";
-case svExternalDoubleRef: return "ExternalDoubleRef";
-case svEx

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

2017-03-27 Thread Stephan Bergmann

 compilerplugins/clang/loopvartoosmall.cxx |2 -
 editeng/source/editeng/editobj.cxx|   31 +++---
 editeng/source/editeng/editobj2.hxx   |   18 -
 editeng/source/editeng/impedit4.cxx   |1 
 4 files changed, 31 insertions(+), 21 deletions(-)

New commits:
commit 4e808469d5a05bb70af76628702661d413b1b71e
Author: Stephan Bergmann 
Date:   Mon Mar 27 15:50:48 2017 +0200

Make loplugin:loopvartoosmall look past top-level ExprWithCleanups

Note the two "//TODO!" in the fix of the one newly found issue.

Change-Id: I181691da4b74cd55611452e002b37bd6798ff1e6

diff --git a/compilerplugins/clang/loopvartoosmall.cxx 
b/compilerplugins/clang/loopvartoosmall.cxx
index eb4cb96d592d..f9c25eb4d8a9 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -80,7 +80,7 @@ unsigned LoopVarTooSmall::getIntValueWidth(QualType type) 
const {
 }
 
 void LoopVarTooSmall::checkSubExpr(Expr const * expr, bool positive) {
-auto const e = expr->IgnoreParenImpCasts();
+auto const e = expr->IgnoreImplicit()->IgnoreParenImpCasts();
 if (auto const uo = dyn_cast(e)) {
 if (uo->getOpcode() == UO_LNot) {
 checkSubExpr(uo->getSubExpr(), !positive);
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index 7e9cccb0c9d0..17f9f13e9497 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -50,6 +50,7 @@
 
 #include 
 #include 
+#include 
 
 #if DEBUG_EDIT_ENGINE
 #include 
@@ -60,7 +61,7 @@ using std::endl;
 using namespace com::sun::star;
 
 
-XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& 
rItem, sal_uInt16 nStart, sal_uInt16 nEnd )
+XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& 
rItem, sal_Int32 nStart, sal_Int32 nEnd )
 {
 // Create thw new attribute in the pool
 const SfxPoolItem& rNew = rPool.Put( rItem );
@@ -69,7 +70,7 @@ XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const 
SfxPoolItem& rItem
 return pNew;
 }
 
-XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, 
sal_uInt16 nE )
+XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_Int32 nS, 
sal_Int32 nE )
 {
 pItem = &rAttr;
 nStart = nS;
@@ -175,8 +176,8 @@ void ContentInfo::dumpAsXml(xmlTextWriterPtr pWriter) const
 for (size_t i=0; iGetStart());
-xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("end"), "%d", 
maCharAttribs[i]->GetEnd());
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("start"), "%" 
SAL_PRIdINT32, maCharAttribs[i]->GetStart());
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("end"), "%" 
SAL_PRIdINT32, maCharAttribs[i]->GetEnd());
 maCharAttribs[i]->GetItem()->dumpAsXml(pWriter);
 xmlTextWriterEndElement(pWriter);
 }
@@ -668,7 +669,7 @@ void EditTextObjectImpl::SetScriptType( SvtScriptType nType 
)
 nScriptType = nType;
 }
 
-XEditAttribute* EditTextObjectImpl::CreateAttrib( const SfxPoolItem& rItem, 
sal_uInt16 nStart, sal_uInt16 nEnd )
+XEditAttribute* EditTextObjectImpl::CreateAttrib( const SfxPoolItem& rItem, 
sal_Int32 nStart, sal_Int32 nEnd )
 {
 return MakeXEditAttribute( *pPool, rItem, nStart, nEnd );
 }
@@ -1074,9 +1075,9 @@ namespace {
 class FindAttribByChar : public 
std::unary_function, bool>
 {
 sal_uInt16 mnWhich;
-sal_uInt16 mnChar;
+sal_Int32 mnChar;
 public:
-FindAttribByChar(sal_uInt16 nWhich, sal_uInt16 nChar) : mnWhich(nWhich), 
mnChar(nChar) {}
+FindAttribByChar(sal_uInt16 nWhich, sal_Int32 nChar) : mnWhich(nWhich), 
mnChar(nChar) {}
 bool operator() (const std::unique_ptr& rAttr) const
 {
 return (rAttr->GetItem()->Which() == mnWhich) && (rAttr->GetStart() <= 
mnChar) && (rAttr->GetEnd() > mnChar);
@@ -1155,7 +1156,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) 
const
 {
 // Don't create a new Attrib with StarBats font, MBR 
changed the
 // SvxFontItem::Store() to store StarBats instead of 
StarSymbol!
-for (sal_uInt16 nChar = rAttr.GetStart(); nChar < 
rAttr.GetEnd(); ++nChar)
+for (sal_Int32 nChar = rAttr.GetStart(); nChar < 
rAttr.GetEnd(); ++nChar)
 {
 sal_Unicode cOld = rC.GetText()[ nChar ];
 char cConv = 
OUStringToOString(OUString(ConvertFontToSubsFontChar(hConv, cOld)), 
RTL_TEXTENCODING_SYMBOL).toChar();
@@ -1176,7 +1177,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) 
const
 }
 if ( hConv )
 {
-for ( sal_uInt16 nChar = 0; nChar < rC.GetText().getLength(); 
nChar++ )
+for ( sal_Int32 nChar = 0; nChar < rC.GetText().getLength(); 
nChar++ )
 {
 const ContentInfo::XEditAttributesType& rAttribs = 
rC.maCharAttribs;

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 4 commits - configure.ac loleaflet/dist loleaflet/src

2017-03-27 Thread Andras Timar

 configure.ac|2 -
 loleaflet/dist/images/lc_insertfootnote.svg |1 
 loleaflet/dist/toolbar.css  |1 
 loleaflet/dist/toolbar/toolbar.js   |   17 ---
 loleaflet/src/map/handler/Map.Scroll.js |   30 
 5 files changed, 3 insertions(+), 48 deletions(-)

New commits:
commit 0a672146505a6c02c5e58a88a2c8c60808c4eb02
Author: Andras Timar 
Date:   Mon Mar 27 15:47:51 2017 +0200

Bump version to 2.1.0

Change-Id: Id5528805a1726de6cb58e9644a8cdd48cc281c1f

diff --git a/configure.ac b/configure.ac
index d89845da..1f6cad77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [2.1.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax])
commit 75133f5170fac14e55bf66b245cc9678b09210f2
Author: Pranav Kant 
Date:   Tue Nov 15 18:16:08 2016 +0530

tdf#103641: Hide redundant break after save too

... if save button is hidden. This is not the case in master
as we have additional element, Textwrap, there.

(cherry picked from commit 1113debc2ff73cf4bebd751a8f97cef050b0f286)

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 949e9163..50492a19 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -924,6 +924,7 @@ map.on('showbusy', function(e) {
 map.on('wopiprops', function(e) {
if (e.HideSaveOption) {
w2ui['toolbar-up'].hide('save');
+   w2ui['toolbar-up'].hide('savebreak');
}
 });
 
commit d03bdb8736ded8b84c9d6a3e832388cb349b9f1a
Author: Andras Timar 
Date:   Mon Mar 27 15:46:14 2017 +0200

Revert "Add footnote and text wrap functions"

Change-Id: I59d374d3f8bdfa6a3b871bdec5389a53bb3a9da9

diff --git a/loleaflet/dist/images/lc_insertfootnote.svg 
b/loleaflet/dist/images/lc_insertfootnote.svg
deleted file mode 100644
index 9907b8b3..
--- a/loleaflet/dist/images/lc_insertfootnote.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 8e5f8308..220f4f94 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -231,7 +231,6 @@ button.leaflet-control-search-next
 .w2ui-icon.save{ background: url('../images/lc_save.svg') no-repeat center 
!important; }
 .w2ui-icon.saveas{ background: url('../images/lc_saveas.svg') no-repeat center 
!important; }
 .w2ui-icon.strikeout{ background: url('../images/lc_strikeout.svg') no-repeat 
center !important; }
-.w2ui-icon.insertfootnote{ background: url('../images/lc_insertfootnote.svg') 
no-repeat center !important; }
 .w2ui-icon.underline{ background: url('../images/lc_underline.svg') no-repeat 
center !important; }
 .w2ui-icon.undo{ background: url('../images/lc_undo.svg') no-repeat center 
!important; }
 .w2ui-icon.zoomin{ background: url('../images/plus.svg') no-repeat center 
!important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 6bbd3439..949e9163 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -278,11 +278,6 @@ function onClick(id, item, subItem) {
else if (id === 'lastrecord') {

$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
}
-   else if (id.startsWith('menu:wrap:wrap-'))
-   {
-   var wrapType = id.substring('menu:wrap:wrap-'.length);
-   map.toggleCommandState(wrapType);
-   }
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -461,15 +456,6 @@ $(function () {
name: 'toolbar-up',
items: [
{type: 'html', id: 'left'},
-   {type: 'menu', id: 'writer:menu:wrap', caption: 
_('Textwrap'), items: [
-   { text: _('No wrap'), id: 'wrap-WrapOff' },
-   { text: _('Page wrap'), id: 'wrap-WrapOn' },
-   { text: _('Wrap anchor only'), id: 
'wrap-WrapAnchorOnly' },
-   { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
-   { text: _('Left wrap'), id: 'wrap-WrapLeft' },
-   { text: _('Right wrap'), id: 'wrap-WrapRight' },
-   { text: _('Wrap through'), id: 
'wrap-WrapThrough' }
-   ]},
{type: 'button',  id: 'save', img: 'save', hint: 
_('Save'), uno: 'Save'},
{type: 'break', id: 'savebreak'},
{type: 'button',  id: 'undo',  img: 'undo', hint: 
_('Undo'), uno: 'Undo'},
@@ -

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

2017-03-27 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3gtkframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32351d1bd34a0a0d3bb8fa41667a770c125de460
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 14:33:40 2017 +0100

Resolves: rhbz#1436050 im window misplaced for gtk3

events are relative to event window not the toplevel
window which includes a menubar widget (and maybe
the decoration topbar as well)

Change-Id: I5101bd4a35d6e3aee03191594e5f6edb7ca34c69

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 67d79c1e0c51..7ae0b9c0915b 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3579,7 +3579,7 @@ void GtkSalFrame::IMHandler::createIMContext()
   G_CALLBACK (signalIMPreeditEnd), this );
 
 GetGenericData()->ErrorTrapPush();
-gtk_im_context_set_client_window( m_pIMContext, 
widget_get_window(GTK_WIDGET(m_pFrame->m_pWindow)) );
+gtk_im_context_set_client_window(m_pIMContext, 
widget_get_window(m_pFrame->getMouseEventWidget()));
 gtk_im_context_focus_in( m_pIMContext );
 GetGenericData()->ErrorTrapPop();
 m_bFocused = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Miklos Vajna

 vcl/source/gdi/pdfwriter_impl.cxx |   35 ++-
 vcl/source/gdi/pdfwriter_impl.hxx |4 ++--
 2 files changed, 20 insertions(+), 19 deletions(-)

New commits:
commit 06d073695c764744d308c74f80c40a317255fc05
Author: Miklos Vajna 
Date:   Mon Mar 27 14:21:53 2017 +0200

vcl PDF export, norefxobj: improve ref handling in dicts

When copying objects referenced from the page stream support references
in any item value, not just for one single item key.

Also move the dictionary entry generator code to
PDFWriterImpl::copyExternalResources(), so other keys can be copied
without code duplication.

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

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 6d6e7eec9993..eb9d00cac010 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10866,11 +10866,9 @@ sal_Int32 
PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter
 // Complex case: can't copy the dictionary byte array as is, as it 
contains a reference.
 bool bDone = false;
 const std::map& rItems = 
rObject.GetDictionaryItems();
-OString aReferenceName("ColorSpace");
-auto it = rItems.find(aReferenceName);
-if (it != rItems.end())
+for (const auto& rItem : rItems)
 {
-auto pReference = 
dynamic_cast(it->second);
+auto pReference = 
dynamic_cast(rItem.second);
 if (pReference)
 {
 filter::PDFObjectElement* pReferenced = 
pReference->LookupObject();
@@ -10880,8 +10878,8 @@ sal_Int32 
PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter
 sal_Int32 nRef = copyExternalResource(rDocBuffer, 
*pReferenced);
 
 sal_uInt64 nDictStart = rObject.GetDictionaryOffset();
-sal_uInt64 nReferenceStart = 
pDictionary->GetKeyOffset(aReferenceName) + aReferenceName.getLength();
-sal_uInt64 nReferenceEnd = 
pDictionary->GetKeyOffset(aReferenceName) + 
pDictionary->GetKeyValueLength(aReferenceName);
+sal_uInt64 nReferenceStart = 
pDictionary->GetKeyOffset(rItem.first) + rItem.first.getLength();
+sal_uInt64 nReferenceEnd = 
pDictionary->GetKeyOffset(rItem.first) + 
pDictionary->GetKeyValueLength(rItem.first);
 sal_uInt64 nDictEnd = nDictStart + 
rObject.GetDictionaryLength();
 // Dict start -> reference start.
 aLine.append(static_cast(rDocBuffer.GetData()) + nDictStart, nReferenceStart - nDictStart);
@@ -10893,6 +10891,7 @@ sal_Int32 
PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter
 aLine.append(static_cast(rDocBuffer.GetData()) + nReferenceEnd, nDictEnd - nReferenceEnd);
 
 bDone = true;
+break;
 }
 }
 }
@@ -10968,7 +10967,7 @@ sal_Int32 
PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter
 return nObject;
 }
 
-std::map 
PDFWriterImpl::copyExternalResources(filter::PDFObjectElement& rPage, const 
OString& rKind)
+OString PDFWriterImpl::copyExternalResources(filter::PDFObjectElement& rPage, 
const OString& rKind)
 {
 // A name - object ID map, IDs as they appear in our output, not the
 // original ones.
@@ -10977,11 +10976,11 @@ std::map 
PDFWriterImpl::copyExternalResources(filter::PDFObj
 // Get the rKind subset of the resource dictionary.
 auto pResources = 
dynamic_cast(rPage.Lookup("Resources"));
 if (!pResources)
-return aRet;
+return OString();
 
 auto pDictionary = 
dynamic_cast(pResources->LookupElement(rKind));
 if (!pDictionary)
-return aRet;
+return OString();
 
 SvMemoryStream& rDocBuffer = rPage.GetDocument().GetEditBuffer();
 
@@ -11002,7 +11001,15 @@ std::map 
PDFWriterImpl::copyExternalResources(filter::PDFObj
 aRet[rItem.first] = nObject;
 }
 
-return aRet;
+// Build the dictionary entry string.
+OString sRet = "/" + rKind + "<<";
+for (const auto& rPair : aRet)
+{
+sRet += "/" + rPair.first + " " + OString::number(rPair.second) + " 0 
R";
+}
+sRet += ">>";
+
+return sRet;
 }
 
 void PDFWriterImpl::writeReferenceXObject(ReferenceXObjectEmit& rEmit)
@@ -11050,13 +11057,7 @@ void 
PDFWriterImpl::writeReferenceXObject(ReferenceXObjectEmit& rEmit)
 return;
 }
 
-std::map aXObjects = copyExternalResources(*pPage, 
"XObject");
-OString sXObjects = "/XObject<<";
-for (const auto& rPair : aXObjects)
-{
-sXObjects += "/" + rPair.first + " " + 
OString::number(rPair.second) + " 0 R";
-}
-sXObjects += ">>";

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

2017-03-27 Thread Jochen Nitschke

 sc/inc/fmtuno.hxx  |5 ++---
 sc/source/ui/unoobj/fmtuno.cxx |   13 +++--
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 71c56d9e74d579471924ec8ecd506743a57fbe2e
Author: Jochen Nitschke 
Date:   Mon Mar 27 12:41:10 2017 +0200

change int to enum

plus some includes cleanup

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

diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 045f5d0c69ba..f305493322fa 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -23,9 +23,9 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "address.hxx"
 #include "conditio.hxx"
@@ -167,7 +166,7 @@ class ScTableValidationObj : public cppu::WeakImplHelper<
 {
 private:
 SfxItemPropertySet  aPropSet;
-sal_uInt16  nMode;  // enum ScConditionMode
+ScConditionMode nMode;
 OUStringaExpr1;
 OUStringaExpr2;
 OUStringmaExprNmsp1;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index f5b7fcd025fe..e82da5206fee 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -586,7 +587,7 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* 
pDoc, sal_uLong nKey,
 const ScValidationData* pData = pDoc->GetValidationEntry( nKey );
 if (pData)
 {
-nMode = sal::static_int_cast( pData->GetOperation() );
+nMode = pData->GetOperation();
 aSrcPos = pData->GetValidSrcPos();  // valid pos for expressions
 aExpr1 = pData->GetExpression( aSrcPos, 0, 0, eGrammar );
 aExpr2 = pData->GetExpression( aSrcPos, 1, 0, eGrammar );
@@ -622,7 +623,7 @@ ScValidationData* 
ScTableValidationObj::CreateValidationData( ScDocument* pDoc,
 FormulaGrammar::Grammar eGrammar2 = lclResolveGrammar( eGrammar, 
meGrammar2 );
 
 ScValidationData* pRet = new ScValidationData( (ScValidationMode)nValMode,
-   (ScConditionMode)nMode,
+   nMode,
aExpr1, aExpr2, pDoc, 
aSrcPos,
maExprNmsp1, maExprNmsp2,
eGrammar1, eGrammar2 );
@@ -687,25 +688,25 @@ ScTableValidationObj::~ScTableValidationObj()
 sheet::ConditionOperator SAL_CALL ScTableValidationObj::getOperator()
 {
 SolarMutexGuard aGuard;
-return lcl_ConditionModeToOperator( (ScConditionMode)nMode );
+return lcl_ConditionModeToOperator( nMode );
 }
 
 void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator 
nOperator )
 {
 SolarMutexGuard aGuard;
-nMode = sal::static_int_cast( lcl_ConditionOperatorToMode( 
nOperator ) );
+nMode = lcl_ConditionOperatorToMode( nOperator );
 }
 
 sal_Int32 SAL_CALL ScTableValidationObj::getConditionOperator()
 {
 SolarMutexGuard aGuard;
-return lcl_ConditionModeToOperatorNew( (ScConditionMode)nMode );
+return lcl_ConditionModeToOperatorNew( nMode );
 }
 
 void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator )
 {
 SolarMutexGuard aGuard;
-nMode = sal::static_int_cast( 
ScConditionEntry::GetModeFromApi( nOperator ) );
+nMode = ScConditionEntry::GetModeFromApi( nOperator );
 }
 
 OUString SAL_CALL ScTableValidationObj::getFormula1()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'distro/collabora/collabora-online-2-1'

2017-03-27 Thread Samuel Mehrbrodt

New branch 'distro/collabora/collabora-online-2-1' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 extensions/source/propctrlr/browserlistbox.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 910582360d2a2f0455841b2cd0c3cc2c7ed08344
Author: CaolÃ¡n McNamara 
Date:   Thu Mar 23 16:06:18 2017 +

Resolves: tdf#106461 use a row height of max of edit and listbox height

not just take the listbox because edits can be taller and result in
overlaps

Change-Id: I6067b384484d933727220febda723bc9e8c5e90b
(cherry picked from commit 5013abeb191cdc6f8375f107a4d30abd802547d2)
Reviewed-on: https://gerrit.libreoffice.org/35596
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/extensions/source/propctrlr/browserlistbox.cxx 
b/extensions/source/propctrlr/browserlistbox.cxx
index 9d6b899ce0e2..93e901f98131 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -332,9 +332,11 @@ namespace pcr
 ,m_bUpdate(true)
 ,m_pControlContextImpl( new PropertyControlContext_Impl( *this ) )
 {
-ScopedVclPtrInstance< ListBox > aListBox(this,WB_DROPDOWN);
-aListBox->SetPosSizePixel(Point(0,0),Size(100,100));
-m_nRowHeight = aListBox->GetSizePixel().Height()+2;
+ScopedVclPtrInstance aListBox(this, WB_DROPDOWN);
+ScopedVclPtrInstance aEditBox(this);
+m_nRowHeight = std::max(aListBox->get_preferred_size().Height(),
+aEditBox->get_preferred_size().Height());
+m_nRowHeight += 2;
 SetBackground( pParent->GetBackground() );
 m_aLinesPlayground->SetBackground( GetBackground() );
 
@@ -345,7 +347,6 @@ namespace pcr
 m_aVScroll->SetScrollHdl(LINK(this, OBrowserListBox, ScrollHdl));
 }
 
-
 OBrowserListBox::~OBrowserListBox()
 {
 disposeOnce();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Samuel Mehrbrodt

 kit/Kit.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd5df2f1da9b4199d729f5a1b9e7beb58ae3d7f0
Author: Samuel Mehrbrodt 
Date:   Mon Mar 27 13:02:02 2017 +

Revert "Don't try to copy the file when it already exists"

This reverts commit 0b91533abb56bd81fa63f2ad85c2bd9bbc523f2c.

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

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f227af9f..58f79b28 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -149,7 +149,7 @@ namespace
 case FTW_F:
 case FTW_SLN:
 File(newPath.parent()).createDirectories();
-if (link(fpath, newPath.toString().c_str()) == -1 && errno != 
EEXIST)
+if (link(fpath, newPath.toString().c_str()) == -1)
 {
 LOG_SYS("link(\"" << fpath << "\", \"" <<
 newPath.toString() << "\") failed. Will copy.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Jens Carl

 dbaccess/source/ui/browser/brwctrlr.cxx|4 ++--
 dbaccess/source/ui/dlg/RelationDlg.cxx |2 +-
 dbaccess/source/ui/inc/QEnumTypes.hxx  |2 +-
 dbaccess/source/ui/inc/WTabPage.hxx|2 +-
 dbaccess/source/ui/misc/DExport.cxx|4 ++--
 dbaccess/source/ui/misc/HtmlReader.cxx |2 +-
 dbaccess/source/ui/querydesign/JoinController.cxx  |2 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx  |   16 
 dbaccess/source/ui/querydesign/TableConnectionData.cxx |2 +-
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx  |2 +-
 dbaccess/source/ui/querydesign/querydlg.cxx|2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit f924422a05ada16d21e5a44da5c30aa0e2c10efd
Author: Jens Carl 
Date:   Fri Mar 24 08:26:23 2017 +

tdf#39468 Translate German comments

Translate German comments in dbaccess/

Change-Id: Ib8e5e737c5d3cd6cd968be45e74d8d015c855e16
Reviewed-on: https://gerrit.libreoffice.org/35620
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx 
b/dbaccess/source/ui/browser/brwctrlr.cxx
index e891ab85c1d0..361575afdf50 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2170,7 +2170,7 @@ bool SbaXDataBrowserController::SaveModified(bool bAskFor)
 }
 }
 
-if ( !CommitCurrent() ) // das aktuelle Control committen lassen
+if ( !CommitCurrent() ) // Commit the current control
 return false;
 
 Reference< XPropertySet >  xFormSet(getRowSet(), UNO_QUERY);
@@ -2211,7 +2211,7 @@ bool SbaXDataBrowserController::CommitCurrent()
 bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock();
 if (xActiveControl.is() && !bControlIsLocked)
 {
-// zunaechst das Control fragen ob es das IFace unterstuetzt
+// At first check Control if it supports the IFace
 Reference< css::form::XBoundComponent >  xBoundControl(xActiveControl, 
UNO_QUERY);
 if (!xBoundControl.is())
 xBoundControl.set(xActiveControl->getModel(), UNO_QUERY);
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx 
b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 98bbba66ae03..f3953eecacdd 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -68,7 +68,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
 
 m_xConnection = pParent->getDesignView()->getController().getConnection();
 
-// Connection kopieren
+// Copy connection
 m_pConnData.reset( 
static_cast(pConnectionData->NewInstance()) );
 m_pConnData->CopyFrom( *pConnectionData );
 
diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx 
b/dbaccess/source/ui/inc/QEnumTypes.hxx
index 9f49df789b78..d88a7f4d6fa8 100644
--- a/dbaccess/source/ui/inc/QEnumTypes.hxx
+++ b/dbaccess/source/ui/inc/QEnumTypes.hxx
@@ -35,7 +35,7 @@ namespace dbaui
 FKT_AGGREGATE   =0x0002,
 FKT_CONDITION   =0x0004,
 FKT_NUMERIC =0x0008
-// if this function type is set, it is either EXISTS oder UNIQUE,
+// if this function type is set, it is either EXISTS or UNIQUE,
 // the FieldName contains the complete statement
 };
 
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx 
b/dbaccess/source/ui/inc/WTabPage.hxx
index b3e77bc958c4..bf06ce71205d 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -30,7 +30,7 @@ namespace dbaui
 {
 protected:
 VclPtr   m_pParent;
-boolm_bFirstTime;   // Page wird das erste mal 
gerufen ; should be set in the reset methode
+boolm_bFirstTime;   // Page is called the first 
time; should be set in the reset methode
 
 OWizardPage( vcl::Window *pParent, const OString& rID, const OUString& 
rUIXMLDescription );
 
diff --git a/dbaccess/source/ui/misc/DExport.cxx 
b/dbaccess/source/ui/misc/DExport.cxx
index 02d9322ed598..aa4196996db7 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -521,7 +521,7 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& 
aCheckToken, sal_Int16 _n
 case NumberFormat::TEXT:
 case NumberFormat::UNDEFINED:
 case NumberFormat::LOGICAL:
-nNumberFormat = NumberFormat::TEXT; // Text "uberschreibt 
alles
+nNumberFormat = NumberFormat::TEXT; // Text overwrites 
everything
 break;
 case NumberFormat::DATETIME:
 switch(_nOldNumberFormat)
@@ -546,7 +546,7 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& 
aCheckToken, sal_Int16 _n
 }
 catch(Exception&)
 {
-nNumberFormat = NumberFormat::TEXT; // Text "uberschre

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

2017-03-27 Thread Katarina Behrens

 basic/source/comp/exprtree.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 4725c2a282f2c6468125073ba9cb5ba66f488e08
Author: Katarina Behrens 
Date:   Fri Mar 17 15:12:32 2017 +0100

tdf#106529: Revert "tdf#80731 Closing parenthesis is now detected"

This reverts commit 65e294e221e0ad1d37c6667eecb995817ace870d, which
breaks several widely used Basic extensions and hundreds of anonymous
macros that miss closing parenthesis here and there

Change-Id: I5d27e6d4e7c8aea3f0762c41ede46e35a5a24aaa
Reviewed-on: https://gerrit.libreoffice.org/35340
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit 660e394b893a045a077ccded263f94a1be03fcf9)
Reviewed-on: https://gerrit.libreoffice.org/35527
Reviewed-by: Michael Stahl 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 008976f1a7d6..e7a2210ada0c 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -1055,11 +1055,6 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser* 
pParser, bool bStandalon
 {
 if( ( pExprList->bBracket && eTok == RPAREN ) || 
SbiTokenizer::IsEoln( eTok ) )
 {
-if ( SbiTokenizer::IsEoln( eTok ) && pExprList->bBracket)
-{
-pParser->Error( ERRCODE_BASIC_EXPECTED, RPAREN );
-pExprList->bError = true;
-}
 break;
 }
 pParser->Error( pExprList->bBracket ? ERRCODE_BASIC_BAD_BRACKETS : 
ERRCODE_BASIC_EXPECTED, COMMA );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 filter/source/graphicfilter/itiff/itiff.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit dfdf256d828e29b430e41d1b82899680664259f5
Author: CaolÃ¡n McNamara 
Date:   Thu Feb 23 12:02:06 2017 +

Resolves: ofz#668 check for massive row lengths before trying to allocate 
them

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

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 4c4b10a3b825..e4afeb0c3d63 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -68,7 +68,7 @@ private:
 sal_uLong   nSubFile;
 sal_Int32   nImageWidth;// picture width in 
pixels
 sal_Int32   nImageLength;   // picture height in 
pixels
-sal_uLong   nBitsPerSample; // bits per pixel per 
layer
+sal_uInt32  nBitsPerSample; // bits per pixel per 
layer
 sal_uLong   nCompression;   // kind of compression
 sal_uLong   nPhotometricInterpretation;
 sal_uLong   nThresholding;
@@ -78,7 +78,7 @@ private:
 sal_uLong*  pStripOffsets;  // field of offsets to 
the Bitmap-Data-"Strips"
 sal_uLong   nNumStripOffsets;   // size of the field 
above
 sal_uLong   nOrientation;
-sal_uLong   nSamplesPerPixel;   // number of layers
+sal_uInt32  nSamplesPerPixel;   // number of layers
 sal_uLong   nRowsPerStrip;  // if it's not 
compressed: number of rows per Strip
 sal_uLong*  pStripByteCounts;   // if compressed (in a 
certain way): size of the strips
 sal_uLong   nNumStripByteCounts;// number of entries 
in the field above
@@ -94,9 +94,9 @@ private:
 std::unique_ptr xColorMap;// color palette
 sal_uLong   nNumColors; // number of colors 
within the color palette
 
-sal_uLong   nPlanes;// number of layers 
within the Tiff file
+sal_uInt32  nPlanes;// number of layers 
within the Tiff file
 sal_uLong   nStripsPerPlane;// number of Strips 
per layer
-sal_uLong   nBytesPerRow;   // Bytes per line per 
Layer in the Tiff file ( uncompressed )
+sal_uInt32  nBytesPerRow;   // Bytes per line per 
Layer in the Tiff file ( uncompressed )
 sal_uInt8*  pMap[ 4 ];  // temporary Scanline
 
 
@@ -1368,8 +1368,18 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 
 if (bStatus)
 {
-nBytesPerRow = ( nImageWidth * nSamplesPerPixel / 
nPlanes * nBitsPerSample + 7 ) >> 3;
+sal_uInt64 nRowSize = 
(static_cast(nImageWidth) * nSamplesPerPixel / nPlanes * 
nBitsPerSample + 7) >> 3;
+if (nRowSize > SAL_MAX_INT32 / SAL_N_ELEMENTS(pMap))
+{
+SAL_WARN("filter.tiff", "Ludicrous row size of: " 
<< nRowSize << " required");
+bStatus = false;
+}
+else
+nBytesPerRow = nRowSize;
+}
 
+if (bStatus)
+{
 for (sal_uInt8*& j : pMap)
 {
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 vcl/source/gdi/dibtools.cxx |  375 +---
 1 file changed, 187 insertions(+), 188 deletions(-)

New commits:
commit 155886c99ba55ef28bd902cfe7256cbc1f4d2d01
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 12:32:56 2017 +0100

move bitmap allocation after palette read

Change-Id: Ie7b2d64bde48d49c6e389c0770f2456187107bda

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index a05f90932cab..5b672ed42912 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -897,15 +897,6 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_u
 }
 
 const Size aSizePixel(aHeader.nWidth, aHeader.nHeight);
-BitmapPalette aPalette;
-Bitmap aNewBmp(aSizePixel, nBitCount, &aPalette);
-Bitmap::ScopedWriteAccess pAcc(aNewBmp);
-if (!pAcc)
-return false;
-if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != aHeader.nHeight)
-{
-return false;
-}
 AlphaMask aNewBmpAlpha;
 AlphaMask::ScopedWriteAccess pAccAlpha;
 bool bAlphaPossible(pBmpAlpha && aHeader.nBitCount == 32);
@@ -933,16 +924,25 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_u
 }
 
 // read palette
+BitmapPalette aPalette;
 if (nColors)
 {
 aPalette.SetEntryCount(nColors);
 ImplReadDIBPalette(*pIStm, aPalette, aHeader.nSize != 
DIBCOREHEADERSIZE);
-pAcc->SetPalette(aPalette);
 }
 
 if (pIStm->GetError())
 return false;
 
+Bitmap aNewBmp(aSizePixel, nBitCount, &aPalette);
+Bitmap::ScopedWriteAccess pAcc(aNewBmp);
+if (!pAcc)
+return false;
+if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != aHeader.nHeight)
+{
+return false;
+}
+
 if(nOffset)
 {
 pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
commit ec1015430dcfd5a6e20a13d878bc34ce3149b8ea
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 12:31:00 2017 +0100

return early on error

no logc change intended

Change-Id: I9a000ccc53b13d2948264b18ae0abf29a6ddc33c

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 7486b59da9e3..a05f90932cab 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -761,230 +761,228 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_u
 {
 DIBV5Header aHeader;
 const sal_uLong nStmPos = rIStm.Tell();
-bool bRet(false);
 bool bTopDown(false);
 
-if(ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat) && 
aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount)
+if (!ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat) && 
aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount)
+return false;
+
+// In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before
+// this method, nOffset is 0, that's OK.
+if (nOffset && aHeader.nSize > nOffset)
 {
-// In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before
-// this method, nOffset is 0, that's OK.
-if (nOffset && aHeader.nSize > nOffset)
-{
-// Header size claims to extend into the image data.
-// Looks like an error.
-return false;
-}
+// Header size claims to extend into the image data.
+// Looks like an error.
+return false;
+}
 
-const sal_uInt16 nBitCount(discretizeBitcount(aHeader.nBitCount));
+const sal_uInt16 nBitCount(discretizeBitcount(aHeader.nBitCount));
 
-sal_uInt16 nColors(0);
-SvStream* pIStm;
-std::unique_ptr pMemStm;
-std::vector aData;
+sal_uInt16 nColors(0);
+SvStream* pIStm;
+std::unique_ptr pMemStm;
+std::vector aData;
 
-if (aHeader.nBitCount <= 8)
+if (aHeader.nBitCount <= 8)
+{
+if(aHeader.nColsUsed)
 {
-if(aHeader.nColsUsed)
-{
-nColors = (sal_uInt16)aHeader.nColsUsed;
-}
-else
-{
-nColors = ( 1 << aHeader.nBitCount );
-}
+nColors = (sal_uInt16)aHeader.nColsUsed;
+}
+else
+{
+nColors = ( 1 << aHeader.nBitCount );
 }
+}
+
+if (ZCOMPRESS == aHeader.nCompression)
+{
+sal_uInt32 nCodedSize(0);
+sal_uInt32  nUncodedSize(0);
+
+// read coding information
+rIStm.ReadUInt32( nCodedSize ).ReadUInt32( nUncodedSize ).ReadUInt32( 
aHeader.nCompression );
+if (nCodedSize > rIStm.remainingSize())
+   nCodedSize = sal_uInt32(rIStm.remainingSize());
+size_t nSizeInc(4 * rIStm.remainingSize());
+if (nUncodedSize < nSizeInc)
+nSizeInc = nUncodedSize;
 
-if(ZCOMPRESS == aHeader.nCompression)
+if (nSizeInc > 0)
 {
-sal_uInt32 nCodedSize(0);
-sal_uInt32  nUn

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

2017-03-27 Thread Caolán McNamara

 drawinglayer/source/primitive2d/polygonprimitive2d.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c8c4c84a5dda6f06aedba8d4cfef208be6812dbc
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 10:08:33 2017 +0100

ofz#947 line dashing is very problematic memory and size wise

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

diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx 
b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 0d41a8d88a7c..147af59b6404 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -345,10 +345,16 @@ namespace drawinglayer
 bUseDecomposition = true;
 }
 
-if(bUseDecomposition)
+if (bUseDecomposition)
 {
 // get correct range by using the decomposition fallback, 
reasons see above cases
+
+// ofz#947 to optimize calculating the range, turn any 
slow dashes into a solid line
+// when just calculating bounds
+attribute::StrokeAttribute aOrigStrokeAttribute = 
maStrokeAttribute;
+
const_cast(this)->maStrokeAttribute = 
attribute::StrokeAttribute();
 aRetval = 
BufferedDecompositionPrimitive2D::getB2DRange(rViewInformation);
+
const_cast(this)->maStrokeAttribute = 
aOrigStrokeAttribute;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - common/Session.cpp common/Session.hpp kit/ChildSession.cpp kit/ChildSession.hpp kit/Kit.cpp loleaflet/src test/WhiteB

2017-03-27 Thread Jan Holesovsky

 common/Session.cpp   |6 ++
 common/Session.hpp   |   13 -
 kit/ChildSession.cpp |2 +-
 kit/ChildSession.hpp |4 ++--
 kit/Kit.cpp  |   16 +++-
 loleaflet/src/core/Socket.js |3 +++
 test/WhiteBoxTests.cpp   |3 ++-
 wsd/ClientSession.cpp|5 +
 wsd/protocol.txt |5 -
 9 files changed, 42 insertions(+), 15 deletions(-)

New commits:
commit c1fc9a8ed403c15871d9efa3672f74604f4a
Author: Jan Holesovsky 
Date:   Fri Mar 24 12:34:32 2017 +0100

Pass the locale settings from loleaflet to wsd/kit.

Change-Id: Ie530db73cfbdb62787f16eae0f4b07fbf8b8acb4

diff --git a/common/Session.cpp b/common/Session.cpp
index e1a3f364..ec251c9b 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -132,6 +132,7 @@ void LOOLSession::parseDocOptions(const StringTokenizer& 
tokens, int& part, std:
 
 for (size_t i = offset; i < tokens.count(); ++i)
 {
+// FIXME use any kind of startsWith() instead of find(...) == 0
 if (tokens[i].find("url=") == 0)
 {
 _docURL = tokens[i].substr(strlen("url="));
@@ -165,6 +166,11 @@ void LOOLSession::parseDocOptions(const StringTokenizer& 
tokens, int& part, std:
 _haveDocPassword = true;
 ++offset;
 }
+else if (tokens[i].find("lang=") == 0)
+{
+_lang = tokens[i].substr(strlen("lang="));
+++offset;
+}
 }
 
 if (tokens.count() > offset)
diff --git a/common/Session.hpp b/common/Session.hpp
index 9873aad6..fb3029ec 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -161,19 +161,19 @@ private:
 std::mutex _mutex;
 
 protected:
-// The actual URL, also in the child, even if the child never accesses 
that.
+/// The actual URL, also in the child, even if the child never accesses 
that.
 std::string _docURL;
 
-// The Jailed document path.
+/// The Jailed document path.
 std::string _jailedFilePath;
 
-// Password provided, if any, to open the document
+/// Password provided, if any, to open the document
 std::string _docPassword;
 
-// If password is provided or not
+/// If password is provided or not
 bool _haveDocPassword;
 
-// Whether document is password protected
+/// Whether document is password protected
 bool _isDocPasswordProtected;
 
 /// Document options: a JSON string, containing options (rendering, also 
possibly load in the future).
@@ -184,6 +184,9 @@ protected:
 
 /// Name of the user to whom the session belongs to
 std::string _userName;
+
+/// Language for the document based on what the user has in the UI.
+std::string _lang;
 };
 
 template 
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index da6e67b7..871858fb 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -328,7 +328,7 @@ bool ChildSession::loadDocument(const char * /*buffer*/, 
int /*length*/, StringT
 
 std::unique_lock lock(Mutex);
 
-bool loaded = _docManager.onLoad(getId(), _jailedFilePath, _userName, 
_docPassword, renderOpts, _haveDocPassword);
+bool loaded = _docManager.onLoad(getId(), _jailedFilePath, _userName, 
_docPassword, renderOpts, _haveDocPassword, _lang);
 if (!loaded || _viewId < 0)
 {
 LOG_ERR("Failed to get LoKitDocument instance.");
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index c2fb09cb..47f667e7 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -36,8 +36,8 @@ public:
 const std::string& userName,
 const std::string& docPassword,
 const std::string& renderOpts,
-const bool haveDocPassword)
-= 0;
+const bool haveDocPassword,
+const std::string& lang) = 0;
 
 /// Unload a client session, which unloads the document
 /// if it is the last and only.
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 9d6ff445..1fa3bea9 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -904,7 +904,8 @@ private:
 const std::string& userName,
 const std::string& docPassword,
 const std::string& renderOpts,
-const bool haveDocPassword) override
+const bool haveDocPassword,
+const std::string& lang) override
 {
 std::unique_lock lock(_mutex);
 
@@ -922,7 +923,7 @@ private:
 
 try
 {
-load(sessionId, uri, userName, docPassword, renderOpts, 
haveDocPassword);
+load(sessionId, uri, userName, docPassword, renderOpts, 
haveDocPassword, lang);
 if (!_loKitDocument || !_loKitDocument->get())
 {
 return false;
@@ -1107,7 +1108,8 @@ private:
 const std::string& userName,
 const std::st

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

2017-03-27 Thread Olivier

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

New commits:
commit 656de6691cfb75fceec812a4bf220448eb91eeff
Author: Olivier 
Date:   Tue Mar 21 11:08:11 2017 -0300

Improve help text

Unit #67543218 (uk)
Unit #67543225 (uk)
Unit #33628571 (uk)

http://nabble.documentfoundation.org/Re-Unit-67543218-uk-tt4210628.html
http://nabble.documentfoundation.org/Re-Unit-67543225-uk-tt4210629.html
http://nabble.documentfoundation.org/Re-Unit-33628571-uk-tt4210707.html

Change "guillemets" for "-"

Change-Id: I7a9fe103d9c738971edbeed89e3c9accc23a0f66
Reviewed-on: https://gerrit.libreoffice.org/35509
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/swriter/librelogo/LibreLogo.xhp 
b/source/text/swriter/librelogo/LibreLogo.xhp
index e131f0017..8619c4c33 100644
--- a/source/text/swriter/librelogo/LibreLogo.xhp
+++ b/source/text/swriter/librelogo/LibreLogo.xhp
@@ -27,7 +27,7 @@
 LibreLogo
 LibreLogo is a 
simple, localized, Logo-like programming environment with turtle vector 
graphics for teaching of computing (programming and word processing), DTP and 
graphic design. See http://www.numbertext.org/logo/librelogo.pdf";>http://www.numbertext.org/logo/librelogo.pdf.
 LibreLogo 
toolbar
-The LibreLogo 
toolbar (ViewÂ Â»Â ToolbarsÂ Â»Â Logo) contains turtle moving, program start, 
stop, home, clear screen, program editor/syntax highlighting/translating icons 
and an input bar (command line).
+The LibreLogo 
toolbar (View - Toolbars - Logo) contains turtle 
moving, program start, stop, home, clear screen, program editor/syntax 
highlighting/translating icons and an input bar (command line).
 Turtle moving 
icons
 They are equivalents 
of the Logo commands âFORWARD 10â, âBACK 10â, âLEFT 15â, âRIGHT 
15â. Clicking on one of the icons will also focus the turtle shape scrolling 
the page to its position.
 Start Logo 
program
@@ -38,7 +38,7 @@
 Clear 
screen
 Click on the icon 
âClear screenâ to remove the drawing objects of the document.
 Program 
editor/Syntax highlighting/Translating
-The âmagic wandâ 
icon sets 2-page layout for program editing, expands and converts to uppercase 
the abbreviated, lowercase Logo commands in the Writer document. Change the 
language of the document (ToolsÂ Â»Â OptionsÂ Â»Â Language Settings Â»Â 
LanguagesÂ Â»Â Western) and click on this icon to translate the Logo program to 
the selected language.
+The âmagic wandâ 
icon sets 2-page layout for program editing, expands and converts to uppercase 
the abbreviated, lowercase Logo commands in the Writer document. Change the 
language of the document (Tools - OptionsÂ -Â Language 
Settings -Â LanguagesÂ -Â Western) and click on this icon to translate 
the Logo program to the selected language.
 Command 
line
 Hit Enter in the 
command line to execute its content. To stop the program use the icon 
âStopâ.
 Hold down the Enter 
to repeat the command line, for example, on the following command 
sequence:
@@ -142,7 +142,7 @@
 SHOWTURTLE 
(st)
  SHOWTURTLE ; show 
turtle
 HOME
- HOME ; reset 
initial turtle settings and position
+ HOME ; reset 
initial turtle position
 CLEARSCREEN 
(cs)
  CLEARSCREEN ; 
remove drawing objects of the document
 FILL and 
CLOSE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-03-27 Thread Olivier

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

New commits:
commit 53e83bca82cb7c279af6a0752171864ffb3e5314
Author: Olivier 
Date:   Tue Mar 21 11:08:11 2017 -0300

Updated core
Project: help  656de6691cfb75fceec812a4bf220448eb91eeff

Improve help text

Unit #67543218 (uk)
Unit #67543225 (uk)
Unit #33628571 (uk)

http://nabble.documentfoundation.org/Re-Unit-67543218-uk-tt4210628.html
http://nabble.documentfoundation.org/Re-Unit-67543225-uk-tt4210629.html
http://nabble.documentfoundation.org/Re-Unit-33628571-uk-tt4210707.html

Change "guillemets" for "-"

Change-Id: I7a9fe103d9c738971edbeed89e3c9accc23a0f66
Reviewed-on: https://gerrit.libreoffice.org/35509
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 6a03706fb174..656de6691cfb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6a03706fb1740b19ce6382ae25f7dbd3cab0cfd8
+Subproject commit 656de6691cfb75fceec812a4bf220448eb91eeff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-03-27 Thread Olivier

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

New commits:
commit 52ad7622a9fd89247324282bba9992a590b17ecd
Author: Olivier 
Date:   Tue Mar 21 10:49:33 2017 -0300

Updated core
Project: help  6a03706fb1740b19ce6382ae25f7dbd3cab0cfd8

Fix help contents

Unit #109429032 (lt)

http://nabble.documentfoundation.org/Re-Unit-109429032-lt-tt4210627.html

Change-Id: Ie3e2932ffa9fdfb3a8a89cb76ede6e7dcabd6c3a
Reviewed-on: https://gerrit.libreoffice.org/35508
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 6be791160b0f..6a03706fb174 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6be791160b0f09944f9bdbf56dc47273b44be708
+Subproject commit 6a03706fb1740b19ce6382ae25f7dbd3cab0cfd8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Olivier

 source/text/swriter/guide/auto_spellcheck.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6a03706fb1740b19ce6382ae25f7dbd3cab0cfd8
Author: Olivier 
Date:   Tue Mar 21 10:49:33 2017 -0300

Fix help contents

Unit #109429032 (lt)

http://nabble.documentfoundation.org/Re-Unit-109429032-lt-tt4210627.html

Change-Id: Ie3e2932ffa9fdfb3a8a89cb76ede6e7dcabd6c3a
Reviewed-on: https://gerrit.libreoffice.org/35508
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/swriter/guide/auto_spellcheck.xhp 
b/source/text/swriter/guide/auto_spellcheck.xhp
index a6ccc0e51..cdb0155b7 100644
--- a/source/text/swriter/guide/auto_spellcheck.xhp
+++ b/source/text/swriter/guide/auto_spellcheck.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
   
  Automatically Check Spelling
@@ -46,7 +46,7 @@
 Right-click a word with a red wavy underline, and then 
choose a suggested replacement word from the list, or from the 
AutoCorrect submenu.
  
   
-  If you choose a word from the AutoCorrect submenu, the underlined word and the 
replacement word are automatically added to the AutoCorrect list for the 
current language. To view the AutoCorrect list, choose Tools â AutoCorrect Options, and then click the Replace tab.
+  If you choose a word from the AutoCorrect submenu, the underlined word and the 
replacement word are automatically added to the AutoCorrect list for the 
current language. To view the AutoCorrect list, choose Tools â AutoCorrect â AutoCorrect Options, and then 
click the Replace tab.
   You can also add the underlined word to your custom dictionary by 
choosing Add.
   To Exclude Words From the Spellcheck
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 lotuswordpro/source/filter/lwpframelayout.cxx |7 ++-
 lotuswordpro/source/filter/lwpframelayout.hxx |1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c2a9387ab259f12c7ee724f7f5be52b8d8f7ed64
Author: CaolÃ¡n McNamara 
Date:   Sun Mar 26 21:21:22 2017 +0100

ofz#944 avoid recurse to death

(cherry picked from commit 7eb92eea21e2af47b17c9901107f6e4833567928)

Change-Id: I27ed8cf5e8296a1ad91c33614913fc7af4a56d45
Reviewed-on: https://gerrit.libreoffice.org/35724
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index ef95f678ad2a..d1616b815a03 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -761,7 +761,7 @@ void LwpFrameLink::Read(LwpObjectStream* pStrm)
 }
 
 LwpFrameLayout::LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
-: LwpPlacableLayout(objHdr, pStrm), m_pFrame(nullptr)
+: LwpPlacableLayout(objHdr, pStrm), m_pFrame(nullptr), 
m_bGettingMaxWidth(false)
 {
 }
 
@@ -946,6 +946,10 @@ double LwpFrameLayout::GetWidth()
  */
 double LwpFrameLayout::GetMaxWidth()
 {
+if (m_bGettingMaxWidth)
+throw std::runtime_error("recursive GetMaxWidth");
+
+m_bGettingMaxWidth = true;
 double fActualWidth = 0;
 rtl::Reference xLayout(GetContainerLayout());
 LwpMiddleLayout* pParent = dynamic_cast(xLayout.get());
@@ -974,6 +978,7 @@ double LwpFrameLayout::GetMaxWidth()
 fActualWidth = fParentWidth - fXOffset - fParentMarginRight - 
fWrapRight;
 }
 
+m_bGettingMaxWidth = false;
 return fActualWidth;
 }
 
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx 
b/lotuswordpro/source/filter/lwpframelayout.hxx
index 99b3a215ccc3..5b11c146e0f4 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -141,6 +141,7 @@ private:
 private:
 LwpFrameLink m_Link;
 LwpFrame* m_pFrame;
+bool m_bGettingMaxWidth;
 };
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 lotuswordpro/source/filter/lwpframelayout.cxx |7 ++-
 lotuswordpro/source/filter/lwpframelayout.hxx |1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 17c7bdd3422dcfc1c434eca0f13b9d5b9a95c7dc
Author: CaolÃ¡n McNamara 
Date:   Sun Mar 26 21:21:22 2017 +0100

ofz#944 avoid recurse to death

(cherry picked from commit 7eb92eea21e2af47b17c9901107f6e4833567928)

Change-Id: I27ed8cf5e8296a1ad91c33614913fc7af4a56d45
Reviewed-on: https://gerrit.libreoffice.org/35725
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 7f593e4a2cd7..0aef51df395c 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -761,7 +761,7 @@ void LwpFrameLink::Read(LwpObjectStream* pStrm)
 }
 
 LwpFrameLayout::LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
-: LwpPlacableLayout(objHdr, pStrm), m_pFrame(nullptr)
+: LwpPlacableLayout(objHdr, pStrm), m_pFrame(nullptr), 
m_bGettingMaxWidth(false)
 {
 }
 
@@ -946,6 +946,10 @@ double LwpFrameLayout::GetWidth()
  */
 double LwpFrameLayout::GetMaxWidth()
 {
+if (m_bGettingMaxWidth)
+throw std::runtime_error("recursive GetMaxWidth");
+
+m_bGettingMaxWidth = true;
 double fActualWidth = 0;
 rtl::Reference xLayout(GetContainerLayout());
 LwpMiddleLayout* pParent = dynamic_cast(xLayout.get());
@@ -974,6 +978,7 @@ double LwpFrameLayout::GetMaxWidth()
 fActualWidth = fParentWidth - fXOffset - fParentMarginRight - 
fWrapRight;
 }
 
+m_bGettingMaxWidth = false;
 return fActualWidth;
 }
 
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx 
b/lotuswordpro/source/filter/lwpframelayout.hxx
index e39606098b65..ec705d300db7 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -141,6 +141,7 @@ private:
 private:
 LwpFrameLink m_Link;
 LwpFrame* m_pFrame;
+bool m_bGettingMaxWidth;
 };
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 944dcced10c10015fb5c97ba467119425c463b11
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 24 13:03:50 2017 +

Resolves: tdf#106724 crash when Title property doesn't already exist

because we just write past the end instead of resizing before hand

(cherry picked from commit 4e32e8900e59f9751a60d9fdef80cdf7d500f72f)

Change-Id: I4742980a331b14ca39aff8aa6cfc27db154091ff
Reviewed-on: https://gerrit.libreoffice.org/35652
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 4d7d277abe68..8b35819288b5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4328,31 +4328,31 @@ void DomainMapper_Impl::SetFieldResult(OUString const& 
rResult)
 uno::Sequence aValues ;
 aProperty >>= aValues;
 beans::PropertyValue propertyVal;
-bool bTitleFound = false;
-int i=0;
-for (; i < aValues.getLength(); i++)
+sal_Int32 nTitleFoundIndex = -1;
+for (sal_Int32 i = 0; i < aValues.getLength(); ++i)
 {
 propertyVal = aValues[i];
-if(propertyVal.Name == "Title")
+if (propertyVal.Name == "Title")
 {
-bTitleFound = true;
+nTitleFoundIndex = i;
 break;
 }
 }
-if(bTitleFound)
+if (nTitleFoundIndex != -1)
 {
 OUString titleStr;
 uno::Any aValue(propertyVal.Value);
 aValue >>= titleStr;
 titleStr = titleStr + rResult;
 propertyVal.Value = uno::makeAny(titleStr);
-aValues[i] = propertyVal;
+aValues[nTitleFoundIndex] = propertyVal;
 }
 else
 {
+aValues.realloc(aValues.getLength() + 1);
 propertyVal.Name = "Title";
 propertyVal.Value = uno::makeAny(rResult);
-aValues[i] = propertyVal;
+aValues[aValues.getLength() - 1] = propertyVal;
 }
 xFieldProperties->setPropertyValue("Fields",
 uno::makeAny(aValues));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 1255360bffebef0f0521b00c4e5af57e6fe09e6b
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 24 13:03:50 2017 +

Resolves: tdf#106724 crash when Title property doesn't already exist

because we just write past the end instead of resizing before hand

(cherry picked from commit 4e32e8900e59f9751a60d9fdef80cdf7d500f72f)

Change-Id: I4742980a331b14ca39aff8aa6cfc27db154091ff
Reviewed-on: https://gerrit.libreoffice.org/35651
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1edf7f20d553..bebfaa7f8e02 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4346,31 +4346,31 @@ void DomainMapper_Impl::SetFieldResult(OUString const& 
rResult)
 uno::Sequence aValues ;
 aProperty >>= aValues;
 beans::PropertyValue propertyVal;
-bool bTitleFound = false;
-int i=0;
-for (; i < aValues.getLength(); i++)
+sal_Int32 nTitleFoundIndex = -1;
+for (sal_Int32 i = 0; i < aValues.getLength(); ++i)
 {
 propertyVal = aValues[i];
-if(propertyVal.Name == "Title")
+if (propertyVal.Name == "Title")
 {
-bTitleFound = true;
+nTitleFoundIndex = i;
 break;
 }
 }
-if(bTitleFound)
+if (nTitleFoundIndex != -1)
 {
 OUString titleStr;
 uno::Any aValue(propertyVal.Value);
 aValue >>= titleStr;
 titleStr = titleStr + rResult;
 propertyVal.Value = uno::makeAny(titleStr);
-aValues[i] = propertyVal;
+aValues[nTitleFoundIndex] = propertyVal;
 }
 else
 {
+aValues.realloc(aValues.getLength() + 1);
 propertyVal.Name = "Title";
 propertyVal.Value = uno::makeAny(rResult);
-aValues[i] = propertyVal;
+aValues[aValues.getLength() - 1] = propertyVal;
 }
 xFieldProperties->setPropertyValue("Fields",
 uno::makeAny(aValues));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist| 
 293 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib | 
   4 
 2 files changed, 289 insertions(+), 8 deletions(-)

New commits:
commit 5df2465c2c1b15363e46d4a67cd810c7d1f661f2
Author: jan Iversen 
Date:   Mon Mar 20 18:21:30 2017 +0100

iOS LibreOfficeLight "open in"

Added pdf, microsoft to know document types.

Created new UTI for ODF documents.

Change-Id: I8037724e6575756bd586c490618cba6954d9fb31

diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
index 416af5951632..b65394198954 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
@@ -8,14 +8,122 @@


CFBundleTypeName
-   ODF-Document
+   DOCX Microsoft Word
+   CFBundleTypeRole
+   Editor
LSHandlerRank
Owner
LSItemContentTypes

-   com.odf.doc
-   com.odf.calc
-   com.odf.impress
+   com.jani.Editors.docx
+   
+   
+   
+   CFBundleTypeName
+   DOC Microsoft Word
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.doc
+   
+   
+   
+   CFBundleTypeName
+   XLSX Microsoft Excel
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.xlsx
+   
+   
+   
+   CFBundleTypeName
+   XLS Microsoft Excel
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.xls
+   
+   
+   
+   CFBundleTypeName
+   PPTX Microsoft PowerPoint
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.pptx
+   
+   
+   
+   CFBundleTypeName
+   PPT Microsoft PowerPoint
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.ppt
+   
+   
+   
+   CFBundleTypeName
+   PDF Adobe pdf
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.pdf
+   
+   
+   
+   CFBundleTypeName
+   ODT LibreOffice writer
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.odt
+   
+   
+   
+   CFBundleTypeName
+   ODS LibreOffice calc
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.ods
+   
+   
+   
+   CFBundleTypeName
+   ODP LibeOffice Impress
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+

[Libreoffice-commits] online.git: loolwsd-systemplate-setup

2017-03-27 Thread Samuel Mehrbrodt

 loolwsd-systemplate-setup |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0b129c05a99345e7c82d630e7722b10494ed7b85
Author: Samuel Mehrbrodt 
Date:   Mon Mar 27 11:57:43 2017 +0200

Find libpng on Ubuntu also

Change-Id: Ib0ed1b26ddac1aca6381650c85e17a4b1a6d017f
Reviewed-on: https://gerrit.libreoffice.org/35749
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 8bb41870..729220c3 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -36,7 +36,7 @@ find etc/passwd etc/group etc/hosts \
  usr/lib/locale/locale_archive \
  usr/share/zoneinfo/* \
  usr/share/liblangtag \
- usr/lib/libpng* usr/lib64/libpng* \
+ usr/lib/libpng* usr/lib64/libpng* lib/*-linux-gnu/libpng* \
 -type f
 
 find etc/fonts \
@@ -44,7 +44,7 @@ find etc/fonts \
  lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
  lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
  lib/libattr* lib/*-linux-gnu/libattr* \
- usr/lib/libpng* usr/lib64/libpng* \
+ usr/lib/libpng* usr/lib64/libpng* lib/*-linux-gnu/libpng* \
 -type l
 
 # Go through the LO shared objects and check what system libraries
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Weekly QA Report (W12-2017)

2017-03-27 Thread Xisco Fauli


Hello,

What have happened in QA in the last 7 days?

  * 134 have been created, of which, 35 are still unconfirmed ( Total 
Unconfirmed bugs: 474 )

Link: http://tinyurl.com/k9n9ujy

  * 851 comments have been written.

== STATUS CHANGED ==
  * 9 bugs have been changed to 'ASSIGNED'.
Link: http://tinyurl.com/k7wnh93
Done by: Miklos Vajna ( 2 ), Ximeng Zu ( 2 ), Vitaliy ( 1 ), László 
Németh ( 1 ), Markus Mohrhard ( 1 ), Kohei Yoshida ( 1 ), Caolán 
McNamara ( 1 )


  * 1 bug has been changed to 'CLOSED'.
Link: http://tinyurl.com/k4zhnm7
Done by: Igor ( 1 )

  * 37 bugs have been changed to 'NEEDINFO'.
Link: http://tinyurl.com/mexdeuz
Done by: Xisco Faulí ( 23 ), Buovjaga ( 3 ), m.a.riosv ( 3 ), 
Samuel Mehrbrodt (CIB) ( 2 ), V Stuart Foote ( 1 ), Julien Nabet ( 1 ), 
Michael Meeks ( 1 ), Mark Hung ( 1 ), Jacques Guilleron ( 1 ), Cor Nouws 
( 1 )


  * 65 bugs have been changed to 'NEW'.
Link: http://tinyurl.com/mtxz7zh
Done by: Xisco Faulí ( 18 ), Buovjaga ( 10 ), Heiko Tietze ( 7 ), 
Yousuf Philips (jay) ( 4 ), V Stuart Foote ( 3 ), Samuel Mehrbrodt (CIB) 
( 3 ), Winfried Donkers ( 2 ), m.a.riosv ( 2 ), fabio.biocchetti ( 2 ), 
Cor Nouws ( 2 ), Tor Lillqvist ( 1 ), Julien Nabet ( 1 ), Stephan 
Bergmann ( 1 ), Olivier Hallot ( 1 ), Maxim Monastirsky ( 1 ), Mikhail 
Krasilnikov ( 1 ), Johnny_M ( 1 ), Khaled Hosny ( 1 ), Alex Thurgood ( 1 
), Jacques Guilleron ( 1 ), Adolfo Jayme ( 1 ), tommy27 ( 1 )


  * 2 bugs have been changed to 'REOPENED'.
Link: http://tinyurl.com/mbsm6z4
Done by: Monika Siwek ( 1 ), admiral.soruk ( 1 )

  * 29 bugs have been changed to 'RESOLVED DUPLICATE'.
Link: http://tinyurl.com/lfnmbe5
Done by: Xisco Faulí ( 10 ), V Stuart Foote ( 6 ), m.a.riosv ( 2 ), 
Winfried Donkers ( 1 ), Buovjaga ( 1 ), Thomas Lendo ( 1 ), Kevin Suo ( 
1 ), Patrick T. ( 1 ), Mike Kaganski ( 1 ), Mert Tumer ( 1 ), Markus 
Mohrhard ( 1 ), JoNi ( 1 ), Adolfo Jayme ( 1 ), Aron Budea ( 1 )


  * 27 bugs have been changed to 'RESOLVED FIXED'.
Link: http://tinyurl.com/l5e4ukh
Done by: Caolán McNamara ( 6 ), Samuel Mehrbrodt (CIB) ( 3 ), 
Michael Stahl ( 3 ), Kü ( 3 ), Xisco Faulí ( 1 ), V Stuart Foote ( 1 ), 
Miklos Vajna ( 1 ), JV ( 1 ), Vitaliy ( 1 ), Heiko Tietze ( 1 ), Pranav 
Kant ( 1 ), Kohei Yoshida ( 1 ), Jean-Pierre Ledure ( 1 ), Jacques 
Guilleron ( 1 ), Adolfo Jayme ( 1 ), kompilainenn ( 1 )


  * 3 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'.
Link: http://tinyurl.com/mtsrung
Done by: Heiko Tietze ( 1 ), Alex Thurgood ( 1 ), Timur ( 1 )

  * 6 bugs have been changed to 'RESOLVED NOTABUG'.
Link: http://tinyurl.com/nxaxoac
Done by: Xisco Faulí ( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), 
Kevin Suo ( 1 ), LibreTraining ( 1 ), Khaled Hosny ( 1 )


  * 1 bug has been changed to 'RESOLVED WONTFIX'.
Link: http://tinyurl.com/kf96wzb
Done by: V Stuart Foote ( 1 )

  * 9 bugs have been changed to 'RESOLVED WORKSFORME'.
Link: http://tinyurl.com/ld4q7w8
Done by: V Stuart Foote ( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), 
Telesto ( 1 ), Julien Nabet ( 1 ), hhrooster ( 1 ), Graham Freeman ( 1 
), Dick Barnhoorn ( 1 ), POSAM-Ron ( 1 )


  * 10 bugs have been changed to 'UNCONFIRMED'.
Link: http://tinyurl.com/mlv46ah
Done by: V Stuart Foote ( 1 ), pr.nienhuis ( 1 ), m.a.riosv ( 1 ), 
hans109h ( 1 ), Filipe Campos ( 1 ), kakwa ( 1 ), boerig ( 1 ), Aron 
Budea ( 1 ), Alexey ( 1 ), ChenAmy ( 1 )


  * 8 bugs have been changed to 'VERIFIED FIXED'.
Link: http://tinyurl.com/kmppssr
Done by: Jacques Guilleron ( 2 ), Xisco Faulí ( 1 ), V Stuart Foote 
( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), Timur ( 1 ), Alex ARNAUD ( 1 )


== KEYWORDS ADDED ==
  * 'accessibility' has been added to 1 bugs.
Link: http://tinyurl.com/kl26fzt
Done by: Julien Nabet ( 1 )

  * 'bibisectRequest' has been added to 8 bugs.
Link: http://tinyurl.com/llglren
Done by: Xisco Faulí ( 3 ), Buovjaga ( 1 ), Yousuf Philips (jay) ( 
1 ), Alex Thurgood ( 1 ), tommy27 ( 1 ), Aron Budea ( 1 )


  * 'bibisected' has been added to 16 bugs.
Link: http://tinyurl.com/kybeb3j
Done by: Xisco Faulí ( 13 ), raal ( 3 )

  * 'bisected' has been added to 15 bugs.
Link: http://tinyurl.com/kzgac3w
Done by: Xisco Faulí ( 11 ), raal ( 2 ), Mike Kaganski ( 1 ), Luke 
( 1 )


  * 'easyHack' has been added to 1 bugs.
Link: http://tinyurl.com/ku29b52
Done by: Katarina Behrens (CIB) ( 1 )

  * 'filter:doc' has been added to 2 bugs.
Link: http://tinyurl.com/klgbalc
Done by: Xisco Faulí ( 2 )

  * 'filter:docx' has been added to 2 bugs.
Link: http://tinyurl.com/lluqmh6
Done by: Xisco Faulí ( 1 ), V Stuart Foote ( 1 )

  * 'filter:pptx' has been added to 1 bugs.
Link: http://tinyurl.com/kabh6mp
Done by: Buovjaga ( 1 )

  * 'filter:rtf' has been added to 1 bugs.
Link: http://tinyurl.com/n5lsc8e
Done by: Xisco Faulí ( 1 )

  * 'filter:xls' has been added to 3 bugs.
Link: http://tinyurl.com/lkhrdpk

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

2017-03-27 Thread Miklos Vajna

 sw/inc/cellatr.hxx  |6 +++---
 sw/source/core/attr/cellatr.cxx |   12 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit be94475414c878d1e3228da577b496985a4a6a8c
Author: Miklos Vajna 
Date:   Mon Mar 27 09:11:05 2017 +0200

sw: prefix members of SwTableBoxValue

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

diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 36e709af2778..2dfb8c193b87 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -75,7 +75,7 @@ public:
 
 class SW_DLLPUBLIC SwTableBoxValue : public SfxPoolItem
 {
-double nValue;
+double m_nValue;
 public:
 SwTableBoxValue();
 SwTableBoxValue( const double aVal );
@@ -86,11 +86,11 @@ public:
 
 SwTableBoxValue& operator=( const SwTableBoxValue& rCmp )
 {
-nValue = rCmp.nValue;
+m_nValue = rCmp.m_nValue;
 return *this;
 }
 
-double GetValue() const { return nValue; }
+double GetValue() const { return m_nValue; }
 };
 
 inline const SwTableBoxNumFormat  &SwAttrSet::GetTableBoxNumFormat(bool 
bInP) const
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 6817eea0c6c1..a157927a6089 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -193,12 +193,12 @@ void SwTableBoxFormula::Calc( SwTableCalcPara& rCalcPara, 
double& rValue )
 }
 
 SwTableBoxValue::SwTableBoxValue()
-: SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 )
+: SfxPoolItem( RES_BOXATR_VALUE ), m_nValue( 0 )
 {
 }
 
 SwTableBoxValue::SwTableBoxValue( const double nVal )
-: SfxPoolItem( RES_BOXATR_VALUE ), nValue( nVal )
+: SfxPoolItem( RES_BOXATR_VALUE ), m_nValue( nVal )
 {
 }
 
@@ -207,14 +207,14 @@ bool SwTableBoxValue::operator==( const SfxPoolItem& 
rAttr ) const
 assert(SfxPoolItem::operator==(rAttr));
 SwTableBoxValue const& rOther( static_cast(rAttr) 
);
 // items with NaN should be equal to enable pooling
-return ::rtl::math::isNan( nValue )
-?   ::rtl::math::isNan( rOther.nValue )
-:   ( nValue == rOther.nValue );
+return ::rtl::math::isNan( m_nValue )
+?   ::rtl::math::isNan( rOther.m_nValue )
+:   ( m_nValue == rOther.m_nValue );
 }
 
 SfxPoolItem* SwTableBoxValue::Clone( SfxItemPool* ) const
 {
-return new SwTableBoxValue( nValue );
+return new SwTableBoxValue( m_nValue );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Miklos Vajna

 include/vcl/filter/pdfdocument.hxx |   14 +-
 vcl/source/filter/ipdf/pdfdocument.cxx |   46 ++---
 vcl/source/gdi/pdfwriter_impl.cxx  |   45 
 3 files changed, 100 insertions(+), 5 deletions(-)

New commits:
commit 044e8d795276cc495c1f796a14ad36e6a5f9cdb9
Author: Miklos Vajna 
Date:   Mon Mar 27 09:17:30 2017 +0200

tdf#106693 vcl PDF export, norefxobj: copy array objects

So far only the dictionary and the stream of the object was copied, see
if it has an array, and take care of that as well.

Also check if the array contains a reference and act accordingly.

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

diff --git a/include/vcl/filter/pdfdocument.hxx 
b/include/vcl/filter/pdfdocument.hxx
index fbfb81ed10a2..9ccbb43d0225 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -32,6 +32,7 @@ class PDFDocument;
 class PDFDictionaryElement;
 class PDFArrayElement;
 class PDFStreamElement;
+class PDFNumberElement;
 
 /// A byte range in a PDF file.
 class VCL_DLLPUBLIC PDFElement
@@ -54,6 +55,10 @@ class VCL_DLLPUBLIC PDFObjectElement : public PDFElement
 /// Length of the dictionary buffer till (before) the '>>' token.
 sal_uInt64 m_nDictionaryLength;
 PDFDictionaryElement* m_pDictionaryElement;
+/// Position after the '[' token, if m_pArrayElement is set.
+sal_uInt64 m_nArrayOffset;
+/// Length of the array buffer till (before) the ']' token.
+sal_uInt64 m_nArrayLength;
 /// The contained direct array, if any.
 PDFArrayElement* m_pArrayElement;
 /// The stream of this object, used when this is an object stream.
@@ -83,6 +88,10 @@ public:
 void SetStream(PDFStreamElement* pStreamElement);
 /// Access to the stream of the object, if it has any.
 PDFStreamElement* GetStream() const;
+void SetArrayOffset(sal_uInt64 nArrayOffset);
+sal_uInt64 GetArrayOffset();
+void SetArrayLength(sal_uInt64 nArrayLength);
+sal_uInt64 GetArrayLength();
 PDFArrayElement* GetArray() const;
 /// Parse objects stored in this object stream.
 void ParseStoredObjects();
@@ -113,9 +122,11 @@ class VCL_DLLPUBLIC PDFReferenceElement : public PDFElement
 int m_fGenerationValue;
 /// Location after the 'R' token.
 sal_uInt64 m_nOffset = 0;
+/// The element providing the object number.
+PDFNumberElement& m_rObject;
 
 public:
-PDFReferenceElement(PDFDocument& rDoc, int fObjectValue, int 
fGenerationValue);
+PDFReferenceElement(PDFDocument& rDoc, PDFNumberElement& rObject, 
PDFNumberElement& rGeneration);
 bool Read(SvStream& rStream) override;
 /// Assuming the reference points to a number object, return its value.
 double LookupNumber(SvStream& rStream) const;
@@ -124,6 +135,7 @@ public:
 int GetObjectValue() const;
 int GetGenerationValue() const;
 sal_uInt64 GetOffset() const;
+PDFNumberElement& GetObjectElement() const;
 };
 
 /// Stream object: a byte array with a known length.
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 8744729fdd83..926ebb0500fd 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -944,7 +944,10 @@ bool PDFDocument::Tokenize(SvStream& rStream, TokenizeMode 
eMode, std::vector< s
 // The array is attached directly, inform the object.
 pArray = pArr;
 if (pObject)
+{
 pObject->SetArray(pArray);
+pObject->SetArrayOffset(rStream.Tell());
+}
 }
 rStream.SeekRel(-1);
 if (!rElements.back()->Read(rStream))
@@ -959,6 +962,13 @@ bool PDFDocument::Tokenize(SvStream& rStream, TokenizeMode 
eMode, std::vector< s
 rElements.push_back(std::unique_ptr(new 
PDFEndArrayElement()));
 pArray = nullptr;
 rStream.SeekRel(-1);
+if (nDictionaryDepth == 0)
+{
+if (pObject)
+{
+pObject->SetArrayLength(rStream.Tell() - 
pObject->GetArrayOffset());
+}
+}
 if (!rElements.back()->Read(rStream))
 {
 SAL_WARN("vcl.filter", "PDFDocument::Tokenize: 
PDFEndArrayElement::Read() failed");
@@ -1049,7 +1059,7 @@ bool PDFDocument::Tokenize(SvStream& rStream, 
TokenizeMode eMode, std::vector< s
 }
 else
 {
-rElements.push_back(std::unique_ptr(new 
PDFReferenceElement(*this, pObjectNumber->GetValue(), 
pGenerationNumber->GetValue(;
+rElements.push_back(std::unique_ptr(new 
PDFReferenceElement(*this, *pObjectNumber, *pGeneration

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

2017-03-27 Thread Caolán McNamara

 fpicker/source/win32/filepicker/VistaFilePicker.cxx |   19 +--
 fpicker/source/win32/filepicker/VistaFilePicker.hxx |2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit de87afd6d8302d2c000be39010196cb1aef865c1
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 09:25:00 2017 +0100

Resolves: tdf#106729 ensure VistaFilePicker init before access

(cherry picked from commit a15ec82edebf14baa41a888ead7da8e0556ab0bb)

Change-Id: I238599cf5ed464c4bb99a894ac47126fbc32796d
Reviewed-on: https://gerrit.libreoffice.org/35745
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index c3e95b51ac1b..a3e906be0115 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -110,6 +110,8 @@ void SAL_CALL VistaFilePicker::disposing(const 
css::lang::EventObject& /*aEvent*
 void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_MULTISELECTION_MODE);
 rRequest->setArgument(PROP_MULTISELECTION_MODE, bMode);
@@ -120,6 +122,8 @@ void SAL_CALL 
VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_TITLE);
 rRequest->setArgument(PROP_TITLE, sTitle);
@@ -178,6 +182,8 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const 
OUString&
 void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_DEFAULT_NAME);
 rRequest->setArgument(PROP_FILENAME, sName);
@@ -189,6 +195,8 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
OUString& sDirectory)
 throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
 {
+ensureInit();
+
 bool bChanged = 
officecfg::Office::Common::Path::Info::WorkPathChanged::get(
 comphelper::getComponentContext(m_xSMGR));
 if (bChanged )
@@ -212,6 +220,8 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
OUString& sDirectory)
 OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::BLOCKED);
@@ -246,8 +256,7 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 return lFiles;
 }
 
-::sal_Int16 SAL_CALL VistaFilePicker::execute()
-throw(css::uno::RuntimeException)
+void VistaFilePicker::ensureInit()
 {
 bool bInitialized(false);
 {
@@ -262,6 +271,12 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 aInitArguments[0] <<= nTemplateDescription;
 initialize(aInitArguments);
 }
+}
+
+::sal_Int16 SAL_CALL VistaFilePicker::execute()
+throw(css::uno::RuntimeException)
+{
+ensureInit();
 
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SHOW_DIALOG_MODAL);
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index deb15ef6ee3e..31e239403aa7 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -249,6 +249,8 @@ public:
 
 using WeakComponentImplHelperBase::disposing;
 
+void ensureInit();
+
 private:
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 fpicker/source/win32/filepicker/VistaFilePicker.cxx |   19 +--
 fpicker/source/win32/filepicker/VistaFilePicker.hxx |2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 51433f10b67685ad64dc77c848c689706f2afdd8
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 09:25:00 2017 +0100

Resolves: tdf#106729 ensure VistaFilePicker init before access

(cherry picked from commit a15ec82edebf14baa41a888ead7da8e0556ab0bb)

Change-Id: I238599cf5ed464c4bb99a894ac47126fbc32796d
Reviewed-on: https://gerrit.libreoffice.org/35746
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 2efdad5af545..238dad83d44d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -121,6 +121,8 @@ void SAL_CALL VistaFilePicker::disposing(const 
css::lang::EventObject& /*aEvent*
 void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_MULTISELECTION_MODE);
 rRequest->setArgument(PROP_MULTISELECTION_MODE, bMode);
@@ -132,6 +134,8 @@ void SAL_CALL 
VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_TITLE);
 rRequest->setArgument(PROP_TITLE, sTitle);
@@ -195,6 +199,8 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const 
OUString&
 void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_DEFAULT_NAME);
 rRequest->setArgument(PROP_FILENAME, sName);
@@ -207,6 +213,8 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
OUString& sDirectory)
 throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
 {
+ensureInit();
+
 bool bChanged = 
officecfg::Office::Common::Path::Info::WorkPathChanged::get(
 comphelper::getComponentContext(m_xSMGR));
 if (bChanged )
@@ -231,6 +239,8 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
OUString& sDirectory)
 OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::BLOCKED);
@@ -268,8 +278,7 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 }
 
 
-::sal_Int16 SAL_CALL VistaFilePicker::execute()
-throw(css::uno::RuntimeException)
+void VistaFilePicker::ensureInit()
 {
 bool bInitialized(false);
 {
@@ -284,6 +293,12 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 aInitArguments[0] <<= nTemplateDescription;
 initialize(aInitArguments);
 }
+}
+
+::sal_Int16 SAL_CALL VistaFilePicker::execute()
+throw(css::uno::RuntimeException)
+{
+ensureInit();
 
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SHOW_DIALOG_MODAL);
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index b14eb124dc69..2118fbd9d058 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -249,6 +249,8 @@ public:
 
 using WeakComponentImplHelperBase::disposing;
 
+void ensureInit();
+
 private:
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang include/o3tl include/sfx2 include/svx sc/inc sc/source sd/inc sd/source sfx2/source starmath/inc starmath/qa starmath/source sw/inc sw/source

2017-03-27 Thread Noel Grandin

 compilerplugins/clang/passstuffbyref.cxx|   11 +++-
 include/o3tl/strong_int.hxx |2 
 include/sfx2/docfac.hxx |2 
 include/sfx2/frame.hxx  |3 -
 include/sfx2/shell.hxx  |   59 -
 include/sfx2/viewfac.hxx|9 +--
 include/sfx2/viewfrm.hxx|   16 ++---
 include/sfx2/viewsh.hxx |4 -
 include/svx/ifaceids.hxx|   10 +--
 sc/inc/shellids.hxx |   36 ++---
 sc/source/ui/app/scdll.cxx  |4 -
 sd/inc/FactoryIds.hxx   |   15 ++---
 sd/inc/glob.hxx |   36 ++---
 sd/source/ui/inc/ViewShellImplementation.hxx|2 
 sd/source/ui/view/GraphicViewShellBase.cxx  |2 
 sd/source/ui/view/ImpressViewShellBase.cxx  |2 
 sd/source/ui/view/OutlineViewShellBase.cxx  |2 
 sd/source/ui/view/PresentationViewShellBase.cxx |2 
 sd/source/ui/view/SlideSorterViewShellBase.cxx  |2 
 sd/source/ui/view/ViewShellImplementation.cxx   |2 
 sd/source/ui/view/viewshe2.cxx  |6 --
 sfx2/source/appl/appdata.cxx|2 
 sfx2/source/appl/appinit.cxx|3 -
 sfx2/source/appl/appquit.cxx|3 -
 sfx2/source/control/objface.cxx |2 
 sfx2/source/doc/docfac.cxx  |4 -
 sfx2/source/inc/appdata.hxx |3 -
 sfx2/source/view/frame.cxx  |2 
 sfx2/source/view/frame2.cxx |6 +-
 sfx2/source/view/frmload.cxx|   15 ++---
 sfx2/source/view/impviewframe.hxx   |   18 +++---
 sfx2/source/view/viewfac.cxx|9 +--
 sfx2/source/view/viewfrm.cxx|   32 +--
 starmath/inc/document.hxx   |2 
 starmath/inc/smmod.hxx  |2 
 starmath/inc/view.hxx   |2 
 starmath/qa/cppunit/test_starmath.cxx   |2 
 starmath/source/smdll.cxx   |2 
 sw/inc/shellid.hxx  |   66 
 sw/source/core/doc/docglbl.cxx  |2 
 sw/source/filter/html/htmlform.cxx  |2 
 sw/source/ui/dbui/mmresultdialogs.cxx   |4 -
 sw/source/uibase/app/appenv.cxx |2 
 sw/source/uibase/app/docsh2.cxx |2 
 sw/source/uibase/app/swmodule.cxx   |8 +-
 sw/source/uibase/dbui/dbmgr.cxx |2 
 sw/source/uibase/misc/glshell.cxx   |4 -
 sw/source/uibase/uno/unomailmerge.cxx   |2 
 sw/source/uibase/uno/unotxdoc.cxx   |4 -
 sw/source/uibase/uno/unotxvw.cxx|2 
 50 files changed, 208 insertions(+), 228 deletions(-)

New commits:
commit d615af618cc6a7152c76a49b3cd09db38eaa9e07
Author: Noel Grandin 
Date:   Thu Mar 23 20:14:15 2017 +0200

create SfxInterfaceId o3tl::strong_int

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

diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index 8b60b5c353e7..12c13d1b6c89 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -252,6 +252,10 @@ void PassStuffByRef::checkParams(const FunctionDecl * 
functionDecl) {
 }
 }
 
+static bool startswith(const std::string& rStr, const char* pSubStr) {
+return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
+}
+
 void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const 
CXXMethodDecl * methodDecl) {
 
 if (methodDecl && (methodDecl->isVirtual() || 
methodDecl->hasAttr())) {
@@ -303,6 +307,9 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * 
functionDecl, const C
 .GlobalNamespace()) {
 return;
 }
+if (startswith(type.getAsString(), "struct o3tl::strong_int")) {
+return;
+}
 mbInsideFunctionDecl = true;
 mbFoundDisqualifier = false;
 TraverseStmt(functionDecl->getBody());
@@ -313,9 +320,9 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * 
functionDecl, const C
 
 report(
 DiagnosticsEngine::Warning,
-"rather return %0 from function %1 %2 by const& than by value, to 
avoid unnecessary copying",
+"rather return %0 from function %1 by const& than by value, to 
avoid unnecessary copying",
 functionDecl->getSourceRange().getBegin())
-<< type.getAsString() << functionDecl->getQualifiedNameAsString() << 
type->getTypeClassName() << functionDecl->getSourceRange();
+<< type.getAsString()

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

2017-03-27 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
|   12 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
|4 +--
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 6f968f00b1534406a2943be374fab924c3396482
Author: jan Iversen 
Date:   Mon Mar 20 12:42:01 2017 +0100

iOS LibreOfficeLight FileManager title

Show current directory as title, together with info
whether it is local or iCloud

Change-Id: Icb4d68e5c21589456ea276e9e11d191dd3714d14

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
index 03003fd699b2..49fdf41ae1ed 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
@@ -92,6 +92,15 @@ private class FileStorage
 
 
 
+func getDirectory() -> String
+{
+let myCurDir = currentDir.path
+let myLen= currentDocPath!.path.endIndex
+return (myLen == myCurDir.endIndex) ? "/" : myCurDir.substring(from: 
myLen)
+}
+
+
+
 func createDirectory(_ name: String)
 {
 let newDir = currentDir.appendingPathComponent(name)
@@ -331,10 +340,9 @@ class FileManagerController : UITableViewController, 
FileActionsControlDelegate
 // Support function
 func reloadData()
 {
-selectedRow = nil
+title = (fileData.selectStorage(false) ? "Local - " : "iCloud - ") + 
fileData.getDirectory()
 tableView.reloadData()
 }
-
 }
 
 
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index 01a75ba0292f..7bf3f6963421 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 
@@ -93,7 +93,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Samuel Mehrbrodt

 kit/Kit.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b91533abb56bd81fa63f2ad85c2bd9bbc523f2c
Author: Samuel Mehrbrodt 
Date:   Fri Mar 24 14:18:46 2017 +0100

Don't try to copy the file when it already exists

Without this, 'make run' fails for me

Change-Id: I7fd3c39a0443d9f5d70af2382e498cd5c10435d8
Reviewed-on: https://gerrit.libreoffice.org/35649
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 58f79b28..f227af9f 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -149,7 +149,7 @@ namespace
 case FTW_F:
 case FTW_SLN:
 File(newPath.parent()).createDirectories();
-if (link(fpath, newPath.toString().c_str()) == -1)
+if (link(fpath, newPath.toString().c_str()) == -1 && errno != 
EEXIST)
 {
 LOG_SYS("link(\"" << fpath << "\", \"" <<
 newPath.toString() << "\") failed. Will copy.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread László Németh

 external/hunspell/0002-fix-other-regression-in-compounding.patch | 
  43 ++
 external/hunspell/0005-fix-syllable-counting-in-compound-word-handling.patch | 
  66 ++
 external/hunspell/UnpackedTarball_hunspell.mk| 
   2 
 3 files changed, 111 insertions(+)

New commits:
commit 23c028ba014f521bf1b70c83439e0915e56c296f
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Mar 24 15:26:49 2017 +0100

tdf#106751 fix regressions in Hungarian spell checking

using recent fixes of Hunspell code base

Change-Id: I180a2ecba924180419c5eb1a0e78b5c84e7242c4
Reviewed-on: https://gerrit.libreoffice.org/35670
Tested-by: Jenkins 
Tested-by: LÃ¡szlÃ³ NÃ©meth 
Reviewed-by: LÃ¡szlÃ³ NÃ©meth 
Reviewed-by: Andras Timar 

diff --git a/external/hunspell/0002-fix-other-regression-in-compounding.patch 
b/external/hunspell/0002-fix-other-regression-in-compounding.patch
new file mode 100644
index ..cbf29e54f93a
--- /dev/null
+++ b/external/hunspell/0002-fix-other-regression-in-compounding.patch
@@ -0,0 +1,43 @@
+From 1fada01663b29b57c010a9c274e45a5cf9ecf222 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?=
+ 
+Date: Sun, 19 Mar 2017 13:19:29 +0100
+Subject: [PATCH 2/7] fix other regression in compounding
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allow compound words again with
+starting "kor", "alak", "asszony", "Ãºr"
+related to the "REP kor _kor" etc. rules
+using the Hungarian spelling dictionary.
+
+regression from...
+
+commit 73b1cad1af7ab94252f75784fa6724cf062a6966
+Author: Martin Hosken 
+Date:   Mon Apr 18 16:28:26 2016 +0700
+
+Add support for bounded conversion
+---
+ src/hunspell/affixmgr.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/hunspell/affixmgr.cxx b/src/hunspell/affixmgr.cxx
+index 78c70e7..ec2093d 100644
+--- a/src/hunspell/affixmgr.cxx
 b/src/hunspell/affixmgr.cxx
+@@ -1290,8 +1290,8 @@ int AffixMgr::cpdrep_check(const char* word, int wl) {
+ // search every occurence of the pattern in the word
+ while ((r = strstr(r, reptable[i].pattern.c_str())) != NULL) {
+   std::string candidate(word);
+-  size_t type = r == word ? 1 : 0;
+-  if (r - word + reptable[i].pattern.size() == lenp)
++  size_t type = r == word && langnum != LANG_hu ? 1 : 0;
++  if (r - word + reptable[i].pattern.size() == lenp && langnum != LANG_hu)
+ type += 2;
+   candidate.replace(r - word, lenp, reptable[i].outstrings[type]);
+   if (candidate_check(candidate.c_str(), candidate.size()))
+-- 
+2.7.4
+
diff --git 
a/external/hunspell/0005-fix-syllable-counting-in-compound-word-handling.patch 
b/external/hunspell/0005-fix-syllable-counting-in-compound-word-handling.patch
new file mode 100644
index ..670d938e5441
--- /dev/null
+++ 
b/external/hunspell/0005-fix-syllable-counting-in-compound-word-handling.patch
@@ -0,0 +1,66 @@
+From f4ec6a283f972c82d068f4472320d424c40d45cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?=
+ 
+Date: Thu, 23 Mar 2017 16:40:52 +0100
+Subject: [PATCH 5/7] fix syllable counting in compound word handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Note: one of the fixed regressions is related to an old
+hidden mistake: using clen instead of blen of the stem
+word lengths was indifferent with the original get_syllable(),
+because blen == clen at 8-bit encodings, and UTF-8
+words were handled by null-termination. Implementing Unicode
+support in Hunspell, clen was changed only in
+compound_check_morph() to blen accidentally, but not
+in compound_check(), resulting problems from the
+recent std::string conversion.
+
+Now this commit is a real fix for the regression from the
+commit c63c93237e4decdba5544a96093448605ac549c2,
+instead of the following bad fix:
+
+commit d06b0c57ae87ee8743f1bf53f80c1f8e364db619
+Author: LÃ¡szlÃ³ NÃ©meth 
+Date:   Fri Mar 17 15:11:23 2017 +0100
+
+fix Hungarian compound word handling
+---
+ src/hunspell/affixmgr.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/hunspell/affixmgr.cxx b/src/hunspell/affixmgr.cxx
+index 2ed8233..3d65539 100644
+--- a/src/hunspell/affixmgr.cxx
 b/src/hunspell/affixmgr.cxx
+@@ -1816,7 +1816,7 @@ struct hentry* AffixMgr::compound_check(const 
std::string& word,
+   // LANG_hu section: spec. Hungarian rule
+   if (langnum == LANG_hu) {
+ // calculate syllable number of the word
+-numsyllable += get_syllable(st.substr(i));
++numsyllable += get_syllable(st.substr(0, i));
+ // + 1 word, if syllable number of the prefix > 1 (hungarian
+ // convention)
+ if (pfx && (get_syllable(pfx->getKey()) > 1))
+@@ -1901,7 +1901,7 @@ struct hentry* AffixMgr::compound_check(const 
std::string& word,
+

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

2017-03-27 Thread Caolán McNamara

 fpicker/source/win32/filepicker/VistaFilePicker.cxx |   17 -
 fpicker/source/win32/filepicker/VistaFilePicker.hxx |2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit ffa13328287f57c25204adddee3a0d12c25ff959
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 09:25:00 2017 +0100

Resolves: tdf#106729 ensure VistaFilePicker init before access

(cherry picked from commit a15ec82edebf14baa41a888ead7da8e0556ab0bb)

Change-Id: I238599cf5ed464c4bb99a894ac47126fbc32796d

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 9e15e2dde1b3..f2565ca78164 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -134,6 +134,8 @@ void SAL_CALL VistaFilePicker::disposing(const 
css::lang::EventObject& /*aEvent*
 void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_MULTISELECTION_MODE);
 rRequest->setArgument(PROP_MULTISELECTION_MODE, bMode);
@@ -145,6 +147,8 @@ void SAL_CALL 
VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_TITLE);
 rRequest->setArgument(PROP_TITLE, sTitle);
@@ -208,6 +212,8 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const 
OUString&
 void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_DEFAULT_NAME);
 rRequest->setArgument(PROP_FILENAME, sName);
@@ -220,6 +226,8 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
OUString& sDirectory)
 throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
 {
+ensureInit();
+
 bool bChanged = 
officecfg::Office::Common::Path::Info::WorkPathChanged::get(
 comphelper::getComponentContext(m_xSMGR));
 if (bChanged )
@@ -244,6 +252,8 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
OUString& sDirectory)
 OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
 throw(css::uno::RuntimeException)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::BLOCKED);
@@ -281,7 +291,7 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 }
 
 
-::sal_Int16 SAL_CALL VistaFilePicker::execute()
+void VistaFilePicker::ensureInit()
 throw(css::uno::RuntimeException)
 {
 bool bInitialized(false);
@@ -297,6 +307,11 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 aInitArguments[0] <<= nTemplateDescription;
 initialize(aInitArguments);
 }
+}
+
+::sal_Int16 SAL_CALL VistaFilePicker::execute()
+{
+ensureInit();
 
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SHOW_DIALOG_MODAL);
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 01b6da335893..88e5460e8948 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -249,6 +249,8 @@ public:
 
 using WeakComponentImplHelperBase::disposing;
 
+void ensureInit();
+
 private:
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 fpicker/source/win32/filepicker/VistaFilePicker.cxx |   17 -
 fpicker/source/win32/filepicker/VistaFilePicker.hxx |2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit a15ec82edebf14baa41a888ead7da8e0556ab0bb
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 27 09:25:00 2017 +0100

Resolves: tdf#106729 ensure VistaFilePicker init before access

Change-Id: I238599cf5ed464c4bb99a894ac47126fbc32796d

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index ad50716c604f..d2508c50e690 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -106,6 +106,8 @@ void SAL_CALL VistaFilePicker::disposing(const 
css::lang::EventObject& /*aEvent*
 
 void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_MULTISELECTION_MODE);
 rRequest->setArgument(PROP_MULTISELECTION_MODE, bMode);
@@ -115,6 +117,8 @@ void SAL_CALL 
VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 
 void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_TITLE);
 rRequest->setArgument(PROP_TITLE, sTitle);
@@ -165,6 +169,8 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const 
OUString&
 
 void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_DEFAULT_NAME);
 rRequest->setArgument(PROP_FILENAME, sName);
@@ -174,6 +180,8 @@ void SAL_CALL VistaFilePicker::setDefaultName(const 
OUString& sName )
 
 void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
 {
+ensureInit();
+
 bool bChanged = 
officecfg::Office::Common::Path::Info::WorkPathChanged::get(
 comphelper::getComponentContext(m_xSMGR));
 if (bChanged )
@@ -196,6 +204,8 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
OUString& sDirectory)
 
 OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
 {
+ensureInit();
+
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::BLOCKED);
@@ -228,7 +238,7 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 return lFiles;
 }
 
-::sal_Int16 SAL_CALL VistaFilePicker::execute()
+void VistaFilePicker::ensureInit()
 {
 bool bInitialized(false);
 {
@@ -243,6 +253,11 @@ css::uno::Sequence< OUString > SAL_CALL 
VistaFilePicker::getSelectedFiles()
 aInitArguments[0] <<= nTemplateDescription;
 initialize(aInitArguments);
 }
+}
+
+::sal_Int16 SAL_CALL VistaFilePicker::execute()
+{
+ensureInit();
 
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SHOW_DIALOG_MODAL);
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 118646810c4b..65e67c2c3041 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -212,6 +212,8 @@ public:
 
 using WeakComponentImplHelperBase::disposing;
 
+void ensureInit();
+
 private:
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Fakabbir Amin

 sw/uiconfig/swriter/ui/tableproperties.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41cd0ccc68b5bb43bfe28f0ece0b1fbc25a7adf3
Author: Fakabbir Amin 
Date:   Fri Mar 24 11:50:49 2017 +0530

tdf#106225 Rename Table Format to Table Properties

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

diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui 
b/sw/uiconfig/swriter/ui/tableproperties.ui
index c64f2333e4d8..f44d8cc04743 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -5,7 +5,7 @@
   
 False
 6
-Table Format
+Table Properties
 False
 dialog
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Caolán McNamara

 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b487ff81b106925b4204276c551e6e3751dc293
Author: CaolÃ¡n McNamara 
Date:   Sun Mar 26 21:31:50 2017 +0100

document mnIndex doesn't change

Change-Id: Ia000682774cee4c58811325f6ab40859502da79f

diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index fbded8d9e32b..ee94039c02b4 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -176,7 +176,7 @@ public:
 
 class EquationExpression : public ExpressionNode
 {
-sal_Int32   mnIndex;
+const sal_Int32 mnIndex;
 const EnhancedCustomShape2d&mrCustoShape;
 mutable boolmbGettingValueGuard;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Miklos Vajna

 wsd/LOOLWSD.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1e8fc5334121cc413465599a71b41c5c3aed14b
Author: Miklos Vajna 
Date:   Mon Mar 27 09:18:30 2017 +0200

wsd: fix libstdc++-4.8 build

error: no viable conversion from returned value of type 'bool' to
function return type 'std::shared_ptr'

Change-Id: I5d4215ce61e5327ab702dbf6e4cc7be1330afed2

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index ad1f4ece..bdad1aaf 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1259,7 +1259,7 @@ static std::shared_ptr 
findOrCreateDocBroker(WebSocketHandler& w
 {
 LOG_WRN("DocBroker with docKey [" << docKey << "] that is marked 
to be destroyed. Rejecting client request.");
 ws.shutdown(WebSocketHandler::StatusCodes::ENDPOINT_GOING_AWAY, 
"error: cmd=load kind=docunloading");
-return false;
+return nullptr;
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Samuel Mehrbrodt

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

New commits:
commit 1bf940eb2bb6b937b2175875bfebca46cca98d45
Author: Samuel Mehrbrodt 
Date:   Fri Mar 24 15:02:53 2017 +

gpg4libre: One service should be enough for the dialog to work

Change-Id: I2279c39e4dddec94cb061fe9bcad06804a6d35c9
Reviewed-on: https://gerrit.libreoffice.org/35664
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 7a7e10c3dc31..fb9fbf429cd2 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -66,7 +66,7 @@ bool DocumentSignatureManager::init()
 if (mxGpgSEInitializer.is())
 mxGpgSecurityContext = 
mxGpgSEInitializer->createSecurityContext(OUString());
 
-return mxSecurityContext.is() && mxGpgSecurityContext.is();
+return mxSecurityContext.is() || mxGpgSecurityContext.is();
 #else
 return mxSecurityContext.is();
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2017-03-27 Thread Samuel Mehrbrodt

 loleaflet/src/admin/AdminSocketSettings.js |4 ++--
 loleaflet/src/core/Socket.js   |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 460da71ce23639b275e95f53fd2a5c8a1ddc2901
Author: Samuel Mehrbrodt 
Date:   Fri Mar 24 14:24:19 2017 +

Use hub link for git log

Change-Id: Iaf4a6f5568f2e84d8261756607a62598a7144df1
Reviewed-on: https://gerrit.libreoffice.org/35656
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loleaflet/src/admin/AdminSocketSettings.js 
b/loleaflet/src/admin/AdminSocketSettings.js
index 5a7ec207..537d1487 100644
--- a/loleaflet/src/admin/AdminSocketSettings.js
+++ b/loleaflet/src/admin/AdminSocketSettings.js
@@ -70,7 +70,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
var loolwsdVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' + 
h + '';
+   h = 'https://hub.libreoffice.org/git-online/' + h + '">' + h + '';

$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h + 
')');
}
else {
@@ -81,7 +81,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h 
+ '';
+   h = 'https://hub.libreoffice.org/git-core/' + h + '">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ea8f15e9..787a487e 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -176,7 +176,7 @@ L.Socket = L.Class.extend({
var loolwsdVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' + 
h + '';
+   h = 'https://hub.libreoffice.org/git-online/' + h + '">' + h + '';

$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h + 
')');
}
else {
@@ -192,7 +192,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h 
+ '';
+   h = 'https://hub.libreoffice.org/git-core/' + h + '">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Samuel Mehrbrodt

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

New commits:
commit 913395e99bbee7b43bf215588956c1b8e4f578c7
Author: Samuel Mehrbrodt 
Date:   Fri Mar 24 14:22:53 2017 +

Use hub link for git log

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

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 72a21d78c51c..35308f030af9 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -162,7 +162,7 @@ void AboutDialog::SetBuildIdLink()
 }
 
 m_pBuildIdLink->SetText(m_buildIdLinkString.replaceAll("$GITHASH", 
buildId));
-
m_pBuildIdLink->SetURL("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=";
 + buildId);
+m_pBuildIdLink->SetURL("https://hub.libreoffice.org/git-core/"; + 
buildId);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Miklos Vajna

 sd/qa/unit/tiledrendering/tiledrendering.cxx  |3 ++-
 sw/qa/extras/tiledrendering/tiledrendering.cxx|3 ++-
 writerfilter/source/rtftok/rtfdispatchdestination.cxx |6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 6dc7d10e038f15c26b7c0732d730eeef2c5c3520
Author: Miklos Vajna 
Date:   Mon Mar 27 09:10:32 2017 +0200

Indentation fixes

Change-Id: Idbd31b84f252abdab1787945c4964173ad5765ba

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index ca40ef641a99..e1a709f3ecc7 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -54,7 +54,8 @@ static const char* const DATA_DIRECTORY = 
"/sd/qa/unit/tiledrendering/data/";
 
 static std::ostream& operator<<(std::ostream& os, ViewShellId id)
 {
-os << (sal_Int32)id; return os;
+os << (sal_Int32)id;
+return os;
 }
 
 class SdTiledRenderingTest : public SdModelTestBase, public XmlTestTools
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 195cde9c31fc..4aee6c1d7ff2 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -38,7 +38,8 @@ static const char* const DATA_DIRECTORY = 
"/sw/qa/extras/tiledrendering/data/";
 
 static std::ostream& operator<<(std::ostream& os, ViewShellId id)
 {
-os << (sal_Int32)id; return os;
+os << (sal_Int32)id;
+return os;
 }
 
 /// Testsuite for the SwXTextDocument methods implementing the 
vcl::ITiledRenderable interface.
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx 
b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 3863309b3601..cb48b5b3d890 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -73,15 +73,15 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 if ('\\' == ch)
 bInKeyword = true;
 if (!bInKeyword
-&& rtl::isAsciiAlphanumeric(static_cast(ch)))
+&& rtl::isAsciiAlphanumeric(static_cast(ch)))
 aBuf.append(ch);
 else if (bInKeyword
  && rtl::isAsciiWhiteSpace(
  static_cast(ch)))
 bInKeyword = false;
 if (!aBuf.isEmpty()
-&& !rtl::isAsciiAlphanumeric(
-static_cast(ch)))
+&& !rtl::isAsciiAlphanumeric(
+static_cast(ch)))
 bFoundCode = true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

83 matches

Mail list logo