date:20150106

[Libreoffice-commits] core.git: 5 commits - sc/CppunitTest_sc_condformats.mk sc/inc sc/Module_sc.mk sc/qa sc/source vcl/inc vcl/opengl

2015-01-06 Thread Markus Mohrhard

 sc/CppunitTest_sc_condformats.mk |  109 +++
 sc/Module_sc.mk  |1 
 sc/inc/attarray.hxx  |1 
 sc/qa/extras/sccondformats.cxx   |  136 +++
 sc/source/core/data/attarray.cxx |8 +-
 sc/source/ui/app/inputhdl.cxx|   11 ++-
 sc/source/ui/unoobj/cellsuno.cxx |   23 +-
 vcl/inc/openglgdiimpl.hxx|2 
 vcl/opengl/gdiimpl.cxx   |   15 ++--
 9 files changed, 288 insertions(+), 18 deletions(-)

New commits:
commit 1ddb7c2c9d10c92371d76c59c69086115b2c4051
Author: Markus Mohrhard 
Date:   Wed Jan 7 08:31:50 2015 +0100

it makes no sense to use the line color in some cases

Hopefully that helps a little bit with some strange rendering effects.

Change-Id: I6b001bf31d745d6d19f91acadee5ceb0e5480025

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index fb436a4..feb8bdc 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -732,7 +732,8 @@ void OpenGLSalGraphicsImpl::DrawPolyPolygon( const 
basegfx::B2DPolyPolygon& rPol
 #ifdef DBG_UTIL
 assert( mProgramIsSolidLineColor );
 #endif
-UseSolidAA( mnLineColor );
+bool bUseLineColor = bLine || mnLineColor != SALCOLOR_NONE;
+UseSolidAA( bUseLineColor ? mnLineColor : mnFillColor );
 for( sal_uInt32 i = 0; i < aSimplePolyPolygon.count(); i++ )
 {
 const basegfx::B2DPolygon& rPolygon( 
aSimplePolyPolygon.getB2DPolygon( i ) );
commit 3a74b40f0f862fc099adb93a528d469903031583
Author: Markus Mohrhard 
Date:   Wed Jan 7 08:31:28 2015 +0100

make sure to use the FillColor when we used it before

Change-Id: I36443d12e1607221b9505d1e05a51e804d714e16

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 4ca30b3..69c211d 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -84,7 +84,7 @@ public:
 void DrawRect( long nX, long nY, long nWidth, long nHeight );
 void DrawRect( const Rectangle& rRect );
 void DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
-void DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, bool 
blockAA = false );
+void DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, bool 
bLine, bool blockAA = false );
 void DrawRegionBand( const RegionBand& rRegion );
 void DrawTextureRect( OpenGLTexture& rTexture, const SalTwoRect& rPosAry, 
bool bInverted = false );
 void DrawTexture( OpenGLTexture& rTexture, const SalTwoRect& rPosAry, bool 
bInverted = false );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 69b4138..fb436a4 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -198,7 +198,7 @@ void OpenGLSalGraphicsImpl::ImplSetClipBit( const 
vcl::Region& rClip, GLuint nMa
 if( rClip.getRegionBand() )
 DrawRegionBand( *rClip.getRegionBand() );
 else
-DrawPolyPolygon( rClip.GetAsB2DPolyPolygon(), true );
+DrawPolyPolygon( rClip.GetAsB2DPolyPolygon(), false, true );
 }
 
 glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
@@ -695,11 +695,11 @@ void OpenGLSalGraphicsImpl::DrawPolygon( sal_uInt32 
nPoints, const SalPoint* pPt
 else
 {
 const ::basegfx::B2DPolyPolygon aPolyPolygon( aPolygon );
-DrawPolyPolygon( aPolyPolygon );
+DrawPolyPolygon( aPolyPolygon, false );
 }
 }
 
-void OpenGLSalGraphicsImpl::DrawPolyPolygon( const basegfx::B2DPolyPolygon& 
rPolyPolygon, bool blockAA )
+void OpenGLSalGraphicsImpl::DrawPolyPolygon( const basegfx::B2DPolyPolygon& 
rPolyPolygon, bool bLine, bool blockAA )
 {
 ::std::vector< GLfloat > aVertices;
 GLfloat nWidth = GetWidth();
@@ -745,7 +745,7 @@ void OpenGLSalGraphicsImpl::DrawPolyPolygon( const 
basegfx::B2DPolyPolygon& rPol
 DrawLineAA( rPt1.getX(), rPt1.getY(), rPt2.getX(), 
rPt2.getY());
 }
 }
-UseSolid( mnLineColor );
+UseSolid( bLine ? mnLineColor : mnFillColor );
 }
 
 CHECK_GL_ERROR();
@@ -1133,7 +1133,7 @@ bool OpenGLSalGraphicsImpl::drawPolyPolygon( const 
::basegfx::B2DPolyPolygon& rP
 for( sal_uInt32 i = 0; i < rPolyPolygon.count(); i++ )
 {
 const ::basegfx::B2DPolyPolygon aOnePoly( 
rPolyPolygon.getB2DPolygon( i ) );
-DrawPolyPolygon( aOnePoly );
+DrawPolyPolygon( aOnePoly, false );
 }
 }
 
@@ -1216,7 +1216,7 @@ bool OpenGLSalGraphicsImpl::drawPolyLine(
 for( sal_uInt32 i = 0; i < aAreaPolyPoly.count(); i++ )
 {
 const ::basegfx::B2DPolyPolygon aOnePoly( 
aAreaPolyPoly.getB2DPolygon( i ) );
-DrawPolyPolygon( aOnePoly );
+DrawPolyPolygon( aOnePoly, true );
 }
 }
 PostDraw();
commit 2ca2b8c2e0926a1562ea9dfbe16b686230e20638
Author: MatÃºÅ¡ Kukan 
Date:   Mon Dec 22 14:09:25 2014 +0100

UNO API test for conditional formats

Change-Id: I45d4b9652f35174eaf

[Libreoffice-commits] core.git: external/icu

2015-01-06 Thread Stephan Bergmann

 external/icu/icu-ubsan.patch.0 |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 934d32a930047d0f221493f8974f1a2682f6779d
Author: Stephan Bergmann 
Date:   Wed Jan 7 08:39:53 2015 +0100

external/icu: Work around -fsanitize=shift

Change-Id: I0ca31fc36b14d433e9276401c952959a46994c91

diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index c1d229c..5729661 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -49,6 +49,17 @@
  table->fNumStates = fDStates->size();
  table->fFlags = 0;
  if (fRB->fLookAheadHardBreak) {
+--- source/common/ubidiimp.h
 source/common/ubidiimp.h
+@@ -198,7 +198,7 @@
+ /* in a Run, logicalStart will get this bit set if the run level is odd */
+ #define INDEX_ODD_BIT (1UL<<31)
+ 
+-#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((int32_t)(level)<<31))
++#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((uint32_t)(level)<<31))
+ #define ADD_ODD_BIT_FROM_LEVEL(x, level)  ((x)|=((int32_t)(level)<<31))
+ #define REMOVE_ODD_BIT(x) ((x)&=~INDEX_ODD_BIT)
+ 
 --- source/common/ucharstriebuilder.cpp
 +++ source/common/ucharstriebuilder.cpp
 @@ -285,7 +285,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Noel Grandin

 desktop/source/deployment/manager/dp_extensionmanager.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a9c2d1c626c52ae595efc1000b0682ba6354fc54
Author: Noel Grandin 
Date:   Wed Jan 7 08:50:55 2015 +0200

fix spelling: garded -> guarded

Change-Id: I3e9f8781957a8b96afeb609501dff1f8bc9d718e

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx 
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 345a3e0..c0b41df 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -690,12 +690,12 @@ Reference 
ExtensionManager::addExtension(
 
 {
 bool bUserDisabled = false;
-// In this garded section (getMutex) we must not use the argument 
xCmdEnv
+// In this guarded section (getMutex) we must not use the argument 
xCmdEnv
 // because it may bring up dialogs (XInteractionHandler::handle) this
-//may potententially deadlock. See issue
-//http://qa.openoffice.org/issues/show_bug.cgi?id=114933
-//By not providing xCmdEnv the underlying APIs will throw an exception 
if
-//the XInteractionRequest cannot be handled
+// may potententially deadlock. See issue
+// http://qa.openoffice.org/issues/show_bug.cgi?id=114933
+// By not providing xCmdEnv the underlying APIs will throw an 
exception if
+// the XInteractionRequest cannot be handled.
 ::osl::MutexGuard guard(getMutex());
 
 if (bCanInstall)
@@ -807,7 +807,7 @@ Reference 
ExtensionManager::addExtension(
 }
 ::cppu::throwException(excOccurred2);
 }
-} // leaving the garded section (getMutex())
+} // leaving the guarded section (getMutex())
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source chart2/source cui/source dbaccess/source desktop/source editeng/source filter/source framework/source helpcompiler/source

2015-01-06 Thread Łukasz Hryniuk

 basegfx/source/workbench/gauss.hxx|   20 +++---
 chart2/source/controller/main/DrawCommandDispatch.cxx |2 -
 chart2/source/tools/AxisHelper.cxx|2 -
 chart2/source/tools/DiagramHelper.cxx |5 +--
 cui/source/options/treeopt.cxx|   12 
 dbaccess/source/filter/xml/xmlfilter.cxx  |2 -
 dbaccess/source/ui/control/FieldDescControl.cxx   |3 --
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |2 -
 dbaccess/source/ui/uno/copytablewizard.cxx|2 -
 desktop/source/app/app.cxx|3 --
 desktop/source/deployment/manager/dp_extensionmanager.cxx |2 -
 editeng/source/rtf/svxrtf.cxx |   10 +++
 filter/source/graphicfilter/epict/epict.cxx   |   12 ++--
 framework/source/uielement/toolbarsmenucontroller.cxx |5 +--
 helpcompiler/source/HelpLinker.cxx|2 -
 15 files changed, 38 insertions(+), 46 deletions(-)

New commits:
commit 9fd89a5952a48b473cee03a2681eb5d4cd6d1742
Author: Åukasz Hryniuk 
Date:   Sun Jan 4 22:50:05 2015 +0100

fdo#39440 reduce scope of local variables

Beside scope changes, it fixes lack of initialization in a few places.

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

diff --git a/basegfx/source/workbench/gauss.hxx 
b/basegfx/source/workbench/gauss.hxx
index b6a784c..fc352fe 100644
--- a/basegfx/source/workbench/gauss.hxx
+++ b/basegfx/source/workbench/gauss.hxx
@@ -49,14 +49,14 @@ bool eliminate( Matrix& matrix,
 const BaseType& minPivot)
 {
 BaseTypetemp;
-int max, i, j, k;   /* *must* be signed, when looping like: j>=0 ! 
*/
 
+/* i, j, k *must* be signed, when looping like: j>=0 ! */
 /* eliminate below main diagonal */
-for(i=0; i fabs(matrix[ max*cols + i ]) )
 max = j;
 
@@ -65,7 +65,7 @@ bool eliminate( Matrix& matrix,
 return false;   /* pivot too small! */
 
 /* interchange rows 'max' and 'i' */
-for(k=0; k=i; --k)
+for(int j=i+1; j=i; --k)
 matrix[ j*cols + k ] -= matrix[ i*cols + k ] *
 matrix[ j*cols + i ] / matrix[ i*cols + i ];
 }
@@ -110,13 +110,13 @@ bool substitute(const Matrix&   matrix,
 Vector& result  )
 {
 BaseTypetemp;
-int j,k;/* *must* be signed, when looping like: j>=0 ! */
 
+/* j, k *must* be signed, when looping like: j>=0 ! */
 /* substitute backwards */
-for(j=rows-1; j>=0; --j)
+for(int j=rows-1; j>=0; --j)
 {
 temp = 0.0;
-for(k=j+1; k tNumberformatFrequency;
 tNumberformatFrequency aKeyMap;
+bool bNumberFormatKeyFoundViaAttachedData = false;
 
 try
 {
diff --git a/chart2/source/tools/DiagramHelper.cxx 
b/chart2/source/tools/DiagramHelper.cxx
index 7705851..82dca03 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1297,11 +1297,10 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed(
 {
 uno::Reference< XCoordinateSystemContainer > xCooSysContainer( 
xDiagram, uno::UNO_QUERY );
 
-//find position of series.
-bool bFound = false;
-
 if( xGivenDataSeries.is() && xCooSysContainer.is() )
 {
+//find position of series.
+bool bFound = false;
 uno::Sequence< uno::Reference< XCoordinateSystem > > aCooSysList( 
xCooSysContainer->getCoordinateSystems() );
 
 for( sal_Int32 nCS = 0; !bFound && nCS < aCooSysList.getLength(); 
++nCS )
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 05bb302..99b7b76 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1179,10 +1179,10 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( 
sal_uInt16 nId )
 pRet->Put(aOptSet);
 
 utl::MiscCfgaMisc;
-const SfxPoolItem* pItem;
 SfxViewFrame* pViewFrame = SfxViewFrame::Current();
 if ( pViewFrame )
 {
+const SfxPoolItem* pItem = NULL;
 SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
 
 // miscellaneous - Year2000
@@ -1229,11 +1229,11 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( 
sal_uInt16 nId )
 aHyphen.GetMinLead()  = (sal_uInt8)nMinLead;
 aHyphen.GetMinTrail() = (sal_uInt8)nMinTrail;
 
-const SfxPoolItem* pItem;
-SfxPoolItem* pClone;
 SfxViewFrame* pViewFrame = SfxViewFrame::Current();
 if ( pViewFrame )
 {
+const SfxPoolI

[Bug 39440] cppcheck cleanliness

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=39440

--- Comment #46 from Commit Notification 
 ---
Łukasz Hryniuk committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9fd89a5952a48b473cee03a2681eb5d4cd6d1742

fdo#39440 reduce scope of local variables

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for core on 2015-01-07

2015-01-06 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ Windows cursor improvements. Fixes fdo#53148 and fdo#53151.
  in https://gerrit.libreoffice.org/13780 from Rimas Kudelis
  about module vcl
+ --with-macosx-app-name= is unused, so bin it from AC_ARG_WITH list
  in https://gerrit.libreoffice.org/13658 from Douglas Mencken
  about module build
+ fdo#63905: fix regression by using paper size set in printer properties
  in https://gerrit.libreoffice.org/13763 from Clément Lassieur
  about module sd, vcl
+ WW8 filter: zoom type testcase
  in https://gerrit.libreoffice.org/13765 from Justin Luth
  about module sw
+ WW8 filter: export zoom type
  in https://gerrit.libreoffice.org/13717 from Justin Luth
  about module sw
 End of freshness 

+ Signed/Unsigned mismatch on x86_64 platform on windows
  in https://gerrit.libreoffice.org/13659 from David Ostrovsky
  about module include
+ crop-pixel: Disable test on x86_64 on windows
  in https://gerrit.libreoffice.org/13661 from David Ostrovsky
  about module sw
+ Disable html tests on x86_64 on windows
  in https://gerrit.libreoffice.org/13660 from David Ostrovsky
  about module sw
+ drop crashrep unused since start of LibreOffice
  in https://gerrit.libreoffice.org/13733 from Caolán McNamara
  about module bin, build, config_host, cppuhelper, crashrep, desktop, 
distro-configs, framework, javaunohelper, reportdesign, sal, scp2
+ Cleanup ImplSVData constructor
  in https://gerrit.libreoffice.org/13778 from Julien Nabet
  about module vcl
+ Replace OSL_TRACE by assert
  in https://gerrit.libreoffice.org/13776 from Julien Nabet
  about module scripting
+ fdo#75757 remove inheritance to std::vector
  in https://gerrit.libreoffice.org/13380 from Michaël Lefèvre
  about module sw
+ fdo#67534 Fix "Property Handler" shared lock
  in https://gerrit.libreoffice.org/13596 from Maxime de Roucy
  about module scp2


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

+ Resolves fdo#87789: show groups in collected addresses
  in https://gerrit.libreoffice.org/13760 from Julien Nabet
+ fdo#85818: rename 'Zins' enum name, constant, function to Rate
  in https://gerrit.libreoffice.org/13777 from Laurent Charrière
+ Fix --enable-pch option on msvc 64bit compiler
  in https://gerrit.libreoffice.org/13779 from David Ostrovsky
+ Better fix for fdo#87558: Duplication in Last Used Functions sidebar list
  in https://gerrit.libreoffice.org/13725 from Julien Nabet
+ vcl: fdo#39468 - translated ImplSVData comments (esp. around timer)
  in https://gerrit.libreoffice.org/13762 from Chris Sherlock


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

+ MSVC: Increase -Zm option
  in https://gerrit.libreoffice.org/13209 from David Ostrovsky
+ fdo#84051 fix distribute on multiple sheets of paper
  in https://gerrit.libreoffice.org/13577 from Clément Lassieur


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

+ brute-force find-and-remove of unused #define constants
  in https://gerrit.libreoffice.org/13623 from Noel Grandin
+ gbuild-to-ide fixes
  in https://gerrit.libreoffice.org/11754 from Peter Foley
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ fdo#86606 removal of direct formatting options from the context menu
  in https://gerrit.libreoffice.org/13196 from Yousuf Philips
+ fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura
  in https://gerrit.libreoffice.org/13290 from Christoph Lutz
+ Replace image-sort.pl with image-sort.py
  in https://gerrit.libreoffice.org/13124 from Marcos Paulo de Souza
+ start detection of kf5 stuff in configure.ac
  in https://gerrit.libreoffice.org/13079 from Jonathan Riddell
+ fdo#65209 attempt to enable daylight saving time
  in https://gerrit.libreoffice.org/11441 from Lim Jing
+ Move more places to boost::signal2 in math
  in https://gerrit.libreoffice.org/13065 from Marcos Paulo de Souza
+ more breeze icons
  in https://gerrit.libreoffice.org/13058 from Jonathan Riddell
+ vcl: change Timer and Idle to use boost's Signal2
  in https://gerrit.libreoffice.org/12528 from Chris Sherlock
+ Removed useless includes in accessibility/ tree
  in https://gerrit.libreoffice.org/12948 from Andrea Gelmini
+ Perftest for loading autocorrect dictionaries, related fdo#79761
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ WIP: fdo#43090: Add an option to disable autoclose brackets
  in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=g

Re: tubes/source/conference.cxx:251:79: error: 'OSL_ENSURE' was not declared in this scope

2015-01-06 Thread ungifted

19.12.2014, 18:26, "Eike Rathke" :
> Hi ungifted,
>
> On Thursday, 2014-12-18 22:56:24 +0300, ungifted wrote:
>>  I found I should report build issues into this maillist. Ok.
>>
>>  Trying to build LibreOffice-4.4. on my Gentoo and got subj.
>
> First thing you should do is not enable tubes in your build, remove the
> --enable-telepathy option from the autogen.sh call. That is an highly
> experimental framework not benefitting anyone except developers who want
> to work on it.

This was Gentoo ebuild changed from 4.3. to 4.4.
Proposed ebuild for 4.4 there:
https://bugs.gentoo.org/show_bug.cgi?id=533138
still have USE flag "telepathy".

>>  With this patch I can at least build it now.
>>
>>  +#include 
>
> Thanks anyway for the heads-up, the proper solution would be to convert
> the old OSL_ENSURE() macro calls to SAL_WARN_IF()

Proposed change looks simple even for me :) I found SAL_WARN_IF() used many 
times in tubes.
Using this as example and by reading desc in log.hxx/log.h patch (not tested).

I found I should negative bool value here because:
from log.hxx for SAL_WARN_IF "if the given condition is true"
from diagnose.h for OSL_ENSURE "If cond is false..."


diff -Naur a/tubes/source/conference.cxx b/tubes/source/conference.cxx
--- a/tubes/source/conference.cxx   2014-12-18 01:13:50.0 +0300
+++ b/tubes/source/conference.cxx   2015-01-07 00:23:50.821287600 +0300
@@ -248,7 +248,7 @@
 
 void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* 
pChannel )
 {
-OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have 
channel");
+SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have 
channel");
 if (mpChannel)
 g_object_unref( mpChannel);
 if (mpAccount)
@@ -297,7 +297,7 @@
 {
 INFO_LOGGER( "TeleConference::offerTube");
 
-OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
+SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
 if (!mpChannel)
 return false;
 
@@ -319,7 +319,7 @@
 {
 INFO_LOGGER( "TeleConference::setTube");
 
-OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
+SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already 
tubed");
 
 pImpl->mpTube = pTube;



> and include sal/log.hxx for that 

It coming from #include #include  and then from #include 



> and add a proper section to include/sal/log-areas.dox

Is "tubes" area into "other" section good?

diff -Naur a/include/sal/log-areas.dox b/include/sal/log-areas.dox
--- a/include/sal/log-areas.dox   2014-12-18 01:13:50.0 +0300
+++ b/include/sal/log-areas.dox 2015-01-07 00:55:31.143174332 +0300
@@ -501,6 +501,7 @@
 @li @c store
 @li @c svg
 @li @c test
+@li @c tubes
 @li @c ucbhelper
 @li @c unoidl
 @li @c unoxml

And I found using SAL_INFO( "tubes.method"... in /tubes/source/conference.cxx 
and manager.cxx
May be it should be added too?

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

Re: Severe performance degradation on Linux

2015-01-06 Thread Noel Grandin



Just a guess, but I would suspect that setting the TCP_NODELAY socket option on both ends of the socket would speed 
things up considerably.


I think that some BSD-based operating systems have a loopback shortcut in their networking code, which would explain 
some of the speed difference between Linux and OSX.


Disclaimer: http://www.peralex.com/disclaimer.html


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

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

2015-01-06 Thread Julien Nabet

 connectivity/source/drivers/mork/MConnection.cxx |   11 +++
 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx |   17 ++-
 connectivity/source/drivers/mork/MQueryHelper.cxx|   10 +-
 connectivity/source/drivers/mork/MorkParser.hxx  |5 +++
 4 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit a527ad98e58a7fc9af482f9088687d82e5c52cca
Author: Julien Nabet 
Date:   Tue Jan 6 00:24:45 2015 +0100

Resolves fdo#87789: show groups in collected addresses

Retrieves lists in CollectedAddressBook and retrieves the right mork parser
However, it doesn't take into account addresses books created by user

Change-Id: I2cee6ba7afd43dd772f69af6686cc4308e753e66
Reviewed-on: https://gerrit.libreoffice.org/13760
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/mork/MConnection.cxx 
b/connectivity/source/drivers/mork/MConnection.cxx
index 2c5748b..7225fc9 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -169,6 +169,17 @@ void OConnection::construct(const OUString& url,const 
Sequence< PropertyValue >&
 SAL_INFO("connectivity.mork", "table->first : " << 
tableIter->first);
 }
 }
+// check that we can retrieve the history tables:
+MorkTableMap *Tables_hist = m_pHistory->getTables( defaultScope );
+if (Tables_hist)
+{
+// Iterate all tables
+for ( tableIter = Tables_hist->begin(); tableIter != 
Tables_hist->end(); ++tableIter )
+{
+if ( 0 == tableIter->first ) continue;
+SAL_INFO("connectivity.mork", "table->first : " << 
tableIter->first);
+}
+}
 }
 
 // XServiceInfo
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx 
b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
index 5c530d8..f04f2bf 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
@@ -58,12 +58,27 @@ bool MDatabaseMetaDataHelper::getTableStrings( OConnection* 
_pCon,
 
 /* retrieve list table names (not from collected ab) */
 std::set lists;
-_pCon->getMorkParser("AddressBook")->retrieveLists(lists);
+MorkParser* pMork = _pCon->getMorkParser("AddressBook");
+pMork->retrieveLists(lists);
 for (::std::set::iterator iter = lists.begin(); iter != 
lists.end(); ++iter) {
 OUString groupTableName = OStringToOUString((*iter).c_str(), 
RTL_TEXTENCODING_UTF8);
 SAL_INFO("connectivity.mork", "add Table " << groupTableName);
 
 _rStrings.push_back(groupTableName);
+// remember the list in the mork parser, we'll use it later
+pMork->lists_.push_back(groupTableName);
+}
+
+std::set lists_history;
+pMork = _pCon->getMorkParser("CollectedAddressBook");
+pMork->retrieveLists(lists_history);
+for (::std::set::iterator iter = lists_history.begin(); iter 
!= lists_history.end(); ++iter) {
+OUString groupTableName = OStringToOUString((*iter).c_str(), 
RTL_TEXTENCODING_UTF8);
+SAL_INFO("connectivity.mork", "add Table " << groupTableName);
+
+_rStrings.push_back(groupTableName);
+// remember the list in the mork parser, we'll use it later
+pMork->lists_.push_back(groupTableName);
 }
 
 return true;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx 
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 3d9a9ae..6139d5e 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -195,7 +195,15 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* 
xConnection, MQueryExpression
 OString oStringTable = OUStringToOString( m_aAddressbook, 
RTL_TEXTENCODING_UTF8 );
 std::set listRecords;
 bool handleListTable = false;
-MorkParser* xMork = xConnection->getMorkParser(oStringTable);
+
+// Let's try to retrieve the list in Collected Addresses book
+MorkParser* xMork = 
xConnection->getMorkParser(OString("CollectedAddressBook"));
+if (std::find(xMork->lists_.begin(), xMork->lists_.end(), m_aAddressbook) 
== xMork->lists_.end())
+{
+// so the list is in Address book
+// TODO : manage case where an address book has been created
+xMork = xConnection->getMorkParser(OString("AddressBook"));
+}
 
 // check if we are retrieving the default table
 if (oStringTable != "AddressBook" && oStringTable != 
"CollectedAddressBook")
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx 
b/connectivity/source/drivers/mork/MorkParser.hxx
index 1effb8f..a6ffc85 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -36,6 +36,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MORKPARSER_HXX
 
 #include 
+#includ

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

2015-01-06 Thread Laurent Charrière

 formula/source/core/api/FormulaCompiler.cxx|2 +-
 formula/source/core/api/token.cxx  |2 +-
 formula/source/core/resource/core_resource.src |8 
 include/formula/compiler.hrc   |2 +-
 include/formula/opcode.hxx |2 +-
 sc/source/core/inc/interpre.hxx|2 +-
 sc/source/core/opencl/formulagroupcl.cxx   |2 +-
 sc/source/core/tool/interpr2.cxx   |2 +-
 sc/source/core/tool/interpr4.cxx   |2 +-
 sc/source/core/tool/token.cxx  |2 +-
 sc/source/filter/excel/xlformula.cxx   |2 +-
 sc/source/filter/lotus/lotform.cxx |6 +++---
 sc/source/filter/qpro/qproform.cxx |2 +-
 sc/source/ui/src/scfuncs.src   |2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 1f4fd70495b3d0e732447e8e60e5faa9086471a8
Author: Laurent CharriÃ¨re 
Date:   Tue Jan 6 21:10:31 2015 +0100

fdo#85818: rename 'Zins' enum name, constant, function to Rate

Rename OcZins to OcRate, SC_OPCODE_ZINS to SC_OPCODE_RATE,
ScInterpreter::ScZins() to ScInterpreter::ScRate()

(partial fix for fdo#85818, more constants remain to be renamed)

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

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index f5b1b9a..69afa63 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -105,7 +105,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
 case ocKumZinsZ:
 case ocKumKapZ:
 return NUMBERFORMAT_CURRENCY;
-case ocZins:
+case ocRate:
 case ocIRR:
 case ocMIRR:
 case ocZGZ:
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 2f6ae97..ec9f4d3 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1264,7 +1264,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray 
*pNewArr, const Missin
 bRet |= AddDefaultArg( pNewArr, 2, 0.0 );   // pmt
 bRet |= AddDefaultArg( pNewArr, 3, 0.0 );   // [fp]v
 break;
-case ocZins:// RATE
+case ocRate:// RATE
 bRet |= AddDefaultArg( pNewArr, 1, 0.0 );   // pmt
 bRet |= AddDefaultArg( pNewArr, 3, 0.0 );   // fv
 bRet |= AddDefaultArg( pNewArr, 4, 0.0 );   // type
diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index 99b387d..408d083 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -227,7 +227,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_ZGZ { Text = "RRI" ; };
 String SC_OPCODE_ZW { Text = "FV" ; };
 String SC_OPCODE_ZZR { Text = "NPER" ; };
-String SC_OPCODE_ZINS { Text = "RATE" ; };
+String SC_OPCODE_RATE { Text = "RATE" ; };
 String SC_OPCODE_ZINS_Z { Text = "IPMT" ; };
 String SC_OPCODE_KAPZ { Text = "PPMT" ; };
 String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
@@ -634,7 +634,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
 String SC_OPCODE_ZGZ { Text = "_xlfn.RRI" ; };
 String SC_OPCODE_ZW { Text = "FV" ; };
 String SC_OPCODE_ZZR { Text = "NPER" ; };
-String SC_OPCODE_ZINS { Text = "RATE" ; };
+String SC_OPCODE_RATE { Text = "RATE" ; };
 String SC_OPCODE_ZINS_Z { Text = "IPMT" ; };
 String SC_OPCODE_KAPZ { Text = "PPMT" ; };
 String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
@@ -1043,7 +1043,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
 String SC_OPCODE_ZGZ { Text = "ZGZ" ; };
 String SC_OPCODE_ZW { Text = "FV" ; };
 String SC_OPCODE_ZZR { Text = "NPER" ; };
-String SC_OPCODE_ZINS { Text = "RATE" ; };
+String SC_OPCODE_RATE { Text = "RATE" ; };
 String SC_OPCODE_ZINS_Z { Text = "IPMT" ; };
 String SC_OPCODE_KAPZ { Text = "PPMT" ; };
 String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
@@ -1991,7 +1991,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
 {
 Text [ en-US ] = "NPER" ;
 };
-String SC_OPCODE_ZINS
+String SC_OPCODE_RATE
 {
 Text [ en-US ] = "RATE" ;
 };
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index bd1ad39..8767082 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -256,7 +256,7 @@
 #define SC_OPCODE_ZGZ   256
 #define SC_OPCODE_ZW257
 #define SC_OPCODE_ZZR   258
-#define SC_OPCODE_ZINS  259
+#define SC_OPCODE_RATE  259
 #define SC_OPCODE_ZINS_Z

"No rule to make target `vs2012-ide-integraion'"

2015-01-06 Thread aron

Hi all

I've built libreoffice-4.2.8.2 successfully on Windows. But I can't get the
MSVS project file.

[build SLC] writerfilter
[build SLC] chart2
[build SLC] sc
[build SLC] sw
[build SLC] libreoffice
[build SLC] loaded modules: UnoControls accessibility accessories afms
android animations apache-commons apple_remote avmedia basctl basebmp
basegfx basic bean beanshell binaryurp boost bridges canvas chart2 cli_ure
clucene codemaker comphelper configmgr connectivity cppcanvas cppu
cppuhelper cppunit cpputools cui curl dbaccess desktop drawinglayer dtrans
editeng embeddedobj embedserv eventattacher expat extensions external
extras filter firebird forms formula fpicker framework graphite
helpcompiler hsqldb hunspell hwpfilter hyphen i18nlangtag i18npool i18nutil
icu idl idlc instsetoo_native io javaunohelper jfreereport jpeg jurt
jvmaccess jvmfwk l10ntools lcms2 libabw libcdr libcmis libebook libetonyek
libexttextcat libfreehand liblangtag libmspub libmwaw libodfgen liborcus
libpng librelogo libreoffice libvisio libwpd libwpg libwps libxml2
libxmlsec libxslt lingucomponent linguistic lotuswordpro lpsolve mdds
more_fonts msc-externals mythes neon np_sdk nss o3tl odk offapi officecfg
oovbaapi oox openssl package padmin poppler postgresql postprocess
psprint_config python3 pyuno readlicense_oo redland registry remotebridges
reportbuilder reportdesign rhino ridljar rsc sal salhelper sax sc scaddins
sccomp scp2 scripting sd sdext setup_native sfx2 shell slideshow smoketest
solenv soltools sot starmath stoc store svgio svl svtools svx sw swext
sysui test testtools toolkit tools touch tubes ucb ucbhelper ucpp udkapi
unodevtools unoidl unoil unotest unotools unoxml ure uui vbahelper vcl
vigra wizards writerfilter writerperfect xmerge xmlhelp xmloff xmlreader
xmlscript xmlsecurity zlib

aron@MY-PC /cygdrive/d/lo/lo-core
*$ /opt/lo/bin/make vs2012-ide-integraion*
*make: *** No rule to make target `vs2012-ide-integraion'.  Stop.*


Is that the LibreOffice don't support vs2012-ide-integraion any more? Or I
made any mistake?
Best regards.
-- 
Aron
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-01-06 Thread Zolnai Tamás

 sw/source/core/layout/fly.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 89a81a6610cf31291750e7300bcd1a97d062
Author: Zolnai TamÃ¡s 
Date:   Wed Jan 7 01:55:29 2015 +0100

fdo#83354: Chart is truncated - moved down outside the margins of the object

Handle the case when the content height is unitialized (0).
When content height is 0 it means there is no content (so
we don't need to calculate adjustment) or the content height is
uninitialized which leads to wrong calculated value.

Regression from:
cb19042f4395c97d123a27c6960d5e30d666c010

Change-Id: I45570a71f0597847820ce77e8dcec4a5b0c6785d

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 05ed4c9..80773d3 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1732,9 +1732,15 @@ void SwFlyFrm::MakeContentPos( const SwBorderAttrs 
&rAttrs )
 Point aNewContentPos;
 aNewContentPos = Prt().Pos();
 const SdrTextVertAdjust nAdjust = 
GetFmt()->GetTextVertAdjust().GetValue();
+
 if( nAdjust != SDRTEXTVERTADJUST_TOP )
 {
-SwTwips nDiff = (Prt().*fnRect->fnGetHeight)() - 
CalcContentHeight(&rAttrs, nMinHeight, nUL);
+const SwTwips nContentHeight = CalcContentHeight(&rAttrs, 
nMinHeight, nUL);
+SwTwips nDiff = 0;
+
+if( nContentHeight != 0)
+nDiff = (Prt().*fnRect->fnGetHeight)() - nContentHeight;
+
 if( nDiff > 0 )
 {
 if( nAdjust == SDRTEXTVERTADJUST_CENTER )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Looking to Get Involved

2015-01-06 Thread fellowtraveler

So I just tried it manually as described in 
https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg134110.html 

It’s not exactly clear to me what that  last two steps are, 

* then open both the original and the saved file in Word,
* make sure that the asserted aspect does not differ (here: one of the images 
became invisible).

I did open both files in the writer (Word?) and didn’t notice any difference, I 
didn’t see that one of the images became invisible.

BTW, Norbert is correct. I ran this on a 15 inch Mac with a retina display. OS 
X v10.10.1 if that’s important.

== Joe

> On Jan 6, 2015, at 6:15 PM, Renato Ferreira  wrote:
> 
> 
> 
> based on /Users/... and the actual test failure, I'll bet a Mac with
> retina display.
> 
> Hm, nice catch. Although it's weird to have a third value, since there should 
> only be two canonical Mac versions for all that should matter here. Maybe OS 
> version?
> 
> Renato. 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

Re: Looking to Get Involved

2015-01-06 Thread Renato Ferreira

>
>
>
> based on /Users/... and the actual test failure, I'll bet a Mac with
> retina display.


Hm, nice catch. Although it's weird to have a third value, since there
should only be two canonical Mac versions for all that should matter here.
Maybe OS version?

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

Re: Looking to Get Involved

2015-01-06 Thread Norbert Thiebaud

On Tue, Jan 6, 2015 at 5:08 PM, Renato Ferreira  wrote:
>> I’ve been looking to get involved for a while but I am not really sure
>> where to start, it will defiantly be small. ;)  I’ve checked out and built
>> the code and I did run into a problem with one of the unit tests, the
>> specific problem that I am seeing was actually discussed on the list:
>>
>>
>> https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg133962.html
>>
>> Incidentally, the result I get for the failed test, getXPath(pXmlDoc,
>> "//a:srcRect", "l").toInt32(), is:
>>
>> 25630
>>
>> crop-pixel.docx,/Users/jdp/Development/libreoffice/core/sw/qa/extras/ooxmlexport/ooxmlexport.cxx:489:testCropPixel::Import_Export_Import
>> assertion failed
>> - Expression: getXPath(pXmlDoc, "//a:srcRect", "l").toInt32() <= 21856
>>
>> I didn’t notice that this problem, if it is a problem, was resolved.
>>
>
> Hi,
>
> I did run into this problem, as you have found out, but the value I got was
> different and, after we concluded that it was still acceptable, I pushed a
> change for the new value 22452.
>
> What system are you using?

based on /Users/... and the actual test failure, I'll bet a Mac with
retina display.

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

Re: Looking to Get Involved

2015-01-06 Thread Renato Ferreira

>
> I’ve been looking to get involved for a while but I am not really sure
> where to start, it will defiantly be small. ;)  I’ve checked out and built
> the code and I did run into a problem with one of the unit tests, the
> specific problem that I am seeing was actually discussed on the list:
>
>
> https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg133962.html
>
> Incidentally, the result I get for the failed test, getXPath(pXmlDoc,
> "//a:srcRect", "l").toInt32(), is:
>
> 25630
>
> crop-pixel.docx,/Users/jdp/Development/libreoffice/core/sw/qa/extras/ooxmlexport/ooxmlexport.cxx:489:testCropPixel::Import_Export_Import
> assertion failed
> - Expression: getXPath(pXmlDoc, "//a:srcRect", "l").toInt32() <= 21856
>
> I didn’t notice that this problem, if it is a problem, was resolved.
>
>
Hi,

I did run into this problem, as you have found out, but the value I got was
different and, after we concluded that it was still acceptable, I pushed a
change for the new value 22452.

What system are you using?

Although this value is still pretty close and, if you do the test manually
(open the document, save it do .docx again, and open on Word, if I remember
correctly) it would probably not fail (the image would still be visible), I
can't say whether we ought to change the value again. It does seem to me
that something trickier might be behind this, but at this point I can't
really understand what's going on a further level.

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

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

2015-01-06 Thread Stephan Bergmann

 sw/source/filter/ww8/ww8scan.cxx |2 +-
 sw/source/filter/ww8/ww8scan.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d7a507ab452bc84aeda00cc4d9bb7dbefde74339
Author: Stephan Bergmann 
Date:   Tue Dec 30 21:30:05 2014 +0100

-Werror,-Wconstant-conversion

"implicit conversion from 'long' to 'sal_uInt16' (aka 'unsigned short') 
changes
value from 9223372036854775807 to 65535," and at least the call to 
getHandle for
the long nHand argument of SwFltControlStack::SetAttr in
SwWW8ImplReader::Read_AtnBook makes it look like it better return long?

Change-Id: I594ac3ee60a72c0eb2e13f802371ff1e8ade7676
(cherry picked from commit cf39dc339f4ba2a6fb8ce572e437fe610754eb00)
Signed-off-by: Eike Rathke 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index af36b28..bef64ec 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4346,7 +4346,7 @@ void WW8PLCFx_AtnBook::advance()
 }
 }
 
-sal_uInt16 WW8PLCFx_AtnBook::getHandle() const
+long WW8PLCFx_AtnBook::getHandle() const
 {
 if (!m_pBook[0] || !m_pBook[1])
 return LONG_MAX;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index a3bdf78..ed4d496 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -796,7 +796,7 @@ public:
 virtual void advance() SAL_OVERRIDE;
 
 /// Handle is the unique ID of an annotation mark.
-sal_uInt16 getHandle() const;
+long getHandle() const;
 bool getIsEnd() const;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Rimas Kudelis license statement

2015-01-06 Thread Rimas Kudelis

   To the extent possible under law, I waive all copyright and related or 
neighboring
   rights to my past & future contributions to LibreOffice:
   http://creativecommons.org/publicdomain/zero/1.0

Regards,
Rimas Kudelis

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

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

2015-01-06 Thread Julien Nabet

 sc/source/core/data/funcdesc.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 689afb19dc399ff3fcea07a6d264b61d10313a1e
Author: Julien Nabet 
Date:   Mon Feb 2 21:02:42 2015 +0100

Better fix for fdo#87558: Duplication in Last Used Functions sidebar list

Advantage compared to previous fix: in sidebar, last used function is put 
at the top

Still function from menu is sorted, the pb is we use InsertEntry, see
0  ImplEntryList::InsertEntry (this=0x32d0910, nPos=2147483647, 
pNewEntry=0x326f620, bSort=true)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:144
1  0x2aaab1b2444e in ImplListBoxWindow::InsertEntry (this=0x3287358, 
nPos=2147483647, pNewEntry=0x326f620)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:750
2  0x2aaab1b2a138 in ImplListBox::InsertEntry (this=0x3287100, 
nPos=2147483647, rStr="ACOT")
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:2182
3  0x2aaab1b47d51 in ListBox::InsertEntry (this=0x32e9ca0, rStr="ACOT", 
nPos=2147483647)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/lstbox.cxx:1001
4  0x2aaad0c05d84 in formula::FuncPage::UpdateFunctionList 
(this=0x3217110) at 
/home/julien/compile-libreoffice/libreoffice/formula/source/ui/dlg/funcpage.cxx:153
should we create a new InsertEntry to force bSort=false?

Change-Id: Iba1b020aeea09951dead30f6781b24993aac98e0
Reviewed-on: https://gerrit.libreoffice.org/13725
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 585ab75a9344e140c876cb7565d3525a62fb8a73)
Reviewed-on: https://gerrit.libreoffice.org/13781
Reviewed-by: Julien Nabet 

diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 912ae33..9dd713d 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -770,13 +770,13 @@ void 
ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
 const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
 sal_uInt16 nLRUFuncCount = std::min( rAppOpt.GetLRUFuncListCount(), 
(sal_uInt16)LRU_MAX );
 sal_uInt16* pLRUListIds = rAppOpt.GetLRUFuncList();
+_rLastRUFunctions.clear();
 
 if ( pLRUListIds )
 {
 for (sal_uInt16 i = 0; i < nLRUFuncCount; ++i)
 {
-if (std::find(_rLastRUFunctions.begin(), _rLastRUFunctions.end(), 
Get(pLRUListIds[i])) == _rLastRUFunctions.end())
-_rLastRUFunctions.push_back( Get( pLRUListIds[i] ) );
+_rLastRUFunctions.push_back( Get( pLRUListIds[i] ) );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Julien Nabet

 sc/source/core/data/funcdesc.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 585ab75a9344e140c876cb7565d3525a62fb8a73
Author: Julien Nabet 
Date:   Mon Feb 2 21:02:42 2015 +0100

Better fix for fdo#87558: Duplication in Last Used Functions sidebar list

Advantage compared to previous fix: in sidebar, last used function is put 
at the top

Still function from menu is sorted, the pb is we use InsertEntry, see
0  ImplEntryList::InsertEntry (this=0x32d0910, nPos=2147483647, 
pNewEntry=0x326f620, bSort=true)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:144
1  0x2aaab1b2444e in ImplListBoxWindow::InsertEntry (this=0x3287358, 
nPos=2147483647, pNewEntry=0x326f620)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:750
2  0x2aaab1b2a138 in ImplListBox::InsertEntry (this=0x3287100, 
nPos=2147483647, rStr="ACOT")
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:2182
3  0x2aaab1b47d51 in ListBox::InsertEntry (this=0x32e9ca0, rStr="ACOT", 
nPos=2147483647)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/control/lstbox.cxx:1001
4  0x2aaad0c05d84 in formula::FuncPage::UpdateFunctionList 
(this=0x3217110) at 
/home/julien/compile-libreoffice/libreoffice/formula/source/ui/dlg/funcpage.cxx:153
should we create a new InsertEntry to force bSort=false?

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

diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 912ae33..9dd713d 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -770,13 +770,13 @@ void 
ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
 const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
 sal_uInt16 nLRUFuncCount = std::min( rAppOpt.GetLRUFuncListCount(), 
(sal_uInt16)LRU_MAX );
 sal_uInt16* pLRUListIds = rAppOpt.GetLRUFuncList();
+_rLastRUFunctions.clear();
 
 if ( pLRUListIds )
 {
 for (sal_uInt16 i = 0; i < nLRUFuncCount; ++i)
 {
-if (std::find(_rLastRUFunctions.begin(), _rLastRUFunctions.end(), 
Get(pLRUListIds[i])) == _rLastRUFunctions.end())
-_rLastRUFunctions.push_back( Get( pLRUListIds[i] ) );
+_rLastRUFunctions.push_back( Get( pLRUListIds[i] ) );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread David Ostrovsky

 solenv/gbuild/platform/com_MSC_defs.mk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 967c060b7d887b2181bae11adbad91105190d12f
Author: David Ostrovsky 
Date:   Tue Jan 6 23:05:53 2015 +0100

Fix --enable-pch option on msvc 64bit compiler

When /Zmxxx option is provided to 64 bit compiler it throws on us
weird error messages, no matter what the value is passed.  It was
mentioned in the knowledge base, that removing it entirely fixes
the problem.

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 7590a7b..43c9198 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -153,7 +153,6 @@ gb_CFLAGS := \
-wd4706 \
-wd4800 \
-Zc:wchar_t- \
-   -Zm500 \
 
 gb_CXXFLAGS := \
-Gd \
@@ -184,7 +183,6 @@ gb_CXXFLAGS := \
-wd4800 \
-wd4913 \
-Zc:wchar_t- \
-   -Zm500 \
 
 ifneq ($(MSVC_USE_DEBUG_RUNTIME),)
 gb_CXXFLAGS += \
@@ -217,6 +215,14 @@ ifeq ($(CPUNAME),X86_64)
 gb_CXXFLAGS += \
-wd4267 \
 
+else
+
+gb_CXXFLAGS += \
+   -Zm500 \
+
+gb_CFLAGS += \
+   -Zm500 \
+
 endif
 
 # rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

removing crashrep

2015-01-06 Thread Caolán McNamara

I propose removing
"crashrep" (https://gerrit.libreoffice.org/#/c/13733/) on the basis that
we've never used it. Any objections ?

C.

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

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

2015-01-06 Thread Miklos Vajna

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

New commits:
commit 1fa51103a1ea4034af6c746b34eeeddd39f7ab4f
Author: Miklos Vajna 
Date:   Fri Jan 2 11:06:01 2015 +0100

CppunitTest_sw_ww8export: use SAL_NEWLINE_STRING

This makes CppunitTest_sw_ww8export pass on Windows again.

Change-Id: I16fed4eabbe7b9ccdcc0c71361b85b0e13f2245a
(cherry picked from commit 4d3b725000e537ce6199f0abd1c80580c9bf95c8)

diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 357b06a..e03c3cc 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -449,7 +449,7 @@ DECLARE_WW8EXPORT_TEST(testCommentedTable, 
"commented-table.doc")
 uno::Reference xField(xFields->nextElement(), 
uno::UNO_QUERY);
 // After first import, there was an off-by-one during import, so this was 
"efore.\nA1\nB1\nAfte". (Notice the additional "e" prefix.)
 // After export and import, things got worse, this was "\nA1\nB1\nAfte".
-CPPUNIT_ASSERT_EQUAL(OUString("fore.\nA1\nB1\nAfte"), 
xField->getAnchor()->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("fore." SAL_NEWLINE_STRING "A1" 
SAL_NEWLINE_STRING "B1" SAL_NEWLINE_STRING "Afte"), 
xField->getAnchor()->getString());
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Eike Rathke

 vcl/source/filter/jpeg/jpegc.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 105e2611032ebc8ad777deb19b8cea62ad2279e2
Author: Eike Rathke 
Date:   Tue Jan 6 21:33:56 2015 +0100

Revert "grml.. nScanLineBufferComponents still needs to be on jmp stack"

This reverts commit d389216038d874c0d99a8168649a7f5f4db970d3.

Author is obviously too dumb for this. It's alright, isn't it?

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index b4cd995..411b17b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -69,7 +69,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 longnAlignedWidth;
 JSAMPLE*aRangeLimit;
 boost::scoped_array pScanLineBuffer;
-longnScanLineBufferComponents;
 
 if ( setjmp( jerr.setjmp_buffer ) )
 {
@@ -150,7 +149,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
 aRangeLimit = cinfo.sample_range_limit;
 
-nScanLineBufferComponents = 0;
+long nScanLineBufferComponents = 0;
 if ( cinfo.out_color_space == JCS_CMYK )
 {
 nScanLineBufferComponents = cinfo.output_width * 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 133 commits - accessibility/source android/Bootstrap android/experimental avmedia/source basctl/source basctl/uiconfig basic/source bea

2015-01-06 Thread Miklos Vajna

Rebased ref, commits from common ancestor:
commit a989d6f5bd6ad9c301259f93ab1fc62a4fcebb93
Author: Miklos Vajna 
Date:   Tue Jan 6 17:31:42 2015 +0100

LOK: add LibreOfficeKitCallbackType enumeration

Change-Id: I0147b1985f87f25e70f4d8672beba18fdd9ba6c2

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 1b20738..a4addb8 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -51,6 +51,19 @@ typedef enum
 }
 LibreOfficeKitPartMode;
 
+typedef enum
+{
+/**
+ * Any tiles which are over the rectangle described in the payload are no
+ * longer valid.
+ *
+ * Rectangle format: "width,height,x,y", where all numbers are document
+ * coordinates, in twips.
+ */
+LOK_CALLBACK_INVALIDATE_TILES
+}
+LibreOfficeKitCallbackType;
+
 typedef void (*LibreOfficeKitCallback)(int nType, const char* pPayload, void* 
pData);
 #endif // LOK_USE_UNSTABLE_API
 
diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index 8eafb53..4e13f03 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -153,10 +153,16 @@ static void lok_docview_callback(int nType, const char* 
pPayload, void* pData)
 {
 LOKDocView* pDocView = pData;
 
-// TODO for now just always render the document.
-(void)nType;
-(void)pPayload;
-renderDocument( pDocView );
+switch (nType)
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+// TODO for now just always render the document.
+(void)pPayload;
+renderDocument( pDocView );
+break;
+default:
+break;
+}
 }
 
 SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document( LOKDocView* pDocView, 
char* pPath )
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index b51d56b3..d5e1902 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6247,7 +6247,7 @@ void SwEditWin::LogicInvalidate(const vcl::Region* 
pRegion)
 ss << aRectangle.getWidth() << ", " << aRectangle.getHeight() << ", " 
<< aRectangle.getX() << ", " << aRectangle.getY();
 sRectangle = ss.str().c_str();
 }
-m_rView.GetWrtShell().libreOfficeKitCallback(0, sRectangle.getStr());
+
m_rView.GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, 
sRectangle.getStr());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3547424b9fa9c335e4e0c80fae8c5ac928403045
Author: Miklos Vajna 
Date:   Tue Jan 6 16:05:45 2015 +0100

sw: notify LOK clients about invalidations

So that when the document changes, they can know what tiles to throw
away.

Change-Id: I1f00585e7691a40af8fe5de71ac1a4225bc4e67f

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 16a8a14..5102fa0 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -442,6 +442,14 @@ public:
 long nTileHeight ) SAL_OVERRIDE;
 virtual Size getDocumentSize() SAL_OVERRIDE;
 virtual void initializeForTiledRendering() SAL_OVERRIDE;
+/**
+ * Registers a callback that will be invoked whenever the tiled renderer
+ * wants to notify the client about an event.
+ *
+ * @param pCallBack is the callback function
+ * @param pData is private data of the client that will be sent back when 
the callback is invoked
+ */
+virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) SAL_OVERRIDE;
 
 voidInvalidate();
 voidReactivate(SwDocShell* pNewDocShell);
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 1c5eddb..574933c 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessible; } } } }
@@ -194,6 +195,9 @@ protected:
 sal_uInt16 mnLockPaint;   ///< != 0 if Paint is locked.
 bool  mbSelectAll; ///< Special select all mode: whole document 
selected, even if doc starts with table.
 
+LibreOfficeKitCallback mpLibreOfficeKitCallback;
+void* mpLibreOfficeKitData;
+
 public:
 TYPEINFO();
 
@@ -572,6 +576,12 @@ public:
 bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return 
(eControl == Header)? mbShowHeaderSeparator: mbShowFooterSeparator; }
 virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool 
bShow ) { if ( eControl == Header ) mbShowHeaderSeparator = bShow; else 
mbShowFooterSeparator = bShow; }
 bool IsSelectAll() { return mbSelectAll; }
+
+/// The actual implementation of the 
vcl::ITiledRenderable::registerCallback() API for Writer.
+void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, 
void* pLibreOfficeKitData);
+/// Invokes the registered callback, if there are any.
+vo

[Libreoffice-commits] core.git: 6 commits - desktop/source include/LibreOfficeKit include/vcl libreofficekit/source sw/inc sw/source vcl/source

2015-01-06 Thread Miklos Vajna

 desktop/source/lib/init.cxx   |   18 ++
 include/LibreOfficeKit/LibreOfficeKit.h   |   18 ++
 include/LibreOfficeKit/LibreOfficeKit.hxx |   11 +++
 include/vcl/ITiledRenderable.hxx  |9 +
 include/vcl/outdev.hxx|8 
 libreofficekit/source/gtk/lokdocview.c|   19 +++
 sw/inc/unotxdoc.hxx   |8 
 sw/inc/viewsh.hxx |   10 ++
 sw/source/core/view/viewsh.cxx|   12 
 sw/source/core/view/vnew.cxx  |4 
 sw/source/uibase/docvw/edtwin.cxx |   15 +++
 sw/source/uibase/inc/edtwin.hxx   |6 ++
 sw/source/uibase/uno/unotxdoc.cxx |7 +++
 vcl/source/window/paint.cxx   |   11 +++
 14 files changed, 156 insertions(+)

New commits:
commit a989d6f5bd6ad9c301259f93ab1fc62a4fcebb93
Author: Miklos Vajna 
Date:   Tue Jan 6 17:31:42 2015 +0100

LOK: add LibreOfficeKitCallbackType enumeration

Change-Id: I0147b1985f87f25e70f4d8672beba18fdd9ba6c2

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 1b20738..a4addb8 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -51,6 +51,19 @@ typedef enum
 }
 LibreOfficeKitPartMode;
 
+typedef enum
+{
+/**
+ * Any tiles which are over the rectangle described in the payload are no
+ * longer valid.
+ *
+ * Rectangle format: "width,height,x,y", where all numbers are document
+ * coordinates, in twips.
+ */
+LOK_CALLBACK_INVALIDATE_TILES
+}
+LibreOfficeKitCallbackType;
+
 typedef void (*LibreOfficeKitCallback)(int nType, const char* pPayload, void* 
pData);
 #endif // LOK_USE_UNSTABLE_API
 
diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index 8eafb53..4e13f03 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -153,10 +153,16 @@ static void lok_docview_callback(int nType, const char* 
pPayload, void* pData)
 {
 LOKDocView* pDocView = pData;
 
-// TODO for now just always render the document.
-(void)nType;
-(void)pPayload;
-renderDocument( pDocView );
+switch (nType)
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+// TODO for now just always render the document.
+(void)pPayload;
+renderDocument( pDocView );
+break;
+default:
+break;
+}
 }
 
 SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document( LOKDocView* pDocView, 
char* pPath )
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index b51d56b3..d5e1902 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6247,7 +6247,7 @@ void SwEditWin::LogicInvalidate(const vcl::Region* 
pRegion)
 ss << aRectangle.getWidth() << ", " << aRectangle.getHeight() << ", " 
<< aRectangle.getX() << ", " << aRectangle.getY();
 sRectangle = ss.str().c_str();
 }
-m_rView.GetWrtShell().libreOfficeKitCallback(0, sRectangle.getStr());
+
m_rView.GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, 
sRectangle.getStr());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3547424b9fa9c335e4e0c80fae8c5ac928403045
Author: Miklos Vajna 
Date:   Tue Jan 6 16:05:45 2015 +0100

sw: notify LOK clients about invalidations

So that when the document changes, they can know what tiles to throw
away.

Change-Id: I1f00585e7691a40af8fe5de71ac1a4225bc4e67f

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 16a8a14..5102fa0 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -442,6 +442,14 @@ public:
 long nTileHeight ) SAL_OVERRIDE;
 virtual Size getDocumentSize() SAL_OVERRIDE;
 virtual void initializeForTiledRendering() SAL_OVERRIDE;
+/**
+ * Registers a callback that will be invoked whenever the tiled renderer
+ * wants to notify the client about an event.
+ *
+ * @param pCallBack is the callback function
+ * @param pData is private data of the client that will be sent back when 
the callback is invoked
+ */
+virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) SAL_OVERRIDE;
 
 voidInvalidate();
 voidReactivate(SwDocShell* pNewDocShell);
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 1c5eddb..574933c 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessible; } } } }
@@ -194,6 +195,9 @@ protected:
 sal_uInt16 mnLockPaint;   ///< != 0 if Paint is locked.
 bool  mbSelectAll; ///< Special

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

2015-01-06 Thread Julien Nabet

 connectivity/source/drivers/mork/MorkParser.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21eb155e3eac7badd987adc041000378c67911ae
Author: Julien Nabet 
Date:   Tue Jan 6 20:33:47 2015 +0100

Typo: Rerturns -> Returns

Change-Id: Ic331f71eb0f248528a340c4390af65951b46b22f

diff --git a/connectivity/source/drivers/mork/MorkParser.hxx 
b/connectivity/source/drivers/mork/MorkParser.hxx
index d0ecba7..1effb8f 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -96,7 +96,7 @@ public:
 
 MorkTableMap *getTables( int tableScope );
 
-/// Rerturns all rows under specified scope
+/// Returns all rows under specified scope
 
 MorkRowMap *getRows( int rowScope, RowScopeMap *table );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Eike Rathke

 vcl/source/filter/jpeg/jpegc.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d389216038d874c0d99a8168649a7f5f4db970d3
Author: Eike Rathke 
Date:   Tue Jan 6 20:18:48 2015 +0100

grml.. nScanLineBufferComponents still needs to be on jmp stack

A follow-up on 09a5910c96a822c6e7fc4b82d89c00c22e905eba
move nScanLineBufferComponents to where it is used [-Werror=clobbered]

If pScanLineBuffer is used, nScanLineBufferComponents is the
corresponding counter so it needs to be preserved as well in case of a
longjmp.

Change-Id: If9c6f148cd47b98dee2418fb61eebe2c829869f1

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 411b17b..b4cd995 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -69,6 +69,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 longnAlignedWidth;
 JSAMPLE*aRangeLimit;
 boost::scoped_array pScanLineBuffer;
+longnScanLineBufferComponents;
 
 if ( setjmp( jerr.setjmp_buffer ) )
 {
@@ -149,7 +150,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
 aRangeLimit = cinfo.sample_range_limit;
 
-long nScanLineBufferComponents = 0;
+nScanLineBufferComponents = 0;
 if ( cinfo.out_color_space == JCS_CMYK )
 {
 nScanLineBufferComponents = cinfo.output_width * 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/opengl

2015-01-06 Thread Kohei Yoshida

 vcl/opengl/win/WinDeviceInfo.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c5ba76147442a5ce3ce2dd69966be7550483fdc9
Author: Kohei Yoshida 
Date:   Tue Jan 6 12:22:18 2015 -0500

Build fix on Windows.

 is needed for std::max.

Change-Id: Ic5cc38f3e34d1de60ece84f2e52a2d82325e1371

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 3b3902c..7beda49 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/uiconfig

2015-01-06 Thread Yousuf Philips

 sd/uiconfig/simpress/toolbar/commontaskbar.xml|5 -
 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml |5 +++--
 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml |4 ++--
 sd/uiconfig/simpress/toolbar/standardbar.xml  |   11 +--
 4 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 2f1e83e0af3babca27ccfd30a071c0537b2db829
Author: Yousuf Philips 
Date:   Sun Dec 28 17:55:19 2014 +0400

fdo#84909 moved presentation features to standard toolbar (4.4)

Change-Id: Id52e58ad74a521f338204d0b4b21f776dc61ba08
Reviewed-on: https://gerrit.libreoffice.org/13678
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 74d84c5065aa7332dcc1af1844f9b8af589165aa)
Reviewed-on: https://gerrit.libreoffice.org/13679
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml 
b/sd/uiconfig/simpress/toolbar/commontaskbar.xml
index 10bda5e..8fc0c0e 100644
--- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml
+++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml
@@ -25,9 +25,4 @@
  
  
  
- 
- 
- 
- 
- 
 
diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml 
b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index 33a37ee..499c6e1 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
@@ -36,16 +36,17 @@
  
  
  
- 
  
+ 
  
  
  
  
  
  
- 
+ 
  
+ 
  
  
  
diff --git a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml 
b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
index 7b34fac..456c5e0 100644
--- a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
@@ -32,12 +32,12 @@
  
  
  
- 
  
+ 
  
  
  
  
  
- 
+ 
 
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml 
b/sd/uiconfig/simpress/toolbar/standardbar.xml
index b3bb795..e575dbd 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -44,16 +44,23 @@
  
  
  
- 
  
  
  
- 
  
+ 
  
  
  
  
  
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/galaxy

2015-01-06 Thread Yousuf Philips

 icon-themes/galaxy/links.txt |4 
 1 file changed, 4 insertions(+)

New commits:
commit fb8ee34a5c9e900e563f6cf75d10e5f7e2d815f4
Author: Yousuf Philips 
Date:   Wed Dec 24 10:24:45 2014 +0400

ICONS: Add duplicate reference for flip commands in impress/draw (4.4)

Change-Id: Id729fd5e8475e48a20645d58f458d5898c9a255a
Reviewed-on: https://gerrit.libreoffice.org/13637
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 673b22a7811a4e341d7a0e8ef9cf61dbc607b97e)
Reviewed-on: https://gerrit.libreoffice.org/13638
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 71562cb..9b49a8b 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -27,3 +27,7 @@ cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png
 # paragraph line spacing
 cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
+
+# flip in impress/draw
+cmd/sc_mirrorhorz.png cmd/sc_fliphorizontal.png
+cmd/sc_mirrorvert.png cmd/sc_flipvertical.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/harfbuzz

2015-01-06 Thread Stephan Bergmann

 external/harfbuzz/UnpackedTarball_harfbuzz.mk |6 +++
 external/harfbuzz/ubsan.patch |   44 ++
 2 files changed, 50 insertions(+)

New commits:
commit 9dbac35b1e55c49b2f1e595f4dfe3437c3fedb58
Author: Stephan Bergmann 
Date:   Tue Jan 6 18:05:49 2015 +0100

external/harfbuzz: Work around -fsanitize=null

Change-Id: I81dc29f5ba2ef442ffb7e2823f02b9bfead24a46

diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 0bda2a1..1f9f15f 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,harfbuzz))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL),,harfbuzz))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
+external/harfbuzz/ubsan.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
new file mode 100644
index 000..3bdb589
--- /dev/null
+++ b/external/harfbuzz/ubsan.patch
@@ -0,0 +1,44 @@
+--- src/hb-object-private.hh
 src/hb-object-private.hh
+@@ -131,7 +131,7 @@
+   }
+ 
+   inline bool destroy (void) {
+-if (unlikely (!this || this->is_inert ()))
++if (unlikely (is_inert ()))
+   return false;
+ if (ref_count.dec () != 1)
+   return false;
+@@ -160,13 +160,12 @@
+   }
+ 
+   inline void trace (const char *function) const {
+-if (unlikely (!this)) return;
+ /* TODO We cannot use DEBUG_MSG_FUNC here since that one currently only
+  * prints the class name and throws away the template info. */
+ DEBUG_MSG (OBJECT, (void *) this,
+  "%s refcount=%d",
+  function,
+- this ? ref_count.ref_count : 0);
++ ref_count.ref_count);
+   }
+ 
+   private:
+@@ -179,7 +179,7 @@
+ template 
+ static inline void hb_object_trace (const Type *obj, const char *function)
+ {
+-  obj->header.trace (function);
++  if (likely (obj)) obj->header.trace (function);
+ }
+ template 
+ static inline Type *hb_object_create (void)
+@@ -204,7 +204,7 @@
+ static inline bool hb_object_destroy (Type *obj)
+ {
+   hb_object_trace (obj, HB_FUNC);
+-  return obj->header.destroy ();
++  return likely (obj) && obj->header.destroy ();
+ }
+ template 
+ static inline bool hb_object_set_user_data (Type   *obj,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread V Stuart Foote

 sw/source/core/doc/DocumentStylePoolManager.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit aa474a538315c20128d0853bac97bfa3e66a2c12
Author: V Stuart Foote 
Date:   Wed Dec 24 20:10:23 2014 +0400

fdo#82041 restore heading 3 and 4 color to automatic (4.4)

Change-Id: I81de0e67b388507a29e3cb70a05f08775a380bad
Reviewed-on: https://gerrit.libreoffice.org/13642
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 889f4705b90147d5653b08491579c51a7aca12be)
Reviewed-on: https://gerrit.libreoffice.org/13643
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 089c9a5..a2c2175 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -491,18 +491,14 @@ SwTxtFmtColl* 
DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 case RES_POOLCOLL_HEADLINE3:// Headinline 3
 {
 SvxULSpaceItem aUL( PT_7, PT_6, RES_UL_SPACE );
-Color aCol( COL_GRAY );
 aSet.Put( aUL );
-aSet.Put( SvxColorItem ( aCol, RES_CHRATR_COLOR ) );
 lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 2, 
false );
 }
 break;
 case RES_POOLCOLL_HEADLINE4:// Headinline 4
 {
 SvxULSpaceItem aUL( PT_6, PT_6, RES_UL_SPACE );
-Color aCol( COL_GRAY );
 aSet.Put( aUL );
-aSet.Put( SvxColorItem ( aCol, RES_CHRATR_COLOR ) );
 lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 3, true 
);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Yousuf Philips

 sd/source/ui/app/menuids_tmpl.src |   23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit a5fd512c34c7210d86f210c74033291bd27ca83c
Author: Yousuf Philips 
Date:   Mon Dec 22 23:49:44 2014 +0400

fdo#84233 rearrange impress and draw slide context menus submenu (4.4)

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

diff --git a/sd/source/ui/app/menuids_tmpl.src 
b/sd/source/ui/app/menuids_tmpl.src
index 2569138..07f6fb0 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -138,41 +138,40 @@
 {\
 ItemList = \
 {\
+MN_INSERT_PAGE\
+MN_DELETE_PAGE\
+SEPARATOR\
 MN_FORMAT_PAGE\
 MN_PRESENTATION_LAYOUT\
 MN_RENAME_PAGE\
-SEPARATOR\
-MN_INSERT_PAGE\
-MN_DELETE_PAGE\
 };\
 };\
 Text [ en-US ] = "Pag~e" ; \
 };
 
 #define MN_SLIDE_MENU \
+MN_SELECT_BACKGROUND\
+MN_FORMAT_PAGE\
 MenuItem\
 {\
 Identifier = DUMMY + 8 ; \
 Command = ".uno:PageMenu" ; \
+Text [ en-US ] = "Slid~e" ; \
 SubMenu = Menu\
 {\
 ItemList = \
 {\
-MN_FORMAT_PAGE\
-MN_PRESENTATION_LAYOUT\
-MN_MODIFY_PAGE\
-MN_SELECT_BACKGROUND\
+MN_INSERT_SLIDE\
+MN_DUPLICATE_SLIDE\
+MN_DELETE_SLIDE\
+SEPARATOR\
 MN_RENAME_SLIDE\
 SEPARATOR\
+MN_PRESENTATION_LAYOUT\
 MN_DISPLAY_MASTER_BACKGROUND\
 MN_DISPLAY_MASTER_OBJECTS\
-SEPARATOR\
-MN_INSERT_SLIDE\
-MN_DUPLICATE_SLIDE\
-MN_DELETE_SLIDE\
 };\
 };\
-Text [ en-US ] = "Slid~e" ; \
 };
 
  // Layer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread David Tardon

 xmloff/source/style/XMLFontAutoStylePool.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3006f4214e58a0617f6c6344791ab89c289f0526
Author: David Tardon 
Date:   Mon Jan 5 18:41:14 2015 +0100

export format of embedded font too

Change-Id: Ife7dbb298861a71987501f3847d3b931c7e83715
(cherry picked from commit 2862ef7e65e4994ff3cf173a36ec59b47445455e)
Reviewed-on: https://gerrit.libreoffice.org/13752
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx 
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 4800c05..7c86e29 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -311,6 +311,10 @@ void XMLFontAutoStylePool::exportXML()
 GetExport().AddAttribute( XML_NAMESPACE_XLINK, 
XML_TYPE, "simple" );
 SvXMLElementExport fontFaceUri( GetExport(), 
XML_NAMESPACE_SVG,
 XML_FONT_FACE_URI, true, true );
+
+GetExport().AddAttribute( XML_NAMESPACE_SVG, 
XML_STRING, "truetype" );
+SvXMLElementExport fontFaceFormat( GetExport(), 
XML_NAMESPACE_SVG,
+XML_FONT_FACE_FORMAT, true, true );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread David Tardon

 xmloff/source/style/XMLFontStylesContext.cxx  |   27 +++---
 xmloff/source/style/XMLFontStylesContext_impl.hxx |8 ++
 2 files changed, 32 insertions(+), 3 deletions(-)

New commits:
commit a9d191857372847fe198cb6036a9db2877289b4b
Author: David Tardon 
Date:   Mon Jan 5 16:45:25 2015 +0100

read embedded fonts from Flat ODF

Change-Id: Ic94608f4afac9d8ac05ec3140d195b0526e9420a
(cherry picked from commit 0a0496858905622374f9880b21b35ac1943c7a19)
Reviewed-on: https://gerrit.libreoffice.org/13751
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/xmloff/source/style/XMLFontStylesContext.cxx 
b/xmloff/source/style/XMLFontStylesContext.cxx
index 5f7dfa8..373e116 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -33,6 +35,7 @@
 #include "fonthdl.hxx"
 #include 
 #include 
+#include 
 
 
 using namespace ::com::sun::star;
@@ -251,6 +254,12 @@ SvXMLImportContext * 
XMLFontStyleContextFontFaceUri::CreateChildContext(
 {
 if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, 
XML_FONT_FACE_FORMAT ))
 return new XMLFontStyleContextFontFaceFormat( GetImport(), nPrefix, 
rLocalName, xAttrList, *this );
+if( linkPath.isEmpty() && ( nPrefix == XML_NAMESPACE_OFFICE ) && 
IsXMLToken( rLocalName, XML_BINARY_DATA ) )
+{
+mxBase64Stream.set( new comphelper::OSequenceOutputStream( maFontData 
) );
+if( mxBase64Stream.is() )
+return new XMLBase64ImportContext( GetImport(), nPrefix, 
rLocalName, xAttrList, mxBase64Stream );
+}
 return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, 
xAttrList );
 }
 
@@ -276,9 +285,9 @@ const char* EOT_FORMAT  = "embedded-opentype";
 
 void XMLFontStyleContextFontFaceUri::EndElement()
 {
-if( linkPath.getLength() == 0 )
+if( ( linkPath.getLength() == 0 ) && ( maFontData.getLength() == 0 ) )
 {
-SAL_WARN( "xmloff", "svg:font-face-uri tag with no link; ignoring." );
+SAL_WARN( "xmloff", "svg:font-face-uri tag with no link or base64 
data; ignoring." );
 return;
 }
 bool eot;
@@ -298,7 +307,10 @@ void XMLFontStyleContextFontFaceUri::EndElement()
 SAL_WARN( "xmloff", "Unknown format of embedded font; assuming TTF." );
 eot = false;
 }
-handleEmbeddedFont( linkPath, eot );
+if ( maFontData.getLength() == 0 )
+handleEmbeddedFont( linkPath, eot );
+else
+handleEmbeddedFont( maFontData, eot );
 }
 
 void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url, 
bool eot )
@@ -328,6 +340,15 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( 
const OUString& url, bo
 SAL_WARN( "xmloff", "External URL for font file not handled." );
 }
 
+void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const 
::css::uno::Sequence< sal_Int8 >& rData, const bool eot )
+{
+const uno::Reference< io::XInputStream > xInput( new 
comphelper::SequenceInputStream( rData ) );
+const OUString fontName = font.familyName();
+if( EmbeddedFontsHelper::addEmbeddedFont( xInput, fontName, "?", 
std::vector< unsigned char >(), eot ) )
+GetImport().NotifyEmbeddedFontRead();
+xInput->closeInput();
+}
+
 SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext(
 sal_uInt16 nPrefix,
 const OUString& rLocalName,
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx 
b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index 3938aa6..a1cfc11 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -22,6 +22,10 @@
 
 #include 
 
+namespace com { namespace sun { namespace star { namespace io {
+class XOutputStream;
+} } } }
+
 /// Handles 
 class XMLFontStyleContextFontFace : public SvXMLStyleContext
 {
@@ -91,7 +95,11 @@ class XMLFontStyleContextFontFaceUri : public 
SvXMLStyleContext
 const XMLFontStyleContextFontFace& font;
 OUString format;
 OUString linkPath;
+::css::uno::Sequence< sal_Int8 > maFontData;
+::css::uno::Reference< ::css::io::XOutputStream > mxBase64Stream;
+
 void handleEmbeddedFont( const OUString& url, bool eot );
+void handleEmbeddedFont( const ::css::uno::Sequence< sal_Int8 >& rData, 
bool eot );
 public:
 
 TYPEINFO_OVERRIDE();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/libmwaw

2015-01-06 Thread David Tardon

 
external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 |   99 ++
 
external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
 |   31 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk
  |5 
 3 files changed, 135 insertions(+)

New commits:
commit c475835cab890a69d3c07ddc85ce131b64affaa3
Author: David Tardon 
Date:   Tue Jan 6 17:01:30 2015 +0100

fdo#88098 ClarisWorks: import empty starting lines/columns

Change-Id: Ibe4d5be4df874336de7ae387d210deff0a927b38
(cherry picked from commit 2a8f6a8a81c568d9ad73838072d287ac4927649f)
Reviewed-on: https://gerrit.libreoffice.org/13772
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 
b/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
new file mode 100644
index 000..0d79446
--- /dev/null
+++ 
b/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
@@ -0,0 +1,99 @@
+From c092ac823e50083c04464565365ddd4af71f8c89 Mon Sep 17 00:00:00 2001
+From: osnola 
+Date: Tue, 6 Jan 2015 15:39:54 +0100
+Subject: [PATCH 1/2] ClarisWorks/AppleWorks[spreadsheet]: do not remove first
+ empty rows and/or columns in the main spreadsheet   + if we remove some first
+ rows/columns in a embedded spreadsheet, update the cells present in
+ formula...
+
+---
+ src/lib/ClarisWksDbaseContent.cxx | 29 +
+ src/lib/ClarisWksDbaseContent.hxx |  3 ++-
+ src/lib/ClarisWksSpreadsheet.cxx  |  5 +
+ 3 files changed, 36 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/ClarisWksDbaseContent.cxx 
b/src/lib/ClarisWksDbaseContent.cxx
+index 7226af1..ea15544 100644
+--- a/src/lib/ClarisWksDbaseContent.cxx
 b/src/lib/ClarisWksDbaseContent.cxx
+@@ -1393,4 +1393,33 @@ bool ClarisWksDbaseContent::readFormula(Vec2i const 
&cPos, long endPos, std::vec
+ 
+   return true;
+ }
++
++
++//
++
++void ClarisWksDbaseContent::Record::updateFormulaCells(Vec2i const 
&removeDelta)
++{
++  if (m_content.m_contentType!=MWAWCellContent::C_FORMULA)
++return;
++  std::vector 
&formula=m_content.m_formula;
++  for (size_t i=0; im_kind==MWAWDocument::MWAW_K_SPREADSHEET && zId==1)
++minData=Vec2i(0,0);
+   std::vector colSize((size_t)(maxData[0]-minData[0]+1),72);
+   for (int c=minData[0], fC=0; c <= maxData[0]; ++c, ++fC) {
+ if (c>=0 && c < int(sheet.m_colWidths.size()))
+@@ -462,6 +464,7 @@ bool ClarisWksSpreadsheet::sendSpreadsheet(int zId, 
MWAWListenerPtr listener)
+   }
+   sheetListener->openSheet(colSize, librevenge::RVNG_POINT);
+   MWAWInputStreamPtr &input= m_parserState->m_input;
++  bool recomputeCellPosition=(minData!=Vec2i(0,0));
+   for (int r=minData[1], fR=0; r <= maxData[1]; ++r, ++fR) {
+ if (sheet.m_rowHeightMap.find(r)!=sheet.m_rowHeightMap.end())
+   
sheetListener->openSheetRow((float)sheet.m_rowHeightMap.find(r)->second, 
librevenge::RVNG_POINT);
+@@ -478,6 +481,8 @@ bool ClarisWksSpreadsheet::sendSpreadsheet(int zId, 
MWAWListenerPtr listener)
+   // change the reference date from 1/1/1904 to 1/1/1900
+   if (rec.m_format.m_format==MWAWCell::F_DATE && 
rec.m_content.isValueSet())
+ rec.m_content.setValue(rec.m_content.m_value+1460);
++  if (recomputeCellPosition)
++rec.updateFormulaCells(minData);
+   if (rec.m_borders) {
+ int wh=0;
+ for (int i=0, bit=1; i < 4; ++i, bit*=2) {
+-- 
+2.1.0
+
diff --git 
a/external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
 
b/external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
new file mode 100644
index 000..98f07bc
--- /dev/null
+++ 
b/external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
@@ -0,0 +1,31 @@
+From bc03e5d29fbf3eb3f58b9f91c7e8c748239721ac Mon Sep 17 00:00:00 2001
+From: osnola 
+Date: Tue, 6 Jan 2015 15:48:18 +0100
+Subject: [PATCH 2/2] ClarisWors/AppleWorks[spreadsheet]: Oops, correct of a
+ mistake...
+
+---
+ src/lib/ClarisWksDbaseContent.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/ClarisWksDbaseContent.cxx 
b/src/lib/ClarisWksDbaseContent.cxx
+index ea15544..e175c2e 100644
+--- a/src/lib/ClarisWksDbaseContent.cxx
 b/src/lib/ClarisWksDbaseContent.cxx
+@@ -1413,10 +1413,10 @@ void 
ClarisWksDbaseContent::Record::updateFormulaCells(Vec2i const &removeDelta)
+ if (first) {
+   MWAW_DEBUG_MSG(("ClarisWksDbaseContent::Record::updateFormulaCells: 
some cell's positions are bad, remove formula\n"));
+   first=false;
+-  // revert to the basic cell type
+-  m_content.m_contentType=m_valueType;
+-  return;
+ }
++// revert to the basic cell type
++

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

2015-01-06 Thread David Tardon

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

New commits:
commit 25b91a6ea6f8f1a1c842116d7361783335fe9338
Author: David Tardon 
Date:   Tue Jan 6 17:02:01 2015 +0100

build requires libmwaw 0.3.4 now

Change-Id: Ia129961bc429514b70e4bb508a76424e4df83289
(cherry picked from commit c075fc1b39c7d8389cd960ccde7295d011105ae6)
Reviewed-on: https://gerrit.libreoffice.org/13771
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/configure.ac b/configure.ac
index 76835e5..a6c5d7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7517,7 +7517,7 @@ 
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 dnl ===
 dnl Check for system libmwaw
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.3])
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.4])
 
 dnl ===
 dnl Check for system libpagemaker
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Caolán McNamara

 include/vcl/outdev.hxx |2 ++
 include/vcl/print.hxx  |1 +
 vcl/source/gdi/print.cxx   |   10 ++
 vcl/source/outdev/gradient.cxx |   23 +++
 4 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit e2883ca86f747eb62d1fe9e9b8d115c689e3abd7
Author: CaolÃ¡n McNamara 
Date:   Tue Jan 6 15:05:36 2015 +

Resolves: fdo#82219 color graphics as black and white

i.e. revert

commit bb5c7d6a79309236d4f19bb2498f2e850f735a2f
Date:   Sun Apr 13 01:42:27 2014 +1000

fdo#38844 Reduce XOR clipping for gradients

Removed XOR clipping version of ClipAndDrawGradientMetafile. Because it
has been removed, the other version isn't really needed in it's own
function so I've moved it back into DrawGradient.

Change-Id: Ib1519a019061c8c71183db63e5c11681bcad4cc4

Change-Id: Iff1cb48cb8fa6d29937cf228a57aea9e8072110c

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 23abb00..0d36309 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1511,6 +1511,8 @@ protected:
 virtual voidEmulateDrawTransparent( const 
tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
 voidDrawInvisiblePolygon( const 
tools::PolyPolygon& rPolyPoly );
 
+virtual voidClipAndDrawGradientMetafile ( const Gradient 
&rGradient, const tools::PolyPolygon &rPolyPoly );
+
 private:
 
 SAL_DLLPRIVATE bool DrawTransparentNatively( const 
tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 3a9ad1d..242873c 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -259,6 +259,7 @@ protected:
 
 virtual longGetGradientStepCount( long nMinRect ) 
SAL_OVERRIDE;
 virtual boolUsePolyPolygonForComplexGradient() 
SAL_OVERRIDE;
+virtual voidClipAndDrawGradientMetafile ( const Gradient 
&rGradient, const tools::PolyPolygon &rPolyPoly ) SAL_OVERRIDE;
 
 voidScaleBitmap ( Bitmap&, SalTwoRect& ) 
SAL_OVERRIDE { };
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 3fec08f..fd23d19 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1813,6 +1813,16 @@ bool Printer::UsePolyPolygonForComplexGradient()
 return true;
 }
 
+void Printer::ClipAndDrawGradientMetafile ( const Gradient &rGradient, const 
tools::PolyPolygon &rPolyPoly )
+{
+const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
+
+Push( PushFlags::CLIPREGION );
+IntersectClipRegion(vcl::Region(rPolyPoly));
+DrawGradient( aBoundRect, rGradient );
+Pop();
+}
+
 void Printer::InitFont() const
 {
 DBG_TESTSOLARMUTEX();
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 8916e76..7031103 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -146,6 +146,24 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon& 
rPolyPoly,
 mpAlphaVDev->DrawPolyPolygon( rPolyPoly );
 }
 
+void OutputDevice::ClipAndDrawGradientMetafile ( const Gradient &rGradient, 
const tools::PolyPolygon &rPolyPoly )
+{
+const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
+const bool  bOldOutput = IsOutputEnabled();
+
+EnableOutput( false );
+Push( PushFlags::RASTEROP );
+SetRasterOp( ROP_XOR );
+DrawGradient( aBoundRect, rGradient );
+SetFillColor( COL_BLACK );
+SetRasterOp( ROP_0 );
+DrawPolyPolygon( rPolyPoly );
+SetRasterOp( ROP_XOR );
+DrawGradient( aBoundRect, rGradient );
+Pop();
+EnableOutput( bOldOutput );
+}
+
 void OutputDevice::DrawGradientToMetafile ( const tools::PolyPolygon& 
rPolyPoly,
 const Gradient& rGradient )
 {
@@ -172,10 +190,7 @@ void OutputDevice::DrawGradientToMetafile ( const 
tools::PolyPolygon& rPolyPoly,
 mpMetaFile->AddAction( new MetaCommentAction( "XGRAD_SEQ_BEGIN" ) 
);
 mpMetaFile->AddAction( new MetaGradientExAction( rPolyPoly, 
rGradient ) );
 
-Push( PushFlags::CLIPREGION );
-IntersectClipRegion(vcl::Region(rPolyPoly));
-DrawGradient( aBoundRect, rGradient );
-Pop();
+ClipAndDrawGradientMetafile ( rGradient, rPolyPoly );
 
 mpMetaFile->AddAction( new MetaCommentAction( "XGRAD_SEQ_END" ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Stephan Bergmann

 vcl/workben/vcldemo.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c2250cbd2fc392e11cb1fe70ff139457968e23a
Author: Stephan Bergmann 
Date:   Tue Jan 6 17:57:41 2015 +0100

loplugin:saloverride

Change-Id: I4509ee714622ad1fcccfed9255a474727e0f8e16

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 608007d..0d81a74 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1215,7 +1215,7 @@ class DemoWin : public WorkWindow
 {
 join();
 }
-virtual void execute()
+virtual void execute() SAL_OVERRIDE
 {
 osl_waitThread(&maDelay);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/icu external/libxml2

2015-01-06 Thread Stephan Bergmann

 external/icu/icu-ubsan.patch.0   |   11 
 external/libxml2/UnpackedTarball_xml2.mk |1 
 external/libxml2/ubsan.patch.0   |   84 +++
 3 files changed, 96 insertions(+)

New commits:
commit d81dbb6dee272bd18c7a1d3e0dbe429b04187f8b
Author: Stephan Bergmann 
Date:   Tue Jan 6 17:45:00 2015 +0100

external/libxml2: Work around -fsanitize=bounds

Change-Id: I57d30410640fa1b7e1768136b1802546b2b7253f

diff --git a/external/libxml2/UnpackedTarball_xml2.mk 
b/external/libxml2/UnpackedTarball_xml2.mk
index 9c53b1f..beed009 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_xml2.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
external/libxml2/libxml2-vc10.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
external/libxml2/libxml2-icu.patch.0 \
+   external/libxml2/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/ubsan.patch.0 b/external/libxml2/ubsan.patch.0
new file mode 100644
index 000..cebacc4
--- /dev/null
+++ b/external/libxml2/ubsan.patch.0
@@ -0,0 +1,84 @@
+--- parser.c
 parser.c
+@@ -1052,7 +1052,7 @@
+ struct _xmlDefAttrs {
+ int nbAttrs;  /* number of defaulted attributes on that element */
+ int maxAttrs;   /* the size of the array */
+-const xmlChar *values[5]; /* array of localname/prefix/values/external */
++const xmlChar *values[1][5]; /* array of localname/prefix/values/external 
*/
+ };
+ 
+ /**
+@@ -1244,17 +1244,17 @@
+   prefix = xmlDictLookup(ctxt->dict, fullattr, len);
+ }
+ 
+-defaults->values[5 * defaults->nbAttrs] = name;
+-defaults->values[5 * defaults->nbAttrs + 1] = prefix;
++defaults->values[defaults->nbAttrs][0] = name;
++defaults->values[defaults->nbAttrs][1] = prefix;
+ /* intern the string and precompute the end */
+ len = xmlStrlen(value);
+ value = xmlDictLookup(ctxt->dict, value, len);
+-defaults->values[5 * defaults->nbAttrs + 2] = value;
+-defaults->values[5 * defaults->nbAttrs + 3] = value + len;
++defaults->values[defaults->nbAttrs][2] = value;
++defaults->values[defaults->nbAttrs][3] = value + len;
+ if (ctxt->external)
+-defaults->values[5 * defaults->nbAttrs + 4] = BAD_CAST "external";
++defaults->values[defaults->nbAttrs][4] = BAD_CAST "external";
+ else
+-defaults->values[5 * defaults->nbAttrs + 4] = NULL;
++defaults->values[defaults->nbAttrs][4] = NULL;
+ defaults->nbAttrs++;
+ 
+ return;
+@@ -9474,8 +9474,8 @@
+   defaults = xmlHashLookup2(ctxt->attsDefault, localname, prefix);
+   if (defaults != NULL) {
+   for (i = 0;i < defaults->nbAttrs;i++) {
+-  attname = defaults->values[5 * i];
+-  aprefix = defaults->values[5 * i + 1];
++  attname = defaults->values[i][0];
++  aprefix = defaults->values[i][1];
+ 
+ /*
+* special work for namespaces defaulted defs
+@@ -9490,9 +9490,9 @@
+   if (j <= nbNs) continue;
+ 
+   nsname = xmlGetNamespace(ctxt, NULL);
+-  if (nsname != defaults->values[5 * i + 2]) {
++  if (nsname != defaults->values[i][2]) {
+   if (nsPush(ctxt, NULL,
+- defaults->values[5 * i + 2]) > 0)
++ defaults->values[i][2]) > 0)
+   nbNs++;
+   }
+   } else if (aprefix == ctxt->str_xmlns) {
+@@ -9505,9 +9505,9 @@
+   if (j <= nbNs) continue;
+ 
+   nsname = xmlGetNamespace(ctxt, attname);
+-  if (nsname != defaults->values[2]) {
++  if (nsname != defaults->values[0][2]) {
+   if (nsPush(ctxt, attname,
+- defaults->values[5 * i + 2]) > 0)
++ defaults->values[i][2]) > 0)
+   nbNs++;
+   }
+   } else {
+@@ -9533,10 +9533,10 @@
+   atts[nbatts++] = NULL;
+   else
+   atts[nbatts++] = xmlGetNamespace(ctxt, aprefix);
+-  atts[nbatts++] = defaults->values[5 * i + 2];
+-  atts[nbatts++] = defaults->values[5 * i + 3];
++  atts[nbatts++] = defaults->values[i][2];
++  atts[nbatts++] = defaults->values[i][3];
+   if ((ctxt->standalone == 1) &&
+-  (defaults->values[5 * i + 4] != NULL)) {
++  (defaults->values[i][4] != NULL)) {
+   xmlValidityError(ctxt, XML_DTD_STANDALONE_DEFAULTED,
+ "standalone: attribute %s on %s defaulted from external subset\n",
+attname, localname);
commit 901091f47a661571a7fb935bd5

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=79641

Laurent BP  changed:

   What|Removed |Added

 CC||jumbo4...@yahoo.fr
 Depends on||88111

--- Comment #28 from Laurent BP  ---
Promote bug 88111
Math object cannot be seen during slide show

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - include/LibreOfficeKit libreofficekit/source sw/source

2015-01-06 Thread Miklos Vajna

 include/LibreOfficeKit/LibreOfficeKit.h |   13 +
 libreofficekit/source/gtk/lokdocview.c  |   14 ++
 sw/source/uibase/docvw/edtwin.cxx   |2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 21c3a1b61733ef017ee4622a76058b3ecad5da08
Author: Miklos Vajna 
Date:   Tue Jan 6 17:31:42 2015 +0100

LOK: add LibreOfficeKitCallbackType enumeration

Change-Id: I0147b1985f87f25e70f4d8672beba18fdd9ba6c2

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 594f83c..5763d54 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -51,6 +51,19 @@ typedef enum
 }
 LibreOfficeKitPartMode;
 
+typedef enum
+{
+/**
+ * Any tiles which are over the rectangle described in the payload are no
+ * longer valid.
+ *
+ * Rectangle format: "width,height,x,y", where all numbers are document
+ * coordinates, in twips.
+ */
+LOK_CALLBACK_INVALIDATE_TILES
+}
+LibreOfficeKitCallbackType;
+
 typedef void (*LibreOfficeKitCallback)(int nType, const char* pPayload, void* 
pData);
 #endif // LOK_USE_UNSTABLE_API
 
diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index 8eafb53..4e13f03 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -153,10 +153,16 @@ static void lok_docview_callback(int nType, const char* 
pPayload, void* pData)
 {
 LOKDocView* pDocView = pData;
 
-// TODO for now just always render the document.
-(void)nType;
-(void)pPayload;
-renderDocument( pDocView );
+switch (nType)
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+// TODO for now just always render the document.
+(void)pPayload;
+renderDocument( pDocView );
+break;
+default:
+break;
+}
 }
 
 SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document( LOKDocView* pDocView, 
char* pPath )
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index b51d56b3..d5e1902 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6247,7 +6247,7 @@ void SwEditWin::LogicInvalidate(const vcl::Region* 
pRegion)
 ss << aRectangle.getWidth() << ", " << aRectangle.getHeight() << ", " 
<< aRectangle.getX() << ", " << aRectangle.getY();
 sRectangle = ss.str().c_str();
 }
-m_rView.GetWrtShell().libreOfficeKitCallback(0, sRectangle.getStr());
+
m_rView.GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, 
sRectangle.getStr());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/generic vcl/inc vcl/osx vcl/source vcl/unx vcl/win vcl/workben

2015-01-06 Thread Michael Meeks

 include/vcl/opengl/OpenGLContext.hxx |8 +++-
 vcl/generic/app/geninst.cxx  |8 ++--
 vcl/inc/unx/gtk/gtkinst.hxx  |5 +
 vcl/osx/salinst.cxx  |4 
 vcl/source/opengl/OpenGLContext.cxx  |   21 -
 vcl/unx/gtk/app/gtkinst.cxx  |   14 --
 vcl/win/source/app/salinst.cxx   |3 +++
 vcl/workben/vcldemo.cxx  |   20 +---
 8 files changed, 58 insertions(+), 25 deletions(-)

New commits:
commit 0bea1d80d10a1e3e9bebf958d622ff2fb480e886
Author: Michael Meeks 
Date:   Tue Jan 6 16:09:09 2015 +

vcl: reset OpenGLContext(s) when yielding the last SolarMutex.

This should make OpenGL thread-safe to allow multiple threads to
render using VCL's OpenGL backend, and fix misc. associated driver
horrors, will give some performance cost for tight Yield loops.

Change-Id: Ib23702262fd9f0925a5ed8c642d0a26e92136b37

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index b93c12c..67570c1 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -199,8 +199,14 @@ public:
 OpenGLProgram*  UseProgram( const OUString& rVertexShader, const 
OUString& rFragmentShader );
 
 bool isCurrent();
-void clearCurrent();
+static void clearCurrent();
+/// reset all contexts dis-associating them with their underlying
+/// resources before a potential thread switch.
+static void resetAllContexts();
+
+/// make this GL context current - so it is implicit in subsequent GL calls
 void makeCurrent();
+/// reset the GL context so this context is not implicit in subsequent GL 
calls.
 void resetCurrent();
 void swapBuffers();
 void sync();
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index cf2f301..5ac4936 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -21,8 +21,9 @@
 #include 
 #include 
 
-#include "osl/module.hxx"
-#include "tools/solarmutex.hxx"
+#include 
+#include 
+#include 
 
 #include "generic/geninst.h"
 
@@ -53,7 +54,10 @@ void SalYieldMutex::release()
 if ( mnThreadId == osl::Thread::getCurrentIdentifier() )
 {
 if ( mnCount == 1 )
+{
+OpenGLContext::resetAllContexts();
 mnThreadId = 0;
+}
 mnCount--;
 }
 m_mutex.release();
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 9979842..411cfba 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -31,6 +31,7 @@
 #include "vcl/window.hxx"
 #include "vcl/timer.hxx"
 #include "vcl/svmain.hxx"
+#include "vcl/opengl/OpenGLContext.hxx"
 
 #include "osx/saldata.hxx"
 #include "osx/salinst.h"
@@ -269,7 +270,10 @@ void SalYieldMutex::release()
 if ( mnThreadId == osl::Thread::getCurrentIdentifier() )
 {
 if ( mnCount == 1 )
+{
+OpenGLContext::resetAllContexts();
 mnThreadId = 0;
+}
 mnCount--;
 }
 m_mutex.release();
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 138a79e..9d681ff 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -82,6 +82,9 @@ OpenGLContext::OpenGLContext():
 else
 pSVData->maGDIData.mpFirstContext = this;
 pSVData->maGDIData.mpLastContext = this;
+
+// FIXME: better hope we call 'makeCurrent' soon to preserve
+// the invariant that the last item is the current context.
 }
 
 OpenGLContext::~OpenGLContext()
@@ -1289,6 +1292,22 @@ void OpenGLContext::clearCurrent()
 pCurrentCtx->ReleaseFramebuffers();
 }
 
+void OpenGLContext::resetAllContexts()
+{
+ImplSVData* pSVData = ImplGetSVData();
+
+// release all framebuffers from the old context so we can re-attach the
+// texture in the new context
+for (OpenGLContext* l = pSVData->maGDIData.mpLastContext; l;
+ l = l->mpPrevContext)
+{
+l->ReleaseFramebuffers();
+if (l->isCurrent())
+l->resetCurrent();
+assert (!l->mpNextContext || l->mpNextContext->mpPrevContext == l);
+}
+}
+
 void OpenGLContext::makeCurrent()
 {
 ImplSVData* pSVData = ImplGetSVData();
@@ -1318,7 +1337,7 @@ void OpenGLContext::makeCurrent()
 }
 #endif
 
-// move the context at the end of the contexts list
+// move the context to the end of the contexts list
 static int nSwitch = 0;
 SAL_INFO("vcl.opengl", "*** CONTEXT SWITCH " << ++nSwitch << " 
*");
 if( mpNextContext )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 9e284eb..1091856 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -148,6 +149,8 @@ void SalYieldMutex::release()
 {
 if ( mnCount == 1 )
 {
+

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

2015-01-06 Thread Lionel Elie Mamane

 reportdesign/source/ui/inspection/GeometryHandler.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0d63a64ecaeb4517c710876b1170e28ae71a44a2
Author: Lionel Elie Mamane 
Date:   Thu Dec 18 06:37:27 2014 +0100

fdo#76780 don't limit PositionY to available width

Change-Id: I3a429d0a6f771f6bfde2331ddc8544c92d8147f7
Reviewed-on: https://gerrit.libreoffice.org/13517
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index be85489..c2ea980 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -881,7 +881,6 @@ inspection::LineDescriptor SAL_CALL 
GeometryHandler::describePropertyLine(const
 switch(nId)
 {
 case PROPERTY_ID_POSITIONX:
-case PROPERTY_ID_POSITIONY:
 case PROPERTY_ID_WIDTH:
 if ( bSetMin )
 
xNumericControl->setMinValue(beans::Optional(sal_True,0.0));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac external/libmwaw

2015-01-06 Thread David Tardon

 configure.ac   
  |2 
 
external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 |   99 ++
 
external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
 |   31 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk
  |5 
 4 files changed, 136 insertions(+), 1 deletion(-)

New commits:
commit c075fc1b39c7d8389cd960ccde7295d011105ae6
Author: David Tardon 
Date:   Tue Jan 6 17:02:01 2015 +0100

build requires libmwaw 0.3.4 now

Change-Id: Ia129961bc429514b70e4bb508a76424e4df83289

diff --git a/configure.ac b/configure.ac
index 5dbe640..df3b179 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7535,7 +7535,7 @@ 
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 dnl ===
 dnl Check for system libmwaw
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.3])
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.4])
 
 dnl ===
 dnl Check for system libpagemaker
commit 2a8f6a8a81c568d9ad73838072d287ac4927649f
Author: David Tardon 
Date:   Tue Jan 6 17:01:30 2015 +0100

fdo#88098 ClarisWorks: import empty starting lines/columns

Change-Id: Ibe4d5be4df874336de7ae387d210deff0a927b38

diff --git 
a/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 
b/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
new file mode 100644
index 000..0d79446
--- /dev/null
+++ 
b/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
@@ -0,0 +1,99 @@
+From c092ac823e50083c04464565365ddd4af71f8c89 Mon Sep 17 00:00:00 2001
+From: osnola 
+Date: Tue, 6 Jan 2015 15:39:54 +0100
+Subject: [PATCH 1/2] ClarisWorks/AppleWorks[spreadsheet]: do not remove first
+ empty rows and/or columns in the main spreadsheet   + if we remove some first
+ rows/columns in a embedded spreadsheet, update the cells present in
+ formula...
+
+---
+ src/lib/ClarisWksDbaseContent.cxx | 29 +
+ src/lib/ClarisWksDbaseContent.hxx |  3 ++-
+ src/lib/ClarisWksSpreadsheet.cxx  |  5 +
+ 3 files changed, 36 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/ClarisWksDbaseContent.cxx 
b/src/lib/ClarisWksDbaseContent.cxx
+index 7226af1..ea15544 100644
+--- a/src/lib/ClarisWksDbaseContent.cxx
 b/src/lib/ClarisWksDbaseContent.cxx
+@@ -1393,4 +1393,33 @@ bool ClarisWksDbaseContent::readFormula(Vec2i const 
&cPos, long endPos, std::vec
+ 
+   return true;
+ }
++
++
++//
++
++void ClarisWksDbaseContent::Record::updateFormulaCells(Vec2i const 
&removeDelta)
++{
++  if (m_content.m_contentType!=MWAWCellContent::C_FORMULA)
++return;
++  std::vector 
&formula=m_content.m_formula;
++  for (size_t i=0; im_kind==MWAWDocument::MWAW_K_SPREADSHEET && zId==1)
++minData=Vec2i(0,0);
+   std::vector colSize((size_t)(maxData[0]-minData[0]+1),72);
+   for (int c=minData[0], fC=0; c <= maxData[0]; ++c, ++fC) {
+ if (c>=0 && c < int(sheet.m_colWidths.size()))
+@@ -462,6 +464,7 @@ bool ClarisWksSpreadsheet::sendSpreadsheet(int zId, 
MWAWListenerPtr listener)
+   }
+   sheetListener->openSheet(colSize, librevenge::RVNG_POINT);
+   MWAWInputStreamPtr &input= m_parserState->m_input;
++  bool recomputeCellPosition=(minData!=Vec2i(0,0));
+   for (int r=minData[1], fR=0; r <= maxData[1]; ++r, ++fR) {
+ if (sheet.m_rowHeightMap.find(r)!=sheet.m_rowHeightMap.end())
+   
sheetListener->openSheetRow((float)sheet.m_rowHeightMap.find(r)->second, 
librevenge::RVNG_POINT);
+@@ -478,6 +481,8 @@ bool ClarisWksSpreadsheet::sendSpreadsheet(int zId, 
MWAWListenerPtr listener)
+   // change the reference date from 1/1/1904 to 1/1/1900
+   if (rec.m_format.m_format==MWAWCell::F_DATE && 
rec.m_content.isValueSet())
+ rec.m_content.setValue(rec.m_content.m_value+1460);
++  if (recomputeCellPosition)
++rec.updateFormulaCells(minData);
+   if (rec.m_borders) {
+ int wh=0;
+ for (int i=0, bit=1; i < 4; ++i, bit*=2) {
+-- 
+2.1.0
+
diff --git 
a/external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
 
b/external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
new file mode 100644
index 000..98f07bc
--- /dev/null
+++ 
b/external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
@@ -0,0 +1,31 @@
+From bc03e5d29fbf3eb3f58b9f91c7e8c748239721ac Mon Sep 17 00:00:00 2001
+From: osnola 
+Date: Tue, 6 Jan 2015 15:48:18 +0100
+Subject: [PATCH 2/2] ClarisWors/AppleWorks[spreadsheet]: Oops, correct of a
+ mistake...
+
+---
+ src/lib/ClarisWksDbaseConten

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

2015-01-06 Thread Caolán McNamara

 scaddins/source/analysis/analysis.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 15067728f2cf437f0ecd78ddaeacef91858dcb29
Author: CaolÃ¡n McNamara 
Date:   Tue Jan 6 15:52:49 2015 +

add cmath for std::nextafter

Change-Id: Ic5580d5efb9d5a891a62630dc457624ba89c15a2

diff --git a/scaddins/source/analysis/analysis.cxx 
b/scaddins/source/analysis/analysis.cxx
index 28ccc2d..d124a79 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define ADDIN_SERVICE   "com.sun.star.sheet.AddIn"
 #define MY_SERVICE  "com.sun.star.sheet.addin.Analysis"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread Caolán McNamara

 comphelper/source/misc/random.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dc5ae421c31ab5bd5641259eb95b3365f78b3495
Author: CaolÃ¡n McNamara 
Date:   Tue Jan 6 15:33:18 2015 +

include time.h for time

Change-Id: Id2fbc93fb99cd97473298e127dd5a3d82f22e438

diff --git a/comphelper/source/misc/random.cxx 
b/comphelper/source/misc/random.cxx
index 4a96b59..ea6c6a1 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 // this is nothing but a simple wrapper around
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread David Tardon

 src/lib/VSDMetaData.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8618e063c1ac0c9fdf60d5b401f8305d8b106d93
Author: David Tardon 
Date:   Tue Jan 6 13:49:02 2015 +0100

why is this constant static?

Change-Id: I4e1129695c2f4fd14c491acfe916853ea33fb64f

diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index d8a8ce1..dac4c97 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -226,7 +226,7 @@ bool 
libvisio::VSDMetaData::parseTimes(librevenge::RVNGInputStream *input)
   uint64_t modifiedTime = readU64(input);
 
   // modifiedTime is number of 100ns since Jan 1 1601
-  static const uint64_t epoch = uint64_t(116444736UL) * 100;
+  const uint64_t epoch = uint64_t(116444736UL) * 100;
   time_t sec = (modifiedTime / 1000) - epoch;
   const struct tm *time = localtime(&sec);
   if (time)
commit 949e96a5b47c3a1fcbc49d9f228398c641ab86af
Author: David Tardon 
Date:   Tue Jan 6 13:48:06 2015 +0100

workaround build error on old 32-bit linux systems

"error: integer constant is too large for 'long' type"

Change-Id: Ib2a8987da0bdc03e2b479d8743f8366fde83c203

diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index d1db01e..d8a8ce1 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -226,7 +226,7 @@ bool 
libvisio::VSDMetaData::parseTimes(librevenge::RVNGInputStream *input)
   uint64_t modifiedTime = readU64(input);
 
   // modifiedTime is number of 100ns since Jan 1 1601
-  static const uint64_t epoch = 11644473600;
+  static const uint64_t epoch = uint64_t(116444736UL) * 100;
   time_t sec = (modifiedTime / 1000) - epoch;
   const struct tm *time = localtime(&sec);
   if (time)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-06 Thread David Tardon

 src/lib/MSPUBMetaData.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84aa593e58a2a3cc28e6e36086d0c99f59e42757
Author: David Tardon 
Date:   Tue Jan 6 13:44:05 2015 +0100

why is this variable static?

Change-Id: Ib3108e1f4a0a4caa2df9685ee58a9ea6e7f7634e

diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index c52fcd7..7e5888e 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -210,7 +210,7 @@ bool 
libmspub::MSPUBMetaData::parseTimes(librevenge::RVNGInputStream *input)
   uint64_t modifiedTime = readU64(input);
 
   // modifiedTime is number of 100ns since Jan 1 1601
-  static const uint64_t epoch = uint64_t(116444736UL) * 100;
+  const uint64_t epoch = uint64_t(116444736UL) * 100;
   time_t sec = (modifiedTime / 1000) - epoch;
   const struct tm *time = localtime(&sec);
   if (time)
commit 4a642d5ab5d9822168ff49580e1349f422ef4481
Author: David Tardon 
Date:   Tue Jan 6 13:43:21 2015 +0100

workaround build error on some old 32-bit systems

"error: integer constant is too large for 'long' type"

Change-Id: I7f6a169059ca3dcd4d9977c6af1522799f1df051

diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index eca048b..c52fcd7 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -210,7 +210,7 @@ bool 
libmspub::MSPUBMetaData::parseTimes(librevenge::RVNGInputStream *input)
   uint64_t modifiedTime = readU64(input);
 
   // modifiedTime is number of 100ns since Jan 1 1601
-  static const uint64_t epoch = 11644473600;
+  static const uint64_t epoch = uint64_t(116444736UL) * 100;
   time_t sec = (modifiedTime / 1000) - epoch;
   const struct tm *time = localtime(&sec);
   if (time)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 42 commits - accessibility/source android/Bootstrap android/experimental bridges/inc bridges/source bridges/test comphelper/source compilerplugins/clang connectivity/so

2015-01-06 Thread Caolán McNamara

 accessibility/source/standard/vclxaccessibletoolboxitem.cxx
 |8 
 android/Bootstrap/src/org/libreoffice/kit/Document.java
 |3 
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
|2 
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx   
 |4 
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx 
 |5 
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx 
 |6 
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx  
 |5 
 bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx 
 |6 
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx  
 |1 
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx   
 |6 
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx 
 |1 
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx  
 |6 
 bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx  
 |6 
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 
 |5 
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx 
 |1 
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx  
 |6 
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx  
 |6 
 bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx   
 |6 
 bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx 
 |6 
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx  
 |6 
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx 
 |6 
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx 
 |6 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx  
 |1 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx   
 |5 
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx   
 |6 
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx   
 |6 
 bridges/source/cpp_uno/mingw_intel/except.cxx  
 |6 
 bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
 |1 
 bridges/source/cpp_uno/mingw_x86-64/except.cxx 
 |6 
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx 
 |5 
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
 |5 
 bridges/source/cpp_uno/shared/vtablefactory.cxx
 |4 
 bridges/test/java_uno/any/transport.cxx
 |2 
 comphelper/source/misc/random.cxx  
 |   21 -
 compilerplugins/clang/cstylecast.cxx   
 |8 
 connectivity/source/drivers/hsqldb/HStorageAccess.cxx  
 |   21 -
 connectivity/source/drivers/hsqldb/StorageFileAccess.cxx   
 |7 
 connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
 |   15 
 connectivity/source/inc/hsqldb/HStorageAccess.h
 |  116 ---
 connectivity/source/inc/hsqldb/HStorageAccess.hxx  
 |4 
 connectivity/source/inc/hsqldb/StorageFileAccess.h 
 |   58 ---
 connectivity/source/inc/hsqldb/StorageNativeInputStream.h  
 |   91 -
 cui/source/customize/cfg.cxx   
 |6 
 cui/uiconfig/ui/movemenu.ui
 |   10 
 cui/uiconfig/ui/namedialog.ui  
 |9 
 dbaccess/source/filter/xml/xmlExport.cxx   
 |   18 -
 dbaccess/source/filter/xml/xmlExport.hxx   
 |2 
 desktop/source/lib/init.cxx
 |   12 
 desktop/source/lib/lokandroid.cxx  
 |7 
 desktop/source/splash/splash.cxx   
 |4 
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx 
 |3 
 editeng/source/xml/xmltxtexp.cxx   
 |2 
 external/openssl/UnpackedTarball_openssl.mk
 |1 
 external/openssl/ubsan.patch.0 
 |   10 
 external/python3/UnpackedTarball_python3.mk
 |1 
 external/python3/ubsan.patch.

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 5 commits - desktop/source include/LibreOfficeKit include/vcl libreofficekit/source sw/inc sw/source vcl/source

2015-01-06 Thread Miklos Vajna

 desktop/source/lib/init.cxx   |   18 ++
 include/LibreOfficeKit/LibreOfficeKit.h   |5 +
 include/LibreOfficeKit/LibreOfficeKit.hxx |   12 
 include/vcl/ITiledRenderable.hxx  |9 +
 include/vcl/outdev.hxx|8 
 libreofficekit/source/gtk/lokdocview.c|   13 +
 sw/inc/unotxdoc.hxx   |8 
 sw/inc/viewsh.hxx |   10 ++
 sw/source/core/view/viewsh.cxx|   12 
 sw/source/core/view/vnew.cxx  |4 
 sw/source/uibase/docvw/edtwin.cxx |   15 +++
 sw/source/uibase/inc/edtwin.hxx   |6 ++
 sw/source/uibase/uno/unotxdoc.cxx |7 +++
 vcl/source/window/paint.cxx   |   11 +++
 14 files changed, 138 insertions(+)

New commits:
commit 4bbe07a214d21dd68201a1b2e2ef9c5b7b6d40f6
Author: Miklos Vajna 
Date:   Tue Jan 6 16:05:45 2015 +0100

sw: notify LOK clients about invalidations

So that when the document changes, they can know what tiles to throw
away.

Change-Id: I1f00585e7691a40af8fe5de71ac1a4225bc4e67f

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index de1507b..e46d2d5 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -441,6 +441,14 @@ public:
 long nTileWidth,
 long nTileHeight ) SAL_OVERRIDE;
 virtual Size getDocumentSize() SAL_OVERRIDE;
+/**
+ * Registers a callback that will be invoked whenever the tiled renderer
+ * wants to notify the client about an event.
+ *
+ * @param pCallBack is the callback function
+ * @param pData is private data of the client that will be sent back when 
the callback is invoked
+ */
+virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) SAL_OVERRIDE;
 
 voidInvalidate();
 voidReactivate(SwDocShell* pNewDocShell);
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 1c5eddb..574933c 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessible; } } } }
@@ -194,6 +195,9 @@ protected:
 sal_uInt16 mnLockPaint;   ///< != 0 if Paint is locked.
 bool  mbSelectAll; ///< Special select all mode: whole document 
selected, even if doc starts with table.
 
+LibreOfficeKitCallback mpLibreOfficeKitCallback;
+void* mpLibreOfficeKitData;
+
 public:
 TYPEINFO();
 
@@ -572,6 +576,12 @@ public:
 bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return 
(eControl == Header)? mbShowHeaderSeparator: mbShowFooterSeparator; }
 virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool 
bShow ) { if ( eControl == Header ) mbShowHeaderSeparator = bShow; else 
mbShowFooterSeparator = bShow; }
 bool IsSelectAll() { return mbSelectAll; }
+
+/// The actual implementation of the 
vcl::ITiledRenderable::registerCallback() API for Writer.
+void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, 
void* pLibreOfficeKitData);
+/// Invokes the registered callback, if there are any.
+void libreOfficeKitCallback(int nType, const char* pPayload);
+
 SwViewShell* GetNext()
 { return GetNextInRing(); }
 const SwViewShell* GetNext() const
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 14a4ade..27ec8a3 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -117,6 +117,18 @@ void SwViewShell::ToggleHeaderFooterEdit()
 GetWin()->Invalidate();
 }
 
+void SwViewShell::registerLibreOfficeKitCallback(LibreOfficeKitCallback 
pCallback, void* pData)
+{
+mpLibreOfficeKitCallback = pCallback;
+mpLibreOfficeKitData = pData;
+}
+
+void SwViewShell::libreOfficeKitCallback(int nType, const char* pPayload)
+{
+if (mpLibreOfficeKitCallback)
+mpLibreOfficeKitCallback(nType, pPayload, mpLibreOfficeKitData);
+}
+
 static void
 lcl_PaintTransparentFormControls(SwViewShell & rShell, SwRect const& rRect)
 {
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 3cfe679..6fef158 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -169,6 +169,8 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window 
*pWindow,
 mnStartAction( 0 ),
 mnLockPaint( 0 ),
 mbSelectAll(false),
+mpLibreOfficeKitCallback(0),
+mpLibreOfficeKitData(0),
 mpPrePostOutDev(0), // #i72754#
 maPrePostMapMode()
 {
@@ -245,6 +247,8 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window 
*pWindow,
 mnStartAction( 0 ),
 mnLockPaint( 0 ),
 mbSelectAll(false),
+mpLibreOfficeKitCallback(0),
+mpLibreOfficeKitData(0),
 mpPrePostOut

[Libreoffice-commits] core.git: Branch 'feature/vclref' - compilerplugins/clang extensions/source include/svtools include/vcl sd/source vcl/inc vcl/qa vcl/source vcl/unx vcl/workben

2015-01-06 Thread Noel Grandin

 compilerplugins/clang/vclwidgets.cxx  |2 
 extensions/source/propctrlr/standardcontrol.cxx   |4 
 extensions/source/propctrlr/standardcontrol.hxx   |2 
 include/svtools/svmedit.hxx   |1 
 include/vcl/button.hxx|   14 -
 include/vcl/combobox.hxx  |3 
 include/vcl/dialog.hxx|   13 -
 include/vcl/edit.hxx  |7 
 include/vcl/fixed.hxx |4 
 include/vcl/group.hxx |2 
 include/vcl/imgctrl.hxx   |2 
 include/vcl/layout.hxx|   33 +---
 include/vcl/lstbox.hxx|1 
 include/vcl/menubtn.hxx   |2 
 include/vcl/scrbar.hxx|2 
 include/vcl/vclmedit.hxx  |1 
 include/vcl/vclptr.hxx|  157 ++
 include/vcl/vclref.hxx|  157 --
 include/vcl/window.hxx|4 
 sd/source/ui/animations/CustomAnimationDialog.cxx |   22 +--
 vcl/inc/printdlg.hxx  |8 -
 vcl/qa/cppunit/lifecycle.cxx  |   34 ++--
 vcl/source/app/dbggui.cxx |   22 +--
 vcl/source/control/combobox.cxx   |2 
 vcl/source/control/edit.cxx   |4 
 vcl/source/window/dialog.cxx  |4 
 vcl/source/window/layout.cxx  |2 
 vcl/source/window/menubarwindow.hxx   |8 -
 vcl/unx/generic/app/i18n_status.cxx   |4 
 vcl/workben/svpclient.cxx |8 -
 30 files changed, 239 insertions(+), 290 deletions(-)

New commits:
commit f0996e0435aa918d7814c4db9a70e2cac2ee5eab
Author: Noel Grandin 
Date:   Tue Jan 6 10:29:11 2015 +0200

vcl: rename VclReference to VclPtr

and remove the typedefs. The code is more obvious this way.

Change-Id: I4c8f5b5ab050dd96216302a03e760ed0e3ab3464

diff --git a/compilerplugins/clang/vclwidgets.cxx 
b/compilerplugins/clang/vclwidgets.cxx
index e7de68e..faffbad 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -72,7 +72,7 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl * fieldDecl) {
 
 report(
 DiagnosticsEngine::Warning,
-"vcl::Window subclass allocated as a class member, should be allocated 
via VclReference.",
+"vcl::Window subclass allocated as a class member, should be allocated 
via VclPtr.",
 fieldDecl->getLocation())
   << fieldDecl->getSourceRange();
 return true;
diff --git a/extensions/source/propctrlr/standardcontrol.cxx 
b/extensions/source/propctrlr/standardcontrol.cxx
index d0ca9e7..071ea12 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1031,7 +1031,7 @@ namespace pcr
 {
 SetCompoundControl( true );
 
-m_pImplEdit = MultiLineEditRef( new MultiLineEdit( this, WB_TABSTOP | 
WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) ) );
+m_pImplEdit = VclPtr( new MultiLineEdit( this, 
WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) ) );
 SetSubEdit( m_pImplEdit.get() );
 m_pImplEdit->Show();
 
@@ -1066,7 +1066,7 @@ namespace pcr
 boost::scoped_ptr aTemp(m_pFloatingEdit);
 m_pFloatingEdit = NULL;
 }
-SetSubEdit(EditRef());
+SetSubEdit(VclPtr());
 {
 boost::scoped_ptr aTemp(m_pDropdownButton);
 m_pDropdownButton = NULL;
diff --git a/extensions/source/propctrlr/standardcontrol.hxx 
b/extensions/source/propctrlr/standardcontrol.hxx
index 6fae7db..31a5aa2 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -375,7 +375,7 @@ namespace pcr
 {
 private:
 OMultilineFloatingEdit* m_pFloatingEdit;
-VclReference m_pImplEdit;
+VclPtr   m_pImplEdit;
 PushButton* m_pDropdownButton;
 MultiLineOperationMode  m_nOperationMode;
 boolm_bDropdown : 1;
diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx
index 726980f..0c322f2 100644
--- a/include/svtools/svmedit.hxx
+++ b/include/svtools/svmedit.hxx
@@ -35,7 +35,6 @@ public:
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XWindowPeer >
 GetComponentInterface(bool bCreate = true) SAL_OVERRIDE;
 };
-typedef VclReference MultiLineEditRef;
 
 
 #endif // INCLUDED_SVTOOLS_SVMEDIT_HXX
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 65c586d..bbea9d7 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 4 commits - framework/source sc/source vcl/source

2015-01-06 Thread Eike Rathke

 framework/source/fwe/classes/addonsoptions.cxx |   44 ++---
 sc/source/core/data/compressedarray.cxx|4 +-
 sc/source/core/data/table5.cxx |2 -
 vcl/source/filter/jpeg/jpegc.cxx   |2 -
 4 files changed, 29 insertions(+), 23 deletions(-)

New commits:
commit b29b9c4861e1008171b59aa4caed9cfdf3d0094e
Author: Eike Rathke 
Date:   Tue Jan 6 13:00:59 2015 +0100

move nScanLineBufferComponents to where it is used [-Werror=clobbered]

gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)

vcl/source/filter/jpeg/jpegc.cxx: In function âvoid ReadJPEG(JPEGReader*, 
void*, long int*, const Size&)â:
vcl/source/filter/jpeg/jpegc.cxx:72:10: error: variable 
ânScanLineBufferComponentsâ might be clobbered by âlongjmpâ or 
âvforkâ [-Werror=clobbered]
 longnScanLineBufferComponents = 0;
  ^

Change-Id: I90a0d02977c49d2471069788a02fb1c7d28c039a
(cherry picked from commit 09a5910c96a822c6e7fc4b82d89c00c22e905eba)
Reviewed-on: https://gerrit.libreoffice.org/13766
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 04aa3a2..411b17b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -69,7 +69,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 longnAlignedWidth;
 JSAMPLE*aRangeLimit;
 boost::scoped_array pScanLineBuffer;
-longnScanLineBufferComponents = 0;
 
 if ( setjmp( jerr.setjmp_buffer ) )
 {
@@ -150,6 +149,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
 aRangeLimit = cinfo.sample_range_limit;
 
+long nScanLineBufferComponents = 0;
 if ( cinfo.out_color_space == JCS_CMYK )
 {
 nScanLineBufferComponents = cinfo.output_width * 4;
commit e6d3d22684d6644dad04aa3f747d6fd1030966be
Author: Eike Rathke 
Date:   Mon Jan 5 22:28:34 2015 +0100

workaround a weird gcc optimization werror bug

gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)

framework/source/fwe/classes/addonsoptions.cxx: In member function âvoid 
framework::AddonsOptions_Impl::ReadAndAssociateImages(const rtl::OUString&, 
const rtl::OUString&)â:
framework/source/fwe/classes/addonsoptions.cxx:267:16: error: array 
subscript is above array bounds [-Werror=array-bounds]
 struct ImageEntry
^

The combination of aScaled[2]; aImage[2]; aURL[2] in sequence apparently 
lead
to some overoptimization and/or alignment problem, already declaring 
aImage[3]
helped (but not aScaled[3]), but that's not what we want.

Change-Id: I82e28d4887ab8072a17d0a9341d322c1cf61aedc
(cherry picked from commit 549b7fad48bb9ddcba7dfa92daea6ce917853a03)
Reviewed-on: https://gerrit.libreoffice.org/13764
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/framework/source/fwe/classes/addonsoptions.cxx 
b/framework/source/fwe/classes/addonsoptions.cxx
index 5ec0e61..067dde4 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -260,19 +260,24 @@ class AddonsOptions_Impl : public ConfigItem
 private:
 enum ImageSize
 {
-IMGSIZE_SMALL,
+IMGSIZE_SMALL = 0,
 IMGSIZE_BIG
 };
 
+struct OneImageEntry
+{
+ImageaScaled;   ///< cached scaled image
+ImageaImage;///< original un-scaled image
+OUString aURL;  ///< URL in case it is not loaded yet
+};
+
 struct ImageEntry
 {
 // if the image is set, it was embedded in some way,
 // otherwise we use the associated URL to load on demand
 
 // accessed in this order
-ImageaScaled[2];   // cached scaled images
-ImageaImage[2];// original un-scaled images
-OUString aURL[2]; // URLs in case they are not loaded yet
+OneImageEntry aSizeEntry[2];
 ImageEntry() {}
 void addImage(ImageSize eSize, const Image &rImage, const OUString 
&rURL);
 };
@@ -355,8 +360,8 @@ void AddonsOptions_Impl::ImageEntry::addImage(ImageSize 
eSize,
   const Image &rImage,
   const OUString &rURL)
 {
-aImage[(int)eSize] = rImage;
-aURL[(int)eSize] = rURL;
+aSizeEntry[(int)eSize].aImage = rImage;
+aSizeEntry[(int)eSize].aURL = rURL;
 }
 
 //  constructor
@@ -589,35 +594,36 @@ Image AddonsOptions_Impl::GetImageFromURL( const 
OUString& aURL, bool bBig, bool
 ImageManager::iterator pIter = m_

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 11 commits - connectivity/source cui/uiconfig download.lst external/libmwaw filter/source framework/source sc/inc sc/source svx/uiconfig vcl/

2015-01-06 Thread David Tardon

 connectivity/source/drivers/file/FResultSet.cxx   |1 
 cui/uiconfig/ui/movemenu.ui   |2 
 download.lst  |9 
 external/libmwaw/ExternalPackage_libmwaw.mk   |2 
 filter/source/xslt/import/uof/uof2odf_presentation.xsl|4 
 framework/source/fwe/classes/addonsoptions.cxx|   44 
++--
 sc/inc/formulacell.hxx|4 
 sc/inc/tokenarray.hxx |3 
 sc/source/core/data/formulacell.cxx   |9 
 sc/source/core/tool/token.cxx |   27 ++
 svx/uiconfig/ui/floatingcontour.ui|3 
 vcl/opengl/gdiimpl.cxx|5 
 vcl/source/filter/jpeg/jpegc.cxx  |2 
 vcl/workben/vcldemo.cxx   |1 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py|2 
 writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx  |  109 
++
 writerperfect/qa/unit/data/writer/libe-book/pass/Broad_Band_eBook.lrf |binary
 writerperfect/source/writer/EBookImportFilter.cxx |5 
 18 files changed, 201 insertions(+), 31 deletions(-)

New commits:
commit ce72753e64cc29590d5cb813577ec2b7803f18d3
Author: David Tardon 
Date:   Sun Jan 4 21:51:29 2015 +0100

upload libmwaw 0.3.4

Change-Id: I0208d53522da4d3d32c4060b6d784d62a64bf0eb
(cherry picked from commit 32c3167be34546bd437ad0f1cacc50a61ef753f7)
Reviewed-on: https://gerrit.libreoffice.org/13748
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/download.lst b/download.lst
index f2bd8d2..cb087d1 100644
--- a/download.lst
+++ b/download.lst
@@ -102,8 +102,9 @@ export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-
 export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := 19b879c2a27251db6fb274d6c585d488
-export MWAW_TARBALL := libmwaw-0.3.3.tar.bz2
+export MWAW_MD5SUM := edb8a92a4b6746efbd45bde5006f71b9
+export MWAW_VERSION_MICRO := 4
+export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk 
b/external/libmwaw/ExternalPackage_libmwaw.mk
index 3b3bcb6..97a6e6d 100644
--- a/external/libmwaw/ExternalPackage_libmwaw.mk
+++ b/external/libmwaw/ExternalPackage_libmwaw.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.3))
+$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.$(MWAW_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx 
b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx
new file mode 100644
index 000..f89c7118
--- /dev/null
+++ b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx
@@ -0,0 +1,109 @@
+(This file must be converted with BinHex 4.0)
+:#R4PFh404&!a,M!!C%4[Bf43FQm"%!cJjC0N4'pM4$,rr`!2!!!"D!&
+S!*!%$VJ,32qerkB2,3ZDB`)&+!2m!3&S!@J!N!31Z!Y!!!%&!!"N!!%
+"!!)"*`m!!3#3$K!!N!N3!2qerkB2,3ZD!!J!N!iC!3!#!(J!5%J!N!J
+"!3!#!*"Y!3!'!!B!!3!"!!B!"J!"!!%,!J#3#!%PT8X!MMaj!8ZP5`#
+rQAN"*D9,!)imH3&,T8X![jPj#`#3"5'&#J!R,em"5k9,!F"I[`%PT8X!MMa
+j!8ZP5`#rQAN,!*!&)B8+!#F[A`&,T8X"`&qr!5@P5`#12(N"5k9,!,qCH3!
+!!*!!5+J!!!"8&J!!!1i!!!###J!!!43!N!S$PB3!N!9
+4rkJ"!8!L!*!'2l`!##%!N!3(3!DY@V9UeDXreT2T2T2T2`!
++)!-"2rJ!N!Brj9@3"J!-)3%"2q)N5*%L4)Nrr$MMMJ!")!-
+"3"c-N!A02m)!&#%!N!3"2mki8HZ&(VK!%+U3"DX",#%!N!3(!!%
+"!!%"!!)#!!)"!!3%!!3"!!B'!!B"!!J
+)!!J"!!S+!!S"!!N*!*!9!3!E#3#3&3%!%J!!!")!N"8
+"!$B5!*!9!3")#3N*!*!0!3")#3N*#3!
+!!!N!N!8"!!%!$!3!N!8%!!)!$!-!N!8"!!-!"JB!N!8"!!3!$!!
+!!!8!N!8"!!8!"38!N!8"!!B!!`-&!!d*&3!!!$!!!-!
+'"3#3(2rr!*$4!3#3"`X!N!X,rj!%!*!-!5

Re: Severe performance degradation on Linux

2015-01-06 Thread Michael Meeks

On Tue, 2015-01-06 at 15:20 +0100, Maarten Hoes wrote:
> Well I tried this, and it produced a file of a whopping 383087 lines
> and 30 MB.

That is expected.

>  I wouldnt expect any sane person to look through all of that in its
> entirety on a page by page basis. 
> ;)

Hit page-down in 'less' - and when you see the time-stamp 'jump' (ie.
we missed 20 seconds ;-) on the left - then that's the interesting bit.

> Are the large amounts of 'futex(FUTEX_WAIT_PRIVATE) /
> futex(FUTEX_WAKE_PRIVATE)' expected behavior in this case ?

Yes - quite expected - and yes we take locks and release them just for
fun all over the place: then again, we shouldn't take contended locks a
lot so should avoid the syscall there mostly which is in itself odd -
but I doubt that that is related to your problem.

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Re: Severe performance degradation on Linux

2015-01-06 Thread Maarten Hoes

Hi,

On Tue, Jan 6, 2015 at 1:28 PM, Michael Meeks 
wrote:
>
> As Tor suggested doing an strace on each end would show what's up:
>
> strace -f -ttt -s 256 -o /tmp/slog slow_proces
>
> And poke in the /tmp/slog for where there is a multi-second jump
in the
> time - and paste a dozen lines or so around that in each direction =)
>

Well I tried this, and it produced a file of a whopping 383087 lines and 30
MB. I wouldnt expect any sane person to look through all of that in its
entirety on a page by page basis.
;)

I guess that means I cant figure out what's going on. Which leaves me with
one last question:

Are the large amounts of 'futex(FUTEX_WAIT_PRIVATE) /
futex(FUTEX_WAKE_PRIVATE)' expected behavior in this case ? I dont know
enough about it to make the call, but it seems to me that inefficient
locking may lead to performance issues. Also, futex() is as far as I can
tell, a penguin-ism and not available on Mac which may account for the
difference ?

Just my 2$, please feel free to correct my incorrect assumptions.
;)

Anyway, thanks for all the help.

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

Re: [libo-marketing-priv] Announcing Pebble Smartwatch Application for LibreOffice Impress

2015-01-06 Thread Gülşah Köse

Thanks a lot Michael :)

I'll commit the project in today and follow your suggestion. This is
exciting for me :)

All the best

-- 
*Gülşah Köse*
*about.me *
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Severe performance degradation on Linux

2015-01-06 Thread Michael Meeks

On Tue, 2015-01-06 at 12:31 +0100, Maarten Hoes wrote:
> Im not sure. When I change the accept to include 'tcpNoDelay=1' as
> below:

In the past - the Linux desktop as a whole suffered something rather
similar when code tried to do a reverse lookup on the hostname which
took significant time - 20s to timeout each time.

IIRC we used to do this inside the "is our profile already in-use by
another libreoffice process" code - which killed us perf-wise long ago.
IIRC we binned that idea and updated the mechanism for that.

As Tor suggested doing an strace on each end would show what's up:

strace -f -ttt -s 256 -o /tmp/slog slow_proces

And poke in the /tmp/slog for where there is a multi-second jump in the
time - and paste a dozen lines or so around that in each direction =)

HTH,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Re: [libo-marketing-priv] Announcing Pebble Smartwatch Application for LibreOffice Impress

2015-01-06 Thread Michael Meeks


On Tue, 2015-01-06 at 12:06 +, Michael Meeks wrote:
>   Great - so you should be able to clone:
> 
>   ssh://gulsahkose@logerrit/core.git

Urgh; and of course I got the wrong URL try this:


git clone ssh://gulsahkose@logerrit/impress_remote.git

>   I'd add a 'pebble' directory alongside ios, android and firefoxos -

Where you will find the other remotes =)

Thanks,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Re: [libo-marketing-priv] Announcing Pebble Smartwatch Application for LibreOffice Impress

2015-01-06 Thread Michael Meeks

Hi Gulsah,

> MPLv2 licence is ok for me. I changed the license of the project.-->
> https://github.com/COMU/pebble-remote/blob/master/LICENCE

Wonderful.
 
Great - so you should be able to clone:

ssh://gulsahkose@logerrit/core.git

And check your code into there; just a few suggestions there:

I'd add a 'pebble' directory alongside ios, android and firefoxos -
inside that I'd have a 'libpebble' directory and pop your code in the
top-level =) - if you can re-arrange it like that ?

> I added i18n and l10n support project recently. Italian and Turkish
> languages have been added.

Great; hopefully cloph can help get pootle sorted out.

Looking forward to seeing where you go next,

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Re: Severe performance degradation on Linux

2015-01-06 Thread Maarten Hoes

Hi,


Im not sure. When I change the accept to include 'tcpNoDelay=1' as below:

p =
subprocess.Popen("/home/buildslave/source/libo-core/instdir/program/soffice
--accept=\"socket,host=localhost,port=2002,tcpNoDelay=1;urp;StarOffice.ServiceManager\"
--headless", shell=True, env=myenv)

I get no noticeable difference.


- Maarten.



On Tue, Jan 6, 2015 at 12:01 PM, Noel Grandin  wrote:

>
> Just a guess, but I would suspect that setting the TCP_NODELAY socket
> option on both ends of the socket would speed things up considerably.
>
> I think that some BSD-based operating systems have a loopback shortcut in
> their networking code, which would explain some of the speed difference
> between Linux and OSX.
>
> Disclaimer: http://www.peralex.com/disclaimer.html
>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Severe performance degradation on Linux

2015-01-06 Thread Maarten Hoes

Hi,


On Mon, Jan 5, 2015 at 10:47 PM, Michael Stahl  wrote:
>
> On 05.01.2015 18:36, Maarten Hoes wrote:
> >
> > For what its worth, i can easily reproduce the script takes fairly long
> > (about ~50 seconds on my vm's) to complete on both Ubuntu 14.04 and
> > Fedora 21, both with the distro supplied binaries and a recent master.
> >
> > I ran the script using strace -f. It shows a lot of calls on futex(
> > 'FUTEX_WAIT_PRIVATE'), though im not sure how relevant that may be. I
> > attached the strace output.
>
> please try that again and use strace options -T -r so it's easier to see
> where the time is spent.
>
Done. Unfortunately, the resulting file (even compressed) is too large as
an attachment for this mailing list. Instead, I uploaded it here :

http://filebin.ca/1nCIQSm4AW6n/strace-f-T-r.log.txt.gz

Please tell me if that proves to be problematic; im open for other
suggestions.


>
> this problem is probably not CPU bound,
>
This is correct. My hosts CPU is barely doing anything during the run of
the script


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

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #22 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=a48d8465c3f9f36a02fb3c6a79f5dbb5851174f7

fdo#84938: convert SELENG_ #defines to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #23 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=abe670157b69aa7fe4b478f1fd13757d7b7fcc4b

fdo#84938: convert CTRL_STATE_ #defines to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #17 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=dc28e90d200a839d4017d548217ee5ce8a23f848

fdo#84938: convert IMPORT_ constants to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #21 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=64cccf36f26f6398906a0cc6fc48e76defbe057d

fdo#84938: convert SEF_EXPORT_ #defines to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #15 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=bae855e667993ea6cddd551452c6e2fa60bdc2f3

fdo#84938: replace BUTTONTYPE_ constants with 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #16 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=d1ce6effb62745e9f9c85badd44a1be0aa4a1d8f

fdo#84938: convert TEXT_PROP_MAP #defines to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #20 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8447eeb192acf7e3255f7fdf92977470b28a18f9

fdo#84938: convert ERROR_ #defines to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #18 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=ec5bf66d366cd42774a87465e1187271f48a4ab1

fdo#84938: convert XML_EXPORT_FLAG_ to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=84938

--- Comment #19 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=c29657e0d6bb707345584ac7a7f5ae5016f37297

fdo#84938: convert EXPORT_ #defines to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 39468] translate German comments, removing redundant ones

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=39468

--- Comment #161 from Commit Notification 
 ---
Chris Sherlock committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b45157ab20c9b158a1ef8f4f364d7a46d9c276b

vcl: fdo#39468 - translated ImplSVData comments (esp. around timer)

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 50430, which changed state.

Bug 50430 Summary: FILEOPEN: Can't Open .uop file
https://bugs.freedesktop.org/show_bug.cgi?id=50430

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-01-06 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 41169, which changed state.

Bug 41169 Summary: All hotkeys are language dependent, don't work in non-Latin 
keyboard layout
https://bugs.freedesktop.org/show_bug.cgi?id=41169

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

75 matches

Mail list logo