[Libreoffice-commits] libcdr.git: 2 commits - src/lib

[Fridrich Štrba]

 src/lib/CMXParser.cpp |   70 +++---
 src/lib/CMXParser.h   |   26 +++---
 2 files changed, 83 insertions(+), 13 deletions(-)

New commits:
commit a9dc0718f68bac96144d15e2b6165fc1ae83d6d1
Author: Fridrich Å trba 
Date:   Wed Jul 13 08:55:08 2016 +0200

Defines for sections

Change-Id: Ib3ce9f075b726aaa0916f0caf720f031210a11da

diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 7d41e84..6483ba2 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -386,7 +386,6 @@ void 
libcdr::CMXParser::readIxmr(librevenge::RVNGInputStream *input)
 unsigned offset = readU32(input, m_bigEndian);
 offsets[indexRecordId] = offset;
   }
-
 }
 
 void libcdr::CMXParser::readPage(librevenge::RVNGInputStream *input, unsigned 
length)
diff --git a/src/lib/CMXParser.h b/src/lib/CMXParser.h
index 854b9e2..32c7ef5 100644
--- a/src/lib/CMXParser.h
+++ b/src/lib/CMXParser.h
@@ -18,6 +18,25 @@
 #include "CDRTypes.h"
 #include "CommonParser.h"
 
+#define CMX_MASTER_INDEX_TABLE 1
+#define CMX_PAGE_INDEX_TABLE 2
+#define CMX_MASTER_LAYER_TABLE 3
+#define CMX_PROCEDURE_INDEX_TABLE 4
+#define CMX_BITMAP_INDEX_TABLE 5
+#define CMX_ARROW_INDEX_TABLE 6
+#define CMX_FONT_INDEX_TABLE 7
+#define CMX_EMBEDDED_FILE_INDEX_TABLE 8
+#define CMX_THUMBNAIL_SECTION 10
+#define CMX_OUTLINE_DESCRIPTION_SECTION 15
+#define CMX_LINE_STYLE_DESCRIPTION_SECTION 16
+#define CMX_ARROWHEADS_DESCRIPTION_SECTION 17
+#define CMX_SCREEN_DESCRIPTION_SECTION 18
+#define CMX_PEN_DESCRIPTION_SECTION 19
+#define CMX_DOT_DASH_DESCRIPTION_SECTION 20
+#define CMX_COLOR_DESCRIPTION_SECTION 21
+#define CMX_COLOR_CORRECTION_SECTION 22
+#define CMX_PREVIEW_BOX_SECTION 23
+
 namespace libcdr
 {
 
commit f9a78854aba45c2dc6a5a29eea1d57a689e2ed5f
Author: Fridrich Å trba 
Date:   Wed Jul 13 08:42:51 2016 +0200

Start the infrastructure for parsing from index section

Change-Id: I9009d6d2f24a91dc8a56418c8b7cc7cd4165fefd

diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 8d8314c..7d41e84 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -36,7 +36,6 @@ libcdr::CMXParser::CMXParser(libcdr::CDRCollector *collector, 
CMXParserState &pa
   : CommonParser(collector),
 m_bigEndian(false), m_unit(0),
 m_scale(0.0), m_xmin(0.0), m_xmax(0.0), m_ymin(0.0), m_ymax(0.0),
-m_indexSectionOffset(0), m_infoSectionOffset(0), m_thumbnailOffset(0),
 m_fillIndex(0), m_nextInstructionOffset(0), m_parserState(parserState),
 m_currentImageInfo(), m_currentPattern(0), m_currentBitmap(0) {}
 
@@ -197,9 +196,6 @@ void libcdr::CMXParser::readRecord(unsigned fourCC, 
unsigned &length, librevenge
   case CDR_FOURCC_cont:
 readCMXHeader(input);
 break;
-  case CDR_FOURCC_DISP:
-readDisp(input, length);
-break;
   case CDR_FOURCC_page:
 readPage(input, length);
 break;
@@ -284,19 +280,45 @@ void 
libcdr::CMXParser::readCMXHeader(librevenge::RVNGInputStream *input)
   m_scale = readDouble(input, m_bigEndian);
   CDR_DEBUG_MSG(("CMX Units Scale: %.9f\n", m_scale));
   input->seek(12, librevenge::RVNG_SEEK_CUR);
-  m_indexSectionOffset = readU32(input, m_bigEndian);
-  m_infoSectionOffset = readU32(input, m_bigEndian);
-  m_thumbnailOffset = readU32(input, m_bigEndian);
+  unsigned indexSectionOffset = readU32(input, m_bigEndian);
+#ifdef DEBUG
+  unsigned infoSectionOffset = readU32(input, m_bigEndian);
+#else
+  input->seek(4, librevenge::RVNG_SEEK_CUR);
+#endif
+  unsigned thumbnailOffset = readU32(input, m_bigEndian);
 #ifdef DEBUG
   CDRBox box = readBBox(input);
 #endif
   CDR_DEBUG_MSG(("CMX Offsets: index section 0x%.8x, info section: 0x%.8x, 
thumbnail: 0x%.8x\n",
- m_indexSectionOffset, m_infoSectionOffset, 
m_thumbnailOffset));
+ indexSectionOffset, infoSectionOffset, thumbnailOffset));
   CDR_DEBUG_MSG(("CMX Bounding Box: x: %f, y: %f, w: %f, h: %f\n", box.m_x, 
box.m_y, box.m_w, box.m_h));
+  if (thumbnailOffset != (unsigned)-1)
+  {
+long oldOffset = input->tell();
+input->seek(thumbnailOffset, librevenge::RVNG_SEEK_SET);
+readDisp(input);
+input->seek(oldOffset, librevenge::RVNG_SEEK_SET);
+  }
+  if (indexSectionOffset != (unsigned)-1)
+  {
+long oldOffset = input->tell();
+input->seek(indexSectionOffset, librevenge::RVNG_SEEK_SET);
+readIxmr(input);
+input->seek(oldOffset, librevenge::RVNG_SEEK_SET);
+  }
 }
 
-void libcdr::CMXParser::readDisp(librevenge::RVNGInputStream *input, unsigned 
length)
+void libcdr::CMXParser::readDisp(librevenge::RVNGInputStream *input)
 {
+  unsigned fourCC = readU32(input, m_bigEndian);
+  if (CDR_FOURCC_DISP != fourCC)
+return;
+  unsigned length = readU32(input, m_bigEndian);
+  const unsigned long maxLength = getRemainingLength(input);
+  if (length > maxLength)
+length = maxLength;
+
   librevenge::RVNGBinaryData previewImage;
   previewImage.append((unsigned char)0x42);
   previewImage.append((unsigned char)0x4d);

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

[Pranav Kant]

 libreofficekit/source/gtk/lokdocview.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit a54d466edc456be5dfd5c695c6b99f570e228916
Author: Pranav Kant 
Date:   Wed Jul 13 12:18:04 2016 +0530

lokdocview: This can be fired even without document

... so handle it and avoid the assert

Change-Id: Ib244746fabeaf41b5ca927d94fc4c3bda19bef26

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 34c2cae..613a909 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -932,6 +932,11 @@ globalCallback (gpointer pData)
 g_signal_emit (pCallback->m_pDocView, 
doc_view_signals[PASSWORD_REQUIRED], 0, pURL, bModify);
 }
 break;
+case LOK_CALLBACK_ERROR:
+{
+reportError(pCallback->m_pDocView, pCallback->m_aPayload);
+}
+break;
 default:
 g_assert(false);
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools svl/source tools/inc tools/source

[Noel Grandin]

 include/tools/b3dtrans.hxx  |4 +--
 include/tools/fract.hxx |2 -
 include/tools/globname.hxx  |2 -
 include/tools/multisel.hxx  |2 -
 include/tools/rc.hxx|2 -
 include/tools/resmgr.hxx|6 ++---
 include/tools/unqidx.hxx|2 -
 include/tools/zcodec.hxx|2 -
 svl/source/items/globalnameitem.cxx |2 -
 tools/inc/poly.h|2 -
 tools/source/generic/b3dtrans.cxx   |2 -
 tools/source/generic/fract.cxx  |2 -
 tools/source/generic/poly.cxx   |6 ++---
 tools/source/memtools/multisel.cxx  |2 -
 tools/source/memtools/unqidx.cxx|2 -
 tools/source/rc/resmgr.cxx  |   38 ++--
 tools/source/ref/errinf.cxx |4 +--
 tools/source/ref/globname.cxx   |2 -
 tools/source/stream/strmunx.cxx |2 -
 tools/source/zcodec/zcodec.cxx  |2 -
 20 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit c9b4e298137ed7c3112de533d44ddf56b1ebca6d
Author: Noel Grandin 
Date:   Tue Jul 12 10:56:22 2016 +0200

loplugin:constparams in tools

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

diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 6dabf50..8b47ba9 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -127,8 +127,8 @@ public:
 
 void SetPerspective(bool bNew);
 
-void SetViewportRectangle(Rectangle& rRect, Rectangle& rVisible);
-void SetViewportRectangle(Rectangle& rRect) { SetViewportRectangle(rRect, 
rRect); }
+void SetViewportRectangle(Rectangle const & rRect, Rectangle const & 
rVisible);
+void SetViewportRectangle(Rectangle const & rRect) { 
SetViewportRectangle(rRect, rRect); }
 
 void CalcViewport();
 
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index adecddf..65110d2 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -71,7 +71,7 @@ public:
 TOOLS_DLLPUBLIC friend bool operator<=( const Fraction& rVal1, const 
Fraction& rVal2 );
 TOOLS_DLLPUBLIC friend bool operator>=( const Fraction& rVal1, const 
Fraction& rVal2 );
 
-TOOLS_DLLPUBLIC friend SvStream& ReadFraction( SvStream& rIStream, 
Fraction& rFract );
+TOOLS_DLLPUBLIC friend SvStream& ReadFraction( SvStream& rIStream, 
Fraction const & rFract );
 TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const 
Fraction& rFract );
 };
 
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index 8c30b37..42928a8 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -85,7 +85,7 @@ public:
 bool  operator != ( const SvGlobalName & rObj ) const
   { return !(*this == rObj); }
 
-void  MakeFromMemory( void * pData );
+void  MakeFromMemory( void const * pData );
 bool  MakeId( const OUString & rId );
 OUString  GetHexName() const;
 
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 2a8a656..6159145 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -164,7 +164,7 @@ public:
  sal_Int32 i_nMinNumber,
  sal_Int32 i_nMaxNumber,
  sal_Int32 i_nLogicalOffset = -1,
- std::set< sal_Int32 >* i_pPossibleValues 
= nullptr
+ std::set< sal_Int32 > const * 
i_pPossibleValues = nullptr
 );
 };
 
diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx
index 372b70b..edb82ae 100644
--- a/include/tools/rc.hxx
+++ b/include/tools/rc.hxx
@@ -52,7 +52,7 @@ protected:
 { return ResMgr::GetObjSize( pHT ); }
 
 // get a 32bit value from Resource data
-static sal_Int32GetLongRes( void * pLong )
+static sal_Int32GetLongRes( void const * pLong )
 { return ResMgr::GetLong( pLong ); }
 
 // read a 32bit value from resource data and increment pointer
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index b6561ef..100ae4c 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -174,11 +174,11 @@ public:
 static sal_uInt32   GetStringSize( const sal_uInt8* pStr, sal_uInt32& nLen 
);
 
 /// Return a int64
-static sal_uInt64   GetUInt64( void* pDatum );
+static sal_uInt64   GetUInt64( void const * pDatum );
 /// Return a long
-static sal_Int32GetLong( void * pLong );
+static sal_Int32GetLong( void const * pLong );
 /// Return a short
-static sal_Int16GetShort( void * pShort );
+static sal_Int16GetShort( void const * pShort );
 
 /// Return a pointer to the resource
 void *  GetClass();
diff -

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

[Pranav Kant]

 libreofficekit/source/gtk/lokdocview.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 5ff1e6bdf7f5b9db3b72d62537047fc45b7d104b
Author: Pranav Kant 
Date:   Wed Jul 13 12:02:43 2016 +0530

lokdocview: Add missing callbacks

Change-Id: I2fd32bb210f1b5f0a090c29af707cb6ca6e8dd77

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index f65bfcd..34c2cae 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -369,6 +369,10 @@ callbackTypeToString (int nType)
 return "LOK_CALLBACK_CELL_VIEW_CURSOR";
 case LOK_CALLBACK_CELL_FORMULA:
 return "LOK_CALLBACK_CELL_FORMULA";
+case LOK_CALLBACK_UNO_COMMAND_RESULT:
+return "LOK_CALLBACK_UNO_COMMAND_RESULT";
+case LOK_CALLBACK_ERROR:
+return "LOK_CALLBACK_ERROR";
 }
 g_assert(false);
 return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source cui/source include/sfx2 include/tools sc/inc sc/source sd/inc sd/qa sd/source sfx2/source starmath/inc starmath/source sw/CppunitTest_sw_htmlexport.mk sw/

[Mark Page]

 basctl/source/basicide/basicmod.hxx|3 -
 basctl/source/basicide/iderdll.cxx |   12 +---
 cui/source/options/treeopt.cxx |9 +--
 cui/source/tabpages/autocdlg.cxx   |3 -
 include/sfx2/app.hxx   |   13 
 include/sfx2/module.hxx|2 
 include/tools/shl.hxx  |   87 -
 sc/inc/scmod.hxx   |3 -
 sc/source/ui/app/scdll.cxx |9 +--
 sd/inc/sddll.hxx   |6 +-
 sd/inc/sdmod.hxx   |3 -
 sd/qa/unit/misc-tests.cxx  |1 
 sd/source/core/drawdoc4.cxx|1 
 sd/source/ui/app/sddll.cxx |   31 +++
 sd/source/ui/app/sdmod.cxx |5 -
 sfx2/source/appl/app.cxx   |   17 ++
 sfx2/source/appl/module.cxx|   40 ---
 sfx2/source/inc/appdata.hxx|4 +
 starmath/inc/smmod.hxx |3 -
 starmath/source/smdll.cxx  |   17 ++
 sw/CppunitTest_sw_htmlexport.mk|1 
 sw/inc/swmodule.hxx|3 -
 sw/qa/extras/htmlexport/htmlexport.cxx |1 
 sw/source/uibase/app/swdll.cxx |   11 +---
 tools/Library_tl.mk|1 
 tools/source/misc/toolsdll.cxx |   33 
 26 files changed, 76 insertions(+), 243 deletions(-)

New commits:
commit f7b1cd66167050afecf487e3d89ea12de74200b5
Author: Mark Page 
Date:   Mon Jul 4 17:30:42 2016 +0100

Moved SfxModule owner to SfxApplication

::GetAppData replaced with SfxApplication::GetModule
that now returns SfxModule*

SfxModule no longer registers self for ownership
instead it is now registered using SfxApplication::SetModule

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

diff --git a/basctl/source/basicide/basicmod.hxx 
b/basctl/source/basicide/basicmod.hxx
index 3bed4f2..ffc960c 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -28,13 +28,10 @@ namespace basctl
 
 class Module : public SfxModule
 {
-static Module* mpModule;
 public:
 Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) :
 SfxModule( pMgr, {pObjFact} )
 { }
-public:
-static Module*& Get () { return mpModule; }
 };
 
 } // namespace basctl
diff --git a/basctl/source/basicide/iderdll.cxx 
b/basctl/source/basicide/iderdll.cxx
index 19d5961..2ea8a29 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -32,7 +32,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 namespace basctl
 {
@@ -40,8 +40,6 @@ namespace basctl
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-Module* Module::mpModule = nullptr;
-
 namespace
 {
 
@@ -106,7 +104,7 @@ ExtraData* GetExtraData()
 
 
 IDEResId::IDEResId( sal_uInt16 nId ):
-ResId(nId, *Module::Get()->GetResMgr())
+ResId(nId, *SfxApplication::GetModule(SfxToolsModule::Basic)->GetResMgr())
 { }
 
 namespace
@@ -121,12 +119,12 @@ Dll::Dll () :
 ResMgr* pMgr = ResMgr::CreateResMgr(
 "basctl", Application::GetSettings().GetUILanguageTag());
 
-Module::Get() = new Module( pMgr, &DocShell::Factory() );
+auto pModule = o3tl::make_unique( pMgr, &DocShell::Factory() );
+SfxModule* pMod = pModule.get();
+SfxApplication::SetModule(SfxToolsModule::Basic, std::move(pModule));
 
 GetExtraData(); // to cause GlobalErrorHdl to be set
 
-SfxModule* pMod = Module::Get();
-
 SfxObjectFactory& rFactory = DocShell::Factory();
 rFactory.SetDocumentServiceName( "com.sun.star.script.BasicIDE" );
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3b3e52c..d61a661 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -89,7 +89,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1586,7 +1585,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< 
XFrame >& _xFrame )
 || aFactory == "com.sun.star.text.WebDocument"
 || aFactory == "com.sun.star.text.GlobalDocument" )
 {
-SfxModule* pSwMod = 
*reinterpret_cast(GetAppData(SHL_WRITER));
+SfxModule* pSwMod = 
SfxApplication::GetModule(SfxToolsModule::Writer);
 if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) )
 {
 if ( aFactory == "com.sun.star.text.WebDocument" )
@@ -1635,7 +1634,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< 
XFrame >& _xFrame )
 if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) )
 {
 ResStringArray& rCalcArray = aDlgResource.GetCalcArray();
-SfxModule* pScMod = *reinterpret_cast(GetAppData( 
SHL_CALC ));
+SfxModule* pScMod 

compiler plugin

[David Ostrovsky]

On Tue, Jul 12, 2016 at 02:58:35PM +0200, Stephan Bergmann  wrote:
> where the first link, 
is the
> one to the results of the new Clang+plugins bot.  However, it is
unclear to
> me how to navigate from that page to the relevant information about
the
> failure, .

This is well known issue of non-obvious way to find out where actually
the logs of Jenkins matrix job are. And if you think you were happy to
find the logs for the right patch set and platform combination, you
start the game from the beginning to find out where the logs for
another patch set/platform combinations are. There are *four* different
kind of meta data involved in the process:

1. Gerrit: find out the right comment in the comment table from the
Jenkins Matrix job (watch for the patch set it was commented on)
2. Jenkins: find out the matrix job that corresponds to the comment in
1
3. Jenkins: find out the right platform job from the matrix job in 2
4. Jenkins: find out single job build outcome for the platform job in 3

Too many steps? Confusing? Something that could be improved?

Khai from the Openstack project and myself wrote verify-status gerrit
plugin: [1], that maintains secondary verify notification channel (the
fist one is reviewers notification channel; the comment table on change
screen should only include human comments and no spam with build
start/end notifications), persists the data in its own database (one
table) and loads and visualizes the data per patch set on the change
screen. With this plugin deployed, all 4 steps above are gone. Either
drop down control is used with links to the build log per per job that
corresponds to the patch set currently loaded on the change screen. Or,
alternatively, dedicated verify-status panel from the plugin is
rendered directly on the change screen.

Announcement: [2]. Screenshot: [3].

ATM Jenkins trigger plugin must be extended to support this verify
channel, e.g. plugin ssh command must be invoked to add build events to
the plugin data: [4].

Needless to say, that ones this works, the notification fire hose that
spams comment table with build notifications should be shut down.
Moreover the data gathered in the plugin can be easily accessed and
evaluated either directly with database own SQL tools, or even remotely
per plugin own ssh command: [5].

* [1] https://gerrit.googlesource.com/plugins/verify-status/+/master/sr
c/main/resources/Documentation
* [2] http://lists.openstack.org/pipermail/openstack-infra/2016-March/0
04098.html
* [3] https://imgur.com/KDquXfy
* [4] https://gerrit.googlesource.com/plugins/verify-status/+/master/sr
c/main/resources/Documentation/cmd-save.md
* [5] https://gerrit.googlesource.com/plugins/verify-status/+/master/sr
c/main/java/com/googlesource/gerrit/plugins/verifystatus/commands/Verif
yStatusAdminQueryShell.java


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

GSoC Report : Week #7

[Jaskaran Singh]

Hi,
I'm Working on the project to integrate Orcus with Libo so that we could
import cell styles from an xml  file. The following work has been done this
week :-

   1. Interface for Orcus has been implemented in Libreoffice.
   2. The interface has been tested manually.

This week I plan to do the following work

   1. Make automated tests for the interface.
   2. Add functionality to import conditional format in orcus.

Thanks for reading this.

Regards,
Jaskaran
IRC Nick : jvsg
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - include/xmloff sw/source xmloff/source

[Rosemary Sebastian]

 include/xmloff/XMLTrackedChangesImportContext.hxx |   15 +++--
 include/xmloff/txtimp.hxx |   23 +---
 sw/source/filter/xml/XMLRedlineImportHelper.cxx   |   48 +-
 sw/source/filter/xml/XMLRedlineImportHelper.hxx   |   18 +++---
 sw/source/filter/xml/xmltexti.cxx |   26 +
 sw/source/filter/xml/xmltexti.hxx |9 +--
 xmloff/source/text/XMLChangeElementImportContext.cxx  |2 
 xmloff/source/text/XMLChangeImportContext.cxx |4 -
 xmloff/source/text/XMLTrackedChangesImportContext.cxx |   42 +--
 xmloff/source/text/txtimp.cxx |   43 +++-
 xmloff/source/text/txtparai.cxx   |7 ++
 11 files changed, 142 insertions(+), 95 deletions(-)

New commits:
commit 45675aed3b9c121266d78e37bccc00dbfbcda09b
Author: Rosemary Sebastian 
Date:   Wed Jul 13 06:28:30 2016 +0530

Access aRedlineMap when parsing content.xml

- Moved aRedlineMap to global scope.
- Made it two-dimensional with the first index indicating the paragraph
  index and the second indicating the text position within the paragraph.

Change-Id: I1c21040e258344c2c42e880fd30dc0efc3689815

diff --git a/include/xmloff/XMLTrackedChangesImportContext.hxx 
b/include/xmloff/XMLTrackedChangesImportContext.hxx
index f19052a..5737e95 100644
--- a/include/xmloff/XMLTrackedChangesImportContext.hxx
+++ b/include/xmloff/XMLTrackedChangesImportContext.hxx
@@ -57,13 +57,15 @@ public:
 /// redline date
 OUString sDate;
 
-/// redline date
-OUString sStart;
+/// redline start
+OUString sStartParaPos;
+OUString sStartTextPos;
 
-/// redline date
-OUString sEnd;
+/// redline end
+OUString sEndParaPos;
+OUString sEndTextPos;
 
-/// redline date
+/// redline type
 OUString sType;
 
 /// merge-last-paragraph flag
@@ -89,7 +91,8 @@ public:
const OUString& rAuthor,
const OUString& rComment,
const OUString& rDate,
-   const sal_uInt32);
+   const OUString& rStartParaPos,
+   const OUString& rStartTextPos);
 
 /// create redline XText/XTextCursor on demand and register with
 /// XMLTextImportHelper
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 12825dd..01045d0 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -390,7 +390,6 @@ private:
 static std::shared_ptr MakeBackpatcherImpl();
 
 sal_Int16nParaIdx = 0;
-bool bInsertRedline = false;
 protected:
 virtual SvXMLImportContext *CreateTableChildContext(
 SvXMLImport& rImport,
@@ -658,8 +657,6 @@ public:
 virtual void RedlineAdd(
 /// redline type (insert, del,... )
 const OUString& rType,
-/// use to identify this redline
-const OUString& rId,
 /// name of the author
 const OUString& rAuthor,
 /// redline comment
@@ -668,13 +665,16 @@ public:
 const css::util::DateTime& rDateTime,
 /// merge last paras
 bool bMergeLastParagraph,
-const sal_uInt32 nStartParaPos);
+/// start position
+const OUString& rStartParaPos,
+const OUString& rStartTextPos);
 
 virtual css::uno::Reference< css::text::XTextCursor> RedlineCreateText(
 /// needed to get the document
 css::uno::Reference< css::text::XTextCursor > & rOldCursor,
 /// ID used to RedlineAdd() call
-const OUString& rId);
+const OUString& rParaPos,
+const OUString& rTextPos);
 
 virtual bool CheckRedlineExists(
 /// ID used to RedlineAdd() call
@@ -682,7 +682,8 @@ public:
 
 virtual void RedlineSetCursor(
 /// ID used to RedlineAdd() call
-const OUString& rId,
+const OUString& rParaPos,
+const OUString& rTextPos,
 /// start or end Cursor
 bool bStart,
 /// range is not within 
@@ -695,11 +696,15 @@ public:
 const css::uno::Sequence & rProtectionKey );
 
 /// get the last open redline ID
-OUString GetOpenRedlineId();
+OUString GetOpenRedlineParaPos();
+/// get the last open redline ID
+OUString GetOpenRedlineTextPos();
+/// modify the last open redline ID
+void SetOpenRedlineParaPos( OUString const & rParaPos);
 /// modify the last open redline ID
-void SetOpenRedlineId( OUString const & rId);
+void SetOpenRedlineTextPos( OUString const & rTextPos);
 /// reset the last open redline ID
-void ResetOpenRedlineId();
+void ResetOpenRedlinePositions();
 
 /** redlining : Setter to remember the fact we are inside/outside
  * a  element (deleted redline section) */
diff --git a/sw/source/filter/xml

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - desktop/source include/opencl opencl/source sc/source

[Michael Meeks]

 desktop/source/app/opencl.cxx|   12 
 include/opencl/openclwrapper.hxx |1 +
 opencl/source/openclwrapper.cxx  |1 +
 sc/source/core/opencl/formulagroupcl.cxx |5 +
 4 files changed, 19 insertions(+)

New commits:
commit 9ad26139b5e8a4df469399378baeac5083f2fcf5
Author: Michael Meeks 
Date:   Tue Jul 12 19:39:33 2016 +0100

tdf#100883 - opencl impls. that use SEH are still bad.

Amazingly we fell-back to the old calculation path for
crashes in older LibreOffices.

Change-Id: Ia182f7a25c5560b68494d5cdd68e02925bfd5845
Reviewed-on: https://gerrit.libreoffice.org/27169
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 09f2204..2b8d6d6 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -46,6 +46,8 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 bool bSuccess = false;
 css::uno::Reference< css::lang::XComponent > xComponent;
 
+sal_uInt64 nKernelFailures = opencl::kernelFailures;
+
 SAL_INFO("opencl", "Starting CL test spreadsheet");
 
 try {
@@ -95,11 +97,21 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message);
 }
 
+if (nKernelFailures != opencl::kernelFailures)
+{
+// tdf#
+SAL_WARN("opencl", "OpenCL kernels failed to compile, "
+ "or took SEH exceptions "
+ << nKernelFailures << " != " << opencl::kernelFailures);
+bSuccess = false;
+}
+
 if (!bSuccess)
 OpenCLZone::hardDisable();
 if (xComponent.is())
 xComponent->dispose();
 
+
 return bSuccess;
 }
 
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index b173d89..afd34c6 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -53,6 +53,7 @@ struct OPENCL_DLLPUBLIC GPUEnv
 };
 
 extern OPENCL_DLLPUBLIC GPUEnv gpuEnv;
+extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures;
 
 OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const 
char * clFileName );
 OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuEnv, const char* filename, int idx);
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index a54e94d..123c2c9 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -58,6 +58,7 @@ using namespace std;
 namespace opencl {
 
 GPUEnv gpuEnv;
+sal_uInt64 kernelFailures = 0;
 
 namespace {
 
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index fbd4b0a..6be5dec 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -4053,6 +4053,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& 
rConfig, ScTokenArray&
 catch (...)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled compiler 
error");
+::opencl::kernelFailures++;
 return nullptr;
 }
 return pDynamicKernel;
@@ -4163,21 +4164,25 @@ public:
 catch (const UnhandledToken& ut)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled token: 
" << ut.mMessage << " at " << ut.mFile << ":" << ut.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const OpenCLError& oce)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error from 
" << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << 
oce.mFile << ":" << oce.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const Unhandled& uh)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled case at 
" << uh.mFile << ":" << uh.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (...)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled 
compiler error");
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |   22 --
 sc/source/core/tool/interpr2.cxx |2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 633413a37ee7442cd899db1269fd3ef404efe58a
Author: Eike Rathke 
Date:   Wed Jul 13 01:11:00 2016 +0200

Resolves: tdf#100768 accept empty missing argument also for first parameter

... and let the interpreter decide about validity. Only if at least two
parameters are given, empty/omitted or not.

Change-Id: I2d7070e56f616b1940ff577c43e257eabb81b412

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 2ed3d59..8cb9534 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4408,17 +4408,19 @@ ScTokenArray* ScCompiler::CompileString( const 
OUString& rFormula )
 default:
 break;
 }
-if( (eLastOp == ocSep ||
- eLastOp == ocArrayRowSep ||
- eLastOp == ocArrayColSep ||
- eLastOp == ocArrayOpen) &&
-(eOp == ocSep ||
- eOp == ocClose ||
- eOp == ocArrayRowSep ||
- eOp == ocArrayColSep ||
- eOp == ocArrayClose) )
+if (!(eLastOp == ocOpen && eOp == ocClose) &&
+(eLastOp == ocOpen ||
+ eLastOp == ocSep ||
+ eLastOp == ocArrayRowSep ||
+ eLastOp == ocArrayColSep ||
+ eLastOp == ocArrayOpen) &&
+(eOp == ocSep ||
+ eOp == ocClose ||
+ eOp == ocArrayRowSep ||
+ eOp == ocArrayColSep ||
+ eOp == ocArrayClose))
 {
-// FIXME: should we check for known functions with optional empty
+// TODO: should we check for known functions with optional empty
 // args so the correction dialog can do better?
 if ( !static_cast(pArr)->Add( new 
FormulaMissingToken ) )
 {
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 458236e..9c8f5e3 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -646,6 +646,8 @@ void ScInterpreter::ScGetDate()
 {
 sal_Int16 nDay   = GetInt16();
 sal_Int16 nMonth = GetInt16();
+if (IsMissing())
+SetError( errParameterExpected);// Year must be given.
 sal_Int16 nYear  = GetInt16();
 if (nGlobalError || nYear < 0)
 PushIllegalArgument();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/qa/unit/data/functions/fods/fvschedule.fods |  549 -
 sc/qa/unit/data/functions/fods/oddlprice.fods  |   65 +-
 sc/qa/unit/data/functions/fods/weeks.fods  |   92 ++--
 sc/qa/unit/data/functions/fods/years.fods  |   98 ++--
 sc/source/core/tool/interpr4.cxx   |   31 -
 5 files changed, 424 insertions(+), 411 deletions(-)

New commits:
commit 4f322f8c6edfceae31e5c61ee2506996083637bf
Author: Eike Rathke 
Date:   Wed Jul 13 00:45:28 2016 +0200

tdf#100759 pass empty Any for omitted missing argument to Add-In functions

Add-In functions have to explicitly support a missing argument, not get a
default 0 substitute value passed.

For this, some already existing function test cases had to be adapted. YEARS
and WEEKS last arguments are required, and the FVSCHEDULE and ODDLPRICE 
cases
now work as in Excel.

Change-Id: Iec362db2a23b431db5917613faad2ea88a09a89c

diff --git a/sc/qa/unit/data/functions/fods/fvschedule.fods 
b/sc/qa/unit/data/functions/fods/fvschedule.fods
index 7301c51..d58add1 100644
--- a/sc/qa/unit/data/functions/fods/fvschedule.fods
+++ b/sc/qa/unit/data/functions/fods/fvschedule.fods
@@ -1,13 +1,13 @@
 
 
 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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis: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: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:form
 x="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.spreadsheet">
- 
2016-06-27T22:10:06.775530967P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/c8a94cae37029b037507ce86d149ba56ca341f11
+ 
2016-06-27T22:10:06.775530967P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/83d5a4a9c256eaef4c04f799db38b373d9cff4d5
  
   
0
0
24768
-   9699
+   9646

 
  view1
@@ -28,10 +28,11 @@
90
60
true
+   false
   
   
-   4
-   5
+   2
+   8
0
0
0
@@ -45,10 +46,11 @@
90
60
true
+   false
   
  
  Sheet2
- 1241
+ 567
  0
  90
  60
@@ -69,6 +71,7 @@
  1
  1
  true
+ false
 

   
@@ -88,10 +91,12 @@
true
true
true
+   true
+   true
false
12632256
false
-   Lexmark-E352dn
+   Generic 
Printer

 
  cs
@@ -115,14 +120,12 @@
  
 

-   true
-   true
3
1
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   hAH+/0dlbmVyaWMgUHJpbnRlcgAAU0dFTlBSVAAWAAMAqgAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBz

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.5.1' created by Christian Lohmaier 
 at 2016-07-12 22:44 +

Tag libreoffice-5.1.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXhXLHAAoJEPQ0oe+v7q6jq4kQANB//drVpC4QlkAg0V0pLZ7l
Jz43vclo+/kHotssE4ptN2gTOv3v+7JAmXbDlz7nqzur6OcfoNDJTNWiSm09wZNO
73wVjnqTKrFKWpBeQDdTrB0JvrTji+YwwOTT7PWzlpJCAYpEAm64ioq/inVGPOCI
6gPtQHjbd90Z3pKv2TKIflTQIgkn6Ng1VdmsHtl9+UHWAW1sEW13Gpa3jZQxap9D
omTlNjaKdqWaJB+LilOfIHARlTZZvpd7uUFOKhI3MEigpkFjERvT9wtEosYzObzW
kFu4a4uspHgcgpwjgKSqsOHgvomeF1becFwpa8w504u984JA0M/QED0gzhOLFilq
/M6TZwscwRoDUjBxfF9XG3t0jjuvDVd2XGipbNZyy3Nbn3KB2OufLoWfJzJlDxoe
Crfdyyq/OqRn+87D1/6TOJnEhHOPkBJIHCH8tDer72uFwluPPUo4BSe4W/yMR0E+
kNxtm/W7MTJW45xCq7mmtBKxApHqigrCnQtF+Mj+1FF0VhtJdOdCF3Vnqp5apuu1
EgGfqBayC/1m+osm7qf4GH8udxeb6MeALP7N7B91jFH8lqgQpjKVprQPE9LytA6o
rDfeOnpOJp4QWkgBE3J2l2Bpq9oAAP13yWUtKNzIflaf/2PiXtaTZn1TvDvQr39M
LZULKfd+bSRkmE4M5uje
=KF/6
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.5.1' created by Christian Lohmaier 
 at 2016-07-12 22:44 +

Tag libreoffice-5.1.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXhXK/AAoJEPQ0oe+v7q6jjdgQAKERQ5V51nhl2J72jQgusjx4
vDigQQ54fxM9pyZsq4LCmyfh8vbbPTmpxI8P2oBTAURzfETCfW3kSd9bW9Rjbsk/
Ot4JFnirFgEgeeAddxmfyVfGTHK201S7g3mxBPKs7y5JuZLnklCxxWdL/PZKk0UU
RfxbAMsGWgjN2Xv+ZHs9PSX8r7O9AUea3LAQetwVCRkf7Y98JXsYlKoiW0SQRcdg
+YzfThBeKkPicL6oUDFn8R49E++HjOFW8oh4AaWGimZdk44u0jiYr0rqKk/0T94B
zyXNhQqkz0+AYKOEtHld09L2EMPUShRXNdcwUNHauiAnoRuGM9kmK6LH6d9Civ6R
9Etwq4zCCBZIHTh+prU21SV+apQ5bx1nlAF6Y/KagZtHQFgYcfhXL14YEaSZYMq7
HUv3XUN5MFDfRoAJW+CuyFVEsnFaamIq9cu8kda8qmpmW0NzZWg5MYCPEeaiH9SZ
wJOuGZwJjmTLA7NZVYXgkuKvAiBiiotcT/aJg8OyWJYHDcJPQijlMUQmjaSLOcod
+aUU4TVrdzXtaAGfUL4IX5SgmAZoq9zMoNzv+3UFbPle8lbrSAl2DH/6ZmqXkfoR
o/gqUiilOODaLtkLQTvboXkX+brE3FPwoUKeDuYuN/ZrqjNIBsr7xZ5mPBH0QlJ0
X11J//ptpZN9QvFQkSg2
=3b26
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.5.1' created by Christian Lohmaier 
 at 2016-07-12 22:44 +

Tag libreoffice-5.1.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXhXLEAAoJEPQ0oe+v7q6jsjwQAKFG8TNPc4da8tKUX8NIOMku
U/JyGH3NJgMz09ZfSUIol3dmk29zQCwNuvi1IaG8TgMCvraxmyMrFUcpMfbEaEdT
lLMB0qOvxhYvhl+BfaJPnq/9VN7q2XpZ1hPRzzPbpjC9sncA18+0+oTEEI1l1CjC
KLkFXuBXSk6qG8h6ZMHbrOZ2oTAJQvAIJnplVb5leLfu5GK+HZYPR77+sKAR1W9M
xwiY0ucp7CVbGOliF49PlCZTDR6boQNg/wzyXTuOIDdEH+3Kw1s20WNntaIDm0x6
hozWRCM+kbSyBBWvHbjgYwabqoirezEvusTlVs8ymmcNFtS6A7rAGUuJweWX858+
ulPXEC7qzHhG/rNZybnjbozz1qXU5wodLeHVJujJ29CtMbkdn0yGolL/07R+lfB1
1UpxexiNcg2CZ8a9TnOQNjC4kmT0orP5DOyEdqd9Nr/8brmztnnXstfqV23w1Asd
Uxe7dTz+8osljo0P9K988HfpeVvuShbyJ2PlRlt/KMyfZGBOumoL+2iYJzZlz2SL
FxfGy51L7GTaqCQWv3M4v8sv3ole/xBRWR9U4UKZ8XlT9p/44LvKEyosZop1xKmZ
EBd7xzyvtTSvUb5A09ZLtTbtasAp8d9X595+7dMKEUeImh9NTRluYq4bLihIzYi+
K6N+Iulf5DBBBuFTMIXQ
=vpld
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-5' - configure.ac

[Christian Lohmaier]

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

New commits:
commit ac0cf2cb2fabeb577ecb7af737b7fe6ac191a4b1
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:45:01 2016 +0200

bump product version to 5.1.5.1.0+

Change-Id: I82beb3fd1b431e7412542e26b91856a4872461e5

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.5.1' created by Christian Lohmaier 
 at 2016-07-12 22:44 +

Tag libreoffice-5.1.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXhXLKAAoJEPQ0oe+v7q6jjJ8P/0jrhuI5C3bSH0SNkKNZlqRs
9U5FxgXG1Uw9MceyWlbOaXeC5Evz4rii5Qr9kMvIUuUdQxvv+Ic03v3hY2TKtFlY
lni+prQTSn48wqGSoqK3pe/5qoryYvY0I3AkqYPnGWWDxTr1ufs0MSqqtLonP+eq
XvnIJbxvwV1+/8MdN7mFnxc/per/2Bdh7B1Njlb/Nlwu9Y2q0Euw53lD87uJjYBx
JnnQTlPORz36RPaAMIpT+aS8fC/WXuqYYX3mATvITT9Ha7ZHm0TVdNDHJlHx+0C5
qu0Sug1k9OXqmHVI+asPiGffkC0qVp+Cep8w6CkkeHIXhrFJwqAVvrMA0e+/VUkV
XfXgF0qlcUu96a84apuwwjBggC9htZpgouVZxE5uKzPtApanDsZ3IMA/CVsO/2VK
ibG8R7QvD2OrWcqz2cf1tE4Fy32jWwV7+ob5osLrTF0DmQxVsQutKjmVxhXaU6pH
imPY9vYaCDlXzsg0okr5aOWwriaE0OwobklIqWEEkP5v0np5VP8Ms1BuR4Lhw/vv
sm/9DXqtczfES26gFPfNFeY+ctQGIBJMBsvH5HCBXRWxlVHA4mksDN8VF+XOZrmq
eWIvsUFZsZoDnTqIlVRedmdzSykVkiw6tf/0uc6Akp9JZfjVLwO6unITgqvX1LKk
qYYCLz3zM0Sj1m2etRG0
=Cs95
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - configure.ac

[Christian Lohmaier]

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

New commits:
commit a52bd477f9404c05c18876533e66c9676a84c5ae
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:42:40 2016 +0200

bump product version to 5.1.6.0.0+

Change-Id: I8c04fe8697795a244efd4e19e5bf2daaf0dd69d6

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

[Libreoffice-commits] core.git: Changes to 'libreoffice-5-1-5'

[Christian Lohmaier]

New branch 'libreoffice-5-1-5' available with the following commits:
commit 8c726b5957477a6b10f0f9abb955c622a6b68095
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:41:13 2016 +0200

Branch libreoffice-5-1-5

This is 'libreoffice-5-1-5' - the stable branch for the 5.1.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I6a12a32745bbaaaddb1644f00a8726e8b91d463d

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-5-1-5'

[Christian Lohmaier]

New branch 'libreoffice-5-1-5' available with the following commits:
commit 71adcbbe868044562de2a940aa3746227214a6ab
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:40:56 2016 +0200

Branch libreoffice-5-1-5

This is 'libreoffice-5-1-5' - the stable branch for the 5.1.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I035d43ce4b936370aa02b7642e58bbd818310834

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-1-5'

[Christian Lohmaier]

New branch 'libreoffice-5-1-5' available with the following commits:
commit 81e5aa8c54c8e2226a54e73f906ccb3ab757e1e0
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:40:57 2016 +0200

Branch libreoffice-5-1-5

This is 'libreoffice-5-1-5' - the stable branch for the 5.1.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ided56465a86ccd45d22ae3e33ed24c94463c9e5f

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-1-5'

[Christian Lohmaier]

New branch 'libreoffice-5-1-5' available with the following commits:
commit a8ea9468418df5eb6e8d83628e94735eaaa39144
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:40:56 2016 +0200

Branch libreoffice-5-1-5

This is 'libreoffice-5-1-5' - the stable branch for the 5.1.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ia5b7ef80159fade54abbbd94c5652c211696ba2e

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1162 ++--
 1 file changed, 581 insertions(+), 581 deletions(-)

New commits:
commit 7ca5da3ccbde26aa66f917f47bae8ce890c122c6
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:36:03 2016 +0200

update credits

Change-Id: I6d1fbba2231faaf3ef64564705cf5b1fbcc8433a
(cherry picked from commit 1c54cbf5bd811423ddfc29bea321510a1533d7d9)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c61fcd..e56ffeb 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
686
@@ -68,7 +68,7 @@
false
false
true
-   5524284
+   5578286
false
false
false
@@ -330,19 +330,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -390,7 +390,7 @@

   
   
-   
+   
   
   

@@ -401,12 +401,12 @@
   

   
+  
+   
+  
   

   
-  
-   
-  
   

   
@@ -1027,7 +1027,7 @@

   
  Credits
-1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-07 03:56:04.
+1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-12 09:40:24.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1054,10 +1054,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19607Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19657Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12323Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12423Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1068,10 +1068,10 @@
Tor 
LillqvistCommits: 7439Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6105Joined: 2011-12-12
+   *Noel GrandinCommits: 
6109Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5718Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5726Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 5520Joined: 
2008-06-16
@@ -1085,15 +1085,15 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   *Markus MohrhardCommits: 
4354Joined: 2011-03-17
+   *Markus MohrhardCommits: 
4370Joined: 2011-03-17
   
   
-   Eike 
RathkeCommits: 3339Joined: 
2000-

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1162 ++--
 1 file changed, 581 insertions(+), 581 deletions(-)

New commits:
commit 4586d4ba9d418268bdaeadabf0eec0c6cd785005
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:36:03 2016 +0200

update credits

Change-Id: I6d1fbba2231faaf3ef64564705cf5b1fbcc8433a
(cherry picked from commit 1c54cbf5bd811423ddfc29bea321510a1533d7d9)
(cherry picked from commit cca5cd7f725a045a19aba74f9ed2bbc3c1963cfc)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c61fcd..e56ffeb 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
686
@@ -68,7 +68,7 @@
false
false
true
-   5524284
+   5578286
false
false
false
@@ -330,19 +330,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -390,7 +390,7 @@

   
   
-   
+   
   
   

@@ -401,12 +401,12 @@
   

   
+  
+   
+  
   

   
-  
-   
-  
   

   
@@ -1027,7 +1027,7 @@

   
  Credits
-1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-07 03:56:04.
+1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-12 09:40:24.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1054,10 +1054,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19607Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19657Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12323Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12423Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1068,10 +1068,10 @@
Tor 
LillqvistCommits: 7439Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6105Joined: 2011-12-12
+   *Noel GrandinCommits: 
6109Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5718Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5726Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 5520Joined: 
2008-06-16
@@ -1085,15 +1085,15 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   *Markus MohrhardCommits: 
4354Joined: 2011-03-17
+   *Markus MohrhardCommits: 
4370Joined: 2

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1162 ++--
 1 file changed, 581 insertions(+), 581 deletions(-)

New commits:
commit 1c54cbf5bd811423ddfc29bea321510a1533d7d9
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:36:03 2016 +0200

update credits

Change-Id: I6d1fbba2231faaf3ef64564705cf5b1fbcc8433a

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c61fcd..e56ffeb 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
686
@@ -68,7 +68,7 @@
false
false
true
-   5524284
+   5578286
false
false
false
@@ -330,19 +330,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -390,7 +390,7 @@

   
   
-   
+   
   
   

@@ -401,12 +401,12 @@
   

   
+  
+   
+  
   

   
-  
-   
-  
   

   
@@ -1027,7 +1027,7 @@

   
  Credits
-1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-07 03:56:04.
+1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-12 09:40:24.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1054,10 +1054,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19607Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19657Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12323Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12423Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1068,10 +1068,10 @@
Tor 
LillqvistCommits: 7439Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6105Joined: 2011-12-12
+   *Noel GrandinCommits: 
6109Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5718Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5726Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 5520Joined: 
2008-06-16
@@ -1085,15 +1085,15 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   *Markus MohrhardCommits: 
4354Joined: 2011-03-17
+   *Markus MohrhardCommits: 
4370Joined: 2011-03-17
   
   
-   Eike 
RathkeCommits: 3339Joined: 
2000-10-11
+   Eike 
RathkeCommits: 3343Joined: 
2000-10-11
   
  

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1162 ++--
 1 file changed, 581 insertions(+), 581 deletions(-)

New commits:
commit cca5cd7f725a045a19aba74f9ed2bbc3c1963cfc
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:36:03 2016 +0200

update credits

Change-Id: I6d1fbba2231faaf3ef64564705cf5b1fbcc8433a
(cherry picked from commit 1c54cbf5bd811423ddfc29bea321510a1533d7d9)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c61fcd..e56ffeb 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.4.2$Linux_X86_64
 
LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
686
@@ -68,7 +68,7 @@
false
false
true
-   5524284
+   5578286
false
false
false
@@ -330,19 +330,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -390,7 +390,7 @@

   
   
-   
+   
   
   

@@ -401,12 +401,12 @@
   

   
+  
+   
+  
   

   
-  
-   
-  
   

   
@@ -1027,7 +1027,7 @@

   
  Credits
-1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-07 03:56:04.
+1177 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-07-12 09:40:24.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1054,10 +1054,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19607Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19657Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12323Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12423Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1068,10 +1068,10 @@
Tor 
LillqvistCommits: 7439Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6105Joined: 2011-12-12
+   *Noel GrandinCommits: 
6109Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5718Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5726Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 5520Joined: 
2008-06-16
@@ -1085,15 +1085,15 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   *Markus MohrhardCommits: 
4354Joined: 2011-03-17
+   *Markus MohrhardCommits: 
4370Joined: 2011-03-17
   
   
-   Eike 
RathkeCommits: 3339Joined: 
2000-

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-1' - source/cy source/da source/de source/eo source/es source/eu source/fi source/gl source/gug source/hu source/is source/lt source/lv so

[Christian Lohmaier]

 source/cy/framework/source/classes.po  |   10 
 source/cy/instsetoo_native/inc_openoffice/windows/msi_languages.po |   18 
 source/cy/vcl/source/src.po|6 
 source/da/helpcontent2/source/text/sbasic/shared.po|   18 
 source/de/editeng/source/misc.po   |   11 
 source/de/helpcontent2/source/text/schart.po   |8 
 source/de/helpcontent2/source/text/shared/guide.po |   10 
 source/de/instsetoo_native/inc_openoffice/windows/msi_languages.po |8 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/de/svtools/source/dialogs.po|   10 
 source/de/vcl/uiconfig/ui.po   |8 
 source/eo/dictionaries/es.po   |   10 
 source/eo/filter/uiconfig/ui.po|   10 
 source/eo/sw/source/ui/dbui.po |   14 
 source/eo/sw/uiconfig/swriter/ui.po|   11 
 source/es/basctl/source/basicide.po|8 
 source/es/cui/uiconfig/ui.po   |8 
 source/es/helpcontent2/source/text/sbasic/guide.po |6 
 source/es/helpcontent2/source/text/sbasic/shared/02.po |   16 
 source/es/helpcontent2/source/text/scalc/00.po |   30 
 source/es/helpcontent2/source/text/scalc/01.po |   62 +-
 source/es/helpcontent2/source/text/scalc/guide.po  |   24 
 source/es/helpcontent2/source/text/schart/01.po|   10 
 source/es/helpcontent2/source/text/shared/01.po|   18 
 source/es/helpcontent2/source/text/shared/05.po|6 
 source/es/helpcontent2/source/text/shared/explorer/database.po |   10 
 source/es/helpcontent2/source/text/shared/guide.po |   20 
 source/es/helpcontent2/source/text/shared/optionen.po  |8 
 source/es/helpcontent2/source/text/smath/01.po |   20 
 source/es/helpcontent2/source/text/swriter/04.po   |   16 
 source/es/helpcontent2/source/text/swriter/guide.po|   32 -
 source/es/officecfg/registry/data/org/openoffice/Office.po |   18 
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po  |6 
 source/es/sc/source/core/src.po|   14 
 source/es/sc/source/ui/src.po  |6 
 source/es/scp2/source/accessories.po   |   14 
 source/es/scp2/source/base.po  |   13 
 source/es/scp2/source/ooo.po   |   12 
 source/es/sd/uiconfig/simpress/ui.po   |8 
 source/es/setup_native/source/mac.po   |   10 
 source/es/svtools/source/misc.po   |6 
 source/es/svx/uiconfig/ui.po   |   12 
 source/eu/cui/uiconfig/ui.po   |   10 
 source/eu/dictionaries/es.po   |   10 
 source/eu/extensions/source/update/check.po|   12 
 source/eu/extras/source/autocorr/emoji.po  |   40 -
 source/eu/filter/uiconfig/ui.po|   10 
 source/eu/helpcontent2/source/text/scalc/00.po |8 
 source/eu/helpcontent2/source/text/scalc/01.po |   13 
 source/eu/helpcontent2/source/text/scalc/guide.po  |8 
 source/eu/helpcontent2/source/text/shared.po   |   10 
 source/eu/helpcontent2/source/text/shared/01.po|   83 +-
 source/eu/helpcontent2/source/text/shared/02.po|  130 ++--
 source/eu/helpcontent2/source/text/shared/autopi.po|   10 
 source/eu/helpcontent2/source/text/shared/guide.po |   53 -
 source/eu/helpcontent2/source/text/simpress.po |9 
 source/eu/helpcontent2/source/text/simpress/00.po  |9 
 source/eu/helpcontent2/source/text/smath.po|   11 
 source/eu/helpcontent2/source/text/swriter/00.po   |9 
 source/eu/helpcontent2/source/text/swriter/01.po   |  309 
++
 source/eu/instsetoo_native/inc_openoffice/windows/msi_languages.po |   12 
 source/eu/officecfg/registry/data/org/openoffice/Office/UI.po  |   12 
 source/eu/sc/source/ui/src.po  |8 
 source/eu/sw/source/ui/dbui.po |   14 
 source/eu/sw/uiconfig/swriter/ui.po|   11 
 source/fi/dictionaries/es.po

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

[Christian Lohmaier]

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

New commits:
commit 83d405de1146307d0cc8a18d819489bcdfba0eb1
Author: Christian Lohmaier 
Date:   Wed Jul 13 00:02:30 2016 +0200

Updated core
Project: translations  53bddc131cb00fe59f9649ed95fe60f863618814

update translations for 5.1.5 rc1

and force-fix errors using pocheck

Change-Id: I9f8bdd9d17cc21529d463011bee01b73c63a4624

diff --git a/translations b/translations
index 0597679..53bddc1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 05976795240823d58b9f15bcbf6c84015338880d
+Subproject commit 53bddc131cb00fe59f9649ed95fe60f863618814
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/dist/toolbar/toolbar.js  |   15 ++-
 loleaflet/po/styles/am.po  |4 
 loleaflet/po/styles/ar.po  |4 
 loleaflet/po/styles/bg.po  |4 
 loleaflet/po/styles/br.po  |4 
 loleaflet/po/styles/ca-valencia.po |4 
 loleaflet/po/styles/ca.po  |4 
 loleaflet/po/styles/cs.po  |4 
 loleaflet/po/styles/cy.po  |4 
 loleaflet/po/styles/da.po  |4 
 loleaflet/po/styles/de.po  |4 
 loleaflet/po/styles/el.po  |4 
 loleaflet/po/styles/eo.po  |4 
 loleaflet/po/styles/es.po  |4 
 loleaflet/po/styles/et.po  |4 
 loleaflet/po/styles/eu.po  |4 
 loleaflet/po/styles/fi.po  |4 
 loleaflet/po/styles/fr.po  |4 
 loleaflet/po/styles/gd.po  |4 
 loleaflet/po/styles/gl.po  |4 
 loleaflet/po/styles/gug.po |4 
 loleaflet/po/styles/he.po  |4 
 loleaflet/po/styles/hr.po  |4 
 loleaflet/po/styles/hu.po  |4 
 loleaflet/po/styles/is.po  |4 
 loleaflet/po/styles/it.po  |4 
 loleaflet/po/styles/ja.po  |4 
 loleaflet/po/styles/kk.po  |4 
 loleaflet/po/styles/ko.po  |4 
 loleaflet/po/styles/lt.po  |4 
 loleaflet/po/styles/lv.po  |4 
 loleaflet/po/styles/nb.po  |4 
 loleaflet/po/styles/nl.po  |4 
 loleaflet/po/styles/nn.po  |4 
 loleaflet/po/styles/oc.po  |4 
 loleaflet/po/styles/pl.po  |4 
 loleaflet/po/styles/pt-BR.po   |4 
 loleaflet/po/styles/pt.po  |4 
 loleaflet/po/styles/ro.po  |4 
 loleaflet/po/styles/ru.po  |4 
 loleaflet/po/styles/sk.po  |4 
 loleaflet/po/styles/sl.po  |4 
 loleaflet/po/styles/sq.po  |4 
 loleaflet/po/styles/sv.po  |4 
 loleaflet/po/styles/ta.po  |4 
 loleaflet/po/styles/tr.po  |4 
 loleaflet/po/styles/uk.po  |4 
 loleaflet/po/styles/zh-CN.po   |4 
 loleaflet/po/styles/zh-TW.po   |4 
 49 files changed, 202 insertions(+), 5 deletions(-)

New commits:
commit e5a6ea3421c002d1ca791b58b32831ea182765b2
Author: Henry Castro 
Date:   Tue Jul 12 18:04:37 2016 -0400

loleaflet: l10n of '$1 rows, $2 columns selected'

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 9eee6ac..2227076 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -491,6 +491,14 @@ function toggleButton(toolbar, state, command)
}
 }
 
+function toLocalePattern (pattern, regex, text, sub1, sub2) {
+   var matches = new RegExp(regex, 'g').exec(text);
+   if (matches) {
+   text = pattern.toLocaleString().replace(sub1, 
matches[1]).replace(sub2, matches[2]);
+   }
+   return text;
+}
+
 function onSearch(e) {
if (e.keyCode === 13) {
var toolbar = w2ui['toolbar-down'];
@@ -848,14 +856,11 @@ map.on('commandstatechanged', function (e) {
}
}
else if (commandName === '.uno:StatusDocPos') {
-   matches = new RegExp('Sheet (\\d+) of (\\d+)', 'g').exec(state);
-   if (matches && matches.length === 3) {
-   state = _('Sheet %1 of %2');
-   state = state.replace('%1', matches[1]).replace('%2', 
matches[2]);
-   }
+   state = toLocalePattern('Sheet %1 of %2', 'Sheet (\\d+) of 
(\\d+)', state, '%1', '%2');
$('#StatusDocPos').html(state ? state : 
' ');
}
else if (commandName === '.uno:RowColSelCount') {
+   state = toLocalePattern('$1 rows, $2 columns selected', '(\\d+) 
rows, (\\d+) columns selected', state, '$1', '$2');
$('#RowColSelCount').html(state ? state : 
' ');
}
else if (commandName === '.uno:StatusPageStyle') {
diff --git a/loleaflet/po/styles/am.po b/loleaflet/po/styles/am.po
index c93a0d3..317ee8e 100644
--- a/loleaflet/po/styles/am.po
+++ b/loleaflet/po/styles/am.po
@@ -1993,3 +1993,7 @@ msgstr "ማስገቢያ"
 #: globstr.src
 msgid "Sheet %1 of %2"
 msgstr "ወረቀት %1 ከ %2"
+
+#: globstr.src
+msgid "$1 rows, $2 columns selected"
+msgstr "$1 ረድፎች, $2 አምዶች ተመርጠዋል"
diff --git a/loleaflet/po/styles/ar.po b/loleaflet/po/styles/ar.po
index a009772..564b65e 100644
--- a/loleaflet/po/styles/ar.po
+++ b/loleaflet/po/styles/ar.po
@@ -2002,3 +2002,7 @@ msgstr "إدراج"
 #: globstr.src
 msgid "Sheet %1 of %2"
 msgstr "الورقة %1 من %2"
+
+#: globstr.src
+msgid "$1 rows, $2 columns selected"
+msgstr "$1 صفّ، $2 عمود محدّد"

[ANN] LibreOffice 5.2.0 RC2 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the second release
candidate of LibreOffice 5.2.0. The upcoming 5.2.0 will be the first
release of our fresh 5.2 line. Please be aware that LibreOffice 5.2.0
RC2 has not been flagged as ready for production use yet, however feel
free to give it a try instead of 5.0.6 of 5.1.4.

A work-in-progress list of new features in LibreOffice 5.2 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/5.2

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Windows builds are also provided in 64bit version.

Developers and QA might also be interested in the symbol server for
windows debug information (see
https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg
for
details)

Should you find bugs, please report them to our Bugzilla:

  https://bugs.documentfoundation.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs compared to 5.2.0 rc1 is
available from our wiki:

  http://wiki.documentfoundation.org/Releases/5.2.0/RC2

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

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

[Katarina Behrens]

 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |4 
 sd/source/ui/sidebar/MasterPagesSelector.cxx|2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 7f980b43a79168dec3172ea7b9abe52c6f354bc0
Author: Katarina Behrens 
Date:   Tue Jul 12 09:40:24 2016 +0200

tdf#99107: Unify single click behaviour across panels

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

diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx 
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 6470397..232aedb 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -73,10 +73,6 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
 const css::uno::Reference& rxSidebar)
 : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar)
 {
-// For this master page selector only we change the default action for
-// left clicks.
-mnDefaultClickAction = SID_TP_APPLY_TO_SELECTED_SLIDES;
-
 Link aLink 
(LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
 rBase.GetEventMultiplexer()->AddEventListener(aLink,
 sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx 
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index f04d113..db4a468 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -75,7 +75,7 @@ MasterPagesSelector::MasterPagesSelector (
   mpContainer(rpContainer),
   mrDocument(rDocument),
   mrBase(rBase),
-  mnDefaultClickAction(SID_TP_APPLY_TO_ALL_SLIDES),
+  mnDefaultClickAction(SID_TP_APPLY_TO_SELECTED_SLIDES),
   maCurrentItemList(),
   maTokenToValueSetIndex(),
   maLockedMasterPages(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/dist/toolbar/toolbar.js  |6 ++
 loleaflet/po/styles/am.po  |4 
 loleaflet/po/styles/ar.po  |4 
 loleaflet/po/styles/bg.po  |4 
 loleaflet/po/styles/br.po  |4 
 loleaflet/po/styles/ca-valencia.po |4 
 loleaflet/po/styles/ca.po  |4 
 loleaflet/po/styles/cs.po  |4 
 loleaflet/po/styles/cy.po  |4 
 loleaflet/po/styles/da.po  |4 
 loleaflet/po/styles/de.po  |4 
 loleaflet/po/styles/el.po  |4 
 loleaflet/po/styles/eo.po  |4 
 loleaflet/po/styles/es.po  |4 
 loleaflet/po/styles/et.po  |4 
 loleaflet/po/styles/eu.po  |4 
 loleaflet/po/styles/fi.po  |4 
 loleaflet/po/styles/fr.po  |4 
 loleaflet/po/styles/gd.po  |4 
 loleaflet/po/styles/gl.po  |4 
 loleaflet/po/styles/gug.po |4 
 loleaflet/po/styles/he.po  |4 
 loleaflet/po/styles/hr.po  |4 
 loleaflet/po/styles/hu.po  |4 
 loleaflet/po/styles/is.po  |4 
 loleaflet/po/styles/it.po  |4 
 loleaflet/po/styles/ja.po  |4 
 loleaflet/po/styles/kk.po  |4 
 loleaflet/po/styles/ko.po  |4 
 loleaflet/po/styles/lt.po  |4 
 loleaflet/po/styles/lv.po  |4 
 loleaflet/po/styles/nb.po  |4 
 loleaflet/po/styles/nl.po  |4 
 loleaflet/po/styles/nn.po  |4 
 loleaflet/po/styles/oc.po  |4 
 loleaflet/po/styles/pl.po  |4 
 loleaflet/po/styles/pt-BR.po   |4 
 loleaflet/po/styles/pt.po  |4 
 loleaflet/po/styles/ro.po  |4 
 loleaflet/po/styles/ru.po  |4 
 loleaflet/po/styles/sk.po  |4 
 loleaflet/po/styles/sl.po  |4 
 loleaflet/po/styles/sq.po  |4 
 loleaflet/po/styles/sv.po  |4 
 loleaflet/po/styles/ta.po  |4 
 loleaflet/po/styles/tr.po  |4 
 loleaflet/po/styles/uk.po  |4 
 loleaflet/po/styles/zh-CN.po   |4 
 loleaflet/po/styles/zh-TW.po   |4 
 49 files changed, 198 insertions(+)

New commits:
commit 111c660d46924cbd1e81ab6e1d63cb8d833d42be
Author: Henry Castro 
Date:   Tue Jul 12 16:54:49 2016 -0400

loleaflet: l10n of 'Sheet 1% of %2'

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 30b02d0..9eee6ac 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -741,6 +741,7 @@ map.on('commandstatechanged', function (e) {
var state = e.state;
var found = false;
var value, color, div;
+   var matches;
if (commandName === '.uno:AssignLayout') {
$('.styles-select').val(state).trigger('change');
} else if (commandName === '.uno:StyleApply') {
@@ -847,6 +848,11 @@ map.on('commandstatechanged', function (e) {
}
}
else if (commandName === '.uno:StatusDocPos') {
+   matches = new RegExp('Sheet (\\d+) of (\\d+)', 'g').exec(state);
+   if (matches && matches.length === 3) {
+   state = _('Sheet %1 of %2');
+   state = state.replace('%1', matches[1]).replace('%2', 
matches[2]);
+   }
$('#StatusDocPos').html(state ? state : 
' ');
}
else if (commandName === '.uno:RowColSelCount') {
diff --git a/loleaflet/po/styles/am.po b/loleaflet/po/styles/am.po
index f4f8339..c93a0d3 100644
--- a/loleaflet/po/styles/am.po
+++ b/loleaflet/po/styles/am.po
@@ -1989,3 +1989,7 @@ msgstr "በላዩ ላይ ደርቦ መጻፊያ"
 #: globstr.src
 msgid "Insert"
 msgstr "ማስገቢያ"
+
+#: globstr.src
+msgid "Sheet %1 of %2"
+msgstr "ወረቀት %1 ከ %2"
diff --git a/loleaflet/po/styles/ar.po b/loleaflet/po/styles/ar.po
index 4925768..a009772 100644
--- a/loleaflet/po/styles/ar.po
+++ b/loleaflet/po/styles/ar.po
@@ -1998,3 +1998,7 @@ msgstr "الكتابة على"
 #: globstr.src
 msgid "Insert"
 msgstr "إدراج"
+
+#: globstr.src
+msgid "Sheet %1 of %2"
+msgstr "الورقة %1 من %2"
diff --git a/loleaflet/po/styles/bg.po b/loleaflet/po/styles/bg.po
index e809ce8..938edb6 100644
--- a/loleaflet/po/styles/bg.po
+++ b/loleaflet/po/styles/bg.po
@@ -1989,3 +1989,7 @@ msgstr "Заместване"
 #: globstr.src
 msgid "Insert"
 msgstr "Вмъкване"
+
+#: globstr.src
+msgid "Sheet %1 of %2"
+msgstr "Лист %1 от %2"
diff --git a/loleaflet/po/styles/br.po b/loleaflet/po/styles/br.po
index 773cf9b..6a3fcfa 100644
--- a/loleaflet/po/styles/br.po
+++ b/loleaflet/po/styles/br.po
@@ -1998,3 +1998,7 @@ msgstr "Flastrañ"
 #: globstr.src
 msgid "Insert"
 msgstr "Enlakaat"
+
+#: globstr.

Re: XLegacyFastParser - Errors

[Mohammed Abdul Azeem]

On Mon, Jul 11, 2016 at 1:48 PM, Michael Meeks 
wrote:
>
> On Mon, 2016-07-11 at 10:22 +0530, Mohammed Abdul Azeem wrote:
>
> > 2. SwUiWriterTest::testAutoCorr
> > It fails with an uncaught exception of type
> > com.sun.star.container.NoSuchElementException.
> > It fails at sw/qa/extras/uiwriter/uiwriter.cxx:1034, so I assume these
> > statements
> > pWrtShell->Insert("Bolt");
> > pWrtShell->AutoCorrect(corr, cIns);
> > at line 1032 and 1033 is failing for some reason.
> > During the execution of those statements, LegacyParser is called with
> > these two filters as document handlers.
> > com.sun.star.comp.Writer.XMLStylesImporter
> > com.sun.star.comp.Writer.XMLContentImporter
>
> A quick git grep:
>
> xmloff/source/transform/OOo2Oasis.cxx-OOO_IMPORTER(
> XMLWriterContentImportOOO,
> xmloff/source/transform/OOo2Oasis.cxx:
> "com.sun.star.comp.Writer.XMLContentImporter",
> xmloff/source/transform/OOo2Oasis.cxx-
> "com.sun.star.comp.Writer.XMLOasisContentImporter" )
>
> Suggests that there is some sort of wrapper / renaming (?)
>
> sw/source/filter/xml/xmlimp.cxx-extern "C" SAL_DLLPUBLIC_EXPORT
> css::uno::XInterface* SAL_CALL
> sw/source/filter/xml/xmlimp.cxx:com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XComponentContext*
> context,
> sw/source/filter/xml/xmlimp.cxx-css::uno::Sequence
> const &)
>
> Might be a good place to look,
>
> At some point of time ManifestReader::readManifestSequence is called,
which calls the parser. But our new parser is not emitting any events for
this source, while XParser parses the manifest file and emits some events.
I am not sure why this is happening. I have attached the diff -u of outputs
of events emitted by both the parsers during SwUiWriterTest::testAutoCorr
test.

Any help is appreciated.

Thanks,
Azeem
--- xparser.txt 2016-07-13 00:22:37.251741561 +0530
+++ legacyfastparser.txt2016-07-13 00:22:38.419716423 +0530
@@ -699,160 +699,10 @@
 Attribs: script:name = Module1
 Attribs: script:language = StarBasic
 characters: REM  *  BASIC  *
-characters: 
 
-characters: 
-
-characters: Sub Main
-characters: 
-
-characters: 
-
-characters: End Sub
-startElement: manifest:manifest
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = /
-Attribs: manifest:media-type = 
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/styles.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/manifest.rdf
-Attribs: manifest:media-type = application/rdf+xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/content.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/
-Attribs: manifest:media-type = application/vnd.oasis.opendocument.text
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/content.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/manifest.rdf
-Attribs: manifest:media-type = application/rdf+xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/styles.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/
-Attribs: manifest:media-type = application/vnd.oasis.opendocument.text
-characters: 
-
-startElement: manifest:manifest
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = /
-Attribs: manifest:media-type = 
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/styles.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/manifest.rdf
-Attribs: manifest:media-type = application/rdf+xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/content.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = 4xx/
-Attribs: manifest:media-type = application/vnd.oasis.opendocument.text
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/content.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/manifest.rdf
-Attribs: manifest:media-type = application/rdf+xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/styles.xml
-Attribs: manifest:media-type = text/xml
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = Bolt/
-Attribs: manifest:media-type = application/vnd.oasis.opendocument.text
-characters: 
-
-startElement: manifest:manifest
-characters: 
-
-startElement: manifest:file-entry
-Attribs: manifest:full-path = /
-Attrib

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

[Szymon Kłos]

 sc/uiconfig/scalc/ui/notebookbar.ui | 1700 +++-
 1 file changed, 940 insertions(+), 760 deletions(-)

New commits:
commit 0b7135a62b6ec91e1f03566c1fcada85833925ee
Author: Szymon Kłos 
Date:   Tue Jul 12 21:18:58 2016 +0200

GSoC notebookbar: added priorities in Calc

Change-Id: I8a2426e80411940aa295ed46eefca58c6864943a

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 990fcc9..6d53571 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -198,7 +198,7 @@
 True
 True
 
-  
+  
 True
 False
 6
@@ -267,14 +267,28 @@
   
 
 
-  
+  
 True
-True
-True
-.uno:ExportTo
-ExportToImg
-none
-top
+False
+
+  
+True
+True
+True
+.uno:ExportTo
+ExportToImg
+none
+top
+  
+  
+False
+True
+0
+  
+
+
+  
+
   
   
 False
@@ -283,14 +297,28 @@
   
 
 
-  
+  
 True
-True
-True
-.uno:ExportToPDF
-ExportToPDFImg
-none
-top
+False
+
+  
+True
+True
+True
+.uno:ExportToPDF
+ExportToPDFImg
+none
+top
+  
+  
+False
+True
+0
+  
+
+
+  
+
   
   
 False
@@ -315,13 +343,27 @@
   
 
 
-  
+  
 True
-True
-True
-.uno:Signature
-none
-top
+False
+
+  
+True
+True
+True
+.uno:Signature
+none
+top
+  
+  
+False
+True
+0
+  
+
+
+  
+
   
   
 False
@@ -343,68 +385,157 @@
   
 
 
-  
+  
 True
 False
 6
 
-  
+  
+True
+True
+True
+.uno:Paste
+PasteImg
+none
+top
+  
+  
+False
+True
+0
+  
+
+
+  
 True
 False
-6
+vertical
+
+  
+True
+True
+True
+.uno:Cut
+none
+0
+  
+  
+False
+True
+0
+  
+
 
-  
+  
+True
+True
+True
+.uno:Copy
+none
+0
+  
+  
+False
+

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

[Michael Meeks]

 desktop/source/app/opencl.cxx|   12 
 include/opencl/openclwrapper.hxx |1 +
 opencl/source/openclwrapper.cxx  |1 +
 sc/source/core/opencl/formulagroupcl.cxx |7 +++
 4 files changed, 21 insertions(+)

New commits:
commit e9a1afbd3e12c6935cbacbff84b1b70fea0add85
Author: Michael Meeks 
Date:   Tue Jul 12 19:30:53 2016 +0100

tdf#100883 - opencl impls. that use SEH are still bad.

Amazingly we fell-back to the old calculation path for
crashes in older LibreOffices, might as well have this on master.

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

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 09f2204..4c75ae7 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -46,6 +46,8 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 bool bSuccess = false;
 css::uno::Reference< css::lang::XComponent > xComponent;
 
+sal_uInt64 nKernelFailures = opencl::kernelFailures;
+
 SAL_INFO("opencl", "Starting CL test spreadsheet");
 
 try {
@@ -95,11 +97,21 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message);
 }
 
+if (nKernelFailures != opencl::kernelFailures)
+{
+// tdf#100883 - defeat SEH exception handling fallbacks.
+SAL_WARN("opencl", "OpenCL kernels failed to compile, "
+ "or took SEH exceptions "
+ << nKernelFailures << " != " << opencl::kernelFailures);
+bSuccess = false;
+}
+
 if (!bSuccess)
 OpenCLZone::hardDisable();
 if (xComponent.is())
 xComponent->dispose();
 
+
 return bSuccess;
 }
 
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index b173d89..afd34c6 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -53,6 +53,7 @@ struct OPENCL_DLLPUBLIC GPUEnv
 };
 
 extern OPENCL_DLLPUBLIC GPUEnv gpuEnv;
+extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures;
 
 OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const 
char * clFileName );
 OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuEnv, const char* filename, int idx);
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 2aecdde..9156ec2 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -58,6 +58,7 @@ using namespace std;
 namespace opencl {
 
 GPUEnv gpuEnv;
+sal_uInt64 kernelFailures = 0;
 
 namespace {
 
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index cc82df9..6747bc9 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -4059,6 +4059,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& 
rConfig, ScTokenArray&
 // OpenCLError used to go to the catch-all below, and not delete 
pDynamicKernel. Was that
 // intentional, should we not do it here then either?
 delete pDynamicKernel;
+::opencl::kernelFailures++;
 return nullptr;
 }
 catch (const Unhandled& uh)
@@ -4068,6 +4069,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& 
rConfig, ScTokenArray&
 // Unhandled used to go to the catch-all below, and not delete 
pDynamicKernel. Was that
 // intentional, should we not do it here then either?
 delete pDynamicKernel;
+::opencl::kernelFailures++;
 return nullptr;
 }
 catch (...)
@@ -4075,6 +4077,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& 
rConfig, ScTokenArray&
 // FIXME: Do we really want to catch random exceptions here?
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unexpected 
exception");
 // FIXME: Not deleting pDynamicKernel here!?, is that intentional?
+::opencl::kernelFailures++;
 return nullptr;
 }
 return pDynamicKernel;
@@ -4185,21 +4188,25 @@ public:
 catch (const UnhandledToken& ut)
 {
 SAL_INFO("sc.opencl", "Dynamic formula compiler: UnhandledToken: " 
<< ut.mMessage << " at " << ut.mFile << ":" << ut.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const OpenCLError& oce)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCLError from 
" << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << 
oce.mFile << ":" << oce.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const Unhandled& uh)
 {
 SAL_INFO("sc.opencl", "Dynamic formula 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - desktop/source include/opencl opencl/source sc/source

[Michael Meeks]

 desktop/source/app/opencl.cxx|   12 
 include/opencl/openclwrapper.hxx |1 +
 opencl/source/openclwrapper.cxx  |3 ++-
 sc/source/core/opencl/formulagroupcl.cxx |5 +
 4 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 2b1f1030bf642d1b9c8af91aa78683a9fb95e6f4
Author: Michael Meeks 
Date:   Tue Jul 12 19:39:33 2016 +0100

tdf#100883 - opencl impls. that use SEH are still bad.

Amazingly we fell-back to the old calculation path for
crashes in older LibreOffices.

Change-Id: Ia182f7a25c5560b68494d5cdd68e02925bfd5845
Reviewed-on: https://gerrit.libreoffice.org/27164
Reviewed-by: Jan Holesovsky 
Tested-by: Michael Meeks 

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 09f2204..2b8d6d6 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -46,6 +46,8 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 bool bSuccess = false;
 css::uno::Reference< css::lang::XComponent > xComponent;
 
+sal_uInt64 nKernelFailures = opencl::kernelFailures;
+
 SAL_INFO("opencl", "Starting CL test spreadsheet");
 
 try {
@@ -95,11 +97,21 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message);
 }
 
+if (nKernelFailures != opencl::kernelFailures)
+{
+// tdf#
+SAL_WARN("opencl", "OpenCL kernels failed to compile, "
+ "or took SEH exceptions "
+ << nKernelFailures << " != " << opencl::kernelFailures);
+bSuccess = false;
+}
+
 if (!bSuccess)
 OpenCLZone::hardDisable();
 if (xComponent.is())
 xComponent->dispose();
 
+
 return bSuccess;
 }
 
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 2121f0e..0583400 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -55,6 +55,7 @@ struct OPENCL_DLLPUBLIC GPUEnv
 };
 
 extern OPENCL_DLLPUBLIC GPUEnv gpuEnv;
+extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures;
 
 OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const 
char * clFileName );
 OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuEnv, const char* filename, int idx);
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 807a185..2551b05 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -58,6 +58,7 @@ using namespace std;
 namespace opencl {
 
 GPUEnv gpuEnv;
+sal_uInt64 kernelFailures = 0;
 
 namespace {
 
@@ -883,7 +884,7 @@ const char* errorString(cl_int nError)
 
 bool GPUEnv::isOpenCLEnabled()
 {
-return gpuEnv.mpDevID;
+return gpuEnv.mpDevID && gpuEnv.mpContext;
 }
 
 }
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 8055ecf..c2835c1 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -4057,6 +4057,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& 
rConfig, ScTokenArray&
 catch (...)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled compiler 
error");
+::opencl::kernelFailures++;
 return nullptr;
 }
 return pDynamicKernel;
@@ -4167,21 +4168,25 @@ public:
 catch (const UnhandledToken& ut)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled token: 
" << ut.mMessage << " at " << ut.mFile << ":" << ut.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const OpenCLError& oce)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error from 
" << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << 
oce.mFile << ":" << oce.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const Unhandled& uh)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled case at 
" << uh.mFile << ":" << uh.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (...)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled 
compiler error");
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dtrans/source uitest/impress_tests

[Markus Mohrhard]

 dtrans/source/win32/ftransl/ftransl.cxx  |   26 +-
 dtrans/source/win32/ftransl/ftransl.hxx  |6 ++
 dtrans/source/win32/ftransl/ftranslentry.cxx |2 +-
 uitest/impress_tests/start.py|8 
 4 files changed, 16 insertions(+), 26 deletions(-)

New commits:
commit 37204431c68a4725b4539fa35e9fcea4fe94c166
Author: Markus Mohrhard 
Date:   Tue Jul 12 15:23:31 2016 +0200

avoid name clash for CDataFormatTranslator in ftransl, tdf#100872

E.g.

http://crashreport.libreoffice.org/stats/signature/com::sun::star::datatransfer::DataFormatTranslator::create%28com::sun::star::uno::Reference%3Ccom::sun::star::uno::XComponentContext%3E%20const%20&%29

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

diff --git a/dtrans/source/win32/ftransl/ftransl.cxx 
b/dtrans/source/win32/ftransl/ftransl.cxx
index 073255e..9247f28 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -103,12 +103,12 @@ FormatEntry::FormatEntry(
 
 // ctor
 
-CDataFormatTranslator::CDataFormatTranslator( const Reference< 
XComponentContext >& rxContext ) :
+CDataFormatTranslatorUNO::CDataFormatTranslatorUNO( const Reference< 
XComponentContext >& rxContext ) :
 m_xContext( rxContext )
 {
 }
 
-Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const 
DataFlavor& aDataFlavor )
+Any SAL_CALL CDataFormatTranslatorUNO::getSystemDataTypeFromDataFlavor( const 
DataFlavor& aDataFlavor )
 throw( RuntimeException )
 {
 Any aAny;
@@ -163,7 +163,7 @@ Any SAL_CALL 
CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataF
 return aAny;
 }
 
-DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( 
const Any& aSysDataType )
+DataFlavor SAL_CALL CDataFormatTranslatorUNO::getDataFlavorFromSystemDataType( 
const Any& aSysDataType )
 throw( RuntimeException )
 {
 OSL_PRECOND( aSysDataType.hasValue( ), "Empty system data type delivered" 
);
@@ -192,14 +192,14 @@ DataFlavor SAL_CALL 
CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
 
 // XServiceInfo
 
-OUString SAL_CALL CDataFormatTranslator::getImplementationName(  )
+OUString SAL_CALL CDataFormatTranslatorUNO::getImplementationName(  )
 throw( RuntimeException )
 {
 return OUString( IMPL_NAME );
 }
 
 //  XServiceInfo
-sal_Bool SAL_CALL CDataFormatTranslator::supportsService( const OUString& 
ServiceName )
+sal_Bool SAL_CALL CDataFormatTranslatorUNO::supportsService( const OUString& 
ServiceName )
 throw( RuntimeException )
 {
 return cppu::supportsService(this, ServiceName);
@@ -207,7 +207,7 @@ sal_Bool SAL_CALL CDataFormatTranslator::supportsService( 
const OUString& Servic
 
 //  XServiceInfo
 
-Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( 
)
+Sequence< OUString > SAL_CALL 
CDataFormatTranslatorUNO::getSupportedServiceNames( )
 throw( RuntimeException )
 {
 return DataFormatTranslator_getSupportedServiceNames( );
@@ -472,7 +472,7 @@ static const std::vector< FormatEntry > g_TranslTable {
 
FormatEntry("application/x-openoffice-dummy4;windows_formatname=\"SO_DUMMYFORMAT_4\"",
 "SO_DUMMYFORMAT_4", NULL, CF_INVALID, CPPUTYPE_DEFAULT),
 };
 
-void SAL_CALL CDataFormatTranslator::findDataFlavorForStandardFormatId( 
sal_Int32 aStandardFormatId, DataFlavor& aDataFlavor ) const
+void SAL_CALL CDataFormatTranslatorUNO::findDataFlavorForStandardFormatId( 
sal_Int32 aStandardFormatId, DataFlavor& aDataFlavor ) const
 {
 /*
 we break the for loop if we find the first CF_INVALID
@@ -494,7 +494,7 @@ void SAL_CALL 
CDataFormatTranslator::findDataFlavorForStandardFormatId( sal_Int3
 }
 }
 
-void SAL_CALL CDataFormatTranslator::findDataFlavorForNativeFormatName( const 
OUString& aNativeFormatName, DataFlavor& aDataFlavor ) const
+void SAL_CALL CDataFormatTranslatorUNO::findDataFlavorForNativeFormatName( 
const OUString& aNativeFormatName, DataFlavor& aDataFlavor ) const
 {
 vector< FormatEntry >::const_iterator citer_end = g_TranslTable.end( );
 for ( vector< FormatEntry >::const_iterator citer = g_TranslTable.begin( );
@@ -509,7 +509,7 @@ void SAL_CALL 
CDataFormatTranslator::findDataFlavorForNativeFormatName( const OU
 }
 }
 
-void SAL_CALL CDataFormatTranslator::findStandardFormatIdForCharset( const 
OUString& aCharset, Any& aAny ) const
+void SAL_CALL CDataFormatTranslatorUNO::findStandardFormatIdForCharset( const 
OUString& aCharset, Any& aAny ) const
 {
 if ( aCharset.equalsIgnoreAsciiCase( "utf-16" ) )
 aAny <<= static_cast< sal_Int32 >( CF_UNICODETEXT );
@@ -521,7 +521,7 @@ void SAL_CALL 
CDataFormatTranslator::findStandardFormatIdForCharset( const OUStr
 }
 }
 
-void SAL_CALL CDataFormatTranslator::setStandardFormatIdForNativeFormatName( 
const OUString& aNativeFormatName, Any&

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

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkinst.hxx  |3 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx |   22 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 962e0bb4b31265b046fe4fb57d3087e20f5fe4ef
Author: Caolán McNamara 
Date:   Tue Jul 12 20:31:52 2016 +0100

Related: rhbz#1351369 gtk3 clipboards have to live to end once created

like the other platforms do

Change-Id: I31340254573d13dc808d1e3038e3a36ae97f6c22

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 6212d5d..01e8ca6 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -246,6 +246,9 @@ public:
 
 private:
 std::vector  m_aTimers;
+#if GTK_CHECK_VERSION(3,0,0)
+std::unordered_map< GdkAtom, css::uno::Reference > 
m_aClipboards;
+#endif
 boolIsTimerExpired();
 boolbNeedsInit;
 
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b5db25d..3cc4046 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -536,7 +536,11 @@ VclGtkClipboard::~VclGtkClipboard()
 {
 GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 g_signal_handler_disconnect(clipboard, m_nOwnerChangedSignalId);
-ClipboardClear(nullptr);
+if (!m_aGtkTargets.empty())
+{
+gtk_clipboard_clear(clipboard);
+}
+assert(m_aGtkTargets.empty());
 }
 
 std::vector VclToGtkHelper::FormatsToGtk(const 
css::uno::Sequence &rFormats)
@@ -587,7 +591,6 @@ void VclGtkClipboard::setContents(
 {
 osl::ClearableMutexGuard aGuard( m_aMutex );
 Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner 
);
-bool bOwnerChange = (xOldOwner.is() && xOldOwner != xClipboardOwner);
 Reference< datatransfer::XTransferable > xOldContents( m_aContents );
 m_aContents = xTrans;
 m_aOwner = xClipboardOwner;
@@ -596,8 +599,10 @@ void VclGtkClipboard::setContents(
 datatransfer::clipboard::ClipboardEvent aEv;
 
 GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
-if (bOwnerChange)
+if (!m_aGtkTargets.empty())
+{
 gtk_clipboard_clear(clipboard);
+}
 assert(m_aGtkTargets.empty());
 if (m_aContents.is())
 {
@@ -624,7 +629,7 @@ void VclGtkClipboard::setContents(
 
 aGuard.clear();
 
-if (bOwnerChange)
+if (xOldOwner.is() && xOldOwner != xClipboardOwner)
 xOldOwner->lostOwnership( this, xOldContents );
 for( std::list< Reference< datatransfer::clipboard::XClipboardListener > 
>::iterator it =
  aListeners.begin(); it != aListeners.end() ; ++it )
@@ -672,7 +677,14 @@ Reference< XInterface > GtkInstance::CreateClipboard(const 
Sequence< Any >& argu
 
 GdkAtom nSelection = (sel == "CLIPBOARD") ? GDK_SELECTION_CLIPBOARD : 
GDK_SELECTION_PRIMARY;
 
-return Reference< XInterface >( static_cast(new 
VclGtkClipboard(nSelection)) );
+auto it = m_aClipboards.find(nSelection);
+if (it != m_aClipboards.end())
+return it->second;
+
+Reference xClipboard(static_cast(new 
VclGtkClipboard(nSelection)));
+m_aClipboards[nSelection] = xClipboard;
+
+return xClipboard;
 }
 
 GtkDropTarget::GtkDropTarget()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source

[Caolán McNamara]

 cui/source/options/optpath.cxx |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit bab5387447d2ea386b49367fe373b124a57c5ce6
Author: Caolán McNamara 
Date:   Tue Jul 5 10:16:51 2016 +0100

Resolves: rhbz#1352835 path options doesn't promptly destroy folder picker

(cherry picked from commit 3bbc0574d78d129359638b74612de2f93419eeb0)

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

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 8695c0c..5a0a87e 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -630,11 +630,12 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, 
Button*, void)
 else
 {
 short nRet = xFolderPicker->execute();
-if ( ExecutableDialogResults::OK != nRet )
-return;
-
-OUString sFolder( xFolderPicker->getDirectory() );
-ChangeCurrentEntry( sFolder );
+if (nRet == ExecutableDialogResults::OK)
+{
+OUString sFolder(xFolderPicker->getDirectory());
+ChangeCurrentEntry(sFolder);
+}
+xFolderPicker.clear();
 }
 }
 catch( Exception& )
@@ -702,21 +703,17 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, 
HeaderBar*, pBar, void )
 }
 }
 
-
-
 IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, 
void )
 {
-if ( RET_OK == pEvt->DialogResult )
+assert(xFolderPicker.is() && "SvxPathTabPage::DialogClosedHdl(): no folder 
picker");
+if (RET_OK == pEvt->DialogResult)
 {
-DBG_ASSERT( xFolderPicker.is(), "SvxPathTabPage::DialogClosedHdl(): no 
folder picker" );
-
 OUString sURL = xFolderPicker->getDirectory();
 ChangeCurrentEntry( sURL );
 }
+xFolderPicker.clear();
 }
 
-
-
 void SvxPathTabPage::GetPathList(
 sal_uInt16 _nPathHandle, OUString& _rInternalPath,
 OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/sfx2/sidebar/Sidebar.hxx  |   12 +++-
 include/sfx2/sidebar/SidebarController.hxx|   16 
 sd/source/ui/view/ViewShellImplementation.cxx |2 ++
 sfx2/source/sidebar/Sidebar.cxx   |   23 +++
 sfx2/source/sidebar/SidebarController.cxx |   19 ---
 sfx2/source/view/viewfrm.cxx  |4 ++--
 6 files changed, 62 insertions(+), 14 deletions(-)

New commits:
commit e1e61bf5e5f368fc1ea579f8ae5eec9faafbd599
Author: Caolán McNamara 
Date:   Fri Jun 3 11:06:22 2016 +0100

Resolves: tdf#88396 switching to sidebar panel will toggle it *off*...

if its already visible.

This solves tdf#88396, but I did this fix originally for

on switching to slide layouts panel move into slide layout context

i.e. exit current textbox edit and shape selection

(cherry picked from commit 05aaef55252bc9f90cbbcc1967c38ab9a5a6c798)

OpenThenSwitchToDeck actually *toggles* deck visibility

so rename it to that and add a OpenThenSwitchToDeck that actually
does that, using the Toggle varient as the callback from the
sidebar button which toggles the current deck on/off

which retains the features of

// tdf#67627 Clicking a second time on a Deck icon will close the Deck
// tdf#88241 Summoning an undocked sidebar a second time should close 
sidebar

but means that calls to OpenThenSwitchToDeck from e.g. slide layout
don't auto close it if that deck is already open

(cherry picked from commit b81daea4a78083def286fa2d5360b152b7a703fd)

3e3724626b93447a7ab6bc7032e9c6839dabcf55

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

diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index aea1fcb..6b138b9 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -38,7 +38,17 @@ public:
 this function probably returns before the requested panel is visible.
 */
 static void ShowPanel (
-const ::rtl::OUString& rsPanelId,
+const OUString& rsPanelId,
+const css::uno::Reference& rxFrame);
+
+/** Switch to the deck that contains the specified panel and toggle
+the visibility of the panel (expanded and scrolled into the
+visible area when visible)
+Note that most of the work is done asynchronously and that
+this function probably returns before the requested panel is visible.
+*/
+static void TogglePanel (
+const OUString& rsPanelId,
 const css::uno::Reference& rxFrame);
 };
 
diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index c077eeb..0298862 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -124,8 +124,8 @@ public:
 
 const static sal_Int32 gnMaximumSidebarWidth = 400;
 
-void OpenThenSwitchToDeck (
-const ::rtl::OUString& rsDeckId);
+void OpenThenSwitchToDeck(const OUString& rsDeckId);
+void OpenThenToggleDeck(const OUString& rsDeckId);
 
 /** Show only the tab bar, not the deck.
 */
@@ -137,7 +137,7 @@ public:
 
 /** Returns true when the given deck is the currently visible deck
  */
-bool IsDeckVisible (const ::rtl::OUString& rsDeckId);
+bool IsDeckVisible(const OUString& rsDeckId);
 
 FocusManager& GetFocusManager() { return maFocusManager;}
 
@@ -148,14 +148,14 @@ public:
 Context GetCurrentContext() const { return maCurrentContext;}
 bool IsDocumentReadOnly (void) const { return mbIsDocumentReadOnly;}
 
-void SwitchToDeck ( const ::rtl::OUString& rsDeckId);
+void SwitchToDeck(const OUString& rsDeckId);
 void SwitchToDefaultDeck();
 
 void CreateDeck(const ::rtl::OUString& rDeckId, bool bForceCreate = false);
 void CreatePanels(const ::rtl::OUString& rDeckId);
 
 ResourceManager::DeckContextDescriptorContainer GetMatchingDecks();
-ResourceManager::PanelContextDescriptorContainer GetMatchingPanels( const 
::rtl::OUString& rDeckId);
+ResourceManager::PanelContextDescriptorContainer GetMatchingPanels(const 
OUString& rDeckId);
 
 void notifyDeckTitle(const OUString& targetDeckId);
 
@@ -174,7 +174,7 @@ private:
 css::uno::Reference mxCurrentController;
 /// Use a combination of SwitchFlag_* as value.
 sal_Int32 mnRequestedForceFlags;
-::rtl::OUString msCurrentDeckId;
+OUString msCurrentDeckId;
 AsynchronousCall maPropertyChangeForwarder;
 AsynchronousCall maContextChangeUpdate;
 AsynchronousCall maAsynchronousDeckSwitch;
@@ -216,12 +216,12 @@ private:
 
 css::uno::Reference CreateUIElement (
 const css::uno::Reference& rxWindow,
-const ::rtl::OUString& rsImplementationURL,
+const 

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

[Justin Luth]

 sw/source/filter/ww8/docxattributeoutput.cxx |   16 +++-
 sw/source/filter/ww8/docxattributeoutput.hxx |4 
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 28ded9c98837d6b6eefff73f396353b61b6b4017
Author: Justin Luth 
Date:   Mon Jul 11 18:07:32 2016 +0300

tdf#99090 docx export page-break only inside a paragraph

If a paragraph hadn't been started yet, a w:r was being written directly in
the /document/body which caused MSWord to complain about a corrupt document.

Reviewed-on: https://gerrit.libreoffice.org/26771
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 07fb94655f4745eb4e80bf6e8d4cdd95371f23bb)

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

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5638632..df4f658 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1045,6 +1045,16 @@ void DocxAttributeOutput::EndParagraphProperties(const 
SfxItemSet& rParagraphMar
 m_nColBreakStatus = COLBRK_NONE;
 }
 
+if ( m_bPostponedPageBreak )
+{
+m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+m_pSerializer->singleElementNS( XML_w, XML_br,
+FSNS( XML_w, XML_type ), "page", FSEND );
+m_pSerializer->endElementNS( XML_w, XML_r );
+
+m_bPostponedPageBreak = false;
+}
+
 // merge the properties _before_ the run (strictly speaking, just
 // after the start of the paragraph)
 m_pSerializer->mergeTopMarks(Tag_StartParagraphProperties, 
sax_fastparser::MergeMarks::PREPEND);
@@ -5395,13 +5405,16 @@ void DocxAttributeOutput::SectionBreak( sal_uInt8 nC, 
const WW8_SepInfo* pSectio
 m_pSectionInfo.reset( new WW8_SepInfo( *pSectionInfo ));
 }
 }
-else
+else if ( m_bParagraphOpened )
 {
 m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
 m_pSerializer->singleElementNS( XML_w, XML_br,
 FSNS( XML_w, XML_type ), "page", FSEND );
 m_pSerializer->endElementNS( XML_w, XML_r );
 }
+else
+m_bPostponedPageBreak = true;
+
 break;
 default:
 OSL_TRACE( "Unknown section break to write: %d", nC );
@@ -8446,6 +8459,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
&rExport, FSHelperPtr pSeri
   m_bAlternateContentChoiceOpen( false ),
   m_bPostponedProcessingFly( false ),
   m_nColBreakStatus( COLBRK_NONE ),
+  m_bPostponedPageBreak( false ),
   m_nTextFrameLevel( 0 ),
   m_closeHyperlinkInThisRun( false ),
   m_closeHyperlinkInPreviousRun( false ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 4089d29..0b2d4ad 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -810,6 +810,10 @@ private:
 // beginning of the next paragraph
 DocxColBreakStatus m_nColBreakStatus;
 
+// Remember that a page break has to be opened at the
+// beginning of the next paragraph
+bool m_bPostponedPageBreak;
+
 std::vector m_aFramesOfParagraph;
 sal_Int32 m_nTextFrameLevel;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkframe.hxx  |2 
 vcl/unx/gtk/gtksalframe.cxx   |3 -
 vcl/unx/gtk3/gtk3gtkframe.cxx |  112 +++---
 3 files changed, 75 insertions(+), 42 deletions(-)

New commits:
commit bda6bce91555861f604a74b8f3d6cc6cd35c11c4
Author: Caolán McNamara 
Date:   Thu Jun 23 17:32:11 2016 +0100

Resolves: rhbz#1349501 gtk3: smooth scrolling events can be disabled...

by the user with GDK_CORE_DEVICE_EVENTS=1, and so manage to disable their 
wheel
scrolling

(cherry picked from commit 7dfd50f947671d79b9119f10259857700d5728d8)

Change-Id: I7df63f738983c90dea75b9f43a36133910446aba

Resolves: rhbz#1349501 gtk3: smooth scrolling events can be disabled...

better fix, if we listen to the eventbox we get either SMOOTH scrolling
or not smooth events, not both. We get SMOOTH when supported, and not
if not supported so no need to reintroduce the miserable hack, which
doesn't work under wayland anyway

Change-Id: I993e71d3553322425a506cd93d812efe081bf3c9
(cherry picked from commit 053a843bccaef2d2323be3ddff6217c592a4c5db)
Reviewed-on: https://gerrit.libreoffice.org/26646
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index eaa222f..3b81c54 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -277,7 +277,7 @@ class GtkSalFrame : public SalFrame
 static gboolean signalKey( GtkWidget*, GdkEventKey*, gpointer );
 static gboolean signalDelete( GtkWidget*, GdkEvent*, gpointer );
 static gboolean signalWindowState( GtkWidget*, GdkEvent*, gpointer );
-static gboolean signalScroll( GtkWidget*, GdkEvent*, gpointer );
+static gboolean signalScroll( GtkWidget*, GdkEventScroll* pEvent, 
gpointer );
 static gboolean signalCrossing( GtkWidget*, GdkEventCrossing*, 
gpointer );
 static gboolean signalVisibility( GtkWidget*, GdkEventVisibility*, 
gpointer );
 static void signalDestroy( GtkWidget*, gpointer );
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 95fd581..84615c8 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2855,10 +2855,9 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, 
GdkEventButton* pEvent, gpointer
 return true;
 }
 
-gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer 
frame )
+gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEventScroll* pSEvent, 
gpointer frame )
 {
 GtkSalFrame* pThis = static_cast(frame);
-GdkEventScroll* pSEvent = reinterpret_cast(pEvent);
 
 static sal_uLongnLines = 0;
 if( ! nLines )
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 6363815..1c57991 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1039,6 +1039,7 @@ void GtkSalFrame::InitCommon()
 m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), 
"drag-failed", G_CALLBACK(signalDragFailed), this ));
 m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), 
"drag-data-delete", G_CALLBACK(signalDragDelete), this ));
 m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), 
"drag-data-get", G_CALLBACK(signalDragDataGet), this ));
+m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), 
"scroll-event", G_CALLBACK(signalScroll), this ));
 
 g_signal_connect( G_OBJECT(m_pFixedContainer), "draw", 
G_CALLBACK(signalDraw), this );
 g_signal_connect( G_OBJECT(m_pFixedContainer), "size-allocate", 
G_CALLBACK(sizeAllocated), this );
@@ -1064,7 +1065,6 @@ void GtkSalFrame::InitCommon()
 g_signal_connect( G_OBJECT(m_pWindow), "key-release-event", 
G_CALLBACK(signalKey), this );
 g_signal_connect( G_OBJECT(m_pWindow), "delete-event", 
G_CALLBACK(signalDelete), this );
 g_signal_connect( G_OBJECT(m_pWindow), "window-state-event", 
G_CALLBACK(signalWindowState), this );
-g_signal_connect( G_OBJECT(m_pWindow), "scroll-event", 
G_CALLBACK(signalScroll), this );
 g_signal_connect( G_OBJECT(m_pWindow), "leave-notify-event", 
G_CALLBACK(signalCrossing), this );
 g_signal_connect( G_OBJECT(m_pWindow), "enter-notify-event", 
G_CALLBACK(signalCrossing), this );
 g_signal_connect( G_OBJECT(m_pWindow), "visibility-notify-event", 
G_CALLBACK(signalVisibility), this );
@@ -2559,54 +2559,88 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, 
GdkEventButton* pEvent, gpointer
 return true;
 }
 
-gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer 
frame )
+gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEventScroll* pEvent, 
gpointer frame )
 {
-GdkEventScroll* pSEvent = reinterpret_cast(pEvent);
-if (pSEvent->direction != GDK_SCROLL_SMOOTH)
-return false;
-
 GtkSalFrame* pThis = static_cast(frame);
 
 SalWheelMouseEvent aEvent;
 
-aEv

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

[Caolán McNamara]

 sw/source/core/layout/flowfrm.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f2dcce9155ddd9444f65b26c59c3b873ac603091
Author: Caolán McNamara 
Date:   Fri Jul 8 16:09:36 2016 +0100

Resolves: tdf#100813 crash during pagination of particular docx

Change-Id: Id2c99cc6c5fe4c3a5bcf3c0b3f16b603cdd46239
(cherry picked from commit f374e01af32c7752b31455642e7d76f2056a2aeb)
Reviewed-on: https://gerrit.libreoffice.org/27051
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 850fc4e303..8420956 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2010,6 +2010,9 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
 }
 
 SwFootnoteBossFrame * pOldBoss = m_rThis.FindFootnoteBossFrame();
+if (!pOldBoss)
+return false;
+
 SwPageFrame * const pOldPage = pOldBoss->FindPageFrame();
 SwLayoutFrame *pNewUpper = nullptr;
 bool bCheckPageDescs = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - include/opencl officecfg/registry opencl/inc opencl/Library_opencl.mk opencl/source sc/source solenv/gbuild vcl/Library_vcl.mk vcl/source

[Tomaž Vajngerl]

 include/opencl/OpenCLZone.hxx  |   52 ++
 include/opencl/openclwrapper.hxx   |4 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 
 opencl/Library_opencl.mk   |2 
 opencl/inc/opencl_device_selection.h   |4 
 opencl/source/OpenCLZone.cxx   |   46 +
 opencl/source/opencl_device.cxx|   23 ++
 opencl/source/openclwrapper.cxx|  107 +++--
 sc/source/core/tool/formulagroup.cxx   |   17 +-
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 vcl/Library_vcl.mk |1 
 vcl/source/app/svmain.cxx  |5 
 12 files changed, 214 insertions(+), 54 deletions(-)

New commits:
commit f0da69b41b1d8aa963887c743ce2ff981691b8db
Author: Tomaž Vajngerl 
Date:   Fri Jul 8 22:16:27 2016 +0900

opencl: OpenCLZone, detect CL device change and disable CL on crash

Guard OpenCL calls with OpenCLZone, so if a OpenCL call crashes we
detect this and disable OpenCL so next time the user doesn't encounter
the crash at the same calculation because he has a broken OpenCL
drivers. Similar has been implemented for OpenGL with good results.

Additionaly we persistently remember a known good OpenCL device ID and
driver version so we can match this and perform calculation tests when
they change. This is to ensure that the selected OpenCL device performs
as we expect. In this commit the calculation tests aren't included yet.

Remove complex static initializer in opencl wrapper library.

Change-Id: I1a8b81ee31298731efcf63dc6a476955afc035e9
Reviewed-on: https://gerrit.libreoffice.org/27064
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 
(cherry picked from commit f41eb66302208f384a475fb20c98b6d1b0676cb6)
Reviewed-on: https://gerrit.libreoffice.org/27099
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/27144
Reviewed-by: Jan Holesovsky 
Tested-by: Michael Meeks 

diff --git a/include/opencl/OpenCLZone.hxx b/include/opencl/OpenCLZone.hxx
new file mode 100644
index 000..1fbc666
--- /dev/null
+++ b/include/opencl/OpenCLZone.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+#define INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+
+#include 
+
+// FIXME: post back-port, templatize me and share with OpenGLZone.
+class OPENCL_DLLPUBLIC OpenCLZone
+{
+/// how many times have we entered a CL zone
+static volatile sal_uInt64 gnEnterCount;
+/// how many times have we left a new CL zone
+static volatile sal_uInt64 gnLeaveCount;
+
+static void enter()
+{
+gnEnterCount++;
+}
+static void leave()
+{
+gnLeaveCount--;
+}
+public:
+OpenCLZone()
+{
+gnEnterCount++;
+}
+
+~OpenCLZone()
+{
+gnLeaveCount++;
+}
+
+static bool isInZone()
+{
+return gnEnterCount != gnLeaveCount;
+}
+
+static void hardDisable();
+};
+
+#endif // INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 178c685..db9bf89 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -61,11 +61,13 @@ OPENCL_DLLPUBLIC const std::vector& 
fillOpenCLInfo();
  *
  * @param pDeviceId the id of the opencl device of type cl_device_id, NULL 
means use software calculation
  * @param bAutoSelect use the algorithm to select the best OpenCL device
+ * @param rOutSelectedDeviceVersionIDString returns the selected device's 
version string.
  *
  * @return returns true if there is a valid opencl device that has been set up
  */
 OPENCL_DLLPUBLIC bool switchOpenCLDevice(const OUString* pDeviceId, bool 
bAutoSelect,
- bool bForceEvaluation);
+ bool bForceEvaluation,
+ OUString& 
rOutSelectedDeviceVersionIDString);
 
 OPENCL_DLLPUBLIC void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& 
rPlatformId);
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index a9097ca..32c3cd7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs

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

[Adolfo Jayme Barrientos]

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

New commits:
commit d17b91b6c497fa9b97ed6d588fcfb37bbdf1d0ad
Author: Adolfo Jayme Barrientos 
Date:   Tue Jul 12 14:05:02 2016 -0500

(Regular) tooltips can no longer be disabled…

… so this is always true.

Change-Id: I1154f86cd7dde358a669f6a3020119e9685ac83a

diff --git a/source/text/scalc/guide/note_insert.xhp 
b/source/text/scalc/guide/note_insert.xhp
index 22587c0..77eaf5f 100644
--- a/source/text/scalc/guide/note_insert.xhp
+++ b/source/text/scalc/guide/note_insert.xhp
@@ -40,7 +40,7 @@
 You can assign a comment to each cell by choosing Insert - 
Comment. The comment is indicated by a small red square, the 
comment indicator, in the cell.
 
 
-The comment is visible whenever the mouse pointer is over the cell, 
provided you have activated Help - Tips or - Extended 
Tips.
+The comment is 
visible whenever the mouse pointer is over the cell.
 
 
 When you select the cell, you can choose Show Comment 
from the context menu of the cell. Doing so keeps the comment visible until you 
deactivate the Show Comment command from the same context 
menu.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit 60a465026f4db1e05f771d9e6f422d7063b0ccd4
Author: Adolfo Jayme Barrientos 
Date:   Tue Jul 12 14:05:02 2016 -0500

Updated core
Project: help  d17b91b6c497fa9b97ed6d588fcfb37bbdf1d0ad

(Regular) tooltips can no longer be disabled…

… so this is always true.

Change-Id: I1154f86cd7dde358a669f6a3020119e9685ac83a

diff --git a/helpcontent2 b/helpcontent2
index 3f158b0db..d17b91b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3f158b0dba476baf0816ce22159860d6dea58084
+Subproject commit d17b91b6c497fa9b97ed6d588fcfb37bbdf1d0ad
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes26' - desktop/source include/opencl opencl/source sc/source

[Michael Meeks]

 desktop/source/app/opencl.cxx|   12 
 include/opencl/openclwrapper.hxx |2 ++
 opencl/source/openclwrapper.cxx  |1 +
 sc/source/core/opencl/formulagroupcl.cxx |5 +
 4 files changed, 20 insertions(+)

New commits:
commit b43ebf9be86d0af46ed381f21a420d44242ba42c
Author: Michael Meeks 
Date:   Tue Jul 12 19:49:12 2016 +0100

tdf#100883 - opencl impls. that use SEH are still bad.

Amazingly we fell-back to the old calculation path for
crashes in older LibreOffices.

Change-Id: Ia182f7a25c5560b68494d5cdd68e02925bfd5845

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 4c47767..72e0df0 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -46,6 +46,8 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 bool bSuccess = false;
 css::uno::Reference< css::lang::XComponent > xComponent;
 
+sal_uInt64 nKernelFailures = opencl::kernelFailures;
+
 SAL_INFO("opencl", "Starting CL test spreadsheet");
 
 try {
@@ -95,11 +97,21 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message);
 }
 
+if (nKernelFailures != opencl::kernelFailures)
+{
+// tdf#
+SAL_WARN("opencl", "OpenCL kernels failed to compile, "
+ "or took SEH exceptions "
+ << nKernelFailures << " != " << opencl::kernelFailures);
+bSuccess = false;
+}
+
 if (!bSuccess)
 OpenCLZone::hardDisable();
 if (xComponent.is())
 xComponent->dispose();
 
+
 return bSuccess;
 }
 
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index c21725b..a284d8d 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -53,6 +53,8 @@ struct GPUEnv
 };
 
 extern OPENCL_DLLPUBLIC GPUEnv gpuEnv;
+extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures;
+
 OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const 
char * clFileName );
 OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuEnv, const char* filename, int idx);
 OPENCL_DLLPUBLIC void setKernelEnv( KernelEnv *envInfo );
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 011c87c..daf479d 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -58,6 +58,7 @@ using namespace std;
 namespace opencl {
 
 GPUEnv gpuEnv;
+sal_uInt64 kernelFailures = 0;
 
 namespace {
 
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 8055ecf..c2835c1 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -4057,6 +4057,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& 
rConfig, ScTokenArray&
 catch (...)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled compiler 
error");
+::opencl::kernelFailures++;
 return nullptr;
 }
 return pDynamicKernel;
@@ -4167,21 +4168,25 @@ public:
 catch (const UnhandledToken& ut)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled token: 
" << ut.mMessage << " at " << ut.mFile << ":" << ut.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const OpenCLError& oce)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error from 
" << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << 
oce.mFile << ":" << oce.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (const Unhandled& uh)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled case at 
" << uh.mFile << ":" << uh.mLineNumber);
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 catch (...)
 {
 SAL_WARN("sc.opencl", "Dynamic formula compiler: unhandled 
compiler error");
+::opencl::kernelFailures++;
 return CLInterpreterResult();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 sfx2/source/doc/guisaveas.cxx|3 +++
 sfx2/source/doc/sfxbasemodel.cxx |1 +
 2 files changed, 4 insertions(+)

New commits:
commit dd48972fc2b66ec2810db1a7cdf673fd5b0e9c40
Author: Pranav Kant 
Date:   Tue Jul 12 20:10:03 2016 +0530

Fix a warning when DontTerminateEdit is mentioned

DontTerminateEdit was added in a5a71cea62ac3041006c5e9815ae2317999639ac

Change-Id: Ia1d2ac626dbdeea689a1f36494963be18316127f
Reviewed-on: https://gerrit.libreoffice.org/27161
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 6a40102..4401850 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -677,6 +677,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
 
 OUString aVersionCommentString("VersionComment");
 OUString aAuthorString("Author");
+OUString aDontTerminateEdit("DontTerminateEdit");
 OUString aInteractionHandlerString("InteractionHandler");
 OUString aStatusIndicatorString("StatusIndicator");
 OUString aFailOnWarningString("FailOnWarning");
@@ -685,6 +686,8 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
 aAcceptedArgs[ aVersionCommentString ] = GetMediaDescr()[ 
aVersionCommentString ];
 if ( GetMediaDescr().find( aAuthorString ) != GetMediaDescr().end() )
 aAcceptedArgs[ aAuthorString ] = GetMediaDescr()[ aAuthorString ];
+if ( GetMediaDescr().find( aDontTerminateEdit ) != GetMediaDescr().end() )
+aAcceptedArgs[ aDontTerminateEdit ] = GetMediaDescr()[ 
aDontTerminateEdit ];
 if ( GetMediaDescr().find( aInteractionHandlerString ) != 
GetMediaDescr().end() )
 aAcceptedArgs[ aInteractionHandlerString ] = GetMediaDescr()[ 
aInteractionHandlerString ];
 if ( GetMediaDescr().find( aStatusIndicatorString ) != 
GetMediaDescr().end() )
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3a691be..ab6d333 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1507,6 +1507,7 @@ void SAL_CALL SfxBaseModel::storeSelf( constSequence< 
beans::PropertyValue >
 {
 // check that only acceptable parameters are provided here
 if ( aSeqArgs[nInd].Name != "VersionComment" && 
aSeqArgs[nInd].Name != "Author"
+  && aSeqArgs[nInd].Name != "DontTerminateEdit"
   && aSeqArgs[nInd].Name != "InteractionHandler" && 
aSeqArgs[nInd].Name != "StatusIndicator"
   && aSeqArgs[nInd].Name != "VersionMajor"
   && aSeqArgs[nInd].Name != "FailOnWarning"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Macro encryption different in between 4.2 and 5.1

[SOS]

On 12/07/2016 15:07, Michael Stahl wrote:

On 12.07.2016 08:57, SOS wrote:

sorry i mixed up the situation
extension *Build in 4.2 and used in 5.1*:
must be:
extension *Build in 5.1 and used in 4.2*: the functions and Sub's in the
libraries are not available,  its only after opening the library
"manualy" and after entering the password that make the functions and
the sub's available in memory.
Build in 4.2 and used in 5.1 gives no problems

On 11/07/2016 17:05, SOS wrote:

A extension made with password protected Basic Libraries using LO 5.1
do not "load" properly the libraries under LO 4.2

We load a  password protected library using the folowing code.
If (Not GlobalScope.BasicLibraries.isLibraryLoaded("DbUtils")) Then
GlobalScope.BasicLibraries.LoadLibrary("DbUtils")
End If
extension Build and used in 4.2  makes all functions and sub's
available in memory.
extension Build and used in 5.1  makes all functions and sub's
available in memory.
extension Build in 4.2 and used in 5.1: the functions and Sub's in the
libraries are not available,  its only after opening the library
"manualy" and after entering the password that make the functions and
the sub's available in memory.

The extensions are build under Windows
There is a difference in size between the extension build in 5.1 and 4.2
5.1 gives 69 KB
4.2 gives 67 KB
There is no error after
"GlobalScope.BasicLibraries.LoadLibrary("DbUtils")
once the librarie is opened with the password, then
"GlobalScope.BasicLibraries.LoadLibrary("DbUtils")"  is working fine
even after closing LO !!

Can someone confirm this behavior and sould i filled a issue ?

hi Fernand,

there were numerous bugfixes for password protected libraries during
that time, like tdf#87530 tdf#68983 tdf#67685 tdf#52076 tdf#40173

but all those bugs were about just using the UI, probably nobody has
tested what happens when calling LoadLibrary() from a macro.

perhaps there is a new bug in LO 5.1 and we can fix it, or perhaps the
bug was in LO 4.2 which means it can't be fixed now, hard to tell
without a more thorough investigation - please file a bug with exact
steps to reproduce the problem.

Hallo Michael,

I can fill a issue with both versions of the encrypted macro Modules, 
but i suppose  its a waste of developer time to investigate,
I am developing new extensions  in 5.1 and the users of my extensions 
still using 4.2 as soon the users will upgrade to  5.1 the problem is 
gone.  and i can always use to make 4.2 extensions who works also fine 
with 5.1.


Thanks

Fernand

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

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

[Stephan Bergmann]

 sd/source/ui/framework/tools/FrameworkHelper.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a405a164357d86630d8fbd0386e07f53c5b6c9a1
Author: Stephan Bergmann 
Date:   Mon Jul 11 14:04:18 2016 +0200

loplugin:staticcall

Change-Id: I800eef0517f063ff7e08a95de9da268fb0e9d621
Signed-off-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/27160

diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx 
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index ed74b7e..7a959a5 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -521,12 +521,12 @@ OUString FrameworkHelper::GetViewURL 
(ViewShell::ShellType eType)
 namespace
 {
 
-void updateEditMode(const Reference &xView, FrameworkHelper* const 
pHelper, const EditMode eEMode, bool updateFrameView)
+void updateEditMode(const Reference &xView, const EditMode eEMode, bool 
updateFrameView)
 {
 // Ensure we have the expected edit mode
 // The check is only for DrawViewShell as OutlineViewShell
 // and SlideSorterViewShell have no master mode
-const ::std::shared_ptr pCenterViewShell 
(pHelper->GetViewShell(xView));
+const ::std::shared_ptr pCenterViewShell 
(FrameworkHelper::GetViewShell(xView));
 DrawViewShell* pDrawViewShell
 = dynamic_cast(pCenterViewShell.get());
 if (pDrawViewShell != nullptr)
@@ -548,7 +548,7 @@ void asyncUpdateEditMode(FrameworkHelper* const pHelper, 
const EditMode eEMode)
 Reference xPaneId (
 
FrameworkHelper::CreateResourceId(framework::FrameworkHelper::msCenterPaneURL));
 Reference xView (pHelper->GetView(xPaneId));
-updateEditMode(xView, pHelper, eEMode, true);
+updateEditMode(xView, eEMode, true);
 }
 
 }
@@ -637,7 +637,7 @@ void FrameworkHelper::HandleModeChangeSlot (
 }
 else
 {
-updateEditMode(xView, this, eEMode, false);
+updateEditMode(xView, eEMode, false);
 }
 }
 catch (RuntimeException&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 compilerplugins/clang/cstylecast.cxx |   68 ---
 1 file changed, 39 insertions(+), 29 deletions(-)

New commits:
commit ba94c97644bf75d39eb30de30ef29b44ad83233d
Author: Stephan Bergmann 
Date:   Tue Jul 12 17:53:16 2016 +0200

loplugin:cstylecast: Better heuristic...

to determine code shared between C and C++

Change-Id: I1fadf69bf9d0a2bde527b7c3f2ec4c687d70e4ae

diff --git a/compilerplugins/clang/cstylecast.cxx 
b/compilerplugins/clang/cstylecast.cxx
index ae95bc2..addf5ed 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 #include 
 #include "plugin.hxx"
 
@@ -74,10 +75,6 @@ bool areSimilar(QualType type1, QualType type2) {
 }
 }
 
-bool hasCLanguageLinkageType(FunctionDecl const * decl) {
-return decl->isExternC() || decl->isInExternCContext();
-}
-
 QualType resolvePointers(QualType type) {
 while (type->isPointerType()) {
 type = type->getAs()->getPointeeType();
@@ -89,9 +86,7 @@ class CStyleCast:
 public RecursiveASTVisitor, public loplugin::Plugin
 {
 public:
-explicit CStyleCast(InstantiationData const & data):
-Plugin(data), externCFunction(false)
-{}
+explicit CStyleCast(InstantiationData const & data): Plugin(data) {}
 
 virtual void run() override {
 if (compiler.getLangOpts().CPlusPlus) {
@@ -99,14 +94,18 @@ public:
 }
 }
 
-bool TraverseFunctionDecl(FunctionDecl * decl);
+bool TraverseLinkageSpecDecl(LinkageSpecDecl * decl);
 
 bool VisitCStyleCastExpr(const CStyleCastExpr * expr);
 
 private:
 bool isConstCast(QualType from, QualType to);
 
-bool externCFunction;
+bool isFromCIncludeFile(SourceLocation spellingLocation) const;
+
+bool isSharedCAndCppCode(SourceLocation location) const;
+
+unsigned int externCContexts_ = 0;
 };
 
 const char * recommendedFix(clang::CastKind ck) {
@@ -118,17 +117,12 @@ const char * recommendedFix(clang::CastKind ck) {
 }
 }
 
-bool CStyleCast::TraverseFunctionDecl(FunctionDecl * decl) {
-bool ext = hasCLanguageLinkageType(decl)
-&& decl->isThisDeclarationADefinition();
-if (ext) {
-assert(!externCFunction);
-externCFunction = true;
-}
-bool ret = RecursiveASTVisitor::TraverseFunctionDecl(decl);
-if (ext) {
-externCFunction = false;
-}
+bool CStyleCast::TraverseLinkageSpecDecl(LinkageSpecDecl * decl) {
+assert(externCContexts_ != std::numeric_limits::max()); 
//TODO
+++externCContexts_;
+bool ret = RecursiveASTVisitor::TraverseLinkageSpecDecl(decl);
+assert(externCContexts_ != 0);
+--externCContexts_;
 return ret;
 }
 
@@ -166,6 +160,9 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr * 
expr) {
 perf = "const_cast";
 }
 }
+if (isSharedCAndCppCode(expr->getLocStart())) {
+return true;
+}
 std::string incompFrom;
 std::string incompTo;
 if( expr->getCastKind() == CK_BitCast ) {
@@ -178,15 +175,6 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr 
* expr) {
 incompTo = "incomplete ";
 }
 }
-if (externCFunction || expr->getLocStart().isMacroID()) {
-SourceLocation spellingLocation = 
compiler.getSourceManager().getSpellingLoc(
-expr->getLocStart());
-StringRef filename = 
compiler.getSourceManager().getFilename(spellingLocation);
-// ignore C code
-if ( filename.endswith(".h") ) {
-return true;
-}
-}
 if (perf == nullptr) {
 perf = recommendedFix(expr->getCastKind());
 }
@@ -225,6 +213,28 @@ bool CStyleCast::isConstCast(QualType from, QualType to) {
 return areSimilar(from, to);
 }
 
+bool CStyleCast::isFromCIncludeFile(SourceLocation spellingLocation) const {
+return !compiler.getSourceManager().isInMainFile(spellingLocation)
+&& (StringRef(
+compiler.getSourceManager().getPresumedLoc(spellingLocation)
+.getFilename())
+.endswith(".h"));
+}
+
+bool CStyleCast::isSharedCAndCppCode(SourceLocation location) const {
+while (compiler.getSourceManager().isMacroArgExpansion(location)) {
+location = compiler.getSourceManager().getImmediateMacroCallerLoc(
+location);
+}
+// Assume that code is intended to be shared between C and C++ if it comes
+// from an include file ending in .h, and is either in an extern "C" 
context
+// or the body of a macro definition:
+return
+
isFromCIncludeFile(compiler.getSourceManager().getSpellingLoc(location))
+&& (externCContexts_ != 0
+|| compiler.getSourceManager().isMacroBodyExpansion(location));
+}
+
 loplugin::Plugin::Registration< CStyleCast > X("cstylecast");
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.fre

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - desktop/inc desktop/Library_sofficeapp.mk desktop/source opencl/inc opencl/Library_opencl.mk opencl/source Repository.mk sc/Module_sc.mk sc/P

[Michael Meeks]

 Repository.mk  |1 
 desktop/Library_sofficeapp.mk  |2 
 desktop/inc/app.hxx|1 
 desktop/source/app/app.cxx |5 
 desktop/source/app/opencl.cxx  |  174 +
 opencl/Library_opencl.mk   |1 
 opencl/inc/opencl_device.hxx   |3 
 opencl/source/OpenCLZone.cxx   |4 
 opencl/source/openclwrapper.cxx|6 
 sc/Module_sc.mk|1 
 sc/Package_opencl.mk   |   16 ++
 sc/source/core/opencl/cl-test.ods  |binary
 sc/source/core/tool/formulagroup.cxx   |   21 ---
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 14 files changed, 215 insertions(+), 21 deletions(-)

New commits:
commit 9befbe1f81a7930e167e0a711666b0779898c12e
Author: Michael Meeks 
Date:   Mon Jul 11 15:12:38 2016 +0100

desktop: validate OpenCL drivers before use.

OpenCL validation needs to happen before drivers are used in
anger. This should isolate any crashes, and/or mis-behavior to
We use app version, CL driver version and file time-stamp to
trigger re-testing the device. If anything fails: hard disable
OpenCL.

We use an opencl validation sheet (cl-test.ods) and install it.
It is a minimal CL set - it requires a very short formula group
length, and combines several CL functions into few formulae to
test more.

The sheet structure, in particular the manual squaring / SQRT is
necessary to stick within the default CL subset, and ensure that
formulae are CL enabled from the root of the dependency tree up.

Reviewed-on: https://gerrit.libreoffice.org/27131
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit c44726c48228d9c6a5960e302b1c0bd16b0099c4)

+ opencl: bail out early in missing OpenCL case.
(cherry picked from commit 605a5dc088385ad21c33028d8107125c0316ddb1)

+ Remove bogus dependency from opencl to configmgr
Since f41eb66302208f384a475fb20c98b6d1b0676cb6 "opencl: OpenCLZone, detect 
CL
device change and disable CL on crash" vcl links against opencl (so 
indirectly
linked against configmgr), which caused CppunitTest_configmgr_unit to 
include
the configmgr object files both statically (through
gb_CppunitTest_use_library_objects) and through the linked-in configmgr 
dynamic
library, which in turn caused ASan builds to report an ODR violation for a
doubly defined 'typeinfo name for configmgr::Access'.

(cherry picked from commit 9c711f05fa10dc70e4257a1f48d43f539353541a)

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

diff --git a/Repository.mk b/Repository.mk
index 04519cb..adfc34b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -820,6 +820,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
vcl_opengl_blacklist \
) \
$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
+$(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index ef95ecf..785ab24 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 deploymentmisc \
 editeng \
 i18nlangtag \
+$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
 sal \
 salhelper \
 sb \
@@ -93,6 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 desktop/source/app/langselect \
 desktop/source/app/lockfile2 \
 desktop/source/app/officeipcthread \
+desktop/source/app/opencl \
 desktop/source/app/sofficemain \
 desktop/source/app/userinstall \
 desktop/source/migration/migration \
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index d07d285..f9e7db6 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -84,6 +84,7 @@ class Desktop : public Application
 
 static void OpenClients();
 static void OpenDefault();
+static void CheckOpenCLCompute(const 
css::uno::Reference &);
 
 DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 958ca8a..1a47e8c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1573,6 +1573,11 @@ int Desktop::Main()
 FatalError( MakeStartupErrorMessage(e.Message) );
 }
 
+// FIXME: move this somewhere sensible.
+#if HAVE_FEATURE_OPENCL
+CheckOpenCLCompute(xDesktop);
+#endif
+
 // Release solar mutex just before

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 6 commits - loleaflet/dist loleaflet/po loleaflet/src loolwsd/test

[Henry Castro]

 loleaflet/dist/images/lc_datefield.png   |binary
 loleaflet/dist/images/lc_numberformatdecdecimals.png |binary
 loleaflet/dist/images/lc_numberformatincdecimals.png |binary
 loleaflet/dist/images/sc_currencyfield.png   |binary
 loleaflet/dist/images/sc_numberformatdecimal.png |binary
 loleaflet/dist/images/sc_numberformatpercent.png |binary
 loleaflet/dist/images/sc_togglemergecells.png|binary
 loleaflet/dist/images/sc_wraptext.png|binary
 loleaflet/dist/toolbar.css   |8 
 loleaflet/dist/toolbar/toolbar.js|  131 +++
 loleaflet/po/styles/am.po|   24 ++
 loleaflet/po/styles/ar.po|   24 ++
 loleaflet/po/styles/as.po|   24 ++
 loleaflet/po/styles/ast.po   |   24 ++
 loleaflet/po/styles/be.po|   24 ++
 loleaflet/po/styles/bg.po|   24 ++
 loleaflet/po/styles/bn-IN.po |   24 ++
 loleaflet/po/styles/br.po|   24 ++
 loleaflet/po/styles/bs.po|   24 ++
 loleaflet/po/styles/ca-valencia.po   |   24 ++
 loleaflet/po/styles/ca.po|   24 ++
 loleaflet/po/styles/cs.po|   24 ++
 loleaflet/po/styles/cy.po|   24 ++
 loleaflet/po/styles/da.po|   24 ++
 loleaflet/po/styles/de.po|   24 ++
 loleaflet/po/styles/el.po|   24 ++
 loleaflet/po/styles/eo.po|   24 ++
 loleaflet/po/styles/es.po|   24 ++
 loleaflet/po/styles/et.po|   24 ++
 loleaflet/po/styles/eu.po|   24 ++
 loleaflet/po/styles/fi.po|   24 ++
 loleaflet/po/styles/fr.po|   24 ++
 loleaflet/po/styles/ga.po|   12 +
 loleaflet/po/styles/gd.po|   24 ++
 loleaflet/po/styles/gl.po|   24 ++
 loleaflet/po/styles/gu.po|   24 ++
 loleaflet/po/styles/gug.po   |   12 +
 loleaflet/po/styles/he.po|   24 ++
 loleaflet/po/styles/hi.po|   24 ++
 loleaflet/po/styles/hr.po|   24 ++
 loleaflet/po/styles/hu.po|   24 ++
 loleaflet/po/styles/id.po|   24 ++
 loleaflet/po/styles/is.po|   24 ++
 loleaflet/po/styles/it.po|   24 ++
 loleaflet/po/styles/ja.po|   24 ++
 loleaflet/po/styles/ka.po|   12 +
 loleaflet/po/styles/kk.po|   24 ++
 loleaflet/po/styles/km.po|   24 ++
 loleaflet/po/styles/kn.po|   24 ++
 loleaflet/po/styles/ko.po|   24 ++
 loleaflet/po/styles/lt.po|   24 ++
 loleaflet/po/styles/lv.po|   24 ++
 loleaflet/po/styles/ml.po|   24 ++
 loleaflet/po/styles/mr.po|   24 ++
 loleaflet/po/styles/my.po|   16 +
 loleaflet/po/styles/nb.po|   24 ++
 loleaflet/po/styles/ne.po|   12 +
 loleaflet/po/styles/nl.po|   24 ++
 loleaflet/po/styles/nn.po|   24 ++
 loleaflet/po/styles/oc.po|   24 ++
 loleaflet/po/styles/or.po|   24 ++
 loleaflet/po/styles/pa-IN.po |   24 ++
 loleaflet/po/styles/pl.po|   24 ++
 loleaflet/po/styles/pt-BR.po |   24 ++
 loleaflet/po/styles/pt.po|   24 ++
 loleaflet/po/styles/ro.po|   24 ++
 loleaflet/po/styles/ru.po|   24 ++
 loleaflet/po/styles/si.po|   16 +
 loleaflet/po/styles/sid.po   |   24 ++
 loleaflet/po/styles/sk.po|   24 ++
 loleaflet/po/styles/sl.po|   24 ++
 loleaflet/po/styles/sq.po|   12 +
 loleaflet/po/styles/sr-Latn.po   |   24 ++
 loleaflet/po/styles/sr.po|   24 ++
 loleaflet/po/styles/sv.po|   24 ++
 loleaflet/po/styles/ta.po|   24 ++
 loleaflet/po/styles/te.po|   24 ++
 loleaflet/po/styles/tr.po|   24 ++
 loleaflet/po/styles/ug

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

[Henry Castro]

 desktop/source/lib/init.cxx  |   20 ++-
 sfx2/source/control/unoctitm.cxx |   68 ---
 2 files changed, 82 insertions(+), 6 deletions(-)

New commits:
commit 4fb1a8705549dd471d1ec687f8828818c106f20e
Author: Henry Castro 
Date:   Thu Jun 30 10:33:20 2016 -0400

lok: add status and tool bar UNO commands

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e88dce8..a052b6f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -796,7 +796,25 @@ static void doc_iniUnoCommands ()
 OUString(".uno:EntireColumn"),
 OUString(".uno:EntireCell"),
 OUString(".uno:MergeCells"),
-OUString(".uno:AssignLayout")
+OUString(".uno:AssignLayout"),
+OUString(".uno:StatusDocPos"),
+OUString(".uno:RowColSelCount"),
+OUString(".uno:StatusPageStyle"),
+OUString(".uno:InsertMode"),
+OUString(".uno:StatusSelectionMode"),
+OUString(".uno:StateTableCell"),
+OUString(".uno:StatusBarFunc"),
+OUString(".uno:StatePageNumber"),
+OUString(".uno:StateWordCount"),
+OUString(".uno:SelectionMode"),
+OUString(".uno:PageStatus"),
+OUString(".uno:LayoutStatus"),
+OUString(".uno:Context"),
+OUString(".uno:WrapText"),
+OUString(".uno:ToggleMergeCells"),
+OUString(".uno:NumberFormatCurrency"),
+OUString(".uno:NumberFormatPercent"),
+OUString(".uno:NumberFormatDate")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e317ae4..bca77ec 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1064,7 +1064,7 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 
 OUStringBuffer aBuffer;
 aBuffer.append(aEvent.FeatureURL.Complete);
-aBuffer.append("=");
+aBuffer.append(static_cast('='));
 
 if (aEvent.FeatureURL.Path == "Bold" ||
 aEvent.FeatureURL.Path == "CenterPara" ||
@@ -1143,16 +1143,74 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 {
 aBuffer.append(OUString::boolean(aEvent.IsEnabled));
 }
-else if (aEvent.FeatureURL.Path == "AssignLayout")
+else if (aEvent.FeatureURL.Path == "AssignLayout" ||
+ aEvent.FeatureURL.Path == "StatusSelectionMode" ||
+ aEvent.FeatureURL.Path == "Signature" ||
+ aEvent.FeatureURL.Path == "SelectionMode")
 {
-sal_Int32 nLayout = 0;
-aEvent.State >>= nLayout;
-aBuffer.append(nLayout);
+sal_Int32 aInt32;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aInt32))
+{
+aBuffer.append(OUString::number(aInt32));
+}
+}
+else if (aEvent.FeatureURL.Path == "StatusDocPos" ||
+ aEvent.FeatureURL.Path == "RowColSelCount" ||
+ aEvent.FeatureURL.Path == "StatusPageStyle" ||
+ aEvent.FeatureURL.Path == "StateTableCell" ||
+ aEvent.FeatureURL.Path == "StatePageNumber" ||
+ aEvent.FeatureURL.Path == "StateWordCount" ||
+ aEvent.FeatureURL.Path == "PageStyleName" ||
+ aEvent.FeatureURL.Path == "PageStatus" ||
+ aEvent.FeatureURL.Path == "LayoutStatus" ||
+ aEvent.FeatureURL.Path == "Context")
+{
+OUString aString;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aString))
+{
+aBuffer.append(aString);
+}
+}
+else if (aEvent.FeatureURL.Path == "InsertMode" ||
+ aEvent.FeatureURL.Path == "WrapText" ||
+ aEvent.FeatureURL.Path == "ToggleMergeCells" ||
+ aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
+ aEvent.FeatureURL.Path == "NumberFormatPercent" ||
+ aEvent.FeatureURL.Path == "NumberFormatDate")
+{
+sal_Bool aBool;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aBool))
+{
+aBuffer.append(OUString::boolean(aBool));
+}
+}
+else if (aEvent.FeatureURL.Path == "Position")
+{
+css::awt::Point aPoint;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aPoint))
+{
+aBuffer.append(OUString::number(aPoint.X) + OUString(" / ") + 
OUString::number(aPoint.Y));
+}
+}
+else if (aEvent.FeatureURL.Path == "StatusBarFunc" ||
+ aEvent.FeatureURL.Path == "Size")
+{
+css::awt::Size aSize;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aSize))
+{
+aBuffer.append(OUString::number(aSize.Width) + OUString(" x ") + 
OUString::number(aSize.Height));
+}
 }
 else
 {
 return;
 }
+
 OUSt

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

[Caolán McNamara]

 sw/source/core/crsr/findtxt.cxx |   48 +---
 1 file changed, 26 insertions(+), 22 deletions(-)

New commits:
commit 46b52c22bfb6b145af3c8407fd96321381e78d99
Author: Caolán McNamara 
Date:   Tue Jul 12 15:45:22 2016 +0100

Resolves: tdf#100538 make searching in shape text a libreoffice-kit only 
thing

This effectively reverts for the normal-app

commit bdc1824ea7acfa2fe9d71cdbe57882acce155577
Author: Miklos Vajna 
Date:   Tue May 19 17:20:10 2015 +0200

SwPaM::Find: search in shapes anchored to the range

The catches are that...

writer will use SvxSearchCmd::Find and not SvxSearchCmd::Replace when 
Replacing
text, and replacing it afterwards. So replace doesn't work. It might be 
possible
to mitigate that by passing down the m_bReplace to SwPam::Find and do a
SvxSearchCmd::Replace on the editeng SearchAndReplace in that case and then 
change
the return code to not-found/found-in-writer/found-in-drawing to figure out 
what
to do there.

regexps are disabled in the ui for draw/impress, maybe because they seem 
not be fully
implemented right wrt matching empty paragraphs, so using regexps in writer 
and
letting them into editeng via this loophole is new territory for the 
editengine

I think if I was trying this I'd fix regexp in editengine, then try add
searching/replacing in drawing boxes sort of at the end of searching in the
main document, something like how searching in frames works.

Change-Id: I2875b374a7ede8edd7f479254cbc2da36488abc8

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 0011605..d37756f 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -343,33 +344,36 @@ bool SwPaM::Find( const SearchOptions2& rSearchOpt, bool 
bSearchInNotes , utl::T
 }
 }
 
-// Writer and editeng selections are not supported in parallel.
-SvxSearchItem* pSearchItem = SwView::GetSearchItem();
-// If we just finished search in shape text, don't attempt to do 
that again.
-if (!bEndedTextEdit && !(pSearchItem && pSearchItem->GetCommand() 
== SvxSearchCmd::FIND_ALL))
+if (comphelper::LibreOfficeKit::isActive())
 {
-// If there are any shapes anchored to this node, search there.
-SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndOfContent());
-aPaM.GetPoint()->nNode = rTextNode;
-
aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTextNode(),
 nStart);
-aPaM.SetMark();
-aPaM.GetMark()->nNode = rTextNode.GetIndex() + 1;
-
aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTextNode(), 
0);
-if 
(pNode->GetDoc()->getIDocumentDrawModelAccess().Search(aPaM, aSearchItem) && 
pSdrView)
+// Writer and editeng selections are not supported in parallel.
+SvxSearchItem* pSearchItem = SwView::GetSearchItem();
+// If we just finished search in shape text, don't attempt to 
do that again.
+if (!bEndedTextEdit && !(pSearchItem && 
pSearchItem->GetCommand() == SvxSearchCmd::FIND_ALL))
 {
-if (SdrObject* pObject = pSdrView->GetTextEditObject())
+// If there are any shapes anchored to this node, search 
there.
+SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndOfContent());
+aPaM.GetPoint()->nNode = rTextNode;
+
aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTextNode(),
 nStart);
+aPaM.SetMark();
+aPaM.GetMark()->nNode = rTextNode.GetIndex() + 1;
+
aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTextNode(), 
0);
+if 
(pNode->GetDoc()->getIDocumentDrawModelAccess().Search(aPaM, aSearchItem) && 
pSdrView)
 {
-if (SwFrameFormat* pFrameFormat = 
FindFrameFormat(pObject))
+if (SdrObject* pObject = pSdrView->GetTextEditObject())
 {
-const SwPosition* pPosition = 
pFrameFormat->GetAnchor().GetContentAnchor();
-if (pPosition)
+if (SwFrameFormat* pFrameFormat = 
FindFrameFormat(pObject))
 {
-// Set search position to the shape's anchor 
point.
-*GetPoint() = *pPosition;
-
GetPoint()->nContent.Assign(pPosition->nNode.GetNode().GetContentNode(), 0);
-SetMark();
- 

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

[Eike Rathke]

 sc/qa/unit/data/functions/fods/oddlprice.fods |  402 ++
 1 file changed, 218 insertions(+), 184 deletions(-)

New commits:
commit b43eece4680d149985382c8528119577ab3d7c2b
Author: Eike Rathke 
Date:   Tue Jul 12 16:29:37 2016 +0200

redemption argument must be >0 now, tdf#100766 follow-up

Since 0759f31172253d6c5be3b938446ff1b8313adebd we check that, so test
for error here.

Change-Id: I395360d96ece31d8fb6a969c75d06b5e441c3051

diff --git a/sc/qa/unit/data/functions/fods/oddlprice.fods 
b/sc/qa/unit/data/functions/fods/oddlprice.fods
index 0bfe0b7..adcf403 100644
--- a/sc/qa/unit/data/functions/fods/oddlprice.fods
+++ b/sc/qa/unit/data/functions/fods/oddlprice.fods
@@ -1,13 +1,13 @@
 
 
 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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis: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: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:form
 x="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.spreadsheet">
- 
2016-07-01T15:50:49.738980082P0D1LibreOffice/5.1.3.2$Linux_X86_64
 LibreOffice_project/10m0$Build-2
+ 
2016-07-01T15:50:49.738980082P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/83d5a4a9c256eaef4c04f799db38b373d9cff4d5
  
   
0
0
25900
-   20909
+   20866

 
  view1
@@ -28,10 +28,11 @@
95
60
true
+   false
   
   
-   5
-   19
+   2
+   22
0
0
0
@@ -45,10 +46,11 @@
95
60
true
+   false
   
  
  Sheet2
- 1185
+ 1224
  0
  95
  60
@@ -69,6 +71,7 @@
  1
  1
  true
+ false
 

   
@@ -93,7 +96,7 @@
false
12632256
false
-   Lexmark-E352dn
+   Generic 
Printer

 
  cs
@@ -122,7 +125,7 @@
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   hAH+/0dlbmVyaWMgUHJpbnRlcgAAU0dFTlBSVAAWAAMAqgAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==
false
0
   
@@ -931,72 +934,93 @@
   


+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+  
+  
+   
+   



   
-  
+  





   
-  
+  
+   
+   
+   
+   
+   
+  
+  





   
-  
+  





   
-  
+  

   
-  
+  


   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  


   
-  
-  
+  
+  


   
-  
+  


   
-  
+  

   
-  
+  

Re: compiler plugin

[Miklos Vajna]

Hi,

On Tue, Jul 12, 2016 at 02:58:35PM +0200, Stephan Bergmann 
 wrote:
> where the first link,  is the
> one to the results of the new Clang+plugins bot.  However, it is unclear to
> me how to navigate from that page to the relevant information about the
> failure, 
> .

At , hover your mouse over
"default", click on the appearing arrow, then choose "console output".

It's quite similar how you could view previous build results already.

Regards,

Miklos


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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - desktop/inc desktop/Library_sofficeapp.mk desktop/source opencl/inc opencl/Library_opencl.mk opencl/source Repository.mk sc/Module_sc.mk sc/P

[Michael Meeks]

 Repository.mk|1 
 desktop/Library_sofficeapp.mk|3 
 desktop/inc/app.hxx  |1 
 desktop/source/app/app.cxx   |5 +
 desktop/source/app/opencl.cxx|  174 +++
 opencl/Library_opencl.mk |1 
 opencl/inc/opencl_device.hxx |3 
 opencl/source/OpenCLZone.cxx |4 
 opencl/source/openclwrapper.cxx  |8 +
 sc/Module_sc.mk  |1 
 sc/Package_opencl.mk |   16 +++
 sc/source/core/opencl/cl-test.ods|binary
 sc/source/core/tool/formulagroup.cxx |   10 --
 13 files changed, 214 insertions(+), 13 deletions(-)

New commits:
commit 3ee2c658508024b62864ce89c2e5a2bb706e6923
Author: Michael Meeks 
Date:   Mon Jul 11 15:12:38 2016 +0100

desktop: validate OpenCL drivers before use.

OpenCL validation needs to happen before drivers are used in
anger. This should isolate any crashes, and/or mis-behavior to
We use app version, CL driver version and file time-stamp to
trigger re-testing the device. If anything fails: hard disable
OpenCL.

We use an opencl validation sheet (cl-test.ods) and install it.
It is a minimal CL set - it requires a very short formula group
length, and combines several CL functions into few formulae to
test more.

The sheet structure, in particular the manual squaring / SQRT is
necessary to stick within the default CL subset, and ensure that
formulae are CL enabled from the root of the dependency tree up.

Reviewed-on: https://gerrit.libreoffice.org/27131
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit c44726c48228d9c6a5960e302b1c0bd16b0099c4)

+ opencl: bail out early in missing OpenCL case.
(cherry picked from commit 605a5dc088385ad21c33028d8107125c0316ddb1)

+ Remove bogus dependency from opencl to configmgr
Since f41eb66302208f384a475fb20c98b6d1b0676cb6 "opencl: OpenCLZone, detect 
CL
device change and disable CL on crash" vcl links against opencl (so 
indirectly
linked against configmgr), which caused CppunitTest_configmgr_unit to 
include
the configmgr object files both statically (through
gb_CppunitTest_use_library_objects) and through the linked-in configmgr 
dynamic
library, which in turn caused ASan builds to report an ODR violation for a
doubly defined 'typeinfo name for configmgr::Access'.

(cherry picked from commit 9c711f05fa10dc70e4257a1f48d43f539353541a)

Change-Id: I18682dbdf9a8ba9c16d52bad4447e9acce97f0a3
Reviewed-on: https://gerrit.libreoffice.org/27141
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/Repository.mk b/Repository.mk
index 858be89..14a1c07 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -837,6 +837,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
Pyuno/mailmerge \
)) \
sfx2_classification \
+$(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 04bc491..a5cf82b 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\
 ))
 
 $(eval $(call gb_Library_use_externals,sofficeapp, \
+   $(if $(filter OPENCL,$(BUILD_TYPE)),clew) \
 boost_headers \
 dbus \
 ))
@@ -57,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 deploymentmisc \
 editeng \
 i18nlangtag \
+$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
 sal \
 salhelper \
 sb \
@@ -102,6 +104,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 desktop/source/app/langselect \
 desktop/source/app/lockfile2 \
 desktop/source/app/officeipcthread \
+desktop/source/app/opencl \
 desktop/source/app/sofficemain \
 desktop/source/app/userinstall \
 desktop/source/migration/migration \
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 1905cf0..c90bfdb 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -84,6 +84,7 @@ class Desktop : public Application
 
 static void OpenClients();
 static void OpenDefault();
+static void CheckOpenCLCompute(const 
css::uno::Reference &);
 
 DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e91e7de..dd5451a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1609,6 +1609,11 @@ int Desktop::Main()
 FatalError( MakeStartupErrorMessage(e.Message) );
 }
 
+// FIXME: move this somewhere sensible.
+#if HAVE_FEATURE_OPENCL
+CheckOpenCLCompute(xDesktop);
+#endif
+
 // Release solar mutex

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

[Takeshi Abe]

 starmath/source/parse.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a323172a92434189ec14eff5b3ca0d6c3b63f269
Author: Takeshi Abe 
Date:   Tue Jul 12 18:30:11 2016 +0900

starmath: no need to create temporary string for comparison

Change-Id: I906ef285ec6164284924ca4771a6da758bd23fd6
Reviewed-on: https://gerrit.libreoffice.org/27140
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index f1434c9..9ac2d93 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -298,7 +298,7 @@ const SmTokenTableEntry * SmParser::GetTokenTableEntry( 
const OUString &rName )
 {
 for (auto const &token : aTokenTable)
 {
-if (rName.equalsIgnoreAsciiCase( 
OUString::createFromAscii(token.pIdent) ))
+if (rName.equalsIgnoreAsciiCaseAscii( token.pIdent ))
 return &token;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Balland-Poirier]

 svl/source/numbers/zformat.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 0a27e1aa4b710219935f298581ccc993963a6a12
Author: Laurent Balland-Poirier 
Date:   Mon Jul 11 09:20:21 2016 +0200

tdf#100842 Do not insert things in the middle of the number

With fraction number format, if number is longer than number of digits in 
format
jump to the beginning of number before inserting extras:
strings, blank, star filling
Do not do this for exponent of scientific format as it may contain
unwanted 0 at beginning.

Change-Id: Ide99f5cba198f76541f0e4e17b29469a99b57b9f
Reviewed-on: https://gerrit.libreoffice.org/27097
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 0727e6e79994b66836841978a554b7f6855449dc)
Reviewed-on: https://gerrit.libreoffice.org/27142
(cherry picked from commit f087e995e169fc348e2b5e0b65d45fd2836fd2d0)
Reviewed-on: https://gerrit.libreoffice.org/27145
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 9f987f5..7f0df63 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4296,6 +4296,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
 // no normal thousands separators if number divided by thousands
 bool bDoThousands = (rInfo.nThousand == 0);
+bool bFoundNumber = false;
 short nType;
 
 k = sBuff.getLength(); // behind last digit
@@ -4307,12 +4308,18 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 case NF_SYMBOLTYPE_STAR:
 if( bStarFlag )
 {
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 bRes = lcl_insertStarFillChar( sBuff, k, rInfo.sStrArray[j]);
 }
 break;
 case NF_SYMBOLTYPE_BLANK:
 if (rInfo.sStrArray[j].getLength() >= 2)
+{
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 k = InsertBlanks(sBuff, k, rInfo.sStrArray[j][1] );
+}
 break;
 case NF_SYMBOLTYPE_THSEP:
 // Same as in ImpNumberFillWithThousands() above, do not insert
@@ -4333,6 +4340,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 break;
 case NF_SYMBOLTYPE_DIGIT:
 {
+bFoundNumber = true;
 const OUString& rStr = rInfo.sStrArray[j];
 const sal_Unicode* p1 = rStr.getStr();
 const sal_Unicode* p = p1 + rStr.getLength();
@@ -4363,6 +4371,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 case NF_KEY_GENERAL: // Standard in the String
 {
 OUStringBuffer sNum;
+bFoundNumber = true;
 ImpGetOutputStandard(rNumber, sNum);
 sNum.stripStart('-');
 sBuff.insert(k, sNum.makeStringAndClear());
@@ -4372,6 +4381,8 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 break;
 
 default:
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 sBuff.insert(k, rInfo.sStrArray[j]);
 break;
 } // of switch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/commontools/dbtools.cxx |   10 --
 include/connectivity/OSubComponent.hxx  |4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 63628b10bf5402c3006e60db84571d5e6e51931c
Author: Stephan Bergmann 
Date:   Tue Jul 12 15:05:41 2016 +0200

tdf#100866: Don't let exception pass connectivity::release

...which is only ever called from onexcept XInterface::release overrides:
connectivity::release itself appears to be only called from
connectivity::OSubComponent::relase_ChildImpl [sic], which in turn is only
called from various XInterface::release overrides across connectivity.

(cherry picked from commit 9624bde1c36a3c1b86d8d88f97bc729ac4d65853)
Conflicts:
connectivity/source/commontools/dbtools.cxx

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

diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index 69c1524..d31c556 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1966,7 +1966,7 @@ namespace connectivity
 void release(oslInterlockedCount& _refCount,
  ::cppu::OBroadcastHelper& rBHelper,
  Reference< XInterface >& _xInterface,
- ::com::sun::star::lang::XComponent* _pObject)
+ ::com::sun::star::lang::XComponent* _pObject) throw ()
 {
 if (osl_atomic_decrement( &_refCount ) == 0)
 {
@@ -1983,7 +1983,13 @@ void release(oslInterlockedCount& _refCount,
 }
 
 // First dispose
-_pObject->dispose();
+try {
+_pObject->dispose();
+} catch (css::uno::RuntimeException & e) {
+SAL_WARN(
+"connectivity.commontools",
+"Caught exception during dispose, " << e.Message);
+}
 
 // only the alive ref holds the object
 OSL_ASSERT( _refCount == 1 );
diff --git a/include/connectivity/OSubComponent.hxx 
b/include/connectivity/OSubComponent.hxx
index 1aa9d15..54eaa37 100644
--- a/include/connectivity/OSubComponent.hxx
+++ b/include/connectivity/OSubComponent.hxx
@@ -43,7 +43,7 @@ namespace connectivity
 void release(oslInterlockedCount& _refCount,
  ::cppu::OBroadcastHelper& rBHelper,
  css::uno::Reference< css::uno::XInterface >& _xInterface,
- css::lang::XComponent* _pObject);
+ css::lang::XComponent* _pObject) throw ();
 
 // OSubComponent
 
@@ -70,7 +70,7 @@ namespace connectivity
 ::osl::MutexGuard aGuard( 
m_pDerivedImplementation->WEAK::rBHelper.rMutex );
 m_xParent.clear();
 }
-void relase_ChildImpl()
+void relase_ChildImpl() throw ()
 {
 ::connectivity::release(m_pDerivedImplementation->m_refCount,
 m_pDerivedImplementation->WEAK::rBHelper,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sd/inc/Outliner.hxx|5 +
 sd/source/ui/view/Outliner.cxx |7 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a563758746a6cd3900c88928c115275229617ed0
Author: Caolán McNamara 
Date:   Tue Jul 12 14:57:42 2016 +0100

Resolves: tdf#100861 replace all doesn't work

Revert "lool - search all - unit test failure - solved"

This reverts commit d6f1ca24932ba85607ba3e526c5721132cd39252.

Change-Id: I328ece1029955ff9f4e5043084d649898e3e8809

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index a9fc0a9..ad22672 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -593,8 +593,6 @@ void Outliner::Initialize (bool bDirectionIsForward)
 
 bool Outliner::SearchAndReplaceAll()
 {
-DetectChange();
-
 bool bRet = true;
 // Save the current position to be restored after having replaced all
 // matches.
commit 0e149c017d3ecd9523492bcc05d44d39746a4131
Author: Caolán McNamara 
Date:   Tue Jul 12 14:40:09 2016 +0100

Related: tdf#100861 same selection recorded multiple times...

in FindAll libreofficekit impress test

on find all we loop through the textboxes searching for the string.

We start by searching into the first textbox with the string in it.
mbStringFound gets set to true and this first selection is reported.
Now the current pos is still in that textbox at the end of the string.

The next loop will find nothing in this textbox, but because mbStringFound
was set in the earlier pass, the same selection gets reported again.

The next loop will move to the next textbox.

To keep this fix as simple as possible just check if the selection was
the previously reported one and skip it if it is.

I believe this is the problem that

commit d6f1ca24932ba85607ba3e526c5721132cd39252
Author: Marco Cecchetti 
Date:   Mon Jan 11 16:43:02 2016 +0100

lool - search all - unit test failure - solved

wanted to solve

Change-Id: I30e7b9c581488b48fa27f138209f291063b459a3

diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 3c7296a..b0a2192 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -50,6 +50,11 @@ struct SearchSelection
 OString m_aRectangles;
 
 SearchSelection(int nPage, const OString& rRectangles);
+
+bool operator==(const SearchSelection& rOther) const
+{
+return m_nPage == rOther.m_nPage && m_aRectangles == 
rOther.m_aRectangles;
+}
 };
 
 /** The main purpose of this class is searching and replacing as well as
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index c1ac3ce..a9fc0a9 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -826,7 +826,10 @@ bool 
Outliner::SearchAndReplaceOnce(std::vector* pSelections)
 }
 else
 {
-
pSelections->push_back(SearchSelection(maCurrentPosition.mnPageIndex, 
sRectangles));
+SearchSelection aSelection(maCurrentPosition.mnPageIndex, 
sRectangles);
+bool bDuplicate = !pSelections->empty() && pSelections->back() == 
aSelection;
+if (!bDuplicate)
+pSelections->push_back(aSelection);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source include/connectivity mysqlc/source odk/examples

[Stephan Bergmann]

 compilerplugins/clang/weakobject.cxx   |2 
+-
 connectivity/source/drivers/ado/AConnection.cxx|2 
+-
 connectivity/source/drivers/ado/AStatement.cxx |2 
+-
 connectivity/source/drivers/evoab2/NConnection.cxx |2 
+-
 connectivity/source/drivers/evoab2/NStatement.cxx  |2 
+-
 connectivity/source/drivers/file/FConnection.cxx   |2 
+-
 connectivity/source/drivers/file/FStatement.cxx|2 
+-
 connectivity/source/drivers/firebird/Connection.cxx|2 
+-
 connectivity/source/drivers/jdbc/JConnection.cxx   |2 
+-
 connectivity/source/drivers/jdbc/JStatement.cxx|2 
+-
 connectivity/source/drivers/kab/KConnection.cxx|2 
+-
 connectivity/source/drivers/macab/MacabConnection.cxx  |2 
+-
 connectivity/source/drivers/mork/MConnection.cxx   |2 
+-
 connectivity/source/drivers/mork/MStatement.cxx|2 
+-
 connectivity/source/drivers/odbc/OConnection.cxx   |2 
+-
 connectivity/source/drivers/odbc/OStatement.cxx|2 
+-
 connectivity/source/sdbcx/VCatalog.cxx |2 
+-
 include/connectivity/OSubComponent.hxx |2 
+-
 mysqlc/source/mysqlc_connection.cxx|2 
+-
 mysqlc/source/mysqlc_statement.cxx |2 
+-
 mysqlc/source/mysqlc_subcomponent.hxx  |2 
+-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx |2 
+-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx   |2 
+-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx|2 
+-
 24 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit a6060e02f7f8c1966e5f54bbe186a445a74942e7
Author: Stephan Bergmann 
Date:   Tue Jul 12 15:57:36 2016 +0200

Fix typo relase_ChildImpl -> release_ChildImpl

Change-Id: I68faf8cfb8eb390e7970383b8a6596a9dd3f95f7

diff --git a/compilerplugins/clang/weakobject.cxx 
b/compilerplugins/clang/weakobject.cxx
index a148da0..7c36f93 100644
--- a/compilerplugins/clang/weakobject.cxx
+++ b/compilerplugins/clang/weakobject.cxx
@@ -123,7 +123,7 @@ public:
 return true;
 }
 }
-else if (pCalled->getName() == "relase_ChildImpl") // FIXME 
remove this lunacy
+else if (pCalled->getName() == "release_ChildImpl") // FIXME 
remove this lunacy
 {
 return true;
 }
diff --git a/connectivity/source/drivers/ado/AConnection.cxx 
b/connectivity/source/drivers/ado/AConnection.cxx
index 45a0dfd..cc94d95 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -158,7 +158,7 @@ void OConnection::construct(const OUString& url,const 
Sequence< PropertyValue >&
 
 void SAL_CALL OConnection::release() throw()
 {
-relase_ChildImpl();
+release_ChildImpl();
 }
 
 Reference< XStatement > SAL_CALL OConnection::createStatement(  ) 
throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/ado/AStatement.cxx 
b/connectivity/source/drivers/ado/AStatement.cxx
index e067254..aaeda5b 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -110,7 +110,7 @@ void OStatement_Base::disposing()
 
 void SAL_CALL OStatement_Base::release() throw()
 {
-relase_ChildImpl();
+release_ChildImpl();
 }
 
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) 
throw(RuntimeException)
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx 
b/connectivity/source/drivers/evoab2/NConnection.cxx
index d3bcb54..9d21a97 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -61,7 +61,7 @@ OEvoabConnection::~OEvoabConnection()
 
 void SAL_CALL OEvoabConnection::release() throw()
 {
-relase_ChildImpl();
+release_ChildImpl();
 }
 
 // XServiceInfo
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx 
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 0731d0d..aec05c3 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -537,7 +537,7 @@ void SAL_CALL OCommonStatement::acquire() throw()
 
 void SAL_CALL OCommonStatement::release() throw()
 {
-relase_ChildImpl();
+release_ChildImpl();
 }
 
 
diff --git a/connectivity/source/drivers/file/FConnection.cxx 
b/connectivity/source/drivers/file/FConnection.cxx
index 6424a25..745c112 100644
--- a/connectivity/source/dri

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

[Miklos Vajna]

 loolwsd/Admin.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ec0c49447f9dc2a203f18fe2560fcb342ddc31d1
Author: Miklos Vajna 
Date:   Tue Jul 12 15:56:17 2016 +0200

Admin: avoid unsigned long -> unsigned int coversion

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index e9344d6..540d36b 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -72,14 +72,14 @@ bool AdminRequestHandler::adminCommandHandler(const 
std::vector& payload)
 }
 else if (tokens[0] == "subscribe" && tokens.count() > 1)
 {
-for (unsigned i = 0; i < tokens.count() - 1; i++)
+for (std::size_t i = 0; i < tokens.count() - 1; i++)
 {
 model.subscribe(_sessionId, tokens[i + 1]);
 }
 }
 else if (tokens[0] == "unsubscribe" && tokens.count() > 1)
 {
-for (unsigned i = 0; i < tokens.count() - 1; i++)
+for (std::size_t i = 0; i < tokens.count() - 1; i++)
 {
 model.unsubscribe(_sessionId, tokens[i + 1]);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sc/source/core/opencl/op_spreadsheet.cxx |   31 ++-
 1 file changed, 30 insertions(+), 1 deletion(-)

New commits:
commit 7e974221de906eccb5b2b10cf744f8768963b761
Author: Michael Meeks 
Date:   Thu Jul 7 20:23:41 2016 +0100

tdf#99512 - opencl - restrict scope of vlookup optimization to doubles.

Change-Id: Iab7316cb167f34c13adafe142af0fdd73eb7d04c
Reviewed-on: https://gerrit.libreoffice.org/27100
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit dead5dc1ae3baab5e25d641322d138dd3d242bff)
Reviewed-on: https://gerrit.libreoffice.org/27104
Reviewed-by: Jan Holesovsky 
(cherry picked from commit f250c06228f4d79af849ebe2ada565e42d29b8cd)
Reviewed-on: https://gerrit.libreoffice.org/27143
Reviewed-by: Eike Rathke 
Tested-by: Michael Meeks 

diff --git a/sc/source/core/opencl/op_spreadsheet.cxx 
b/sc/source/core/opencl/op_spreadsheet.cxx
index c18b2ba..243d299 100644
--- a/sc/source/core/opencl/op_spreadsheet.cxx
+++ b/sc/source/core/opencl/op_spreadsheet.cxx
@@ -45,12 +45,41 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream 
&ss,
 CheckSubArgumentIsNan(ss,vSubArguments,arg++);
 int secondParaWidth = 1;
 
+// tdf#99512 - for now only allow non-dynamic indicees (the
+// common-case) to validate consistent return types vs. the input.
+int index = 0;
+int indexArg = vSubArguments.size() - 2;
+if (vSubArguments[indexArg]->GetFormulaToken()->GetType() == 
formula::svDouble)
+{
+const formula::FormulaDoubleToken *dblToken = static_cast(vSubArguments[indexArg]->GetFormulaToken());
+index = ::rtl::math::approxFloor(dblToken->GetDouble());
+}
+
 if (vSubArguments[1]->GetFormulaToken()->GetType() == 
formula::svDoubleVectorRef)
 {
 FormulaToken *tmpCur = vSubArguments[1]->GetFormulaToken();
 const formula::DoubleVectorRefToken*pCurDVR = static_cast(tmpCur);
-secondParaWidth = pCurDVR->GetArrays().size();
+const std::vector items = pCurDVR->GetArrays();
+
+secondParaWidth = items.size();
+
+if (index < 1 || index > secondParaWidth)
+throw Unhandled(__FILE__, __LINE__); // oob index.
+
+if (items[index - 1].mpStringArray)
+{
+rtl_uString **pStrings = items[index - 1].mpStringArray;
+for (size_t i = 0; i < pCurDVR->GetArrayLength(); ++i)
+{
+if (pStrings[i] != nullptr)
+{   // TODO: the GroupTokenConverter should do better.
+throw Unhandled(__FILE__, __LINE__); // mixed arguments.
+}
+}
+}
 }
+else
+throw Unhandled(__FILE__, __LINE__); // unusual vlookup.
 
 arg += secondParaWidth;
 CheckSubArgumentIsNan(ss,vSubArguments,arg++);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/commontools/dbtools.cxx |   10 --
 include/connectivity/OSubComponent.hxx  |4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 9624bde1c36a3c1b86d8d88f97bc729ac4d65853
Author: Stephan Bergmann 
Date:   Tue Jul 12 15:05:41 2016 +0200

tdf#100866: Don't let exception pass connectivity::release

...which is only ever called from onexcept XInterface::release overrides:
connectivity::release itself appears to be only called from
connectivity::OSubComponent::relase_ChildImpl [sic], which in turn is only
called from various XInterface::release overrides across connectivity.

Change-Id: I94b682ec531acecd0ef9f8c100f67a71c361941e

diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index 701c64d..1c1dbfe 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1965,7 +1965,7 @@ namespace connectivity
 void release(oslInterlockedCount& _refCount,
  ::cppu::OBroadcastHelper& rBHelper,
  Reference< XInterface >& _xInterface,
- css::lang::XComponent* _pObject)
+ css::lang::XComponent* _pObject) throw ()
 {
 if (osl_atomic_decrement( &_refCount ) == 0)
 {
@@ -1982,7 +1982,13 @@ void release(oslInterlockedCount& _refCount,
 }
 
 // First dispose
-_pObject->dispose();
+try {
+_pObject->dispose();
+} catch (css::uno::RuntimeException & e) {
+SAL_WARN(
+"connectivity.commontools",
+"Caught exception during dispose, " << e.Message);
+}
 
 // only the alive ref holds the object
 OSL_ASSERT( _refCount == 1 );
diff --git a/include/connectivity/OSubComponent.hxx 
b/include/connectivity/OSubComponent.hxx
index 8f80e8e..1955c54 100644
--- a/include/connectivity/OSubComponent.hxx
+++ b/include/connectivity/OSubComponent.hxx
@@ -43,7 +43,7 @@ namespace connectivity
 void release(oslInterlockedCount& _refCount,
  ::cppu::OBroadcastHelper& rBHelper,
  css::uno::Reference< css::uno::XInterface >& _xInterface,
- css::lang::XComponent* _pObject);
+ css::lang::XComponent* _pObject) throw ();
 
 // OSubComponent
 
@@ -70,7 +70,7 @@ namespace connectivity
 ::osl::MutexGuard aGuard( 
m_pDerivedImplementation->WEAK::rBHelper.rMutex );
 m_xParent.clear();
 }
-void relase_ChildImpl()
+void relase_ChildImpl() throw ()
 {
 #if 0
 ::connectivity::release(m_pDerivedImplementation->m_refCount,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Macro encryption different in between 4.2 and 5.1

[Michael Stahl]

On 12.07.2016 08:57, SOS wrote:
> sorry i mixed up the situation
> extension *Build in 4.2 and used in 5.1*:
> must be:
> extension *Build in 5.1 and used in 4.2*: the functions and Sub's in the
> libraries are not available,  its only after opening the library 
> "manualy" and after entering the password that make the functions and
> the sub's available in memory.
> Build in 4.2 and used in 5.1 gives no problems
> 
> On 11/07/2016 17:05, SOS wrote:
>> A extension made with password protected Basic Libraries using LO 5.1 
>> do not "load" properly the libraries under LO 4.2
>>
>> We load a  password protected library using the folowing code.
>> If (Not GlobalScope.BasicLibraries.isLibraryLoaded("DbUtils")) Then
>> GlobalScope.BasicLibraries.LoadLibrary("DbUtils")
>> End If
>> extension Build and used in 4.2  makes all functions and sub's
>> available in memory.
>> extension Build and used in 5.1  makes all functions and sub's
>> available in memory.
>> extension Build in 4.2 and used in 5.1: the functions and Sub's in the
>> libraries are not available,  its only after opening the library 
>> "manualy" and after entering the password that make the functions and
>> the sub's available in memory.
>>
>> The extensions are build under Windows
>> There is a difference in size between the extension build in 5.1 and 4.2
>> 5.1 gives 69 KB
>> 4.2 gives 67 KB
>> There is no error after
>> "GlobalScope.BasicLibraries.LoadLibrary("DbUtils")
>> once the librarie is opened with the password, then
>> "GlobalScope.BasicLibraries.LoadLibrary("DbUtils")"  is working fine
>> even after closing LO !!
>>
>> Can someone confirm this behavior and sould i filled a issue ?

hi Fernand,

there were numerous bugfixes for password protected libraries during
that time, like tdf#87530 tdf#68983 tdf#67685 tdf#52076 tdf#40173

but all those bugs were about just using the UI, probably nobody has
tested what happens when calling LoadLibrary() from a macro.

perhaps there is a new bug in LO 5.1 and we can fix it, or perhaps the
bug was in LO 4.2 which means it can't be fixed now, hard to tell
without a more thorough investigation - please file a bug with exact
steps to reproduce the problem.

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

Re: compiler plugin

[Stephan Bergmann]

On 07/12/2016 09:32 AM, Norbert Thiebaud wrote:

I've enabled an additional build for gerrit doing clang + plugins on linux


So Jenkins comments on Gerrit changes now contain two links, one to the 
results of the three old bots (Linux, OS X, Windows) and one to the 
results of the new Clang+plugins bot.  For example, the seventh comment 
to  reads



Jenkins
13:27

Patch Set 1:

Build Failed

http://ci.libreoffice.org/job/lo_gerrit/25/ : FAILURE

http://ci.libreoffice.org/job/lo_gerrit_master/18776/ : SUCCESS


where the first link,  is 
the one to the results of the new Clang+plugins bot.  However, it is 
unclear to me how to navigate from that page to the relevant information 
about the failure, 
.


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

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

[Winfried Donkers]

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

New commits:
commit e4b3772ef966fb3db8dfaa55dfc5f5582d61761d
Author: Winfried Donkers 
Date:   Fri Jul 8 09:46:10 2016 +0200

tdf#100762 Add support for array arguments to NPV.

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

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 8418062..458236e 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1316,6 +1316,41 @@ void ScInterpreter::ScNPV()
 SetError(nErr);
 }
 break;
+case svMatrix :
+case svExternalSingleRef:
+case svExternalDoubleRef:
+{
+ScMatrixRef pMat = GetMatrix();
+if (pMat)
+{
+SCSIZE nC, nR;
+pMat->GetDimensions(nC, nR);
+if (nC == 0 || nR == 0)
+{
+PushIllegalArgument();
+return;
+}
+else
+{
+double fx;
+for ( SCSIZE j = 0; j < nC; j++ )
+{
+for (SCSIZE k = 0; k < nR; ++k)
+{
+if (!pMat->IsValue(j,k))
+{
+PushIllegalArgument();
+return;
+}
+fx = pMat->GetDouble(j,k);
+nVal += (fx / pow(1.0 + nInterest, 
nCount));
+nCount++;
+}
+}
+}
+}
+}
+break;
 default : SetError(errIllegalParameter); break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 scaddins/source/analysis/financial.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0759f31172253d6c5be3b938446ff1b8313adebd
Author: Winfried Donkers 
Date:   Thu Jul 7 14:01:58 2016 +0200

tdf100766 : ODDLPRICE apply constraints to comply with ODFF1.2

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

diff --git a/scaddins/source/analysis/financial.cxx 
b/scaddins/source/analysis/financial.cxx
index a5f38d1..6b4a6fd 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -439,7 +439,7 @@ double SAL_CALL AnalysisAddIn::getOddlprice( const 
css::uno::Reference< css::bea
 sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
 double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const 
css::uno::Any& rOB ) throw( css::uno::RuntimeException, 
css::lang::IllegalArgumentException, std::exception )
 {
-if( fRate < 0.0 || fYield < 0.0 || CHK_Freq || nMat <= nSettle || nSettle 
<= nLastInterest )
+if( fRate <= 0.0 || fYield < 0.0 || fRedemp <= 0.0 || CHK_Freq || nMat <= 
nSettle || nSettle <= nLastInterest )
 throw css::lang::IllegalArgumentException();
 
 double fRet = GetOddlprice( GetNullDate( xOpt ), nSettle, nMat, 
nLastInterest, fRate, fYield, fRedemp, nFreq,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 scaddins/source/analysis/financial.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 897049ef655d09f477c4c766221a5b1b42087d63
Author: Winfried Donkers 
Date:   Thu Jul 7 12:13:30 2016 +0200

tdf#100729 ODDLYIELD : apply constraints in compliance with ODFF1.2

(and Excel).

Change-Id: I1cc40494fb2451a06864f770af7c33d26013dcaa
Reviewed-on: https://gerrit.libreoffice.org/27002
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/scaddins/source/analysis/financial.cxx 
b/scaddins/source/analysis/financial.cxx
index 052f8b5..a5f38d1 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -452,7 +452,7 @@ double SAL_CALL AnalysisAddIn::getOddlyield( const 
css::uno::Reference< css::bea
 sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
 double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const 
css::uno::Any& rOB ) throw( css::uno::RuntimeException, 
css::lang::IllegalArgumentException, std::exception )
 {
-if( fRate < 0.0 || fPrice <= 0.0 || CHK_Freq || nMat <= nSettle || nSettle 
<= nLastInterest )
+if( fRate <= 0.0 || fPrice <= 0.0 || fRedemp <= 0.0 || CHK_Freq || nMat <= 
nSettle || nSettle <= nLastInterest )
 throw css::lang::IllegalArgumentException();
 
 double fRet = GetOddlyield( GetNullDate( xOpt ), nSettle, nMat, 
nLastInterest, fRate, fPrice, fRedemp, nFreq,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 scaddins/source/analysis/analysishelper.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2fd00e59ad6cf55c4fc621724de863947ef6dcf6
Author: Winfried Donkers 
Date:   Thu Jul 7 08:16:21 2016 +0200

tdf#100528 follow up; filter nonsense results.

With unrealistic depreciation rates (>100%), the caluculated amortisation
value can be < 0. Although mathematically correct, financially this is
nonsense. The patch returns 0.0 when the calculated amortisation values
gets < 0.0. (Excel does the same.)

Change-Id: I928bba647429ff6141abfdbd996d4562e31da746
Reviewed-on: https://gerrit.libreoffice.org/26996
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 9b17f04..992abfd 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1042,12 +1042,16 @@ double GetAmorlinc( sal_Int32 nNullDate, double fCost, 
sal_Int32 nDate, sal_Int3
 double  f0Rate = GetYearFrac( nNullDate, nDate, nFirstPer, nBase ) * 
fRate * fCost;
 sal_uInt32  nNumOfFullPeriods = sal_uInt32( ( fCost - fRestVal - f0Rate) / 
fOneRate );
 
+double fResult = 0.0;
 if( nPer == 0 )
-return f0Rate;
+fResult = f0Rate;
 else if( nPer <= nNumOfFullPeriods )
-return fOneRate;
+fResult = fOneRate;
 else if( nPer == nNumOfFullPeriods + 1 )
-return fCostDelta - fOneRate * nNumOfFullPeriods - f0Rate;
+fResult = fCostDelta - fOneRate * nNumOfFullPeriods - f0Rate;
+
+if ( fResult > 0.0 )
+return fResult;
 else
 return 0.0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 29089b562ea6d0137cf054d9710b7238e327aa4f
Author: Miklos Vajna 
Date:   Tue Jul 12 11:29:52 2016 +0200

lokdocview: log the view id of the callback messages

So that e.g. it's possible to see which invalidation affects which view.

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

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 667b4d4..f65bfcd 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1271,7 +1271,10 @@ static void callbackWorker (int nType, const char* 
pPayload, void* pData)
 LOKDocView* pDocView = LOK_DOC_VIEW (pData);
 
 CallbackData* pCallback = new CallbackData(nType, pPayload ? pPayload : 
"(nil)", pDocView);
-g_info("callbackWorker: %s, '%s'", callbackTypeToString(nType), pPayload);
+LOKDocViewPrivate& priv = getPrivate(pDocView);
+std::stringstream ss;
+ss << "callbackWorker, view #" << priv->m_nViewId << ": " << 
callbackTypeToString(nType) << ", '" << pPayload << "'";
+g_info("%s", ss.str().c_str());
 gdk_threads_add_idle(callback, pCallback);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 sc/source/core/tool/interpr2.cxx |  115 ---
 1 file changed, 95 insertions(+), 20 deletions(-)

New commits:
commit 3d4a68aa04d13de374641792d3d4981783045dbd
Author: Winfried Donkers 
Date:   Fri Jul 8 12:34:18 2016 +0200

tdf#100767 make MIRR compliant with ODFF1.2

Support array argument for values.
At least one value must be positive and at least one value must be
negative.
Text and empty cells in the value range are ignored.

Change-Id: I1c086767bd4cf997be40f5f58fde75a639acb132
Reviewed-on: https://gerrit.libreoffice.org/27036
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index cc73527..8418062 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1393,46 +1393,121 @@ void ScInterpreter::ScIRR()
 void ScInterpreter::ScMIRR()
 {   // range_of_values ; rate_invest ; rate_reinvest
 nFuncFmtType = css::util::NumberFormat::PERCENT;
-if( MustHaveParamCount( GetByte(), 3 ) )
+if ( MustHaveParamCount( GetByte(), 3 ) )
 {
 double fRate1_reinvest = GetDouble() + 1;
 double fRate1_invest = GetDouble() + 1;
 
 ScRange aRange;
-PopDoubleRef( aRange );
+ScMatrixRef pMat;
+SCSIZE nC = 0;
+SCSIZE nR = 0;
+bool bIsMatrix = false;
+switch ( GetStackType() )
+{
+case svDoubleRef :
+PopDoubleRef( aRange );
+break;
+case svMatrix :
+case svExternalSingleRef:
+case svExternalDoubleRef:
+{
+pMat = GetMatrix();
+if ( pMat )
+{
+pMat->GetDimensions( nC, nR );
+if ( nC == 0 || nR == 0 )
+SetError( errIllegalArgument );
+bIsMatrix = true;
+}
+else
+SetError( errIllegalArgument );
+}
+break;
+default :
+SetError( errIllegalParameter );
+break;
+}
 
-if( nGlobalError )
-PushError( nGlobalError);
+if ( nGlobalError )
+PushError( nGlobalError );
 else
 {
 double fNPV_reinvest = 0.0;
 double fPow_reinvest = 1.0;
 double fNPV_invest = 0.0;
 double fPow_invest = 1.0;
-ScValueIterator aValIter( pDok, aRange, mnSubTotalFlags );
-double fCellValue;
 sal_uLong nCount = 0;
-sal_uInt16 nIterError = 0;
+bool bHasPosValue = false;
+bool bHasNegValue = false;
 
-bool bLoop = aValIter.GetFirst( fCellValue, nIterError );
-while( bLoop )
+if ( bIsMatrix )
 {
-if( fCellValue > 0.0 )  // reinvestments
-fNPV_reinvest += fCellValue * fPow_reinvest;
-else if( fCellValue < 0.0 ) // investments
-fNPV_invest += fCellValue * fPow_invest;
-fPow_reinvest /= fRate1_reinvest;
-fPow_invest /= fRate1_invest;
-nCount++;
+double fX;
+for ( SCSIZE j = 0; j < nC; j++ )
+{
+for ( SCSIZE k = 0; k < nR; ++k )
+{
+if ( !pMat->IsValue( j, k ) )
+continue;
+fX = pMat->GetDouble( j, k );
+if ( nGlobalError )
+break;
+
+if ( fX > 0.0 )
+{// reinvestments
+bHasPosValue = true;
+fNPV_reinvest += fX * fPow_reinvest;
+}
+else if ( fX < 0.0 )
+{   // investments
+bHasNegValue = true;
+fNPV_invest += fX * fPow_invest;
+}
+fPow_reinvest /= fRate1_reinvest;
+fPow_invest /= fRate1_invest;
+nCount++;
+}
+}
+}
+else
+{
+ScValueIterator aValIter( pDok, aRange, mnSubTotalFlags );
+double fCellValue;
+sal_uInt16 nIterError = 0;
+
+bool bLoop = aValIter.GetFirst( fCellValue, nIterError );
+while( bLoop )
+{
+if( fCellValue > 0.0 )  // reinvestments
+{// reinvestments
+bHasPosValue = true;
+fNPV_reinvest += fCellValue * fPow_reinvest;
+ 

[Libreoffice-commits] core.git: Branch 'feature/fixes26' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 189ae6c585219ff0cf4bee44e9477cfd9818b485
Author: Jan Holesovsky 
Date:   Tue Jul 12 12:07:34 2016 +0200

Fix --enable-mergelibs build.

Change-Id: I4520a4c415a9d5d602a281cd59ef2d2b14dd3be7

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b338570..20cc510 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -12,6 +12,7 @@
 MERGE_LIBRARY_LIST := \
avmedia \
$(if $(filter $(OS),ANDROID),,basebmp) \
+   $(if $(filter OPENCL,$(BUILD_TYPE)),clew) \
basegfx \
canvastools \
configmgr \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Balland-Poirier]

 svl/source/numbers/zformat.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit f087e995e169fc348e2b5e0b65d45fd2836fd2d0
Author: Laurent Balland-Poirier 
Date:   Mon Jul 11 09:20:21 2016 +0200

tdf#100842 Do not insert things in the middle of the number

With fraction number format, if number is longer than number of digits in 
format
jump to the beginning of number before inserting extras:
strings, blank, star filling
Do not do this for exponent of scientific format as it may contain
unwanted 0 at beginning.

Change-Id: Ide99f5cba198f76541f0e4e17b29469a99b57b9f
Reviewed-on: https://gerrit.libreoffice.org/27097
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 0727e6e79994b66836841978a554b7f6855449dc)
Reviewed-on: https://gerrit.libreoffice.org/27142

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 9f987f5..7f0df63 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4296,6 +4296,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
 // no normal thousands separators if number divided by thousands
 bool bDoThousands = (rInfo.nThousand == 0);
+bool bFoundNumber = false;
 short nType;
 
 k = sBuff.getLength(); // behind last digit
@@ -4307,12 +4308,18 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 case NF_SYMBOLTYPE_STAR:
 if( bStarFlag )
 {
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 bRes = lcl_insertStarFillChar( sBuff, k, rInfo.sStrArray[j]);
 }
 break;
 case NF_SYMBOLTYPE_BLANK:
 if (rInfo.sStrArray[j].getLength() >= 2)
+{
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 k = InsertBlanks(sBuff, k, rInfo.sStrArray[j][1] );
+}
 break;
 case NF_SYMBOLTYPE_THSEP:
 // Same as in ImpNumberFillWithThousands() above, do not insert
@@ -4333,6 +4340,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 break;
 case NF_SYMBOLTYPE_DIGIT:
 {
+bFoundNumber = true;
 const OUString& rStr = rInfo.sStrArray[j];
 const sal_Unicode* p1 = rStr.getStr();
 const sal_Unicode* p = p1 + rStr.getLength();
@@ -4363,6 +4371,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 case NF_KEY_GENERAL: // Standard in the String
 {
 OUStringBuffer sNum;
+bFoundNumber = true;
 ImpGetOutputStandard(rNumber, sNum);
 sNum.stripStart('-');
 sBuff.insert(k, sNum.makeStringAndClear());
@@ -4372,6 +4381,8 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 break;
 
 default:
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 sBuff.insert(k, rInfo.sStrArray[j]);
 break;
 } // of switch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/fragiledestructor.cxx |   15 +++
 svl/source/numbers/zformat.cxx  |   11 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit e12fbdd64b83f988191b8d085c99467fd8a52555
Author: Noel Grandin 
Date:   Tue Jul 12 11:31:25 2016 +0200

only traverse the dtor's statements once

rather than twice, once implicitly from TraverseCXXDestructorDecl and
explicitly from VisitCXXDestructorDecl

Change-Id: I62a794faa530f2b54b82c86de0629afa28f30091
Reviewed-on: https://gerrit.libreoffice.org/27139
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/compilerplugins/clang/fragiledestructor.cxx 
b/compilerplugins/clang/fragiledestructor.cxx
index ebce1d6..d4b7e61 100644
--- a/compilerplugins/clang/fragiledestructor.cxx
+++ b/compilerplugins/clang/fragiledestructor.cxx
@@ -29,7 +29,7 @@ public:
 
 virtual void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
 
-bool VisitCXXDestructorDecl(const CXXDestructorDecl *);
+bool TraverseCXXDestructorDecl(CXXDestructorDecl *);
 
 bool VisitCXXMemberCallExpr(const CXXMemberCallExpr *);
 
@@ -37,13 +37,13 @@ private:
 bool mbChecking = false;
 };
 
-bool FragileDestructor::VisitCXXDestructorDecl(const CXXDestructorDecl* 
pCXXDestructorDecl)
+bool FragileDestructor::TraverseCXXDestructorDecl(CXXDestructorDecl* 
pCXXDestructorDecl)
 {
 if (ignoreLocation(pCXXDestructorDecl)) {
-return true;
+return 
RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
 }
 if (!pCXXDestructorDecl->isThisDeclarationADefinition()) {
-return true;
+return 
RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
 }
 // ignore this for now, too tricky for me to work out
 StringRef aFileName = compiler.getSourceManager().getFilename(
@@ -55,12 +55,11 @@ bool FragileDestructor::VisitCXXDestructorDecl(const 
CXXDestructorDecl* pCXXDest
 // dont know how to detect this in clang - it is making an explicit 
call to it's own method, so presumably OK
 || aFileName == SRCDIR "/basic/source/sbx/sbxvalue.cxx"
)
-return true;
+return 
RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
 mbChecking = true;
-Stmt * pStmt = pCXXDestructorDecl->getBody();
-TraverseStmt(pStmt);
+bool ret = 
RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
 mbChecking = false;
-return true;
+return ret;
 }
 
 bool FragileDestructor::VisitCXXMemberCallExpr(const CXXMemberCallExpr* 
callExpr)
commit 0727e6e79994b66836841978a554b7f6855449dc
Author: Laurent Balland-Poirier 
Date:   Mon Jul 11 09:20:21 2016 +0200

tdf#100842 Do not insert things in the middle of the number

With fraction number format, if number is longer than number of digits in 
format
jump to the beginning of number before inserting extras:
strings, blank, star filling
Do not do this for exponent of scientific format as it may contain
unwanted 0 at beginning.

Change-Id: Ide99f5cba198f76541f0e4e17b29469a99b57b9f
Reviewed-on: https://gerrit.libreoffice.org/27097
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index aea14d0..1350525 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4144,6 +4144,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
 // no normal thousands separators if number divided by thousands
 bool bDoThousands = (rInfo.nThousand == 0);
+bool bFoundNumber = false;
 short nType;
 
 k = sBuff.getLength(); // behind last digit
@@ -4155,12 +4156,18 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 case NF_SYMBOLTYPE_STAR:
 if( bStarFlag )
 {
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 bRes = lcl_insertStarFillChar( sBuff, k, rInfo.sStrArray[j]);
 }
 break;
 case NF_SYMBOLTYPE_BLANK:
 if (rInfo.sStrArray[j].getLength() >= 2)
+{
+if ( bFoundNumber && eSymbolType != NF_SYMBOLTYPE_EXP )
+k = 0; // tdf#100842 jump to beginning of number before 
inserting something else
 k = InsertBlanks(sBuff, k, rInfo.sStrArray[j][1] );
+}
 break;
 case NF_SYMBOLTYPE_THSEP:
 // Same as in ImpNumberFillWithThousands() above, do not insert
@@ -4181,6 +4188,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 break;
 case NF_SYMBOLTYPE_DIGIT:
 {
+ 

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

[Miklos Vajna]

 sfx2/source/view/classificationcontroller.cxx |4 +++-
 vcl/source/window/toolbox2.cxx|6 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 8192da8e4de7a058ef95253f992f4143f83fa0f1
Author: Miklos Vajna 
Date:   Tue Jul 12 10:13:22 2016 +0200

tdf#100600 sfx2 classification: never replace the control with label

Thanks to Caolán McNamara for pointing out where is the condition of the
replacement in VCL.

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

diff --git a/sfx2/source/view/classificationcontroller.cxx 
b/sfx2/source/view/classificationcontroller.cxx
index caa6ef4..b905cd6 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -234,7 +234,9 @@ void ClassificationCategoriesController::removeEntries()
 }
 
 ClassificationControl::ClassificationControl(vcl::Window* pParent)
-: Window(pParent, WB_DIALOGCONTROL)
+// WB_NOLABEL means here that the control won't be replaced with a label
+// when it wouldn't fit the available space.
+: Window(pParent, WB_DIALOGCONTROL | WB_NOLABEL)
 {
 m_pLabels[SfxClassificationPolicyType::IntellectualProperty] = 
VclPtr::Create(this, WB_CENTER);
 m_pLabels[SfxClassificationPolicyType::NationalSecurity] = 
VclPtr::Create(this, WB_CENTER);
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index e6d3af2..307b387 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -213,6 +213,12 @@ Size ImplToolItem::GetSize( bool bHorz, bool 
bCheckMaxWidth, long maxWidth, cons
 // get size of item window and check if it fits
 // no windows in vertical toolbars (the default is 
mbShowWindow=false)
 Size aWinSize = mpWindow->GetSizePixel();
+
+if (mpWindow->GetStyle() & WB_NOLABEL)
+// Window wants no label? Then don't check width, it'll be just
+// clipped.
+bCheckMaxWidth = false;
+
 if ( !bCheckMaxWidth || (aWinSize.Width() <= maxWidth) )
 {
 aSize.Width()   = aWinSize.Width();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 sc/qa/unit/data/ods/outline.ods   |binary
 sc/qa/unit/subsequent_export-test.cxx |  107 --
 sc/source/filter/excel/xetable.cxx|   10 ++-
 3 files changed, 97 insertions(+), 20 deletions(-)

New commits:
commit b0d96a82a4f6a0832d03d185f4a53db669adcc99
Author: Bartosz Kosiorek 
Date:   Fri Jul 8 10:08:00 2016 +0200

tdf#51524 Preserve hidden column width after saving into .xlsx and .xls

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

diff --git a/sc/qa/unit/data/ods/outline.ods b/sc/qa/unit/data/ods/outline.ods
index 320e318..ac951b7 100644
Binary files a/sc/qa/unit/data/ods/outline.ods and 
b/sc/qa/unit/data/ods/outline.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 560db4d..3fca217 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -481,7 +481,8 @@ void ScExportTest::testFormatExportODS()
 
 void ScExportTest::testOutlineExportXLSX()
 {
-//tdf#100347 FILESAVE FILEOPEN after exporting to xlsx format grouping are 
lost
+//tdf#100347 FILESAVE FILEOPEN after exporting to .xlsx format grouping 
are lost
+//tdf#51524  FILESAVE .xlsx and.xls looses width information for 
hidden/collapsed grouped columns
 ScDocShellRef xShell = loadDoc("outline.", FORMAT_ODS);
 CPPUNIT_ASSERT(xShell.Is());
 
@@ -489,71 +490,143 @@ void ScExportTest::testOutlineExportXLSX()
 xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/worksheets/sheet1.xml");
 CPPUNIT_ASSERT(pSheet);
 
+// First XML node, creates two columns (from min=1 to max=2)
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[1]", "hidden", "false");
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[1]", "outlineLevel", "1");
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[1]", "collapsed", "false");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[2]", "hidden", "false");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[1]", "min", "1");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[1]", "max", "2");
+
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[2]", "hidden", "true");
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[2]", "outlineLevel", "2");
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[2]", "collapsed", "false");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[2]", "min", "3");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[2]", "max", "3");
+
+// Column 4 has custom width and it is hidden. We need to make sure that 
it is created
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[3]", "hidden", "true");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[3]", "outlineLevel", "3");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[3]", "outlineLevel", "2");
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[3]", "collapsed", "false");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[3]", "min", "4");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[3]", "max", "4");
+
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[4]", "hidden", "true");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[4]", "outlineLevel", "4");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[4]", "outlineLevel", "3");
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[4]", "collapsed", "false");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[4]", "min", "5");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[4]", "max", "6");
+
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[5]", "hidden", "true");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[5]", "outlineLevel", "3");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[5]", "outlineLevel", "4");
 assertXPath(pSheet, "/x:worksheet/x:cols/x:col[5]", "collapsed", "false");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "hidden", "false");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "outlineLevel", "2");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "collapsed", "true");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[7]", "hidden", "false");
-assertXPath(pSheet, "/x:worksheet/x:cols/x:col[7]", "outlineLevel", "2");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[5]", "min", "7");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[5]", "max", "7");
+
+// Column 8 has custom width and it is hidden. We need to make sure that 
it is created
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "hidden", "true");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "outlineLevel", "4");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "collapsed", "false");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "min", "8");
+assertXPath(pSheet, "/x:worksheet/x:cols/x:col[6]", "max", "8");
+
+assertXPath(pSheet, "/x:worksheet/x:cols/x:co

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

[Christian Lohmaier]

 scp2/source/ooo/file_extra_ooo.scp |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 4364e93bd71912b4b003c3260aaa6d86ff60ce79
Author: Christian Lohmaier 
Date:   Tue Jul 12 11:15:53 2016 +0200

fix installation set creation after 24e2ee04 broke it

Change-Id: Id9ec8bfbe21e76294e0d84c78318d20cda33c969

diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 11c6ffa..3f09fc9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -164,13 +164,6 @@ File gid_File_Extra_Palettes
 Name = "extras_palettes.filelist";
 End
 
-File gid_File_Extra_Tpllayoutimpr
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_tpllayoutimpr.filelist";
-End
-
 File gid_File_Extra_Tplofficorr
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Christian Lohmaier]

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

New commits:
commit 362a4c585efc62695cb2abe1c9bb00785aac9a8d
Author: Christian Lohmaier 
Date:   Tue Jul 12 11:10:59 2016 +0200

Updated core
Project: help  3f158b0dba476baf0816ce22159860d6dea58084

remove pointless (since empty) switchinline

Change-Id: I4db96b80c90b312f2c79468388693cb9a934f525

diff --git a/helpcontent2 b/helpcontent2
index f4fb6df..3f158b0db 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f4fb6dfe872c87ae28d3c17647ccc0230def948c
+Subproject commit 3f158b0dba476baf0816ce22159860d6dea58084
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 source/text/sdraw/main.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f158b0dba476baf0816ce22159860d6dea58084
Author: Christian Lohmaier 
Date:   Tue Jul 12 11:10:59 2016 +0200

remove pointless (since empty) switchinline

Change-Id: I4db96b80c90b312f2c79468388693cb9a934f525

diff --git a/source/text/sdraw/main.xhp b/source/text/sdraw/main.xhp
index 4f980dd..e60d80b 100644
--- a/source/text/sdraw/main.xhp
+++ b/source/text/sdraw/main.xhp
@@ -32,7 +32,7 @@
 
   
   
-
Welcome to the $[officename] Draw Help
+  Welcome to the $[officename] Draw 
Help
   How to Work With $[officename] Draw
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 desktop/source/app/opencl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 605a5dc088385ad21c33028d8107125c0316ddb1
Author: Michael Meeks 
Date:   Tue Jul 12 09:47:23 2016 +0100

opencl: bail out early in missing OpenCL case.

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

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 4c47767..09f2204 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -122,6 +122,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 
> &xDesktop)
 {
 SAL_WARN("opencl", "Failed to initialize OpenCL for test");
 OpenCLZone::hardDisable();
+return;
 }
 
 // Append our app version as well.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sd/source/ui/func/fusearch.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 2e6608de95d0d845b6a2eccfaba7baebc992e7c8
Author: Caolán McNamara 
Date:   Tue Jul 12 09:58:41 2016 +0100

fix assert about unsorted ids when search+replace in impress

Change-Id: Ib4d549a18365f954cb3e35ac016a4c69803cff99

diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 3e1a986..a18e340 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -42,15 +42,14 @@ namespace sd {
 
 static sal_uInt16 SidArraySpell[] = {
 SID_DRAWINGMODE,
-SID_SLIDE_MASTER_MODE,
 SID_OUTLINE_MODE,
 SID_SLIDE_SORTER_MODE,
 SID_NOTES_MODE,
-SID_NOTES_MASTER_MODE,
 SID_HANDOUT_MASTER_MODE,
+SID_SLIDE_MASTER_MODE,
+SID_NOTES_MASTER_MODE,
 0 };
 
-
 FuSearch::FuSearch (
 ViewShell* pViewSh,
 ::sd::Window* pWin,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/opencl officecfg/registry opencl/inc opencl/Library_opencl.mk opencl/source sc/source solenv/gbuild vcl/Library_vcl.mk vcl/source

[Tomaž Vajngerl]

 include/opencl/OpenCLZone.hxx  |   52 ++
 include/opencl/openclwrapper.hxx   |4 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 
 opencl/Library_opencl.mk   |2 
 opencl/inc/opencl_device_selection.h   |4 
 opencl/source/OpenCLZone.cxx   |   46 +
 opencl/source/opencl_device.cxx|   23 ++
 opencl/source/openclwrapper.cxx|  106 +++--
 sc/source/core/tool/formulagroup.cxx   |   17 +-
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 vcl/Library_vcl.mk |1 
 vcl/source/app/svmain.cxx  |5 
 12 files changed, 214 insertions(+), 53 deletions(-)

New commits:
commit e1ef22371613f384cc2f6fc75d022cb01bf92af7
Author: Tomaž Vajngerl 
Date:   Fri Jul 8 22:16:27 2016 +0900

opencl: OpenCLZone, detect CL device change and disable CL on crash

Guard OpenCL calls with OpenCLZone, so if a OpenCL call crashes we
detect this and disable OpenCL so next time the user doesn't encounter
the crash at the same calculation because he has a broken OpenCL
drivers. Similar has been implemented for OpenGL with good results.

Additionaly we persistently remember a known good OpenCL device ID and
driver version so we can match this and perform calculation tests when
they change. This is to ensure that the selected OpenCL device performs
as we expect. In this commit the calculation tests aren't included yet.

Remove complex static initializer in opencl wrapper library.

Reviewed-on: https://gerrit.libreoffice.org/27064
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 
(cherry picked from commit f41eb66302208f384a475fb20c98b6d1b0676cb6)

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

diff --git a/include/opencl/OpenCLZone.hxx b/include/opencl/OpenCLZone.hxx
new file mode 100644
index 000..1fbc666
--- /dev/null
+++ b/include/opencl/OpenCLZone.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+#define INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+
+#include 
+
+// FIXME: post back-port, templatize me and share with OpenGLZone.
+class OPENCL_DLLPUBLIC OpenCLZone
+{
+/// how many times have we entered a CL zone
+static volatile sal_uInt64 gnEnterCount;
+/// how many times have we left a new CL zone
+static volatile sal_uInt64 gnLeaveCount;
+
+static void enter()
+{
+gnEnterCount++;
+}
+static void leave()
+{
+gnLeaveCount--;
+}
+public:
+OpenCLZone()
+{
+gnEnterCount++;
+}
+
+~OpenCLZone()
+{
+gnLeaveCount++;
+}
+
+static bool isInZone()
+{
+return gnEnterCount != gnLeaveCount;
+}
+
+static void hardDisable();
+};
+
+#endif // INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 5205aaa..2121f0e 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -66,11 +66,13 @@ OPENCL_DLLPUBLIC const std::vector& 
fillOpenCLInfo();
  *
  * @param pDeviceId the id of the opencl device of type cl_device_id, NULL 
means use software calculation
  * @param bAutoSelect use the algorithm to select the best OpenCL device
+ * @param rOutSelectedDeviceVersionIDString returns the selected device's 
version string.
  *
  * @return returns true if there is a valid opencl device that has been set up
  */
 OPENCL_DLLPUBLIC bool switchOpenCLDevice(const OUString* pDeviceId, bool 
bAutoSelect,
- bool bForceEvaluation);
+ bool bForceEvaluation,
+ OUString& 
rOutSelectedDeviceVersionIDString);
 
 OPENCL_DLLPUBLIC void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& 
rPlatformId);
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 8662cfc..d9e81e5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5641,6 +5641,12 @@
 
 Linux//Advanced Micro Devices, Inc\.//1445\.5 
\(sse2,avx\);//Advanced

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/opencl officecfg/registry opencl/inc opencl/Library_opencl.mk opencl/source sc/source solenv/gbuild vcl/Library_vcl.mk vcl/source

[Tomaž Vajngerl]

 include/opencl/OpenCLZone.hxx  |   52 ++
 include/opencl/openclwrapper.hxx   |4 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 
 opencl/Library_opencl.mk   |2 
 opencl/inc/opencl_device_selection.h   |4 
 opencl/source/OpenCLZone.cxx   |   46 +
 opencl/source/opencl_device.cxx|   23 ++
 opencl/source/openclwrapper.cxx|  107 +++--
 sc/source/core/tool/formulagroup.cxx   |   17 +-
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 vcl/Library_vcl.mk |1 
 vcl/source/app/svmain.cxx  |5 
 12 files changed, 214 insertions(+), 54 deletions(-)

New commits:
commit b535d0ae52089bc7e28024b76a3380ab91574466
Author: Tomaž Vajngerl 
Date:   Fri Jul 8 22:16:27 2016 +0900

opencl: OpenCLZone, detect CL device change and disable CL on crash

Guard OpenCL calls with OpenCLZone, so if a OpenCL call crashes we
detect this and disable OpenCL so next time the user doesn't encounter
the crash at the same calculation because he has a broken OpenCL
drivers. Similar has been implemented for OpenGL with good results.

Additionaly we persistently remember a known good OpenCL device ID and
driver version so we can match this and perform calculation tests when
they change. This is to ensure that the selected OpenCL device performs
as we expect. In this commit the calculation tests aren't included yet.

Remove complex static initializer in opencl wrapper library.

Change-Id: I1a8b81ee31298731efcf63dc6a476955afc035e9
Reviewed-on: https://gerrit.libreoffice.org/27064
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 
(cherry picked from commit f41eb66302208f384a475fb20c98b6d1b0676cb6)
Reviewed-on: https://gerrit.libreoffice.org/27099
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/include/opencl/OpenCLZone.hxx b/include/opencl/OpenCLZone.hxx
new file mode 100644
index 000..1fbc666
--- /dev/null
+++ b/include/opencl/OpenCLZone.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+#define INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+
+#include 
+
+// FIXME: post back-port, templatize me and share with OpenGLZone.
+class OPENCL_DLLPUBLIC OpenCLZone
+{
+/// how many times have we entered a CL zone
+static volatile sal_uInt64 gnEnterCount;
+/// how many times have we left a new CL zone
+static volatile sal_uInt64 gnLeaveCount;
+
+static void enter()
+{
+gnEnterCount++;
+}
+static void leave()
+{
+gnLeaveCount--;
+}
+public:
+OpenCLZone()
+{
+gnEnterCount++;
+}
+
+~OpenCLZone()
+{
+gnLeaveCount++;
+}
+
+static bool isInZone()
+{
+return gnEnterCount != gnLeaveCount;
+}
+
+static void hardDisable();
+};
+
+#endif // INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index b83c1fc..b173d89 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -64,11 +64,13 @@ OPENCL_DLLPUBLIC const std::vector& 
fillOpenCLInfo();
  *
  * @param pDeviceId the id of the opencl device of type cl_device_id, NULL 
means use software calculation
  * @param bAutoSelect use the algorithm to select the best OpenCL device
+ * @param rOutSelectedDeviceVersionIDString returns the selected device's 
version string.
  *
  * @return returns true if there is a valid opencl device that has been set up
  */
 OPENCL_DLLPUBLIC bool switchOpenCLDevice(const OUString* pDeviceId, bool 
bAutoSelect,
- bool bForceEvaluation);
+ bool bForceEvaluation,
+ OUString& 
rOutSelectedDeviceVersionIDString);
 
 OPENCL_DLLPUBLIC void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& 
rPlatformId);
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index a9097ca..32c3cd7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5661,6 +5661,12 @@
 
 Linux//Advanced Micro Devices, Inc\.//1445\.5 
\(sse2,avx\);//Advanced Micr

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

[Noel Grandin]

 compilerplugins/clang/constparams.cxx |  407 ++
 1 file changed, 407 insertions(+)

New commits:
commit 03fefeec9988248cbc6ae8725720f4ca0df99871
Author: Noel Grandin 
Date:   Tue Jul 12 10:54:43 2016 +0200

new plugin constparams

very basic detection of pointer and reference params that can be const.

Off by default until the relevant changes have landed.

Change-Id: I88bba4e67307e3fb0e11dad252ec59c913828763

diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
new file mode 100644
index 000..291a4e7
--- /dev/null
+++ b/compilerplugins/clang/constparams.cxx
@@ -0,0 +1,407 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+
+#include "plugin.hxx"
+#include "compat.hxx"
+#include "check.hxx"
+
+/**
+   Find pointer and reference params that can be declared const.
+
+   This is not a sophisticated analysis. It deliberately skips all of the hard 
cases for now.
+   It is an exercise in getting the most benefit for the least effort.
+*/
+namespace
+{
+
+class ConstParams:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit ConstParams(InstantiationData const & data): Plugin(data) {}
+
+virtual void run() override {
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+
+bool VisitFunctionDecl(FunctionDecl *);
+bool VisitDeclRefExpr( const DeclRefExpr* );
+private:
+bool checkIfCanBeConst(const Stmt*);
+bool isPointerOrReferenceToConst(const QualType& qt);
+StringRef getFilename(const SourceLocation& loc);
+
+bool mbInsideFunction;
+std::set interestingSet;
+std::set cannotBeConstSet;
+};
+
+bool ConstParams::VisitFunctionDecl(FunctionDecl * functionDecl)
+{
+if (ignoreLocation(functionDecl) || 
!functionDecl->doesThisDeclarationHaveABody()) {
+return true;
+}
+// ignore stuff that forms part of the stable URE interface
+if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(
+  
functionDecl->getCanonicalDecl()->getNameInfo().getLoc( {
+return true;
+}
+// TODO ignore these for now, requires some extra work
+if (isa(functionDecl)) {
+return true;
+}
+// TODO ignore template stuff for now
+if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate) {
+return true;
+}
+if (isa(functionDecl)
+&& 
dyn_cast(functionDecl)->getParent()->getDescribedClassTemplate() 
!= nullptr ) {
+return true;
+}
+// ignore virtual methods
+if (isa(functionDecl)
+&& dyn_cast(functionDecl)->isVirtual() ) {
+return true;
+}
+// ignore C main
+if (functionDecl->isMain()) {
+return true;
+}
+// ignore macro expansions so we can ignore the IMPL_LINK macros from 
include/tools/link.hxx
+// TODO make this more precise
+if (functionDecl->getLocation().isMacroID())
+return true;
+
+if (functionDecl->getIdentifier()) {
+StringRef name = functionDecl->getName();
+if (name == "yyerror" // ignore lex/yacc callback
+// some function callbacks
+|| name == "PDFSigningPKCS7PasswordCallback"
+|| name == "VCLExceptionSignal_impl"
+|| name == "parseXcsFile"
+// UNO component entry points
+|| name.endswith("component_getFactory"))
+return true;
+}
+
+StringRef aFileName = getFilename(functionDecl->getLocStart());
+if (aFileName.startswith(SRCDIR "/sal/")
+|| aFileName.startswith(SRCDIR "/bridges/")
+|| aFileName.startswith(SRCDIR "/binaryurp/")
+|| aFileName.startswith(SRCDIR "/stoc/")
+|| aFileName.startswith(WORKDIR 
"/YaccTarget/unoidl/source/sourceprovider-parser.cxx")
+// some weird calling through a function pointer
+|| aFileName.startswith(SRCDIR 
"/svtools/source/table/defaultinputhandler.cxx")
+// windows only
+|| aFileName.startswith(SRCDIR "/basic/source/sbx/sbxdec.cxx")
+|| aFileName.startswith(SRCDIR "/sfx2/source/doc/syspath.cxx")) {
+return true;
+}
+
+// calculate the ones we want to check
+interestingSet.clear();
+for (const ParmVarDecl *pParmVarDecl : compat::parameters(*functionDecl)) {
+// ignore unused params
+if (pParmVarDecl->getName().empty())
+continue;
+auto const type = loplugin::TypeCheck(pParmVarDecl->getType());
+if (!type.Pointer() && !type.LvalueReference())
+continue;
+if (type.Pointer().Const())

[Libreoffice-commits] core.git: accessibility/inc avmedia/source compilerplugins/clang framework/inc framework/source include/sot include/svx sot/source svx/inc svx/source toolkit/source vcl/inc xmlof

[Noel Grandin]

 accessibility/inc/extended/accessibleeditbrowseboxcell.hxx |2 
 accessibility/inc/extended/accessiblelistboxentry.hxx  |2 
 avmedia/source/gstreamer/gstplayer.hxx |2 
 avmedia/source/opengl/oglwindow.hxx|2 
 compilerplugins/clang/fragiledestructor.cxx|  113 +
 framework/inc/services/layoutmanager.hxx   |2 
 framework/source/jobs/jobexecutor.cxx  |2 
 framework/source/services/autorecovery.cxx |2 
 framework/source/services/pathsettings.cxx |2 
 framework/source/uiconfiguration/moduleuicfgsupplier.cxx   |2 
 framework/source/uifactory/uicontrollerfactory.cxx |2 
 include/sot/stg.hxx|8 
 include/svx/svdedxv.hxx|2 
 sot/source/unoolestorage/xolesimplestorage.hxx |2 
 svx/inc/sdr/contact/objectcontactofpageview.hxx|2 
 svx/source/inc/GraphCtlAccessibleContext.hxx   |2 
 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx  |2 
 svx/source/svdraw/svdoedge.cxx |4 
 toolkit/source/controls/grid/sortablegriddatamodel.cxx |2 
 vcl/inc/headless/svpbmp.hxx|2 
 vcl/inc/opengl/salbmp.hxx  |2 
 xmloff/source/forms/elementexport.cxx  |6 
 22 files changed, 140 insertions(+), 27 deletions(-)

New commits:
commit 52b91f3454394a1792dec018804bf2c969f564e5
Author: Noel Grandin 
Date:   Wed Jun 22 12:08:45 2016 +0200

new loplugin fragiledestructor

fix up a small number of places that it finds

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

diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx 
b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index c9be43d..04dcd7c 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -81,7 +81,7 @@ namespace accessibility
 virtual void SAL_CALL disposing() override;
 
 // XComponent/OComponentProxyAggregationHelper (needs to be 
disambiguated)
-virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, 
std::exception ) override;
+virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, 
std::exception ) final override;
 
 // OAccessibleContextWrapperHelper();
 void notifyTranslatedEvent( const 
css::accessibility::AccessibleEventObject& _rEvent ) throw 
(css::uno::RuntimeException) override;
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx 
b/accessibility/inc/extended/accessiblelistboxentry.hxx
index 886c27e..a58ce0e 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -112,7 +112,7 @@ namespace accessibility
 virtual void SAL_CALL   disposing() override;
 
 // ListBoxAccessible/XComponent
-virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, 
std::exception ) override;
+virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, 
std::exception ) final override;
 
 // OCommonAccessibleText
 virtual OUStringimplGetText() override;
diff --git a/avmedia/source/gstreamer/gstplayer.hxx 
b/avmedia/source/gstreamer/gstplayer.hxx
index f0f23b5..4bf2f8e 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -75,7 +75,7 @@ public:
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  
) throw (css::uno::RuntimeException, std::exception) override;
 
 // ::cppu::OComponentHelper
-virtual void SAL_CALL disposing() override;
+virtual void SAL_CALL disposing() final override;
 
 protected:
 OUStringmaURL;
diff --git a/avmedia/source/opengl/oglwindow.hxx 
b/avmedia/source/opengl/oglwindow.hxx
index 4b28657..f939037 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -39,7 +39,7 @@ public:
 virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 
throw (css::uno::RuntimeException, std::exception) override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
throw (css::uno::RuntimeException, std::exception) override;
 
-virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, 
std::exception) override;
+virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, 
std::exception) final override;
 virtual void SAL_CALL addEventListener( const css::uno::Reference< 
css::lang::XEventListener >& xListener ) throw (

[Libreoffice-commits] core.git: desktop/inc desktop/Library_sofficeapp.mk desktop/source opencl/inc opencl/source Repository.mk sc/Module_sc.mk sc/Package_opencl.mk sc/source

[Michael Meeks]

 Repository.mk|1 
 desktop/Library_sofficeapp.mk|3 
 desktop/inc/app.hxx  |1 
 desktop/source/app/app.cxx   |5 +
 desktop/source/app/opencl.cxx|  173 +++
 opencl/inc/opencl_device.hxx |3 
 opencl/source/OpenCLZone.cxx |4 
 opencl/source/openclwrapper.cxx  |8 +
 sc/Module_sc.mk  |1 
 sc/Package_opencl.mk |   16 +++
 sc/source/core/opencl/cl-test.ods|binary
 sc/source/core/tool/formulagroup.cxx |   10 --
 12 files changed, 213 insertions(+), 12 deletions(-)

New commits:
commit c44726c48228d9c6a5960e302b1c0bd16b0099c4
Author: Michael Meeks 
Date:   Mon Jul 11 15:12:38 2016 +0100

desktop: validate OpenCL drivers before use.

OpenCL validation needs to happen before drivers are used in
anger. This should isolate any crashes, and/or mis-behavior to
We use app version, CL driver version and file time-stamp to
trigger re-testing the device. If anything fails: hard disable
OpenCL.

We use an opencl validation sheet (cl-test.ods) and install it.
It is a minimal CL set - it requires a very short formula group
length, and combines several CL functions into few formulae to
test more.

The sheet structure, in particular the manual squaring / SQRT is
necessary to stick within the default CL subset, and ensure that
formulae are CL enabled from the root of the dependency tree up.

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

diff --git a/Repository.mk b/Repository.mk
index a07f758..4dcd930 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -837,6 +837,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
Pyuno/mailmerge \
)) \
sfx2_classification \
+$(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 04bc491..a5cf82b 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\
 ))
 
 $(eval $(call gb_Library_use_externals,sofficeapp, \
+   $(if $(filter OPENCL,$(BUILD_TYPE)),clew) \
 boost_headers \
 dbus \
 ))
@@ -57,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 deploymentmisc \
 editeng \
 i18nlangtag \
+$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
 sal \
 salhelper \
 sb \
@@ -102,6 +104,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 desktop/source/app/langselect \
 desktop/source/app/lockfile2 \
 desktop/source/app/officeipcthread \
+desktop/source/app/opencl \
 desktop/source/app/sofficemain \
 desktop/source/app/userinstall \
 desktop/source/migration/migration \
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 1905cf0..c90bfdb 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -84,6 +84,7 @@ class Desktop : public Application
 
 static void OpenClients();
 static void OpenDefault();
+static void CheckOpenCLCompute(const 
css::uno::Reference &);
 
 DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index fab48e1..7628c7a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1605,6 +1605,11 @@ int Desktop::Main()
 FatalError( MakeStartupErrorMessage(e.Message) );
 }
 
+// FIXME: move this somewhere sensible.
+#if HAVE_FEATURE_OPENCL
+CheckOpenCLCompute(xDesktop);
+#endif
+
 // Release solar mutex just before we wait for our client to connect
 {
 SolarMutexReleaser aReleaser;
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
new file mode 100644
index 000..4c47767
--- /dev/null
+++ b/desktop/source/app/opencl.cxx
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/*
+ * This module exists to validate the OpenCL implementation,
+ * where necessary during startup; and before we load or
+ * calculate using OpenCL.
+ */
+
+#include "app.hxx"
+
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+
+using namespace ::osl;
+using namespace ::com::sun::star::uno;

[Libreoffice-commits] core.git: opencl/Library_opencl.mk

[Stephan Bergmann]

 opencl/Library_opencl.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9c711f05fa10dc70e4257a1f48d43f539353541a
Author: Stephan Bergmann 
Date:   Tue Jul 12 10:31:55 2016 +0200

Remove bogus dependency from opencl to configmgr

Since f41eb66302208f384a475fb20c98b6d1b0676cb6 "opencl: OpenCLZone, detect 
CL
device change and disable CL on crash" vcl links against opencl (so 
indirectly
linked against configmgr), which caused CppunitTest_configmgr_unit to 
include
the configmgr object files both statically (through
gb_CppunitTest_use_library_objects) and through the linked-in configmgr 
dynamic
library, which in turn caused ASan builds to report an ODR violation for a
doubly defined 'typeinfo name for configmgr::Access'.

Change-Id: I9ae8637ac02c116dd2d03017f2ebb4004f4b14ad

diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk
index 039ec01..5b3de52 100644
--- a/opencl/Library_opencl.mk
+++ b/opencl/Library_opencl.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_custom_headers,opencl,\
 $(eval $(call gb_Library_use_sdk_api,opencl))
 
 $(eval $(call gb_Library_use_libraries,opencl,\
-configmgr \
 comphelper \
 cppu \
 sal \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 chart2/source/controller/dialogs/res_DataLabel.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit cd1e2f5cc3a97d48b12d858cd74275f51c4de268
Author: Stephan Bergmann 
Date:   Tue Jul 12 09:43:56 2016 +0200

Avoid global data with (non-constexpr) ctors/dtors

Change-Id: I787ec685275d119dd4eea86f51b6dd85bc0260d1

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 7bcb605..8d4a31c 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -40,10 +40,11 @@ namespace chart
 namespace
 {
 
-const OUString our_aLBEntryMap[] = {" ",
-", ",
-"; ",
-"\n"};
+const OUStringLiteral our_aLBEntryMap[] = {
+OUStringLiteral(" "),
+OUStringLiteral(", "),
+OUStringLiteral("; "),
+OUStringLiteral("\n")};
 
 bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 
nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& 
rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

compiler plugin

[Norbert Thiebaud]

so I ran some number... after upgrading ccache

clang+pluging+dbgutil  (time result in minutes.. elapsed/user/system)

cold: 33/840/50
hot: 9/79/14
no-op: 4/46/1

clang+dbgutil (no plugins)

cold: 26/605/46
hot: 9/79/14
no-op: 4/46/1

gcc-dbgutil

cold: 28/621/97
hot: 9/79/14
no-op: 4/45/1

note: none of these comprise make check

so the cost of the plugins on a full build is 7 minutes elapsed, ~240
minutes cpu.

ccache works fine... on the other hand any change in any of the
plugins invalidate the cache...

I've enabled an additional build for gerrit doing clang + plugins on linux
we will see how that perform in average.
preliminary observation is that there is way to much churn in the
plugins for this to be viable at this time

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

[Libreoffice-commits] core.git: Branch 'feature/fixes26' - 2 commits - desktop/inc desktop/Library_sofficeapp.mk desktop/source include/opencl officecfg/registry opencl/inc opencl/Library_opencl.mk op

[Michael Meeks]

 Repository.mk  |1 
 desktop/Library_sofficeapp.mk  |2 
 desktop/inc/app.hxx|1 
 desktop/source/app/app.cxx |5 
 desktop/source/app/opencl.cxx  |  173 +
 include/opencl/OpenCLZone.hxx  |   52 +++
 include/opencl/openclwrapper.hxx   |4 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 
 opencl/Library_opencl.mk   |2 
 opencl/inc/opencl_device.hxx   |3 
 opencl/inc/opencl_device_selection.h   |4 
 opencl/source/OpenCLZone.cxx   |   50 +++
 opencl/source/opencl_device.cxx|   23 +
 opencl/source/openclwrapper.cxx|  112 +---
 sc/Module_sc.mk|1 
 sc/Package_opencl.mk   |   16 +
 sc/source/core/opencl/cl-test.ods  |binary
 sc/source/core/tool/formulagroup.cxx   |   16 -
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 vcl/Library_vcl.mk |1 
 vcl/source/app/svmain.cxx  |5 
 21 files changed, 416 insertions(+), 62 deletions(-)

New commits:
commit eb350fa48833b4e110e71f4677b04e3c337c1275
Author: Michael Meeks 
Date:   Mon Jul 11 15:12:38 2016 +0100

desktop: validate OpenCL drivers before use.

OpenCL validation needs to happen before drivers are used in
anger. This should isolate any crashes, and/or mis-behavior to
We use app version, CL driver version and file time-stamp to
trigger re-testing the device. If anything fails: hard disable
OpenCL.

We use an opencl validation sheet (cl-test.ods) and install it.
It is a minimal CL set - it requires a very short formula group
length, and combines several CL functions into few formulae to
test more.

The sheet structure, in particular the manual squaring / SQRT is
necessary to stick within the default CL subset, and ensure that
formulae are CL enabled from the root of the dependency tree up.

Change-Id: I18682dbdf9a8ba9c16d52bad4447e9acce97f0a3

diff --git a/Repository.mk b/Repository.mk
index 04519cb..adfc34b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -820,6 +820,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
vcl_opengl_blacklist \
) \
$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
+$(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index ef95ecf..785ab24 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 deploymentmisc \
 editeng \
 i18nlangtag \
+$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
 sal \
 salhelper \
 sb \
@@ -93,6 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 desktop/source/app/langselect \
 desktop/source/app/lockfile2 \
 desktop/source/app/officeipcthread \
+desktop/source/app/opencl \
 desktop/source/app/sofficemain \
 desktop/source/app/userinstall \
 desktop/source/migration/migration \
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index d07d285..f9e7db6 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -84,6 +84,7 @@ class Desktop : public Application
 
 static void OpenClients();
 static void OpenDefault();
+static void CheckOpenCLCompute(const 
css::uno::Reference &);
 
 DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 958ca8a..1a47e8c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1573,6 +1573,11 @@ int Desktop::Main()
 FatalError( MakeStartupErrorMessage(e.Message) );
 }
 
+// FIXME: move this somewhere sensible.
+#if HAVE_FEATURE_OPENCL
+CheckOpenCLCompute(xDesktop);
+#endif
+
 // Release solar mutex just before we wait for our client to connect
 {
 SolarMutexReleaser aReleaser;
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
new file mode 100644
index 000..4c47767
--- /dev/null
+++ b/desktop/source/app/opencl.cxx
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject