date:20141013

LibreOffice Gerrit News for core on 2014-10-14

2014-10-13 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ Sane configure GStreamer handling
  in https://gerrit.libreoffice.org/11912 from Jan-Marek Glogowski
  about module build
+ vcl/source: get rid of redundant svsys.h includes
  in https://gerrit.libreoffice.org/11814 from Douglas Mencken
  about module vcl
+ runner: finally block to ensure that a resource is closed (Prior to Java 
  in https://gerrit.libreoffice.org/11950 from Robert Antoni Buj i Gelonch
  about module qadevOOo
+ fdo#35862 De-/Increase font when multi-sized text
  in https://gerrit.libreoffice.org/11857 from Daniel Sikeler
  about module sw
 End of freshness 

+ kill OUTPATH
  in https://gerrit.libreoffice.org/11908 from Norbert Thiebaud
  about module build, instsetoo_native, solenv
+ fdo#84938 - replace LIST_ACTION constants with enum
  in https://gerrit.libreoffice.org/11959 from Noel Grandin
  about module include, svtools
+ Resolves fdo#84961: zh_CN date separator should be "/" rather than "／"
  in https://gerrit.libreoffice.org/11958 from Julien Nabet
  about module i18npool
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11954 from Michaël Lefèvre
  about module vcl
+ fdo#60689: replace SUPD variable
  in https://gerrit.libreoffice.org/11937 from Marcos Paulo de Souza
  about module basic, desktop, sfx2, solenv
+ fdo#75757: remove inheritance to std::map
  in https://gerrit.libreoffice.org/11951 from Takeshi Abe
  about module include, tools
+ unit test performance for big calc file
  in https://gerrit.libreoffice.org/11949 from Laurent Godard
  about module include, sc, test
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11947 from Michaël Lefèvre
  about module sw
+ [FORMAT CHANGE] basic: use 32-bit integers for array indices
  in https://gerrit.libreoffice.org/11944 from Noel Grandin
  about module basctl, basic, include, sc
+ Trying to make the Find & Replace dialog a bit more compact…
  in https://gerrit.libreoffice.org/11942 from Adolfo Jayme Barrientos
  about module svx


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

+ scripting: Null pointer dereference
  in https://gerrit.libreoffice.org/11923 from Robert Antoni Buj i Gelonch
+ create a macro library for implementing bit-flags types
  in https://gerrit.libreoffice.org/11835 from Noel Grandin
+ coverity#1066164 Resource leak
  in https://gerrit.libreoffice.org/11946 from Caolán McNamara
+ Register flat file mime types on OS X
  in https://gerrit.libreoffice.org/11957 from Matthew Francis
+ java: Collections.addAll for adding an array of elements to a Collection
  in https://gerrit.libreoffice.org/11953 from Robert Antoni Buj i Gelonch
+ java: import from the same package
  in https://gerrit.libreoffice.org/11955 from Robert Antoni Buj i Gelonch
+ reportbuilder: import from java.lang package
  in https://gerrit.libreoffice.org/11956 from Robert Antoni Buj i Gelonch
+ enhance perfcheck failing message
  in https://gerrit.libreoffice.org/11948 from Laurent Godard
+ runner: Object comparison
  in https://gerrit.libreoffice.org/11921 from Robert Antoni Buj i Gelonch
+ vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap
  in https://gerrit.libreoffice.org/11823 from Chris Sherlock
+ nlpsolver: ensure that the stream is cleaned up before the method returns
  in https://gerrit.libreoffice.org/11940 from Robert Antoni Buj i Gelonch
+ xmerge: ensure that the stream is cleaned up before the method returns
  in https://gerrit.libreoffice.org/11939 from Robert Antoni Buj i Gelonch
+ accessibility: ensure that the stream is cleaned up before the method ret
  in https://gerrit.libreoffice.org/11938 from Robert Antoni Buj i Gelonch
+ convert SW_TAB #defines to enum
  in https://gerrit.libreoffice.org/11936 from Noel Grandin


* 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#58194 - export DOCX Automatic indent as firstLine indent
  in https://gerrit.libreoffice.org/10425 from Joren De Cuyper
+ WIP (do not merge): remove custom impl of bidirectional list
  in https://gerrit.libreoffice.org/11001 from Chris Laplante
+ fdo#83003 Startcenter: No method for returnin Recent Docs
  in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ Perftest for loading autocorrect dictionaries (fdo#79761)
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ fdo#81426 : Data from head

[Bug 45168] Add Option to crop (reduce size of) Images in PDF Export

2014-10-13 Thread bugzilla-daemon

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

--- Comment #10 from Fernand  ---
Daniel,

Thanks for the interest  to improve LO to make better (more professional) PDF.
IN LO we ca do everyting needend to produce high quality documents, books,
magazines etc. The link to Professional printers is still PDF.
Here we are talking about the storing of images in the resulting PDF.
2 options:
Full Image who permit to re-edit this image in the PDF.
Cropped Size off the Image who delivers smaller PDF

Resampling is a separeted thing and can now allready been done when using the
API and macro to produce the PDF (filter options).
But The Resampling is not present in the current GUI and can been ussefull as
well.

I Suppose there can been more done to make smaller, leaner PDF also

Storing, a PDFdocument as a Image (not a OLE object) in LO documents would also
been a greath improvement !

Greetz

Fernand

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

[Bug 45168] Add Option to crop (reduce size of) Images in PDF Export

2014-10-13 Thread bugzilla-daemon

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

--- Comment #9 from Daniel Miranda  ---
I plan to work on this, but I'd like some clarifications first. Is cropping the
only desired feature, or is automatic resizing/resampling of non-cropped images
wanted well? I can grasp the PDFWrite without much difficulty, but I don't know
how would be the best way to provide UI toggles, or where their corresponding
code should be. Any assistance would be appreciated.

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

WindYan OSSII license statement

2014-10-13 Thread WindYan OSSII

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 4 commits - chart2/source

2014-10-13 Thread Kohei Yoshida

 chart2/source/view/axes/Tickmarks.cxx|6 -
 chart2/source/view/axes/VAxisProperties.cxx  |   48 
 chart2/source/view/axes/VAxisProperties.hxx  |   17 ++
 chart2/source/view/axes/VCartesianAxis.cxx   |  102 +
 chart2/source/view/axes/VCartesianAxis.hxx   |4 
 chart2/source/view/axes/VPolarRadiusAxis.cxx |6 -
 chart2/source/view/main/ChartView.cxx|  155 ---
 7 files changed, 192 insertions(+), 146 deletions(-)

New commits:
commit a7b70511e2ba26b56c8f80ac6b3b0c0bd5630118
Author: Kohei Yoshida 
Date:   Mon Oct 13 19:32:15 2014 -0400

More on documenting the methods.

Change-Id: Ibdbc1b26521e56de5dcba1b9572bb0221fc0fff5

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index c0e133c..5b290b0 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -255,11 +255,23 @@ public:
  * largest axis label text object prior to calling this method.
  *
  * The new axis scaling data will be stored in the VCoordinateSystem
- * objects.
+ * objects.  The label alignment direction for each axis will also get
+ * determined during this process, and stored in VAxis.
  */
 void doAutoScaling( ChartModel& rModel );
+
+/**
+ * After auto-scaling is performed, call this method to set the explicit
+ * scaling and increment data to all relevant VAxis objects.
+ */
 void updateScalesAndIncrementsOnAxes();
+
+/**
+ * After auto-scaling is performed, call this method to set the explicit
+ * scaling data to all the plotters.
+ */
 void setScalesFromCooSysToPlotter();
+
 void setNumberFormatsFromAxes();
 drawing::Direction3D getPreferredAspectRatio();
 
commit 16e84295b39ffcaa519b24656de3601678df1c39
Author: Kohei Yoshida 
Date:   Mon Oct 13 15:24:33 2014 -0400

Scope level reduction & explain what the max axis index really is.

The concept of axis index and dimension index is quite confusing in the
chart2 code

Change-Id: I035af0a225396bd5394089d6f584f78dcaf0ad31

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 542a24f..c0e133c 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -276,7 +276,15 @@ private:
 SeriesPlottersType m_aSeriesPlotterList;
 std::vector< VCoordinateSystem* >& m_rVCooSysList;
 ::std::map< uno::Reference< XAxis >, AxisUsage > m_aAxisUsageList;
+
+/**
+ * Max axis index of all dimensions.  Currently this can be either 0 or 1
+ * since we only support primary and secondary axes per dimension.  The
+ * value of 0 means all dimensions have only primary axis, while 1 means
+ * at least one dimension has a secondary axis.
+ */
 sal_Int32 m_nMaxAxisIndex;
+
 bool m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 sal_Int32 m_nDefaultDateNumberFormat;
 };
@@ -778,85 +786,85 @@ void 
SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
 continue;
 
 uno::Reference< XDiagram > xDiagram( rModel.getFirstDiagram() );
-if( xDiagram.is() )
+if (!xDiagram.is())
+continue;
+
+bool bSeriesAttachedToThisAxis = false;
+sal_Int32 nAttachedAxisIndex = -1;
 {
-bool bSeriesAttachedToThisAxis = false;
-sal_Int32 nAttachedAxisIndex = -1;
+::std::vector< Reference< XDataSeries > > aSeriesVector( 
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+::std::vector< Reference< XDataSeries > >::const_iterator 
aIter = aSeriesVector.begin();
+for( ; aIter != aSeriesVector.end(); ++aIter )
 {
-::std::vector< Reference< XDataSeries > > aSeriesVector( 
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
-::std::vector< Reference< XDataSeries > >::const_iterator 
aIter = aSeriesVector.begin();
-for( ; aIter != aSeriesVector.end(); ++aIter )
+sal_Int32 nCurrentIndex = 
DataSeriesHelper::getAttachedAxisIndex( *aIter );
+if( nAxisIndex == nCurrentIndex )
 {
-sal_Int32 nCurrentIndex = 
DataSeriesHelper::getAttachedAxisIndex( *aIter );
-if( nAxisIndex == nCurrentIndex )
-{
-bSeriesAttachedToThisAxis = true;
-break;
-}
-else if( nAttachedAxisIndex<0 || 
nAttachedAxisIndex>nCurrentIndex )
-nAttachedAxisIndex=nCurrentIndex;
+bSeriesAttachedToThisAxis = true;
+break;
 }
+else if( nAttachedAxisIndex<0 || 
nAttachedA

[Libreoffice-commits] core.git: Branch 'feature/perfwork2' - 52 commits - include/oox include/sax oox/source package/inc package/Library_package2.mk package/source sax/source sc/inc sc/Library_sc.mk s

2014-10-13 Thread Matúš Kukan

 include/oox/token/tokenmap.hxx |9 
 include/sax/fastattribs.hxx|   42 +-
 include/sax/fshelper.hxx   |4 
 oox/source/core/xmlfilterbase.cxx  |7 
 oox/source/token/tokenmap.cxx  |7 
 package/Library_package2.mk|1 
 package/inc/ZipOutputEntry.hxx |   79 +
 package/inc/ZipOutputStream.hxx|   49 ---
 package/inc/ZipPackageFolder.hxx   |5 
 package/source/zipapi/ZipOutputEntry.cxx   |  367 +
 package/source/zipapi/ZipOutputStream.cxx  |  351 ---
 package/source/zippackage/ZipPackage.cxx   |   36 +-
 package/source/zippackage/ZipPackageFolder.cxx |   31 +-
 sax/source/fastparser/fastparser.cxx   |7 
 sax/source/tools/CachedOutputStream.hxx|  121 
 sax/source/tools/fastattribs.cxx   |   41 --
 sax/source/tools/fastserializer.cxx|  324 --
 sax/source/tools/fastserializer.hxx|   95 +++---
 sax/source/tools/fshelper.cxx  |   55 +--
 sc/Library_sc.mk   |1 
 sc/inc/column.hxx  |4 
 sc/inc/document.hxx|2 
 sc/inc/documentimport.hxx  |   19 +
 sc/inc/formulacell.hxx |3 
 sc/inc/numformat.hxx   |   46 +++
 sc/inc/rowheightcontext.hxx|6 
 sc/inc/table.hxx   |4 
 sc/source/core/data/column.cxx |   60 +++-
 sc/source/core/data/column2.cxx|   28 +
 sc/source/core/data/column3.cxx|   41 ++
 sc/source/core/data/document.cxx   |8 
 sc/source/core/data/documentimport.cxx |  117 +++
 sc/source/core/data/formulacell.cxx|   25 +
 sc/source/core/data/rowheightcontext.cxx   |5 
 sc/source/core/data/table1.cxx |   41 +-
 sc/source/core/data/table2.cxx |   24 +
 sc/source/core/opencl/op_statistical.cxx   |6 
 sc/source/core/opencl/opbase.cxx   |   73 
 sc/source/core/opencl/opbase.hxx   |   68 +---
 sc/source/core/tool/address.cxx|   86 ++---
 sc/source/core/tool/numformat.cxx  |   82 +
 sc/source/filter/excel/excdoc.cxx  |2 
 sc/source/filter/excel/xecontent.cxx   |   12 
 sc/source/filter/excel/xeextlst.cxx|2 
 sc/source/filter/excel/xestream.cxx|   14 
 sc/source/filter/excel/xetable.cxx |2 
 sc/source/filter/excel/xistyle.cxx |   24 -
 sc/source/filter/excel/xlroot.cxx  |   21 +
 sc/source/filter/inc/numberformatsbuffer.hxx   |4 
 sc/source/filter/inc/stylesbuffer.hxx  |   19 +
 sc/source/filter/inc/xeroot.hxx|3 
 sc/source/filter/inc/xestream.hxx  |3 
 sc/source/filter/inc/xlroot.hxx|   10 
 sc/source/filter/oox/numberformatsbuffer.cxx   |   16 -
 sc/source/filter/oox/sheetdatabuffer.cxx   |   28 +
 sc/source/filter/oox/stylesbuffer.cxx  |   98 +-
 sc/source/filter/oox/worksheethelper.cxx   |   13 
 sc/source/filter/xcl97/XclExpChangeTrack.cxx   |2 
 sc/source/filter/xml/xmlimprt.cxx  |   29 -
 sc/source/ui/view/viewfun2.cxx |2 
 sd/source/filter/eppt/pptx-epptooxml.cxx   |2 
 61 files changed, 1731 insertions(+), 955 deletions(-)

New commits:
commit e04873f05ddacb35814d93055980b655ef107bd6
Author: MatÃºÅ¡ Kukan 
Date:   Thu Oct 9 15:22:54 2014 +0200

package: Add ZipOutputEntry to isolate deflating of streams.

Preparation commit for deflating streams in parallel.
We still use the same single XOutputStream (ByteChucker :-) for
sequential writing but this can now be changed more easily.

Change-Id: Idf26cc2187461660e31ac2e12c4708e761596fb2

diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 269cf81..f563d0a 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_exception_objects,package2,\
package/source/zipapi/XUnbufferedStream \
package/source/zipapi/ZipEnumeration \
package/source/zipapi/ZipFile \
+   package/source/zipapi/ZipOutputEntry \
package/source/zipapi/ZipOutputStream \
package/source/zippackage/wrapstreamforshare \
package/source/zippackage/zipfileaccess \
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
new file mode 100644
index 000..a1d03d3
--- /dev/null
+++ b/package/inc/ZipOutputEntry.hxx
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source

Re: Crash test update

2014-10-13 Thread David Tardon

Hi,

On Mon, Oct 13, 2014 at 08:38:23PM +0100, Caolán McNamara wrote:
> On Mon, 2014-10-13 at 16:22 +, Miklos Vajna wrote:
> > New crashtest update available at 
> > http://dev-builds.libreoffice.org/crashtest/86c4762790823c338f018fb2f06c4a5fa4497916/
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
> +306 ppt and +5 sxi failures!, I wonder if
> 
> commit 1c8695ecf65174298ebd9edb5b0289db07af98ca
> Date:   Mon Oct 13 10:02:02 2014 +0200
> boost::rational throws if 0 is passed as denominator
> 
> fixes a gadzillion of those ?

It is quite probable. In any case, I will look at the new failures tomorrow.

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

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

2014-10-13 Thread Caolán McNamara

 download.lst|2 
 external/nss/ExternalProject_nss.mk |2 
 external/nss/nss.aix.patch  |  133 ++---
 external/nss/nss.patch  |  160 ++--
 external/nss/nss_macosx.patch   |   41 -
 5 files changed, 173 insertions(+), 165 deletions(-)

New commits:
commit c9a3695857f3c616dcfe3503616be961ed4c8987
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 29 16:58:50 2014 +0100

bump nss from 3.15.3 to 3.16.5

Reviewed-on: https://gerrit.libreoffice.org/11700
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe)
Signed-off-by: Michael Stahl 

Conflicts:
external/nss/ExternalProject_nss.mk
external/nss/nspr-build-config.patch
external/nss/nss_macosx.patch

(cherry picked from commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1)
Reviewed-on: https://gerrit.libreoffice.org/11898
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

Conflicts:
download.lst
external/nss/nss-linux-x86.patch.0
external/nss/nss-pem.patch

Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e

diff --git a/download.lst b/download.lst
index 908c660..3255674 100644
--- a/download.lst
+++ b/download.lst
@@ -96,7 +96,7 @@ export MDDS_TARBALL := 
a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := 
06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
+export NSS_TARBALL := 
b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 
66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index dc19ec4..cf071a4 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 
 $(call gb_ExternalProject_get_state_target,nss,configure):
$(call gb_ExternalProject_run,configure,\
-   $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
+   $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 
LIB="$(ILIB)") \
nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index c83ae57..da9aacb 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -1,16 +1,7 @@
 a/a/nspr/configure 2010-08-18 07:23:01.0 -0500
-+++ b/b/nspr/configure 2010-08-18 07:33:11.0 -0500
-@@ -2973,7 +2973,8 @@
- #define SYSV 1
- EOF
- 
--DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall 
-blibpath:/usr/lib:/lib'
-+MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
-+DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
- ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
- echo "configure:3477: checking for sys/atomic_op.h" >&5
-@@ -3102,7 +3103,6 @@
+diff -ru a/nspr/configure b/nspr/configure
+--- a/a/nspr/configure 2014-09-29 16:47:42.984012225 +0100
 b/b/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+@@ -6369,7 +6369,6 @@
  AIX_LINK_OPTS='-brtl -bnso -berok'
  ;;
  esac
@@ -18,9 +9,10 @@
  AIX_WRAP='$(DIST)/lib/aixwrap.o'
  AIX_TMP='./_aix_tmp.o'
  if test -n "$USE_64"; then
 a/a/nspr/configure.in  2010-08-18 07:23:01.0 -0500
-+++ b/b/nspr/configure.in  2010-08-18 07:32:36.0 -0500
-@@ -831,7 +831,8 @@
+diff -ru a/nspr/configure.in b/nspr/configure.in
+--- a/a/nspr/configure.in  2014-09-29 16:46:35.257394860 +0100
 b/b/nspr/configure.in  2014-09-29 16:50:33.908375942 +0100
+@@ -1229,7 +1229,8 @@
  AC_DEFINE(XP_UNIX)
  AC_DEFINE(AIX)
  AC_DEFINE(SYSV)
@@ -30,7 +22,7 @@
  AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
  case "${target_os}" in
  aix3.2*)
-@@ -871,10 +872,9 @@
+@@ -1269,10 +1270,9 @@
  AC_DEFINE(HAVE_SOCKLEN_T)
  AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
  USE_IPV6=1
@@ -42,9 +34,10 @@
  AIX_WRAP='$(DIST)/lib/aixwrap.o'

allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false

2014-10-13 Thread nicholas ferguson

For the --enable-debug in autogen.input ( configure.ac)

can you review to make ASSERT_ALWAYS_ABORT available also for debug builds .
to be either true or false.

 

currently in configure.ac

--enable-assert-always-abortmake assert() abort even in release mode

 

Suggest adding

--enable-assert-dbg-never-abort prevent assert() aborts in debug mode.

 

 

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

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

2014-10-13 Thread Caolán McNamara

 connectivity/source/drivers/firebird/Blob.cxx |7 ++-
 connectivity/source/drivers/firebird/Util.cxx |   56 ++
 connectivity/source/drivers/firebird/Util.hxx |   14 +-
 3 files changed, 47 insertions(+), 30 deletions(-)

New commits:
commit 15decb9b323029e764a89a78793862c8af74cbac
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 09:59:00 2014 +0100

coverity#1158396 Uncaught exception

Change-Id: I0306b8431641d841027b30dfe1c03ecad5df6867

diff --git a/connectivity/source/drivers/firebird/Blob.cxx 
b/connectivity/source/drivers/firebird/Blob.cxx
index 7d62bbc..44cd33e 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -212,8 +212,11 @@ sal_Int32 SAL_CALL Blob::readBytes(uno::Sequence< sal_Int8 
>& rDataOut,
&nBytesRead,
nReadSize,
(char*) rDataOut.getArray() + nTotalBytesRead);
-if (aErr)
-evaluateStatusVector(m_statusVector, "isc_get_segment", *this);
+if (aErr && IndicatesError(m_statusVector))
+{
+OUString sError(StatusVectorToString(m_statusVector, 
"isc_get_segment"));
+throw IOException(sError, *this);
+}
 nTotalBytesRead += nBytesRead;
 m_nBlobPosition += nBytesRead;
 }
diff --git a/connectivity/source/drivers/firebird/Util.cxx 
b/connectivity/source/drivers/firebird/Util.cxx
index 448fa3a..0806d0e 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -26,37 +26,43 @@ OUString firebird::sanitizeIdentifier(const OUString& 
rIdentifier)
 return sRet;
 }
 
-void firebird::evaluateStatusVector(ISC_STATUS_ARRAY& aStatusVector,
-const OUString& aCause,
-const uno::Reference< XInterface >& 
_rxContext)
-throw(SQLException)
+OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector,
+const OUString& rCause)
 {
-if (aStatusVector[0]==1 && aStatusVector[1]) // indicates error
-{
-OUStringBuffer buf;
-char msg[512]; // Size is based on suggestion in docs.
-const ISC_STATUS* pStatus = (const ISC_STATUS*) &aStatusVector;
+OUStringBuffer buf;
+char msg[512]; // Size is based on suggestion in docs.
+const ISC_STATUS* pStatus = (const ISC_STATUS*) &rStatusVector;
 
-buf.appendAscii("firebird_sdbc error:");
-try
-{
-while(fb_interpret(msg, sizeof(msg), &pStatus))
-{
-// TODO: verify encoding
-buf.appendAscii("\n*");
-buf.append(OUString(msg, strlen(msg), RTL_TEXTENCODING_UTF8));
-}
-}
-catch (...)
+buf.appendAscii("firebird_sdbc error:");
+try
+{
+while(fb_interpret(msg, sizeof(msg), &pStatus))
 {
-SAL_WARN("connectivity.firebird", "ignore fb_interpret exception");
+// TODO: verify encoding
+buf.appendAscii("\n*");
+buf.append(OUString(msg, strlen(msg), RTL_TEXTENCODING_UTF8));
 }
-buf.appendAscii("\ncaused by\n'").append(aCause).appendAscii("'\n");
+}
+catch (...)
+{
+SAL_WARN("connectivity.firebird", "ignore fb_interpret exception");
+}
+buf.appendAscii("\ncaused by\n'").append(rCause).appendAscii("'\n");
 
-OUString error = buf.makeStringAndClear();
-SAL_WARN("connectivity.firebird", error);
+OUString error = buf.makeStringAndClear();
+SAL_WARN("connectivity.firebird", error);
+return error;
+}
 
-throw SQLException( error, _rxContext, OUString(), 1, Any() );
+void firebird::evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector,
+const OUString& rCause,
+const uno::Reference< XInterface >& 
_rxContext)
+throw(SQLException)
+{
+if (IndicatesError(rStatusVector))
+{
+OUString error = StatusVectorToString(rStatusVector, rCause);
+throw SQLException(error, _rxContext, OUString(), 1, Any());
 }
 }
 
diff --git a/connectivity/source/drivers/firebird/Util.hxx 
b/connectivity/source/drivers/firebird/Util.hxx
index e6a978a..c04488f 100644
--- a/connectivity/source/drivers/firebird/Util.hxx
+++ b/connectivity/source/drivers/firebird/Util.hxx
@@ -31,13 +31,21 @@ namespace connectivity
  * for such shorter strings, however any trailing padding makes the gui
  * editing of such names harder, hence we remove all trailing 
whitespace.
  */
-::rtl::OUString sanitizeIdentifier(const ::rtl::OUString& rIdentifier);
+OUString sanitizeIdentifier(const OUString& rIdentifier);
+
+inline bool IndicatesError(const ISC_STATUS_ARRAY& rStatusVector)
+{
+return rStatusVector[0]

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

2014-10-13 Thread Caolán McNamara

 vcl/source/gdi/impfont.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit affd907cb4f19d006efc5cbde903970d7f97ef46
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 20:54:35 2014 +0100

valgrind + bff, multiple failures, initialize ref counts to 0...

for boost::intrusive_ptr

==6595== Conditional jump or move depends on uninitialised value(s)
==6595==at 0xB21664D: intrusive_ptr_release(FontCharMap*) 
(metric.hxx:226)
==6595==by 0xB2172F6: 
boost::intrusive_ptr::~intrusive_ptr() (intrusive_ptr.hpp:97)
==6595==by 0xB5AE196: FtFontInfo::GetFontCharMap() (gcach_ftyp.cxx:1287)

Change-Id: Iea5ab13b093945c840481f29bc626a16dcbc234b

diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index 223e9e1..7f80a38 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -52,7 +52,7 @@ ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR )
 ,   mpGlyphIds( rCR.mpGlyphIds )
 ,   mnRangeCount( rCR.mnRangeCount )
 ,   mnCharCount( 0 )
-,   mnRefCount( 1 )
+,   mnRefCount( 0 )
 {
 const sal_UCS4* pRangePtr = mpRangeCodes;
 for( int i = mnRangeCount; --i >= 0; pRangePtr += 2 )
@@ -374,14 +374,17 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 }
 
 FontCharMap::FontCharMap()
-:   mpImplFontCharMap( ImplFontCharMap::getDefaultMap() )
+: mpImplFontCharMap( ImplFontCharMap::getDefaultMap() )
+, mnRefCount(0)
 {}
 
 FontCharMap::FontCharMap( ImplFontCharMapPtr pIFCMap )
-:   mpImplFontCharMap( pIFCMap )
+: mpImplFontCharMap( pIFCMap )
+, mnRefCount(0)
 {}
 
 FontCharMap::FontCharMap( const CmapResult& rCR )
+: mnRefCount(0)
 {
 ImplFontCharMapPtr pImplFontCharMap( new ImplFontCharMap(rCR) );
 mpImplFontCharMap = pImplFontCharMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Miklos Vajna

 sw/source/filter/ww8/wrtw8esh.cxx |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   22 ++
 2 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 3ded687bef4b72a9bb25ce8749c481809b9e04df
Author: Miklos Vajna 
Date:   Mon Oct 13 21:45:57 2014 +0200

SwBasicEscherEx::WritePictures: improve comment

Change-Id: I6763d18efb2b61462b0a92f847495884716f18bb

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 1c5e838..a259e91 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2236,7 +2236,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& 
rWW8Wrt)
 
 for( ; i--; pSdrObjs = rWrt.pSdrObjs, pTxtBxs = rWrt.pTxtBxs )
 {
-// "dummy char" (or any Count ?) - why? This knows only M$
+// "dummy char" (or any Count ?) - why? Only Microsoft knows it.
 GetStream().WriteChar( i );
 
 OpenContainer( ESCHER_DgContainer );
commit 05874170fefb22ad1c461d5402ad30de2654453a
Author: Miklos Vajna 
Date:   Mon Oct 13 21:44:50 2014 +0200

Use comphelper::SequenceAsVector

Change-Id: I0af333551bdd32400b795d37de0d6240e68dd6b6

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f49a14f..8bdf7f7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -589,25 +589,15 @@ void DomainMapper_Impl::IncorporateTabStop( const 
DeletableTabStop &  rTabStop )
 
 uno::Sequence< style::TabStop > DomainMapper_Impl::GetCurrentTabStopAndClear()
 {
-uno::Sequence< style::TabStop > aRet( sal_Int32( m_aCurrentTabStops.size() 
) );
-style::TabStop* pArray = aRet.getArray();
-::std::vector::const_iterator aIt = 
m_aCurrentTabStops.begin();
-::std::vector::const_iterator aEndIt = 
m_aCurrentTabStops.end();
-sal_Int32 nDeleted = 0;
-for(sal_Int32 nIndex = 0; aIt != aEndIt; ++aIt)
-{
-if(!aIt->bDeleted)
-pArray[nIndex++] = *aIt;
-else
-++nDeleted;
+comphelper::SequenceAsVector aRet;
+for (DeletableTabStop& rStop : m_aCurrentTabStops)
+{
+if (!rStop.bDeleted)
+aRet.push_back(rStop);
 }
 m_aCurrentTabStops.clear();
 m_nCurrentTabStopIndex = 0;
-if(nDeleted)
-{
-aRet.realloc( aRet.getLength() - nDeleted);
-}
-return aRet;
+return aRet.getAsConstList();
 }
 
 /*-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC call Thursday 16:00 central European time ...

2014-10-13 Thread Michael Meeks

Hi guys,

You are warmly invited (if you can make a phone-call) to hear what
we get up to in the Engineering Steering Committee, ask questions at a
suitable time in the agenda etc. We maintain our agenda in an etherpad here:

http://pad.documentfoundation.org/p/esc

Dial in details below;

Room number: 21 24 86

All the best,

Michael.

Country Number

Czech Republic  +420 22 888 07 95
Germany +49 30 34044134
Finland +35 89 42 45 00 19
France (Paris)  +33 170 743 070
Great Britain   +44 333 202 00 22
Great Britain   +44 1 777 29 56 08
Hungary +36 18 08 84 82
Italy (Milan)   +39 02 87 212 000
Italy (Rome)+39 06 888 12 000
Japan   +81 3 45 20 93 34
Netherlands +3 12 52 74 40 06
Norway  +47 21 04 92 14
Poland  +48 22 30 70 70 4
Portugal+351 30 88 00 624
Romania +40 333 63 000 3
Slovakia+421 2 33 45 66 16
Slovenia+386 16 00 14 01
South Africa+27 2 13 00 95 90
Spain   +34 911 822 733
Sweden  +46 8 40 30 96 98
USA (N.Y.)  +1 347 416 5028
USA +1 917 200 9279

More numbers: https://wiki.documentfoundation.org/Talkyoo 
-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

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

Re: Crash test update

2014-10-13 Thread Caolán McNamara

On Mon, 2014-10-13 at 16:22 +, Miklos Vajna wrote:
> New crashtest update available at 
> http://dev-builds.libreoffice.org/crashtest/86c4762790823c338f018fb2f06c4a5fa4497916/
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

+306 ppt and +5 sxi failures!, I wonder if

commit 1c8695ecf65174298ebd9edb5b0289db07af98ca
Date:   Mon Oct 13 10:02:02 2014 +0200
boost::rational throws if 0 is passed as denominator

fixes a gadzillion of those ?

C.

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

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

2014-10-13 Thread Tor Lillqvist

 reportdesign/source/ui/report/ReportController.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 758a78ca6e1a734695a09b9c9a6c59f567ae938f
Author: Tor Lillqvist 
Date:   Mon Oct 13 21:37:20 2014 +0300

WaE: unused variable 'aNullShadowCol'

Change-Id: I3907306b53f77874597ac2b727fad9f3a3a3c333

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index d1646b4..bdfa224 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2425,7 +2425,6 @@ void OReportController::openPageDialog(const 
uno::Reference& _
 const Graphic aNullGraphic;
 const ::Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use 
defined default color
 const ::Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use 
defined default color
-const ::Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY));
 const XDash aNullDash;
 const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
 const XHatch aNullHatch(aNullLineCol);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Build error using boost :etonyek library, does not property

2014-10-13 Thread PICCORO McKAY Lenz

I have error building the etonyek library, i enabled on config script the
--disable-weffc option at configure, and also i used the lasted 0.0.4 with
compatibility patch for boost, or i have a missing library in my boost
instalation?

how i can made built with glib 2.24, boost 1.42 and libc 2.7, here the
build error here:

libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I../.. -I../../inc
-I/usr/include/libwpd-0.9 -I/usr/include/libxml2 -DNDEBUG -g -O2 -Wall
-Wextra -Wshadow -pedantic -c KEYShape.cpp  -fPIC -DPIC -o .libs/KEYShape.o
KEYShape.cpp: In function 'std::deque::Point,
std::allocator::Point> >
libetonyekrotatePoint(const libetonyekPoint&,
unsigned int)':
KEYShape.cpp:140: error: 'two_pi' is not a member of 'm'
KEYShape.cpp:140: error: expected primary-expression before 'double'
KEYShape.cpp:140: error: expected ',' or ';' before 'double'
KEYShape.cpp: In function 'libetonyek::KEYPathPtr_t
libetonyek::makeStarPath(const libetonyek::KEYSize&, unsigned int, double)':
KEYShape.cpp:310: error: 'two_pi' is not a member of 'm'
KEYShape.cpp:310: error: expected primary-expression before 'double'
KEYShape.cpp:310: error: expected ',' or ';' before 'double'
make[5]: *** [KEYShape.lo] Error 1


Lenz McKAY Gerardo (PICCORO)
http://qgqlochekone.blogspot.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: 8 commits - chart2/source comphelper/source connectivity/source offapi/com ucb/source unoxml/source vcl/source

2014-10-13 Thread Michael Stahl

On 13.10.2014 16:38, Stephan Bergmann wrote:
> On 10/10/2014 07:15 PM, Caolán McNamara wrote:
>> commit ccaaa544350156ed4cd113634ceb66ad8cc5af23
>> Author: Caolán McNamara 
>> Date:   Fri Oct 10 17:24:03 2014 +0100
>>
>>  coverity#707458 Uncaught exception
>>
>>  Change-Id: Ia446cc0b8b26bb158b36ca64cbf45bf172f37bdf
>>
>> diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl 
>> b/offapi/com/sun/star/rdf/XDocumentRepository.idl
>> index 039e376..ff1ee9b 100644
>> --- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
>> +++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
>> @@ -169,6 +169,7 @@ interface XDocumentRepository : XRepository
>>   com::sun::star::beans::Pair< sequence, boolean >
>>   getStatementRDFa([in] XMetadatable Element)
>>   raises( com::sun::star::lang::IllegalArgumentException,
>> +com::sun::star::container::NoSuchElementException,
>>   RepositoryException );
>>
>>   /** gets matching RDFa statements from the repository.
> 
> What does it mean to throw NoSuchElementException from
> 
>getStatementRDFa([in] XMetadatable Element)
> 

i was thinking it means that implementation details are leaking through
at the interface and just pushed a different fix...


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

[Libreoffice-commits] core.git: 2 commits - include/svx offapi/com oox/inc oox/source sd/qa svx/source unoxml/source

2014-10-13 Thread Michael Stahl

 include/svx/svdomedia.hxx   |1 
 offapi/com/sun/star/rdf/XDocumentRepository.idl |1 
 oox/inc/drawingml/graphicproperties.hxx |5 +
 oox/source/drawingml/fillproperties.cxx |8 +-
 oox/source/drawingml/graphicshapecontext.cxx|   32 +-
 oox/source/drawingml/shape.cxx  |2 
 sd/qa/unit/import-tests.cxx |2 
 svx/source/svdraw/svdomedia.cxx |   76 
 svx/source/unodraw/unoprov.cxx  |2 
 svx/source/unodraw/unoshap4.cxx |   26 
 unoxml/source/rdf/librdf_repository.cxx |   31 ++---
 11 files changed, 130 insertions(+), 56 deletions(-)

New commits:
commit 220a3686921847b71dc72b69ce98ba260b951610
Author: Michael Stahl 
Date:   Mon Oct 13 19:01:12 2014 +0200

oox: refactor embedded media import

Currently the oox import creates a temp file and leaks it, and there is
no way to clean it up afterwards.  Unfortunately it turns out that
SdrModel has no way to access the imported OOXML storage, so add a
really ugly hack to get the embedded media into the SdrMediaObj by
setting both MediaURL and PrivateStream properties (currently oox really
wants to set the properties in alphabetical order too...)

Change-Id: I5a235fbeb08e7bc17faf066de52b94867e9a79a2

diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index b8c4c67..224f117 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -72,6 +72,7 @@ public:
 getSnapshot();
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>
 GetInputStream();
+void
SetInputStream(css::uno::Reference const&);
 
 protected:
 
diff --git a/oox/inc/drawingml/graphicproperties.hxx 
b/oox/inc/drawingml/graphicproperties.hxx
index 27644cd..b89d3b9 100644
--- a/oox/inc/drawingml/graphicproperties.hxx
+++ b/oox/inc/drawingml/graphicproperties.hxx
@@ -22,6 +22,8 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -36,7 +38,8 @@ namespace drawingml {
 struct GraphicProperties
 {
 BlipFillProperties  maBlipProps;///< Properties for the 
graphic.
-OUStringmsMediaTempFile;///< Audio/Video temporary 
file.
+OUStringm_sMediaPackageURL; ///< Audio/Video URL.
+css::uno::Reference m_xMediaStream; ///< 
Audio/Video input stream.
 
 /** Overwrites all members that are explicitly set in rSourceProps. */
 voidassignUsed( const GraphicProperties& rSourceProps );
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 80e2c25..fd45658 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -753,8 +753,12 @@ void GraphicProperties::pushToPropMap( PropertyMap& 
rPropMap, const GraphicHelpe
 rPropMap.setProperty(PROP_AdjustContrast, nContrast);
 
 // Media content
-if( !msMediaTempFile.isEmpty() )
-rPropMap.setProperty(PROP_MediaURL, msMediaTempFile);
+assert(m_xMediaStream.is() != m_sMediaPackageURL.isEmpty());
+if (m_xMediaStream.is() && !m_sMediaPackageURL.isEmpty())
+{
+rPropMap.setProperty(PROP_PrivateStream, m_xMediaStream);
+rPropMap.setProperty(PROP_MediaURL, m_sMediaPackageURL);
+}
 }
 
 bool ArtisticEffectProperties::isEmpty() const
diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index a2eac16..7c82395f 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -49,20 +49,19 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::oox::core;
 
-static OUString lcl_CopyToTempFile(const OUString& rStream, const 
oox::core::XmlFilterBase& rFilter)
+static uno::Reference
+lcl_GetMediaStream(const OUString& rStream, const oox::core::XmlFilterBase& 
rFilter)
 {
 if (rStream.isEmpty())
-return OUString();
+return nullptr;
 
 Reference< XInputStream > xInStrm( rFilter.openInputStream(rStream), 
UNO_SET_THROW );
-Reference< XTempFile > xTempFile( 
TempFile::create(rFilter.getComponentContext()) );
-Reference< XOutputStream > xOutStrm( xTempFile->getOutputStream(), 
UNO_SET_THROW );
-oox::BinaryXOutputStream aOutStrm( xOutStrm, false );
-oox::BinaryXInputStream aInStrm( xInStrm, false );
-aInStrm.copyToStream( aOutStrm );
-
-xTempFile->setRemoveFile( false );
-return xTempFile->getUri();
+return xInStrm;
+}
+
+static OUString lcl_GetMediaReference(const OUString& rStream)
+{
+return rStream.isEmpty() ? OUString() : "vnd.sun.star.Package:" + rStream;
 }
 
 namespace oox {
@@ -86,8 +85,11 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( 
sal_Int32

[Libreoffice-commits] core.git: scripting/java

2014-10-13 Thread Robert Antoni Buj i Gelonch

 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java |
2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b862f6e92357f8d4a8d88072ce5caf44bd6f1c6d
Author: Robert Antoni Buj i Gelonch 
Date:   Sat Oct 11 20:10:51 2014 +0200

scripting: Null pointer dereference

Change-Id: I0d72ef34945065f68e9af8b0957dc440a74c14ce
Reviewed-on: https://gerrit.libreoffice.org/11923
Reviewed-by: Matthew Francis 
Tested-by: Matthew Francis 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index bcef577..8daf836 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -171,7 +171,7 @@ public abstract class ScriptProvider implements
 } else {
 // otherwise, check whether it's an XModel
 m_xModel =
-UnoRuntime.queryInterface(XModel.class, 
m_xInvocContext.getScriptContainer());
+UnoRuntime.queryInterface(XModel.class, aArguments[0]);
 }
 
 if (m_xModel == null) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Armin Le Grand

 svgio/inc/svgio/svgreader/svgtools.hxx|4 ++
 svgio/source/svgreader/svgdocumenthandler.cxx |   11 +
 svgio/source/svgreader/svgtools.cxx   |   51 ++
 3 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit c18591107d9c856b15fa884eaed354d021ec4262
Author: Armin Le Grand 
Date:   Fri Oct 10 15:52:52 2014 +

Resolves: #i125325# added code to handle block comments...

in Css style definitions

(cherry picked from commit 7b071b828a5f602cc30c17ddd871a75426a53faf)

Conflicts:
svgio/source/svgreader/svgtools.cxx

Change-Id: I094228ea398686c5b39f5f279a964a2df7b00368

diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx 
b/svgio/inc/svgio/svgreader/svgtools.hxx
index 555a075..a2f1940 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -224,6 +224,10 @@ namespace svgio
 OUString whiteSpaceHandlingDefault(const OUString& rCandidate);
 OUString whiteSpaceHandlingPreserve(const OUString& rCandidate);
 
+// #125325# removes block comment of the general form '/* ... */', 
returns
+// an adapted string or the original if no comments included
+OUString removeBlockComments(const OUString& rCandidate);
+
 } // end of namespace svgreader
 } // end of namespace svgio
 
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx 
b/svgio/source/svgreader/svgdocumenthandler.cxx
index 1cb1a54..d816f54 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -519,7 +519,16 @@ namespace svgio
 if(maCssContents.size())
 {
 // need to interpret css styles and remember them as 
StyleSheets
-pCssStyle->addCssStyleSheet(*(maCssContents.end() - 
1));
+// #125325# Caution! the Css content may contain block 
comments
+// (see 
http://www.w3.org/wiki/CSS_basics#CSS_comments). These need
+// to be removed first
+const OUString 
aCommentFreeSource(removeBlockComments(*(maCssContents.end() - 1)));
+
+if(aCommentFreeSource.getLength())
+{
+pCssStyle->addCssStyleSheet(aCommentFreeSource);
+}
+
 maCssContents.pop_back();
 }
 else
diff --git a/svgio/source/svgreader/svgtools.cxx 
b/svgio/source/svgreader/svgtools.cxx
index f3faa47..a4d594a 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -1513,6 +1513,57 @@ namespace svgio
 return rCandidate;
 }
 
+// #i125325#
+OUString removeBlockComments(const OUString& rCandidate)
+{
+const sal_Int32 nLen(rCandidate.getLength());
+
+if(nLen)
+{
+sal_Int32 nPos(0);
+OUStringBuffer aBuffer;
+bool bChanged(false);
+sal_Int32 nInsideComment(0);
+const sal_Unicode aCommentSlash('/');
+const sal_Unicode aCommentStar('*');
+
+while(nPos < nLen)
+{
+const sal_Unicode aChar(rCandidate[nPos]);
+const bool bStart(aCommentSlash == aChar && nPos + 1 < 
nLen && aCommentStar == rCandidate[nPos + 1]);
+const bool bEnd(aCommentStar == aChar && nPos + 1 < nLen 
&& aCommentSlash == rCandidate[nPos + 1]);
+
+if(bStart)
+{
+nPos += 2;
+nInsideComment++;
+bChanged = true;
+}
+else if(bEnd)
+{
+nPos += 2;
+nInsideComment--;
+}
+else
+{
+if(!nInsideComment)
+{
+aBuffer.append(aChar);
+}
+
+nPos++;
+}
+}
+
+if(bChanged)
+{
+return aBuffer.makeStringAndClear();
+}
+}
+
+return rCandidate;
+}
+
 OUString consolidateContiguosSpace(const OUString& rCandidate)
 {
 const sal_Int32 nLen(rCandidate.getLength());
___
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' - 7b/071b828a5f602cc30c17ddd871a75426a53faf

2014-10-13 Thread Caolán McNamara

 7b/071b828a5f602cc30c17ddd871a75426a53faf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f7d424231a54fd2ce7047b63238c68bf988bd577
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 17:32:03 2014 +0100

Notes added by 'git notes add'

diff --git a/7b/071b828a5f602cc30c17ddd871a75426a53faf 
b/7b/071b828a5f602cc30c17ddd871a75426a53faf
new file mode 100644
index 000..47fed64
--- /dev/null
+++ b/7b/071b828a5f602cc30c17ddd871a75426a53faf
@@ -0,0 +1 @@
+merged as: c18591107d9c856b15fa884eaed354d021ec4262
___
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' - bb/72d5b3ecbe6a03d3d3dfe101ad67ff4650a9f9

2014-10-13 Thread Caolán McNamara

 bb/72d5b3ecbe6a03d3d3dfe101ad67ff4650a9f9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 57be20a82947b26c355655076e43ca0fe3c202fd
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 17:26:33 2014 +0100

Notes added by 'git notes add'

diff --git a/bb/72d5b3ecbe6a03d3d3dfe101ad67ff4650a9f9 
b/bb/72d5b3ecbe6a03d3d3dfe101ad67ff4650a9f9
new file mode 100644
index 000..1ebf1bc
--- /dev/null
+++ b/bb/72d5b3ecbe6a03d3d3dfe101ad67ff4650a9f9
@@ -0,0 +1 @@
+merged as: 4c31a0be1d8048bf3340acbb59248185e4b93041
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Armin Le Grand

 svgio/source/svgreader/svgdocumenthandler.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 4c31a0be1d8048bf3340acbb59248185e4b93041
Author: Armin Le Grand 
Date:   Fri Oct 10 12:50:29 2014 +

Resolves: #i125326# accept CssStyles with missing type attribute

(cherry picked from commit bb72d5b3ecbe6a03d3d3dfe101ad67ff4650a9f9)

Conflicts:
svgio/source/svgreader/svgdocumenthandler.cxx

Change-Id: I5395c2cada92d5abcde9f6cc18bc237a58e77992

diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx 
b/svgio/source/svgreader/svgdocumenthandler.cxx
index d052e46..1cb1a54 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -323,10 +323,26 @@ namespace svgio
 {
 SvgStyleNode* pNew = new SvgStyleNode(maDocument, 
mpTarget);
 mpTarget = pNew;
-mpTarget->parseAttributes(xAttribs);
+const sal_uInt32 nAttributes(xAttribs->getLength());
+
+if(0 == nAttributes)
+{
+// #i125326# no attributes, thus also no 
type="text/css". This is allowed to be missing,
+// thus do mark this style as CssStyle. This is 
required to read the contained
+// text (which defines the css style)
+pNew->setTextCss(true);
+}
+else
+{
+// #i125326# there are attributes, read them. This 
will set isTextCss to true if
+// a type="text/css" is contained as exact match, 
else not
+mpTarget->parseAttributes(xAttribs);
+}
 
 if(pNew->isTextCss())
 {
+// if it is a Css style, allow reading text 
between the start and end tag (see
+// SvgDocHdl::characters for details)
 maCssContents.push_back(OUString());
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

2014-10-13 Thread Miklos Vajna

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/86c4762790823c338f018fb2f06c4a5fa4497916/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

2014-10-13 Thread Caolán McNamara

 include/vcl/outdevstate.hxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 4be799fc8236dff1038e84dc522f6cac9f834cb7
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 17:03:34 2014 +0100

build error: specialization in different namespace

Change-Id: Ic1730a49576a663a2e04a2386bd3962a21b6fc48

diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index da3dc4e..ed84aa0 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -53,13 +53,14 @@ enum class PushFlags : sal_uInt16 {
 
 //bool operator bool() { return static_cast(*this) != 0; }
 };
-template<>
-struct o3tl::typed_flags: o3tl::is_typed_flags 
{};
+
+namespace o3tl
+{
+template<> struct typed_flags : is_typed_flags {};
+}
 #define PUSH_ALLTEXT  (PushFlags::TEXTCOLOR | PushFlags::TEXTFILLCOLOR | 
PushFlags::TEXTLINECOLOR | PushFlags::OVERLINECOLOR | PushFlags::TEXTALIGN | 
PushFlags::TEXTLAYOUTMODE | PushFlags::TEXTLANGUAGE)
 #define PUSH_ALLFONT  (PUSH_ALLTEXT | PushFlags::FONT)
 
-
-
 // LayoutModes for Complex Text Layout
 // These are flag values, i.e they can be combined
 enum ComplexTextLayoutMode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 9 commits - reportdesign/source rsc/source svx/source sw/source

2014-10-13 Thread Caolán McNamara

 reportdesign/source/ui/report/ReportController.cxx |   98 +
 rsc/source/rsc/rsc.cxx |4 
 svx/source/gallery2/galtheme.cxx   |5 -
 svx/source/tbxctrls/fontworkgallery.cxx|4 
 sw/source/core/docnode/ndnum.cxx   |4 
 sw/source/filter/ww8/ww8par5.cxx   |4 
 sw/source/filter/ww8/ww8scan.cxx   |2 
 sw/source/filter/xml/swxml.cxx |6 -
 8 files changed, 93 insertions(+), 34 deletions(-)

New commits:
commit 9783ea516f007ce4dc46af3362b94dcece59b0dc
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 16:52:36 2014 +0100

Resolves: fdo#84930 format page background in report-builder crash

another regression from one of...

commit 7d9bb549d498d6beed2c4050c402d09643febdfa
Author: Armin Le Grand 
Date:   Mon Jun 2 15:00:50 2014 +

Related: #i124638# Second step of DrawingLayer FillAttributes...

for Writer objects, now added support for Paragraph and PageStyle 
(including
Header and Footer) for direct attributes and style attributes

commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c
Author: Armin Le Grand 
Date:   Thu Apr 17 16:44:58 2014 +

i#124638 support for DrawingLayre FillStyle for GraphicFrames and 
...

... EmbeddedObjectFrames in Writer

commit 6e61ecd09679a66060f932835622821d39e92f01
Author: Armin Le Grand 
Date:   Wed Mar 19 16:17:02 2014 +

This is something of a horror, and this is a suboptimal fix, but it
appears to work.

Change-Id: Iee7e6fdb40ca2e32beaa8e4bfea31872b8e0642e

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index f827456..d1646b4 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -17,16 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define RPTUI_ID_LRSPACE1
-#define RPTUI_ID_ULSPACE2
-#define RPTUI_ID_PAGE   3
-#define RPTUI_ID_SIZE   4
-#define RPTUI_ID_PAGE_MODE  5
-#define RPTUI_ID_START  6
-#define RPTUI_ID_END7
-#define RPTUI_ID_BRUSH  8
-#define RPTUI_ID_METRIC 9
-
 #include "ReportController.hxx"
 #include "ReportDefinition.hxx"
 #include "CondFormat.hxx"
@@ -98,6 +88,17 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -154,6 +155,16 @@
 
 #define MAX_ROWS_FOR_PREVIEW20
 
+#define RPTUI_ID_LRSPACEXATTR_FILL_FIRST - 8
+#define RPTUI_ID_ULSPACEXATTR_FILL_FIRST - 7
+#define RPTUI_ID_PAGE   XATTR_FILL_FIRST - 6
+#define RPTUI_ID_SIZE   XATTR_FILL_FIRST - 5
+#define RPTUI_ID_PAGE_MODE  XATTR_FILL_FIRST - 4
+#define RPTUI_ID_START  XATTR_FILL_FIRST - 3
+#define RPTUI_ID_ENDXATTR_FILL_FIRST - 2
+#define RPTUI_ID_BRUSH  XATTR_FILL_FIRST - 1
+#define RPTUI_ID_METRIC XATTR_FILL_LAST + 1
+
 using namespace ::com::sun::star;
 using namespace uno;
 using namespace io;
@@ -2378,12 +2389,47 @@ void OReportController::openPageDialog(const 
uno::Reference& _
 { SID_PAPER_START,  SFX_ITEM_POOLABLE },
 { SID_PAPER_END,SFX_ITEM_POOLABLE },
 { SID_ATTR_BRUSH,   SFX_ITEM_POOLABLE },
-{ SID_FLAG_TYPE,SFX_ITEM_POOLABLE },
+{ XATTR_FILLSTYLE,  SFX_ITEM_POOLABLE },
+{ XATTR_FILLCOLOR,  SFX_ITEM_POOLABLE },
+{ XATTR_FILLGRADIENT,   SFX_ITEM_POOLABLE },
+{ XATTR_FILLHATCH,  SFX_ITEM_POOLABLE },
+{ XATTR_FILLBITMAP, SFX_ITEM_POOLABLE },
+{ XATTR_FILLTRANSPARENCE,   SFX_ITEM_POOLABLE },
+{ XATTR_GRADIENTSTEPCOUNT,  SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_TILE,   SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_POS,SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_SIZEX,  SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_SIZEY,  SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_SIZELOG,SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_TILEOFFSETX,SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_TILEOFFSETY,SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_STRETCH,SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_POSOFFSETX, SFX_ITEM_POOLABLE },
+{ XATTR_FILLBMP_POSOFFSETY, SFX_ITEM_POOLABLE },
+{ XATTR_FILLFLOATTRANSPARENCE,  SFX_ITEM_POOLABLE },
+{ XATTR_SECONDARYFILLCOLOR, SFX_ITEM_POOLABLE },
+{ XATTR_FILLBACKGROUND, SFX_ITEM_POOLABLE },
 { SID_ATTR_METRIC,  SFX_ITEM_POOLABLE }
 };
 
 MeasurementSystem eSystem = 
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
 FieldUnit eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_

[Libreoffice-commits] core.git: canvas/source cppcanvas/source cui/source dbaccess/source drawinglayer/source editeng/qa editeng/source filter/source forms/source include/o3tl include/vcl reportdesign

2014-10-13 Thread Noel Grandin

 canvas/source/vcl/canvashelper_texturefill.cxx |8 
 canvas/source/vcl/spritecanvashelper.cxx   |2 
 canvas/source/vcl/spritehelper.cxx |2 
 cppcanvas/source/inc/outdevstate.hxx   |2 
 cppcanvas/source/mtfrenderer/implrenderer.cxx  |   36 +-
 cui/source/dialogs/hangulhanjadlg.cxx  |2 
 dbaccess/source/ui/browser/dataview.cxx|2 
 dbaccess/source/ui/control/listviewitems.cxx   |4 
 dbaccess/source/ui/tabledesign/TEditControl.cxx|2 
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx|   44 +-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx|2 
 editeng/qa/items/borderline_test.cxx   |4 
 editeng/source/editeng/impedit.cxx |2 
 editeng/source/editeng/impedit2.cxx|2 
 editeng/source/editeng/impedit3.cxx|   12 
 editeng/source/items/borderline.cxx|8 
 editeng/source/items/frmitems.cxx  |8 
 editeng/source/misc/hangulhanja.cxx|2 
 filter/source/flash/swfwriter1.cxx |2 
 filter/source/graphicfilter/ieps/ieps.cxx  |2 
 filter/source/graphicfilter/ios2met/ios2met.cxx|6 
 filter/source/pdf/pdfexport.cxx|4 
 forms/source/richtext/richtextimplcontrol.cxx  |4 
 include/o3tl/typed_flags_set.hxx   |  208 +
 include/vcl/outdev.hxx |2 
 include/vcl/outdevstate.hxx|   57 +--
 include/vcl/pdfwriter.hxx  |2 
 reportdesign/source/ui/inc/ColorChanger.hxx|6 
 sc/source/filter/excel/xichart.cxx |2 
 sc/source/ui/cctrl/checklistmenu.cxx   |4 
 sc/source/ui/cctrl/dpcontrol.cxx   |2 
 sc/source/ui/dbgui/csvcontrol.cxx  |2 
 sc/source/ui/miscdlgs/autofmt.cxx  |2 
 sfx2/source/dialog/backingwindow.cxx   |2 
 sfx2/source/dialog/titledockwin.cxx|2 
 sfx2/source/sidebar/TitleBar.cxx   |4 
 starmath/source/dialog.cxx |2 
 starmath/source/document.cxx   |4 
 starmath/source/node.cxx   |2 
 starmath/source/rect.cxx   |4 
 starmath/source/tmpdevice.cxx  |4 
 starmath/source/visitors.cxx   |8 
 svtools/source/brwbox/brwbox2.cxx  |4 
 svtools/source/control/headbar.cxx |2 
 svtools/source/control/ruler.cxx   |2 
 svtools/source/control/toolbarmenu.cxx |2 
 svtools/source/graphic/grfmgr.cxx  |4 
 svtools/source/graphic/grfmgr2.cxx |4 
 svtools/source/table/gridtablerenderer.cxx |   10 
 svtools/source/toolpanel/paneltabbar.cxx   |6 
 svx/source/dialog/framelink.cxx|6 
 svx/source/dialog/framelinkarray.cxx   |2 
 svx/source/form/filtnav.cxx|2 
 svx/source/gallery2/galctrl.cxx|2 
 svx/source/sdr/contact/objectcontactofpageview.cxx |2 
 svx/source/sidebar/tools/ValueSetWithTextControl.cxx   |2 
 sw/source/core/doc/notxtfrm.cxx|2 
 sw/source/core/draw/dflyobj.cxx|2 
 sw/source/core/layout/layact.cxx   |2 
 sw/source/core/layout/paintfrm.cxx |   16 -
 sw/source/core/layout/virtoutp.cxx |2 
 sw/source/core/text/EnhancedPDFExportHelper.cxx|2 
 sw/source/core/text/inftxt.cxx |   10 
 sw/source/core/text/porlin.cxx |4 
 sw/source/core/txtnode/fntcache.cxx|2 
 sw/source/core/txtnode/fntcap.cxx  |2 
 sw/source/core/txtnode/swfont.cxx  |2 
 sw/source/core/view/vdraw.cxx  |2 
 sw/source/core/view/viewsh.cxx |4 
 sw/source/core/view/vprint.cxx |2 
 sw/source/filter/ww8/ww8par3.cxx   |2 
 sw/source/ui/table/tautofmt.cxx|2 
 test/source/m

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

2014-10-13 Thread Caolán McNamara

 jvmfwk/source/framework.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1156d11ef0bb2bc3d71ae9299656db4fed66f073
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 10:31:14 2014 +0100

coverity#1066164 Resource leak

Change-Id: I152f22728a8eeea65114fe102511940bccf40478
Signed-off-by: Stephan Bergmann 

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index bdb75f7..a604164 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -732,6 +732,8 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo 
const *pInfo)
 //remember that the JRE was selected in this process
 jfw::setJavaSelected();
 }
+
+jfw_freeJavaInfo(currentInfo);
 }
 catch (const jfw::FrameworkException& e)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Matthew J . Francis

 sysui/desktop/macosx/Info.plist.in |   92 +
 1 file changed, 92 insertions(+)

New commits:
commit e71b696ef6a50db0cb6a02e261b858e05fdb1a8f
Author: Matthew J. Francis 
Date:   Mon Oct 13 22:15:09 2014 +0800

Register flat file mime types on OS X

Change-Id: I505703b2f6890586e05e6c2146d9b37774f101d0
Reviewed-on: https://gerrit.libreoffice.org/11957
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sysui/desktop/macosx/Info.plist.in 
b/sysui/desktop/macosx/Info.plist.in
index 892d0df..b9c78c0 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -71,6 +71,28 @@



+   
+   UTTypeIdentifier
+   vnd.oasis.opendocument.text-flat-xml
+   UTTypeDescription
+   OpenDocument Text (Flat XML)
+   UTTypeConformsTo
+   
+   public.data
+   public.content
+   
+   UTTypeTagSpecification
+   
+   public.filename-extension
+   
+   fodt
+   
+   public.mime-type
+   
+   
application/vnd.oasis.opendocument.text-flat-xml
+   
+   
+   
 


@@ -119,6 +141,28 @@



+   
+   UTTypeIdentifier
+   
vnd.oasis.opendocument.spreadsheet-flat-xml
+   UTTypeDescription
+   OpenDocument Spreadsheet (Flat XML)
+   UTTypeConformsTo
+   
+   public.data
+   public.content
+   
+   UTTypeTagSpecification
+   
+   public.filename-extension
+   
+   fods
+   
+   public.mime-type
+   
+   
application/vnd.oasis.opendocument.spreadsheet-flat-xml
+   
+   
+   
 


@@ -169,6 +213,28 @@



+   
+   UTTypeIdentifier
+   
vnd.oasis.opendocument.presentation-flat-xml
+   UTTypeDescription
+   OpenDocument Presentation
+   UTTypeConformsTo
+   
+   public.data
+   public.content
+   
+   UTTypeTagSpecification
+   
+   public.filename-extension
+   
+   fodp
+   
+   public.mime-type
+   
+   
application/vnd.oasis.opendocument.presentation-flat-xml
+   
+   
+   
 


@@ -217,6 +283,28 @@



+   
+   UTTypeIdentifier
+   
vnd.oasis.opendocument.graphics-flat-xml
+   UTTypeDescription
+   OpenDocument Drawing (Flat XML)
+   UTTypeConformsTo
+   
+   public.data
+   public.content
+   
+   UTTypeTagSpecification
+   
+   public.filename-extension
+   
+   fodg
+   
+   public.mime-type
+   
+   
application/vnd.oasis.opendocument.graphics-flat-xml
+   
+   
+   
 


@@ -1373,12 +1461,16 @@

org.openoffice.text

org.oasis-open.opendocument.text
+   
vnd.oasis.opendocument.te

[Libreoffice-commits] core.git: qadevOOo/runner toolkit/test

2014-10-13 Thread Robert Antoni Buj i Gelonch

 qadevOOo/runner/graphical/IniFile.java  |7 +++
 qadevOOo/runner/share/DescGetter.java   |7 +++
 toolkit/test/accessibility/AccTreeNode.java |6 ++
 3 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit d0be30e8eec9d982501e8727df05962572c7acc6
Author: Robert Antoni Buj i Gelonch 
Date:   Mon Oct 13 16:05:18 2014 +0200

java: Collections.addAll for adding an array of elements to a Collection

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

diff --git a/qadevOOo/runner/graphical/IniFile.java 
b/qadevOOo/runner/graphical/IniFile.java
index f6b371f..fe2df6e 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -19,7 +19,9 @@ package graphical;
 
 import java.io.File;
 import java.io.RandomAccessFile;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Enumeration;
 
 /**
@@ -55,10 +57,7 @@ public class IniFile implements Enumeration
 if (m_aList.isEmpty())
 {
 // can only insert if there is nothing else already in the ini 
file
-for (int i = 0; i < _aList.length; i++)
-{
-m_aList.add(_aList[i]);
-}
+m_aList.addAll(Arrays.asList(_aList));
 }
 }
 
diff --git a/qadevOOo/runner/share/DescGetter.java 
b/qadevOOo/runner/share/DescGetter.java
index 53e0f93..892a33d 100644
--- a/qadevOOo/runner/share/DescGetter.java
+++ b/qadevOOo/runner/share/DescGetter.java
@@ -19,7 +19,9 @@ package share;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.StringTokenizer;
 
 /**
@@ -108,10 +110,7 @@ public abstract class DescGetter
 line.length()).trim(), descPath,
 debug);
 
-for (int i = 0; i < subs.length; i++)
-{
-entryList.add(subs[i]);
-}
+entryList.addAll(Arrays.asList(subs));
 }
 else if (line.startsWith("-p"))
 {
diff --git a/toolkit/test/accessibility/AccTreeNode.java 
b/toolkit/test/accessibility/AccTreeNode.java
index 136f872..73fa129 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -17,6 +17,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleComponent;
@@ -299,10 +300,7 @@ class AccTreeNode
 HandlerDescriptor aDescriptor = getHandlerDescriptor (i);
 NodeHandler aHandler = aDescriptor.maHandler;
 String[] aHandlerActions = aHandler.getActions (this);
-for(int j = 0; j < aHandlerActions.length; j++ )
-{
-aActions.add( aHandlerActions[j] );
-}
+aActions.addAll(Arrays.asList(aHandlerActions));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: javaunohelper/test jurt/com qadevOOo/runner wizards/com xmerge/source

2014-10-13 Thread Robert Antoni Buj i Gelonch

 javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java   |   
 1 -
 jurt/com/sun/star/uno/WeakReference.java   |   
 5 -
 qadevOOo/runner/lib/TestCase.java  |   
 1 -
 qadevOOo/runner/util/InstCreator.java  |   
 2 --
 wizards/com/sun/star/wizards/common/ParaStyled.java|   
 1 -
 wizards/com/sun/star/wizards/common/PlaceholderTextElement.java|   
 2 --
 wizards/com/sun/star/wizards/common/TextElement.java   |   
 2 --
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java |   
 2 --
 8 files changed, 16 deletions(-)

New commits:
commit f6388e15bf95326d2a712453dc2c17b010801533
Author: Robert Antoni Buj i Gelonch 
Date:   Mon Oct 13 16:36:02 2014 +0200

java: import from the same package

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

diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java 
b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
index 092c9fc..bb0a605 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -30,7 +30,6 @@ import com.sun.star.registry.XSimpleRegistry;
 import com.sun.star.registry.XImplementationRegistration;
 import com.sun.star.container.XSet;
 
-import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.comp.helper.RegistryServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
diff --git a/jurt/com/sun/star/uno/WeakReference.java 
b/jurt/com/sun/star/uno/WeakReference.java
index 3691c0f..261bc1a 100644
--- a/jurt/com/sun/star/uno/WeakReference.java
+++ b/jurt/com/sun/star/uno/WeakReference.java
@@ -18,11 +18,6 @@
 
 package com.sun.star.uno;
 
-import com.sun.star.uno.XWeak;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XAdapter;
-import com.sun.star.uno.XReference;
-
 /**
  * This class holds weak reference to an object.
  *
diff --git a/qadevOOo/runner/lib/TestCase.java 
b/qadevOOo/runner/lib/TestCase.java
index a4895f1..ebe175d 100644
--- a/qadevOOo/runner/lib/TestCase.java
+++ b/qadevOOo/runner/lib/TestCase.java
@@ -19,7 +19,6 @@
 package lib;
 
 import java.io.PrintWriter;
-import lib.TestParameters;
 
 /**
  * TestCase represent a factory for TestEnvironments
diff --git a/qadevOOo/runner/util/InstCreator.java 
b/qadevOOo/runner/util/InstCreator.java
index 5259b43..e1eb8c8 100644
--- a/qadevOOo/runner/util/InstCreator.java
+++ b/qadevOOo/runner/util/InstCreator.java
@@ -18,8 +18,6 @@
 
 package util;
 
-import util.XInstCreator;
-
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java 
b/wizards/com/sun/star/wizards/common/ParaStyled.java
index e1eedfd..0a80f45 100644
--- a/wizards/com/sun/star/wizards/common/ParaStyled.java
+++ b/wizards/com/sun/star/wizards/common/ParaStyled.java
@@ -17,7 +17,6 @@
  */
 
 package com.sun.star.wizards.common;
-import com.sun.star.wizards.common.TemplateElement;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.text.*;
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java 
b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index a6e69da..3b943e0 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -17,14 +17,12 @@
  */
 
 package com.sun.star.wizards.common;
-import com.sun.star.wizards.common.TextElement;
 
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.*;
 import com.sun.star.wizards.text.*;
-import com.sun.star.wizards.common.PlaceholderTextElement;
 
 public class PlaceholderTextElement extends TextElement
 {
diff --git a/wizards/com/sun/star/wizards/common/TextElement.java 
b/wizards/com/sun/star/wizards/common/TextElement.java
index 3830891..4549a9f 100644
--- a/wizards/com/sun/star/wizards/common/TextElement.java
+++ b/wizards/com/sun/star/wizards/common/TextElement.java
@@ -17,11 +17,9 @@
  */
 
 package com.sun.star.wizards.common;
-import com.sun.star.wizards.common.ParaStyled;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.text.*;
-import com.sun.star.wizards.common.TextElement;
 
 public class TextElement extends ParaStyled
 {
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index f74a999..11e337b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merge

[Libreoffice-commits] core.git: reportbuilder/java

2014-10-13 Thread Robert Antoni Buj i Gelonch

 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java |2 
--
 1 file changed, 2 deletions(-)

New commits:
commit a667840368d0299c695c3565da06d31f6fde4c02
Author: Robert Antoni Buj i Gelonch 
Date:   Mon Oct 13 16:52:02 2014 +0200

reportbuilder: import from java.lang package

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

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
index 0a8586b..a054794 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
@@ -40,8 +40,6 @@ import 
org.libreoffice.report.pentaho.output.text.TextRawReportProcessor;
 
 import java.io.IOException;
 
-import java.lang.Integer;
-
 import java.util.ArrayList;
 import java.util.List;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: README.Android README.cross

2014-10-13 Thread Jan Holesovsky

 README.Android |5 +
 README.cross   |   13 +
 2 files changed, 18 insertions(+)

New commits:
commit c862be08158f502c42752f025d5cc6384285c688
Author: Jan Holesovsky 
Date:   Mon Oct 13 16:51:08 2014 +0200

android: Dump my debugging notes to the readme's.

Change-Id: I8f91e73fe5df5dfef054df80d43be3c74d01388b

diff --git a/README.Android b/README.Android
index 2fe09e2..9ae7fd3 100644
--- a/README.Android
+++ b/README.Android
@@ -46,6 +46,11 @@ know. But don't seem to be necessary on a real device anyway?
 
 * Debugging
 
+   Install the .apk to the device, start the application, and:
+
+   cd android/experimental/LOAndroid3
+   /ndk-gdb --adb=/platform-tools/adb
+
Some versions of the NDK had a broken gdb in the way that it can see
 symbols only for shlibs that were already loaded when the debuggee was
 attached, so you need to carefully guess where to put:
diff --git a/README.cross b/README.cross
index 451751d..0c6a777 100644
--- a/README.cross
+++ b/README.cross
@@ -375,6 +375,19 @@ an "adb logcat" running in another window.
 To debug, do manually what "make run" would do and when the app has
 started, run ndk-gdb.
 
+You can also do that manually; to install:
+
+  /platform-tools/adb install -r 
android/experimental/LOAndroid3/bin/LibreOfficeViewer-debug.apk
+
+To see the log:
+
+  /platform-tools/adb logcat
+
+To debug, install the .apk, run it, and then:
+
+  cd android/experimental/LOAndroid3
+  /ndk-gdb --adb=/platform-tools/adb
+
 NB: If you happen to upgrade to Android SDK Tools 23, and the build (using
 'make verbose=t android') fails for you with:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - README.Android README.cross

2014-10-13 Thread Jan Holesovsky

 README.Android |5 +
 README.cross   |   13 +
 2 files changed, 18 insertions(+)

New commits:
commit 9c0cb7a7d1f608e26dadbc71748439bac8b7d17e
Author: Jan Holesovsky 
Date:   Mon Oct 13 16:51:08 2014 +0200

android: Dump my debugging notes to the readme's.

Change-Id: I8f91e73fe5df5dfef054df80d43be3c74d01388b

diff --git a/README.Android b/README.Android
index 2fe09e2..9ae7fd3 100644
--- a/README.Android
+++ b/README.Android
@@ -46,6 +46,11 @@ know. But don't seem to be necessary on a real device anyway?
 
 * Debugging
 
+   Install the .apk to the device, start the application, and:
+
+   cd android/experimental/LOAndroid3
+   /ndk-gdb --adb=/platform-tools/adb
+
Some versions of the NDK had a broken gdb in the way that it can see
 symbols only for shlibs that were already loaded when the debuggee was
 attached, so you need to carefully guess where to put:
diff --git a/README.cross b/README.cross
index 451751d..0c6a777 100644
--- a/README.cross
+++ b/README.cross
@@ -375,6 +375,19 @@ an "adb logcat" running in another window.
 To debug, do manually what "make run" would do and when the app has
 started, run ndk-gdb.
 
+You can also do that manually; to install:
+
+  /platform-tools/adb install -r 
android/experimental/LOAndroid3/bin/LibreOfficeViewer-debug.apk
+
+To see the log:
+
+  /platform-tools/adb logcat
+
+To debug, install the .apk, run it, and then:
+
+  cd android/experimental/LOAndroid3
+  /ndk-gdb --adb=/platform-tools/adb
+
 NB: If you happen to upgrade to Android SDK Tools 23, and the build (using
 'make verbose=t android') fails for you with:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 8 commits - chart2/source comphelper/source connectivity/source offapi/com ucb/source unoxml/source vcl/source

2014-10-13 Thread Stephan Bergmann


On 10/10/2014 07:15 PM, Caolán McNamara wrote:

commit ccaaa544350156ed4cd113634ceb66ad8cc5af23
Author: Caolán McNamara 
Date:   Fri Oct 10 17:24:03 2014 +0100

 coverity#707458 Uncaught exception

 Change-Id: Ia446cc0b8b26bb158b36ca64cbf45bf172f37bdf

diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl 
b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index 039e376..ff1ee9b 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -169,6 +169,7 @@ interface XDocumentRepository : XRepository
  com::sun::star::beans::Pair< sequence, boolean >
  getStatementRDFa([in] XMetadatable Element)
  raises( com::sun::star::lang::IllegalArgumentException,
+com::sun::star::container::NoSuchElementException,
  RepositoryException );

  /** gets matching RDFa statements from the repository.


What does it mean to throw NoSuchElementException from

  getStatementRDFa([in] XMetadatable Element)

Stephan

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-7' - download.lst external/nss

2014-10-13 Thread Caolán McNamara

 download.lst|2 
 external/nss/ExternalProject_nss.mk |2 
 external/nss/nss.aix.patch  |  133 ++---
 external/nss/nss.patch  |  160 ++--
 external/nss/nss_macosx.patch   |   41 -
 5 files changed, 173 insertions(+), 165 deletions(-)

New commits:
commit f0f1cffa3d1552ba3d6c422249a92548145b21bd
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 29 16:58:50 2014 +0100

bump nss from 3.15.3 to 3.16.5

Reviewed-on: https://gerrit.libreoffice.org/11700
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe)
Signed-off-by: Michael Stahl 

Conflicts:
external/nss/ExternalProject_nss.mk
external/nss/nspr-build-config.patch
external/nss/nss_macosx.patch

(cherry picked from commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1)

Conflicts:
download.lst
external/nss/nss-linux-x86.patch.0
external/nss/nss-pem.patch

Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e
Reviewed-on: https://gerrit.libreoffice.org/11945
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 
(cherry picked from commit ee2ce6fa19ac8bdf65b22f1a5c5e9c2afb7d5c71)
Reviewed-on: https://gerrit.libreoffice.org/11952
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/download.lst b/download.lst
index 54904cc..1a85d8a 100644
--- a/download.lst
+++ b/download.lst
@@ -88,7 +88,7 @@ export MDDS_TARBALL := 
a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := 
06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
+export NSS_TARBALL := 
b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 
66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index dc19ec4..cf071a4 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 
 $(call gb_ExternalProject_get_state_target,nss,configure):
$(call gb_ExternalProject_run,configure,\
-   $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
+   $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 
LIB="$(ILIB)") \
nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index c83ae57..da9aacb 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -1,16 +1,7 @@
 a/a/nspr/configure 2010-08-18 07:23:01.0 -0500
-+++ b/b/nspr/configure 2010-08-18 07:33:11.0 -0500
-@@ -2973,7 +2973,8 @@
- #define SYSV 1
- EOF
- 
--DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall 
-blibpath:/usr/lib:/lib'
-+MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
-+DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
- ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
- echo "configure:3477: checking for sys/atomic_op.h" >&5
-@@ -3102,7 +3103,6 @@
+diff -ru a/nspr/configure b/nspr/configure
+--- a/a/nspr/configure 2014-09-29 16:47:42.984012225 +0100
 b/b/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+@@ -6369,7 +6369,6 @@
  AIX_LINK_OPTS='-brtl -bnso -berok'
  ;;
  esac
@@ -18,9 +9,10 @@
  AIX_WRAP='$(DIST)/lib/aixwrap.o'
  AIX_TMP='./_aix_tmp.o'
  if test -n "$USE_64"; then
 a/a/nspr/configure.in  2010-08-18 07:23:01.0 -0500
-+++ b/b/nspr/configure.in  2010-08-18 07:32:36.0 -0500
-@@ -831,7 +831,8 @@
+diff -ru a/nspr/configure.in b/nspr/configure.in
+--- a/a/nspr/configure.in  2014-09-29 16:46:35.257394860 +0100
 b/b/nspr/configure.in  2014-09-29 16:50:33.908375942 +0100
+@@ -1229,7 +1229,8 @@
  AC_DEFINE(XP_UNIX)
  AC_DEFINE(AIX)
  AC_DEFINE(SYSV)
@@ -30,7 +22,7 @@
  AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
  case "${target_os}" in
  aix3.2*)
-@@ -871,10 +872,9 @@
+@@ -1269,10 +1270,9 @@
  AC_DEFINE(HAVE_SOCKLEN

Re: Registration of LO extensions

2014-10-13 Thread Rene Engelhard

Hi,

On Mon, Oct 13, 2014 at 02:46:49PM +0200, Stephan Bergmann wrote:
> On 10/12/2014 03:42 PM, Sebastian Humenda wrote:
> >Rene Engelhard wrote:
> >>On Sun, Oct 12, 2014 at 11:09:52AM +0100, Sebastian Humenda wrote:
> >>>I am trying to register an extension for Libreoffice. I unzipped the 
> >>>*.oxt-file
> >>>under /usr/lib/libreoffice/share/extensions/, but it seems not 
> >>>to be
> >>>recognized. Do I need to register the extension somehow or is Libreoffice
> >>>supposed to pick up all the extensions in this folder automatically? How 
> >>>could I
> >>It's supposed to pick it up automatically.
> 
> The way it works in needToSyncRepository
> (desktop/source/deployment/misc/dp_misc.cxx) is to compare (LO's
> idea of) modification times of
> /usr/lib/libreoffice/share/extensions/ directory and
> ~/.config/libreoffice/4/user/extensions/bundled/lastsynchronized
> file. There is a dummy
> /usr/lib/libreoffice/share/extensions/package.txt file specifically
> intended to be manually touched whenever manually adding a bundled
> extension, for platforms where the directory's modification time
> would otherwise not necessarily be updated reliably, for one reason
> or other.

And installing any extension via package does that (the directory):

if [ "$1" = "triggered" ]; then
for triggername in $2; do
case "$triggername" in
# new "bundled" extensions (since 3.3)
"/@OODIR@/share/extensions")
  make_lo_sync_extensions
;;
esac
done
fi

where make_lo_sync_extensions is

make_lo_sync_extensions() {
touch /usr/lib/libreoffice/share/extensions
}

Regards,

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

Re: VS2013: improved C++11 conformance

2014-10-13 Thread Stephan Bergmann


On 10/12/2014 11:31 AM, David Ostrovsky wrote:

Recently compiler baseline was raised to VS 2012 to use improved C++11
conformance. It turns out that VS2013 has much more C++11 features  [1]:

* Default template arguments for function templates
* Delegating constructors
* Explicit conversion operators
* Initializer lists and uniform initialization
* Raw string literals
* Variadic templates


Indeed, from 
 
"Support For C++11 Features (Modern C++)" it looks like what is 
advertised as available in "11.0 nov'12" at 
 would mean MSVC 
2013 rather than a fully patched MSVC 2012.  :(


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/nss

2014-10-13 Thread Caolán McNamara

 download.lst|2 
 external/nss/ExternalProject_nss.mk |2 
 external/nss/nss.aix.patch  |  133 ++---
 external/nss/nss.patch  |  160 ++--
 external/nss/nss_macosx.patch   |   41 -
 5 files changed, 173 insertions(+), 165 deletions(-)

New commits:
commit ee2ce6fa19ac8bdf65b22f1a5c5e9c2afb7d5c71
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 29 16:58:50 2014 +0100

bump nss from 3.15.3 to 3.16.5

Reviewed-on: https://gerrit.libreoffice.org/11700
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe)
Signed-off-by: Michael Stahl 

Conflicts:
external/nss/ExternalProject_nss.mk
external/nss/nspr-build-config.patch
external/nss/nss_macosx.patch

(cherry picked from commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1)

Conflicts:
download.lst
external/nss/nss-linux-x86.patch.0
external/nss/nss-pem.patch

Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e
Reviewed-on: https://gerrit.libreoffice.org/11945
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 54904cc..1a85d8a 100644
--- a/download.lst
+++ b/download.lst
@@ -88,7 +88,7 @@ export MDDS_TARBALL := 
a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := 
06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
+export NSS_TARBALL := 
b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 
66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index dc19ec4..cf071a4 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 
 $(call gb_ExternalProject_get_state_target,nss,configure):
$(call gb_ExternalProject_run,configure,\
-   $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
+   $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 
LIB="$(ILIB)") \
nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index c83ae57..da9aacb 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -1,16 +1,7 @@
 a/a/nspr/configure 2010-08-18 07:23:01.0 -0500
-+++ b/b/nspr/configure 2010-08-18 07:33:11.0 -0500
-@@ -2973,7 +2973,8 @@
- #define SYSV 1
- EOF
- 
--DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall 
-blibpath:/usr/lib:/lib'
-+MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
-+DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
- ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
- echo "configure:3477: checking for sys/atomic_op.h" >&5
-@@ -3102,7 +3103,6 @@
+diff -ru a/nspr/configure b/nspr/configure
+--- a/a/nspr/configure 2014-09-29 16:47:42.984012225 +0100
 b/b/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+@@ -6369,7 +6369,6 @@
  AIX_LINK_OPTS='-brtl -bnso -berok'
  ;;
  esac
@@ -18,9 +9,10 @@
  AIX_WRAP='$(DIST)/lib/aixwrap.o'
  AIX_TMP='./_aix_tmp.o'
  if test -n "$USE_64"; then
 a/a/nspr/configure.in  2010-08-18 07:23:01.0 -0500
-+++ b/b/nspr/configure.in  2010-08-18 07:32:36.0 -0500
-@@ -831,7 +831,8 @@
+diff -ru a/nspr/configure.in b/nspr/configure.in
+--- a/a/nspr/configure.in  2014-09-29 16:46:35.257394860 +0100
 b/b/nspr/configure.in  2014-09-29 16:50:33.908375942 +0100
+@@ -1229,7 +1229,8 @@
  AC_DEFINE(XP_UNIX)
  AC_DEFINE(AIX)
  AC_DEFINE(SYSV)
@@ -30,7 +22,7 @@
  AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
  case "${target_os}" in
  aix3.2*)
-@@ -871,10 +872,9 @@
+@@ -1269,10 +1270,9 @@
  AC_DEFINE(HAVE_SOCKLEN_T)
  AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
  USE_IPV6=1
@@ -42,9 +34,10 @@
  AIX_WRAP='$(DIST)/lib/aixwrap.o'
  AIX_TMP='./_aix_tmp.o'
  if test -n "$USE_64"; then

Re: Registration of LO extensions

2014-10-13 Thread Stephan Bergmann


On 10/12/2014 03:42 PM, Sebastian Humenda wrote:

Rene Engelhard wrote:

On Sun, Oct 12, 2014 at 11:09:52AM +0100, Sebastian Humenda wrote:

I am trying to register an extension for Libreoffice. I unzipped the *.oxt-file
under /usr/lib/libreoffice/share/extensions/, but it seems not to be
recognized. Do I need to register the extension somehow or is Libreoffice
supposed to pick up all the extensions in this folder automatically? How could I

It's supposed to pick it up automatically.


The way it works in needToSyncRepository 
(desktop/source/deployment/misc/dp_misc.cxx) is to compare (LO's idea 
of) modification times of /usr/lib/libreoffice/share/extensions/ 
directory and 
~/.config/libreoffice/4/user/extensions/bundled/lastsynchronized file. 
There is a dummy /usr/lib/libreoffice/share/extensions/package.txt file 
specifically intended to be manually touched whenever manually adding a 
bundled extension, for platforms where the directory's modification time 
would otherwise not necessarily be updated reliably, for one reason or 
other.


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

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

2014-10-13 Thread Caolán McNamara

 sc/source/filter/inc/sheetdatacontext.hxx |2 +-
 sc/source/filter/inc/workbookhelper.hxx   |4 +++-
 sc/source/filter/oox/sheetdatacontext.cxx |6 +++---
 sc/source/filter/oox/workbookhelper.cxx   |   11 +--
 4 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 17e68606b7c5001edf2ebede5e7d5ea0e0b9753f
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 13 11:03:19 2014 +0100

fdo#84872 give each SheetDataContext a new FormulaParser

Change-Id: I120a9d0943db38571892defe1b5d3169158e3e42

diff --git a/sc/source/filter/inc/sheetdatacontext.hxx 
b/sc/source/filter/inc/sheetdatacontext.hxx
index 2d02f20..206d365 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -36,7 +36,7 @@ namespace xls {
 struct SheetDataContextBase
 {
 AddressConverter&   mrAddressConv;  /// The address converter.
-FormulaParser&  mrFormulaParser;/// The formula parser.
+std::unique_ptr mxFormulaParser;/// The formula parser, 
different one for each SheetDataContext
 SheetDataBuffer&mrSheetData;/// The sheet data buffer for cell 
content and formatting.
 CellModel   maCellData; /// Position, contents, formatting 
of current imported cell.
 CellFormulaModelmaFmlaData; /// Settings for a cell formula.
diff --git a/sc/source/filter/inc/workbookhelper.hxx 
b/sc/source/filter/inc/workbookhelper.hxx
index 510474b..90fdca4 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -244,8 +244,10 @@ public:
 
 // converters -
 
-/** Returns the import formula parser (import filter only!). */
+/** Returns a shared import formula parser (import filter only!). */
 FormulaParser&  getFormulaParser() const;
+/** Returns an unshared import formula parser (import filter only!). */
+FormulaParser*  createFormulaParser() const;
 /** Returns the measurement unit converter. */
 UnitConverter&  getUnitConverter() const;
 /** Returns the converter for string to cell address/range conversion. */
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx 
b/sc/source/filter/oox/sheetdatacontext.cxx
index f6ca6a4..5105d25 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -64,10 +64,10 @@ const sal_uInt8 BIFF12_ROW_SHOWPHONETIC = 0x01;
 
 SheetDataContextBase::SheetDataContextBase( const WorksheetHelper& rHelper ) :
 mrAddressConv( rHelper.getAddressConverter() ),
-mrFormulaParser( rHelper.getFormulaParser() ),
 mrSheetData( rHelper.getSheetData() ),
 mnSheet( rHelper.getSheetIndex() )
 {
+mxFormulaParser.reset(rHelper.createFormulaParser());
 }
 
 SheetDataContextBase::~SheetDataContextBase()
@@ -426,7 +426,7 @@ bool SheetDataContext::readCellHeader( SequenceInputStream& 
rStrm, CellType eCel
 ApiTokenSequence SheetDataContext::readCellFormula( SequenceInputStream& rStrm 
)
 {
 rStrm.skip( 2 );
-return mrFormulaParser.importFormula( maCellData.maCellAddr, 
FORMULATYPE_CELL, rStrm );
+return mxFormulaParser->importFormula( maCellData.maCellAddr, 
FORMULATYPE_CELL, rStrm );
 }
 
 bool SheetDataContext::readFormulaRef( SequenceInputStream& rStrm )
@@ -536,7 +536,7 @@ void SheetDataContext::importArray( SequenceInputStream& 
rStrm )
 if( readFormulaRef( rStrm ) && maFmlaData.isValidArrayRef( 
maCellData.maCellAddr ) )
 {
 rStrm.skip( 1 );
-ApiTokenSequence aTokens = mrFormulaParser.importFormula( 
maCellData.maCellAddr, FORMULATYPE_ARRAY, rStrm );
+ApiTokenSequence aTokens = mxFormulaParser->importFormula( 
maCellData.maCellAddr, FORMULATYPE_ARRAY, rStrm );
 mrSheetData.createArrayFormula( maFmlaData.maFormulaRef, aTokens );
 }
 }
diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 06ecc60..0dc581b 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -202,8 +202,10 @@ public:
 
 // converters -
 
-/** Returns the import formula parser. */
+/** Returns a shared import formula parser. */
 inline FormulaParser& getFormulaParser() const { return *mxFmlaParser; }
+/** Returns an unshared import formula parser. */
+inline FormulaParser* createFormulaParser() { return new 
FormulaParser(*this); }
 /** Returns the measurement unit converter. */
 inline UnitConverter& getUnitConverter() const { return *mxUnitConverter; }
 /** Returns the converter for string to cell address/range conversion. */
@@ -590,7 +592,7 @@ void WorkbookGlobals::initialize( bool bWorkbookFile )
 mpDoc->EnableExecuteLink(false);
 
 mxProgressBar.reset( new SegmentProgressBar( 
mrBaseFilter.getStatusIndicator(), ScGlobal::GetRscString(STR_LOAD_DOC)

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

2014-10-13 Thread Laurent Godard

 solenv/gbuild/CppunitTest.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1e9163b5929f68860b56b04112fb76d303f6388
Author: Laurent Godard 
Date:   Mon Oct 13 11:50:39 2014 +0200

enhance perfcheck failing message

add the expected number

Change-Id: Ib068288f7efbfebc2705c6084dc34a651def1986
Reviewed-on: https://gerrit.libreoffice.org/11948
Reviewed-by: MatÃºÅ¡ Kukan 
Tested-by: MatÃºÅ¡ Kukan 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d79e1ce..3c5f11c 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -96,7 +96,7 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_CPPTESTDEPS)
$(call 
gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> 
$@.log 2>&1;) \
cat $@.log; 
$(SRCDIR)/solenv/bin/unittest-failed.sh Cppunit $*))) \
$(if $(PERFTEST), && VAL=$$(grep '^==.*== Collected : ' $@.log 
| sed "s/==.*== Collected : //") && \
-   $(if $(filter 0,$(PERFTEST)), expr "$$VAL" "*" "101" 
"/" "100", test $$VAL -le $(PERFTEST) || (echo "Unit test is slow! $$VAL 
instructions detected." && false))) \
+   $(if $(filter 0,$(PERFTEST)), expr "$$VAL" "*" "101" 
"/" "100", test $$VAL -le $(PERFTEST) || (echo "Unit test is slow! $$VAL 
instructions detected (expected $(PERFTEST))." && false))) \
)
 
 define gb_CppunitTest_CppunitTest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/perfwork2'

2014-10-13 Thread Noel Grandin

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

Re: VS2013: improved C++11 conformance

2014-10-13 Thread Thorsten Behrens

Tor Lillqvist wrote:
> If it does now (it did not for me some month ago when I tried;
> unfortunately I don't have that machine available any more), then I am not
> opposed to switching to VS2013. Quite the opposite, I am all for it!
> 
If we go ahead with this, let's please coordinate a bit with the
various Windows tinderbox sponsors, when would be a good cut-over
time. Also I guess we'd want to retain at least one
continuously-running box with an older MSVC version to guard older
branches.

Cheers,

-- Thorsten


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

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

2014-10-13 Thread Stephan Bergmann

 svx/source/form/fmobj.cxx   |6 ++
 svx/source/form/fmvwimp.cxx |9 +
 svx/source/inc/fmvwimp.hxx  |2 ++
 3 files changed, 17 insertions(+)

New commits:
commit 211ad259bbc18997f9f070e59e4262885c11e924
Author: Stephan Bergmann 
Date:   Mon Oct 13 12:02:40 2014 +0200

fdo#82980: Cancel FmXFormView::OnStartControlWizard when breaking creation

The problem is that SdrCreateView::EndCreateObj 
(svx/source/svdraw/svdcrtv.cxx)
first calls FmFormObj::EndCreate (svx/source/form/fmobj.cxx) ->
FmXFormView::onCreatedFormObject (svx/source/form/fmvwimp.cxx) ->
Application::PostUserEvent( LINK( this, FmXFormView, OnStartControlWizard ) 
),
and only then, upon bPntsEq, calls FmFormObj::BrkCreate
(svx/source/form/fmobj.cxx), which does not cancel the posted
OnStartControlWizard link.

The fix is apparently not perfect, though, as afterwards the text document 
goes
back to text input mode (cursor blinking, mouse pointer has I-beam shape) 
even
though the "List Box" icon is still selected.

Change-Id: I3137110a5b04c8dde5377265b1dee91ed6ac

diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 9d92835..e5293b7 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -677,6 +677,12 @@ void FmFormObj::BrkCreate( SdrDragStat& rStat )
 {
 SdrUnoObj::BrkCreate( rStat );
 impl_isolateControlModel_nothrow();
+
+FmFormView* pView( dynamic_cast< FmFormView* >( rStat.GetView() ) );
+FmXFormView* pViewImpl = pView ? pView->GetImpl() : NULL;
+OSL_ENSURE( pViewImpl, "FmFormObj::EndCreate: no view!?" );
+if ( pViewImpl )
+pViewImpl->breakCreateFormObject();
 }
 
 
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 212c9de..d9ed7a0 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1021,6 +1021,15 @@ void FmXFormView::onCreatedFormObject( FmFormObj& 
_rFormObject )
 m_nControlWizardEvent = Application::PostUserEvent( LINK( this, 
FmXFormView, OnStartControlWizard ) );
 }
 
+void FmXFormView::breakCreateFormObject()
+{
+if (m_nControlWizardEvent != 0)
+{
+Application::RemoveUserEvent(m_nControlWizardEvent);
+m_nControlWizardEvent = 0;
+}
+m_xLastCreatedControlModel.clear();
+}
 
 IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
 {
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index ee224cd..d221873 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -238,6 +238,8 @@ public:
 
 voidonCreatedFormObject( FmFormObj& _rFormObject );
 
+voidbreakCreateFormObject();
+
 static bool
 isFocusable(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XControl >& i_rControl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Tor Lillqvist

 vcl/workben/icontest.cxx |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit e52c070088f23d5ed815bb7132412fe07f47bf7b
Author: Tor Lillqvist 
Date:   Mon Oct 13 13:00:14 2014 +0300

Quit after 100 rounds

Also, print the timing output to stdout, so that one can run the time
command on this, redirecting the program output to /dev/null, and just
see the 'time' output.

Change-Id: I4b2bfe7f0d37746fe0a015b961512850a880560c

diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index ec6c574..4373cd4 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -116,7 +116,8 @@ void MyWorkWindow::LoadGraphic( const OUString& sImageFile )
 
 void MyWorkWindow::Paint( const Rectangle& rRect )
 {
-std::cerr << "==> Paint! " << mnPaintCount++ << " (vcl) " << 
GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
+std::cout << "==> Paint! " << mnPaintCount++ << " (vcl) " << 
GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
+
 Size aGraphicSize( maGraphic.GetSizePixel() );
 float aspect = ((float) aGraphicSize.Width()) / aGraphicSize.Height();
 Size aSize;
@@ -126,13 +127,19 @@ void MyWorkWindow::Paint( const Rectangle& rRect )
 aSize = Size( WIDTH * aspect, HEIGHT );
 aSize.setWidth( aSize.Width() * (1 + (0.1*sin(mnPaintCount/60.))) );
 aSize.setHeight( aSize.Height() * (1 + (0.1*sin(mnPaintCount/50.))) );
-GraphicConversionParameters aConv( aSize );
+
 Bitmap aEmpty;
 mpFixedBitmap->SetBitmap( aEmpty );
+GraphicConversionParameters aConv( aSize );
 mpBitmap = new Bitmap( maGraphic.GetBitmap( aConv ) );
 mpFixedBitmap->SetBitmap( *mpBitmap );
 mpFixedBitmap->SetSizePixel( aSize );
+
 WorkWindow::Paint( rRect );
+
+if (mnPaintCount == 100)
+Application::Quit();
+
 Invalidate( INVALIDATE_CHILDREN );
 }
 
@@ -234,7 +241,7 @@ void MyOpenGLWorkWindow::LoadTexture()
 
 void MyOpenGLWorkWindow::Paint( const Rectangle& )
 {
-std::cerr << "==> Paint! "<< mnPaintCount++ << " (OpenGL) " << 
GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
+std::cout << "==> Paint! "<< mnPaintCount++ << " (OpenGL) " << 
GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
 OpenGLContext& aCtx = mpOpenGLWindow->getContext();
 aCtx.requestLegacyContext();
 CHECK_GL_ERROR();
@@ -287,6 +294,9 @@ void MyOpenGLWorkWindow::Paint( const Rectangle& )
 aCtx.swapBuffers();
 CHECK_GL_ERROR();
 
+if (mnPaintCount == 100)
+Application::Quit();
+
 Invalidate( INVALIDATE_CHILDREN );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/runner

2014-10-13 Thread Robert Antoni Buj i Gelonch

 qadevOOo/runner/convwatch/OfficePrint.java |2 +-
 qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5233d9b8e57aebbfda22a2edcf67e87282ebc66d
Author: Robert Antoni Buj i Gelonch 
Date:   Sat Oct 11 19:44:58 2014 +0200

runner: Object comparison

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

diff --git a/qadevOOo/runner/convwatch/OfficePrint.java 
b/qadevOOo/runner/convwatch/OfficePrint.java
index 75f117e..24eb0b0 100644
--- a/qadevOOo/runner/convwatch/OfficePrint.java
+++ b/qadevOOo/runner/convwatch/OfficePrint.java
@@ -570,7 +570,7 @@ public class OfficePrint {
 {
 nPropIndex++;
 }
-isBusy = (aPrinterProps[nPropIndex].Value == 
Boolean.TRUE);
+isBusy = 
aPrinterProps[nPropIndex].Value.equals(Boolean.TRUE);
 TimeHelper.waitInSeconds(1, "is print ready?");
 nPrintCount++;
 if (nPrintCount > 3600)
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java 
b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index 2ab3910..0e827b3 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -528,7 +528,7 @@ public class OpenOfficePostscriptCreator implements IOffice
 {
 nPropIndex++;
 }
-isBusy = (aPrinterProps[nPropIndex].Value == 
Boolean.TRUE);
+isBusy = 
aPrinterProps[nPropIndex].Value.equals(Boolean.TRUE);
 TimeHelper.waitInSeconds(1, "is print ready?");
 nPrintCount++;
 if (nPrintCount > 3600)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/svx include/vcl sc/source starmath/source svtools/source svx/source vcl/generic vcl/headless vcl/inc vcl/qa vcl/quartz vcl/source vcl/unx vcl/win

2014-10-13 Thread Chris Sherlock

 cui/source/dialogs/cuicharmap.cxx   |6 
 include/svx/charmap.hxx |2 
 include/svx/ucsubset.hxx|4 
 include/vcl/metric.hxx  |   39 ++-
 include/vcl/outdev.hxx  |5 
 sc/source/filter/excel/xistyle.cxx  |   50 ++--
 starmath/source/dialog.cxx  |8 
 svtools/source/misc/sampletext.cxx  |   10 
 svx/source/dialog/charmap.cxx   |   40 +--
 vcl/generic/fontmanager/fontmanager.cxx |4 
 vcl/generic/glyphs/gcach_ftyp.cxx   |   13 -
 vcl/generic/glyphs/gcach_ftyp.hxx   |4 
 vcl/generic/print/genpspgraphics.cxx|6 
 vcl/headless/svptext.cxx|6 
 vcl/inc/generic/genpspgraphics.h|2 
 vcl/inc/generic/glyphcache.hxx  |4 
 vcl/inc/headless/svpgdi.hxx |3 
 vcl/inc/impfont.hxx |   24 -
 vcl/inc/quartz/salgdi.h |8 
 vcl/inc/salgdi.hxx  |   19 -
 vcl/inc/unx/salgdi.h|7 
 vcl/inc/win/salgdi.h|6 
 vcl/qa/cppunit/fontcharmap.cxx  |   12 
 vcl/quartz/salgdi.cxx   |   30 +-
 vcl/source/filter/wmf/wmfwr.cxx |9 
 vcl/source/gdi/impfont.cxx  |  393 ++--
 vcl/source/outdev/font.cxx  |   24 +
 vcl/unx/generic/gdi/salgdi3.cxx |9 
 vcl/win/source/gdi/salgdi3.cxx  |   40 +--
 29 files changed, 406 insertions(+), 381 deletions(-)

New commits:
commit f6d61562d41b8a49449d881da66a3d8fa519487f
Author: Chris Sherlock 
Date:   Mon Oct 6 18:16:16 2014 +1100

vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap

To do this, I've made FontCharMap a friend class for ImplFontCharMap,
and have moved the functions directly into FontCharMap. In this patch,
I am attempting to stop the direct use of ImplFontCharMap by anything
other than FontCharMap. However, FontCharMap itself requires a
refcounter, so we will use FontCharMapPtr to access the font character
map.

Change-Id: I509b990a8cbd911c5cc1572c7d24fc5348ca06d9
Reviewed-on: https://gerrit.libreoffice.org/11823
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 2d46a79..94898e69 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -446,9 +446,9 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
 bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
 if( bNeedSubset )
 {
-FontCharMap aFontCharMap;
-m_pShowSet->GetFontCharMap( aFontCharMap );
-pSubsetMap = new SubsetMap( &aFontCharMap );
+FontCharMapPtr pFontCharMap( new FontCharMap() );
+m_pShowSet->GetFontCharMap( pFontCharMap );
+pSubsetMap = new SubsetMap( pFontCharMap );
 
 // update subset listbox for new font's unicode subsets
 // TODO: is it worth to improve the stupid linear search?
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 1615fa2..7810dda 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -111,7 +111,7 @@ private:
 
 sal_Int32   nSelectedIndex;
 
-FontCharMap maFontCharMap;
+FontCharMapPtr  mpFontCharMap;
 ScrollBar   aVscrollSB;
 
 private:
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 4cf0b45..a2a8a7e 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -63,7 +63,7 @@ typedef ::std::list SubsetList;
 class SVX_DLLPUBLIC SubsetMap : private Resource
 {
 public:
-SubsetMap( const FontCharMap* );
+SubsetMap( const FontCharMapPtr );
 
 const Subset*   GetSubsetByUnicode( sal_UCS4 ) const;
 const Subset*   GetNextSubset( bool bFirst ) const;
@@ -73,7 +73,7 @@ private:
 mutable SubsetList::const_iterator maSubsetIterator;
 
 SVX_DLLPRIVATE voidInitList();
-SVX_DLLPRIVATE voidApplyCharMap( const FontCharMap* );
+SVX_DLLPRIVATE voidApplyCharMap( const FontCharMapPtr );
 };
 
 #endif
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index ca53b65..e9872a9 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -28,9 +28,11 @@
 
 class ImplFontMetric;
 class ImplFontCharMap;
+class CmapResult;
 
 typedef sal_uInt32 sal_UCS4;
 typedef boost::intrusive_ptr< ImplFontCharMap > ImplFontCharMapPtr;
+typedef boost::intrusive_ptr< FontCharMap > FontCharMapPtr;
 
 namespace vcl {
 
@@ -96,16 +98,20 @@ inline std::basic_ostream & operator <<(
 
 class VCL_DLLPUBLIC FontCharMap
 {
-private:
-ImplFontCharMapPtr  mpImplFontCharMap;
-
 public:
 /** A new FontCharMap is created based on a "default" map, which includes
 all codepoints in the Unicode BMP range, including surrogates.
  **/
 FontCharMap();
+

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

2014-10-13 Thread Tor Lillqvist

 vcl/workben/icontest.cxx |   94 ++-
 1 file changed, 52 insertions(+), 42 deletions(-)

New commits:
commit bb1d4f8c9a275a20e8795ee36ca3259376746e4f
Author: Tor Lillqvist 
Date:   Mon Oct 13 12:07:09 2014 +0300

Make the image continuously resize back and forth in both cases

Change-Id: Ia543e5355c8d6a7712bf6f10c989945ff830627d

diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 87f3897..ec6c574 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -17,6 +17,8 @@
  */
 
 
+#include 
+
 #include 
 
 #include 
@@ -59,13 +61,21 @@ namespace {
 
 class MyWorkWindow : public WorkWindow
 {
+private:
+
 protected:
-double nStartTime;
-int nPaintCount;
+double mnStartTime;
+int mnPaintCount;
 
 public:
+Graphic maGraphic;
+Bitmap *mpBitmap;
+FixedBitmap *mpFixedBitmap;
+
 MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
 
+void LoadGraphic( const OUString& sImageFile );
+
 virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 virtual void Resize() SAL_OVERRIDE;
 };
@@ -75,7 +85,6 @@ class MyOpenGLWorkWindow : public MyWorkWindow
 public:
 bool mbHaveTexture;
 OpenGLWindow *mpOpenGLWindow;
-Graphic maGraphic;
 GLuint mnTextureName;
 float mnTextureAspect;
 
@@ -89,14 +98,40 @@ public:
 MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) :
 WorkWindow( pParent, nWinStyle )
 {
-nPaintCount = 0;
-nStartTime = getTimeNow();
+mnPaintCount = 0;
+mnStartTime = getTimeNow();
 EnableInput();
 }
 
+void MyWorkWindow::LoadGraphic( const OUString& sImageFile )
+{
+SvFileStream aFileStream( sImageFile, STREAM_READ );
+GraphicFilter aGraphicFilter(false);
+if (aGraphicFilter.ImportGraphic(maGraphic, sImageFile, aFileStream) != 0)
+{
+SAL_WARN("vcl.icontest", "Could not import image '" << sImageFile << 
"'");
+return;
+}
+}
+
 void MyWorkWindow::Paint( const Rectangle& rRect )
 {
-std::cerr << "==> Paint! " << nPaintCount++ << " (vcl) " << GetSizePixel() 
<< " " << getTimeNow() - nStartTime << std::endl;
+std::cerr << "==> Paint! " << mnPaintCount++ << " (vcl) " << 
GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
+Size aGraphicSize( maGraphic.GetSizePixel() );
+float aspect = ((float) aGraphicSize.Width()) / aGraphicSize.Height();
+Size aSize;
+if( aspect >= ((float) WIDTH) / HEIGHT )
+aSize = Size( WIDTH, HEIGHT/aspect );
+else
+aSize = Size( WIDTH * aspect, HEIGHT );
+aSize.setWidth( aSize.Width() * (1 + (0.1*sin(mnPaintCount/60.))) );
+aSize.setHeight( aSize.Height() * (1 + (0.1*sin(mnPaintCount/50.))) );
+GraphicConversionParameters aConv( aSize );
+Bitmap aEmpty;
+mpFixedBitmap->SetBitmap( aEmpty );
+mpBitmap = new Bitmap( maGraphic.GetBitmap( aConv ) );
+mpFixedBitmap->SetBitmap( *mpBitmap );
+mpFixedBitmap->SetSizePixel( aSize );
 WorkWindow::Paint( rRect );
 Invalidate( INVALIDATE_CHILDREN );
 }
@@ -199,7 +234,7 @@ void MyOpenGLWorkWindow::LoadTexture()
 
 void MyOpenGLWorkWindow::Paint( const Rectangle& )
 {
-std::cerr << "==> Paint! "<< nPaintCount++ << " (OpenGL) " << 
GetSizePixel() << " " << getTimeNow() - nStartTime << std::endl;
+std::cerr << "==> Paint! "<< mnPaintCount++ << " (OpenGL) " << 
GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
 OpenGLContext& aCtx = mpOpenGLWindow->getContext();
 aCtx.requestLegacyContext();
 CHECK_GL_ERROR();
@@ -207,7 +242,7 @@ void MyOpenGLWorkWindow::Paint( const Rectangle& )
 if (!mbHaveTexture)
 LoadTexture();
 
-aCtx.setWinSize( Size( WIDTH, HEIGHT ) );
+aCtx.setWinSize( Size( WIDTH+1, HEIGHT+1 ) );
 CHECK_GL_ERROR();
 
 aCtx.makeCurrent();
@@ -238,11 +273,11 @@ void MyOpenGLWorkWindow::Paint( const Rectangle& )
 glTexCoord2f(0, 0);
 glVertex3f(0, 0, 0);
 glTexCoord2f(0, 1);
-glVertex3f(0, 1, 0);
+glVertex3f(0, 1 + (0.1*sin(mnPaintCount/50.)), 0);
 glTexCoord2f(1, 1);
-glVertex3f(1, 1, 0);
+glVertex3f(1 + (0.1*sin(mnPaintCount/60.)), 1 + 
(0.1*sin(mnPaintCount/50.)), 0);
 glTexCoord2f(1, 0);
-glVertex3f(1, 0, 0);
+glVertex3f(1 + (0.1*sin(mnPaintCount/60.)), 0, 0);
 glEnd();
 CHECK_GL_ERROR();
 
@@ -319,30 +354,10 @@ void IconTestApp::DoItWithVcl( const OUString& sImageFile)
 
 pWindow->SetText(OUString("VCL Image Test"));
 
-SvFileStream aFileStream( sImageFile, STREAM_READ );
-GraphicFilter aGraphicFilter(false);
-Graphic aGraphic;
-if (aGraphicFilter.ImportGraphic(aGraphic, sImageFile, aFileStream) != 
0)
-{
-SAL_WARN("vcl.icontest", "Could not import image '" << sImageFile 
<< "'");
-return;
-}
-Size aGraphicSize( aGraphic.GetSizePixel() );
-float aspect = ((float) aGraphicSize.Width()) / aGraphicSize.Height();
-

[Bug 64975] FORMATTING: autoIndent for Chinese should be two characters

2014-10-13 Thread bugzilla-daemon

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

Kevin Suo  changed:

   What|Removed |Added

   Priority|high|medium
 CC||suokunl...@gmail.com

--- Comment #5 from Kevin Suo  ---
In version 4.3.2, set first line indent to "2 字" or "2 ch" will work.
If you want all your documents do be indent 2 chars, please set your "Text
Body" style and save it as default template.

(I realized that "字" should be “字符" here. Translation has been revised and will
be reflacted in 4.3.3 release. So start from version 4.3.3, input "2 字符" or "2
ch" instead)

As this easy workaround, set "Importance" to "Medium Normal".

-- 
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: android/experimental configure.ac

2014-10-13 Thread Jan Holesovsky

 android/experimental/LOAndroid3/AndroidManifest.xml.in |2 -
 configure.ac   |   22 ++---
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 02119a79c176f08aebd7a3068e5fa05eaded1f7a
Author: Jan Holesovsky 
Date:   Mon Oct 13 10:19:25 2014 +0200

android: When debugging, the installLocation must be "internalOnly".

Otherwise the gdbserver ends up with

run-as: exec failed for /data/data/org.libreoffice/lib/gdbserver 
Error:Permission denied

(you need to run ndk-gdb with --verbose to see that).

Change-Id: Iccdf0ff268c20d2fb5abc1e93404375fa51c1cf1

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in 
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index 989a43c..8eb4dbb 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -1,7 +1,7 @@
 
 http://schemas.android.com/apk/res/android";
 package="org.libreoffice"
-android:installLocation="preferExternal"
+@ANDROID_INSTALL_LOCATION@
 android:versionCode="1"
 android:versionName="1.0">
 
diff --git a/configure.ac b/configure.ac
index f05034d..2572e96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3751,24 +3751,28 @@ AC_MSG_CHECKING([whether to do a debug build])
 if test -n "$enable_debug" && test "$enable_debug" != "yes" && test 
"$enable_debug" != "no"; then
 AC_MSG_ERROR([--enable-debug now accepts only yes or no, use 
--enable-selective-debuginfo])
 fi
-if test -n "$ENABLE_DBGUTIL"; then
-if test "$enable_debug" = "no"; then
-AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil])
-fi
-ENABLE_DEBUG="TRUE"
-ANDROID_DEBUGGABLE='android:debuggable="true"'
-AC_MSG_RESULT([yes (dbgutil)])
-elif test -n "$enable_debug" && test "$enable_debug" != "no"; then
+if test -n "$ENABLE_DBGUTIL" -a "$enable_debug" = "no"; then
+AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil])
+fi
+
+if test -n "$ENABLE_DBGUTIL" -o \( -n "$enable_debug" -a "$enable_debug" != 
"no" \) ; then
 ENABLE_DEBUG="TRUE"
 ANDROID_DEBUGGABLE='android:debuggable="true"'
-AC_MSG_RESULT([yes])
+ANDROID_INSTALL_LOCATION='android:installLocation="internalOnly"'
+if test -n "$ENABLE_DBGUTIL" ; then
+AC_MSG_RESULT([yes (dbgutil)])
+else
+AC_MSG_RESULT([yes])
+fi
 else
 ENABLE_DEBUG=""
 ANDROID_DEBUGGABLE=""
+ANDROID_INSTALL_LOCATION='android:installLocation="preferExternal"'
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
 AC_SUBST(ANDROID_DEBUGGABLE)
+AC_SUBST(ANDROID_INSTALL_LOCATION)
 
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Caolán McNamara

 vcl/source/outdev/text.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b3e96abc32623891a7147c9f8fa6477ffcddd643
Author: CaolÃ¡n McNamara 
Date:   Thu Oct 9 11:13:10 2014 +0100

Resolves: fdo#84809 crash when button is too short for text

regression from 4c539fac018dfd44cd8db52161a8cb930c627da7

commit 4c539fac018dfd44cd8db52161a8cb930c627da7
Date:   Tue Dec 17 05:18:35 2013 -0600
vcl get rid of xub_StrLen and STRING_LEN in outdev3

before this there was a dubious cast which hid the problem

Change-Id: I7c01c0f0ac211196a62acaf02297f29ae829403d
(cherry picked from commit 3144b8deaf8397d719b7ad7a56b309655a53d90a)
Reviewed-on: https://gerrit.libreoffice.org/11871
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index b7bb028..e426368 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1496,7 +1496,7 @@ void OutputDevice::ImplDrawText( OutputDevice& 
rTargetDevice, const Rectangle& r
 long nMaxTextWidth = ImplGetTextLines( aMultiLineInfo, nWidth, 
aStr, nStyle, _rLayout );
 nLines = (sal_Int32)(nHeight/nTextHeight);
 nFormatLines = aMultiLineInfo.Count();
-if ( !nLines )
+if (nLines <= 0)
 nLines = 1;
 if ( nFormatLines > nLines )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental configure.ac

2014-10-13 Thread Jan Holesovsky

 android/experimental/LOAndroid3/AndroidManifest.xml.in |2 -
 configure.ac   |   22 ++---
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit ff1ad6c235b63c51f5dc25df92dc4235f4609686
Author: Jan Holesovsky 
Date:   Mon Oct 13 10:19:25 2014 +0200

android: When debugging, the installLocation must be "internalOnly".

Otherwise the gdbserver ends up with

run-as: exec failed for /data/data/org.libreoffice/lib/gdbserver 
Error:Permission denied

(you need to run ndk-gdb with --verbose to see that).

Change-Id: Iccdf0ff268c20d2fb5abc1e93404375fa51c1cf1

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in 
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index 989a43c..8eb4dbb 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -1,7 +1,7 @@
 
 http://schemas.android.com/apk/res/android";
 package="org.libreoffice"
-android:installLocation="preferExternal"
+@ANDROID_INSTALL_LOCATION@
 android:versionCode="1"
 android:versionName="1.0">
 
diff --git a/configure.ac b/configure.ac
index ed5b1ef..91cc7d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3774,24 +3774,28 @@ AC_MSG_CHECKING([whether to do a debug build])
 if test -n "$enable_debug" && test "$enable_debug" != "yes" && test 
"$enable_debug" != "no"; then
 AC_MSG_ERROR([--enable-debug now accepts only yes or no, use 
--enable-selective-debuginfo])
 fi
-if test -n "$ENABLE_DBGUTIL"; then
-if test "$enable_debug" = "no"; then
-AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil])
-fi
-ENABLE_DEBUG="TRUE"
-ANDROID_DEBUGGABLE='android:debuggable="true"'
-AC_MSG_RESULT([yes (dbgutil)])
-elif test -n "$enable_debug" && test "$enable_debug" != "no"; then
+if test -n "$ENABLE_DBGUTIL" -a "$enable_debug" = "no"; then
+AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil])
+fi
+
+if test -n "$ENABLE_DBGUTIL" -o \( -n "$enable_debug" -a "$enable_debug" != 
"no" \) ; then
 ENABLE_DEBUG="TRUE"
 ANDROID_DEBUGGABLE='android:debuggable="true"'
-AC_MSG_RESULT([yes])
+ANDROID_INSTALL_LOCATION='android:installLocation="internalOnly"'
+if test -n "$ENABLE_DBGUTIL" ; then
+AC_MSG_RESULT([yes (dbgutil)])
+else
+AC_MSG_RESULT([yes])
+fi
 else
 ENABLE_DEBUG=""
 ANDROID_DEBUGGABLE=""
+ANDROID_INSTALL_LOCATION='android:installLocation="preferExternal"'
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
 AC_SUBST(ANDROID_DEBUGGABLE)
+AC_SUBST(ANDROID_INSTALL_LOCATION)
 
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Kohei Yoshida

 sc/source/ui/undo/undoblk3.cxx |   23 +--
 1 file changed, 9 insertions(+), 14 deletions(-)

New commits:
commit eb5f25984307cd9e63e9cc88cbdb09228d66b097
Author: Kohei Yoshida 
Date:   Sat Oct 11 14:18:10 2014 -0400

fdo#80846: Broadcast changes before EndUndo().

EndUndo() calls PostDataChanged(), which renders the recalculated formula
cells.  Not broadcasting before EndUndo causes some dependent formula
cells to not get recalculated.

This one unfortunately is not currently unit-testable as this behavior
depends on the presence of ScTabViewShell

Change-Id: I86288608b7f2627cda7c74be27a18029832775ef
(cherry picked from commit 424bfaa773e58d6b609ac7f64907db4b542d1315)
Reviewed-on: https://gerrit.libreoffice.org/11927
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 03edabf..6784134 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -170,12 +170,20 @@ void ScUndoDeleteContents::DoChange( const bool bUndo )
 SetChangeTrack();
 }
 
+if (nFlags & IDF_CONTENTS)
+{
+// Broadcast only when the content changes. fdo#74687
+if (mpDataSpans)
+BroadcastChanges(*mpDataSpans);
+else
+BroadcastChanges(aRange);
+}
+
 ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 if ( !( (pViewShell) && pViewShell->AdjustRowHeight(
 aRange.aStart.Row(), aRange.aEnd.Row() ) ) )
 /*A*/   pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
 
-pDocShell->PostDataChanged();
 if (pViewShell)
 pViewShell->CellContentChanged();
 
@@ -188,15 +196,6 @@ void ScUndoDeleteContents::Undo()
 DoChange( true );
 EndUndo();
 
-if (nFlags & IDF_CONTENTS)
-{
-// Broadcast only when the content changes. fdo#74687
-if (mpDataSpans)
-BroadcastChanges(*mpDataSpans);
-else
-BroadcastChanges(aRange);
-}
-
 HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange);
 }
 
@@ -206,10 +205,6 @@ void ScUndoDeleteContents::Redo()
 DoChange( false );
 EndRedo();
 
-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

Re: sw export test failures

2014-10-13 Thread Miklos Vajna

Hi David,

On Sat, Oct 11, 2014 at 11:57:13PM +0200, David Ostrovsky 
 wrote:
> on very recent master (9aad656156fbf76288e8a281760e60f1eccc6622),
> on VS 2013 the xmlexport tests are failing here [1]:
> 
> // This is 17667 in the original document, was 504666 (so the image
> // become invisible), now is around 19072.
> CPPUNIT_ASSERT(getXPath(pXmlDoc, "//a:srcRect",
> "l").toInt32() < 2);
> 
> looking into it, reveals that the XPATH in question is:
> 
>
> 
> 
> the whole word/document.xml is [2] and the stack trace is [3].
> It looks like this test was added recently, in this commit: 4cdce63d.
> 
> On VS2013 i was able to build LO with all tests before. When i increase
> the value to 24000 to pass this specific tests

That's quite interesting, you mean that in this case VS 2012 and VS 2013
generates different code? It would be good to find out what causes the
difference.

Of course, as the comment says it was around 500 000 before, so you can
work around the problem with raising the limit to e.g. 24000, but it
would be nice to find out the root cause. ;-)

>, then the next test that is
> failing is: testExportImageProperties::Import_Export [4], that sounds
> familiar:
> 
> 'hspace' of '/html/body/p/a/font/img' incorrect value

See the comment in that test, it's already disabled on OSX, so option #1
is to do what the comment already says, option #2 is to just disable it
for VS 2013 as well.

Regards,

Miklos

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

Project Proposal

2014-10-13 Thread Lee Jeff


Project Proposal

hi, Sir.

I'm quite interested to LibreOffice project.

I have rich experience in LibreOffice project.

I have new proposal for LibreOffice ribbon menu.

If you had interest for my proposal, please contact me.

I will wait your response.

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

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

2014-10-13 Thread David Tardon

 sd/source/ui/view/frmview.cxx |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 1c8695ecf65174298ebd9edb5b0289db07af98ca
Author: David Tardon 
Date:   Mon Oct 13 10:02:02 2014 +0200

boost::rational throws if 0 is passed as denominator

Change-Id: I312fd6b964555b3b4aa4e22cec6054c9a83b2c52

diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 470866d..8f48aec 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -874,19 +874,31 @@ void FrameView::ReadUserDataSequence ( const 
::com::sun::star::uno::Sequence < :
 }
 else if ( pValue->Name == sUNO_View_GridSnapWidthXNumerator )
 {
-pValue->Value >>= aSnapGridWidthXNum;
+sal_Int32 nValue = 0;
+pValue->Value >>= nValue;
+if (nValue != 0) // 0 is allowed, but it doesn't make any 
sense...
+aSnapGridWidthXNum = nValue;
 }
 else if ( pValue->Name == sUNO_View_GridSnapWidthXDenominator )
 {
-pValue->Value >>= aSnapGridWidthXDom;
+sal_Int32 nValue = 0;
+pValue->Value >>= nValue;
+if (nValue != 0)
+aSnapGridWidthXDom = nValue;
 }
 else if ( pValue->Name == sUNO_View_GridSnapWidthYNumerator )
 {
-pValue->Value >>= aSnapGridWidthYNum;
+sal_Int32 nValue = 0;
+pValue->Value >>= nValue;
+if (nValue != 0) // 0 is allowed, but it doesn't make any 
sense...
+aSnapGridWidthYNum = nValue;
 }
 else if ( pValue->Name == sUNO_View_GridSnapWidthYDenominator )
 {
-pValue->Value >>= aSnapGridWidthYDom;
+sal_Int32 nValue = 0;
+pValue->Value >>= nValue;
+if (nValue != 0)
+aSnapGridWidthYDom = nValue;
 }
 else if (!bImpress && pValue->Name == sUNO_View_VisibleLayers  )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   36 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |3 -
 2 files changed, 21 insertions(+), 18 deletions(-)

New commits:
commit 376dae8117365166a6a9c7c280f5bf367570fefa
Author: Miklos Vajna 
Date:   Mon Oct 13 09:59:23 2014 +0200

Avoid manual realloc, use comphelper::SequenceAsVector instead

Change-Id: I26c6bcf7361bbb787fcb4133d05b0a668fd72d01

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 835387d..3b99048 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -285,10 +285,10 @@ bool lcl_extractTableBorderProperty(PropertyMapPtr 
pTableProperties, const Prope
 
 }
 
-bool lcl_extractHoriOrient(uno::Sequence& 
rFrameProperties, sal_Int32& nHoriOrient)
+bool lcl_extractHoriOrient(comphelper::SequenceAsVector& 
rFrameProperties, sal_Int32& nHoriOrient)
 {
 // Shifts the frame left by the given value.
-for (sal_Int32 i = 0; i < rFrameProperties.getLength(); ++i)
+for (size_t i = 0; i < rFrameProperties.size(); ++i)
 {
 if (rFrameProperties[i].Name == "HoriOrient")
 {
@@ -299,10 +299,10 @@ bool 
lcl_extractHoriOrient(uno::Sequence& rFrameProperties
 return false;
 }
 
-void lcl_DecrementHoriOrientPosition(uno::Sequence& 
rFrameProperties, sal_Int32 nAmount)
+void 
lcl_DecrementHoriOrientPosition(comphelper::SequenceAsVector&
 rFrameProperties, sal_Int32 nAmount)
 {
 // Shifts the frame left by the given value.
-for (sal_Int32 i = 0; i < rFrameProperties.getLength(); ++i)
+for (size_t i = 0; i < rFrameProperties.size(); ++i)
 {
 beans::PropertyValue& rPropertyValue = rFrameProperties[i];
 if (rPropertyValue.Name == "HoriOrientPosition")
@@ -315,7 +315,7 @@ void 
lcl_DecrementHoriOrientPosition(uno::Sequence& rFrame
 }
 }
 
-TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo & rInfo, 
uno::Sequence& rFrameProperties)
+TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo & rInfo, 
comphelper::SequenceAsVector& rFrameProperties)
 {
 // will receive the table style if any
 TableStyleSheetEntry* pTableStyle = NULL;
@@ -484,7 +484,7 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 m_aTableProperties->Insert( PROP_TABLE_BORDER_DISTANCES, uno::makeAny( 
aDistances ) );
 
-if (rFrameProperties.hasElements())
+if (!rFrameProperties.empty())
 lcl_DecrementHoriOrientPosition(rFrameProperties, 
rInfo.nLeftBorderDistance);
 
 // Set table above/bottom spacing to 0.
@@ -512,7 +512,7 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 // Only top level table position depends on border width
 if (rInfo.nNestLevel == 1)
 {
-if (!rFrameProperties.hasElements())
+if (rFrameProperties.empty())
 rInfo.nLeftBorderDistance += aLeftBorder.LineWidth * 0.5;
 else
 lcl_DecrementHoriOrientPosition(rFrameProperties, 
aLeftBorder.LineWidth * 0.5);
@@ -980,7 +980,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 #endif
 
 // If we want to make this table a floating one.
-uno::Sequence aFrameProperties = 
m_rDMapper_Impl.getTableManager().getCurrentTablePosition();
+comphelper::SequenceAsVector aFrameProperties = 
m_rDMapper_Impl.getTableManager().getCurrentTablePosition();
 TableInfo aTableInfo;
 aTableInfo.nNestLevel = nestedTableLevel;
 aTableInfo.pTableStyle = endTableGetTableStyle(aTableInfo, 
aFrameProperties);
@@ -1000,7 +1000,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 uno::Reference xStart;
 uno::Reference xEnd;
 
-bool bFloating = aFrameProperties.hasElements();
+bool bFloating = !aFrameProperties.empty();
 // Additional checks: if we can do this.
 if (bFloating && (*m_pTableSeq)[0].getLength() > 0 && 
(*m_pTableSeq)[0][0].getLength() > 0)
 {
@@ -1083,15 +1083,17 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 xTableProperties->getPropertyValue("IsWidthRelative") >>= 
bIsRelative;
 if (!bIsRelative)
 {
-aFrameProperties.realloc(aFrameProperties.getLength() + 1);
-aFrameProperties[aFrameProperties.getLength() - 1].Name = 
"Width";
-aFrameProperties[aFrameProperties.getLength() - 1].Value = 
xTableProperties->getPropertyValue("Width");
+beans::PropertyValue aValue;
+aValue.Name = "Width";
+aValue.Value = xTableProperties->getPropertyValue("Width");
+aFrameProperties.push_back(aV

58 matches

Mail list logo