date:20140416

LibreOffice Gerrit News for core on 2014-04-16

2014-04-16 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
  about module filter
+ fdo#77476:FILE_SAVE : 'TIF' is changed to 'TIFF' in RT
  in https://gerrit.libreoffice.org/9010 from Ravindra Vidhate
  about module oox, sw
+ fdo77216-Charts-Scattered chart: Chart gets distorted on RT
  in https://gerrit.libreoffice.org/9011 from Sourav Mahajan
  about module chart2, oox
+ ftnfrm: Translated comments from German to English
  in https://gerrit.libreoffice.org/8948 from Tobias Mueller
  about module sw
 End of freshness 

+ fdo#77451 Detect AOO 4.x for SvXMLImport::needFixPositionAfterZ
  in https://gerrit.libreoffice.org/9012 from Laurent BP
  about module xmloff
+ Fix a memory leak
  in https://gerrit.libreoffice.org/9016 from Takeshi Abe
  about module framework
+ fdo#76934 : FILESAVE: DOCX: Title is not preserved after Roundtrip
  in https://gerrit.libreoffice.org/8847 from Pallavi Jadhav
  about module sw, writerfilter


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

+ Rename ImplGetGradientColorValue
  in https://gerrit.libreoffice.org/8994 from Chris Sherlock
+ Change acessibility level for private functions
  in https://gerrit.libreoffice.org/8993 from Chris Sherlock
+ Reorganize locations of functions in gradient.cxx
  in https://gerrit.libreoffice.org/8992 from Chris Sherlock
+ Move hatch functions to own source file.
  in https://gerrit.libreoffice.org/8991 from Chris Sherlock
+ Fix typo
  in https://gerrit.libreoffice.org/8990 from Chris Sherlock
+ Move OutputDevice polygon funcs to vcl/source/gdi/outdev/polygon.cxx
  in https://gerrit.libreoffice.org/8989 from Chris Sherlock
+ Move OutputDevice gradient funcs to vcl/source/gdi/outdev/gradient.cxx
  in https://gerrit.libreoffice.org/8988 from Chris Sherlock
+ Rearrange position of gradient functions in outdev4.cxx
  in https://gerrit.libreoffice.org/8987 from Chris Sherlock
+ Move OutputDevice source files to vcl/source/gdi/outdev
  in https://gerrit.libreoffice.org/8986 from Chris Sherlock
+ Split outdev5.cxx and outdev6.cxx
  in https://gerrit.libreoffice.org/9004 from Chris Sherlock
+ Split outdev3.cxx
  in https://gerrit.libreoffice.org/9003 from Chris Sherlock
+ Split outdev2.cxx
  in https://gerrit.libreoffice.org/9002 from Chris Sherlock
+ Move lines and rectangles to seperate source files
  in https://gerrit.libreoffice.org/9001 from Chris Sherlock
+ Move line functions into line.cxx and polyline.cxx
  in https://gerrit.libreoffice.org/9000 from Chris Sherlock
+ Remove unnecessary headers from polygon.cxx
  in https://gerrit.libreoffice.org/8999 from Chris Sherlock
+ Remove unnecessary includes from hatch.cxx
  in https://gerrit.libreoffice.org/8998 from Chris Sherlock
+ Remove unnecessary includes from gradient.cxx
  in https://gerrit.libreoffice.org/8997 from Chris Sherlock
+ Move bezier functions into own source file bezier.cxx
  in https://gerrit.libreoffice.org/8996 from Chris Sherlock
+ Don't forget to add polygon as an object in the makefile!
  in https://gerrit.libreoffice.org/8995 from Chris Sherlock
+ Line spacing is not preserved for styles.
  in https://gerrit.libreoffice.org/8902 from Priyanka Gaikwad


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

None

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

+ fdo#43157 : Remove OSL_THIS_FILE
  in https://gerrit.libreoffice.org/8886 from Michaël Lefèvre
+ fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF
  in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre
+ new method INetURLObject::getData() for data urls
  in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#67544 Slide transistion sound(other sound) is not included in present
  in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
  in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored
  in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal
+ fdo#75757 Remove inheritance to std::map from PropertyMap
  in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
  in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
  in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
  in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
  in https://gerrit.libreoffice.org/8098 from Umesh Kadam
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
  in

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

2014-04-16 Thread Tor Lillqvist

 configure.ac  |8 ++--
 dbaccess/source/core/dataaccess/commanddefinition.cxx |7 +++
 dbaccess/source/core/dataaccess/databasedocument.cxx  |7 ++-
 dbaccess/source/core/dataaccess/datasource.cxx|7 ++-
 dbaccess/source/core/inc/services.hxx |   16 ++--
 dbaccess/source/filter/xml/dbloader2.cxx  |5 +
 dbaccess/source/ui/browser/unodatbr.cxx   |   12 ++--
 7 files changed, 38 insertions(+), 24 deletions(-)

New commits:
commit 77be5e9064134fa0b559537433d57b6c0c646fa5
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 09:56:08 2014 +0300

Update experimental hacks for using Clang from the NDK

Change-Id: Id8fd8ca3c53fe97caa00a2d1c80b73387a4be2bc

diff --git a/configure.ac b/configure.ac
index cbc7199..05a2931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,9 @@ AC_ARG_WITH(android-ndk-toolchain-version,
 AS_HELP_STRING([--with-android-ndk-toolchain-version],
 [Specify which toolchain version to use, of those present in the
 Android NDK you are using. Mandatory if the NDK used has several
-toolchain versions for the host architecture you are building for.]), 
,)
+toolchain versions for the host architecture you are building for.
+Possible values are 4.6, 4.8, clang3.3 and clang3.4. Only 4.8 has been
+tested for real...]), ,)
 
 AC_ARG_WITH(android-sdk,
 AS_HELP_STRING([--with-android-sdk],
@@ -268,12 +270,14 @@ if test -n $with_android_ndk; then
 
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
 ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
 ;;
-clang3.1|clang3.2)
+clang3.3|clang3.4)
 AC_MSG_WARN([Building with the Clang tool-chain is known to break in 
the bridges module, fix that please])
 
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6
 
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
 ANDROID_USING_CLANG=true
 ;;
+*)
+AC_MSG_ERROR([Unrecognized value for the 
--with-android-ndk-toolchain-version option])
 esac
 
 if test ! -d $ANDROID_BINUTILS_DIR; then
commit e616c346d433dffd52fd483d8cfb3c4e5ec4169e
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 09:51:47 2014 +0300

WaE: Unreferenced function definition [loplugin:unreffun]

Work around a slight confusion in the Clang plugin when used with Clang
3.2. Put these 'extern C' function definitions consistenly outside
namespaces, as they are declared in the header.

Change-Id: Iccee41dfe0776f382e677b109009a95fb806a12c

diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx 
b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 8efc222..14a527e 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -38,15 +38,14 @@ using namespace ::osl;
 using namespace ::comphelper;
 using namespace ::cppu;
 
-namespace dbaccess
-{
-
 // OCommandDefinition
 extern C void SAL_CALL createRegistryInfo_OCommandDefinition()
 {
-static ::dba::OAutoRegistration OCommandDefinition  aAutoRegistration;
+static ::dba::OAutoRegistration ::dbaccess::OCommandDefinition  
aAutoRegistration;
 }
 
+namespace dbaccess
+{
 
 void OCommandDefinition::registerProperties()
 {
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 9270176..6a181bb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -146,13 +146,18 @@ bool ViewMonitor::onSetCurrentController( const 
Reference XController  _rxCon
 return bLoadFinished;
 }
 
+} // namespace dbaccess
+
 // ODatabaseDocument
 
 extern C void SAL_CALL createRegistryInfo_ODatabaseDocument()
 {
-static ::dba::OAutoRegistration ODatabaseDocument  aAutoRegistration;
+static ::dba::OAutoRegistration ::dbaccess::ODatabaseDocument  
aAutoRegistration;
 }
 
+namespace dbaccess
+{
+
 ODatabaseDocument::ODatabaseDocument(const 
::rtl::ReferenceODatabaseModelImpl _pImpl )
 :ModelDependentComponent( _pImpl )
 ,ODatabaseDocument_OfficeDocument( getMutex() )
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index 3d65363..c1b5ba5 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -475,13 +475,18 @@ namespace
 };
 }
 
+} // namespace dbaccess
+
 // ODatabaseContext
 
 extern C void SAL_CALL createRegistryInfo_ODatabaseSource()
 {
-static ::dba::OAutoRegistration ODatabaseSource  aAutoRegistration;
+static ::dba::OAutoRegistration

Re: 'test-bugzilla-files.py' dependencies

2014-04-16 Thread John Smith

Hi,

Thanks for those url's.

I downloaded the sources 'officeotron-source-0.7.0.zip' and
'odftoolkit-0.6-incubating-src.zip', but am a bit unsure about how to
compile and run the programs.

I unzipped both files.

For officeotron, I can run 'ant' in the top level source directory,
which gets me './dist/officeotron-0.7.0.jar'. Can I simply copy that
to another directory, like for example '/home/buildslave/source/bin/',
and then proceed to run it from there with 'java -jar foo.jar' ?

For odftoolkit, I can run 'mvn install' in the top level source
directory, which gets me
'./odfdom/target/odfdom-java-0.8.9-incubating.jar'. Same question:
just copy the jar to another directory and run it with java -jar
foo.jar ?



Thanks,



Regards,




John Smith


On Wed, Apr 16, 2014 at 7:10 AM, Markus Mohrhard
markus.mohrh...@googlemail.com wrote:

 https://code.google.com/p/officeotron/

 http://incubator.apache.org/odftoolkit/conformance/ODFValidator.html

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

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

2014-04-16 Thread Zolnai Tamás

 slideshow/source/engine/animationnodes/animationcommandnode.cxx |2 
 slideshow/source/engine/animationnodes/animationcommandnode.hxx |5 
 slideshow/source/engine/shapes/appletshape.cxx  |   26 +
 slideshow/source/engine/shapes/externalshapebase.cxx|   43 ++-
 slideshow/source/engine/shapes/externalshapebase.hxx|  139 
++
 slideshow/source/engine/shapes/mediashape.cxx   |   27 +
 slideshow/source/inc/externalshapebase.hxx  |  131 
-
 slideshow/source/inc/iexternalmediashapebase.hxx|   86 ++
 8 files changed, 298 insertions(+), 161 deletions(-)

New commits:
commit cae4370bce63e161fc5ecceb70f74ca50d64ed93
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Apr 16 09:28:51 2014 +0200

Rename ExternalMediaShape to IExternalMediaShapeBase

I because of interface.
Base because it's an interface of a base class
and because it's easy to mix it up with the inherited MediaShape.
(MediaShape also an externally rendered thing so
the name ExternalMediaShape doesn't make any
difference between the two classes)

Change-Id: I4a03dd090034092942eea39d35894ce6cfc9947b

diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index c7cbf09..be7b2b7 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -49,7 +49,7 @@ AnimationCommandNode::AnimationCommandNode( 
uno::Referenceanimations::XAnimatio
 uno::Reference drawing::XShape  xShape( mxCommandNode-getTarget(),
   uno::UNO_QUERY );
 ShapeSharedPtr pShape( 
getContext().mpSubsettableShapeManager-lookupShape( xShape ) );
-mpShape = ::boost::dynamic_pointer_cast ExternalMediaShape ( pShape );
+mpShape = ::boost::dynamic_pointer_cast IExternalMediaShapeBase ( pShape 
);
 }
 
 void AnimationCommandNode::dispose()
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index 3ce5f23..f9e61fd 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SLIDESHOW_ANIMATIONCOMMANDNODE_HXX
 
 #include basecontainernode.hxx
-#include externalmediashape.hxx
+#include iexternalmediashapebase.hxx
 #include soundplayer.hxx
 #include com/sun/star/animations/XCommand.hpp
 
@@ -49,7 +49,7 @@ private:
 virtual bool hasPendingAnimation() const SAL_OVERRIDE;
 
 private:
-ExternalMediaShapeSharedPtr mpShape;
+IExternalMediaShapeBaseSharedPtr mpShape;
 ::com::sun::star::uno::Reference
 ::com::sun::star::animations::XCommand  mxCommandNode;
 };
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx 
b/slideshow/source/engine/shapes/externalshapebase.hxx
index 4de1360..1f240aa 100644
--- a/slideshow/source/engine/shapes/externalshapebase.hxx
+++ b/slideshow/source/engine/shapes/externalshapebase.hxx
@@ -22,7 +22,7 @@
 
 #include vector
 
-#include externalmediashape.hxx
+#include iexternalmediashapebase.hxx
 #include unoview.hxx
 #include subsettableshapemanager.hxx
 #include slideshowexceptions.hxx
@@ -44,7 +44,7 @@ namespace slideshow
 (including mutual overdraw). It therefore reports yes for
 the isBackgroundDetached() question.
  */
-class ExternalShapeBase : public ExternalMediaShape
+class ExternalShapeBase : public IExternalMediaShapeBase
 {
 public:
 /** Create a shape for the given XShape for an external shape
diff --git a/slideshow/source/inc/externalmediashape.hxx 
b/slideshow/source/inc/iexternalmediashapebase.hxx
similarity index 88%
rename from slideshow/source/inc/externalmediashape.hxx
rename to slideshow/source/inc/iexternalmediashapebase.hxx
index c55d0ba..134a4df 100644
--- a/slideshow/source/inc/externalmediashape.hxx
+++ b/slideshow/source/inc/iexternalmediashapebase.hxx
@@ -29,12 +29,13 @@ namespace slideshow
 {
 namespace internal
 {
-/** Represents a shape containing media (video, sound).
+/** Represents a shape containing playable content rendered by
+external engine (e.g. media or applet).
 
 This interface adds media handling methods to a shape. It
 allows starting/stopping and pausing playback.
- */
-class ExternalMediaShape : public Shape
+*/
+class IExternalMediaShapeBase : public Shape
 {
 public:
 // Animation methods
@@ -51,7 +52,7 @@ namespace slideshow
 
 This method leaves playback mode on all registered
 views. The media is then rewound to the start, and
-removed from screen (for

Re: 'test-bugzilla-files.py' dependencies

2014-04-16 Thread John Smith

On Wed, Apr 16, 2014 at 9:30 AM, John Smith lbalba...@gmail.com wrote:

 For odftoolkit, I can run 'mvn install' in the top level source
 directory, which gets me
 './odfdom/target/odfdom-java-0.8.9-incubating.jar'. Same question:
 just copy the jar to another directory and run it with java -jar
 foo.jar ?

Oops, I mean 
'./validator/target/odfvalidator-1.1.6-incubating-jar-with-dependencies.jar',
of course.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-04-16 Thread Tamas Zolnai

On Tuesday, April 15, 2014 23:15 BST, Thorsten Behrens 
t...@documentfoundation.org wrote: 
 
 Zolnai Tamás wrote:
  --- a/slideshow/source/engine/shapes/appletshape.cxx
  +++ b/slideshow/source/engine/shapes/appletshape.cxx
  @@ -96,11 +96,11 @@ namespace slideshow
   virtual bool implRender( const ::basegfx::B2DRange 
  rCurrBounds ) const SAL_OVERRIDE;
   virtual void implViewChanged( const UnoViewSharedPtr rView ) 
  SAL_OVERRIDE;
   virtual void implViewsChanged() SAL_OVERRIDE;
  -virtual bool implStartIntrinsicAnimation() SAL_OVERRIDE;
  -virtual bool implEndIntrinsicAnimation() SAL_OVERRIDE;
  -virtual bool implPauseIntrinsicAnimation() SAL_OVERRIDE;
  -virtual bool implIsIntrinsicAnimationPlaying() const 
  SAL_OVERRIDE;
  -virtual void implSetIntrinsicAnimationTime(double) 
  SAL_OVERRIDE;
  +virtual void play() SAL_OVERRIDE;
  +virtual void stop() SAL_OVERRIDE;
  +virtual void pause() SAL_OVERRIDE;
  +virtual bool isPlaying() const SAL_OVERRIDE;
  +virtual void setMediaTime(double) SAL_OVERRIDE;
   
 There's some point in having all those methods go through the base
 class first - you have exactly one central place to check invariants,
 log stuff, stick breakpoints in etc. It is now also needlessly
 deviating from implViewsChanged() and others. C.f. NVI pattern.
 
  commit 2a594eb22bfed62fdbcef51a56c2c180bea0283f
  Author: Zolnai Tam??s tamas.zol...@collabora.com
  Date:   Mon Apr 14 16:23:06 2014 +0200
  
  Slideshow: Remove unneded ExternalMediaShape
  
  ExternalShapeBase is the base class of MediaShape and
  AppletShape so it's nonsense that ExternalMediaShape
  to be the base of ExternalShapeBase.
  Actually this class does nothing, anyway.
  
 Well - it *did* provide a minimal interface for media shapes to
 calling code. What client code now sees is ExternalShapeBase, that
 drags in a chunk of private member definitions, irrelevant e.g. to the
 code in AnimationCommandNode. Maybe naming it IExternalMediaShape
 would have made my intention clearer. ;)
 
 If this is about the extra vtable - there's SAL_NO_VTABLE.
 
 Zolnai Tamás wrote:
  commit 50b60c5508b3ba5a0b8dc05eac511d7edaa5a343
  Author: Zolnai Tam??s tamas.zol...@collabora.com
  Date:   Tue Apr 15 22:23:42 2014 +0200
  
  Slideshow: these methods override public methods
  
  So make them public too.
  
 That is true, but for leaf classes that are supposed to be used via
 polymorphic pointers to their base, it is still idiomatic to have
 overridden virtuals to be private. In this case, there's really no
 danger in anyone using this implementation class - it is defined and
 visible only in this one cxx file.
 
 Cheers,
 
 -- Thorsten
 

Hi Thorsten,


Thanks for the information, it seems I need some to learn. :)
I reverted these changes and just rename ExternalMediaShape which was confusing 
for me.


Regards,
Tamás

 
 

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

[Libreoffice-commits] core.git: 2 commits - svgio/CppunitTest_svgio.mk svgio/Module_svgio.mk svgio/qa svgio/source

2014-04-16 Thread Tomaž Vajngerl

 svgio/CppunitTest_svgio.mk |   68 +
 svgio/Module_svgio.mk  |4 +
 svgio/qa/cppunit/SvgImportTest.cxx |   99 +
 svgio/qa/cppunit/data/Rect.svg |4 +
 svgio/qa/cppunit/data/RectWithParentStyles.svg |   13 +++
 svgio/qa/cppunit/data/RectWithStyles.svg   |4 +
 svgio/source/svgreader/svgstyleattributes.cxx  |   16 +---
 svgio/source/svgreader/svgsvgnode.cxx  |3 
 8 files changed, 201 insertions(+), 10 deletions(-)

New commits:
commit 8c571e5f82a6d6e36bd47c7d2ab202f2f9b7cf86
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Apr 16 09:51:27 2014 +0200

svgio: introduce svg import tests

Change-Id: Id69f659a9e4b0332970e75b1d0a7d820c8b2c998

diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk
new file mode 100644
index 000..7fe8370
--- /dev/null
+++ b/svgio/CppunitTest_svgio.mk
@@ -0,0 +1,68 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,svgio_import_test))
+
+$(eval $(call gb_CppunitTest_set_include,svgio_import_test,\
+$$(INCLUDE) \
+-I$(SRCDIR)/svgio/inc \
+))
+
+$(eval $(call gb_CppunitTest_use_external,svgio_import_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,svgio_import_test,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_library_objects,svgio_import_test,\
+svgio \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,svgio_import_test,\
+basegfx \
+drawinglayer \
+cppu \
+cppuhelper \
+comphelper \
+sal \
+sax \
+svt \
+test \
+unotest \
+tl \
+vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,svgio_import_test,\
+svgio/qa/cppunit/SvgImportTest \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,svgio_import_test))
+
+$(eval $(call gb_CppunitTest_use_components,svgio_import_test,\
+configmgr/source/configmgr \
+dtrans/util/mcnttype \
+framework/util/fwk \
+i18npool/util/i18npool \
+package/source/xstor/xstor \
+package/util/package2 \
+toolkit/util/tk \
+sfx2/util/sfx \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unotools/util/utl \
+svgio/svgio \
+sax/source/expatwrap/expwrap \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,svgio_import_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svgio/Module_svgio.mk b/svgio/Module_svgio.mk
index 8b827fc..29ef97d 100644
--- a/svgio/Module_svgio.mk
+++ b/svgio/Module_svgio.mk
@@ -22,4 +22,8 @@ $(eval $(call gb_Module_add_targets,svgio,\
 Library_svgio \
 ))
 
+$(eval $(call gb_Module_add_check_targets,svgio,\
+CppunitTest_svgio \
+))
+
 # vim: set noet ts=4 sw=4:
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
new file mode 100644
index 000..4b42afd
--- /dev/null
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -0,0 +1,99 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include sal/config.h
+#include test/bootstrapfixture.hxx
+#include comphelper/processfactory.hxx
+#include comphelper/seqstream.hxx
+
+#include com/sun/star/graphic/SvgTools.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/graphic/SvgTools.hpp
+#include com/sun/star/graphic/Primitive2DTools.hpp
+#include com/sun/star/graphic/XPrimitive2D.hpp
+
+#include boost/scoped_array.hpp
+
+namespace
+{
+
+using namespace css::uno;
+using namespace css::io;
+using namespace css::graphic;
+
+class Test : public test::BootstrapFixture
+{
+ReferenceXComponentContext mxContext;
+
+void testStyles();
+
+Primitive2DSequence parseSvg(const char* aSource);
+
+public:
+virtual void setUp() SAL_OVERRIDE;
+virtual void tearDown() SAL_OVERRIDE;
+
+CPPUNIT_TEST_SUITE(Test);
+CPPUNIT_TEST(testStyles);
+CPPUNIT_TEST_SUITE_END();
+};
+
+Primitive2DSequence Test::parseSvg(const char* aSource)
+{
+const ReferenceXSvgParser xSvgParser = SvgTools::create(mxContext);
+
+OUString aUrl  = getURLFromSrc(aSource);
+OUString aPath = getPathFromSrc(aSource);
+
+SvFileStream aFileStream(aUrl, STREAM_READ);
+sal_Size nSize = aFileStream.remainingSize();
+boost::scoped_arraysal_Int8 pBuffer(new sal_Int8[nSize + 1]);
+aFileStream.Read(pBuffer.get(), nSize);
+pBuffer[nSize] = 0;
+
+

Re: 'test-bugzilla-files.py' dependencies

2014-04-16 Thread Markus Mohrhard

On Apr 16, 2014 9:35 AM, John Smith lbalba...@gmail.com wrote:

 On Wed, Apr 16, 2014 at 9:30 AM, John Smith lbalba...@gmail.com wrote:
 
  For odftoolkit, I can run 'mvn install' in the top level source
  directory, which gets me
  './odfdom/target/odfdom-java-0.8.9-incubating.jar'. Same question:
  just copy the jar to another directory and run it with java -jar
  foo.jar ?
 
 Oops, I mean
'./validator/target/odfvalidator-1.1.6-incubating-jar-with-dependencies.jar',
 of course.

That is the correct one. Just rename it for the script. For officeotron you
can't use the war file. There is a build option to build the command line
version. Please check The build script.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source

2014-04-16 Thread Steve Yin

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

New commits:
commit bcd42eb4039ce1bc1f5d9fa005036fd4fe59e2c6
Author: Steve Yin stev...@apache.org
Date:   Wed Apr 16 07:48:58 2014 +

Issue 124661 - crash when loading and re-saving attached ppt file with a 
single customshape

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 3df2193..328bbfd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2558,7 +2558,7 @@ void ConvertEnhancedCustomShapeEquation( 
SdrObjCustomShape* pCustoShape,
 if ( pAny )
 *pAny = sEquationSource;
 sal_Int32 nEquationSourceCount = sEquationSource.getLength();
-if ( nEquationSourceCount )
+if ( nEquationSourceCount  (nEquationSourceCount = 128) )
 {
 sal_Int32 i;
 for ( i = 0; i  nEquationSourceCount; i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Tomaž Vajngerl

 svgio/qa/cppunit/SvgImportTest.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7789041708238cbad23cd065ff29d75b2ce15208
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Apr 16 10:08:17 2014 +0200

svgio: compilation error - ambiguous parameter int / sal_Int32

Change-Id: I10b247bce555d244d21d031bdaefb0f60d9ed0ca

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 4b42afd..be74939 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -78,13 +78,13 @@ void Test::tearDown()
 void Test::testStyles()
 {
 Primitive2DSequence maSequenceRect = 
parseSvg(/svgio/qa/cppunit/data/Rect.svg);
-CPPUNIT_ASSERT_EQUAL(1, maSequenceRect.getLength());
+CPPUNIT_ASSERT_EQUAL(1, (int) maSequenceRect.getLength());
 
 Primitive2DSequence maSequenceRectWithStyle = 
parseSvg(/svgio/qa/cppunit/data/RectWithStyles.svg);
-CPPUNIT_ASSERT_EQUAL(1, maSequenceRectWithStyle.getLength());
+CPPUNIT_ASSERT_EQUAL(1, (int) maSequenceRectWithStyle.getLength());
 
 Primitive2DSequence maSequenceRectWithParentStyle = 
parseSvg(/svgio/qa/cppunit/data/RectWithParentStyles.svg);
-CPPUNIT_ASSERT_EQUAL(1, maSequenceRectWithParentStyle.getLength());
+CPPUNIT_ASSERT_EQUAL(1, (int) maSequenceRectWithParentStyle.getLength());
 
 // TODO: Test if the 3 sequences are equal..
 //const Primitive2DReference xReference(maSequenceRect[0]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 'test-bugzilla-files.py' dependencies

2014-04-16 Thread John Smith

On Wed, Apr 16, 2014 at 10:03 AM, Markus Mohrhard
markus.mohrh...@googlemail.com wrote:

 On Apr 16, 2014 9:35 AM, John Smith lbalba...@gmail.com wrote:

 On Wed, Apr 16, 2014 at 9:30 AM, John Smith lbalba...@gmail.com wrote:
 
  For odftoolkit, I can run 'mvn install' in the top level source
  directory, which gets me
  './odfdom/target/odfdom-java-0.8.9-incubating.jar'. Same question:
  just copy the jar to another directory and run it with java -jar
  foo.jar ?
 
 Oops, I mean
 './validator/target/odfvalidator-1.1.6-incubating-jar-with-dependencies.jar',
 of course.

 That is the correct one. Just rename it for the script. For officeotron you
 can't use the war file. There is a build option to build the command line
 version. Please check The build script.

Thanks. I assume you mean the build.xml file ? Ive looked through
that, but managed to find nothing that's obviously supposed to be a
build option. Anyway, after 'ant' in the top level source dir I get
both 'dist/officeotron-0.7.0.war' and 'dist/officeotron-0.7.0.jar'. I
assume I can just copy the jar file and leave the war alone ?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-04-16 Thread Thorsten Behrens

 slideshow/source/inc/iexternalmediashapebase.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4be3e38439672e6b3f42617a050494b16535afea
Author: Thorsten Behrens t...@documentfoundation.org
Date:   Wed Apr 16 10:35:58 2014 +0200

Adjust header guard to modified filename.

Change-Id: Ia1d5133186ec46fa566e751b2168c2a1b2b1b762

diff --git a/slideshow/source/inc/iexternalmediashapebase.hxx 
b/slideshow/source/inc/iexternalmediashapebase.hxx
index 134a4df..bbfb501 100644
--- a/slideshow/source/inc/iexternalmediashapebase.hxx
+++ b/slideshow/source/inc/iexternalmediashapebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SLIDESHOW_EXTERNALMEDIASHAPE_HXX
-#define INCLUDED_SLIDESHOW_EXTERNALMEDIASHAPE_HXX
+#ifndef INCLUDED_SLIDESHOW_IEXTERNALMEDIASHAPEBASE_HXX
+#define INCLUDED_SLIDESHOW_IEXTERNALMEDIASHAPEBASE_HXX
 
 #include boost/shared_ptr.hpp
 
@@ -81,6 +81,6 @@ namespace slideshow
 }
 }
 
-#endif /* INCLUDED_SLIDESHOW_EXTERNALMEDIASHAPE_HXX */
+#endif /* INCLUDED_SLIDESHOW_IEXTERNALMEDIASHAPEBASE_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Thorsten Behrens

Tamas Zolnai wrote:
 I reverted these changes and just rename ExternalMediaShape which
 was confusing for me.
 
Cool then - thx! :)

-- Thorsten


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

Fwd: [Bug 1087931] [abrt] libreoffice-core: KDE4FilePicker::execute - QTransform::type: soffice.bin killed by SIGABRT

2014-04-16 Thread Stephan Bergmann


Jan-Marek, all,

Any details on the reason for the revert, and whether it could be the 
cause for the newly seen crash?


Stephan

On 04/15/2014 06:12 PM, bugzi...@redhat.com wrote:

https://bugzilla.redhat.com/show_bug.cgi?id=1087931

Stephan Bergmann sberg...@redhat.com changed:

What|Removed |Added

 Summary|[abrt] libreoffice-core:|[abrt] libreoffice-core:
|os::die()(): soffice.bin|KDE4FilePicker::execute -
|killed by SIGABRT   |QTransform::type:
||soffice.bin killed by
||SIGABRT



--- Comment #12 from Stephan Bergmann sberg...@redhat.com ---
The backtrace in attachment 886519 indicates this is a duplicate of bug 977068,
which was fixed for libreoffice-4.1.3.2-7.fc19 via upstream
http://cgit.freedesktop.org/libreoffice/core/commit/?id=13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb
Rewrite Qt4 based nested yield mutex locking.

But part of that got later reverted (and is reverted in
libreoffice-core-4.2.3.2-3.fc20) via upstream
http://cgit.freedesktop.org/libreoffice/core/commit/?id=daf011870efae282244c0298494820d9a0c6d3bc
Revert 'Rewrite Qt4 based nested yield mutex locking,' but unfortunately
without any rationale.

So it looks somewhat plausible that this got broken again (if it ever was
actually truly fixed) with that revert.

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

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

2014-04-16 Thread Tushar Bende

 sw/qa/extras/ooxmlimport/data/test_extra_image.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|8 
 writerfilter/source/dmapper/NumberingManager.cxx|   10 ++
 3 files changed, 18 insertions(+)

New commits:
commit cebb4abec105c2576b065853eb48af9be1d9fde6
Author: Tushar Bende tushar.be...@synerzip.com
Date:   Fri Apr 11 22:47:33 2014 +0530

fdo#74652 : Extra image gets added to the document body after RT.

Description: There was a problem for some documents, that when opened in 
LibreOffice
extra image was getting added to the first page of the doc and same could 
be noticed
even in RoundTripped doc.

The root cause was if picture bullet is added to the doc and there is no 
w:lvlPicBulletId tag
in w:lvl of w:abstractNum then removal of extra added graphic object 
from document body was
getting missed because currently that is handled in 
ListsManager::lcl_sprm() inside case NS_ooxml::LN_CT_Lvl_lvlPicBulletId.

Checking if there is any remaining item in m_aNumPicBullets when LO hits 
the ListsManager destructor.
If there is any calling dispose() for all of them.

Change-Id: Ibfc3c93b68ff7d6ef0909fe789dda6db67ac11e2
Reviewed-on: https://gerrit.libreoffice.org/8940
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/ooxmlimport/data/test_extra_image.docx 
b/sw/qa/extras/ooxmlimport/data/test_extra_image.docx
new file mode 100644
index 000..cdb05af
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/test_extra_image.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8961eed..6e3388b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2011,6 +2011,14 @@ DECLARE_OOXMLIMPORT_TEST(testFdo38414, fdo38414.docx )
 CPPUNIT_ASSERT_EQUAL( height3, height4 );
 }
 
+DECLARE_OOXMLIMPORT_TEST(test_extra_image, test_extra_image.docx )
+{
+// fdo#74652 Check there is no shape added to the doc during import
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xDraws-getCount());
+}
+
 DECLARE_OOXMLIMPORT_TEST(testFdo74401, fdo74401.docx)
 {
 uno::Referencedrawing::XShapes xGroupShape(getShape(1), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index da88e52..17e359e 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -710,6 +710,16 @@ ListsManager::ListsManager(DomainMapper rDMapper,
 
 ListsManager::~ListsManager( )
 {
+uno::Referencedrawing::XShape xShape;
+for (std::vectorNumPicBullet::Pointer::iterator it = 
m_aNumPicBullets.begin(); it != m_aNumPicBullets.end(); ++it)
+{
+xShape = (*it)-GetShape();
+if (xShape.is())
+{
+uno::Referencelang::XComponent xShapeComponent(xShape, 
uno::UNO_QUERY);
+xShapeComponent-dispose();
+}
+}
 }
 
 void ListsManager::lcl_attribute( Id nName, Value rVal )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Tomaž Vajngerl

 svgio/qa/cppunit/SvgImportTest.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 8ec26e211af44a6c8ef1e322c4e3b2d774a9f546
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Apr 16 10:45:09 2014 +0200

svgio test: no need to create our own ComponentContext

Change-Id: If8e90c949223a0f11c6b8c6a8ac1cd08ce95a74b

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index be74939..23fcf90 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -29,8 +29,6 @@ using namespace css::graphic;
 
 class Test : public test::BootstrapFixture
 {
-ReferenceXComponentContext mxContext;
-
 void testStyles();
 
 Primitive2DSequence parseSvg(const char* aSource);
@@ -46,7 +44,7 @@ public:
 
 Primitive2DSequence Test::parseSvg(const char* aSource)
 {
-const ReferenceXSvgParser xSvgParser = SvgTools::create(mxContext);
+const ReferenceXSvgParser xSvgParser = SvgTools::create(m_xContext);
 
 OUString aUrl  = getURLFromSrc(aSource);
 OUString aPath = getPathFromSrc(aSource);
@@ -66,8 +64,6 @@ Primitive2DSequence Test::parseSvg(const char* aSource)
 void Test::setUp()
 {
 BootstrapFixture::setUp();
-
-mxContext = 
ReferenceXComponentContext(comphelper::getProcessComponentContext());
 }
 
 void Test::tearDown()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Tor Lillqvist

 sw/source/core/view/viewsh.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1f5d29e3ec97302508da07bbb7ffab5e70bd24d0
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 11:51:58 2014 +0300

Need vcl/sysdata.hxx for SystemGraphicsData, used in touch_lo_draw_tile()

Change-Id: I70c2dafea2f86f8f2df2da6e939748facf7165e5

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index a9aef73..12f134c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -55,6 +55,7 @@
 #include svtools/colorcfg.hxx
 #include vcl/bmpacc.hxx
 #include vcl/alpha.hxx
+#include vcl/sysdata.hxx
 #include svtools/accessibilityoptions.hxx
 #include accessibilityoptions.hxx
 #include statstr.hrc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Faisal M . Al-Otaibi

 svx/source/tbxctrls/tbunosearchcontrollers.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 251fd06de2c7bd2e46fd257d848acbebb93e1fab
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Wed Apr 16 11:55:04 2014 +0300

fdo#77123: Add Ignore Kashida to quick find

if the CTL enabled the ignore kashida option will work
when you use the quick find toolbar.

Change-Id: I6dd9d4b3fa96c0d1c47a044e813c4062b8678ea2

diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 6df2de7..2309224 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -110,6 +110,7 @@ void impl_executeSearch( const css::uno::Reference 
css::uno::XComponentContext
 sal_Int32 nFlags = 0;
 nFlags |= (!aMatchCase ? 
static_castint(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0);
 nFlags |= (aCTLOptions.IsCTLFontEnabled() ? 
com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 );
+nFlags |= (aCTLOptions.IsCTLFontEnabled() ? 
com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL:0 );
 lArgs[3].Value = nFlags;
 lArgs[4].Name = OUString(SEARCHITEM_COMMAND);
 lArgs[4].Value = (sal_Int16)(aFindAll ?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Tor Lillqvist

 sw/source/core/view/viewsh.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2f316b07a502b527876462d524061dbf6c9a04d5
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 12:06:38 2014 +0300

Avoid risk of unused header removal

Change-Id: I4cf2bec8fdcb03b4012de50ed0ce03a8e5154d82

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 12f134c..af543fd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include config_features.h
+
 #include touch/touch.h
 
 #include com/sun/star/accessibility/XAccessible.hpp
@@ -55,7 +57,6 @@
 #include svtools/colorcfg.hxx
 #include vcl/bmpacc.hxx
 #include vcl/alpha.hxx
-#include vcl/sysdata.hxx
 #include svtools/accessibilityoptions.hxx
 #include accessibilityoptions.hxx
 #include statstr.hrc
@@ -72,6 +73,10 @@
 #include vcl/svapp.hxx
 #include svx/sdrpaintwindow.hxx
 
+#if !HAVE_FEATURE_DESKTOP
+#include vcl/sysdata.hxx
+#endif
+
 sal_Bool SwViewShell::mbLstAct = sal_False;
 ShellResource *SwViewShell::mpShellRes = 0;
 Window *SwViewShell::mpCareWindow = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

(not) getting a backtrace with WinDbg

2014-04-16 Thread Winfried Donkers

Hi,

I'm trying to get a useful backtrace for a 'hang' problem with Writer and using 
Visio for embedded objects.
However, in WinDbg '!analyze -v' produces no proper backtrace and reports 
'Symbol file could not be found' (see attachment).

The Symbol file path has been filled explained as in 
https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg .

But when I try to visit http://dev-downloads.libreoffice.org/symstore/symbols I 
get a 403-error.

I can visit http://dev-downloads.libreoffice.org/symstore but not further.



Am I overlooking something?


Winfried



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

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

2014-04-16 Thread Tomaž Vajngerl

 svgio/source/svgreader/svgstyleattributes.cxx |   16 +++-
 svgio/source/svgreader/svgsvgnode.cxx |3 ++-
 2 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 8d15b2c3dbad718782d3923ece0eb6816beafab0
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Apr 16 09:40:29 2014 +0200

fdo#74743 avoid infinite loop when gathering svg element styles

Change-Id: Ifcfd0c64302b9174510e3d774607f5ca60173885
Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index ecddfbf..0fae736 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -205,17 +205,15 @@ namespace svgio
 
 const SvgStyleAttributes* SvgStyleAttributes::getParentStyle() const
 {
-if(getCssStyleParent())
-{
-return getCssStyleParent();
-}
+const SvgStyleAttributes* pParentStyle = getCssStyleParent();
 
-if(mrOwner.getParent())
-{
-return mrOwner.getParent()-getSvgStyleAttributes();
-}
+// no parent style set, check parent for its style attributes
+if(pParentStyle == NULL  mrOwner.getParent() != NULL)
+   pParentStyle = mrOwner.getParent()-getSvgStyleAttributes();
 
-return 0;
+if (pParentStyle != this) // to prevent infinite loop
+return pParentStyle;
+return NULL;
 }
 
 void SvgStyleAttributes::add_text(
diff --git a/svgio/source/svgreader/svgsvgnode.cxx 
b/svgio/source/svgreader/svgsvgnode.cxx
index 8e107c6..cde5387 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -60,7 +60,8 @@ namespace svgio
 
 const SvgStyleAttributes* SvgSvgNode::getSvgStyleAttributes() const
 {
-return checkForCssStyle(OUString(svg), maSvgStyleAttributes);
+checkForCssStyle(OUString(svg), maSvgStyleAttributes);
+return maSvgStyleAttributes.getCssStyleParent();
 }
 
 void SvgSvgNode::parseAttribute(const OUString rTokenName, SVGToken 
aSVGToken, const OUString aContent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: (not) getting a backtrace with WinDbg

2014-04-16 Thread Christian Lohmaier

Hi Winfried, *,

On Wed, Apr 16, 2014 at 11:15 AM, Winfried Donkers
w.donk...@dci-electronics.nl wrote:

 However, in WinDbg '!analyze -v' produces no proper backtrace and reports
 'Symbol file could not be found' (see attachment).

soffice.bin doesn't find symbols, because the file is renamed during build.

 The Symbol file path has been filled explained as in
 https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg .

 But when I try to visit
 http://dev-downloads.libreoffice.org/symstore/symbols I get a 403-error.

It is not meant to be browsable. That is expected.

 Am I overlooking something?

You don't state what version of LO you're trying with, you don't state
version of Windows, etc, whether it worked for you before, ..

dev-downloads only has symbols for the officially published builds,
not for dailies.

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

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

2014-04-16 Thread Tor Lillqvist

 configure.ac|   38 
 external/icu/ExternalProject_icu.mk |3 +-
 2 files changed, 24 insertions(+), 17 deletions(-)

New commits:
commit 253ffdf2b0c22247e6208e0881838b1896c63116
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 13:00:25 2014 +0300

Pass -flto as part of CC and CXX when building external libs for Android

Using -flto and Clang still doesn't work, though, build stops already in
fontconfig. The linker claims the expat library doesn't have an archive 
symbol
table. Go figure, oh well, won't bother trying any more for now.

Change-Id: Icbd65269e958665704104322e66a5b3a78fac75e

diff --git a/configure.ac b/configure.ac
index 44d432e..eaa46b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,6 +391,12 @@ if test -n $with_android_ndk; then
 ;;
 esac
 
+if test $ENABLE_LTO = TRUE; then
+# -flto comes from com_GCC_degs.mk, too, but we need to make sure it 
gets passed as part of
+# $CC and $CXX when building external libraries
+ANDROIDCFLAGS=$ANDROIDCFLAGS -flto
+fi
+
 # gdbserver can be in different locations
 if test -f 
$ANDROID_NDK_HOME/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver; 
then
 
ANDROID_NDK_GDBSERVER=$ANDROID_NDK_HOME/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver
commit 3ac1663a60926ab2f3fbbd1219455e37d5a83b45
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 12:02:10 2014 +0300

No use to build tools or extras when cross-compiling

Also, for some reason building the endian check thing fails when trying to 
use
Clang for Android, so just hardcode it.

Change-Id: I04fb7ba4f88a1dc6a4e743b39e7c0cd19d7e3598

diff --git a/external/icu/ExternalProject_icu.mk 
b/external/icu/ExternalProject_icu.mk
index 4450260..8f1104e 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -77,8 +77,9 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
./configure \
--disable-layout --disable-samples \
+   $(if $(CROSS_COMPILING),--disable-tools 
--disable-extras) \
$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
-   $(if $(filter ANDROID,$(OS)),--disable-strict) \
+   $(if $(filter ANDROID,$(OS)),--disable-strict 
ac_cv_c_bigendian=no) \
$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
--enable-static --disable-shared,\
commit 9eb25b0fb9606b7740ba92697fbd5acf34dd9154
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 12:01:51 2014 +0300

Probably not a good idea to use gold with LTO

Change-Id: I72559ebabecad288f4c56bb9ff1eddbb498a2d35

diff --git a/configure.ac b/configure.ac
index bc4206a..44d432e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,6 +208,19 @@ if test -z $SED; then
 AC_MSG_ERROR([install sed to run this script])
 fi
 
+# Set the ENABLE_LTO variable
+# ===
+AC_MSG_CHECKING([whether to use link-time optimization])
+if test -n $enable_lto -a $enable_lto != no; then
+ENABLE_LTO=TRUE
+AC_MSG_RESULT([yes])
+AC_DEFINE(STATIC_LINKING)
+else
+ENABLE_LTO=
+AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_LTO)
+
 dnl ===
 dnl When building for Android, --with-android-ndk,
 dnl --with-android-ndk-toolchain-version and --with-android-sdk are
@@ -372,7 +385,7 @@ if test -n $with_android_ndk; then
 case $with_android_ndk_toolchain_version in
 4.[[6789]]*|[[56789]].*|clang*)
 # The NDK doesn't have ld.gold for MIPS for some reason
-if test $host_cpu != mips; then
+if test $host_cpu != mips -a $ENABLE_LTO != TRUE; then
 ANDROIDCFLAGS=$ANDROIDCFLAGS -fuse-ld=gold
 fi
 ;;
@@ -2536,19 +2549,6 @@ if test $COMPATH = .; then
 fi
 COMPATH=`echo $COMPATH | $SED s@/[[Bb]][[Ii]][[Nn]]\\\$@@`
 
-# Set the ENABLE_LTO variable
-# ===
-AC_MSG_CHECKING([whether to use link-time optimization])
-if test -n $enable_lto -a $enable_lto != no; then
-ENABLE_LTO=TRUE
-AC_MSG_RESULT([yes])
-AC_DEFINE(STATIC_LINKING)
-else
-ENABLE_LTO=
-AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_LTO)
-
 dnl ===
 dnl Java support
 dnl ===
commit c32f6050bd41e4b404002593d1e95558f8db4a35
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 11:48:34 2014 +0300

Use the 4.8 gcc toolchain in conjunction with Clang for Android

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-04-16 Thread bugzilla-daemon

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

Bug 60270 depends on bug 71423, which changed state.

Bug 71423 Summary: Impress frequently crashes when editing tables in slides
https://bugs.freedesktop.org/show_bug.cgi?id=71423

   What|Removed |Added

 Status|NEEDINFO|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

RE: (not) getting a backtrace with WinDbg

2014-04-16 Thread Winfried Donkers

Hi Christian,

You don't state what version of LO you're trying with, you don't state version 
of Windows, etc., whether it worked for you before, ..
version 4.2.3.3, Windows 7 professional, it never worked before. I followed the 
steps in the wiki ( 
https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg ).

dev-downloads only has symbols for the officially published builds, not for 
dailies.
As I understand from the wiki, any version from 4.2.0rc1 or later will do.
And the symbols path to http://dev-downloads.libreoffice.org/symstore/symbols 
is for official builds (says the wiki).
So I hope you understand that I don't understand ;-)

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

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

2014-04-16 Thread Caolán McNamara

 sw/inc/PostItMgr.hxx  |3 +
 sw/inc/SidebarWin.hxx |2 
 sw/inc/printdata.hxx  |1 
 sw/source/core/layout/paintfrm.cxx|2 
 sw/source/core/uibase/docvw/PostItMgr.cxx |   16 ++
 sw/source/core/uibase/docvw/SidebarTxtControl.cxx |   40 
 sw/source/core/uibase/docvw/SidebarTxtControl.hxx |2 
 sw/source/core/uibase/docvw/SidebarWin.cxx|   55 ++
 sw/source/core/uibase/inc/optpage.hxx |1 
 sw/source/core/view/printdata.cxx |7 +-
 sw/source/core/view/vprint.cxx|   49 ++-
 sw/source/ui/config/optdlg.src|1 
 sw/source/ui/config/optpage.cxx   |6 ++
 sw/uiconfig/swriter/ui/printoptionspage.ui|   23 -
 14 files changed, 200 insertions(+), 8 deletions(-)

New commits:
commit eb1c0480050a1328287c4a85468afbec50b0e29d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 15 09:42:32 2014 +0100

Resolves: fdo#36815 enable printing WYSIWYG sidewindow comments

in order for that to happen the document has to be scaled down
so that the comments outside the border of the sheet of paper
can be brought inside the printable area

Change-Id: Ifafb8eec10a4ea3ea001409772603e61e5a4

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 3043215..4f99419 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -33,6 +33,7 @@
 #include SidebarWindowsTypes.hxx
 #include svl/lstner.hxx
 
+class OutputDevice;
 class SwWrtShell;
 class SwDoc;
 class SwView;
@@ -279,6 +280,8 @@ class SwPostItMgr: public SfxListener
 const sal_Int32 nIndex );
 void GetAllSidebarWinForFrm( const SwFrm rFrm,
  std::vector Window* * pChildren );
+
+void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
 };
 
 #endif
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 630ef16..8ab89a5 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -176,6 +176,8 @@ class SwSidebarWin : public Window
 void ChangeSidebarItem( SwSidebarItem rSidebarItem );
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::accessibility::XAccessible  CreateAccessible() SAL_OVERRIDE;
 
+virtual voidDraw(OutputDevice* pDev, const Point, const Size, 
sal_uLong) SAL_OVERRIDE;
+
 protected:
 virtual voidDataChanged( const DataChangedEvent aEvent) 
SAL_OVERRIDE;
 virtual voidLoseFocus() SAL_OVERRIDE;
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 4ff41e2..748c694 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -292,6 +292,7 @@ public:
 #define POSTITS_ONLY1
 #define POSTITS_ENDDOC  2
 #define POSTITS_ENDPAGE 3
+#define POSTITS_INMARGINS 4
 
 namespace sw {
 
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index eb3133a..a5cbf3b 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6172,7 +6172,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, 
const Point aPoint, con
 SwAlignRect( aPageRect, _pViewShell );
 
 const SwPostItMgr *pMgr = _pViewShell-GetPostItMgr();
-if (pMgr  pMgr-ShowNotes()  pMgr-HasNotes())  // do not show 
anything in print preview
+if (pMgr /* pMgr-ShowNotes()*/  pMgr-HasNotes())  // do not show 
anything in print preview
 {
 sal_Int32 nScrollerHeight = pMgr-GetSidebarScrollerHeight();
 const Rectangle aVisRect = _pViewShell-VisArea().SVRect();
diff --git a/sw/source/core/uibase/docvw/PostItMgr.cxx 
b/sw/source/core/uibase/docvw/PostItMgr.cxx
index 4193ad6..e63ce8b 100644
--- a/sw/source/core/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/core/uibase/docvw/PostItMgr.cxx
@@ -823,6 +823,22 @@ bool SwPostItMgr::BorderOverPageBorder(unsigned long 
aPage) const
 return false;
 }
 
+void SwPostItMgr::DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage)
+{
+assert(nPage  mPages.size());
+if (nPage = mPages.size())
+return;
+for(SwSidebarItem_iterator i = mPages[nPage]-mList-begin(); i != 
mPages[nPage]-mList-end(); ++i)
+{
+SwSidebarWin* pPostIt = (*i)-pPostIt;
+if (!pPostIt)
+continue;
+Point aPoint(mpEditWin-PixelToLogic(pPostIt-GetPosPixel()));
+Size aSize(pPostIt-PixelToLogic(pPostIt-GetSizePixel()));
+pPostIt-Draw(pOutDev, aPoint, aSize, 0);
+}
+}
+
 void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage)
 {
 OSL_ENSURE((lScroll % GetScrollSize() )==0,SwPostItMgr::Scroll: scrolling 
by wrong value);
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.cxx 
b/sw/source/core/uibase/docvw/SidebarTxtControl.cxx
index 421bd0a..4e84a0b 100644
---

Re: OutputDevice code reorganization

2014-04-16 Thread Chris Sherlock

Hi Kohei,

I have a good deal of respect for your opinion, I've tried my best to keep
the commit history :-)

Thanks all for the responses!

Chris


On Wed, Apr 16, 2014 at 9:08 AM, Kohei Yoshida
kohei.yosh...@collabora.comwrote:

 On Tue, 2014-04-15 at 18:56 -0400, Kohei Yoshida wrote:
  On Wed, 2014-04-16 at 00:22 +0200, Thorsten Behrens wrote:
   Kohei Yoshida wrote:
My only request is that the move be done in such a way that git knows
the files have been moved (in a single commit), rather than the old
files removed and new one added.
   
   That is, for all intents and purposes, not going to work here, when
   methods are mixed and matched differently.
 
  Oh, I thought he was just relocating the methods.  Maybe I
  mis-understood what he's doing.

 FWIW, from my own experience, I've done a fair amount of large scale
 reorganization in the past, and even if methods are mixed and matched
 differently, with careful commit strategy you can stil maintain lineage
 of commit history.  So, I wouldn't dismiss it right from the start.

 Anyway, ultimately it's all up to Chris since (as Norbert said) he's the
 one making this all happen.  Mine was nothing more than just a humble
 request.


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

[Libreoffice-commits] core.git: 25 commits - chart2/source embeddedobj/source framework/source include/filter include/sfx2 include/svx include/vcl sc/source sd/source sfx2/source svx/source sw/inc sw/

2014-04-16 Thread Caolán McNamara

 chart2/source/view/main/3DChartObjects.cxx  |7 ---
 embeddedobj/source/inc/commonembobj.hxx |2 --
 framework/source/uielement/menubarmanager.cxx   |1 +
 include/filter/msfilter/escherex.hxx|7 +++
 include/sfx2/mnumgr.hxx |1 -
 include/svx/svdpntv.hxx |1 -
 include/vcl/print.hxx   |2 --
 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx  |7 ---
 sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx |8 +---
 sd/source/core/CustomAnimationEffect.cxx|   21 -
 sfx2/source/appl/workwin.cxx|2 ++
 sfx2/source/dialog/titledockwin.cxx |1 +
 svx/source/dialog/svxbmpnumvalueset.cxx |1 +
 svx/source/svdraw/svdmodel.cxx  |3 +++
 svx/source/tbxctrls/colrctrl.cxx|4 ++--
 svx/source/toolbars/extrusionbar.cxx|2 +-
 sw/inc/dbmgr.hxx|4 ++--
 sw/source/core/doc/number.cxx   |8 
 sw/source/core/uibase/app/docshini.cxx  |9 ++---
 sw/source/core/uibase/dbui/dbmgr.cxx|   16 +---
 sw/source/filter/xml/xmlexp.cxx |1 +
 tools/source/inet/inetmsg.cxx   |1 +
 vcl/source/filter/graphicfilter.cxx |7 ---
 23 files changed, 66 insertions(+), 50 deletions(-)

New commits:
commit 187a513742725c683555f251350604153c5f9fb4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 15 21:24:37 2014 +0100

coverity#1202981 Non-virtual destructor

Change-Id: Iabf91e6c8e450b72b83de51c6a1fb6986f88b430

diff --git a/include/filter/msfilter/escherex.hxx 
b/include/filter/msfilter/escherex.hxx
index dd2da0c..1b86971 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1107,9 +1107,8 @@ public:
 voidSetBaseURI( const OUString rBaseURI ) { maBaseURI = rBaseURI; 
};
 const OUString GetBaseURI() { return maBaseURI; };
 
-EscherGraphicProvider( sal_uInt32 nFlags = 
_E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
-~EscherGraphicProvider();
-
+EscherGraphicProvider( sal_uInt32 nFlags = 
_E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
+virtual ~EscherGraphicProvider();
 };
 
 struct EscherShapeListEntry;
@@ -1604,7 +1603,7 @@ public:
 /** Returns the graphic provider from the global object that has been
 passed to the constructor.
  */
-inline EscherGraphicProvider GetGraphicProvider() { return *mxGlobal; }
+EscherGraphicProvider GetGraphicProvider() { return *mxGlobal; }
 
 /** Called if a picture shall be written and no picture stream is set at
 class ImplEscherExSdr.
commit 46401db853bea6dbf0ef3495d0a4002eefd13087
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 15 21:22:28 2014 +0100

WaE: -Werror=maybe-uninitialized

Change-Id: Ie0612c60dbb9c12afb98a5923c374cb76c17be1a

diff --git a/svx/source/toolbars/extrusionbar.cxx 
b/svx/source/toolbars/extrusionbar.cxx
index 2ad2b3b..5810e16 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -150,7 +150,7 @@ static void impl_execute( SdrView*, SfxRequest rReq, 
SdrCustomShapeGeometryItem
 
 if( pAny )
 {
-bool bOn;
+bool bOn(false);
 (*pAny) = bOn;
 bOn = !bOn;
 (*pAny) = bOn;
commit 271c634e4fd2445dd61d6bccd75b926cbc71bc65
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 15 21:19:19 2014 +0100

coverity#1202968 Uninitialized scalar field

Change-Id: Ic226202bb1ce429f9dd8e13183ec64ffc9059d05

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
index 6617b0b..a094f2a 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
@@ -23,9 +23,11 @@ extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL 
makeScPivotLayoutTreeListLabel(
 return new ScPivotLayoutTreeListLabel(pParent, WB_BORDER | WB_TABSTOP | 
WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE);
 }
 
-ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(Window* pParent, 
WinBits nBits) :
-ScPivotLayoutTreeListBase(pParent, nBits, LABEL_LIST)
-{}
+ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(Window* pParent, 
WinBits nBits)
+: ScPivotLayoutTreeListBase(pParent, nBits, LABEL_LIST)
+, maDataItem(0)
+{
+}
 
 ScPivotLayoutTreeListLabel::~ScPivotLayoutTreeListLabel()
 {}
commit 9a11fbb6593812ee25a88cc198c6ef0025436c78
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 15 21:12:18 2014 +0100

coverity#1202965 unused member

Change-Id: Iadee347fea0dcdcd3382eaeaebfea71d55975f9c

diff --git a/embeddedobj/source/inc/commonembobj.hxx 
b/embeddedobj/source/inc/commonembobj.hxx
index 542a160..861450f

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

2014-04-16 Thread Thorsten Behrens

 sfx2/source/dialog/templdlg.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4128c63d655869e0ab7befde2c46761d8e1b273f
Author: Thorsten Behrens t...@documentfoundation.org
Date:   Thu Apr 10 19:40:54 2014 +0200

Fix fdo#71423 - crash while editing Impress tables.

Band-aid fix for this nasty crasher, seems sometimes the
family item is not found.

Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06
(cherry picked from commit 058cfa72dcdd91df302be45f7fc59b0d961a420b)
Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ecc4d41..cbd856f 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1245,6 +1245,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
 if(pStyleSheetPool  nActFamily != 0x)
 {
 const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
+if(!pItem)
+return;
 pStyleSheetPool-SetSearchMask(pItem-GetFamily(), 
SFXSTYLEBIT_ALL_VISIBLE);
 StyleTreeArr_Impl aArr;
 SfxStyleSheetBase *pStyle = pStyleSheetPool-First();
@@ -1589,7 +1591,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
  // other filters for automatic
  CheckItem( nActFamily, sal_True );
  const SfxStyleFamilyItem *pStyleItem =  GetFamilyItem_Impl();
- if (  0 == pStyleItem-GetFilterList()[ nActFilter ]-nFlags
+ if ( pStyleItem  0 == pStyleItem-GetFilterList()[ nActFilter 
]-nFlags
  nAppFilter != pItem-GetValue())
  {
  nAppFilter = pItem-GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Stanislav Horacek

 source/text/shared/optionen/01040900.xhp  |4 
 source/text/swriter/01/0604.xhp   |2 +-
 source/text/swriter/guide/words_count.xhp |9 +
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 9ca1d85d439e6f384ce372a8ddc069db89019ecd
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Apr 14 16:48:21 2014 +0200

update word counting

Change-Id: I301b3671d30782acc4fd0a4f8ee6a1baf847e6f1
Reviewed-on: https://gerrit.libreoffice.org/8968
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/optionen/01040900.xhp 
b/source/text/shared/optionen/01040900.xhp
index db31c44..fc98cd7 100644
--- a/source/text/shared/optionen/01040900.xhp
+++ b/source/text/shared/optionen/01040900.xhp
@@ -42,6 +42,7 @@
 bookmark_valueOLE objects; captions (Writer)/bookmark_value
 bookmark_valuetab stops; spacing in text documents/bookmark_value
 bookmark_valuespacing; tab stops in text documents/bookmark_value
+bookmark_valueword counts; separators/bookmark_value
 /bookmark
 bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/optgeneralpage/OptGeneralPage id=bm_id3150443 
localize=false/paragraph role=heading id=hd_id3155892 xml-lang=en-US 
level=1 l10n=U oldref=1link href=text/shared/optionen/01040900.xhp 
name=GeneralGeneral/link/paragraph
 paragraph role=paragraph id=par_id3145382 xml-lang=en-US l10n=U 
oldref=2ahelp 
hid=modules/swriter/ui/optgeneralpage/OptGeneralPageSpecifies general 
settings for text documents./ahelp/paragraph
@@ -146,5 +147,8 @@
 paragraph role=paragraph id=par_id3150419 xml-lang=en-USahelp 
hid=.When this setting is enabled, the measurement units of indents and 
spacing on emphFormat - Paragraph - Indents amp; Spacing/emph tab will be 
character (ch) and line./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/optgeneralpage/squaremode id=bm_id3154739 
localize=false/paragraph role=heading id=hd_id3154945 xml-lang=en-US 
level=3Use square page mode for text grid/paragraph
 paragraph role=paragraph id=par_id3150418 xml-lang=en-USahelp 
hid=.When this setting is enabled, the text grid will look like square 
page./ahelp Square page is a kind of page layout which is used to train 
students to write articles in China and Japan./paragraph
+paragraph role=heading id=hd_id3166976 xml-lang=en-US level=2 
l10n=U oldref=46Word count/paragraph
+paragraph role=heading id=hd_id3166980 xml-lang=en-US 
level=3Additional separators/paragraph
+paragraph role=paragraph id=par_id3166985 xml-lang=en-USSpecifies the 
characters that are considered as word separators when counting words, in 
addition to spaces, tabs and line and paragraph breaks./paragraph
 /body
 /helpdocument
diff --git a/source/text/swriter/01/0604.xhp 
b/source/text/swriter/01/0604.xhp
index d7257e7..621706a 100644
--- a/source/text/swriter/01/0604.xhp
+++ b/source/text/swriter/01/0604.xhp
@@ -31,7 +31,7 @@
 bookmark xml-lang=en-US branch=hid/.uno:WordCountDialog id=bm_id1483504 
localize=false/
 section id=wordcount
  paragraph xml-lang=en-US id=par_idN10542 role=heading 
level=1 l10n=NEWlink href=text/swriter/01/0604.xhpWord 
Count/link/paragraph
- paragraph xml-lang=en-US id=par_idN10552 role=paragraph 
l10n=NEWahelp hid=FN_WORDCOUNT_DIALOGCounts the words and characters, 
with or without spaces, in the current selection and in the whole 
document./ahelp/paragraph
+ paragraph xml-lang=en-US id=par_idN10552 role=paragraph 
l10n=NEWahelp hid=FN_WORDCOUNT_DIALOGCounts the words and characters, 
with or without spaces, in the current selection and in the whole document. The 
count is kept up to date as you type or change the 
selection./ahelp/paragraph
  embed href=text/swriter/guide/words_count.xhp#how/
   /section
   section id=howtoget
diff --git a/source/text/swriter/guide/words_count.xhp 
b/source/text/swriter/guide/words_count.xhp
index 6f6413c..8da2393 100644
--- a/source/text/swriter/guide/words_count.xhp
+++ b/source/text/swriter/guide/words_count.xhp
@@ -40,20 +40,21 @@
 /variable/paragraph
   list type=ordered
  listitem
-paragraph xml-lang=en-US id=par_idN105D1 role=listitem 
l10n=NEWWord count is shown in the status bar, and is kept up to date as you 
edit./paragraph
+paragraph xml-lang=en-US id=par_idN105D1 role=listitem 
l10n=NEWWord and character count is shown in the status bar, and is kept up 
to date as you edit./paragraph
  /listitem
  listitem
 paragraph xml-lang=en-US id=par_idN106D1 role=listitem 
l10n=NEWIf you want to count only some text of your document, select the 
text./paragraph
  /listitem
  listitem
-paragraph xml-lang=en-US id=par_id3149821 role=listitem 
l10n=CHG oldref=5To display extended statistics such as character count, 
double click the word count in the status bar, or choose emphTools -

[Libreoffice-commits] core.git: helpcontent2

2014-04-16 Thread Stanislav Horacek

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

New commits:
commit 41ce95873e3efdc588f854822a652c72f50f516c
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Apr 14 16:48:21 2014 +0200

Updated core
Project: help  9ca1d85d439e6f384ce372a8ddc069db89019ecd

update word counting

Change-Id: I301b3671d30782acc4fd0a4f8ee6a1baf847e6f1
Reviewed-on: https://gerrit.libreoffice.org/8968
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index c78bb98..9ca1d85 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c78bb98ac5b6e8c434678c063fa1762a828833d5
+Subproject commit 9ca1d85d439e6f384ce372a8ddc069db89019ecd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Andrzej Hunt

 include/sfx2/thumbnailview.hxx|2 +-
 sfx2/source/control/thumbnailview.cxx |   15 +++
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit ed2d6ab389c169330f3c359463ce503eafcee253
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Tue Apr 15 16:22:53 2014 +0100

fdo#72287 Scroll automatically to show selected item when keyboard used.

806919adf9c9bafbaba92c2d2ab35d2e2f9863f8 added finer-grained scrolling using
the scrollbar / scrollwheel, but inadvertently prevents the display from 
scrolling
when an item is selected that is currently offscreen (e.g. by using the 
down-arrow
button on the keyboard).

Change-Id: Iaa3a7dc6d214741d37cf4ec78c00ed0034ed1e42
(cherry picked from commit 717aa1ac75ddd54fdf72cd4de6551f1fb536da9b)
Reviewed-on: https://gerrit.libreoffice.org/9017
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index e21b87b..851eba0 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -292,7 +292,7 @@ protected:
 using Control::ImplInitSettings;
 using Window::ImplInit;
 
-void CalculateItemPositions ();
+void CalculateItemPositions (bool bScrollBarUsed = false);
 void MakeItemVisible( sal_uInt16 nId );
 
 SFX2_DLLPRIVATE void ImplInit();
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index a4e38a7..814a8d7 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -275,7 +275,7 @@ void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*)
 return new ThumbnailViewAcc( this, mbIsTransientChildrenDisabled );
 }
 
-void ThumbnailView::CalculateItemPositions ()
+void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
 {
 if (!mnItemHeight || !mnItemWidth)
 return;
@@ -300,7 +300,7 @@ void ThumbnailView::CalculateItemPositions ()
 
 // calculate window scroll ratio
 float nScrollRatio;
-if( mpScrBar )
+if( bScrollBarUsed  mpScrBar )
 nScrollRatio = static_castfloat(mpScrBar-GetThumbPos()) /
 static_castfloat(mpScrBar-GetRangeMax()-2);
 else
@@ -356,7 +356,12 @@ void ThumbnailView::CalculateItemPositions ()
 nHiddenLines * nItemHeightOffset;
 
 // draw items
-size_t nFirstItem = nHiddenLines * mnCols;
+// Unless we are scrolling (via scrollbar) we just use the precalculated
+// mnFirstLine -- our nHiddenLines calculation takes into account only
+// what the user has done with the scrollbar but not any changes of 
selection
+// using the keyboard, meaning we could accidentally hide the selected item
+// if we believe the scrollbar (fdo#72287).
+size_t nFirstItem = (bScrollBarUsed ? nHiddenLines : mnFirstLine) * mnCols;
 size_t nLastItem = nFirstItem + (mnVisLines + 1) * mnCols;
 
 maItemListRect.Left() = x;
@@ -438,6 +443,8 @@ void ThumbnailView::CalculateItemPositions ()
 mpScrBar-SetPosSizePixel( aPos, aSize );
 mpScrBar-SetRangeMax( (nCurCount+mnCols-1)*mnFineness/mnCols);
 mpScrBar-SetVisibleSize( mnVisLines );
+if (!bScrollBarUsed)
+mpScrBar-SetThumbPos( (long)mnFirstLine*mnFineness );
 long nPageSize = mnVisLines;
 if ( nPageSize  1 )
 nPageSize = 1;
@@ -520,7 +527,7 @@ IMPL_LINK( ThumbnailView,ImplScrollHdl, ScrollBar*, 
pScrollBar )
 {
 if ( pScrollBar-GetDelta() )
 {
-CalculateItemPositions();
+CalculateItemPositions(true);
 
 if ( IsReallyVisible()  IsUpdateMode() )
 Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Stephan Bergmann

 sd/source/ui/app/optsitem.cxx |  211 +-
 1 file changed, 107 insertions(+), 104 deletions(-)

New commits:
commit 0fcab91da2ea6531289aaf01c8c061249f9d6a50
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 12:37:03 2014 +0200

Counting is hard (thanks to -fsanitize=address for pointing it out)

Change-Id: I665125d61c4bae5cb52b29cfa3af1e3c4b6d4333

diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index a624ac8..f6277e0 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -232,34 +232,36 @@ sal_Bool SdOptionsLayout::operator==( const 
SdOptionsLayout rOpt ) const
 
 void SdOptionsLayout::GetPropNameArray( const char** ppNames, sal_uLong 
rCount ) const
 {
-static const char* aPropNamesMetric[] =
-{
-Display/Ruler,
-Display/Bezier,
-Display/Contour,
-Display/Guide,
-Display/Helpline,
-Other/MeasureUnit/Metric,
-Other/TabStop/Metric
-};
-
-static const char* aPropNamesNonMetric[] =
-{
-Display/Ruler,
-Display/Bezier,
-Display/Contour,
-Display/Guide,
-Display/Helpline,
-Other/MeasureUnit/NonMetric,
-Other/TabStop/NonMetric
-};
-
-rCount = 7;
-
 if( isMetricSystem() )
+{
+static const char* aPropNamesMetric[] =
+{
+Display/Ruler,
+Display/Bezier,
+Display/Contour,
+Display/Guide,
+Display/Helpline,
+Other/MeasureUnit/Metric,
+Other/TabStop/Metric
+};
 ppNames = aPropNamesMetric;
+rCount = SAL_N_ELEMENTS(aPropNamesMetric);
+}
 else
+{
+static const char* aPropNamesNonMetric[] =
+{
+Display/Ruler,
+Display/Bezier,
+Display/Contour,
+Display/Guide,
+Display/Helpline,
+Other/MeasureUnit/NonMetric,
+Other/TabStop/NonMetric
+};
 ppNames = aPropNamesNonMetric;
+rCount = SAL_N_ELEMENTS(aPropNamesNonMetric);
+}
 }
 
 
@@ -402,7 +404,7 @@ void SdOptionsContents::GetPropNameArray( const char** 
ppNames, sal_uLong rCou
 Display/TextPlaceholder
 };
 
-rCount = 4;
+rCount = SAL_N_ELEMENTS(aPropNames);
 ppNames = aPropNames;
 }
 
@@ -580,7 +582,7 @@ void SdOptionsMisc::GetPropNameArray( const char** 
ppNames, sal_uLong rCount )
 Start/EnablePresenterScreen
 };
 
-rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 27 : 14 );
+rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? SAL_N_ELEMENTS(aPropNames) 
: 14 );
 ppNames = aPropNames;
 }
 
@@ -874,7 +876,7 @@ void SdOptionsSnap::GetPropNameArray( const char** 
ppNames, sal_uLong rCount )
 Position/PointReduction
 };
 
-rCount = 10;
+rCount = SAL_N_ELEMENTS(aPropNames);
 ppNames = aPropNames;
 }
 
@@ -1036,7 +1038,7 @@ void SdOptionsZoom::GetPropNameArray( const char** 
ppNames, sal_uLong rCount )
 ScaleY
 };
 
-rCount = ( GetConfigId() == SDCFG_DRAW ) ? 2 : 0;
+rCount = ( GetConfigId() == SDCFG_DRAW ) ? SAL_N_ELEMENTS(aPropNames) : 0;
 ppNames = aPropNames;
 }
 
@@ -1130,40 +1132,42 @@ sal_Bool SdOptionsGrid::operator==( const 
SdOptionsGrid rOpt ) const
 
 void SdOptionsGrid::GetPropNameArray( const char** ppNames, sal_uLong rCount 
) const
 {
-static const char* aPropNamesMetric[] =
-{
-Resolution/XAxis/Metric,
-Resolution/YAxis/Metric,
-Subdivision/XAxis,
-Subdivision/YAxis,
-SnapGrid/XAxis/Metric,
-SnapGrid/YAxis/Metric,
-Option/SnapToGrid,
-Option/Synchronize,
-Option/VisibleGrid,
-SnapGrid/Size
-};
-
-static const char* aPropNamesNonMetric[] =
-{
-Resolution/XAxis/NonMetric,
-Resolution/YAxis/NonMetric,
-Subdivision/XAxis,
-Subdivision/YAxis,
-SnapGrid/XAxis/NonMetric,
-SnapGrid/YAxis/NonMetric,
-Option/SnapToGrid,
-Option/Synchronize,
-Option/VisibleGrid,
-SnapGrid/Size
-};
-
-rCount = 10;
-
 if( isMetricSystem() )
+{
+static const char* aPropNamesMetric[] =
+{
+Resolution/XAxis/Metric,
+Resolution/YAxis/Metric,
+Subdivision/XAxis,
+Subdivision/YAxis,
+SnapGrid/XAxis/Metric,
+SnapGrid/YAxis/Metric,
+Option/SnapToGrid,
+Option/Synchronize,
+Option/VisibleGrid,
+SnapGrid/Size
+};
 ppNames = aPropNamesMetric;
+rCount = SAL_N_ELEMENTS(aPropNamesMetric);
+}
 else
+{
+static const char* aPropNamesNonMetric[] =
+{
+Resolution/XAxis/NonMetric,
+Resolution/YAxis/NonMetric,
+Subdivision/XAxis,
+Subdivision/YAxis,
+

Re: Hi, need Libcdr for windows.

2014-04-16 Thread David Tardon

Hi,

On Tue, Apr 15, 2014 at 03:07:40AM -0700, Ahmed Khatri wrote:
 I am looking for libcdr for windows. Please let me now how may i go about
 it.

As we already told you on IRC yesterday, you can find information about
the project at http://www.freedesktop.org/wiki/Software/libcdr/ . For
building, we have project files for several versions of MSVC. They
should be complete, but it is without guarantee, as nobody uses them
anymore. Similarly, you are on your own figuring out how to set up the
dependencies. Alternatively, you can cross-compile on Linux using MinGW,
which should be much easier (and it is tested semi-regularly on Fedora
and OpenSuSE).

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

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

2014-04-16 Thread Michael Stahl

 include/xmloff/xmlimp.hxx  |7 +++
 xmloff/source/draw/XMLGraphicsDefaultStyle.cxx |5 +
 xmloff/source/meta/xmlmetai.cxx|3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 426077fbea57facf9907cff2431d8f669713d6da
Author: Michael Stahl mst...@redhat.com
Date:   Wed Apr 16 12:11:39 2014 +0200

fdo#77027: add some comments to prevent such oversights

Change-Id: I381c9738bba3e422e01324fa0c781c857db3d360

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index d4a7480..8790f77 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -430,11 +430,18 @@ public:
 static const sal_uInt16 OOo_34x = 34;
 // for AOO, no release overlaps with OOo, so continue OOo version numbers
 static const sal_uInt16 AOO_40x = 40;
+// @ATTENTION: it's not usually ok to use the 4x wildcard in an ==
+// comparison, since that will match unreleased versions too; it is also
+// risky to use it in  comparison, because it requires checking and
+// possibly adapting all such uses when a new value for a more specific
+// version is added.
 static const sal_uInt16 AOO_4x = 41;
 static const sal_uInt16 LO_flag = 0x100;
 static const sal_uInt16 LO_3x = 30 | LO_flag;
 static const sal_uInt16 LO_41x = 41 | LO_flag;
 static const sal_uInt16 LO_42x = 42 | LO_flag;
+/// @ATTENTION: when adding a new value more specific than 4x, grep for
+/// all current uses and adapt them!!!
 static const sal_uInt16 LO_4x = 43 | LO_flag;
 static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16;
 
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx 
b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index afbe579..9753a3f 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -125,6 +125,11 @@ void XMLGraphicsDefaultStyle::SetDefaults()
 xDefaults-setPropertyValue(IsFollowingTextFlow, uno::makeAny(true));
 }
 
+// NOTE: the only reason why it's legal to check == (not ) against
+// arbitrary versions here is that the default value of these attributes
+// is not defined by ODF, therefore it is implementation-defined
+// (and we of course must not override any attributes that are actually
+// in the document, so check for that)
 bool const bIsAOO4(
GetImport().getGeneratorVersion() = SvXMLImport::AOO_40x
  GetImport().getGeneratorVersion() = SvXMLImport::AOO_4x);
commit 5d53cabb52648507086a39e06803624949e4a301
Author: Michael Stahl mst...@redhat.com
Date:   Wed Apr 16 12:07:56 2014 +0200

xmloff: we used to call it LOdev back in 4.0 so check that too

Change-Id: Icb7a82267d935a3ca28569657f8e8dc0ba240a5f

diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 17122cb..01117e1 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -268,7 +268,8 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const 
i_rBuildId, const uno:
 
 OUString rest;
 if (i_rBuildId.startsWith(LibreOffice/, rest) ||
-i_rBuildId.startsWith(LibreOfficeDev/, rest))
+i_rBuildId.startsWith(LibreOfficeDev/, rest) ||
+i_rBuildId.startsWith(LOdev/, rest))
 {
 OUStringBuffer sNumber;
 for (sal_Int32 i = 0; i  rest.getLength(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2014-04-16 Thread Caolán McNamara

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

New commits:
commit d8c6707b118f6da34218d806166a13ee9ab12460
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 11:56:28 2014 +0100

Updated core
Project: help  337b406be206cea2b14cb85edddc4c7a936d1ecf

diff --git a/helpcontent2 b/helpcontent2
index 9ca1d85..337b406 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9ca1d85d439e6f384ce372a8ddc069db89019ecd
+Subproject commit 337b406be206cea2b14cb85edddc4c7a936d1ecf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Caolán McNamara

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

New commits:
commit 337b406be206cea2b14cb85edddc4c7a936d1ecf
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 11:56:28 2014 +0100

fix mismatching tags

Change-Id: I1cf9f5a255e30d573771d3c5c93de529754ac6fc

diff --git a/source/text/swriter/guide/words_count.xhp 
b/source/text/swriter/guide/words_count.xhp
index 8da2393..e33af2a 100644
--- a/source/text/swriter/guide/words_count.xhp
+++ b/source/text/swriter/guide/words_count.xhp
@@ -54,7 +54,7 @@
  paragraph xml-lang=en-US id=par_id1116200901133998 
role=paragraph l10n=NEWIn general, every string of characters between two 
spaces is a word. Dashes, tabs, line breaks, and paragraph breaks are word 
limits, too./paragraph
  paragraph xml-lang=en-US id=par_id1116200901133985 
role=paragraph l10n=NEWWords with always visible hyphens, as in plug-in, 
add-on, user/config, are counted as one word each./paragraph
  paragraph xml-lang=en-US id=par_id111620090113399 
role=paragraph l10n=NEWThe words can be a mix of letters, numbers, and 
special characters. So the following text counts as four words: abc123 1.23 $ 
http://www.example.com./paragraph
- paragraph xml-lang=en-US id=par_id111620090113400 
role=paragraph l10n=NEWTo add a custom character to be considered as the 
word limit, choose switchinline select=syscaseinline 
select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - 
Options/defaultinline/switchinline - %PRODUCTNAME Writer - General/emph 
and add the character into the emphAdditional separators/emph 
field./paragraph
+ paragraph xml-lang=en-US id=par_id111620090113400 
role=paragraph l10n=NEWTo add a custom character to be considered as the 
word limit, choose emphswitchinline select=syscaseinline 
select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - 
Options/defaultinline/switchinline - %PRODUCTNAME Writer - General/emph 
and add the character into the emphAdditional separators/emph 
field./paragraph
   /section
   paragraph xml-lang=en-US id=par_idN106E2 role=tip l10n=NEWTo 
get some more statistics about the document, choose emphFile - Properties - 
Statistics/emph./paragraph
   embed href=text/shared/00/0004.xhp#related/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Steve Yin

 filter/source/msfilter/escherex.cxx |2 +-
 filter/source/msfilter/msdffimp.cxx |   26 ++
 2 files changed, 15 insertions(+), 13 deletions(-)

New commits:
commit b827f6f81f6a8f6d8046a278a18acb69e780afba
Author: Steve Yin stev...@apache.org
Date:   Tue Apr 15 10:12:14 2014 +

Related: #i124661# crash when loading and re-saving ppt file...

with a single customshape

check the equation array element number. If the number is greater than 128, 
the
equation array will not be imported.

(cherry picked from commit 48653aa3a1cc24ed9ad8a14ae035b38a751e561d)

Conflicts:
filter/source/msfilter/msdffimp.cxx

Change-Id: I49ac6ec5610a7761ca3ed4905d6fe1bc7ec079d0

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 7e495db..db1473f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2582,7 +2582,7 @@ void ConvertEnhancedCustomShapeEquation( 
SdrObjCustomShape* pCustoShape,
 if ( pAny )
 *pAny = sEquationSource;
 sal_Int32 nEquationSourceCount = sEquationSource.getLength();
-if ( nEquationSourceCount )
+if ( nEquationSourceCount  (nEquationSourceCount = 128) )
 {
 sal_Int32 i;
 for ( i = 0; i  nEquationSourceCount; i++ )
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index d7d6ba8..eb2e91d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1866,20 +1866,22 @@ void 
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream rIn, SfxIt
 sal_uInt16 nElemSize = 8;
 rIn.ReadUInt16( nNumElem ).ReadUInt16( nNumElemMem ).ReadUInt16( 
nElemSize );
 }
-sal_Int16 nP1, nP2, nP3;
-sal_uInt16 nFlags;
-
-uno::Sequence OUString  aEquations( nNumElem );
-for ( sal_uInt16 i = 0; i  nNumElem; i++ )
+if ( nNumElem = 128 )
 {
-rIn.ReadUInt16( nFlags ).ReadInt16( nP1 ).ReadInt16( nP2 
).ReadInt16( nP3 );
-aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags, nP1, 
nP2, nP3 );
+uno::Sequence OUString  aEquations( nNumElem );
+for ( sal_uInt16 i = 0; i  nNumElem; i++ )
+{
+sal_Int16 nP1(0), nP2(0), nP3(0);
+sal_uInt16 nFlags(0);
+rIn.ReadUInt16( nFlags ).ReadInt16( nP1 ).ReadInt16( nP2 
).ReadInt16( nP3 );
+aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags, 
nP1, nP2, nP3 );
+}
+// pushing the whole Equations element
+const OUString sEquations( Equations );
+aProp.Name = sEquations;
+aProp.Value = aEquations;
+aPropVec.push_back( aProp );
 }
-// pushing the whole Equations element
-const OUString sEquations( Equations );
-aProp.Name = sEquations;
-aProp.Value = aEquations;
-aPropVec.push_back( aProp );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bc/d42eb4039ce1bc1f5d9fa005036fd4fe59e2c6

2014-04-16 Thread Caolán McNamara

 bc/d42eb4039ce1bc1f5d9fa005036fd4fe59e2c6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6ecc83c6389f25996c791408512efcde07c67921
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 11:58:37 2014 +0100

Notes added by 'git notes add'

diff --git a/bc/d42eb4039ce1bc1f5d9fa005036fd4fe59e2c6 
b/bc/d42eb4039ce1bc1f5d9fa005036fd4fe59e2c6
new file mode 100644
index 000..853f781
--- /dev/null
+++ b/bc/d42eb4039ce1bc1f5d9fa005036fd4fe59e2c6
@@ -0,0 +1 @@
+merged as: b827f6f81f6a8f6d8046a278a18acb69e780afba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 48/653aa3a1cc24ed9ad8a14ae035b38a751e561d

2014-04-16 Thread Caolán McNamara

 48/653aa3a1cc24ed9ad8a14ae035b38a751e561d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e5d0e5e9568ab5f1281e87db79caa6cd61282574
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 11:58:54 2014 +0100

Notes added by 'git notes add'

diff --git a/48/653aa3a1cc24ed9ad8a14ae035b38a751e561d 
b/48/653aa3a1cc24ed9ad8a14ae035b38a751e561d
new file mode 100644
index 000..853f781
--- /dev/null
+++ b/48/653aa3a1cc24ed9ad8a14ae035b38a751e561d
@@ -0,0 +1 @@
+merged as: b827f6f81f6a8f6d8046a278a18acb69e780afba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Michael Stahl

 l10ntools/source/helpmerge.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit aef2111fd14d654f72ae910eb52eb8c8f2b8cc94
Author: Michael Stahl mst...@redhat.com
Date:   Wed Apr 16 13:19:44 2014 +0200

l10ntools: helpex: don't crash if the file can't be parsed; return error

Change-Id: I637f8486b0774b399ed5e250868d756c944e50f6

diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 6d3c4dd..20773de 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -152,6 +152,11 @@ bool HelpParser::Merge( const OString rPOFile, const 
OString rDestinationFile,
 //TODO: explicit BOM handling?
 
 XMLFile* xmlfile = ( aParser.Execute( sHelpFile, new XMLFile( OString('0') 
) ) );
+if (!xmlfile)
+{
+SAL_WARN(l10ntools, could not parse   sHelpFile);
+return false;
+}
 bool hasNoError = MergeSingleFile( xmlfile , pMergeDataFile , rLanguage , 
rDestinationFile );
 delete xmlfile;
 return hasNoError;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fwd: [Bug 1087931] [abrt] libreoffice-core: KDE4FilePicker::execute - QTransform::type: soffice.bin killed by SIGABRT

2014-04-16 Thread Maxim Monastirsky

Hi Stephan,

On Wednesday 16 April 2014 10:40:11 Stephan Bergmann wrote:
  But part of that got later reverted (and is reverted in
  libreoffice-core-4.2.3.2-3.fc20) via upstream
  http://cgit.freedesktop.org/libreoffice/core/commit/?id=daf011870efae2822
  44c0298494820d9a0c6d3bc Revert 'Rewrite Qt4 based nested yield mutex
  locking,' but unfortunately without any rationale.
Are you sure? I can't see this commit in libreoffice-4-2-3 branch (only in 4-2 
 
4-2-4), or in Fedora logs.

  So it looks somewhat plausible that this got broken again (if it ever was
  actually truly fixed) with that revert.
Keep in mind that Fedora users of 4.2.4 won't get the native file picker at 
all, unless Fedora will patch Qt4: 
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-2-4id=f13a93eef2b860ce14d036e6657a6ed8dbfe3651

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

Re: HarfBuzz performance problem

2014-04-16 Thread julien2412

Hi,

Just taking a look to Harfbuzz releases, I noticed there was a 0.9.27
version, current download.lst indicates 0.9.23 (see
http://opengrok.libreoffice.org/xref/core/download.lst).
Even if changelog indicates only micro optim, perhaps it could be
interesting to give it a try. If it doesn't work, at least, investigation in
harfbuzz would start from the most recent version.

Julien




--
View this message in context: 
http://nabble.documentfoundation.org/HarfBuzz-performance-problem-tp4105389p4105434.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-04-16 Thread bugzilla-daemon

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

Bug 60270 depends on bug 71423, which changed state.

Bug 71423 Summary: Impress frequently crashes when editing tables in slides
https://bugs.freedesktop.org/show_bug.cgi?id=71423

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 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

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

2014-04-16 Thread Caolán McNamara

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

New commits:
commit 12984e46704f1e55f76b210cf65217e54662dc26
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 13:04:52 2014 +0100

Resolves: fdo#75525 out by one error

Change-Id: I0171d2a79b6b015fa2f01d78228e901005017fb0

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 919aff8..6e9dfde 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -641,7 +641,7 @@ SmCategoryDesc::SmCategoryDesc(VclBuilderContainer 
rBuilder, sal_uInt16 nCatego
 Graphics [i] = 0;
 }
 
-const FieldMinMax rMinMax = pMinMaxData[ nCategoryIdx ][i];
+const FieldMinMax rMinMax = pMinMaxData[ nCategoryIdx-1 ][i];
 Value[i] = Minimum[i] = rMinMax.nMin;
 Maximum[i] = rMinMax.nMax;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-04-16 Thread bugzilla-daemon

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

Bug 60270 depends on bug 71423, which changed state.

Bug 71423 Summary: Impress frequently crashes when editing tables in slides
https://bugs.freedesktop.org/show_bug.cgi?id=71423

   What|Removed |Added

 Status|UNCONFIRMED |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

[Libreoffice-commits] core.git: 4 commits - external/openldap filter/Configuration_filter.mk rsc/inc rsc/source unotools/source

2014-04-16 Thread Stephan Bergmann

 external/openldap/ExternalProject_openldap.mk |   13 -
 filter/Configuration_filter.mk|2 +-
 rsc/inc/rscdef.hxx|2 +-
 rsc/source/rscpp/cpp5.c   |7 +++
 unotools/source/misc/fontcvt.cxx  |2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 42852bb7a33fcfac793224d12cb46ba2f4c8e598
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 14:12:56 2014 +0200

Help openldap configure along when CC contains -fsanitize=address on Linux

Change-Id: Ie1cebb9884d580d5e2bb0e885a22ee04b92aecb5

diff --git a/external/openldap/ExternalProject_openldap.mk 
b/external/openldap/ExternalProject_openldap.mk
index 1b919f4..6fc4f51 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -15,6 +15,17 @@ $(eval $(call gb_ExternalProject_register_targets,openldap,\
build \
 ))
 
+openldap_LDFLAGS =
+ifneq ($(SYSTEM_NSS),)
+openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \
+$(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)
+endif
+# Help openldap's configure determine that it needs -lpthread even if 
libasan.so
+# contains a pthread_create override:
+ifneq ($(filter -fsanitize=address,$(CC)),)
+openldap_LDFLAGS += -pthread
+endif
+
 $(call gb_ExternalProject_get_state_target,openldap,build) :
$(call gb_ExternalProject_run,build,\
./configure \
@@ -34,8 +45,8 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
, \
CPPFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/include \
CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/include \
-   LDFLAGS=-L$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib $(if $(filter 
AIX,$(OS)),-Wl$(COMMA)-brtl) \
) \
+   $(if $(openldap_LDFLAGS),LDFLAGS=$(openldap_LDFLAGS)) 
\
 MAKEFLAGS=  $(MAKE) \
)
 
commit e71a61bc09a15cdcec872c2b281c9884401cfb7f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 14:11:39 2014 +0200

gbuild: More crude hacking to fix over-evalutation

Change-Id: I36d7b0c40ac60c6cf9f0968530774e4b2b03b829

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index d75d81e..fcc989b 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -210,7 +210,7 @@ $$(call filter_XcuResTarget_get_target,$(1)) : \
$$(call gb_Output_announce,$(1),$(true),XCU,1)
$$(call gb_Helper_abbreviate_dirs,\
mkdir -p $$(dir $$@)  \
-   $(call gb_ExternalExecutable_get_command,xsltproc) --nonet 
--stringparam lang $(1) \
+   $(subst $$,,$(call 
gb_ExternalExecutable_get_command,xsltproc)) --nonet --stringparam lang $(1) \
$(filter_XSLT_langfilter) \
$(filter_XcuFilterUiTarget)  $$@)
 endef
commit 1c27bb5237ed6067bba70d7ffe63ed9967098b19
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 14:09:33 2014 +0200

Some trivial -fsanitize=undefined adaptions

Change-Id: I60f6e2b5f041919319cb6b72684b8b7b8504560c

diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index d85657f..c38f3d9 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -63,7 +63,7 @@ public:
 sal_Int32 GetLong() const
   {
   return aExp.aLong.nLo |
-  ((sal_Int32)aExp.aLong.nHi  16);
+  ((sal_uInt32)aExp.aLong.nHi  16);
   }
 bool Evaluate( sal_Int32 * pValue ) const;
 void AppendMacro( OStringBuffer  ) const;
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 92587fe..091b594 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -291,16 +291,15 @@ again:  ;
 }
 opp-op = (char)op;
 opp-prec = (char)prec;
-skip = (valp[-1] != 0); /* Short-circuit tester */
 /*
  * Do the short-circuit stuff here.  Short-circuiting
  * stops automagically when operators are evaluated.
  */
-if ((op == OP_ANA  !skip)
- || (op == OP_ORO  skip))
+if ((op == OP_ANA  valp[-1] == 0)
+ || (op == OP_ORO  valp[-1] != 0))
 opp-skip = S_ANDOR;/* And/or skip starts   */
 else if (op == OP_QUE)  /* Start of ?: operator */
-opp-skip = (char)((op1  S_ANDOR) | ((!skip) ? S_QUEST : 0));
+opp-skip = (char)((op1  S_ANDOR) | ((valp[-1] == 0) ? S_QUEST : 
0));
 else if (op == OP_COL) {/* : inverts S_QUEST*/
 opp-skip = (char)((op1  S_ANDOR)
   |

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

2014-04-16 Thread Michael Stahl

 xmloff/source/meta/xmlmetai.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e290cc1ceb31315905288e29945c9843b6588342
Author: Michael Stahl mst...@redhat.com
Date:   Wed Apr 16 00:26:33 2014 +0200

ODF import: detect LibreOfficeDev in meta:generator too

(cherry picked from commit 74d7911abf77643544c58a0d3e5fb956add76c44)

xmloff: we used to call it LOdev back in 4.0 so check that too
(cherry picked from commit 5d53cabb52648507086a39e06803624949e4a301)

Change-Id: Icea3086975dab1afedf111364683e6a7de50ce41
Reviewed-on: https://gerrit.libreoffice.org/9063
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 6db2452..9ff8e75 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -266,17 +266,19 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const 
i_rBuildId, const uno:
 }
 }
 
-if (i_rBuildId.startsWith(LibreOffice/))
+OUString rest;
+if (i_rBuildId.startsWith(LibreOffice/, rest) ||
+i_rBuildId.startsWith(LibreOfficeDev/, rest) ||
+i_rBuildId.startsWith(LOdev/, rest))
 {
 OUStringBuffer sNumber;
-for (sal_Int32 i = sizeof(LibreOffice/) - 1;
-i  i_rBuildId.getLength(); ++i)
+for (sal_Int32 i = 0; i  rest.getLength(); ++i)
 {
-if (isdigit(i_rBuildId[i]))
+if (isdigit(rest[i]))
 {
-sNumber.append(i_rBuildId[i]);
+sNumber.append(rest[i]);
 }
-else if ('.' != i_rBuildId[i])
+else if ('.' != rest[i])
 {
 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-2' - sd/qa xmloff/source

2014-04-16 Thread Michael Stahl

 sd/qa/unit/data/odp/fdo77027.odp |binary
 sd/qa/unit/import-tests.cxx  |   37 +
 xmloff/source/draw/ximpshap.cxx  |2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit 192963c3c1959389cb78e80bbc3e22e49fabcc73
Author: Michael Stahl mst...@redhat.com
Date:   Tue Apr 15 23:34:37 2014 +0200

fdo#77027: ODF import: fix wrong version in check for embedded objects

SvXMLImport::LO_4x does not mean 4.0+ any more.

(regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)

(cherry picked from commit 25a2eab22798373b8197f1e594568207eb7c5039)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a
Reviewed-on: https://gerrit.libreoffice.org/9064
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sd/qa/unit/data/odp/fdo77027.odp b/sd/qa/unit/data/odp/fdo77027.odp
new file mode 100644
index 000..4d834d4
Binary files /dev/null and b/sd/qa/unit/data/odp/fdo77027.odp differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 991f5fe..7fddb39 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -18,6 +18,10 @@
 
 #include svx/svdotext.hxx
 #include svx/svdoashp.hxx
+#include svx/svdogrp.hxx
+#include svx/svdomedia.hxx
+#include svx/svdoole2.hxx
+#include svx/xflclit.hxx
 #include animations/animationnodehelper.hxx
 
 #include com/sun/star/drawing/XDrawPage.hpp
@@ -43,6 +47,7 @@ class SdFiltersTest : public SdModelTestBase
 public:
 void testDocumentLayout();
 void testSmoketest();
+void testFdo77027();
 void testN759180();
 void testN778859();
 void testFdo64512();
@@ -53,6 +58,7 @@ public:
 CPPUNIT_TEST_SUITE(SdFiltersTest);
 CPPUNIT_TEST(testDocumentLayout);
 CPPUNIT_TEST(testSmoketest);
+CPPUNIT_TEST(testFdo77027);
 CPPUNIT_TEST(testN759180);
 CPPUNIT_TEST(testN778859);
 CPPUNIT_TEST(testFdo64512);
@@ -243,6 +249,37 @@ void SdFiltersTest::testN778859()
 }
 }
 
+// FIXME copypasta
+std::ostream operator(std::ostream rStrm, const Color rColor)
+{
+rStrm  Color: R:  rColor.GetRed()   G:  rColor.GetGreen()   
B:  rColor.GetBlue();
+return rStrm;
+}
+
+void SdFiltersTest::testFdo77027()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/odp/fdo77027.odp));
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+const SdrPage *pPage = pDoc-GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL );
+{
+SdrOle2Obj *const pObj = dynamic_castSdrOle2Obj*(pPage-GetObj(0));
+CPPUNIT_ASSERT(pObj);
+
+// check that the fill style/color was actually imported
+const XFillStyleItem rStyleItem = dynamic_castconst XFillStyleItem(
+pObj-GetMergedItem(XATTR_FILLSTYLE));
+CPPUNIT_ASSERT_EQUAL(XFILL_SOLID, rStyleItem.GetValue());
+const XFillColorItem rColorItem = dynamic_castconst XFillColorItem(
+pObj-GetMergedItem(XATTR_FILLCOLOR));
+CPPUNIT_ASSERT_EQUAL(Color(0xff6600), rColorItem.GetColorValue());
+}
+
+xDocShRef-DoClose();
+}
+
 void SdFiltersTest::testFdo64512()
 {
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/fdo64512.odp));
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index bb3a49f..ae94d31 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2677,7 +2677,7 @@ void SdXMLObjectShapeContext::StartElement( const 
::com::sun::star::uno::Referen
 void SdXMLObjectShapeContext::EndElement()
 {
 if (GetImport().isGeneratorVersionOlderThan(
-SvXMLImport::OOo_34x, SvXMLImport::LO_4x))
+SvXMLImport::OOo_34x, SvXMLImport::LO_41x)) //  LO 4.0
 {
 // #i118485#
 // If it's an old file from us written before OOo3.4, we need to 
correct
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Zolnai Tamás

 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c78962970b81ea9db925075c94db13b8c0d42a79
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Mon Apr 14 12:14:48 2014 +0200

Slideshow: Fix regression related to media animations

Misc effects tab page animations were lost.
Regression from
9695f38ca4ab26b40524f2eade98c45f0360131d.

Change-Id: I81f7321d7dd87f5b0f6b4acbecbd60241ab1e430
(cherry picked from commit 81e98150cc04ad764abc668dc12b91d3de90369e)
Reviewed-on: https://gerrit.libreoffice.org/9054
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx 
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 257d7fe..0eb084a 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -569,7 +569,7 @@ CustomAnimationCreateTabPage* 
CustomAnimationCreateDialog::getCurrentPage() cons
 {
 sal_Int16 curPageId = mpTabControl-GetCurPageId();
 
-for( sal_uInt16 i = ENTRANCE; i = MOTIONPATH; i++ )
+for( sal_uInt16 i = ENTRANCE; i = MISCEFFECTS; i++ )
 {
 if( mpTabPages[i]-getId() == curPageId )
 return mpTabPages[i];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Zolnai Tamás

 slideshow/source/engine/shapes/viewmediashape.cxx |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 5dfb92d506e1aed643dcc84a219882edeac1a9a7
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Apr 11 16:33:55 2014 +0200

fdo#72400: slideshow: display a snapshot of movie until its not started

Change-Id: Ibd81f2aada458dd7437053b59882d3200f78747e
(cherry picked from commit 539017f1d96b0ca2c062ed7ffd2f48166f831493)
Reviewed-on: https://gerrit.libreoffice.org/8949
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx 
b/slideshow/source/engine/shapes/viewmediashape.cxx
index 004dce8..8f66d95 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -31,6 +31,7 @@
 #include vcl/canvastools.hxx
 #include vcl/syschild.hxx
 #include vcl/window.hxx
+#include vcl/graph.hxx
 
 #include basegfx/tools/canvastools.hxx
 #include basegfx/matrix/b2dhommatrixtools.hxx
@@ -186,14 +187,16 @@ namespace slideshow
 
 if( !mpMediaWindow.get()  !mxPlayerWindow.is() )
 {
-// draw placeholder for no-video (no window) case
-// no window and player == audio icon
-// no window and no player == broken icon
-BitmapEx aAudioLogo(mxPlayer.is() ?
-avmedia::MediaWindow::getAudioLogo() : 
avmedia::MediaWindow::getEmptyLogo() );
+OUString sURL;
+uno::Reference beans::XPropertySet  xPropSet( mxShape, 
uno::UNO_QUERY );
+if (xPropSet.is())
+xPropSet-getPropertyValue(PrivateTempFileURL) = sURL;
+
+const Graphic 
aGraphic(avmedia::MediaWindow::grabFrame(sURL,, true));
+const BitmapEx aBmp = aGraphic.GetBitmapEx();
 
 uno::Reference rendering::XBitmap  
xBitmap(vcl::unotools::xBitmapFromBitmapEx(
-pCanvas-getUNOCanvas()-getDevice(), aAudioLogo));
+pCanvas-getUNOCanvas()-getDevice(), aBmp));
 
 rendering::ViewState aViewState;
 aViewState.AffineTransform = 
pCanvas-getViewState().AffineTransform;
@@ -201,7 +204,7 @@ namespace slideshow
 rendering::RenderState aRenderState;
 ::canvas::tools::initRenderState( aRenderState );
 
-const ::Size aBmpSize( aAudioLogo.GetSizePixel() );
+const ::Size aBmpSize( aBmp.GetSizePixel() );
 
 const ::basegfx::B2DVector aScale( rBounds.getWidth() / 
aBmpSize.Width(),
rBounds.getHeight() / 
aBmpSize.Height() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Stephan Bergmann

 include/cppuhelper/propertysetmixin.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a1b1b79adb9f93a1bb503862675bc42814900ac9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 14:41:45 2014 +0200

For GCC 4.9, extend range where -Wnon-virtual-dtor is ignored

Change-Id: Ib44f5b2f6be7ae583d8931fc8bf5cb060ef21610

diff --git a/include/cppuhelper/propertysetmixin.hxx 
b/include/cppuhelper/propertysetmixin.hxx
index 88d460b..0a88945 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -403,10 +403,6 @@ private:
 
 void checkUnknown(rtl::OUString const  propertyName);
 };
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY  HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
- !defined __clang__
-#pragma GCC diagnostic pop
-#endif
 
 /**
@short A helper mixin to implement certain UNO interfaces related to 
property
@@ -482,6 +478,10 @@ private:
 PropertySetMixin( const PropertySetMixin); // not defined
 void operator=( const PropertySetMixin); // not defined
 };
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY  HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+ !defined __clang__
+#pragma GCC diagnostic pop
+#endif
 
 #if defined _MSC_VER
 #pragma warning(pop)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Stephan Bergmann

 desktop/source/app/app.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0fc6ac8a07cbc78133b4d85f78677a9a8fdcc71a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 14:46:37 2014 +0200

Avoid soffice.bin restarting ad inf when version ini-file buildid is empty

...for whatever reason (one being that in a build from tarball, the git 
log
call in instsetoo_native/CustomTarget_setup.mk will produce no value).

Change-Id: I3116a7dded4bc502ef8970a3d433b572c989dd65

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 518c694..037858c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -261,7 +261,8 @@ bool cleanExtensionCache() {
 SAL_WARN_IF(
 rc2 != osl::FileBase::E_None, desktop.app,
 cannot close   fr.getURL()   after reading:   +rc2);
-if (rc != osl::FileBase::E_None) {
+// readLine returns E_AGAIN for a zero-size file:
+if (rc != osl::FileBase::E_None  rc != osl::FileBase::E_AGAIN) {
 SAL_WARN( desktop.app, cannot read from   fr.getURL()  
:   +rc);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Jan Holesovsky

 include/svx/svdoopengl.hxx  |5 +--
 sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx|6 ---
 svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |5 +--
 svx/source/svdraw/svdoopengl.cxx|   25 
 4 files changed, 26 insertions(+), 15 deletions(-)

New commits:
commit 7a8146e080ef13e066d29e4bff354b732980c2a8
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Apr 16 15:21:30 2014 +0200

non-desktop: Attempt to get rid of glew.

Change-Id: I883ff114ebd98234fcc9f41d69de96aadedadf4b

diff --git a/include/svx/svdoopengl.hxx b/include/svx/svdoopengl.hxx
index 2203443..49eb73d 100644
--- a/include/svx/svdoopengl.hxx
+++ b/include/svx/svdoopengl.hxx
@@ -26,10 +26,11 @@ class IOpenGLRenderer;
 class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject, public IOpenGLInfoProvider
 {
 public:
+SdrOpenGLObj();
 virtual ~SdrOpenGLObj();
 virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() 
SAL_OVERRIDE;
 
-OpenGLContext getOpenGLContext();
+OpenGLContext* getOpenGLContext();
 
 virtual void NbcResize(const Point rRef, const Fraction xFact, const 
Fraction yFact) SAL_OVERRIDE;
 
@@ -40,7 +41,7 @@ public:
 
 private:
 
-OpenGLContext maContext;
+OpenGLContext* mpContext;
 
 boost::scoped_ptrIOpenGLRenderer mpRenderer;
 };
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx 
b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index a4a8d90..6062ab9 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -21,8 +21,9 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
 ObjectContact rObjectContact, ViewContact rViewContact )
 : ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
 {
-OpenGLContext rContext = 
static_castSdrOpenGLObj(static_castViewContactOfSdrObj(rViewContact).GetSdrObject()).getOpenGLContext();
-rContext.init(getWindow());
+OpenGLContext* pContext = 
static_castSdrOpenGLObj(static_castViewContactOfSdrObj(rViewContact).GetSdrObject()).getOpenGLContext();
+if (pContext)
+pContext-init(getWindow());
 }
 
 ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
diff --git a/svx/source/svdraw/svdoopengl.cxx b/svx/source/svdraw/svdoopengl.cxx
index 178afcc..59922ac 100644
--- a/svx/source/svdraw/svdoopengl.cxx
+++ b/svx/source/svdraw/svdoopengl.cxx
@@ -7,13 +7,26 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include config_features.h
+
 #include svx/svdoopengl.hxx
 #include svx/sdr/contact/viewcontactofopenglobj.hxx
 
 #include vcl/opengl/IOpenGLRenderer.hxx
 
+SdrOpenGLObj::SdrOpenGLObj()
+  : SdrObject(),
+IOpenGLInfoProvider(),
+mpContext(NULL)
+{
+#if HAVE_FEATURE_DESKTOP
+mpContext = new OpenGLContext;
+#endif
+}
+
 SdrOpenGLObj::~SdrOpenGLObj()
 {
+delete mpContext;
 }
 
 sdr::contact::ViewContact* SdrOpenGLObj::CreateObjectSpecificViewContact()
@@ -21,17 +34,19 @@ sdr::contact::ViewContact* 
SdrOpenGLObj::CreateObjectSpecificViewContact()
 return new sdr::contact::ViewContactOfOpenGLObj(*this);
 }
 
-OpenGLContext SdrOpenGLObj::getOpenGLContext()
+OpenGLContext* SdrOpenGLObj::getOpenGLContext()
 {
-return maContext;
+return mpContext;
 }
 
 void SdrOpenGLObj::NbcResize(const Point rRef, const Fraction xFact, const 
Fraction yFact)
 {
 SdrObject::NbcResize(rRef, xFact, yFact);
 
-//now pass the information to the OpenGL context
-maContext.setWinSize(aOutRect.GetSize());
+// now pass the information to the OpenGL context
+if (mpContext)
+mpContext-setWinSize(aOutRect.GetSize());
+
 SAL_WARN(svx.opengl, resized opengl drawinglayer object);
 }
 
@@ -48,7 +63,7 @@ IOpenGLRenderer* SdrOpenGLObj::getRenderer()
 
 bool SdrOpenGLObj::isOpenGLInitialized()
 {
-return maContext.isInitialized();
+return mpContext  mpContext-isInitialized();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c553a2fd3d5a33c41fcc0b14b7a89619f50e893f
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Apr 15 14:32:44 2014 +0200

This is never defined.

Change-Id: If1bbead68fb074cfd01ac045982e20c9c74fe9c2

diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx 
b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 182080a..3830f5b 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -65,12 +65,6 @@ public:
 FrameView* pFrameView);
 virtual ~ToolPanelViewShell (void);
 
-/** Register the SFX interfaces so that (some of) the controls can be
-pushed as SFX shells on the shell stack and process slot calls and
-so on.
-*/
-static void RegisterControls (void);
-
 virtual void GetFocus (void);
 virtual void LoseFocus (void);
 virtual void KeyInput (const KeyEvent rEvent);

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

2014-04-16 Thread Stephan Bergmann

 sc/source/core/data/docpool.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d59395617411f3dcccbcec29f0fe74985d6cf2ad
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 16:28:33 2014 +0200

SfxItemPool(..., ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, ...) off by one

...since d9ef61fb546af443736057557552e3a95c569c11 API CHANGE: roll back the
XStyle changes to add a new Hidden property on Style bumped ATTR_ENDINDEX 
for
ATTR_HIDDEN but didn't adapt aItemInfos, and mstahl suggests its better to
adapt aItemInfos than to use ATTR_ENDINDEX-1 in the SfxItemPool ctor call.

Change-Id: Iafdf595091ac300793bad1bcd87d58abba4fda6d

diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 880f02d..7027e56b 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -19,6 +19,8 @@
 
 
 #include scitems.hxx
+
+#include boost/static_assert.hpp
 #include comphelper/string.hxx
 #include i18nutil/unicode.hxx
 #include tools/shl.hxx
@@ -182,8 +184,11 @@ static SfxItemInfo const  aItemInfos[] =
 { SID_ATTR_PAGE_FOOTERSET,  SFX_ITEM_POOLABLE },// 
ATTR_PAGE_FOOTERSET
 { SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE },// 
ATTR_PAGE_FORMULAS
 { SID_SCATTR_PAGE_NULLVALS, SFX_ITEM_POOLABLE },// 
ATTR_PAGE_NULLVALS
-{ SID_SCATTR_PAGE_SCALETO,  SFX_ITEM_POOLABLE } // 
ATTR_PAGE_SCALETO
+{ SID_SCATTR_PAGE_SCALETO,  SFX_ITEM_POOLABLE },// 
ATTR_PAGE_SCALETO
+{ 0,SFX_ITEM_POOLABLE } // ATTR_HIDDEN
 };
+BOOST_STATIC_ASSERT(
+SAL_N_ELEMENTS(aItemInfos) == ATTR_ENDINDEX - ATTR_STARTINDEX + 1);
 
 ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - dictionaries

2014-04-16 Thread Joan Montane

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

New commits:
commit fcbaea6043843b352b105f505fab73c8d1f31de9
Author: Joan Montane j...@montane.cat
Date:   Wed Apr 9 13:25:51 2014 +0100

Updated core
Project: dictionaries  a042ec0063d8f6976de5c28d12dd035b67142ad2

diff --git a/dictionaries b/dictionaries
index 94d0d2b..a042ec006 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 94d0d2bee95f138a902d6ddc02b0407da00e3b1a
+Subproject commit a042ec0063d8f6976de5c28d12dd035b67142ad2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'distro/collabora/cp-4.2'

2014-04-16 Thread Joan Montane

New branch 'distro/collabora/cp-4.2' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'distro/collabora/cp-4.2'

2014-04-16 Thread Zolnai Tamás

New branch 'distro/collabora/cp-4.2' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' -

2014-04-16 Thread Zolnai Tamás

 0 files changed

New commits:
commit 78c9d22fe9f68a7ba71f9b0b6cc81af16bd766d8
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Sat Jan 11 21:55:33 2014 +0100

Updated core
Project: help  7d73db5cf05eb0cd0c01536667fc021367b0aa92
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - translations

2014-04-16 Thread Christian Lohmaier

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

New commits:
commit 72d9b4bc65dfad0e8af3cf09d11a81b4ee7e0db7
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Apr 15 21:36:42 2014 +0200

Updated core
Project: translations  0f2b2fa37079cca17ca4d19ff8fa81233c2c950a

diff --git a/translations b/translations
index eab38ba..0f2b2fa 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit eab38ba5adf1d1318d19dde70264ece49b3eb26a
+Subproject commit 0f2b2fa37079cca17ca4d19ff8fa81233c2c950a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Caolán McNamara

 starmath/uiconfig/smath/ui/spacingdialog.ui |4 
 1 file changed, 4 deletions(-)

New commits:
commit 6a8c627906ea86b32d1248673091271c61342ee0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 16:03:44 2014 +0100

spacing-borders spinbuttons end up a little narrow

Change-Id: I206db0f4bb55d43ef244e8af850947dbb1fdeb02

diff --git a/starmath/uiconfig/smath/ui/spacingdialog.ui 
b/starmath/uiconfig/smath/ui/spacingdialog.ui
index 7d69e96..35ec493 100644
--- a/starmath/uiconfig/smath/ui/spacingdialog.ui
+++ b/starmath/uiconfig/smath/ui/spacingdialog.ui
@@ -147,7 +147,6 @@
   object class=GtkSpinButton 
id=spinbutton1:0.00cm
 property name=can_focusTrue/property
 property 
name=no_show_allTrue/property
-property name=hexpandTrue/property
 property 
name=invisible_charâ/property
 property 
name=invisible_char_setTrue/property
   /object
@@ -162,7 +161,6 @@
   object class=GtkSpinButton 
id=spinbutton2:0.00cm
 property name=can_focusTrue/property
 property 
name=no_show_allTrue/property
-property name=hexpandTrue/property
 property 
name=invisible_charâ/property
 property 
name=invisible_char_setTrue/property
   /object
@@ -177,7 +175,6 @@
   object class=GtkSpinButton 
id=spinbutton3:0.00cm
 property name=can_focusTrue/property
 property 
name=no_show_allTrue/property
-property name=hexpandTrue/property
 property 
name=invisible_charâ/property
 property 
name=invisible_char_setTrue/property
   /object
@@ -240,7 +237,6 @@
   object class=GtkSpinButton 
id=spinbutton4:0.00cm
 property name=can_focusTrue/property
 property 
name=no_show_allTrue/property
-property name=hexpandTrue/property
 property 
name=invisible_charâ/property
 property 
name=invisible_char_setTrue/property
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'distro/collabora/cp-4.2'

2014-04-16 Thread Christian Lohmaier

New branch 'distro/collabora/cp-4.2' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Kohei Yoshida

 sc/source/ui/view/tabview3.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 52cc88d6191ba0c4b6477e5c4b9c5d0f0228030d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 11:08:46 2014 -0400

fdo#75026: Sometimes we need to update grid view while not being active.

For example when jumping to mark in the non-active window triggered by
hyperlink in the active one.  The jump-to-mark command gets dispatched 
before
the new window is officially activated.

Change-Id: I4e9c126b061ee3af4440e36d1ba6d796eb1c3539

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 8b7e0a1..5312c0d 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2111,9 +2111,6 @@ void ScTabView::PaintRangeFinderEntry (ScRangeFindData* 
pData, const SCTAB nTab)
 
 void ScTabView::UpdateGrid()
 {
-if (!aViewData.IsActive())
-return;
-
 if (!UpdateVisibleRange())
 // Visible range hasn't changed. No need to re-paint.
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Caolán McNamara

 svx/uiconfig/ui/sidebarparagraph.ui |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 0c41a9e274eb4b4fecec282638b5ff4c496ebf5a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 16:10:59 2014 +0100

order decrease/increase spacing

because that's the order in the toolbar to align the two
orders

Change-Id: Ie6f76189a71bd1706c567592f941bbe2c2d5f083

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 121f8aa..d91364c 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -492,15 +492,13 @@
 property name=tooltip_text 
translatable=yesIndent/property
 property name=show_arrowFalse/property
 child
-  object class=GtkToolButton id=increaseindent
-property name=width_request15/property
-property name=height_request25/property
+  object class=GtkToolButton id=decreaseindent
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=has_tooltipTrue/property
-property name=tooltip_markup 
translatable=yesIncrease Indent/property
-property name=tooltip_text 
translatable=yesIncrease Indent/property
-property 
name=action_name.uno:IncrementIndent/property
+property name=tooltip_markup 
translatable=yesDecrease Indent/property
+property name=tooltip_text 
translatable=yesDecrease Indent/property
+property 
name=action_name.uno:DecrementIndent/property
 property name=use_underlineTrue/property
   /object
   packing
@@ -509,13 +507,15 @@
   /packing
 /child
 child
-  object class=GtkToolButton id=decreaseindent
+  object class=GtkToolButton id=increaseindent
+property name=width_request15/property
+property name=height_request25/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=has_tooltipTrue/property
-property name=tooltip_markup 
translatable=yesDecrease Indent/property
-property name=tooltip_text 
translatable=yesDecrease Indent/property
-property 
name=action_name.uno:DecrementIndent/property
+property name=tooltip_markup 
translatable=yesIncrease Indent/property
+property name=tooltip_text 
translatable=yesIncrease Indent/property
+property 
name=action_name.uno:IncrementIndent/property
 property name=use_underlineTrue/property
   /object
   packing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cppcheck: duplicateBranch in ParaPropertyPanel.cxx (svx module)

2014-04-16 Thread Caolán McNamara

On Mon, 2013-07-29 at 13:12 -0700, julien2412 wrote:
 Hello,
 
 Cppcheck reported this:
 error file=svx/source/sidebar/paragraph/ParaPropertyPanel.cxx line=309
 id=duplicateBranch severity=style msg=Found duplicate branches for 'if'
 and 'else'./
 error file=svx/source/sidebar/paragraph/ParaPropertyPanel.cxx line=328
 id=duplicateBranch severity=style msg=Found duplicate branches for 'if'
 and 'else'./
 Any idea how it should be?

Now having checked in LTR mode and RTL mode I'm happy enough to just
remove the duplication of the branches and I checked that in now.

C.

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

Re: cppcheck: duplicate branch for ParaPropertyPanel (svx) + interpr7.cxx (sc)

2014-04-16 Thread Caolán McNamara

On Fri, 2013-09-27 at 14:52 -0700, julien2412 wrote:
 Hello,
 
 Cppcheck reported this:
 sc/source/core/tool/interpr7.cxx
  94 else if(pNodeSet-nodeTab[0]-type ==
 XML_ELEMENT_NODE)
  95 {
  96 xmlNodePtr cur = pNodeSet-nodeTab[0];
  97 boost::shared_ptrxmlChar
 pChar2(xmlNodeGetContent(cur), xmlFree);
  98 aResult =
 OUString::createFromAscii((char*)pChar2.get());
  99 }
 100 else
 101 {
 102 xmlNodePtr cur = pNodeSet-nodeTab[0];
 103 boost::shared_ptrxmlChar
 pChar2(xmlNodeGetContent(cur), xmlFree);
 104 aResult =
 OUString::createFromAscii((char*)pChar2.get());
 105 }
 
 See
 http://opengrok.libreoffice.org/xref/core/sc/source/core/tool/interpr7.cxx#87

So I decided to just remove the duplication for now. Markus might want
to have a look at it as the original author.

C.

(and the other issue in svx is fixed now as well as per the earlier
mail).

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

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

2014-04-16 Thread Kohei Yoshida

 sc/source/ui/view/output2.cxx |   29 +
 1 file changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 21fc47e115530780ad45ae64e8076dc5e9fedb5e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 11:41:19 2014 -0400

fdo#75665: Fix the right-aligned case.

Change-Id: I905c4e331f37ed2ffbdf5c89dde9fb6c9ca546cf

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 90d562e..75efff3 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2034,18 +2034,31 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
 
 double fVisibleRatio = 1.0;
 double fTextWidth = aVars.GetTextSize().Width();
+sal_Int32 nTextLen = aString.getLength();
 if (eOutHorJust == SVX_HOR_JUSTIFY_LEFT  
aAreaParam.mnRightClipLength  0)
+{
 fVisibleRatio = (fTextWidth - 
aAreaParam.mnRightClipLength) / fTextWidth;
+if (0.0  fVisibleRatio  fVisibleRatio  1.0)
+{
+// Only show the left-end segment.
+sal_Int32 nShortLen = 
fVisibleRatio*nTextLen + 1;
+aShort = aShort.copy(0, nShortLen);
+}
+}
 else if (eOutHorJust == SVX_HOR_JUSTIFY_RIGHT  
aAreaParam.mnLeftClipLength  0)
-fVisibleRatio = (fTextWidth - 
aAreaParam.mnLeftClipLength) / fTextWidth;
-
-if (fVisibleRatio  1.0)
 {
-// Heuristically determine the length of the
-// visible section of the string.  Length + 1
-// to avoid becoming too short.
-sal_Int32 nShortLen = fVisibleRatio * 
aString.getLength() + 1;
-aShort = aShort.copy(0, nShortLen);
+fVisibleRatio = (fTextWidth - 
aAreaParam.mnLeftClipLength) / fTextWidth;
+if (0.0  fVisibleRatio  fVisibleRatio  1.0)
+{
+// Only show the right-end segment.
+sal_Int32 nShortLen = 
fVisibleRatio*nTextLen + 1;
+aShort = aShort.copy(nTextLen-nShortLen);
+
+// Adjust the text position after 
shortening of the string.
+double fShortWidth = 
pFmtDevice-GetTextWidth(aShort);
+double fOffset = fTextWidth - fShortWidth;
+aDrawTextPos.Move(fOffset, 0);
+}
 }
 
 if (bMetaFile || pFmtDevice != mpDev || aZoomX != 
aZoomY)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 9 commits - connectivity/source framework/source sfx2/source svx/source sw/source vcl/source

2014-04-16 Thread Caolán McNamara

 connectivity/source/drivers/postgresql/pq_baseresultset.cxx |2 +-
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |2 +-
 connectivity/source/drivers/postgresql/pq_statement.cxx |2 +-
 framework/source/uielement/menubarmerger.cxx|1 +
 sfx2/source/dialog/dinfdlg.cxx  |9 
+
 svx/source/sidebar/line/LinePropertyPanel.cxx   |2 +-
 sw/source/core/access/accpara.cxx   |2 +-
 sw/source/core/frmedt/tblsel.cxx|2 +-
 sw/source/filter/ww8/ww8par.cxx |2 --
 sw/source/ui/vba/vbadialog.cxx  |7 ---
 vcl/source/filter/sgvmain.cxx   |1 +
 11 files changed, 13 insertions(+), 19 deletions(-)

New commits:
commit bcbf14f6077b0ccf1179dcba3e382bda4f9bdcad
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 14:40:24 2014 +0100

coverity#1202773 Logically dead code

I can't find any evidence that it was possible to be
other than true/false here before sal_Bool got converted
to bool

Change-Id: Ieacc780b5f5abce0fe166337a50284bd5e0aef45

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 44750f8..df43353 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -217,8 +217,6 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
 {
 }
 
-
-
 SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString rFile,
 const uno::Referencedocument::XDocumentProperties i_xDocProps,
 const uno::Sequencedocument::CmisProperty i_cmisProps,
@@ -1112,12 +1110,7 @@ void SfxDocumentPage::Reset( const SfxItemSet rSet )
 m_pInfoItem-getEditingCycles() ) );
 }
 
-TriState eState = (TriState)m_bUseUserData;
-
-if ( TRISTATE_INDET == eState )
-m_pUseUserDataCB-EnableTriState( true );
-
-m_pUseUserDataCB-SetState( eState );
+m_pUseUserDataCB-SetState( static_castTriState(m_bUseUserData) );
 m_pUseUserDataCB-SaveValue();
 m_pUseUserDataCB-Enable( bEnableUseUserData );
 bHandleDelete = false;
commit 98a39af312d493c26eabc94f95df0c27b3c7f66c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 14:33:13 2014 +0100

WaE: -Werror=maybe-uninitialized

Change-Id: Id9226a5d460c114d4811209020f408779dd2424d

diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx 
b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index e6fb435..5b4a030 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -617,7 +617,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue(
 case BASERESULTSET_ESCAPE_PROCESSING:
 case BASERESULTSET_IS_BOOKMARKABLE:
 {
-bool val;
+bool val(false);
 bRet = ( rValue = val );
 m_props[nHandle] = makeAny( val );
 break;
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 
b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index bfb5010..83dbdbf 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -779,7 +779,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue(
 }
 case PREPARED_STATEMENT_ESCAPE_PROCESSING:
 {
-bool val;
+bool val(false);
 bRet = ( rValue = val );
 rConvertedValue = makeAny( val );
 break;
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx 
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 14a7817..e002067 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -934,7 +934,7 @@ sal_Bool Statement::convertFastPropertyValue(
 }
 case STATEMENT_ESCAPE_PROCESSING:
 {
-bool val;
+bool val(false);
 bRet = ( rValue = val );
 rConvertedValue = makeAny( val );
 break;
commit eff36c994e0a0c19c8f38bba116e268ac7e9f146
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 14:27:43 2014 +0100

coverity#1027390 Logically dead code

Change-Id: Ie2d375093828cc2b0f9ca20b360a8fe8a5032dcf

diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx 
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 7452532..01c64f1 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -500,7 +500,7 @@ void LinePropertyPanel::NotifyItemUpdate(
 
 if(pItem)
 {
-mpStartItem.reset(pItem ? (XLineStartItem*)pItem-Clone() 
: 0);
+mpStartItem.reset((XLineStartItem*)pItem-Clone());
 SelectEndStyle(true);

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

2014-04-16 Thread Stephan Bergmann

 include/unotools/fontdefs.hxx  |2 --
 unotools/source/misc/fontdefs.cxx  |   24 +---
 vcl/inc/PhysicalFontCollection.hxx |2 +-
 vcl/source/outdev/font.cxx |9 ++---
 4 files changed, 8 insertions(+), 29 deletions(-)

New commits:
commit d67da1e7216a1b1281f418ecaa067cd3014e47c0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 17:44:56 2014 +0200

Remove FontNameHash, use standard OUStringHash

Change-Id: If123bbe8a4ee044ef45f418be0118ccf9509f4e7

diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index ad9a68b..6e20b88 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -41,8 +41,6 @@ UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString 
rName, sal_uLong nF
 
 UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString rName, const OUString 
rNewToken );
 
-struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const OUString) 
const; };
-
 // - ConvertChar -
 
 class UNOTOOLS_DLLPUBLIC ConvertChar
diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index 0f4206e..61f6a07 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -423,7 +423,7 @@ void GetEnglishSearchFontName( OUString rName )
 // translate normalized localized name to its normalized English ASCII name
 if( bNeedTranslation )
 {
-typedef boost::unordered_mapconst OUString, const char*, 
FontNameHash FontNameDictionary;
+typedef boost::unordered_mapconst OUString, const char*, 
OUStringHash FontNameDictionary;
 static FontNameDictionary aDictionary( 
SAL_N_ELEMENTS(aImplLocalizedNamesList) );
 // the font name dictionary needs to be intialized once
 if( aDictionary.empty() )
@@ -568,28 +568,6 @@ OUString GetSubsFontName( const OUString rName, sal_uLong 
nFlags )
 return aName;
 }
 
-// TODO: use a more generic String hash
-int FontNameHash::operator()( const OUString rStr ) const
-{
-// this simple hash just has to be good enough for font names
-int nHash = 0;
-const int nLen = rStr.getLength();
-const sal_Unicode* p = rStr.getStr();
-switch( nLen )
-{
-default: nHash = (p[0]16) - (p[1]8) + p[2];
- nHash += nLen;
- p += nLen - 3;
- // fall through
-case 3:  nHash += (p[2]16);   // fall through
-case 2:  nHash += (p[1]8);// fall through
-case 1:  nHash += p[0]; // fall through
-case 0:  break;
-};
-
-return nHash;
-}
-
 bool IsStarSymbol(const OUString rFontName)
 {
 sal_Int32 nIndex = 0;
diff --git a/vcl/inc/PhysicalFontCollection.hxx 
b/vcl/inc/PhysicalFontCollection.hxx
index 9c0c7a1..fd9eb15 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -35,7 +35,7 @@ private:
 mutable boolmbMatchData;// true if matching attributes are 
initialized
 boolmbMapNames; // true if MapNames are available
 
-typedef boost::unordered_mapconst OUString, 
PhysicalFontFamily*,FontNameHash PhysicalFontFamilies;
+typedef boost::unordered_mapconst OUString, 
PhysicalFontFamily*,OUStringHash PhysicalFontFamilies;
 PhysicalFontFamiliesmaPhysicalFontFamilies;
 
 ImplPreMatchFontSubstitution* mpPreMatchHook;   // device specific 
prematch substitution
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index c1565f7..c82badd 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -770,16 +770,19 @@ size_t ImplFontCache::IFSD_Hash::operator()( const 
FontSelectPattern rFSD ) con
 size_t FontSelectPatternAttributes::hashCode() const
 {
 // TODO: does it pay off to improve this hash function?
-static FontNameHash aFontNameHash;
-size_t nHash = aFontNameHash( maSearchName );
+size_t nHash;
 #if ENABLE_GRAPHITE
 // check for features and generate a unique hash if necessary
 if (maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
 != -1)
 {
-nHash = aFontNameHash( maTargetName );
+nHash = maTargetName.hashCode();
 }
+else
 #endif
+{
+nHash = maSearchName.hashCode();
+}
 nHash += 11 * mnHeight;
 nHash += 19 * GetWeight();
 nHash += 29 * GetSlant();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Jan Holesovsky

 writerfilter/source/ooxml/OOXMLFactory.cxx   |2 ++
 writerfilter/source/ooxml/OOXMLFactory.hxx   |2 +-
 writerfilter/source/ooxml/factory_ns.xsl |2 ++
 writerfilter/source/ooxml/factoryimpl_ns.xsl |2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7ec515a7162d886cba611067cc6b4577aaf270a4
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Apr 16 17:43:43 2014 +0200

writerfilter: Hide more debug strings we don't need in production builds.

Change-Id: If30d3a94cd3f18bd5c4856d8a88f6c78e0da3e76

diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx 
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 8e2fa15..1f778c3 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -85,10 +85,12 @@ TokenToIdMapPointer OOXMLFactory_ns::getTokenToIdMap(Id nId)
 return m_TokenToIdsMap[nId];
 }
 
+#ifdef DEBUG_FACTORY
 string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
 {
 return ;
 }
+#endif
 
 // class OOXMLFactory
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx 
b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 346b023..7690976 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -102,8 +102,8 @@ public:
 virtual void charactersAction(OOXMLFastContextHandler * pHandler, const 
OUString  rString);
 virtual void endAction(OOXMLFastContextHandler * pHandler);
 virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t 
nToken, OOXMLValue::Pointer_t pValue);
-virtual string getDefineName(Id nId) const;
 #ifdef DEBUG_FACTORY
+virtual string getDefineName(Id nId) const;
 virtual string getName() const;
 #endif
 
diff --git a/writerfilter/source/ooxml/factory_ns.xsl 
b/writerfilter/source/ooxml/factory_ns.xsl
index 2815078..a657215 100644
--- a/writerfilter/source/ooxml/factory_ns.xsl
+++ b/writerfilter/source/ooxml/factory_ns.xsl
@@ -86,7 +86,9 @@ public:
 virtual ListValueMapPointer createListValueMap(Id nId);
 virtual CreateElementMapPointer createCreateElementMap(Id nId);
 virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
+#ifdef DEBUG_FACTORY
 virtual string getDefineName(Id nId) const;/xsl:text
+#endif
 xsl:call-template name=factoryactiondecls/
 virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t 
nToken, OOXMLValue::Pointer_t pValue);
 
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl 
b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index 8d5f565..9cb8912 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -676,6 +676,7 @@ CreateElementMapPointer /xsl:text
 
 xsl:template name=factorygetdefinename
 xsl:text
+#ifdef DEBUG_FACTORY
 string /xsl:text
 xsl:call-template name=factoryclassname/
 xsl:text::getDefineName(Id nId) const
@@ -699,6 +700,7 @@ string /xsl:text
 
 return (*pMap)[nId];
 }
+#endif
 
 /xsl:template
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Kohei Yoshida

 sc/source/ui/view/tabview3.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 44c9235ba8ab513451fcc6cd5dbdf82c577481f1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 11:08:46 2014 -0400

fdo#75026: Sometimes we need to update grid view while not being active.

For example when jumping to mark in the non-active window triggered by
hyperlink in the active one.  The jump-to-mark command gets dispatched 
before
the new window is officially activated.

Change-Id: I4e9c126b061ee3af4440e36d1ba6d796eb1c3539
(cherry picked from commit 52cc88d6191ba0c4b6477e5c4b9c5d0f0228030d)
Reviewed-on: https://gerrit.libreoffice.org/9068
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 92aaadc..2a79b15 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2112,9 +2112,6 @@ void ScTabView::PaintRangeFinderEntry (ScRangeFindData* 
pData, const SCTAB nTab)
 
 void ScTabView::UpdateGrid()
 {
-if (!aViewData.IsActive())
-return;
-
 if (!UpdateVisibleRange())
 // Visible range hasn't changed. No need to re-paint.
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Ravindra Vidhate

 oox/source/export/drawingml.cxx |4 ++--
 sw/qa/extras/ooxmlexport/data/fdo77476.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   11 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit ccfc02f7691848284403d339ee17054169fbff1d
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date:   Tue Apr 15 15:24:40 2014 +0530

fdo#77476:FILE_SAVE : 'TIF' is changed to 'TIFF' in RT

1. Open the attached file in LO which has images [.TIF] format
2. Save the document as DOCX
3. Open the saved document in MS-Office or extract the content of the saved 
docx file.
 In [Content_Types].xml , .tif extension is changed to .tiff.

Change-Id: I73baea9ad6cd991b04d47e23865b77432127a510
Reviewed-on: https://gerrit.libreoffice.org/9010
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f3aceee..fd60107 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -749,8 +749,8 @@ OUString DrawingML::WriteImage( const Graphic rGraphic , 
bool bRelPathToMedia )
 pExtension = .png;
 break;
 case GFX_LINK_TYPE_NATIVE_TIF:
-sMediaType = image/tiff;
-pExtension = .tiff;
+sMediaType = image/tif;
+pExtension = .tif;
 break;
 case GFX_LINK_TYPE_NATIVE_WMF:
 sMediaType = image/x-wmf;
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77476.docx 
b/sw/qa/extras/ooxmlexport/data/fdo77476.docx
new file mode 100644
index 000..08c38b0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77476.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a3853cf..1e4067e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3130,6 +3130,17 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76597, fdo76597.docx)
 assertXPath(pXmlDoc, /w:document/w:body/w:p[4]/w:pPr/w:spacing, 
before, 96);
 assertXPath(pXmlDoc, /w:document/w:body/w:p[4]/w:pPr/w:spacing, after, 
120);
 }
+
+DECLARE_OOXMLEXPORT_TEST(testContentTypeTIF, fdo77476.docx)
+{
+xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+   return;
+
+assertXPath(pXmlDoc, 
/ContentType:Types/ContentType:Override[@ContentType='image/tif'], 
PartName, /word/media/image1.tif);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: HarfBuzz performance problem

2014-04-16 Thread Kohei Yoshida

On Wed, 2014-04-16 at 04:41 -0700, julien2412 wrote:
 Even if changelog indicates only micro optim, perhaps it could be
 interesting to give it a try.

Could you point me to HarfBuzz's change log?  I have hard time finding
it.

Kohei

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

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

2014-04-16 Thread Jan Holesovsky

 package/source/xstor/ocompinstream.cxx|   62 +++---
 package/source/xstor/oseekinstream.cxx|   12 +-
 package/source/xstor/owriteablestream.cxx |  117 +++---
 package/source/xstor/owriteablestream.hxx |1 
 package/source/xstor/xstorage.cxx |  132 +++---
 5 files changed, 155 insertions(+), 169 deletions(-)

New commits:
commit a60d9aa7ce7d5c77798e7be1efce2afc05d97f85
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Apr 16 18:24:58 2014 +0200

package: Turn own logging infra into SAL_INFO to reduce product bin size.

Change-Id: I81b4cf62cb6ae77ea35e7781ef5f464c28b44855

diff --git a/package/source/xstor/ocompinstream.cxx 
b/package/source/xstor/ocompinstream.cxx
index 770a0a3..3693364 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -115,13 +115,13 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( 
uno::Sequence sal_Int8  aData
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
 if ( !m_xStream.is() )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX No stream! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX No stream!);
 throw uno::RuntimeException();
 }
 
@@ -137,13 +137,13 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( 
uno::Sequence sal_Int8  a
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
 if ( !m_xStream.is() )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX No stream! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX No stream!);
 throw uno::RuntimeException();
 }
 
@@ -160,13 +160,13 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 
nBytesToSkip )
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
 if ( !m_xStream.is() )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX No stream! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX No stream!);
 throw uno::RuntimeException();
 }
 
@@ -182,13 +182,13 @@ sal_Int32 SAL_CALL OInputCompStream::available(  )
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
 if ( !m_xStream.is() )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX No stream! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX No stream!);
 throw uno::RuntimeException();
 }
 
@@ -210,7 +210,7 @@ uno::Reference io::XInputStream  SAL_CALL 
OInputCompStream::getInputStream()
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
@@ -226,7 +226,7 @@ uno::Reference io::XOutputStream  SAL_CALL 
OInputCompStream::getOutputStream()
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
@@ -239,7 +239,7 @@ void OInputCompStream::InternalDispose()
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
@@ -267,7 +267,7 @@ void SAL_CALL OInputCompStream::dispose(  )
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
@@ -294,7 +294,7 @@ void SAL_CALL OInputCompStream::addEventListener( const 
uno::Reference lang::XE
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-::package::StaticAddLog( OSL_LOG_PREFIX Disposed! );
+SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
 throw lang::DisposedException();
 }
 
@@ -310,7 +310,7 @@ void SAL_CALL OInputCompStream::removeEventListener( const 
uno::Reference lang:
 ::osl::MutexGuard aGuard(

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

2014-04-16 Thread Miklos Vajna

 include/oox/helper/propertymap.hxx  |2 
 include/sal/log-areas.dox   |1 
 oox/source/drawingml/customshapeproperties.cxx  |3 
 oox/source/drawingml/customshapes/generatePresetsCXX.pl |   72 +++-
 oox/source/drawingml/shape.cxx  |1 
 oox/source/helper/propertymap.cxx   |   19 
 6 files changed, 97 insertions(+), 1 deletion(-)

New commits:
commit e1f9e73893e3d5760dab45b9322eca9fb8ce7ac4
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 16 18:29:46 2014 +0200

oox: add --data switch to generatePresetsCXX.pl

generatePresetsCXX.pl (as its name says) by default generates C++ code,
but with the new switch it filters out data from the provided
custom-shapes.log.

Change-Id: Ic59c666422db667112c280716f98342fabdae692

diff --git a/oox/source/drawingml/customshapes/generatePresetsCXX.pl 
b/oox/source/drawingml/customshapes/generatePresetsCXX.pl
index 2ce96f5..29a3c19 100755
--- a/oox/source/drawingml/customshapes/generatePresetsCXX.pl
+++ b/oox/source/drawingml/customshapes/generatePresetsCXX.pl
@@ -7,6 +7,54 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+sub loadData()
+{
+open (IN, custom-shapes.log);
+
+my %sources;
+
+while (IN)
+{
+if (/==csdata== /)
+{
+if (/shape name: '/)
+{
+chop;
+s/.*shape name: '([^']+)'.*/$1/;
+$name = $_;
+}
+else
+{
+if (/==csdata== begin/)
+{
+$inside = true;
+@code = ();
+}
+else
+{
+if (/==csdata== end/)
+{
+s/^  \/([^]+)/$1/;
+undef $inside;
+$sources{$name} = [ @code ];
+}
+}
+}
+}
+else
+{
+if ($inside)
+{
+push @code, $_;
+}
+}
+}
+
+close (IN);
+
+return \%sources;
+}
+
 sub loadSourceCode()
 {
 open (IN, custom-shapes.log);
@@ -168,6 +216,28 @@ EOS
 close OUT;
 }
 
-generateSource (loadSourceCode ());
+sub generateData
+{
+my $sources = shift;
+open (OUT, oox-drawingml-cs-presets);
+
+foreach $shape (sort(keys %$sources))
+{
+printf OUT /* %s */\n, $shape;
+print OUT @{$sources-{$shape}};
+}
+
+close OUT;
+}
+
+my $arg = shift;
+
+if ($arg eq --data)
+{
+generateData(loadData());
+} else
+{
+generateSource (loadSourceCode ());
+}
 
 # vim:set ft=perl shiftwidth=4 softtabstop=4 expandtab: #
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index c1d00f6..f7150db 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -895,6 +895,7 @@ Reference XShape  Shape::createAndInsert(
 }
 
 SAL_INFO(oox.cscode, ==cscode== shape name: '  msName  
');
+SAL_INFO(oox.csdata, ==csdata== shape name: '  msName  
');
 mpCustomShapePropertiesPtr-pushToPropSet( rFilterBase, xSet, 
mxShape, maSize );
 }
 else if( getTextBody() )
commit 142d63d01567b5c7e513258f2835dbde54b30012
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 16 18:15:21 2014 +0200

oox: add a method to dump a PropertyMap as data

It was already possible to dump a PropertyMap as code, but not as data.
The plan here is that if we dump the customshape preset definitions as
data, then once there is a parser for it, we can get rid of the ugly
generated code.

Change-Id: If596941fedf71693e5d0bff436446ac0855c4c84

diff --git a/include/oox/helper/propertymap.hxx 
b/include/oox/helper/propertymap.hxx
index 4b4f416..5cd606b 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -110,6 +110,8 @@ public:
 #endif
   static void dumpCode( ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet  rXPropSet);
   void dumpCode();
+  static void 
dumpData(com::sun::star::uno::Referencecom::sun::star::beans::XPropertySet 
rXPropSet);
+  void dumpData();
 #endif
 private:
 const PropertyNameVector* mpPropNames;
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 90fd1c0..c924dcb 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -173,6 +173,7 @@ certain functionality.
 @li @c filter.tiff
 @li @c filter.xslt - xslt import/export
 @li @c oox.cscode - see oox/source/drawingml/customshapes/README
+@li @c oox.csdata - see oox/source/drawingml/customshapes/README
 @li @c oox.drawingml - DrawingML
 @li @c oox.ppt - pptx filter
 @li @c oox.storage - ZipStorage class
diff --git a/oox/source/drawingml/customshapeproperties.cxx

Re: HarfBuzz performance problem

2014-04-16 Thread Noel Grandin


On 2014-04-16 05:02, Kohei Yoshida wrote:

This bug

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

reveals that our HarfBuzz based text rendering is quite expensive.  I
tried to do what I could on the Calc side to lessen the impact of this
problem.  I've made some improvement, but I've hit my roadblock.

I was wondering if anyone who is more familiar with HarfBuzz could
suggest any good idea on how to improve this further.



Hi

I suggest that you also ask on the HarfBuzz mailing list
   http://lists.freedesktop.org/archives/harfbuzz/

The maintainer, Behdad Esfahbod, is very helpful.

Regards, Noel.

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: 3 commits - include/tools include/vcl tools/source vcl/Library_vcl.mk vcl/source

2014-04-16 Thread Chris Sherlock

 include/tools/poly.hxx |2 ++
 include/vcl/outdev.hxx |3 ---
 tools/source/generic/poly.cxx  |   12 
 tools/source/generic/poly2.cxx |   11 +++
 vcl/Library_vcl.mk |1 -
 vcl/source/outdev/bezier.cxx   |   41 -
 vcl/source/outdev/polygon.cxx  |6 +++---
 vcl/source/outdev/polyline.cxx |   19 ++-
 8 files changed, 30 insertions(+), 65 deletions(-)

New commits:
commit c1bc990aa5fd2a40191dae9683db7b0cd3e9a0d0
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Apr 17 02:03:23 2014 +1000

No need for vcl/source/outdev/bezier.cxx any more

Change-Id: Ie3c401b5f40972999f45da7d2c4b8ed732454af0

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7c8b3eb..72285c5 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -236,7 +236,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/oldprintadaptor \
 vcl/source/outdev/outdev \
 vcl/source/outdev/tworect \
-vcl/source/outdev/bezier \
 vcl/source/outdev/polygon \
 vcl/source/outdev/transparent \
 vcl/source/outdev/blend \
diff --git a/vcl/source/outdev/bezier.cxx b/vcl/source/outdev/bezier.cxx
deleted file mode 100644
index 5046f65..000
--- a/vcl/source/outdev/bezier.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include vcl/outdev.hxx
-#include tools/poly.hxx
commit 97ce12cd2ef1805a68d210dd41ab2ae3371a8d06
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Apr 17 02:01:20 2014 +1000

Remove commented out code in polyline.cxx

Change-Id: I400d38ccb2e87c6435bc767c13a52beb62baa435

diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index b9da23e..97dab0f 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -234,21 +234,6 @@ void OutputDevice::ImplDrawPolyLineWithLineInfo(const 
Polygon rPoly, const Line
 
 Polygon aPoly = ImplLogicToDevicePixel( rPoly );
 
-// #100127# LineInfo is not curve-safe, subdivide always
-
-// What shall this mean? It's wrong to subdivide here when the
-// polygon is a fat line. In that case, the painted geometry
-// WILL be much different.
-// I also have no idea how this could be related to the given ID
-// which reads 'consolidate boost versions' in the task description.
-// Removing.
-
-//if( aPoly.HasFlags() )
-//{
-//aPoly = ImplSubdivideBezier( aPoly );
-//nPoints = aPoly.GetSize();
-//}
-
 // we need a graphics
 if ( !mpGraphics  !ImplGetGraphics() )
 return;
commit 2024224a4ee351841f50a6f7b8a267f605a17096
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Apr 17 01:45:58 2014 +1000

Move bezier functions

Move ImplSubdivideBezier(Polygon) to Polygon as a static function.
Move ImplSubdivideBezier(PolyPolygon) to PolyPolygon as a static function.

Change-Id: I0d006a8a2d3a8d9ba1aec913ceecb38507e4dd2f

diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 5f5171c..dbfb94da 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -156,6 +156,7 @@ public:
 pixel.
  */
 voidAdaptiveSubdivide( Polygon rResult, const double d = 
1.0 ) const;
+static Polygon  SubdivideBezier( const Polygon rPoly );
 
 voidMove( long nHorzMove, long nVertMove );
 voidTranslate( const Point rTrans );
@@ -242,6 +243,7 @@ public:
 pixel.
  */
 voidAdaptiveSubdivide( PolyPolygon rResult, const double 
d = 1.0 ) const;
+static PolyPolygon  SubdivideBezier( const PolyPolygon rPolyPoly );
 
 voidGetIntersection( const PolyPolygon rPolyPoly, 
PolyPolygon rResult ) const;
 voidGetUnion( const PolyPolygon rPolyPoly, PolyPolygon 
rResult ) const;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6b19451..420fe44 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -275,9 +275,6 @@

Re: HarfBuzz performance problem

2014-04-16 Thread Julien Nabet


On 16/04/2014 18:29, Kohei Yoshida wrote:

On Wed, 2014-04-16 at 12:26 -0400, Kohei Yoshida wrote:

On Wed, 2014-04-16 at 04:41 -0700, julien2412 wrote:

Even if changelog indicates only micro optim, perhaps it could be
interesting to give it a try.

Could you point me to HarfBuzz's change log?  I have hard time finding
it.

Nevermind I found the info I was looking for in the NEWS file.

Just for information, I went to this page: 
http://www.freedesktop.org/software/harfbuzz/release/ , downloaded 
harfbuzz-0.9.27.tar.bz2 file and extract it.


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

[Libreoffice-commits] libcdr.git: 2 commits - libcdr.pc.in

2014-04-16 Thread David Tardon

 libcdr.pc.in |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 94eedda925e3b8a2274b4068bb50455a9fc1869a
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 16 19:06:07 2014 +0200

add other used projects to .pc file

Change-Id: Ib457b04595cfc6cc8916fc92b8cf4622afdfefe1

diff --git a/libcdr.pc.in b/libcdr.pc.in
index b06c8ff..e1bbab4 100644
--- a/libcdr.pc.in
+++ b/libcdr.pc.in
@@ -9,3 +9,5 @@ Version: @VERSION@
 Requires: librevenge-0.0 librevenge-stream-0.0
 Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
 Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
+
+Requires.private: icu-i18n lcms2 zlib
commit 98a4e74de6a8cee5818a2929cd21a9002bab2948
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 16 19:05:17 2014 +0200

require librevenge-stream too

Change-Id: Iee5eb88e5fec5c9c1bb848bac237efde9a46fe4a

diff --git a/libcdr.pc.in b/libcdr.pc.in
index 8af093a..b06c8ff 100644
--- a/libcdr.pc.in
+++ b/libcdr.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
 Description: Library for parsing the Corel Draw file format structure
 Version: @VERSION@
-Requires: librevenge-0.0
+Requires: librevenge-0.0 librevenge-stream-0.0
 Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
 Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libmspub.git: 2 commits - libmspub.pc.in

2014-04-16 Thread David Tardon

 libmspub.pc.in |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 76d5e65866c042b54b70e64f230b9fa66e24a0a2
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 16 19:07:56 2014 +0200

add requires for other projects

Change-Id: Id25d39aa06cddb06783a30f4ad961e1618c8275e

diff --git a/libmspub.pc.in b/libmspub.pc.in
index 9169078..9171530 100644
--- a/libmspub.pc.in
+++ b/libmspub.pc.in
@@ -9,3 +9,5 @@ Version: @VERSION@
 Requires: librevenge-0.0 librevenge-stream-0.0
 Libs: -L${libdir} -lmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
 Cflags: -I${includedir}/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
+
+Requires.private: icu-i18n zlib
commit 53233cdbfeba8fbb7914f1825b100681f64e716f
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 16 19:06:59 2014 +0200

require librevenge-stream too

Change-Id: I023a16c7d7abaa3cd68c047b32c8c6163e0fe36f

diff --git a/libmspub.pc.in b/libmspub.pc.in
index 726357d..9169078 100644
--- a/libmspub.pc.in
+++ b/libmspub.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
 Description: Library for parsing the Microsoft Publisher file format structure
 Version: @VERSION@
-Requires: librevenge-0.0
+Requires: librevenge-0.0 librevenge-stream-0.0
 Libs: -L${libdir} -lmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
 Cflags: -I${includedir}/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: 2 commits - libvisio.pc.in

2014-04-16 Thread David Tardon

 libvisio.pc.in |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 712ed7e69d7a0ef0ae4ff0bfd2b5b2c68b1193b6
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 16 19:13:18 2014 +0200

add requires for other used projects

Change-Id: I438a66de23324c25a1c49b1ad31bc2020e545816

diff --git a/libvisio.pc.in b/libvisio.pc.in
index 7cf1749..d45aef5 100644
--- a/libvisio.pc.in
+++ b/libvisio.pc.in
@@ -9,3 +9,5 @@ Version: @VERSION@
 Requires: librevenge-0.0 librevenge-stream-0.0
 Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
 Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
+
+Requires.private: icu-i18n libxml-2.0 zlib
commit 13d0c3a3957ef167a63b4f529ca86455f64d725a
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 16 19:12:43 2014 +0200

require librevenge-stream too

Change-Id: I1f6c56b691df88830d3e779e2de4dd5ae5028022

diff --git a/libvisio.pc.in b/libvisio.pc.in
index f7b7302..7cf1749 100644
--- a/libvisio.pc.in
+++ b/libvisio.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
 Description: Library for parsing the visio file format structure
 Version: @VERSION@
-Requires: librevenge-0.0
+Requires: librevenge-0.0 librevenge-stream-0.0
 Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
 Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
___
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

2014-04-16 Thread Chris Sherlock

 include/vcl/outdev.hxx |6 +++---
 include/vcl/print.hxx  |6 +++---
 vcl/source/gdi/print.cxx   |6 +++---
 vcl/source/outdev/mask.cxx |   28 +++-
 4 files changed, 20 insertions(+), 26 deletions(-)

New commits:
commit bc3625fce46e3e4529b2eb7daabc5c66d7b1cbcc
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Apr 17 02:56:10 2014 +1000

fdo#74702 Move common mask functionality to ApplyMask

There is code in OutputDevice that essentially carries out the same
functionality as ImplPrintMask, but for VirtualDevice and Window
instances. Therefore, renamed ImplPrintMask to ApplyMask and moved
OutputDevice functionality into new protected function ApplyMask.

Change-Id: Ia88469e9b149f7819dfc538ecbe014198e4534f6

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 420fe44..3034fb3 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -848,9 +848,9 @@ public:
 protected:
 OutputDevice();
 
-virtual voidImplPrintMask ( const Bitmap rMask, const 
Color rMaskColor,
-const Point rDestPt, const 
Size rDestSize,
-const Point rSrcPtPixel, 
const Size rSrcSizePixel );
+virtual voidApplyMask ( const Bitmap rMask, const Color 
rMaskColor,
+const Point rDestPt, const Size 
rDestSize,
+const Point rSrcPtPixel, const 
Size rSrcSizePixel );
 
 virtual boolUsePolyPolygonForComplexGradient() = 0;
 
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 6309f12..23c656d 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -283,9 +283,9 @@ protected:
 
 voidSetSelfAsQueuePrinter( bool bQueuePrinter ) { 
mbIsQueuePrinter = bQueuePrinter; }
 boolIsQueuePrinter() const { return 
mbIsQueuePrinter; }
-virtual voidImplPrintMask ( const Bitmap rMask, const 
Color rMaskColor,
-const Point rDestPt, const 
Size rDestSize,
-const Point rSrcPtPixel, 
const Size rSrcSizePixel ) SAL_OVERRIDE;
+virtual voidApplyMask ( const Bitmap rMask, const Color 
rMaskColor,
+const Point rDestPt, const Size 
rDestSize,
+const Point rSrcPtPixel, const 
Size rSrcSizePixel ) SAL_OVERRIDE;
 
 boolDrawTransformBitmapExDirect(
 const basegfx::B2DHomMatrix 
aFullTransform,
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 7adfcde..d25a28e 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -801,9 +801,9 @@ void Printer::ImplInitDisplay( const Window* pWindow )
 mnDPIY  = mpDisplayDev-mnDPIY;
 }
 
-void Printer::ImplPrintMask( const Bitmap rMask, const Color rMaskColor,
- const Point rDestPt, const Size rDestSize,
- const Point rSrcPtPixel, const Size 
rSrcSizePixel )
+void Printer::ApplyMask( const Bitmap rMask, const Color rMaskColor,
+ const Point rDestPt, const Size rDestSize,
+ const Point rSrcPtPixel, const Size rSrcSizePixel )
 {
 Point   aPt;
 Point   aDestPt( LogicToPixel( rDestPt ) );
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index f8562b2..20f97d3 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -96,13 +96,15 @@ void OutputDevice::DrawMask( const Point rDestPt, const 
Size rDestSize,
 
 OUTDEV_INIT();
 
-if ( OUTDEV_PRINTER == meOutDevType )
-{
-ImplPrintMask( rBitmap, rMaskColor, rDestPt, rDestSize, rSrcPtPixel, 
rSrcSizePixel );
-return;
-}
+ApplyMask( rBitmap, rMaskColor, rDestPt, rDestSize, rSrcPtPixel, 
rSrcSizePixel );
+
+}
 
-const ImpBitmap* pImpBmp = rBitmap.ImplGetImpBitmap();
+void OutputDevice::ApplyMask( const Bitmap rMask, const Color rMaskColor,
+  const Point rDestPt, const Size rDestSize,
+  const Point rSrcPtPixel, const Size 
rSrcSizePixel )
+{
+const ImpBitmap* pImpBmp = rMask.ImplGetImpBitmap();
 if ( pImpBmp )
 {
 SalTwoRect aPosAry;
@@ -125,7 +127,7 @@ void OutputDevice::DrawMask( const Point rDestPt, const 
Size rDestSize,
 
 if( nMirrFlags )
 {
-Bitmap aTmp( rBitmap );
+Bitmap aTmp( rMask );
 aTmp.Mirror( nMirrFlags );
 mpGraphics-DrawMask( aPosAry, 
*aTmp.ImplGetImpBitmap()-ImplGetSalBitmap(),
   ImplColorToSal( rMaskColor )

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-04-16 Thread bugzilla-daemon

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

Bug 65675 depends on bug 50855, which changed state.

Bug 50855 Summary: VIEWING: Nimbus Sans L missing styles
https://bugs.freedesktop.org/show_bug.cgi?id=50855

   What|Removed |Added

 Status|NEEDINFO|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

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

2014-04-16 Thread Chris Sherlock

 include/vcl/outdev.hxx  |3 ++-
 include/vcl/window.hxx  |2 ++
 vcl/source/outdev/wallpaper.cxx |   35 +++
 vcl/source/window/window.cxx|   40 
 4 files changed, 51 insertions(+), 29 deletions(-)

New commits:
commit 948c4654f683e93b757f96e8859e9e91b45298a4
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Apr 17 03:45:23 2014 +1000

fdo#74702 Seperate ImplDrawGradientWallpaper and rename

I have made ImplDrawGradientWallpaper a virtual protected function as
Window needs to handle this differently to Printer and VirtualDevice
instances. I have also renamed it to DrawGradientWallpaper.

Change-Id: I529ed0a757cfcebb6fe06f3738219ec43272f657

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3034fb3..c428c81 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -768,7 +768,6 @@ public:
 SAL_DLLPRIVATE void ImplDrawWallpaper( long nX, long nY, long 
nWidth, long nHeight, const Wallpaper rWallpaper );
 SAL_DLLPRIVATE void ImplDrawColorWallpaper( long nX, long nY, long 
nWidth, long nHeight, const Wallpaper rWallpaper );
 SAL_DLLPRIVATE void ImplDrawBitmapWallpaper( long nX, long nY, 
long nWidth, long nHeight, const Wallpaper rWallpaper );
-SAL_DLLPRIVATE void ImplDrawGradientWallpaper( long nX, long nY, 
long nWidth, long nHeight, const Wallpaper rWallpaper );
 ///@}
 
 /** @name Bitmap functions
@@ -891,6 +890,8 @@ protected:
 virtual voidEmulateDrawTransparent( const PolyPolygon 
rPolyPoly, sal_uInt16 nTransparencePercent );
 voidDrawInvisiblePolygon( const PolyPolygon 
rPolyPoly );
 
+virtual voidDrawGradientWallpaper( long nX, long nY, long 
nWidth, long nHeight, const Wallpaper rWallpaper );
+
 private:
 typedef void ( OutputDevice::* FontUpdateHandler_t )( bool );
 
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 786cd0d..f71ae68 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -583,6 +583,8 @@ protected:
 virtual voidClipToPaintRegion( Rectangle rDstRect ) 
SAL_OVERRIDE;
 virtual boolUsePolyPolygonForComplexGradient() 
SAL_OVERRIDE;
 
+virtual voidDrawGradientWallpaper( long nX, long nY, long 
nWidth, long nHeight, const Wallpaper rWallpaper ) SAL_OVERRIDE;
+
 public:
 bool HasMirroredGraphics() const SAL_OVERRIDE;
 
diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx
index c53c1ec..d59d9f4 100644
--- a/vcl/source/outdev/wallpaper.cxx
+++ b/vcl/source/outdev/wallpaper.cxx
@@ -113,7 +113,7 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long 
nY,
 
 // background of bitmap?
 if( bDrawGradientBackground )
-ImplDrawGradientWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
+DrawGradientWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
 else if( bDrawColorBackground  bTransparent )
 {
 ImplDrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
@@ -301,43 +301,22 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long 
nY,
 mpMetaFile = pOldMetaFile;
 }
 
-void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY,
-  long nWidth, long nHeight,
-  const Wallpaper rWallpaper )
+void OutputDevice::DrawGradientWallpaper( long nX, long nY,
+  long nWidth, long nHeight,
+  const Wallpaper rWallpaper )
 {
 Rectangle   aBound;
 GDIMetaFile*pOldMetaFile = mpMetaFile;
 const bool  bOldMap = mbMap;
-boolbNeedGradient = true;
 
-aBound = Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) );
+aBound = Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) );
 
 mpMetaFile = NULL;
 EnableMapMode( false );
 Push( PUSH_CLIPREGION );
 IntersectClipRegion( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) 
);
 
-if( OUTDEV_WINDOW == meOutDevType  rWallpaper.GetStyle() == 
WALLPAPER_APPLICATIONGRADIENT )
-{
-Window *pWin = dynamic_cast Window* ( this );
-if( pWin )
-{
-// limit gradient to useful size, so that it still can be noticed
-// in maximized windows
-long gradientWidth = pWin-GetDesktopRectPixel().GetSize().Width();
-if( gradientWidth  1024 )
-gradientWidth = 1024;
-if( mnOutOffX+nWidth  gradientWidth )
-ImplDrawColorWallpaper(  nX, nY, nWidth, nHeight, 
rWallpaper.GetGradient().GetEndColor() );
-if( mnOutOffX  gradientWidth )
-bNeedGradient = false;
-else
-aBound = Rectangle( Point( -mnOutOffX, nY ), Size( 
gradientWidth,

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

2014-04-16 Thread Stephan Bergmann

 sw/source/core/text/inftxt.cxx |   12 +++-
 sw/source/core/text/inftxt.hxx |2 +-
 sw/source/core/text/porfld.cxx |3 +--
 sw/source/core/text/portxt.cxx |7 +++
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 2ecc196419c7eae4e1a286fb209cfb4b6df23550
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 20:43:37 2014 +0200

Do not pass bad pointers to strlen

...neither a pointer to a lone char nor null

Change-Id: I08a4f6b80310e23edd614490633b677bd50323a4

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index d1dc520..001844d 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1659,7 +1659,7 @@ SwTxtSlot::SwTxtSlot(
 const SwLinePortion *pPor,
 bool bTxtLen,
 bool bExgLists,
-const sal_Char *pCh )
+OUString const  pCh )
 : pOldTxt(0)
 , pOldSmartTagList(0)
 , pOldGrammarCheckList(0)
@@ -1668,13 +1668,15 @@ SwTxtSlot::SwTxtSlot(
 , nLen(0)
 , pInf(NULL)
 {
-if( pCh )
+if( pCh.isEmpty() )
 {
-aTxt = OUString( pCh, strlen(pCh), RTL_TEXTENCODING_MS_1252 );
-bOn = true;
+bOn = pPor-GetExpTxt( *pNew, aTxt );
 }
 else
-bOn = pPor-GetExpTxt( *pNew, aTxt );
+{
+aTxt = pCh;
+bOn = true;
+}
 
 // The text is replaced ...
 if( bOn )
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index d81d16e..112bed8 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -777,7 +777,7 @@ public:
 // The replacement string originates either from the portion via 
GetExpText()
 // or from the char * pCh, if it is not NULL
 SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, bool 
bTxtLen,
-   bool bExgLists, const sal_Char *pCh = NULL );
+   bool bExgLists, OUString const  pCh = OUString() );
 ~SwTxtSlot();
 bool IsOn() const { return bOn; }
 };
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index e711579..7064e43 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -713,7 +713,6 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo rInf ) 
const
 if( bPaintSpace  nOldWidth  nSpaceOffs )
 {
 SwTxtPaintInfo aInf( rInf );
-static sal_Char const sDoubleSpace[] =   ;
 aInf.X( aInf.X() + nSpaceOffs );
 
 // #i53199# Adjust position of underline:
@@ -725,7 +724,7 @@ static sal_Char const sDoubleSpace[] =   ;
 
 pThis-Width( nOldWidth - nSpaceOffs + 12 );
 {
-SwTxtSlot aDiffTxt( aInf, this, true, false, sDoubleSpace 
);
+SwTxtSlot aDiffTxt( aInf, this, true, false,);
 aInf.DrawText( *this, aInf.GetLen(), true );
 }
 }
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index ebeef8e..a379e4c 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -719,7 +719,7 @@ bool SwTxtInputFldPortion::Format( SwTxtFormatInfo rInf )
 }
 else
 {
-SwTxtSlot aFormatTxt( rInf, this, true, true, 0 );
+SwTxtSlot aFormatTxt( rInf, this, true, true );
 if ( rInf.GetLen() == 0 )
 {
 Width( 0 );
@@ -763,9 +763,8 @@ void SwTxtInputFldPortion::Paint( const SwTxtPaintInfo 
rInf ) const
 if ( Width() )
 {
 rInf.DrawViewOpt( *this, POR_INPUTFLD );
-static sal_Char sSpace = ' ';
 SwTxtSlot aPaintTxt( rInf, this, true, true,
-ContainsOnlyDummyChars() ? sSpace : 0 );
+ ContainsOnlyDummyChars() ? OUString( ) : 
OUString() );
 SwTxtPortion::Paint( rInf );
 }
 }
@@ -790,7 +789,7 @@ bool SwTxtInputFldPortion::GetExpTxt( const SwTxtSizeInfo 
rInf, OUString rTxt
 
 SwPosSize SwTxtInputFldPortion::GetTxtSize( const SwTxtSizeInfo rInf ) const
 {
-SwTxtSlot aFormatTxt( rInf, this, true, false, 0 );
+SwTxtSlot aFormatTxt( rInf, this, true, false );
 if ( rInf.GetLen() == 0 )
 {
 return SwPosSize( 0, 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Kohei Yoshida

 sc/source/core/data/column2.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 947177a5cb79e03a415d9c3d1203420c874d2b35
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 14:40:09 2014 -0400

fdo#74555: Avoid excessive calls to GetPreviewCellStyle().

GetOptimalHeight() gets called *all the time* and is very performance
sensitive.  Let's not do an expensive operation such as 
GetPreviewCellStyle()
which slows down pretty much everything else after the non-default font is
applied.

Change-Id: I5d5b2e706dd5dd98173044642b98ccaedd9536f0

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index a899ea9..b7d76d6 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -767,15 +767,6 @@ void ScColumn::GetOptimalHeight(
 ::boost::ptr_vectorScPatternAttr aAltPatterns;
 while ( pPattern )
 {
-// GetOptimalHeight called for preview style needs to
-// use really use the style
-if ( ScStyleSheet* pStyle = pDocument-GetPreviewCellStyle( nCol, 
nStartRow, nTab ) )
-{
-aAltPatterns.push_back( new ScPatternAttr( *pPattern ) );
-ScPatternAttr* pModifiedPatt = aAltPatterns.back();
-pModifiedPatt-SetStyleSheet( pStyle );
-pPattern = pModifiedPatt;
-}
 const ScMergeAttr*  pMerge = (const 
ScMergeAttr*)pPattern-GetItem(ATTR_MERGE);
 const ScMergeFlagAttr*  pFlag = (const 
ScMergeFlagAttr*)pPattern-GetItem(ATTR_MERGE_FLAG);
 if ( pMerge-GetRowMerge()  1 || pFlag-IsOverlapped() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Caolán McNamara

 editeng/source/items/textitem.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 64b040866df60d3e89dcda17b63a1fffdac5e9df
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 16:49:22 2014 +0100

coverity#735422 Logically dead code

Change-Id: I8e1694c311e1e29dc5ea59b292c6afe90fb762fa

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index b976712..8b3e357 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -873,8 +873,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any rVal, 
sal_uInt8 nMemberId ) const
 // CONVERT_TWIPS is not set.
 if( bConvert )
 {
-long nTwips = bConvert ? nHeight : convertMm100ToTwip(nHeight);
-rVal = (float)( nTwips / 20.0 );
+rVal = (float)( nHeight / 20.0 );
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Kohei Yoshida

 sc/source/ui/undo/undoblk3.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 1d1fbbe81b4435765d3f69c6bcae2840dc629912
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 15:17:13 2014 -0400

fdo#74687: Undo  redo of format-only changes don't need broadcasting.

Also discovered that the undo path was broadcasting twice.  Let's only
do it once.

Change-Id: I169f1659aecb1eb78be3a497e244f79c5883e50f

diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index a23cf09..437a9e1 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -142,7 +142,6 @@ void ScUndoDeleteContents::DoChange( const bool bUndo )
 aCopyRange.aEnd.SetTab(nTabCount-1);
 
 pUndoDoc-CopyToDocument( aCopyRange, nUndoFlags, bMulti, pDoc, 
aMarkData );
-BroadcastChanges(aCopyRange);
 
 DoSdrUndoAction( pDrawUndo, pDoc );
 
@@ -184,7 +183,10 @@ void ScUndoDeleteContents::Undo()
 DoChange( true );
 EndUndo();
 
-BroadcastChanges(aRange);
+if (nFlags  IDF_CONTENTS)
+// Broadcast only when the content changes. fdo#74687
+BroadcastChanges(aRange);
+
 HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange);
 }
 
@@ -194,7 +196,10 @@ void ScUndoDeleteContents::Redo()
 DoChange( false );
 EndRedo();
 
-BroadcastChanges(aRange);
+if (nFlags  IDF_CONTENTS)
+// Broadcast only when the content changes. fdo#74687
+BroadcastChanges(aRange);
+
 HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - bin/get-bugzilla-attachments-by-mimetype sc/source sd/source svx/source

2014-04-16 Thread Caolán McNamara

 bin/get-bugzilla-attachments-by-mimetype|1 
 sc/source/core/tool/interpr7.cxx|6 ---
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |8 ++---
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |   25 ++--
 4 files changed, 9 insertions(+), 31 deletions(-)

New commits:
commit 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 20:24:33 2014 +0100

Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tab

Change-Id: I38deeae3135badde23b9d454d548193af654caab

diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx 
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 97d7aaa..1e65803 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -175,7 +175,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent 
rMEvt )
 class CustomAnimationCreateTabPage : public TabPage
 {
 public:
-CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList rCategoryList, bool bHasText );
+CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList rCategoryList, bool bHasText, bool bIsMotionPath = false );
 virtual ~CustomAnimationCreateTabPage();
 
 PathKind getCreatePathKind() const;
@@ -236,7 +236,7 @@ bool ImplStlEffectCategorySortHelper::operator()( const 
CustomAnimationPresetPtr
 return mxCollator-compareString(p1-getLabel(), p2-getLabel()) == -1;
 }
 
-CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList rCategoryList, bool bHasText )
+CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList rCategoryList, bool bHasText, bool bIsMotionPath )
 : TabPage( pParent, CustomAnimationCreateTab, 
modules/simpress/ui/customanimationcreatetab.ui )
 , mpParent( pDialogParent )
 , mnId( nTabId )
@@ -257,7 +257,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( 
Window* pParent, Cus
 
 sal_Int32  nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
 
-if( nTabId == MOTIONPATH )
+if( bIsMotionPath )
 {
 mpLBEffects-InsertCategory( sMotionPathLabel );
 
@@ -524,7 +524,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( 
Window* pParent, Custo
 mpTabControl-SetTabPage( mnEmphasisId, mpTabPages[EMPHASIS] );
 mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, 
mnExitId, rPresets.getExitPresets(), bHasText );
 mpTabControl-SetTabPage( mnExitId, mpTabPages[EXIT] );
-mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, 
this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText );
+mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, 
this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText, true );
 mpTabControl-SetTabPage( mnMPathId, mpTabPages[MOTIONPATH] );
 mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, 
this, mnMiscId, rPresets.getMiscPresets(), bHasText );
 mpTabControl-SetTabPage( mnMiscId, mpTabPages[MISCEFFECTS] );
commit b5fd106f93321fb79e74a4cbcd0ea9a62b6f4474
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 16:53:31 2014 +0100

add image/x-sun-raster mimetype

Change-Id: I6c53ec2ae15a68b9fa6bfd0daf81d6a21ca6c457

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 3480713..ce967e2 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -437,6 +437,7 @@ mimetypes = {
 'image/x-portable-pixmap': 'ppm',
 'image/vnd.adobe.photoshop': 'psd',
 'image/x-cmu-raster': 'ras',
+'image/x-sun-raster': 'ras',
 'image/x-xbitmap': 'xbm',
 'image/x-xpixmap': 'xpm',
 }
commit 032a127348ff8146bad53ec19c5db47aea5ebdb6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 16:29:00 2014 +0100

cppcheck: duplicate branch

Change-Id: I2348a763ba4ba2ae8d00df926d6a1dddceb02b4c

diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index c249a55..9ba8cd4 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -96,12 +96,6 @@ void ScInterpreter::ScFilterXML()
 boost::shared_ptrxmlChar 
pChar2(xmlNodeGetContent(cur), xmlFree);
 aResult = 
OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8);
 }
-else if(pNodeSet-nodeTab[0]-type == XML_ELEMENT_NODE)
-{
-

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

2014-04-16 Thread Caolán McNamara

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

New commits:
commit f7e32ba07910956bd09d79e37eb8ce6eb8a0ac30
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Apr 16 13:04:52 2014 +0100

Resolves: fdo#75525 out by one error

(cherry picked from commit 12984e46704f1e55f76b210cf65217e54662dc26)

Conflicts:
starmath/source/dialog.cxx

Change-Id: I0171d2a79b6b015fa2f01d78228e901005017fb0
Reviewed-on: https://gerrit.libreoffice.org/9066
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 73d93ab..fc9641b 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -643,7 +643,7 @@ SmCategoryDesc::SmCategoryDesc(VclBuilderContainer 
rBuilder, sal_uInt16 nCatego
 Graphics [i] = 0;
 }
 
-const FieldMinMax rMinMax = pMinMaxData[ nCategoryIdx ][i];
+const FieldMinMax rMinMax = pMinMaxData[ nCategoryIdx-1 ][i];
 Value[i] = Minimum[i] = rMinMax.nMin;
 Maximum[i] = rMinMax.nMax;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Stephan Bergmann

 binaryurp/source/incomingrequest.cxx  |9 +---
 binaryurp/source/writer.cxx   |4 -
 package/source/xstor/ocompinstream.cxx|   62 ++--
 package/source/xstor/oseekinstream.cxx|   12 ++---
 package/source/xstor/owriteablestream.cxx |   66 +++---
 vcl/unx/generic/printer/ppdparser.cxx |   18 
 6 files changed, 85 insertions(+), 86 deletions(-)

New commits:
commit c3e84d4c74847271f88e1f83369d0b55b2fd6037
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 16 22:42:40 2014 +0200

sal/log.hxx functionality also includes the equivalent of OSL_LOG_PREFIX

Change-Id: I1bb0115a378003b5cc5b1cfc59c474a1f100d894

diff --git a/binaryurp/source/incomingrequest.cxx 
b/binaryurp/source/incomingrequest.cxx
index 1ac6e10..ff30a8e 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -101,16 +101,16 @@ void IncomingRequest::execute() const {
 return;
 } catch (const css::uno::RuntimeException  e) {
 OSL_TRACE(
-OSL_LOG_PREFIX caught UNO runtime exception '%s',
+caught UNO runtime exception '%s',
 (OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
  getStr()));
 } catch (const std::exception  e) {
-OSL_TRACE(OSL_LOG_PREFIX caught C++ exception '%s', e.what());
+OSL_TRACE(caught C++ exception '%s', e.what());
 }
 bridge_-terminate(false);
 } else {
 if (isExc) {
-OSL_TRACE(OSL_LOG_PREFIX oneway method raised exception);
+OSL_TRACE(oneway method raised exception);
 }
 bridge_-decrementCalls();
 }
@@ -148,8 +148,7 @@ bool IncomingRequest::execute_throw(
 ifc = prov-getInstance(oid_);
 } catch (const css::container::NoSuchElementException  e) {
 OSL_TRACE(
-(OSL_LOG_PREFIX initial element '%s':
-  NoSuchElementException '%s'),
+initial element '%s': NoSuchElementException '%s',
 OUStringToOString(oid_, 
RTL_TEXTENCODING_UTF8).getStr(),
 (OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
  getStr()));
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index edcb0f5..46198b9 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -171,10 +171,10 @@ void Writer::execute() {
 }
 } catch (const css::uno::Exception  e) {
 OSL_TRACE(
-OSL_LOG_PREFIX caught UNO exception '%s',
+caught UNO exception '%s',
 OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
 } catch (const std::exception  e) {
-OSL_TRACE(OSL_LOG_PREFIX caught C++ exception '%s', e.what());
+OSL_TRACE(caught C++ exception '%s', e.what());
 }
 bridge_-terminate(false);
 bridge_.clear();
diff --git a/package/source/xstor/ocompinstream.cxx 
b/package/source/xstor/ocompinstream.cxx
index 3693364..0165d0a 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -115,13 +115,13 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( 
uno::Sequence sal_Int8  aData
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
+SAL_INFO(package.xstor, Disposed!);
 throw lang::DisposedException();
 }
 
 if ( !m_xStream.is() )
 {
-SAL_INFO(package.xstor, OSL_LOG_PREFIX No stream!);
+SAL_INFO(package.xstor, No stream!);
 throw uno::RuntimeException();
 }
 
@@ -137,13 +137,13 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( 
uno::Sequence sal_Int8  a
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
+SAL_INFO(package.xstor, Disposed!);
 throw lang::DisposedException();
 }
 
 if ( !m_xStream.is() )
 {
-SAL_INFO(package.xstor, OSL_LOG_PREFIX No stream!);
+SAL_INFO(package.xstor, No stream!);
 throw uno::RuntimeException();
 }
 
@@ -160,13 +160,13 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 
nBytesToSkip )
 ::osl::MutexGuard aGuard( m_rMutexRef-GetMutex() );
 if ( m_bDisposed )
 {
-SAL_INFO(package.xstor, OSL_LOG_PREFIX Disposed!);
+SAL_INFO(package.xstor, Disposed!);
 throw lang::DisposedException();
 }
 
 if ( !m_xStream.is() )
 {
-SAL_INFO(package.xstor, OSL_LOG_PREFIX No stream!);
+SAL_INFO(package.xstor, No stream!);
 throw uno::RuntimeException();
 }
 
@@ -182,13 +182,13 @@ sal_Int32 SAL_CALL OInputCompStream::available(  )
 ::osl::MutexGuard aGuard(

[Libreoffice-commits] core.git: Branch 'private/moggi/screen-rendering' - chart2/source

2014-04-16 Thread Markus Mohrhard

 chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx |3 ++-
 chart2/source/inc/FastPropertyIdRanges.hxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0ce6d08eed4ba3a8451053de2a3ef95405943820
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Apr 17 01:28:38 2014 +0200

fix non unique property handle

Change-Id: I110feee77ab65bc8f528e85cba7c74063937b086

diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 20e366c..5625242 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -9,6 +9,7 @@
 
 #include WrappedGL3DProperties.hxx
 #include Chart2ModelContact.hxx
+#include FastPropertyIdRanges.hxx
 #include unonames.hxx
 #include WrappedProperty.hxx
 #include DiagramHelper.hxx
@@ -24,7 +25,7 @@ namespace {
 
 enum
 {
-PROP_GL3DCHARTTYPE_ROUNDED_EDGE
+PROP_GL3DCHARTTYPE_ROUNDED_EDGE = FAST_PROPERTY_ID_START_GL_3D
 };
 
 class WrappedGL3DProperty : public WrappedProperty
diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx 
b/chart2/source/inc/FastPropertyIdRanges.hxx
index 0c24f46..d848bab 100644
--- a/chart2/source/inc/FastPropertyIdRanges.hxx
+++ b/chart2/source/inc/FastPropertyIdRanges.hxx
@@ -40,7 +40,8 @@ enum FastPropertyIdRanges
 FAST_PROPERTY_ID_START_CHART_SPLINE_PROP = FAST_PROPERTY_ID_START + 15000,
 FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000,
 FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP = FAST_PROPERTY_ID_START + 
17000,
-FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000
+FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000,
+FAST_PROPERTY_ID_START_GL_3D = FAST_PROPERTY_ID_START + 19000
 };
 
 } //  namespace chart
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Kohei Yoshida

 sc/inc/scopetools.hxx  |9 
 sc/source/core/tool/scopetools.cxx |   11 +
 sc/source/ui/inc/output.hxx|2 
 sc/source/ui/view/output2.cxx  |   76 -
 4 files changed, 80 insertions(+), 18 deletions(-)

New commits:
commit 4321ca5a3ca78e4a6e6c3654dbab825036bb60e3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 15 14:37:47 2014 -0400

fdo#75665: Truncate string when clipped on screen.

This improves performance of text layouting by HarfBuzz for very long 
strings.
HarfBuzz's layout algorithm appears to be more expensive than ICU's.

(cherry picked from commit 087a79db1272858f107656c5ca3c6efb45680986)
(cherry picked from commit 6fa4d31d6a7e363285f22d4c0012521d10073652)
(cherry picked from commit 8e50a6c7b1cb9481cce42c71ff07e921fb4292d0)
(cherry picked from commit 21fc47e115530780ad45ae64e8076dc5e9fedb5e)

Conflicts:
sc/inc/scopetools.hxx
sc/source/core/tool/scopetools.cxx
sc/source/ui/view/output2.cxx

Change-Id: Ic9738b7b8f0f1a29c51c83b147763118939b90ef
Reviewed-on: https://gerrit.libreoffice.org/9057
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 3544b79..802aea1 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -35,6 +35,15 @@ public:
 ~ExpandRefsSwitch();
 };
 
+class SC_DLLPUBLIC IdleSwitch
+{
+ScDocument mrDoc;
+bool mbOldValue;
+public:
+IdleSwitch(ScDocument rDoc, bool bEnableIdle);
+~IdleSwitch();
+};
+
 }
 
 #endif
diff --git a/sc/source/core/tool/scopetools.cxx 
b/sc/source/core/tool/scopetools.cxx
index af65cff..6f423d0 100644
--- a/sc/source/core/tool/scopetools.cxx
+++ b/sc/source/core/tool/scopetools.cxx
@@ -34,6 +34,17 @@ ExpandRefsSwitch::~ExpandRefsSwitch()
 mrDoc.SetExpandRefs(mbOldValue);
 }
 
+IdleSwitch::IdleSwitch(ScDocument rDoc, bool bEnableIdle) :
+mrDoc(rDoc), mbOldValue(rDoc.IsIdleEnabled())
+{
+mrDoc.EnableIdle(bEnableIdle);
+}
+
+IdleSwitch::~IdleSwitch()
+{
+mrDoc.EnableIdle(mbOldValue);
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 03952a8..a34dab6 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -70,6 +70,8 @@ private:
 Rectangle   maAlignRect;
 Rectangle   maClipRect;
 longmnColWidth;
+longmnLeftClipLength; /// length of the string getting cut off 
on the left.
+longmnRightClipLength; /// length of the string getting cut 
off on the right.
 boolmbLeftClip;
 boolmbRightClip;
 };
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 544e737..75739d4 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -60,6 +60,7 @@
 #include markdata.hxx
 #include stlsheet.hxx
 #include spellcheckcontext.hxx
+#include scopetools.hxx
 
 #include com/sun/star/i18n/DirectionProperty.hpp
 #include comphelper/string.hxx
@@ -1245,8 +1246,8 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, 
long nPosX, long nPosY
 --nMergeSizeX;  // leave out the grid horizontally, also for alignment 
(align between grid lines)
 
 rParam.mnColWidth = nMergeSizeX; // store the actual column width.
+rParam.mnLeftClipLength = rParam.mnRightClipLength = 0;
 
-//
 // construct the rectangles using logical left/right values (justify is 
called at the end)
 //
 
@@ -1338,6 +1339,8 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, 
long nPosX, long nPosY
 
 rParam.mbLeftClip = ( nLeftMissing  0 );
 rParam.mbRightClip = ( nRightMissing  0 );
+rParam.mnLeftClipLength = nLeftMissing;
+rParam.mnRightClipLength = nRightMissing;
 }
 else
 {
@@ -1451,9 +1454,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 
 vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, 
mpDev-GetExtOutDevData() );
 
-bool bWasIdleEnabled = mpDoc-IsIdleEnabled();
-mpDoc-EnableIdle(false);
-
+sc::IdleSwitch aIdleSwitch(*mpDoc, false);
 ScDrawStringsVars aVars( this, bPixelToLogic );
 
 sal_Bool bProgress = false;
@@ -1485,6 +1486,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 // before processing the cell value.
 ::boost::ptr_vectorScPatternAttr aAltPatterns;
 
+std::vectorsal_Int32 aDX;
 long nPosY = nScrY;
 for (SCSIZE nArrY=1; nArrY+1nArrCount; nArrY++)
 {
@@ -2030,25 +2032,64 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 //  aufgezeichnet werden (fuer nicht-proportionales 
Resize):
 
 OUString aString = aVars.GetString();
-if (bMetaFile || pFmtDevice

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

2014-04-16 Thread Kohei Yoshida

 sc/source/core/data/column2.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 9585ea8a3f10be60c42b671a07dfafd78f173e52
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 14:40:09 2014 -0400

fdo#74555: Avoid excessive calls to GetPreviewCellStyle().

GetOptimalHeight() gets called *all the time* and is very performance
sensitive.  Let's not do an expensive operation such as 
GetPreviewCellStyle()
which slows down pretty much everything else after the non-default font is
applied.

Change-Id: I5d5b2e706dd5dd98173044642b98ccaedd9536f0
(cherry picked from commit 947177a5cb79e03a415d9c3d1203420c874d2b35)
Reviewed-on: https://gerrit.libreoffice.org/9074
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f6825e2..465ae23 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -775,15 +775,6 @@ void ScColumn::GetOptimalHeight(
 ::boost::ptr_vectorScPatternAttr aAltPatterns;
 while ( pPattern )
 {
-// GetOptimalHeight called for preview style needs to
-// use really use the style
-if ( ScStyleSheet* pStyle = pDocument-GetPreviewCellStyle( nCol, 
nStartRow, nTab ) )
-{
-aAltPatterns.push_back( new ScPatternAttr( *pPattern ) );
-ScPatternAttr* pModifiedPatt = aAltPatterns.back();
-pModifiedPatt-SetStyleSheet( pStyle );
-pPattern = pModifiedPatt;
-}
 const ScMergeAttr*  pMerge = (const 
ScMergeAttr*)pPattern-GetItem(ATTR_MERGE);
 const ScMergeFlagAttr*  pFlag = (const 
ScMergeFlagAttr*)pPattern-GetItem(ATTR_MERGE_FLAG);
 if ( pMerge-GetRowMerge()  1 || pFlag-IsOverlapped() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Kohei Yoshida

 sc/source/ui/undo/undoblk3.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 8d63fce4ec73aa4ee9fd5348fe675e4f0b0a3b6b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 15:17:13 2014 -0400

fdo#74687: Undo  redo of format-only changes don't need broadcasting.

Also discovered that the undo path was broadcasting twice.  Let's only
do it once.

Change-Id: I169f1659aecb1eb78be3a497e244f79c5883e50f
(cherry picked from commit 1d1fbbe81b4435765d3f69c6bcae2840dc629912)
Reviewed-on: https://gerrit.libreoffice.org/9075
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 3239b1c..a06a076 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -141,7 +141,6 @@ void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
 aCopyRange.aEnd.SetTab(nTabCount-1);
 
 pUndoDoc-CopyToDocument( aCopyRange, nUndoFlags, bMulti, pDoc, 
aMarkData );
-BroadcastChanges(aCopyRange);
 
 DoSdrUndoAction( pDrawUndo, pDoc );
 
@@ -183,7 +182,10 @@ void ScUndoDeleteContents::Undo()
 DoChange( sal_True );
 EndUndo();
 
-BroadcastChanges(aRange);
+if (nFlags  IDF_CONTENTS)
+// Broadcast only when the content changes. fdo#74687
+BroadcastChanges(aRange);
+
 HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange);
 }
 
@@ -193,7 +195,10 @@ void ScUndoDeleteContents::Redo()
 DoChange( false );
 EndRedo();
 
-BroadcastChanges(aRange);
+if (nFlags  IDF_CONTENTS)
+// Broadcast only when the content changes. fdo#74687
+BroadcastChanges(aRange);
+
 HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Markus Mohrhard

 chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx |3 ++-
 chart2/source/inc/FastPropertyIdRanges.hxx |3 ++-
 sc/source/ui/unoobj/chart2uno.cxx  |5 +
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 0ce6d9bcea7c37a7cb2c42e8393e2e20780bd171
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Apr 17 02:02:15 2014 +0200

limit the range shrinking in charts to really large ranges, fdo#70609,

Also improves the situation for fdo#55697.

It is just the fist step to a better algorithm.

Change-Id: I15de1ca6604e585fcf5690f0d903c757d641e765

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 826e74b..348c86d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1368,6 +1368,8 @@ bool lcl_addUpperLeftCornerIfMissing(vectorScTokenRef 
rRefTokens,
 return true;
 }
 
+#define SHRINK_RANGE_THRESHOLD 1
+
 class ShrinkRefTokenToDataRange : std::unary_functionScTokenRef, void
 {
 ScDocument* mpDoc;
@@ -1387,6 +1389,9 @@ public:
 ScSingleRefData s = rData.Ref1;
 ScSingleRefData e = rData.Ref2;
 
+if(abs((e.Col()-s.Col())*(e.Row()-s.Row()))  SHRINK_RANGE_THRESHOLD)
+return;
+
 SCCOL nMinCol = MAXCOL, nMaxCol = 0;
 SCROW nMinRow = MAXROW, nMaxRow = 0;
 
commit b7ba33e4a0a2094b9e515249d9da0c30a1272402
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Apr 17 01:28:38 2014 +0200

fix non unique property handle

Change-Id: I110feee77ab65bc8f528e85cba7c74063937b086

diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 20e366c..5625242 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -9,6 +9,7 @@
 
 #include WrappedGL3DProperties.hxx
 #include Chart2ModelContact.hxx
+#include FastPropertyIdRanges.hxx
 #include unonames.hxx
 #include WrappedProperty.hxx
 #include DiagramHelper.hxx
@@ -24,7 +25,7 @@ namespace {
 
 enum
 {
-PROP_GL3DCHARTTYPE_ROUNDED_EDGE
+PROP_GL3DCHARTTYPE_ROUNDED_EDGE = FAST_PROPERTY_ID_START_GL_3D
 };
 
 class WrappedGL3DProperty : public WrappedProperty
diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx 
b/chart2/source/inc/FastPropertyIdRanges.hxx
index 0c24f46..d848bab 100644
--- a/chart2/source/inc/FastPropertyIdRanges.hxx
+++ b/chart2/source/inc/FastPropertyIdRanges.hxx
@@ -40,7 +40,8 @@ enum FastPropertyIdRanges
 FAST_PROPERTY_ID_START_CHART_SPLINE_PROP = FAST_PROPERTY_ID_START + 15000,
 FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000,
 FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP = FAST_PROPERTY_ID_START + 
17000,
-FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000
+FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000,
+FAST_PROPERTY_ID_START_GL_3D = FAST_PROPERTY_ID_START + 19000
 };
 
 } //  namespace chart
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Markus Mohrhard

 sc/inc/scopetools.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cc45204a7a286cef32fc7faf266dc2da235c1ae2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Apr 17 02:19:53 2014 +0200

missing header include

Change-Id: I5bb1f1f5a457d4d390318fc793b15df078423c8c

diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 802aea1..40f1dec 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -10,6 +10,8 @@
 #ifndef SC_SCOPETOOLS_HXX
 #define SC_SCOPETOOLS_HXX
 
+#include scdllapi.h
+
 class ScDocument;
 
 namespace sc {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-16 Thread Markus Mohrhard

 chart2/qa/extras/chart2import.cxx |   13 +
 chart2/qa/extras/charttest.hxx|   27 +++
 2 files changed, 40 insertions(+)

New commits:
commit 326f8dc37bc11591e7d683b21085da7ee15b8072
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Apr 17 02:42:15 2014 +0200

add test case for fdo#70609

Change-Id: I85ddd43f5c8e88c6f6bf19284b0822f8bbea1d44

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index bdebe51..4d7f4b0 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -35,6 +35,7 @@ public:
 void testODPChartSeries();
 void testBnc864396();
 void testSimpleStrictXLSX();
+void testDelayedCellImport(); // chart range referencing content on later 
sheets
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -57,6 +58,7 @@ public:
 CPPUNIT_TEST(testODPChartSeries);
 CPPUNIT_TEST(testBnc864396);
 CPPUNIT_TEST(testSimpleStrictXLSX);
+CPPUNIT_TEST(testDelayedCellImport);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -311,6 +313,17 @@ void Chart2ImportTest::testSimpleStrictXLSX()
 
 }
 
+void Chart2ImportTest::testDelayedCellImport()
+{
+load(/chart2/qa/extras/data/xlsx/, fdo70609.xlsx);
+uno::Reference chart2::XChartDocument  xChartDoc = getChartDocFromSheet( 
0, mxComponent );
+Reference chart2::data::XDataSequence  xDataSeq =
+getDataSequenceFromDocByRole(xChartDoc, values-x);
+
+OUString aRange = xDataSeq-getSourceRangeRepresentation();
+CPPUNIT_ASSERT_EQUAL(OUString($Sheet2.$C$5:$C$9), aRange);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 471346c..b3a0d31 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -238,6 +238,33 @@ Reference chart2::data::XDataSequence  
getLabelDataSequenceFromDoc(
 return Reference chart2::data::XDataSequence  ();
 }
 
+Reference chart2::data::XDataSequence  getDataSequenceFromDocByRole(
+Reference chart2::XChartDocument  xChartDoc, const OUString rRole,
+sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0, sal_Int32 nCooSys 
= 0 )
+{
+Reference chart2::XDataSeries  xDataSeries =
+getDataSeriesFromDoc( xChartDoc, nDataSeries, nChartType, nCooSys );
+CPPUNIT_ASSERT(xDataSeries.is());
+Reference chart2::data::XDataSource  xDataSource( xDataSeries, 
uno::UNO_QUERY_THROW );
+Sequence Reference chart2::data::XLabeledDataSequence   xDataSequences 
=
+xDataSource-getDataSequences();
+for(sal_Int32 i = 0; i  xDataSequences.getLength(); ++i)
+{
+Reference chart2::data::XDataSequence xLabelSeq = 
xDataSequences[i]-getValues();
+uno::Reference beans::XPropertySet  xProps(xLabelSeq, 
uno::UNO_QUERY);
+if(!xProps.is())
+continue;
+
+OUString aRoleName = xProps-getPropertyValue(Role).getOUString();
+
+if(aRoleName == rRole)
+return xLabelSeq;
+}
+
+CPPUNIT_FAIL(no Label sequence found);
+return Reference chart2::data::XDataSequence  ();
+}
+
 uno::Sequence  OUString  getWriterChartColumnDescriptions( Reference 
lang::XComponent  mxComponent )
 {
 uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcompiler/source i18npool/source

2014-04-16 Thread Takeshi Abe

 helpcompiler/source/HelpLinker.cxx   |   12 -
 helpcompiler/source/HelpLinker_main.cxx  |4 +--
 i18npool/source/nativenumber/nativenumbersupplier.cxx|   19 ++-
 i18npool/source/textconversion/textconversion_ko.cxx |6 ++--
 i18npool/source/textconversion/textconversion_zh.cxx |6 ++--
 i18npool/source/transliteration/transliteration_body.cxx |   12 +
 6 files changed, 29 insertions(+), 30 deletions(-)

New commits:
commit 6a964dcf0fe3b9258d07391ada0f0d245b1f7cec
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Apr 17 10:56:03 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: Ibadadacbe09a93e7d7a7210868c52a8fa582d427

diff --git a/helpcompiler/source/HelpLinker.cxx 
b/helpcompiler/source/HelpLinker.cxx
index 3e1cfd4..f98c9a2 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -36,6 +36,8 @@
 #include rtl/bootstrap.hxx
 
 #include expat.h
+#include boost/scoped_array.hpp
+#include boost/scoped_ptr.hpp
 
 IndexerPreProcessor::IndexerPreProcessor
 ( const std::string aModuleName, const fs::path fsIndexBaseDir,
@@ -946,9 +948,8 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 xmlSetStructuredErrorFunc( NULL, 
(xmlStructuredErrorFunc)StructuredXMLErrorFunction );
 try
 {
-HelpLinker* pHelpLinker = new HelpLinker();
+boost::scoped_ptrHelpLinker pHelpLinker(new HelpLinker());
 pHelpLinker-main( args, aStdStrExtensionPath, aStdStrDestination, 
aOfficeHelpPath );
-delete pHelpLinker;
 }
 catch( const HelpProcessingException e )
 {
@@ -980,14 +981,14 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 aFileStatus.isValid( osl_FileStatus_Mask_FileSize ) )
 {
 sal_uInt64 ret, len = aFileStatus.getFileSize();
-char* s = new char[ int(len) ];  // the buffer to hold the installed 
files
+boost::scoped_arraychar s(new char[ int(len) ]);  // the buffer to 
hold the installed files
 osl::File aFile( aTreeFileURL );
 aFile.open( osl_File_OpenFlag_Read );
-aFile.read( s, len, ret );
+aFile.read( s.get(), len, ret );
 aFile.close();
 
 XML_Parser parser = XML_ParserCreate( 0 );
-XML_Status parsed = XML_Parse( parser, s, int( len ), true );
+XML_Status parsed = XML_Parse( parser, s.get(), int( len ), true );
 
 if (XML_STATUS_ERROR == parsed)
 {
@@ -1000,7 +1001,6 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 }
 
 XML_ParserFree( parser );
-delete[] s;
 }
 
 return bSuccess;
diff --git a/helpcompiler/source/HelpLinker_main.cxx 
b/helpcompiler/source/HelpLinker_main.cxx
index 8390683..dd22eb9 100644
--- a/helpcompiler/source/HelpLinker_main.cxx
+++ b/helpcompiler/source/HelpLinker_main.cxx
@@ -21,6 +21,7 @@
 #include HelpLinker.hxx
 #include iostream
 #include sal/main.h
+#include boost/scoped_ptr.hpp
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
 std::vectorstd::string args;
@@ -28,9 +29,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
 args.push_back(std::string(argv[i]));
 try
 {
-HelpLinker* pHelpLinker = new HelpLinker();
+boost::scoped_ptrHelpLinker pHelpLinker(new HelpLinker());
 pHelpLinker-main( args );
-delete pHelpLinker;
 }
 catch( const HelpProcessingException e )
 {
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 3883840..8cb9c16 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -25,6 +25,7 @@
 #include data/numberchar.h
 #include comphelper/string.hxx
 #include cppuhelper/supportsservice.hxx
+#include boost/scoped_array.hpp
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -172,8 +173,8 @@ OUString SAL_CALL AsciiToNative( const OUString inStr, 
sal_Int32 startPos, sal_
 if (nCount  0)
 {
 const sal_Unicode *str = inStr.getStr() + startPos;
-sal_Unicode *newStr = new sal_Unicode[nCount * 2 + 1];
-sal_Unicode *srcStr = new sal_Unicode[nCount + 1]; // for keeping 
number without comma
+boost::scoped_arraysal_Unicode newStr(new sal_Unicode[nCount * 2 + 
1]);
+boost::scoped_arraysal_Unicode srcStr(new sal_Unicode[nCount + 1]); 
// for keeping number without comma
 sal_Int32 i, len = 0, count = 0;
 
 if (useOffset)
@@ -200,7 +201,7 @@ OUString SAL_CALL AsciiToNative( const OUString inStr, 
sal_Int32 startPos, sal_
 end = len; begin = end, end += 
number-multiplierExponent[0]) {
 if (end == 0) continue;
 sal_Int32 _count = count;
-notZero |= AsciiToNative_numberMaker(srcStr, begin, 
end - begin, newStr, count,
+

[Libreoffice-commits] core.git: Changes to 'private/kohei/calc-sort-fix'

2014-04-16 Thread Kohei Yoshida

New branch 'private/kohei/calc-sort-fix' available with the following commits:
commit 7804a39bba25b07ecae24a7a4cb37b1e87634e36
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 22:04:55 2014 -0400

Use boost::scoped_ptr for this.

Change-Id: I5acdb7e55cb3dfeff880f1f361fed4a8cc4acd3c

commit d3cdf2d99f14ddcdd7a1c1abd1cd8f7f4839a426
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 15:17:13 2014 -0400

fdo#74687: Undo  redo of format-only changes don't need broadcasting.

Also discovered that the undo path was broadcasting twice.  Let's only
do it once.

Change-Id: I169f1659aecb1eb78be3a497e244f79c5883e50f

commit a5bca0268eebef9e49a896df2b4cf5035f21efd0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 14:40:09 2014 -0400

fdo#74555: Avoid excessive calls to GetPreviewCellStyle().

GetOptimalHeight() gets called *all the time* and is very performance
sensitive.  Let's not do an expensive operation such as 
GetPreviewCellStyle()
which slows down pretty much everything else after the non-default font is
applied.

Change-Id: I5d5b2e706dd5dd98173044642b98ccaedd9536f0

commit 38309adfc0caf3b10c3dd153756a165dc264f961
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 11:41:19 2014 -0400

fdo#75665: Fix the right-aligned case.

Change-Id: I905c4e331f37ed2ffbdf5c89dde9fb6c9ca546cf

commit 78ab171a8ef470f6f7ca02cbc33722ee6d861d6f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 16 11:08:46 2014 -0400

fdo#75026: Sometimes we need to update grid view while not being active.

For example when jumping to mark in the non-active window triggered by
hyperlink in the active one.  The jump-to-mark command gets dispatched 
before
the new window is officially activated.

Change-Id: I4e9c126b061ee3af4440e36d1ba6d796eb1c3539

commit 9662441b03bf698fcd0ca578beae58048d48c177
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 15 20:47:37 2014 -0400

fdo#75665: Truncate string when clipped on screen.

This improves performance of text layouting by HarfBuzz for very long 
strings.
HarfBuzz's layout algorithm appears to be more expensive than ICU's.

Change-Id: Ic9738b7b8f0f1a29c51c83b147763118939b90ef

commit 89b3ef410e3b8c83ff19825ff3182899db1482cb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 15 14:47:53 2014 -0400

Use scope switch rather than manual on and off.

Change-Id: Ia4072339b6f1fd4b929d891dcc8f3bb3e2403d5e

commit 8c2a073ef502c2b5582bf70e554cc7fafbbc9d49
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 15 14:37:47 2014 -0400

Use single std::vector instance in lieu of heap arrays.

Change-Id: I36820b5c3790998eab922a0fa603ac063972c445

commit ae59f2267bdcba8657fec8ce24f147d06d8f5f5f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 15 11:13:05 2014 -0400

Remove this duplicate, and use the one in ScCellFormat.

Change-Id: I2410c8805ef5be950d5ce1e24f845ed910615442

commit dc84d061a140941b5126d542b1f1f2c9076042d4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 15 11:00:15 2014 -0400

Avoid unnecessarily converting UNO cell address to ScAddress.

Change-Id: I69849b0a16cb353257f9fc1890a27595cd1b7b7b

commit 63b25b920f23bc4a60d98eecde88ed4efbd72442
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 15 10:12:58 2014 -0400

fdo#76409: Write output cell string to text:p element when saving to ods.

The change was made by accident.

Change-Id: Ife2461b0fca6e3ea5a65d72d985d1e0976737b5a

commit b85c30e72ee98df65b73f37994ba40d064da847d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Apr 14 18:56:12 2014 -0400

fdo#76294: Fix the build.

Change-Id: I123751e9f08faaccc06649c2f8b29a9a33548312

commit 36314e2e640298aec9fb9eddd0892155d9d2f48a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Apr 14 18:32:57 2014 -0400

fdo#76294: Intern strings in AddFormulaToken() as well.

And a whole bunch of changes needed to make that happen.

Change-Id: Idd98fbc99322c0d72fb0a7848d89cb1a6abc88b6

commit 066298c611783d625175af3ec991752947d47cd4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Apr 14 16:57:52 2014 -0400

fdo#76294: Properly intern string literals in formula on xls import.

Change-Id: Ib3a442cbb68c23294762561f2911101a087a795e

commit 55c88407331561246383d31aa8ba4940741e198f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Apr 14 16:41:14 2014 -0400

fdo#76294: Write import test for this.

Change-Id: I4d2f98117b783e801916f99fd99e69d43e161e2d

commit d055153f6def79ad07a65fdd78d2d8fa352ecbcb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Apr 14 11:23:23 2014 -0400

fdo#77209: Share string pool with clip documents.

We do

1 2 3 >

1 - 100 of 283 matches

Mail list logo