[Libreoffice-commits] core.git: 4 commits - connectivity/source cui/source dbaccess/source include/vcl sd/source vcl/source

[Noel Grandin]

 connectivity/source/drivers/odbc/OConnection.cxx|2 
 connectivity/source/drivers/odbc/OPreparedStatement.cxx |2 
 connectivity/source/drivers/odbc/ORealDriver.cxx|  112 +--
 connectivity/source/drivers/odbc/OResultSet.cxx |6 
 connectivity/source/drivers/odbc/OResultSetMetaData.cxx |2 
 connectivity/source/drivers/odbc/OTools.cxx |   24 +-
 connectivity/source/inc/odbc/OConnection.hxx|3 
 connectivity/source/inc/odbc/ODatabaseMetaData.hxx  |2 
 connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx |2 
 connectivity/source/inc/odbc/ODriver.hxx|3 
 connectivity/source/inc/odbc/OFunctions.hxx |  122 ++--
 connectivity/source/inc/odbc/OResultSet.hxx |2 
 connectivity/source/inc/odbc/OResultSetMetaData.hxx |2 
 connectivity/source/inc/odbc/OStatement.hxx |2 
 connectivity/source/inc/odbc/OTools.hxx |  111 +-
 cui/source/tabpages/chardlg.h   |   28 --
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx   |2 
 include/vcl/wrkwin.hxx  |   39 ++-
 sd/source/ui/slideshow/slideshow.cxx|4 
 vcl/source/window/wrkwin.cxx|   18 -
 20 files changed, 237 insertions(+), 251 deletions(-)

New commits:
commit abb774722230ce2b55f2e1f1528fcd0514ba83e1
Author: Noel Grandin 
Date:   Thu May 28 15:33:16 2015 +0200

simplify

Change-Id: I74288b1a29a928d14a022f39b63bbdab1517c68a

diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx 
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 4cddc7d..c474a19 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -270,7 +270,7 @@ namespace
 {
 m_pBrowseBox->DeactivateCell();
 // we are in the right mode if a row hase been selected row
-if ( BrowserMode::HIDESELECT == ( nMode & BrowserMode::HIDESELECT 
) )
+if ( nMode & BrowserMode::HIDESELECT )
 {
 nMode &= ~BrowserMode::HIDESELECT;
 nMode |= BrowserMode::MULTISELECTION;
commit 66dd3427652e4297b12c76bb1a28bc81d4a70c87
Author: Noel Grandin 
Date:   Thu May 28 14:09:39 2015 +0200

convert ODBC3SQL constants to scoped enum

Change-Id: I61d2b76a32be23d238b1f50a6a76975d64d1878c

diff --git a/connectivity/source/drivers/odbc/OConnection.cxx 
b/connectivity/source/drivers/odbc/OConnection.cxx
index d88bb04..458819e 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -90,7 +90,7 @@ void SAL_CALL OConnection::release() throw()
 relase_ChildImpl();
 }
 
-oslGenericFunction OConnection::getOdbcFunction(sal_Int32 _nIndex)  const
+oslGenericFunction OConnection::getOdbcFunction(ODBC3SQLFunctionId _nIndex)  
const
 {
 OSL_ENSURE(m_pDriver,"OConnection::getOdbcFunction: m_pDriver is null!");
 return m_pDriver->getOdbcFunction(_nIndex);
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index f5ff4e3..a611ebe 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -391,7 +391,7 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
 rDataLen = _nDataLen;
 
 SQLRETURN nRetcode;
-nRetcode = 
(*reinterpret_cast(m_pConnection->getOdbcFunction(ODBC3SQLBindParameter)))(
+nRetcode = 
(*reinterpret_cast(m_pConnection->getOdbcFunction(ODBC3SQLFunctionId::BindParameter)))(
   m_aStatementHandle,
   // checkParameterIndex guarantees this is safe
   static_cast(parameterIndex),
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx 
b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 2012cf5..27b23ff 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -94,225 +94,225 @@ namespace connectivity
 class ORealObdcDriver : public ODBCDriver
 {
 protected:
-virtual oslGenericFunction  getOdbcFunction(sal_Int32 _nIndex)  
const SAL_OVERRIDE;
+virtual oslGenericFunction  getOdbcFunction(ODBC3SQLFunctionId 
_nIndex)  const SAL_OVERRIDE;
 virtual SQLHANDLE   EnvironmentHandle(OUString &_rPath) 
SAL_OVERRIDE;
 public:
 ORealObdcDriver(const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : 
ODBCDriver(_rxFactory) {}
 };
 
 
-oslGenericFunction ORealObdcDriver::getOdbcFunction(sal_Int32 _nIndex) const
+oslGenericFunction ORealObdcDriver::getOdbcFu

[Libreoffice-commits] online.git: 2 commits - loolwsd/configure.ac

[Tor Lillqvist]

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

New commits:
commit f94cef92c8ad8040853ae3e2345f9ff70622d791
Author: Tor Lillqvist 
Date:   Fri May 29 09:47:51 2015 +0300

Post-release bump to 1.0.25

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 74791d3..e1567f9 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.24], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.25], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 2230b3f0c57393c98b827be33482fe0623c24cda
Author: Tor Lillqvist 
Date:   Fri May 29 09:47:03 2015 +0300

Bump version to 1.0.24 for tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index a5f391b..74791d3 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.23], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.24], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp loolwsd/protocol.txt

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp |   21 +++--
 loolwsd/protocol.txt|   17 -
 2 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit a608aaee90db0d045bd8fa4713c6fa31dd47bd1e
Author: Tor Lillqvist 
Date:   Fri May 29 09:44:39 2015 +0300

Add an invalidate: message that is in LOOL style with named parameters

The invalidatetiles: message as generated directly from the
LOK_CALLBACK_INVALIDATE_TILES will be dropped soon.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 3716492..9843832 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -736,8 +736,25 @@ extern "C"
 switch ((LibreOfficeKitCallbackType) nType)
 {
 case LOK_CALLBACK_INVALIDATE_TILES:
-srv->sendTextFrame("curpart: part=" + 
std::to_string(srv->_loKitDocument->pClass->getPart(srv->_loKitDocument)));
-srv->sendTextFrame("invalidatetiles: " + std::string(pPayload));
+{
+int curPart = 
srv->_loKitDocument->pClass->getPart(srv->_loKitDocument);
+srv->sendTextFrame("curpart: part=" + std::to_string(curPart));
+srv->sendTextFrame("invalidatetiles: " + 
std::string(pPayload));
+StringTokenizer tokens(std::string(pPayload), " ", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+if (tokens.count() == 4)
+{
+int width(std::stoi(tokens[0]));
+int height(std::stoi(tokens[1]));
+int x(std::stoi(tokens[2]));
+int y(std::stoi(tokens[3]));
+srv->sendTextFrame("invalidate:"
+   " part=" + std::to_string(curPart) +
+   " x=" + std::to_string(x) +
+   " y=" + std::to_string(y) +
+   " width=" + std::to_string(width) +
+   " height=" + std::to_string(height));
+}
+}
 break;
 case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
 srv->sendTextFrame("invalidatecursor: " + std::string(pPayload));
diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index adb5950..82d3b90 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -66,10 +66,25 @@ error: cmd= kind=
 message that caused the error.  is some single-word
 classification
 
+invalidate: part= x= y= width= height=
+
+All parameters are numbers. Tells the client to invalidate any
+cached tiles for the document area specified (in twips), at any
+zoom level.
+
+The client should handle either this message or the
+invalidatetiles: message, which has a different syntax, with
+payload directly from the LOK_CALLBACK_INVALIDATE_TILES
+callback. (The latter does not contain a part number, and as the
+protocol is asynchronous, it is unclear whether a client can be
+sure, or find out with certainty, for what part the
+invalidatetiles: message is. The invalidatetiles: message will be
+dropped soon.)
+
 nextmessage: size=
 
  is the size, in bytes, of the next message, in case it
-is "large" (in practise, nextmessage: messages precede each tile:
+is "large". (In practice, nextmessage: messages precede each tile:
 message). Can be ignored by clients using an API that can read
 arbitrarily large buffers from a WebSocket (like JavaScript), but
 must be handled by clients that cannot (like those using Poco
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 connectivity/source/commontools/warningscontainer.cxx |5 -
 dbaccess/source/core/api/FilteredContainer.cxx|2 
 dbaccess/source/core/api/query.hxx|   10 +--
 dbaccess/source/core/api/querycontainer.cxx   |4 -
 dbaccess/source/core/api/tablecontainer.cxx   |2 
 dbaccess/source/core/api/viewcontainer.cxx|2 
 dbaccess/source/core/inc/FilteredContainer.hxx|6 +-
 dbaccess/source/core/inc/querycontainer.hxx   |8 +--
 dbaccess/source/core/inc/tablecontainer.hxx   |2 
 dbaccess/source/core/inc/viewcontainer.hxx|4 -
 include/connectivity/warningscontainer.hxx|   46 --
 11 files changed, 32 insertions(+), 59 deletions(-)

New commits:
commit 6c1cabe677f5eb24b465dd6e316c8c66df64bb29
Author: Noel Grandin 
Date:   Tue May 26 10:25:09 2015 +0200

loplugin:unnecessarysuperclass, merge IWarningsContainer..

..into WarningsContainer

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

diff --git a/connectivity/source/commontools/warningscontainer.cxx 
b/connectivity/source/commontools/warningscontainer.cxx
index 4afe81a..5d35532 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -55,11 +55,6 @@ namespace dbtools
 }
 
 
-WarningsContainer::~WarningsContainer()
-{
-}
-
-
 void WarningsContainer::appendWarning(const SQLException& _rWarning)
 {
 lcl_concatWarnings( m_aOwnWarnings, makeAny( _rWarning ) );
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index 3fa7078..4002ce9 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -239,7 +239,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, ::std::vecto
  const Reference< XConnection >& _xCon,
  bool _bCase,
  IRefreshListener*  _pRefreshListener,
- ::dbtools::IWarningsContainer* 
_pWarningsContainer
+ ::dbtools::WarningsContainer* 
_pWarningsContainer
  ,oslInterlockedCount& _nInAppend)
 :OCollection(_rParent,_bCase,_rMutex,::std::vector< OUString>())
 ,m_bConstructed(false)
diff --git a/dbaccess/source/core/api/query.hxx 
b/dbaccess/source/core/api/query.hxx
index ecaa325..baf50c2 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -32,7 +32,7 @@
 
 namespace dbtools
 {
-class IWarningsContainer;
+class WarningsContainer;
 }
 
 namespace dbaccess
@@ -64,8 +64,8 @@ protected:
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
 m_xConnection;
 ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySetInfo >   m_xCommandPropInfo;
 ::rtl::Reference< OContainerMediator > 
 m_pColumnMediator;
-::dbtools::IWarningsContainer* 
 m_pWarnings;
-bool   
 m_bCaseSensitiv : 1;// assume case sensitivity of the column names 
?
+::dbtools::WarningsContainer*  
 m_pWarnings;
+bool   
 m_bCaseSensitiv : 1;// assume case sensitivity of the column 
names ?
 
 // possible actions on our "aggregate"
 enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING };
@@ -131,8 +131,8 @@ public:
 
 public:
 // the caller is responsible for the lifetime!
-voidsetWarningsContainer( 
::dbtools::IWarningsContainer* _pWarnings )   { m_pWarnings = _pWarnings; }
-::dbtools::IWarningsContainer*  getWarningsContainer( ) const  
 { return m_pWarnings; }
+voidsetWarningsContainer( 
::dbtools::WarningsContainer* _pWarnings )   { m_pWarnings = _pWarnings; }
+::dbtools::WarningsContainer*   getWarningsContainer( ) const  
{ return m_pWarnings; }
 
 // XRename
 virtual void SAL_CALL rename( const OUString& newName ) throw 
(::com::sun::star::sdbc::SQLException, 
::com::sun::star::container::ElementExistException, 
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/querycontainer.cxx 
b/dbaccess/source/core/api/querycontainer.cxx
index 59ad63e..b9dd5c1 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core

[Libreoffice-commits] online.git: 2 commits - loleaflet/Makefile

[Tor Lillqvist]

 loleaflet/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77214095944f77ecd2fc213866e869a4ca773fec
Author: Tor Lillqvist 
Date:   Fri May 29 09:41:25 2015 +0300

Post-release bump to 1.0.9

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index afbc8c0..6ae9e76 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.8
+VERSION=1.0.9
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit 96e0b433a7ffa1040a36e2b61f0cb2c312fc6b17
Author: Tor Lillqvist 
Date:   Fri May 29 09:40:54 2015 +0300

Bump version to 1.0.8 for tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 78ed48b..afbc8c0 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.6
+VERSION=1.0.8
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2015-05-29

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ tdf#91634: Image hyperlink is not export after roundtrip.
  in https://gerrit.libreoffice.org/15919 from Yogesh Bharate
  about module oox, sc
+ tdf#91592 WRITER crashes when navigating through comments
  in https://gerrit.libreoffice.org/15952 from Philippe Jung
  about module sw
+ Remove B1IBox, it's not used anywhere
  in https://gerrit.libreoffice.org/15814 from Zsolt Bölöny
  about module basegfx, include
+ Calc: Insert row/col before/after [2/2]
  in https://gerrit.libreoffice.org/15831 from Philippe Jung
  about module officecfg, sc
+ tdf#91691 - FILESAVE: Hyperlink with numeric text not saved in xlsx
  in https://gerrit.libreoffice.org/15943 from Priyanka Gaikwad
  about module sc
+ Implemented formula group count statistic
  in https://gerrit.libreoffice.org/15927 from Benjamin Ni
  about module sc
 End of freshness 

+ split forms unoapi test for performance
  in https://gerrit.libreoffice.org/15959 from Björn Michaelsen
  about module forms
+ split sc unoapi test for performance
  in https://gerrit.libreoffice.org/15956 from Björn Michaelsen
  about module sc
+ split toolkit unoapi test for performance
  in https://gerrit.libreoffice.org/15958 from Björn Michaelsen
  about module toolkit
+ split sw unoapi test for performance
  in https://gerrit.libreoffice.org/15957 from Björn Michaelsen
  about module sw
+ tdf#91702 - fix stack-based MessBox allocation.
  in https://gerrit.libreoffice.org/15954 from Michael Meeks
  about module basctl, basic, chart2, cui, dbaccess, editeng, extensions, sc, 
sd, sfx2, svx, sw, xmlsecurity
+ loplugin:loopvartoosmall
  in https://gerrit.libreoffice.org/15950 from Noel Grandin
  about module compilerplugins, cui, dbaccess, desktop, extensions, 
helpcompiler, i18npool, writerfilter
+ loplugin:loopvartoosmall
  in https://gerrit.libreoffice.org/15948 from Noel Grandin
  about module compilerplugins, connectivity, editeng, framework, sfx2, svx, 
xmloff
+ loplugin:loopvartoosmall
  in https://gerrit.libreoffice.org/15949 from Noel Grandin
  about module basctl, canvas, chart2, compilerplugins, connectivity, 
cpputools, filter, helpcompiler, oox, svx
+ loplugin:loopvartoosmall
  in https://gerrit.libreoffice.org/15945 from Noel Grandin
  about module accessibility, basic, compilerplugins, drawinglayer, framework, 
idl, rsc, sfx2, svtools, toolkit, xmlscript
+ tdf#91645 - Set the text color explicitly for rendering menu items.
  in https://gerrit.libreoffice.org/15947 from Michael Meeks
  about module vcl
+ new uno sidebar api
  in https://gerrit.libreoffice.org/15856 from Laurent Godard
  about module dbaccess, include, offapi, sfx2, vcl


* Merged changes on master for project core changed in the last 25 hours:

+ DrawingML export crash fix
  in https://gerrit.libreoffice.org/15951 from Andras Timar
+ add field namespace to styles.xml when saving fdo85232-1.docx to .odt
  in https://gerrit.libreoffice.org/15858 from Caolán McNamara
+ tdf#91652 - store PDF FilterConfigItem options in dispose.
  in https://gerrit.libreoffice.org/15946 from Michael Meeks
+ Unit test related to tdf#89783: more than 64k PageDescs
  in https://gerrit.libreoffice.org/15941 from Katarina Behrens
+ new clang plugin: loopvartoosmall
  in https://gerrit.libreoffice.org/15930 from Noel Grandin
+ Bug 91489 - CONDITIONAL FORMATTING: Crash on select Icon Set from dialog
  in https://gerrit.libreoffice.org/15928 from Philippe Jung
+ More aggressive system malloc memory checking for linux unit tests.
  in https://gerrit.libreoffice.org/15940 from Michael Meeks
+ Rewrite all calls like Dialog(params).Execute()
  in https://gerrit.libreoffice.org/15915 from Philippe Jung


* Abandoned changes on master for project core changed in the last 25 hours:

+ Implemented formula group count statistic
  in https://gerrit.libreoffice.org/15936 from Benjamin Ni


* Open changes needing tweaks, but being untouched for more than a week:

+ Removed getNormal() from polygontools, it just calls B3DPolygon::getNorma
  in https://gerrit.libreoffice.org/15809 from Zsolt Bölöny
+ fdo#58194 - export DOCX Automatic indent as firstLine indent
  in https://gerrit.libreoffice.org/15768 from Joren De Cuyper
+ tdf#76334 push viewbox properties to the CustomShapeProperties
  in https://gerrit.libreoffice.org/15753 from Joren De Cuyper
+ Add very initial support for Visual Studio 2015
  in https://gerrit.libreoffice.org/15644 from Jesús Corrius
+ tdf#90494: Change gradient angle diagonally by choosing option.
  in https://gerrit.libreoffice.org/15180 from Heena Gupta
+ Rendering support for  multiStop GradientFill (OOXML LINEAR)
  in https://gerrit.libreoffice.org/12056 from Vinaya Mandke
+ Resolves tdf#83365 Other: Access across spreadsheet returns Err:504
  in https://gerrit.libreoffice.org/15363 from Henry Castro
+ tdf#46037: Exchange some uses of configurationhelper for officecfg in Wri

LibreOffice Gerrit News for submodules on 2015-05-29

[gerrit]

Moin!



~~ Project dictionaries ~~

* Open changes on master for project dictionaries changed in the last 25 hours:

None

* Merged changes on master for project dictionaries changed in the last 25 
hours:

None

* Abandoned changes on master for project dictionaries changed in the last 25 
hours:

+ Lightproof: do not return invalid nBehindEndOfSentencePosition
  in https://gerrit.libreoffice.org/15857 from Németh László


* Open changes needing tweaks, but being untouched for more than a week:

None

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

Nothing moved in the project for the last 25 hours

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for dev-tools on 2015-05-29

[gerrit]

Moin!

* Open changes on master for project dev-tools changed in the last 25 hours:

+ Use XML v2. cppcheck doesnt report some issues with the legacy format.
  in https://gerrit.libreoffice.org/15955 from Maarten Hoes


* Merged changes on master for project dev-tools changed in the last 25 hours:

None

* Abandoned changes on master for project dev-tools changed in the last 25 
hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLSession.cpp loolwsd/LOOLWSD.cpp loolwsd/TileCache.cpp

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp |   26 +-
 loolwsd/LOOLWSD.cpp |   18 +++-
 loolwsd/TileCache.cpp   |   67 ++--
 3 files changed, 66 insertions(+), 45 deletions(-)

New commits:
commit 1b85e8e6c266f4f918dedfd4ff3bf659c63b
Author: Tor Lillqvist 
Date:   Fri May 29 08:49:49 2015 +0300

Be more consistent in using 'using'

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index a98a577..3716492 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -52,8 +52,8 @@
 
 using namespace LOOLProtocol;
 
-using Poco::Buffer;
 using Poco::File;
+using Poco::IOException;
 using Poco::Net::HTTPStreamFactory;
 using Poco::Net::WebSocket;
 using Poco::Path;
@@ -101,7 +101,7 @@ std::set 
MasterProcessSession::_pendingPreSpawnedChildren;
 std::set> 
MasterProcessSession::_availableChildSessions;
 std::mutex MasterProcessSession::_availableChildSessionMutex;
 std::condition_variable MasterProcessSession::_availableChildSessionCV;
-Poco::Random MasterProcessSession::_rng;
+Random MasterProcessSession::_rng;
 std::mutex MasterProcessSession::_rngMutex;
 
 MasterProcessSession::MasterProcessSession(std::shared_ptr ws, Kind 
kind) :
@@ -278,7 +278,7 @@ bool MasterProcessSession::haveSeparateProcess()
 return _childId != 0;
 }
 
-Path MasterProcessSession::getJailPath(Poco::UInt64 childId)
+Path MasterProcessSession::getJailPath(UInt64 childId)
 {
 return Path::forDirectory(LOOLWSD::childRoot + Path::separator() + 
std::to_string(childId));
 }
@@ -592,14 +592,14 @@ void MasterProcessSession::dispatchChild()
 _availableChildSessions.insert(childSession);
 std::cout << Util::logPrefix() << "_availableChildSessions size=" 
<< _availableChildSessions.size() << std::endl;
 lock.unlock();
-throw Poco::IOException(copy.toString());
+throw IOException(copy.toString());
 }
 StreamCopier::copyStream(*input, output);
 output.close();
 
 Application::instance().logger().information(Util::logPrefix() + 
"Copying done");
 }
-catch (Poco::IOException& exc)
+catch (IOException& exc)
 {
 Application::instance().logger().error(Util::logPrefix() + "Copying 
failed: " + exc.message());
 sendTextFrame("error: cmd=load kind=failed");
@@ -881,7 +881,7 @@ void ChildProcessSession::sendTile(const char *buffer, int 
length, StringTokeniz
 sendBinaryFrame(output.data(), output.size());
 }
 
-bool ChildProcessSession::keyEvent(const char *buffer, int length, 
Poco::StringTokenizer& tokens)
+bool ChildProcessSession::keyEvent(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 int type, charcode, keycode;
 
@@ -901,7 +901,7 @@ bool ChildProcessSession::keyEvent(const char *buffer, int 
length, Poco::StringT
 return true;
 }
 
-bool ChildProcessSession::mouseEvent(const char *buffer, int length, 
Poco::StringTokenizer& tokens)
+bool ChildProcessSession::mouseEvent(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 int type, x, y, count;
 
@@ -924,7 +924,7 @@ bool ChildProcessSession::mouseEvent(const char *buffer, 
int length, Poco::Strin
 return true;
 }
 
-bool ChildProcessSession::unoCommand(const char *buffer, int length, 
Poco::StringTokenizer& tokens)
+bool ChildProcessSession::unoCommand(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 if (tokens.count() == 1)
 {
@@ -937,7 +937,7 @@ bool ChildProcessSession::unoCommand(const char *buffer, 
int length, Poco::Strin
 return true;
 }
 
-bool ChildProcessSession::selectText(const char *buffer, int length, 
Poco::StringTokenizer& tokens)
+bool ChildProcessSession::selectText(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 int type, x, y;
 
@@ -959,7 +959,7 @@ bool ChildProcessSession::selectText(const char *buffer, 
int length, Poco::Strin
 return true;
 }
 
-bool ChildProcessSession::selectGraphic(const char *buffer, int length, 
Poco::StringTokenizer& tokens)
+bool ChildProcessSession::selectGraphic(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 int type, x, y;
 
@@ -980,7 +980,7 @@ bool ChildProcessSession::selectGraphic(const char *buffer, 
int length, Poco::St
 return true;
 }
 
-bool ChildProcessSession::resetSelection(const char *buffer, int length, 
Poco::StringTokenizer& tokens)
+bool ChildProcessSession::resetSelection(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 if (tokens.count() != 1)
 {
@@ -993,7 +993,7 @@ bool ChildProcessSession::resetSelection(const char 
*buffer, int length, Poco::S
 return true;
 }
 
-bool ChildProcessSession::saveAs(const char *buffer, int length, 
Poco::StringTokenizer& tokens)
+bool ChildProcessSession::saveAs(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 std::string url, format, filterOp

minutes of ESC call ...

[David Ostrovsky]

On Thu, May 28, 2015 at 11:16 AM, Michael Meeks
 wrote:

> + Windows 64 status (David O)
>+ all fine, poking some Base test with Stephan
>+ an OLE test, failing on some machines not others;
>  environment dependent. Thorsten's machine doesn't crash.

That is the exception not the rule.
I could not get a build to finish, and cloph also reproduce the ole bug.

Just rechecked: I'm not able to reproduce the failure: [1] on most
recent master. If I read the code correctly:

void VBATest::testMiscOLEStuff()
{
[...]
if( xContext.is() )
{
uno::Reference xSMgr =
xContext->getServiceManager();
xOLEFactory = uno::Reference(
xSMgr->createInstanceWithContext(
"com.sun.star.bridge.OleObjectFactory",
xContext ), uno::UNO_QUERY );
}
bool bOk = false;
if( xOLEFactory.is() )
{
uno::Reference< uno::XInterface > xExcel =
xOLEFactory->createInstance( "Excel.Application" );
uno::Reference< uno::XInterface > xADODB =
xOLEFactory->createInstance( "ADODB.Connection" );
   bOk = xExcel.is() && xADODB.is();
}
if ( !bOk )
return; // can't do anything, skip test

It's crashing during the load of UNO components, instead exiting with
"can't do anything, skip test" code path.

Can someone who can reproduce this failure debug it? Two options are
needed to activate 64bit windows build: [2].

Thanks!

[1] http://pastebin.com/2tRsXiQn
[2]
https://wiki.documentfoundation.org/Development/msvc-x86_64#Configure_options_known_to_work

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

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/39f3039724f3933963f861f4afc24a92348eb991/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[Norbert Thiebaud]

On Thu, May 28, 2015 at 7:37 PM, Bjoern Michaelsen
 wrote:
> there is no excuse to not run 'make check' anymore at least before
> pushing -- if there ever was one.

you mean beside the fact that make check fails on Windows _and_ Mac ?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[Bjoern Michaelsen]

Hi,

On Thu, May 28, 2015 at 10:40:40PM +0200, Bjoern Michaelsen wrote:
> And with this I see a lot of processes running parallel till the end. This
> suggests to me that the stuff is quite parallelized -- however none of the
> testing threads seem to be CPU-bound rather the Java-stuff seems to be IO 
> bound
> (for IPC?) with the slowest test unit taking ~5 minutes. Thus even 32 jobs or
> more dont seem to keep more than one core busy.

So, I has a look at what is so slow in subsequentcheck:
sc_unoapi4m21.137s
sw_unoapi3m34.494s
toolkit_unoapi   3m18.056s
forms_unoapi 2m51.588s

sw_complex   1m 6.937s
framework_unoapi 1m 2.938s
svx_unoapi   0m40.205s
sd_unoapi0m38.568s
chart2_unoapi0m37.695s
xmloff_unoapi0m29.696s
ucb_unoapi   0m25.288s
starmath_unoapi  0m24.856s

pragmatically splitting up the first four:

 https://gerrit.libreoffice.org/#/c/15959/

brings 'make check' down to 2m6s on big Bertha. For comparison:

 find instdir/ -name '*lo.so'|xargs rm; time make

that is, just relinking (most) LibreOffice libs takes 2m26s on that machine
without symbols (assume more than 10 minutes with symbols). Given this
relation, there is no excuse to not run 'make check' anymore at least before
pushing -- if there ever was one.

Best,

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - officecfg/registry svx/inc

[Adolfo Jayme Barrientos]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |
2 +-
 svx/inc/globlmn_tmpl.hrc |
2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7a3d25c5916dc293a8d30e24c41aee4b7154a39a
Author: Adolfo Jayme Barrientos 
Date:   Thu May 28 17:51:01 2015 -0500

tdf#91653 Give this command a saner name

Change-Id: I0cd1d51d1e16019c87e0c615c046a553eb5dc138
(cherry picked from commit ef2e135cfb8f107a154aaab9b54f2dfca0edf6a0)

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 433c723..c380155 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2012,7 +2012,7 @@
   
   
 
-  ~Change Image...
+  ~Replace Image...
 
 
 1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index ce7f718..49b9745 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1388,7 +1388,7 @@
   
   
 
-  ~Change Image...
+  ~Replace Image...
 
 
 1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a991676..f691568 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -767,7 +767,7 @@
   
   
 
-  ~Change Image...
+  ~Replace Image...
 
 
 1
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index ae6953d..9d511c8 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -271,7 +271,7 @@
 #define ITEM_CHANGE_PICTURE \
 Identifier = SID_CHANGE_PICTURE ; \
 Command = ".uno:ChangePicture" ; \
-Text [ en-US ] = "Change Image..." ; \
+Text [ en-US ] = "Replace Image..." ; \
 
 #define ITEM_VIEW_ATTR_ZOOM \
 Identifier = SID_ATTR_ZOOM ; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |
2 +-
 svx/inc/globlmn_tmpl.hrc |
2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ef2e135cfb8f107a154aaab9b54f2dfca0edf6a0
Author: Adolfo Jayme Barrientos 
Date:   Thu May 28 17:51:01 2015 -0500

tdf#91653 Give this command a saner name

Change-Id: I0cd1d51d1e16019c87e0c615c046a553eb5dc138

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 433c723..c380155 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2012,7 +2012,7 @@
   
   
 
-  ~Change Image...
+  ~Replace Image...
 
 
 1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index ce7f718..49b9745 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1388,7 +1388,7 @@
   
   
 
-  ~Change Image...
+  ~Replace Image...
 
 
 1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a991676..f691568 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -767,7 +767,7 @@
   
   
 
-  ~Change Image...
+  ~Replace Image...
 
 
 1
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index ae6953d..9d511c8 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -271,7 +271,7 @@
 #define ITEM_CHANGE_PICTURE \
 Identifier = SID_CHANGE_PICTURE ; \
 Command = ".uno:ChangePicture" ; \
-Text [ en-US ] = "Change Image..." ; \
+Text [ en-US ] = "Replace Image..." ; \
 
 #define ITEM_VIEW_ATTR_ZOOM \
 Identifier = SID_ATTR_ZOOM ; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6543b35508950e73b2cf95352aac3bce19c46dab
Author: matteocam 
Date:   Thu May 28 18:01:59 2015 -0400

Activated Handlers for recursive chaining (failed experiment)

Change-Id: I84db8bec5b79e77f6a3844c1cbce864f4b378b98

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index ffbca74..5cdea14 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -738,13 +738,14 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 if ( this ==  pNextTextObj )
 return;
 
-   
//rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
+   SdrOutliner &rOutliner = ImpGetDrawOutliner();
+   rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 
// Push text through the chain if there's any
 if (mpOverflowingText) {
 pNextTextObj->NbcSetOutlinerParaObject(mpOverflowingText);
 }
-//rOutliner.SetStatusEventHdl1(Link());
+rOutliner.SetStatusEventHdl1(Link());
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx  |1 +
 svx/source/svdraw/svdotextdecomposition.cxx |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 185abcf6f56e7eb2e31f656474269f0aac96cf3a
Author: matteocam 
Date:   Thu May 28 17:50:41 2015 -0400

Minor refactoring

Change-Id: Ie627b0e6274581a5946ee18103f8720fd29b8bc8

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index e6b4156..1695183 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1964,6 +1964,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 
 // Pushes text in next link on the fly
 if ( pEditStatus->IsPageOverflow() ) {
+mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
 SdrTextObj *pNextTextObj = GetNextLinkInChain();
 impCopyTextInTextObj(pNextTextObj);
 }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index d0d72dc..ffbca74 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -741,7 +741,6 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const

//rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 
// Push text through the chain if there's any
-   mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
 if (mpOverflowingText) {
 pNextTextObj->NbcSetOutlinerParaObject(mpOverflowingText);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx  |7 ---
 svx/source/svdraw/svdotextdecomposition.cxx |   19 ---
 2 files changed, 8 insertions(+), 18 deletions(-)

New commits:
commit 544517d54588e11d7e07853188ffb10277d7cd8a
Author: matteocam 
Date:   Thu May 28 17:39:09 2015 -0400

Minor refactoring

Change-Id: I5914e5b5d229404093c8bc46cde10b8687bc4cac

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index e197a24..e6b4156 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1956,13 +1956,14 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 else if ( GetNextLinkInChain() != NULL ) // is this a chainable object?
 {
 // set whether there is need for chaining
+// (used in EndTextEdit to crop the overflowing part)
+// XXX: might be removed later when we remove text in real time
 SetToBeChained( pEditStatus->IsPageOverflow() );
 fprintf(stderr, "[CHAINING] Need for Chaining is %s\n",
 pEditStatus->IsPageOverflow() ? "TRUE" : "FALSE");
-// Trying to copy stuff right away
 
-if (pEditStatus->IsPageOverflow()) {
-mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
+// Pushes text in next link on the fly
+if ( pEditStatus->IsPageOverflow() ) {
 SdrTextObj *pNextTextObj = GetNextLinkInChain();
 impCopyTextInTextObj(pNextTextObj);
 }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 3540146..d0d72dc 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -734,30 +734,19 @@ void SdrTextObj::embedText() const
 
 void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
 {
-// Code inspired from SdrTextObj::FitFrameToTextSize
-
-// avoid copying text in same box
+// prevent copying text in same box
 if ( this ==  pNextTextObj )
 return;
 
-// trying to copy text in obj 1
-//SdrText* pText = getActiveText();
+   
//rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 
-//SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner();
-//rOutliner.SetUpdateMode(true);
-
//rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
-// XXX: experimental code 27/5/15
-//OutlinerParaObject *someText = rOutliner.CreateParaObject(0,1); // only 
first para
-//pNextTextObj->SetOutlinerParaObject(*someText);
-//pNextTextObj->SetText("Bukowski, were are thou?");
+   // Push text through the chain if there's any
+   mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
 if (mpOverflowingText) {
 pNextTextObj->NbcSetOutlinerParaObject(mpOverflowingText);
 }
-//rOutliner.Insert("Bukowski, were are thou?");
-//rOutliner.Clear();
 //rOutliner.SetStatusEventHdl1(Link());
 
-
 }
 
 void SdrTextObj::impDecomposeAutoFitTextPrimitive(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/text/frmform.cxx  |   16 
 sw/source/core/text/frmpaint.cxx |4 ++--
 sw/source/core/text/txtfly.cxx   |8 
 sw/source/core/text/txtfrm.cxx   |   10 +-
 sw/source/core/text/txtftn.cxx   |8 
 sw/source/core/text/widorp.cxx   |   10 +-
 6 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit c725ebaced006c02baeb9b0ee5ac6ac4625adc01
Author: Stephan Bergmann 
Date:   Thu May 28 23:21:10 2015 +0200

brown paper bag

Change-Id: If290c03d86d691674b6a50f20f818f2e80d530ac

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 01b0ee6..eb61728 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -79,7 +79,7 @@ void ValidateText( SwFrm *pFrm ) // Friend of frame
 void SwTextFrm::ValidateFrm()
 {
 // Validate surroundings to avoid oscillation
-SWAP_IF_SWAPPED( this );
+SWAP_IF_SWAPPED swap( this );
 
 if ( !IsInFly() && !IsInTab() )
 {   // Only validate 'this' when inside a fly, the rest should actually 
only be
@@ -132,7 +132,7 @@ void _ValidateBodyFrm( SwFrm *pFrm )
 
 void SwTextFrm::ValidateBodyFrm()
 {
-SWAP_IF_SWAPPED( this );
+SWAP_IF_SWAPPED swap( this );
 
  // See comment in ValidateFrm()
 if ( !IsInFly() && !IsInTab() &&
@@ -142,7 +142,7 @@ void SwTextFrm::ValidateBodyFrm()
 
 bool SwTextFrm::_GetDropRect( SwRect &rRect ) const
 {
-SWAP_IF_NOT_SWAPPED(const_cast(this));
+SWAP_IF_NOT_SWAPPED swap(const_cast(this));
 
 OSL_ENSURE( HasPara(), "SwTextFrm::_GetDropRect: try again next year." );
 SwTextSizeInfo aInf( const_cast(this) );
@@ -179,7 +179,7 @@ const SwBodyFrm *SwTextFrm::FindBodyFrm() const
 
 bool SwTextFrm::CalcFollow( const sal_Int32 nTextOfst )
 {
-SWAP_IF_SWAPPED( this );
+SWAP_IF_SWAPPED swap( this );
 
 OSL_ENSURE( HasFollow(), "CalcFollow: missing Follow." );
 
@@ -349,7 +349,7 @@ void SwTextFrm::AdjustFrm( const SwTwips nChgHght, bool 
bHasToFit )
 
 // AdjustFrm is called with a swapped frame during
 // formatting but the frame is not swapped during FormatEmpty
-SWAP_IF_SWAPPED( this );
+SWAP_IF_SWAPPED swap( this );
 SWRECTFN ( this )
 
 // The Frame's size variable is incremented by Grow or decremented by 
Shrink.
@@ -661,7 +661,7 @@ SwContentFrm *SwTextFrm::JoinFrm()
 
 SwContentFrm *SwTextFrm::SplitFrm( const sal_Int32 nTextPos )
 {
-SWAP_IF_SWAPPED( this );
+SWAP_IF_SWAPPED swap( this );
 
 // The Paste sends a Modify() to me
 // I lock myself, so that my data does not disappear
@@ -853,7 +853,7 @@ bool SwTextFrm::CalcPreps()
 }
 
 {
-SWAP_IF_NOT_SWAPPED( this );
+SWAP_IF_NOT_SWAPPED swap( this );
 
 SwTextFormatInfo aInf( this );
 SwTextFormatter aLine( this, &aInf );
@@ -948,7 +948,7 @@ void SwTextFrm::FormatAdjust( SwTextFormatter &rLine,
  const sal_Int32 nStrLen,
  const bool bDummy )
 {
-SWAP_IF_NOT_SWAPPED( this );
+SWAP_IF_NOT_SWAPPED swap( this );
 
 SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
 
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index f4c1d2e..30b1f51 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -300,7 +300,7 @@ void SwTextFrm::PaintExtraData( const SwRect &rRect ) const
 return;
 SwViewShell *pSh = getRootFrm()->GetCurrShell();
 
-SWAP_IF_NOT_SWAPPED(const_cast(this));
+SWAP_IF_NOT_SWAPPED swap(const_cast(this));
 SwRect rOldRect( rRect );
 
 if ( IsVertical() )
@@ -647,7 +647,7 @@ void SwTextFrm::Paint(SwRect const& rRect, SwPrintData 
const*const) const
 SwRect aOldRect( rRect );
 
 {
-SWAP_IF_NOT_SWAPPED(const_cast(this));
+SWAP_IF_NOT_SWAPPED swap(const_cast(this));
 
 if ( IsVertical() )
 SwitchVerticalToHorizontal( (SwRect&)rRect );
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 04a0910..94068d4 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -410,7 +410,7 @@ SwRect SwTextFly::_GetFrm( const SwRect &rRect, bool bTop ) 
const
 
 bool SwTextFly::IsAnyFrm() const
 {
-SWAP_IF_SWAPPED(const_cast(pCurrFrm));
+SWAP_IF_SWAPPED swap(const_cast(pCurrFrm));
 
 OSL_ENSURE( bOn, "IsAnyFrm: Why?" );
 SwRect aRect( pCurrFrm->Frm().Pos() + pCurrFrm->Prt().Pos(),
@@ -861,7 +861,7 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
 // #i68520#
 OSL_ENSURE( !mpAnchoredObjList, "InitFlyList: FlyList already initialized" 
);
 
-SWAP_IF_SWAPPED(const_cast(pCurrFrm));
+SWAP_IF_SWAPPED swap(const_cast(pCurrFrm));
 
 const SwSortedObjs *pSorted = pPage->GetSortedObjs();
 const size_t nCount = pSorted ? pSorted->size() : 0;
@@ -1023,7 +1023

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

[Stephan Bergmann]

 sw/qa/extras/globalfilter/globalfilter.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e17fa49d99ce8de3fb9d026b515a7c7e1f00d269
Author: Stephan Bergmann 
Date:   Thu May 28 23:17:18 2015 +0200

loplugin:unreffun

Change-Id: I89674148bd25f0ee996bf8796138bbab234d8c8f

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index c7af47e..66dd3aa 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -33,7 +33,9 @@ public:
 void testCharHighlightBody();
 void testMSCharBackgroundEditing();
 void testCharBackgroundToHighlighting();
+#if !defined(WNT) && !defined(MACOSX)
 void testSkipImages();
+#endif
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testSwappedOutImageExport);
@@ -657,6 +659,7 @@ void Test::testCharBackgroundToHighlighting()
 }
 }
 
+#if !defined(WNT) && !defined(MACOSX)
 void Test::testSkipImages()
 {
 // Check how LO skips image loading (but not texts of textboxes and custom 
shapes)
@@ -732,7 +735,7 @@ void Test::testSkipImages()
 CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(bSkipImages ? 0 : 3), nImageCount );
 }
 }
-
+#endif
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[Bjoern Michaelsen]

Hi,

On Thu, May 28, 2015 at 06:01:33PM +, Noel Grandin wrote:
> Wasn't someone going to look at speeding that up? Make check is not
> currently making very good use of multiple cores and it has a long tail
> where only one or two cores are busy.

I cant fully confirm that -- at least not combined with Michaels 15 minutes
number.  Good ol' big Bertha with two Opteron 6272s has 32 cores, but mediocre
single-threaded performance compared with some of todays offerings. Still[1]:

-j
real 5m 9.091s
user25m12.250s
sys  2m53.420s

-j32
real 5m30.133s
user29m46.310s
sys  3m10.660s

-j8
real 6m35.434s
user19m36.700s
sys  2m 6.390s

-j1
real34m11.814s
user17m51.990s
sys  1m52.470s

(all above along with moderate desktop use alongside: Firefox, mplayer audio
streaming etc. -- so not too scientific.)

And with this I see a lot of processes running parallel till the end. This
suggests to me that the stuff is quite parallelized -- however none of the
testing threads seem to be CPU-bound rather the Java-stuff seems to be IO bound
(for IPC?) with the slowest test unit taking ~5 minutes. Thus even 32 jobs or
more dont seem to keep more than one core busy.

At least for people with a meager duo-core laptop or somesuch, this suggests
you should try:

 time make check PARALLELISM= # aka forkbomb me please

And if that doesnt explode your RAM, it should help you quite a bit and you
should end up with 5 minutes for 'make check' -- quite independant of your
hardware, as much of that seems IO-bound idling. If we want to cut down on that
5 minutes, we would need to touch the JunitTest internals.

Best,

Bjoern


[1] As a sidenote: I noted that linking with debug symbols takes at least 4
times as long as without debug symbols. Given that linking happens at the end
of the build with a narrow dependency tree left (as libraries are daisy-chained
dependency-wise for linking), you are really penalized for building with
symbols when you dont need those, as it can easily dry out paralellism. So dont
do that: Rather than building with symbols everywhere and then skipping on
tests, better build without symbols unless you are debugging, but _run the
tests_.

[2] On my ancient notebook with a i7-2720QM (a modern 4th gen i7-4770HQ is at
least 50% faster at the same speed) I find the following with disabling
Junittest_toolkit_unoapi as it was failing on that checkout.

time make check PARALLELISM=:
reall5m15.351s
user15m52.808s
sys  1m10.073s

time make check (thus -j8):
real  6m2.806s
user14m32.157s
sys   1m1.861s

time make check PARALLELISM=1:
real41m 7.984s
user27m33.174s
sys  1m13.949s
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loolwsd/TileCache.cpp

[Henry Castro]

 loolwsd/TileCache.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba70f2a0501d9846c94674b12c650e0ef580e654
Author: Henry Castro 
Date:   Thu May 28 16:22:27 2015 -0400

Fixed invalidatetiles assertion.

diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index c72888e..d785404 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -153,7 +153,7 @@ void TileCache::invalidateTiles(int part, const 
std::string& tiles)
 {
 Poco::StringTokenizer tokens(tiles, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
 
-assert(tokens[0] == "invalidateTiles:");
+assert(tokens[0] == "invalidatetiles:");
 
 if (tokens.count() != 5)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/sl/cui/source/dialogs.po   |4 
 source/sl/cui/uiconfig/ui.po  |8 
 source/sl/filter/source/config/fragments/filters.po   |   40 ++-
 source/sl/helpcontent2/source/text/sbasic/shared.po   |4 
 source/sl/helpcontent2/source/text/scalc/01.po|4 
 source/sl/helpcontent2/source/text/shared/00.po   |4 
 source/sl/helpcontent2/source/text/shared/01.po   |4 
 source/sl/helpcontent2/source/text/swriter/librelogo.po   |   62 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   70 -
 source/sl/sc/source/ui/sidebar.po |4 
 source/sl/sc/source/ui/src.po |8 
 source/sl/sd/source/ui/app.po |   31 +-
 source/sl/svtools/source/control.po   |4 
 source/sl/svtools/uiconfig/ui.po  |   17 +
 source/sl/svx/uiconfig/ui.po  |  128 --
 source/sl/sw/source/ui/app.po |   34 ++
 16 files changed, 241 insertions(+), 185 deletions(-)

New commits:
commit d7d293962f648d490de39264d0c9573b9536b06d
Author: Andras Timar 
Date:   Thu May 28 22:22:11 2015 +0200

Updated Slovenian translation

Change-Id: I31ea6584c795fde46c86080cf94005337d3ae790

diff --git a/source/sl/cui/source/dialogs.po b/source/sl/cui/source/dialogs.po
index dc539b2..dba8dff 100644
--- a/source/sl/cui/source/dialogs.po
+++ b/source/sl/cui/source/dialogs.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.5\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-05-18 21:48+0200\n"
+"POT-Creation-Date: 2015-05-28 13:37+0200\n"
 "PO-Revision-Date: 2015-05-20 11:22+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 44c9c38..580f513 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-05-18 21:48+0200\n"
-"PO-Revision-Date: 2015-05-18 23:02+0200\n"
+"POT-Creation-Date: 2015-05-28 13:37+0200\n"
+"PO-Revision-Date: 2015-05-28 19:12+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -221,8 +221,8 @@ msgctxt ""
 "link\n"
 "label\n"
 "string.text"
-msgid "http://www.libreoffice.org/about-us/credits/";
-msgstr "http://sl.libreoffice.org/o-nas/zasluge/";
+msgid "https://www.libreoffice.org/about-us/credits/";
+msgstr "https://sl.libreoffice.org/o-nas/zasluge/";
 
 #: accelconfigpage.ui
 msgctxt ""
diff --git a/source/sl/filter/source/config/fragments/filters.po 
b/source/sl/filter/source/config/fragments/filters.po
index 22bb1fb..2effc03 100644
--- a/source/sl/filter/source/config/fragments/filters.po
+++ b/source/sl/filter/source/config/fragments/filters.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-05-18 21:48+0200\n"
-"PO-Revision-Date: 2015-05-18 23:04+0200\n"
+"POT-Creation-Date: 2015-05-28 13:36+0200\n"
+"PO-Revision-Date: 2015-05-28 19:19+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -35,6 +35,24 @@ msgctxt ""
 msgid "Apple Keynote 5"
 msgstr "Predstavitev Apple Keynote 5"
 
+#: AppleNumbers.xcu
+msgctxt ""
+"AppleNumbers.xcu\n"
+"Apple Numbers\n"
+"UIName\n"
+"value.text"
+msgid "Apple Numbers 2"
+msgstr "Preglednica Apple Numbers 2"
+
+#: ApplePages.xcu
+msgctxt ""
+"ApplePages.xcu\n"
+"Apple Pages\n"
+"UIName\n"
+"value.text"
+msgid "Apple Pages 4"
+msgstr "Dokument Apple Pages 4"
+
 #: BMP___MS_Windows.xcu
 msgctxt ""
 "BMP___MS_Windows.xcu\n"
@@ -1196,6 +1214,24 @@ msgctxt ""
 msgid "WMF - Windows Metafile"
 msgstr "WMF – Windows Metafile"
 
+#: WPS_Lotus_Calc.xcu
+msgctxt ""
+"WPS_Lotus_Calc.xcu\n"
+"WPS_Lotus_Calc\n"
+"UIName\n"
+"value.text"
+msgid "Lotus Document"
+msgstr "Dokument Lotus"
+
+#: WPS_QPro_Calc.xcu
+msgctxt ""
+"WPS_QPro_Calc.xcu\n"
+"WPS_QPro_Calc\n"
+"UIName\n"
+"value.text"
+msgid "QuattroPro Document"
+msgstr "Dokument QuattroPro"
+
 #: WordPerfect.xcu
 

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

[Andras Timar]

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

New commits:
commit 5490bf204e2b1841e72ba0f906b2cf3cd12f583c
Author: Andras Timar 
Date:   Thu May 28 22:22:11 2015 +0200

Updated core
Project: translations  d7d293962f648d490de39264d0c9573b9536b06d

Updated Slovenian translation

Change-Id: I31ea6584c795fde46c86080cf94005337d3ae790

diff --git a/translations b/translations
index b294606..d7d2939 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b29460698cce2b20cf82d33fdf5d3a9483b2ef9a
+Subproject commit d7d293962f648d490de39264d0c9573b9536b06d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit a1e1625aef5bc15aef0910707aba7f856aca748e
Author: Andras Timar 
Date:   Thu May 28 22:17:16 2015 +0200

Updated core
Project: translations  856ea51b121540813da12661061955c4e0250d0c

Updated Slovenian translation

Change-Id: I58fd465bdd1b039cada6cec06e9491461eb19a6f
(cherry picked from commit 033b724ca2cdc87f7443d61b66a829969befc80f)

diff --git a/translations b/translations
index 393e77a..856ea51 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 393e77a510ed54f8ae400d7f8e94713619fdb4bd
+Subproject commit 856ea51b121540813da12661061955c4e0250d0c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/sl/sd/source/ui/app.po |   22 
 source/sl/sd/uiconfig/simpress/ui.po  |  463 --
 source/sl/starmath/uiconfig/smath/ui.po   |   13 
 4 files changed, 25 insertions(+), 477 deletions(-)

New commits:
commit 856ea51b121540813da12661061955c4e0250d0c
Author: Andras Timar 
Date:   Thu May 28 22:17:16 2015 +0200

Updated Slovenian translation

Change-Id: I58fd465bdd1b039cada6cec06e9491461eb19a6f
(cherry picked from commit 033b724ca2cdc87f7443d61b66a829969befc80f)

diff --git a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
index e9e68b9..5d72ea6 100644
--- a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-02-08 23:37+0100\n"
+"POT-Creation-Date: 2015-05-28 13:43+0200\n"
 "PO-Revision-Date: 2015-02-09 01:15+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/sd/source/ui/app.po b/source/sl/sd/source/ui/app.po
index f09836e..8745a5c 100644
--- a/source/sl/sd/source/ui/app.po
+++ b/source/sl/sd/source/ui/app.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-01-17 22:24+0100\n"
-"PO-Revision-Date: 2014-12-23 00:28+0200\n"
+"POT-Creation-Date: 2015-05-28 13:44+0200\n"
+"PO-Revision-Date: 2015-05-28 17:56+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -3776,6 +3776,22 @@ msgstr "<Å¡tevec>"
 #: strings.src
 msgctxt ""
 "strings.src\n"
+"STR_FIELD_PLACEHOLDER_SLIDENAME\n"
+"string.text"
+msgid ""
+msgstr ""
+
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"STR_FIELD_PLACEHOLDER_PAGENAME\n"
+"string.text"
+msgid ""
+msgstr ""
+
+#: strings.src
+msgctxt ""
+"strings.src\n"
 "STR_PLACEHOLDER_DESCRIPTION_NOTES\n"
 "string.text"
 msgid "Notes Area"
diff --git a/source/sl/sd/uiconfig/simpress/ui.po 
b/source/sl/sd/uiconfig/simpress/ui.po
index dc17297..77e0b6e 100644
--- a/source/sl/sd/uiconfig/simpress/ui.po
+++ b/source/sl/sd/uiconfig/simpress/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-02-08 23:36+0100\n"
+"POT-Creation-Date: 2015-05-28 13:44+0200\n"
 "PO-Revision-Date: 2015-02-09 01:23+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1061,465 +1061,6 @@ msgctxt ""
 msgid "F_ormat"
 msgstr "_Oblika"
 
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"DockingAnimation\n"
-"title\n"
-"string.text"
-msgid "Animation"
-msgstr "Animacija"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"box\n"
-"tooltip_text\n"
-"string.text"
-msgid "Preview"
-msgstr "Predogled"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"tooltip_text\n"
-"string.text"
-msgid "Loop Count"
-msgstr "Å tevec zanke"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"0\n"
-"stringlist.text"
-msgid "1"
-msgstr "1"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"1\n"
-"stringlist.text"
-msgid "2"
-msgstr "2"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"2\n"
-"stringlist.text"
-msgid "3"
-msgstr "3"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"3\n"
-"stringlist.text"
-msgid "4"
-msgstr "4"
-
-#: dockinganima

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

[Andras Timar]

 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/sl/sd/source/ui/app.po |   22 
 source/sl/sd/uiconfig/simpress/ui.po  |  463 --
 source/sl/starmath/uiconfig/smath/ui.po   |   13 
 4 files changed, 25 insertions(+), 477 deletions(-)

New commits:
commit 033b724ca2cdc87f7443d61b66a829969befc80f
Author: Andras Timar 
Date:   Thu May 28 22:17:16 2015 +0200

Updated Slovenian translation

Change-Id: I58fd465bdd1b039cada6cec06e9491461eb19a6f

diff --git a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
index e9e68b9..5d72ea6 100644
--- a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-02-08 23:37+0100\n"
+"POT-Creation-Date: 2015-05-28 13:43+0200\n"
 "PO-Revision-Date: 2015-02-09 01:15+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/sd/source/ui/app.po b/source/sl/sd/source/ui/app.po
index f09836e..8745a5c 100644
--- a/source/sl/sd/source/ui/app.po
+++ b/source/sl/sd/source/ui/app.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-01-17 22:24+0100\n"
-"PO-Revision-Date: 2014-12-23 00:28+0200\n"
+"POT-Creation-Date: 2015-05-28 13:44+0200\n"
+"PO-Revision-Date: 2015-05-28 17:56+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -3776,6 +3776,22 @@ msgstr "<Å¡tevec>"
 #: strings.src
 msgctxt ""
 "strings.src\n"
+"STR_FIELD_PLACEHOLDER_SLIDENAME\n"
+"string.text"
+msgid ""
+msgstr ""
+
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"STR_FIELD_PLACEHOLDER_PAGENAME\n"
+"string.text"
+msgid ""
+msgstr ""
+
+#: strings.src
+msgctxt ""
+"strings.src\n"
 "STR_PLACEHOLDER_DESCRIPTION_NOTES\n"
 "string.text"
 msgid "Notes Area"
diff --git a/source/sl/sd/uiconfig/simpress/ui.po 
b/source/sl/sd/uiconfig/simpress/ui.po
index dc17297..77e0b6e 100644
--- a/source/sl/sd/uiconfig/simpress/ui.po
+++ b/source/sl/sd/uiconfig/simpress/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-02-08 23:36+0100\n"
+"POT-Creation-Date: 2015-05-28 13:44+0200\n"
 "PO-Revision-Date: 2015-02-09 01:23+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1061,465 +1061,6 @@ msgctxt ""
 msgid "F_ormat"
 msgstr "_Oblika"
 
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"DockingAnimation\n"
-"title\n"
-"string.text"
-msgid "Animation"
-msgstr "Animacija"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"box\n"
-"tooltip_text\n"
-"string.text"
-msgid "Preview"
-msgstr "Predogled"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"tooltip_text\n"
-"string.text"
-msgid "Loop Count"
-msgstr "Å tevec zanke"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"0\n"
-"stringlist.text"
-msgid "1"
-msgstr "1"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"1\n"
-"stringlist.text"
-msgid "2"
-msgstr "2"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"2\n"
-"stringlist.text"
-msgid "3"
-msgstr "3"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"3\n"
-"stringlist.text"
-msgid "4"
-msgstr "4"
-
-#: dockinganimation.ui
-msgctxt ""
-"dockinganimation.ui\n"
-"loopcount\n"
-"4\n"
-"stri

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

[Andras Timar]

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

New commits:
commit c41eb9571f5789ccfa5b755adf4d7c7a03d2798f
Author: Andras Timar 
Date:   Thu May 28 22:17:16 2015 +0200

Updated core
Project: translations  033b724ca2cdc87f7443d61b66a829969befc80f

Updated Slovenian translation

Change-Id: I58fd465bdd1b039cada6cec06e9491461eb19a6f

diff --git a/translations b/translations
index bca70bd..033b724 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit bca70bdd09af581293a9176bc68ea92e7cbe3190
+Subproject commit 033b724ca2cdc87f7443d61b66a829969befc80f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Andras Timar]

On 2015.05.28. 10:36, Caolán McNamara wrote:
> On Thu, 2015-05-28 at 03:17 +, Crashtest VM wrote:
>> New crashtest update available at 
>> http://dev-builds.libreoffice.org/crashtest/a67be04ba374a6e4f3c5abe4de2ab3cf86e7b538/
> caolanm->timar: There are a few new hundred asserts/crashes in this run
> versus yesterdays run all stemming from...
>
> commit 481c185e327cb83ffcb29657d5a354eae2c4a5f3
> Author: Andras Timar 
> Date:   Tue May 26 19:35:08 2015 +0200
>
> tdf#90338 tdf#84254 DrawingML export fix
>
> C.
>
>
Fixed by
http://cgit.freedesktop.org/libreoffice/core/commit/?id=62031cd02d1fbb27c2e5bc9eee2a8dd7c7c9e295
hopefully...

Thanks,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - oox/source

[Andras Timar]

 oox/source/export/drawingml.cxx |   34 ++
 1 file changed, 14 insertions(+), 20 deletions(-)

New commits:
commit 03284f0ff98a02f8bdc85735cda67ca975a11034
Author: Andras Timar 
Date:   Thu May 28 17:22:48 2015 +0200

DrawingML export crash fix

Change-Id: I777c6734a7f63240e9021152ecff0a86f530ff8f
Reviewed-on: https://gerrit.libreoffice.org/15951
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 62031cd02d1fbb27c2e5bc9eee2a8dd7c7c9e295)

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0600f60..0becb68 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -,18 +,6 @@ void DrawingML::WriteCustomGeometry( Reference< XShape > 
rXShape )
 }
 
 
-mpFS->startElementNS( XML_a, XML_custGeom, FSEND );
-mpFS->singleElementNS( XML_a, XML_avLst, FSEND );
-mpFS->singleElementNS( XML_a, XML_gdLst, FSEND );
-mpFS->singleElementNS( XML_a, XML_ahLst, FSEND );
-mpFS->singleElementNS( XML_a, XML_rect,
-   XML_l, "l",
-   XML_t, "t",
-   XML_r, "r",
-   XML_b, "b",
-   FSEND );
-
-mpFS->startElementNS( XML_a, XML_pathLst, FSEND );
 
 uno::Sequence< beans::PropertyValue > const * pGeometrySeq =
 static_cast const 
*>(aAny.getValue());
@@ -2251,7 +2239,6 @@ void DrawingML::WriteCustomGeometry( Reference< XShape > 
rXShape )
 uno::Sequence 
aPairs;
 uno::Sequence aSegments;
 uno::Sequence aPathSize;
-bool bHasSubViewSize = false;
 for (int j = 0; j < aPathProp.getLength(); ++j )
 {
 const beans::PropertyValue& rPathProp = aPathProp[j];
@@ -2260,13 +2247,21 @@ void DrawingML::WriteCustomGeometry( Reference< XShape 
> rXShape )
 else if (rPathProp.Name == "Segments")
 rPathProp.Value >>= aSegments;
 else if (rPathProp.Name == "SubViewSize")
-{
 rPathProp.Value >>= aPathSize;
-bHasSubViewSize = true;
-}
 }
 
-if ( bHasSubViewSize )
+if ( !aPairs.hasElements() || !aSegments.hasElements() )
+return;
+
+mpFS->startElementNS( XML_a, XML_custGeom, FSEND );
+mpFS->singleElementNS( XML_a, XML_avLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_gdLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_ahLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_rect, XML_l, "l", XML_t, "t",
+XML_r, "r", XML_b, "b", FSEND );
+mpFS->startElementNS( XML_a, XML_pathLst, FSEND );
+
+if ( aPathSize.hasElements() )
 {
 mpFS->startElementNS( XML_a, XML_path,
   XML_w, I64S( aPathSize[0].Width ),
@@ -2395,13 +2390,12 @@ void DrawingML::WriteCustomGeometry( Reference< XShape 
> rXShape )
 }
 }
 mpFS->endElementNS( XML_a, XML_path );
+mpFS->endElementNS( XML_a, XML_pathLst );
+mpFS->endElementNS( XML_a, XML_custGeom );
 }
 }
 }
 
-mpFS->endElementNS( XML_a, XML_pathLst );
-
-mpFS->endElementNS( XML_a, XML_custGeom );
 }
 
 void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 oox/source/export/drawingml.cxx |   34 ++
 1 file changed, 14 insertions(+), 20 deletions(-)

New commits:
commit 62031cd02d1fbb27c2e5bc9eee2a8dd7c7c9e295
Author: Andras Timar 
Date:   Thu May 28 17:22:48 2015 +0200

DrawingML export crash fix

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

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c7af2b8..3887e0e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -,18 +,6 @@ void DrawingML::WriteCustomGeometry( Reference< XShape > 
rXShape )
 }
 
 
-mpFS->startElementNS( XML_a, XML_custGeom, FSEND );
-mpFS->singleElementNS( XML_a, XML_avLst, FSEND );
-mpFS->singleElementNS( XML_a, XML_gdLst, FSEND );
-mpFS->singleElementNS( XML_a, XML_ahLst, FSEND );
-mpFS->singleElementNS( XML_a, XML_rect,
-   XML_l, "l",
-   XML_t, "t",
-   XML_r, "r",
-   XML_b, "b",
-   FSEND );
-
-mpFS->startElementNS( XML_a, XML_pathLst, FSEND );
 
 uno::Sequence< beans::PropertyValue > const * pGeometrySeq =
 static_cast const 
*>(aAny.getValue());
@@ -2251,7 +2239,6 @@ void DrawingML::WriteCustomGeometry( Reference< XShape > 
rXShape )
 uno::Sequence 
aPairs;
 uno::Sequence aSegments;
 uno::Sequence aPathSize;
-bool bHasSubViewSize = false;
 for (int j = 0; j < aPathProp.getLength(); ++j )
 {
 const beans::PropertyValue& rPathProp = aPathProp[j];
@@ -2260,13 +2247,21 @@ void DrawingML::WriteCustomGeometry( Reference< XShape 
> rXShape )
 else if (rPathProp.Name == "Segments")
 rPathProp.Value >>= aSegments;
 else if (rPathProp.Name == "SubViewSize")
-{
 rPathProp.Value >>= aPathSize;
-bHasSubViewSize = true;
-}
 }
 
-if ( bHasSubViewSize )
+if ( !aPairs.hasElements() || !aSegments.hasElements() )
+return;
+
+mpFS->startElementNS( XML_a, XML_custGeom, FSEND );
+mpFS->singleElementNS( XML_a, XML_avLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_gdLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_ahLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_rect, XML_l, "l", XML_t, "t",
+XML_r, "r", XML_b, "b", FSEND );
+mpFS->startElementNS( XML_a, XML_pathLst, FSEND );
+
+if ( aPathSize.hasElements() )
 {
 mpFS->startElementNS( XML_a, XML_path,
   XML_w, I64S( aPathSize[0].Width ),
@@ -2395,13 +2390,12 @@ void DrawingML::WriteCustomGeometry( Reference< XShape 
> rXShape )
 }
 }
 mpFS->endElementNS( XML_a, XML_path );
+mpFS->endElementNS( XML_a, XML_pathLst );
+mpFS->endElementNS( XML_a, XML_custGeom );
 }
 }
 }
 
-mpFS->endElementNS( XML_a, XML_pathLst );
-
-mpFS->endElementNS( XML_a, XML_custGeom );
 }
 
 void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/inc/txtfrm.hxx|   47 ++-
 sw/source/core/text/frmform.cxx  |  119 +--
 sw/source/core/text/frmpaint.cxx |   87 ++--
 sw/source/core/text/txtfly.cxx   |   20 +-
 sw/source/core/text/txtfrm.cxx   |   18 +
 sw/source/core/text/txtftn.cxx   |   41 +
 sw/source/core/text/widorp.cxx   |   20 +-
 7 files changed, 160 insertions(+), 192 deletions(-)

New commits:
commit 53a066b7d1a639c6d31655bfc7c6257896fb57ef
Author: Stephan Bergmann 
Date:   Thu May 28 21:21:34 2015 +0200

Replace SWAP_IF_[NOT_]SWAPPED/UNDO_SWAP with RAII classes

Change-Id: I3c2c1dd8221b6b9c884f368a65696318c698bb43

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 2d1418c..034b2be 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -779,25 +779,42 @@ inline void SwTextFrm::ResetBlinkPor() const
 const_cast(this)->bBlinkPor = false;
 }
 
-#define SWAP_IF_SWAPPED( pFrm )\
-bool bUndoSwap = false;   \
-if ( pFrm->IsVertical() && pFrm->IsSwapped() )\
-{ \
-bUndoSwap = true; \
-const_cast(pFrm)->SwapWidthAndHeight(); \
+class TemporarySwap {
+protected:
+explicit TemporarySwap(SwTextFrm * frame, bool swap):
+frame_(frame), undo_(false)
+{
+if (frame_->IsVertical() && swap) {
+undo_ = true;
+frame_->SwapWidthAndHeight();
+}
 }
 
-#define SWAP_IF_NOT_SWAPPED( pFrm )\
-bool bUndoSwap = false; \
-if ( pFrm->IsVertical() && ! pFrm->IsSwapped() )\
-{   \
-bUndoSwap = true;   \
-const_cast(pFrm)->SwapWidthAndHeight(); \
+~TemporarySwap() {
+if (undo_) {
+frame_->SwapWidthAndHeight();
+}
 }
 
-#define UNDO_SWAP( pFrm )\
-if ( bUndoSwap )\
-const_cast(pFrm)->SwapWidthAndHeight();
+private:
+TemporarySwap(TemporarySwap &) = delete;
+void operator =(TemporarySwap &) = delete;
+
+SwTextFrm * frame_;
+bool undo_;
+};
+
+class SWAP_IF_SWAPPED: private TemporarySwap {
+public:
+explicit SWAP_IF_SWAPPED(SwTextFrm * frame):
+TemporarySwap(frame, frame->IsSwapped()) {}
+};
+
+class SWAP_IF_NOT_SWAPPED: private TemporarySwap {
+public:
+explicit SWAP_IF_NOT_SWAPPED(SwTextFrm * frame):
+TemporarySwap(frame, !frame->IsSwapped()) {}
+};
 
 /**
  * Helper class which can be used instead of the macros if a function
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index cb70ff2..01b0ee6 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -79,7 +79,7 @@ void ValidateText( SwFrm *pFrm ) // Friend of frame
 void SwTextFrm::ValidateFrm()
 {
 // Validate surroundings to avoid oscillation
-SWAP_IF_SWAPPED( this )
+SWAP_IF_SWAPPED( this );
 
 if ( !IsInFly() && !IsInTab() )
 {   // Only validate 'this' when inside a fly, the rest should actually 
only be
@@ -106,8 +106,6 @@ void SwTextFrm::ValidateFrm()
 const bool bMustFit = pPara->IsPrepMustFit();
 ResetPreps();
 pPara->SetPrepMustFit( bMustFit );
-
-UNDO_SWAP( this )
 }
 
 // After a RemoveFootnote the BodyFrm and all Frms contained within it, need 
to be
@@ -134,19 +132,17 @@ void _ValidateBodyFrm( SwFrm *pFrm )
 
 void SwTextFrm::ValidateBodyFrm()
 {
-SWAP_IF_SWAPPED( this )
+SWAP_IF_SWAPPED( this );
 
  // See comment in ValidateFrm()
 if ( !IsInFly() && !IsInTab() &&
  !( IsInSct() && FindSctFrm()->Lower()->IsColumnFrm() ) )
 _ValidateBodyFrm( GetUpper() );
-
-UNDO_SWAP( this )
 }
 
 bool SwTextFrm::_GetDropRect( SwRect &rRect ) const
 {
-SWAP_IF_NOT_SWAPPED( this )
+SWAP_IF_NOT_SWAPPED(const_cast(this));
 
 OSL_ENSURE( HasPara(), "SwTextFrm::_GetDropRect: try again next year." );
 SwTextSizeInfo aInf( const_cast(this) );
@@ -163,12 +159,9 @@ bool SwTextFrm::_GetDropRect( SwRect &rRect ) const
 
 if ( IsVertical() )
 SwitchHorizontalToVertical( rRect );
-UNDO_SWAP( this )
 return true;
 }
 
-UNDO_SWAP( this )
-
 return false;
 }
 
@@ -186,7 +179,7 @@ const SwBodyFrm *SwTextFrm::FindBodyFrm() const
 
 bool SwTextFrm::CalcFollow( const sal_Int32 nTextOfst )
 {
-SWAP_IF_SWAPPED( this )
+SWAP_IF_SWAPPED( this );
 
 OSL_ENSURE( HasFollow(), "CalcFollow: missing Follow." );
 
@@ -338,13 +331,10 @@ bool SwTextFrm::CalcFollow( const sal_Int32 nTextOfst )
   nMyPos - Frm().Right() :
   Frm().Top() - nMyPos ) )
 {
-UNDO_SWAP( this )
 return true;
 }
 }
 
-UNDO_SWAP( this )
-
 return false;
 }
 
@@ -359,7 +349,7 @@ void SwTextFrm::AdjustFrm( const SwTwips nChgHght, bool 
bHasToFit )
 
 // AdjustFrm is called with a swapped f

Re: About skip SkipImages unit test on MacOs

[Robert Antoni Buj i Gelonch]

Hi,

I shut down the tb61 yesterday, I'm going to put it up and running again.
If there is someone who wants that I shut it down, please reply this thread.

Regards,
Robert

2015-05-28 19:09 GMT+02:00 julien2412 :

> Hi,
>
> I just wanted to communicate about the patch
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=be01d68420086fc36ecf26b5f597ba7c6b29b369
> to make it more visible (because I dislike hiding a bug):
>
> As I indicated, it concerns only 1 TB in Mac, for the record here is the
> error reported:
> 901   [build LNK] CppunitTest/libtest_sc_filters_test.dylib
> 902
>
> /Volumes/Master/lo/core/unotest/source/cpp/macros_test.cxx:52:Test::testSkipImages
> 903   NEXTassertion failed
> 904   - Expression: xComponent.is()
> 905   NEXT- loading failed:
>
> file:///Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx
> 906
> 907   unknown:0:Test::testSkipImages
> 908   NEXTtearDown() failed
> 909   NEXT- An uncaught exception of type
> com.sun.star.lang.DisposedException
> 910   -
> 911
> 912   NEXT
> /Volumes/Master/lo/core/unotest/source/cpp/macros_test.cxx:52:
> Assertion
> 913   Test name: Test::testSkipImages
> 914   NEXTassertion failed
> 915   - Expression: xComponent.is()
> 916   NEXT- loading failed:
>
> file:///Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx
> 917
> 918   NEXT##Failure Location unknown## : Error
> 919   Test name: Test::testSkipImages
> 920   NEXTtearDown() failed
> 921   NEXT- An uncaught exception of type
> com.sun.star.lang.DisposedException
> 922   -
> 923
> 924   Failures !!!
> 925   Run: 8   Failure total: 2   Failures: 1   Errors: 1
> 926   2015-05-26 18:53:02.338 cppunittester[1430:650077] ***
> -[NSAutoreleasePool release]: This pool has already been released, do not
> drain it (double release).
> As I indicated in the comment:
> "If someone wants to revert it go ahead but in this case, please either fix
> the problem or disable this TB for the moment, thank you"
>
> Now there's another error in this TB but that's another story.
>
> Julien
>
>
>
> --
> View this message in context:
> http://nabble.documentfoundation.org/About-skip-SkipImages-unit-test-on-MacOs-tp4149788.html
> Sent from the Dev mailing list archive at Nabble.com.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>



-- 
http://about.me/rbuj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sw/qa/core/uwriter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit efc64511b2c833e46ab553c8d25ea489016a4bd2
Author: Stephan Bergmann 
Date:   Thu May 28 20:41:05 2015 +0200

loplugin:stringconstant

Change-Id: I86c8bd43a4fd87ce14e36108d686f6c8fca6cf81

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 08f8020..61d400b 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1574,7 +1574,7 @@ void SwDocTest::test64kPageDescs()
 
 for (size_t i = 0; i < nPageDescCount; ++i)
 {
-OUString aName = OUString("Page") + OUString::number(i);
+OUString aName = "Page" + OUString::number(i);
 m_pDoc->MakePageDesc( aName );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Jan Holesovsky]

 vcl/source/window/window2.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit f8d738134d1cbbee775d68b33755239d750b5825
Author: Jan Holesovsky 
Date:   Thu May 28 16:39:48 2015 +0200

vcl: Do nothing when we don't have mpWindowImpl.

Avoids a crash in Impress search.

Change-Id: I07106e0185a1fe4cfa09a6783396c0d48b028f10

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 1e70a62..b8d822f 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1723,6 +1723,8 @@ bool Window::set_property(const OString &rKey, const 
OString &rValue)
 
 void Window::set_height_request(sal_Int32 nHeightRequest)
 {
+if (!mpWindowImpl)
+return;
 
 WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
 
@@ -1735,6 +1737,8 @@ void Window::set_height_request(sal_Int32 nHeightRequest)
 
 void Window::set_width_request(sal_Int32 nWidthRequest)
 {
+if (!mpWindowImpl)
+return;
 
 WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[Noel Grandin]

 > takes 15mins to run 'make check' (Michael)

Wasn't someone going to look at speeding that up? Make check is not
currently making very good use of multiple cores and it has a long tail
where only one or two cores are busy.
On Thu, 28 May 2015 at 18:38, Norbert Thiebaud  wrote:

> On Thu, May 28, 2015 at 11:16 AM, Michael Meeks
>  wrote:
>
> > + Windows 64 status (David O)
> >+ all fine, poking some Base test with Stephan
> >+ an OLE test, failing on some machines not others;
> >  environment dependent. Thorsten's machine doesn't crash.
>
> That is the exception not the rule.
> I could not get a build to finish, and cloph also reproduce the ole bug.
> Until Win64 can reliably build, I can't pull that platform under
> jenkins/gerrit-build
>
> (Not that I could right this minutes anyway, still working on bring
> hardware online to cope with growing demand)
>
> Norbert
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

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

New commits:
commit 7dbe6870559459961d64b365f136955b83d09dbd
Author: matteocam 
Date:   Thu May 28 13:46:15 2015 -0400

Copies all overflowing paras

Change-Id: Ic8357571860ea31571c260c33679272a802761b8

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 094cc8b..3540146 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -751,7 +751,7 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 //pNextTextObj->SetOutlinerParaObject(*someText);
 //pNextTextObj->SetText("Bukowski, were are thou?");
 if (mpOverflowingText) {
-pNextTextObj->SetText(mpOverflowingText->GetTextObject().GetText(0));
+pNextTextObj->NbcSetOutlinerParaObject(mpOverflowingText);
 }
 //rOutliner.Insert("Bukowski, were are thou?");
 //rOutliner.Clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx  |3 +--
 svx/source/svdraw/svdotextdecomposition.cxx |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b5ae0b74bcf34618d50aa64e0bcbab7541efdb67
Author: matteocam 
Date:   Thu May 28 13:27:10 2015 -0400

Can copy text in real time from the first box (only first overfl.para)

Change-Id: Iccfa5e55f2b0befc9923097917011f3d8fe68322

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a9f5857..e197a24 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1962,8 +1962,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 // Trying to copy stuff right away
 
 if (pEditStatus->IsPageOverflow()) {
-SdrOutliner& rOutliner = ImpGetDrawOutliner();
-mpOverflowingText = rOutliner.GetOverflowingParaObject();
+mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
 SdrTextObj *pNextTextObj = GetNextLinkInChain();
 impCopyTextInTextObj(pNextTextObj);
 }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 7ff01f8..094cc8b 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -750,7 +750,9 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 //OutlinerParaObject *someText = rOutliner.CreateParaObject(0,1); // only 
first para
 //pNextTextObj->SetOutlinerParaObject(*someText);
 //pNextTextObj->SetText("Bukowski, were are thou?");
-pNextTextObj->SetText(mpOverflowingText->GetTextObject().GetText(0));
+if (mpOverflowingText) {
+pNextTextObj->SetText(mpOverflowingText->GetTextObject().GetText(0));
+}
 //rOutliner.Insert("Bukowski, were are thou?");
 //rOutliner.Clear();
 //rOutliner.SetStatusEventHdl1(Link());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About skip SkipImages unit test on MacOs

[julien2412]

Hi,

I just wanted to communicate about the patch
http://cgit.freedesktop.org/libreoffice/core/commit/?id=be01d68420086fc36ecf26b5f597ba7c6b29b369
to make it more visible (because I dislike hiding a bug):

As I indicated, it concerns only 1 TB in Mac, for the record here is the
error reported:
901   [build LNK] CppunitTest/libtest_sc_filters_test.dylib
902  
/Volumes/Master/lo/core/unotest/source/cpp/macros_test.cxx:52:Test::testSkipImages
903   NEXTassertion failed
904   - Expression: xComponent.is()
905   NEXT- loading failed:
file:///Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx
906   
907   unknown:0:Test::testSkipImages
908   NEXTtearDown() failed
909   NEXT- An uncaught exception of type
com.sun.star.lang.DisposedException
910   - 
911   
912   NEXT/Volumes/Master/lo/core/unotest/source/cpp/macros_test.cxx:52:
Assertion
913   Test name: Test::testSkipImages
914   NEXTassertion failed
915   - Expression: xComponent.is()
916   NEXT- loading failed:
file:///Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx
917   
918   NEXT##Failure Location unknown## : Error
919   Test name: Test::testSkipImages
920   NEXTtearDown() failed
921   NEXT- An uncaught exception of type
com.sun.star.lang.DisposedException
922   - 
923   
924   Failures !!!
925   Run: 8   Failure total: 2   Failures: 1   Errors: 1
926   2015-05-26 18:53:02.338 cppunittester[1430:650077] ***
-[NSAutoreleasePool release]: This pool has already been released, do not
drain it (double release).
As I indicated in the comment:
"If someone wants to revert it go ahead but in this case, please either fix
the problem or disable this TB for the moment, thank you"

Now there's another error in this TB but that's another story.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-skip-SkipImages-unit-test-on-MacOs-tp4149788.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[Norbert Thiebaud]

On Thu, May 28, 2015 at 11:16 AM, Michael Meeks
 wrote:

> + Windows 64 status (David O)
>+ all fine, poking some Base test with Stephan
>+ an OLE test, failing on some machines not others;
>  environment dependent. Thorsten's machine doesn't crash.

That is the exception not the rule.
I could not get a build to finish, and cloph also reproduce the ole bug.
Until Win64 can reliably build, I can't pull that platform under
jenkins/gerrit-build

(Not that I could right this minutes anyway, still working on bring
hardware online to cope with growing demand)

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

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

[Jan Holesovsky]

 sd/source/ui/app/sdstring.src|4 -
 sd/source/ui/app/strings.src |8 --
 sd/source/ui/inc/sdstring.hrc|1 
 sd/source/ui/inc/strings.hrc |2 
 sd/source/ui/view/Outliner.cxx   |  118 +--
 sd/uiconfig/sdraw/toolbar/findbar.xml|2 
 sd/uiconfig/simpress/toolbar/findbar.xml |2 
 vcl/source/window/window2.cxx|4 +
 8 files changed, 60 insertions(+), 81 deletions(-)

New commits:
commit bc37514ed6b8694872d0e958428a940ca9835619
Author: Jan Holesovsky 
Date:   Thu May 28 18:23:25 2015 +0200

fdo#74132: Do not interrupt search in Impress and Draw.

Apparently this was forgotten; Writer and Calc already support this.

Change-Id: I1a187b54294cb84a1b48ef8e855cc75df3f75dd7

diff --git a/sd/source/ui/app/sdstring.src b/sd/source/ui/app/sdstring.src
index 2198a1a..6751765 100644
--- a/sd/source/ui/app/sdstring.src
+++ b/sd/source/ui/app/sdstring.src
@@ -18,10 +18,6 @@
  */
 
 #include "sdstring.hrc"
-String STR_SAR_NOT_FOUND
-{
-Text [ en-US ] = "Search key not found.";
-};
 
 String STR_SAR_WRAP_FORWARD
 {
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index ed790cf..6308c02 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -459,10 +459,6 @@ String STR_OBJECTS
 {
 Text [ en-US ] = "Objects" ;
 };
-String STR_END_SEARCHING
-{
-Text [ en-US ] = "The document search is finished." ;
-};
 String STR_END_SPELLING
 {
 Text [ en-US ] = "Spellcheck of entire document has been completed." ;
@@ -507,10 +503,6 @@ String STR_UNDO_SET_PRESLAYOUT
 {
 Text [ en-US ] = "Apply presentation layout" ;
 };
-String STR_STRING_NOTFOUND
-{
-Text [ en-US ] = "Search key not found." ;
-};
 String STR_PLAY
 {
 Text [ en-US ] = "~Play" ;
diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc
index 9d11d16..abf2acf 100644
--- a/sd/source/ui/inc/sdstring.hrc
+++ b/sd/source/ui/inc/sdstring.hrc
@@ -20,7 +20,6 @@
 #define SID_SD_STRING_START RID_APP_START+300
 
 // Texts for search and replace info and question boxes.
-#define STR_SAR_NOT_FOUND   SID_SD_STRING_START+23
 #define STR_SAR_WRAP_FORWARDSID_SD_STRING_START+24
 #define STR_SAR_WRAP_BACKWARD   SID_SD_STRING_START+25
 #define STR_SAR_WRAP_FORWARD_DRAW   SID_SD_STRING_START+26
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index a5da566..ca3f496a 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -200,7 +200,6 @@
 #define STR_IMPORT_GRFILTER_TOOBIG  (RID_APP_START+340)
 
 #define STR_OBJECTS (RID_APP_START+341)
-#define STR_END_SEARCHING   (RID_APP_START+342)
 #define STR_END_SPELLING(RID_APP_START+343)
 #define STR_NOLANGUAGE  (RID_APP_START+344)
 #define STR_ASK_FOR_CONVERT_TO_BEZIER   (RID_APP_START+347)
@@ -210,7 +209,6 @@
 #define STR_UNDO_INSERT_FILE(RID_APP_START+352)
 #define STR_UNDO_INSERT_SPECCHAR(RID_APP_START+353)
 #define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354)
-#define STR_STRING_NOTFOUND (RID_APP_START+355)
 #define STR_PLAY(RID_APP_START+356)
 #define STR_STOP(RID_APP_START+357)
 #define STR_UNDO_ORIGINALSIZE   (RID_APP_START+359)
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index feebd92d..a92766d 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -439,6 +439,9 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* 
pSearchItem)
 {
 bool bEndOfSearch = true;
 
+// clear the search toolbar entry
+SvxSearchDialogWrapper::SetSearchLabel(SL_Empty);
+
 mpDrawDocument->GetDocSh()->SetWaitCursor( true );
 if (mbPrepareSpellingPending)
 PrepareSpelling();
@@ -718,12 +721,9 @@ bool Outliner::SearchAndReplaceOnce()
 mpDrawDocument->GetDocSh()->SetWaitCursor( false );
 
 // notify LibreOfficeKit about changed page
-if (pViewShell && pViewShell->GetDoc()->isTiledRendering() &&
-mbStringFound && pViewShell->ISA(DrawViewShell))
+if (pViewShell && pViewShell->GetDoc()->isTiledRendering() && 
mbStringFound)
 {
-::boost::shared_ptr 
pDrawViewShell(::boost::dynamic_pointer_cast(pViewShell));
-
-sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId() - 1;
+sal_uInt16 nSelectedPage = maCurrentPosition.mnPageIndex;
 if (nSelectedPage != mnStartPageIndex)
 {
 OString aPayload = OString::number(nSelectedPage);
@@ -1065,86 +1065,73 @@ void Outliner::EndOfSearch()
 
 void Outliner::ShowEndOfSearchDialog()
 {
-OUString aString;
+mbWholeDocumentProcessed = true;
+
 if (meMode == SEARCH)
 {
-if (mbStringFound)
-aString = SD_RESSTR(STR_END_SEARCHI

Re: minutes of ESC call ...

[Norbert Thiebaud]

>
> * Jenkins update (Norbert)

I missed the call.. but here are the stats for last week:

from:Thu May 21 16:11:49 2015
master linux rel jobs:155 ok:147 ko:7 fail ratio:4.51% break:2 broken
duration:1.83%
master linux dbg jobs:105 ok:97 ko:8 fail ratio:7.61% break:3 broken
duration:5.44%
master mac rel  jobs:140 ok:139 ko:1 fail ratio:0.71% break:1 broken
duration:0.3%
master mac dbg  jobs:131 ok:129 ko:1 fail ratio:0.76% break:1 broken
duration:0.29%
master win rel  jobs:110 ok:96 ko:14 fail ratio:12.72% break:9 broken
duration:20.08%
master win dbg  jobs:107 ok:95 ko:12 fail ratio:11.21% break:7 broken
duration:11.69%
lo-4.4 mac  jobs:11 ok:9 ko:2 fail ratio:18.18% break:1 broken
duration:33.22%
gerrit win rel  jobs:131 ok:72 ko:59 fail ratio:45.03%
gerrit lin rel  jobs:134 ok:120 ko:14 fail ratio:10.44%
gerrit mac rel  jobs:130 ok:110 ko:20 fail ratio:15.38%
gerrit all   jobs:130 ok:66 ko:64 fail ratio:49.23%
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Andras, Caolan, Kendy, Sophie, Michael M, David T, Bjoern, David O,
  Robinson, Miklos, Muthu, Thorsten, Lionel
 
* Completed Action Items:
+ add ooenv bits for cppunittests (Michael)
+ take pretty Cambridge Hackfest pictures (Thorsten)
[ pending permission from those included ]
+ firebird_sdbc disable by default in the Win64 config (Thorsten)
+ disable by default in thunderbird in favour of mork on Win64 (Thorsten)
+ please forward GSOC phone numbers to Fridrich/Thorsten/Cedric (Thorsten, 
Kendy)
+ provide a new Easy Hacks query for the minutes (Robinson)
[ not a case sensitive query => not needed ]
+ make --enable-pch a dummy option for windows (Norbert)
+ same for ccache on windows (Norbert)
 
* Pending Action Items:
+ find some developer/sysadmin'y type people to train in CI maintenance 
(Cloph)
[ no time scheduled; after the call ]
+ move problem writer tests from check -> subsequentcheck for sw.all 
(Michael S)
+ add ooenv MALLOC_CHECK etc. to script wrapper for tinderboxes (Norbert)
 
* Release Engineering update (Robinson)
+ 5.0.0 - Beta 0
  + not much heard.
  + Late Feature Status (Michael)
 + LibreOfficeKit / Online tweaks (Kendy)
 + unstable API and/or reviewed.
 + OpenGL / double-buffer RenderContext (Kendy/Quikee)
 + re-review in a week - see if we can fix the rendering.
 + gtk3+ theming, embedded video, cut/paste (Caolan)
 + got popups working at hackfest
 + that also fixes a bunch of platform's undo / color
   selector popup placement problems.
 + no concerns.
 + change-tracking UI improvements @ hackfest (Kendy)
 [ punted in favour of rendercontext work @ hackfest ]
 + toolbar search / wrap-around (Kendy) 
 [ a somewhat feature'y change to push to master; in
   writer/impress - when searching instead of the
   wrap-around / dialog. Say so in the search toolbar;
   reviews solicited & appreciated ].
 + text wrapping for chart labels (Marco)
 [ punted to 5.1 ]
 + orcus with gnumeric import (Markus)
 + no concerns.
+ Windows 64 status (David O)
   + all fine, poking some Base test with Stephan
   + an OLE test, failing on some machines not others;
 environment dependent. Thorsten's machine doesn't crash.
   + firebird now disabled; didn't fix (Stephan)
   + mork driver on Win64 - no-one ever reported a bug (David O)
AI: + encourage QA guys to test thunderbird / Win64 (Robinson)
+ 4.4.4 RC1 status
+ will push that out later today
+ Android & iOS Remote
 
* Killed gcc 4.6 on master (post 5.0) (Stephan)
+ at least one commit in master now that is incompatible with 4.6
+ but avoiding large scale changes for some months.
+ internal tinderbox switched to libreoffice-5-0 (Thorsten)
 
* Crashtest update (Caolán)
+ import is reporting no crashers at all.
+ prolly timing out on 1x doc.
+ exports - terrible currently
+ ~all from recent DrawingML export fix (Andras)
+ beautiful screenshots; hopefully just some corner case (Michael)
+ ignoring those plus ignoring ~20x asserts from last discussion (Caolan)
+ then the legacy issues are dropping nicely.
+ also intersted in building a list of easy-to-fix regression crashers 
(Caolan)
 
* GSoC (Thorsten)
+ make sure students on-track; coding started on monday ...
+ mid-term is not so far out - June 26th, deadline July 3rd.
+ seen some good commits already there.
 
* Cambridge Hackfest retrospective (~Many)
+ a good number of guys; only 2x students - 1x already known
+ Photo approval: Miklos, Caolan, Michael, Kendy, Andras
+ Bjoern punted too (though no pictures exist)
 
* Hackfests (Bjoern)
+ Hamburg, Germany: Oct 23rd -> 25th
+ https://wiki.documentfoundation.org/Hackfest/Hamburg2015
+ draft page; to be filled out
+ great to see everyone there.
+ next venues / suggestions
+ Belgium another candidate ...
 
* Consolidating debug levels via EasyHacks (Bjoern)
+ first thing to do - to kill all OSL_DEBUG_ levels
  above 2, so have only 0 and 1.
+ questions answered (Thorsten)
+ getting rid of level 2 is great; as
  much -> SAL_INFOS as possible (Stephan)
 
* UX Update (Kendy)
+ closed submissions for 5.0 branding proposals
+ sent the list to the marketing & design representatives
+ how should we proceed ? / should we amend it with a designer ?
+ hope to have new graphics soon (by RC2)
 
* l10n Update (Sophie)
+ Olivier H found an English string in 4.4
+ macros->security warning dialog
   

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

[Michael Meeks]

 filter/source/pdf/impdialog.cxx|2 ++
 include/vcl/FilterConfigItem.hxx   |3 +++
 vcl/source/filter/FilterConfigItem.cxx |6 ++
 3 files changed, 11 insertions(+)

New commits:
commit fee29fde64567e91c69a350a787b6aefadfb71af
Author: Michael Meeks 
Date:   Thu May 28 14:17:11 2015 +0100

tdf#91652 - store PDF FilterConfigItem options in dispose.

Change-Id: I808aeab8fdac35330de24970b873f49e22c52c6a
Reviewed-on: https://gerrit.libreoffice.org/15946
Tested-by: Jenkins 
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 6211602..63cec8d 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -325,6 +325,8 @@ void ImpPDFTabDialog::dispose()
 RemoveTabPage(mnLinksPage);
 RemoveTabPage(mnSecurityPageId);
 RemoveTabPage(mnSigningPageId);
+maConfigItem.WriteModifiedConfig();
+maConfigI18N.WriteModifiedConfig();
 SfxTabDialog::dispose();
 }
 
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index 88694f0..ccee439b 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -60,7 +60,10 @@ public :
 FilterConfigItem( const OUString& rSubTree );
 FilterConfigItem( ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >* pFilterData );
 FilterConfigItem( const OUString& rSubTree, 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* 
pFilterData );
+/// Writes config in destructor
 ~FilterConfigItem();
+/// Writes config and sets unmodified state again.
+void WriteModifiedConfig();
 
 // all read methods are trying to return values in following order:
 // 1. FilterData PropertySequence
diff --git a/vcl/source/filter/FilterConfigItem.cxx 
b/vcl/source/filter/FilterConfigItem.cxx
index 156dc67..1194859 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -169,6 +169,11 @@ FilterConfigItem::FilterConfigItem( const OUString& 
rSubTree,
 
 FilterConfigItem::~FilterConfigItem()
 {
+WriteModifiedConfig();
+}
+
+void FilterConfigItem::WriteModifiedConfig()
+{
 if ( xUpdatableView.is() )
 {
 if ( xPropSet.is() && bModified )
@@ -179,6 +184,7 @@ FilterConfigItem::~FilterConfigItem()
 try
 {
 xUpdateControl->commitChanges();
+bModified = false;
 }
 catch ( ::com::sun::star::uno::Exception& )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - loolwsd/LOOLSession.cpp loolwsd/LOOLSession.hpp loolwsd/protocol.txt loolwsd/TileCache.cpp loolwsd/TileCache.hpp

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp |   64 ++---
 loolwsd/LOOLSession.hpp |6 ++-
 loolwsd/TileCache.cpp   |   53 ++
 loolwsd/TileCache.hpp   |6 +++
 loolwsd/protocol.txt|   83 +++-
 5 files changed, 164 insertions(+), 48 deletions(-)

New commits:
commit bf985624f1cdf5f6299c2b64e1805edb79f719a1
Author: Tor Lillqvist 
Date:   Thu May 28 18:39:05 2015 +0300

Handle LOK_CALLBACK_INVALIDATE_TILES in the server too

Remove any intersecting cached tiles. It is the parent process that handles
the tile cache, so it must look for invalidatetiles: messages, too, before
passing them on to the client. To know for which part we should remove 
tiles,
add an "ephemeral" curpart: message that the child process sends to the 
parent
process before the invalidatetils: message.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 9bbca5b..a98a577 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -106,7 +106,8 @@ std::mutex MasterProcessSession::_rngMutex;
 
 MasterProcessSession::MasterProcessSession(std::shared_ptr ws, Kind 
kind) :
 LOOLSession(ws, kind),
-_childId(0)
+_childId(0),
+_curPart(0)
 {
 std::cout << Util::logPrefix() << "MasterProcessSession ctor this=" << 
this << " ws=" << _ws.get() << std::endl;
 }
@@ -134,8 +135,19 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 // Note that this handles both forwarding requests from the client to 
the child process, and
 // forwarding replies from the child process to the client. Or does it?
 
-// Snoop at tile: and status: messages and (re-)cache them
+// Snoop at some  messages and manipulate tile cache information as 
needed
 auto peer = _peer.lock();
+
+if (_kind == Kind::ToPrisoner)
+{
+if (tokens[0] == "curpart:" &&
+tokens.count() == 2 &&
+getTokenInteger(tokens[1], "part", _curPart))
+{
+return true;
+}
+}
+
 if (_kind == Kind::ToPrisoner && peer && peer->_tileCache)
 {
 if (tokens[0] == "tile:")
@@ -159,6 +171,11 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 assert(firstLine.size() == 
static_cast(length));
 peer->_tileCache->saveStatus(firstLine);
 }
+else if (tokens[0] == "invalidatetiles:")
+{
+assert(firstLine.size() == 
static_cast(length));
+peer->_tileCache->invalidateTiles(_curPart, firstLine);
+}
 }
 
 forwardToPeer(buffer, length);
@@ -212,15 +229,16 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 }
 return loadDocument(buffer, length, tokens);
 }
-else if (tokens[0] != "status" &&
- tokens[0] != "tile" &&
+else if (tokens[0] != "invalidatetiles" &&
  tokens[0] != "key" &&
  tokens[0] != "mouse" &&
- tokens[0] != "uno" &&
- tokens[0] != "selecttext" &&
- tokens[0] != "selectgraphic" &&
  tokens[0] != "resetselection" &&
- tokens[0] != "saveas")
+ tokens[0] != "saveas" &&
+ tokens[0] != "selectgraphic" &&
+ tokens[0] != "selecttext" &&
+ tokens[0] != "status" &&
+ tokens[0] != "tile" &&
+ tokens[0] != "uno")
 {
 sendTextFrame("error: cmd=" + tokens[0] + " kind=unknown");
 return false;
@@ -230,6 +248,10 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 sendTextFrame("error: cmd=" + tokens[0] + " kind=nodocloaded");
 return false;
 }
+else if (tokens[0] == "invalidatetiles")
+{
+return invalidateTiles(buffer, length, tokens);
+}
 else if (tokens[0] == "status")
 {
 return getStatus(buffer, length);
@@ -406,6 +428,25 @@ void MasterProcessSession::preSpawn()
 _childProcesses[child.id()] = childId;
 }
 
+bool MasterProcessSession::invalidateTiles(const char *buffer, int length, 
StringTokenizer& tokens)
+{
+int part, tilePosX, tilePosY, tileWidth, tileHeight;
+
+if (tokens.count() != 6 ||
+!getTokenInteger(tokens[1], "part", part) ||
+!getTokenInteger(tokens[2], "tileposx", tilePosX) ||
+!getTokenInteger(tokens[3], "tileposy", tilePosY) ||
+!getTokenInteger(tokens[4], "tilewidth", tileWidth) ||
+!getTokenInteger(tokens[5], "tileheight", tileHeight))
+{
+sendTextFrame("error: cmd=invalidatetiles kind=syntax");
+return false;
+}
+
+_tileCache->invalidateTiles(_curPart, tilePosX, tilePosY, tileWidth, 
tileHeight);
+return true;
+}
+
 bool MasterProcessSession::loadDocument(const char *buffer, int length, 
StringTokenizer& tokens)
 {
 if (t

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

[Mihai Varga]

 loleaflet/build/deps.js  |7 +++
 loleaflet/src/control/Control.StatusIndicator.js |   46 +++
 loleaflet/src/layer/tile/TileLayer.js|   10 +
 3 files changed, 63 insertions(+)

New commits:
commit 2fa440c18f75e81748f9780762979854b8d7e9f9
Author: Mihai Varga 
Date:   Thu May 28 18:43:29 2015 +0300

Status indicator control

diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index b3e838d..e1fd636 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -227,6 +227,13 @@ var deps = {
desc: 'Switches from viewing to editing mode and backwards'
},
 
+   ControlStatusIndicator: {
+   src: ['control/Control.js',
+ 'control/Control.StatusIndicator.js'],
+   heading: 'Controls',
+   desc: 'Display document loading status'
+   },
+
ControlAttrib: {
src: ['control/Control.js',
  'control/Control.Attribution.js'],
diff --git a/loleaflet/src/control/Control.StatusIndicator.js 
b/loleaflet/src/control/Control.StatusIndicator.js
new file mode 100644
index 000..96b9da9
--- /dev/null
+++ b/loleaflet/src/control/Control.StatusIndicator.js
@@ -0,0 +1,46 @@
+/*
+ * L.Control.StatusIndicator is used for displaying the current loading status
+ */
+
+L.Control.StatusIndicator = L.Control.extend({
+   options: {
+   position: 'topleft',
+   },
+
+   onAdd: function (map) {
+   var partName = 'leaflet-control-statusindicator';
+   this._container = L.DomUtil.create('div', partName + ' 
leaflet-bar');
+
+   map.on('statusindicator:start statusindicator:setvalue 
statusindicator:finish',
+   this._updateStatus, this);
+   return this._container;
+   },
+
+   _updateStatus: function (e) {
+   if (e.type === 'statusindicator:start') {
+   L.DomUtil.setStyle(this._container, 'display', '');
+   this._container.innerText = '0 %';
+   }
+   else if (e.type === 'statusindicator:setvalue') {
+   this._container.innerText = e.statusIndicator + '% ';
+   }
+   else if (e.type === 'statusindicator:finish') {
+   L.DomUtil.setStyle(this._container, 'display', 'none');
+   }
+   }
+});
+
+L.Map.mergeOptions({
+   statusIndicatorControl: true
+});
+
+L.Map.addInitHook(function () {
+   if (this.options.statusIndicatorControl) {
+   this.statusIndicatorControl = new L.Control.StatusIndicator();
+   this.addControl(this.statusIndicatorControl);
+   }
+});
+
+L.control.statusIndicator = function (options) {
+   return new L.Control.StatusIndicator(options);
+};
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6bcab24..a4ee0b4 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -194,6 +194,16 @@ L.TileLayer = L.GridLayer.extend({
this._update();
}
}
+   else if (textMsg.startsWith('statusindicatorstart:')) {
+   this._map.fire('statusindicator:start');
+   }
+   else if (textMsg.startsWith('statusindicatorsetvalue:')) {
+   var statusIndicator = textMsg.match(/\d+/g)[0];
+   this._map.fire('statusindicator:setvalue', 
{statusIndicator:statusIndicator});
+   }
+   else if (textMsg.startsWith('statusindicatorfinish:')) {
+   this._map.fire('statusindicator:finish');
+   }
else if (textMsg.startsWith('tile:')) {
var command = this._parseServerCmd(textMsg);
var coords = this._twipsToCoords(new L.Point(command.x, 
command.y));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - desktop/source include/LibreOfficeKit include/sfx2 include/svl libreofficekit/qa libreofficekit/source sfx2/sdi svl/source sw/source

[Miklos Vajna]

 desktop/source/lib/init.cxx |2 +
 include/LibreOfficeKit/LibreOfficeKitGtk.h  |3 +
 include/sfx2/msg.hxx|2 -
 include/svl/memberid.hrc|2 +
 include/svl/srchitem.hxx|9 +
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   10 +-
 libreofficekit/source/gtk/lokdocview.cxx|8 +
 sfx2/sdi/sfxitems.sdi   |2 +
 svl/source/items/srchitem.cxx   |   32 ++--
 sw/source/uibase/uiview/viewsrch.cxx|   10 ++
 10 files changed, 76 insertions(+), 4 deletions(-)

New commits:
commit 3c9fb5898159fbda9d5b23f3f518044a5df03f72
Author: Miklos Vajna 
Date:   Thu May 28 17:21:50 2015 +0200

gtktiledviewer: use SearchItem.SearchStartPoint*

Change-Id: If0219eda3a2ca3b97c37bea70e35d47e49d38e02

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 320121e..b3e50d3 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -74,6 +74,9 @@ voidlok_docview_post_command(LOKDocView* 
pDocView, const char* p
 
 /// Posts a keyboard event to LibreOfficeKit.
 voidlok_docview_post_key(GtkWidget* pWidget, GdkEventKey* 
pEvent, gpointer pData);
+
+/// Get the visible area of the document (in twips).
+void lok_docview_get_visarea(LOKDocView* pThis, GdkRectangle* pArea);
 #ifdef __cplusplus
 }
 #endif
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 5fbd337..d20f43d 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -158,10 +158,18 @@ static void doSearch(bool bBackwards)
 
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchString/value",
 '/'), pText);
 
aTree.put(boost::property_tree::ptree::path_type("SearchItem.Backward/type", 
'/'), "boolean");
 
aTree.put(boost::property_tree::ptree::path_type("SearchItem.Backward/value", 
'/'), bBackwards);
+
+LOKDocView* pLOKDocView = LOK_DOCVIEW(pDocView);
+GdkRectangle aArea;
+lok_docview_get_visarea(pLOKDocView, &aArea);
+
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchStartPointX/type",
 '/'), "long");
+
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchStartPointX/value",
 '/'), aArea.x);
+
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchStartPointY/type",
 '/'), "long");
+
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchStartPointY/value",
 '/'), aArea.y);
+
 std::stringstream aStream;
 boost::property_tree::write_json(aStream, aTree);
 
-LOKDocView* pLOKDocView = LOK_DOCVIEW(pDocView);
 lok_docview_post_command(pLOKDocView, ".uno:ExecuteSearch", 
aStream.str().c_str());
 }
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index e3c03db..064e534 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1319,4 +1319,12 @@ SAL_DLLPUBLIC_EXPORT void 
lok_docview_post_key(GtkWidget* /*pWidget*/, GdkEventK
 pDocView->m_pImpl->signalKey(pEvent);
 }
 
+SAL_DLLPUBLIC_EXPORT void lok_docview_get_visarea(LOKDocView* pThis, 
GdkRectangle* pArea)
+{
+GtkAdjustment* pHAdjustment = 
gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(pThis));
+pArea->x = 
pThis->m_pImpl->pixelToTwip(gtk_adjustment_get_value(pHAdjustment));
+GtkAdjustment* pVAdjustment = 
gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(pThis));
+pArea->y = 
pThis->m_pImpl->pixelToTwip(gtk_adjustment_get_value(pVAdjustment));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1dc60bc9e99304c58007bfd5a964ff3f78480106
Author: Miklos Vajna 
Date:   Thu May 28 17:13:38 2015 +0200

SvxSearchItem: add m_nStartPoint{X,Y}

The idea is that if you have your cursor at the begining of a Writer
document, and you scroll down a lot, then search, then it's annoying
that search jumps back to the start of the document for the first hit.

Add an optional way to provide what is the starting point of such a
search, so we can have "when nothing is selected, then search from the
top left corner of the visible area".

No UI yet to enable this, but available via the UNO API.

Change-Id: Ibcf3a5f2eeba1372b1dfe8474081e6591a6e0134

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3ca2744..3993015 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -742,6 +742,8 @@ static void jsonToPropertyValues(const char* pJSON, 
uno::Sequence>= m_nStartPointX);
+break;
+}
+case MID_SEARCH_STARTPOINTY:
+{
+  

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

[Mihai Varga]

 loleaflet/dist/leaflet.css|4 +++-
 loleaflet/src/control/Control.EditView.js |3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1d34f8f0a8d5190277b0468e4fa3b22ad4817b29
Author: Mihai Varga 
Date:   Thu May 28 17:43:53 2015 +0300

Set pointer cursor in viewmode

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index cd63ccd..8aa8aed 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -198,7 +198,9 @@
cursor: -webkit-grabbing;
cursor:-moz-grabbing;
}
-
+.leaflet-viewmode {
+cursor: pointer;
+}
 
 /* visual tweaks */
 
diff --git a/loleaflet/src/control/Control.EditView.js 
b/loleaflet/src/control/Control.EditView.js
index 248c341..2baf269 100644
--- a/loleaflet/src/control/Control.EditView.js
+++ b/loleaflet/src/control/Control.EditView.js
@@ -19,11 +19,14 @@ L.Control.EditViewSwitch = L.Control.extend({
},
 
 _onChange: function() {
+var className = 'leaflet-viewmode';
 if (this._checkBox.checked) {
 this._map.fire('viewmode');
+L.DomUtil.addClass(this._map._container, className);
 }
 else {
 this._map.fire('editmode');
+L.DomUtil.removeClass(this._map._container, className);
 }
 }
 });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dbaccess/source

[Caolán McNamara]

 dbaccess/source/ui/querydesign/JoinController.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06c57058178fa28c79d002cf2794ebd4ec2a2db4
Author: Caolán McNamara 
Date:   Thu May 28 15:20:48 2015 +0100

VclPtr: assert with query dialog open on closing query design

Change-Id: I40d196462ff2e37d86ca367d3a150c94872715f1
(cherry picked from commit 2ecf0ced9d2e55881033786fe95d45ceaeb73d37)

diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx 
b/dbaccess/source/ui/querydesign/JoinController.cxx
index ac48303..3852ef9 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -170,7 +170,7 @@ OJoinDesignView* OJoinController::getJoinView()
 
 void OJoinController::disposing()
 {
-m_pAddTableDialog   = NULL;
+m_pAddTableDialog.disposeAndClear();
 
 OJoinController_BASE::disposing();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dbaccess/source/ui/querydesign/JoinController.cxx |2 +-
 xmloff/source/core/xmlexp.cxx |8 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 2ecf0ced9d2e55881033786fe95d45ceaeb73d37
Author: Caolán McNamara 
Date:   Thu May 28 15:20:48 2015 +0100

VclPtr: assert with query dialog open on closing query design

Change-Id: I40d196462ff2e37d86ca367d3a150c94872715f1

diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx 
b/dbaccess/source/ui/querydesign/JoinController.cxx
index ac48303..3852ef9 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -170,7 +170,7 @@ OJoinDesignView* OJoinController::getJoinView()
 
 void OJoinController::disposing()
 {
-m_pAddTableDialog   = NULL;
+m_pAddTableDialog.disposeAndClear();
 
 OJoinController_BASE::disposing();
 
commit 9bc314e38b6bcc268fe519b6d771a60087a1af9e
Author: Caolán McNamara 
Date:   Fri May 22 10:59:01 2015 +0100

add field namespace to styles.xml when saving fdo85232-1.docx to .odt

when >= SvtSaveOptions::ODFVER_012

Change-Id: I0414bc4a83ae4787e10cd8a21f249da7e65a

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 405a660..7b29bd7 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -336,6 +336,7 @@ void SvXMLExport::_InitCtor()
 mpNamespaceMap->Add( GetXMLToken(XML_NP_STYLE), 
GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE );
 }
 
+bool bAddFieldNM = false;
 // namespaces for documents
 if( getExportFlags() & 
(SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT)
 )
 {
@@ -363,6 +364,7 @@ void SvXMLExport::_InitCtor()
 mpNamespaceMap->Add(
 GetXMLToken(XML_NP_LO_EXT), GetXMLToken(XML_N_LO_EXT),
 XML_NAMESPACE_LO_EXT);
+bAddFieldNM = true;
 }
 }
 if( getExportFlags() & 
(SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
@@ -380,9 +382,13 @@ void SvXMLExport::_InitCtor()
 mpNamespaceMap->Add( GetXMLToken(XML_NP_XFORMS_1_0), 
GetXMLToken(XML_N_XFORMS_1_0), XML_NAMESPACE_XFORMS );
 mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), 
XML_NAMESPACE_XSD );
 mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), 
XML_NAMESPACE_XSI );
-mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), 
GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
 mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), 
GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
+bAddFieldNM = true;
 }
+
+if (bAddFieldNM)
+mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), 
GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
+
 // RDFa: needed for content and header/footer styles
 if( getExportFlags() & 
(SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT)
 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mihai Varga]

 loleaflet/src/control/Control.Parts.js |7 ++-
 loleaflet/src/layer/tile/TileLayer.js  |7 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit d8dd709377812d32b5386e7025c54fbdc13412dd
Author: Mihai Varga 
Date:   Thu May 28 17:22:42 2015 +0300

setpart command handler

diff --git a/loleaflet/src/control/Control.Parts.js 
b/loleaflet/src/control/Control.Parts.js
index 254c10b..2b198d7 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -24,6 +24,8 @@ L.Control.Parts = L.Control.extend({
this._parts = options.parts;
this._currentPart = options.currentPart;
this._updateDisabled();
+   map.on('setpart', this._updateDisabled, this);
+
return container;
},
 
@@ -58,7 +60,10 @@ L.Control.Parts = L.Control.extend({
return link;
},
 
-   _updateDisabled: function () {
+   _updateDisabled: function (e) {
+   if (e) {
+   this._currentPart = e.currentPart;
+   }
var className = 'leaflet-disabled';
if (this._currentPart === 0) {
L.DomUtil.addClass(this._prevPartButton, className);
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 432d98f..6bcab24 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -251,6 +251,12 @@ L.TileLayer = L.GridLayer.extend({
}
}
}
+   else if (textMsg.startsWith('setpart:')) {
+   this._currentPart = parseInt(textMsg.match(/\d+/g)[0]);
+   this._update();
+   this._clearSelections();
+   this._map.fire('setpart', {currentPart: 
this._currentPart});
+   }
else if (textMsg.startsWith('searchnotfound:')) {
this._map.fire('searchnotfound');
}
@@ -544,6 +550,7 @@ L.TileLayer = L.GridLayer.extend({
}
this._update();
this._pruneTiles();
+   this._clearSelections();
},
 
_updateEditViewMode: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dbaccess/source

[Caolán McNamara]

 dbaccess/source/ui/querydesign/JoinDesignView.cxx  |2 +-
 dbaccess/source/ui/querydesign/QueryViewSwitch.cxx |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6f66aab4b757d02a5f9955d825cd142bd353b765
Author: Caolán McNamara 
Date:   Thu May 28 15:06:40 2015 +0100

VclPtr: undisposed things and dispose order on query design window close

Change-Id: I3070d52e15febe2f5981ffdf5d665e28fa4f799b
(cherry picked from commit 82f15336cfbcb766c060c4936d11ff33c54558e4)

diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx 
b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 39a86c4..a5701f9 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -66,8 +66,8 @@ OJoinDesignView::~OJoinDesignView()
 
 void OJoinDesignView::dispose()
 {
-m_pScrollWindow.disposeAndClear();
 m_pTableView.disposeAndClear();
+m_pScrollWindow.disposeAndClear();
 ODataView::dispose();
 }
 
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx 
b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 4baf6079..a527afd 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -42,6 +42,9 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* 
_pParent, OQueryContro
 
 OQueryViewSwitch::~OQueryViewSwitch()
 {
+// destroy children
+m_pDesignView.disposeAndClear();
+m_pTextView.disposeAndClear();
 }
 
 void OQueryViewSwitch::Construct()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dbaccess/source/ui/querydesign/JoinDesignView.cxx  |2 +-
 dbaccess/source/ui/querydesign/QueryViewSwitch.cxx |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 82f15336cfbcb766c060c4936d11ff33c54558e4
Author: Caolán McNamara 
Date:   Thu May 28 15:06:40 2015 +0100

VclPtr: undisposed things and dispose order on query design window close

Change-Id: I3070d52e15febe2f5981ffdf5d665e28fa4f799b

diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx 
b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 39a86c4..a5701f9 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -66,8 +66,8 @@ OJoinDesignView::~OJoinDesignView()
 
 void OJoinDesignView::dispose()
 {
-m_pScrollWindow.disposeAndClear();
 m_pTableView.disposeAndClear();
+m_pScrollWindow.disposeAndClear();
 ODataView::dispose();
 }
 
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx 
b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 4baf6079..a527afd 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -42,6 +42,9 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* 
_pParent, OQueryContro
 
 OQueryViewSwitch::~OQueryViewSwitch()
 {
+// destroy children
+m_pDesignView.disposeAndClear();
+m_pTextView.disposeAndClear();
 }
 
 void OQueryViewSwitch::Construct()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 4 commits - sc/source svx/source sw/qa sw/source

[Henry Castro]

 dev/null   |binary
 sc/source/core/data/drwlayer.cxx   |   59 +
 svx/source/svdraw/svdoashp.cxx |1 
 sw/qa/extras/htmlexport/htmlexport.cxx |   18 --
 sw/source/filter/html/wrthtml.cxx  |   17 ++---
 5 files changed, 64 insertions(+), 31 deletions(-)

New commits:
commit 9722c6c17537b9f0b341486f0f4a46a99a15b786
Author: Henry Castro 
Date:   Fri Apr 24 16:55:01 2015 -0400

Resolves tdf#67712 form controls and draw objects

anchored to cell but changes position after reopening

Also included tdf#68797 "FILEOPEN lost position of lines
anchored to cell". It was marked as duplicate but the
step to reproduce are different.

Conflicts:
sc/qa/unit/subsequent_filters-test.cxx

Conflicts:
sc/qa/unit/subsequent_export-test.cxx

Reviewed-on: https://gerrit.libreoffice.org/15523
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 487880b6882ec01c1b4679eae60bec484272a86b)

Conflicts:
sc/qa/unit/subsequent_export-test.cxx

Change-Id: Ia1c4010f118749256077a0ecad6ca16b867d22f7

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 073508a..c67f305 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "scitems.hxx"
 #include 
@@ -119,6 +120,14 @@ void ScUndoObjData::Undo()
 pData->maStart = aOldStt;
 pData->maEnd = aOldEnd;
 }
+
+// Undo also an untransformed anchor
+pData = ScDrawLayer::GetNonRotatedObjData( pObj );
+if (pData)
+{
+pData->maStart = aOldStt;
+pData->maEnd = aOldEnd;
+}
 }
 
 void ScUndoObjData::Redo()
@@ -130,6 +139,14 @@ void ScUndoObjData::Redo()
 pData->maStart = aNewStt;
 pData->maEnd = aNewEnd;
 }
+
+// Redo also an untransformed anchor
+pData = ScDrawLayer::GetNonRotatedObjData( pObj );
+if (pData)
+{
+pData->maStart = aNewStt;
+pData->maEnd = aNewEnd;
+}
 }
 
 ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) :
@@ -499,6 +516,15 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW 
nRow1, SCCOL nCol2,SC
 {
 if ( pObj->ISA( SdrRectObj ) && pData->maStart.IsValid() && 
pData->maEnd.IsValid() )
 pData->maStart.PutInOrder( pData->maEnd );
+
+// Update also an untransformed anchor thats what we stored ( 
and still do ) to xml
+ScDrawObjData* pNoRotatedAnchor = GetNonRotatedObjData( pObj, 
false );
+if ( pNoRotatedAnchor )
+{
+pNoRotatedAnchor->maStart = pData->maStart;
+pNoRotatedAnchor->maEnd = pData->maEnd;
+}
+
 AddCalcUndo( new ScUndoObjData( pObj, aOldStt, aOldEnd, 
pData->maStart, pData->maEnd ) );
 RecalcPos( pObj, *pData, bNegativePage, bUpdateNoteCaptionPos 
);
 }
@@ -763,6 +789,39 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData& rData, bool bNegati
 ScDrawObjData& rNoRotatedAnchor = *GetNonRotatedObjData( pObj, true );
 if (rData.maLastRect.IsEmpty())
 {
+// Every shape it is saved with an negative offset relative to cell
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+{
+double fRotate(0.0);
+double fShearX(0.0);
+
+Point aPoint;
+Rectangle aRect;
+
+basegfx::B2DTuple aScale;
+basegfx::B2DTuple aTranslate;
+basegfx::B2DPolyPolygon aPolyPolygon;
+basegfx::B2DHomMatrix aOriginalMatrix;
+
+aRect = pDoc->GetMMRect(nCol1, nRow1, nCol1 , nRow1, nTab1);
+
+if (bNegativePage)
+aPoint.X() = aRect.Right();
+else
+aPoint.X() = aRect.Left();
+aPoint.Y() = aRect.Top();
+
+pObj->TRGetBaseGeometry(aOriginalMatrix, aPolyPolygon);
+aOriginalMatrix.decompose(aScale, aTranslate, fRotate, 
fShearX);
+aTranslate += ::basegfx::B2DTuple(aPoint.X(), aPoint.Y());
+aOriginalMatrix = 
basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
+aScale,
+fShearX,
+fRotate,
+aTranslate);
+pObj->TRSetBaseGeometry(aOriginalMatrix, aPolyPolygon);
+}
+
 // It's confusing ( but blame that we persist the anchor in terms 
of unrotated shape )
 // that the initial anchor we get here is in terms of an unrotated 
shape ( if the shape is rotated )
 // we need to save the old anchor ( for persisting ) and also 
track any resize or repositions t

[Libreoffice-commits] online.git: 6 commits - loolwsd/LoadTest.cpp loolwsd/LOOLSession.cpp loolwsd/LOOLSession.hpp loolwsd/LOOLWSD.cpp loolwsd/protocol.txt loolwsd/TileCache.cpp loolwsd/TileCache.hpp

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp |   30 +++-
 loolwsd/LOOLSession.hpp |   21 --
 loolwsd/LOOLWSD.cpp |   30 
 loolwsd/LoadTest.cpp|   28 +-
 loolwsd/TileCache.cpp   |   71 
 loolwsd/TileCache.hpp   |3 --
 loolwsd/protocol.txt|9 ++
 7 files changed, 70 insertions(+), 122 deletions(-)

New commits:
commit f6a00edbeeed69d66d36e39df1fd8abc44bd7605
Author: Tor Lillqvist 
Date:   Thu May 28 16:42:38 2015 +0300

Use shared_ptr to the WebSockets for increased robustness

Why did I wait so long to do this? This is obviously the right thing to do, 
I
hope, and has a very significant impact on the robustness of the server...

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 3221dd4..9bbca5b 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -71,12 +71,12 @@ using Poco::Util::Application;
 
 const std::string LOOLSession::jailDocumentURL = "/user/thedocument";
 
-LOOLSession::LOOLSession(WebSocket& ws, Kind kind) :
+LOOLSession::LOOLSession(std::shared_ptr ws, Kind kind) :
 _kind(kind),
-_ws(&ws),
+_ws(ws),
 _docURL("")
 {
-std::cout << Util::logPrefix() << "LOOLSession ctor this=" << this << " " 
<< _kind << " ws=" << _ws << std::endl;
+std::cout << Util::logPrefix() << "LOOLSession ctor this=" << this << " " 
<< _kind << " ws=" << _ws.get() << std::endl;
 }
 
 LOOLSession::~LOOLSession()
@@ -104,11 +104,11 @@ std::condition_variable 
MasterProcessSession::_availableChildSessionCV;
 Poco::Random MasterProcessSession::_rng;
 std::mutex MasterProcessSession::_rngMutex;
 
-MasterProcessSession::MasterProcessSession(WebSocket& ws, Kind kind) :
+MasterProcessSession::MasterProcessSession(std::shared_ptr ws, Kind 
kind) :
 LOOLSession(ws, kind),
 _childId(0)
 {
-std::cout << Util::logPrefix() << "MasterProcessSession ctor this=" << 
this << " ws=" << _ws << std::endl;
+std::cout << Util::logPrefix() << "MasterProcessSession ctor this=" << 
this << " ws=" << _ws.get() << std::endl;
 }
 
 MasterProcessSession::~MasterProcessSession()
@@ -590,12 +590,12 @@ void MasterProcessSession::forwardToPeer(const char 
*buffer, int length)
 peer->_ws->sendFrame(buffer, length, WebSocket::FRAME_BINARY);
 }
 
-ChildProcessSession::ChildProcessSession(WebSocket& ws, LibreOfficeKit *loKit) 
:
+ChildProcessSession::ChildProcessSession(std::shared_ptr ws, 
LibreOfficeKit *loKit) :
 LOOLSession(ws, Kind::ToMaster),
 _loKit(loKit),
 _loKitDocument(NULL)
 {
-std::cout << Util::logPrefix() << "ChildProcessSession ctor this=" << this 
<< " ws=" << _ws << std::endl;
+std::cout << Util::logPrefix() << "ChildProcessSession ctor this=" << this 
<< " ws=" << _ws.get() << std::endl;
 }
 
 ChildProcessSession::~ChildProcessSession()
diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 64a2dae..2d780d7 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -46,7 +46,7 @@ public:
 virtual bool getStatus(const char *buffer, int length) = 0;
 
 protected:
-LOOLSession(Poco::Net::WebSocket& ws, Kind kind);
+LOOLSession(std::shared_ptr ws, Kind kind);
 virtual ~LOOLSession();
 
 static const std::string jailDocumentURL;
@@ -65,7 +65,7 @@ protected:
 
 // In the master process, the websocket to the LOOL client or the jailed 
child process. In a
 // jailed process, the websocket to the parent.
-Poco::Net::WebSocket *_ws;
+std::shared_ptr _ws;
 
 // In the master, the actual URL. In the child, the copy inside the chroot 
jail.
 std::string _docURL;
@@ -91,7 +91,7 @@ inline std::basic_ostream & operator 
<<(std::basic_ostream
 {
 public:
-MasterProcessSession(Poco::Net::WebSocket& ws, Kind kind);
+MasterProcessSession(std::shared_ptr ws, Kind kind);
 virtual ~MasterProcessSession();
 
 virtual bool handleInput(char *buffer, int length) override;
@@ -146,7 +146,7 @@ private:
 class ChildProcessSession final : public LOOLSession
 {
 public:
-ChildProcessSession(Poco::Net::WebSocket& ws, LibreOfficeKit *loKit);
+ChildProcessSession(std::shared_ptr ws, 
LibreOfficeKit *loKit);
 virtual ~ChildProcessSession();
 
 virtual bool handleInput(char *buffer, int length) override;
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 34aa2e4..fa4d386 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -139,7 +139,7 @@ public:
 {
 try
 {
-WebSocket ws(request, response);
+std::shared_ptr ws(new WebSocket(request, 
response));
 
 std::shared_ptr session;
 
@@ -157,11 +157,11 @@ public:
 // the client).
 int flags;
 int n;
-ws.setReceiveTimeout(0);
+ws->setReceiveTimeout(0);
 do
 {
 char buffer[10];
-   

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - sc/source svx/source

[Henry Castro]

 sc/source/core/data/drwlayer.cxx |   59 +++
 svx/source/svdraw/svdoashp.cxx   |1 
 2 files changed, 60 insertions(+)

New commits:
commit b1f1c77687e301c99e81631d33298e44bdb5ca84
Author: Henry Castro 
Date:   Fri Apr 24 16:55:01 2015 -0400

Resolves tdf#67712 form controls and draw objects

anchored to cell but changes position after reopening

Also included tdf#68797 "FILEOPEN lost position of lines
anchored to cell". It was marked as duplicate but the
step to reproduce are different.

Conflicts:
sc/qa/unit/subsequent_filters-test.cxx

Conflicts:
sc/qa/unit/subsequent_export-test.cxx

Reviewed-on: https://gerrit.libreoffice.org/15523
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 487880b6882ec01c1b4679eae60bec484272a86b)

Conflicts:
sc/qa/unit/subsequent_export-test.cxx

Change-Id: Ia1c4010f118749256077a0ecad6ca16b867d22f7

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 23e0de3..6649953 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "scitems.hxx"
 #include 
@@ -116,6 +117,14 @@ void ScUndoObjData::Undo()
 pData->maStart = aOldStt;
 pData->maEnd = aOldEnd;
 }
+
+// Undo also an untransformed anchor
+pData = ScDrawLayer::GetNonRotatedObjData( pObj );
+if (pData)
+{
+pData->maStart = aOldStt;
+pData->maEnd = aOldEnd;
+}
 }
 
 void ScUndoObjData::Redo()
@@ -127,6 +136,14 @@ void ScUndoObjData::Redo()
 pData->maStart = aNewStt;
 pData->maEnd = aNewEnd;
 }
+
+// Redo also an untransformed anchor
+pData = ScDrawLayer::GetNonRotatedObjData( pObj );
+if (pData)
+{
+pData->maStart = aNewStt;
+pData->maEnd = aNewEnd;
+}
 }
 
 ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) :
@@ -495,6 +512,15 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW 
nRow1, SCCOL nCol2,SC
 {
 if ( pObj->ISA( SdrRectObj ) && pData->maStart.IsValid() && 
pData->maEnd.IsValid() )
 pData->maStart.PutInOrder( pData->maEnd );
+
+// Update also an untransformed anchor thats what we stored ( 
and still do ) to xml
+ScDrawObjData* pNoRotatedAnchor = GetNonRotatedObjData( pObj, 
false );
+if ( pNoRotatedAnchor )
+{
+pNoRotatedAnchor->maStart = pData->maStart;
+pNoRotatedAnchor->maEnd = pData->maEnd;
+}
+
 AddCalcUndo( new ScUndoObjData( pObj, aOldStt, aOldEnd, 
pData->maStart, pData->maEnd ) );
 RecalcPos( pObj, *pData, bNegativePage, bUpdateNoteCaptionPos 
);
 }
@@ -759,6 +785,39 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData& rData, bool bNegati
 ScDrawObjData& rNoRotatedAnchor = *GetNonRotatedObjData( pObj, true );
 if (rData.maLastRect.IsEmpty())
 {
+// Every shape it is saved with an negative offset relative to cell
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+{
+double fRotate(0.0);
+double fShearX(0.0);
+
+Point aPoint;
+Rectangle aRect;
+
+basegfx::B2DTuple aScale;
+basegfx::B2DTuple aTranslate;
+basegfx::B2DPolyPolygon aPolyPolygon;
+basegfx::B2DHomMatrix aOriginalMatrix;
+
+aRect = pDoc->GetMMRect(nCol1, nRow1, nCol1 , nRow1, nTab1);
+
+if (bNegativePage)
+aPoint.X() = aRect.Right();
+else
+aPoint.X() = aRect.Left();
+aPoint.Y() = aRect.Top();
+
+pObj->TRGetBaseGeometry(aOriginalMatrix, aPolyPolygon);
+aOriginalMatrix.decompose(aScale, aTranslate, fRotate, 
fShearX);
+aTranslate += ::basegfx::B2DTuple(aPoint.X(), aPoint.Y());
+aOriginalMatrix = 
basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
+aScale,
+fShearX,
+fRotate,
+aTranslate);
+pObj->TRSetBaseGeometry(aOriginalMatrix, aPolyPolygon);
+}
+
 // It's confusing ( but blame that we persist the anchor in terms 
of unrotated shape )
 // that the initial anchor we get here is in terms of an unrotated 
shape ( if the shape is rotated )
 // we need to save the old anchor ( for persisting ) and also 
track any resize or repositions that happen.
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 60910e1..a77d9e9 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoas

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

[Henry Castro]

 loleaflet/src/layer/tile/TileLayer.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e974f7c98cbbf03841743f263e300387d4818bf5
Author: Henry Castro 
Date:   Thu May 28 09:36:52 2015 -0400

Fixed EMPTY invalidattiles

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 467fe9d..432d98f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -154,7 +154,7 @@ L.TileLayer = L.GridLayer.extend({

this._twipsToLatLng(bottomRightTwips));
this._onUpdateCursor();
}
-   else if (textMsg.startsWith('invalidatetiles')) {
+   else if (textMsg.startsWith('invalidatetiles') && 
!textMsg.match('EMPTY')) {
strTwips = textMsg.match(/\d+/g);
var topLeftTwips = new L.Point(parseInt(strTwips[0]), 
parseInt(strTwips[1]));
var offset = new L.Point(parseInt(strTwips[2]), 
parseInt(strTwips[3]));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 sw/qa/core/uwriter.cxx |   50 +
 1 file changed, 50 insertions(+)

New commits:
commit f12f5525427d7d743a267ab2e8bf5315d389e9cf
Author: Katarina Behrens 
Date:   Wed May 27 23:00:17 2015 +0200

Unit test related to tdf#89783: more than 64k PageDescs

Change-Id: I19207a15e1a3eec2ac097ec007afd7bfc2fd1cf1
Reviewed-on: https://gerrit.libreoffice.org/15941
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 966a2aa..08f8020 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -62,6 +62,7 @@
 #include "IMark.hxx"
 #include "ring.hxx"
 #include "calbck.hxx"
+#include "pagedesc.hxx"
 
 typedef tools::SvRef SwDocShellRef;
 
@@ -109,6 +110,7 @@ public:
 void testFormulas();
 void testIntrusiveRing();
 void testClientModify();
+void test64kPageDescs();
 
 CPPUNIT_TEST_SUITE(SwDocTest);
 
@@ -141,6 +143,7 @@ public:
 CPPUNIT_TEST(testFormulas);
 CPPUNIT_TEST(testIntrusiveRing);
 CPPUNIT_TEST(testClientModify);
+CPPUNIT_TEST(test64kPageDescs);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1565,6 +1568,53 @@ void SwDocTest::testClientModify()
 CPPUNIT_ASSERT_EQUAL(aClient2.m_nNotifyCount,1);
 }
 
+void SwDocTest::test64kPageDescs()
+{
+size_t nPageDescCount = 65536; // USHRT_MAX + 1
+
+for (size_t i = 0; i < nPageDescCount; ++i)
+{
+OUString aName = OUString("Page") + OUString::number(i);
+m_pDoc->MakePageDesc( aName );
+}
+
+size_t nCount = m_pDoc->GetPageDescCnt();
+// +1 because Writer always creates a dummy page desc
+// in a new SwDoc
+CPPUNIT_ASSERT_EQUAL( nPageDescCount + 1, nCount );
+
+const SwPageDesc &rDesc = m_pDoc->GetPageDesc( nPageDescCount );
+SwPageDesc &rZeroDesc = m_pDoc->GetPageDesc( 0 );
+CPPUNIT_ASSERT_EQUAL( OUString("Page65535"), rDesc.GetName() );
+
+SwPageDesc aDesc( rDesc );
+const OUString aChanged("Changed01");
+aDesc.SetName( aChanged );
+m_pDoc->ChgPageDesc( nPageDescCount, aDesc );
+
+size_t nPos;
+SwPageDesc *pDesc = m_pDoc->FindPageDesc( aChanged, &nPos );
+CPPUNIT_ASSERT( pDesc != NULL );
+CPPUNIT_ASSERT( nPos == nPageDescCount );
+
+// check if we didn't mess up PageDesc at pos 0
+// (happens with 16bit int overflow)
+OUString aZeroName = rZeroDesc.GetName();
+rZeroDesc = m_pDoc->GetPageDesc( 0 );
+CPPUNIT_ASSERT_EQUAL( aZeroName, rZeroDesc.GetName() );
+
+m_pDoc->DelPageDesc( aChanged, nPos );
+pDesc = m_pDoc->FindPageDesc( aChanged, &nPos );
+// not there anymore
+CPPUNIT_ASSERT( pDesc == NULL );
+CPPUNIT_ASSERT( nPos == SIZE_MAX );
+
+// check if PageDesc at pos 0 is still there
+pDesc = m_pDoc->FindPageDesc( aZeroName, &nPos );
+CPPUNIT_ASSERT( pDesc != NULL );
+CPPUNIT_ASSERT( nPos == 0 );
+}
+
 void SwDocTest::setUp()
 {
 BootstrapFixture::setUp();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/svtools/brwbox.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c609d7a1ccee5044d8d64f07b59407dfb316324
Author: Caolán McNamara 
Date:   Thu May 28 14:31:19 2015 +0100

Resolves: tdf#91673 wrong bit mask for BrowserMode

Change-Id: Iecd1d9d743fb3d7a02b31d2bee001de5092be7e0

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 8da4925..610eb57 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -96,7 +96,7 @@ enum class BrowserMode
 };
 namespace o3tl
 {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
 }
 
 #define BROWSER_NONE  0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svtools

[Caolán McNamara]

 include/svtools/brwbox.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc755ad11687947cbb52ab7624503a8abefbe259
Author: Caolán McNamara 
Date:   Thu May 28 14:31:19 2015 +0100

Resolves: tdf#91673 wrong bit mask for BrowserMode

Change-Id: Iecd1d9d743fb3d7a02b31d2bee001de5092be7e0
(cherry picked from commit 8c609d7a1ccee5044d8d64f07b59407dfb316324)

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 6c34655..8701dd1 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -96,7 +96,7 @@ enum class BrowserMode
 };
 namespace o3tl
 {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
 }
 
 #define BROWSER_NONE  0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Jan Holesovsky]

 sd/source/ui/view/Outliner.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e275f2c6808abe9f0bd9c720dee801a887198270
Author: Jan Holesovsky 
Date:   Thu May 28 14:31:36 2015 +0200

lok search sd: Off-by-one; and send the page only when it changed.

Change-Id: Ifc56c7771bfdf75531a0c5153cbcbb5c36f051b7

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index da24d0e..feebd92d 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -723,9 +723,12 @@ bool Outliner::SearchAndReplaceOnce()
 {
 ::boost::shared_ptr 
pDrawViewShell(::boost::dynamic_pointer_cast(pViewShell));
 
-sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId();
-OString aPayload = OString::number(nSelectedPage);
-pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId() - 1;
+if (nSelectedPage != mnStartPageIndex)
+{
+OString aPayload = OString::number(nSelectedPage);
+
pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
 }
 
 return mbEndOfSearch;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sd/source/ui/view/Outliner.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 090ad6b02c84e04642dbcd53ddd3a079b0d17471
Author: Jan Holesovsky 
Date:   Thu May 28 14:31:36 2015 +0200

lok search sd: Off-by-one; and send the page only when it changed.

Change-Id: Ifc56c7771bfdf75531a0c5153cbcbb5c36f051b7

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index da24d0e..feebd92d 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -723,9 +723,12 @@ bool Outliner::SearchAndReplaceOnce()
 {
 ::boost::shared_ptr 
pDrawViewShell(::boost::dynamic_pointer_cast(pViewShell));
 
-sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId();
-OString aPayload = OString::number(nSelectedPage);
-pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId() - 1;
+if (nSelectedPage != mnStartPageIndex)
+{
+OString aPayload = OString::number(nSelectedPage);
+
pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
 }
 
 return mbEndOfSearch;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Jan Holesovsky]

 sd/source/ui/view/Outliner.cxx |   11 +++
 sd/source/ui/view/drviews1.cxx |6 --
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit a1187a329ea735bf584f67a2f568e64676f8ae23
Author: Jan Holesovsky 
Date:   Thu May 28 12:12:37 2015 +0200

sd: Notify about the part change (when searching) only once.

Change-Id: Iae0e3fa0ec86898f17bc4b595075c3a2384ecfb2

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 60873d0..da24d0e 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -717,6 +717,17 @@ bool Outliner::SearchAndReplaceOnce()
 
 mpDrawDocument->GetDocSh()->SetWaitCursor( false );
 
+// notify LibreOfficeKit about changed page
+if (pViewShell && pViewShell->GetDoc()->isTiledRendering() &&
+mbStringFound && pViewShell->ISA(DrawViewShell))
+{
+::boost::shared_ptr 
pDrawViewShell(::boost::dynamic_pointer_cast(pViewShell));
+
+sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId();
+OString aPayload = OString::number(nSelectedPage);
+pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
+
 return mbEndOfSearch;
 }
 
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 74a77c4..9aa19da 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -81,7 +81,6 @@
 
 #include 
 #include 
-#include 
 
 using namespace com::sun::star;
 
@@ -1099,11 +1098,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
 mpDrawView->AdjustMarkHdl();
 }
 
-if (bOK)
-{
-OString aPayload = OString::number(nSelectedPage);
-GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
-}
 return bOK;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sc/source/ui/condformat/condformatdlgentry.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0b52089c1d88a5223981d8c177b3044d53eff700
Author: Philippe Jung 
Date:   Wed May 27 15:33:23 2015 +0200

Bug 91489 - CONDITIONAL FORMATTING: Crash on select Icon Set from dialog

Removed the recalcAll line in IMPL_LINK_NOARG( ScIconSetFrmtEntry, 
IconSetTypeHdl )

1) ScCondFormatList already calls RecalcAll on selection new/changed
2) Without this line, it does not crash

Change-Id: I8aa45f691d33d8ad046a88e7695913e2ccff3caf
Reviewed-on: https://gerrit.libreoffice.org/15928
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 8c4ddb1..b48a82b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1598,7 +1598,6 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
 maEntries[0]->SetFirstEntry();
 
 SetHeight();
-static_cast(GetParent())->RecalcAll();
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Caolán McNamara]

 sc/source/ui/drawfunc/futext.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit ad90d924ad5b29cd2209ef8b9217ae9377f85870
Author: Caolán McNamara 
Date:   Thu May 28 12:26:09 2015 +0100

Resolves: tdf#90960 toggle out of paste-mode on editing an object

otherwise pressing return in the object goes to the
sheet and attempts to paste over the current cell

reproduce with insert->comment in A1, insert some text and
click in e.g. A5, ctrl c, right click on A1 and show comment,
double click on comment to edit, go to end of text and
press enter, either "bad things happen" if a11y is enabled
, or "nothing happens" instead of a new line appearing in
the object

Change-Id: Ie44851cf3394652e1a60eecb59a999889094b3c5
(cherry picked from commit 7b75dc8ccca61988392779d4c61eef15f1211c16)

diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 17d5095..4f6a1c8 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -725,6 +725,12 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* 
pMousePixel,
 //!??   ohne uebergebenen Outliner stimmen die Defaults nicht 
???!?
 if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) )
 {
+//  Toggle out of paste mode if we are in it, otherwise
+//  pressing return in this object will instead go to the
+//  sheet and be considered an overwrite-cell instruction
+pViewShell->GetViewData().SetPasteMode(SC_PASTE_NONE);
+pViewShell->UpdateCopySourceOverlay();
+
 //  EditEngine-UndoManager anmelden
 pViewShell->SetDrawTextUndo( &pO->GetUndoManager() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 i18npool/qa/cppunit/test_breakiterator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 788b778d168f5de13479eb9a83369810a06232fb
Author: Caolán McNamara 
Date:   Thu May 28 13:02:18 2015 +0100

sal_Int32 as long strikes again

Change-Id: I26abf6d0e102712f76977e0763c4a672434a1325

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index a2820d2..6e758f6 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -809,7 +809,7 @@ void TestBreakIterator::testLao()
 i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
 i18n::WordType::DICTIONARY_WORD, true);
 
-CPPUNIT_ASSERT_EQUAL(0, aBounds.startPos);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aBounds.startPos);
 //TODO: Expected: 5 | Actual : 12
 //CPPUNIT_ASSERT_EQUAL(5, aBounds.endPos);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/drawfunc/futext.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 7b75dc8ccca61988392779d4c61eef15f1211c16
Author: Caolán McNamara 
Date:   Thu May 28 12:26:09 2015 +0100

Resolves: tdf#90960 toggle out of paste-mode on editing an object

otherwise pressing return in the object goes to the
sheet and attempts to paste over the current cell

reproduce with insert->comment in A1, insert some text and
click in e.g. A5, ctrl c, right click on A1 and show comment,
double click on comment to edit, go to end of text and
press enter, either "bad things happen" if a11y is enabled
, or "nothing happens" instead of a new line appearing in
the object

Change-Id: Ie44851cf3394652e1a60eecb59a999889094b3c5

diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 4bec72d..7b72133 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -725,6 +725,12 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* 
pMousePixel,
 //!??   ohne uebergebenen Outliner stimmen die Defaults nicht 
???!?
 if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) )
 {
+//  Toggle out of paste mode if we are in it, otherwise
+//  pressing return in this object will instead go to the
+//  sheet and be considered an overwrite-cell instruction
+pViewShell->GetViewData().SetPasteMode(SC_PASTE_NONE);
+pViewShell->UpdateCopySourceOverlay();
+
 //  EditEngine-UndoManager anmelden
 pViewShell->SetDrawTextUndo( &pO->GetUndoManager() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Ostrovsky]

 i18npool/qa/cppunit/test_breakiterator.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 452a06b70578eb83067c6c744cd97eebafc4003c
Author: David Ostrovsky 
Date:   Thu May 28 13:49:27 2015 +0200

Activate unit test for Lao breakiterator support

In f24fa8efad247bdc296e4724b914f73f01ef2d0b added unit test wasn't
activated. Activating it now reveals that the test is failing. Add
TODOs for the failing asserts.

Change-Id: I6c9f36be3aa84a5d5092d2a3f576af39a15b935e

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index be4dd6d..a2820d2 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -52,6 +52,7 @@ public:
 CPPUNIT_TEST(testWeak);
 CPPUNIT_TEST(testAsian);
 CPPUNIT_TEST(testThai);
+CPPUNIT_TEST(testLao);
 #ifdef TODO
 CPPUNIT_TEST(testNorthernThai);
 #endif
@@ -808,13 +809,17 @@ void TestBreakIterator::testLao()
 i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
 i18n::WordType::DICTIONARY_WORD, true);
 
-CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 5);
+CPPUNIT_ASSERT_EQUAL(0, aBounds.startPos);
+//TODO: Expected: 5 | Actual : 12
+//CPPUNIT_ASSERT_EQUAL(5, aBounds.endPos);
 
 aBounds = m_xBreak->getWordBoundary(aTest, aBounds.endPos, aLocale,
 i18n::WordType::DICTIONARY_WORD, true);
 
-CPPUNIT_ASSERT(aBounds.startPos == 5 && aBounds.endPos == 9);
-
+//TODO: Expected: 5 | Actual : 12
+//CPPUNIT_ASSERT_EQUAL(5, aBounds.startPos);
+//TODO: Expected: 9 | Actual : 12
+//CPPUNIT_ASSERT_EQUAL(9, aBounds.endPos);
 }
 
 //A test to ensure that our thai word boundary detection is useful
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 solenv/gbuild/CppunitTest.mk |1 +
 solenv/gbuild/platform/unxgcc.mk |1 +
 2 files changed, 2 insertions(+)

New commits:
commit cb27eb7811d7ebf92ac9b28509387cc4bffca7f1
Author: Michael Meeks 
Date:   Thu May 28 09:47:46 2015 +0100

More aggressive system malloc memory checking for linux unit tests.

Change-Id: If8e70dc25c537fcf12de0853d91c30f0e6f92e31
Reviewed-on: https://gerrit.libreoffice.org/15940
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 021ecc8..22c91c2 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -97,6 +97,7 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_RUNTIMEDEPS)
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(HEADLESS),,VCL_HIDE_WINDOWS=1) \
+   $(gb_CppunitTest_malloc_check) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index bf10e99..41bdef0 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -258,6 +258,7 @@ gb_CppunitTest_CPPTESTPRECOMMAND := \
 $(call 
gb_Helper_extend_ld_path,$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = libtest_$(1).so
 gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
+gb_CppunitTest_malloc_check := MALLOC_CHECK_=2 MALLOC_PERTURB_=153
 
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call 
gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,NONE))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 canvas/source/directx/dx_9rm.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e23bced878c2e7a5b1a7d3dcbb931ba8b6b58d09
Author: Noel Grandin 
Date:   Thu May 28 13:08:28 2015 +0200

fix Windows build

Change-Id: I5f0489e2fe8fc08461b3409de2690988826ed334

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 6d4157b..dbd2601 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -673,10 +673,7 @@ namespace dxcanvas
 mpWindow->SetMouseTransparent( TRUE );
 
 // parent should receive paint messages as well
-// [ParentClipMode::NoClip], the argument is here
-// passed as plain numeric value since the stupid
-// define utilizes a USHORT cast.
-mpWindow->SetParentClipMode(0x0002);
+mpWindow->SetParentClipMode(ParentClipMode::NoClip);
 
 // the system child window must not clear its background
 mpWindow->EnableEraseBackground( sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/vcl/window.hxx   |2 +-
 svx/source/accessibility/AccessibleFrameSelector.cxx |2 +-
 vcl/source/control/edit.cxx  |2 +-
 vcl/source/window/dlgctrl.cxx|8 
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b406664c0c3f9c8a383e47c7eb045657cd3fdd83
Author: Noel Grandin 
Date:   Thu May 28 13:01:56 2015 +0200

GetFocusFlags::Cursor->GetFocusFlags::CURSOR

to avoid name-clash with X11 headers

Change-Id: I727c523f6d9bd7d4db28fe7427e053903626be00

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 9f9f73d..0aa057d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -362,7 +362,7 @@ enum class GetFocusFlags
 {
 NONE   = 0x,
 Tab= 0x0001,
-Cursor = 0x0002,
+CURSOR = 0x0002, // avoid name-clash with X11 #define
 Mnemonic   = 0x0004,
 F6 = 0x0008,
 Forward= 0x0010,
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx 
b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 2227951..1a22ae6 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -468,7 +468,7 @@ voidAccFrameSelector::NotifyFocusListeners(bool 
bGetFocus)
 GetFocusFlags nFocusFlags = mpFrameSel->GetGetFocusFlags();
 if(nFocusFlags & GetFocusFlags::Tab)
 aEvent.FocusFlags |= AwtFocusChangeReason::TAB;
-if(nFocusFlags & GetFocusFlags::Cursor)
+if(nFocusFlags & GetFocusFlags::CURSOR)
 aEvent.FocusFlags |= AwtFocusChangeReason::CURSOR;
 if(nFocusFlags & GetFocusFlags::Mnemonic)
 aEvent.FocusFlags |= AwtFocusChangeReason::MNEMONIC;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 05eb605..51982fc 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1901,7 +1901,7 @@ void Edit::GetFocus()
 
 SelectionOptions nSelOptions = 
GetSettings().GetStyleSettings().GetSelectionOptions();
 if ( !( GetStyle() & (WB_NOHIDESELECTION|WB_READONLY) )
-&& ( GetGetFocusFlags() & 
(GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::Cursor|GetFocusFlags::Mnemonic)
 ) )
+&& ( GetGetFocusFlags() & 
(GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::CURSOR|GetFocusFlags::Mnemonic)
 ) )
 {
 if ( nSelOptions & SelectionOptions::ShowFirst )
 {
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 5cd0706..3039e78 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -543,7 +543,7 @@ namespace
 
 if (isSuitableDestination(pWindow))
 {
-pWindow->ImplControlFocus( GetFocusFlags::Cursor | 
GetFocusFlags::Forward );
+pWindow->ImplControlFocus( GetFocusFlags::CURSOR | 
GetFocusFlags::Forward );
 return true;
 }
 }
@@ -554,7 +554,7 @@ namespace
 
 if (isSuitableDestination(pWindow))
 {
-pWindow->ImplControlFocus( GetFocusFlags::Cursor | 
GetFocusFlags::Forward );
+pWindow->ImplControlFocus( GetFocusFlags::CURSOR | 
GetFocusFlags::Forward );
 return true;
 }
 }
@@ -868,7 +868,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool 
bKeyInput )
 if (isSuitableDestination(pWindow))
 {
 if ( pWindow != pSWindow )
-pWindow->ImplControlFocus( 
GetFocusFlags::Cursor | GetFocusFlags::Backward );
+pWindow->ImplControlFocus( 
GetFocusFlags::CURSOR | GetFocusFlags::Backward );
 return true;
 }
 
@@ -898,7 +898,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool 
bKeyInput )
 
 if (isSuitableDestination(pWindow))
 {
-pWindow->ImplControlFocus( GetFocusFlags::Cursor | 
GetFocusFlags::Backward );
+pWindow->ImplControlFocus( GetFocusFlags::CURSOR | 
GetFocusFlags::Backward );
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 readlicense_oo/license/LICENSE  |   31 
 readlicense_oo/license/LICENSE.fodt | 1480 +---
 readlicense_oo/license/LICENSE.html |   58 -
 readlicense_oo/license/NOTICE   |8 
 4 files changed, 774 insertions(+), 803 deletions(-)

New commits:
commit 6b35c59f3727e1e79cb7206dc2cd576161f38e8c
Author: Caolán McNamara 
Date:   Fri May 22 10:23:49 2015 +0100

bsh-2.0b5 is under the APL, adjust readlicense_oo and include notice

edit fodt first with writer, and export to xhtml for the html

(adjusted the .txt file manually)

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

diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index 862d5c9..a01c59d 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -79,36 +79,7 @@ beanshell
The following software may be included in this product: beanshell. Use
of any of this software is governed by the terms of the license below:
 
-   This file is part of the BeanShell Java Scripting distribution.
-   Documentation and updates may be found at http://www.beanshell.org/
-
-   Sun Public License Notice:
-
-   The contents of this file are subject to the Sun Public License Version
-   1.0 (the "License"); you may not use this file except in compliance
-   with the License. A copy of the License is available at
-   http://www.sun.com
-
-   The Original Code is BeanShell. The Initial Developer of the Original
-   Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright
-   (C) 2000. All Rights Reserved.
-
-   GNU Public License Notice:
-
-   Alternatively, the contents of this file may be used under the terms of
-   the GNU Lesser General Public License (the "LGPL"), in which case the
-   provisions of LGPL are applicable instead of those above. If you wish
-   to allow use of your version of this file only under the terms of the
-   LGPL and not to allow others to use your version of this file under the
-   SPL, indicate your decision by deleting the provisions above and
-   replace them with the notice and other provisions required by the LGPL.
-   If you do not delete the provisions above, a recipient may use your
-   version of this file under either the SPL or the LGPL.
-
-   Patrick Niemeyer (p...@pat.net) Author of Learning Java, O'Reilly &
-   Associates http://www.pat.net/~pat/
-
-   See LGPL Version 3 below
+   See Apache License Version 2.0 below
 
 C++ Boost Library
 
diff --git a/readlicense_oo/license/LICENSE.fodt 
b/readlicense_oo/license/LICENSE.fodt
index 728f7f7..c1530fe 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- 
2011-05-11T11:39:17.792015-01-12T14:53:31.375949809P6DT2H14M29S252LibreOfficeDev/4.5.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/226e367ff93542d82975d6ccd34448f68acf8035LicenseGPLLGPLMPLApacheCCLibreOffice
 Licensing and Legal informationLicensing and Legal 
informationTor 
Lillqvist
+ 
2011-05-11T11:39:17.792015-05-22T10:18:42.401712240P6DT2H16M14S25

[Libreoffice-commits] core.git: accessibility/source basegfx/source compilerplugins/clang l10ntools/source registry/source shell/source sot/source svl/source tools/source UnoControls/source unoidl/sou

[Noel Grandin]

 UnoControls/source/controls/progressbar.cxx   |4 
 accessibility/source/extended/accessibletabbar.cxx|4 
 accessibility/source/extended/accessibletabbarpagelist.cxx|6 
 accessibility/source/extended/textwindowaccessibility.cxx |2 
 accessibility/source/standard/accessiblemenubasecomponent.cxx |8 
 accessibility/source/standard/vclxaccessiblestatusbar.cxx |6 
 accessibility/source/standard/vclxaccessibletabcontrol.cxx|6 
 basegfx/source/polygon/b2dpolygoncutandtouch.cxx  |2 
 basegfx/source/polygon/b2dpolypolygon.cxx |4 
 basegfx/source/polygon/b2dpolypolygoncutter.cxx   |4 
 basegfx/source/polygon/b2dtrapezoid.cxx   |2 
 basegfx/source/polygon/b3dpolypolygon.cxx |   12 -
 compilerplugins/clang/loopvartoosmall.cxx |  119 ++
 l10ntools/source/cfgmerge.cxx |2 
 l10ntools/source/export.cxx   |8 
 l10ntools/source/propmerge.cxx|4 
 l10ntools/source/xrmmerge.cxx |4 
 registry/source/regimpl.cxx   |4 
 shell/source/unix/sysshell/recently_used_file_handler.cxx |2 
 sot/source/sdstor/stgstrms.cxx|6 
 sot/source/unoolestorage/xolesimplestorage.cxx|2 
 svl/source/items/aeitem.cxx   |2 
 svl/source/items/ilstitem.cxx |2 
 svl/source/items/itempool.cxx |2 
 svl/source/notify/lstner.cxx  |4 
 tools/source/stream/stream.cxx|2 
 unoidl/source/legacyprovider.cxx  |6 
 unotools/source/config/searchopt.cxx  |4 
 vcl/generic/print/prtsetup.cxx|2 
 vcl/source/bitmap/BitmapFilterStackBlur.cxx   |4 
 vcl/source/bitmap/bitmapscalesuper.cxx|   20 -
 vcl/source/control/edit.cxx   |2 
 vcl/source/edit/textdata.cxx  |4 
 vcl/source/edit/texteng.cxx   |   12 -
 vcl/source/filter/wmf/winmtf.cxx  |2 
 vcl/source/filter/wmf/winwmf.cxx  |4 
 vcl/source/filter/wmf/wmfwr.cxx   |4 
 vcl/source/gdi/bitmap.cxx |4 
 vcl/source/gdi/bitmap4.cxx|8 
 vcl/source/gdi/bitmapex.cxx   |4 
 vcl/source/gdi/image.cxx  |   10 
 vcl/source/gdi/pdfwriter_impl.cxx |   16 -
 vcl/source/gdi/pngread.cxx|   28 +-
 vcl/source/gdi/pngwrite.cxx   |2 
 vcl/source/gdi/print.cxx  |6 
 vcl/source/gdi/region.cxx |4 
 vcl/source/opengl/OpenGLHelper.cxx|4 
 vcl/source/outdev/text.cxx|2 
 vcl/source/window/splitwin.cxx|6 
 vcl/unx/generic/gdi/x11windowprovider.cxx |2 
 50 files changed, 251 insertions(+), 132 deletions(-)

New commits:
commit d5129a9dd68978f9eccdd4597b5b6834557c422a
Author: Noel Grandin 
Date:   Wed May 27 16:33:44 2015 +0200

new clang plugin: loopvartoosmall

Idea from bubli - look for loops where the index variable is of such
size that it cannot cover the range revealed by examining the length
part of the condition.

So far, I have only run the plugin up till the VCL module.

Also the plugin deliberately excludes anything more complicated than a
straightforward incrementing for loop.

Change-Id: Ifced18b01c03ea537c64168465ce0b8287a42015

diff --git a/UnoControls/source/controls/progressbar.cxx 
b/UnoControls/source/controls/progressbar.cxx
index 6ff24be..f5dd914 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -352,7 +352,7 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, 
const Reference< XGra
 // Step to left side of window
 nBlockStart = nX;
 
-for ( sal_Int16 i=1; i<=nBlockCount; ++i )
+for ( sal_Int32 i=1; i<=nBlockCount; ++i )
 {
 // step free field
 nBlockStart +=  PROGRESSBAR_FREESPACE;
@@ -370,7 +370,7 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, 
const Reference< XGra
 nBlockStart  =  nY+impl_getHeight();

[Libreoffice-commits] core.git: 5 commits - avmedia/source canvas/source cui/source include/svtools include/vcl reportdesign/source sc/source sd/source sfx2/source slideshow/source svtools/source svx/

[Noel Grandin]

 avmedia/source/framework/mediacontrol.cxx|2 
 canvas/source/directx/dx_9rm.cxx |2 
 cui/source/dialogs/iconcdlg.cxx  |4 
 cui/source/options/optcolor.cxx  |2 
 include/svtools/editbrowsebox.hxx|2 
 include/vcl/button.hxx   |2 
 include/vcl/window.hxx   |  107 +--
 reportdesign/source/ui/report/EndMarker.cxx  |2 
 reportdesign/source/ui/report/ReportSection.cxx  |2 
 reportdesign/source/ui/report/SectionWindow.cxx  |2 
 reportdesign/source/ui/report/StartMarker.cxx|2 
 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx   |2 
 sc/source/ui/dbgui/csvgrid.cxx   |2 
 sc/source/ui/dbgui/csvruler.cxx  |2 
 sc/source/ui/view/preview.cxx|4 
 sd/source/ui/presenter/PresenterHelper.cxx   |4 
 sfx2/source/dialog/backingwindow.cxx |6 -
 slideshow/source/engine/shapes/viewmediashape.cxx|2 
 svtools/source/brwbox/editbrowsebox.cxx  |   10 -
 svtools/source/brwbox/editbrowsebox2.cxx |8 -
 svtools/source/contnr/imivctl1.cxx   |   12 +-
 svtools/source/control/calendar.cxx  |2 
 svtools/source/control/valueset.cxx  |2 
 svx/source/accessibility/AccessibleFrameSelector.cxx |   16 +-
 svx/source/fmcomp/gridcell.cxx   |2 
 sw/source/ui/dbui/createaddresslistdialog.cxx|2 
 sw/source/ui/dbui/mmaddressblockpage.cxx |2 
 sw/source/ui/index/cnttab.cxx|2 
 toolkit/source/awt/vclxtoolkit.cxx   |3 
 toolkit/source/awt/vclxwindow.cxx|4 
 vcl/inc/svdata.hxx   |4 
 vcl/inc/window.h |6 -
 vcl/source/app/help.cxx  |2 
 vcl/source/control/button.cxx|   22 +--
 vcl/source/control/edit.cxx  |4 
 vcl/source/control/fixed.cxx |   16 +-
 vcl/source/control/group.cxx |4 
 vcl/source/control/ilstbox.cxx   |4 
 vcl/source/control/prgsbar.cxx   |2 
 vcl/source/control/scrbar.cxx|   12 +-
 vcl/source/control/slider.cxx|   13 +-
 vcl/source/control/tabctrl.cxx   |6 -
 vcl/source/opengl/OpenGLContext.cxx  |6 -
 vcl/source/window/clipping.cxx   |   16 +-
 vcl/source/window/cursor.cxx |6 -
 vcl/source/window/dialog.cxx |2 
 vcl/source/window/dlgctrl.cxx|   46 
 vcl/source/window/dockmgr.cxx|4 
 vcl/source/window/dockwin.cxx|2 
 vcl/source/window/menubarwindow.cxx  |6 -
 vcl/source/window/mouse.cxx  |   10 -
 vcl/source/window/paint.cxx  |2 
 vcl/source/window/scrwnd.cxx |   18 +--
 vcl/source/window/stacking.cxx   |2 
 vcl/source/window/syschild.cxx   |2 
 vcl/source/window/tabpage.cxx|4 
 vcl/source/window/taskpanelist.cxx   |6 -
 vcl/source/window/toolbox.cxx|   28 ++--
 vcl/source/window/window.cxx |8 -
 vcl/source/window/window2.cxx|   36 +++---
 vcl/source/window/winproc.cxx|8 -
 61 files changed, 282 insertions(+), 241 deletions(-)

New commits:
commit f3331f7694e74f349375c223ce7ed84838e92d89
Author: Noel Grandin 
Date:   Wed May 27 16:09:43 2015 +0200

convert PARENTCLIPMODE constants to scoped enum

Change-Id: I36a53112e75fca9208b2f91e224a7c671695509b

diff --git a/avmedia/source/framework/mediacontrol.cxx 
b/avmedia/source/framework/mediacontrol.cxx
index 4c019e5..4a33e59 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -79,7 +79,7 @@ MediaControl::MediaControl( vcl::Window* pParent, 
MediaControlStyle eControlStyl
 
 SetBackground();
 SetPaintTransparent( true );
-SetParentClipMode( PARENTCLIPMODE_NOCLIP );
+SetParentClipMode( ParentClipMode::NoClip );
 
 if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
 {
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index ba03c53..6d4157b 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -673,7 +673,7 @@ namespace dxcanvas
 mpWindow->SetMouseTransparent( TRUE );
 
 // parent s

[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - 32 commits - basic/inc basic/source dictionaries drawinglayer/source editeng/source filter/source .gitignore i18npool/source icon-th

[Miklos Vajna]

 .gitignore|3 
 basic/inc/pch/precompiled_sb.hxx  |2 
 basic/source/runtime/methods.cxx  |   46 
 dev/null  |binary
 dictionaries  |2 
 drawinglayer/source/attribute/fillgradientattribute.cxx   |4 
 drawinglayer/source/attribute/fillgraphicattribute.cxx|4 
 drawinglayer/source/attribute/fillhatchattribute.cxx  |4 
 drawinglayer/source/attribute/lineattribute.cxx   |4 
 drawinglayer/source/attribute/linestartendattribute.cxx   |4 
 drawinglayer/source/attribute/sdrfillattribute.cxx|4 
 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx |4 
 drawinglayer/source/attribute/sdrlightingattribute3d.cxx  |4 
 drawinglayer/source/attribute/sdrlineattribute.cxx|4 
 drawinglayer/source/attribute/sdrlinestartendattribute.cxx|4 
 drawinglayer/source/attribute/sdrsceneattribute3d.cxx |4 
 drawinglayer/source/attribute/sdrshadowattribute.cxx  |4 
 drawinglayer/source/attribute/strokeattribute.cxx |4 
 editeng/source/items/flditem.cxx  |2 
 editeng/source/uno/unofield.cxx   |9 
 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |   13 
 i18npool/source/breakiterator/breakiterator_th.cxx|   10 
 icon-themes/galaxy/res/helpimg/rechenlt.png   |binary
 include/editeng/flditem.hxx   |2 
 include/xmloff/txtimp.hxx |1 
 include/xmloff/xmltoken.hxx   |1 
 offapi/com/sun/star/text/textfield/Type.idl   |2 
 readlicense_oo/license/CREDITS.fodt   | 2784 +-
 sc/source/ui/view/gridwin4.cxx|   10 
 sd/source/ui/app/sdmod2.cxx   |6 
 sd/source/ui/app/strings.src  |   10 
 sd/source/ui/inc/strings.hrc  |2 
 sd/source/ui/unoidl/unomodel.cxx  |6 
 sw/CppunitTest_sw_rtfexport.mk|   31 
 sw/inc/doc.hxx|5 
 sw/inc/frmfmt.hxx |   23 
 sw/inc/node.hxx   |9 
 sw/qa/extras/htmlexport/data/tdf90905.odt |binary
 sw/qa/extras/htmlexport/htmlexport.cxx|9 
 sw/qa/extras/inc/swmodeltestbase.hxx  |6 
 sw/qa/extras/odfimport/odfimport.cxx  |2 
 sw/qa/extras/ooxmlexport/data/hyperlink-field.odt |binary
 sw/qa/extras/ooxmlexport/data/tdf91261.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   19 
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |8 
 sw/qa/extras/rtfexport/data/tdf90421.fodt |8 
 sw/qa/extras/rtfexport/rtfexport.cxx  |   23 
 sw/qa/extras/rtfimport/data/tdf91074.rtf  |7 
 sw/qa/extras/rtfimport/rtfimport.cxx  |7 
 sw/source/core/doc/DocumentRedlineManager.cxx |2 
 sw/source/core/doc/docbm.cxx  |2 
 sw/source/core/doc/doclay.cxx |   18 
 sw/source/core/doc/docnew.cxx |2 
 sw/source/core/docnode/node.cxx   |   47 
 sw/source/core/docnode/nodes.cxx  |   76 
 sw/source/core/layout/atrfrm.cxx  |   51 
 sw/source/core/layout/frmtool.cxx |9 
 sw/source/core/txtnode/ndtxt.cxx  |8 
 sw/source/core/undo/undoflystrattr.cxx|1 
 sw/source/core/unocore/unoflatpara.cxx|   10 
 sw/source/core/unocore/unoframe.cxx   |   21 
 sw/source/filter/html/wrthtml.cxx |8 
 sw/source/filter/ww8/docxattributeoutput.cxx  |   10 
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   74 
 sw/source/filter/ww8/rtfattributeoutput.hxx   |3 
 sw/source/ui/fldui/fldref.cxx |5 
 vcl/generic/glyphs/gcach_layout.cxx   |6 
 vcl/source/gdi/mapmod.cxx |8 
 vcl/source/outdev/font.cxx|5 
 vcl/source/outdev/map.cxx |1 
 vcl/source/window/

[Libreoffice-commits] online.git: 4 commits - loolwsd/LoadTest.cpp loolwsd/LOOLSession.cpp loolwsd/TileCache.cpp loolwsd/TileCache.hpp

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp |   18 ---
 loolwsd/LoadTest.cpp|   15 -
 loolwsd/TileCache.cpp   |   78 
 loolwsd/TileCache.hpp   |5 +++
 4 files changed, 110 insertions(+), 6 deletions(-)

New commits:
commit d6bd6ca14000cb734a2bb858d3801a77b6160400
Author: Tor Lillqvist 
Date:   Thu May 28 13:23:25 2015 +0300

Handle nextmessage: here, too

Otherwise loadtest crashes on big tiles.

diff --git a/loolwsd/LoadTest.cpp b/loolwsd/LoadTest.cpp
index 6996c72..bac83bd 100644
--- a/loolwsd/LoadTest.cpp
+++ b/loolwsd/LoadTest.cpp
@@ -28,7 +28,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -58,6 +58,7 @@ using Poco::Net::TCPServerConnection;
 using Poco::Net::WebSocket;
 using Poco::Net::WebSocketException;
 using Poco::Runnable;
+using Poco::StringTokenizer;
 using Poco::Thread;
 using Poco::Timespan;
 using Poco::Timestamp;
@@ -101,6 +102,18 @@ public:
 std::endl;
 #endif
 std::string response = getFirstLine(buffer, n);
+StringTokenizer tokens(response, " ", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+
+int size;
+if (tokens.count() == 2 && tokens[0] == "nextmessage:" && 
getTokenInteger(tokens[1], "size", size) && size > 0)
+{
+char largeBuffer[size];
+
+n = _ws.receiveFrame(largeBuffer, size, flags);
+// We don't actually need to do anything with the 
buffer in this program. We
+// only parse status: messages and they are not 
preceded by nextmessage:
+// messages.
+}
 if (response.find("status:") == 0)
 {
 parseStatus(response, _type, _numParts, _currentPart, 
_width, _height);
commit 13645eb76970f1628a394199c0d7dd1244520d59
Author: Tor Lillqvist 
Date:   Thu May 28 12:59:11 2015 +0300

There should be whitespace after the message keyword and colon

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 1903128..f5f7e36 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -742,7 +742,7 @@ extern "C"
 srv->sendTextFrame("searchnotfound: " + std::string(pPayload));
 break;
 case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
-srv->sendTextFrame("documentsizechanged:" + std::string(pPayload));
+srv->sendTextFrame("documentsizechanged: " + 
std::string(pPayload));
 break;
 case LOK_CALLBACK_SET_PART:
 srv->sendTextFrame("setpart: " + std::string(pPayload));
commit cedee8f1a931436872a6aafd74a375bd9f0d0be3
Author: Tor Lillqvist 
Date:   Thu May 28 12:58:08 2015 +0300

Log the input to MasterProcessSession::handleInput() earlier

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index d33ac13..1903128 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -124,7 +124,7 @@ MasterProcessSession::~MasterProcessSession()
 
 bool MasterProcessSession::handleInput(char *buffer, int length)
 {
-Application& app = Application::instance();
+Application::instance().logger().information(Util::logPrefix() + "Input: " 
+ getAbbreviatedMessage(buffer, length));
 
 std::string firstLine = getFirstLine(buffer, length);
 StringTokenizer tokens(firstLine, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
@@ -175,8 +175,6 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 return true;
 }
 
-app.logger().information(Util::logPrefix() + "Input: " + 
getAbbreviatedMessage(buffer, length));
-
 if (tokens[0] == "child")
 {
 if (_kind != Kind::ToPrisoner)
commit 009241447054156720d8f5df7ef37241fd0784c6
Author: Tor Lillqvist 
Date:   Thu May 28 12:53:14 2015 +0300

Handle LOK_CALLBACK_DOCUMENT_SIZE_CHANGED callbacks more cleverly

When a child process sends a documentsizechanged: message to the parent, to 
be
forwarded to the client, parse it and update a cached status of the 
doucment,
if available, and send an updated status: message to the client instead.

Note that clients should not rely on getting only status: messages and never
documentsizechanged: messages, though; the cache might be cleaned at any 
time
even while the server is running. If there is no cached status of the 
document
to update and re-use, we have to forward the documentsizechanged: message as
such to the client.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index ce273b7..d33ac13 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -134,7 +134,7 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 // Note that this handles both forwarding requests from the client to 
the c

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

[David Ostrovsky]

 connectivity/source/drivers/mozab/MStatement.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 46a985feca255abbebf826be6103ee8cc7f2cde1
Author: David Ostrovsky 
Date:   Thu May 28 12:11:23 2015 +0200

Fix memory leak

The same was done in mork driver [1] and mork driver was derived from
mozab driver.

[1] 317306710d8f7c16bd6b9edc1e0af7e0e757cbac

Change-Id: I64bc85819810707511a3cebd43802066cd94a727

diff --git a/connectivity/source/drivers/mozab/MStatement.cxx 
b/connectivity/source/drivers/mozab/MStatement.cxx
index 76f9896..637a2e2 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -102,6 +102,7 @@ void OCommonStatement::disposing()
 m_pConnection = NULL;
 
 m_pSQLIterator->dispose();
+delete m_pParseTree;
 
 dispose_ChildImpl();
 OCommonStatement_IBASE::disposing();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sd/source/ui/view/Outliner.cxx |   11 +++
 sd/source/ui/view/drviews1.cxx |6 --
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 90ffbdf7346364b096c5ada6415b8536d929670a
Author: Jan Holesovsky 
Date:   Thu May 28 12:12:37 2015 +0200

sd: Notify about the part change (when searching) only once.

Change-Id: Iae0e3fa0ec86898f17bc4b595075c3a2384ecfb2

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 60873d0..da24d0e 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -717,6 +717,17 @@ bool Outliner::SearchAndReplaceOnce()
 
 mpDrawDocument->GetDocSh()->SetWaitCursor( false );
 
+// notify LibreOfficeKit about changed page
+if (pViewShell && pViewShell->GetDoc()->isTiledRendering() &&
+mbStringFound && pViewShell->ISA(DrawViewShell))
+{
+::boost::shared_ptr 
pDrawViewShell(::boost::dynamic_pointer_cast(pViewShell));
+
+sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId();
+OString aPayload = OString::number(nSelectedPage);
+pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
+
 return mbEndOfSearch;
 }
 
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 74a77c4..9aa19da 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -81,7 +81,6 @@
 
 #include 
 #include 
-#include 
 
 using namespace com::sun::star;
 
@@ -1099,11 +1098,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
 mpDrawView->AdjustMarkHdl();
 }
 
-if (bOK)
-{
-OString aPayload = OString::number(nSelectedPage);
-GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
-}
 return bOK;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 dbaccess/source/ui/app/AppDetailView.cxx  |6 ++-
 dbaccess/source/ui/app/AppTitleWindow.cxx |   40 +++-
 dbaccess/source/ui/app/AppTitleWindow.hxx |2 +
 svtools/source/contnr/imivctl1.cxx|   58 +++---
 svtools/source/contnr/treelistbox.cxx |   12 --
 vcl/source/control/edit.cxx   |2 -
 vcl/source/control/lstbox.cxx |2 -
 vcl/source/window/paint.cxx   |7 +--
 8 files changed, 86 insertions(+), 43 deletions(-)

New commits:
commit 1afa39b1e9a4ce1cdab866a29a637283ed6792a9
Author: Tomaž Vajngerl 
Date:   Thu May 28 18:53:13 2015 +0900

fix calls to RenderContext

Change-Id: I5ef4b740a9c62d5cc7a2126686df4fd86a4b3492

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 15cf93d..6ff15da 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -551,7 +551,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, 
bool bLayout)
 rRenderContext.DrawRect(Rectangle(aPos, 
Size(GetOutputSizePixel().Width() - 2 * mnXOffset, 
GetOutputSizePixel().Height(;
 rRenderContext.Pop();
 
-SetTextFillColor(GetControlBackground());
+rRenderContext.SetTextFillColor(GetControlBackground());
 }
 else if (IsPaintTransparent() || ImplUseNativeBorder(rRenderContext, 
GetStyle()))
 rRenderContext.SetTextFillColor();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index a1ad0eb..6944518 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -555,7 +555,7 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt )
 if ( mpImplWin )
 {
 mpImplWin->SetSettings( GetSettings() ); // If not yet set...
-mpImplWin->ApplySettings(*this);
+mpImplWin->ApplySettings(*mpImplWin);
 
 mpBtn->SetSettings( GetSettings() );
 ImplInitDropDownButton( mpBtn );
commit 737a0de6fd06070d5eb11c6dd43bb51f9cc272da
Author: Tomaž Vajngerl 
Date:   Thu May 28 18:47:29 2015 +0900

tdf#91649 call ApplySettings at a more correct place

Change-Id: I84a620a845b9338cd830c8929346204e3d88003f

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a68d6bc..fd50a20 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -217,6 +217,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
 {
 // double-buffering
 SetupBuffer();
+m_pWindow->ApplySettings(*m_pBuffer.get());
 
 // temporarily decrease the mnOutOffX/Y of the buffer for the
 // subwidgets (because the m_pBuffer is our base here)
@@ -237,6 +238,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
 else
 {
 // direct painting
+m_pWindow->ApplySettings(*m_pWindow);
 m_pWindow->PushPaintHelper(this, *m_pWindow);
 m_pWindow->Paint(*m_pWindow, m_aPaintRect);
 }
@@ -505,11 +507,6 @@ namespace vcl {
 
 void Window::ImplCallPaint(const VclPtr& rBuffer, const 
vcl::Region* pRegion, sal_uInt16 nPaintFlags)
 {
-if (rBuffer)
-ApplySettings(*rBuffer.get());
-else
-ApplySettings(*this);
-
 // call PrePaint. PrePaint may add to the invalidate region as well as
 // other parameters used below.
 PrePaint(*this);
commit 8400e87a41b5613f2fcf27525b97b40f653a3178
Author: Tomaž Vajngerl 
Date:   Thu May 28 18:43:55 2015 +0900

fix highlight rendering for iconview with more effective clipping

Change-Id: I9d8f2341477b9b9c0acd71a7d33cd5a9a55757d2

diff --git a/svtools/source/contnr/imivctl1.cxx 
b/svtools/source/contnr/imivctl1.cxx
index 51ba7a4..07221d5 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -663,13 +663,8 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& 
rRenderContext, const Rec
 if (!nCount)
 return;
 
-bool bResetClipRegion = false;
-if (!rRenderContext.IsClipRegion())
-{
-vcl::Region const aOutputArea(GetOutputRect());
-bResetClipRegion = true;
-rRenderContext.SetClipRegion(aOutputArea);
-}
+rRenderContext.Push(PushFlags::CLIPREGION);
+rRenderContext.SetClipRegion(vcl::Region(rRect));
 
 SvxIconChoiceCtrlEntryList_impl* pNewZOrderList = new 
SvxIconChoiceCtrlEntryList_impl();
 boost::scoped_ptr pPaintedEntries(new 
SvxIconChoiceCtrlEntryList_impl());
@@ -701,15 +696,27 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& 
rRenderContext, const Rec
 }
 pPaintedEntries.reset();
 
-if (bResetClipRegion)
-rRenderContext.SetClipRegion();
+rRenderContext.Pop();
 }
 
-void SvxIconChoiceCtrl_Impl::RepaintEntries(SvxIconViewFlags 
/*nEntryFlagsMask*/)
+void SvxIconChoiceCtrl_Impl::RepaintEntries(SvxIconViewFlags nEntryFlagsMask)
 {
-pView->Invalidate();
-}
+const size_t nCoun

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf91074.rtf   |7 +++
 sw/qa/extras/rtfimport/rtfimport.cxx   |7 +++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 ++-
 writerfilter/source/rtftok/rtfsdrimport.cxx|   45 ++---
 writerfilter/source/rtftok/rtfsdrimport.hxx|2 +
 5 files changed, 47 insertions(+), 20 deletions(-)

New commits:
commit fe898641dd7f8ff3cc74804f01340fdade3e5ed7
Author: Miklos Vajna 
Date:   Mon May 11 09:05:12 2015 +0200

tdf#91074 RTF import: handle \dplineco* for text frames

RTFSdrImport::resolve() already had the logic to use the relevant API
depending on if the shape is a text frame or not -- extract that to a
separate member function and use it from RTFDocumentImpl::popState(),
too.

(cherry picked from commit ec1a96e79e3e6225706151cb72eb3df763b0598d)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfsdrimport.cxx
writerfilter/source/rtftok/rtfsdrimport.hxx

Change-Id: I663b372244f09f002447ece62587143b2a575795
Reviewed-on: https://gerrit.libreoffice.org/15939
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/rtfimport/data/tdf91074.rtf 
b/sw/qa/extras/rtfimport/data/tdf91074.rtf
new file mode 100644
index 000..ff3fe9b
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf91074.rtf
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\deff0\deftab720
+{\*\do\dobxpage\dobypage\dodhgt8192\dptxbx
+{\dptxbxtext\pard\plain
+inner\par }
+\dpx674\dpy725\dpxsize1875\dpysize1020\dplinecor255\dplinecog0\dplinecob0\dplinew40\dpfillfgcr0\dpfillfgcg0\dpfillfgcb0\dpfillbgcr0\dpfillbgcg0\dpfillbgcb0\dpfillpat0}
+\par
+outer\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 6c52362..535687f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2265,6 +2265,13 @@ DECLARE_RTFIMPORT_TEST(testTdf86182, "tdf86182.rtf")
 CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, 
getProperty(getParagraph(1), "WritingMode"));
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf91074, "tdf91074.rtf")
+{
+// The file failed to load, as the border color was imported using the 
LineColor UNO property.
+uno::Reference xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(static_cast(COL_LIGHTRED), 
getProperty(xShape, "TopBorder").Color);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ad9954b..b039ede 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5541,7 +5541,11 @@ int RTFDocumentImpl::popState()
 xShape->setSize(awt::Size(rDrawing.nRight, rDrawing.nBottom));
 
 if (rDrawing.bHasLineColor)
-xPropertySet->setPropertyValue("LineColor", 
uno::makeAny(sal_uInt32((rDrawing.nLineColorR<<16) + (rDrawing.nLineColorG<<8) 
+ rDrawing.nLineColorB)));
+{
+uno::Any aLineColor = 
uno::makeAny(sal_uInt32((rDrawing.nLineColorR<<16) + (rDrawing.nLineColorG<<8) 
+ rDrawing.nLineColorB));
+uno::Any aLineWidth;
+RTFSdrImport::resolveLineColorAndWidth(bTextFrame, 
xPropertySet, aLineColor, aLineWidth);
+}
 if (rDrawing.bHasFillColor)
 xPropertySet->setPropertyValue("FillColor", 
uno::makeAny(sal_uInt32((rDrawing.nFillColorR<<16) + (rDrawing.nFillColorG<<8) 
+ rDrawing.nFillColorB)));
 else if (!bTextFrame)
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 7969b0b..1ebaf46 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -128,6 +128,31 @@ void 
RTFSdrImport::resolveDhgt(uno::Reference const& xPrope
 pHelper->addItem(xPropertySet, nZOrder);
 }
 
+void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, const 
uno::Reference& xPropertySet, uno::Any& rLineColor, 
uno::Any& rLineWidth)
+{
+if (!bTextFrame)
+{
+xPropertySet->setPropertyValue("LineColor", rLineColor);
+xPropertySet->setPropertyValue("LineWidth", rLineWidth);
+}
+else
+{
+static const char* aBorders[] =
+{
+"TopBorder", "LeftBorder", "BottomBorder", "RightBorder"
+};
+for (unsigned int i = 0; i < SAL_N_ELEMENTS(aBorders); ++i)
+{
+table::BorderLine2 aBorderLine = 
xPropertySet->getPropertyValue(OUString::createFromAscii(aBorders[i])).get();
+if (rLineColor.hasValue())
+aBorderLine.Color = rLineColor.get();
+if (rLineWidth.hasValue())
+aBorderLine.LineWidth = rLineWidth.get();
+
xPropertySet->setPropertyValue(OUString::createFromAscii(aBorders[i]), 
uno::m

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

[Caolán McNamara]

 sw/source/ui/fldui/fldref.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 475edbbe446df3250b3d898b8e2cc4c380c60ece
Author: Caolán McNamara 
Date:   Wed May 27 17:24:13 2015 +0100

Resolves: tdf#91403 no wrtshell during initial layout

(cherry picked from commit ff44502d836880d2bdb057e7fdfd9b5abeb87842)

(cherry picked from commit cf851cda7c943548d0ce60d0b4836ccbf6e76698)

Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd
Reviewed-on: https://gerrit.libreoffice.org/15933
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 360c080c..1244308 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -183,9 +183,12 @@ void SwFldRefPage::Reset(const SfxItemSet* )
 
 // fill up with the sequence types
 SwWrtShell *pSh = GetWrtShell();
-if(!pSh)
+if (!pSh)
 pSh = ::GetActiveWrtShell();
 
+if (!pSh)
+return;
+
 const sal_uInt16 nFldTypeCnt = pSh->GetFldTypeCount(RES_SETEXPFLD);
 
 for (sal_uInt16 n = 0; n < nFldTypeCnt; ++n)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 29babc3958687a1515eb6f4bb3b61ca0e038a09d
Author: Caolán McNamara 
Date:   Wed May 27 16:20:34 2015 +0100

Resolves: tdf#89731 numberingChange feature not available in writer

Change-Id: Ie779e78fc3c7ccf717117513d9187697c22cc51a
(cherry picked from commit 0123bbbc4d07fd7d6c233f67139984ab3cd4555d)
Reviewed-on: https://gerrit.libreoffice.org/15932
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3e7e4af..040e228 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4700,8 +4700,10 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( const 
OUString& sAuthor )
 {
 if (!m_xAnnotationField.is())
 {
-assert( m_currentRedline.get());
-m_currentRedline->m_sAuthor = sAuthor;
+if (m_currentRedline.get())
+m_currentRedline->m_sAuthor = sAuthor;
+else
+SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
 }
 else
 m_xAnnotationField->setPropertyValue("Author", uno::makeAny(sAuthor));
@@ -4717,8 +4719,10 @@ void DomainMapper_Impl::SetCurrentRedlineDate( const 
OUString& sDate )
 {
 if (!m_xAnnotationField.is())
 {
-assert( m_currentRedline.get());
-m_currentRedline->m_sDate = sDate;
+if (m_currentRedline.get())
+m_currentRedline->m_sDate = sDate;
+else
+SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
 }
 else
 m_xAnnotationField->setPropertyValue("DateTimeValue", 
uno::makeAny(ConversionHelper::ConvertDateStringToDateTime(sDate)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - wizards/com

[Caolán McNamara]

 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1fa00ac892f1d8a0d326a5f2258f7d9c98735903
Author: Caolán McNamara 
Date:   Wed May 27 15:39:12 2015 +0100

wrong comparison in letter wizard

the file name widget is empty when it shouldn't be.
the other wizards get this right

Change-Id: Icdb629e676a73fcf8d8be4352818abbef455bbaf
(cherry picked from commit a3727ad62b7c1a30f9b0531042cce5ce5b8c6089)
Reviewed-on: https://gerrit.libreoffice.org/15931
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index d8598ff..f4a16e2 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -123,7 +123,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.myConfig.cp_PrivateLetter.cp_Salutation = \
 self.resources.SalutationLabels[2]
 
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 xContainerWindow = self.myLetterDoc.xFrame.ContainerWindow
@@ -256,7 +256,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.lstBusinessStyleItemChanged()
 self.enableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 def optPrivOfficialLetterItemChanged(self):
@@ -273,7 +273,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 self.myLetterDoc.fillSenderWithUserData()
 
@@ -291,7 +291,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(False)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 def optSenderPlaceholderItemChanged(self):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 4 commits - basctl/source basic/source canvas/source chart2/source cui/source dbaccess/source desktop/source extensions/source reportdesign/s

[Noel Grandin]

 basctl/source/basicide/baside2.cxx |6 +-
 basctl/source/basicide/baside3.cxx |2 
 basctl/source/basicide/basobj2.cxx |4 -
 basctl/source/basicide/bastypes.cxx|2 
 basctl/source/basicide/macrodlg.cxx|6 +-
 basctl/source/basicide/moduldl2.cxx|   28 ++---
 basctl/source/basicide/moduldlg.cxx|6 +-
 basic/source/runtime/iosys.cxx |4 -
 canvas/source/directx/dx_9rm.cxx   |   13 ++
 chart2/source/controller/dialogs/DataBrowser.cxx   |   11 -
 cui/source/dialogs/cuifmsearch.cxx |2 
 cui/source/dialogs/cuigaldlg.cxx   |2 
 cui/source/dialogs/insdlg.cxx  |8 +--
 cui/source/options/optdict.cxx |2 
 cui/source/options/optinet2.cxx|2 
 cui/source/options/optjava.cxx |4 -
 cui/source/tabpages/tparea.cxx |2 
 cui/source/tabpages/tpbitmap.cxx   |   16 +++
 cui/source/tabpages/tpcolor.cxx|   12 ++---
 cui/source/tabpages/tpgradnt.cxx   |   12 ++---
 cui/source/tabpages/tphatch.cxx|   12 ++---
 cui/source/tabpages/tplnedef.cxx   |   12 ++---
 cui/source/tabpages/tplneend.cxx   |   12 ++---
 dbaccess/source/ui/browser/brwctrlr.cxx|2 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx|2 
 dbaccess/source/ui/dlg/paramdialog.cxx |2 
 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx   |2 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 -
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |4 -
 extensions/source/abpilot/abspilot.cxx |2 
 extensions/source/update/ui/updatecheckui.cxx  |2 
 reportdesign/source/ui/report/ReportController.cxx |2 
 sc/source/ui/dbgui/dbnamdlg.cxx|2 
 sc/source/ui/dbgui/filtdlg.cxx |2 
 sc/source/ui/dbgui/sfiltdlg.cxx|2 
 sc/source/ui/dbgui/tpsort.cxx  |2 
 sc/source/ui/miscdlgs/crnrdlg.cxx  |4 -
 sc/source/ui/miscdlgs/instbdlg.cxx |2 
 sc/source/ui/miscdlgs/optsolver.cxx|2 
 sc/source/ui/miscdlgs/solvrdlg.cxx |2 
 sc/source/ui/miscdlgs/tabopdlg.cxx |2 
 sc/source/ui/pagedlg/areasdlg.cxx  |2 
 scripting/source/dlgprov/dlgevtatt.cxx |2 
 sd/source/ui/app/sdmod1.cxx|2 
 sd/source/ui/func/fuinsert.cxx |2 
 sd/source/ui/func/futhes.cxx   |4 -
 sfx2/source/appl/appserv.cxx   |2 
 sfx2/source/appl/lnkbase2.cxx  |2 
 sfx2/source/dialog/dinfdlg.cxx |2 
 sfx2/source/dialog/newstyle.cxx|2 
 sfx2/source/doc/objserv.cxx|   12 ++---
 sfx2/source/doc/templatedlg.cxx|   18 
 sfx2/source/view/viewprn.cxx   |8 +--
 starmath/source/view.cxx   |2 
 svtools/source/dialogs/restartdialog.cxx   |2 
 svtools/source/filter/SvFilterOptionsDialog.cxx|2 
 svx/source/dialog/hdft.cxx |4 -
 svx/source/dialog/imapdlg.cxx  |4 -
 svx/source/dialog/passwd.cxx   |4 -
 svx/source/form/fmshimp.cxx|4 -
 svx/source/gallery2/galbrws1.cxx   |2 
 svx/source/gallery2/galbrws2.cxx   |2 
 sw/source/core/crsr/viscrs.cxx |4 -
 sw/source/ui/chrdlg/break.cxx  |2 
 sw/source/ui/config/mailconfigpage.cxx |2 
 sw/source/ui/dbui/mmaddressblockpage.cxx   |2 
 sw/source/ui/dialog/uiregionsw.cxx |   10 ++--
 sw/source/ui/envelp/labfmt.cxx |2 
 sw/source/ui/misc/glossary.cxx |6 +-
 sw/source/ui/misc/srtdlg.cxx   |2 
 sw/source/ui/table/tabledlg.cxx|2 
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx   |2 
 sw/

[Libreoffice-commits] core.git: basctl/source basic/source cui/source dbaccess/source desktop/source extensions/source scripting/source sc/source sd/source sfx2/source starmath/source svtools/source s

[Philippe Jung]

 basctl/source/basicide/baside2.cxx |6 +-
 basctl/source/basicide/baside3.cxx |2 
 basctl/source/basicide/basobj2.cxx |4 -
 basctl/source/basicide/bastypes.cxx|2 
 basctl/source/basicide/macrodlg.cxx|6 +-
 basctl/source/basicide/moduldl2.cxx|   28 ++---
 basctl/source/basicide/moduldlg.cxx|6 +-
 basic/source/runtime/iosys.cxx |4 -
 cui/source/dialogs/cuifmsearch.cxx |2 
 cui/source/dialogs/cuigaldlg.cxx   |2 
 cui/source/dialogs/insdlg.cxx  |8 +--
 cui/source/options/optdict.cxx |2 
 cui/source/options/optinet2.cxx|2 
 cui/source/options/optjava.cxx |4 -
 cui/source/tabpages/tparea.cxx |2 
 cui/source/tabpages/tpbitmap.cxx   |   16 +++
 cui/source/tabpages/tpcolor.cxx|   12 ++---
 cui/source/tabpages/tpgradnt.cxx   |   12 ++---
 cui/source/tabpages/tphatch.cxx|   12 ++---
 cui/source/tabpages/tplnedef.cxx   |   12 ++---
 cui/source/tabpages/tplneend.cxx   |   12 ++---
 dbaccess/source/ui/browser/brwctrlr.cxx|2 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx|2 
 dbaccess/source/ui/dlg/paramdialog.cxx |2 
 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx   |2 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 -
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |4 -
 extensions/source/abpilot/abspilot.cxx |2 
 extensions/source/update/ui/updatecheckui.cxx  |2 
 sc/source/ui/dbgui/dbnamdlg.cxx|2 
 sc/source/ui/dbgui/filtdlg.cxx |2 
 sc/source/ui/dbgui/sfiltdlg.cxx|2 
 sc/source/ui/dbgui/tpsort.cxx  |2 
 sc/source/ui/miscdlgs/crnrdlg.cxx  |4 -
 sc/source/ui/miscdlgs/instbdlg.cxx |2 
 sc/source/ui/miscdlgs/optsolver.cxx|2 
 sc/source/ui/miscdlgs/solvrdlg.cxx |2 
 sc/source/ui/miscdlgs/tabopdlg.cxx |2 
 sc/source/ui/pagedlg/areasdlg.cxx  |2 
 scripting/source/dlgprov/dlgevtatt.cxx |2 
 sd/source/ui/app/sdmod1.cxx|2 
 sd/source/ui/func/fuinsert.cxx |2 
 sd/source/ui/func/futhes.cxx   |4 -
 sfx2/source/appl/appserv.cxx   |2 
 sfx2/source/appl/lnkbase2.cxx  |2 
 sfx2/source/dialog/dinfdlg.cxx |2 
 sfx2/source/dialog/newstyle.cxx|2 
 sfx2/source/doc/objserv.cxx|   12 ++---
 sfx2/source/doc/templatedlg.cxx|   18 
 sfx2/source/view/viewprn.cxx   |8 +--
 starmath/source/view.cxx   |2 
 svtools/source/dialogs/restartdialog.cxx   |2 
 svtools/source/filter/SvFilterOptionsDialog.cxx|2 
 svx/source/dialog/hdft.cxx |4 -
 svx/source/dialog/imapdlg.cxx  |4 -
 svx/source/dialog/passwd.cxx   |4 -
 svx/source/form/fmshimp.cxx|4 -
 svx/source/gallery2/galbrws1.cxx   |2 
 svx/source/gallery2/galbrws2.cxx   |2 
 sw/source/core/crsr/viscrs.cxx |4 -
 sw/source/ui/chrdlg/break.cxx  |2 
 sw/source/ui/config/mailconfigpage.cxx |2 
 sw/source/ui/dbui/mmaddressblockpage.cxx   |2 
 sw/source/ui/dialog/uiregionsw.cxx |   10 ++--
 sw/source/ui/envelp/labfmt.cxx |2 
 sw/source/ui/misc/glossary.cxx |6 +-
 sw/source/ui/misc/srtdlg.cxx   |2 
 sw/source/ui/table/tabledlg.cxx|2 
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx   |2 
 sw/source/uibase/dochdl/gloshdl.cxx|2 
 sw/source/uibase/dochdl/swdtflvr.cxx   |   10 ++--
 sw/source/uibase/docvw/SidebarTxtControl.cxx   |4 -
 sw/source

Re: Crash test update

[Caolán McNamara]

On Thu, 2015-05-28 at 03:17 +, Crashtest VM wrote:
> New crashtest update available at 
> http://dev-builds.libreoffice.org/crashtest/a67be04ba374a6e4f3c5abe4de2ab3cf86e7b538/

caolanm->timar: There are a few new hundred asserts/crashes in this run
versus yesterdays run all stemming from...

commit 481c185e327cb83ffcb29657d5a354eae2c4a5f3
Author: Andras Timar 
Date:   Tue May 26 19:35:08 2015 +0200

tdf#90338 tdf#84254 DrawingML export fix

C.


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

[Libreoffice-commits] online.git: loleaflet/loleaflet.spec.in

[Tor Lillqvist]

 loleaflet/loleaflet.spec.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6968bd1c3ca67e530f452252acad13df23b5eb9a
Author: Tor Lillqvist 
Date:   Thu May 28 11:19:15 2015 +0300

This should obviously be noarch

diff --git a/loleaflet/loleaflet.spec.in b/loleaflet/loleaflet.spec.in
index a366581..297912e 100644
--- a/loleaflet/loleaflet.spec.in
+++ b/loleaflet/loleaflet.spec.in
@@ -22,6 +22,7 @@ Vendor: Collabora
 Summary:LibreOffice On-Line Javascript part
 License:MPL
 Source0:loleaflet-@package_vers...@.tar.gz
+BuildArchitectures: noarch
 
 %description
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 extensions/source/propctrlr/propertyeditor.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ac633cec1b2b7d6f2ffaa128490f2b90f977b024
Author: David Tardon 
Date:   Thu May 28 10:05:58 2015 +0200

tdf#91671 avoid use of already disposed control

Change-Id: I9cf5feeb2fc0ea91c7684aaf8adc2809907fa5d7
(cherry picked from commit a14d7e3b41e1083edcebdeb3484e3ccdd63c)

diff --git a/extensions/source/propctrlr/propertyeditor.cxx 
b/extensions/source/propctrlr/propertyeditor.cxx
index 73d8389..60f72f4 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -166,7 +166,8 @@ namespace pcr
 
 void OPropertyEditor::GetFocus()
 {
-m_aTabControl->GrabFocus();
+if ( m_aTabControl )
+m_aTabControl->GrabFocus();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/html/htmltab.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f9e0e3a4eb8a23bfb9fb66055511c53d120e6579
Author: Miklos Vajna 
Date:   Thu May 28 10:06:44 2015 +0200

sw: -Werror=shadow

Change-Id: If09cc703bf1a922c6b3a1f584f23e5867ea7ad5f

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 0becb42..d01333d 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2989,7 +2989,7 @@ class _SectionSaveStruct : public SwPendingStackData
 
 public:
 
-HTMLTable *pTable;
+HTMLTable *m_pTable;
 
 explicit _SectionSaveStruct( SwHTMLParser& rParser );
 virtual ~_SectionSaveStruct();
@@ -3003,7 +3003,7 @@ public:
 _SectionSaveStruct::_SectionSaveStruct( SwHTMLParser& rParser ) :
 nBaseFontStMinSave(0), nFontStMinSave(0), nFontStHeadStartSave(0),
 nDefListDeepSave(0), nContextStMinSave(0), nContextStAttrMinSave(0),
-pTable( 0 )
+m_pTable( 0 )
 {
 // Font-Stacks einfrieren
 nBaseFontStMinSave = rParser.nBaseFontStMin;
@@ -3884,7 +3884,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, 
bool bReadOptions,
 // nur wenn eine neue Tabelle aufgemacht wird, aber
 // nicht wenn nach einem Pending in der Tabelle
 // weitergelesen wird!
-pSaveStruct->pTable = pTable;
+pSaveStruct->m_pTable = pTable;
 
 // HACK: Eine Section fuer eine Tabelle anlegen, die
 // in einen Rahmen kommt.
@@ -3991,7 +3991,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, 
bool bReadOptions,
 }
 }
 
-pTable = pSaveStruct->pTable;
+pTable = pSaveStruct->m_pTable;
 }
 }
 break;
@@ -4858,8 +4858,8 @@ void SwHTMLParser::BuildTableCaption( HTMLTable 
*pCurTable )
 case HTML_TABLE_ON:
 if( !pPendStack )
 {
-pSaveStruct->pTable = pTable;
-bool bHasToFly = pSaveStruct->pTable!=pCurTable;
+pSaveStruct->m_pTable = pTable;
+bool bHasToFly = pSaveStruct->m_pTable!=pCurTable;
 BuildTable( pCurTable->GetTableAdjust( true ),
 false, true, bHasToFly );
 }
@@ -4869,7 +4869,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable 
*pCurTable )
 }
 if( SVPAR_PENDING != GetStatus() )
 {
-pTable = pSaveStruct->pTable;
+pTable = pSaveStruct->m_pTable;
 }
 break;
 case HTML_TABLE_OFF:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 extensions/source/propctrlr/propertyeditor.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a14d7e3b41e1083edcebdeb3484e3ccdd63c
Author: David Tardon 
Date:   Thu May 28 10:05:58 2015 +0200

tdf#91671 avoid use of already disposed control

Change-Id: I9cf5feeb2fc0ea91c7684aaf8adc2809907fa5d7

diff --git a/extensions/source/propctrlr/propertyeditor.cxx 
b/extensions/source/propctrlr/propertyeditor.cxx
index 73d8389..60f72f4 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -166,7 +166,8 @@ namespace pcr
 
 void OPropertyEditor::GetFocus()
 {
-m_aTabControl->GrabFocus();
+if ( m_aTabControl )
+m_aTabControl->GrabFocus();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mihai Varga]

 loleaflet/src/layer/tile/TileLayer.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f999c337b9ac4455d4181df8aa154194d04ab027
Author: Mihai Varga 
Date:   Thu May 28 11:02:03 2015 +0300

Better differentiate commands, status vs statusindicator

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 1f2d5ba..467fe9d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -177,7 +177,7 @@ L.TileLayer = L.GridLayer.extend({
}
}
}
-   else if (textMsg.startsWith('status')) {
+   else if (textMsg.startsWith('status:')) {
var command = this._parseServerCmd(textMsg);
if (command.width && command.height && 
this._documentInfo !== textMsg) {
this._docWidthTwips = command.width;
@@ -194,7 +194,7 @@ L.TileLayer = L.GridLayer.extend({
this._update();
}
}
-   else if (textMsg.startsWith('tile')) {
+   else if (textMsg.startsWith('tile:')) {
var command = this._parseServerCmd(textMsg);
var coords = this._twipsToCoords(new L.Point(command.x, 
command.y));
coords.z = command.zoom;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 11 commits - include/LibreOfficeKit libreofficekit/qa libreofficekit/source sd/qa sd/source sw/source

[Henry Castro]

 include/LibreOfficeKit/LibreOfficeKitEnums.h|8 +-
 include/LibreOfficeKit/LibreOfficeKitGtk.h  |2 
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   34 +-
 libreofficekit/source/gtk/lokdocview.cxx|   67 ++--
 sd/qa/unit/tiledrendering/data/dummy.odp|binary
 sd/qa/unit/tiledrendering/tiledrendering.cxx|   49 --
 sd/source/ui/view/Outliner.cxx  |   14 
 sw/source/core/view/viewsh.cxx  |   10 ++
 sw/source/uibase/uiview/view2.cxx   |2 
 sw/source/uibase/uno/unotxdoc.cxx   |5 +
 10 files changed, 171 insertions(+), 20 deletions(-)

New commits:
commit 3bc8e5f81b85b02a34cd6bb9080ba0fe1505bd33
Author: Henry Castro 
Date:   Wed May 27 10:37:03 2015 +0200

sd LOKit callback for search not found

Change-Id: Ide13a989005169cd6e8663f308d15f0e5984bd86
(cherry picked from commit c0cc9a8622a2cd0e3ba07e15a79dd65ca910b233)

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index aff2e76..60873d0 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -70,6 +70,7 @@
 #include "framework/FrameworkHelper.hxx"
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1056,7 +1057,12 @@ void Outliner::ShowEndOfSearchDialog()
 if (mbStringFound)
 aString = SD_RESSTR(STR_END_SEARCHING);
 else
+{
 aString = SD_RESSTR(STR_STRING_NOTFOUND);
+
mpDrawDocument->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+  
mpSearchItem->GetSearchString().toUtf8().getStr());
+
+}
 }
 else
 {
commit 2195aa2ce8a93895213bbbe2b25bb5a12d3c5160
Author: Miklos Vajna 
Date:   Wed May 27 17:12:28 2015 +0200

lokdocview: handle LOK_CALLBACK_DOCUMENT_SIZE_CHANGED

Change-Id: Ib1b99221afbf9810bad5fd49fbf62c7a20fd28e4
(cherry picked from commit 8cbb94a2b79dcaf9675125da800b64a85bae52dc)

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 73dd15e..d01c743 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -170,6 +170,8 @@ struct LOKDocView_Impl
  * the tiles that intersect with pPartial.
  */
 void renderDocument(GdkRectangle* pPartial);
+/// Sets rWidth and rHeight from a "width, height" string.
+void payloadToSize(const char* pPayload, long& rWidth, long& rHeight);
 /// Returns the GdkRectangle of a width,height,x,y string.
 static GdkRectangle payloadToRectangle(const char* pPayload);
 /// Returns the GdkRectangles of a w,h,x,y;w2,h2,x2,y2;... string.
@@ -844,6 +846,21 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* 
pPartial)
 }
 }
 
+void LOKDocView_Impl::payloadToSize(const char* pPayload, long& rWidth, long& 
rHeight)
+{
+rWidth = rHeight = 0;
+gchar** ppCoordinates = g_strsplit(pPayload, ", ", 2);
+gchar** ppCoordinate = ppCoordinates;
+if (!*ppCoordinate)
+return;
+rWidth = atoi(*ppCoordinate);
+++ppCoordinate;
+if (!*ppCoordinate)
+return;
+rHeight = atoi(*ppCoordinate);
+g_strfreev(ppCoordinates);
+}
+
 GdkRectangle LOKDocView_Impl::payloadToRectangle(const char* pPayload)
 {
 GdkRectangle aRet;
@@ -913,8 +930,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
 return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
 case LOK_CALLBACK_SEARCH_NOT_FOUND:
 return "LOK_CALLBACK_SEARCH_NOT_FOUND";
-case LOK_CALLBACK_PAGE_COUNT_CHANGED:
-return "LOK_CALLBACK_PAGE_COUNT_CHANGED";
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+return "LOK_CALLBACK_DOCUMENT_SIZE_CHANGED";
 case LOK_CALLBACK_SET_PART:
 return "LOK_CALLBACK_SET_PART";
 }
@@ -1014,9 +1031,9 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 searchNotFound(pCallback->m_aPayload);
 }
 break;
-case LOK_CALLBACK_PAGE_COUNT_CHANGED:
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
 {
-m_pDocument->pClass->getDocumentSize(m_pDocument, 
&m_nDocumentWidthTwips, &m_nDocumentHeightTwips);
+LOKDocView_Impl::payloadToSize(pCallback->m_aPayload.c_str(), 
m_nDocumentWidthTwips, m_nDocumentHeightTwips);
 }
 break;
 case LOK_CALLBACK_SET_PART:
commit 50cb3a83fdafd37a4814b3cc6e6d1336274007a7
Author: Miklos Vajna 
Date:   Wed May 27 17:12:00 2015 +0200

LOK: change PAGE_COUNT to a more generic DOCUMENT_SIZE

Change-Id: If94af4072c321358d7bd4d678eeed181dc0f44db
(cherry picked from commit 63a40c45018ad2e6f4a660a520a5907beb1d7801)

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 9ad7636..5293aa9 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/

[Libreoffice-commits] online.git: 4 commits - loolwsd/bundled loolwsd/configure.ac loolwsd/LOOLSession.cpp loolwsd/loolwsd.spec.in

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp  |   25 +--
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |8 +--
 loolwsd/configure.ac |2 
 loolwsd/loolwsd.spec.in  |8 +--
 4 files changed, 22 insertions(+), 21 deletions(-)

New commits:
commit 8166e9494f38ac2e81a89ee3bbee39db8ff81465
Author: Tor Lillqvist 
Date:   Thu May 28 10:35:07 2015 +0300

Post-release bump to 1.0.23

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 4936d4a..a5f391b 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.21], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.23], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 5150db06b9277e8a2dc2f5663281ab746cfc7af4
Author: Tor Lillqvist 
Date:   Thu May 28 10:31:39 2015 +0300

Adapt to work with either 5.0 or 5.1 packages from TDF

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 5cc4dc5..6ee3c38 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -28,9 +28,7 @@ Requires:   libcap libcap-progs libpng 
libPocoFoundation30 >= 1.6.0 libPocoN
 %define owner lool
 %define group lool
 
-# This works for now only with the TDF nightly builds or similar, I think
-%define sofficeversion 5.0
-%define sofficepackage libreofficedev%{sofficeversion}
+# This works for now only with the TDF nightly builds of 5.0 or 5.1, I think
 
 %description
 
@@ -64,7 +62,9 @@ mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd
 
 # Figure out where LO is installed, let's hope it is not a mount point
 # Create a directory for loolwsd on the same file system
-loroot=`rpm -ql %{sofficepackage} | grep '/soffice$' | sed -e 
's-/program/soffice--'`
+# First look for TDF libreofficedev5.1, then 5.0
+loroot=`rpm -ql libreofficedev5.1 | grep '/soffice$' | sed -e 
's-/program/soffice--'`
+test -z "$loroot" && loroot=`rpm -ql libreofficedev5.0 | grep '/soffice$' | 
sed -e 's-/program/soffice--'`
 loolparent=`cd ${loroot} && cd .. && /bin/pwd`
 
 rm -rf ${loolparent}/lool
commit fd7f83df924e73a1b642019802d08194325a9e4a
Author: Tor Lillqvist 
Date:   Thu May 28 10:27:43 2015 +0300

Update from master

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index bbcd5b9..66237e4 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -143,12 +143,12 @@ typedef enum
 LOK_CALLBACK_SEARCH_NOT_FOUND,
 
 /**
- * Number of pages changed in the document.
+ * Size of the document changed.
  *
- * Clients should assume that data returned by an earlier
- * lok::Document::getDocumentSize() call is no longer valid.
+ * Payload format is "width, height", i.e. clients get the new size without
+ * having to do an explicit lok::Document::getDocumentSize() call.
  */
-LOK_CALLBACK_PAGE_COUNT_CHANGED,
+LOK_CALLBACK_DOCUMENT_SIZE_CHANGED,
 
 /**
  * The current part number is changed.
commit 84819b6f0c957965f43952d219c731d06b35f4d7
Author: Tor Lillqvist 
Date:   Wed May 27 17:14:13 2015 +0300

Improve error handling

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index bdb4c48..ce273b7 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -214,6 +214,19 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 }
 return loadDocument(buffer, length, tokens);
 }
+else if (tokens[0] != "status" &&
+ tokens[0] != "tile" &&
+ tokens[0] != "key" &&
+ tokens[0] != "mouse" &&
+ tokens[0] != "uno" &&
+ tokens[0] != "selecttext" &&
+ tokens[0] != "selectgraphic" &&
+ tokens[0] != "resetselection" &&
+ tokens[0] != "saveas")
+{
+sendTextFrame("error: cmd=" + tokens[0] + " kind=unknown");
+return false;
+}
 else if (_docURL == "")
 {
 sendTextFrame("error: cmd=" + tokens[0] + " kind=nodocloaded");
@@ -233,18 +246,6 @@ bool MasterProcessSession::handleInput(char *buffer, int 
length)
 // LibreOfficeKitDocument session, i.e. need to be handled in
 // a child process.
 
-if (tokens[0] != "key" &&
-tokens[0] != "mouse" &&
-tokens[0] != "uno" &&
-tokens[0] != "selecttext" &&
-tokens[0] != "selectgraphic" &&
-tokens[0] != "resetselection" &&
-tokens[0] != "saveas")
-{
-sendTextFrame("error: cmd=" + tokens[0] + " kind=unknown");
-return false;
-}
-
 if (_peer.expired())
 dispatchChild();
 forwardToPeer(buffer, length);
___
Libreo

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

[Miklos Vajna]

 sw/source/filter/html/htmltab.cxx |   66 +++---
 1 file changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 39f3039724f3933963f861f4afc24a92348eb991
Author: Miklos Vajna 
Date:   Thu May 28 09:08:21 2015 +0200

sw: prefix HTMLTableCnts members

So that one can stop guessing if pTable or pHTMLTable is the member
variable.

Change-Id: Ia2c240d15c3e5d6d1a6e2e23373ed57909501070

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 659f5f4..0becb42 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -158,15 +158,15 @@ public:
 
 class HTMLTableCnts
 {
-HTMLTableCnts *pNext;   // next content
+HTMLTableCnts *m_pNext;   // next content
 
 // Only one of the next two pointers must be set!
-const SwStartNode *pStartNode;  // a paragraph
-HTMLTable *pTable;  // a table
+const SwStartNode *m_pStartNode;  // a paragraph
+HTMLTable *m_pTable;  // a table
 
-SwHTMLTableLayoutCnts* pLayoutInfo;
+SwHTMLTableLayoutCnts* m_pLayoutInfo;
 
-bool bNoBreak;
+bool m_bNoBreak;
 
 void InitCtor();
 
@@ -178,20 +178,20 @@ public:
 ~HTMLTableCnts();   // only allowed in ~HTMLTableCell
 
 // Determine SwStartNode and HTMLTable respectively
-const SwStartNode *GetStartNode() const { return pStartNode; }
-const HTMLTable *GetTable() const { return pTable; }
-HTMLTable *GetTable() { return pTable; }
+const SwStartNode *GetStartNode() const { return m_pStartNode; }
+const HTMLTable *GetTable() const { return m_pTable; }
+HTMLTable *GetTable() { return m_pTable; }
 
 // Add a new node at the end of the list
 void Add( HTMLTableCnts* pNewCnts );
 
 // Determine next node
-const HTMLTableCnts *Next() const { return pNext; }
-HTMLTableCnts *Next() { return pNext; }
+const HTMLTableCnts *Next() const { return m_pNext; }
+HTMLTableCnts *Next() { return m_pNext; }
 
 inline void SetTableBox( SwTableBox *pBox );
 
-void SetNoBreak() { bNoBreak = true; }
+void SetNoBreak() { m_bNoBreak = true; }
 
 SwHTMLTableLayoutCnts *CreateLayoutInfo();
 };
@@ -619,59 +619,59 @@ public:
 
 void HTMLTableCnts::InitCtor()
 {
-pNext = 0;
-pLayoutInfo = 0;
+m_pNext = 0;
+m_pLayoutInfo = 0;
 
-bNoBreak = false;
+m_bNoBreak = false;
 }
 
 HTMLTableCnts::HTMLTableCnts( const SwStartNode* pStNd ):
-pStartNode(pStNd), pTable(0)
+m_pStartNode(pStNd), m_pTable(0)
 {
 InitCtor();
 }
 
 HTMLTableCnts::HTMLTableCnts( HTMLTable* pTab ):
-pStartNode(0), pTable(pTab)
+m_pStartNode(0), m_pTable(pTab)
 {
 InitCtor();
 }
 
 HTMLTableCnts::~HTMLTableCnts()
 {
-delete pTable;  // die Tabellen brauchen wir nicht mehr
-delete pNext;
+delete m_pTable;  // die Tabellen brauchen wir nicht mehr
+delete m_pNext;
 }
 
 void HTMLTableCnts::Add( HTMLTableCnts* pNewCnts )
 {
 HTMLTableCnts *pCnts = this;
 
-while( pCnts->pNext )
-pCnts = pCnts->pNext;
+while( pCnts->m_pNext )
+pCnts = pCnts->m_pNext;
 
-pCnts->pNext = pNewCnts;
+pCnts->m_pNext = pNewCnts;
 }
 
 inline void HTMLTableCnts::SetTableBox( SwTableBox *pBox )
 {
-OSL_ENSURE( pLayoutInfo, "Da sit noch keine Layout-Info" );
-if( pLayoutInfo )
-pLayoutInfo->SetTableBox( pBox );
+OSL_ENSURE( m_pLayoutInfo, "Da sit noch keine Layout-Info" );
+if( m_pLayoutInfo )
+m_pLayoutInfo->SetTableBox( pBox );
 }
 
 SwHTMLTableLayoutCnts *HTMLTableCnts::CreateLayoutInfo()
 {
-if( !pLayoutInfo )
+if( !m_pLayoutInfo )
 {
-SwHTMLTableLayoutCnts *pNextInfo = pNext ? pNext->CreateLayoutInfo() : 
0;
-SwHTMLTableLayout *pTableInfo = pTable ? pTable->CreateLayoutInfo() : 
0;
+SwHTMLTableLayoutCnts *pNextInfo = m_pNext ? 
m_pNext->CreateLayoutInfo() : 0;
+SwHTMLTableLayout *pTableInfo = m_pTable ? 
m_pTable->CreateLayoutInfo() : 0;
 
-pLayoutInfo = new SwHTMLTableLayoutCnts( pStartNode, pTableInfo,
- bNoBreak, pNextInfo );
+m_pLayoutInfo = new SwHTMLTableLayoutCnts( m_pStartNode, pTableInfo,
+ m_bNoBreak, pNextInfo );
 }
 
-return pLayoutInfo;
+return m_pLayoutInfo;
 }
 
 HTMLTableCell::HTMLTableCell():
@@ -3301,12 +3301,12 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
 
 if( rParser.nContextStAttrMin == GetContextStAttrMin() )
 {
-_HTMLAttr** pHTMLTable = 
reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
+_HTMLAttr** pTable = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
 
 for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
-nCnt--; ++pHTMLTable )
+nCnt--; ++pTable )
 {
-OSL_ENSURE( 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 3 commits - include/oox oox/source sc/qa sc/source sd/qa svx/source

[Andras Timar]

 include/oox/export/drawingml.hxx  |1 
 oox/source/export/drawingml.cxx   |  206 
 oox/source/export/shapes.cxx  |   25 
 sc/qa/unit/data/ods/move-cell-anchored-shapes.ods |binary
 sc/qa/unit/subsequent_export-test.cxx |  166 ++
 sc/qa/unit/ucalc.cxx  |  100 +++
 sc/qa/unit/ucalc.hxx  |2 
 sc/source/core/data/drwlayer.cxx  |   59 ++
 sd/qa/unit/data/tdf90338.odp  |binary
 sd/qa/unit/data/xml/tdf90338_0.xml|  561 ++
 sd/qa/unit/import-tests.cxx   |1 
 svx/source/svdraw/svdoashp.cxx|1 
 12 files changed, 1110 insertions(+), 12 deletions(-)

New commits:
commit 9ad8490e1154d5667249d56a63c9c00111cafa4d
Author: Andras Timar 
Date:   Wed May 27 12:47:29 2015 +0200

tdf#90338 related: ignore empty shape handles struct

Change-Id: I486564a124cfb0d13a8b20e89cf13e752ccb7237
Reviewed-on: https://gerrit.libreoffice.org/15923
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 1a4eeac14b618714bb8be9755f508ee63ac4a422)

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index e2a5e75..735c569 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -400,8 +400,12 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< 
XShape > xShape )
 rProp.Value >>= bFlipV;
 if ( rProp.Name == "AdjustmentValues" )
 nAdjustmentValuesIndex = i;
-else if ( rProp.Name == "Handles" ) {
-bHasHandles = true;
+else if ( rProp.Name == "Handles" )
+{
+uno::Sequence aHandles;
+rProp.Value >>= aHandles;
+if ( aHandles.getLength() )
+bHasHandles = true;
 if( !bIsDefaultObject )
 bPredefinedHandlesUsed = false;
 // TODO: update nAdjustmentsWhichNeedsToBeConverted here
commit 0fa10fa7ea7026de7d998776201747afda0ca6b2
Author: Andras Timar 
Date:   Tue May 26 19:35:08 2015 +0200

tdf#90338 tdf#84254 DrawingML export fix

Change-Id: I610d8099f057a2a34a1f9573d8ac16b5b8da9fc7
Reviewed-on: https://gerrit.libreoffice.org/15918
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 481c185e327cb83ffcb29657d5a354eae2c4a5f3)

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 2707852..3b9d847 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -177,6 +177,7 @@ public:
 
 void WritePresetShape( const char* pShape );
 void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool 
bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const 
::com::sun::star::beans::PropertyValue& rProp );
+void WriteCustomGeometry( css::uno::Reference 
rXShape );
 void WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon );
 void WriteFill( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > xPropSet );
 void WriteShapeStyle( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 832914f..0600f60 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -43,6 +43,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -2198,6 +2202,208 @@ void DrawingML::WritePresetShape( const char* pShape, 
MSO_SPT eShapeType, bool b
 mpFS->endElementNS(  XML_a, XML_prstGeom );
 }
 
+void DrawingML::WriteCustomGeometry( Reference< XShape > rXShape )
+{
+uno::Reference< beans::XPropertySet > aXPropSet;
+uno::Any aAny( 
rXShape->queryInterface(cppu::UnoType::get()));
+
+if ( ! (aAny >>= aXPropSet) )
+return;
+
+try
+{
+aAny = aXPropSet->getPropertyValue( "CustomShapeGeometry" );
+if ( !aAny.hasValue() )
+return;
+}
+catch( const ::uno::Exception& )
+{
+return;
+}
+
+
+mpFS->startElementNS( XML_a, XML_custGeom, FSEND );
+mpFS->singleElementNS( XML_a, XML_avLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_gdLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_ahLst, FSEND );
+mpFS->singleElementNS( XML_a, XML_rect,
+   XML_l, "l",
+   XML_t, "t",
+   XML_r, "r",
+   XML_b, "b",
+   FSEND );
+
+mpFS->startElementNS( XML_a, XML_pathLst, FSEND );
+
+uno::Sequence< beans::PropertyValue > const * pGeometrySeq =
+static_cast const 
*>(aAny.getValue());
+
+

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

[Miklos Vajna]

 sd/qa/unit/tiledrendering/tiledrendering.cxx |2 +-
 sw/source/core/doc/doc.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit afc3010f45ee67a2517fcebac5d96c309eb94118
Author: Miklos Vajna 
Date:   Thu May 28 09:04:53 2015 +0200

indentation fixes

Change-Id: I267bb8b66c6c568718cec3f292f0b63737693b37

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b41c427..0523773 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -82,7 +82,7 @@ private:
 SdTiledRenderingTest::SdTiledRenderingTest()
 #if !defined(WNT) && !defined(MACOSX)
 : m_bFound(true),
-m_nPart(0)
+  m_nPart(0)
 #endif
 {
 }
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index a25a641..c65309f 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1058,7 +1058,7 @@ const SwFormatRefMark* SwDoc::GetRefMark( sal_uInt16 
nIndex ) const
 nCount++;
 }
 }
-   return pRet;
+return pRet;
 }
 
 /// @return the names of all set references in the Doc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits