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

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

2015-11-16 Thread Caolán McNamara

 Makefile.fetch   |2 
 download.lst |3 
 external/libpng/configs/pnglibconf.h |  267 ++-
 3 files changed, 141 insertions(+), 131 deletions(-)

New commits:
commit 1658932a95fa6f2428bb6cad437eef4514c24ccb
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 16 11:23:40 2015 +

bump png to 1.5.24 CVE-2015-7981 + CVE-2015-8126

Conflicts:
download.lst
external/libpng/configs/pnglibconf.h

Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446

diff --git a/Makefile.fetch b/Makefile.fetch
index 6af0bbe..bb675de 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -90,6 +90,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
+   $(call fetch_Optional,LIBPNG,PNG_TARBALL) \
$(call fetch_Optional,SERF,SERF_TARBALL) \
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
,$(call 
fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item)))
@@ -160,7 +161,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,OPENSSL,$(OPENSSL_TARBALL)) \
$(call fetch_Optional,ORCUS,$(ORCUS_TARBALL)) \
$(call fetch_Optional,CAIRO,$(PIXMAN_TARBALL)) \
-   $(call fetch_Optional,LIBPNG,$(PNG_TARBALL)) \
$(call fetch_Optional,POPPLER,$(POPPLER_TARBALL)) \
$(call fetch_Optional,POSTGRESQL,$(POSTGRESQL_TARBALL)) \
$(call fetch_Optional,PYTHON,$(PYTHON_TARBALL)) \
diff --git a/download.lst b/download.lst
index 69031e8..d1e8734 100644
--- a/download.lst
+++ b/download.lst
@@ -101,7 +101,8 @@ export OPENLDAP_TARBALL := 
804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 
d143d1555d842a069cb7cc34ba745a06-openssl-1.0.1m.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
+PNG_MD5SUM := 6652e428d1d3fc3c6cb1362159b1cf3b
+export PNG_TARBALL := libpng-1.5.24.tar.gz
 export POPPLER_TARBALL := 
1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
diff --git a/external/libpng/configs/pnglibconf.h 
b/external/libpng/configs/pnglibconf.h
index 650098e..8149f59 100644
--- a/external/libpng/configs/pnglibconf.h
+++ b/external/libpng/configs/pnglibconf.h
@@ -1,10 +1,9 @@
-/* libpng STANDARD API DEFINITION */
-
+/* 1.5.24 STANDARD API DEFINITION */
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.0 - last changed on January 6, 2011 */
+/* libpng version 1.5.24 - November 12, 2015 */
 
-/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
@@ -15,164 +14,174 @@
 /* Derived from: scripts/pnglibconf.dfa */
 #ifndef PNGLCONF_H
 #define PNGLCONF_H
-/* settings */
-#define PNG_MAX_GAMMA_8 11
-#define PNG_CALLOC_SUPPORTED
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_USER_WIDTH_MAX 100L
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_API_RULE 0
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_USER_CHUNK_CACHE_MAX 0
-#define PNG_USER_HEIGHT_MAX 100L
-#define PNG_sCAL_PRECISION 5
-#define PNG_COST_SHIFT 3
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_USER_CHUNK_MALLOC_MAX 0
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_ZBUF_SIZE 8192
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-/* end of settings */
 /* options */
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
+#define PNG_16BIT_SUPPORTED
+#define PNG_ALIGNED_MEMORY_SUPPORTED
+/*#undef PNG_ARM_NEON_API_SUPPORTED*/
+/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
+#define PNG_BENIGN_ERRORS_SUPPORTED
+#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+#define PNG_CHECK_cHRM_SUPPORTED
+#define PNG_CONSOLE_IO_SUPPORTED
+#define PNG_CONVERT_tIME_SUPPORTED
 #define PNG_EASY_ACCESS_SUPPORTED
-#define PNG_ALIGN_MEMORY_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
 /*#undef

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 5 commits - configure.ac include/unotools sc/source sw/source unotools/source vcl/source

2015-11-02 Thread Andras Timar

 configure.ac   |2 
 include/unotools/securityoptions.hxx   |2 
 sc/source/filter/xml/xmlimprt.cxx  |   10 +++
 sc/source/ui/docshell/docsh4.cxx   |   18 +-
 sw/source/core/doc/docnew.cxx  |   10 +++
 sw/source/filter/ww8/ww8scan.cxx   |   22 
 sw/source/filter/ww8/ww8scan.hxx   |4 -
 sw/source/filter/xml/xmlimp.cxx|   78 ++---
 unotools/source/config/securityoptions.cxx |8 ++
 vcl/source/gdi/jobset.cxx  |   27 +-
 10 files changed, 115 insertions(+), 66 deletions(-)

New commits:
commit a71ec87df4d17a20654dcacb0268ee93f212fa27
Author: Andras Timar 
Date:   Tue Sep 29 04:06:27 2015 -0700

Bump version to 4.2-30

Change-Id: I0b6947aa5563b580bcd5acd3d45af646e276b7b0

diff --git a/configure.ac b/configure.ac
index fac5eb4..f819417 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.29],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.30],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit 259b7be4313dc7a8eb4047a99918e95a1719cbe6
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 26 11:26:41 2015 +

coverity#1266485 Untrusted value as argument

(cherry picked from commit 0934ed1a40c59c169354b177d7dab4228de66171)

min legal size here is > 4

(cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3)

(cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab)
(cherry picked from commit d4f07cdd244a6aa69de1fde0df4163b27a65556c)

Conflicts:
vcl/source/gdi/jobset.cxx

9f68d000b32623db4d949d13284043630f5689f4

Change-Id: I7708ecaf5412535055584ed6c71beaa9cd71c10c

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index a2ca658..16718f0 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -235,19 +235,24 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& 
rJobSetup )
 DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version 
not set on rOStream" );
 
 {
-sal_Size nFirstPos = rIStream.Tell();
-
 sal_uInt16 nLen = 0;
 rIStream >> nLen;
-if ( !nLen )
+if (nLen <= 4)
 return rIStream;
 
 sal_uInt16 nSystem = 0;
 rIStream >> nSystem;
-
-char* pTempBuf = new char[nLen];
-rIStream.Read( pTempBuf,  nLen - sizeof( nLen ) - sizeof( nSystem ) );
-if ( nLen >= sizeof(ImplOldJobSetupData)+4 )
+const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
+if (nRead > rIStream.remainingSize())
+{
+SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() <<
+ " max possible entries, but " << nRead << " claimed, 
truncating");
+return rIStream;
+}
+sal_Size nFirstPos = rIStream.Tell();
+char* pTempBuf = new char[nRead];
+rIStream.Read(pTempBuf,  nRead);
+if (nRead >= sizeof(ImplOldJobSetupData))
 {
 ImplOldJobSetupData* pData = (ImplOldJobSetupData*)pTempBuf;
 if ( rJobSetup.mpData )
@@ -289,8 +294,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& 
rJobSetup )
 }
 if( nSystem == JOBSET_FILE605_SYSTEM )
 {
-rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 
4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen );
-while( rIStream.Tell() < nFirstPos + nLen )
+rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 
sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen );
+while( rIStream.Tell() < nFirstPos + nRead )
 {
 OUString aKey = 
read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
 OUString aValue = 
read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
@@ -308,9 +313,9 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& 
rJobSetup )
 else
 pJobData->maValueMap[ aKey ] = aValue;
 }
-DBG_ASSERT( rIStream.Tell() == nFirstPos+nLen, "corrupted 
job setup" );
+DBG_ASSERT( rIStream.Tell() == nFirstPos+nRead, "corrupted 
job setup" );
 // ensure correct stream position
-rIStream.Seek( nFirstPos + nLen );
+rIStream.Seek(nFirstPos + nRead);
 }
 }
 }
commit

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

2015-05-03 Thread Mike Kaganski

 embedserv/source/embed/docholder.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 7e1ba1ed24419518edb23829a93301d2fcb1ba71
Author: Mike Kaganski mikekagan...@hotmail.com
Date:   Sun May 3 22:59:49 2015 +1000

tdf#66232: Cannot open files by COM2

As suggested by comment 13 of the bug, the problem is caused
by commit b248624126c271c88381d3dad6e04fc954f65779 by Noel Grandin.

1. DocumentHolder::DocumentFrame(): XDesktop2 cannot be directly
queried for XFrame2. And in this case, simple XFrame is enough.

2. DocumentHolder::CloseFrame(): m_xFrame-dispose() violates an
assert because of NULL reference. Reverted to previous code.

3. Following commit debde4fdc443f522562ee29def4c27512d64609a by
Andras Timar (supposed to fix the bug), found two places where
previously used to be UNO_QUERY, but now UNO_QUERY_THROW is used.
These places are reverted to use UNO_QUERY.

Change-Id: Ifb9e74367d5dd99ba12166abdd443b29a8018aeb
Reviewed-on: https://gerrit.libreoffice.org/15607
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit 8568c7226cfb732e17fa42b365b9fce3a8264691)

diff --git a/embedserv/source/embed/docholder.cxx 
b/embedserv/source/embed/docholder.cxx
index 2a443ac..875776b 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -363,7 +363,7 @@ HRESULT DocumentHolder::InPlaceActivate(
 LoadDocInFrame( sal_True );
 
 uno::Reference frame::XDesktop2  xDesktop = 
frame::Desktop::create(comphelper::getComponentContext(m_xFactory));
-xDesktop-getFrames()-append( 
uno::Referenceframe::XFrame(m_xFrame, uno::UNO_QUERY_THROW) );
+xDesktop-getFrames()-append( 
uno::Referenceframe::XFrame(m_xFrame, uno::UNO_QUERY) );
 
 // determine the menuhandle to get menutitems.
 if(m_xLayoutManager.is()) {
@@ -694,7 +694,9 @@ void DocumentHolder::CloseFrame()
 catch( const uno::Exception ) {
 }
 else {
-m_xFrame-dispose();
+uno::Referencelang::XComponent xComp(m_xFrame, uno::UNO_QUERY);
+if (xComp.is())
+xComp-dispose();
 }
 
 m_xFrame = uno::Reference frame::XFrame2 ();
@@ -770,13 +772,13 @@ uno::Reference frame::XFrame2  
DocumentHolder::DocumentFrame()
 {
 uno::Referenceframe::XDesktop2 xDesktop = 
frame::Desktop::create(comphelper::getComponentContext(m_xFactory));
 
-uno::Referenceframe::XFrame2 xFrame(xDesktop,uno::UNO_QUERY);
+uno::Referenceframe::XFrame xFrame(xDesktop,uno::UNO_QUERY);
 
 // the frame will be registered on desktop here, later when the 
document
 // is loaded into the frame in ::show() method the terminate listener 
will be removed
 // this is so only for outplace activation
 if( xFrame.is() )
-m_xFrame.set( xFrame-findFrame( OUString(_blank), 0 ), 
uno::UNO_QUERY_THROW );
+m_xFrame.set( xFrame-findFrame( OUString(_blank), 0 ), 
uno::UNO_QUERY );
 
 uno::Reference util::XCloseBroadcaster  xBroadcaster(
 m_xFrame, uno::UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-29 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e503b429899b6edc510d4481d39aabd29fef52ce
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Apr 27 14:45:29 2015 +0200

cp#1000125 DOCX import: fix non-zero para indent

This only affects libreoffice-4-3 and earlier, libreoffice-4-4 and newer
is unaffected.

The problem is that the document had this XML fragment:

w:p
  w:pPr
w:numPr
  ...
/w:numPr
w:ind w:left=0 w:firstLine=0/
  /w:pPr
/w:p

The order of generated tokens for the left and firstLine attributes is
~random (but with the exact CPLinux config or on Windows, it's
firstLine, left), while it's always left, firstLine on newer
versions, since iterating over the keys of the boost::unordered_map has
been cleaned up.

When left is the later attribute, then the ParaFirstLineIndent
property should be set in the left handler only in case firstLine
did not set it already, so switch off overwriting.

Change-Id: Ifd0f6f7e1e85ac485be326d52b6db89f32d77357
(cherry picked from commit 8961fa8c1a72c81cee091f3e447a0f6cac7f6bea)

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 76d61e1..ed0fdac 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1075,7 +1075,7 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 sal_Int32 nFirstLineIndent = 
m_pImpl-getCurrentNumberingProperty(FirstLineIndent);
 
 if (nFirstLineIndent != 0)
-
m_pImpl-GetTopContext()-Insert(PROP_PARA_FIRST_LINE_INDENT, 
uno::makeAny(nFirstLineIndent));
+
m_pImpl-GetTopContext()-Insert(PROP_PARA_FIRST_LINE_INDENT, 
uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false);
 
 m_pImpl-GetTopContext()-Insert(
 PROP_PARA_LEFT_MARGIN, uno::makeAny( 
ConversionHelper::convertTwipToMM100(nIntValue ) ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-15 Thread Markus Mohrhard

 include/oox/export/chartexport.hxx |3 ++
 oox/source/export/chartexport.cxx  |   41 +
 2 files changed, 44 insertions(+)

New commits:
commit 84a63e099c97a721715de1710dc396294426bb6c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Apr 15 00:21:21 2015 +0200

export missing value treatment to OOXML

Change-Id: I1a448e9c954a3851fe3590a0fae73ed5b27555f0
(cherry picked from commit e68ceaec43f0c0ff326064642072bb8f904e7e8a)

diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index 524c61d..fb32b0c 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -171,6 +171,9 @@ private:
 void exportView3D();
 sal_Bool isDeep3dChart();
 
+void exportMissingValueTreatment(com::sun::star::uno::Reference
+com::sun::star::beans::XPropertySet xPropSet);
+
 public:
 
 ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, 
::com::sun::star::uno::Reference ::com::sun::star::frame::XModel  xModel, 
::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = 
DOCUMENT_PPTX );
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 0b63d3e..be38415 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -44,6 +44,7 @@
 #include com/sun/star/chart/ChartSolidType.hpp
 #include com/sun/star/chart/DataLabelPlacement.hpp
 #include com/sun/star/chart/ErrorBarStyle.hpp
+#include com/sun/star/chart/MissingValueTreatment.hpp
 
 #include com/sun/star/chart2/XChartDocument.hpp
 #include com/sun/star/chart2/XDiagram.hpp
@@ -845,9 +846,44 @@ void ChartExport::exportChart( Reference 
::com::sun::star::chart::XChartDocumen
 XML_val, 1,
 FSEND );
 
+exportMissingValueTreatment(Referencebeans::XPropertySet(mxDiagram, 
uno::UNO_QUERY));
+
 pFS-endElement( FSNS( XML_c, XML_chart ) );
 }
 
+void 
ChartExport::exportMissingValueTreatment(uno::Referencebeans::XPropertySet 
xPropSet)
+{
+if (!xPropSet.is())
+return;
+
+sal_Int32 nVal = 0;
+uno::Any aAny = xPropSet-getPropertyValue(MissingValueTreatment);
+if (!(aAny = nVal))
+return;
+
+const char* pVal = NULL;
+switch (nVal)
+{
+case cssc::MissingValueTreatment::LEAVE_GAP:
+pVal = gap;
+break;
+case cssc::MissingValueTreatment::USE_ZERO:
+pVal = zero;
+break;
+case cssc::MissingValueTreatment::CONTINUE:
+pVal = span;
+break;
+default:
+SAL_WARN(oox, unknown MissingValueTreatment value);
+break;
+}
+
+FSHelperPtr pFS = GetFS();
+pFS-singleElement( FSNS(XML_c, XML_dispBlanksAs),
+XML_val, pVal,
+FSEND);
+}
+
 void ChartExport::exportLegend( Reference 
::com::sun::star::chart::XChartDocument  rChartDoc )
 {
 FSHelperPtr pFS = GetFS();
commit 063882a18477abc045719353ac9fbd85763de508
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Apr 14 23:07:22 2015 +0200

we use the correct OOXML default value now

Change-Id: I1aad3e40ad61a1397b619bdc6e0f578e2c9c141e
(cherry picked from commit ec2c8a602ecb8664b24d77e6ca6af17bf59d211c)

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 6be487f..0b63d3e 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -800,7 +800,12 @@ void ChartExport::exportChart( Reference 
::com::sun::star::chart::XChartDocumen
 {
 Reference drawing::XShape  xShape = rChartDoc-getTitle();
 if( xShape.is() )
+{
 exportTitle( xShape );
+pFS-singleElement( FSNS(XML_c, XML_autoTitleDeleted),
+XML_val, 0,
+FSEND);
+}
 }
 InitPlotArea( );
 if( mbIs3DChart )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sal/textenc svtools/source

2015-04-04 Thread Caolán McNamara

 sal/textenc/handleundefinedunicodetotextchar.cxx |2 +-
 svtools/source/contnr/treelist.cxx   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 15487c3f0fde61012ea69f88c64cdcd2017733b3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sat Jan 31 21:11:57 2015 +

coverity#1267678 this is surely backwards (gold)

surely we clone from the source and return the newly created
entry. Presumably this doesn't break all the time because
aCloneLink is generally set ?

coverity#1267678 Resource leak

Change-Id: I3e02dfaef371e006f1510b186cdd881c991ef2cf
(cherry picked from commit 9f1ecd3ac35f06746fe2a12ca52899f664679de5)
Reviewed-on: https://gerrit.libreoffice.org/15023
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index cbd011a..2029931 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -355,8 +355,8 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* 
pSource ) const
 if( aCloneLink.IsSet() )
 return (SvTreeListEntry*)aCloneLink.Call( pSource );
 SvTreeListEntry* pEntry = CreateEntry();
-pSource-Clone( pEntry );
-return pSource;
+pEntry-Clone(pSource);
+return pEntry;
 }
 
 SvTreeListEntry* SvTreeList::CreateEntry() const
commit b1bede525c68e628456bf8cbe9ecc855d2307612
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 9 10:20:03 2014 +0100

coverity#1209362 coverity gold, wrong mask

Change-Id: I039563908a391103cc478e1148cc517fc677

diff --git a/sal/textenc/handleundefinedunicodetotextchar.cxx 
b/sal/textenc/handleundefinedunicodetotextchar.cxx
index b92a9811..5a8ceef 100644
--- a/sal/textenc/handleundefinedunicodetotextchar.cxx
+++ b/sal/textenc/handleundefinedunicodetotextchar.cxx
@@ -58,7 +58,7 @@ bool ImplGetInvalidAsciiMultiByte(sal_uInt32 nFlags,
 {
 if (nMaxLen == 0)
 return false;
-switch (nFlags  RTL_UNICODETOTEXT_FLAGS_UNDEFINED_MASK)
+switch (nFlags  RTL_UNICODETOTEXT_FLAGS_INVALID_MASK)
 {
 case RTL_UNICODETOTEXT_FLAGS_INVALID_0:
 *pBuf = 0x00;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-04 Thread Andras Timar

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

New commits:
commit 8e4b3e4d85fa914f20f45b90ed1bd09573b1b09b
Author: Andras Timar andras.ti...@collabora.com
Date:   Sat Apr 4 12:48:33 2015 -0700

Bump version to 4.2-29

Change-Id: Ibfa2c1923c47080a44f2b95c82355c6a06901531

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 56 commits - download.lst external/openssl hwpfilter/source

2015-03-20 Thread Andras Timar

 download.lst|2 
 external/openssl/CVE-2010-5298.patch|   21 -
 external/openssl/CVE-2013-4353.patch|   21 -
 external/openssl/CVE-2013-6449.patch|  111 --
 external/openssl/CVE-2013-6450.patch|   85 -
 external/openssl/CVE-2014-0160.patch|  108 --
 external/openssl/CVE-2014-0195.patch|   36 --
 external/openssl/CVE-2014-0198.patch|   33 -
 external/openssl/CVE-2014-0221.patch|   34 --
 external/openssl/CVE-2014-0224.patch|   88 -
 external/openssl/CVE-2014-3470.patch|   26 -
 external/openssl/CVE-2014-3505.patch|   52 ---
 external/openssl/CVE-2014-3506.patch|   87 -
 external/openssl/CVE-2014-3507.patch|   53 ---
 external/openssl/CVE-2014-3508.patch|  138 
 external/openssl/CVE-2014-3509.patch|   45 --
 external/openssl/CVE-2014-3510.patch|   86 -
 external/openssl/CVE-2014-3511.patch|   85 -
 external/openssl/CVE-2014-3513.patch|  186 ---
 external/openssl/CVE-2014-3566.patch|  466 
 external/openssl/CVE-2014-3567.patch|   14 
 external/openssl/UnpackedTarball_openssl.mk |   20 -
 hwpfilter/source/attributes.cxx |1 
 hwpfilter/source/cspline.cxx|3 
 hwpfilter/source/drawdef.h  |   18 -
 hwpfilter/source/drawing.h  |  297 ++---
 hwpfilter/source/fontmap.cxx|2 
 hwpfilter/source/fontmap.hxx|   29 +
 hwpfilter/source/formula.cxx|   16 
 hwpfilter/source/grammar.cxx|   10 
 hwpfilter/source/grammar.hxx|   31 +
 hwpfilter/source/hbox.cxx   |  162 ++---
 hwpfilter/source/hbox.h |  109 +++---
 hwpfilter/source/hcode.cxx  |   62 +--
 hwpfilter/source/hgzip.cxx  |2 
 hwpfilter/source/hinfo.cxx  |  171 +++---
 hwpfilter/source/hinfo.h|   60 ++-
 hwpfilter/source/hiodev.cxx |  117 ---
 hwpfilter/source/hiodev.h   |   32 +
 hwpfilter/source/hpara.cxx  |   69 ++--
 hwpfilter/source/hpara.h|2 
 hwpfilter/source/htags.cxx  |8 
 hwpfilter/source/htags.h|6 
 hwpfilter/source/hutil.cxx  |1 
 hwpfilter/source/hwpeq.cxx  |   31 -
 hwpfilter/source/hwpfile.cxx|  102 +++---
 hwpfilter/source/hwpfile.h  |   14 
 hwpfilter/source/hwplib.h   |   11 
 hwpfilter/source/hwpread.cxx|  312 ++
 hwpfilter/source/hwpreader.cxx  |   91 ++---
 hwpfilter/source/hwpreader.hxx  |8 
 hwpfilter/source/lexer.cxx  |   18 -
 hwpfilter/source/lexer.hxx  |   29 +
 hwpfilter/source/list.hxx   |6 
 hwpfilter/source/mzstring.cxx   |2 
 hwpfilter/source/mzstring.h |4 
 56 files changed, 1135 insertions(+), 2498 deletions(-)

New commits:
commit 683b30bcd6fcb2c99ad7361ed7afa52517707962
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Mar 20 13:50:34 2015 +0100

bump to openssl-1.0.1m

Change-Id: I3152e33f726aab1596adc99e512c156161dc31ca

diff --git a/download.lst b/download.lst
index 3255674..69031e8 100644
--- a/download.lst
+++ b/download.lst
@@ -98,7 +98,7 @@ export MYTHES_TARBALL := 
46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.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 OPENSSL_TARBALL := 
d143d1555d842a069cb7cc34ba745a06-openssl-1.0.1m.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
diff --git a/external/openssl/CVE-2010-5298.patch 
b/external/openssl/CVE-2010-5298.patch
deleted file mode 100644
index 55251b3..000
--- a/external/openssl/CVE-2010-5298.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ben Laurie b...@links.org
-Date: Wed, 23 Apr 2014 06:24:03 + (+0100)
-Subject: Fix use after free.
-X-Git-Url: 
https://git.openssl.org/gitweb/b/?p=openssl.git;a=commitdiff_plain;h=94d1f4b
-
-Fix use after free.

-
-diff --git a/a/ssl/s3_pkt.c b/b/ssl/s3_pkt.c
-index b9e45c7..d601a18 100644
 a/a/ssl/s3_pkt.c
-+++ b/b/ssl/s3_pkt.c
-@@ -1334,7 +1334,7 @@ start:
-   {
-

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

2015-03-20 Thread Michael Stahl

 external/openssl/opensslwnt.patch |   23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 3ec327667e8870d171b9dad448b7f829909d7323
Author: Michael Stahl mst...@redhat.com
Date:   Tue Apr 8 14:35:38 2014 +0200

openssl: fix WNT patch to apply

(cherry picked from commit 1c772b16829364ce6a98f3b9584fe68f8f93f7d7)

Change-Id: I31494d4314557672b7e3c2ff6846663fb9ed981a

diff --git a/external/openssl/opensslwnt.patch 
b/external/openssl/opensslwnt.patch
index b68e037..69c1e4d 100644
--- a/external/openssl/opensslwnt.patch
+++ b/external/openssl/opensslwnt.patch
@@ -1,8 +1,8 @@
 --- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 
+0100
 +++ build/openssl-0.9.8v/crypto/x509v3/v3_pci.c2010-03-26 
12:04:20.961547300 +0100
 @@ -2,7 +2,7 @@
- /* Contributed to the OpenSSL Project 2004
-  * by Richard Levitte (rich...@levitte.org)
+  * Contributed to the OpenSSL Project 2004 by Richard Levitte
+  * (rich...@levitte.org)
   */
 -/* Copyright (c) 2004 Kungliga Tekniska Högskolan
 +/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan
@@ -12,8 +12,8 @@
 --- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 
01:21:33.0 +0100
 +++ build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c   2010-03-26 
12:04:20.961547300 +0100
 @@ -2,7 +2,7 @@
- /* Contributed to the OpenSSL Project 2004
-  * by Richard Levitte (rich...@levitte.org)
+  * Contributed to the OpenSSL Project 2004 by Richard Levitte
+  * (rich...@levitte.org)
   */
 -/* Copyright (c) 2004 Kungliga Tekniska Högskolan
 +/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan
@@ -88,7 +88,7 @@
  printf OUT EOF;
  #ifdef $platform_cpp_symbol
/* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
--  #define CFLAGS $cc $cflags
+-  #define CFLAGS compiler: $cc $cflags
 +  #define CFLAGS $cflags
#define PLATFORM $platform
  EOF
@@ -96,7 +96,7 @@
 --- misc/openssl-0.9.8v/util/pl/VC-32.pl   2010-02-04 02:10:24.0 
+0100
 +++ build/openssl-0.9.8v/util/pl/VC-32.pl  2010-03-26 12:04:20.977172300 
+0100
 @@ -32,7 +32,7 @@
- $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
+ my $ff = ;
  
  # C compiler stuff
 -$cc='cl';
@@ -104,7 +104,7 @@
  if ($FLAVOR =~ /WIN64/)
  {
  # Note that we currently don't have /WX on Win64! There is a lot of
-@@ -103,21 +103,21 @@
+@@ -103,22 +103,22 @@
  }
  
  $cc='$(CC)';
@@ -125,10 +125,11 @@
 +$base_cflags=  $mf_cflag;
 -my $f = $shlib || $fips ?' /MD':' /MT';
 -$lib_cflag='/Zl' if (!$shlib);# remove /DEFAULTLIBs from static lib
--$opt_cflags=$f.' /Ox /O2 /Ob2';
--$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
 +my $f = $shlib || $fips ? (($ENV{MSVC_USE_DEBUG_RUNTIME} eq TRUE) ? ' 
-MDd' : ' -MD' ):' -MT';
 +$lib_cflag='-Zl' if (!$shlib);# remove /DEFAULTLIBs from static lib
+ $ff = /fixed;
+-$opt_cflags=$f.' /Ox /O2 /Ob2';
+-$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
 +$opt_cflags=$f.' -Ox -O2 -Ob2';
 +$dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
  $lflags=/nologo /subsystem:console /opt:ref;
@@ -147,8 +148,8 @@
 +++ build/openssl-0.9.8v/ms/uplink.c
 @@ -1,5 +1,6 @@
  #if (defined(_WIN64) || defined(_WIN32_WCE))  !defined(UNICODE)
- #define UNICODE
+ # define UNICODE
 +#define _CRT_NON_CONFORMING_SWPRINTFS
  #endif
  #if defined(UNICODE)  !defined(_UNICODE)
- #define _UNICODE
+ # define _UNICODE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-16 Thread László Németh

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

New commits:
commit f42608ecab31dc3d626a7b30a779b6591b1f7dd6
Author: LÃ¡szlÃ³ NÃ©meth laszlo.nem...@collabora.com
Date:   Mon Mar 16 11:04:46 2015 +0100

fdo#37156 insert table copy as nested table in non-starting cell position

Cherry-picked from 7600a2942ce2b9dac66836105bed6620d55abec2

Change-Id: I7584ed179e92abcb10ef0e3a7e4e0d30d24f86bf

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 8c5b6b9..5bac3ab 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -824,7 +824,12 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool 
bIncludingPageFrames )
 FOREACHPAM_START(GetCrsr())
 
 if( pSrcNd 
-0 != ( pDestNd = GetDoc()-IsIdxInTbl( PCURCRSR-GetPoint()-nNode 
)))
+0 != ( pDestNd = GetDoc()-IsIdxInTbl( PCURCRSR-GetPoint()-nNode 
)) 
+// are we at the beginning of the cell? (if not, we will insert a 
nested table)
+// first paragraph of the cell?
+PCURCRSR-GetNode().GetIndex() == 
PCURCRSR-GetNode().FindTableBoxStartNode()-GetIndex()+1 
+// beginning of the paragraph?
+!PCURCRSR-GetPoint()-nContent.GetIndex())
 {
 SwPosition aDestPos( *PCURCRSR-GetPoint() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-16 Thread Markus Mohrhard

 oox/source/drawingml/chart/chartspacefragment.cxx |6 +-
 oox/source/drawingml/chart/chartspacemodel.cxx|2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5da802443023e0a43cb6979b0fd82bc5b76311d8
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Mar 10 14:42:26 2015 +0100

handle one more place with MSO 2007 vs OOXML spec for charts

Change-Id: I7dbc3017f2bba7b186174be2e4fd8c9ce7005d34
(cherry picked from commit 708d201884c4940647dc65e43e887803f06dce87)

diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx 
b/oox/source/drawingml/chart/chartspacefragment.cxx
index 8df7f3b..cbcc905 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -91,8 +91,12 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( 
sal_Int32 nElement, const
 case C_TOKEN( backWall ):
 return new WallFloorContext( *this, 
mrModel.mxBackWall.create() );
 case C_TOKEN( dispBlanksAs ):
-mrModel.mnDispBlanksAs = rAttribs.getToken( XML_val, 
XML_zero );
+{
+bool bMSO2007Document = getFilter().isMSO2007Document();
+// default value is XML_gap for MSO 2007 and XML_zero in 
OOXML
+mrModel.mnDispBlanksAs = rAttribs.getToken( XML_val, 
bMSO2007Document ? XML_gap : XML_zero );
 return 0;
+}
 case C_TOKEN( floor ):
 return new WallFloorContext( *this, 
mrModel.mxFloor.create() );
 case C_TOKEN( legend ):
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx 
b/oox/source/drawingml/chart/chartspacemodel.cxx
index da86a4b..7dee6a2 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -26,7 +26,7 @@ namespace chart {
 // 
 
 ChartSpaceModel::ChartSpaceModel(bool bMSO2007Doc) :
-mnDispBlanksAs( XML_gap ),  // not zero as specified, TODO: OOXML_spec
+mnDispBlanksAs( bMSO2007Doc ? XML_gap : XML_zero ),  // difference between 
OOXML spec and MSO 2007
 mnStyle( 2 ),
 mbAutoTitleDel( !bMSO2007Doc ), // difference between OOXML spec and MSO 
2007
 mbPlotVisOnly( false ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-16 Thread Andras Timar

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

New commits:
commit b252b59f5cedaf8901d4622c10b0fd259b2e1a95
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Mar 16 05:48:40 2015 -0700

Bump version to 4.2-28

Change-Id: I1ff7045b17d945432255b6a805ce6e121dfc807c

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

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

2015-03-16 Thread Miklos Vajna

 sw/source/core/frmedt/fecopy.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b34f1f81d8e0af327d1c60fc300cbfc7a09fb389
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Mar 16 18:00:05 2015 +0100

sw: fix build

Change-Id: I0b16abb2ba6cbc24059e8409669b16a11588915b

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 5bac3ab..d9c27dc 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -827,7 +827,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool 
bIncludingPageFrames )
 0 != ( pDestNd = GetDoc()-IsIdxInTbl( PCURCRSR-GetPoint()-nNode 
)) 
 // are we at the beginning of the cell? (if not, we will insert a 
nested table)
 // first paragraph of the cell?
-PCURCRSR-GetNode().GetIndex() == 
PCURCRSR-GetNode().FindTableBoxStartNode()-GetIndex()+1 
+PCURCRSR-GetNode()-GetIndex() == 
PCURCRSR-GetNode()-FindTableBoxStartNode()-GetIndex()+1 
 // beginning of the paragraph?
 !PCURCRSR-GetPoint()-nContent.GetIndex())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-16 Thread László Németh

 vcl/source/glyphs/graphite_layout.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3313aee8436ea248c8292314aa51f124aaed49fe
Author: LÃ¡szlÃ³ NÃ©meth laszlo.nem...@collabora.com
Date:   Mon Mar 16 00:18:51 2015 +0100

fdo#52540, fdo#88051: fix Graphite layout

The previous fixes were incomplete solutions (see the new test
cases of the bug reports).

Change-Id: I928f09d94edf68d268de9046c16582e6f016d561

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 50e2a2d..eeda997 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -599,9 +599,12 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 static com::sun::star::uno::Reference 
com::sun::star::i18n::XCharacterClassification  xCharClass;
 if ( !xCharClass.is() )
 xCharClass = vcl::unohelper::CreateCharacterClassification();
-size_t numchars2 = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, 
fdo#68313, fdo#70666 avoid bad ligature replacement
-if (numchars  numchars2  (rArgs.mpStr[numchars2] == '\t' || 
xCharClass-getType(rArgs.mpStr, numchars2 + 1) == 
::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER))
+size_t numchars2 = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, 
fdo#68313, fdo#70666 avoid bad ligature replacement, fdo#88051 layout problem
+if (numchars  numchars2  (rArgs.mpStr[mnSegCharOffset + numchars2] 
== '\t' ||
+xCharClass-getType(rArgs.mpStr + mnSegCharOffset, numchars2 + 1) 
== ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER))
+{
 numchars = numchars2;
+}
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-13 Thread Andras Timar

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

New commits:
commit aac0c2931c7ec431e959c5fdcd1c8e7715ade8f3
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Mar 13 09:19:59 2015 +0100

Bump version to 4.2-27

Change-Id: I33f0bc2acc8f94bbebb0e32bca49bbbf65072f6f

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - include/oox oox/source sc/source

2015-03-13 Thread Markus Mohrhard

 include/oox/core/xmlfilterbase.hxx|3 +
 include/oox/drawingml/chart/chartspacemodel.hxx   |2 -
 oox/source/core/xmlfilterbase.cxx |   42 --
 oox/source/drawingml/chart/chartspacefragment.cxx |7 +++
 oox/source/drawingml/chart/chartspacemodel.cxx|4 +-
 oox/source/drawingml/shape.cxx|3 +
 sc/source/filter/oox/excelfilter.cxx  |   23 
 7 files changed, 70 insertions(+), 14 deletions(-)

New commits:
commit e4c6dcef807d24be29975d8fa1ad0ca435e914c5
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Feb 23 02:19:32 2015 +0100

import the document properties before the document

That allows us to potentially change the import depending on the
producer of the document.

This becomes necessary to handle MSO 2007 chart drawingml streams
correctly.

(cherry picked from commit a2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072)

Conflicts:
sc/source/filter/oox/excelfilter.cxx

Change-Id: I9be8b019fae69cd206203591982a89648965692f

diff --git a/sc/source/filter/oox/excelfilter.cxx 
b/sc/source/filter/oox/excelfilter.cxx
index 6c2d6bd..8495767 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -105,11 +105,7 @@ bool ExcelFilter::importDocument() throw()
 if( aWorkbookPath.isEmpty() )
 return false;
 
-/*  Construct the WorkbookGlobals object referred to by every instance of
-the class WorkbookHelper, and execute the import filter by constructing
-an instance of WorkbookFragment and loading the file. */
-WorkbookGlobalsRef xBookGlob = WorkbookHelper::constructGlobals( *this );
-if ( xBookGlob.get()  importFragment( new WorkbookFragment( *xBookGlob, 
aWorkbookPath ) ) )
+try
 {
 try
 {
@@ -119,8 +115,23 @@ bool ExcelFilter::importDocument() throw()
 {
 SAL_WARN(sc, exception when importing document properties   
e.Message);
 }
-return true;
+catch( ... )
+{
+SAL_WARN(sc, exception when importing document properties);
+}
+/*  Construct the WorkbookGlobals object referred to by every instance 
of
+the class WorkbookHelper, and execute the import filter by 
constructing
+an instance of WorkbookFragment and loading the file. */
+WorkbookGlobalsRef xBookGlob(WorkbookHelper::constructGlobals(*this));
+if (xBookGlob.get()  importFragment(new WorkbookFragment(*xBookGlob, 
aWorkbookPath)))
+{
+return true;
+}
+}
+catch (...)
+{
 }
+
 return false;
 }
 
commit 648d3022bd77e66fdf3fe42132b6dc207c5a2804
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Mar 10 00:34:07 2015 +0100

detect MSO 2007 OOXML documents

(cherry picked from commit 15174177091367332b57cd79575e2f7dd27388b2)

Conflicts:
oox/source/core/xmlfilterbase.cxx

Change-Id: I4052c6f1e5dde71ce4cede1ec9a313f461861d71

diff --git a/include/oox/core/xmlfilterbase.hxx 
b/include/oox/core/xmlfilterbase.hxx
index 351910d..da0a400 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -237,6 +237,8 @@ public:
 
 FastParser* createParser() const;
 
+bool isMSO2007Document() const;
+
 protected:
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::io::XInputStream 
 implGetInputStream( utl::MediaDescriptor rMediaDesc ) const;
@@ -256,6 +258,7 @@ private:
 ::std::auto_ptr XmlFilterBaseImpl  mxImpl;
 sal_Int32 mnRelId;
 sal_Int32 mnMaxDocId;
+bool mbMSO2007;
 };
 
 typedef ::rtl::Reference XmlFilterBase  XmlFilterRef;
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 1608aed..70d01d5 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -20,6 +20,7 @@
 #include oox/core/xmlfilterbase.hxx
 
 #include cstdio
+#include com/sun/star/beans/XPropertyAccess.hpp
 #include com/sun/star/container/XNameContainer.hpp
 #include com/sun/star/embed/XRelationshipAccess.hpp
 #include com/sun/star/xml/sax/InputSource.hpp
@@ -188,7 +189,8 @@ XmlFilterBase::XmlFilterBase( const Reference 
XComponentContext  rxContext )
 FilterBase( rxContext ),
 mxImpl( new XmlFilterBaseImpl( rxContext ) ),
 mnRelId( 1 ),
-mnMaxDocId( 0 )
+mnMaxDocId( 0 ),
+mbMSO2007(false)
 {
 }
 
@@ -204,6 +206,35 @@ XmlFilterBase::~XmlFilterBase()
 mxImpl-maFastParser.setDocumentHandler( 0 );
 }
 
+namespace {
+
+bool is2007MSODocument(ReferenceXDocumentProperties xDocProps)
+{
+if (!xDocProps-getGenerator().startsWithIgnoreAsciiCase(Microsoft))
+return false;
+
+uno::Referencebeans::XPropertyAccess 
xUserDefProps(xDocProps-getUserDefinedProperties(), uno::UNO_QUERY);
+if (!xUserDefProps.is())
+return false;
+
+

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

2015-03-05 Thread Henry Castro

 sc/source/ui/view/output2.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 79e9e78f9e9b0747d8e9c19cf4dd87df78773bcf
Author: Henry Castro hcvcas...@gmail.com
Date:   Mon Mar 2 21:39:53 2015 -0400

Resolves tdf#84012 FORMATTING: Partially missing text in shrink-to-fit cells

Change-Id: I32f44acbcf5a6aed4d9f7442ad7212af31073352
Reviewed-on: https://gerrit.libreoffice.org/14723
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit 4acffa65b58c8bd359215345dca2c61e2c5ceba5)

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index d14c901..740bfb5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1777,7 +1777,11 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 // If even at half the size the font still 
isn't rendered smaller,
 // fall back to normal clipping (showing ### 
for numbers).
 if ( nNewSize = nAvailable )
+{
+// Reset relevant parameters.
 aAreaParam.mbLeftClip = 
aAreaParam.mbRightClip = false;
+aAreaParam.mnLeftClipLength = 
aAreaParam.mnRightClipLength = 0;
+}
 
 pOldPattern = NULL;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-19 Thread Andras Timar

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

New commits:
commit 0eed9d22dfc7ff8fa3d822ffd12b2615eab1a513
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Feb 19 03:40:19 2015 -0800

Bump version to 4.2-26

Change-Id: I457bece6409f89f3668e53c9862cd7caf54807a7

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 8 commits - chart2/qa include/oox oox/README oox/source

2015-02-19 Thread Andras Timar

 chart2/qa/extras/chart2import.cxx   |   20 ++
 chart2/qa/extras/data/xlsx/chart-area-style-background.xlsx |binary
 include/oox/helper/graphichelper.hxx|2 
 oox/README  |9 ++
 oox/source/drawingml/chart/chartspaceconverter.cxx  |5 -
 oox/source/drawingml/chart/chartspacefragment.cxx   |3 
 oox/source/drawingml/chart/chartspacemodel.cxx  |2 
 oox/source/drawingml/chart/objectformatter.cxx  |   37 
 oox/source/helper/graphichelper.cxx |4 -
 oox/source/ppt/pptimport.cxx|6 -
 10 files changed, 62 insertions(+), 26 deletions(-)

New commits:
commit 225054ca85e0a853baaa4213f19971fb3417de29
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Feb 19 11:55:01 2015 +0100

fix chart2 unit test backport

Change-Id: I40a3816b0a942ca9dcdb84c0fe96b21c71496c9f

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 07b3dc0..2a684ed 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -18,6 +18,7 @@
 #include com/sun/star/chart/XChartData.hpp
 #include com/sun/star/chart2/XInternalDataProvider.hpp
 #include com/sun/star/chart/XChartDataArray.hpp
+#include com/sun/star/drawing/FillStyle.hpp
 
 class Chart2ImportTest : public ChartTest
 {
commit bf7ff8f265a8a832e9872f60e8399f7e6d173d00
Author: Muthu Subramanian muthu.subramanian.karunani...@ericsson.com
Date:   Fri Oct 10 18:59:46 2014 +0530

fdo#54361: Chart background in XLSX is transparent instead of white.

(cherry picked from commit aad90e18cd00ac8af6bcddf14e4e19c9475dedbf)

Conflicts:
oox/source/drawingml/chart/objectformatter.cxx

Change-Id: I116e7e8c9046009cfcadc04b5367a6fe25f88d96

diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index 22b9931..d6cd258 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -630,7 +630,8 @@ class FillFormatter : public DetailFormatterBase
 public:
 explicitFillFormatter(
 ObjectFormatterData rData,
-const AutoFormatEntry* pAutoFormatEntry );
+const AutoFormatEntry* pAutoFormatEntry,
+const ObjectType eObjType );
 
 /** Converts area formatting to the passed property set. */
 voidconvertFormatting(
@@ -691,7 +692,8 @@ public:
 explicitObjectTypeFormatter(
 ObjectFormatterData rData,
 const ObjectTypeFormatEntry rEntry,
-const ChartSpaceModel rChartSpace );
+const ChartSpaceModel rChartSpace,
+const ObjectType eObjType );
 
 /** Sets frame formatting properties to the passed property set. */
 voidconvertFrameFormatting(
@@ -873,15 +875,14 @@ void LineFormatter::convertFormatting( ShapePropertyMap 
rPropMap, const ModelRe
 aLineProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), 
getPhColor( nSeriesIdx ) );
 }
 
-// 
-
-FillFormatter::FillFormatter( ObjectFormatterData rData, const 
AutoFormatEntry* pAutoFormatEntry ) :
+FillFormatter::FillFormatter( ObjectFormatterData rData, const 
AutoFormatEntry* pAutoFormatEntry, const ObjectType eObjType ) :
 DetailFormatterBase( rData, pAutoFormatEntry )
 {
 if( pAutoFormatEntry )
 {
 mxAutoFill.reset( new FillProperties );
-mxAutoFill-moFillType = XML_noFill;
+if( eObjType != OBJECTTYPE_CHARTSPACE )
+mxAutoFill-moFillType = XML_noFill;
 if( const Theme* pTheme = mrData.mrFilter.getCurrentTheme() )
 if( const FillProperties* pFillProps = pTheme-getFillStyle( 
pAutoFormatEntry-mnThemedIdx ) )
 *mxAutoFill = *pFillProps;
@@ -967,11 +968,9 @@ void TextFormatter::convertFormatting( PropertySet 
rPropSet, const ModelRef Te
 convertFormatting( rPropSet, lclGetTextProperties( rxTextProp ) );
 }
 
-// 
-
-ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData rData, const 
ObjectTypeFormatEntry rEntry, const ChartSpaceModel rChartSpace ) :
+ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData rData, const 
ObjectTypeFormatEntry rEntry, const ChartSpaceModel rChartSpace, const 
ObjectType eObjType ) :
 maLineFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoLines,   
rChartSpace.mnStyle ) ),
-maFillFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoFills,   
rChartSpace.mnStyle ) ),
+maFillFormatter(   rData,

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - chart2/qa oox/source

2015-02-19 Thread Markus Mohrhard

 chart2/qa/extras/chart2import.cxx   |   19 ++
 chart2/qa/extras/charttest.hxx  |   21 
 chart2/qa/extras/data/xlsx/axis-label-rotation.xlsx |binary
 oox/source/drawingml/chart/objectformatter.cxx  |2 -
 4 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 4f0721028edc311a99a5593fbdc658c31fea9c1a
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Feb 19 01:03:48 2015 +0100

add test for tdf#89454

(cherry picked from commit b13534de022972131b46f93f5ada90af155eec9e)

Conflicts:
chart2/qa/extras/chart2import.cxx

Change-Id: Iefb52f6fa77cf90955dbb47c1b9ca7ab699a43eb

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 2a684ed..f0ab606 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -36,6 +36,7 @@ public:
 void testPPTChartSeries();
 void testODPChartSeries();
 void testChartAreaStyleBackgroundXLSX();
+void testAxisTextRotationXLSX();
 void testNumberFormatsXLSX();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
@@ -58,6 +59,7 @@ public:
 //CPPUNIT_TEST(testPPTXChartSeries);
 //CPPUNIT_TEST(testODPChartSeries);
 CPPUNIT_TEST(testChartAreaStyleBackgroundXLSX);
+CPPUNIT_TEST(testAxisTextRotationXLSX);
 CPPUNIT_TEST(testNumberFormatsXLSX);
 CPPUNIT_TEST_SUITE_END();
 
@@ -317,6 +319,23 @@ void Chart2ImportTest::testChartAreaStyleBackgroundXLSX()
 sal_Int32(0), nColor);
 }
 
+void Chart2ImportTest::testAxisTextRotationXLSX()
+{
+load(/chart2/qa/extras/data/xlsx/, axis-label-rotation.xlsx);
+uno::Referencechart2::XChartDocument xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+CPPUNIT_ASSERT_MESSAGE(failed to load chart, xChartDoc.is());
+
+Referencechart2::XAxis xYAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
+CPPUNIT_ASSERT(xYAxis.is());
+
+Referencebeans::XPropertySet xPS(xYAxis, uno::UNO_QUERY_THROW);
+double nRotation = 0;
+bool bSuccess = xPS-getPropertyValue(TextRotation) = nRotation;
+
+CPPUNIT_ASSERT(bSuccess);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(90, nRotation, 1e-10);
+}
+
 
 void Chart2ImportTest::testNumberFormatsXLSX()
 {
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 216c915..05575a1 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -158,6 +158,27 @@ Reference chart2::XChartType  getChartTypeFromDoc( 
Reference chart2::XChartDo
 return xChartTypeSequence[nChartType];
 }
 
+Referencechart2::XAxis getAxisFromDoc(
+const Referencechart2::XChartDocument xChartDoc, sal_Int32 nCooSys, 
sal_Int32 nAxisDim, sal_Int32 nAxisIndex )
+{
+Referencechart2::XDiagram xDiagram = xChartDoc-getFirstDiagram();
+CPPUNIT_ASSERT(xDiagram.is());
+
+Referencechart2::XCoordinateSystemContainer xCooSysContainer(xDiagram, 
UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xCooSysContainer.is());
+
+SequenceReferencechart2::XCoordinateSystem  xCooSysSequence = 
xCooSysContainer-getCoordinateSystems();
+CPPUNIT_ASSERT(xCooSysSequence.getLength()  nCooSys);
+
+Referencechart2::XCoordinateSystem xCoord = xCooSysSequence[nCooSys];
+CPPUNIT_ASSERT(xCoord.is());
+
+Referencechart2::XAxis xAxis = xCoord-getAxisByDimension(nAxisDim, 
nAxisIndex);
+CPPUNIT_ASSERT(xAxis.is());
+
+return xAxis;
+}
+
 Reference chart2::XDataSeries  getDataSeriesFromDoc( uno::Reference 
chart2::XChartDocument  xChartDoc,
 sal_Int32 
nDataSeries, sal_Int32 nChartType = 0, sal_Int32 nCooSys = 0 )
 {
diff --git a/chart2/qa/extras/data/xlsx/axis-label-rotation.xlsx 
b/chart2/qa/extras/data/xlsx/axis-label-rotation.xlsx
new file mode 100644
index 000..cc3b1df
Binary files /dev/null and 
b/chart2/qa/extras/data/xlsx/axis-label-rotation.xlsx differ
commit 381819692937defbd565f351ad9100ed38d1fc57
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Feb 19 00:36:49 2015 +0100

this should be [-90, 90] and not (-90, 90), tdf#89454

Change-Id: I943be2cf660d2dc77eebd776208af96c0b5f67a4
(cherry picked from commit 0d1bd8c4f12d4e60d1f33f7df0a201d2affb7767)

diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index d6cd258..ac5b875 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1110,7 +1110,7 @@ void ObjectFormatter::convertTextRotation( PropertySet 
rPropSet, const ModelRef
 OOXML counts clockwise, Chart2 counts counterclockwise. */
 double fAngle = static_cast double ( bStacked ? 0 : 
rxTextProp-getTextProperties().moRotation.get( 0 ) );
 // MS Office UI allows values only in range of [-90,90].
-if ( fAngle = -540.0 || fAngle = 540.0 )
+if ( fAngle  -540.0 || fAngle  540.0 )

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

2015-02-16 Thread Andras Timar

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

New commits:
commit 7edd532c989a71744b277752c9bef0b5872024be
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Feb 16 14:21:56 2015 -0800

Bump version to 4.2-25

Change-Id: I5061b96787324fa5c2a718650b8dee4da3b447e3

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/CppunitTest_sw_uiwriter.mk sw/qa sw/source

2015-02-16 Thread Miklos Vajna

 sw/CppunitTest_sw_uiwriter.mk |   30 
 sw/qa/extras/inc/swmodeltestbase.hxx  |   40 +
 sw/qa/extras/uiwriter/data/cp1000115.fodt |  208 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   13 +
 sw/source/core/text/frmform.cxx   |8 +
 5 files changed, 270 insertions(+), 29 deletions(-)

New commits:
commit 6c4ca575866cfda38b3769b8c302b0c94a16c952
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Feb 13 13:47:30 2015 +0100

cp#1000115 SwTxtFrm: don't join follow just because it has no content

The problem was that the bugdoc had a table, and inside the table there
was a long paragraph that flows to the next page, but only the paragraph
mark of it does so. We first split the frame to have space for the
paragraph mark, but later decided that all the content would fit the
first frame, and this way the last hard line break and the paragraph
mark was painted on each other.

This is normally not a problem without tables, because
SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to
non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to
join it, and we're ready. However, when the paragraph is inside a table,
then the paragraph was formatted multiple times, and next time when we
already had a follow nNew was not set, so even if there was a correct
split first, the new frame was joined later.

Fix the problem by explicitly setting nNew for the in a table and
paragraph ends with a hard line break case, that way we don't blindly
join the frame, only in case there is enough space for the follow in the
master.

(cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9)

Conflicts:
sw/CppunitTest_sw_uiwriter.mk
sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a

diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index 7d9bee8..3e57271 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -52,35 +52,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_uiwriter,\
 
 $(eval $(call gb_CppunitTest_use_ure,sw_uiwriter))
 
-$(eval $(call gb_CppunitTest_use_components,sw_uiwriter,\
-basic/util/sb \
-comphelper/util/comphelp \
-configmgr/source/configmgr \
-embeddedobj/util/embobj \
-filter/source/config/cache/filterconfig1 \
-framework/util/fwk \
-i18npool/util/i18npool \
-linguistic/source/lng \
-package/util/package2 \
-package/source/xstor/xstor \
-sw/util/sw \
-sw/util/swd \
-sax/source/expatwrap/expwrap \
-sfx2/util/sfx \
-svl/source/fsstor/fsstorage \
-svtools/util/svt \
-toolkit/util/tk \
-ucb/source/core/ucb1 \
-ucb/source/ucp/file/ucpfile1 \
-unotools/util/utl \
-unoxml/source/service/unoxml \
-uui/util/uui \
-$(if $(filter-out MACOSX WNT,$(OS)), \
-vcl/vcl.unx \
-) \
-$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
-xmloff/util/xo \
-))
+$(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter))
 
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index f59d14e..03aa054 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -34,6 +34,9 @@
 
 #include libxml/xmlwriter.h
 #include libxml/xpath.h
+#include libxml/tree.h
+#include libxml/xpathInternals.h
+#include libxml/parserInternals.h
 
 using namespace com::sun::star;
 
@@ -267,6 +270,15 @@ protected:
 return xAutoStyleFamily;
 }
 
+/// Similar to parseExport(), but this gives the xmlDocPtr of the layout 
dump.
+xmlDocPtr parseLayoutDump()
+{
+if (!mpXmlBuffer)
+dumpLayout();
+
+return xmlParseMemory((const char*)xmlBufferContent(mpXmlBuffer), 
xmlBufferLength(mpXmlBuffer));;
+}
+
 /**
  * Extract a value from the layout dump using an XPath expression and an 
attribute name.
  *
@@ -295,6 +307,34 @@ protected:
 return aRet;
 }
 
+void registerNamespaces(xmlXPathContextPtr pXmlXpathCtx)
+{
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(w), 
BAD_CAST(http://schemas.openxmlformats.org/wordprocessingml/2006/main;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(v), 
BAD_CAST(urn:schemas-microsoft-com:vml));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(mc), 
BAD_CAST(http://schemas.openxmlformats.org/markup-compatibility/2006;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(wps), 
BAD_CAST(http://schemas.microsoft.com/office/word/2010/wordprocessingShape;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(wpg), 
BAD_CAST(http://schemas.microsoft.com/office/word/2010/wordprocessingGroup;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(wp),

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

2015-02-13 Thread Ursache Vladimir

 sc/source/filter/oox/sheetdatabuffer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a97d670050722c5977bee9f96991e0df314468b
Author: Ursache Vladimir ursa...@collabora.co.uk
Date:   Tue Feb 10 22:55:42 2015 +0200

tdf#68117 Partially fix boolean labels in XLSX

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

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 11c9c7f..f836357 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -204,7 +204,7 @@ void SheetDataBuffer::setBooleanCell( const CellModel 
rModel, bool bValue )
 rModel.maCellAddr, bValue ? OUString(TRUE()) : OUString(FALSE()));
 
 // #108770# set 'Standard' number format for all Boolean cells
-setCellFormat( rModel, 0 );
+setCellFormat( rModel );
 }
 
 void SheetDataBuffer::setErrorCell( const CellModel rModel, const OUString 
rErrorCode )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-10 Thread Andras Timar

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

New commits:
commit e91d901189f8265b82d40b5053c0553174a534d4
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Feb 10 00:19:57 2015 -0800

Bump version to 4.2-24

Change-Id: I1acff9fe3e907b303851984674da33dff5ed0e08

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

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

2015-02-03 Thread Caolán McNamara

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

New commits:
commit 48cdb25686e0db390c910622d729590a19213a5d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jan 23 16:45:51 2015 +

Resolves: fdo#75565 reduce block on pasting rtf like we do for html

Change-Id: I74a9748a2e4981dc5d1677f06db7eceed9e4b108
(cherry picked from commit 0efbd9931ea854cf71c4c54ca3f3d55d6db1fa13)
Reviewed-on: https://gerrit.libreoffice.org/14144
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
(cherry picked from commit a0ef7698b7df63b8befe274305051063425f8eb6)

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index ba1aec8..0b4dace 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -295,8 +295,9 @@ sal_Bool ScTransferObj::GetData( const 
datatransfer::DataFlavor rFlavor, const
 
 bool bIncludeFiltered = pDoc-IsCutMode() || bUsedForLink;
 
+bool bReduceBlockFormat = nFormat == SOT_FORMATSTR_ID_HTML || 
nFormat == SOT_FORMAT_RTF;
 ScRange aReducedBlock = aBlock;
-if ( nFormat == SOT_FORMATSTR_ID_HTML  (aBlock.aEnd.Col() == 
MAXCOL || aBlock.aEnd.Row() == MAXROW)  aBlock.aStart.Tab() == 
aBlock.aEnd.Tab() )
+if (bReduceBlockFormat  (aBlock.aEnd.Col() == MAXCOL || 
aBlock.aEnd.Row() == MAXROW)  aBlock.aStart.Tab() == aBlock.aEnd.Tab())
 {
 bool bShrunk = false;
 //shrink the area to allow pasting to external applications
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-03 Thread Caolán McNamara

 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx  |5 +++--
 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx  |   10 ++
 sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx |   10 ++
 3 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit b195fc7549dd17fb659795ea9e916af99f9909b5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 2 21:04:28 2015 +

Related: fdo#88455 crash using delete in available fields

Change-Id: I4ac5fe6f42b425ee96124b2dde39ff397a081638
(cherry picked from commit 1746c886362b8525b04365dd6b7203b8098b99ba)
Reviewed-on: https://gerrit.libreoffice.org/14290
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index 2d53653..a2c78e9 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -253,12 +253,14 @@ void ScPivotLayoutTreeListData::KeyInput(const KeyEvent 
rKeyEvent)
 KeyCode aCode = rKeyEvent.GetKeyCode();
 sal_uInt16 nCode = aCode.GetCode();
 
-switch (nCode)
+if (nCode == KEY_DELETE)
 {
-case KEY_DELETE:
-GetModel()-Remove(GetCurEntry());
-return;
+const SvTreeListEntry* pEntry = GetCurEntry();
+if (pEntry)
+GetModel()-Remove(pEntry);
+return;
 }
+
 SvTreeListBox::KeyInput(rKeyEvent);
 }
 
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
index 6617b0b..013ce2c 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
@@ -78,12 +78,14 @@ void ScPivotLayoutTreeListLabel::KeyInput(const KeyEvent 
rKeyEvent)
 KeyCode aCode = rKeyEvent.GetKeyCode();
 sal_uInt16 nCode = aCode.GetCode();
 
-switch (nCode)
+if (nCode == KEY_DELETE)
 {
-case KEY_DELETE:
-GetModel()-Remove(GetCurEntry());
-return;
+const SvTreeListEntry* pEntry = GetCurEntry();
+if (pEntry)
+GetModel()-Remove(pEntry);
+return;
 }
+
 SvTreeListBox::KeyInput(rKeyEvent);
 }
 
commit 86ea9493fda77e6aa5e6ebd666b2d8306057d6cc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sat Jan 24 20:59:27 2015 +

Resolves: rhbz#1179642 crash in GetFocus with empty 
mpPreviouslyFocusedListBox

Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
(cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29)
Reviewed-on: https://gerrit.libreoffice.org/14161
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index f4201dc..9dd08ce 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -122,9 +122,10 @@ void ScPivotLayoutTreeListBase::GetFocus()
 if( GetGetFocusFlags()  GETFOCUS_MNEMONIC )
 {
 SvTreeListEntry* pEntry = 
mpParent-mpPreviouslyFocusedListBox-GetCurEntry();
-InsertEntryForSourceTarget(pEntry, NULL);
+if (pEntry)
+InsertEntryForSourceTarget(pEntry, NULL);
 
-if(mpParent-mpPreviouslyFocusedListBox != NULL)
+if (mpParent-mpPreviouslyFocusedListBox != NULL)
 mpParent-mpPreviouslyFocusedListBox-GrabFocus();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-03 Thread Maxime de Roucy

 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   18 +
 1 file changed, 18 insertions(+)

New commits:
commit 1c5b55c92d3ea9ad43534f6020ba627e95178e28
Author: Maxime de Roucy mdero...@linagora.com
Date:   Mon Dec 22 13:57:55 2014 +0100

fdo#67534 Fix Property Handler shared lock

As explained in the following link, access mode should be set to
EnableShareDenyNone to avoid blocking others process to access the
file opened by the Property Handler.

http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx

Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

Conflicts:
scp2/source/winexplorerext/registryitem_winexplorerext.scp

Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp 
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index a8eda1d..ccd1dba 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -339,6 +339,15 @@ RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
 Value = %PRODUCTNAME Property Handler;
 End
 
+RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext;
+ComponentCondition = VersionNT = 600;
+Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431};
+Name = EnableShareDenyNone;
+Value = #1;
+End
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -347,6 +356,15 @@ RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
 Value = %PRODUCTNAME Property Handler;
 End
 
+RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext_x64;
+ComponentCondition = VersionNT = 600;
+Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431};
+Name = EnableShareDenyNone;
+Value = #1;
+End
+
 RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Optional_Winexplorerext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-31 Thread Tomofumi Yagi

 unotools/source/misc/fontdefs.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e4e936d9bffbe7f890809b722a74cd7f95106a8
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Jan 29 20:12:47 2015 +0900

fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.

GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex.HGS Gothic M).
Because, the conversion table aImplLocalizedNamesList[] is wrong.


http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181

This causes the assertion from 
vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.

This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.

Change-Id: I31417956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14262
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index cdb8bd6..a5fd5ff 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   mdeasop,  aMDEasop },
 {   hggothice,aHGGothicE },
 {   hgpgothice,   aHGPGothicE },
-{   hgpothice,aHGSGothicE },
+{   hgsgothice,   aHGSGothicE },
 {   hggothicm,aHGGothicM },
 {   hgpgothicm,   aHGPGothicM },
-{   hgpgothicm,   aHGSGothicM },
+{   hgsgothicm,   aHGSGothicM },
 {   hggyoshotai,  aHGGyoshotai },
 {   hgpgyoshotai, aHGPGyoshotai },
 {   hgsgyoshotai, aHGSGyoshotai },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-27 Thread Andras Timar

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

New commits:
commit faf1498e0e2d1ab60eb7d88bced8cebe49584d28
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Jan 27 11:04:50 2015 -0800

Bump version to 4.2-23

Change-Id: Ica66c89fe86c18c436290a03849aa5ebfb4e8bc3

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

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

2015-01-27 Thread Caolán McNamara

 sw/source/filter/html/wrthtml.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f609239187e73059b63f9f5121b8ff5448311f62
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Jan 25 14:12:22 2015 +

coverity#1266508 Useless call (gold)

regression from

commit 832e5aadbff006ec24959162c29756fe2b1982be
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Oct 8 10:06:59 2013 +0100
Related: fdo#38838 remove UniString::SearchAndReplaceAll

(cherry picked from commit 6cde3ff3dd646f51f37f2342863371db8de9087a)

Conflicts:
sw/source/filter/html/wrthtml.cxx

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

diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 796dbe0..4d28937 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1068,8 +1068,7 @@ void SwHTMLWriter::OutImplicitMark( const OUString rMark,
 {
 if( !rMark.isEmpty()  !aImplicitMarks.empty() )
 {
-OUString sMark( rMark );
-sMark + OUString(cMarkSeparator) + 
OUString::createFromAscii(pMarkType);
+OUString sMark(rMark + OUString(cMarkSeparator) + 
OUString::createFromAscii(pMarkType));
 if( 0 != aImplicitMarks.erase( sMark ) )
 {
 OutAnchor(sMark.replace('?', '_')); // '?' causes problems in 
IE/Netscape 5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-27 Thread László Németh

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

New commits:
commit e3e3a8e3f13d79814f6b0e8b6e4efc14b65971c9
Author: LÃ¡szlÃ³ NÃ©meth laszlo.nem...@collabora.com
Date:   Tue Jan 27 10:15:05 2015 +0100

tdf#88051 fix Graphite layout at Linux Libertine G ligature followed by tab

Change-Id: Iecedb87f6329c1cddcaa4cd939b349924e58d256

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 230583b..50e2a2d 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -600,7 +600,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 if ( !xCharClass.is() )
 xCharClass = vcl::unohelper::CreateCharacterClassification();
 size_t numchars2 = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, 
fdo#68313, fdo#70666 avoid bad ligature replacement
-if (numchars  numchars2  xCharClass-getType(rArgs.mpStr, numchars2 
+ 1) == ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER)
+if (numchars  numchars2  (rArgs.mpStr[numchars2] == '\t' || 
xCharClass-getType(rArgs.mpStr, numchars2 + 1) == 
::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER))
 numchars = numchars2;
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 5 commits - sc/source starmath/source sw/qa sw/source

2015-01-27 Thread Caolán McNamara

 sc/source/ui/cctrl/checklistmenu.cxx  |3 
 sc/source/ui/dbgui/tpsort.cxx |2 
 starmath/source/node.cxx  |2 
 sw/qa/core/data/html/pass/fdo87601-1.html |  100 ++
 sw/source/filter/html/swhtml.cxx  |2 
 sw/source/filter/xml/xmltexti.cxx |   18 +++--
 6 files changed, 116 insertions(+), 11 deletions(-)

New commits:
commit 27aee569d57815acf564b6e47e55caefbb164f8c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jan 20 16:17:07 2015 +

Resolves: fdo#84943 make fodt non crashy like odt for formulas inside shapes

where odt checks for a null pTxtCrsr and skips the object and fodt
just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942)

(cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3)

Conflicts:
sw/source/filter/xml/xmltexti.cxx

Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f
Reviewed-on: https://gerrit.libreoffice.org/14058
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index fb968ac..8ae40ff 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -235,7 +235,7 @@ uno::Reference XPropertySet  
SwXMLTextImportHelper::createAndInsertOLEObject(
 OSL_ENSURE( xCrsrTunnel.is(), missing XUnoTunnel for Cursor );
 OTextCursorHelper *pTxtCrsr = reinterpret_cast OTextCursorHelper * (
 sal::static_int_cast sal_IntPtr ( xCrsrTunnel-getSomething( 
OTextCursorHelper::getUnoTunnelId() )));
-OSL_ENSURE( pTxtCrsr, SwXTextCursor missing );
+SAL_WARN_IF(!pTxtCrsr, sw.uno, SwXTextCursor missing);
 SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
 
 SfxItemSet aItemSet( pDoc-GetAttrPool(), RES_FRMATR_BEGIN,
@@ -289,12 +289,16 @@ uno::Reference XPropertySet  
SwXMLTextImportHelper::createAndInsertOLEObject(
 lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, 
MAP_TWIP );
 }
 
-pFrmFmt = pDoc-Insert( *pTxtCrsr-GetPaM(),
-::svt::EmbeddedObjectRef( xObj, 
embed::Aspects::MSOLE_CONTENT ),
-aItemSet,
-NULL,
-NULL );
-pOLENd = lcl_GetOLENode( pFrmFmt );
+if( pTxtCrsr )
+{
+pFrmFmt = pDoc-Insert( *pTxtCrsr-GetPaM(),
+::svt::EmbeddedObjectRef( xObj, 
embed::Aspects::MSOLE_CONTENT ),
+aItemSet,
+NULL,
+NULL );
+pOLENd = lcl_GetOLENode( pFrmFmt );
+}
+
 if( pOLENd )
 aObjName = pOLENd-GetOLEObj().GetCurrentPersistName();
 }
commit c9054070ffc9223d05c3f4903179e3e3fd409b17
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 21 15:25:03 2015 +

Resolves: fdo#87601 specific html doc hangs on load

Change-Id: I67f472d72efe123b533d4d94be0084986c0e8349
(cherry picked from commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3)
Reviewed-on: https://gerrit.libreoffice.org/14081
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/sw/qa/core/data/html/pass/fdo87601-1.html 
b/sw/qa/core/data/html/pass/fdo87601-1.html
new file mode 100644
index 000..b33f11c
--- /dev/null
+++ b/sw/qa/core/data/html/pass/fdo87601-1.html
@@ -0,0 +1,100 @@
+
+   html xmlns:v=urn:schemas-microsoft-com:vml
+   xmlns:o=urn:schemas-microsoft-com:office:office
+   xmlns:w=urn:schemas-microsoft-com:office:word
+   
xmlns:m=http://schemas.microsoft.com/office/2006/01/omml;
+   xmlns=http://www.w3.org/TR/REC-html40;
+   head
+   meta http-equiv=Content-Type content=text/html; 
charset=utf-8
+   style
+   v\:* {behavior:url(#default#VML);}
+   o\:* {behavior:url(#default#VML);}
+   w\:* {behavior:url(#default#VML);}
+   .shape {behavior:url(#default#VML);}
+   /style
+   style
+   @page
+   {
+   mso-page-orientation: portrait;
+   size:21cm 29.7cm;margin:1cm 1cm 1cm 
1cm;
+   }
+   @page Section1 {
+   mso-header-margin:.5in;
+

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

2015-01-12 Thread Caolán McNamara

 filter/source/msfilter/mstoolbar.cxx |2 -
 include/vcl/dibtools.hxx |3 +-
 vcl/source/gdi/dibtools.cxx  |   39 ---
 3 files changed, 35 insertions(+), 9 deletions(-)

New commits:
commit 7440dd32b7327198e49d3922379780ba5399ab1a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 12 13:27:21 2015 +

Resolves: fdo#87015 image missing from doc

regression from

commit e0cce521f1ad0cc384d30ce2f1077ea229fffe62
Author: Armin Le Grand a...@apache.org
AuthorDate: Thu Jan 10 16:28:40 2013 +
Commit: CaolÃ¡n McNamara caol...@redhat.com
CommitDate: Thu Jun 13 14:50:46 2013 +0100
Resolves: #i121504# Support for alpha channel in clipboard for all 
systems
(cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519)

which blindly just bulldozed out the bMSOFormat branch

(cherry picked from commit 470fcca594ba4f6bf473d4d44b415c2ba151b0d9)

Conflicts:
vcl/source/gdi/dibtools.cxx

Change-Id: Iec354f1fb585f0803b9df472bc9ec9e103aa5847

diff --git a/filter/source/msfilter/mstoolbar.cxx 
b/filter/source/msfilter/mstoolbar.cxx
index c4a6c7f..f909e6b 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -713,7 +713,7 @@ bool TBCBitMap::Read( SvStream rS)
 nOffSet = rS.Tell();
 rS  cbDIB;
 // cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10
-return ReadDIB(mBitMap, rS, false);
+return ReadDIB(mBitMap, rS, false, true);
 }
 
 void TBCBitMap::Print( FILE* fp )
diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx
index b880147..113d821 100644
--- a/include/vcl/dibtools.hxx
+++ b/include/vcl/dibtools.hxx
@@ -36,7 +36,8 @@ class Bitmap;
 bool VCL_DLLPUBLIC ReadDIB( // ReadDIB(rBitmap, rIStm, true);
 Bitmap rTarget,
 SvStream rIStm,
-bool bFileHeader);
+bool bFileHeader,
+bool bMSOFormat=false);
 
 bool VCL_DLLPUBLIC ReadDIBBitmapEx(
 BitmapEx rTarget,
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 077f0b0..87c42b9 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -166,7 +166,7 @@ namespace
 
 //
 
-bool ImplReadDIBInfoHeader(SvStream rIStm, DIBV5Header rHeader, bool 
bTopDown)
+bool ImplReadDIBInfoHeader(SvStream rIStm, DIBV5Header rHeader, bool 
bTopDown, bool bMSOFormat)
 {
 // BITMAPINFOHEADER or BITMAPCOREHEADER or BITMAPV5HEADER
 const sal_Size aStartPos(rIStm.Tell());
@@ -182,6 +182,29 @@ bool ImplReadDIBInfoHeader(SvStream rIStm, DIBV5Header 
rHeader, bool bTopDown
 rIStm  rHeader.nPlanes;
 rIStm  rHeader.nBitCount;
 }
+else if ( bMSOFormat  rHeader.nSize == DIBINFOHEADERSIZE )
+{
+sal_Int16 nTmp16(0);
+rIStm  nTmp16;
+rHeader.nWidth = nTmp16;
+rIStm  nTmp16;
+rHeader.nHeight = nTmp16;
+sal_uInt8 nTmp8(0);
+rIStm  nTmp8;
+rHeader.nPlanes = nTmp8;
+rIStm  nTmp8;
+rHeader.nBitCount = nTmp8;
+rIStm  nTmp16;
+rHeader.nSizeImage = nTmp16;
+rIStm  nTmp16;
+rHeader.nCompression = nTmp16;
+if ( !rHeader.nSizeImage ) // uncompressed?
+rHeader.nSizeImage = ((rHeader.nWidth * rHeader.nBitCount + 31)  
~31) / 8 * rHeader.nHeight;
+rIStm  rHeader.nXPelsPerMeter;
+rIStm  rHeader.nYPelsPerMeter;
+rIStm  rHeader.nColsUsed;
+rIStm  rHeader.nColsImportant;
+}
 else
 {
 // BITMAPCOREHEADER, BITMAPV5HEADER or unknown. Read as far as possible
@@ -617,14 +640,14 @@ bool ImplReadDIBBits(SvStream rIStm, DIBV5Header 
rHeader, BitmapWriteAccess r
 return( rIStm.GetError() == 0UL );
 }
 
-bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp, Bitmap* pBmpAlpha, 
sal_uLong nOffset )
+bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp, Bitmap* pBmpAlpha, 
sal_uLong nOffset, bool bMSOFormat = false )
 {
 DIBV5Header aHeader;
 const sal_uLong nStmPos = rIStm.Tell();
 bool bRet(false);
 bool bTopDown(false);
 
-if(ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown)  aHeader.nWidth  
aHeader.nHeight  aHeader.nBitCount)
+if(ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat)  
aHeader.nWidth  aHeader.nHeight  aHeader.nBitCount)
 {
 // In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before
 // this method, nOffset is 0, that's OK.
@@ -1357,7 +1380,8 @@ bool ImplReadDIB(
 Bitmap rTarget, Bitmap*
 pTargetAlpha,
 SvStream rIStm,
-bool bFileHeader)
+bool bFileHeader,
+bool bMSOFormat=false)
 {
 const sal_uInt16 nOldFormat(rIStm.GetNumberFormatInt());
 const sal_uLong nOldPos(rIStm.Tell());
@@ -1375,7 +1399,7 @@ bool ImplReadDIB(
 }
 else
 {
-bRet = ImplReadDIBBody(rIStm, rTarget, 0, nOffset);
+bRet =

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

2015-01-08 Thread Andras Timar

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

New commits:
commit 74fb0cb74bc62b5d652f0fb10f8dc3b4795c6cd3
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Jan 8 14:19:24 2015 -0800

Bump version to 4.2-22

Change-Id: Ib43b42caac84aa0218be5944b2b4f808860da9c0

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

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

2015-01-08 Thread Eike Rathke

 sc/source/filter/inc/unitconverter.hxx   |3 +++
 sc/source/filter/oox/sheetdatabuffer.cxx |   11 +--
 sc/source/filter/oox/unitconverter.cxx   |   14 ++
 3 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 992673fb89b79a1b2abd28173b013ccbc3987364
Author: Eike Rathke er...@redhat.com
Date:   Tue Dec 16 01:37:31 2014 +0100

fdo#79249 call formula compiler with error string

... instead of attempting to stringize a NaN coded error value.

Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb

(cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6)

construct grouped ScFormulaCell with bDirty=true, fdo#79249 related

Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.

(cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993)

correct error string, #N/A instead of #NA

(cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac)

implement an actually working setErrorCell() from BIFF error codes

(cherry picked from commit ca9a81b2ca858b82e863e1e6f917928916fea79e)

3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
15019072b6e812b9ffe29d3ee6afacd9ab526948
67b8fc324779875ba14e2d69204c40fe27cc180e
Reviewed-on: https://gerrit.libreoffice.org/13492
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

Conflicts:
sc/source/filter/oox/sheetdatabuffer.cxx

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b

diff --git a/sc/source/filter/inc/unitconverter.hxx 
b/sc/source/filter/inc/unitconverter.hxx
index 88921d1..dbd6424 100644
--- a/sc/source/filter/inc/unitconverter.hxx
+++ b/sc/source/filter/inc/unitconverter.hxx
@@ -88,6 +88,9 @@ public:
 /** Returns a BIFF error code from the passed error string. */
 sal_uInt8   calcBiffErrorCode( const OUString rErrorCode ) const;
 
+/** Returns an error string from the passed BIFF error code. */
+const OUString calcErrorString( sal_uInt8 nErrorCode ) const;
+
 private:
 /** Adds an error code to the internal maps. */
 voidaddErrorCode( sal_uInt8 nErrorCode, const OUString 
rErrorCode );
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 98cf684..11c9c7f 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -216,16 +216,7 @@ void SheetDataBuffer::setErrorCell( const CellModel 
rModel, const OUString rEr
 
 void SheetDataBuffer::setErrorCell( const CellModel rModel, sal_uInt8 
nErrorCode )
 {
-assert(!stringizing any NaN will only give 'nan');
-/* FIXME: map nErrorCode to error string and call setErrorCell() above. */
-
-OUStringBuffer aBuf;
-aBuf.append('{');
-aBuf.append(BiffHelper::calcDoubleFromError(nErrorCode));
-aBuf.append('}');
-
-getFormulaBuffer().setCellFormula(rModel.maCellAddr, 
aBuf.makeStringAndClear());
-setCellFormat( rModel );
+setErrorCell( rModel, getUnitConverter().calcErrorString( nErrorCode));
 }
 
 void SheetDataBuffer::setDateCell( const CellModel rModel, const OUString 
rDateString )
diff --git a/sc/source/filter/oox/unitconverter.cxx 
b/sc/source/filter/oox/unitconverter.cxx
index 108b248..2eff676 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -226,6 +226,20 @@ sal_uInt8 UnitConverter::calcBiffErrorCode( const 
OUString rErrorCode ) const
 return (aIt == maOoxErrCodes.end()) ? BIFF_ERR_NA : aIt-second;
 }
 
+const OUString UnitConverter::calcErrorString( sal_uInt8 nErrorCode ) const
+{
+OoxErrorCodeMap::const_iterator iFail( maOoxErrCodes.end());
+for (OoxErrorCodeMap::const_iterator aIt( maOoxErrCodes.begin()); aIt != 
maOoxErrCodes.end(); ++aIt)
+{
+if (aIt-second == nErrorCode)
+return aIt-first;
+if (aIt-second == BIFF_ERR_NA)
+iFail = aIt;
+}
+assert(iFail != maOoxErrCodes.end());   // BIFF_ERR_NA really should be in 
the map..
+return iFail-first;
+}
+
 void UnitConverter::addErrorCode( sal_uInt8 nErrorCode, const OUString 
rErrorCode )
 {
 maOoxErrCodes[ rErrorCode ]  = nErrorCode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Michael Stahl

 sw/qa/extras/odfimport/data/fdo79269.odt|binary
 sw/qa/extras/odfimport/data/fdo79269_header.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx|   35 
 sw/source/core/unocore/unostyle.cxx |   35 +---
 4 files changed, 55 insertions(+), 15 deletions(-)

New commits:
commit 6c64dfb95cf4b23627e5d5ead930c089f2ebb50c
Author: Michael Stahl mst...@redhat.com
Date:   Tue Sep 30 17:59:08 2014 +0200

fdo#79269: fix ODF import of style:footer-first

The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.

This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c
because unostyle.cxx is very different on master...

Reviewed-on: https://gerrit.libreoffice.org/11722
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c)

Conflicts:
sw/source/core/unocore/unostyle.cxx

Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13
Reviewed-on: https://gerrit.libreoffice.org/11752
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/qa/extras/odfimport/data/fdo79269.odt 
b/sw/qa/extras/odfimport/data/fdo79269.odt
new file mode 100644
index 000..2e3bf1e
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269.odt differ
diff --git a/sw/qa/extras/odfimport/data/fdo79269_header.odt 
b/sw/qa/extras/odfimport/data/fdo79269_header.odt
new file mode 100644
index 000..6f1a839
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269_header.odt 
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index f1651bd..4fa3600 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -272,6 +272,41 @@ DECLARE_ODFIMPORT_TEST(testFdo60842, fdo60842.odt)
 getCell(xTable, E1, 01/04/2012);
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo79269, fdo79269.odt)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+
+// The problem was that the first-footer was shared.
+uno::Referencebeans::XPropertySet 
xPropSet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xPropSet, FirstIsShared));
+
+uno::Referencetext::XTextRange xFooter1 = getProperty 
uno::Referencetext::XTextRange (xPropSet, FooterTextFirst);
+CPPUNIT_ASSERT_EQUAL(OUString(forst), xFooter1-getString());
+uno::Referencetext::XTextRange xFooter = getProperty 
uno::Referencetext::XTextRange (xPropSet, FooterText);
+CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
+}
+
+DECLARE_ODFIMPORT_TEST(testFdo79269_header, fdo79269_header.odt)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+
+uno::Referencebeans::XPropertySet 
xPropSet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xPropSet, FirstIsShared));
+
+uno::Referencetext::XTextRange xFooter1 = getProperty 
uno::Referencetext::XTextRange (xPropSet, HeaderTextFirst);
+CPPUNIT_ASSERT_EQUAL(OUString(forst), xFooter1-getString());
+uno::Referencetext::XTextRange xFooter = getProperty 
uno::Referencetext::XTextRange (xPropSet, HeaderText);
+CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo56272, fdo56272.odt)
 {
 uno::Referencedrawing::XShape xShape = getShape(1);
diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index d5589ec..97d161c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -467,6 +467,24 @@ SwXStyleFamily::~SwXStyleFamily()
 
 }
 
+static bool lcl_GetHeaderFooterItem(
+SfxItemSet const rSet, OUString const rPropName, bool const bFooter,
+SvxSetItem const* o_rpItem)
+{
+SfxItemState eState = rSet.GetItemState(
+(bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+false, reinterpret_castconst SfxPoolItem**(o_rpItem));
+

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

2015-01-08 Thread David Tardon

 sc/source/core/tool/token.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa2c14d7ad8990afa25603f637c7ef2628b77873
Author: David Tardon dtar...@redhat.com
Date:   Mon Oct 6 20:24:52 2014 +0200

avoid use of ref. to possibly deleted object

Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69
(cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c)
Reviewed-on: https://gerrit.libreoffice.org/11832
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index eb83c8c..ba01d9a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2386,9 +2386,9 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const 
ScDocument* pOldDoc, cons
 sal_uInt16 nFileId;
 GetExternalTableData(pOldDoc, pNewDoc, rRef.Tab(), 
aTabName, nFileId);
 //replace with ScExternalSingleRefToken and adjust 
references
-pCode[j]-DecRef();
 ScExternalSingleRefToken* pToken = new 
ScExternalSingleRefToken(nFileId, aTabName, rRef);
 pToken-IncRef();
+pCode[j]-DecRef(); // ATTENTION: rRef can't be used after 
this point
 pCode[j] = pToken;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - filter/source sc/source vcl/source

2015-01-05 Thread Caolán McNamara

 filter/source/graphicfilter/itiff/itiff.cxx |   11 +--
 sc/source/filter/excel/xistring.cxx |6 +++---
 vcl/source/filter/ixpm/xpmread.cxx  |4 +++-
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 76b878d66dfb464accc4d1ce83b0d1f5c1094abc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 19 09:52:39 2014 +

valgrind: initialize these

Change-Id: I6440832fe508689ffa8e20fa17827528331e3585
(cherry picked from commit 2645b1979365085edf4a94500f2c610bfc4e668b)

diff --git a/sc/source/filter/excel/xistring.cxx 
b/sc/source/filter/excel/xistring.cxx
index 6bb003f..dc903c5 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -120,7 +120,7 @@ void XclImpString::ReadFormats( XclImpStream rStrm, 
XclFormatRunVec rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx  nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm  nChar  nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -129,7 +129,7 @@ void XclImpString::ReadFormats( XclImpStream rStrm, 
XclFormatRunVec rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx  nRunCount; ++nIdx )
 {
-sal_uInt8 nChar, nFontIdx;
+sal_uInt8 nChar(0), nFontIdx(0);
 rStrm  nChar  nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -144,7 +144,7 @@ void XclImpString::ReadObjFormats( XclImpStream rStrm, 
XclFormatRunVec rFormat
 rFormats.reserve( nRunCount );
 for( sal_uInt16 nIdx = 0; nIdx  nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm  nChar  nFontIdx;
 rStrm.Ignore( 4 );
 AppendFormat( rFormats, nChar, nFontIdx );
commit f997c9fb5078d529f61eecb19f6b8ad0fc15314e
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Dec 28 20:16:17 2014 +0100

check size before looking into the string

Found by Asan. e.g moz233272-2.xpm

Change-Id: Ic563db41dbd4ce7250492e99f3e48a203cfdcf00
Reviewed-on: https://gerrit.libreoffice.org/13686
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit ba4b5741db25ff3b76a8d10d8f3745dfc1973749)
(cherry picked from commit cda3b8767fd8f5b43b1043852e9f90fd17a129f4)

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index 3a85978..ff42c2a 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -23,6 +23,7 @@
 #include rgbtable.hxx
 #define _XPMPRIVATE
 #include xpmread.hxx
+#include cstring
 
 // -
 // - XPMReader -
@@ -348,7 +349,8 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest )
 {
 if ( pRGBTable[ i ].name == NULL )
 break;
-if ( pRGBTable[ i ].name[ mnParaSize ] == 0 )
+if ( std::strlen(pRGBTable[i].name)  mnParaSize 
+pRGBTable[ i ].name[ mnParaSize ] == 0 )
 {
 if ( ImplCompare ( (unsigned char*)pRGBTable[ i ].name,
 mpPara, mnParaSize, XPMCASENONSENSITIVE ) )
commit d83cbc12afb9b6b91533d329015981d26adf8918
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 5 10:56:32 2015 +

asan wrt mandriva57054-1.tiff

Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5
(cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729)
Reviewed-on: https://gerrit.libreoffice.org/13739
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index aa80b09..54efd86 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -934,23 +934,22 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 case 8 :
 {
-sal_uInt8 nLast;
 if ( bByteSwap )
 {
 if ( nPredictor == 2 )
 {
-nLast = BYTESWAP( (sal_uInt8)*pt++ );
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx  nImageWidth; nx++ )
 {
+nLast += nx == 0 ? BYTESWAP( (sal_uInt8)*pt++ 
) : *pt++;
 pAcc-SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
 {
 for ( nx = 0; nx  nImageWidth; nx++ )

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

2015-01-05 Thread Caolán McNamara

 sw/source/filter/ascii/parasc.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ba5d09072c4e9c103f6af3c44e689bc6c93e0477
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 5 15:49:47 2015 +

valgrind: uninitialized read

on loading id:000386,src:00,op:havoc,rep:128.jpg as text

Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033
(cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921)
Reviewed-on: https://gerrit.libreoffice.org/13744
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index ddc6855..11c7f2e 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -324,6 +324,7 @@ sal_uLong SwASCIIParser::ReadChars()
 sal_Size nNewLen = lGCount, nCntBytes;
 aWork.reset(new sal_Unicode[nNewLen + 1]); // add 1 for '\0'
 sal_Unicode* pBuf = aWork.get();
+pBuf[nNewLen] = 0; // ensure '\0'
 
 nNewLen = rtl_convertTextToUnicode( hConverter, hContext,
 pArr, lGCount, pBuf, nNewLen,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-04 Thread Markus Mohrhard

 sc/source/filter/inc/sheetdatabuffer.hxx  |   14 +-
 sc/source/filter/inc/worksheethelper.hxx  |2 +-
 sc/source/filter/oox/sheetdatabuffer.cxx  |   19 ++-
 sc/source/filter/oox/sheetdatacontext.cxx |7 ++-
 4 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit 80817430ee98fad2e6ada52a52741ef9992f4a44
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Dec 24 04:11:08 2014 +0100

reimplement shared formula import for xlsb, fdo#86734

(cherry picked from commit e1351ed4c5f9152c80b32bbaa53e3eff56671331)

Change-Id: Ic5d678a2b1197ce8d83b308b0a4387bf657052d5

diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx 
b/sc/source/filter/inc/sheetdatabuffer.hxx
index f84f91c..f8290bf 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -136,6 +136,10 @@ public:
 /** Inserts a ISO 8601 date cell into the sheet. */
 voidsetDateCell( const CellModel rModel, const OUString 
rDateString );
 
+voidcreateSharedFormula(
+const com::sun::star::table::CellAddress rRange,
+const ApiTokenSequence rTokens);
+
 /** Inserts the passed token array as array formula. */
 voidcreateArrayFormula(
 const ::com::sun::star::table::CellRangeAddress 
rRange,
@@ -161,17 +165,17 @@ public:
 /** Final processing after the sheet has been imported. */
 voidfinalizeImport();
 
-private:
-struct XfIdRowRange;
-
 /** Sets the passed formula token array into a cell. */
 voidsetCellFormula(
 const ::com::sun::star::table::CellAddress 
rCellAddr,
 const ApiTokenSequence rTokens );
 
+private:
+struct XfIdRowRange;
+
 /** Creates a formula token array representing the shared formula with the
 passed identifier. */
-ApiTokenSequenceresolveSharedFormula( const BinAddress rMapKey ) 
const;
+ApiTokenSequenceresolveSharedFormula( const css::table::CellAddress 
rMapKey ) const;
 
 /** Inserts the passed array formula into the sheet. */
 voidfinalizeArrayFormula(
@@ -244,7 +248,7 @@ private:
 SharedFormulaMapmaSharedFormulas;   /// Maps shared formula base 
address to defined name token index.
 ::com::sun::star::table::CellAddress
 maSharedFmlaAddr;   /// Address of a cell 
containing a pending shared formula.
-BinAddress  maSharedBaseAddr;   /// Base address of the 
pending shared formula.
+css::table::CellAddress maSharedBaseAddr;   /// Base address of the 
pending shared formula.
 XfIdRowRangemaXfIdRowRange; /// Cached XF identifier for a 
range of rows.
 XfIdRangeListMapmaXfIdRangeLists;   /// Collected XF identifiers 
for cell rangelists.
 MergedRangeList maMergedRanges; /// Merged cell ranges.
diff --git a/sc/source/filter/inc/worksheethelper.hxx 
b/sc/source/filter/inc/worksheethelper.hxx
index a07019a..dbf1990 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -61,7 +61,7 @@ typedef ::std::map OUString, void*   ExtLst;
 // 
 // 
 
-typedef ::std::map BinAddress, sal_Int32  SharedFormulaMap;
+typedef ::std::map BinAddress, ApiTokenSequence  SharedFormulaMap;
 
 /** An enumeration for all types of sheets in a workbook. */
 enum WorksheetType
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 60987c9..98cf684 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -241,6 +241,14 @@ void SheetDataBuffer::setDateCell( const CellModel 
rModel, const OUString rDat
 setValueCell( rModel, fValue );
 }
 
+void SheetDataBuffer::createSharedFormula(const CellAddress rAddr, const 
ApiTokenSequence rTokens)
+{
+BinAddress aAddr(rAddr);
+maSharedFormulas[aAddr] = rTokens;
+if( mbPendingSharedFmla )
+setCellFormula( maSharedFmlaAddr, resolveSharedFormula( 
maSharedBaseAddr ) );
+}
+
 void SheetDataBuffer::setFormulaCell( const CellModel rModel, const 
ApiTokenSequence rTokens )
 {
 mbPendingSharedFmla = false;
@@ -270,11 +278,11 @@ void SheetDataBuffer::setFormulaCell( const CellModel 
rModel, const ApiTokenSeq
 reading the formula definition it will be retried to insert the
 formula via retryPendingSharedFormulaCell(). */
 BinAddress aBaseAddr( aTokenInfo.First );
-aTokens = resolveSharedFormula( aBaseAddr );
+aTokens = resolveSharedFormula( aTokenInfo.First );
 if( !aTokens.hasElements() )
 {

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

2014-12-29 Thread Markus Mohrhard

 sc/source/filter/excel/excform8.cxx |   11 ++-
 sc/source/filter/excel/impop.cxx|   12 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 4fca914f7413dc65d8cb8b1c5206df0ace6ab773
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Dec 30 01:16:53 2014 +0100

relative refs wrap around in xls, fdo#84556

Change-Id: If84d468d4bd55ed55ccd517d0b078d283a1a9c38

diff --git a/sc/source/filter/excel/excform8.cxx 
b/sc/source/filter/excel/excform8.cxx
index d283616..a413037 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -1412,7 +1412,16 @@ void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, 
sal_uInt16 nC, ScSingleRefData
 {
 // C O L
 if( bColRel )
-rSRD.SetRelCol(static_castSCCOL(static_castsal_Int8(nC)));
+{
+SCCOL nRelCol = static_castsal_Int8(nC);
+sal_Int16 nDiff = aEingPos.Col() + nRelCol;
+if ( nDiff  0)
+{
+// relative column references wrap around
+nRelCol = static_castsal_Int16(256 + (int)nRelCol);
+}
+rSRD.SetRelCol(static_castSCCOL(nRelCol));
+}
 else
 rSRD.SetAbsCol(static_castSCCOL(nCol));
 
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 312da25..ddb1058 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -864,17 +864,17 @@ void ImportExcel::Shrfmla( void )
 
 const ScTokenArray* pErgebnis;
 
-pFormConv-Reset();
-pFormConv-Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula );
-
-OSL_ENSURE( pErgebnis, +ImportExcel::Shrfmla(): ScTokenArray is NULL! );
-
 // The shared range in this record is erroneous more than half the time.
-// Don't ever rely on it.
+// Don't ever rely on it. Use the one from the formula cell above.
 SCCOL nCol1 = mpLastFormula-mnCol;
 SCROW nRow1 = mpLastFormula-mnRow;
 
 ScAddress aPos(nCol1, nRow1, GetCurrScTab());
+pFormConv-Reset(aPos);
+pFormConv-Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula );
+
+OSL_ENSURE( pErgebnis, +ImportExcel::Shrfmla(): ScTokenArray is NULL! );
+
 pExcRoot-pShrfmlaBuff-Store(aPos, *pErgebnis);
 
 // Create formula cell for the last formula record.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-29 Thread Markus Mohrhard

 sc/source/filter/excel/xeformula.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 81fd0162d69f2753e669093b9bb0cd6e7693743b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Dec 30 06:16:45 2014 +0100

use the correct tab for sheet local names, fdo#81195

Change-Id: I7e8b7ed552a37c6d9c6ce7c75765267b343d508c

diff --git a/sc/source/filter/excel/xeformula.cxx 
b/sc/source/filter/excel/xeformula.cxx
index 654cc14..9017103 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -2095,8 +2095,8 @@ void XclExpFmlaCompImpl::ProcessDefinedName( const 
XclExpScToken rTokData )
 {
 SCTAB nTab = SCTAB_GLOBAL;
 bool bGlobal = rTokData.mpScToken-IsGlobal();
-if (!bGlobal  mxData-mpScBasePos)
-nTab = mxData-mpScBasePos-Tab();
+if (!bGlobal)
+nTab = GetCurrScTab();
 
 XclExpNameManager rNameMgr = GetNameManager();
 sal_uInt16 nNameIdx = rNameMgr.InsertName(nTab, 
rTokData.mpScToken-GetIndex());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-28 Thread Markus Mohrhard

 sc/source/filter/excel/excform8.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1a81d22a320319f57be7ac61058997fa61ad
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Dec 29 06:01:27 2014 +0100

handle relative refs correctly in xls import, fdo#80091

Change-Id: Ia70f96e1d31e71c56f03c828be0a4e49fff4b198

diff --git a/sc/source/filter/excel/excform8.cxx 
b/sc/source/filter/excel/excform8.cxx
index f2c2938..d283616 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -611,9 +611,12 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray* 
rpTokArray, XclImpStream aIn,
 ExcRelToScRel8( nRowFirst, nColFirst, aCRD.Ref1, bRNorSF );
 ExcRelToScRel8( nRowLast, nColLast, aCRD.Ref2, bRNorSF );
 
-if( IsComplColRange( nColFirst, nColLast ) )
+bool bColRel = aCRD.Ref1.IsColRel() || aCRD.Ref2.IsColRel();
+bool bRowRel = aCRD.Ref1.IsRowRel() || aCRD.Ref2.IsRowRel();
+
+if( !bColRel  IsComplColRange( nColFirst, nColLast ) )
 SetComplCol( aCRD );
-else if( IsComplRowRange( nRowFirst, nRowLast ) )
+else if( !bRowRel  IsComplRowRange( nRowFirst, nRowLast ) )
 SetComplRow( aCRD );
 
 aStack  aPool.Store( aCRD );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-22 Thread Zolnai Tamás

 oox/source/drawingml/shape.cxx|   13 ++-
 sd/qa/unit/data/pptx/bnc862510_6.pptx |binary
 sd/qa/unit/import-tests.cxx   |   40 ++
 3 files changed, 48 insertions(+), 5 deletions(-)

New commits:
commit 28099820d2eca510f946e38e7d0973aec829e850
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Mon Dec 22 17:58:23 2014 +0100

bnc#862510: PPTX import: Wrong text color inside shape

When theme index is 0, it means it's unset so we should not
apply that.

(cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365)

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

Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 28b93b1..8710435 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -647,11 +647,14 @@ Reference XShape  Shape::createAndInsert(
 TextCharacterProperties aCharStyleProperties;
 if( const ShapeStyleRef* pFontRef = getShapeStyleRef( 
XML_fontRef ) )
 {
-if( pTheme )
-if( const TextCharacterProperties* pCharProps = 
pTheme-getFontStyle( pFontRef-mnThemedIdx ) )
-aCharStyleProperties.assignUsed( *pCharProps );
-SAL_INFO(oox.drawingml, OSL_THIS_FUNC  use font 
color);
-aCharStyleProperties.maCharColor.assignIfUsed( 
pFontRef-maPhClr );
+if( pFontRef-mnThemedIdx != 0 )
+{
+if( pTheme )
+if( const TextCharacterProperties* pCharProps = 
pTheme-getFontStyle( pFontRef-mnThemedIdx ) )
+aCharStyleProperties.assignUsed( *pCharProps );
+SAL_INFO(oox.drawingml, OSL_THIS_FUNC  use font 
color);
+aCharStyleProperties.maCharColor.assignIfUsed( 
pFontRef-maPhClr );
+}
 }
 
 Reference  XTextCursor  xAt = xText-createTextCursor();
diff --git a/sd/qa/unit/data/pptx/bnc862510_6.pptx 
b/sd/qa/unit/data/pptx/bnc862510_6.pptx
new file mode 100644
index 000..fc5f008
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc862510_6.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 70be8e5..d652a1f 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -74,6 +74,7 @@ public:
 void testBnc584721_4();
 void testBnc904423();
 void testShapeLineStyle();
+void testBnc862510_6();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
 CPPUNIT_TEST(testDocumentLayout);
@@ -95,6 +96,7 @@ public:
 CPPUNIT_TEST(testBnc584721_4);
 CPPUNIT_TEST(testBnc904423);
 CPPUNIT_TEST(testShapeLineStyle);
+CPPUNIT_TEST(testBnc862510_6);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -860,6 +862,44 @@ void SdFiltersTest::testShapeLineStyle()
 xDocShRef-DoClose();
 }
 
+void SdFiltersTest::testBnc862510_6()
+{
+// Black text was imported instead of gray
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/bnc862510_6.pptx));
+
+uno::Reference drawing::XDrawPagesSupplier  xDoc(
+xDocShRef-GetDoc()-getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference drawing::XDrawPage  xPage(
+xDoc-getDrawPages()-getByIndex(0), uno::UNO_QUERY_THROW );
+
+uno::Reference beans::XPropertySet  xShape(
+xPage-getByIndex(0), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( no shape, xShape.is() );
+
+// Get first paragraph of the text
+uno::Referencetext::XText xText = 
uno::Referencetext::XTextRange(xShape, uno::UNO_QUERY)-getText();
+CPPUNIT_ASSERT_MESSAGE( not a text shape, xText.is() );
+uno::Referencecontainer::XEnumerationAccess paraEnumAccess;
+paraEnumAccess.set(xText, uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration paraEnum = 
paraEnumAccess-createEnumeration();
+uno::Referencetext::XTextRange const xParagraph(paraEnum-nextElement(),
+uno::UNO_QUERY_THROW);
+
+// Get first run of the paragraph
+uno::Referencecontainer::XEnumerationAccess xRunEnumAccess(xParagraph, 
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xRunEnum = 
xRunEnumAccess-createEnumeration();
+uno::Referencetext::XTextRange xRun(xRunEnum-nextElement(), 
uno::UNO_QUERY);
+uno::Reference beans::XPropertySet  xPropSet( xRun, uno::UNO_QUERY_THROW 
);
+sal_Int32 nCharColor;
+xPropSet-getPropertyValue( CharColor ) = nCharColor;
+
+// Color should be gray
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0x8B8B8B), nCharColor );
+
+xDocShRef-DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

2014-12-21 Thread Markus Mohrhard

 sc/source/filter/xcl97/XclExpChangeTrack.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit ffb40fa1d7561d3847379488a61b340760924a64
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Dec 22 05:00:24 2014 +0100

fix OOXML validation errors

Change-Id: Ieac082a3b312602eff5ec101529536d747fa3836

diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx 
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index fe27e92..ae86948 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1109,6 +1109,12 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream 
rRevisionLogStrm )
 if( pOldData )
 {
 lcl_WriteCell( rRevisionLogStrm, XML_oc, aPosition, pOldData );
+if (!pNewData)
+{
+pStream-singleElement(XML_nc,
+XML_r,  XclXmlUtils::ToOString( aPosition ).getStr(),
+FSEND);
+}
 }
 if( pNewData )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eike Rathke

 sc/source/filter/xml/xmlfilti.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 06d8c19dd093a6ea0b63288ae45531c4358e31fc
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 12 14:49:09 2014 +0100

resolved fdo#86809 connect filter conditions correctly

Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a
single filter stack were OR connected, regardless whether filter-and was
given in the file.

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

diff --git a/sc/source/filter/xml/xmlfilti.cxx 
b/sc/source/filter/xml/xmlfilti.cxx
index 34327eb..03cfdfd 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -178,12 +178,19 @@ bool ScXMLFilterContext::GetConnection()
 // secondary item gets the current connection.
 return rItem.mbOr;
 
+// The next condition of this stack will get the current connection.
+++rItem.mnCondCount;
+
 if (maConnStack.size()  2)
 // There is no last stack.  Likely the first condition in the first
-// stack whose connection is not used.
-return true;
+// stack whose connection is not used.  Default in
+// ScQueryEntry::eConnect is SC_AND, so return false (AND instead of
+// OR) here. Otherwise, when saving the document again, we'd write a
+// uselessly stacked
+// 
table:filter-ortable:filter-and.../table:filter-and/table:filter-or
+// for two conditions connected with AND.
+return false;
 
-++rItem.mnCondCount;
 std::vectorConnStackItem::reverse_iterator itr = maConnStack.rbegin();
 ++itr;
 return itr-mbOr; // connection of the last stack.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-18 Thread Jan Holesovsky

 cui/source/dialogs/SpellDialog.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 7d526bd5b97ce6c627f1e0d6ec540d9acb820621
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 18 21:42:13 2014 +0100

spell dialog: Make [Close] work in protected documents with editable fields.

We have to call ToggleChildWindow directly; calling SfxDispatcher's 
Execute()
does not work here when we are in a document with protected section - in 
that
case, the cursor can move from the editable field to the protected area, and
the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see
FN_SPELL_GRAMMAR_DIALOG in .sdi).

(cherry picked from commit 08e0a79aeba6fd41cbb51de3be48659619f27206)

Conflicts:
cui/source/dialogs/SpellDialog.cxx

Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 5eb92a3..0602223 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -736,16 +736,20 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
 return 1;
 }
 
-// ---
+
 
 sal_Bool SpellDialog::Close()
 {
-GetBindings().GetDispatcher()-
-Execute(rParent.GetType(),
-SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+// We have to call ToggleChildWindow directly; calling SfxDispatcher's
+// Execute() does not work here when we are in a document with protected
+// section - in that case, the cursor can move from the editable field to
+// the protected area, and the slots get disabled because of
+// SW_DISABLE_ON_PROTECTED_CURSOR (see FN_SPELL_GRAMMAR_DIALOG in .sdi).
+SfxViewFrame::Current()-ToggleChildWindow(rParent.GetType());
+
 return sal_True;
 }
-// ---
+
 
 void SpellDialog::SetSelectedLang_Impl( LanguageType nLang )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - configure.ac sc/inc sc/source

2014-12-18 Thread Andras Timar

 configure.ac |2 
 sc/inc/scmatrix.hxx  |2 
 sc/source/core/data/document.cxx |   15 +++-
 sc/source/core/data/formulacell.cxx  |2 
 sc/source/core/tool/scmatrix.cxx |   96 ---
 sc/source/filter/oox/sheetdatabuffer.cxx |7 +-
 sc/source/filter/oox/unitconverter.cxx   |2 
 7 files changed, 72 insertions(+), 54 deletions(-)

New commits:
commit d3e346ef2b0c13d257afb68b7fe581ac29235b34
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Dec 18 22:53:19 2014 +0100

Bump version to 4.2-21

Change-Id: Id9a052e61b0c098ff9e843b04e738fc1daa3a7c7

diff --git a/configure.ac b/configure.ac
index 5ef7055..35c7af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.20],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.21],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit d96e5eb9d316117f3f560d77c9858737d7e58c9d
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 18 20:07:55 2014 +0100

fdo#68385 update references only if cut originates from the same document

Change-Id: Ia7b27309251cf9e47505c58d8ed0172d134280f4
(cherry picked from commit f2ac9fab2677a6a718f251baef75d3cae96d1f01)

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e7963b9..751204d 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2551,11 +2551,16 @@ void ScDocument::CopyBlockFromClip(
 aRefCxt.mnTabDelta = nDz;
 if (rCxt.getClipDoc()-GetClipParam().mbCutMode)
 {
-bool bOldInserting = IsInsertingFromOtherDoc();
-SetInsertingFromOtherDoc( true);
-aRefCxt.meMode = URM_MOVE;
-UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
-SetInsertingFromOtherDoc( bOldInserting);
+// Update references only if cut originates from the same
+// document we are pasting into.
+if (rCxt.getClipDoc()-GetPool() == GetPool())
+{
+bool bOldInserting = IsInsertingFromOtherDoc();
+SetInsertingFromOtherDoc( true);
+aRefCxt.meMode = URM_MOVE;
+UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
+SetInsertingFromOtherDoc( bOldInserting);
+}
 }
 else
 {
commit 04a9c1c90cc2e2d969b712b3b7a255d286d19b84
Author: Eike Rathke er...@redhat.com
Date:   Tue Dec 16 01:37:31 2014 +0100

fdo#79249 call formula compiler with error string

... instead of attempting to stringize a NaN coded error value.

Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb

(cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6)

construct grouped ScFormulaCell with bDirty=true, fdo#79249 related

Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.

(cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993)

correct error string, #N/A instead of #NA

(cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac)

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b
3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
15019072b6e812b9ffe29d3ee6afacd9ab526948

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index a1ab35a..d64ed2d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -683,7 +683,7 @@ ScFormulaCell::ScFormulaCell(
 nSeenInIteration(0),
 cMatrixFlag ( cInd ),
 nFormatType(xGroup-mnFormatType),
-bDirty(false),
+bDirty(true),
 bChanged( false ),
 bRunning( false ),
 bCompile( false ),
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index b3963df..60987c9 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -209,11 +209,16 @@ void SheetDataBuffer::setBooleanCell( const CellModel 
rModel, bool bValue )
 
 void SheetDataBuffer::setErrorCell( const CellModel rModel, const OUString 
rErrorCode )
 {
-setErrorCell( rModel, getUnitConverter().calcBiffErrorCode( rErrorCode ) );
+// Using the formula compiler now we can simply pass on the error string.
+

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

2014-12-15 Thread Markus Mohrhard

 sc/source/ui/dbgui/asciiopt.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d156a160a45337fdcdca25515cb8c723d799cb21
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Dec 14 21:03:08 2014 +0100

no separator really means no separator, fdo#83027

Change-Id: I612a46701e7447db63f38ed709e8693d0533710d
Reviewed-on: https://gerrit.libreoffice.org/13474
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 1072a89..4b7c1b8 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -366,8 +366,7 @@ sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const 
OUString  rFieldSeps, bo
 OUString aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps, 
bMergeFieldSeps) : rFieldSeps);
 if (aFieldSeps.isEmpty())
 {
-SAL_WARN( sc.ui, ScAsciiOptions::GetWeightedFieldSep - no separator 
at all, using ',' comma);
-return ',';
+return 0;
 }
 else if (aFieldSeps.getLength() == 1)
 return aFieldSeps[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - filter/source fpicker/source include/vcl offapi/com vcl/Library_vcl.mk vcl/source xmlsecurity/source

2014-12-12 Thread Stephan Bergmann

 filter/source/pdf/impdialog.cxx   
|   18 
 filter/source/pdf/impdialog.hrc   
|3 
 filter/source/pdf/impdialog.src   
|   10 
 filter/source/pdf/pdfexport.cxx   
|2 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx   
|   38 +
 include/vcl/pdfwriter.hxx 
|5 
 offapi/com/sun/star/security/CertificateCharacters.idl
|4 
 offapi/com/sun/star/security/CertificateException.idl 
|5 
 offapi/com/sun/star/security/CertificateValidity.idl  
|4 
 offapi/com/sun/star/security/CryptographyException.idl
|5 
 offapi/com/sun/star/security/DocumentDigitalSignatures.idl
|3 
 offapi/com/sun/star/security/EncryptionException.idl  
|5 
 offapi/com/sun/star/security/ExtAltNameType.idl   
|2 
 offapi/com/sun/star/security/KeyException.idl 
|5 
 offapi/com/sun/star/security/NoPasswordException.idl  
|7 
 offapi/com/sun/star/security/SignatureException.idl   
|8 
 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl   
|5 
 offapi/com/sun/star/security/XSanExtension.idl
|4 
 offapi/com/sun/star/security/XSerialNumberAdapter.idl 
|2 
 offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
|5 
 offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
|5 
 offapi/com/sun/star/xml/crypto/XMLEncryption.idl  
|4 
 offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl 
|8 
 offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl  
|5 
 offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl 
|5 
 offapi/com/sun/star/xml/crypto/XMLSignature.idl   
|5 
 offapi/com/sun/star/xml/crypto/XMLSignatureException.idl  
|8 
 offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl   
|5 
 offapi/com/sun/star/xml/crypto/XUriBinding.idl
|5 
 offapi/com/sun/star/xml/crypto/XXMLEncryption.idl 
|5 
 offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl 
|6 
 offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl   
|5 
 offapi/com/sun/star/xml/crypto/XXMLSignature.idl  
|4 
 offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl  
|5 
 offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl  
|4 
 offapi/com/sun/star/xml/crypto/sax/Decryptor.idl  
|5 
 offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
|4 
 offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
|5 
 offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl   
|5 
 offapi/com/sun/star/xml/crypto/sax/Encryptor.idl  
|5 
 offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl 
|5 
 offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl   
|3 
 offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl  
|7 
 offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
|5 
 offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl   
|5 
 offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl  
|5 
 offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
|5 
 offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl   
|5 
 offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl  
|2 
 offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl  
|5 
 offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl  
|5 
 offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
|5 
 offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl  
|5 
 offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl 
|5 
 offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
|5 
 offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl 
|5

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

2014-12-12 Thread Tor Lillqvist

 vcl/source/gdi/pdfwriter_impl.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9efaaa57d73367ba737be151de8ecc3730374230
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 3 14:00:38 2014 +0200

PDF signing feature backported from 4.4

Cherry picked from:
840f75065918c4584fa9159fdc90242b5374ab37
1fe9ee73a758603ee0e1465931352c41ef8bd999
d8a8ff8177df628636d80c4dc1d8f597f6677dfc
bfa01d8a8248f7e44675de5ed1f85a1d17105022
bbb18f679f5a50e9c709520d6c3260d3d9db5aa9
c4cc31b5b55019aabad4045c8174b45e1b27073a
7e3c931786c3cbe83ee170b8b0746d141b520ce6
070c93af73df9aa4eb333265c81060d123b530b9
6e91763769a562b2a4c2a94b1367c6ed4866

Change-Id: Ib4b67eec0fb7f032a395b5463b481a5680287768

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index c0791f6..e1fe341 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6192,7 +6192,7 @@ bool PDFWriterImpl::finalizeSignature()
 #else
 
 // Prepare buffer and calculate PDF file digest
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) );
+CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut, 
0)));
 
 PCCERT_CONTEXT pCertContext = 
CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 
reinterpret_castconst BYTE*(n_derArray), n_derLength);
 if (pCertContext == NULL)
@@ -6204,7 +6204,7 @@ bool PDFWriterImpl::finalizeSignature()
 boost::scoped_arraychar buffer1(new char[m_nSignatureContentOffset - 1]);
 sal_uInt64 bytesRead1;
 
-if (osl::File::E_None != m_aFile.read(buffer1.get(), 
m_nSignatureContentOffset - 1 , bytesRead1) ||
+if (osl_File_E_None != osl_readFile(m_aFile, buffer1.get(), 
m_nSignatureContentOffset - 1 , bytesRead1) ||
 bytesRead1 != (sal_uInt64)m_nSignatureContentOffset - 1)
 {
 SAL_WARN(vcl.pdfwriter, PDF Signing: First buffer read failed!);
@@ -6215,8 +6215,8 @@ bool PDFWriterImpl::finalizeSignature()
 boost::scoped_arraychar buffer2(new char[nLastByteRangeNo]);
 sal_uInt64 bytesRead2;
 
-if (osl::File::E_None != m_aFile.setPos(osl_Pos_Absolut, 
m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) ||
-osl::File::E_None != m_aFile.read(buffer2.get(), nLastByteRangeNo, 
bytesRead2) ||
+if (osl_File_E_None != osl_setFilePos(m_aFile, osl_Pos_Absolut, 
m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) ||
+osl_File_E_None != osl_readFile(m_aFile, buffer2.get(), 
nLastByteRangeNo, bytesRead2) ||
 bytesRead2 != (sal_uInt64) nLastByteRangeNo)
 {
 SAL_WARN(vcl.pdfwriter, PDF Signing: Second buffer read failed!);
@@ -6279,10 +6279,10 @@ bool PDFWriterImpl::finalizeSignature()
 
 // Set file pointer to the m_nSignatureContentOffset, we're ready to 
overwrite PKCS7 object
 nWritten = 0;
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 
m_nSignatureContentOffset)) );
-m_aFile.write(cms_hexbuffer.getStr(), cms_hexbuffer.getLength(), nWritten);
+CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut, 
m_nSignatureContentOffset)) );
+osl_writeFile(m_aFile, cms_hexbuffer.getStr(), cms_hexbuffer.getLength(), 
nWritten);
 
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 
nOffset)) );
+CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut, 
nOffset)) );
 
 return true;
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-11 Thread Luboš Luňák

 sw/source/core/undo/undobj.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 759658efd1c68fe919d33528497ecb6725343057
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Mon Dec 1 12:58:47 2014 +0100

do not save UNO marks in undo history

These are usually very short-lived marks that are used for various
internal purposes or by UNO interfaces, so restoring them from undo history
does not make any sense. It can in fact lead to a crash on undo if the mark 
has
been already deleted (which is usually the case with UNO marks) but
the restoring still refers to it (this is not a problem with other mark 
types
since those should be deleted only when they are no longer in the document,
in which case they are saved in undo history by content positions rather 
than
mark references).

Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c

diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index f552dc9..afa472c 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -784,10 +784,12 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition 
rMark,
 
 if ( bSavePos || bSaveOtherPos )
 {
-if( !pHistory )
-pHistory = new SwHistory;
-
-pHistory-Add( *pBkmk, bSavePos, bSaveOtherPos );
+if( IDocumentMarkAccess::GetType(*pBkmk) != 
IDocumentMarkAccess::UNO_BOOKMARK )
+{
+if( !pHistory )
+pHistory = new SwHistory;
+pHistory-Add( *pBkmk, bSavePos, bSaveOtherPos );
+}
 if ( bSavePos
   ( bSaveOtherPos
   || !pBkmk-IsExpanded() ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - include/xmloff sc/source xmloff/source

2014-12-07 Thread Markus Mohrhard

 include/xmloff/xmltoken.hxx |1 -
 sc/source/filter/xml/XMLExportDataPilot.cxx |4 +---
 xmloff/source/core/xmltoken.cxx |1 -
 xmloff/source/draw/shapeexport.cxx  |1 +
 4 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit c5abf965fae4aa979989e60b00ab926ddf35ae8f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Dec 7 00:55:48 2014 +0100

correct order of xml elements, related fdo#45266

Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d

diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx 
b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 4b9c913..047934f 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -699,8 +699,8 @@ void 
ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim
 rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sValueStr);
 
 SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, 
XML_DATA_PILOT_FIELD, true, true);
-WriteFieldReference(pDim);
 WriteLevels(pDim);
+WriteFieldReference(pDim);
 if( pDim-GetOrientation() != sheet::DataPilotFieldOrientation_DATA )
 WriteGroupDimElements(pDim, pDimData);
 }
commit d981c7fa5500dab0d24a36506e706f4a40edf075
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Dec 7 00:41:44 2014 +0100

remove invalid attribute that is not read anyway

Change-Id: Id7770ffda49ba7bc0ebc780c67c56b81152213f7

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 6dd7d1c..88da569 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2609,7 +2609,6 @@ namespace xmloff { namespace token {
 XML_DATE_START,
 XML_DATE_END,
 XML_STEP,
-XML_IS_GROUP_FIELD,
 XML_DATA_PILOT_GROUPS,
 XML_DATA_PILOT_GROUP,
 
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx 
b/sc/source/filter/xml/XMLExportDataPilot.cxx
index cd711d4..4b9c913 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -599,7 +599,6 @@ void ScXMLExportDataPilot::WriteGroupDimAttributes(const 
ScDPSaveGroupDimension*
 if (pGroupDim)
 {
 OUString aSrcFieldName = 
ScDPUtil::getSourceDimensionName(pGroupDim-GetSourceDimName());
-rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD, 
XML_TRUE);
 rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, 
aSrcFieldName);
 if (pGroupDim-GetDatePart())
 {
@@ -613,7 +612,6 @@ void ScXMLExportDataPilot::WriteNumGroupDim(const 
ScDPSaveNumGroupDimension* pNu
 {
 if (pNumGroupDim)
 {
-rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD, 
XML_TRUE);
 if (pNumGroupDim-GetDatePart())
 {
 WriteDatePart(pNumGroupDim-GetDatePart());
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 555f24b..e39814d 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2614,7 +2614,6 @@ namespace xmloff { namespace token {
 TOKEN( date-start,   XML_DATE_START ),
 TOKEN( date-end, XML_DATE_END ),
 TOKEN( step, XML_STEP ),
-TOKEN( is-group-field,   XML_IS_GROUP_FIELD ),
 TOKEN( data-pilot-groups,XML_DATA_PILOT_GROUPS ),
 TOKEN( data-pilot-group, XML_DATA_PILOT_GROUP ),
 TOKEN( japanese-candle-stick,XML_JAPANESE_CANDLE_STICK ),
commit cbd8ae9e9c0fb5b936264dc8956854184e70ca7f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Dec 6 08:21:50 2014 +0100

the xlink:type attribute is mandatory, related fdo#79449

Change-Id: I03c4217f786bc10aa915780dc10ea52d94019b6e

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index bddf0ac..22dcbeb 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1740,6 +1740,7 @@ void XMLShapeExport::ImpExportEvents( const 
uno::Reference drawing::XShape  x
 XML_NAMESPACE_DOM, OUString(  click  ) ) );
 mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, 
aEventQName );
 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, 
aStrMacro );
+mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, simple 
);
 
 SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, 
XML_EVENT_LISTENER, sal_True, sal_True);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-07 Thread Markus Mohrhard

 sc/inc/column.hxx   |1 +
 sc/source/core/data/column3.cxx |6 ++
 sc/source/core/data/table1.cxx  |4 
 3 files changed, 11 insertions(+)

New commits:
commit feb749092d1008fba6acb9206d1f8655749519af
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Dec 8 07:43:14 2014 +0100

we need the SdrPage for deleting the notes, fdo#86166

The SdrPage that contains the shapes for the note captions is deleted
before the notes. Prevent that case by deleting the notes before
deleting the SdrPage.

Change-Id: I13727cea7df0b033fb386a6a8e20dcadec743335

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 86d39ab..b9009cb 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -183,6 +183,7 @@ public:
 
 voidDelete( SCROW nRow );
 voidFreeAll();
+voidFreeNotes();
 void Swap( ScColumn rOther, SCROW nRow1, SCROW nRow2, bool bPattern );
 
 boolHasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 146e026..c8e6839 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -141,6 +141,12 @@ void ScColumn::FreeAll()
 CellStorageModified();
 }
 
+void ScColumn::FreeNotes()
+{
+maCellNotes.clear();
+maCellNotes.resize(MAXROWCOUNT);
+}
+
 namespace {
 
 /**
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 834dfe1..b06fa28 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -320,6 +320,10 @@ ScTable::~ScTable()
 {
 if (!pDocument-IsInDtorClear())
 {
+for (SCCOL nCol = 0; nCol  MAXCOL; ++nCol)
+{
+aCol[nCol].FreeNotes();
+}
 //  nicht im dtor die Pages in der falschen Reihenfolge loeschen
 //  (nTab stimmt dann als Page-Number nicht!)
 //  In ScDocument::Clear wird hinterher per Clear am Draw Layer alles 
geloescht.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-07 Thread Markus Mohrhard

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

New commits:
commit 7e5877a5cd0e48ce3aa364788c6faf81fbce7338
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Dec 8 08:05:34 2014 +0100

don't update range name if ref not in update range, fdo#85304

Change-Id: I1ccfacd98bd10f6ae1d4eaf7a705fe8863045697

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3349434..eb83c8c 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3125,6 +3125,9 @@ bool adjustSingleRefInName(
 return false;
 }
 
+if (!rCxt.maRange.In(rRef.toAbs(rPos)))
+return false;
+
 bool bChanged = false;
 
 if (rCxt.mnColDelta)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-05 Thread Eike Rathke

 xmloff/source/text/txtprmap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20a8df00b31e313167bd650b80319cdda7e14144
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 20 22:10:46 2013 +0100

fdo#58112 write loext:contextual-spacing accept style:contextual-spacing

Change-Id: I3e6698d9d9399dd5a13658641847df8a5f34f6ae

diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 1e4ed6f..023c9a9 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -95,8 +95,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
 MP_E( ParaTopMarginRelative,  FO, MARGIN_TOP, 
XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
 MP_E( ParaBottomMargin,   FO, MARGIN_BOTTOM,  
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ),
 MP_E( ParaBottomMarginRelative,FO,MARGIN_BOTTOM,  
XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ),
-MAP_EXT( ParaContextMargin, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, 
XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),  // proposed ODF 1.2+
-MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_LO_EXT, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),   // 
extension namespace
+MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_STYLE, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),// 
proposed ODF 1.2+ and was written by LO=4.2
+MAP_EXT( ParaContextMargin, XML_NAMESPACE_LO_EXT, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // 
extension namespace
 // RES_CHRATR_CASEMAP
 MT_E( CharCaseMap,FO, FONT_VARIANT,   
XML_TYPE_TEXT_CASEMAP_VAR,  0 ),
 MT_E( CharCaseMap,FO, TEXT_TRANSFORM, 
XML_TYPE_TEXT_CASEMAP,  0 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-05 Thread Michael Stahl

 xmloff/source/text/XMLTextMarkImportContext.cxx |   49 
 1 file changed, 34 insertions(+), 15 deletions(-)

New commits:
commit ace0ec919fea773c847469dc01abf74393617d5f
Author: Michael Stahl mst...@redhat.com
Date:   Fri Dec 5 18:04:39 2014 +0100

fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...

... if it has start/end, because Writer will become grumpy and crash.

(cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a)

Conflicts:
xmloff/source/text/XMLTextMarkImportContext.cxx

Change-Id: I6024051249eeac6ed9e43856fa77db969287f888

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 73ee88d..7720533 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -143,7 +143,7 @@ static const char *lcl_getFormFieldmarkName(OUString name)
 return NULL;
 }
 
-static OUString lcl_getFieldmarkName(OUString name)
+static OUString lcl_getFieldmarkName(OUString const name)
 {
 static const char sFormtext[]=ODF_FORMTEXT;
 if (name.equalsAscii(msoffice.field.FORMTEXT) ||
@@ -288,19 +288,40 @@ void XMLTextMarkImportContext::EndElement()
 
 bool 
bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd  
m_rHelper.hasCurrentFieldCtx());
 
-// insert reference
-const ReferenceXInterface xContent(
-CreateAndInsertMark(GetImport(),
-
(bImportAsField?sAPI_fieldmark:sAPI_bookmark),
-m_sBookmarkName,
-xInsertionCursor,
-m_sXmlId) );
-if (pRDFaAttributes)
+// fdo#86795 check if it's actually a checkbox 
first
+bool isInvalid(false);
+OUString fieldmarkTypeName;
+if (bImportAsField  
m_rHelper.hasCurrentFieldCtx())
 {
-const Referencerdf::XMetadatable
-xMeta(xContent, UNO_QUERY);
-GetImport().GetRDFaImportHelper().AddRDFa(
-xMeta, pRDFaAttributes);
+
+OUString const 
type(m_rHelper.getCurrentFieldType());
+fieldmarkTypeName = lcl_getFieldmarkName(type);
+if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
+fieldmarkTypeName == ODF_FORMDROPDOWN)
+{   // sw can't handle checkbox with start+end
+SAL_INFO(xmloff.text, invalid 
fieldmark-start/fieldmark-end ignored);
+isInvalid = true;
+}
+}
+
+ReferenceXInterface xContent;
+if (!isInvalid)
+{
+// insert reference
+xContent = CreateAndInsertMark(GetImport(),
+(bImportAsField
+? OUString(sAPI_fieldmark)
+: OUString(sAPI_bookmark)),
+m_sBookmarkName,
+xInsertionCursor,
+m_sXmlId);
+if (pRDFaAttributes)
+{
+const Referencerdf::XMetadatable
+xMeta(xContent, UNO_QUERY);
+GetImport().GetRDFaImportHelper().AddRDFa(
+xMeta, pRDFaAttributes);
+}
 }
 
 if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) {
@@ -308,8 +329,6 @@ void XMLTextMarkImportContext::EndElement()
 // setup fieldmark...
 Reference 
::com::sun::star::text::XFormField xFormField(xContent, UNO_QUERY);
 if (xFormField.is()  
m_rHelper.hasCurrentFieldCtx()) {
-OUString 
givenTypeName=m_rHelper.getCurrentFieldType();
-OUString 
fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName);
 
 
xFormField-setFieldType(fieldmarkTypeName);
 
m_rHelper.setCurrentFieldParamsTo(xFormField);

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 5 commits - configure.ac editeng/qa external/icu sc/inc sc/source sw/source

2014-12-03 Thread Andras Timar

 configure.ac|2 
 editeng/qa/unit/core-test.cxx   |4 
 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-scriptrun.patch  |   58 
 sc/inc/column.hxx   |2 
 sc/inc/document.hxx |2 
 sc/inc/refhint.hxx  |   18 ++
 sc/inc/table.hxx|2 
 sc/source/core/data/column.cxx  |   17 ++
 sc/source/core/data/document.cxx|5 
 sc/source/core/data/formulacell.cxx |   10 +
 sc/source/core/data/table2.cxx  |4 
 sc/source/core/data/table3.cxx  |  245 +++-
 sc/source/core/tool/refhint.cxx |6 
 sc/source/ui/docshell/dbdocfun.cxx  |2 
 sw/source/ui/misc/swruler.cxx   |3 
 16 files changed, 283 insertions(+), 98 deletions(-)

New commits:
commit 2580fb2882343b7b80cc3c0317d8f99379cc8acb
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Dec 3 08:21:05 2014 -0800

Bump version to 4.2-20

Change-Id: I9838eede17e52ba377f072f967acf65f081d1985

diff --git a/configure.ac b/configure.ac
index ed38062..5ef7055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.19],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.20],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit d1b9bad9414b91787760a320cd80467139c064f5
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 1 23:56:44 2014 +0100

fdo#86762 re-establish listeners to move cell broadcasters

... for UpdateReferenceOnSort=false

(cherry picked from commit 6c2111f17089eb667bf526561d7667d17825e822)

Conflicts:
sc/source/core/data/table3.cxx

fdo#86762 broadcast also empty cells after sort

(cherry picked from commit 08793e08c7e9cefe594c49130f782725e386c463)

Conflicts:
sc/inc/column.hxx
sc/source/core/data/column.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table2.cxx
sc/source/ui/docshell/dbdocfun.cxx

fdo#86762 re-establish listeners on moved broadcasters

...  also in SortReorderByColumn() similar to SortReorderByRow()

(cherry picked from commit e119f3883513aeaa49f332362620e955dc8b453f)

Conflicts:
sc/source/core/data/table3.cxx

e275a754c530d6039ed14304900dd71416f36e46
7665dcc90d70fcf3b08bef0adb9ab6aaff1cdcdf

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

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 4bda39d..86d39ab 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -334,7 +334,7 @@ public:
 bool IsFormulaDirty( SCROW nRow ) const;
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( SCROW nRow1, SCROW nRow2 );
+voidSetDirty( SCROW nRow1, SCROW nRow2, bool bIncludeEmptyCells = 
false );
 voidSetDirtyVar();
 voidSetDirtyAfterLoad();
 voidSetTableOpDirty( const ScRange );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 432cf13..e7cd762 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -996,7 +996,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( const ScRange );
+voidSetDirty( const ScRange, bool bIncludeEmptyCells = false 
);
 voidSetTableOpDirty( const ScRange );  // for Interpreter 
TableOp
 voidInterpretDirtyCells( const ScRangeList rRanges );
 SC_DLLPUBLIC void CalcAll();
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index 6ccda8b..9ff8d30 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -21,7 +21,9 @@ public:
 enum Type {
 Moved,
 ColumnReordered,
-RowReordered
+RowReordered,
+StartListening,
+StopListening
 };
 
 private:
@@ -95,6 +97,20 @@ public:
 SCCOL getEndColumn() const;
 };
 
+class RefStartListeningHint : public RefHint
+{
+public:
+RefStartListeningHint();
+virtual ~RefStartListeningHint();
+};
+
+class RefStopListeningHint : public RefHint
+{
+public:
+RefStopListeningHint();
+virtual ~RefStopListeningHint();
+};
+
 }
 
 #endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0b451a4..cc0257e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -521,7 +521,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext

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

2014-12-03 Thread Andras Timar

 sc/source/filter/excel/xiescher.cxx|3 +--
 xmloff/source/forms/elementexport.cxx  |4 
 xmloff/source/forms/layerimport.cxx|6 ++
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |1 +
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 62f144ef3b4e9e5d8cd9b624f86ff823380d425b
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Dec 3 14:11:34 2014 -0800

Revert ODF export: don't write invalid group-name attribute

This reverts commit 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7.

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 8d86040..a739409 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2321,8 +2321,7 @@ void XclImpOptionButtonObj::DoProcessControl( 
ScfPropertySet rPropSet ) const
 ScfPropertySet aProps( xCtrlModel );
 OUString sGroupName = OUString::number( 
pLeader-GetDffShapeId() );
 
-// for radio buttons, Name is the group name
-aProps.SetStringProperty( Name, sGroupName );
+aProps.SetStringProperty( GroupName, sGroupName );
 aProps.SetStringProperty( RefValue, OUString::number( 
nRefVal++ ) );
 if ( pLeader-HasCellLink()  !pTbxObj-HasCellLink() )
 {
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 3118b19..5d4e635 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1158,9 +1158,11 @@ namespace xmloff
 {
 static const sal_Int32 nStringPropertyAttributeIds[] =
 {   // attribute flags
+SCA_GROUP_NAME
 };
 static const OUString pStringPropertyNames[] =
 {   // property names
+OUString(PROPERTY_GROUP_NAME)
 };
 
 static const sal_Int32 nIdCount = sizeof( 
nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
@@ -1656,6 +1658,8 @@ namespace xmloff
 }
 if ( m_xPropertyInfo-hasPropertyByName( 
PROPERTY_IMAGE_POSITION ) )
 m_nIncludeSpecial |= SCA_IMAGE_POSITION;
+if ( m_xPropertyInfo-hasPropertyByName( PROPERTY_GROUP_NAME ) 
)
+m_nIncludeSpecial |= SCA_GROUP_NAME;
 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
 m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
 break;
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index 39c5b4c..adc7998 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -78,11 +78,9 @@ 
OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport _rImporter)
 // string properties which are exported as attributes
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), 
PROPERTY_NAME);
-// map invalid group-name attribute to name
-// (since radio buttons are grouped by name)
-m_aAttributeMetaData.addStringProperty(
-OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_NAME);
 m_aAttributeMetaData.addStringProperty(
+OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_GROUP_NAME);
+m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), 
PROPERTY_IMAGEURL);
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), 
PROPERTY_LABEL);
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index e71389b..00d575e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -427,6 +427,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * 
all_styles  )
 readImageURLAttr( ImageURL, XMLNS_DIALOGS_PREFIX :image-src );
 readImagePositionAttr( ImagePosition, XMLNS_DIALOGS_PREFIX 
:image-position );
 readBoolAttr( MultiLine, XMLNS_DIALOGS_PREFIX :multiline );
+readStringAttr( GroupName, XMLNS_DIALOGS_PREFIX :group-name );
 
 sal_Int16 nState = 0;
 if (readProp( State ) = nState)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 3963e59..47ee825a 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1177,9 +1177,7 @@ void TitledBoxElement::endElement()
 ctx.importImageURLProperty( ImageURL ,  image-src , _xAttributes );
 ctx.importImagePositionProperty( ImagePosition,

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

2014-12-02 Thread Michael Stahl

 editeng/qa/unit/core-test.cxx  |   39 +
 editeng/source/editeng/editobj.cxx |   15 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit d8ae4e4a74cfd3b7e997c2132fdc41a812be8069
Author: Michael Stahl mst...@redhat.com
Date:   Mon Dec 1 19:25:13 2014 +0100

fdo#85496: editeng: avoid exporting duplicate attributes

Since commit 0d57434180db6c8eda8c5b9b704f8a1c18b371df multiple 0-length
attributes will be exported by the ODF filter as duplicate attributes.

(cherry picked from commit 7a242b463132d67a4a2d6e69319e0da367145cc0)
(cherry picked from commit 846b56b6b99e334dfa44f1a24640aa3158509854)

This backport takes a different approach from the master fix and simply
detects duplicates in EditTextObjectImpl::GetAllSections() which should
be safe enough for 4.2.8.2.

Change-Id: Iff787c8d2a71bc3082192cc98e3d916badee65dd

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 4e3da9b..3d5bd81 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -573,6 +573,45 @@ void Test::testSectionAttributes()
 CPPUNIT_ASSERT_EQUAL(static_castsize_t(0), pSecAttr-mnEnd);
 CPPUNIT_ASSERT_MESSAGE(Attribute array should be empty., 
pSecAttr-maAttributes.empty());
 }
+
+
+{
+aEngine.Clear();
+aEngine.SetText(one\ntwo);
+CPPUNIT_ASSERT_EQUAL(2, aEngine.GetParagraphCount());
+
+// embolden 2nd paragraph
+pSet.reset(new SfxItemSet(aEngine.GetEmptyItemSet()));
+pSet-Put(aBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(1,0,1,3));
+// disboldify 1st paragraph
+SvxWeightItem aNotSoBold(WEIGHT_NORMAL, EE_CHAR_WEIGHT);
+pSet-Put(aNotSoBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(0,0,0,3));
+
+// now delete  join the paragraphs - this is fdo#85496 scenario
+aEngine.QuickDelete(ESelection(0,0,1,3));
+CPPUNIT_ASSERT_EQUAL(1, aEngine.GetParagraphCount());
+
+boost::scoped_ptrEditTextObject 
pEditText(aEngine.CreateTextObject());
+CPPUNIT_ASSERT_MESSAGE(Failed to create text object., 
pEditText.get());
+std::vectorediteng::Section aAttrs;
+pEditText-GetAllSections(aAttrs);
+
+CPPUNIT_ASSERT_EQUAL(static_castsize_t(1), aAttrs.size());
+
+const editeng::Section* pSecAttr = aAttrs[0];
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnParagraph);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnStart);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnEnd);
+std::setsal_uInt16 whiches;
+for (size_t i = 0; i  pSecAttr-maAttributes.size(); ++i)
+{
+sal_uInt16 const nWhich(pSecAttr-maAttributes[i]-Which());
+CPPUNIT_ASSERT_MESSAGE(duplicate item in text portion attributes,
+whiches.insert(nWhich).second);
+}
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index e85448e..691256e 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1014,7 +1014,20 @@ void EditTextObjectImpl::GetAllSections( 
std::vectorediteng::Section rAttrs )
 for (; itCurAttr != aAttrs.end()  itCurAttr-mnParagraph == 
nPara  itCurAttr-mnEnd = nEnd; ++itCurAttr)
 {
 editeng::Section rSecAttr = *itCurAttr;
-rSecAttr.maAttributes.push_back(pItem);
+bool bInsert(true);
+for (size_t j = 0; j  rSecAttr.maAttributes.size(); ++j)
+{
+if (rSecAttr.maAttributes[j]-Which() == pItem-Which())
+{
+SAL_WARN(editeng, GetAllSections(): duplicate 
attribute suppressed);
+bInsert = false;
+break;
+}
+}
+if (bInsert)
+{
+rSecAttr.maAttributes.push_back(pItem);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Michael Stahl

 sc/source/filter/excel/xiescher.cxx|3 ++-
 xmloff/source/forms/elementexport.cxx  |4 
 xmloff/source/forms/layerimport.cxx|6 --
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |1 -
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 18 18:08:37 2014 +0200

ODF export: don't write invalid group-name attribute

Radio buttons are grouped via their form:name attribute already.

Change-Id: I9f8b27a2904d947c3d4665495d36961e3e41d2c6

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index a739409..8d86040 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2321,7 +2321,8 @@ void XclImpOptionButtonObj::DoProcessControl( 
ScfPropertySet rPropSet ) const
 ScfPropertySet aProps( xCtrlModel );
 OUString sGroupName = OUString::number( 
pLeader-GetDffShapeId() );
 
-aProps.SetStringProperty( GroupName, sGroupName );
+// for radio buttons, Name is the group name
+aProps.SetStringProperty( Name, sGroupName );
 aProps.SetStringProperty( RefValue, OUString::number( 
nRefVal++ ) );
 if ( pLeader-HasCellLink()  !pTbxObj-HasCellLink() )
 {
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 5d4e635..3118b19 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1158,11 +1158,9 @@ namespace xmloff
 {
 static const sal_Int32 nStringPropertyAttributeIds[] =
 {   // attribute flags
-SCA_GROUP_NAME
 };
 static const OUString pStringPropertyNames[] =
 {   // property names
-OUString(PROPERTY_GROUP_NAME)
 };
 
 static const sal_Int32 nIdCount = sizeof( 
nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
@@ -1658,8 +1656,6 @@ namespace xmloff
 }
 if ( m_xPropertyInfo-hasPropertyByName( 
PROPERTY_IMAGE_POSITION ) )
 m_nIncludeSpecial |= SCA_IMAGE_POSITION;
-if ( m_xPropertyInfo-hasPropertyByName( PROPERTY_GROUP_NAME ) 
)
-m_nIncludeSpecial |= SCA_GROUP_NAME;
 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
 m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
 break;
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index adc7998..39c5b4c 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -78,9 +78,11 @@ 
OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport _rImporter)
 // string properties which are exported as attributes
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), 
PROPERTY_NAME);
+// map invalid group-name attribute to name
+// (since radio buttons are grouped by name)
+m_aAttributeMetaData.addStringProperty(
+OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_NAME);
 m_aAttributeMetaData.addStringProperty(
-OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_GROUP_NAME);
-m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), 
PROPERTY_IMAGEURL);
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), 
PROPERTY_LABEL);
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 00d575e..e71389b 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -427,7 +427,6 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * 
all_styles  )
 readImageURLAttr( ImageURL, XMLNS_DIALOGS_PREFIX :image-src );
 readImagePositionAttr( ImagePosition, XMLNS_DIALOGS_PREFIX 
:image-position );
 readBoolAttr( MultiLine, XMLNS_DIALOGS_PREFIX :multiline );
-readStringAttr( GroupName, XMLNS_DIALOGS_PREFIX :group-name );
 
 sal_Int16 nState = 0;
 if (readProp( State ) = nState)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 47ee825a..3963e59 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1177,7 +1177,9 @@ void TitledBoxElement::endElement()
 ctx.importImageURLProperty( ImageURL ,  image-src , _xAttributes );

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

2014-12-02 Thread Markus Mohrhard

 include/xmloff/xmlnumfe.hxx  |3 ++-
 xmloff/source/style/xmlnumfe.cxx |8 
 xmloff/source/style/xmlnumfi.cxx |1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 2af6880c44cd9d4083c1258d5ad46238f53a6c4f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Aug 16 07:14:28 2014 +0200

prevent invalid ods files with loext:fill-character

ODF specifies that extension elements in a document are removed before
the validation. With our old implementation of the number format export
this could result in two number:text elements following each other.

According to the spec a number:text element may not follow another
number:text element.

The number:text element before loext:fill is actually not that
interesting so it makes more sense to make this one an extension
element.

Possible documents showing issues:

fdo45268-1.xlsx
fdo49150-1.xlsx
and many more

Conflicts:
xmloff/source/style/xmlnumfe.cxx

Change-Id: I3ad92b8a61a246b3dbc0132d9a2c367488a766d0

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index e047de3..bc2517d 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -26,6 +26,7 @@
 #include com/sun/star/util/XNumberFormatsSupplier.hpp
 #include com/sun/star/uno/Sequence.h
 #include rtl/ustrbuf.hxx
+#include boost/ptr_container/ptr_vector.hpp
 
 #define XML_WRITTENNUMBERSTYLES WrittenNumberStyles
 
@@ -57,7 +58,7 @@ private:
 SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang );
 
 SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString rString );
-SAL_DLLPRIVATE void FinishTextElement_Impl();
+SAL_DLLPRIVATE void FinishTextElement_Impl(bool bUseExtensionNS = false);
 
 SAL_DLLPRIVATE void WriteColorElement_Impl( const Color rColor );
 SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nInteger,
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 6658a3e..e6d0fae 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -46,7 +46,6 @@
 #include xmloff/xmlexp.hxx
 
 #include set
-#include boost/ptr_container/ptr_vector.hpp
 
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
@@ -338,11 +337,12 @@ void SvXMLNumFmtExport::AddToTextElement_Impl( const 
OUString rString )
 sTextContent.append( rString );
 }
 
-void SvXMLNumFmtExport::FinishTextElement_Impl()
+void SvXMLNumFmtExport::FinishTextElement_Impl(bool bUseExtensionNS)
 {
 if ( !sTextContent.isEmpty() )
 {
-SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT,
+sal_uInt16 nNS = bUseExtensionNS ? XML_NAMESPACE_LO_EXT : 
XML_NAMESPACE_NUMBER;
+SvXMLElementExport aElem( rExport, nNS, XML_TEXT,
   sal_True, sal_False );
 rExport.Characters( sTextContent.makeStringAndClear() );
 }
@@ -502,7 +502,7 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool 
bLong )
 
 void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
 {
-FinishTextElement_Impl();
+FinishTextElement_Impl(sal_True);
 SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, 
XML_FILL_CHARACTER,
   sal_True, sal_False );
 rExport.Characters( OUString( nChar ) );
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 8773f3a..9a108cd 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -496,6 +496,7 @@ const SvXMLTokenMap SvXMLNumImpData::GetStyleElemTokenMap()
 static const SvXMLTokenMapEntry aStyleElemMap[] =
 {
 //  elements in a style
+{ XML_NAMESPACE_LO_EXT, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
 { XML_NAMESPACE_NUMBER, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
 { XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
 { XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - include/oox oox/source sd/qa

2014-12-01 Thread Zolnai Tamás

 include/oox/drawingml/shape.hxx   |2 
 oox/source/drawingml/shape.cxx|   12 ++
 sd/qa/unit/data/pptx/ShapeLineProperties.pptx |binary
 sd/qa/unit/data/pptx/bnc904423.pptx   |binary
 sd/qa/unit/import-tests.cxx   |  128 ++
 5 files changed, 140 insertions(+), 2 deletions(-)

New commits:
commit 79146230f0082275dee361644524cccd1ab4
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Sun Nov 30 18:53:48 2014 +0100

PPTX import: fix import of shape line properties defined by theme

See also:
81cd386facedfbb15be6dffc10351262abf733f3

(cherry picked from commit 664a56b3c81503bdf199edf1806676f0a35b956f)

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

Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index f711228..6d8b70c 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -228,6 +228,7 @@ protected:
 
 TextBodyPtr mpTextBody;
 LinePropertiesPtr   mpLinePropertiesPtr;
+LinePropertiesPtr   mpShapeRefLinePropPtr;
 FillPropertiesPtr   mpFillPropertiesPtr;
 FillPropertiesPtr   mpShapeRefFillPropPtr;
 GraphicPropertiesPtrmpGraphicPropertiesPtr;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 843de0c..28b93b1 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -88,6 +88,7 @@ namespace oox { namespace drawingml {
 Shape::Shape( const sal_Char* pServiceName )
 : mbIsChild( false )
 , mpLinePropertiesPtr( new LineProperties )
+, mpShapeRefLinePropPtr( new LineProperties )
 , mpFillPropertiesPtr( new FillProperties )
 , mpShapeRefFillPropPtr( new FillProperties )
 , mpGraphicPropertiesPtr( new GraphicProperties )
@@ -114,6 +115,7 @@ Shape::Shape( const ShapePtr pSourceShape )
 , mbIsChild( pSourceShape-mbIsChild )
 , mpTextBody(pSourceShape-mpTextBody)
 , mpLinePropertiesPtr( pSourceShape-mpLinePropertiesPtr )
+, mpShapeRefLinePropPtr( pSourceShape-mpShapeRefLinePropPtr )
 , mpFillPropertiesPtr( pSourceShape-mpFillPropertiesPtr )
 , mpShapeRefFillPropPtr( pSourceShape-mpShapeRefFillPropPtr )
 , mpGraphicPropertiesPtr( pSourceShape-mpGraphicPropertiesPtr )
@@ -275,7 +277,7 @@ void Shape::applyShapeReference( const Shape 
rReferencedShape, bool bUseText )
 else
 mpTextBody.reset();
 maShapeProperties = rReferencedShape.maShapeProperties;
-mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties( 
*rReferencedShape.mpLinePropertiesPtr.get() ) );
+mpShapeRefLinePropPtr = LinePropertiesPtr( new LineProperties( 
*rReferencedShape.mpLinePropertiesPtr.get() ) );
 mpShapeRefFillPropPtr = FillPropertiesPtr( new FillProperties( 
*rReferencedShape.mpFillPropertiesPtr.get() ) );
 mpCustomShapePropertiesPtr = CustomShapePropertiesPtr( new 
CustomShapeProperties( *rReferencedShape.mpCustomShapePropertiesPtr.get() ) );
 mpTablePropertiesPtr = table::TablePropertiesPtr( 
rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( 
*rReferencedShape.mpTablePropertiesPtr.get() ) : NULL );
@@ -539,6 +541,7 @@ Reference XShape  Shape::createAndInsert(
 
 // First apply reference shape's properties (shape on the master slide)
 aFillProperties.assignUsed( *mpShapeRefFillPropPtr );
+aLineProperties.assignUsed( *mpShapeRefLinePropPtr );
 
 if( pTheme )
 {
diff --git a/sd/qa/unit/data/pptx/ShapeLineProperties.pptx 
b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
new file mode 100644
index 000..36ece8c
Binary files /dev/null and b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx 
differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 774d6b8..70be8e5 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -26,6 +26,9 @@
 #include svx/svdoole2.hxx
 #include svx/svdotable.hxx
 #include svx/xflclit.hxx
+#include svx/xlineit0.hxx
+#include svx/xlnclit.hxx
+#include svx/xlnwtit.hxx
 #include animations/animationnodehelper.hxx
 #include sax/tools/converter.hxx
 
@@ -70,6 +73,7 @@ public:
 void testCreationDate();
 void testBnc584721_4();
 void testBnc904423();
+void testShapeLineStyle();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
 CPPUNIT_TEST(testDocumentLayout);
@@ -90,6 +94,7 @@ public:
 CPPUNIT_TEST(testCreationDate);
 CPPUNIT_TEST(testBnc584721_4);
 CPPUNIT_TEST(testBnc904423);
+CPPUNIT_TEST(testShapeLineStyle);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -787,6 +792,74 @@ void SdFiltersTest::testBnc904423()
 xDocShRef-DoClose();
 }
 
+void SdFiltersTest::testShapeLineStyle()
+{
+// Here the problem was that different line properties were applied in 
wrong order on the shape
+// Right order: 1) master slide line style, 2) theme, 3) direct formatting
+::sd::DrawDocShellRef

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - cui/source officecfg/registry sw/source

2014-11-28 Thread Michael Stahl

 cui/source/tabpages/paragrph.cxx|2 +-
 officecfg/registry/data/org/openoffice/Office/Embedding.xcu |4 +++-
 sw/source/ui/utlui/uitool.cxx   |5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit d3269c49fc685c342b3baa128667c77dd782e81b
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 27 23:38:38 2014 +0100

fdo#70861: cui: fix crash in SvxExtParagraphTabPage

SvxExtParagraphTabPage::Reset() must not request a pool default for
SID_ATTR_PARA_PAGENUM because it simply does not exist; the item is
backed by a member of SwPageDesc in Writer.

(cherry picked from commit 9c1a1b98776ca2216d82af303394a09f2bac0471)

Conflicts:
cui/source/tabpages/paragrph.cxx

Change-Id: I9b157f048cd986566f9b01f3677b53d5974b6c8d

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index f8e7db1..5d564c1 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1562,7 +1562,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet 
rSet )
 
 _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
 
-if ( rSet.GetItemState(_nWhich) = SFX_ITEM_AVAILABLE )
+if ( rSet.GetItemState(_nWhich) = SFX_ITEM_SET )
 {
 const sal_uInt16 nPageNum =
 ( (const SfxUInt16Item)rSet.Get( _nWhich ) ).GetValue();
commit a8408afb3856a57f6ba7ab49b699c13343d22c90
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Nov 28 08:36:15 2014 +0100

Revert fdo#70861 SwToSfxPageDescAttr: fix call to SvxExtParagraphTabPage

This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.

diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 512d0bd..e0c4a36 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -642,10 +642,9 @@ void SwToSfxPageDescAttr( SfxItemSet rCoreSet )
 bPut = false;
 }
 
-// TODO for now always pass a page number to cui, it can't make a
-// difference between 0 and no page number at the moment.
+if (oNumOffset)
 {
-SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset ? 
oNumOffset.get() : 0 );
+SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() );
 rCoreSet.Put( aPageNum );
 }
 
commit acba3681deaedc3be6ae8bd416b4d308451e84ab
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Nov 26 15:42:46 2014 +

Resolves: fdo#75408 go back to the old way of doing things

Revert Resolves: rhbz#1012353 fdo#48846 allow starmath objects to be 
resized

This reverts commit 1b717e5686f34c3ce798310a6216f7ea98fb2cd9.

Change-Id: Iaf8410fc1e5611cda04356d32e37ee25a7f59898
(cherry picked from commit 51221bbf0c7cca0a329393dac2059818006ab338)
(cherry picked from commit 2babe1baf46dcad936703d12cbd847393f5e467b)

diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu 
b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index 44031e8..e39af5d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -236,7 +236,9 @@
   prop oor:name=ObjectDocumentServiceName
 valuecom.sun.star.formula.FormulaProperties/value
   /prop
-  prop oor:name=ObjectMiscStatus/
+  prop oor:name=ObjectMiscStatus
+value8589934592/value
+  /prop
   prop oor:name=ObjectVerbs
 valuePRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS/value
   /prop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-28 Thread Caolán McNamara

 sc/source/ui/view/gridwin.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f66fa733ffcf58f86a0100be89c5ed14600cca12
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Nov 19 16:39:55 2014 +

Resolves: rhbz#1165444 abrt crash with NULL pView

Change-Id: I37f02f16209f274cf0358defba6bfa109948990f
(cherry picked from commit 755209d88073fd497b884b8de1348ec75c2df7eb)

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 4121f7d..942f142 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5262,12 +5262,9 @@ bool ScGridWindow::GetEditUrl( const Point rPos,
 ScInputHandler* pInputHdl = NULL;
 if (pViewSh)
 pInputHdl = pViewSh-GetInputHandler();
-
-if (pInputHdl  pInputHdl-IsInputMode())
-{
-EditView* pView = pInputHdl-GetTableView();
+EditView* pView = (pInputHdl  pInputHdl-IsInputMode()) ? 
pInputHdl-GetTableView() : NULL;
+if (pView)
 return extractURLInfo(pView-GetFieldUnderMousePointer(), pName, pUrl, 
pTarget);
-}
 
 //! nPosX/Y mit uebergeben?
 SCsCOL nPosX;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-28 Thread Christian Lohmaier

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

New commits:
commit a63448e1991968ce69ded903e30cb76ad3cfae2a
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Nov 28 23:33:52 2014 +0100

Updated core
Project: translations  4c97a576edaa75a013dbbfdc472324131e961298

diff --git a/translations b/translations
index 3f6da2a..4c97a57 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3f6da2afc8cd96d196fab9a9c33f3755f2c38225
+Subproject commit 4c97a576edaa75a013dbbfdc472324131e961298
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 7 commits - readlicense_oo/license sc/source sw/source writerfilter/qa writerfilter/source xmloff/source

2014-11-28 Thread Eike Rathke

 readlicense_oo/license/CREDITS.fodt
|19213 +-
 sc/source/core/data/column3.cxx
|3 
 sc/source/ui/view/viewdata.cxx 
|   17 
 sw/source/core/crsr/swcrsr.cxx 
|   14 
 sw/source/core/doc/docruby.cxx 
|2 
 sw/source/filter/html/htmlfldw.cxx 
|2 
 
writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
 |   62 
 
writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
 |   62 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx 
|   87 
 xmloff/source/draw/ximpshap.cxx
|   32 
 10 files changed, 11213 insertions(+), 8281 deletions(-)

New commits:
commit 26de998d1950ec3ddf1aec2c45f1f11932f2b2b2
Author: Eike Rathke er...@redhat.com
Date:   Fri Nov 28 23:47:02 2014 +0100

set only valid positions from ScExtTabSettings at ScViewDataTable

Some address fields of ScExtTabSettings are initialized invalid and
maybe kept invalid, on purpose, so take care of that and use only the
valid fields.

Change-Id: I37cbf8ff49c6ccf38bfac3e1c8c6492ac7bad61b
(cherry picked from commit 8bc56801af0540c0496c1f8ddd335578a8791017)
Reviewed-on: https://gerrit.libreoffice.org/13184
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 414f07f..dee7139 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2486,10 +2486,19 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions 
rDocOpt )
 bool bVSplit = bFrozen ? (rTabSett.maFreezePos.Row()  0) : 
(rTabSett.maSplitPos.Y()  0);
 
 // first visible cell of top-left pane and additional panes
-rViewTab.nPosX[ SC_SPLIT_LEFT ] = rTabSett.maFirstVis.Col();
-rViewTab.nPosY[ bVSplit ? SC_SPLIT_TOP : SC_SPLIT_BOTTOM ] = 
rTabSett.maFirstVis.Row();
-if( bHSplit ) rViewTab.nPosX[ SC_SPLIT_RIGHT ] = 
rTabSett.maSecondVis.Col();
-if( bVSplit ) rViewTab.nPosY[ SC_SPLIT_BOTTOM ] = 
rTabSett.maSecondVis.Row();
+if (rTabSett.maFirstVis.IsValid())
+{
+rViewTab.nPosX[ SC_SPLIT_LEFT ] = rTabSett.maFirstVis.Col();
+rViewTab.nPosY[ bVSplit ? SC_SPLIT_TOP : SC_SPLIT_BOTTOM ] = 
rTabSett.maFirstVis.Row();
+}
+
+if (rTabSett.maSecondVis.IsValid())
+{
+if (bHSplit)
+rViewTab.nPosX[ SC_SPLIT_RIGHT ] = 
rTabSett.maSecondVis.Col();
+if (bVSplit)
+rViewTab.nPosY[ SC_SPLIT_BOTTOM ] = 
rTabSett.maSecondVis.Row();
+}
 
 // split mode, split and freeze position
 rViewTab.eHSplitMode = rViewTab.eVSplitMode = SC_SPLIT_NONE;
commit 7cc1ff54dd6ed817eced4f4355c05567c286406f
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Sat Nov 29 00:13:33 2014 +0100

update credits

Change-Id: I80b2c7ae8e17075219b6827590d3268ad2989478

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 19ea003..4e7f43a 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 ?xml version=1.0 encoding=UTF-8?
 
 office:document 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 
xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 
xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 
xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 
xmlns:config=urn:oas
 is:names:tc:opendocument:xmlns:config:1.0 
xmlns:ooo=http://openoffice.org/2004/office;

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

2014-11-26 Thread Eike Rathke

 sc/inc/tokenarray.hxx   |6 +
 sc/source/core/data/column4.cxx |2 +
 sc/source/core/data/table3.cxx  |4 +++
 sc/source/core/tool/token.cxx   |   43 
 4 files changed, 55 insertions(+)

New commits:
commit b38b0ba7bd6bc52dacc9a45199d6a6a951ae
Author: Eike Rathke er...@redhat.com
Date:   Mon Nov 24 23:29:32 2014 +0100

fix fdo#79441 again and keep references to other sheets during sort

... also if other references are not updated. References to other sheets
are never to be treated as relative during sort, they are always
absolute, even if they have relative row/column part references.

Broken again during the big sort mess. Even if there was a unit test,
which didn't help as it got disabled / adapted to the change..

(cherry picked from commit f0e7364603c9566bc158303c515c3274ccba62ca)

Backported.

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

diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index fbb613c..75451e1 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -208,6 +208,12 @@ public:
 void AdjustReferenceOnMovedOrigin( const ScAddress rOldPos, const 
ScAddress rNewPos );
 
 /**
+ * Adjust all internal references on base position change if they point to
+ * a sheet other than the one of rOldPos.
+ */
+void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress rOldPos, 
const ScAddress rNewPos );
+
+/**
  * Clear sheet deleted flag from internal reference tokens if the sheet
  * index falls within specified range.  Note that when a reference is on a
  * sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 568b5b64..10bec05 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -454,6 +454,8 @@ public:
 pCell-aPos.SetRow(nRow);
 if (mbUpdateRefs)
 pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos, 
pCell-aPos);
+else
+
pCell-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos, 
pCell-aPos);
 }
 else
 {
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 99d6239..e49a4dc 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -870,6 +870,10 @@ void ScTable::SortReorderByRow(
 pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
 pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos, 
aCellPos);
 }
+else
+{
+
pNew-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos, aCellPos);
+}
 
 sc::CellStoreType::iterator itBlk = 
rCellStore.push_back(pNew);
 }
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f78e1c1..3349434 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3599,6 +3599,49 @@ void ScTokenArray::AdjustReferenceOnMovedOrigin( const 
ScAddress rOldPos, const
 }
 }
 
+void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress 
rOldPos, const ScAddress rNewPos )
+{
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_castsize_t(nLen);
+for (; p != pEnd; ++p)
+{
+bool bAdjust = false;
+switch ((*p)-GetType())
+{
+case svExternalSingleRef:
+bAdjust = true; // always
+// fallthru
+case svSingleRef:
+{
+ScToken* pToken = static_castScToken*(*p);
+ScSingleRefData rRef = pToken-GetSingleRef();
+ScAddress aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (aAbs.Tab() != rOldPos.Tab());
+if (bAdjust)
+rRef.SetAddress(aAbs, rNewPos);
+}
+break;
+case svExternalDoubleRef:
+bAdjust = true; // always
+// fallthru
+case svDoubleRef:
+{
+ScToken* pToken = static_castScToken*(*p);
+ScComplexRefData rRef = pToken-GetDoubleRef();
+ScRange aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (rOldPos.Tab()  aAbs.aStart.Tab() || 
aAbs.aEnd.Tab()  rOldPos.Tab());
+if (bAdjust)
+rRef.SetRange(aAbs, rNewPos);
+}
+break;
+default:
+;
+}
+}
+}
+
 namespace {
 
 void clearTabDeletedFlag( ScSingleRefData

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

2014-11-25 Thread Eike Rathke

 sc/source/ui/undo/undosort.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 560c69f5268be0116691a625fcf66f9125055fcf
Author: Eike Rathke er...@redhat.com
Date:   Tue Nov 25 19:02:08 2014 +0100

fdo#86708 paint after Undo of Sort

Regression of 10fc138307afb4b39baddb0d56eb8e986e5d29ea that exchanged
the PostPaint with SetDirty, but the paint is also needed.

Change-Id: Ic3e81fa106f405568effaed71ab33b575b4c5c5c
(cherry picked from commit 5cec4ea827570a5bb0a368025f3733b841107d07)

diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx
index 4a00707..f86bdc2 100644
--- a/sc/source/ui/undo/undosort.cxx
+++ b/sc/source/ui/undo/undosort.cxx
@@ -49,6 +49,9 @@ void UndoSort::Execute( bool bUndo )
 rDoc.SetDirty(maParam.maSortRange);
 if (!aParam.mbUpdateRefs)
 rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED);
+
+pDocShell-PostPaint(maParam.maSortRange, PAINT_GRID);
+pDocShell-PostDataChanged();
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-23 Thread Zolnai Tamás

 svx/source/svdraw/svdograf.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit e398dda0da19614efb0c8f16d11f8f54d35f6270
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Sat Nov 22 22:01:25 2014 +0100

fdo#86573: Impress does not show pictures anymore

Regression from:
286e2f5c6ec829bc0987b1be7016699f7ef03e5e

Sometimes SdrGrafObj import the image file just as a
preview (with low resolution) and late when the real
picture is needed it just throws this preview and tries
to load the image again.
This preview works only with package URL so in this
case we should not forget that URL.

Plus an other related potential image loss situation:
- Image preview is thrown when we actually have no
package URL from we can import the image again.

(cherry picked from commit f0b28806eebb1477066d44de49b5d1d61a8e84cf)

Change-Id: Ib21f400eb6d28133e8598e6b201209e5dd1a976f

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index cb31fc2..33dbc5f 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -600,7 +600,7 @@ OUString SdrGrafObj::GetGrafStreamURL() const
 
 void SdrGrafObj::ForceSwapIn() const
 {
-if( mbIsPreview )
+if( mbIsPreview  pGraphic-HasUserData() )
 {
 // removing preview graphic
 const OUString aUserData( pGraphic-GetUserData() );
@@ -1409,9 +1409,15 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
 GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData))
 {
 const OUString aNewUserData( pGraphic-GetUserData() );
-
 pGraphic-SetGraphic( aGraphic );
-pGraphic-SetUserData();
+if( mbIsPreview )
+{
+pGraphic-SetUserData(aNewUserData);
+}
+else
+{
+pGraphic-SetUserData();
+}
 
 // Graphic successfully swapped in.
 pRet = GRFMGR_AUTOSWAPSTREAM_LOADED;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-23 Thread Aurimas Fišeras

 i18npool/source/localedata/data/lt_LT.xml |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 20105f4984421fdf98b5978e88025605069c9d31
Author: Aurimas FiÅ¡eras auri...@members.fsf.org
Date:   Sat Aug 23 11:56:42 2014 +0300

added EUR as default currency to Lithuanian locale

Change-Id: I08c82639da2acd5830fa69044b252217b69c5e62
Reviewed-on: https://gerrit.libreoffice.org/11089
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit a150d06bc5cda4f18364256af859fd3e1ee70b4b)
Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/i18npool/source/localedata/data/lt_LT.xml 
b/i18npool/source/localedata/data/lt_LT.xml
index a7f8717..97839ab 100644
--- a/i18npool/source/localedata/data/lt_LT.xml
+++ b/i18npool/source/localedata/data/lt_LT.xml
@@ -413,7 +413,14 @@
 /Calendar
   /LC_CALENDAR
   LC_CURRENCY
-Currency default=true usedInCompatibleFormatCodes=true
+Currency default=true usedInCompatibleFormatCodes=false
+  CurrencyIDEUR/CurrencyID
+  CurrencySymbolâ¬/CurrencySymbol
+  BankSymbolEUR/BankSymbol
+  CurrencyNameEuras/CurrencyName
+  DecimalPlaces2/DecimalPlaces
+/Currency
+Currency default=false usedInCompatibleFormatCodes=true
   CurrencyIDLTL/CurrencyID
   CurrencySymbolLt/CurrencySymbol
   BankSymbolLTL/BankSymbol
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-23 Thread Aurimas Fišeras

 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   11 +++
 sc/source/core/tool/interpr2.cxx   |3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 2894cd72dd356cb113cd229a12e2a2c3bb398bd8
Author: Aurimas FiÅ¡eras auri...@members.fsf.org
Date:   Sat Aug 23 11:50:56 2014 +0300

added Lithuanian LTL to EUROCONVERT(), CONVERT()

Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
Reviewed-on: https://gerrit.libreoffice.org/11088
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4)
Reviewed-on: https://gerrit.libreoffice.org/12463
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu 
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 190766e..a62d065 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -217,6 +217,17 @@
 value0.702804/value
   /prop
 /node
+node oor:name=CR19 oor:op=replace
+  prop oor:name=FromUnit
+valueEUR/value
+  /prop
+  prop oor:name=ToUnit
+valueLTL/value
+  /prop
+  prop oor:name=Factor
+value3.45280/value
+  /prop
+/node
   /node
   node oor:name=Calculate
 node oor:name=Other
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index d13f1e6..8867c0a 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2563,7 +2563,8 @@ static bool lclConvertMoney( const OUString aSearchUnit, 
double rfRate, int r
 { CYP, 0.585274, 2 },
 { SKK, 30.1260,  2 },
 { EEK, 15.6466,  2 },
-{ LVL, 0.702804, 2 }
+{ LVL, 0.702804, 2 },
+{ LTL, 3.45280,  2 }
 };
 
 const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( 
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-23 Thread Noel Grandin

 cui/source/customize/cfg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f97025d1c6db6fb0bde601d48005399a9422e7c9
Author: Noel Grandin n...@peralex.com
Date:   Mon Nov 10 12:16:41 2014 +0200

fdo#76658 fix bad conversion of old-style UNO service..

in my commit 0394cb37a2d378511f265004b285fd93df37e5ca
fdo#46808, Convert ui::ImageManager to new style

Change-Id: I77d3189723403221e7388969b1eb892a244b90af
Signed-off-by: Stephan Bergmann sberg...@redhat.com
(cherry picked from commit 00ddedcb477ed09b5649e816b629234d5689b861)
Reviewed-on: https://gerrit.libreoffice.org/13069
Reviewed-by: Maxim Monastirsky momonas...@gmail.com
Tested-by: Maxim Monastirsky momonas...@gmail.com

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index c646ec6..9c4e1e8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5015,6 +5015,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window 
*pWindow,
 aProp[ 1 ] = aPropValue;
 
 m_xImportedImageManager = css::ui::ImageManager::create( xComponentContext 
);
+m_xImportedImageManager-initialize(aProp);
 
 ImageInfo mImageInfo;
 uno::Sequence OUString  names;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-23 Thread Andras Timar

 linguistic/source/spelldsp.cxx |   44 +++--
 1 file changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 278c12762c6990c4c6918b8002f89a9810d1e37d
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Nov 3 12:03:48 2014 +0100

fdo#61167 suggest titlecase and uppercase words from exception dict

Change-Id: I280ffed996814e246ac3e93de5ff0acaad84018c

diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index bd99519..f9005ce 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -651,7 +651,7 @@ Reference XSpellAlternatives  
SpellCheckerDispatcher::spell_Impl(
 Reference XDictionaryEntry  xTmp( lcl_GetRulingDictionaryEntry( 
aChkWord, nLanguage ) );
 if (xTmp.is())
 {
-if (xTmp-isNegative())// positive entry found
+if (xTmp-isNegative())// negative entry found
 {
 eFailureType = SpellFailure::IS_NEGATIVE_WORD;
 
@@ -671,6 +671,46 @@ Reference XSpellAlternatives  
SpellCheckerDispatcher::spell_Impl(
 eFailureType = -1;  // no failure
 }
 }
+else
+{
+setCharClass(LanguageTag(nLanguage));
+sal_uInt16 ct = capitalType(aChkWord, pCharClass);
+if (ct == CAPTYPE_INITCAP || ct == CAPTYPE_ALLCAP)
+{
+Reference XDictionaryEntry  xTmp2( 
lcl_GetRulingDictionaryEntry( makeLowerCase(aChkWord, pCharClass), nLanguage ) 
);
+if (xTmp2.is())
+{
+if (xTmp2-isNegative())// negative entry found
+{
+eFailureType = SpellFailure::IS_NEGATIVE_WORD;
+
+// replacement text to be added to suggestions, if 
not empty
+OUString aAddRplcTxt( xTmp2-getReplacementText() 
);
+
+// replacement text must not be in negative 
dictionary itself
+if (!aAddRplcTxt.isEmpty() 
+!SearchDicList( xDList, aAddRplcTxt, 
nLanguage, false, true ).is())
+{
+switch ( ct )
+{
+case CAPTYPE_INITCAP:
+aProposalList.Prepend( 
pCharClass-titlecase(aAddRplcTxt) );
+break;
+case CAPTYPE_ALLCAP:
+aProposalList.Prepend( 
pCharClass-uppercase(aAddRplcTxt) );
+default:
+aProposalList.Prepend( aAddRplcTxt );
+}
+}
+}
+else// positive entry found
+{
+xRes = NULL;
+eFailureType = -1;  // no failure
+}
+}
+}
+}
 }
 
 if (eFailureType != -1) // word misspelled or found in negative 
user-dictionary
@@ -683,7 +723,7 @@ Reference XSpellAlternatives  
SpellCheckerDispatcher::spell_Impl(
 Sequence OUString  aProposals = aProposalList.GetSequence();
 
 // remove entries listed in negative dictionaries
-// (we don't want to display suggestions that will be regarded as 
misspelledlater on)
+// (we don't want to display suggestions that will be regarded as 
misspelled later on)
 if (bCheckDicsxDList.is())
 SeqRemoveNegEntries( aProposals, xDList, nLanguage );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - basic/source editeng/source officecfg/registry svx/source

2014-11-22 Thread Tomofumi Yagi

 basic/source/runtime/methods.cxx   |5 +-
 editeng/source/editeng/editdoc.cxx |2 -
 officecfg/registry/data/org/openoffice/VCL.xcu |   16 
 svx/source/table/tablecontroller.cxx   |   46 +
 4 files changed, 45 insertions(+), 24 deletions(-)

New commits:
commit ae09c6f74b9a18d7d1ef2c51535f327ae3e2d3d1
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Nov 15 20:26:15 2014 +0900

fdo#77971 Writer:Better font selection in Japanese locale on Mac OSX.

This patch resolves the problem that Basic fonts(Asian) are Arial
Unicode MS in Japanese locale on Mac OSX.
Expected behavior is that Basic fonts(Asian) are Hiragino Mincho ProN
font.

LibreOffice 4.1 and later, on Mac OS X, the font family names are kept
without suffix(e.g. w3, w6) in the system font list.
Some font names in VCL.xcu (font family name including the weight
as suffix) doesn't match the font name kept in the system font list.

This problem reproduces at the CJK fonts environment.
This patch resolves this problem with Japanese fonts environment only.

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

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index ec48498..457ac10 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -212,31 +212,31 @@
 /node
 node oor:name=ja oor:op=replace
   prop oor:name=CJK_TEXT oor:type=xs:string oor:op=replace
-valueHG ææL Sun;HG MinchoL Sun;HG Pã´ã·ãã¯B Sun;HG-PGothicB 
Sun;HG Pã´ã·ãã¯B;HG-PGothicB;HG Mincho Light J;ï¼ï¼³ 
ï¼°ææ;ãã©ã®ãææ ProN W3;ãã©ã®ãææ Pro W3;UmePlus P 
Gothic;TLPææ;LXææ;HGPMinchoL;IPA Pææ;æ±é¢¨ææ;Kochi 
Mincho;ãããªã¿ææ;Mincho;Serif/value
+valueHG ææL Sun;HG MinchoL Sun;HG Pã´ã·ãã¯B Sun;HG-PGothicB 
Sun;HG Pã´ã·ãã¯B;HG-PGothicB;HG Mincho Light J;ï¼ï¼³ 
ï¼°ææ;ãã©ã®ãææ ProN;ãã©ã®ãææ Pro;UmePlus P 
Gothic;TLPææ;LXææ;HGPMinchoL;IPA Pææ;æ±é¢¨ææ;Kochi 
Mincho;ãããªã¿ææ;Mincho;Serif/value
   /prop
   prop oor:name=CJK_HEADING oor:type=xs:string oor:op=replace
-valueHG ææL Sun;HG ææL;HG Mincho Light J;ï¼ï¼³ 
ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN W3;ãã©ã®ãè§ã´ Pro 
W3;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA 
Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Gothic;ï¼ï¼³ 
ææ;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ï¼ï¼³ ï¼°ææ;HG Mincho 
Light J;ï¼ï¼³ ã´ã·ãã¯;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ï¼ï¼³ 
ï¼°ã´ã·ãã¯;UmePlus P Gothic/value
+valueHG ææL Sun;HG ææL;HG Mincho Light J;ï¼ï¼³ 
ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN;ãã©ã®ãè§ã´ 
Pro;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA 
Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Gothic;ï¼ï¼³ 
ææ;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ï¼ï¼³ ï¼°ææ;HG Mincho 
Light J;ï¼ï¼³ ã´ã·ãã¯;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ï¼ï¼³ 
ï¼°ã´ã·ãã¯;UmePlus P Gothic/value
   /prop
   prop oor:name=CJK_PRESENTATION oor:type=xs:string oor:op=replace
-valueHG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG 
Pã´ã·ãã¯B;ãã©ã®ãææ ProN W3;ãã©ã®ãææ Pro 
W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼ï¼³ 
ï¼°ã´ã·ãã¯;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA 
Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;ï¼ï¼³ 
ã´ã·ãã¯;ï¼ï¼³ ï¼°ã´ã·ãã¯;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
+valueHG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG 
Pã´ã·ãã¯B;ãã©ã®ãææ ProN;ãã©ã®ãææ 
Pro;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼ï¼³ 
ï¼°ã´ã·ãã¯;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA 
Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;ï¼ï¼³ 
ã´ã·ãã¯;ï¼ï¼³ ï¼°ã´ã·ãã¯;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
   /prop
   prop oor:name=LATIN_PRESENTATION oor:type=xs:string 
oor:op=replace
 valueAndale;Arial/value
   /prop
   prop oor:name=CJK_SPREADSHEET oor:type=xs:string oor:op=replace
-valueHG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG 
Pã´ã·ãã¯B;HG-PGothicB;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN 
W3;ãã©ã®ãè§ã´ Pro W3;TLPã´ã·ãã¯;LXã´ã·ãã¯;ãã©ã®ãææ 
ProN W3;ãã©ã®ãææ Pro W3;HGPGothicB;IPA 
Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;UmePlus P 
Gothic;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic/value
+valueHG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG 
Pã´ã·ãã¯B;HG-PGothicB;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ 
ProN;ãã©ã®ãè§ã´

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

2014-11-20 Thread Eike Rathke

 sc/inc/column.hxx   |   12 +++-
 sc/source/core/data/column4.cxx |   10 ++
 sc/source/core/data/table3.cxx  |3 ++-
 3 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 73ebd5e227c284280219130ffe3f486c50023004
Author: Eike Rathke er...@redhat.com
Date:   Mon Nov 17 22:44:56 2014 +0100

fdo#83765 do not update references in SortReorderByColumn() if disabled

Similar to SortReorderByRow()

(cherry picked from commit 115a4b7ca36f65d93070d2e81048320d202e87a3)

Conflicts:
sc/inc/column.hxx

Change-Id: I11dd710c00a56a5f56aeb048fa2258631555a220

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 66cd524..4bda39d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -575,18 +575,20 @@ public:
 
 /**
  * Reset column position of formula cells within specified row range.
- * Reference positions are also adjusted to reflect the new position so
- * that the formula cells still reference the same cells or ranges after
- * the the position change.  The position of a formula cell before the
- * call is interpreted as the old position of that cell.
+ * If bUpdateRefs==true then reference positions are also adjusted to
+ * reflect the new position so that the formula cells still reference the
+ * same cells or ranges after the the position change.
+ * The position of a formula cell before the call is interpreted as the old
+ * position of that cell.
  *
  * Caller needs to ensure that no formula groups cross the top and bottom
  * row boundaries.
  *
  * @param nRow1 top row boundary
  * @param nRow2 bottom row boundary
+ * @param bUpdateRefs whether to adjust references
  */
-void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 );
+void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2, bool bUpdateRefs 
);
 
 void SplitFormulaGroupByRelativeRef( const ScRange rBoundRange );
 
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 8b46e74..568b5b64 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -439,8 +439,9 @@ namespace {
 class FormulaColPosSetter
 {
 SCCOL mnCol;
+bool  mbUpdateRefs;
 public:
-FormulaColPosSetter( SCCOL nCol ) : mnCol(nCol) {}
+FormulaColPosSetter( SCCOL nCol, bool bUpdateRefs ) : mnCol(nCol), 
mbUpdateRefs(bUpdateRefs) {}
 
 void operator() ( size_t nRow, ScFormulaCell* pCell )
 {
@@ -451,7 +452,8 @@ public:
 ScAddress aOldPos = pCell-aPos;
 pCell-aPos.SetCol(mnCol);
 pCell-aPos.SetRow(nRow);
-pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos, 
pCell-aPos);
+if (mbUpdateRefs)
+pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos, 
pCell-aPos);
 }
 else
 {
@@ -463,9 +465,9 @@ public:
 
 }
 
-void ScColumn::ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 )
+void ScColumn::ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2, bool 
bUpdateRefs )
 {
-FormulaColPosSetter aFunc(nCol);
+FormulaColPosSetter aFunc(nCol, bUpdateRefs);
 sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
 }
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index d646678..99d6239 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -716,8 +716,9 @@ void ScTable::SortReorderByColumn(
 }
 
 // Reset formula cell positions which became out-of-sync after column 
reordering.
+bool bUpdateRefs = pArray-IsUpdateRefs();
 for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
-aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2);
+aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2, bUpdateRefs);
 
 // Set up column reorder map (for later broadcasting of reference updates).
 sc::ColRowReorderMapType aColMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - svx/source sw/CppunitTest_sw_odfexport.mk sw/qa sw/source

2014-11-16 Thread Zolnai Tamás

 svx/source/svdraw/svdograf.cxx|
2 
 sw/CppunitTest_sw_odfexport.mk|
4 
 sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt 
|binary
 sw/qa/extras/odfexport/odfexport.cxx  |   
50 ++
 sw/source/core/graphic/ndgrf.cxx  |
4 
 5 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 2080fad9ed431b9d78f292fa14d31fef2c244287
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Sun Nov 16 21:33:56 2014 +0100

Related fdo#82953: Forget package URL of image after it is loaded

It causes problems if we handle those imported images differently which
are identified by a package URL, so after the first load remove
this URL and handle images on the same way as inserted images.

Some related bugs:
* #i44367#
* #i124946#
* #i114361#
* fdo#73270

The image in the test document has a special ID which is different
from that one which is generated by LO internally so after ODF export
the new generated image URL is different from the imported one.

(cherry picked from commit 286e2f5c6ec829bc0987b1be7016699f7ef03e5e)

Change-Id: I4e7d3490674c5f86bec5c7c6e1c975dcafd7c265

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 0446977..cb31fc2 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1411,7 +1411,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
 const OUString aNewUserData( pGraphic-GetUserData() );
 
 pGraphic-SetGraphic( aGraphic );
-pGraphic-SetUserData( aNewUserData );
+pGraphic-SetUserData();
 
 // Graphic successfully swapped in.
 pRet = GRFMGR_AUTOSWAPSTREAM_LOADED;
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 8c0842e..1a08488 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -79,6 +79,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
 xmloff/util/xo \
 ))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\
+officecfg/registry \
+))
+
 $(eval $(call gb_CppunitTest_use_configuration,sw_odfexport))
 
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport))
diff --git 
a/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt 
b/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt
new file mode 100644
index 000..867c075
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt 
differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 5ef7ca4..a0ddfe5 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -13,6 +13,9 @@
 #include com/sun/star/awt/Gradient.hpp
 #include com/sun/star/drawing/FillStyle.hpp
 #include com/sun/star/table/ShadowFormat.hpp
+#include com/sun/star/awt/XBitmap.hpp
+#include com/sun/star/graphic/XGraphic.hpp
+#include officecfg/Office/Common.hxx
 
 class Test : public SwModelTestBase
 {
@@ -310,6 +313,53 @@ DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow, 
textframe-transparent-sh
 CPPUNIT_ASSERT_EQUAL(sal_Int32(25), getPropertysal_Int32(xPicture, 
ShadowTransparence));
 }
 
+DECLARE_ODFEXPORT_TEST(testImageWithSpecialID, 
document_with_two_images_with_special_IDs.odt)
+{
+// Here the problem was that LO did not handle well those image URLs in 
the ODT file which are
+// not match with that one which is generated by LO internaly (based on 
the image's size, type and so on)
+
+// Trigger swap out mechanism to test swapped state factor too.
+boost::shared_ptr comphelper::ConfigurationChanges  
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
 batch);
+batch-commit();
+
+uno::Referencedrawing::XShape xImage = getShape(1);
+uno::Reference beans::XPropertySet  XPropSet( xImage, 
uno::UNO_QUERY_THROW );
+// Check URL
+{
+OUString sURL;
+XPropSet-getPropertyValue(GraphicURL) = sURL;
+CPPUNIT_ASSERT(sURL != 
OUString(vnd.sun.star.GraphicObject:));
+}
+// Check size
+{
+uno::Referencegraphic::XGraphic xGraphic;
+XPropSet-getPropertyValue(Graphic) = xGraphic;
+uno::Referenceawt::XBitmap xBitmap(xGraphic, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xBitmap.is());
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(610), 
xBitmap-getSize().Width );
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(381), 
xBitmap-getSize().Height );
+}
+// Second Image
+xImage =

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

2014-11-10 Thread Andras Timar

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

New commits:
commit 24253481d0f3075cd7f3670e3ed7806d61094360
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Nov 10 12:19:16 2014 -0800

Bump version to 4.2-19

Change-Id: Ie02193db64ea94de1f1df6a2e2aa6d13ddbd72e2

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

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

2014-11-10 Thread Andras Timar

 sw/qa/extras/ww8export/ww8export.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc20268b0290cc1a3968121c12257c4be9fe3645
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Nov 10 23:01:28 2014 +0100

buildfix: sw ww8 export unit test

Change-Id: I011bea4f6da37e180446447dee1b79eee7bbd918

diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index b4037ed..ef3b04e 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -214,8 +214,6 @@ DECLARE_WW8EXPORT_TEST(testFdo59530, fdo59530.doc)
 CPPUNIT_ASSERT_EQUAL(OUString(TextFieldEnd), 
getPropertyOUString(xPropertySet, TextPortionType));
 }
 
-#endif
-
 DECLARE_WW8EXPORT_TEST(testBnc636128, bnc636128.doc)
 {
 // Import / export of FFData.cch was missing.
@@ -225,6 +223,8 @@ DECLARE_WW8EXPORT_TEST(testBnc636128, bnc636128.doc)
 CPPUNIT_ASSERT_EQUAL(OUString(5), 
xParameters-getByName(MaxLength).getOUString());
 }
 
+#endif
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-05 Thread Marco Cecchetti

 sd/source/ui/inc/ViewShellManager.hxx  |4 
 sd/source/ui/view/ViewShellManager.cxx |   24 +++-
 sd/source/ui/view/drviews1.cxx |9 +
 sd/source/ui/view/outlview.cxx |   11 ++-
 4 files changed, 42 insertions(+), 6 deletions(-)

New commits:
commit 613d312d771840225d75d2d61c66ffa614f66198
Author: Marco Cecchetti mrcek...@gmail.com
Date:   Wed Nov 5 20:15:32 2014 +0100

fix bnc#624546 (fdo#83773) slide pane cut/copy/paste in outline view

Problem:
When I'm in outline mode, if I select a slide in the left slide preview
pane, ctrl-c, then select another slide I would like it after and hit
ctrl-v; it refuses to cut/paste.

Analysis:
This issue is due to the fact that the outline view always grabs focus
when activated and a view is activated whenever is pushed to the
sfx shell stack even if it is not the new top-most active view shell
(see `ViewShellManager`, `SfxViewShell`, `SfxDispacther`).

Solution:
Make the `OutlineViewShell` grabs focus only if it is the top-most
active view shell.

Rationale:
When `OutlineViewShell::Activate` is invoked, instead of removing
the focus grabbing action completely, we check if the
`OutlineViewShell` instance is the the top-most view shell and
perform the focus grabbing action only in such a case. This change
required to have also the `DrawViewShell` grabbing focus on
activation (only when it is the top-most view shell). In order to
implement this solution I needed to add a new method (and data
member) to the `ViewShellManager` class. I named it
`GetTopViewShell`. This method returns a pointer to the top-most
active view shell of the internal stack. The returned pointer is
updated in the `UpdateShellStack` method, before the sfx shell
stack is updated.

For more details see :
https://gist.github.com/mcecchetti/15b3ebc505d6582ea0db

(cherry picked from commit 967a386bccb15b99915a1e878e42450fbe9a2d0e)
Signed-off-by: Andras Timar andras.ti...@collabora.com

Conflicts:
sd/source/ui/view/ViewShellManager.cxx

Change-Id: I619a406864f50f0e62dee3fcb9ac5d46e3d48272

diff --git a/sd/source/ui/inc/ViewShellManager.hxx 
b/sd/source/ui/inc/ViewShellManager.hxx
index 18ac6eb..926dbf8 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -165,6 +165,10 @@ public:
 */
 SfxShell* GetTopShell (void) const;
 
+/** Return the top-most active view shell on the internal shell stack.
+*/
+SfxShell* GetTopViewShell (void) const;
+
 /** Use this class to safely lock updates of the view shell stack.
 */
 class UpdateLock
diff --git a/sd/source/ui/view/ViewShellManager.cxx 
b/sd/source/ui/view/ViewShellManager.cxx
index bfb8ef8..21c5aa5 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -126,6 +126,7 @@ public:
 void MoveToTop (const SfxShell rParentShell);
 SfxShell* GetShell (ShellId nId) const;
 SfxShell* GetTopShell (void) const;
+SfxShell* GetTopViewShell (void) const;
 void Shutdown (void);
 void InvalidateAllSubShells (const SfxShell* pParentShell);
 
@@ -203,6 +204,8 @@ private:
 bool mbFormShellAboveParent;
 
 SfxShell* mpTopShell;
+SfxShell* mpTopViewShell;
+
 
 void GatherActiveShells (ShellStack rShellList);
 
@@ -386,8 +389,13 @@ SfxShell* ViewShellManager::GetTopShell (void) const
 return NULL;
 }
 
-
-
+SfxShell* ViewShellManager::GetTopViewShell (void) const
+{
+if (mbValid)
+return mpImpl-GetTopViewShell();
+else
+return NULL;
+}
 
 void ViewShellManager::Shutdown (void)
 {
@@ -431,7 +439,8 @@ ViewShellManager::Implementation::Implementation (
   mpFormShell(NULL),
   mpFormShellParent(NULL),
   mbFormShellAboveParent(true),
-  mpTopShell(NULL)
+  mpTopShell(NULL),
+  mpTopViewShell(NULL)
 {
 (void)rManager;
 }
@@ -815,8 +824,10 @@ SfxShell* ViewShellManager::Implementation::GetTopShell 
(void) const
 return mpTopShell;
 }
 
-
-
+SfxShell* ViewShellManager::Implementation::GetTopViewShell (void) const
+{
+return mpTopViewShell;
+}
 
 void ViewShellManager::Implementation::LockUpdate (void)
 {
@@ -867,6 +878,9 @@ void ViewShellManager::Implementation::UpdateShellStack 
(void)
 // 1. Create the missing shells.
 CreateShells();
 
+// Update the pointer to the top-most active view shell.
+mpTopViewShell = maActiveViewShells.begin()-mpShell;
+
 
 // 2. Create the internal target stack.
 ShellStack aTargetStack;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index bffde5d..2c949bf 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -91,6 +91,15 @@ namespace sd {
 void DrawViewShell::Activate(sal_Bool bIsMDIActivate)
 {

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

2014-11-04 Thread Miklos Vajna

 sw/qa/extras/ww8export/data/bnc636128.doc |binary
 sw/qa/extras/ww8export/ww8export.cxx  |   10 ++
 sw/source/filter/ww8/wrtww8.cxx   |   10 ++
 sw/source/filter/ww8/ww8par.hxx   |4 +++-
 sw/source/filter/ww8/ww8par3.cxx  |4 +++-
 5 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 282bd32aac90f81520a4dd5cbb13053f6dbf6ed7
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 4 15:36:02 2014 +0100

bnc#636128 DOC export: handle FFData.cch

Change-Id: Ia1a3a4ef5e61d8ed2a3bde689f3d2101525efc46
(cherry picked from commit 2ad1f195b875f2c1052c8ffab79602b9f6871ccb)

diff --git a/sw/qa/extras/ww8export/data/bnc636128.doc 
b/sw/qa/extras/ww8export/data/bnc636128.doc
new file mode 100644
index 000..5f92c3e
Binary files /dev/null and b/sw/qa/extras/ww8export/data/bnc636128.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 8a611e6..b4037ed 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -17,6 +17,7 @@
 #include com/sun/star/view/XViewSettingsSupplier.hpp
 #include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/text/GraphicCrop.hpp
+#include com/sun/star/text/XFormField.hpp
 
 class Test : public SwModelTestBase
 {
@@ -215,6 +216,15 @@ DECLARE_WW8EXPORT_TEST(testFdo59530, fdo59530.doc)
 
 #endif
 
+DECLARE_WW8EXPORT_TEST(testBnc636128, bnc636128.doc)
+{
+// Import / export of FFData.cch was missing.
+uno::Referencetext::XFormField xFormField = getProperty 
uno::Referencetext::XFormField (getRun(getParagraph(1), 2), Bookmark);
+uno::Referencecontainer::XNameContainer xParameters = 
xFormField-getParameters();
+// This resulted in a container.NoSuchElementException.
+CPPUNIT_ASSERT_EQUAL(OUString(5), 
xParameters-getByName(MaxLength).getOUString());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 7530668..ec558c9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3663,6 +3663,16 @@ void WW8Export::WriteFormData( const 
::sw::mark::IFieldmark rFieldmark )
 ffres = 0;
 }
 aFldHeader.bits |= ( (ffres2)  0x7C );
+if (type == 0) // iTypeText
+{
+sw::mark::IFieldmark::parameter_map_t::const_iterator pParameter = 
rFieldmark.GetParameters()-find(MaxLength);
+if (pParameter != rFieldmark.GetParameters()-end())
+{
+OUString aLength;
+pParameter-second = aLength;
+aFldHeader.cch = aLength.toUInt32();
+}
+}
 
 std::vector OUString  aListItems;
 if (type==2)
commit 3a40e9d4b2338e8650c921ff4c8c2bb9e7cba33b
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 4 12:37:45 2014 +0100

bnc#636128 DOC import: handle FFData.cch

(cherry picked from commit dfa26e6d489a2c5bd79652450a9f27343008d37f)

Conflicts:
sw/source/filter/ww8/ww8par3.cxx

Change-Id: I8020ce561a72f10b8f0f517d50407a802049bd48

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 696d103..a9cca62 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -625,7 +625,7 @@ public:
 WW8FormulaControl(const OUString rN, SwWW8ImplReader rR)
 : rRdr(rR), fUnknown(0), fDropdownIndex(0),
 fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0),
-fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN )
+fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), mnMaxLen(0), 
sName( rN )
 {
 }
 sal_uInt8 fUnknown:2;
@@ -642,6 +642,8 @@ public:
 sal_uInt16 nChecked;
 sal_uInt16 nDefaultChecked;
 
+/// FFData.cch in the spec: maximum length, in characters, of the value of 
the textbox.
+sal_uInt16 mnMaxLen;
 OUString sTitle;
 OUString sDefault;
 OUString sFormatting;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 25da902..22e305e 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -167,6 +167,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* 
pF, OUString rStr )
 maFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
 maFieldStack.back().getParameters()[Description] = 
uno::makeAny(OUString(aFormula.sToolTip));
 maFieldStack.back().getParameters()[Name] = 
uno::makeAny(OUString(aFormula.sTitle));
+if (aFormula.mnMaxLen)
+maFieldStack.back().getParameters()[MaxLength] = 
uno::makeAny(OUString::number(aFormula.mnMaxLen));
 }
 return FLD_TEXT;
 }
@@ -2199,7 +2201,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType 
nWhich,
 sal_uInt8 iRes = (bits1  0x7C)  2;
 
 sal_uInt16 cch = 0;
-*pDataStream  cch;
+*pDataStream

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sc/qa sc/source sw/source

2014-10-29 Thread Andras Timar

 sc/qa/unit/data/xls/external-ref.xls  |binary
 sc/qa/unit/subsequent_export-test.cxx |   22 ++
 sc/source/filter/excel/xehelper.cxx   |   10 ++
 sw/source/ui/docvw/edtwin.cxx |2 --
 4 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 24f95d7e82b0c7896994ed12cac5ab022fc32267
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Oct 28 12:13:55 2014 +0100

fdo#37960 fix shift+click to select multiple drawings

I simply didn't get the logic behind calling GotoNextFly(). It caused
not only this bug. For example Ctrl+click on a background text frame
did not select the text frame, but an image on the previous page.

Change-Id: I85ccbbda2f324de55417d6199b4abe79e59bf295

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 714734d..4289af4 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3673,8 +3673,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
  rSh.IsObjSelectable( aDocPos ) )  
!lcl_urlOverBackground( rSh, aDocPos ) )
 {
 SwMvContext aMvContext( rSh );
-if( !rSh.IsFrmSelected() )
-rSh.GotoNextFly();
 rSh.EnterSelFrmMode();
 bCallBase = false;
 }
commit 0a5597d120e561dc8ad72a0416af15f7fb273a67
Author: Andras Timar andras.ti...@collabora.com
Date:   Sat Oct 25 21:47:55 2014 +0200

bnc#893791 XLS export: external sheet references on Linux/OSX

The commit solves two problems.
1. Make sure we save absolute paths on Linux/OSX
2. Make sure we don't save invalid XLS (VirtualPath longer than 255 chars)
The first problem has always been there, so after a few load/save cycles
an XLS with reference to other XLS on a Unix-like file system became
invalid, and only LibreOffice could open it, Excel could not. These
broken XLS files can be repaired by saving after this patch, however,
the original reference will remain broken.

(cherry picked from commit 3f5251675ae56ea282fdeb09dbc53ce4aae6)

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

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

Change-Id: I8f575acb1d560d539c1da61a1afdaac3f0c13977

diff --git a/sc/qa/unit/data/xls/external-ref.xls 
b/sc/qa/unit/data/xls/external-ref.xls
new file mode 100644
index 000..21f3338
Binary files /dev/null and b/sc/qa/unit/data/xls/external-ref.xls differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index ad2e2ee..1b88b27 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -74,6 +74,8 @@ public:
 void testFormulaReferenceXLS();
 void testSheetProtectionXLSX();
 
+void testSupBookVirtualPath();
+
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
 #if !defined(MACOSX)  !defined(DRAGONFLY)
@@ -93,6 +95,9 @@ public:
 CPPUNIT_TEST(testFormulaReferenceXLS);
 CPPUNIT_TEST(testSheetProtectionXLSX);
 
+#if !defined(WNT)
+CPPUNIT_TEST(testSupBookVirtualPath);
+#endif
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -828,6 +833,23 @@ void ScExportTest::tearDown()
 test::BootstrapFixture::tearDown();
 }
 
+void ScExportTest::testSupBookVirtualPath()
+{
+ScDocShellRef xShell = loadDoc(external-ref., XLS);
+CPPUNIT_ASSERT(xShell.Is());
+
+ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+xShell-DoClose();
+CPPUNIT_ASSERT(xDocSh.Is());
+
+ScDocument* pDoc = xDocSh-GetDocument();
+
+if (!checkFormula(*pDoc, ScAddress(0,0,0), 
'file:///home/timar/Documents/external.xls'#$Sheet1.A1))
+CPPUNIT_FAIL(Wrong SupBook VirtualPath URL);
+
+xDocSh-DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xehelper.cxx 
b/sc/source/filter/excel/xehelper.cxx
index 98f8b12..d590988 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -913,6 +913,11 @@ OUString lclEncodeDosUrl(
 aBuf.append(EXC_URL_DOSDRIVE).append(cDrive);
 aOldUrl = aOldUrl.copy(3);
 }
+else
+{
+// URL probably points to a document on a Unix-like file system
+aBuf.append(EXC_URL_DRIVEROOT);
+}
 
 // directories
 sal_Int32 nPos = -1;
@@ -954,6 +959,11 @@ OUString lclEncodeDosUrl(
 if (pTableName)
 aBuf.append(*pTableName);
 
+// VirtualPath must be shorter than 255 chars ([MS-XLS].pdf 2.5.277)
+// It's better to truncate, than generate invalid file that Excel cannot 
open.
+if (aBuf.getLength()  255)
+aBuf.setLength(255);
+
 return aBuf.makeStringAndClear();
 }
 
___
Libreoffice-commits mailing

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

2014-10-27 Thread Kohei Yoshida

 sc/source/core/data/table3.cxx |   15 +
 sc/source/core/tool/token.cxx  |   67 +
 2 files changed, 76 insertions(+), 6 deletions(-)

New commits:
commit 800eb8025233c340b154843c074fd5b6e8d21d35
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Oct 27 07:32:32 2014 -0700

fdo#85282: Correct adjustment of range reference on delete  shift.

Change-Id: I6e01c160f77599dfa4a2e55b60e23d256184c822

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 7208d9d..f78e1c1 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2536,6 +2536,9 @@ void setRefDeleted( ScComplexRefData rRef, const 
sc::RefUpdateContext rCxt )
 
 bool shrinkRange( const sc::RefUpdateContext rCxt, ScRange rRefRange, const 
ScRange rDeletedRange )
 {
+if (!rDeletedRange.Intersects(rRefRange))
+return false;
+
 if (rCxt.mnColDelta  0)
 {
 // Shifting left.
@@ -2543,9 +2546,35 @@ bool shrinkRange( const sc::RefUpdateContext rCxt, 
ScRange rRefRange, const Sc
 // Deleted range is only partially overlapping in vertical 
direction. Bail out.
 return false;
 
-// Move the last column position to the left.
-SCCOL nDelta = rDeletedRange.aStart.Col() - rDeletedRange.aEnd.Col() - 
1;
-rRefRange.aEnd.IncCol(nDelta);
+if (rDeletedRange.aStart.Col() = rRefRange.aStart.Col())
+{
+if (rRefRange.aEnd.Col() = rDeletedRange.aEnd.Col())
+{
+// Reference is entirely deleted.
+rRefRange.SetInvalid();
+}
+else
+{
+// The reference range is truncated on the left.
+SCCOL nOffset = rDeletedRange.aStart.Col() - 
rRefRange.aStart.Col();
+SCCOL nDelta = rRefRange.aStart.Col() - 
rDeletedRange.aEnd.Col() - 1;
+rRefRange.aStart.IncCol(nOffset);
+rRefRange.aEnd.IncCol(nDelta+nOffset);
+}
+}
+else if (rDeletedRange.aEnd.Col()  rRefRange.aEnd.Col())
+{
+// Reference is deleted in the middle. Move the last column
+// position to the left.
+SCCOL nDelta = rDeletedRange.aStart.Col() - 
rDeletedRange.aEnd.Col() - 1;
+rRefRange.aEnd.IncCol(nDelta);
+}
+else
+{
+// The reference range is truncated on the right.
+SCCOL nDelta = rDeletedRange.aStart.Col() - rRefRange.aEnd.Col() - 
1;
+rRefRange.aEnd.IncCol(nDelta);
+}
 return true;
 }
 else if (rCxt.mnRowDelta  0)
@@ -2556,9 +2585,35 @@ bool shrinkRange( const sc::RefUpdateContext rCxt, 
ScRange rRefRange, const Sc
 // Deleted range is only partially overlapping in horizontal 
direction. Bail out.
 return false;
 
-// Move the last row position up.
-SCROW nDelta = rDeletedRange.aStart.Row() - rDeletedRange.aEnd.Row() - 
1;
-rRefRange.aEnd.IncRow(nDelta);
+if (rDeletedRange.aStart.Row() = rRefRange.aStart.Row())
+{
+if (rRefRange.aEnd.Row() = rDeletedRange.aEnd.Row())
+{
+// Reference is entirely deleted.
+rRefRange.SetInvalid();
+}
+else
+{
+// The reference range is truncated on the top.
+SCCOL nOffset = rDeletedRange.aStart.Row() - 
rRefRange.aStart.Row();
+SCCOL nDelta = rRefRange.aStart.Row() - 
rDeletedRange.aEnd.Row() - 1;
+rRefRange.aStart.IncRow(nOffset);
+rRefRange.aEnd.IncRow(nDelta+nOffset);
+}
+}
+else if (rDeletedRange.aEnd.Row()  rRefRange.aEnd.Row())
+{
+// Reference is deleted in the middle. Move the last row
+// position upward.
+SCCOL nDelta = rDeletedRange.aStart.Row() - 
rDeletedRange.aEnd.Row() - 1;
+rRefRange.aEnd.IncRow(nDelta);
+}
+else
+{
+// The reference range is truncated on the bottom.
+SCCOL nDelta = rDeletedRange.aStart.Row() - rRefRange.aEnd.Row() - 
1;
+rRefRange.aEnd.IncRow(nDelta);
+}
 return true;
 }
 
commit 452165fb459dd026b86de1e4b5fe0ade5beb3a83
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Oct 27 08:52:38 2014 -0700

fdo#85215: Ensure that formula broadcasting works after sort.

When the reference update on sort is turned off.

Change-Id: I547dd1525a638dd447fe331e22583af4a7947308
(cherry picked from commit 1eb82c78a223d9a0b2bb5c3f5c129c1ee8bdf303)

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 9a6069c..d646678 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -802,6 +802,15 @@ void ScTable::SortReorderByRow(
 ScSortInfoArray::RowsType*

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

2014-10-26 Thread Kohei Yoshida

 sc/source/core/data/table3.cxx |7 +--
 sc/source/ui/undo/undosort.cxx |3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 5f9fdfcf98b44a09d0a3d1bde4b7279fcd372c7f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Sun Oct 26 14:43:14 2014 -0700

fdo#85215: Don't adjust references wrt cell position when disabled.

Change-Id: Ie1a12cc189bcb66fad59ea9901ac0dc95bb68788
(cherry picked from commit 10fc138307afb4b39baddb0d56eb8e986e5d29ea)

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 589a9b1..9a6069c 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -855,8 +855,11 @@ void ScTable::SortReorderByRow(
 ScAddress aOldPos = rCell.maCell.mpFormula-aPos;
 
 ScFormulaCell* pNew = rCell.maCell.mpFormula-Clone( 
aCellPos, SC_CLONECELL_DEFAULT);
-pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
-pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos, 
aCellPos);
+if (pArray-IsUpdateRefs())
+{
+pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
+pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos, 
aCellPos);
+}
 
 sc::CellStoreType::iterator itBlk = 
rCellStore.push_back(pNew);
 }
diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx
index 36156fe..4a00707 100644
--- a/sc/source/ui/undo/undosort.cxx
+++ b/sc/source/ui/undo/undosort.cxx
@@ -46,8 +46,7 @@ void UndoSort::Execute( bool bUndo )
 
 ScUndoUtil::MarkSimpleBlock(pDocShell, maParam.maSortRange);
 
-pDocShell-PostPaint(maParam.maSortRange, PAINT_GRID);
-pDocShell-PostDataChanged();
+rDoc.SetDirty(maParam.maSortRange);
 if (!aParam.mbUpdateRefs)
 rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-24 Thread Andras Timar

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

New commits:
commit 1efecdfac65b5eafa7b56d8eafb70d39107144ce
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Oct 6 21:58:07 2014 +0200

Bump version to 4.2-17

Change-Id: If617f1ebf76d20fc79ce5e01b4e293fa3f6c37fd

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/CppunitTest_sw_odfimport.mk sw/qa sw/source

2014-10-24 Thread Miklos Vajna

 sw/CppunitTest_sw_odfimport.mk |3 ++
 sw/qa/extras/odfimport/data/bnc800714.fodt |   35 +
 sw/qa/extras/odfimport/odfimport.cxx   |   11 +
 sw/source/core/text/frmform.cxx|7 -
 4 files changed, 55 insertions(+), 1 deletion(-)

New commits:
commit 05e9de8d69dd9a2194f6f561fa77c0c61534e9a8
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Oct 14 16:31:13 2014 +0200

bnc#800714 SwTxtFrm::FormatAdjust: still call SplitFrm if we have columns

Regression from c5a8a2c3cbcee0175127a0662e3d820ea4deea22 (sw34bf05:
i#84870 - method SwTxtFrm::FormatAdjust(..) - do not split text frame
which only contains on as-character anchored object, 2011-03-11), the
i#84870 fix was for a document which didn't have columns, and didn't
consider that this causes a layout loop in case:

1) There are two paragraphs in a section, having multiple columns.

2) The second paragraph has fo:keep-together=always.

In this case originally we tried to call SplitFrm(), realized that it
didn't help, and then gave up. But after the change, we kept trying to
satisfy the two conflicting requirements (balance content in the 3
columns vs keep the second paragraph with the first one).

Fix the problem by not calling SplitFrm() only in case we're not inside
columns.

(cherry picked from commit 2d35baed5e87ffe7ca371986391cdb3983cdd2b1)

Conflicts:
sw/CppunitTest_sw_odfimport.mk
sw/qa/extras/odfimport/odfimport.cxx

Change-Id: I64e969ef5e8f519314f5613f8e6fae626ae085ce

diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index a37b438..41357be 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -56,6 +56,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
 configmgr/source/configmgr \
embeddedobj/util/embobj \
 filter/source/config/cache/filterconfig1 \
+   filter/source/odfflatxml/odfflatxml \
+   filter/source/xmlfilterdetect/xmlfd \
+   filter/source/xmlfilteradaptor/xmlfa \
 framework/util/fwk \
 i18npool/util/i18npool \
lingucomponent/source/languageguessing/guesslang \
diff --git a/sw/qa/extras/odfimport/data/bnc800714.fodt 
b/sw/qa/extras/odfimport/data/bnc800714.fodt
new file mode 100644
index 000..a759b7c
--- /dev/null
+++ b/sw/qa/extras/odfimport/data/bnc800714.fodt
@@ -0,0 +1,35 @@
+?xml version=1.0 encoding=UTF-8?
+office:document 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 
xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 
xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 
xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 
xmlns:config=urn:oas
 is:names:tc:opendocument:xmlns:config:1.0 
xmlns:ooo=http://openoffice.org/2004/office; 
xmlns:ooow=http://openoffice.org/2004/writer; 
xmlns:oooc=http://openoffice.org/2004/calc; 
xmlns:dom=http://www.w3.org/2001/xml-events; 
xmlns:xforms=http://www.w3.org/2002/xforms; 
xmlns:xsd=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt=http://openoffice.org/2005/report; 
xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 
xmlns:xhtml=http://www.w3.org/1999/xhtml; 
xmlns:grddl=http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo=http://openoffice.org/2009/office; 
xmlns:tableooo=http://openoffice.org/2009/table; 
xmlns:drawooo=http://openoffice.org/2010/draw; 
xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0
 
xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0
 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 
xmlns:formx=urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0 
xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 
office:mimetype=application/vnd.oasis.opendocument.text
+ office:automatic-styles
+  style:style style:name=P1 style:family=paragraph/
+  style:style style:name=P2 style:family=paragraph
+   style:paragraph-properties fo:keep-with-next=always/
+  /style:style
+  style:style style:name=fr1 style:family=graphic 
style:parent-style-name=Frame
+   style:graphic-properties

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

2014-10-23 Thread Andras Timar

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

New commits:
commit d70884569c5ed09675c3b3f50117aa54636cc479
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 23 12:56:35 2014 +0200

Resolves: fdo#62682 crash on second export of svg

because the first export has left dangling CalcFieldValueHdl Links in
Outliners that got created based on the Drawing Outliner while it had a
temporary CalcFieldValueHdl installed, and didn't get the old 
CalcFieldValueHdl
installed when the old Drawing Outliner one was re-installed.

(cherry picked from commit 5bdfa8c12472eb9ff6ca054c2ada7150b1869fff)

Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 4265f35..e6cf93a 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -619,7 +619,7 @@ sal_Bool SVGFilter::implExport( const Sequence 
PropertyValue  rDescriptor )
 //the maOldFieldHdl for all that have ended up using
 //maNewFieldHdl
 std::vectorSdrOutliner* 
aOutliners(mpSdrModel-GetActiveOutliners());
-for (auto aIter = aOutliners.begin(); aIter != 
aOutliners.end(); ++aIter)
+for (std::vectorSdrOutliner*::iterator aIter = 
aOutliners.begin(); aIter != aOutliners.end(); ++aIter)
 {
 SdrOutliner* pOutliner = *aIter;
 if (maNewFieldHdl == 
pOutliner-GetCalcFieldValueHdl())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-22 Thread Andras Timar

 readlicense_oo/license/EULA.odt   |binary
 readlicense_oo/license/EULA_en-US.rtf |5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1c0d9a9a77abb1aad70518f06d030e03d6b48a05
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Oct 22 21:59:18 2014 +0200

EULA 2014-10-20

Change-Id: If483c8a91ee86b08f1506cac1f0e464b9187a729

diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt
index 000d413..93be7be 100644
Binary files a/readlicense_oo/license/EULA.odt and 
b/readlicense_oo/license/EULA.odt differ
diff --git a/readlicense_oo/license/EULA_en-US.rtf 
b/readlicense_oo/license/EULA_en-US.rtf
index e8a3ed8..87205ed 100644
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -48,7 +48,7 @@ MAINTENANCE SERVICES. \par
 \cf1\f0\fs20 6) Maintenance services do not include integration services, 
installation of upgrades or updates, support services or any other benefits not 
expressly described in this Agreement.\par
 \cf0\f1\fs22\par
 \cf1\b\f0\fs20 SUPPORT SERVICES\par
-\pard\sa120\sl276\slmult1\cf0\b0 An entitlement to \lquote Level 3\rquote  
technical support services will be provided on certain terms which include:\par
+\pard\sa120\sl276\slmult1\cf0\b0 By purchasing an entitlement to \lquote Level 
3\rquote  technical support services will be provided on certain terms which 
include:\par
 - allocation of a severity level for each support case and any variations on 
this;\par
 - Collabora\rquote s work availability times, initial response time and the 
communication frequency for each support case based on such allocated case 
severity level; \par
 - Your limit on the number of support cases that You can report for each such 
allocated case severity level (although for the avoidance of doubt, any unused 
limit cannot be refunded and expires at the end of the Subscription Services 
Entitlement period unless otherwise agreed). \par
@@ -90,6 +90,5 @@ Alternatively, Collabora also entitle You to purchase the 
support services entit
 \pard\qj\cf1\f0\fs20 9) Without regard to conflict of laws rules and 
principles or the United Nations Convention of Contracts for the International 
Sale of Goods, this Agreement is governed by the laws of England, and any 
action relating to this Agreement may only be brought before the courts of 
England.\par
 \cf0\f1\fs22\par
 \par
-\cf1\i\f0\fs20 EULA 2014-06-12\par
+\cf1\i\f0\fs20 EULA 2014-10-20\par
 }
-
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-22 Thread Andras Timar

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

New commits:
commit c03ae0dedf3bf901b386ba334aabe2205b1808f3
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Oct 22 13:26:36 2014 -0700

Bump version to 4.2-18

Change-Id: Ib252bb7fbc0e00035165c2033a36f235ecbe43d7

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

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

2014-10-19 Thread Kohei Yoshida

 sc/source/core/data/table2.cxx |7 +-
 sc/source/core/tool/token.cxx  |   47 +
 2 files changed, 49 insertions(+), 5 deletions(-)

New commits:
commit 701ea5c08efd63bbea82a43e49405a911f7419c8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Sat Oct 18 20:22:53 2014 -0400

fdo#82047: Correctly adjust references in range names on row deletion.

Change-Id: Iac924b0b6932863f7f9cc088f996e0b07c340d2c
(cherry picked from commit 281847613bd3ae472523822f4be9c21cc353867e)

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 73d284a..7208d9d 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3164,6 +3164,53 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
 if (adjustDoubleRefInName(rRef, rCxt, rPos))
 aRes.mbReferenceModified = true;
 }
+else if (rCxt.mnRowDelta  0)
+{
+// row(s) deleted.
+if (rRef.Ref1.IsRowRel() || rRef.Ref2.IsRowRel())
+// Don't modify relative references in names.
+break;
+
+if (aAbs.aStart.Col()  rCxt.maRange.aStart.Col() || 
rCxt.maRange.aEnd.Col()  aAbs.aEnd.Col())
+// column range of the reference is not entirely in 
the deleted column range.
+break;
+
+ScRange aDeleted = rCxt.maRange;
+aDeleted.aStart.IncRow(rCxt.mnRowDelta);
+
aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);
+
+if (aAbs.aEnd.Row()  aDeleted.aStart.Row() || 
aDeleted.aEnd.Row()  aAbs.aStart.Row())
+// reference range doesn't intersect with the deleted 
range.
+break;
+
+if (aDeleted.aStart.Row() = aAbs.aStart.Row()  
aAbs.aEnd.Row() = aDeleted.aEnd.Row())
+{
+// This reference is entirely deleted.
+rRef.Ref1.SetRowDeleted(true);
+rRef.Ref2.SetRowDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+
+if (aAbs.aStart.Row()  aDeleted.aStart.Row())
+{
+if (aDeleted.aEnd.Row()  aAbs.aEnd.Row())
+// Deleted in the middle.  Make the reference 
shorter.
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+else
+// Deleted at tail end.  Cut off the lower part.
+rRef.Ref2.SetAbsRow(aDeleted.aStart.Row()-1);
+}
+else
+{
+// Deleted at the top.  Cut the top off and shift up.
+rRef.Ref1.SetAbsRow(aDeleted.aEnd.Row()+1);
+rRef.Ref1.IncRow(rCxt.mnRowDelta);
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+}
+
+aRes.mbReferenceModified = true;
+}
 else if (rCxt.maRange.Intersects(aAbs))
 {
 if (rCxt.mnColDelta  rCxt.maRange.aStart.Row() = 
aAbs.aStart.Row()  aAbs.aEnd.Row() = rCxt.maRange.aEnd.Row())
commit 5ff49c8461d91fd04a321051f27335b4fe8c0970
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Oct 17 21:48:31 2014 -0400

fdo#80284: Avoid broadcasting during cell delete  shift.

Broadcasting it here and marking formula cells dirty prevents them
from being entered into the formula tree at the end.  They get marked
postponed dirty during reference update, and are supposed to be
set dirty at the end.

Change-Id: I65977300ee4ee26b6166d170acd2145abcbbf288
(cherry picked from commit 7fef943114b9184e69c8c714bf158116b8d9caf7)

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 56a2768..101eb18 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -389,11 +389,8 @@ void ScTable::DeleteCol(
 }
 }
 
-{   // scope for bulk broadcast
-ScBulkBroadcast aBulkBroadcast( pDocument-GetBASM());
-for (SCSIZE i = 0; i  nSize; i++)
-aCol[nStartCol + i].DeleteArea(nStartRow, nEndRow, IDF_ALL);
-}
+for (SCSIZE i = 0; i  nSize; i++)
+aCol[nStartCol + i].DeleteArea(nStartRow, nEndRow, IDF_ALL, false);
 
 if ((nStartRow == 0)  (nEndRow == MAXROW))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-19 Thread Yousuf Philips

 dev/null|binary
 icon-themes/sifr/cmd/lc_spacepara15.png |binary
 icon-themes/sifr/cmd/lc_spacepara2.png  |binary
 icon-themes/sifr/cmd/sc_spacepara15.png |binary
 icon-themes/sifr/cmd/sc_spacepara2.png  |binary
 5 files changed

New commits:
commit 50437394dd1253bbe14b1ba5a47146928424646d
Author: Yousuf Philips philip...@hotmail.com
Date:   Sat Oct 18 12:37:18 2014 +0400

fdo#75359 - SIFR: Line Spacing 1.5 icon missing (4.2)

Change-Id: Ia0e7cd833bcc5d29fccaf098a043e4990966aa15

diff --git a/icon-themes/sifr/cmd/lc_spacepara15.png 
b/icon-themes/sifr/cmd/lc_spacepara15.png
new file mode 100644
index 000..8b5fc3e
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_spacepara15.png differ
diff --git a/icon-themes/sifr/cmd/lc_spacepara2.png 
b/icon-themes/sifr/cmd/lc_spacepara2.png
index 8b5fc3e..a32a95d 100644
Binary files a/icon-themes/sifr/cmd/lc_spacepara2.png and 
b/icon-themes/sifr/cmd/lc_spacepara2.png differ
diff --git a/icon-themes/sifr/cmd/lc_spacepara3.png 
b/icon-themes/sifr/cmd/lc_spacepara3.png
deleted file mode 100644
index a32a95d..000
Binary files a/icon-themes/sifr/cmd/lc_spacepara3.png and /dev/null differ
diff --git a/icon-themes/sifr/cmd/sc_spacepara15.png 
b/icon-themes/sifr/cmd/sc_spacepara15.png
new file mode 100644
index 000..7f52432
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_spacepara15.png differ
diff --git a/icon-themes/sifr/cmd/sc_spacepara2.png 
b/icon-themes/sifr/cmd/sc_spacepara2.png
index 7f52432..f0267b8 100644
Binary files a/icon-themes/sifr/cmd/sc_spacepara2.png and 
b/icon-themes/sifr/cmd/sc_spacepara2.png differ
diff --git a/icon-themes/sifr/cmd/sc_spacepara3.png 
b/icon-themes/sifr/cmd/sc_spacepara3.png
deleted file mode 100644
index f0267b8..000
Binary files a/icon-themes/sifr/cmd/sc_spacepara3.png and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-18 Thread Caolán McNamara

 filter/source/svg/svgexport.cxx|   18 --
 filter/source/svg/svgfilter.hxx|1 +
 include/svx/svdmodel.hxx   |2 ++
 svx/source/inc/svdoutlinercache.hxx|7 +++
 svx/source/svdraw/svdmodel.cxx |   11 +++
 svx/source/svdraw/svdoutlinercache.cxx |2 ++
 6 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 9b8cc24d5e6a6a216582c5ddbe80bcbd53d337b0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Oct 17 15:03:34 2014 +0100

Resolves: fdo#62682 crash on second export of svg

because the first export has left dangling CalcFieldValueHdl Links in
Outliners that got created based on the Drawing Outliner while it had a
temporary CalcFieldValueHdl installed, and didn't get the old 
CalcFieldValueHdl
installed when the old Drawing Outliner one was re-installed.

Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index a9cfc01..4265f35 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -598,7 +598,8 @@ sal_Bool SVGFilter::implExport( const Sequence 
PropertyValue  rDescriptor )
 SdrOutliner rOutl = 
mpSdrModel-GetDrawOutliner(NULL);
 
 maOldFieldHdl = 
rOutl.GetCalcFieldValueHdl();
-rOutl.SetCalcFieldValueHdl( LINK( this, 
SVGFilter, CalcFieldHdl) );
+maNewFieldHdl = LINK(this, SVGFilter, 
CalcFieldHdl);
+rOutl.SetCalcFieldValueHdl(maNewFieldHdl);
 }
 }
 bRet = implExportDocument();
@@ -611,7 +612,20 @@ sal_Bool SVGFilter::implExport( const Sequence 
PropertyValue  rDescriptor )
 }
 
 if( mpSdrModel )
-mpSdrModel-GetDrawOutliner( NULL 
).SetCalcFieldValueHdl( maOldFieldHdl );
+{
+//fdo#62682 The maNewFieldHdl can end up getting copied
+//into various other outliners which live past this
+//method, so get the full list of outliners and restore
+//the maOldFieldHdl for all that have ended up using
+//maNewFieldHdl
+std::vectorSdrOutliner* 
aOutliners(mpSdrModel-GetActiveOutliners());
+for (auto aIter = aOutliners.begin(); aIter != 
aOutliners.end(); ++aIter)
+{
+SdrOutliner* pOutliner = *aIter;
+if (maNewFieldHdl == 
pOutliner-GetCalcFieldValueHdl())
+pOutliner-SetCalcFieldValueHdl(maOldFieldHdl);
+}
+}
 
 delete mpSVGWriter, mpSVGWriter = NULL;
 mpSVGExport = NULL; // pointed object is released by 
xSVGExport dtor at the end of this scope
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 85fab2b..09c41d2 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -263,6 +263,7 @@ private:
 XDrawPageSequence   mMasterPageTargets;
 
 LinkmaOldFieldHdl;
+LinkmaNewFieldHdl;
 
 sal_BoolimplImport( const Sequence 
PropertyValue  rDescriptor ) throw (RuntimeException);
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 81df0c4..fa7f18a 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -233,6 +233,8 @@ public:
 sal_uIntPtr nSwapGraphicsMode;
 
 SdrOutlinerCache* mpOutlinerCache;
+//get a vector of all the SdrOutliner belonging to the model
+std::vectorSdrOutliner* GetActiveOutliners() const;
 SdrModelImpl*   mpImpl;
 sal_uInt16  mnCharCompressType;
 sal_uInt16  mnHandoutPageCount;
diff --git a/svx/source/inc/svdoutlinercache.hxx 
b/svx/source/inc/svdoutlinercache.hxx
index 6dbf728..03572fc 100644
--- a/svx/source/inc/svdoutlinercache.hxx
+++ b/svx/source/inc/svdoutlinercache.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SVX_SOURCE_INC_SVDOUTLINERCACHE_HXX
 
 #include sal/types.h
+#include vector
 
 class SdrModel;
 class SdrOutliner;
@@ -33,12 +34,18 @@ private:
 
 SdrOutliner*mpModeOutline;
 SdrOutliner*mpModeText;
+
+std::vectorSdrOutliner* maActiveOutliners;
 public:
 SdrOutlinerCache( SdrModel* pModel );
 ~SdrOutlinerCache();
 
 SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode );
 void disposeOutliner( SdrOutliner* pOutliner );
+std::vectorSdrOutliner* GetActiveOutliners() const
+{
+return maActiveOutliners;
+}
 };
 
 #endif
diff --git

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

2014-10-17 Thread Caolán McNamara

 external/openssl/CVE-2014-3505.patch|   52 +++
 external/openssl/CVE-2014-3506.patch|   87 +
 external/openssl/CVE-2014-3507.patch|   53 +++
 external/openssl/CVE-2014-3508.patch|  138 
 external/openssl/CVE-2014-3509.patch|   45 ++
 external/openssl/CVE-2014-3510.patch|   86 +
 external/openssl/CVE-2014-3511.patch|   85 +
 external/openssl/CVE-2014-3513.patch|  186 +++
 external/openssl/CVE-2014-3566.patch|  466 
 external/openssl/CVE-2014-3567.patch|   14 
 external/openssl/UnpackedTarball_openssl.mk |   10 
 11 files changed, 1222 insertions(+)

New commits:
commit 2ae53ab6e6e8eee4384648ab8b40bba72ce746ba
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Oct 17 11:07:59 2014 +0100

CVE-2014-3566 (etc)

i.e. sync with fedora 20 openssl-1.0.1e security backports

Change-Id: I9e07d3aad7f0c7a3fd684d4e52b3b952cfb2f82d

diff --git a/external/openssl/CVE-2014-3505.patch 
b/external/openssl/CVE-2014-3505.patch
new file mode 100644
index 000..69284d5
--- /dev/null
+++ b/external/openssl/CVE-2014-3505.patch
@@ -0,0 +1,52 @@
+From 2172d4f63c61922487008f42511cc6bdae9b47a0 Mon Sep 17 00:00:00 2001
+From: Adam Langley a...@imperialviolet.org
+Date: Fri, 6 Jun 2014 14:19:21 -0700
+Subject: [PATCH] Avoid double free when processing DTLS packets.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The |item| variable, in both of these cases, may contain a pointer to a
+|pitem| structure within |s-d1-buffered_messages|. It was being freed
+in the error case while still being in |buffered_messages|. When the
+error later caused the |SSL*| to be destroyed, the item would be double
+freed.
+
+Thanks to Wah-Teh Chang for spotting that the fix in 1632ef74 was
+inconsistent with the other error paths (but correct).
+
+Fixes CVE-2014-3505
+
+Reviewed-by: Matt Caswell m...@openssl.org
+Reviewed-by: Emilia KÃ¤sper emi...@openssl.org
+---
+ ssl/d1_both.c | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/ssl/d1_both.c b/ssl/d1_both.c
+index c1eb970..cdb83b6 100644
+--- a/a/ssl/d1_both.c
 b/b/ssl/d1_both.c
+@@ -693,8 +693,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* 
msg_hdr, int *ok)
+   return DTLS1_HM_FRAGMENT_RETRY;
+ 
+ err:
+-  if (frag != NULL) dtls1_hm_fragment_free(frag);
+-  if (item != NULL) OPENSSL_free(item);
++  if (frag != NULL  item == NULL) dtls1_hm_fragment_free(frag);
+   *ok = 0;
+   return i;
+   }
+@@ -778,8 +777,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct 
hm_header_st* msg_hdr, int *ok)
+   return DTLS1_HM_FRAGMENT_RETRY;
+ 
+ err:
+-  if ( frag != NULL) dtls1_hm_fragment_free(frag);
+-  if ( item != NULL) OPENSSL_free(item);
++  if (frag != NULL  item == NULL) dtls1_hm_fragment_free(frag);
+   *ok = 0;
+   return i;
+   }
+-- 
+1.8.3.1
+
diff --git a/external/openssl/CVE-2014-3506.patch 
b/external/openssl/CVE-2014-3506.patch
new file mode 100644
index 000..45b87dc
--- /dev/null
+++ b/external/openssl/CVE-2014-3506.patch
@@ -0,0 +1,87 @@
+From fc7804ec392fcf8051abe6bc9da9108744d2ae35 Mon Sep 17 00:00:00 2001
+From: Matt Caswell m...@openssl.org
+Date: Fri, 6 Jun 2014 14:25:52 -0700
+Subject: [PATCH] Fix DTLS handshake message size checks.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In |dtls1_reassemble_fragment|, the value of
+|msg_hdr-frag_off+frag_len| was being checked against the maximum
+handshake message size, but then |msg_len| bytes were allocated for the
+fragment buffer. This means that so long as the fragment was within the
+allowed size, the pending handshake message could consume 16MB + 2MB
+(for the reassembly bitmap). Approx 10 outstanding handshake messages
+are allowed, meaning that an attacker could consume ~180MB per DTLS
+connection.
+
+In the non-fragmented path (in |dtls1_process_out_of_seq_message|), no
+check was applied.
+
+Fixes CVE-2014-3506
+
+Wholly based on patch by Adam Langley with one minor amendment.
+
+Reviewed-by: Emilia KÃ¤sper emi...@openssl.org
+---
+ ssl/d1_both.c | 29 -
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/ssl/d1_both.c b/ssl/d1_both.c
+index 6559dfc..b9e15df 100644
+--- a/a/ssl/d1_both.c
 b/b/ssl/d1_both.c
+@@ -587,6 +587,16 @@ dtls1_retrieve_buffered_fragment(SSL *s, long max, int 
*ok)
+   return 0;
+   }
+ 
++/* dtls1_max_handshake_message_len returns the maximum number of bytes
++ * permitted in a DTLS handshake message for |s|. The minimum is 16KB, but may
++ * be greater if the maximum certificate list size requires it. */
++static unsigned long dtls1_max_handshake_message_len(const SSL *s)
++  {
++  unsigned long max_len = DTLS1_HM_HEADER_LENGTH + 
SSL3_RT_MAX_ENCRYPTED_LENGTH;
++  if (max_len

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

2014-10-17 Thread Kohei Yoshida

 sc/source/core/tool/interpr1.cxx |   54 +++
 1 file changed, 32 insertions(+), 22 deletions(-)

New commits:
commit f2d60af6bec226e5a5490648b837b9825a6cbfc7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Oct 16 20:49:42 2014 -0400

fdo#73080: Fix the single cell reference cases as well.

Conflicts:
sc/source/core/tool/interpr1.cxx

Change-Id: Ib9a8ae04733c5bcb982ef4d337112eb8249d0ee0

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 7d5b8f3..5058283 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4596,13 +4596,39 @@ void ScInterpreter::ScMatch()
 }
 }
 
+namespace {
+
+bool isCellContentEmpty( const ScRefCellValue rCell )
+{
+switch (rCell.meType)
+{
+case CELLTYPE_VALUE:
+case CELLTYPE_STRING:
+case CELLTYPE_EDIT:
+return false;
+case CELLTYPE_FORMULA:
+{
+sc::FormulaResultValue aRes = rCell.mpFormula-GetResult();
+if (aRes.meType != sc::FormulaResultValue::String)
+return false;
+if (!aRes.maString.isEmpty())
+return false;
+}
+break;
+default:
+;
+}
+
+return true;
+}
+
+}
 
 void ScInterpreter::ScCountEmptyCells()
 {
 if ( MustHaveParamCount( GetByte(), 1 ) )
 {
 sal_uLong nMaxCount = 0, nCount = 0;
-CellType eCellType;
 switch (GetStackType())
 {
 case svSingleRef :
@@ -4610,8 +4636,9 @@ void ScInterpreter::ScCountEmptyCells()
 nMaxCount = 1;
 ScAddress aAdr;
 PopSingleRef( aAdr );
-eCellType = pDok-GetCellType(aAdr);
-if (eCellType != CELLTYPE_NONE)
+ScRefCellValue aCell;
+aCell.assign(*pDok, aAdr);
+if (!isCellContentEmpty(aCell))
 nCount = 1;
 }
 break;
@@ -4633,25 +4660,8 @@ void ScInterpreter::ScCountEmptyCells()
 for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
 {
 const ScRefCellValue rCell = aIter.getRefCellValue();
-switch (rCell.meType)
-{
-case CELLTYPE_VALUE:
-case CELLTYPE_STRING:
-case CELLTYPE_EDIT:
-++nCount;
-break;
-case CELLTYPE_FORMULA:
-{
-sc::FormulaResultValue aRes = 
rCell.mpFormula-GetResult();
-if (aRes.meType != 
sc::FormulaResultValue::String)
-++nCount;
-else if (!aRes.maString.isEmpty())
-++nCount;
-}
-break;
-default:
-;
-}
+if (!isCellContentEmpty(rCell))
+++nCount;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - officecfg/registry sc/inc sc/qa sc/source

2014-10-17 Thread Kohei Yoshida

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   10 +
 sc/inc/document.hxx  |5 
 sc/inc/inputopt.hxx  |3 
 sc/inc/sc.hrc|1 
 sc/inc/sortparam.hxx |1 
 sc/inc/table.hxx |8 -
 sc/qa/unit/ucalc.cxx |   10 -
 sc/source/core/data/documen3.cxx |5 
 sc/source/core/data/table3.cxx   |  115 ---
 sc/source/core/tool/inputopt.cxx |   34 ++--
 sc/source/ui/app/scmod.cxx   |9 +
 sc/source/ui/docshell/dbdocfun.cxx   |5 
 sc/source/ui/undo/undosort.cxx   |2 
 13 files changed, 135 insertions(+), 73 deletions(-)

New commits:
commit c357fb2dbdc54d9ee8471ce4e9f9381e74a6deed
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Oct 9 16:21:59 2014 +0100

fdo#81633: Add a hidden configuration option to toggle ref update on sort.

This option is defaulted to off for 4.3 for back-compatibility.

Reviewed-on: https://gerrit.libreoffice.org/11902
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

Conflicts:
sc/inc/inputopt.hxx
sc/qa/unit/ucalc.cxx
sc/source/core/tool/inputopt.cxx

Change-Id: I5ac686e96742df40f7d8ba5ffec23806db2988a6

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 0cdb9d5..54e15fc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -678,6 +678,16 @@
 /info
 valuefalse/value
   /prop
+  prop oor:name=UpdateReferenceOnSort oor:type=xs:boolean 
oor:nillable=false
+!-- OldPath: Calc/Input --
+!-- OldLocation: Soffice.cfg --
+!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
--
+info
+  descSpecifies whether references get updated when performing sort 
on a range of cells./desc
+  labelUpdate references when sorting range of cells/label
+/info
+valuefalse/value
+  /prop
   prop oor:name=HighlightSelection oor:type=xs:boolean 
oor:nillable=false
 !-- OldPath: Calc/Input --
 !-- OldLocation: Soffice.cfg --
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1857e07..432cf13 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1666,7 +1666,10 @@ public:
 SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
 SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
 
-void Sort( SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, 
ScProgress* pProgress, sc::ReorderParam* pUndo );
+void Sort(
+SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, bool 
bUpdateRefs,
+ScProgress* pProgress, sc::ReorderParam* pUndo );
+
 void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
 
 SCSIZE  Query( SCTAB nTab, const ScQueryParam rQueryParam, bool 
bKeepSub );
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 3a46bf6..3c33154 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -32,6 +32,7 @@ private:
 sal_BoolbExtendFormat;
 sal_BoolbRangeFinder;
 sal_BoolbExpandRefs;
+sal_BoolmbSortRefUpdate;
 sal_BoolbMarkHeader;
 sal_BoolbUseTabCol;
 sal_BoolbTextWysiwyg;
@@ -57,6 +58,8 @@ public:
 sal_BoolGetRangeFinder() const  { return bRangeFinder;   }
 voidSetExpandRefs(sal_Bool bSet){ bExpandRefs = bSet;}
 sal_BoolGetExpandRefs() const   { return bExpandRefs;}
+voidSetSortRefUpdate(sal_Bool bSet) { mbSortRefUpdate = bSet; }
+sal_BoolGetSortRefUpdate() const{ return mbSortRefUpdate; }
 voidSetMarkHeader(sal_Bool bSet){ bMarkHeader = bSet;}
 sal_BoolGetMarkHeader() const   { return bMarkHeader;}
 voidSetUseTabCol(sal_Bool bSet) { bUseTabCol = bSet; }
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e632269..aaaf4d3 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -86,6 +86,7 @@
 
 // TabPage entry - Legacy selection
 #define SID_SC_INPUT_LEGACY_CELL_SELECTION (SC_VIEW_START + 15)
+#define SID_SC_OPT_SORT_REF_UPDATE (SC_VIEW_START + 16)
 
 // Format options
 #define SID_SCFORMULAOPTIONS(SC_VIEW_START + 20)
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 4c3ef1b..b83e941 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -98,6 +98,7 @@ struct

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

2014-10-15 Thread Kohei Yoshida

 sc/source/core/tool/interpr1.cxx |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit c1b850ed0ad3740fb7dc731f0f1bb49b7f5562d4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Oct 15 20:07:33 2014 -0400

fdo#73080: Correctly count blank cells in COUNTBLANK.

Especially when formula cells are involved.

Change-Id: I40950e7108778821c17d08354f01bb157b1551e6
(cherry picked from commit 3e2bd1e4022e25b77bcc8eba5e02c1adc57008a1)

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a42dbad..7d5b8f3 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4632,8 +4632,26 @@ void ScInterpreter::ScCountEmptyCells()
 ScCellIterator aIter( pDok, aRange, glSubTotal);
 for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
 {
-if (!aIter.hasEmptyData())
-++nCount;
+const ScRefCellValue rCell = aIter.getRefCellValue();
+switch (rCell.meType)
+{
+case CELLTYPE_VALUE:
+case CELLTYPE_STRING:
+case CELLTYPE_EDIT:
+++nCount;
+break;
+case CELLTYPE_FORMULA:
+{
+sc::FormulaResultValue aRes = 
rCell.mpFormula-GetResult();
+if (aRes.meType != 
sc::FormulaResultValue::String)
+++nCount;
+else if (!aRes.maString.isEmpty())
+++nCount;
+}
+break;
+default:
+;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 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 caol...@redhat.com
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 caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe)
Signed-off-by: Michael Stahl mst...@redhat.com

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 caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com

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

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

2014-10-12 Thread Jan-Marek Glogowski

 sw/source/ui/shells/basesh.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 074b76e612e45d5a6e1c08847d834b4143dcf96c
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Thu Aug 7 15:18:19 2014 +0200

fdo#76565 Allow pasting into input fields

Reviewed-on: https://gerrit.libreoffice.org/10835
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 3f26ab24e0bfd27645c97ff7915fba2db409930a)

Conflicts:

sw/source/uibase/shells/basesh.cxx

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

diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index b5de5fe..e88731d 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -267,8 +267,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest rReq)
 TransferableDataHelper aDataHelper(
 TransferableDataHelper::CreateFromSystemClipboard( 
rSh.GetView().GetEditWin() ) );
 if( aDataHelper.GetXTransferable().is()
- SwTransferable::IsPaste( rSh, aDataHelper )
- !rSh.CrsrInsideInputFld() )
+ SwTransferable::IsPaste( rSh, aDataHelper ) )
 {
 // Temporary variables, because the shell could already be
 // destroyed after the paste.
@@ -418,8 +417,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet rSet)
 break;
 
 case SID_PASTE:
-if( !GetView().IsPasteAllowed()
-|| rSh.CrsrInsideInputFld() )
+if( !GetView().IsPasteAllowed() )
 {
 rSet.DisableItem( nWhich );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-12 Thread Kohei Yoshida

 sc/source/core/data/column.cxx  |6 ++
 sc/source/core/data/formulacell.cxx |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c74fbd22dd3decc37574da210157cea4e7a6b1a2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Sun Oct 12 10:18:09 2014 -0400

fdo#83901: ROW() and COLUMN() to be properly recalculated on cell move.

For cases where ROW or COLUMN references another cell that has shifted.

Change-Id: Ic4bef8672dab811ceff6886d9af0388306a66485
(cherry picked from commit 0b29a16d1dcffd75e49bd7ad3da867b0d0ebfa38)

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 10da725..ec1224c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2110,6 +2110,12 @@ class UpdateRefOnNonCopy : 
std::unary_functionsc::FormulaGroupEntry, void
 if (pCode-IsRecalcModeOnRefMove())
 aRes.mbValueChanged = true;
 }
+else if (aRes.mbReferenceModified  pCode-IsRecalcModeOnRefMove())
+{
+// The cell itself hasn't shifted. But it may have ROW or COLUMN
+// referencing another cell that has.
+aRes.mbValueChanged = true;
+}
 
 if (aRes.mbNameModified)
 recompileTokenArray(*pTop);
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index bbaff4f..3887caa 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2767,7 +2767,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
 
 if (bOnRefMove)
 // Cell may reference itself, e.g. ocColumn, ocRow without parameter
-bOnRefMove = (bValChanged || (aPos != aOldPos));
+bOnRefMove = (bValChanged || (aPos != aOldPos) || bRefModified);
 
 bool bHasRelName = false;
 bool bNewListening = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-11 Thread Kohei Yoshida

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

New commits:
commit e392a590399af9c5b87cfbba419d77784c28c250
Author: Kohei Yoshida kohei.yosh...@collabora.com
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)

diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 6c258e0..35b80ba 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -169,12 +169,20 @@ void ScUndoDeleteContents::DoChange( const sal_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();
 
@@ -187,15 +195,6 @@ void ScUndoDeleteContents::Undo()
 DoChange( sal_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);
 }
 
@@ -205,10 +204,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

1 2 3 >

1 - 100 of 285 matches

Mail list logo