[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source distro-configs/Jenkins include/svx svx/inc svx/source sw/source

[Stephan Bergmann]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx  |2 
 chart2/source/controller/main/ChartController_Position.cxx |2 
 cui/source/factory/dlgfact.cxx |   73 +++--
 cui/source/factory/dlgfact.hxx |   16 +-
 cui/source/options/optlingu.cxx|2 
 distro-configs/Jenkins/Linux_ubsan_master.conf |5 
 include/svx/bmpmask.hxx|2 
 include/svx/camera3d.hxx   |4 
 include/svx/colrctrl.hxx   |2 
 include/svx/framelink.hxx  |2 
 include/svx/imapdlg.hxx|2 
 include/svx/itemwin.hxx|7 -
 include/svx/obj3d.hxx  |2 
 include/svx/pagenumberlistbox.hxx  |2 
 include/svx/papersizelistbox.hxx   |2 
 include/svx/samecontentlistbox.hxx |2 
 include/svx/sdgcpitm.hxx   |5 
 include/svx/sdr/contact/objectcontactofobjlistpainter.hxx  |4 
 include/svx/sdr/table/tablecontroller.hxx  |2 
 include/svx/sidebar/ValueSetWithTextControl.hxx|8 -
 include/svx/spacinglistbox.hxx |2 
 include/svx/svdcrtv.hxx|4 
 include/svx/svdglev.hxx|8 -
 include/svx/svdpoev.hxx|4 
 include/svx/svdsnpv.hxx|2 
 include/svx/svxdlg.hxx |   21 +--
 include/svx/svxgrahicitem.hxx  |2 
 include/svx/xpoly.hxx  |2 
 include/svx/xpool.hxx  |2 
 svx/inc/sdr/overlay/overlayrectangle.hxx   |1 
 svx/inc/svdibrow.hxx   |2 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx |   18 ---
 svx/source/accessibility/svxrectctaccessiblecontext.cxx|   15 --
 svx/source/dialog/_bmpmask.cxx |6 -
 svx/source/dialog/framelink.cxx|4 
 svx/source/dialog/grfflt.cxx   |   10 -
 svx/source/dialog/imapdlg.cxx  |6 -
 svx/source/dialog/pagenumberlistbox.cxx|4 
 svx/source/dialog/papersizelistbox.cxx |4 
 svx/source/dialog/samecontentlistbox.cxx   |4 
 svx/source/dialog/spacinglistbox.cxx   |4 
 svx/source/dialog/svxgrahicitem.cxx|6 -
 svx/source/engine3d/camera3d.cxx   |   10 -
 svx/source/engine3d/obj3d.cxx  |4 
 svx/source/inc/GraphCtlAccessibleContext.hxx   |4 
 svx/source/inc/svxrectctaccessiblecontext.hxx  |4 
 svx/source/sdr/contact/objectcontactofobjlistpainter.cxx   |3 
 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx  |2 
 svx/source/sdr/overlay/overlayrectangle.cxx|3 
 svx/source/sidebar/tools/ValueSetWithTextControl.cxx   |   18 ---
 svx/source/svdraw/svdattr.cxx  |2 
 svx/source/svdraw/svdcrtv.cxx  |8 -
 svx/source/svdraw/svddrgmt.cxx |4 
 svx/source/svdraw/svdglev.cxx  |   26 ++--
 svx/source/svdraw/svdhdl.cxx   |9 -
 svx/source/svdraw/svdibrow.cxx |4 
 svx/source/svdraw/svdpoev.cxx  |   10 -
 svx/source/svdraw/svdsnpv.cxx  |4 
 svx/source/table/tablecontroller.cxx   |   53 ++---
 svx/source/table/tablehandles.cxx  |2 
 svx/source/tbxctrls/colrctrl.cxx   |4 
 svx/source/tbxctrls/itemwin.cxx|   12 +-
 svx/source/xoutdev/_xpoly.cxx  |4 
 svx/source/xoutdev/xpool.cxx   |4 
 sw/source/uibase/shells/tabsh.cxx  |2 
 sw/source/uibase/sidebar/PageMarginControl.cxx |   10 -
 sw/source/uibase/sidebar/PageSizeControl.cxx   |3 
 67 files changed, 174 insertions(+), 312 deletions(-)

New commits:
commit 02235bc4610f22028c614a61b1493257fda4eaf0
Author: Stephan Bergmann 
Date:   Fri Sep 9 08:45:45 2016 +0200

Some --enable-ext-* switches got removed

...with 8dc38d9ded92960eda46343b67da8a8b95404b5a "Remove obsolete 
OxygenOffice
bits"

Change-Id: I796505a87a821d6f7f0b79ade9fdeec89932e561

d

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

[Noel Grandin]

 include/vcl/vclptr.hxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 976a4803e4cca4c5104c0ed60544a91a50ada012
Author: Noel Grandin 
Date:   Wed Sep 7 10:19:45 2016 +0200

disallow calls to ::Create in VclPtr subclasses

where it can be actively dangerous, if the calling code thinks it's
creating a ScopedVclPtrInstance, and it actually only gets a VclPtr

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

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 436a358..b4ef553 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -281,6 +281,12 @@ public:
 : VclPtr( new 
reference_type(std::forward(arg)...), SAL_NO_ACQUIRE )
 {
 }
+
+/**
+ * Override and disallow this, to prevent people accidentally calling it 
and actually
+ * getting VclPtr::Create and getting a naked VclPtr<> instance
+ */
+template static VclPtrInstance< reference_type > 
Create(Arg &&... ) = delete;
 };
 
 template 
@@ -339,6 +345,12 @@ public:
 {
 }
 
+/**
+ * Override and disallow this, to prevent people accidentally calling it 
and actually
+ * getting VclPtr::Create and getting a naked VclPtr<> instance
+ */
+template static ScopedVclPtr< reference_type > Create(Arg 
&&... ) = delete;
+
 ~ScopedVclPtr()
 {
 VclPtr::disposeAndClear();
@@ -382,6 +394,12 @@ public:
 {
 }
 
+/**
+ * Override and disallow this, to prevent people accidentally calling it 
and actually
+ * getting VclPtr::Create and getting a naked VclPtr<> instance
+ */
+template static ScopedVclPtrInstance< reference_type > 
Create(Arg &&...) = delete;
+
 private:
 // Prevent the above perfect forwarding ctor from hijacking (accidental)
 // attempts at ScopedVclPtrInstance copy construction (where the hijacking
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 26 commits - include/xmloff sc/source sw/source xmloff/inc xmloff/source

[David Tardon]

 include/xmloff/prstylei.hxx |4 
 include/xmloff/shapeimport.hxx  |   27 +-
 include/xmloff/txtstyli.hxx |3 
 include/xmloff/xmlictxt.hxx |9 
 include/xmloff/xmlimp.hxx   |2 
 include/xmloff/xmlnumi.hxx  |7 
 sc/source/filter/xml/xmlcvali.cxx   |4 
 sw/source/filter/xml/xmlfmt.cxx |   37 +--
 sw/source/filter/xml/xmlitemi.cxx   |4 
 sw/source/filter/xml/xmltbli.cxx|   45 +--
 sw/source/filter/xml/xmltbli.hxx|4 
 xmloff/inc/XMLTextColumnsContext.hxx|   14 -
 xmloff/inc/xmltabi.hxx  |8 
 xmloff/source/core/xmlictxt.cxx |   15 +
 xmloff/source/core/xmlimp.cxx   |   89 +++
 xmloff/source/core/xmlmultiimagehelper.cxx  |6 
 xmloff/source/draw/XMLShapePropertySetContext.cxx   |4 
 xmloff/source/draw/sdxmlimp.cxx |  234 
 xmloff/source/draw/sdxmlimp_impl.hxx|   24 +-
 xmloff/source/draw/shapeimport.cxx  |  232 ---
 xmloff/source/draw/ximp3dscene.cxx  |   17 -
 xmloff/source/draw/ximpshap.cxx |   28 +-
 xmloff/source/draw/ximpstyl.cxx |   67 +
 xmloff/source/draw/ximpstyl.hxx |   11 
 xmloff/source/forms/layerimport.cxx |   33 --
 xmloff/source/forms/layerimport.hxx |3 
 xmloff/source/style/XMLFontStylesContext_impl.hxx   |2 
 xmloff/source/style/prstylei.cxx|   12 -
 xmloff/source/style/xmlnumi.cxx |   31 --
 xmloff/source/style/xmlstyle.cxx|   50 +---
 xmloff/source/style/xmltabi.cxx |   32 --
 xmloff/source/table/XMLTableImport.cxx  |2 
 xmloff/source/text/XMLIndexTOCContext.cxx   |8 
 xmloff/source/text/XMLTextColumnsContext.cxx|   59 +
 xmloff/source/text/XMLTextFrameContext.cxx  |   24 +-
 xmloff/source/text/XMLTextFrameHyperlinkContext.cxx |   12 -
 xmloff/source/text/XMLTextListBlockContext.cxx  |6 
 xmloff/source/text/XMLTextShapeStyleContext.cxx |4 
 xmloff/source/text/txtfldi.cxx  |4 
 xmloff/source/text/txtimp.cxx   |   32 +-
 xmloff/source/text/txtlists.cxx |   10 
 xmloff/source/text/txtparaimphint.hxx   |   25 --
 xmloff/source/text/txtstyli.cxx |   20 -
 43 files changed, 523 insertions(+), 741 deletions(-)

New commits:
commit 0f9a81c8f58c1a9e771d7ff90abe3c20e8283f94
Author: David Tardon 
Date:   Thu Sep 8 16:27:25 2016 +0200

remove manual memory management

Change-Id: I07960df50645fb77b24eaad4a60f93b715cbb6a9

diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 885cabd..a77496a 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -207,27 +207,26 @@ class SvXMLStyleIndex_Impl
 {
 OUString  sName;
 sal_uInt16nFamily;
-const SvXMLStyleContext *pStyle;
+const uno::Reference mxStyle;
 
 public:
 
 SvXMLStyleIndex_Impl( sal_uInt16 nFam, const OUString& rName ) :
 sName( rName ),
-nFamily( nFam ),
-pStyle ( nullptr )
+nFamily( nFam )
 {
 }
 
-SvXMLStyleIndex_Impl( const SvXMLStyleContext *pStl ) :
-sName( pStl->GetName() ),
-nFamily( pStl->GetFamily() ),
-pStyle ( pStl )
+SvXMLStyleIndex_Impl( const uno::Reference &rStl ) :
+sName( rStl->GetName() ),
+nFamily( rStl->GetFamily() ),
+mxStyle ( rStl )
 {
 }
 
 const OUString& GetName() const { return sName; }
 sal_uInt16 GetFamily() const { return nFamily; }
-const SvXMLStyleContext *GetStyle() const { return pStyle; }
+const SvXMLStyleContext *GetStyle() const { return mxStyle.get(); }
 };
 
 struct SvXMLStyleIndexCmp_Impl
@@ -249,7 +248,7 @@ struct SvXMLStyleIndexCmp_Impl
 
 class SvXMLStylesContext_Impl
 {
-typedef std::vector StylesType;
+typedef std::vector> StylesType;
 typedef std::set 
IndicesType;
 
 StylesType aStyles;
@@ -264,13 +263,12 @@ class SvXMLStylesContext_Impl
 
 public:
 explicit SvXMLStylesContext_Impl( bool bAuto );
-~SvXMLStylesContext_Impl();
 
 size_t GetStyleCount() const { return aStyles.size(); }
 
 SvXMLStyleContext *GetStyle( size_t i )
 {
-return i < aStyles.size() ? aStyles[ i ] : nullptr;
+return i < aStyles.size() ? aStyles[ i ].get() : nullptr;
 }
 
 inline void AddStyle( SvXMLStyleContext *pStyle );
@@ -289,19 +287,9 @@ SvXMLStylesContext_Impl::SvXMLStylesContext_Impl( bool 
bAuto ) :
 #endif
 {}
 
-SvXMLStylesConte

[Libreoffice-commits] core.git: download.lst external/libzmf writerperfect/Library_wpftdraw.mk

[David Tardon]

 download.lst |4 ++--
 external/libzmf/0001-add-missing-include.patch.1 |   12 ++--
 writerperfect/Library_wpftdraw.mk|1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit a013b8505534896bc926e54116ef14e7879b0545
Author: David Tardon 
Date:   Wed Sep 7 13:50:03 2016 +0200

upload libzmf 0.0.1

Change-Id: I706d454226d17fe1386c876782f6ad2843f17197
Reviewed-on: https://gerrit.libreoffice.org/28718
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index 1c72509..55057f6 100644
--- a/download.lst
+++ b/download.lst
@@ -171,8 +171,8 @@ export WPS_TARBALL := 
libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
 export ZLIB_TARBALL := zlib-1.2.8.tar.gz
-export ZMF_MD5SUM := b64a7780bfef91e0a953f436366b2047
-export ZMF_TARBALL := libzmf-0.0.0.tar.bz2
+export ZMF_MD5SUM := c611df8664240de0276ab95670f413d8
+export ZMF_TARBALL := libzmf-0.0.1.tar.bz2
 
 export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip
 export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip
diff --git a/external/libzmf/0001-add-missing-include.patch.1 
b/external/libzmf/0001-add-missing-include.patch.1
index ff1dc2a..d640531 100644
--- a/external/libzmf/0001-add-missing-include.patch.1
+++ b/external/libzmf/0001-add-missing-include.patch.1
@@ -5,16 +5,16 @@ Subject: [PATCH] add missing include
 
 Change-Id: Ia21873123179902b2c3cad95b39db7d15c5b388a
 ---
- src/lib/ZMFCollector.cpp | 2 ++
+ src/lib/ZMFTypes.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/src/lib/ZMFCollector.cpp b/src/lib/ZMFCollector.cpp
+diff --git a/src/lib/ZMFTypes.cpp b/src/lib/ZMFTypes.cpp
 index ded93c7..7e024b3 100644
 a/src/lib/ZMFCollector.cpp
-+++ b/src/lib/ZMFCollector.cpp
+--- a/src/lib/ZMFTypes.cpp
 b/src/lib/ZMFTypes.cpp
 @@ -9,6 +9,19 @@
  
- #include "ZMFCollector.h"
+ #include "ZMFTypes.h"
  
 +#include 
 +
@@ -30,8 +30,8 @@ index ded93c7..7e024b3 100644
 +#endif
 +
  #include 
- #include 
  
+ namespace libzmf
 -- 
 2.7.4
 
diff --git a/writerperfect/Library_wpftdraw.mk 
b/writerperfect/Library_wpftdraw.mk
index 23d2945..ec9057c 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
mspub \
mwaw \
odfgen \
+   png \
pagemaker \
revenge \
staroffice \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maarten Bosmans]

 sc/qa/unit/data/xlsx/tdf100709.xlsx|binary
 sc/qa/unit/subsequent_filters-test.cxx |   14 ++
 2 files changed, 14 insertions(+)

New commits:
commit 6cf44da0395ce5d8dc9cfda838fb15c593507363
Author: Maarten Bosmans 
Date:   Wed Sep 7 22:11:26 2016 +0200

Related: tdf#100709 Add unit test

This tests for the two bugs fixed in d16070a3.

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

diff --git a/sc/qa/unit/data/xlsx/tdf100709.xlsx 
b/sc/qa/unit/data/xlsx/tdf100709.xlsx
new file mode 100644
index 000..87698bb
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf100709.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index c538ec7..42aa391 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -216,6 +216,7 @@ public:
 void testBnc762542();
 
 void testTdf100458();
+void testTdf100709XLSX();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -321,6 +322,7 @@ public:
 CPPUNIT_TEST(testHiddenSheetsXLSX);
 
 CPPUNIT_TEST(testTdf100458);
+CPPUNIT_TEST(testTdf100709XLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -3342,6 +3344,18 @@ void ScFiltersTest::testTdf100458()
 CPPUNIT_ASSERT(!rDoc.HasStringData(0, 0, 0));
 }
 
+void ScFiltersTest::testTdf100709XLSX()
+{
+ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("tdf100709.", 
FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf100709.xlsx", xDocSh.Is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Cell B52 should not be formatted with a $", 
OUString("218"), rDoc.GetString(1, 51, 0));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Cell A75 should not be formatted as a date", 
OUString("218"), rDoc.GetString(0, 74, 0));
+
+xDocSh->DoClose();
+}
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/f.dist.rt.fods | 3859 +
 sc/qa/unit/data/functions/fods/f.inv.rt.fods  | 3910 ++
 2 files changed, 7769 insertions(+)

New commits:
commit 4a751b119129fc3c924b92cc9d527ab9b504b5c5
Author: Zdeněk Crhonek 
Date:   Sat Sep 3 14:28:22 2016 +0200

add F.DIST.RT test case

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

diff --git a/sc/qa/unit/data/functions/fods/f.dist.rt.fods 
b/sc/qa/unit/data/functions/fods/f.dist.rt.fods
new file mode 100644
index 000..ce726fa
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/f.dist.rt.fods
@@ -0,0 +1,3859 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-09-03T14:27:23.271485583P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a8a7b7114d96b2013b00e9bc0ced81aad5495457
+ 
+  
+   0
+   0
+   39262
+   10234
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+  
+   4
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 75
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   kQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+   
+
+   Kč
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+   
+

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/erf.precise.fods | 3900 +++
 sc/qa/unit/data/functions/fods/f.dist.fods  | 3868 +++
 sc/qa/unit/data/functions/fods/f.inv.fods   | 3913 
 3 files changed, 11681 insertions(+)

New commits:
commit 9b3699b3b8b49aab42f16a493eeff60897788072
Author: Zdeněk Crhonek 
Date:   Sat Sep 3 20:55:00 2016 +0200

add F.DIST test case

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

diff --git a/sc/qa/unit/data/functions/fods/f.dist.fods 
b/sc/qa/unit/data/functions/fods/f.dist.fods
new file mode 100644
index 000..37fbd68
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/f.dist.fods
@@ -0,0 +1,3868 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-09-03T20:54:23.561954932P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a8a7b7114d96b2013b00e9bc0ced81aad5495457
+ 
+  
+   0
+   0
+   39262
+   10541
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+  
+   4
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 75
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   kQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+ 

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/expondist.fods | 3769 +
 sc/qa/unit/data/functions/fods/indirect.fods  | 4581 ++
 2 files changed, 8350 insertions(+)

New commits:
commit 3d1391e05a1dcbe0e8468fd84282137fcc73f152
Author: Zdeněk Crhonek 
Date:   Sat Sep 3 08:47:36 2016 +0200

add INDIRECT test case

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

diff --git a/sc/qa/unit/data/functions/fods/indirect.fods 
b/sc/qa/unit/data/functions/fods/indirect.fods
new file mode 100644
index 000..641da18
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/indirect.fods
@@ -0,0 +1,4581 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-09-03T08:45:20.467594215P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/139d3b3e8b157c1f365f888126269f0902acbaa2
+ 
+  
+   0
+   0
+   56495
+   12819
+   
+
+ view1
+ 
+  
+   0
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+  
+   0
+   0
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+  
+   0
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+  
+   1
+   5
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 75
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   rQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIA

Re: export-validation in tests by default causing 32 bit Ubuntu to crash

[Markus Mohrhard]

Hey Luke,

On Thu, Sep 8, 2016 at 6:44 PM, Luke Benes  wrote:

> Ever since
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=
> 0868f670374cdcf6c2610d91ff8702f59b2e0bd3
>
> With 32-bit Ubuntu 16.04, I'm getting the following build failure:
>
> CUT] sw_ww8import
> testTscp::Import_Export_Import finished in: 354ms
> testFdo45724::Import finished in: 0ms
> File tested,Execution Time (ms)
> Segmentation fault (core dumped)
>
> No core file identified in directory /core/workdir/CppunitTest/sw_
> ww8export.test.core
> To show backtraces for crashes during test execution,
> enable core files with:
>
>ulimit -c unlimited
>
>
> Error: a unit test failed, please do one of:
> make CppunitTest_sw_ww8export CPPUNITTRACE="gdb --args"
> # for interactive debugging on Linux
> make CppunitTest_sw_ww8export VALGRIND=memcheck
> # for memory checking
> make CppunitTest_sw_ww8export DEBUGCPPUNIT=TRUE
> # for exception catching
>
> /core/solenv/gbuild/CppunitTest.mk:101: recipe for target
> '/core/workdir/CppunitTest/sw_ww8export.test' failed
> make[1]: *** [/core/workdir/CppunitTest/sw_ww8export.test] Error 1
> make[1]: *** Waiting for unfinished jobs
> Aborted (core dumped)
> /core/test/source/bootstrapfixture.cxx:177:SdImportTest::
> testDocumentLayout
> equality assertion failed
> - Expected: 0
> - Actual  : 34304
> - failed to execute: sh /core/bin/officeotron.sh /tmp/lu16851plw1cl.tmp >
> /tmp/lu16851plw1cn.tmp
>
> SdImportTest::testDocumentLayout finished in: 46233ms
> SdImportTest::testSmoketest finished in: 200ms
> SdImportTest::testN759180 finished in: 237ms
> SdImportTest::testN778859 finished in: 253ms
> ...
> SdImportTest::testTdf93868 finished in: 262ms
> SdImportTest::testTdf95932 finished in: 230ms
> SdImportTest::testTdf99030 finished in: 189ms
> SdImportTest::testTdf49561 finished in: 105ms
> bootstrapfixture.cxx:177:Assertion
> Test name: SdImportTest::testDocumentLayout
> equality assertion failed
> - Expected: 0
> - Actual  : 34304
> - failed to execute: sh /core/bin/officeotron.sh /tmp/lu16851plw1cl.tmp >
> /tmp/lu16851plw1cn.tmp
>
> Failures !!!
> Run: 46   Failure total: 1   Failures: 1   Errors: 0
>
> Error: a unit test failed, please do one of:
> make CppunitTest_sd_import_tests CPPUNITTRACE="gdb --args"
> # for interactive debugging on Linux
> make CppunitTest_sd_import_tests VALGRIND=memcheck
> # for memory checking
> make CppunitTest_sd_import_tests DEBUGCPPUNIT=TRUE
> # for exception catching
>
> /core/solenv/gbuild/CppunitTest.mk:101: recipe for target
> '/core/workdir/CppunitTest/sd_import_tests.test' failed
> make[1]: *** [/core/workdir/CppunitTest/sd_import_tests.test] Error 1
> Makefile:261: recipe for target 'build' failed
> make: *** [build] Error 2
>
> ---
>
> Vasily,
> Is there anything else I can do to help you resolve this build failure?
>
>
> 
>
>
Can you run:

make CppunitTest_sw_ww8export CPPUNITTRACE="gdb --args"

type "run" into the gdb window and when it crashes produce a backtrace that
you send with: "thread apply all bt"

At least for the crash that should give an idea what is broken (under the
assumption that you have at least symbols enabled in your build, one of
--enable-symbols, --enable-debug or --enable-dbgutil in autogen.input).

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

[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig sd/UIConfig_simpress.mk

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |   23 
++
 officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu|   26 
++
 sd/UIConfig_simpress.mk |1 
 sd/uiconfig/simpress/toolbar/singlemode.xml |   87 
++
 4 files changed, 137 insertions(+)

New commits:
commit 2846aae8feee12695aa920d49c611c5c13cf6f5f
Author: Yousuf Philips 
Date:   Fri Sep 9 02:41:07 2016 +0400

tdf#92218 Implement Impress single toolbar mode toolbar

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index b87aa35..16ee624 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -1000,6 +1000,29 @@
   false
 
   
+  
+
+  0,0
+
+
+  true
+
+
+  0
+
+
+  Standard (Single Mode)
+
+
+  false
+
+
+  false
+
+
+  false
+
+  
 
   
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
index e9e8ddb..1476d13 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
@@ -257,6 +257,32 @@
 Opened
   
 
+
+  
+Single toolbar
+  
+  
+Single
+  
+  
+1
+  
+  
+false
+  
+  
+
+  private:resource/toolbar/singlemode
+
+  
+  
+
+
+  
+  
+Arrow
+  
+
 
   
 Notebookbar
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index da5ae10..7e1e3c3 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
sd/uiconfig/simpress/toolbar/rectanglesbar \
sd/uiconfig/simpress/toolbar/slideviewobjectbar \
sd/uiconfig/simpress/toolbar/slideviewtoolbar \
+   sd/uiconfig/simpress/toolbar/singlemode \
sd/uiconfig/simpress/toolbar/standardbar \
sd/uiconfig/simpress/toolbar/starshapes \
sd/uiconfig/simpress/toolbar/symbolshapes \
diff --git a/sd/uiconfig/simpress/toolbar/singlemode.xml 
b/sd/uiconfig/simpress/toolbar/singlemode.xml
new file mode 100644
index 000..0dd592d
--- /dev/null
+++ b/sd/uiconfig/simpress/toolbar/singlemode.xml
@@ -0,0 +1,87 @@
+
+
+
+http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   11 +++
 sc/uiconfig/scalc/menubar/menubar.xml |   31 
++
 2 files changed, 42 insertions(+)

New commits:
commit 191b4d964458a052f491521d41eed2f7a7792156
Author: Yousuf Philips 
Date:   Thu Sep 8 07:55:29 2016 +0400

tdf#91820 Add Insert > Form Control submenu into Calc

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 381e39a..5a86859 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2203,6 +2203,17 @@
   1
 
   
+  
+
+  ~Insert...
+
+
+  .uno:InsertName
+
+
+  1
+
+  
 
   
 
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 6b2a2ee..0bbf97c 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -258,6 +258,36 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -497,6 +527,7 @@
 
 
 
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/accessories external/Module_external.mk Makefile.fetch Repository.mk scp2/InstallModule_accessories.mk scp2/InstallModule_extens

[Gabor Kelemen]

 Makefile.fetch 
|   18 
 Repository.mk  
|   23 
 config_host.mk.in  
|   20 
 configure.ac   
|  128 -
 external/Module_external.mk
|1 
 external/accessories/AllLangPackage_accessoriessamples.mk  
|   35 
 external/accessories/AllLangPackage_accessoriessamplesadvertisement.mk 
|   39 
 external/accessories/AllLangPackage_accessoriessamplesdocumentation.mk 
|   34 
 external/accessories/AllLangPackage_accessoriessamplesnonfree.mk   
|   33 
 external/accessories/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk  
|   33 
 external/accessories/AllLangPackage_accessoriessamplesnonfreedocumentation.mk  
|   33 
 external/accessories/AllLangPackage_accessoriestemplates.mk
|   32 
 external/accessories/AllLangPackage_accessoriestemplateseducate.mk 
|   48 
 external/accessories/AllLangPackage_accessoriestemplatesfinance.mk 
|  106 -
 external/accessories/AllLangPackage_accessoriestemplatesforms.mk   
|   85 -
 external/accessories/AllLangPackage_accessoriestemplateslabels.mk  
|   74 -
 external/accessories/AllLangPackage_accessoriestemplateslayout.mk  
|  333 
 external/accessories/AllLangPackage_accessoriestemplatesmisc.mk
|  262 ---
 external/accessories/AllLangPackage_accessoriestemplatesnonfree.mk 
|   33 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreeeducate.mk  
|   53 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreefinance.mk  
|   45 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreeforms.mk
|   33 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreelabels.mk   
|   33 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreelayout.mk   
|   33 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreemisc.mk 
|   54 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk 
|   34 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk 
|   33 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreepersonal.mk 
|   35 
 external/accessories/AllLangPackage_accessoriestemplatesnonfreepresent.mk  
|   33 
 external/accessories/AllLangPackage_accessoriestemplatesofficorr.mk
|  170 --
 external/accessories/AllLangPackage_accessoriestemplatesoffimisc.mk
|  151 --
 external/accessories/AllLangPackage_accessoriestemplatespersonal.mk
|  138 --
 external/accessories/AllLangPackage_accessoriestemplatespresent.mk 
|   94 -
 external/accessories/ExternalPackage_accessoriesgallery.mk 
|  315 
 external/accessories/ExternalPackage_accessoriesgallerydrawspeople.mk  
|   36 
 external/accessories/ExternalPackage_accessoriesgalleryelementsbullets2.mk 
|  189 --
 external/accessories/ExternalPackage_accessoriesgallerynonfree.mk  
|   27 
 external/accessories/ExternalPackage_accessoriesgalleryphotosbuildings.mk  
|   35 
 external/accessories/ExternalPackage_accessoriesgalleryphotoscelebration.mk
|   17 
 external/accessories/ExternalPackage_accessoriesgalleryphotoscities.mk 
|   23 
 external/accessories/ExternalPackage_accessoriesgalleryphotosfauna.mk  
|   58 
 external/accessories/ExternalPackage_accessoriesgalleryphotosflowers.mk
|   37 
 external/accessories/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk 
|   22 
 external/accessories/ExternalPackage_accessoriesgalleryphotoshumans.mk 
|   26 
 external/accessories/ExternalPackage_accessoriesgalleryphotoslandscapes.mk 
|   74 -
 external/accessories/ExternalPackage_accessoriesgalleryphotosobjects.mk
|   33 
 external/accessories/ExternalPackage_accessoriesgalleryphotosplants.mk 
|   74 -
 external/accessories/ExternalPackage_accessoriesgalleryphotosspace.mk  
|   34 
 external/accessories/ExternalPackage_accessoriesgalleryphotosstatues.mk
|   20 
 external/accessories/ExternalPackage_accessoriesgalleryphotostravel.mk 
|   21 
 external/accessories/ExternalPackage_accessoriestemplatescommon.mk 
|   18 
 external/accessories/ExternalPackage_accessoriestemplatescommoneducate.mk  
|   32 
 external/accessories/ExternalPackage_accessoriestemplatescommonfinance.mk  
|   16 
 external/accessories/ExternalPackage_accessoriestemplatescommonforms.mk
|   16 
 external/accessories/ExternalPackage_accessoriestemplatescommonlabels.mk   
|   66 
 external/accessories/ExternalPackage_accessoriestemplatescommonlayout.mk 

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

[Caolán McNamara]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
 writerfilter/source/rtftok/rtftokenizer.cxx|2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4112594d60961d2d1a6b0f90422ce1b0924bf07d
Author: Caolán McNamara 
Date:   Tue Sep 6 20:19:04 2016 +0100

rtf: don't skip backwards on skipping bin specified bytes

otherwise we could end up re-parsing the block endlessly

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

diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx 
b/writerfilter/source/rtftok/rtftokenizer.cxx
index cb78085..1afbc10 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -285,7 +285,7 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, 
bool bParam, int nPara
 {
 // skip binary data explicitely, to not trip over rtf markup
 // control characters
-if (rKeyword.equals("bin"))
+if (rKeyword.equals("bin") && nParam > 0)
 Strm().SeekRel(nParam);
 return RTFError::OK;
 }
commit 10da1cf5b1e2446470b4892f0e49132217baf33d
Author: Caolán McNamara 
Date:   Tue Sep 6 20:31:06 2016 +0100

rtf: throw early on a bad nestrow token

Reviewed-on: https://gerrit.libreoffice.org/28708
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 5e9982668224345f901631d664985e823530e05a)

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

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1910baf..48a3707 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2287,12 +2287,12 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)
   pBuffer->pRowProperties,
   m_nNestedCells, m_nNestedCurrentCellX);
 
-assert(m_aStates.top().pCurrentBuffer == &m_aTableBufferStack.back());
-if (m_aTableBufferStack.size() == 1)
+if (m_aTableBufferStack.size() == 1 || !m_aStates.top().pCurrentBuffer)
 {
 throw io::WrongFormatException(
 "mismatch between \\itap and number of \\nestrow", nullptr);
 }
+assert(m_aStates.top().pCurrentBuffer == &m_aTableBufferStack.back());
 // note: there may be several states pointing to table buffer!
 for (size_t i = 0; i < m_aStates.size(); ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/qa/extras/odfimport/data/tdf75221.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx |9 +
 sw/source/core/layout/flowfrm.cxx|   21 -
 3 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit ba18832ceeda21f047a664b71a4333a54737e6c8
Author: Mike Kaganski 
Date:   Thu Sep 8 07:20:18 2016 +0300

tdf#75221: make margin collapsing implementation conform OASIS proposal

Since the margin collapsing (aka contextual spacing, implemented
for LO 3.6 by Miklos Vajna, commits
6f04bf5e90ff75288dcf75c43843edf798641e3d,
0662778b0b4b9958ee5e5bd3bac69f9e290f9495,
11059331718fb8faab483c75633b4e80d8028b7d,
03f9b6bebc0ca77021be46664c7bcbe4cb297503,
8631dbf85fb5ed56d225e32ea5a9c36c96b0d649,
9f4bb5bd4f55b4a80544413efde26391849b1d7f,
f722299e133568fe75f7cf9ce0c103a1553474c4) is only meant
to suppress fo:margin-top and fo:margin-bottom, as seen in
https://issues.oasis-open.org/browse/OFFICE-3767, current
implementation is inconsistent: it nullifies all spacing, including
normal line spacing.

This patch makes sure that collapsing conforms to specification.

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

diff --git a/sw/qa/extras/odfimport/data/tdf75221.odt 
b/sw/qa/extras/odfimport/data/tdf75221.odt
new file mode 100644
index 000..6ef117c
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf75221.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 02fb8b1..ceb5572 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -658,5 +658,14 @@ DECLARE_ODFIMPORT_TEST(testFdo47267, "fdo47267-3.odt")
 // This was a Style Families getByName() crash
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf75221, "tdf75221.odt")
+{
+// When "Don't add space between paragraphs of the same style" setting set,
+// spacing between same-style paragraphs must be equal to their line 
spacing.
+// It used to be 0.
+OUString top = parseDump("/root/page/body/txt[2]/infos/prtBounds", "top");
+CPPUNIT_ASSERT(top.toInt32() > 0);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 874733a..0ab2319 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1391,6 +1391,10 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs 
*pAttrs,
 const bool bUseFormerLineSpacing = 
rIDSA.get(DocumentSettingId::OLD_LINE_SPACING);
 if( pPrevFrame )
 {
+const bool bContextualSpacing = pAttrs->GetULSpace().GetContext()
+ && 
lcl_getContextualSpacing(pPrevFrame)
+ && lcl_IdenticalStyles(pPrevFrame, 
&m_rThis);
+
 // OD 2004-03-10 #i11860# - use new method to determine needed 
spacing
 // values of found previous frame and use these values.
 SwTwips nPrevLowerSpace = 0;
@@ -1402,7 +1406,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs 
*pAttrs,
bPrevLineSpacingPorportional );
 if( rIDSA.get(DocumentSettingId::PARA_SPACE_MAX) )
 {
-nUpper = nPrevLowerSpace + pAttrs->GetULSpace().GetUpper();
+nUpper = (bContextualSpacing) ? 0 : nPrevLowerSpace + 
pAttrs->GetULSpace().GetUpper();
 SwTwips nAdd = nPrevLineSpacing;
 // OD 07.01.2004 #i11859# - consideration of the line spacing
 //  for the upper spacing of a text frame
@@ -1445,8 +1449,8 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs 
*pAttrs,
 }
 else
 {
-nUpper = std::max( static_cast(nPrevLowerSpace),
-  
static_cast(pAttrs->GetULSpace().GetUpper()) );
+nUpper = bContextualSpacing ? 0 : 
std::max(static_cast(nPrevLowerSpace),
+   
static_cast(pAttrs->GetULSpace().GetUpper()) );
 // OD 07.01.2004 #i11859# - consideration of the line spacing
 //  for the upper spacing of a text frame
 if ( bUseFormerLineSpacing )
@@ -1510,16 +1514,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs 
*pAttrs,
 {
 nUpper += GetUpperSpaceAmountConsideredForPageGrid_( nUpper );
 }
-
-const bool bContextualSpacing = pAttrs->GetULSpace().GetContext();
-
-if (bContextualSpacing && pPrevFrame && 
lcl_getContextualSpacing(pPrevFrame)
-&& lcl_IdenticalStyles(pPrevFrame, &m_rThis))
-{
-return 0;
-}
-else
-return nUpper;
+return nUpper;
 }
 
 /** me

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

[Caolán McNamara]

 vcl/inc/unx/gtk/gtksalmenu.hxx |1 +
 vcl/unx/gtk/gtksalmenu.cxx |8 
 2 files changed, 9 insertions(+)

New commits:
commit d45d8ae3c51606eb1d9e63396a0eab13c8742907
Author: Caolán McNamara 
Date:   Thu Sep 8 16:36:59 2016 +0100

Resolves: tdf#101881 gtk3 3.18 menubar doesn't grab keyboard...

the same way gtk3 3.20 does with gtk_grab_add, so on gtk_menu_shell_deselect
the keyboard focus doesn't remain in the menubar.

bisecting gtk itself I find...

commit 5cbbb90e311d95192d1b68ba89c3190cdb652868
Author: Carlos Garnacho 
Date:   Thu Nov 26 19:54:31 2015 +0100

GtkCellRendererAccel: Use gdk_seat_grab()

https://bugzilla.gnome.org/show_bug.cgi?id=759309

is the commit that makes it do what I want, so add an extra
gtk_grab_add/gtk_grab_remove around our entry and exit of the menubar

Change-Id: I5bf09834b4e1a14d30403208d03b3abd28a382a8

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index b6c1042..48e9373 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -48,6 +48,7 @@ private:
 boolmbMenuBar;
 boolmbNeedsUpdate;
 boolmbReturnFocusToDocument;
+boolmbAddedGrab;
 GtkWidget*  mpMenuBarContainerWidget;
 GtkWidget*  mpMenuBarWidget;
 GtkWidget*  mpCloseButton;
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index d75e7bc..604a418 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -421,6 +421,7 @@ GtkSalMenu::GtkSalMenu( bool bMenuBar ) :
 mbMenuBar( bMenuBar ),
 mbNeedsUpdate( false ),
 mbReturnFocusToDocument( false ),
+mbAddedGrab( false ),
 mpMenuBarContainerWidget( nullptr ),
 mpMenuBarWidget( nullptr ),
 mpCloseButton( nullptr ),
@@ -599,6 +600,11 @@ void GtkSalMenu::ShowCloseButton(bool bShow)
 //focus to the next pane by itself.
 void GtkSalMenu::ReturnFocus()
 {
+if (mbAddedGrab)
+{
+gtk_grab_remove(mpMenuBarWidget);
+mbAddedGrab = false;
+}
 if (!mbReturnFocusToDocument)
 gtk_widget_grab_focus(GTK_WIDGET(mpFrame->getEventBox()));
 else
@@ -658,6 +664,8 @@ bool GtkSalMenu::TakeFocus()
 
 //this pairing results in a menubar with keyboard focus with no menus
 //auto-popped down
+gtk_grab_add(mpMenuBarWidget);
+mbAddedGrab = true;
 gtk_menu_shell_select_first(GTK_MENU_SHELL(mpMenuBarWidget), false);
 gtk_menu_shell_deselect(GTK_MENU_SHELL(mpMenuBarWidget));
 mbReturnFocusToDocument = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 svx/sdi sw/sdi

[Caolán McNamara]

 idl/inc/globals.hxx |4 
 idl/inc/slot.hxx|4 
 idl/source/objects/slot.cxx |   18 --
 idl/source/prj/command.cxx  |2 --
 idl/source/prj/globals.cxx  |2 --
 idl/source/prj/parser.cxx   |2 --
 include/sfx2/msg.hxx|6 ++
 svx/sdi/svx.sdi |   34 --
 sw/sdi/swriter.sdi  |   39 ---
 9 files changed, 2 insertions(+), 109 deletions(-)

New commits:
commit bcf8f878899be13002b2c40f9f2b9363f20fec3a
Author: Caolán McNamara 
Date:   Thu Sep 8 13:38:38 2016 +0100

remove IMAGEROTATION and IMAGEREFLECTION SfxSlotMode enums...

unused since...

commit 7affe26a1291eef8c77e890228061f13e987bff1
Author: Maxim Monastirsky 
Date:   Mon Feb 22 18:47:15 2016 +0200

Kill sfx2 menu support

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

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 6092fbb..e49e81e 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -63,8 +63,6 @@ struct SvGlobalHashNames
 SvStringHashEntryRef MM_FastCall;
 SvStringHashEntryRef MM_SbxObject;
 SvStringHashEntryRef MM_Container;
-SvStringHashEntryRef MM_ImageRotation;
-SvStringHashEntryRef MM_ImageReflection;
 SvStringHashEntryRef MM_ReadOnlyDoc;
 SvStringHashEntryRef MM_struct;
 SvStringHashEntryRef MM_SlotType;
@@ -129,8 +127,6 @@ HASH_INLINE(AccelConfig)
 HASH_INLINE(FastCall)
 HASH_INLINE(SbxObject)
 HASH_INLINE(Container)
-HASH_INLINE(ImageRotation)
-HASH_INLINE(ImageReflection)
 HASH_INLINE(ReadOnlyDoc)
 HASH_INLINE(struct)
 HASH_INLINE(SlotType)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index bb80784..e3e8c19 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -48,8 +48,6 @@ public:
 SvBOOL   aAccelConfig;
 SvBOOL   aFastCall;
 SvBOOL   aContainer;
-SvBOOL   aImageRotation;
-SvBOOL   aImageReflection;
 SvIdentifier aPseudoPrefix;
 OString  aDisableFlags;
 SvMetaSlot*  pLinkedSlot;
@@ -123,8 +121,6 @@ public:
 boolGetAccelConfig() const;
 boolGetFastCall() const;
 boolGetContainer() const;
-boolGetImageRotation() const;
-boolGetImageReflection() const;
 boolGetReadOnlyDoc() const;
 boolGetExport() const;
 boolGetHidden() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index c17926a..a4df0c8 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -221,18 +221,6 @@ bool SvMetaSlot::GetContainer() const
 return static_cast(GetRef())->GetContainer();
 }
 
-bool SvMetaSlot::GetImageRotation() const
-{
-if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation;
-return static_cast(GetRef())->GetImageRotation();
-}
-
-bool SvMetaSlot::GetImageReflection() const
-{
-if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
-return static_cast(GetRef())->GetImageReflection();
-}
-
 void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 SvTokenStream & rInStm )
 {
@@ -292,8 +280,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 
 bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
 bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
-bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
-bOk |= aImageReflection.ReadSvIdl( SvHash_ImageReflection(), rInStm );
 
 if( !bOk )
 {
@@ -774,10 +760,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, 
sal_uInt16 nCount,
 rOutStm.WriteOString( MakeSlotName( SvHash_Container() ) ).WriteChar( 
'|' );
 if ( GetReadOnlyDoc() )
 rOutStm.WriteOString( MakeSlotName( SvHash_ReadOnlyDoc() ) 
).WriteChar( '|' );
-if( GetImageRotation() )
-rOutStm.WriteOString( MakeSlotName( SvHash_ImageRotation() ) 
).WriteChar( '|' );
-if( GetImageReflection() )
-rOutStm.WriteOString( MakeSlotName( SvHash_ImageReflection() ) 
).WriteChar( '|' );
 rOutStm.WriteCharPtr( "SfxSlotMode::NONE" );
 
 rOutStm.WriteChar( ',' ) << endl;
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index a939ee5..54e23ab 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -83,8 +83,6 @@ char const * SyntaxStrings[] = {
 "\t\tFastCall",
 "\t\tGet, Set",
 "\t\tGroupId= Identifier",
-"\t\tImageRotation",
-"\t\tImageReflection",
 "\t\tPseudoPrefix   = Identifier",
 "\t\tPseudoSlots",
 "\t\tReadOnlyDoc*",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index dc24d94..483c41d 100644
--- a/i

[Libreoffice-commits] online.git: loleaflet/src

[Henry Castro]

 loleaflet/src/map/Map.js |4 
 1 file changed, 4 insertions(+)

New commits:
commit 46a314206b720858127e254d2ae499e12fa53b60
Author: Henry Castro 
Date:   Thu Sep 8 16:48:56 2016 -0400

loleaflet: avoid undefined variables when map not loaded

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1d01ff7..e2204b4 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -790,6 +790,8 @@ L.Map = L.Evented.extend({
},
 
_onLostFocus: function () {
+   if (!this._loaded) { return; }
+
var doclayer = this._docLayer;
if (doclayer._isCursorVisible && 
doclayer._isCursorOverlayVisible) {
doclayer._visibleCursorOnLostFocus = 
doclayer._visibleCursor;
@@ -802,6 +804,8 @@ L.Map = L.Evented.extend({
},
 
_onGotFocus: function () {
+   if (!this._loaded) { return; }
+
var doclayer = this._docLayer;
if (doclayer._isCursorVisibleOnLostFocus && 
doclayer._isCursorOverlayVisibleOnLostFocus) {
// we restore the old cursor position by a small delay, 
so that if the user clicks
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sc/uiconfig/scalc/menubar/menubar.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d704c2b95e811798b900ac18974f7983ffca4090
Author: Maxim Monastirsky 
Date:   Thu Sep 8 23:48:43 2016 +0300

Wrong command for shape name

Change-Id: I99719229fe58233053ce39aa3f07b0d112b32bd7

diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index d1cad9a..6b2a2ee 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -413,7 +413,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/tiledrendering/tiledrendering.cxx |  212 
 1 file changed, 212 deletions(-)

New commits:
commit a7b0cd14117972dce5fc18e09057cb362fbc01de
Author: Miklos Vajna 
Date:   Thu Sep 8 17:32:50 2016 +0200

sw: remove qa/tiledrendering/tiledrendering.cxx again

It was first removed in aa94466699a98730d9e8d112fd52cea63c2226b2
(Executable_tiledrendering is obsolete and can be killed, 2015-03-24),
and then it was re-introduced with
00f2787a4a68633206635743298926bf2e65a8fa (vclwidgets: wrap all
vcl::Window subclasses allocated on stack in VclPtr, 2015-04-09) due to
a mismerge.

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

diff --git a/sw/qa/tiledrendering/tiledrendering.cxx 
b/sw/qa/tiledrendering/tiledrendering.cxx
deleted file mode 100644
index 1adad49..000
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::sfx2;
-
-class TiledRenderingApp : public Application
-{
-private:
-uno::Reference xContext;
-uno::Reference xFactory;
-uno::Reference xSFactory;
-uno::Reference xDesktop;
-uno::Reference xLoader;
-uno::Reference xComponent;
-public:
-virtual void Init() override;
-virtual int Main() override;
-void Open(OUString & aFileUrl);
-};
-
-class TiledRenderingDialog: public ModalDialog
-{
-private:
-TiledRenderingApp *mpApp;
-VclPtr mpContextWidth;
-VclPtr mpContextHeight;
-VclPtr mpTilePosX;
-VclPtr mpTilePosY;
-VclPtr mpTileWidth;
-VclPtr mpTileHeight;
-VclPtr mpImage;
-
-public:
-explicit TiledRenderingDialog(TiledRenderingApp * app) :
-ModalDialog(nullptr, "TiledRendering", "qa/sw/ui/tiledrendering.ui", 
Dialog::InitFlag::NoParent),
-mpApp(app)
-{
-VclPtr renderButton;
-get(renderButton, "buttonRenderTile");
-renderButton->SetClickHdl( LINK( this, TiledRenderingDialog, 
RenderHdl));
-
-VclPtr chooseDocumentButton;
-get(chooseDocumentButton, "buttonChooseDocument");
-chooseDocumentButton->SetClickHdl( LINK( this, TiledRenderingDialog, 
ChooseDocumentHdl));
-
-SetStyle(GetStyle()|WB_CLOSEABLE);
-
-get(mpContextWidth, "spinContextWidth");
-get(mpContextHeight, "spinContextHeight");
-get(mpTilePosX, "spinTilePosX");
-get(mpTilePosY, "spinTilePosY");
-get(mpTileWidth, "spinTileWidth");
-get(mpTileHeight, "spinTileHeight");
-get(mpImage, "imageTile");
-}
-
-virtual ~TiledRenderingDialog()
-{
-disposeOnce();
-}
-
-virtual void dispose() override
-{
-mpContextWidth.clear();
-mpContextHeight.clear();
-mpTilePosX.clear();
-mpTilePosY.clear();
-mpTileWidth.clear();
-mpTileHeight.clear();
-mpImage.clear();
-ModalDialog::dispose();
-}
-
-DECL_LINK_TYPED( RenderHdl, Button *, void );
-DECL_LINK_TYPED( ChooseDocumentHdl, Button *, void );
-};
-
-IMPL_LINK_NOARG_TYPED( TiledRenderingDialog, RenderHdl, Button *, void)
-{
-int contextWidth = mpContextWidth->GetValue();
-int contextHeight = mpContextHeight->GetValue();
-int tilePosX = mpTilePosX->GetValue();
-int tilePosY = mpTilePosY->GetValue();
-long tileWidth = mpTileWidth->GetValue();
-long tileHeight = mpTileHeight->GetValue();
-
-// do the same thing we are doing in touch_lo_draw_tile()
-SwWrtShell *pViewShell = GetActiveWrtShell();
-
-if (pViewShell)
-{
-// TODO create a VirtualDevice based on SystemGraphicsData instead so
-// that we get direct rendering; something like:
-//
-// SystemGraphicsData aData;
-// [setup the aData]
-// VirtualDevice pDevice(&aData, [color depth]);
-ScopedVclPtrInstance< VirtualDevice > pDevice;
-
-// paint to it
-pViewShell->PaintTile(*pDevice.get(), contextWidth, contextHeight, 
tilePosX, tilePosY, tileWidth, tileHeight);
-
-// copy the pDevice content to mpImage
-Bitmap aBitmap(pDevice->GetBitmap(pDevice->PixelToLogic(Point(0,0)), 
pD

Michael Lewis license statement

[Michael Lewis]

All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

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

export-validation in tests by default causing 32 bit Ubuntu to crash

[Luke Benes]

Ever since
https://cgit.freedesktop.org/libreoffice/core/commit/?id=0868f670374cdcf6c2610d91ff8702f59b2e0bd3

With 32-bit Ubuntu 16.04, I'm getting the following build failure:

CUT] sw_ww8import
testTscp::Import_Export_Import finished in: 354ms
testFdo45724::Import finished in: 0ms
File tested,Execution Time (ms)
Segmentation fault (core dumped)

No core file identified in directory 
/core/workdir/CppunitTest/sw_ww8export.test.core
To show backtraces for crashes during test execution,
enable core files with:

   ulimit -c unlimited


Error: a unit test failed, please do one of:
make CppunitTest_sw_ww8export CPPUNITTRACE="gdb --args"
# for interactive debugging on Linux
make CppunitTest_sw_ww8export VALGRIND=memcheck
# for memory checking
make CppunitTest_sw_ww8export DEBUGCPPUNIT=TRUE
# for exception catching

/core/solenv/gbuild/CppunitTest.mk:101: recipe for target 
'/core/workdir/CppunitTest/sw_ww8export.test' failed
make[1]: *** [/core/workdir/CppunitTest/sw_ww8export.test] Error 1
make[1]: *** Waiting for unfinished jobs
Aborted (core dumped)
/core/test/source/bootstrapfixture.cxx:177:SdImportTest::testDocumentLayout
equality assertion failed
- Expected: 0
- Actual  : 34304
- failed to execute: sh /core/bin/officeotron.sh /tmp/lu16851plw1cl.tmp > 
/tmp/lu16851plw1cn.tmp

SdImportTest::testDocumentLayout finished in: 46233ms
SdImportTest::testSmoketest finished in: 200ms
SdImportTest::testN759180 finished in: 237ms
SdImportTest::testN778859 finished in: 253ms
...
SdImportTest::testTdf93868 finished in: 262ms
SdImportTest::testTdf95932 finished in: 230ms
SdImportTest::testTdf99030 finished in: 189ms
SdImportTest::testTdf49561 finished in: 105ms
bootstrapfixture.cxx:177:Assertion
Test name: SdImportTest::testDocumentLayout
equality assertion failed
- Expected: 0
- Actual  : 34304
- failed to execute: sh /core/bin/officeotron.sh /tmp/lu16851plw1cl.tmp > 
/tmp/lu16851plw1cn.tmp

Failures !!!
Run: 46   Failure total: 1   Failures: 1   Errors: 0

Error: a unit test failed, please do one of:
make CppunitTest_sd_import_tests CPPUNITTRACE="gdb --args"
# for interactive debugging on Linux
make CppunitTest_sd_import_tests VALGRIND=memcheck
# for memory checking
make CppunitTest_sd_import_tests DEBUGCPPUNIT=TRUE
# for exception catching

/core/solenv/gbuild/CppunitTest.mk:101: recipe for target 
'/core/workdir/CppunitTest/sd_import_tests.test' failed
make[1]: *** [/core/workdir/CppunitTest/sd_import_tests.test] Error 1
Makefile:261: recipe for target 'build' failed
make: *** [build] Error 2

---

Vasily,
Is there anything else I can do to help you resolve this build failure?


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

[Libreoffice-commits] online.git: loolwsd/test

[Henry Castro]

 loolwsd/test/httpwstest.cpp |   62 
 1 file changed, 62 insertions(+)

New commits:
commit e9f3fd4e560089aa5402b4b12b48a7483185893a
Author: Henry Castro 
Date:   Thu Sep 8 12:16:51 2016 -0400

loolwsd: test: cell view cursor

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 79bb226..a6fe190 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -91,6 +91,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testOptimalResize);
 CPPUNIT_TEST(testInvalidateViewCursor);
 CPPUNIT_TEST(testViewCursorVisible);
+CPPUNIT_TEST(testCellViewCursor);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -130,6 +131,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 void testOptimalResize();
 void testInvalidateViewCursor();
 void testViewCursorVisible();
+void testCellViewCursor();
 
 void loadDoc(const std::string& documentURL);
 
@@ -2223,6 +2225,66 @@ void HTTPWSTest::testViewCursorVisible()
 }
 }
 
+void HTTPWSTest::testCellViewCursor()
+{
+try
+{
+int docSheet = -1;
+int docSheets = 0;
+int docHeight = 0;
+int docWidth = 0;
+int docViewId = -1;
+int itView = 0;
+
+// 0..N Views
+std::vector> views;
+
+// Load a document
+std::string documentPath, documentURL, response, text;
+getDocumentPathAndURL("empty.ods", documentPath, documentURL);
+
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
documentURL);
+Poco::Net::WebSocket socket1 = *connectLOKit(_uri, request, _response);
+
+sendTextFrame(socket1, "load url=" + documentURL);
+CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, 
isDocumentLoaded(socket1));
+
+// Check document size
+sendTextFrame(socket1, "status");
+getResponseMessage(socket1, "status:", response, false);
+CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as 
expected", !response.empty());
+parseDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, 
docHeight, docViewId);
+
+// Click to show a cell cursor
+Poco::format(text, "mouse type=%s x=%d y=%d count=1 buttons=1 
modifier=0", std::string("buttondown"), docWidth/10, docHeight/10);
+sendTextFrame(socket1, text); text.clear();
+Poco::format(text, "mouse type=%s x=%d y=%d count=1 buttons=1 
modifier=0", std::string("buttonup"), docWidth/10, docHeight/10);
+sendTextFrame(socket1, text);
+getResponseMessage(socket1, "cellcursor:", response, false);
+CPPUNIT_ASSERT_MESSAGE("did not receive a cellcursor: message as 
expected", !response.empty());
+
+// Connect 0..N Views
+for (itView = 0; itView < 10; ++itView)
+{
+views.emplace_back(connectLOKit(_uri, request, _response));
+}
+
+// Load 0..N view and expect to receive cellviewcursor
+for (auto socketView : views)
+{
+sendTextFrame(*socketView, "load url=" + documentURL);
+CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, 
isDocumentLoaded(*socketView, "", true));
+
+// Expected to receive cellviewcursor second view
+getResponseMessage(*socketView, "cellviewcursor:", response, 
false);
+CPPUNIT_ASSERT_MESSAGE("did not receive a cellviewcursor: message 
as expected", !response.empty());
+}
+}
+catch (const Poco::Exception& exc)
+{
+CPPUNIT_FAIL(exc.displayText());
+}
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HTTPWSTest);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Henry Castro]

 loleaflet/src/control/Parts.js|1 +
 loleaflet/src/layer/tile/TileLayer.js |   21 -
 2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 878fff5ebb78b58bbcb5c49516eed8f7215111e5
Author: Henry Castro 
Date:   Thu Sep 8 12:11:07 2016 -0400

loleaflet: fix part not taken into account for cell cursors

diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index db63f95..45fd68d 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -32,6 +32,7 @@ L.Map.include({
});
this._socket.sendMessage('setclientpart part=' + 
docLayer._selectedPart);
docLayer._updateViewCursors();
+   docLayer._updateCellViewCursors();
docLayer._clearSelections();
docLayer._updateOnChangePart();
docLayer._pruneTiles();
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6fb3c1b..8b40da6 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -653,6 +653,7 @@ L.TileLayer = L.GridLayer.extend({
this._twipsToLatLng(bottomRightTwips, 
this._map.getZoom()));
}
 
+   this._cellViewCursors[viewId].part = parseInt(obj.part);
this._onUpdateCellViewCursor(viewId);
},
 
@@ -661,23 +662,19 @@ L.TileLayer = L.GridLayer.extend({
return;
 
var cellViewCursorsMarker = 
this._cellViewCursors[viewId].marker;
-   if 
(!this._isEmptyRectangle(this._cellViewCursors[viewId].bounds)) {
+   var viewPart = this._cellViewCursors[viewId].part;
 
-   if (cellViewCursorsMarker) {
-   this._map.removeLayer(cellViewCursorsMarker);
-   }
-   cellViewCursorsMarker = 
L.rectangle(this._cellViewCursors[viewId].bounds, {fill: false, color: 
L.LOUtil.getViewIdHexColor(viewId), weight: 2});
+   if 
(!this._isEmptyRectangle(this._cellViewCursors[viewId].bounds) && 
this._selectedPart === viewPart) {
if (!cellViewCursorsMarker) {
-   this._map.fire('error', {msg: 'Cell View Cursor 
marker initialization', cmd: 'cellViewCursor', kind: 'failed', id: 1});
-   return;
+   cellViewCursorsMarker = 
L.rectangle(this._cellViewCursors[viewId].bounds, {fill: false, color: 
L.LOUtil.getViewIdHexColor(viewId), weight: 2});
+   this._cellViewCursors[viewId].marker = 
cellViewCursorsMarker;
}
+   
cellViewCursorsMarker.setBounds(this._cellViewCursors[viewId].bounds);
this._map.addLayer(cellViewCursorsMarker);
}
else if (cellViewCursorsMarker) {
this._map.removeLayer(cellViewCursorsMarker);
}
-
-   this._cellViewCursors[viewId].marker = cellViewCursorsMarker;
},
 
_onViewCursorVisibleMsg: function(textMsg) {
@@ -1198,6 +1195,12 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   _updateCellViewCursors: function () {
+   for (var key in this._cellViewCursors) {
+   this._onUpdateCellViewCursor(key);
+   }
+   },
+
// Update dragged graphics selection resize.
_onGraphicEdit: function (e) {
if (!e.handle) { return; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf |binary
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f5bbdd05582a0a6fa9a3db399f97df18373215ad
Author: Caolán McNamara 
Date:   Tue Sep 6 15:57:30 2016 +0100

fftester: missing ValueLast

Reviewed-on: https://gerrit.libreoffice.org/28693
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 30af3971d826d55426f51a7beb14c24ac3880250)

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

diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf
new file mode 100644
index 000..847e165
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8b2efd6..1910baf 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2328,7 +2328,8 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)
 if ((m_nCellxMax - m_nTopLevelCurrentCellX) >= MINLAY)
 {
 auto pXValueLast = 
m_aStates.top().aTableRowSprms.find(NS_ooxml::LN_CT_TblGridBase_gridCol, false);
-auto pXValue = std::make_shared(pXValueLast->getInt() + 
m_nCellxMax - m_nTopLevelCurrentCellX);
+const int nXValueLast = pXValueLast ? pXValueLast->getInt() : 0;
+auto pXValue = std::make_shared(nXValueLast + 
m_nCellxMax - m_nTopLevelCurrentCellX);
 
m_aStates.top().aTableRowSprms.eraseLast(NS_ooxml::LN_CT_TblGridBase_gridCol);
 
m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblGridBase_gridCol, 
pXValue, RTFOverwrite::NO_APPEND);
 m_nTopLevelCurrentCellX = m_nCellxMax;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rpmbuild]

 vcl/inc/helpwin.hxx |1 +
 vcl/source/app/help.cxx |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 02b6a8ae5a0ad4ebb0c929ebf079e01eb76762f8
Author: rpmbuild 
Date:   Mon Aug 15 15:17:11 2016 +0100

Resolves: tdf#91533 (rhbz#1364335) Tooltips are truncated

Change-Id: Id9ec91ed9652f491e4e2a0556eeed27bf6517002
(cherry picked from commit e527edf06f8befb45b76ee8ebabe62e6dc885e45)
Reviewed-on: https://gerrit.libreoffice.org/28220
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index cf35423..db7c10e 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -49,6 +49,7 @@ private:
 virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) 
override;
 virtual void RequestHelp( const HelpEvent& rHEvt ) override;
 virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
+virtual void StateChanged(StateChangedType nType) override;
 
 virtual OUString GetText() const override;
 void ImplShow();
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 19570ce..cd89ea5 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -260,6 +260,17 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, 
const OUString& rText, sal
 maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() );
 }
 
+void HelpTextWindow::StateChanged(StateChangedType nType)
+{
+FloatingWindow::StateChanged(nType);
+if (nType == StateChangedType::InitShow)
+{
+ApplySettings(*this);
+SetHelpText(maHelpText);
+Invalidate();
+}
+}
+
 void HelpTextWindow::ApplySettings(vcl::RenderContext& rRenderContext)
 {
 const StyleSettings& rStyleSettings = 
rRenderContext.GetSettings().GetStyleSettings();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 editeng/source/misc/svxacorr.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 0c0c421f1936417d72d6268aaeee86d119ae8841
Author: Michael Stahl 
Date:   Thu Sep 1 23:06:00 2016 +0200

editeng: don't let wild-card auto-correct leave current word

If a paragraph has e.g. multiple -> in it then auto-correct of the first
one will create via the .*->.* rule a new auto-correct entry that has as
long-word the word that contains the first -> until the last -> and
everything in between.  This will be somewhat irritating when it is
eventually applied.  Avoid it by limiting the wild-card loop to the
current word, which is apparently the intent anyway.

(regression from a07425892205ff8951027ea20459b97370d01de6)

Change-Id: I294bae863c44eb460627b61b4383133131fe4b3a
Reviewed-on: https://gerrit.libreoffice.org/28608
Reviewed-by: László Németh 
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 9670f0d17ffed1ff07cb1deddcabc26c756e4bc1)
Reviewed-on: https://gerrit.libreoffice.org/28634
Reviewed-by: Miklos Vajna 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 7c459f4..51bb16c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2833,6 +2833,11 @@ const SvxAutocorrWord* 
SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
 nSttWdPos = rTxt.indexOf( sTmp, nFndPos);
 if (nSttWdPos != -1)
 {
+sal_Int32 nTmp(nFndPos);
+while (nTmp < nSttWdPos && 
!IsWordDelim(rTxt[nTmp]))
+nTmp++;
+if (nTmp < nSttWdPos)
+break; // word delimiter found
 buf.append(rTxt.copy(nFndPos, nSttWdPos - 
nFndPos)).append(pFnd->GetLong());
 nFndPos = nSttWdPos + sTmp.getLength();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/unocore/unosett.cxx   |2 +-
 writerfilter/source/dmapper/NumberingManager.cxx |   11 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 0ac170beb986997d57fd14c7dcdfff8f46820699
Author: Caolán McNamara 
Date:   Tue Sep 6 14:49:31 2016 +0100

if we throw in sw on HoriOrientation::NONE then don't pass it in from rtf

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

diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index b3a5571..da269dc 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1678,7 +1678,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
 {
 case 0: //"Adjust"
 {
-sal_Int16 nValue = 0;
+sal_Int16 nValue = text::HoriOrientation::NONE;
 pProp->Value >>= nValue;
 if(nValue > 0 &&
 nValue <= text::HoriOrientation::LEFT &&
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index c927575..6648513 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -989,7 +989,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
 break;
 case NS_ooxml::LN_CT_Lvl_lvlJc:
 {
-sal_Int16 nValue = 0;
+sal_Int16 nValue = text::HoriOrientation::NONE;
 switch (nIntValue)
 {
 case NS_ooxml::LN_Value_ST_Jc_left:
@@ -1004,9 +1004,12 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
 nValue = text::HoriOrientation::RIGHT;
 break;
 }
-m_pCurrentDefinition->GetCurrentLevel( )->Insert(
-PROP_ADJUST, uno::makeAny( nValue ) );
-writerfilter::Reference::Pointer_t pProperties 
= rSprm.getProps();
+if (nValue != text::HoriOrientation::NONE)
+{
+m_pCurrentDefinition->GetCurrentLevel( )->Insert(
+PROP_ADJUST, uno::makeAny( nValue ) );
+writerfilter::Reference::Pointer_t 
pProperties = rSprm.getProps();
+}
 }
 break;
 case NS_ooxml::LN_CT_Lvl_pPr:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods: fails with Assertion

[Eike Rathke]

Hi Alex,

On Thursday, 2016-09-08 13:28:46 +0100, Alex McMurchy wrote:

> > [... -msse ...]
> 
> Both failed for the same reason.

Pity.. ok, thanks for trying, we'll have to further investigate.

> Is the problem just a 32bit issue?

Yes. Only two tinderbox 32-bit builds (and your's) have the problem.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] online.git: loolwsd/test

[Henry Castro]

 loolwsd/test/httpwstest.cpp |   52 
 1 file changed, 52 insertions(+)

New commits:
commit f751d36c8f3f84948acd77e5c14b18597578f0fe
Author: Henry Castro 
Date:   Thu Sep 8 10:26:25 2016 -0400

loolwsd: test: view cursor visible

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 4af1fea..79bb226 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -90,6 +90,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testColumnRowResize);
 CPPUNIT_TEST(testOptimalResize);
 CPPUNIT_TEST(testInvalidateViewCursor);
+CPPUNIT_TEST(testViewCursorVisible);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -128,6 +129,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 void testColumnRowResize();
 void testOptimalResize();
 void testInvalidateViewCursor();
+void testViewCursorVisible();
 
 void loadDoc(const std::string& documentURL);
 
@@ -2172,6 +2174,56 @@ void HTTPWSTest::testInvalidateViewCursor()
 }
 }
 
+void HTTPWSTest::testViewCursorVisible()
+{
+try
+{
+int docSlide = -1;
+int docSlides = 0;
+int docHeight = 0;
+int docWidth = 0;
+int docViewId = -1;
+
+// Load a document
+std::string documentPath, documentURL, response, text;
+getDocumentPathAndURL("viewcursor.odp", documentPath, documentURL);
+
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
documentURL);
+Poco::Net::WebSocket socket1 = *connectLOKit(_uri, request, _response);
+
+sendTextFrame(socket1, "load url=" + documentURL);
+CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, 
isDocumentLoaded(socket1));
+
+// Check document size
+sendTextFrame(socket1, "status");
+getResponseMessage(socket1, "status:", response, false);
+CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as 
expected", !response.empty());
+parseDocSize(response, "presentation", docSlide, docSlides, docWidth, 
docHeight, docViewId);
+
+// Click to show a cursor
+Poco::format(text, "mouse type=%s x=%d y=%d count=1 buttons=1 
modifier=0", std::string("buttondown"), docWidth/2, docHeight/6);
+sendTextFrame(socket1, text); text.clear();
+Poco::format(text, "mouse type=%s x=%d y=%d count=1 buttons=1 
modifier=0", std::string("buttonup"), docWidth/2, docHeight/6);
+sendTextFrame(socket1, text);
+getResponseMessage(socket1, "cursorvisible:", response, false);
+CPPUNIT_ASSERT_MESSAGE("did not receive a cursorvisible: message as 
expected", !response.empty());
+
+// Connect and load second view.
+Poco::Net::WebSocket socket2 = *connectLOKit(_uri, request, _response);
+sendTextFrame(socket2, "load url=" + documentURL);
+CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, 
isDocumentLoaded(socket2, "", true));
+
+// Expected to receive viewcursorvisible second view
+getResponseMessage(socket2, "viewcursorvisible:", response, false);
+CPPUNIT_ASSERT_MESSAGE("did not receive a viewcursorvisible: message 
as expected", !response.empty());
+}
+catch (const Poco::Exception& exc)
+{
+CPPUNIT_FAIL(exc.displayText());
+}
+}
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(HTTPWSTest);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sfx2/source/doc/doc.hrc |2 --
 sfx2/source/doc/doc.src |8 
 2 files changed, 10 deletions(-)

New commits:
commit 28ffa3e2abb5cf3a33314dd957deff752261cef6
Author: Maxim Monastirsky 
Date:   Thu Sep 8 16:55:40 2016 +0300

Unused strings

Since 7affe26a1291eef8c77e890228061f13e987bff1
("Kill sfx2 menu support").

Change-Id: Ib08ba64e7d3dc479df15f04f4e9ab81e13611202

diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 19f77fe..388cdf6 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -32,11 +32,9 @@
 #define STR_TEMPLATE_FILTER (RID_SFX_DOC_START+ 28)
 
 #define STR_SAVEDOC (RID_SFX_DOC_START+ 45)
-#define STR_UPDATEDOC   (RID_SFX_DOC_START+ 46)
 #define STR_SAVEASDOC   (RID_SFX_DOC_START+ 47)
 
 #define STR_CLOSEDOC(RID_SFX_DOC_START+ 49)
-#define STR_CLOSEDOC_ANDRETURN  (RID_SFX_DOC_START+ 50)
 #define STR_SAVEACOPY   (RID_SFX_DOC_START+ 55)
 
 #define STR_AUTOMATICVERSION(RID_SFX_DOC_START+ 68)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index ef60bff..978f5e3 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -28,10 +28,6 @@ String STR_SAVEDOC
 {
 Text [ en-US ] = "~Save" ;
 };
-String STR_UPDATEDOC
-{
-Text [ en-US ] = "~Update" ;
-};
 String STR_SAVEASDOC
 {
 Text [ en-US ] = "Save ~As..." ;
@@ -44,10 +40,6 @@ String STR_CLOSEDOC
 {
 Text [ en-US ] = "~Close" ;
 };
-String STR_CLOSEDOC_ANDRETURN
-{
-Text [ en-US ] = "~Close & Return to " ;
-};
 String STR_OPEN
 {
 Text [ en-US ] = "Open" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 embeddedobj/source/general/docholder.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 3c51f207747150933c6725fa22af1682cf066d8c
Author: Caolán McNamara 
Date:   Mon Aug 15 21:13:01 2016 +0100

Resolves: tdf#96451 do magic to enable embedded chart sidebar only for chart

objects, and do the normal thing for other objects, e.g. math

Change-Id: Ifb786a841b843b0317713769cb214a44dceaf546
(cherry picked from commit c5977a89c28b285dfface71ca71e07bb0463ed19)
Reviewed-on: https://gerrit.libreoffice.org/28153
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/embeddedobj/source/general/docholder.cxx 
b/embeddedobj/source/general/docholder.cxx
index e89695e..c9e931e 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -709,10 +709,17 @@ bool DocumentHolder::ShowUI( const uno::Reference< 
css::frame::XLayoutManager >&
 // this must be done after merging menus as we won't get 
the container menu otherwise
 xContainerLM->setDockingAreaAcceptor( uno::Reference < 
ui::XDockingAreaAcceptor >() );
 
+bool bIsChart = false;
+uno::Reference< lang::XServiceInfo> 
xServiceInfo(m_xComponent, uno::UNO_QUERY);
+if (xServiceInfo.is() && 
xServiceInfo->supportsService("com.sun.star.chart2.ChartDocument"))
+bIsChart = true;
 // prevent further changes at this LM
 // TODO: moggi: why is this necessary?
-// xContainerLM->setVisible( sal_False );
-// xContainerLM->lock();
+if (!bIsChart)
+{
+xContainerLM->setVisible( false );
+xContainerLM->lock();
+}
 bUnlock = true;
 
 // by unlocking the LM each layout change will now resize 
the containers window; pending layouts will be processed now
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 writerfilter/source/rtftok/rtfdispatchsymbol.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 518d3a6173742e0b8b8d30d8ad3584fe5af129c4
Author: Caolán McNamara 
Date:   Tue Sep 6 20:31:06 2016 +0100

rtf: throw early on a bad nestrow token

Change-Id: I9de8d09bce18fd1e8a145617794594a99a5f996e
Reviewed-on: https://gerrit.libreoffice.org/28711
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx 
b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index 966a0b7..e33d140 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -202,12 +202,12 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)
   pBuffer->pRowProperties,
   m_nNestedCells, m_nNestedCurrentCellX);
 
-assert(m_aStates.top().pCurrentBuffer == &m_aTableBufferStack.back());
-if (m_aTableBufferStack.size() == 1)
+if (m_aTableBufferStack.size() == 1 || !m_aStates.top().pCurrentBuffer)
 {
 throw io::WrongFormatException(
 "mismatch between \\itap and number of \\nestrow", nullptr);
 }
+assert(m_aStates.top().pCurrentBuffer == &m_aTableBufferStack.back());
 // note: there may be several states pointing to table buffer!
 for (std::size_t i = 0; i < m_aStates.size(); ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: helpauthoring/registry

[Samuel Mehrbrodt]

 helpauthoring/registry/Filter.xcu |2 +-
 helpauthoring/registry/Paths.xcu  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e2b97cf875a19f2364af5fc8a9a1cc1635307073
Author: Samuel Mehrbrodt 
Date:   Thu Sep 8 15:43:46 2016 +0200

Fix links after moving files

diff --git a/helpauthoring/registry/Filter.xcu 
b/helpauthoring/registry/Filter.xcu
index c8cf855..7b8fdbe 100644
--- a/helpauthoring/registry/Filter.xcu
+++ b/helpauthoring/registry/Filter.xcu
@@ -25,7 +25,7 @@
 0
 XHP_Help
 com.sun.star.text.TextDocument
-com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,%origin%/filter/xmlhelp2soffice.xsl,%origin%/filter/soffice2xmlhelp.xsl,%origin%/filter/xmlhel.dtd,%origin%/filter/xmlhelptemplate.ott
+com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,%origin%/../filter/xmlhelp2soffice.xsl,%origin%/../filter/soffice2xmlhelp.xsl,%origin%/../filter/xmlhel.dtd,%origin%/../filter/xmlhelptemplate.ott
 com.sun.star.comp.Writer.XmlFilterAdaptor
 Help (xhp)
 IMPORT EXPORT ALIEN 
3RDPARTYFILTER
diff --git a/helpauthoring/registry/Paths.xcu b/helpauthoring/registry/Paths.xcu
index 1b96bbc..717db12 100644
--- a/helpauthoring/registry/Paths.xcu
+++ b/helpauthoring/registry/Paths.xcu
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fwd: [Libreoffice-qa] Fwd: QA Meeting @ Brno Libreoffice Conference. Wed 19.00-20.00(UTC+2)

[Xisco Faulí]

Hi,

Below you can find some notes I took of the main topics we talked 
yesterday during the QA meeting, which eventually lasted from 19.30 to 
23:00.


Attendees: Aaron, Beluga, Robinson, Zdenek, Cor, Timur, Yousuf ( 
hangouts), Xisco


* Rework GetInvolved page ( 
https://wiki.documentfoundation.org/QA/GetInvolved ):

- Focus on newcomers
- Keep it as simple as possible ( easy-to-follow steps )
- Explain just 2 actions:
-- How to confirm bugs
-- How to retest old bugs (untouched for more than a year)

* Add a new status 'TRIAGE':
- Set when a 'NEW' bug meets the following conditions:
-- Checked it isn't duplicated
-- Checked whether it is a regression
-- Tested in at least two different OSs
-- Priority and Severity have been set

	- The barrier shouldn't be too high otherwise it could discourage 
people to do it
	- A notification should be sent when a bug has been changed from 'NEW' 
to 'TRIAGE' to verify the criteria has been met


the idea behind it would be that newcomers could focus on confirming 
bugs and QA contributors on triaging those confirmed bugs. However, 
newcomers should be able to triage bugs as well, as we want to avoid 
setting limitations for newcomers.


* Send a welcoming email to newcomers:
- Showing gratitude for their work
- Add link to the wiki
- Add link to IRC
- it shouldn't be sent to everyone (be a bit selective)

* Send a polite ping to old QA contributors who have been inactive for a 
while:
	- Check who is active nowadays ( useful to check current's QA team 
status too )

- Check who did some great work in the past and send it to them
	- Do it recursive over time in order to keep contributors in the 
project
-- A small questionnaire could help us to know if there was 
any specific reason why they left us.


* Social Networks:
	- Use reddit to recruit new contributors ( Done once by Beluga with 
positive results )

- Use reddit as a channel where end-users can report bugs
-- a Banner could be added to our bugzilla's mainpage
-- it could be done in youtube too. Example: 
http://ubuntuonair.com/

* Visibility of QA members
- Create a list where QA member are listed
-- Sorted alphabetically ( it's not a competition )
- Add QA numbers to the release notes
- Add QA numbers to under the hood

* Moztrap
	- Could be improved. Sample: 
https://shinglyu.github.io/moztrap-new-ui/index.html#/caseversion/search/suite:%22[TV]%20Firefox%20Account%22


* Bibisect Repositories
- Bibisect-5.1max and Bibisect-5.2max for linux on their way
- Mac and Windows repositories created recursively in gerrit
		-- Could be interesting to have them for linux too, specially for 
bibisect master.


* Bugzilla Voting System
	- Probably it would be better to have a bug heat system where other 
parameters would count as well.

-- Probably not possible in bugzilla
-- Number of subscribers might help here. it's worth a try.

I think I've mentioned all the main topics we covered yesterday. 
However, I may have forgotten something, so feel free to extend this 
email if  it's needed.


Regards,
Xisco

On 07.09.2016 10:50, Xisco Faulí wrote:

Hi all,

taking into account that some of us are present at Brno Libreoffice
Conference this week, we're going to have a face-to-face QA meeting
from 19.00 to 20.00 UTC+2 at the Red Hat Offices while the hackfest
session is taking place.

Therefore, I invite everybody present at the Libreoffice Conference to
join the meeting as we would like to hear anything you have to say
with regards to QA.

On the other hand,  we would also like to try something Gabriel
proposed yesterday. Basically, we would like to offer the possibility
for non-QA/non-developer people to report bugs in person, mainly
thinking of FOSDEM and the incoming Libreoffice Conferences, so we can
also show them how doing QA looks like at the same time. We plan to do
a public announcement in the social networks during the course of the
day and it's going to take place today from 20.00 to 22.00 to see
whether someone is showing up or not.

I'll keep you updated.

Regards
Xisco
___
List Name: Libreoffice-qa mailing list
Mail address: libreoffice...@lists.freedesktop.org
Change settings: 
https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? 
http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: 
http://wiki.documentfoundation.org/Netiquette

List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

___

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf81345.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx   |   12 
 writerfilter/source/dmapper/PropertyMap.cxx |7 +--
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 3870c0555aa461268a6d056543f4545d562769ce
Author: Justin Luth 
Date:   Wed Sep 7 19:26:30 2016 +0300

tdf#81345 docx import fix default page break regression

"regression" from 4e653d15eff26aa5283d8ba20611893f4c573f57

If there are new style elements, then don't treat a
default break in columns as a continuous break.

This fixes both round-tripping, and initial import of
columns and headers on this particular document. Since
MS and LO treat sections so differently, it is a balancing
act of what to change.

Change-Id: I9c79bc1246108da6a5ebbf744acbcfcbb9d33d48
Reviewed-on: https://gerrit.libreoffice.org/28728
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf81345.docx 
b/sw/qa/extras/ooxmlexport/data/tdf81345.docx
new file mode 100644
index 000..4f18b1e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf81345.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index b837ae2..5da3ee2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -998,6 +998,18 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf92724_continuousBreaksComplex,"tdf92724_continuo
 CPPUNIT_ASSERT_EQUAL(sal_Int16(3), xCursor->getPage());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf81345_045Original,"tdf81345.docx")
+{
+//Header wasn't replaced  and columns were missing because no new style 
was created.
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+
+xCursor->jumpToPage(2);
+OUString pageStyleName = getProperty(xCursor, "PageStyleName");
+CPPUNIT_ASSERT(pageStyleName != "Standard");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index b138a28..c0e646c 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1170,9 +1170,12 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 }
 
 // depending on the break type no page styles should be created
-// If the section type is missing, but we have columns, then this should be
+// If the section type is missing, but we have columns without new style 
info, then this should be
 // handled as a continuous section break.
-if(m_nBreakType == 
static_cast(NS_ooxml::LN_Value_ST_SectionMark_continuous) || 
(m_nBreakType == -1 && m_nColumnCount > 0))
+const bool bTreatAsContinuous = m_nBreakType == -1
+&& m_nColumnCount > 0
+&& (m_bIsFirstSection || 
m_sFollowPageStyleName.isEmpty() || (m_sFirstPageStyleName.isEmpty() && 
m_bTitlePage));
+if(m_nBreakType == 
static_cast(NS_ooxml::LN_Value_ST_SectionMark_continuous) || 
bTreatAsContinuous)
 {
 //todo: insert a section or access the already inserted section
 uno::Reference< beans::XPropertySet > xSection =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods: fails with Assertion

[Alex McMurchy]

Hi Eike

This is what I ran.


cd master
make clean
make ENVCFLAGS=-msse ENVCFLAGSCXX=-msse && make sc.check
make clean
make ENVCFLAGS=-msse2 ENVCFLAGSCXX=-msse2 && make sc.check


Both failed for the same reason.

btw. I ran the above tests on a 32bit Lubuntu 14.04 within VirtualBox. 
The flags form /proc/cpuinfo are


flags   : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge 
mca cmov pat pse36 clflush mmx fxsr sse sse2 ht nx rdtscp constant_tsc 
pni ssse3
flags   : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge 
mca cmov pat pse36 clflush mmx fxsr sse sse2 ht nx rdtscp constant_tsc 
pni ssse3
flags   : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge 
mca cmov pat pse36 clflush mmx fxsr sse sse2 ht nx rdtscp constant_tsc 
pni ssse3
flags   : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge 
mca cmov pat pse36 clflush mmx fxsr sse sse2 ht nx rdtscp constant_tsc 
pni ssse3 


Is the problem just a 32bit issue?

Alex



On 07/09/16 21:37, Eike Rathke wrote:

Hi Alex,

On Wednesday, 2016-08-31 19:30:35 +0100, Alex McMurchy wrote:


When compiling LibreOffice I get a failed Unit test. The problem occurs in
sc/qa/unit/functions_test.cxx with

You could do us a favour, are you willing to invest some machine time
and try if passing either -msse or -msse2 as compiler flags would solve
the failing function tests problem? For this you'd need to do

make clean
make ENVCFLAGS=-msse ENVCFLAGSCXX=-msse && make sc.check

and if that still fails try

make clean
make ENVCFLAGS=-msse2 ENVCFLAGSCXX=-msse2 && make sc.check

Thanks
   Eike



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

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

[Noel Grandin]

 sw/inc/ccoll.hxx   |2 +-
 sw/inc/crsrsh.hxx  |   13 ++---
 sw/inc/dbmgr.hxx   |3 +--
 sw/inc/doc.hxx |   10 +-
 sw/inc/docstyle.hxx|3 +--
 sw/inc/editsh.hxx  |5 +
 sw/source/core/crsr/crsrsh.cxx |   33 -
 sw/source/core/docnode/ndtbl.cxx   |   32 +---
 sw/source/core/docnode/ndtbl1.cxx  |2 +-
 sw/source/core/edit/editsh.cxx |4 ++--
 sw/source/core/edit/edtab.cxx  |6 ++
 sw/source/core/frmedt/fetab.cxx|8 
 sw/source/ui/dbui/dbinsdlg.cxx |2 +-
 sw/source/uibase/app/docstyle.cxx  |   15 +++
 sw/source/uibase/chrdlg/ccoll.cxx  |5 ++---
 sw/source/uibase/dbui/dbmgr.cxx|8 +++-
 sw/source/uibase/shells/basesh.cxx |4 ++--
 sw/source/uibase/wrtsh/select.cxx  |2 +-
 18 files changed, 45 insertions(+), 112 deletions(-)

New commits:
commit 0f8a30318695447e205b17fb0af06362ab890bc3
Author: Noel Grandin 
Date:   Thu Sep 8 10:21:09 2016 +0200

loplugin:constantparam in sw

Change-Id: Ibae4cac28e6ff52298c804519f683017729c07a5

diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 313609c..3048ca9 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -48,7 +48,7 @@ class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem
 OUStringm_sStyles[COND_COMMAND_COUNT];
 
 public:
-SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL);
+SwCondCollItem();
 virtual ~SwCondCollItem();
 
 
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 82671bf..dde4013 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -271,18 +271,9 @@ protected:
 
 /*
  * Compare-Methode for the StackCursor and the current Cursor.
- * The Methods return -1, 0, 1 for lower, equal, greater. The enum
- * CursorCompareType says which position is compared.
+ * The Methods return -1, 0, 1 for lower, equal, greater.
  */
-enum CursorCompareType {
-StackPtStackMk,
-StackPtCurrPt,
-StackPtCurrMk,
-StackMkCurrPt,
-StackMkCurrMk,
-CurrPtCurrMk
-};
-int CompareCursor( CursorCompareType eType ) const;
+int CompareCursorStackMkCurrPt() const;
 
 bool SelTableRowOrCol( bool bRow, bool bRowSimple = false );
 
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 3994149..5ae985d 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -256,8 +256,7 @@ friend class SwConnectionDisposedListener_Impl;
 
 /// Run the mail merge for defined modes, except DBMGR_MERGE
 SAL_DLLPRIVATE bool MergeMailFiles( SwWrtShell* pSh,
-const SwMergeDescriptor& 
rMergeDescriptor,
-vcl::Window* pParent );
+const SwMergeDescriptor& 
rMergeDescriptor );
 
 SAL_DLLPRIVATE bool ToNextMergeRecord();
 SAL_DLLPRIVATE bool IsValidMergeRecord() const;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 4347254..793f6d2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1223,11 +1223,11 @@ public:
 static void GetTabCols( SwTabCols &rFill, const SwCursor* pCursor,
 const SwCellFrame* pBoxFrame );
 void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
-const SwCursor* pCursor, const SwCellFrame* pBoxFrame );
+const SwCellFrame* pBoxFrame );
 static void GetTabRows( SwTabCols &rFill, const SwCursor* pCursor,
 const SwCellFrame* pBoxFrame );
-void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* 
pCursor,
- const SwCellFrame* pBoxFrame );
+void SetTabRows( const SwTabCols &rNew, bool bCurColOnly,
+const SwCellFrame* pBoxFrame );
 
 // Direct access for UNO.
 void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols 
&rOld,
@@ -1247,8 +1247,8 @@ public:
 const SwTableAutoFormatTable& GetTableStyles() const { return 
*mpTableStyles.get(); }
 // Create a new table style. Tracked by Undo.
 SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool bBroadcast = 
false);
-// Delete table style named rName. If pAffectedTables is not null, it 
contains pointers to affected tables. Tracked by undo.
-std::unique_ptr DelTableStyle(const OUString& rName, 
bool bBroadcast = false, std::vector* pAffectedTables = nullptr);
+// Delete table style named rName. Tracked by undo.
+std::unique_ptr DelTableStyle(const OUString& rName, 
bool bBroadcast = false);
 // Change (replace) a table style named rName. Tracked by undo.
 void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& 
rNewFormat);
 
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 1eebe05..c8b526f 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -77,8 +77,7 @

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

[Noel Grandin]

 sw/source/core/doc/docredln.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit ac1c3f2ab68a17b6508901bf9b5abdad618158a6
Author: Noel Grandin 
Date:   Thu Sep 8 11:41:22 2016 +0200

more workaround lack of constexpr

Change-Id: I1be117f9845d502d4b8dfa238dc13198f8b76dd6

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 5f258a4..2173fc8 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -994,19 +994,13 @@ bool SwRangeRedline::HasValidRange() const
 
 void SwRangeRedline::CallDisplayFunc(size_t nMyPos)
 {
-switch( RedlineFlags::ShowMask & 
GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() )
-{
-case RedlineFlags::ShowInsert | RedlineFlags::ShowDelete:
+RedlineFlags eShow = RedlineFlags::ShowMask & 
GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags();
+if (eShow == (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete))
 Show(0, nMyPos);
-break;
-case RedlineFlags::ShowInsert:
+else if (eShow == RedlineFlags::ShowInsert)
 Hide(0, nMyPos);
-break;
-case RedlineFlags::ShowDelete:
+else if (eShow == RedlineFlags::ShowDelete)
 ShowOriginal(0, nMyPos);
-break;
-default: break;
-}
 }
 
 void SwRangeRedline::Show(sal_uInt16 nLoop, size_t nMyPos)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/source/core/doc/DocumentRedlineManager.cxx |   28 --
 1 file changed, 9 insertions(+), 19 deletions(-)

New commits:
commit 4e5ec21c5191dc6c90c51ae786ac692e804c1fb7
Author: Noel Grandin 
Date:   Thu Sep 8 11:30:35 2016 +0200

workaround lack of constexpr

when dealing with switch statements and o3tl::typed_flags

Change-Id: Ia72a3ff643ea1c41f9b328e980ba51f3cdfdf582

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 10ba317..38a4c77 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -603,22 +603,17 @@ void DocumentRedlineManager::SetRedlineFlags( 
RedlineFlags eMode )
 // and then hide/display everything
 void (SwRangeRedline::*pFnc)(sal_uInt16, size_t) = nullptr;
 
-switch( RedlineFlags::ShowMask & eMode )
-{
-case RedlineFlags::ShowInsert | RedlineFlags::ShowDelete :
+RedlineFlags eShowMode = RedlineFlags::ShowMask & eMode;
+if (eShowMode == (RedlineFlags::ShowInsert | 
RedlineFlags::ShowDelete))
 pFnc = &SwRangeRedline::Show;
-break;
-case RedlineFlags::ShowInsert:
+else if (eShowMode == RedlineFlags::ShowInsert)
 pFnc = &SwRangeRedline::Hide;
-break;
-case RedlineFlags::ShowDelete:
+else if (eShowMode == RedlineFlags::ShowDelete)
 pFnc = &SwRangeRedline::ShowOriginal;
-break;
-
-default:
+else
+{
 pFnc = &SwRangeRedline::Hide;
 eMode |= RedlineFlags::ShowInsert;
-break;
 }
 
 CheckAnchoredFlyConsistency(m_rDoc);
@@ -1781,16 +1776,11 @@ void DocumentRedlineManager::CompressRedlines()
 CHECK_REDLINE( *this )
 
 void (SwRangeRedline::*pFnc)(sal_uInt16, size_t) = nullptr;
-switch( RedlineFlags::ShowMask & meRedlineFlags )
-{
-case RedlineFlags::ShowInsert | RedlineFlags::ShowDelete:
+RedlineFlags eShow = RedlineFlags::ShowMask & meRedlineFlags;
+if( eShow == (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete))
 pFnc = &SwRangeRedline::Show;
-break;
-case RedlineFlags::ShowInsert:
+else if (eShow == RedlineFlags::ShowInsert)
 pFnc = &SwRangeRedline::Hide;
-break;
-default: break;
-}
 
 // Try to merge identical ones
 for( size_t n = 1; n < mpRedlineTable->size(); ++n )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Create Report: Format Fieldcontence as HTML

[KRose]

Hi together,

I'm creating a report based on a table which contains a field that has
HTML-Data stored.
While running the report, it displays the original html-code as simple text.
That is not the way the fieldcontence should be formatted on output.
Is there a posibility to assign html-formatting on output for such fields.

thanks a lot
KRose




--
View this message in context: 
http://nabble.documentfoundation.org/Create-Report-Format-Fieldcontence-as-HTML-tp4192864.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods: fails with Assertion

[Alex McMurchy]

Hi Eike

No problem. Just started the compile.

Alex


On 07/09/16 21:37, Eike Rathke wrote:

Hi Alex,

On Wednesday, 2016-08-31 19:30:35 +0100, Alex McMurchy wrote:


When compiling LibreOffice I get a failed Unit test. The problem occurs in
sc/qa/unit/functions_test.cxx with

You could do us a favour, are you willing to invest some machine time
and try if passing either -msse or -msse2 as compiler flags would solve
the failing function tests problem? For this you'd need to do

make clean
make ENVCFLAGS=-msse ENVCFLAGSCXX=-msse && make sc.check

and if that still fails try

make clean
make ENVCFLAGS=-msse2 ENVCFLAGSCXX=-msse2 && make sc.check

Thanks
   Eike



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

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

[Samuel Mehrbrodt]

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |   11 +++
 sd/source/ui/dlg/PhotoAlbumDialog.hxx |1 +
 2 files changed, 12 insertions(+)

New commits:
commit 64a6083df40c5ffe4f557a96846ea4fa10f6
Author: Samuel Mehrbrodt 
Date:   Thu Sep 8 09:42:30 2016 +0200

Related tdf#64575 Only allow "Fill Slide" for 1 Image/Slide

Change-Id: I4887a5dd727eecacf7c80a581428f6440218bf86

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index c1de735..e764048 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -70,6 +70,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, 
SdDrawDocument* pAc
 pRemoveBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, RemoveHdl));
 pRemoveBtn->Disable();
 pImagesLst->SetSelectHdl(LINK(this, SdPhotoAlbumDialog, SelectHdl));
+pInsTypeCombo->SetSelectHdl(LINK(this, SdPhotoAlbumDialog, TypeSelectHdl));
 
 mpGraphicFilter = new GraphicFilter;
 sDirUrl.clear();
@@ -666,6 +667,16 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, SelectHdl, 
ListBox&, void)
 EnableDisableButtons();
 }
 
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, TypeSelectHdl, ListBox&, void)
+{
+// Enable "Fill Slide" only for one image
+// If we want to have it for other images too, we need to implement the 
actual cropping.
+bool const bEnable = pInsTypeCombo->GetSelectEntryPos() == ONE_IMAGE;
+pASRCheckCrop->Enable(bEnable);
+if (!bEnable)
+pASRCheckCrop->Check(false);
+}
+
 Reference< drawing::XDrawPage > SdPhotoAlbumDialog::appendNewSlide(AutoLayout 
aLayout,
 const Reference< drawing::XDrawPages >& xDrawPages
 )
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index cf8854a..e6850a2 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -81,6 +81,7 @@ private:
 DECL_LINK_TYPED(RemoveHdl, Button*, void);
 
 DECL_LINK_TYPED(SelectHdl, ListBox&, void);
+DECL_LINK_TYPED(TypeSelectHdl, ListBox&, void);
 
 Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout,
 const Reference< drawing::XDrawPages >& xDrawPages);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Douglas Mencken]

 filter/source/graphicfilter/ipict/ipict.cxx |  139 ++--
 1 file changed, 71 insertions(+), 68 deletions(-)

New commits:
commit 8d1885de86132a975075b23a043ead1ad4d9d4f3
Author: Douglas Mencken 
Date:   Wed Sep 7 15:02:33 2016 -0400

convert PictDrawingMethod to enum class

Change-Id: I10b8a5b13a68a0229de4b5db64020f5b7dbc5bc3
Reviewed-on: https://gerrit.libreoffice.org/28731
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index 2c4a7e9..a5c5a96 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -136,9 +136,9 @@ namespace PictReaderInternal {
 
 // PictReader ==
 
-enum PictDrawingMethod {
-PDM_FRAME, PDM_PAINT, PDM_ERASE, PDM_INVERT, PDM_FILL,
-PDM_TEXT, PDM_UNDEFINED
+enum class PictDrawingMethod {
+FRAME, PAINT, ERASE, INVERT, FILL,
+TEXT, UNDEFINED
 };
 
 class PictReader {
@@ -213,12 +213,13 @@ private:
 sal_uLong ReadAndDrawRgn(PictDrawingMethod eMethod);
 sal_uLong ReadAndDrawSameRgn(PictDrawingMethod eMethod);
 
-// returns true, if we do not need to print the shape/text/frame
-bool IsInvisible(PictDrawingMethod eMethod) const {
-  if (eActROP == RasterOp::N1) return true;
-  if (eMethod==PDM_FRAME && (nActPenSize.Width() == 0 || 
nActPenSize.Height() == 0)) return true;
+// returns true if there's no need to print the shape/text/frame
+bool IsInvisible( PictDrawingMethod eMethod ) const {
+  if ( eActROP == RasterOp::N1 ) return true;
+  if ( eMethod == PictDrawingMethod::FRAME && ( nActPenSize.Width() == 0 
|| nActPenSize.Height() == 0 ) ) return true;
   return false;
 }
+
 void DrawingMethod(PictDrawingMethod eMethod);
 
 sal_uLong ReadAndDrawText();
@@ -248,7 +249,7 @@ public:
 , nOrigPos(0)
 , IsVersion2(false)
 , eActROP(RasterOp::OverPaint)
-, eActMethod(PDM_UNDEFINED)
+, eActMethod(PictDrawingMethod::UNDEFINED)
 {
 aActFont.SetCharSet(GetTextEncoding());
 }
@@ -514,7 +515,7 @@ sal_uLong PictReader::ReadAndDrawSameRect(PictDrawingMethod 
eMethod)
 {
 if (IsInvisible(eMethod)) return 0;
 DrawingMethod(eMethod);
-PictReaderShape::drawRectangle(pVirDev, eMethod==PDM_FRAME, aLastRect, 
nActPenSize);
+PictReaderShape::drawRectangle( pVirDev, eMethod == 
PictDrawingMethod::FRAME, aLastRect, nActPenSize );
 return 0;
 }
 
@@ -529,7 +530,7 @@ sal_uLong 
PictReader::ReadAndDrawSameRoundRect(PictDrawingMethod eMethod)
 {
 if (IsInvisible(eMethod)) return 0;
 DrawingMethod(eMethod);
-PictReaderShape::drawRoundRectangle(pVirDev, eMethod==PDM_FRAME, 
aLastRoundRect, aActOvalSize, nActPenSize);
+PictReaderShape::drawRoundRectangle( pVirDev, eMethod == 
PictDrawingMethod::FRAME, aLastRoundRect, aActOvalSize, nActPenSize );
 return 0;
 }
 
@@ -544,7 +545,7 @@ sal_uLong PictReader::ReadAndDrawSameOval(PictDrawingMethod 
eMethod)
 {
 if (IsInvisible(eMethod)) return 0;
 DrawingMethod(eMethod);
-PictReaderShape::drawEllipse(pVirDev, eMethod==PDM_FRAME, aLastOval, 
nActPenSize);
+PictReaderShape::drawEllipse( pVirDev, eMethod == 
PictDrawingMethod::FRAME, aLastOval, nActPenSize );
 return 0;
 }
 
@@ -560,7 +561,7 @@ sal_uLong 
PictReader::ReadAndDrawSamePolygon(PictDrawingMethod eMethod)
 {
 if (IsInvisible(eMethod)) return 0;
 DrawingMethod(eMethod);
-PictReaderShape::drawPolygon(pVirDev, eMethod==PDM_FRAME, aLastPolygon, 
nActPenSize);
+PictReaderShape::drawPolygon( pVirDev, eMethod == 
PictDrawingMethod::FRAME, aLastPolygon, nActPenSize );
 return 0;
 }
 
@@ -585,9 +586,10 @@ sal_uLong PictReader::ReadAndDrawSameArc(PictDrawingMethod 
eMethod)
 nstartAngle = nstartAngle + narcAngle;
 narcAngle=-narcAngle;
 }
-fAng1=((double)nstartAngle)/180.0*3.14159265359;
-fAng2=((double)(nstartAngle+narcAngle))/180.0*3.14159265359;
-PictReaderShape::drawArc(pVirDev, eMethod==PDM_FRAME, 
aLastArcRect,fAng1,fAng2, nActPenSize);
+const double pi = 2 * acos(0.0);
+fAng1 = ( (double)nstartAngle ) * pi / 180.0;
+fAng2 = ( (double)(nstartAngle + narcAngle) ) * pi / 180.0;
+PictReaderShape::drawArc( pVirDev, eMethod == PictDrawingMethod::FRAME, 
aLastArcRect, fAng1, fAng2, nActPenSize );
 return 4;
 }
 
@@ -626,15 +628,15 @@ void PictReader::DrawingMethod(PictDrawingMethod eMethod)
 {
 if( eActMethod==eMethod ) return;
 switch (eMethod) {
-case PDM_FRAME:
-if (eActPenPattern.isDefault())
+case PictDrawingMethod::FRAME:
+if (eActPenPattern.isDefault())
   SetLineColor( aActForeColor );
 else
   SetLineColor(eActPenPattern.getColor(aActBackColor, 
aActForeColor));
 SetFillColor( Color(COL_TRA

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

[Stanislav Horacek]

 source/text/scalc/01/04060115.xhp |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit fbd93f4c667396b55f7c2df3707590ba56218b39
Author: Stanislav Horacek 
Date:   Wed Sep 7 22:27:15 2016 +0200

tdf#101805 correct documentation for ERF.PRECISE function

Change-Id: Ic621f1e60f41ebcda5b3f390713da4315cf68500
Reviewed-on: https://gerrit.libreoffice.org/28735
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/scalc/01/04060115.xhp 
b/source/text/scalc/01/04060115.xhp
index fc1dac1..e84a51f 100644
--- a/source/text/scalc/01/04060115.xhp
+++ b/source/text/scalc/01/04060115.xhp
@@ -218,19 +218,16 @@
 
 ERF.PRECISE function
 Gaussian error integral
-mw added one entr
+
 
 ERF.PRECISE
-Returns values of the Gaussian error 
integral.
+Returns values of the Gaussian error integral between 0 
and the given limit.
 Syntax
-ERF.PRECISE(LowerLimit; UpperLimit)
-
-LowerLimit is the lower limit of the integral.
-
-UpperLimit is optional. It is the upper limit of the integral. If 
this value is missing, the calculation takes places between 0 and the lower 
limit.
+ERF.PRECISE(LowerLimit)
+LowerLimit is the limit of the integral. The 
calculation takes places between 0 and this limit.
 Example
-
-=ERF.PRECISE(0;1) returns 0.842701.
+
+=ERF.PRECISE(1) returns 0.842701.
 
 
 ERFC function
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stanislav Horacek]

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

New commits:
commit d43864ba4b59375c4a5d55987384a41333941516
Author: Stanislav Horacek 
Date:   Wed Sep 7 22:27:15 2016 +0200

Updated core
Project: help  fbd93f4c667396b55f7c2df3707590ba56218b39

tdf#101805 correct documentation for ERF.PRECISE function

Change-Id: Ic621f1e60f41ebcda5b3f390713da4315cf68500
Reviewed-on: https://gerrit.libreoffice.org/28735
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index b62218f..fbd93f4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b62218feb4fc7d278699d425868fdc7ac1bb6212
+Subproject commit fbd93f4c667396b55f7c2df3707590ba56218b39
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stanislav Horacek]

 source/text/shared/00/00040500.xhp  |4 ++--
 source/text/shared/guide/paintbrush.xhp |2 +-
 source/text/shared/guide/scripting.xhp  |2 +-
 source/text/swriter/00/0404.xhp |2 +-
 source/text/swriter/00/0405.xhp |   14 +++---
 source/text/swriter/01/0413.xhp |2 +-
 source/text/swriter/guide/nonprintable_text.xhp |2 +-
 source/text/swriter/guide/text_centervert.xhp   |2 +-
 source/text/swriter/guide/text_frame.xhp|2 +-
 source/text/swriter/guide/wrap.xhp  |4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit b62218feb4fc7d278699d425868fdc7ac1bb6212
Author: Stanislav Horacek 
Date:   Wed Sep 7 21:59:41 2016 +0200

tdf#101064 adjust menu path to Format - Frame and Object - Properties

Change-Id: Ib7692042bfb7daaf7325be8f183759b27eb315e6
Reviewed-on: https://gerrit.libreoffice.org/28733
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/shared/00/00040500.xhp 
b/source/text/shared/00/00040500.xhp
index 0fb4cf1..a2cb5fc 100644
--- a/source/text/shared/00/00040500.xhp
+++ b/source/text/shared/00/00040500.xhp
@@ -142,7 +142,7 @@
 (all options 
only in Writer or Calc)
 Choose 
Format - Paragraph - Borders tab
 Choose 
Format - Image - Borders tab
-Choose 
Format - Frame/Object - Borders tab
+Choose 
Format - Frame and Object - Properties - Borders tab
 Choose 
Format - Page - Borders tab
 Choose 
Format - Character - Borders tab
 Choose 
View - Styles and Formatting - open context menu of an entry and 
choose Modify/New - Borders tab
@@ -163,7 +163,7 @@
 Choose 
Format - Paragraph - Background tab
 Choose 
Format - Character - Background tab
 Choose 
Format - Image - Background tab
-Choose 
Format - Frame/Object - Background tab
+Choose 
Format - Frame and Object - Properties - Area tab
 Choose 
Format - Page - Background tab
 Choose 
Format - Page - Header - More button
 Choose 
Format - Page - Footer - More button
diff --git a/source/text/shared/guide/paintbrush.xhp 
b/source/text/shared/guide/paintbrush.xhp
index c8eeacf..ac583a7 100644
--- a/source/text/shared/guide/paintbrush.xhp
+++ b/source/text/shared/guide/paintbrush.xhp
@@ -90,7 +90,7 @@
Frame is selected
 
 
-   Copies the frame attributes that are defined in 
Format - Frame dialog. The contents, size, 
position, linking, hyperlinks, and macros in the frame are not 
copied.
+   Copies the frame attributes that are defined in Format - Frame and Object - Properties dialog. The 
contents, size, position, linking, hyperlinks, and macros in the frame are not 
copied.
 
  
  
diff --git a/source/text/shared/guide/scripting.xhp 
b/source/text/shared/guide/scripting.xhp
index d0edae4..4b8a2d6 100644
--- a/source/text/shared/guide/scripting.xhp
+++ b/source/text/shared/guide/scripting.xhp
@@ -139,7 +139,7 @@
 Select the embedded object, for example a chart, in your 
document.
  
  
-Choose Format - Frame/Object - Macro.
+Choose Format - Frame and Object - Properties - 
Macro.
  
  
 In the Macros list box, open the %PRODUCTNAME Scripts 
entry.
diff --git a/source/text/swriter/00/0404.xhp 
b/source/text/swriter/00/0404.xhp
index 7eba748..ab9d0ae 100644
--- a/source/text/swriter/00/0404.xhp
+++ b/source/text/swriter/00/0404.xhp
@@ -244,7 +244,7 @@
 
 Choose Insert - Frame
 
-Choose Format - Frame/Object
+Choose 
Format - Frame and Object - Properties
 
 Open Insert toolbar, click
 
diff --git a/source/text/swriter/00/0405.xhp 
b/source/text/swriter/00/0405.xhp
index 831dedf..e73fb7a 100644
--- a/source/text/swriter/00/0405.xhp
+++ b/source/text/swriter/00/0405.xhp
@@ -56,7 +56,7 @@
 
   
  Choose Format - Page - Columns tab
- Choose Format - Frame/Object - Columns 
tab
+ Choose Format - Frame and Object - Properties - 
Columns tab
  Choose View - Styles and Formatting - open 
context menu Modify/New - Columns tab
  Choose Insert - Frame - Columns 
tab
  Choose Insert/Format - Section(s) - Columns 
tab
@@ -116,13 +116,13 @@
   
   
  Choose Format - Image - Type tab
- Choose Format - Frame/Object - Type 
tabUFI: removed some lines with Format-Object, see 
#i64150
+ Choose Format - Frame and Object - Properties - 
Type tabUFI: removed some lines with Format-Object, 
see #i64150
 Choose 
View - Styles and Formatting - open context menu Modify/New 
- Type tab
  Choose Insert - Frame - Type tab
   
   
  Choose Format - Image - Properties - Wrap 
tab
- Choose Format - Frame/Object - Properties - 
Wrap tab
+ Choose Format - Frame and Object - Properties - 
Wrap tab
  Choose Insert - Frame - Wrap tab
  Choose Format - Wra

[Libreoffice-commits] core.git: helpcontent2

[Stanislav Horacek]

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

New commits:
commit fb627243020ce053fe2e705c7d64a5020977f208
Author: Stanislav Horacek 
Date:   Wed Sep 7 21:59:41 2016 +0200

Updated core
Project: help  b62218feb4fc7d278699d425868fdc7ac1bb6212

tdf#101064 adjust menu path to Format - Frame and Object - Properties

Change-Id: Ib7692042bfb7daaf7325be8f183759b27eb315e6
Reviewed-on: https://gerrit.libreoffice.org/28733
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index c122aa7..b62218f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c122aa7574e363c9dce332f1ca8b69b1cccde202
+Subproject commit b62218feb4fc7d278699d425868fdc7ac1bb6212
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/inc/IDocumentContentOperations.hxx   |2 
 sw/inc/IDocumentFieldsAccess.hxx|2 
 sw/inc/IDocumentRedlineAccess.hxx   |   48 +++--
 sw/inc/SwAppletImpl.hxx |2 
 sw/inc/SwUndoField.hxx  |3 
 sw/inc/editsh.hxx   |6 
 sw/inc/fesh.hxx |1 
 sw/inc/ftninfo.hxx  |2 
 sw/inc/grfatr.hxx   |4 
 sw/inc/ndgrf.hxx|3 
 sw/inc/postithelper.hxx |2 
 sw/inc/redline.hxx  |5 
 sw/inc/splargs.hxx  |7 
 sw/inc/swabstdlg.hxx|   18 --
 sw/inc/swcrsr.hxx   |2 
 sw/inc/swtable.hxx  |3 
 sw/inc/txatritr.hxx |5 
 sw/inc/undobj.hxx   |7 
 sw/inc/unocrsr.hxx  |2 
 sw/inc/unosett.hxx  |2 
 sw/inc/view.hxx |3 
 sw/inc/wdocsh.hxx   |2 
 sw/qa/core/uwriter.cxx  |   34 ++--
 sw/qa/extras/globalfilter/globalfilter.cxx  |   18 +-
 sw/qa/extras/uiwriter/uiwriter.cxx  |8 
 sw/source/core/access/parachangetrackinginfo.cxx|2 
 sw/source/core/crsr/crstrvl.cxx |2 
 sw/source/core/crsr/swcrsr.cxx  |6 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   70 
 sw/source/core/doc/DocumentFieldsManager.cxx|   10 -
 sw/source/core/doc/DocumentRedlineManager.cxx   |  129 +++-
 sw/source/core/doc/DocumentTimerManager.cxx |2 
 sw/source/core/doc/acmplwrd.cxx |8 
 sw/source/core/doc/doc.cxx  |6 
 sw/source/core/doc/doccomp.cxx  |   44 ++---
 sw/source/core/doc/docfld.cxx   |   39 +---
 sw/source/core/doc/docfmt.cxx   |6 
 sw/source/core/doc/docftn.cxx   |8 
 sw/source/core/doc/docglbl.cxx  |2 
 sw/source/core/doc/docnum.cxx   |8 
 sw/source/core/doc/docredln.cxx |   43 ++---
 sw/source/core/doc/docsort.cxx  |2 
 sw/source/core/doc/doctxm.cxx   |2 
 sw/source/core/doc/notxtfrm.cxx |2 
 sw/source/core/doc/tblrwcl.cxx  |4 
 sw/source/core/docnode/ndsect.cxx   |6 
 sw/source/core/docnode/ndtbl.cxx|   20 +-
 sw/source/core/docnode/node2lay.cxx |5 
 sw/source/core/docnode/section.cxx  |   16 -
 sw/source/core/edit/autofmt.cxx |   14 -
 sw/source/core/edit/edglss.cxx  |4 
 sw/source/core/edit/edlingu.cxx |2 
 sw/source/core/edit/edredln.cxx |   14 -
 sw/source/core/edit/edundo.cxx  |8 
 sw/source/core/fields/postithelper.cxx  |5 
 sw/source/core/frmedt/fecopy.cxx|   10 -
 sw/source/core/frmedt/fefly1.cxx|3 
 sw/source/core/inc/DocumentContentOperationsManager.hxx |2 
 sw/source/core/inc/DocumentFieldsManager.hxx|2 
 sw/source/core/inc/DocumentRedlineManager.hxx   |   10 -
 sw/source/core/inc/attrhint.hxx |8 
 sw/source/core/inc/docfld.hxx   |9 -
 sw/source/core/inc/node2lay.hxx |2 
 sw/source/core/layout/newfrm.cxx|2 
 sw/source/core/table/swtable.cxx|4 
 sw/source/core/text/atrhndl.hxx |3 
 sw/source/core/text/atrstck.cxx |5 
 sw/source/core/text/frmpaint.cxx|6 
 sw/source/core/text/inftxt.cxx  |   10 -
 sw/source/core/text/inftxt.hxx  |8 
 sw/source/core/text/itradj.cxx  |2 
 sw/source/core/text/porglue.cxx |4 
 sw/source/core/text/porglue.hxx |2 
 sw/source/core/text/porlay.cxx  |4 
 sw/source/core/text/pormulti.cxx|4 
 sw/source/core/text/porrst.cxx  |4