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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/tdf92045.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ac6bfd85df271b650dbd24b45391dac346ecd72c
Author: Miklos Vajna 
Date:   Wed Jan 6 08:23:20 2016 +0100

tdf#92045 DOCX import:  doesn't mean blinking

Regression from commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use
constants for ST_TextEffect values, 2014-09-22), the problem was that
while the tokenizer stopped using hardcoded token values, the matching
dmapper code wasn't adapted.

Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0

diff --git a/sw/qa/extras/ooxmlimport/data/tdf92045.docx 
b/sw/qa/extras/ooxmlimport/data/tdf92045.docx
new file mode 100644
index 000..d41f523
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf92045.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 3ab0c83..714704c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -3027,6 +3027,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx")
 CPPUNIT_ASSERT(aActualSize.Height > 0);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf92045, "tdf92045.docx")
+{
+// This was true,  resulted in setting the 
blinking font effect.
+CPPUNIT_ASSERT_EQUAL(false, getProperty(getRun(getParagraph(1), 1), 
"CharFlash"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index fb48b9a..d61818c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1653,7 +1653,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 case NS_ooxml::LN_EG_RPrBase_effect:
 // The file-format has many character animations. We have only
 // one, so we use it always. Suboptimal solution though.
-if (nIntValue)
+if (nIntValue != NS_ooxml::LN_Value_ST_TextEffect_none)
 rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( true ));
 else
 rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/loolwsd-systemplate-setup

[Miklos Vajna]

 loolwsd/loolwsd-systemplate-setup |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3377e0e077f946ee15cc62058d06b40fef97e049
Author: Miklos Vajna 
Date:   Wed Jan 6 08:56:14 2016 +0100

loolwsd: find libcap in /lib64

Running ./loolwsd  resulted in

/usr/bin/loolkit: error while loading shared libraries: libcap.so.2: cannot 
open shared object file: No such file or directory

diff --git a/loolwsd/loolwsd-systemplate-setup 
b/loolwsd/loolwsd-systemplate-setup
index fd2bab0..0c395b3 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -27,7 +27,7 @@ cd / || exit 1
find etc/passwd etc/group etc/hosts \
 etc/resolv.conf \
 lib/ld-* lib64/ld-* \
-lib/libcap* lib/*-linux-gnu/libcap* \
+lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
 lib/libattr* lib/*-linux-gnu/libattr* \
 etc/ld.so.* \
 lib/libnss_* lib64/libnss_* \
@@ -47,7 +47,7 @@ cd / || exit 1
 lib/ld-* lib64/ld-* \
 lib64/libnss_* \
 lib/*-linux-gnu/libnss* \
-lib/libcap* lib/*-linux-gnu/libcap* \
+lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
 lib/libattr* lib/*-linux-gnu/libattr* \
 -type l
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

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

New commits:
commit a30a36b3c70e64b62add9f3c5376202b9682851f
Author: Markus Mohrhard 
Date:   Tue Jan 5 23:42:17 2016 +0100

disable test on OSX

The table seems to be on page 4 on OSX and not page 5. This makes the
xpath expression fail.

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

diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 39c3fc8..949e58f 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -632,11 +632,13 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, 
"comment-export.odt")
 }
 }
 
+#if !defined(MACOSX)
 DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
 {
 //emulate table "keep with next" -do not split table
 CPPUNIT_ASSERT_EQUAL( OUString("Row 1"), 
parseDump("/root/page[5]/body/tab[1]/row[2]/cell[1]/txt[1]") );
 }
+#endif
 
 DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 idl/source/objects/types.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d79efb6070850b3a07b7d13668de8dcce6815166
Author: Stephan Bergmann 
Date:   Wed Jan 6 08:04:19 2016 +0100

Missing include

Change-Id: Iaa59ae222c4d0453cbacb33018036802d606affc

diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 47c2882..f208f26 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 5af3256f92b5aaabf59f42a8e431bfbed078685d
Author: Stephan Bergmann 
Date:   Wed Jan 6 07:58:40 2016 +0100

Missing include

Change-Id: I958c2baf2ee1e0505e961d1a9c420df2881dab3f

diff --git a/writerfilter/source/rtftok/rtfsprm.cxx 
b/writerfilter/source/rtftok/rtfsprm.cxx
index 5584a0e..4e8768b 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -10,7 +10,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 namespace writerfilter
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/o3tl/cow_wrapper.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a459b52c57591ddc0d2c7db58d8534344263d65
Author: Stephan Bergmann 
Date:   Wed Jan 6 07:53:23 2016 +0100

std::swap is in , not 

Change-Id: I8b93f053276ff273f2f79ed29d7605d976f7d866

diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index f3db60e..f9811b4 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-#include 
+#include 
 
 namespace o3tl
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 idl/source/objects/object.cxx |2 ++
 idl/source/prj/database.cxx   |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 6c1cab568039aca82a744badde335f83413beaa3
Author: Stephan Bergmann 
Date:   Wed Jan 6 07:52:56 2016 +0100

Missing include

Change-Id: Icba84b4921cdb7c4a9e88975ec98dddc91e9f79b

diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 3172e86..2aec4e5 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
+#include 
 #include 
 #include 
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 5dccf9b..48a3f5e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 95463] Floating Navigator opens with much too small a default size in Writer

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=95463

--- Comment #3 from kumar  ---
(In reply to Susobhan Ghosh from comment #2)
> Hi! I'd like to take this up.

patch has been submitted for this bug. Waiting for review.
Thanks

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

[Bug 95463] Floating Navigator opens with much too small a default size in Writer

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=95463

--- Comment #2 from Susobhan Ghosh  ---
Hi! I'd like to take this up.

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

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

[Chris Sherlock]

 vcl/inc/fontattributes.hxx |2 -
 vcl/source/outdev/font.cxx |   54 -
 2 files changed, 50 insertions(+), 6 deletions(-)

New commits:
commit 5a014c49b3183e6da6842119b4e0f92ab59b2843
Author: Chris Sherlock 
Date:   Wed Jan 6 14:48:48 2016 +1100

vcl: init font metric variables in ImplFontAttributes constructors

If you run valgrind on a number of the unit tests, you get errors, mostly
because mbKernable has not been initialized and is in indeterminate state.
I am initializing all font metric variables to default variables explicitly
in the constructor now.

Snippet from output of CppunitTest_sd_filter_test before change follows:

make CppunitTest_sd_filters_test VALGRIND=memcheck

[cut lots of irrelevant stuff]

Testing 
file:///home/chris/repos/libreoffice/sd/qa/unit/data/odg/pass/CVE-2012-4233-2.odg:
==24149== Conditional jump or move depends on uninitialised value(s)
==24149==at 0xD75BBDC: OutputDevice::GetFontMetric() const 
(font.cxx:212)
==24149==by 0x1A358682: 
ImpEditEngine::RecalcFormatterFontMetrics(FormatterFontMetric&, SvxFont&) 
(impedit3.cxx:2826)
==24149==by 0x1A35AF86: 
ImpEditEngine::CreateAndInsertEmptyLine(ParaPortion*, unsigned int) 
(impedit3.cxx:1649)
==24149==by 0x1A362A3D: ImpEditEngine::CreateLines(int, unsigned int) 
(impedit3.cxx:625)
==24149==by 0x1A364BA0: ImpEditEngine::FormatDoc() (impedit3.cxx:390)
==24149==by 0x1A369982: ImpEditEngine::FormatAndUpdate(EditView*) 
(impedit3.cxx:4199)
==24149==by 0x1A31BCA4: EditEngine::SetUpdateMode(bool) 
(editeng.cxx:1436)
==24149==by 0x1D2DF8D0: 
SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle&, bool, bool) const 
(svdotxat.cxx:167)
==24149==by 0x1D2DFA4D: 
SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool, bool) (svdotxat.cxx:263)
==24149==by 0x1D1F15D0: 
sdr::properties::TextProperties::SetStyleSheet(SfxStyleSheet*, bool) 
(textproperties.cxx:356)
==24149==by 0x1D1EE027: 
sdr::properties::RectangleProperties::SetStyleSheet(SfxStyleSheet*, bool) 
(rectangleproperties.cxx:65)
==24149==by 0x1D1F324B: 
sdr::properties::AttributeProperties::SetModel(SdrModel*, SdrModel*) 
(attributeproperties.cxx:471)
==24149==by 0x1D2D0810: SdrTextObj::SetModel(SdrModel*) 
(svdotext.cxx:532)
==24149==by 0x1D284924: SdrObject::SetPage(SdrPage*) (svdobj.cxx:462)
==24149==by 0x1D286A74: SdrObjFactory::MakeNewObject(unsigned int, 
unsigned short, Rectangle const&, SdrPage*) (svdobj.cxx:3312)
==24149==by 0x1D3BEAB5: 
SvxDrawPage::_CreateSdrObject(com::sun::star::uno::Reference
 const&) (unopage.cxx:508)
==24149==by 0x1D53F88C: 
SvxFmDrawPage::_CreateSdrObject(com::sun::star::uno::Reference
 const&) (fmdpage.cxx:78)
==24149==by 0x1B59ECDF: 
SdGenericDrawPage::_CreateSdrObject(com::sun::star::uno::Reference
 const&) (unopage.cxx:401)
==24149==by 0x1D3BF1AF: 
SvxDrawPage::CreateSdrObject(com::sun::star::uno::Reference
 const&, bool) (unopage.cxx:838)
==24149==by 0x1D3BF37C: 
SvxDrawPage::add(com::sun::star::uno::Reference
 const&) (unopage.cxx:213)
==24149==by 0x1E6CFA87: 
SdXMLShapeContext::AddShape(com::sun::star::uno::Reference&)
 (ximpshap.cxx:427)
==24149==by 0x1E6D053A: SdXMLShapeContext::AddShape(rtl::OUString 
const&) (ximpshap.cxx:520)
==24149==by 0x1E6D3C93: 
SdXMLTextBoxShapeContext::StartElement(com::sun::star::uno::Reference
 const&) (ximpshap.cxx:1689)
==24149==by 0x1E608E3A: SvXMLImport::startElement(rtl::OUString const&, 
com::sun::star::uno::Reference 
const&) (xmlimp.cxx:737)
==24149==by 0x1FA10639: callbackStartElement (sax_expat.cxx:749)
==24149==by 0x1FA10639: call_callbackStartElement (sax_expat.cxx:247)
==24149==by 0x1FA303B9: doContent (xmlparse.c:2443)
==24149==by 0x1FA310CB: contentProcessor (xmlparse.c:2105)
==24149==by 0x1FA2F418: doProlog (xmlparse.c:4016)
==24149==by 0x1FA2FB94: prologProcessor (xmlparse.c:3739)
==24149==by 0x1FA3312F: XML_ParseBuffer (xmlparse.c:1651)
==24149==by 0x1FA0D359: (anonymous 
namespace)::SaxExpatParser_Impl::parse() (sax_expat.cxx:687)
==24149==by 0x1FA0E47E: (anonymous 
namespace)::SaxExpatParser::parseStream(com::sun::star::xml::sax::InputSource 
const&) (sax_expat.cxx:484)
==24149==by 0x1B30B4A2: ReadThroughComponent (sdxmlwrp.cxx:220)
==24149==by 0x1B30B4A2: (anonymous 
namespace)::ReadThroughComponent(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference, char 
const*, char const*, 
com::sun::star::uno::Reference&, char 
const*, com::sun::star::uno::Sequence const&, 
rtl::OUString const&, bool) (sdxmlwrp.cxx:392)
==24149==by 0x1B30E582: SdXMLFilter::Import(unsigned int&) 
(sdxmlwrp.cxx:660)
==24149==by 0x1B3CEA64: sd::DrawDocShell::ConvertFrom(SfxMedium&) 
(docshel4.cxx:462)
==2414

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

[Andrea Gelmini]

 writerfilter/source/dmapper/TagLogger.cxx  |1 
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx  |   21 ++---
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |1 
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx |1 
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx  |1 
 writerfilter/source/rtftok/rtfsprm.cxx |3 --
 writerfilter/source/rtftok/rtfsprm.hxx |3 --
 7 files changed, 8 insertions(+), 23 deletions(-)

New commits:
commit 11262803d6da77267dd1b2482b8575aee68aba77
Author: Andrea Gelmini 
Date:   Sun Sep 20 18:56:13 2015 +0200

writefilter: removed superfluous #includes

Change-Id: If9a563767cd1165c4a7363b513447cd975cb20c9
Reviewed-on: https://gerrit.libreoffice.org/15850
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/writerfilter/source/dmapper/TagLogger.cxx 
b/writerfilter/source/dmapper/TagLogger.cxx
index f1e0810..58f6bf8 100644
--- a/writerfilter/source/dmapper/TagLogger.cxx
+++ b/writerfilter/source/dmapper/TagLogger.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
 #include 
 #include "TagLogger.hxx"
 #include 
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 63c1313..ff888be 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -20,27 +20,22 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX
 
-#include 
-
 #include 
 #include 
-#include "sal/config.h"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/implbase.hxx"
-#include "com/sun/star/xml/sax/XFastContextHandler.hpp"
-#include "OOXMLParserState.hxx"
-#include "OOXMLPropertySet.hxx"
-#include "OOXMLDocumentImpl.hxx"
-#include 
-#include 
-
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include "OOXMLParserState.hxx"
+#include "OOXMLPropertySet.hxx"
 
 namespace writerfilter {
 namespace ooxml
 {
-
+class OOXMLDocumentImpl;
 
 class OOXMLFastContextHandler: public 
::cppu::WeakImplHelper
 {
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 2d7ba7a..78bf891 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -20,7 +20,6 @@
 #include 
 #include "OOXMLFastDocumentHandler.hxx"
 #include "OOXMLFastContextHandler.hxx"
-#include "oox/token/tokens.hxx"
 #include "OOXMLFactory.hxx"
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx 
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index d2c73fd..ff63cdd 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTDOCUMENTHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTDOCUMENTHANDLER_HXX
 
-#include 
 #include 
 #include 
 #include 
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx 
b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index bbebd87..8c9069a 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 
 extern OUString customTarget;
 extern OUString embeddingsTarget;
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx 
b/writerfilter/source/rtftok/rtfsprm.cxx
index 3af3000..5584a0e 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -8,9 +8,6 @@
  */
 
 #include 
-
-#include 
-
 #include 
 #include 
 
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx 
b/writerfilter/source/rtftok/rtfsprm.hxx
index 05b39cb..e05ef78 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -10,14 +10,11 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSPRM_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSPRM_HXX
 
-#include 
-
 #include 
 #include 
 #include 
 
 #include 
-#include 
 #include 
 
 namespace writerfilter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sysui/desktop

[David Tardon]

 sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml|4 
 sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml|4 
 sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml|4 
 sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml |4 
 sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml  |4 
 5 files changed, 20 insertions(+)

New commits:
commit 5b4b6daf2d66681fbb697fa49ab7404086b89318
Author: David Tardon 
Date:   Tue Jan 5 17:08:24 2016 +0100

add more URLs to appdata files

Change-Id: If32565d244d7882e1fca514214e5be1351ead41f
(cherry picked from commit 5f981642889b1b9980e98ebccc3150e022a73bed)
Reviewed-on: https://gerrit.libreoffice.org/21126
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 7b9e857..2a9d3b6 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -26,6 +26,10 @@ to connect to virtually any other existing database engine 
as well.
 
 
 http://www.libreoffice.org/discover/base/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png
 
http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index c49a198..b438931 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -20,6 +20,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/calc/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index 0b43c4a..f175008 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -25,6 +25,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/draw/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png
 
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index e12ecc1..c998e58 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -21,6 +21,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/impress/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
index 63dff95..089166f 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -27,6 +27,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/writer/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png
 
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-03-Technical-Doc-fdo83524.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 91065] Title of Document Properties dialog cannot be localized adequately

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=91065

Adolfo Jayme  changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

--- Comment #6 from Adolfo Jayme  ---
Thanks, Arul!

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

Re: pasqual milvaques license statement

[Eike Rathke]

Hi Pasqual,

Seems this wasn't answered during the holiday season.

On Friday, 2015-12-18 01:26:20 +0100, Pasqual Milvaques wrote:

> Yes, I have a question. When I submit a patch for review to gerrit, the
> people can make comments to it, if I want to submit some changes to the
> patch I must abandon this patch and submit a new one or can I make changes
> over the already submitted one?

Basically you submit a patch set of an amended commit with the same
Change-Id, which replaces the previous patch set of the same gerrit
change, see
https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch#Submitting_a_new_version
and
https://wiki.documentfoundation.org/Development/GitReview#Amending_a_gerrit_change
depending on which workflow, ./logerrit (or git push) or git-review, you use.

  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
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [SOLVED] Calc code pointer appreciated

[Eike Rathke]

Hi Winfried,

On Tuesday, 2015-12-29 07:25:50 +0100, Winfried Donkers wrote:

> Found it, sc/source/core/data/table4.cxx, ScTable::FillAnalyse().

Bah, a reply in that same original thread would had spared me an answer ;)
anyway.. that's it.

  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
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Calc code pointer appreciated

[Eike Rathke]

Hi Winfried,

On Wednesday, 2015-12-23 09:13:01 +0100, Winfried Donkers wrote:

> I am working on forecast functions and need to 'detect' date intervals (e.g. 
> months).
> 
> When entering 1/1 /15in cell A1 and 1/2/15 in cell A2 I can expand this in 
> the cells below (A3 then contains 1/3/15, ..., A13 1/1/16, etc.).
> To avoid double and/or inconsistent code, I would like to know where the 
> above mentioned month-detection takes place in the code.

I assume ScTable::FillAnalyse() in sc/source/core/data/table4.cxx is
what you are looking for, correct?

  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
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loolwsd/loolwsd-systemplate-setup

[Henry Castro]

 loolwsd/loolwsd-systemplate-setup |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cfb748edf74c82f86b6085039c63d62bbc55361c
Author: Henry Castro 
Date:   Tue Jan 5 19:08:12 2016 -0400

loolwsd: ensure POCO library is installed into systemplate.

In order to avoid "/usr/bin/loolkit: error while loading shared libraries: 
libPocoNetd.so.30"

diff --git a/loolwsd/loolwsd-systemplate-setup 
b/loolwsd/loolwsd-systemplate-setup
index e8f7eb2..fd2bab0 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -65,6 +65,7 @@ cd / || exit 1
# Go through the loolkit
find $POCODIR -name '*Poco*.so' -o -name '*.so.[0-9]*' |
while read file; do
+   echo $file
ldd $file 2>/dev/null
done |
grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | 
sed -e 's,^/,,'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes14' -

[László Németh]

 0 files changed

New commits:
commit fe774c9c466df09ba3b8e09d41fe7cd737edcfaa
Author: László Németh 
Date:   Tue Jan 5 23:41:05 2016 +0100

system restart

Change-Id: Idaec086ded7892585c4c264013ef1f559fe86e47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 formula/source/core/api/token.cxx |8 
 include/formula/tokenarray.hxx|5 +
 sc/source/core/tool/compiler.cxx  |   16 ++--
 3 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 22e5170af74c635cf55d089f97946b6dc86f82ad
Author: Eike Rathke 
Date:   Tue Jan 5 22:54:10 2016 +0100

create closing bracket token only when necessary

Change-Id: Ifb705279ff01d4c886678a183de0499ec5bb119e

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index aa9e1b9..a9bbc68 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4320,15 +4320,19 @@ ScTokenArray* ScCompiler::CompileString( const 
OUString& rFormula )
 aCorrectedFormula += mxSymbols->getSymbol(ocArrayClose);
 }
 
-FormulaByteToken aToken( ocClose );
-while( nBrackets-- )
+if (nBrackets)
 {
-if( !pArr->AddToken( aToken ) )
+FormulaByteToken aToken( ocClose );
+while( nBrackets-- )
 {
-SetError(errCodeOverflow); break;
+if( !pArr->AddToken( aToken ) )
+{
+SetError(errCodeOverflow);
+break;  // while
+}
+if ( bAutoCorrect )
+aCorrectedFormula += mxSymbols->getSymbol(ocClose);
 }
-if ( bAutoCorrect )
-aCorrectedFormula += mxSymbols->getSymbol(ocClose);
 }
 }
 if ( nForced >= 2 )
commit 4ae7b66286f391839b0d8d6c5a73ee7849eb4d1f
Author: Eike Rathke 
Date:   Tue Jan 5 22:26:45 2016 +0100

use new'ed FormulaToken and FormulaTokenArray::Add()

... instead of a temporary instance and AddToken() that just clones it
again.

Add function comment describing the difference.

Change-Id: I3f089965d394b33d79a1c3f69dc1c4182fd2

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index c16f3ca..3668b4d 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -395,11 +395,11 @@ bool FormulaTokenArray::AddFormulaToken(
 // long is svIndex, used for name / database area, or "byte" 
for spaces
 sal_Int32 nValue = rToken.Data.get();
 if ( eOpCode == ocDBArea )
-AddToken( formula::FormulaIndexToken( eOpCode, 
static_cast(nValue) ) );
+Add( new formula::FormulaIndexToken( eOpCode, 
static_cast(nValue) ) );
 else if ( eOpCode == ocTableRef )
 bError = true;  /* TODO: implementation */
 else if ( eOpCode == ocSpaces )
-AddToken( formula::FormulaByteToken( ocSpaces, 
static_cast(nValue) ) );
+Add( new formula::FormulaByteToken( ocSpaces, 
static_cast(nValue) ) );
 else
 bError = true;
 }
@@ -414,7 +414,7 @@ bool FormulaTokenArray::AddFormulaToken(
 else if ( eOpCode == ocStringXML )
 AddStringXML( aStrVal );
 else if ( eOpCode == ocExternal || eOpCode == ocMacro )
-AddToken( formula::FormulaExternalToken( eOpCode, aStrVal 
) );
+Add( new formula::FormulaExternalToken( eOpCode, aStrVal ) 
);
 else
 bError = true;  // unexpected string: don't know what 
to do with it
 }
@@ -1600,7 +1600,7 @@ FormulaToken* FormulaTokenArray::AddOpCode( OpCode eOp )
 pRet = new FormulaByteToken( eOp, 0, false );
 break;
 }
-return AddToken( *pRet );
+return Add( pRet );
 }
 
 void FormulaTokenArray::ReinternStrings( svl::SharedStringPool& rPool )
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 292b318..bf3056a 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -296,7 +296,12 @@ public:
  */
 virtual void CheckToken( const FormulaToken& t );
 
+/** Clones the token and then adds the clone to the pCode array.
+For just new'ed tokens use Add() instead of cloning it again.
+Use this AddToken() when adding a token from another origin.
+ */
 FormulaToken* AddToken( const FormulaToken& );
+
 FormulaToken* AddString( const svl::SharedString& rStr );
 FormulaToken* AddDouble( double fVal );
 FormulaToken* AddExternal( const sal_Unicode* pStr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/loolwsd-systemplate-setup

[Henry Castro]

 loolwsd/loolwsd-systemplate-setup |5 +
 1 file changed, 5 insertions(+)

New commits:
commit ecd360f3653b93128ae2be8eda94fd1fa0ea6dc2
Author: Henry Castro 
Date:   Tue Jan 5 18:01:08 2016 -0400

loolwsd: add missing libraries

libcap and libattr is located in lib/x84_64-linux-gnu
Debian GNU/Linux Jessie distribution

diff --git a/loolwsd/loolwsd-systemplate-setup 
b/loolwsd/loolwsd-systemplate-setup
index 51dbc36..e8f7eb2 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -27,6 +27,8 @@ cd / || exit 1
find etc/passwd etc/group etc/hosts \
 etc/resolv.conf \
 lib/ld-* lib64/ld-* \
+lib/libcap* lib/*-linux-gnu/libcap* \
+lib/libattr* lib/*-linux-gnu/libattr* \
 etc/ld.so.* \
 lib/libnss_* lib64/libnss_* \
 var/cache/fontconfig \
@@ -42,8 +44,11 @@ cd / || exit 1
 
find etc/fonts \
 lib/libnss_* \
+lib/ld-* lib64/ld-* \
 lib64/libnss_* \
 lib/*-linux-gnu/libnss* \
+lib/libcap* lib/*-linux-gnu/libcap* \
+lib/libattr* lib/*-linux-gnu/libattr* \
 -type l
 
find lib/libnss_* lib64/libnss_* -type l
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 formula/source/core/api/token.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64c599e06badd7225f86025ee552db812b0ae78b
Author: Eike Rathke 
Date:   Tue Jan 5 22:05:46 2016 +0100

for new'ed FormulaToken use FormulaTokenArray::Add()

... instead of AddToken() that just clones it again.

Change-Id: I99b02b0924d0a0c070435501f8ecd45f030e9c2c
(cherry picked from commit c3d2313eca8fdab9eb3b4c9a49fd14e255feb2c0)

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 2cd8dec..c16f3ca 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1513,7 +1513,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( 
const MissingConvention &
 {
 FormulaToken *pToken = new FormulaToken( svByte,
 ( pCur->GetOpCode() == ocCeil ? ocCeil_Math : 
ocFloor_Math ) );
-pNewArr->AddToken( *pToken );
+pNewArr->Add( pToken );
 }
 else if (pCur->GetOpCode() == ocWeeknumOOo &&
 rConv.getConvention() == 
MissingConvention::FORMULA_MISSING_CONVENTION_ODFF)
@@ -1529,7 +1529,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( 
const MissingConvention &
  * formula/source/core/resource/core_resource.src
  * SC_OPCODE_WEEKNUM_OOO */
 FormulaToken *pToken = new FormulaByteToken( ocIsoWeeknum, 
pCur->GetByte(), pCur->IsInForceArray());
-pNewArr->AddToken( *pToken );
+pNewArr->Add( pToken );
 }
 else
 pNewArr->AddToken( *pCur );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 sw/inc/dbmgr.hxx|4 ++--
 sw/source/uibase/dbui/dbmgr.cxx |   22 --
 2 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit d7e0d0135ba65243fab5ee038c21290b8e74e548
Author: Jan-Marek Glogowski 
Date:   Tue Jan 5 20:53:06 2016 +0100

tdf#93565 Use multiple docs for individual PDF MM

There is actually a comment in the mail merge code:

  // convert fields to text if we are exporting to PDF
  // this prevents a second merge while updating the fields
  // in SwXTextDocument::getRendererCount()

This was included to fix i#93714.

But the reference to 2005-05-23 #122919# in the actual code
doesn't help to understand, why the original code is needed.
I would like to get rid of it, but currently don't have time
for tests.

So the optimization to skip ConvertFieldsToText() and use a
single working document for individual document mail merge
breaks for PDF, as the working document won't contain any
fields after the first document is written.
This uses multiple working documents for PDF export again.

Change-Id: I0cf1c64da27863fc5fb4bb6c7812fed90b737d13

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 580b0f1..fb4ec0d 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -287,13 +287,13 @@ friend class SwConnectionDisposedListener_Impl;
  long nStartRow, sal_uInt16 
nStartingPageNo, int &targetDocPageCount, const bool bMergeShell,
  const SwMergeDescriptor& 
rMergeDescriptor, sal_Int32 nMaxDumpDocs);
 
-SAL_DLLPRIVATE void ResetWorkDoc(SwDoc *pWorkDoc, SfxObjectShellLock 
&xWorkDocSh, SwDBManager *pOldDBManager);
+SAL_DLLPRIVATE void CloseWorkDoc(SwDoc *pWorkDoc, SfxObjectShellLock 
&xWorkDocSh, SwDBManager *pOldDBManager);
 
 SAL_DLLPRIVATE void FreezeLayouts(SwWrtShell *pTargetShell, bool freeze);
 
 SAL_DLLPRIVATE void FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, 
SwView *pWorkView, SwDoc *pTargetDoc,
  SwWrtShell *pTargetShell, bool 
bCreateSingleFile, bool bPrinter,
- SwDoc *pWorkDoc, SwDBManager 
*pOldDBManager);
+ SwDoc *pWorkDoc, SwDBManager 
*pOldDBManager, const bool bIsPDFeport);
 
 SAL_DLLPRIVATE bool SavePrintDoc(SfxObjectShellRef xTargetDocShell, SwView 
*pTargetView,
  const SwMergeDescriptor &rMergeDescriptor,
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 6fcd7b5..ab1544c 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -974,6 +974,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 const OUString* pStoreToFilterOptions = nullptr;
 
 CreateStoreToFilter(pStoreToFilter, pStoreToFilterOptions, 
pSourceDocSh, bEMail, rMergeDescriptor);
+const bool bIsPDFeport = pStoreToFilter && 
pStoreToFilter->GetFilterName() == "writer_pdf_Export";
 
 bCancel = false;
 
@@ -1060,7 +1061,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 // Create a copy of the source document and work with 
that one instead of the source.
 // If we're not in the single file mode (which 
requires modifying the document for the merging),
 // it is enough to do this just once.
-if( 1 == nDocNo || bCreateSingleFile )
+if( 1 == nDocNo || bCreateSingleFile || bIsPDFeport )
 CreateWorkDoc(xWorkDocSh, pWorkView, pWorkDoc, 
pOldDBManager, pSourceDocSh, nMaxDumpDocs, nDocNo);
 
 SwWrtShell &rWorkShell = pWorkView->GetWrtShell();
@@ -1121,7 +1122,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 
 //convert fields to text if we are exporting to PDF
 //this prevents a second merge while updating the 
fields in SwXTextDocument::getRendererCount()
-if( pStoreToFilter && 
pStoreToFilter->GetFilterName() == "writer_pdf_Export")
+if( bIsPDFeport )
 rWorkShell.ConvertFieldsToText();
 xWorkDocSh->DoSaveAs(*pDstMed);
 xWorkDocSh->DoSaveCompleted(pDstMed);
@@ -1210,9 +1211,9 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 }
 }
 }
-if( bCreateSingleFile )
+if( bCreateSingleFile || bIsPDFeport )
 {
-ResetWorkDoc(pWorkDoc, xWorkDocSh, pOldDBManager);
+CloseWorkDoc(pWorkDoc, xWorkDocSh, 

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

[Maxim Monastirsky]

 svx/source/tbxctrls/tbxdrctl.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit cdd14dbd7858b35c3ac999c039bd22c52b4852b2
Author: Maxim Monastirsky 
Date:   Tue Jan 5 22:55:42 2016 +0200

Kill one indentation level

Change-Id: Id7a7b33dbfc902fcf5130f3dc8ae23012d1f2310

diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index a7de724..43af4f8 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -56,16 +56,11 @@ void SAL_CALL SvxTbxCtlDraw::initialize( const 
css::uno::Sequence< css::uno::Any
  * difference.
  */
 if( m_aCommandURL==".uno:TrackChangesBar")
-{
 m_sToolboxName="private:resource/toolbar/changes";
-}
+else if ( m_sModuleName == 
"com.sun.star.presentation.PresentationDocument" || m_sModuleName == 
"com.sun.star.drawing.DrawingDocument" )
+m_sToolboxName="private:resource/toolbar/toolbar";
 else
-{
-if ( m_sModuleName == "com.sun.star.presentation.PresentationDocument" 
|| m_sModuleName == "com.sun.star.drawing.DrawingDocument" )
-m_sToolboxName="private:resource/toolbar/toolbar";
-else
-m_sToolboxName="private:resource/toolbar/drawbar";
-}
+m_sToolboxName="private:resource/toolbar/drawbar";
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry svx/source sw/inc sw/sdi sw/source sw/uiconfig

[Gulsah Kose]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 +++
 svx/source/tbxctrls/tbxdrctl.cxx|   13 
-
 sw/inc/cmdid.h  |1 
 sw/sdi/_viewsh.sdi  |5 ++
 sw/sdi/swriter.sdi  |   24 
++
 sw/source/uibase/app/swmodule.cxx   |1 
 sw/uiconfig/swriter/toolbar/standardbar.xml |1 
 7 files changed, 50 insertions(+), 3 deletions(-)

New commits:
commit 1949cc74b929e13799686b22b450ded8dbf4c064
Author: Gulsah Kose 
Date:   Sun Jan 3 19:49:54 2016 +0200

tdf#90187 Added uno command for track changes bar.

v2: Solved dimmed button problem and changed controller class
for listen trackchangesbar button.

Change-Id: I5a921ad9bb6c8e53d3043e86492d0923a998f3d2
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/21064
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index fff1246..7910f0b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -232,6 +232,14 @@
   1
 
   
+  
+
+  Show Track Changes Bar
+
+
+  1
+
+  
   
 
   ~Show Changes
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 0c40f0a..a7de724 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -55,10 +55,17 @@ void SAL_CALL SvxTbxCtlDraw::initialize( const 
css::uno::Sequence< css::uno::Any
  * "private:resource/toolbar/toolbar" in draw and impress. Control is 
added for this
  * difference.
  */
-if ( m_sModuleName == "com.sun.star.presentation.PresentationDocument" || 
m_sModuleName == "com.sun.star.drawing.DrawingDocument" )
-m_sToolboxName="private:resource/toolbar/toolbar";
+if( m_aCommandURL==".uno:TrackChangesBar")
+{
+m_sToolboxName="private:resource/toolbar/changes";
+}
 else
-m_sToolboxName="private:resource/toolbar/drawbar";
+{
+if ( m_sModuleName == "com.sun.star.presentation.PresentationDocument" 
|| m_sModuleName == "com.sun.star.drawing.DrawingDocument" )
+m_sToolboxName="private:resource/toolbar/toolbar";
+else
+m_sToolboxName="private:resource/toolbar/drawbar";
+}
 }
 
 
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index cd0ce77..acb112b 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -701,6 +701,7 @@
 #define FN_SELECTION_MODE_DEFAULT   (FN_SELECTION + 90)   /* use default 
selection mode - not block mode */
 #define FN_SELECTION_MODE_BLOCK (FN_SELECTION + 91)   /* switch on block 
selection */
 #define SID_JUMP_TO_SPECIFIC_PAGE(FN_SELECTION + 92)
+#define SID_TRACK_CHANGES_BAR   (FN_SELECTION + 93)   /* shows/hides track 
changes bar */
 
 // QUERY-Block
 #define FN_TXTATR_INET  (FN_QUERY +29)  /* INet-Attribut */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 78deb1f..58573f4 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -803,6 +803,11 @@ interface BaseTextEditView
 StateMethod = StateViewOptions ;
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
+SID_TRACK_CHANGES_BAR
+[
+ExecMethod = ExecViewOptions ;
+StateMethod = StateViewOptions ;
+]
 }
 
 interface GlobalContents
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index a80d38c..f43ed50 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -91,6 +91,30 @@ SfxBoolItem TrackChanges FN_REDLINE_ON
 GroupId = GID_EDIT;
 ]
 
+SfxAllEnumItem TrackChangesBar SID_TRACK_CHANGES_BAR
+
+[
+/* flags: */
+AutoUpdate = TRUE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+Synchron;
+
+Readonly = FALSE,
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_EDIT;
+]
+
 SfxVoidItem AddAllUnknownWords FN_ADD_UNKNOWN
 ()
 [
diff --git a/sw/source/uibase/app/swmodule.cxx 
b/sw/source/uibase/app/swmodule.cxx
index 2e86864..0f3af65 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -286,6 +286,7 @@ void SwDLL::RegisterControls()
 SwModule* pMod = SW_MOD();
 
 SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
+SvxTbxCtlDraw::RegisterControl(SID_TRACK_CHANGES_BAR, pMod );
 SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod );
 SwTbx

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

[Matúš Kukan]

 solenv/bin/native-code.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d929e3a6b478b0bc02aa90ba326aab79353a7799
Author: Matúš Kukan 
Date:   Tue Jan 5 22:29:27 2016 +0100

sot_component_getFactory is gone

Change-Id: I4c0360b088f7de8bbcd598fcf3f35c6de13b6c66

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 819f1bb..99a3a4c 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -39,7 +39,6 @@ core_factory_list = [
 ("libooxlo.a", "oox_component_getFactory"),
 ("libpackage2.a", "package2_component_getFactory"),
 ("libsmlo.a", "sm_component_getFactory"),
-("libsotlo.a", "sot_component_getFactory"),
 ("libsrtrs1.a", "srtrs1_component_getFactory"),
 ("libstoragefdlo.a", "storagefd_component_getFactory"),
 ("libucb1.a", "ucb_component_getFactory"),
@@ -175,6 +174,8 @@ core_constructor_list = [
 "com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation",
 "com_sun_star_comp_sfx2_DocumentTemplates_get_implementation",
 "com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
+# sot/util/sot.component
+"com_sun_star_comp_embed_OLESimpleStorage",
 # stoc/source/inspect/introspection.component
 "com_sun_star_comp_stoc_Introspection_get_implementation",
 # stoc/util/stocservices.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 66822] refactor HTML export of image bullet list

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=66822

Beluga  changed:

   What|Removed |Added

 CC||d...@coprolite.net

--- Comment #10 from Beluga  ---
*** Bug 86973 has been marked as a duplicate of this bug. ***

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

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

[Eike Rathke]

 formula/source/core/api/token.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3d2313eca8fdab9eb3b4c9a49fd14e255feb2c0
Author: Eike Rathke 
Date:   Tue Jan 5 22:05:46 2016 +0100

for new'ed FormulaToken use FormulaTokenArray::Add()

... instead of AddToken() that just clones it again.

Change-Id: I99b02b0924d0a0c070435501f8ecd45f030e9c2c

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 2cd8dec..c16f3ca 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1513,7 +1513,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( 
const MissingConvention &
 {
 FormulaToken *pToken = new FormulaToken( svByte,
 ( pCur->GetOpCode() == ocCeil ? ocCeil_Math : 
ocFloor_Math ) );
-pNewArr->AddToken( *pToken );
+pNewArr->Add( pToken );
 }
 else if (pCur->GetOpCode() == ocWeeknumOOo &&
 rConv.getConvention() == 
MissingConvention::FORMULA_MISSING_CONVENTION_ODFF)
@@ -1529,7 +1529,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( 
const MissingConvention &
  * formula/source/core/resource/core_resource.src
  * SC_OPCODE_WEEKNUM_OOO */
 FormulaToken *pToken = new FormulaByteToken( ocIsoWeeknum, 
pCur->GetByte(), pCur->IsInForceArray());
-pNewArr->AddToken( *pToken );
+pNewArr->Add( pToken );
 }
 else
 pNewArr->AddToken( *pCur );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 66822] refactor HTML export of image bullet list

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=66822

--- Comment #9 from Susobhan Ghosh  ---
Hi! I'm just starting off. If this issue is not resolved, I'd like to take it
up. I checked the test file and created a HTML file from it, and previewed in
web browser too. I saw that the ul tag is not properly defined (not
syntactically correct). I've attached the output I got.

Upon correcting the extra ul> at the end (refer attachment), the issue wasn't
resolved. I replaced the svg data with some other svg data from the internet
and the bullet image appeared properly. So if I'm not wrong, isn't there also
some problem with the SVG base64 encoding / exporting of the SVG base64 data?

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

[Bug 66822] refactor HTML export of image bullet list

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=66822

--- Comment #8 from Susobhan Ghosh  ---
Created attachment 121740
  --> https://bugs.documentfoundation.org/attachment.cgi?id=121740&action=edit
Testcase Output

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

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

[Miklos Vajna]

 loolwsd/test/httpposttest.cpp |4 ++--
 loolwsd/test/httpwstest.cpp   |5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e3e4c4d6f3330bb9238cc3059e0f0a55bf116890
Author: Miklos Vajna 
Date:   Tue Jan 5 21:32:53 2016 +0100

loolwsd: fix tests to build again

diff --git a/loolwsd/test/httpposttest.cpp b/loolwsd/test/httpposttest.cpp
index a4bd199..772210a 100644
--- a/loolwsd/test/httpposttest.cpp
+++ b/loolwsd/test/httpposttest.cpp
@@ -16,7 +16,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 /// Tests the HTTP POST API of loolwsd. The server has to be started manually 
before running this test.
 class HTTPPostTest : public CPPUNIT_NS::TestFixture
@@ -30,7 +30,7 @@ class HTTPPostTest : public CPPUNIT_NS::TestFixture
 
 void HTTPPostTest::testConvertTo()
 {
-Poco::URI uri("http://127.0.0.1:"; + 
std::to_string(LOOLWSD::DEFAULT_CLIENT_PORT_NUMBER));
+Poco::URI uri("http://127.0.0.1:"; + std::to_string(ClientPortNumber));
 Poco::Net::HTTPClientSession session(uri.getHost(), uri.getPort());
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/convert-to");
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 415b4d9..cb05b71 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -11,12 +11,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 
 #include 
-#include 
+#include 
 
 /// Tests the HTTP WebSocket API of loolwsd. The server has to be started 
manually before running this test.
 class HTTPWSTest : public CPPUNIT_NS::TestFixture
@@ -38,7 +39,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 void sendTextFrame(Poco::Net::WebSocket& socket, const std::string& 
string);
 public:
 HTTPWSTest()
-: _uri("http://127.0.0.1:"; + 
std::to_string(LOOLWSD::DEFAULT_CLIENT_PORT_NUMBER)),
+: _uri("http://127.0.0.1:"; + std::to_string(ClientPortNumber)),
   _session(_uri.getHost(), _uri.getPort()),
   _request(Poco::Net::HTTPRequest::HTTP_POST, "/ws"),
   _socket(_session, _request, _response)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - formula/source include/formula sc/inc sc/qa sc/source

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx|   10 --
 formula/source/core/api/token.cxx  |   17 +
 formula/source/core/resource/core_resource.src |9 +
 include/formula/compiler.hrc   |3 ++-
 include/formula/opcode.hxx |1 +
 sc/inc/helpids.h   |1 +
 sc/qa/unit/data/contentCSV/date-time-functions.csv |2 +-
 sc/source/core/inc/interpre.hxx|1 +
 sc/source/core/tool/interpr2.cxx   |   12 
 sc/source/core/tool/interpr4.cxx   |1 +
 sc/source/filter/excel/xlformula.cxx   |3 ++-
 11 files changed, 51 insertions(+), 9 deletions(-)

New commits:
commit efeef720de31fe0fab9013f954eac63fe49fa59d
Author: Eike Rathke 
Date:   Tue Jan 5 19:13:54 2016 +0100

tdf#96198 add WEEKNUM_OOO compatibility function, tdf#50950 follow-up

The remaining cases when loading old and wrong ISOWEEKNUM that can't be
mapped to either new WEEKNUM or ISOWEEKNUM now are mapped to
WEEKNUM_OOO(date,mode) with calculations identical to the old and wrong
OOo WEEKNUM.

These WEEKNUM_OOO cases are still wrongly saved as ISOWEEKNUM so can be
read by 5.0 or earlier versions as the old WEEKNUM, which should be
changed for 5.3 or later.

WEEKNUM_OOO is not offered in the Function Wizard to prevent deliberate
usage.

Also reverts the interim unit test change to
sc/qa/unit/data/contentCSV/date-time-functions.csv
that was necessary to catch the error generated by ISOWEEKNUM with two
arguments.

(cherry picked from commit 902c593196741ffec2d096855369313f6bbe756e)

Conflicts:
include/formula/compiler.hrc
sc/inc/helpids.h
sc/source/filter/excel/xlformula.cxx

Change-Id: I874c4c7225900f03b879f2947512ae02270cbd4f

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 457beee..526f83f 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1294,8 +1294,7 @@ void FormulaCompiler::Factor()
 // literal double value and keep function. Anything else
 // can not be resolved, there exists no "like ISO but week
 // starts on Sunday" mode in WEEKNUM and for an expression
-// we can't determine, so let ISOWEEKNUM generate an error
-// for two arguments in these cases.
+// we can't determine.
 if (pc >= 2 && pArr->nIndex == nSepPos + 3 &&
 pArr->pCode[nSepPos+1]->GetType() == svDouble &&
 pArr->pCode[nSepPos+1]->GetDouble() != 1.0 &&
@@ -1309,10 +1308,9 @@ void FormulaCompiler::Factor()
 }
 else
 {
-/* FIXME: introduce (hidden?) compatibility function? 
*/
-#if 0
-pFacToken->NewOpCode( ocWeeknumCompat, 
FormulaToken::PrivateAccess());
-#endif
+// For the remaining two arguments cases use the
+// compatibility function.
+pFacToken->NewOpCode( ocWeeknumOOo, 
FormulaToken::PrivateAccess());
 }
 }
 PutCode( pFacToken );
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 53bc620..2cd8dec 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1113,6 +1113,7 @@ inline bool MissingConventionODF::isRewriteNeeded( OpCode 
eOp ) const
 case ocAddress:
 case ocLogNormDist:
 case ocNormDist:
+case ocWeeknumOOo:
 return true;
 case ocMissing:
 case ocLog:
@@ -1514,6 +1515,22 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( 
const MissingConvention &
 ( pCur->GetOpCode() == ocCeil ? ocCeil_Math : 
ocFloor_Math ) );
 pNewArr->AddToken( *pToken );
 }
+else if (pCur->GetOpCode() == ocWeeknumOOo &&
+rConv.getConvention() == 
MissingConvention::FORMULA_MISSING_CONVENTION_ODFF)
+{
+/* XXX TODO FIXME: Remove this special handling (also
+ * ocWeeknumOOo in MissingConventionODF::isRewriteNeeded()
+ * above) in 5.3 or later, this still abuses the ODFF
+ * ISOWEEKNUM function to store the old WEEKNUM (now
+ * WEEKNUM_OOO) cases that can't be mapped to the new WEEKNUM
+ * or ISOWEEKNUM, as 5.0 and earlier always stored the old
+ * WEEKNUM as ISOWEEKNUM. Ugly nasty ...
+ * Later write ORG.LIBREOFFICE.WEEKNUM_OOO, see
+ * formula/source/cor

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

[Andrea Gelmini]

 slideshow/opengl/vortexVertexShader.glsl|2 +-
 slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx |2 +-
 slideshow/source/engine/animationnodes/basenode.cxx |2 +-
 slideshow/source/engine/shapes/drawinglayeranimation.cxx|2 +-
 slideshow/source/engine/slide/userpaintoverlay.cxx  |2 +-
 slideshow/source/engine/slideshowimpl.cxx   |2 +-
 slideshow/source/engine/tools.cxx   |2 +-
 slideshow/source/engine/transitions/clippingfunctor.cxx |2 +-
 slideshow/source/engine/transitions/clippingfunctor.hxx |2 +-
 slideshow/source/inc/enumanimation.hxx  |2 +-
 slideshow/source/inc/eventqueue.hxx |2 +-
 slideshow/source/inc/slideshowcontext.hxx   |2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 2851683d8ae51525b2324f4871baabe499980f14
Author: Andrea Gelmini 
Date:   Tue Jan 5 17:59:50 2016 +0100

Fix typos

Change-Id: I7c40d7eb90a5c2b5d9808683c83b664707c27cb1
Reviewed-on: https://gerrit.libreoffice.org/21128
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/slideshow/opengl/vortexVertexShader.glsl 
b/slideshow/opengl/vortexVertexShader.glsl
index e01b331..33fdc93 100644
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -113,7 +113,7 @@ void main( void )
 vec4 v = vec4(a_position, 1.0);
 vec4 normal = vec4(a_normal, 1.0);
 
-// Each tile moves during only half of the transition. The letmost
+// Each tile moves during only half of the transition. The leftmost
 // tiles start moving at the start and arrive at their end
 // position around time=0.5, when the tiles there (the rightmost
 // ones) start moving. (The exact time each tile is moving is
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
index df058c2..ad03f23 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
@@ -43,7 +43,7 @@ public:
 virtual ~Operation(){}
 
 protected:
-/** Should this operation be interpolated . If TRUE, the transform will 
smoothly move from making no difference from t = 0.0 to mnT0 to being 
completely transformed from t = mnT1 to 1. If FALSE, the transform will be 
inneffectual from t = 0 to mnT0, and completely transformed from t = mnT0 to 1.
+/** Should this operation be interpolated . If TRUE, the transform will 
smoothly move from making no difference from t = 0.0 to mnT0 to being 
completely transformed from t = mnT1 to 1. If FALSE, the transform will be 
ineffectual from t = 0 to mnT0, and completely transformed from t = mnT0 to 1.
 */
 bool mbInterpolate;
 
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx 
b/slideshow/source/engine/animationnodes/basenode.cxx
index 5e0b3fb..b2e66b0 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -538,7 +538,7 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr 
const& pEvent )
 
 // xxx todo:
 // think about set node, anim base node!
-// if anim base node has no activity, this is called to schedule 
deactivatiion,
+// if anim base node has no activity, this is called to schedule 
deactivation,
 // but what if it does not schedule anything?
 
 // TODO(F2): Handle end time attribute, too
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx 
b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 5804f7e..5a2a7f1 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -221,7 +221,7 @@ private:
 // Flag decides if TextScroll alternates. Default is sal_False.
 boolmbAlternate;
 
-// Flag to remember if this is a simple scrollin text
+// Flag to remember if this is a simple scrolling text
 boolmbScrollIn;
 
 // start time for this animation
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx 
b/slideshow/source/engine/slide/userpaintoverlay.cxx
index cd7437b..1e3aab9 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -169,7 +169,7 @@ namespace slideshow
 // therefore destroy all the polygons stored
 if(mbIsEraseAllModeActivated)
 {
-// The Erase Mode should be desactivated
+// The Erase Mode should be deactivated
 mbIsEraseModeActivated = false;

[Libreoffice-commits] core.git: 3 commits - basctl/source chart2/source cui/source include/sot sc/source sd/source sfx2/source sot/Library_sot.mk sot/source sot/util starmath/source svx/source sw/inc

[Matúš Kukan]

 basctl/source/basicide/basdoc.cxx |1 
 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |1 
 cui/source/dialogs/pastedlg.cxx   |2 
 include/sot/factory.hxx   |   64 ---
 include/sot/object.hxx|   15 
 include/sot/sotdata.hxx   |   52 --
 include/sot/storage.hxx   |   27 -
 sc/source/ui/unoobj/chartuno.cxx  |1 
 sd/source/ui/func/fudraw.cxx  |5 
 sfx2/source/appl/imagemgr.cxx |1 
 sfx2/source/doc/docfac.cxx|1 
 sfx2/source/doc/frmdescr.cxx  |2 
 sfx2/source/doc/objitem.cxx   |2 
 sfx2/source/doc/objxtor.cxx   |1 
 sfx2/source/doc/ownsubfilterservice.cxx   |1 
 sfx2/source/doc/printhelper.cxx   |1 
 sfx2/source/menu/virtmenu.cxx |2 
 sfx2/source/statbar/stbitem.cxx   |1 
 sfx2/source/toolbox/tbxitem.cxx   |1 
 sfx2/source/view/frame.cxx|1 
 sot/Library_sot.mk|2 
 sot/source/base/exchange.cxx  |   34 +
 sot/source/base/factory.cxx   |  202 ---
 sot/source/base/object.cxx|   43 --
 sot/source/sdstor/storage.cxx |   72 ---
 sot/source/unoolestorage/register.cxx |   59 ---
 sot/source/unoolestorage/xolesimplestorage.cxx|  253 +-
 sot/source/unoolestorage/xolesimplestorage.hxx|   45 --
 sot/util/sot.component|5 
 starmath/source/smdll.cxx |3 
 svx/source/dialog/_contdlg.cxx|3 
 svx/source/unodraw/unopage.cxx|1 
 svx/source/xoutdev/_xoutbmp.cxx   |3 
 sw/inc/pch/precompiled_msword.hxx |1 
 sw/source/core/doc/DocumentContentOperationsManager.cxx   |1 
 sw/source/core/doc/docdesc.cxx|1 
 sw/source/core/doc/doctxm.cxx |1 
 sw/source/core/draw/dview.cxx |1 
 sw/source/core/frmedt/fefly1.cxx  |1 
 sw/source/core/frmedt/feshview.cxx|1 
 sw/source/core/ole/ndole.cxx  |1 
 sw/source/core/txtnode/thints.cxx |3 
 sw/source/core/unocore/unoframe.cxx   |1 
 sw/source/ui/frmdlg/frmpage.cxx   |2 
 sw/source/uibase/shells/basesh.cxx|3 
 sw/source/uibase/wrtsh/wrtsh1.cxx |3 
 vbahelper/inc/pch/precompiled_msforms.hxx |1 
 vcl/source/control/longcurr.cxx   |2 
 vcl/source/filter/wmf/winmtf.hxx  |3 
 49 files changed, 190 insertions(+), 743 deletions(-)

New commits:
commit 7f36d2e25572978ee6ee79a4089db81c191df260
Author: Matúš Kukan 
Date:   Tue Jan 5 18:04:14 2016 +0100

tdf#74608: Ctor function for css.embed.OLESimpleStorage

Change-Id: I20b91ad65514e27094ff702d1d94a48ef9a82fe6

diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 3c443e5..6c76555 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,sot,\
 
 $(eval $(call gb_Library_add_exception_objects,sot,\
 sot/source/unoolestorage/xolesimplestorage \
-sot/source/unoolestorage/register \
 sot/source/base/formats \
 sot/source/base/object \
 sot/source/base/exchange \
diff --git a/sot/source/unoolestorage/register.cxx 
b/sot/source/unoolestorage/register.cxx
deleted file mode 100644
index 1c65311..000
--- a/sot/source/unoolestorage/register.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Ve

[Libreoffice-commits] online.git: loolwsd/Capabilities.hpp loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp

[Ashod Nakashian]

 loolwsd/Capabilities.hpp |   15 +++
 loolwsd/LOOLWSD.cpp  |4 
 loolwsd/LOOLWSD.hpp  |5 -
 3 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 82c455ef94d8e101720cce95c5bb787c0f33b2a3
Author: Ashod Nakashian 
Date:   Tue Jan 5 12:41:57 2016 -0500

loolwsd: dropCapability now works with --enable-debug

Change-Id: I1a852b0cb4fe0b08fcc00f2f7ab15eea3d36801b
Reviewed-on: https://gerrit.libreoffice.org/21133
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/Capabilities.hpp b/loolwsd/Capabilities.hpp
index d50018f..cb7e300 100644
--- a/loolwsd/Capabilities.hpp
+++ b/loolwsd/Capabilities.hpp
@@ -16,6 +16,13 @@
 
 #include "Util.hpp"
 
+#if ENABLE_DEBUG
+#include 
+#include 
+
+static int uid = 0;
+#endif
+
 static
 void dropCapability(
 #ifdef __linux
@@ -75,15 +82,15 @@ void dropCapability(
 #endif
 
 // Running under sudo, probably because being debugged? Let's drop 
super-user rights.
-if (LOOLWSD::uid == 0)
+if (uid == 0)
 {
 struct passwd *nobody = getpwnam("nobody");
 if (nobody)
-LOOLWSD::uid = nobody->pw_uid;
+uid = nobody->pw_uid;
 else
-LOOLWSD::uid = 65534;
+uid = 65534;
 }
-if (setuid(LOOLWSD::uid) != 0)
+if (setuid(uid) != 0)
 {
 Log::error("setuid() failed.");
 }
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 4bee0e5..cf4658e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -42,7 +42,6 @@ DEALINGS IN THE SOFTWARE.
 
 #include 
 #include 
-#include 
 #include 
 
 #ifdef __linux
@@ -623,9 +622,6 @@ Poco::NamedMutex LOOLWSD::NamedMutexLOOL("loolwsd");
 
 int LOOLWSD::NumPreSpawnedChildren = 10;
 bool LOOLWSD::doTest = false;
-#if ENABLE_DEBUG
-int LOOLWSD::uid = 0;
-#endif
 const std::string LOOLWSD::CHILD_URI = "/loolws/child/";
 const std::string LOOLWSD::PIDLOG = "/tmp/loolwsd.pid";
 const std::string LOOLWSD::LOKIT_PIDLOG = "/tmp/lokit.pid";
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index d97addd..907620a 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -76,11 +76,6 @@ private:
 
 void startupBroker(int nBroker);
 int  createBroker();
-
-#if ENABLE_DEBUG
-public:
-static int uid;
-#endif
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 starmath/inc/view.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 62b274fd7f8abf71300607f43d68acc694c9295b
Author: Takeshi Abe 
Date:   Mon Dec 28 23:24:57 2015 +0900

starmath: Drop nonexistent friend

SmClipboardChangeListener was gone at 
5ed3fa4c39a67b2b12b4206bef6680fb757e1b75.

Change-Id: Ia826ecbeb53eb1d5cb41bd39fe250cdaf60268cd
Reviewed-on: https://gerrit.libreoffice.org/20987
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index a6c96c3..8f9f1ae 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -38,7 +38,6 @@
 
 class Menu;
 class DataChangedEvent;
-class SmClipboardChangeListener;
 class SmDocShell;
 class SmViewShell;
 class SmPrintUIOptions;
@@ -235,9 +234,6 @@ struct SmViewShell_Impl;
 
 class SmViewShell: public SfxViewShell
 {
-// for handling the PasteClipboardState
-friend class SmClipboardChangeListener;
-
 std::unique_ptr pImpl;
 
 VclPtr aGraphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx|   10 --
 formula/source/core/api/token.cxx  |   17 +
 formula/source/core/resource/core_resource.src |9 +
 include/formula/compiler.hrc   |3 ++-
 include/formula/opcode.hxx |1 +
 sc/inc/helpids.h   |1 +
 sc/qa/unit/data/contentCSV/date-time-functions.csv |2 +-
 sc/source/core/inc/interpre.hxx|1 +
 sc/source/core/tool/interpr2.cxx   |   12 
 sc/source/core/tool/interpr4.cxx   |1 +
 sc/source/filter/excel/xlformula.cxx   |3 ++-
 11 files changed, 51 insertions(+), 9 deletions(-)

New commits:
commit 902c593196741ffec2d096855369313f6bbe756e
Author: Eike Rathke 
Date:   Tue Jan 5 19:13:54 2016 +0100

tdf#96198 add WEEKNUM_OOO compatibility function, tdf#50950 follow-up

The remaining cases when loading old and wrong ISOWEEKNUM that can't be
mapped to either new WEEKNUM or ISOWEEKNUM now are mapped to
WEEKNUM_OOO(date,mode) with calculations identical to the old and wrong
OOo WEEKNUM.

These WEEKNUM_OOO cases are still wrongly saved as ISOWEEKNUM so can be
read by 5.0 or earlier versions as the old WEEKNUM, which should be
changed for 5.3 or later.

WEEKNUM_OOO is not offered in the Function Wizard to prevent deliberate
usage.

Also reverts the interim unit test change to
sc/qa/unit/data/contentCSV/date-time-functions.csv
that was necessary to catch the error generated by ISOWEEKNUM with two
arguments.

Change-Id: I874c4c7225900f03b879f2947512ae02270cbd4f

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 457beee..526f83f 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1294,8 +1294,7 @@ void FormulaCompiler::Factor()
 // literal double value and keep function. Anything else
 // can not be resolved, there exists no "like ISO but week
 // starts on Sunday" mode in WEEKNUM and for an expression
-// we can't determine, so let ISOWEEKNUM generate an error
-// for two arguments in these cases.
+// we can't determine.
 if (pc >= 2 && pArr->nIndex == nSepPos + 3 &&
 pArr->pCode[nSepPos+1]->GetType() == svDouble &&
 pArr->pCode[nSepPos+1]->GetDouble() != 1.0 &&
@@ -1309,10 +1308,9 @@ void FormulaCompiler::Factor()
 }
 else
 {
-/* FIXME: introduce (hidden?) compatibility function? 
*/
-#if 0
-pFacToken->NewOpCode( ocWeeknumCompat, 
FormulaToken::PrivateAccess());
-#endif
+// For the remaining two arguments cases use the
+// compatibility function.
+pFacToken->NewOpCode( ocWeeknumOOo, 
FormulaToken::PrivateAccess());
 }
 }
 PutCode( pFacToken );
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 53bc620..2cd8dec 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1113,6 +1113,7 @@ inline bool MissingConventionODF::isRewriteNeeded( OpCode 
eOp ) const
 case ocAddress:
 case ocLogNormDist:
 case ocNormDist:
+case ocWeeknumOOo:
 return true;
 case ocMissing:
 case ocLog:
@@ -1514,6 +1515,22 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( 
const MissingConvention &
 ( pCur->GetOpCode() == ocCeil ? ocCeil_Math : 
ocFloor_Math ) );
 pNewArr->AddToken( *pToken );
 }
+else if (pCur->GetOpCode() == ocWeeknumOOo &&
+rConv.getConvention() == 
MissingConvention::FORMULA_MISSING_CONVENTION_ODFF)
+{
+/* XXX TODO FIXME: Remove this special handling (also
+ * ocWeeknumOOo in MissingConventionODF::isRewriteNeeded()
+ * above) in 5.3 or later, this still abuses the ODFF
+ * ISOWEEKNUM function to store the old WEEKNUM (now
+ * WEEKNUM_OOO) cases that can't be mapped to the new WEEKNUM
+ * or ISOWEEKNUM, as 5.0 and earlier always stored the old
+ * WEEKNUM as ISOWEEKNUM. Ugly nasty ...
+ * Later write ORG.LIBREOFFICE.WEEKNUM_OOO, see
+ * formula/source/core/resource/core_resource.src
+ * SC_OPCODE_WEEKNUM_OOO */
+FormulaToken *pToken = new FormulaByteToken( ocIsoWeeknum, 
pCur->GetByte(), pCur->IsInForceArray());
+   

Re: vcl/null folder

[Chris Sherlock]

Ugh. This needs further review. I’ll do this after I wrangle some of this font 
code I’m looking at. 

Thanks all :-)

Chris

> On 4 Jan 2016, at 8:27 PM, Tor Lillqvist  wrote:
> 
> > It sounds like a good idea to move it to vcl/generic
> 
> Except that it is unclear what the "generic" in vcl/generic actually means. 
> It does not necessarily mean "any platform".
> 
> --tml
> 

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

[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1bbc42351bf8b17a5a1355be0bc95570bf05cebd
Author: Ashod Nakashian 
Date:   Tue Jan 5 12:29:34 2016 -0500

loolwsd: handle browser ping frames

Change-Id: I6f0074a3f8945b0ffe7a435d40f72f0ef4eae4b8
Reviewed-on: https://gerrit.libreoffice.org/21132
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index bd7dc9f..4bee0e5 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -424,7 +424,11 @@ public:
 {
 n = ws->receiveFrame(buffer, sizeof(buffer), flags);
 
-if ((flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_PONG)
+if ((flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_PING)
+{
+ws->sendFrame("", 0, WebSocket::FRAME_OP_PONG);
+}
+else if ((flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_PONG)
 {
 n = 1;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Stopping LibreOffice related activities

[Chris Sherlock]

Hi Cedric, 

Thank you for your great work. Sad to see you go, hope you’ll hop onto IRC 
every now and then and maybe give us the odd patch :-)

Chris

> On 5 Jan 2016, at 7:24 PM, Cedric Bosdonnat  
> wrote:
> 
> Hi there!
> 
> You surely have remarked that I don't have much time for LibreOffice
> these times. I'm announcing you that I'm retiring from any LibreOffice
> activity since I couldn't handle them properly. That includes GSoC
> administration.
> 
> Continue the nice work and see you perhaps in an opensource event
> someday.
> 
> --
> Cedric
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

Re: Character encoding not being detected when using Link to external source in calc

[Chris Sherlock]

Thanks Mark, appreciate these code pointers!

(I’m cc’ing in the mailing list so others can comment)

Chris

> On 4 Jan 2016, at 8:21 PM, Mark Hung  wrote:
> 
> 
> I meant there is a chance for SvParser::GetNextChar() to switch encoding, but 
> yes it is less relevant.
> 
> Grepping content-type under ucb , there are some suspicious code
> http://opengrok.libreoffice.org/xref/core/ucb/source/ucp/webdav-neon/ContentProperties.cxx#454
>  
> 
> http://opengrok.libreoffice.org/xref/core/ucb/source/ucp/webdav/ContentProperties.cxx#471
>  
> 
> 
> Which seems incosistent with 
> http://opengrok.libreoffice.org/xref/core/sc/source/filter/html/htmlpars.cxx#264
>  
> 
> 
> 
> 2016-01-04 16:17 GMT+08:00 Chris Sherlock  >:
> Hi Mark,
> 
> BOM detection is irrelevant here. The HTTP header states that it should be 
> UTF8, but this is not being honoured. 
> 
> There is something further down the stack that isn’t recording the HTTP 
> headers. 
> 
> Chris
> 
>> On 4 Jan 2016, at 4:23 PM, Mark Hung > > wrote:
>> 
>> Hi Chris,
>> 
>> As recently I'm working on SvParser and HTMLParser, 
>> 
>> There is BOM detection is in SvParser::GetNextChar().
>> 
>> A quick look at eehtml, EditHTMLParser:: <>EditHTMLParser seems relevant.
>> 
>> Best regards.
>> 
>> 
>> 2016-01-04 12:02 GMT+08:00 Chris Sherlock > >:
>> Hey guys, 
>> 
>> Probably nobody saw this because of the time of year (Happy New Year, 
>> incidentally!!!).
>> 
>> Just a quick ping to the list to see if anyone can give me some pointers. 
>> 
>> Chris
>> 
>>> On 30 Dec 2015, at 12:15 PM, Chris Sherlock >> > wrote:
>>> 
>>> Hi guys,
>>> 
>>> In bug 95217 - https://bugs.documentfoundation.org/show_bug.cgi?id=95217 
>>>  - Persian test 
>>> in a webpage encoded as UTF-8 is corrupting.
>>> 
>>> If I take the webpage and save to an HTML file encoded as UTF8, then there 
>>> are no problems and the Persian text comes through fine. However, when 
>>> connecting to a webserver directly, the HTTP header correctly gives the 
>>> content type as utf8.
>>> 
>>> I did a test using Charles Proxy with its SSL interception feature turned 
>>> on and pointed Safari to 
>>> https://bugs.documentfoundation.org/attachment.cgi?id=119818 
>>> 
>>> 
>>> The following headers are gathered:
>>> 
>>> HTTP/1.1 200 OK
>>> Server: nginx/1.2.1
>>> Date: Sat, 26 Dec 2015 01:41:30 GMT
>>> Content-Type: text/html; name="text.html"; charset=UTF-8
>>> Content-Length: 982
>>> Connection: keep-alive
>>> X-xss-protection: 1; mode=block
>>> Content-disposition: inline; filename="text.html"
>>> X-content-type-options: nosniff
>>> 
>>> Some warnings are spat out that it editeng's eehtml can't detect the 
>>> encoding. I initially thought it was looking for a BOM, which makes no 
>>> sense for a webpage, but that's wrong. Instead, for some reason the headers 
>>> don't seem to be processed and the HTML parser is falling back to 
>>> ISO-8859-1 and not UTF8 as the character encoding.
>>> 
>>> We seem to use Neon to make the GET request to the webserver. A few 
>>> observations:
>>> 
>>> 1. We detect a server OK response as an error
>>> 2. (Probably more to the point) I believe PROPFIND is being used, but 
>>> actually even though the function being used indicates a PROPFIND verb is 
>>> used a GET is used as is normal but the headers aren't being stored. This 
>>> ,Evans that when the parser looks for the headers to find the encoding it's 
>>> not finding anything, resulting in a fallback to ISO-8859-1.
>>> 
>>> One easy thing (doesn't solve the root issue) is that wouldn't it be a 
>>> better idea to fallback to UTF8 and not ISO-8859-1, given ISO-8859-1 is 
>>> really just a subset of UTF-8?
>>> 
>>> Any pointers on how to get to the bottom of this would be appreciated, I'm 
>>> honestly not up on webdav or Neon.
>>> 
>>> Chris Sherlock
>> 
>> 
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org 
>> http://lists.freedesktop.org/mailman/listinfo/libreoffice 
>> 
>> 
>> 
>> 
>> 
>> -- 
>> Mark Hung
> 
> 
> 
> 
> -- 
> Mark Hung

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

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 572 commits - accessibility/inc accessibility/source android/Bootstrap android/source apple_remote/Library_AppleRemote.mk apple_remot

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit 1be42c82008f25eefa4c958b6a367ec18571305f
Author: Douglas Mencken 
Date:   Fri Dec 11 13:18:00 2015 -0500

make the >>jvmfwk<< library to be fully compatible with OS X below 10.8

Change-Id: I1f6ba607154d7250bbc8cc0bb85ff234909ad795

diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index f3373b7..3a078fc 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -55,10 +55,6 @@ $(eval $(call gb_Library_use_externals,jvmfwk,\
 ))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_cxxflags,jvmfwk,\
-$(gb_OBJCXXFLAGS) \
-))
-
 $(eval $(call gb_Library_add_objcxxobjects,jvmfwk,\
 jvmfwk/plugins/sunmajor/pluginlib/util_cocoa \
 ))
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 52d1a3c..553d0bb 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -657,17 +657,23 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 if ( pInfo == nullptr || ppVm == nullptr || ppEnv == nullptr)
 return JFW_PLUGIN_E_INVALID_ARG;
 //Check if the Vendor (pInfo->sVendor) is supported by this plugin
-if ( ! isVendorSupported(pInfo->sVendor))
+if ( ! isVendorSupported(pInfo->sVendor) )
+{
 return JFW_PLUGIN_E_WRONG_VENDOR;
+}
 #ifdef MACOSX
 rtl::Reference aVendorInfo = getJREInfoByPath( OUString( 
pInfo->sLocation ) );
 if ( !aVendorInfo.is() || aVendorInfo->compareVersions( OUString( 
pInfo->sVersion ) ) < 0 )
+{
 return JFW_PLUGIN_E_VM_CREATION_FAILED;
+}
 #endif
 OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
 #ifdef MACOSX
 if ( !JvmfwkUtil_isLoadableJVM( sRuntimeLib ) )
+{
 return JFW_PLUGIN_E_VM_CREATION_FAILED;
+}
 #endif
 JFW_TRACE2("Using Java runtime library: " << sRuntimeLib);
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index f16f96f..61dcd27 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -68,8 +68,7 @@ using ::rtl::Reference;
 #define HKEY_SUN_SDK L"Software\\JavaSoft\\Java Development Kit"
 #endif
 
-#ifdef UNX
-#if !(defined MACOSX && defined X86_64)
+#if defined( UNX ) && !defined( MACOSX )
 namespace {
 char const *g_arJavaNames[] = {
 "",
@@ -82,6 +81,7 @@ char const *g_arJavaNames[] = {
 "Home",
 "IBMJava2-ppc-142"
 };
+
 /* These are directory names which could contain multiple java installations.
  */
 char const *g_arCollectDirs[] = {
@@ -101,11 +101,6 @@ char const *g_arCollectDirs[] = {
looked for.
 */
 char const *g_arSearchPaths[] = {
-#ifdef MACOSX
-"",
-"Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
-"System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
-#else
 #ifndef JVM_ONE_PATH_CHECK
 "",
 "usr/",
@@ -120,11 +115,9 @@ char const *g_arSearchPaths[] = {
 #else
 JVM_ONE_PATH_CHECK
 #endif
-#endif
 };
 }
-#endif
-#endif //  UNX
+#endif //  UNX && !MACOSX
 
 namespace jfw_plugin
 {
@@ -1204,10 +1197,16 @@ void addJavaInfosDirScan(
 std::vector> & addedInfos)
 {
 #ifdef MACOSX
+#if MACOSX_SDK_VERSION >= 1080
 // Ignore all but Oracle's JDK as loading Apple's Java and Oracle's JRE
 // will cause OS X's JavaVM framework to display a dialog and invoke
 // exit() when loaded via JNI on OS X 10.10
 Directory aDir("file:///Library/Java/JavaVirtualMachines");
+#else
+// For Java versions 6 and below, Apple supplies their own version of Java,
+// so it's under /System and not /Library
+Directory 
aDir("file:///System/Library/Frameworks/JavaVM.framework/Versions");
+#endif
 if (aDir.open() == File::E_None)
 {
 DirectoryItem aItem;
@@ -1219,9 +1218,16 @@ void addJavaInfosDirScan(
 OUString aItemURL( aStatus.getFileURL() );
 if (aItemURL.getLength())
 {
+#if MACOSX_SDK_VERSION >= 1080
 aItemURL += "/Contents/Home";
+#else
+aItemURL += "/Home";
+#endif
 if (DirectoryItem::get(aItemURL, aItem) == File::E_None)
-getAndAddJREInfoByPath(aItemURL, allInfos, addedInfos);
+{
+bool success = getAndAddJREInfoByPath(aItemURL, 
allInfos, addedInfos);
+JFW_TRACE2( ">>getAndAddJREInfoByPath<< returned " << 
( success ? "TRUE" : "FALSE" ) );
+}
 }
 }
 }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm 
b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
index 5755d4c..c282192 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
@@ -22,24 +22,46 @@ bool JvmfwkUtil_isLoadableJVM( OUS

Stopping LibreOffice related activities

[Cedric Bosdonnat]

Hi there!

You surely have remarked that I don't have much time for LibreOffice
these times. I'm announcing you that I'm retiring from any LibreOffice
activity since I couldn't handle them properly. That includes GSoC
administration.

Continue the nice work and see you perhaps in an opensource event
someday.

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

[Libreoffice-commits] core.git: Branch 'feature/unitver' - include/formula sc/inc sc/source

[Benjamin Ni]

 include/formula/token.hxx  |1 -
 sc/inc/formulacell.hxx |1 +
 sc/inc/units.hxx   |1 -
 sc/source/core/tool/interpr4.cxx   |3 +++
 sc/source/core/units/unitsimpl.cxx |4 ++--
 sc/source/core/units/unitsimpl.hxx |1 +
 6 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 375d0cd087f8a2d76f8682109e585ff0e0837198
Author: Benjamin Ni 
Date:   Wed Jul 22 15:49:23 2015 +0100

cosmetic changes

Change-Id: I6826a23655c9556dac2be49a8f28d67e95e91ff2
Reviewed-on: https://gerrit.libreoffice.org/17582
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 23d9787..9bb39b1 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -103,7 +103,6 @@ protected:
 public:
 FormulaToken( StackVar eTypeP,OpCode e = ocPush );
 FormulaToken( const FormulaToken& r );
-
 virtual ~FormulaToken();
 
 inline  voidDelete(){ delete this; }
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 724b1e2..ff110fb 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -31,6 +31,7 @@
 #include 
 
 #include "types.hxx"
+#include "units.hxx"
 
 #include "formularesult.hxx"
 
diff --git a/sc/inc/units.hxx b/sc/inc/units.hxx
index 1e0c5ea..e93d745 100644
--- a/sc/inc/units.hxx
+++ b/sc/inc/units.hxx
@@ -58,7 +58,6 @@ public:
 static ::boost::shared_ptr< Units > GetUnits();
 
 virtual FormulaStatus verifyFormula(ScTokenArray* pArray, const ScAddress& 
rFormulaAddress, ScDocument* pDoc) = 0;
-
 /*
  * Split the input into value and unit, where rInput == rValue + rUnit.
  * (We assume that the unit is always the last part of the input string.)
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index bd84fa6..fe93ec0 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -65,6 +65,9 @@
 #include "doubleref.hxx"
 #include "queryparam.hxx"
 #include "tokenarray.hxx"
+#include "units.hxx"
+#include "scmod.hxx"
+#include "viewfunc.hxx"
 
 #include 
 #include 
diff --git a/sc/source/core/units/unitsimpl.cxx 
b/sc/source/core/units/unitsimpl.cxx
index 0c89201..f2101c2 100644
--- a/sc/source/core/units/unitsimpl.cxx
+++ b/sc/source/core/units/unitsimpl.cxx
@@ -526,11 +526,11 @@ HeaderUnitDescriptor 
UnitsImpl::findHeaderUnitForCell(const ScAddress& rCellAddr
 return { false, UtUnit(), boost::optional< ScAddress >(), OUString(""), -1 
};
 }
 
-FormulaStatus UnitsImpl::verifyFormula(ScTokenArray* pArray, const ScAddress& 
rFormulaAddress, ScDocument* pDoc) {
+FormulaStatus UnitsImpl::verifyFormula(ScTokenArray* pArray, const ScAddress& 
rFormulaAddress, ScDocument* pDoc)
+{
 #if DEBUG_FORMULA_COMPILER
 pArray->Dump();
 #endif
-
 stack< RAUSItem > aStack;
 
 for (FormulaToken* pToken = pArray->FirstRPN(); pToken != 0; pToken = 
pArray->NextRPN()) {
diff --git a/sc/source/core/units/unitsimpl.hxx 
b/sc/source/core/units/unitsimpl.hxx
index f3e2cb8..5bdee2a 100644
--- a/sc/source/core/units/unitsimpl.hxx
+++ b/sc/source/core/units/unitsimpl.hxx
@@ -137,6 +137,7 @@ private:
 HeaderUnitDescriptor extractUnitFromHeaderString(const OUString& rHeader);
 
 static OUString extractUnitStringFromFormat(const OUString& rFormatString);
+
 static OUString extractUnitStringForCell(const ScAddress& rAddress, 
ScDocument* pDoc);
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Additions required to the AppData file

[Michael Stahl]

On 26.11.2015 17:15, Richard Hughes (semi-automated) wrote:
> So, what do I want you to do? Basically, I would like you to:
> 
> Add the following data into libreoffice-draw.appdata.xml
> 
>   
> HiDpiIcon
> ModernToolkit
>   

...

(finally) done on master, and the backport for libreoffice-5-1 was
reviewed too so LO 5.1.0 should have it.

> Of course, you don't have to do a release with this fix straight
> away,
and if you have a stable branch it would be a good thing to backport
this as well. Nothing bad will happen if we run the automated tools with
the kudos already set in the AppData file. If you think any of the other
kudos might apply[1], please email me back and we can discuss any new
additions.

i believe we are entitled to the `HighContrast` and `UserDocs` kudos as
well so i've added those.

i am sceptical as to our application menu being "in line with the GNOME
HIG", but i am also too lazy to read said HIG so leaving out `AppMenu`
for now.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sysui/desktop

[Richard Hughes]

 sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml|6 ++
 sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml|6 ++
 sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml|6 ++
 sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml |6 ++
 sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml  |6 ++
 5 files changed, 30 insertions(+)

New commits:
commit 02148691fdd839da0fa26cd49105d0a002d04154
Author: Richard Hughes 
Date:   Tue Jan 5 14:42:45 2016 +0100

sysui: add "kudos" to AppData files

(cherry picked from commit c7fee34686d22d164dd1f42f9d68c53832011d0f)

sysui: also add `HighContrast` and `UserDocs` to AppData
(cherry picked from commit 6cf31f69b41b7155a208362f0d913f854fa70c43)

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

diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 0257878..7b9e857 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -32,4 +32,10 @@ to connect to virtually any other existing database engine 
as well.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  HighContrast
+  ModernToolkit
+  UserDocs
+
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index 836f100..c49a198 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -25,4 +25,10 @@ worrying about compatibility.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  HighContrast
+  ModernToolkit
+  UserDocs
+
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index 4888653..0b43c4a 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -31,4 +31,10 @@ worrying about compatibility.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  HighContrast
+  ModernToolkit
+  UserDocs
+
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index 6174a0865..e12ecc1 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -26,4 +26,10 @@ worrying about compatibility.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  HighContrast
+  ModernToolkit
+  UserDocs
+
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
index 7e4b07f..63dff95 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -33,4 +33,10 @@ worrying about compatibility.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  HighContrast
+  ModernToolkit
+  UserDocs
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml|4 
 sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml|4 
 sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml|4 
 sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml |4 
 sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml  |4 
 5 files changed, 20 insertions(+)

New commits:
commit 5f981642889b1b9980e98ebccc3150e022a73bed
Author: David Tardon 
Date:   Tue Jan 5 17:08:24 2016 +0100

add more URLs to appdata files

Change-Id: If32565d244d7882e1fca514214e5be1351ead41f

diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 7b9e857..2a9d3b6 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -26,6 +26,10 @@ to connect to virtually any other existing database engine 
as well.
 
 
 http://www.libreoffice.org/discover/base/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png
 
http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index c49a198..b438931 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -20,6 +20,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/calc/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index 0b43c4a..f175008 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -25,6 +25,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/draw/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png
 
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index e12ecc1..c998e58 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -21,6 +21,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/impress/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
index 63dff95..089166f 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -27,6 +27,10 @@ worrying about compatibility.
 
 
 http://www.libreoffice.org/discover/writer/
+https://bugs.documentfoundation.org/
+https://donate.libreoffice.org/
+https://wiki.documentfoundation.org/Faq
+http://www.libreoffice.org/get-help/documentation/
 
 http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png
 
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-03-Technical-Doc-fdo83524.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/inc/conditio.hxx |2 -
 sc/qa/unit/ucalc.cxx|   26 -
 sc/qa/unit/ucalc.hxx|2 -
 sc/source/core/data/validat.cxx |   49 
 4 files changed, 1 insertion(+), 78 deletions(-)

New commits:
commit 058dea3b1ac3080dd8a6345d77199eae8487c509
Author: Markus Mohrhard 
Date:   Tue Jan 5 16:48:15 2016 +0100

Revert "Time wraparound validation feature"

This reverts commit c01bcbc88522c5f86820105a45e2e5593ae01501.

It still needs to be determined if this really was a good idea or a
brain fart from me.

There are some serious interop issues around the issue.

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 69f8ddd..d33ecc6 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -154,12 +154,10 @@ public:
 class SC_DLLPUBLIC ScConditionEntry : public ScFormatEntry
 {
 // stored data:
-protected:
 ScConditionMode eOp;
 sal_uInt16  nOptions;
 double  nVal1;  // input or calculated
 double  nVal2;
-private:
 OUString  aStrVal1;   // input or calculated
 OUString  aStrVal2;
 OUString  aStrNmsp1;  // namespace to be used on 
(re)compilation, e.g. in XML import
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 7d836b1..ccb3619 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -45,7 +45,6 @@
 #include "interpre.hxx"
 #include "columniterator.hxx"
 #include "types.hxx"
-#include "validat.hxx"
 #include "conditio.hxx"
 #include "colorscale.hxx"
 #include "fillinfo.hxx"
@@ -5691,31 +5690,6 @@ void Test::testCondFormatInsertRow()
 m_pDoc->DeleteTab(0);
 }
 
-void Test::testValidity()
-{
-m_pDoc->InsertTab(0, "Test");
-
-m_pDoc->SetValue( 0, 0, 0, 22.0/24.0 );
-m_pDoc->SetValue( 2, 0, 0, 23.0/24.0 );
-m_pDoc->SetValue( 4, 0, 0, 24.0/24.0 );
-
-// invalid between 2300-0100 hrs
-ScValidationData* pData0 = new ScValidationData( SC_VALID_TIME, 
SC_COND_NOTBETWEEN,
-OUString::number(23.0/24.0), OUString::number(1.0/24.0), m_pDoc, 
ScAddress(0,0,0) );
-ScValidationData* pData1 = new ScValidationData( SC_VALID_TIME, 
SC_COND_NOTBETWEEN,
-OUString::number(23.0/24.0), OUString::number(1.0/24.0), m_pDoc, 
ScAddress(2,0,0) );
-ScValidationData* pData2 = new ScValidationData( SC_VALID_TIME, 
SC_COND_NOTBETWEEN,
-OUString::number(23.0/24.0), OUString::number(1.0/24.0), m_pDoc, 
ScAddress(4,0,0) );
-
-ScRefCellValue aCell;
-aCell.assign(*m_pDoc, ScAddress(0,0,0));
-CPPUNIT_ASSERT(  pData0->IsDataValid( aCell, ScAddress(0,0,0) ) );
-aCell.assign(*m_pDoc, ScAddress(2,0,0));
-CPPUNIT_ASSERT( !pData1->IsDataValid( aCell, ScAddress(2,0,0) ) );
-aCell.assign(*m_pDoc, ScAddress(4,0,0));
-CPPUNIT_ASSERT( !pData2->IsDataValid( aCell, ScAddress(4,0,0) ) );
-}
-
 void Test::testCondFormatInsertDeleteSheets()
 {
 m_pDoc->InsertTab(0, "Test");
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 6085311..b3e5bf3 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -433,7 +433,6 @@ public:
 void testCondFormatINSDEL();
 void testCondFormatInsertRow();
 void testCondFormatInsertCol();
-void testValidity();
 void testCondFormatInsertDeleteSheets();
 void testCondCopyPaste();
 void testCondCopyPasteSingleCell(); //e.g. fdo#82503
@@ -670,7 +669,6 @@ public:
 CPPUNIT_TEST(testCondFormatINSDEL);
 CPPUNIT_TEST(testCondFormatInsertRow);
 CPPUNIT_TEST(testCondFormatInsertCol);
-CPPUNIT_TEST(testValidity);
 CPPUNIT_TEST(testCondFormatInsertDeleteSheets);
 CPPUNIT_TEST(testCondCopyPaste);
 CPPUNIT_TEST(testCondCopyPasteSingleCell);
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index e9cff1e..437434a 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -543,54 +543,7 @@ bool ScValidationData::IsDataValid( ScRefCellValue& rCell, 
const ScAddress& rPos
 OSL_FAIL("not yet done");
 break;
 }
-if (eDataMode == SC_VALID_TIME) {
-// consider only time portion (i.e. decimal)
-double nComp1 = (nVal1 - floor(nVal1));
-double nComp2 = (nVal2 - floor(nVal2));
-double nInVal = (nVal  - floor(nVal ));
-switch (eOp)
-{
-case SC_COND_NONE:
-break;  // Always sal_False
-case SC_COND_EQUAL:
-bOk = ::rtl::math::approxEqual( nInVal, nComp1 );
-break;
-case SC_COND_NOTEQUAL:
-bOk = !::rtl::math::approxEqual( nInVal, nComp1 );
-break;
-case SC_COND_GREATER:
-bOk = ( nInVal > nComp1 ) && !::rtl::math::approxEqual( nInVal, 
nComp1 );
-break;
-case SC_COND_EQGREATER:
-bOk = ( nInVal

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

[rezso]

 bin/distro-install-desktop-integration |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2ec813b4bb8340dea7e4f04cf571a2b2d88a7626
Author: rezso 
Date:   Sat Dec 26 10:51:22 2015 +0100

don't use bash completion compatibility dir

Change-Id: I575f6fc9c1605bb7ec07842928f85c2eeadc72f8
Reviewed-on: https://gerrit.libreoffice.org/20954
Reviewed-by: rezso 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index ed31d5b..e9332aa 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -178,12 +178,12 @@ ln -sf $INSTALLDIR/program/soffice 
$DESTDIR$PREFIXDIR/bin/soffice
 test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" 
>>$DESTDIR/gid_Module_Root_Brand
 
 # create bash completion
-mkdir -p $DESTDIR/etc/bash_completion.d
-./bin/generate-bash-completion bin/bash-completion.in 
$DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR/usr/share/bash-completion/completions
+./bin/generate-bash-completion bin/bash-completion.in 
$DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" 
>>$DESTDIR/gid_Module_Root_Brand
 if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
-./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in 
$DESTDIR/etc/bash_completion.d/ooffice.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
+./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in 
$DESTDIR/usr/share/bash-completion/completions/ooffice.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/usr/share/bash-completion/completions/ooffice.sh" 
>>$DESTDIR/gid_Module_Root_Brand
 fi
 
 echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/configure.ac loolwsd/.gitignore loolwsd/loolwsd-systemplate-setup loolwsd/loolwsd-systemplate-setup.in loolwsd/README

[Henry Castro]

 loolwsd/.gitignore   |1 
 loolwsd/README   |1 
 loolwsd/configure.ac |1 
 loolwsd/loolwsd-systemplate-setup|  123 +++
 loolwsd/loolwsd-systemplate-setup.in |  186 ---
 5 files changed, 123 insertions(+), 189 deletions(-)

New commits:
commit 32745e181b4aa904a65984e1506f65e20df70b65
Author: Henry Castro 
Date:   Tue Jan 5 11:33:00 2016 -0400

loolwsd: remove g++ from loolwsd-sytemplate-setup

diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore
index 2da8030..a50e3e6 100644
--- a/loolwsd/.gitignore
+++ b/loolwsd/.gitignore
@@ -22,7 +22,6 @@
 /test-driver
 /jails
 /loolwsd.spec
-/loolwsd-systemplate-setup
 
 *.o
 *.exe
diff --git a/loolwsd/README b/loolwsd/README
index 4586db0..39550cc 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -71,7 +71,6 @@ Now you need to set up a minimal chroot system, and directory 
for the jails:
 ROOTFORJAILS=`pwd`/jails   # or tweak for your system
 
 rm -Rf ${SYSTEMPLATE} # clean
-chmod +x loolwsd-systemplate-setup
 ./loolwsd-systemplate-setup ${SYSTEMPLATE} ${MASTER}/instdir # build 
template
 mkdir -p ${ROOTFORJAILS} # create location for transient jails.
 
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index c60d958..ed31af7 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -151,7 +151,6 @@ 
AC_DEFINE_UNQUOTED([LOOLWSD_CACHEDIR],["$LOOLWSD_CACHEDIR"],[Cache folder])
 AC_SUBST(LOOLWSD_CACHEDIR)
 
 AC_CONFIG_FILES([Makefile
- loolwsd-systemplate-setup
  test/Makefile
  loolwsd.spec])
 AC_OUTPUT
diff --git a/loolwsd/loolwsd-systemplate-setup.in 
b/loolwsd/loolwsd-systemplate-setup
similarity index 76%
rename from loolwsd/loolwsd-systemplate-setup.in
rename to loolwsd/loolwsd-systemplate-setup
index 6eef947..51dbc36 100755
--- a/loolwsd/loolwsd-systemplate-setup.in
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -105,66 +105,6 @@ cpio -p -d -L $CHROOT
 
 mkdir -p $CHROOT/tmp
 mkdir -p $CHROOT/usr/bin/
-dummy=$CHROOT/usr/bin/dummy
-
-# checking for library containing Poco::Application
-cat <<_ACEOF >$dummy.cpp
-#include 
-#include 
-
-using Poco::Util::Application;
-
-int main ()
-{
-  std::cout << "Poco functionality OK!" << std::endl;
-  return Application::EXIT_OK;
-}
-_ACEOF
-
-gcc_compile='g++ -o $dummy.o -c $dummy.cpp'
-(eval "$gcc_compile") 2>$dummy.err
-
-if ! test $? = 0; then
-  cat $dummy.err;
-  exit 1;
-fi
-
-gcc_link='g++ -o $dummy @LIBS@ $dummy.o'
-(eval "$gcc_link") 2>$dummy.err
-
-if ! test $? = 0; then
-  cat $dummy.err;
-  exit 1;
-fi
-
-lib_poco=$( echo "$dummy" |
-  while read file; do
-ldd $file 2>/dev/null
-  done |
-  grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)')
-
-for lib in $lib_poco
-do
-  cp --parent -n $lib $CHROOT
-
-  libs=$( echo $lib |
-  while read file; do
-ldd $file 2>/dev/null
-  done |
-  grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)')
-
-  for sofile in $libs
-  do
-cp --parent -n $sofile $CHROOT
-  done
-done
-
-loaders="$(find /lib/ld-* -type l) $(find /lib32/ld-* -type l) $(find 
/lib64/ld-* -type l)"
-
-for loader in $loaders
-do
-  cp --parent -n $loader $CHROOT
-done
 
 # /usr/share/fonts needs to be taken care of separately because the
 # directory time stamps must be preserved are for fontconfig to trust
@@ -181,6 +121,3 @@ if [ `uname -s` = Linux ]; then
cp -r -p /usr/share/ghostscript/fonts usr/share/ghostscript
 fi
 fi
-
-echo "testing if Poco libraries were installed properly"
-sudo chroot $CHROOT /usr/bin/dummy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 sw/qa/extras/mailmerge/data/tdf92623.odt|binary
 sw/qa/extras/mailmerge/mailmerge.cxx|   51 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   10 ++-
 3 files changed, 60 insertions(+), 1 deletion(-)

New commits:
commit bdcafdff89836518cb94f362ca7ea4c09a82fa03
Author: Jan-Marek Glogowski 
Date:   Thu Dec 3 23:18:16 2015 +0100

tdf#92623 Handle StartOfContent node for copying bookmarks

For SwDoc::AppendDoc we use the StartOfContent node as the
starting copy node to prevent merging of the first node in
CopyRange and to get a 2nd node needed for CopyRange in case
of single content node documents.

This correctly counts StartOfContent as a non-copy node when
adapting the bookmark ranges for copying.

Change-Id: Ia3ee0328a1be5548f8751aa2240812c4662fb73f
Reviewed-on: https://gerrit.libreoffice.org/20383
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 
(cherry picked from commit 689962feae2054f965a7378c3408b0ccfad2bbd5)

tdf#92623 MM: add unit test

Adds the missing unit test to the bugfix.

Actually the original bug was a crash, so this just
does some test on the resulting MM document.

Change-Id: I4c9f031e57157fe5744aa8290b7503b7e1990fc7
(cherry picked from commit 480e943f0100154fa82942db092ed1f66b76ef66)
Reviewed-on: https://gerrit.libreoffice.org/21076
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/mailmerge/data/tdf92623.odt 
b/sw/qa/extras/mailmerge/data/tdf92623.odt
new file mode 100644
index 000..3dea831
Binary files /dev/null and b/sw/qa/extras/mailmerge/data/tdf92623.odt differ
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 992ddd5..f359809 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -412,5 +412,56 @@ DECLARE_SHELL_MAILMERGE_TEST(testTdf90230, "empty.odt", 
"10-testing-addresses.od
 executeMailMerge();
 }
 
+DECLARE_SHELL_MAILMERGE_TEST(testTdf92623, "tdf92623.odt", 
"10-testing-addresses.ods", "testing-addresses")
+{
+// Copying bookmarks for MM was broken because of the StartOfContent node 
copy
+// copyied marks were off by one
+executeMailMerge();
+
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+IDocumentMarkAccess const *pIDMA = 
pTextDoc->GetDocShell()->GetDoc()->getIDocumentMarkAccess();
+// There is just one mark...
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pIDMA->getAllMarksCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pIDMA->getBookmarksCount());
+IDocumentMarkAccess::const_iterator_t mark = pIDMA->getAllMarksBegin();
+// and it's a TEXT_FIELDMARK
+CPPUNIT_ASSERT_EQUAL( sal_Int32(IDocumentMarkAccess::GetType( **mark )),
+  
sal_Int32(IDocumentMarkAccess::MarkType::TEXT_FIELDMARK ) );
+sal_uLong src_pos = (*mark)->GetMarkPos().nNode.GetIndex();
+
+// Get the size of the document in nodes
+SwDoc *doc = pTextDoc->GetDocShell()->GetDoc();
+sal_uLong size = doc->GetNodes().GetEndOfContent().GetIndex() - 
doc->GetNodes().GetEndOfExtras().GetIndex();
+CPPUNIT_ASSERT_EQUAL( sal_uLong(13), size );
+size -= 2; // For common start and end nodes
+
+// Iterate over all field marks in the target document and check that they
+// are positioned at a multitude of the document size
+SwXTextDocument* pMMTextDoc = dynamic_cast(mxMMComponent.get());
+CPPUNIT_ASSERT(pMMTextDoc);
+pIDMA = pMMTextDoc->GetDocShell()->GetDoc()->getIDocumentMarkAccess();
+// The target document has the duplicated amount of bookmarks
+// as the helping uno bookmark from the mail merge is left in the doc
+// TODO should be fixed!
+CPPUNIT_ASSERT_EQUAL(sal_Int32(20), pIDMA->getAllMarksCount());
+std::set pages;
+sal_Int32 countFieldMarks = 0;
+for( mark = pIDMA->getAllMarksBegin(); mark != pIDMA->getAllMarksEnd(); 
++mark )
+{
+IDocumentMarkAccess::MarkType markType = IDocumentMarkAccess::GetType( 
**mark );
+if( markType == IDocumentMarkAccess::MarkType::TEXT_FIELDMARK )
+{
+sal_uLong pos = (*mark)->GetMarkPos().nNode.GetIndex() - src_pos;
+CPPUNIT_ASSERT_EQUAL(sal_uLong(0), pos % size);
+CPPUNIT_ASSERT(pages.insert(pos).second);
+countFieldMarks++;
+}
+else // see previous TODO
+CPPUNIT_ASSERT_EQUAL( sal_Int32(markType), 
sal_Int32(IDocumentMarkAccess::MarkType::UNO_BOOKMARK) );
+}
+CPPUNIT_ASSERT_EQUAL(sal_Int32(10), countFieldMarks);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index d1d0254..8fdc824 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.c

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

[Stephan Bergmann]

 i18npool/source/localedata/localedata.cxx |   36 --
 1 file changed, 1 insertion(+), 35 deletions(-)

New commits:
commit c83b55564dab042e3fc1889920cbb4db8fe40117
Author: Stephan Bergmann 
Date:   Tue Jan 5 15:41:52 2016 +0100

Use OUString::replaceAll

...instead of a local function using a static (!) buffer, which just cannot 
work
in a multi-threaded environment.

Change-Id: Id28e1c55c32aa2e35cd3c1756f5d392241092a30

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index d685dd5..e91ac3f3 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -816,40 +816,6 @@ LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) 
throw(RuntimeException
 }
 
 
-// return a static (!) string resulting from replacing all occurrences of
-// 'oldStr' string in 'formatCode' string with 'newStr' string
-static const sal_Unicode * replace( sal_Unicode const * const formatCode, 
sal_Unicode const * const oldStr, sal_Unicode const * const newStr)
-{
-// make reasonable assumption of maximum length of formatCode.
-#define MAX_FORMATCODE_LENTH 512
-static sal_Unicode str[MAX_FORMATCODE_LENTH];
-
-if (oldStr[0] == 0) // no replacement requires
-return formatCode;
-
-sal_Int32 i = 0, k = 0;
-while (formatCode[i] > 0 && k < MAX_FORMATCODE_LENTH) {
-sal_Int32 j = 0, last = k;
-// search oldStr in formatCode
-while (formatCode[i] > 0 && oldStr[j] > 0 && k < MAX_FORMATCODE_LENTH) 
{
-str[k++] = formatCode[i];
-if (formatCode[i++] != oldStr[j++])
-break;
-}
-if (oldStr[j] == 0) {
-// matched string found, do replacement
-k = last; j = 0;
-while (newStr[j] > 0 && k < MAX_FORMATCODE_LENTH)
-str[k++] = newStr[j++];
-}
-}
-if (k >= MAX_FORMATCODE_LENTH) // could not complete replacement, return 
original formatCode
-return formatCode;
-
-str[k] = 0;
-return str;
-}
-
 Sequence< FormatElement > SAL_CALL
 LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, 
std::exception)
 {
@@ -886,7 +852,7 @@ LocaleDataImpl::getAllFormats( const Locale& rLocale ) 
throw(RuntimeException, s
 for (int i = 0, nOff = 0; i < section[s].formatCount; ++i, nOff += 
7, ++f)
 {
 FormatElement elem(
-replace( formatArray[nOff], section[s].from, 
section[s].to),
+
OUString(formatArray[nOff]).replaceAll(section[s].from, section[s].to),
 formatArray[nOff + 1],
 formatArray[nOff + 2],
 formatArray[nOff + 3],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 sw/qa/extras/uiwriter/uiwriter.cxx |   97 +
 sw/source/core/txtnode/thints.cxx  |7 +-
 2 files changed, 100 insertions(+), 4 deletions(-)

New commits:
commit e781a8273eb2938f905485c00fbaf432e517d1dc
Author: Jan-Marek Glogowski 
Date:   Wed Dec 30 01:20:23 2015 +0100

tdf#96479 workaround bookmark end pos handling...

... when inserting text into a text node.

Seems SwTextNode::InsertText doesn't handle bookmark end
positions correctly. This is just handled correctly, if it
also contains the bookmark start.

This workaround simply concats the three strings to be
inserted in advance, so we just have to call
SwTextNode::InsertText once for the whole string.

(cherry picked from commit c91024891ff10c2ae01e11a28a9aecca2f36b6c3)

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

Change-Id: Iab7708b4cc4df406bdbc3a685c7410e0e797fdc4

loplugin:stringconstant

Change-Id: I588a9c0205e03f701b617fd1775e7f9b9b88c6b0
(cherry picked from commit 67d440e6bd2c895833fa22d0f9bf5dc6901723e8)

loplugin:stringconstant

Change-Id: I60ee2ccc6090c305ade4ba16d3d298866cf89c4e
(cherry picked from commit 6aa4496c789fec271dcdc7995cf62ef2dabf1f96)
Reviewed-on: https://gerrit.libreoffice.org/21077
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 097b295..a31dc51 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -173,6 +173,7 @@ public:
 void testTdf77014();
 void testTdf92648();
 void testTdf96515();
+void testTdf96479();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -254,6 +255,7 @@ public:
 CPPUNIT_TEST(testTdf77014);
 CPPUNIT_TEST(testTdf92648);
 CPPUNIT_TEST(testTdf96515);
+CPPUNIT_TEST(testTdf96479);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2904,6 +2906,101 @@ void SwUiWriterTest::testTdf96515()
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+void SwUiWriterTest::testTdf96479()
+{
+// We want to verify the empty input text field in the bookmark
+static const OUString emptyInputTextField =
+OUStringLiteral1() + 
OUStringLiteral1();
+
+SwDoc* pDoc = createDoc();
+SwXTextDocument *xTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(xTextDoc);
+
+// So we can clean up all references for reload
+{
+// Append bookmark
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+IDocumentMarkAccess &rIDMA = *pDoc->getIDocumentMarkAccess();
+sw::mark::IMark *pMark =
+rIDMA.makeMark(aPaM, "original", 
IDocumentMarkAccess::MarkType::BOOKMARK);
+CPPUNIT_ASSERT(!pMark->IsExpanded());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount());
+
+// Get helper objects
+uno::Reference 
xBookmarksSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+
+// Create cursor from bookmark
+uno::Reference 
xTextContent(xBookmarksSupplier->getBookmarks()->getByName("original"), 
uno::UNO_QUERY);
+uno::Reference xRange(xTextContent->getAnchor(), 
uno::UNO_QUERY);
+uno::Reference 
xCursor(xRange->getText()->createTextCursorByRange(xRange), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCursor->isCollapsed());
+
+// Remove bookmark
+xRange->getText()->removeTextContent(xTextContent);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rIDMA.getBookmarksCount());
+
+// Insert replacement bookmark
+uno::Reference 
xBookmarkNew(xFactory->createInstance("com.sun.star.text.Bookmark"), 
uno::UNO_QUERY);
+uno::Reference xBookmarkName(xBookmarkNew, 
uno::UNO_QUERY);
+xBookmarkName->setName("replacement");
+CPPUNIT_ASSERT(xCursor->isCollapsed());
+// Force bookmark expansion
+xCursor->getText()->insertString(xCursor, ".", true);
+xCursor->getText()->insertTextContent(xCursor, xBookmarkNew, true);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount());
+auto mark = *(rIDMA.getBookmarksBegin());
+CPPUNIT_ASSERT(mark->IsExpanded());
+
+// Create and insert input textfield with some content
+uno::Reference 
xTextField(xFactory->createInstance("com.sun.star.text.TextField.Input"), 
uno::UNO_QUERY);
+uno::Reference 
xCursorNew(xBookmarkNew->getAnchor()->getText()->createTextCursorByRange(xBookmarkNew->getAnchor()));
+CPPUNIT_ASSERT(!xCursorNew->isCollapsed());
+xCursorNew->getText()->insertTextContent(xCursorNew, xTextField, true);
+xBookmarkNew = 
uno::Reference(xBookmarksSupplier->getBookmarks()->getByName("replacement"),
 uno::UNO_QUERY);
+xCursorNew = 
uno::Reference(xBookmarkNew->getAnchor()->getText()->createTextCur

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - config_host/config_writerperfect.h.in configure.ac writerperfect/qa

[David Tardon]

 config_host/config_writerperfect.h.in   |4 
 configure.ac|3 ++-
 writerperfect/qa/unit/WpftDrawFilterTest.cxx|   13 -
 writerperfect/qa/unit/WpftImportTestBase.hxx|3 +++
 writerperfect/qa/unit/WpftImpressFilterTest.cxx |6 +-
 writerperfect/qa/unit/WpftWriterFilterTest.cxx  |8 +++-
 6 files changed, 33 insertions(+), 4 deletions(-)

New commits:
commit 9930b99f50f72fc593bd7153686440135a99f840
Author: David Tardon 
Date:   Thu Dec 17 14:00:17 2015 +0100

do not require newest libmwaw for build

Change-Id: Ic0f9e47c2128b74deb0a948c1853afb13ae5fd1d
(cherry picked from commit 3fd652b3de435e85d91154352f9a2029fd47b2d4)
Reviewed-on: https://gerrit.libreoffice.org/20939
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/config_host/config_writerperfect.h.in 
b/config_host/config_writerperfect.h.in
index fea81dd..df10014 100644
--- a/config_host/config_writerperfect.h.in
+++ b/config_host/config_writerperfect.h.in
@@ -16,4 +16,8 @@
 #undef ETONYEK_VERSION_MINOR
 #undef ETONYEK_VERSION_MICRO
 
+#undef MWAW_VERSION_MAJOR
+#undef MWAW_VERSION_MINOR
+#undef MWAW_VERSION_MICRO
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 35792a2..5c5eb58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7714,7 +7714,8 @@ 
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 dnl ===
 dnl Check for system libmwaw
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.6])
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.7])
 
 dnl ===
 dnl Check for system libpagemaker
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx 
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 8ae087c..56eebec 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -31,11 +31,22 @@ WpftDrawFilterTest::WpftDrawFilterTest()
 
 void WpftDrawFilterTest::test()
 {
+const writerperfect::test::WpftOptionalMap_t aMWAWOptional
+{
+{"ClarisDraw.hqx", REQUIRE_MWAW_VERSION(0, 3, 5)},
+{"MacDraft_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 5)},
+{"MacDraft_5.5.drw", REQUIRE_MWAW_VERSION(0, 3, 6)},
+{"MacDraw_0.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
+{"MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
+{"MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3)},
+{"MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4)},
+};
+
 doTest("com.sun.star.comp.Draw.CDRImportFilter", 
"/writerperfect/qa/unit/data/draw/libcdr/");
 doTest("com.sun.star.comp.Draw.CMXImportFilter", 
"/writerperfect/qa/unit/data/draw/libcdr-cmx/");
 doTest("com.sun.star.comp.Draw.FreehandImportFilter", 
"/writerperfect/qa/unit/data/draw/libfreehand/");
 doTest("com.sun.star.comp.Draw.MSPUBImportFilter", 
"/writerperfect/qa/unit/data/draw/libmspub/");
-doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter", 
"/writerperfect/qa/unit/data/draw/libmwaw/");
+doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter", 
"/writerperfect/qa/unit/data/draw/libmwaw/", aMWAWOptional);
 doTest("com.sun.star.comp.Draw.VisioImportFilter", 
"/writerperfect/qa/unit/data/draw/libvisio/");
 doTest("com.sun.star.comp.Draw.WPGImportFilter", 
"/writerperfect/qa/unit/data/draw/libwpg/");
 doTest("org.libreoffice.comp.Draw.PageMakerImportFilter", 
"/writerperfect/qa/unit/data/draw/libpagemaker/");
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx 
b/writerperfect/qa/unit/WpftImportTestBase.hxx
index 1d83586..e545103 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.hxx
@@ -32,6 +32,9 @@
 #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
 REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, 
ETONYEK_VERSION_MICRO, major, minor, micro)
 
+#define REQUIRE_MWAW_VERSION(major, minor, micro) \
+REQUIRE_VERSION(MWAW_VERSION_MAJOR, MWAW_VERSION_MINOR, 
MWAW_VERSION_MICRO, major, minor, micro)
+
 namespace com
 {
 namespace sun
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx 
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index ec16a11..579fb9a 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -37,9 +37,13 @@ void WpftImpressFilterTest::test()
 {"v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
 {"v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4)},
 };
+const writerperfect::test::WpftOptionalMap_t aMWAWOptional
+{
+{"ClarisWorks_6.0.cwk", REQUIRE_MWAW_VERSION(0, 3, 3)},
+};
 
 doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", 
"/wr

Re: Odd error on OS X jenkins box

[Michael Stahl]

On 03.01.2016 09:22, Chris Sherlock wrote:
> Hi all, 
> 
> I’m getting the following error on a Mac OS X Jenkins box:
> 
> http://ci.libreoffice.org/job/lo_gerrit_master/9826/Gerrit=Gerrit,Platform=MacOSX/console
> 
> [build CUT] writerperfect_writer
> 
> _RegisterApplication(), FAILED TO establish the default connection to the 
> WindowServer, _CGSDefaultConnection() is NULL.
> 2016-01-03 02:12:14.375 cppunittester[96353:83061014] Couldn't contact spell 
> checker for U.S. English
> 2016-01-03 02:12:16.537 cppunittester[96353:83061045] 
> __agent_connection_block_invoke_2: Connection error - Connection invalid
> redlineFrame.fodt,fdo69893.odt,fdo70807.odt,fdo75110.odt,fdo75898.odt,shape-textbox.odt,shape-textbox.odt,cp171.odt,shape-textbox-vertadjust.odt,shape-textbox-autosize.odt,fdo82191.odt,commented-word.odt,fdo85554.odt,merge-change1.odt,uno-cycle.odt,fdo87448.odt,cp1000115.fodt,tdf90003.odt,tdf83798.odt,tdf90362.fodt,tdf86639.rtf,tdf90883.odt,embedded-data-source.odt,unicodeAltX.odt,draw-anchor-undo.odt,tdf34957.odt,tdf89954.odt,tdf87922.odt,tdf77014.odt,tdf92648.docx,/Users/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/MacOSX/sw/qa/extras/uiwriter/uiwriter.cxx:2968:SwUiWriterTest::testTdf96536
> equality assertion failed
> - Expected: 276
> - Actual  : 266
> 
> /Users/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/MacOSX/sw/qa/extras/uiwriter/uiwriter.cxx:2968:
>  Assertion
> Test name: SwUiWriterTest::testTdf96536
> equality assertion failed
> - Expected: 276
> - Actual  : 266
> 
> Failures !!!
> Run: 83   Failure total: 1   Failures: 1   Errors: 0

it looks like Miklos added a workaround for this on master in commit
af47b54d49355a003deda722b5d0112a7b746485


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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - config_host/config_writerperfect.h.in configure.ac writerperfect/qa

[David Tardon]

 config_host/config_writerperfect.h.in   |4 
 configure.ac|3 ++-
 writerperfect/qa/unit/WpftCalcFilterTest.cxx|7 ++-
 writerperfect/qa/unit/WpftImportTestBase.hxx|3 +++
 writerperfect/qa/unit/WpftImpressFilterTest.cxx |9 -
 writerperfect/qa/unit/WpftWriterFilterTest.cxx  |7 ++-
 6 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 517e2522adcd7d091009bfd9e9f9704374ec02a7
Author: David Tardon 
Date:   Thu Dec 17 13:16:29 2015 +0100

do not require newest libetonyek for build

Change-Id: I6e023cd25a1481dd18e3a16b8756c43dde4560ce
(cherry picked from commit 71f92e9a6959b2b468aa4310633e4785d4bd0ea0)
Reviewed-on: https://gerrit.libreoffice.org/20938
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/config_host/config_writerperfect.h.in 
b/config_host/config_writerperfect.h.in
index 4331b4f..fea81dd 100644
--- a/config_host/config_writerperfect.h.in
+++ b/config_host/config_writerperfect.h.in
@@ -12,4 +12,8 @@
  * version.
  */
 
+#undef ETONYEK_VERSION_MAJOR
+#undef ETONYEK_VERSION_MINOR
+#undef ETONYEK_VERSION_MICRO
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index b5de019..35792a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7688,7 +7688,8 @@ 
libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1])
 dnl ===
 dnl Check for system libetonyek
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.4])
+libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
 
 dnl ===
 dnl Check for system libfreehand
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx 
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 40d1ace..848f7e2 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -31,9 +31,14 @@ WpftCalcFilterTest::WpftCalcFilterTest()
 
 void WpftCalcFilterTest::test()
 {
+const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+{
+{"Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
+};
+
 doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libmwaw/");
 doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libwps/");
-doTest("org.libreoffice.comp.Calc.NumbersImportFilter", 
"/writerperfect/qa/unit/data/calc/libetonyek/");
+doTest("org.libreoffice.comp.Calc.NumbersImportFilter", 
"/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(WpftCalcFilterTest);
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx 
b/writerperfect/qa/unit/WpftImportTestBase.hxx
index 4689f98..1d83586 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.hxx
@@ -29,6 +29,9 @@
 ((minor) > (req_minor) \
  || ((minor) == (req_minor) && ((micro) >= (req_micro)
 
+#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
+REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, 
ETONYEK_VERSION_MICRO, major, minor, micro)
+
 namespace com
 {
 namespace sun
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx 
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 1b5590a..ec16a11 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -31,7 +31,14 @@ WpftImpressFilterTest::WpftImpressFilterTest()
 
 void WpftImpressFilterTest::test()
 {
-doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", 
"/writerperfect/qa/unit/data/impress/libetonyek/");
+const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+{
+{"v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
+{"v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
+{"v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4)},
+};
+
+doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", 
"/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional);
 doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter", 
"/writerperfect/qa/unit/data/impress/libmwaw/");
 }
 
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx 
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index f8f9f85..a72b206 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -31,11 +31,16 @@ WpftWriterFilterTest::WpftWriterFilterTest()
 
 void WpftWriterFilterTest::test()
 {
+const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+{
+{"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
+};
+
 doTest("com.sun.star.co

Re: Build error on branch libreoffice-5-0-4

[Jan Rheinländer]

Hi Jan-Marek,

thank you very much for the hint, the build has now completed successfully.

Jan

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - m4/libo_pkg_version.m4

[David Tardon]

 m4/libo_pkg_version.m4 |   48 
 1 file changed, 48 insertions(+)

New commits:
commit 2b8fd3b5c1ec0400df70e065e794703c78eb63ea
Author: David Tardon 
Date:   Wed Dec 16 17:55:11 2015 +0100

add support for version detection of libs

Change-Id: Id5f84306926b6c28bef0d213aba151d8834b7b2d
(cherry picked from commit bc0f3f0df24b05d749481ca99e5251546611aaf4)
Reviewed-on: https://gerrit.libreoffice.org/20936
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/m4/libo_pkg_version.m4 b/m4/libo_pkg_version.m4
new file mode 100644
index 000..c004b92
--- /dev/null
+++ b/m4/libo_pkg_version.m4
@@ -0,0 +1,48 @@
+dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 
-*-
+#
+# 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/.
+#
+
+m4_define([_libo_define_pkg_version], [
+save_IFS="$IFS"
+IFS=.
+echo "$ver" | while read major minor micro; do
+AC_DEFINE_UNQUOTED([$1_VERSION_MAJOR], [$major])
+AC_DEFINE_UNQUOTED([$1_VERSION_MINOR], [$minor])
+AC_DEFINE_UNQUOTED([$1_VERSION_MICRO], [$micro])
+done
+IFS="$save_IFS"
+])
+
+m4_define([_libo_define_pkg_version_direct], [
+AC_DEFINE([$1_VERSION_MAJOR], [$2])
+AC_DEFINE([$1_VERSION_MINOR], [$3])
+AC_DEFINE([$1_VERSION_MICRO], [$4])
+])
+
+# libo_PKG_VERSION(VARIABLE-STEM, MODULE, BUNDLED-VERSION)
+AC_DEFUN([libo_PKG_VERSION], [
+AS_IF([test -n "$SYSTEM_$1"], [
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+AC_MSG_CHECKING([for $1 version])
+AS_IF([test -n "$PKG_CONFIG"], [
+ver=`$PKG_CONFIG --modversion "$2"`
+AS_IF([test -n "$ver"], [
+AC_MSG_RESULT([$ver])
+_libo_define_pkg_version([$1], [$ver])
+], [
+AC_MSG_ERROR([not found])
+])
+], [
+AC_MSG_ERROR([not found])
+])
+], [
+_libo_define_pkg_version_direct([$1], m4_translit([$3], [.], [,]))
+])
+])
+
+dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 vcl/source/opengl/OpenGLContext.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1fd7994a4ea7daf8bdbf394f4d5cd8f678d00758
Author: Tor Lillqvist 
Date:   Tue Jan 5 16:17:54 2016 +0200

Fix dbgutil build in case GL_DEBUG_SEVERITY_NOTIFICATION_ARB is undefined

Change-Id: I14628e9dee8651e87b4782057c4681fded5e4643

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 5226e34..1dc7d61 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1044,8 +1044,10 @@ void OpenGLContext::InitGLEWDebugging()
 glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
 glDebugMessageCallbackARB(&debug_callback, nullptr);
 
+#ifdef GL_DEBUG_SEVERITY_NOTIFICATION_ARB
 // Ignore i965’s shader compiler notification flood.
 glDebugMessageControlARB(GL_DEBUG_SOURCE_SHADER_COMPILER_ARB, 
GL_DEBUG_TYPE_OTHER_ARB, GL_DEBUG_SEVERITY_NOTIFICATION_ARB, 0, nullptr, true);
+#endif
 }
 else if ( glDebugMessageCallback )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: virus detection with GData

[jan iversen]

> 
> none of these files actually contains a virus, they just have malformed
> content that tend to trigger anti-virus heuristics.
> 
OK I stand corrected, but my proposal is the same, because it still informs 
people, that this is not something to worry about.

rgds
jan i.


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

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

[Tor Lillqvist]

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

New commits:
commit d12dcbcb61b1818c7ea58650fc06bf4aa04057cf
Author: Tor Lillqvist 
Date:   Tue Jan 5 15:29:23 2016 +0200

Avoid indexing out of array bounds

Change-Id: I65022f30e21cb94fc8c653ef8e2797da3746875c

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index fe3297c..7443194 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -282,7 +282,7 @@ bool SplitDriverVersion(const char *aSource, char *aAStr, 
char *aBStr, char *aCS
 
 for (int i = 0; i < len; i++)
 {
-if (destIdx > ArrayLength(dest))
+if (destIdx >= ArrayLength(dest))
 {
 // Invalid format found. Ensure we don't access dest beyond bounds.
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - config_host/config_writerperfect.h.in configure.ac writerperfect/CppunitTest_writerperfect_calc.mk writerperfect/CppunitTest_writerperfect_dr

[David Tardon]

 config_host/config_writerperfect.h.in  |   15 +++
 configure.ac   |1 +
 writerperfect/CppunitTest_writerperfect_calc.mk|1 +
 writerperfect/CppunitTest_writerperfect_draw.mk|1 +
 writerperfect/CppunitTest_writerperfect_impress.mk |1 +
 writerperfect/CppunitTest_writerperfect_writer.mk  |1 +
 writerperfect/qa/unit/WpftImportTestBase.cxx   |   20 
 writerperfect/qa/unit/WpftImportTestBase.hxx   |   14 ++
 8 files changed, 54 insertions(+)

New commits:
commit 88570decb6941e1e4fbea14f120f9ad2cd1c18d1
Author: David Tardon 
Date:   Thu Dec 17 13:06:20 2015 +0100

allow to skip import tests based on library version

That way we don't have to require the newest version for build just to
run tests.

Change-Id: I4f91828a13821b235004ff16a69043d6d43686c1
(cherry picked from commit ddbba41b39399644b1ce7008d8922998446411e7)
Reviewed-on: https://gerrit.libreoffice.org/20937
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/config_host/config_writerperfect.h.in 
b/config_host/config_writerperfect.h.in
new file mode 100644
index 000..4331b4f
--- /dev/null
+++ b/config_host/config_writerperfect.h.in
@@ -0,0 +1,15 @@
+/* -*- 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/.
+ */
+
+/* Configuration for versions of import libraries used by writerperfect.
+ * This is needed to skip test files that are not supported by the used
+ * version.
+ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 15b3fd2..b5de019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12961,6 +12961,7 @@ AC_CONFIG_HEADERS([config_host/config_version.h])
 AC_CONFIG_HEADERS([config_host/config_oauth2.h])
 AC_CONFIG_HEADERS([config_host/config_poppler.h])
 AC_CONFIG_HEADERS([config_host/config_python.h])
+AC_CONFIG_HEADERS([config_host/config_writerperfect.h])
 AC_OUTPUT
 
 if test "$CROSS_COMPILING" = TRUE; then
diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk 
b/writerperfect/CppunitTest_writerperfect_calc.mk
index 75716b3..db0212a 100644
--- a/writerperfect/CppunitTest_writerperfect_calc.mk
+++ b/writerperfect/CppunitTest_writerperfect_calc.mk
@@ -24,6 +24,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,writerperfect_calc,\
cppuhelper \
sal \
test \
+   tl \
ucbhelper \
unotest \
$(gb_UWINAPI) \
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk 
b/writerperfect/CppunitTest_writerperfect_draw.mk
index fac4476..232ef34 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -24,6 +24,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,writerperfect_draw,\
cppuhelper \
sal \
test \
+   tl \
ucbhelper \
unotest \
$(gb_UWINAPI) \
diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk 
b/writerperfect/CppunitTest_writerperfect_impress.mk
index 4da810c..1c3bb7a 100644
--- a/writerperfect/CppunitTest_writerperfect_impress.mk
+++ b/writerperfect/CppunitTest_writerperfect_impress.mk
@@ -24,6 +24,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,writerperfect_impress,\
cppuhelper \
sal \
test \
+   tl \
ucbhelper \
unotest \
$(gb_UWINAPI) \
diff --git a/writerperfect/CppunitTest_writerperfect_writer.mk 
b/writerperfect/CppunitTest_writerperfect_writer.mk
index 0c3e615..ca0ee0a 100644
--- a/writerperfect/CppunitTest_writerperfect_writer.mk
+++ b/writerperfect/CppunitTest_writerperfect_writer.mk
@@ -24,6 +24,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,writerperfect_writer,\
cppuhelper \
sal \
test \
+   tl \
ucbhelper \
unotest \
$(gb_UWINAPI) \
diff --git a/writerperfect/qa/unit/WpftImportTestBase.cxx 
b/writerperfect/qa/unit/WpftImportTestBase.cxx
index 874b4d6..8b66c3b 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.cxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #include "WpftImportTestBase.hxx"
@@ -50,6 +52,7 @@ WpftImportTestBase::WpftImportTestBase(const rtl::OUString 
&rFactoryURL)
 , m_xDesktop()
 , m_xFilter()
 , m_xTypeMap()
+, m_pOptionalMap(nullptr)
 {
 }
 
@@ -75,6 +78,15 @@ void WpftImportTestBase::tearDown()
 bool WpftImportTestBase::load(const OUString &, const OUString &rURL, const 
OUString &,
   SfxFilterFlags, SotClipboardFormatId, unsigned 
int)
 {
+if (m_pOptionalMap)
+{
+// first check if

Re: Hi! New to LibreOfiice

[jan iversen]

Welcome to libreoffice.

I hope you will have a lot of fun being part of our community.

I am helping new people get started, because Libreoffice is quite a big 
program, so it is easy to get confused.

Feel free to write me directly, so I can help you. 

The first thing you need to do is to get LO build on your platform (which is?) 
and then you need to setup gerrit in order to submit patches.

We have a lot of easy tasks for new people, to make it easy to get started.

Have you looked at our wiki ?

looking forward to see your mail.
rgds
jan i.


Sent from my iPad, please excuse any misspellings 

> On 05 Jan 2016, at 13:43, shubham tibra  wrote:
> 
> Hello,
> 
> I would really like to contribute in LibreOffice, but I am new to open source 
> community.
> I can code in C, C++ and I also know little python too.
> 
> Can someone help me get started?
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: virus detection with GData

[Michael Stahl]

On 05.01.2016 15:09, jan iversen wrote:
> 
> 
>> the CVE-* files in the same directory are all encrypted with some dummy
>> password, so that virus scanners don't complain about them.
>>
>> vcl/qa/cppunit/graphicfilter/data/README
>>
>> i've taken the liberty to encrypt these now on master with
>> 18b0343010517daa1eaf52a17ef19564076e1f3a, so you should only get virus
>> warnings when the tests are actually running (because the files will be
>> written unencrypted to temporary files), which can be avoided with
>> --disable-cve-tests.
> 
> Can I suggest we name files, that contain virus especially (like
> CVE-* and VIRUS-*) so that it is obvious that the file contains a "wanted" 
> virus.

none of these files actually contains a virus, they just have malformed
content that tend to trigger anti-virus heuristics.


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

Re: virus detection with GData

[jan iversen]

> the CVE-* files in the same directory are all encrypted with some dummy
> password, so that virus scanners don't complain about them.
> 
> vcl/qa/cppunit/graphicfilter/data/README
> 
> i've taken the liberty to encrypt these now on master with
> 18b0343010517daa1eaf52a17ef19564076e1f3a, so you should only get virus
> warnings when the tests are actually running (because the files will be
> written unencrypted to temporary files), which can be avoided with
> --disable-cve-tests.

Can I suggest we name files, that contain virus especially (like CVE-* and 
VIRUS-*) so that it is obvious that the file contains a "wanted" virus.

rgds
jan i.

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

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

[Justin Luth]

 vcl/source/edit/textview.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5a217ada5e28e17f052ebec8e53dce05c2aa9cae
Author: Justin Luth 
Date:   Mon Dec 28 14:20:53 2015 +0300

tdf#96687 - force validation after External Input

After external input (EndExtTextInput), the selection was marked
as invalid, but bFormatted remained true, so all the functions that
re-evaluated and marked the portion as valid again were skipped
and therefore the invalid portion was not painted.

Change-Id: Ibb2208bdaeb8ed17a4a34fa378a2fc750abf1b07
Reviewed-on: https://gerrit.libreoffice.org/20986
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 78bd880..45cc854 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -931,6 +931,7 @@ void TextView::Command( const CommandEvent& rCEvt )
 delete mpImpl->mpTextEngine->mpIMEInfos;
 mpImpl->mpTextEngine->mpIMEInfos = nullptr;
 
+mpImpl->mpTextEngine->TextModified();
 mpImpl->mpTextEngine->FormatAndUpdate( this );
 
 SetInsertMode( bInsertMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - slideshow/opengl slideshow/Package_opengl.mk slideshow/source vcl/source

[Emmanuel Gil Peyrot]

 slideshow/Package_opengl.mk  |1 
 slideshow/opengl/basicVertexShader.glsl  |   45 ++
 slideshow/opengl/glitterFragmentShader.glsl  |2 
 slideshow/opengl/glitterVertexShader.glsl|   65 
+++-
 slideshow/opengl/reflectionVertexShader.glsl |   45 ++
 slideshow/opengl/rippleFragmentShader.glsl   |   44 ++
 slideshow/opengl/vortexFragmentShader.glsl   |   40 --
 slideshow/opengl/vortexVertexShader.glsl |  153 
+++---
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |   46 ++-
 vcl/source/opengl/OpenGLContext.cxx  |6 
 10 files changed, 333 insertions(+), 114 deletions(-)

New commits:
commit a301da7cb6c562cd21983d9b3b34dc01235a82a5
Author: Emmanuel Gil Peyrot 
Date:   Mon Dec 21 21:25:35 2015 +

slideshow: Define inverse() to bring back the GLSL version to 1.20

Change-Id: Ib0372d6a98734724d99b979f2d01abc1ee317847

diff --git a/slideshow/opengl/basicVertexShader.glsl 
b/slideshow/opengl/basicVertexShader.glsl
index e9febff..730da36 100644
--- a/slideshow/opengl/basicVertexShader.glsl
+++ b/slideshow/opengl/basicVertexShader.glsl
@@ -26,7 +26,7 @@
  *
  /
 
-#version 140
+#version 120
 
 attribute vec3 a_position;
 attribute vec3 a_normal;
@@ -41,6 +41,49 @@ uniform mat4 u_operationsTransformMatrix;
 varying vec2 v_texturePosition;
 varying vec3 v_normal;
 
+#if __VERSION__ < 140
+mat4 inverse(mat4 m)
+{
+float a00 = m[0][0], a01 = m[0][1], a02 = m[0][2], a03 = m[0][3];
+float a10 = m[1][0], a11 = m[1][1], a12 = m[1][2], a13 = m[1][3];
+float a20 = m[2][0], a21 = m[2][1], a22 = m[2][2], a23 = m[2][3];
+float a30 = m[3][0], a31 = m[3][1], a32 = m[3][2], a33 = m[3][3];
+
+float b00 = a00 * a11 - a01 * a10;
+float b01 = a00 * a12 - a02 * a10;
+float b02 = a00 * a13 - a03 * a10;
+float b03 = a01 * a12 - a02 * a11;
+float b04 = a01 * a13 - a03 * a11;
+float b05 = a02 * a13 - a03 * a12;
+float b06 = a20 * a31 - a21 * a30;
+float b07 = a20 * a32 - a22 * a30;
+float b08 = a20 * a33 - a23 * a30;
+float b09 = a21 * a32 - a22 * a31;
+float b10 = a21 * a33 - a23 * a31;
+float b11 = a22 * a33 - a23 * a32;
+
+float det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + 
b05 * b06;
+
+return mat4(
+a11 * b11 - a12 * b10 + a13 * b09,
+a02 * b10 - a01 * b11 - a03 * b09,
+a31 * b05 - a32 * b04 + a33 * b03,
+a22 * b04 - a21 * b05 - a23 * b03,
+a12 * b08 - a10 * b11 - a13 * b07,
+a00 * b11 - a02 * b08 + a03 * b07,
+a32 * b02 - a30 * b05 - a33 * b01,
+a20 * b05 - a22 * b02 + a23 * b01,
+a10 * b10 - a11 * b08 + a13 * b06,
+a01 * b08 - a00 * b10 - a03 * b06,
+a30 * b04 - a31 * b02 + a33 * b00,
+a21 * b02 - a20 * b04 - a23 * b00,
+a11 * b07 - a10 * b09 - a12 * b06,
+a00 * b09 - a01 * b07 + a02 * b06,
+a31 * b01 - a30 * b03 - a32 * b00,
+a20 * b03 - a21 * b01 + a22 * b00) / det;
+}
+#endif
+
 void main( void )
 {
 mat4 modelViewMatrix = u_modelViewMatrix * u_operationsTransformMatrix * 
u_sceneTransformMatrix * u_primitiveTransformMatrix;
diff --git a/slideshow/opengl/glitterFragmentShader.glsl 
b/slideshow/opengl/glitterFragmentShader.glsl
index 1bec201..7188174 100644
--- a/slideshow/opengl/glitterFragmentShader.glsl
+++ b/slideshow/opengl/glitterFragmentShader.glsl
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#version 130
+#version 120
 
 #define M_PI 3.1415926535897932384626433832795
 
diff --git a/slideshow/opengl/glitterVertexShader.glsl 
b/slideshow/opengl/glitterVertexShader.glsl
index 64bb6de..3704efd 100644
--- a/slideshow/opengl/glitterVertexShader.glsl
+++ b/slideshow/opengl/glitterVertexShader.glsl
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#version 140
+#version 120
 
 #define M_PI 3.1415926535897932384626433832795
 
@@ -29,6 +29,49 @@ uniform ivec2 numTiles;
 uniform sampler2D permTexture;
 varying float angle;
 
+#if __VERSION__ < 140
+mat4 inverse(mat4 m)
+{
+float a00 = m[0][0], a01 = m[0][1], a02 = m[0][2], a03 = m[0][3];
+float a10 = m[1][0], a11 = m[1][1], a12 = m[1][2], a13 = m[1][3];
+float a20 = m[2][0], a21 = m[2][1], a22 = m[2][2], a23 = m[2][3];
+float a30 = m[3][0], a31 = m[3][1], a32 = m[3][2], a33 = m[3][3];
+
+float b00 = a00 * a11 - a01 * a10;
+float b01 = a00 * a12 - a02 * a10;
+float b02 = a00 * a13 - a03 * a10;
+float b03 = a01 * a12 - a02 * a11;
+float b04 = a01 * a13 - a03 * a11;
+float b05 = a02 * a13 - a03 * a12;
+float b06 = a20 * a31 - a21 * a30;
+float b07 = a20 * a32 - a22 * a30;
+f

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

[Michael Stahl]

 sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml|6 ++
 sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml|6 ++
 sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml|6 ++
 sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml |6 ++
 sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml  |6 ++
 5 files changed, 30 insertions(+)

New commits:
commit 6cf31f69b41b7155a208362f0d913f854fa70c43
Author: Michael Stahl 
Date:   Tue Jan 5 14:52:24 2016 +0100

sysui: also add `HighContrast` and `UserDocs` to AppData

Change-Id: I204cdb190d9d505551fb3f7b77046dd171b94290

diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 7795001..7b9e857 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -34,6 +34,8 @@ to connect to virtually any other existing database engine as 
well.
 libreoffice_at_lists.freedesktop.org
 
   HiDpiIcon
+  HighContrast
   ModernToolkit
+  UserDocs
 
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index 6685911..c49a198 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -27,6 +27,8 @@ worrying about compatibility.
 libreoffice_at_lists.freedesktop.org
 
   HiDpiIcon
+  HighContrast
   ModernToolkit
+  UserDocs
 
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index bbeac47..0b43c4a 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -33,6 +33,8 @@ worrying about compatibility.
 libreoffice_at_lists.freedesktop.org
 
   HiDpiIcon
+  HighContrast
   ModernToolkit
+  UserDocs
 
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index ca61e38..e12ecc1 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -28,6 +28,8 @@ worrying about compatibility.
 libreoffice_at_lists.freedesktop.org
 
   HiDpiIcon
+  HighContrast
   ModernToolkit
+  UserDocs
 
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
index 5830057..63dff95 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -35,6 +35,8 @@ worrying about compatibility.
 libreoffice_at_lists.freedesktop.org
 
   HiDpiIcon
+  HighContrast
   ModernToolkit
+  UserDocs
 
 
commit c7fee34686d22d164dd1f42f9d68c53832011d0f
Author: Richard Hughes 
Date:   Tue Jan 5 14:42:45 2016 +0100

sysui: add "kudos" to AppData files

Change-Id: I36cf0a8aa2f501fa30d86de35ae083e78ce0904b

diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 0257878..7795001 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -32,4 +32,8 @@ to connect to virtually any other existing database engine as 
well.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  ModernToolkit
+
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index 836f100..6685911 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -25,4 +25,8 @@ worrying about compatibility.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  ModernToolkit
+
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index 4888653..bbeac47 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -31,4 +31,8 @@ worrying about compatibility.
 
 The Document Foundation
 libreoffice_at_lists.freedesktop.org
+
+  HiDpiIcon
+  ModernToolkit
+
 
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index 6174a0865..ca61e38 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -26,4 +26,8 @@ worrying about compatibility.
 
 The Document Foundation
 libr

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

[Miklos Vajna]

 xmlsecurity/inc/xmlsecurity/sigstruct.hxx  |   13 +-
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |9 +
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |4 
 xmlsecurity/source/helper/xsecctl.cxx  |4 
 xmlsecurity/source/helper/xsecctl.hxx  |2 
 xmlsecurity/source/helper/xsecparser.cxx   |  106 -
 xmlsecurity/source/helper/xsecsign.cxx |6 
 xmlsecurity/source/helper/xsecverify.cxx   |6 
 xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |   13 ++
 9 files changed, 92 insertions(+), 71 deletions(-)

New commits:
commit 59269d02adcfc3b892438c3ba7ad18eba1be36ce
Author: Miklos Vajna 
Date:   Tue Jan 5 14:39:00 2016 +0100

xmlsecurity: show signature description in DigitalSignaturesDialog

Change-Id: Ic98c731eb381ee3b6ff198381b63e48b786e3fe6

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index f1928c8..872cd90 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -201,11 +201,13 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
 m_pSignaturesLB = VclPtr::Create(*pSignatures);
 // #i48253# the tablistbox needs its own unique id
 m_pSignaturesLB->Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG );
-static long aTabs[] = { 4, 0, 6*nControlWidth/100, 36*nControlWidth/100, 
74*nControlWidth/100 };
+// Give the first column 6 percent, try to distribute the rest equally.
+static long aTabs[] = { 5, 0, 6*nControlWidth/100, 30*nControlWidth/100, 
54*nControlWidth/100, 78*nControlWidth/100 };
 m_pSignaturesLB->SetTabs(aTabs);
 
 m_pSignaturesLB->InsertHeaderEntry("\t" + 
get("signed")->GetText() + "\t"
-   + get("issued")->GetText() + "\t" + 
get("date")->GetText());
+   + get("issued")->GetText() + "\t" + 
get("date")->GetText() + "\t"
+   + get("description")->GetText());
 
 mbVerifySignatures = true;
 mbSignaturesChanged = false;
@@ -618,6 +620,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 OUString aSubject;
 OUString aIssuer;
 OUString aDateTimeStr;
+OUString aDescription;
 
 bool bSigValid = false;
 bool bCertValid = false;
@@ -641,6 +644,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 aIssuer = XmlSec::GetContentPart( xCert->getIssuerName() );
 // String with date and time information (#i20172#)
 aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime );
+aDescription = rInfo.ouDescription;
 }
 bSigValid = ( rInfo.nStatus == 
::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
 
@@ -687,6 +691,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 m_pSignaturesLB->SetEntryText( aSubject, pEntry, 1 );
 m_pSignaturesLB->SetEntryText( aIssuer, pEntry, 2 );
 m_pSignaturesLB->SetEntryText( aDateTimeStr, pEntry, 3 );
+m_pSignaturesLB->SetEntryText(aDescription, pEntry, 4);
 pEntry->SetUserData( reinterpret_cast(n) ); // missuse 
user data as index
 }
 }
diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui 
b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
index f5b7d73..4eebb5e 100644
--- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
+++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
@@ -192,6 +192,19 @@
 1
   
 
+
+  
+True
+False
+Description
+  
+  
+3
+0
+1
+1
+  
+
   
   
 0
commit ee2b08ed8a1a6a588b01d6c5e845fc92c651af5d
Author: Miklos Vajna 
Date:   Tue Jan 5 10:38:39 2016 +0100

xmlsecurity: convert TYPE_...__REFERENCE constants to scoped enum

Change-Id: Ic2248b3bc6460e65bdf4eb30af4f8893a7f0e68d

diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx 
b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
index ea0e0f3..f798b3b 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
@@ -29,17 +29,20 @@
 /*
  * type of reference
  */
-#define TYPE_SAMEDOCUMENT_REFERENCE 1
-#define TYPE_BINARYSTREAM_REFERENCE 2
-#define TYPE_XMLSTREAM_REFERENCE3
+enum class SignatureReferenceType
+{
+SAMEDOCUMENT = 1,
+BINARYSTREAM = 2,
+XMLSTREAM = 3
+};
 
 struct SignatureReferenceInformation
 {
-sal_Int32  nType;
+SignatureReferenceType  nType;
 OUString   ouURI;
 OUString   ouDigestValue;
 
-SignatureReferenceInfor

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 3 commits - formula/source include/formula sc/qa

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx|   26 +
 formula/source/core/api/token.cxx  |   58 +
 include/formula/tokenarray.hxx |   16 +
 sc/qa/unit/data/contentCSV/date-time-functions.csv |2 
 4 files changed, 100 insertions(+), 2 deletions(-)

New commits:
commit 63931f25785e25368ee808f4e0e269f91c99d0e6
Author: Eike Rathke 
Date:   Tue Jan 5 14:16:27 2016 +0100

tdf#96198 adapt unit test to reality, tdf#50950 follow-up

* old WEEKNUM(date,1) (saved as ISOWEEKNUM(date,1)) now results in
  Err:504 because there is no match to convert to.

* old WEEKNUM(date,2) (saved as ISOWEEKNUM(date,2)) is now converted to
  ISOWEEKNUM(date) and for the sample date 1995-01-01 week 52 is the
  correct result, the test case erroneously tested against week 1
  because the implementation of the now current WEEKNUM(date,2) was
  wrong and even if now right doesn't match the calculation of the ISO
  week.

Change-Id: Ia6940fce1f97639ea9b04f05172a64eb46b65635
(cherry picked from commit 1efc41a87e2b9491b2a7471b1154a4d586a21c37)

diff --git a/sc/qa/unit/data/contentCSV/date-time-functions.csv 
b/sc/qa/unit/data/contentCSV/date-time-functions.csv
index 33aa540..a9e3ddd 100644
--- a/sc/qa/unit/data/contentCSV/date-time-functions.csv
+++ b/sc/qa/unit/data/contentCSV/date-time-functions.csv
@@ -21,7 +21,7 @@
 4,3,4
 52
 1,1,52
-1,1
+Err:504,52
 52
 10,11
 52,52
commit a7c0dcf6cf7c25420c0ea804e878861f1ba39206
Author: Michael Meeks 
Date:   Tue Jan 5 12:44:41 2016 +

formula: add missing algorithm include for std::min.

Change-Id: Ica344a8f1351826e53c109ef49f80e4b022a0364
(cherry picked from commit 15494f0f99d1cf6f75e8c2996377b242af247bbf)

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 65211f3..53bc620 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
commit 3e5deb8ccfaf0b73fb6cf394822e560dc036a686
Author: Eike Rathke 
Date:   Tue Jan 5 11:54:32 2016 +0100

tdf#96198 detect old ISO/WEEKNUM usage with two arguments, tdf#50950 
follow-up

5.0 and earlier implemented WEEKNUM(date,mode) with mode!=1 such that
effectively an ISO 8601 week number was calculated. WEEKNUM was wrongly
saved as ISOWEEKNUM (even with two parameters though it is defined to
have only one) so that when reading it we can try to detect a literal
double argument for mode and if it is not 1 remove it to keep
ISOWEEKNUM(date) instead of calling WEEKNUM(date,mode) which wouldn't
match.

A further change to 5.0 to accept also only one parameter in
WEEKNUM(date) and for this default the mode to not 1 for ISO week will
yield forward compatibility.

Change-Id: I88de7dd809d69b6826a190505d2a1dd3fe79c90b
(cherry picked from commit 2f79244cb3fcc4cbfd2b818380ea9d62b49aaade)

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index c4ca443..457beee 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1271,6 +1271,7 @@ void FormulaCompiler::Factor()
 else
 SetError( errPairExpected);
 sal_uInt8 nSepCount = 0;
+const sal_uInt16 nSepPos = pArr->nIndex - 1;// separator 
position, if any
 if( !bNoParam )
 {
 nSepCount++;
@@ -1289,7 +1290,30 @@ void FormulaCompiler::Factor()
 pFacToken->SetByte( nSepCount );
 if (nSepCount == 2)
 {
-pFacToken->NewOpCode( ocWeek, 
FormulaToken::PrivateAccess());
+// An old mode!=1 indicates ISO week, remove argument if
+// literal double value and keep function. Anything else
+// can not be resolved, there exists no "like ISO but week
+// starts on Sunday" mode in WEEKNUM and for an expression
+// we can't determine, so let ISOWEEKNUM generate an error
+// for two arguments in these cases.
+if (pc >= 2 && pArr->nIndex == nSepPos + 3 &&
+pArr->pCode[nSepPos+1]->GetType() == svDouble &&
+pArr->pCode[nSepPos+1]->GetDouble() != 1.0 &&
+pArr->RemoveToken( nSepPos, 2) == 2)
+{
+// Remove the ocPush/svDouble just removed also from
+// the compiler local RPN array.
+--pCode, --pc;
+(*pCode)->DecRef(); // may be dead now
+pFacToken->SetByte( nSepCount - 1 );
+}
+else
+{
+  

[Bug 91065] Title of Document Properties dialog cannot be localized adequately

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=91065

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

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

tdf#91065 Support localization of Properties dialog title

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

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

[Bug 91065] Title of Document Properties dialog cannot be localized adequately

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=91065

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|| target:5.2.0

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

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

[Arul]

 sfx2/source/dialog/dinfdlg.cxx   |8 
 sfx2/uiconfig/ui/documentpropertiesdialog.ui |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 804e2403cd077a069372ead548fa6a5c593db1f6
Author: Arul 
Date:   Tue Jan 5 15:41:26 2016 +0530

tdf#91065 Support localization of Properties dialog title

Having a place holder for substituting the file name instead of 
concatenating it in
Properties dialogue title.

Change-Id: I8b3bafbc95c857fa5957bfdafbded5dde94e0e64
Reviewed-on: https://gerrit.libreoffice.org/21107
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0cb152f..75e03a5 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1208,18 +1208,18 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( 
vcl::Window* pParent,
 {
 OUString aLastName( aURL.GetLastName() );
 if ( !aLastName.isEmpty() )
-aTitle += aLastName;
+aTitle = aTitle.replaceFirst("%1", aLastName);
 else
-aTitle += aFile;
+aTitle = aTitle.replaceFirst("%1", aFile);
 }
 else
-aTitle += SfxResId( STR_NONAME ).toString();
+aTitle = aTitle.replaceFirst("%1", SfxResId( STR_NONAME 
).toString());
 }
 else
 {
 DBG_ASSERT( dynamic_cast(pItem) != nullptr,
 "SfxDocumentInfoDialog: expected" );
-aTitle += static_cast(pItem)->GetValue();
+aTitle = aTitle.replaceFirst("%1", static_cast(pItem)->GetValue());
 }
 SetText( aTitle );
 
diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui 
b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
index 88cf755..54890cc 100644
--- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui
+++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
@@ -5,7 +5,7 @@
   
 False
 6
-Properties of 
+Properties of %1
 False
 dialog
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/inc accessibility/source android/source avmedia/source basctl/source basebmp/source basegfx/source basic/source Makefile.in

[Andrea Gelmini]

 Makefile.in   |2 +-
 accessibility/inc/accessibility/helper/accresmgr.hxx  |2 +-
 accessibility/source/extended/AccessibleGridControl.cxx   |2 +-
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |4 
++--
 android/source/src/java/org/mozilla/gecko/gfx/Axis.java   |2 +-
 avmedia/source/gstreamer/gstplayer.cxx|2 +-
 basctl/source/basicide/baside2b.cxx   |4 
++--
 basctl/source/basicide/macrodlg.cxx   |2 +-
 basebmp/source/bitmapdevice.cxx   |2 +-
 basegfx/source/curve/b2dcubicbezier.cxx   |2 +-
 basegfx/source/matrix/b3dhommatrix.cxx|2 +-
 basegfx/source/polygon/b2dpolygonclipper.cxx  |4 
++--
 basegfx/source/polygon/b2dtrapezoid.cxx   |2 +-
 basegfx/source/polygon/b3dpolygontools.cxx|2 +-
 basegfx/source/raster/rasterconvert3d.cxx |2 +-
 basic/source/runtime/runtime.cxx  |2 +-
 16 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit fbec6ac08999a36664571dc0b1eba3ba251a5984
Author: Andrea Gelmini 
Date:   Mon Jan 4 12:22:58 2016 +0100

Fix typos

Change-Id: I3fba2c76c83381eb398c80947ef4849bccf7ab27
Reviewed-on: https://gerrit.libreoffice.org/21078
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/Makefile.in b/Makefile.in
index 51a2e61..3bfd09f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -206,7 +206,7 @@ get-submodules:
 ifneq ($(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git),$(wildcard $(foreach 
i,$(GIT_NEEDED_SUBMODULES),$(i)/.git)))
cd $(SRCDIR) && ./g -f clone
 endif
-   @cd $(SRCDIR) && ./g -z # make sure the git hooks are in place enen if 
no submodules are needed
+   @cd $(SRCDIR) && ./g -z # make sure the git hooks are in place even if 
no submodules are needed
 
 else # these sources are from a tarball, so get the other source tarballs
 gb_LO_VER := $(shell . $(SRCDIR)/sources.ver && echo $$lo_sources_ver)
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx 
b/accessibility/inc/accessibility/helper/accresmgr.hxx
index 311fb16..9e27881 100644
--- a/accessibility/inc/accessibility/helper/accresmgr.hxx
+++ b/accessibility/inc/accessibility/helper/accresmgr.hxx
@@ -42,7 +42,7 @@ private:
 ~TkResMgr() { }
 
 // we'll instantiate one static member of the following class,
-// which in it's dtor ensures that m_pImpl will be deleted
+// which in its dtor ensures that m_pImpl will be deleted
 class EnsureDelete
 {
 public:
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx 
b/accessibility/source/extended/AccessibleGridControl.cxx
index 98e3b28..c1e81e9 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -307,7 +307,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 
nChildIndex )
 AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
 {
 Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
-OSL_ENSURE( xCreator.is(), 
"accessibility/extended/AccessibleGirdControl::createAccessibleTable: my 
creator died - how this?" );
+OSL_ENSURE( xCreator.is(), 
"accessibility/extended/AccessibleGridControl::createAccessibleTable: my 
creator died - how this?" );
 return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
 }
 
diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 29229e1..148a98c 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -533,7 +533,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements ActionBa
 startActivity(new Intent(getApplicationContext(), 
SettingsActivity.class));
 return true;
 case R.id.menu_storage_preferences:
-startActivity(new Intent(this, 
DocumentProviderSettingsActivity.class));;
+startActivity(new Intent(this, 
DocumentProviderSettingsActivity.class));
 break;
 
 default:
@@ -617,7 +617,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements ActionBa
 
 Log.d(LOGTAG, currentDirectory.toString() + 
Integer.toString(filterMode) + Integer.toString(viewMode));
 //prefs.edit().putInt(EXPLORER_VIEW_TYPE, viewType).commit();
-Log.d(LOGTAG, "savedInstanceSate");
+Log.d(LOGTAG, "savedInstanceState");
 }

[Libreoffice-commits] online.git: loolwsd/loolwsd.spec.in

[Andras Timar]

 loolwsd/loolwsd.spec.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0902a21a5e852ba90fe0b7a50eb88757ff32fdd8
Author: Andras Timar 
Date:   Tue Jan 5 14:33:11 2016 +0100

loolwsd: setcap loolbroker

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 6bb3090..8bb1122 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -67,6 +67,7 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 
 %post
 setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolbroker
 
 getent group %{group} >/dev/null || groupadd -r %{group}
 getent passwd %{owner} >/dev/null || useradd -g %{group} -r %{owner}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/qa/unit/data/contentCSV/date-time-functions.csv |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1efc41a87e2b9491b2a7471b1154a4d586a21c37
Author: Eike Rathke 
Date:   Tue Jan 5 14:16:27 2016 +0100

tdf#96198 adapt unit test to reality, tdf#50950 follow-up

* old WEEKNUM(date,1) (saved as ISOWEEKNUM(date,1)) now results in
  Err:504 because there is no match to convert to.

* old WEEKNUM(date,2) (saved as ISOWEEKNUM(date,2)) is now converted to
  ISOWEEKNUM(date) and for the sample date 1995-01-01 week 52 is the
  correct result, the test case erroneously tested against week 1
  because the implementation of the now current WEEKNUM(date,2) was
  wrong and even if now right doesn't match the calculation of the ISO
  week.

Change-Id: Ia6940fce1f97639ea9b04f05172a64eb46b65635

diff --git a/sc/qa/unit/data/contentCSV/date-time-functions.csv 
b/sc/qa/unit/data/contentCSV/date-time-functions.csv
index 33aa540..a9e3ddd 100644
--- a/sc/qa/unit/data/contentCSV/date-time-functions.csv
+++ b/sc/qa/unit/data/contentCSV/date-time-functions.csv
@@ -21,7 +21,7 @@
 4,3,4
 52
 1,1,52
-1,1
+Err:504,52
 52
 10,11
 52,52
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/text/blink.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eb4f15d704f9506b4a0d7a8e6d4f650d9f3dd26c
Author: Michael Stahl 
Date:   Tue Jan 5 14:14:56 2016 +0100

sw: revert use of invalid (erased) iterator

(regression from commit d75b9fd582f0aa83bd2fc99028b3f83eb7171d61)

Change-Id: I6e67ebfbac20b42c0ff8580b575793daec46b68d

diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index e17a760..9588973 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -23,7 +23,7 @@
 #include "blink.hxx"
 #include "porlin.hxx"
 #include "porlay.hxx"
-#include 
+
 // Visible time
 #define BLINK_ON_TIME   2400L
 // Invisible time
@@ -147,8 +147,9 @@ void SwBlink::Replace( const SwLinePortion* pOld, const 
SwLinePortion* pNew )
 SwBlinkSet::iterator it = m_List.find( pBlinkPortion );
 if (it != m_List.end())
 {
+std::unique_ptr pTmp(new SwBlinkPortion(it->get(), 
pNew));
 m_List.erase( it );
-m_List.insert(o3tl::make_unique(it->get(), pNew));
+m_List.insert(std::move(pTmp));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/generic/print/genpspgraphics.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09442a04624cd09f7c693cd7e64e0259f17b2d6b
Author: Stephan Bergmann 
Date:   Tue Jan 5 14:17:38 2016 +0100

Remove unnecessary cast

Change-Id: I5b9bb5231d65beb0ac5c98973a33f1cb369f0649

diff --git a/vcl/generic/print/genpspgraphics.cxx 
b/vcl/generic/print/genpspgraphics.cxx
index 096536a..a6e1e83 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -921,7 +921,7 @@ void GenPspGraphics::GetFontAttributes( ImplFontAttributes 
*pFontAttributes, int
 if (rMgr.getFontInfo (m_pPrinterGfx->GetFontID(), aInfo))
 {
 ImplFontAttributes aDFA = Info2FontAttributes( aInfo );
-static_cast(*pFontAttributes) = aDFA;
+*pFontAttributes = aDFA;
 pFontAttributes->SetBuiltInFontFlag( aDFA.IsBuiltInFont() );
 pFontAttributes->SetScalableFlag( true );
 pFontAttributes->SetTrueTypeFlag( false ); // FIXME, needed?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/outdev.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit e0632e1063d5ce9877c3b81835759046c99b1eee
Author: Stephan Bergmann 
Date:   Tue Jan 5 14:17:16 2016 +0100

Remove unused forward decls

Change-Id: I6486916a189d102a8f794daa8084d9857fad35de

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0438523..53755d2 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -88,13 +88,11 @@ class AlphaMask;
 class FontCharMap;
 class SalLayout;
 class ImplLayoutArgs;
-class ImplFontAttributes;
 class VirtualDevice;
 struct SalTwoRect;
 class VirtualDevice;
 class Printer;
 class FontSelectPattern;
-class ImplFontAttributes;
 class VCLXGraphics;
 class OutDevStateStack;
 struct BitmapSystemData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

tdf#96482 (5.0.4 regression introduced in fix of tdf#94069) [was: minutes of ESC call ...]

[Lionel Elie Mamane]

On Thu, Dec 17, 2015 at 05:18:05PM +, Michael Meeks wrote:

> + 5.0.4 - released as final today.
> + dbaccess / table control columns editing - not delayed for it.
> + fix lost in the sea of master; needs to be identified and 
> cherry-picked into 5.0.5

Caolan, as mentioned in
https://bugs.documentfoundation.org/show_bug.cgi?id=96482#c5
I think you have the best clue which commit in "the sea of master" is
involved here.

Are you / will you be on it?

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

[Bug 96059] Cleanup: Replace imageproducer with CommandInfoProvider

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96059

Susobhan Ghosh  changed:

   What|Removed |Added

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

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

[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp

[Henry Castro]

 loolwsd/LOOLBroker.cpp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fe3b4fc9a48a6caa36ccaffc739e6a40ec7c3832
Author: Henry Castro 
Date:   Tue Jan 5 08:51:05 2016 -0400

loolwsd: when no available child sessions, pre spawns more children

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index e94d6c3..1ec6ea3 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -67,6 +67,7 @@ static int readerBroker = -1;
 
 static unsigned int forkCounter = 0;
 static unsigned int childCounter = 0;
+static unsigned int numPreSpawnedChildren = 0;
 
 static std::mutex forkMutex;
 static std::map _childProcesses;
@@ -307,8 +308,8 @@ public:
 }
 else
 {
-Log::info("No children available, creating a new one.");
-forkCounter++;
+Log::info("No children available, creating [" + 
std::to_string(numPreSpawnedChildren) + "] childs");
+forkCounter = numPreSpawnedChildren;
 }
 }
 }
@@ -531,7 +532,6 @@ int main(int argc, char** argv)
 std::string loSubPath;
 std::string sysTemplate;
 std::string loTemplate;
-int numPreSpawnedChildren = 0;
 
 for (int i = 0; i < argc; ++i)
 {
@@ -772,10 +772,10 @@ int main(int argc, char** argv)
 else if (pid < 0)
 Log::error("Error: Child error.");
 
-if ( forkCounter > 0 )
+if (forkCounter > 0)
 {
 forkMutex.lock();
-forkCounter -= 1;
+forkCounter--;
 
 if (createLibreOfficeKit(sharePages, loSubPath, childId) < 0)
 Log::error("Error: fork falied.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Hi! New to LibreOfiice

[shubham tibra]

Hello,

I would really like to contribute in LibreOffice, but I am new to open
source community.
I can code in C, C++ and I also know little python too.

Can someone help me get started?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: virus detection with GData

[Michael Stahl]

On 28.12.2015 22:06, Markus Mohrhard wrote:
> Hey,
> 
> On Mon, Dec 28, 2015 at 9:57 PM, Regina Henschel
> mailto:rb.hensc...@t-online.de>> wrote:
> 
> Hi all,
> 
> I get a virus detection from scanner GData on the files
> crash-1.tiff and hang-7.tiff in filter\qa\cppunit\data\tiff\fail,
> both Exploit.CVE-2015-5097-Gen
> 
> and a suspected virus on the file hang-3.wmf in
> vcl\qa\cppunit\graphicfilter\data\wmf\fail\ with
> Exploit.Win32.MS04-032.Gen
> 
> 
> you can safely ignore these reports. Our */qa directories contain a
> number of files that are detected by various virus scanners. The files
> are there to prevent regressions with security issues.

it looks like the hang-*.tiff and hang-*.wmf are not encrypted.

the CVE-* files in the same directory are all encrypted with some dummy
password, so that virus scanners don't complain about them.

vcl/qa/cppunit/graphicfilter/data/README

i've taken the liberty to encrypt these now on master with
18b0343010517daa1eaf52a17ef19564076e1f3a, so you should only get virus
warnings when the tests are actually running (because the files will be
written unencrypted to temporary files), which can be avoided with
--disable-cve-tests.



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

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

[Michael Stahl]

 dev/null  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-4.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-5.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-6.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-7.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-8.tiff  |binary
 filter/qa/cppunit/data/tiff/fail/RC4-hang-9.tiff  |binary
 unotest/source/cpp/filters-test.cxx   |3 ++-
 vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-1.wmf |binary
 vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-2.wmf |binary
 vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-3.wmf |5 +
 vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-4.wmf |3 +++
 23 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 18b0343010517daa1eaf52a17ef19564076e1f3a
Author: Michael Stahl 
Date:   Tue Jan 5 13:21:14 2016 +0100

RC4 encrypt some WMF and TIFF test files

Reportedly some virus scanners warn about some of these files.

Use a new "RC4" name prefix since the files don't come from external
sources.


http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/69200

Change-Id: I6d4cff2fdd5c0134bf2c77558ea09b3196b39be9

diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff
new file mode 100644
index 000..9e9d192
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff
new file mode 100644
index 000..8aaede4
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff
new file mode 100644
index 000..712e780
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff
new file mode 100644
index 000..7c5402e
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff
new file mode 100644
index 000..97433c3
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff
new file mode 100644
index 000..2b2846d
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff
new file mode 100644
index 000..0ca75a0
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff
new file mode 100644
index 000..5b5b72d
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff
new file mode 100644
index 000..ad722fc
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff
new file mode 100644
index 000..9924b38
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff
new file mode 100644
index 000..8de41b5
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff 
differ
diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-4.tiff 
b/filter/qa/cppunit/data/tiff/fail/RC4-hang-4.tiff
new file mode 100644
index 000..e51e391
Binary files /dev/null and b/filter/qa/cppun

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

[Michael Meeks]

 formula/source/core/api/token.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 15494f0f99d1cf6f75e8c2996377b242af247bbf
Author: Michael Meeks 
Date:   Tue Jan 5 12:44:41 2016 +

formula: add missing algorithm include for std::min.

Change-Id: Ica344a8f1351826e53c109ef49f80e4b022a0364

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 65211f3..53bc620 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Two svg import filters

[Jan Holesovsky]

Hi Armin,

Armin Le Grand píše v St 23. 12. 2015 v 10:04 +0100:

> > I would have thought the difference between "open" and "insert" was 
> > pretty clear (yes, I know there are plenty of clueless lusers out 
> > there). But it applies to pretty much ALL objects - if you "insert" 
> > then LO keeps the object unaltered, if you "open" then LO converts the 
> > object to a form that it can edit.
> 
> That is a good argument to stay on that difference. But - when opening 
> and we have the possibility by doing this using the same filter as when 
> inserting - wouldn't it be better to use that and additionally 'break' 
> the SVG?

With my UX hat on, I wouldn't break it on load, it's OK enough when
there is a possibility to do so.  When not broken, I suspect the move /
resize etc. behaves more naturally (moves / resizes the entire picture).

> This would lead to the same 'open' behaviour, guarantee SVG looking the 
> same despite of insert/open, deliver better quality and reduce number of 
> filters to maintain to one.

I think the breaking (ie. loading the svg in a way it can be editable)
was the biggest concern blocking this...

So I guess if the fidelity (in the sense of shapes / gradients etc.) of
a svg loaded via svgio and broken into shapes is similar / same (or even
better) than the fidelity of svg loaded via filter/source/svg, I'd vote
for removing filter/source/svg ;-)  Can you please take this topic to
the ESC?

Thank you,
Kendy

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

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

[Stephan Bergmann]

 sc/source/core/data/validat.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 0a03aedfb1dcd07093810ff435bc287377a53e85
Author: Stephan Bergmann 
Date:   Tue Jan 5 13:08:10 2016 +0100

loplugin:bodynotinblock

Change-Id: I7b53113c0665fbd705b9110075f0d707c7798fdd

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index c4c4ba6..e9cff1e 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -572,19 +572,19 @@ bool ScValidationData::IsDataValid( ScRefCellValue& 
rCell, const ScAddress& rPos
 break;
 case SC_COND_BETWEEN:
 if (nComp2 < nComp1) // time wraparound
-bOk = ( nInVal >= nComp1 || nInVal <= nComp2 ) ||
-::rtl::math::approxEqual( nInVal, nComp1 ) || 
::rtl::math::approxEqual( nInVal, nComp2 );
+bOk = ( nInVal >= nComp1 || nInVal <= nComp2 ) ||
+::rtl::math::approxEqual( nInVal, nComp1 ) || 
::rtl::math::approxEqual( nInVal, nComp2 );
 else
-bOk = ( nInVal >= nComp1 && nInVal <= nComp2 ) ||
-::rtl::math::approxEqual( nInVal, nComp1 ) || 
::rtl::math::approxEqual( nInVal, nComp2 );
+bOk = ( nInVal >= nComp1 && nInVal <= nComp2 ) ||
+::rtl::math::approxEqual( nInVal, nComp1 ) || 
::rtl::math::approxEqual( nInVal, nComp2 );
 break;
 case SC_COND_NOTBETWEEN:
 if (nComp2 < nComp1) // time wraparound
-bOk = ( nInVal < nComp1 && nInVal > nComp2 ) &&
-!::rtl::math::approxEqual( nInVal, nComp1 ) && 
!::rtl::math::approxEqual( nInVal, nComp2 );
+bOk = ( nInVal < nComp1 && nInVal > nComp2 ) &&
+!::rtl::math::approxEqual( nInVal, nComp1 ) && 
!::rtl::math::approxEqual( nInVal, nComp2 );
 else
-bOk = ( nInVal < nComp1 || nInVal > nComp2 ) &&
-!::rtl::math::approxEqual( nInVal, nComp1 ) && 
!::rtl::math::approxEqual( nInVal, nComp2 );
+bOk = ( nInVal < nComp1 || nInVal > nComp2 ) &&
+!::rtl::math::approxEqual( nInVal, nComp1 ) && 
!::rtl::math::approxEqual( nInVal, nComp2 );
 break;
 default:
 SAL_WARN("sc", "unknown operation at 
ScValidationData::IsDataValid()");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 84bdb12d1a568e66bb8b03a19f6ea4449f8e1c94
Author: Stephan Bergmann 
Date:   Tue Jan 5 13:01:53 2016 +0100

loplugin:sallogareas

Change-Id: Ia6dc83137fb970046750996b9afd7a54aa4f4c5b

diff --git a/writerfilter/source/ooxml/Handler.cxx 
b/writerfilter/source/ooxml/Handler.cxx
index 2010be4..7915f8b 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -131,7 +131,7 @@ void OOXMLOLEHandler::attribute(Id name, Value & val)
 catch (const ::css::uno::Exception&)
 {
 // Can't resolve OLE stream
-SAL_WARN("OOXMLOLEHandler::attribute", "Failed to open OLE 
stream!");
+SAL_WARN("writerfilter.ooxml", "Failed to open OLE stream!");
 }
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/firebird/Connection.cxx |   83 
 connectivity/source/drivers/firebird/Connection.hxx |8 +
 2 files changed, 91 insertions(+)

New commits:
commit c88fd50c4e8815546e9830a41bf08edf9f165923
Author: Lionel Elie Mamane 
Date:   Tue Jan 5 12:00:00 2016 +

Revert "WIP tdf#72987 Use firebird backup format for .odb no need for 
rebuild indexes"

This reverts commit f961fef03906fc059a4a0c008799f68fc22727c1.

This can be done only *after* the firebird driver switches to the backup 
format.

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

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index e9d453a..be6178b 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -294,6 +294,12 @@ void Connection::construct(const ::rtl::OUString& url, 
const Sequence< PropertyV
 
 if (m_bIsEmbedded) // Add DocumentEventListener to save the .fdb as 
needed
 {
+// TODO: this is only needed when we change icu versions, so 
ideally
+// we somehow keep track of which icu version we have. There might
+// be something db internal that we can check, or we might have to 
store
+// it in the .odb.
+rebuildIndexes();
+
 // We need to attach as a document listener in order to be able to 
store
 // the temporary db back into the .odb when saving
 uno::Reference 
xBroadcaster(m_xParentDocument, UNO_QUERY);
@@ -816,4 +822,81 @@ uno::Reference< XTablesSupplier > 
Connection::createCatalog()
 
 }
 
+void Connection::rebuildIndexes() throw (SQLException, RuntimeException, 
std::exception)
+{
+MutexGuard aGuard(m_aMutex);
+
+try
+{
+// We only need to do this for character based columns on user-created 
tables.
+
+// Ideally we'd use a FOR SELECT ... INTO  DO ..., but that seems 
to
+// only be possible using PSQL, i.e. using a stored procedure.
+OUString sSql(
+// multiple columns possible per index, only select once
+"SELECT DISTINCT indices.RDB$INDEX_NAME "
+"FROM RDB$INDICES indices "
+"JOIN RDB$INDEX_SEGMENTS index_segments "
+"ON (indices.RDB$INDEX_NAME = index_segments.RDB$INDEX_NAME) "
+"JOIN RDB$RELATION_FIELDS relation_fields "
+"ON (index_segments.RDB$FIELD_NAME = 
relation_fields.RDB$FIELD_NAME) "
+"JOIN RDB$FIELDS fields "
+"ON (relation_fields.RDB$FIELD_SOURCE = fields.RDB$FIELD_NAME) "
+
+"WHERE (indices.RDB$SYSTEM_FLAG = 0) "
+// TODO: what about blr_text2 etc. ?
+"AND ((fields.RDB$FIELD_TYPE = " + OUString::number((int) 
blr_text) + ") "
+" OR (fields.RDB$FIELD_TYPE = " + OUString::number((int) 
blr_varying) + ")) "
+"AND (indices.RDB$INDEX_INACTIVE IS NULL OR 
indices.RDB$INDEX_INACTIVE = 0) "
+);
+
+uno::Reference< XStatement > xCharIndicesStatement = createStatement();
+uno::Reference< XResultSet > xCharIndices =
+
xCharIndicesStatement->executeQuery(sSql);
+uno::Reference< XRow > xRow(xCharIndices, UNO_QUERY_THROW);
+
+uno::Reference< XStatement > xAlterIndexStatement = createStatement();
+
+// ALTER is a DDL statement, hence using Statement will cause a commit
+// after every alter -- in this case this is inappropriate 
(xCharIndicesStatement
+// and its ResultSet become invalidated) hence we use the native api.
+while (xCharIndices->next())
+{
+OUString sIndexName(sanitizeIdentifier(xRow->getString(1)));
+SAL_INFO("connectivity.firebird", "rebuilding index " + 
sIndexName);
+OString sAlterIndex = "ALTER INDEX \""
+   + OUStringToOString(sIndexName, 
RTL_TEXTENCODING_UTF8)
+   + "\" ACTIVE";
+
+ISC_STATUS_ARRAY aStatusVector;
+ISC_STATUS aErr;
+
+aErr = isc_dsql_execute_immediate(aStatusVector,
+  &getDBHandle(),
+  &getTransaction(),
+  0, // Length: 0 for null 
terminated
+  sAlterIndex.getStr(),
+  FIREBIRD_SQL_DIALECT,
+  nullptr);
+if (aErr)
+evaluateStatusVector(aStatusVector,
+ 
"rebuildIndexes:isc_dsql_execute_immediate",
+ *this);
+ 

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

[Benjamin Ni]

 sc/inc/conditio.hxx |2 +
 sc/qa/unit/ucalc.cxx|   26 +
 sc/qa/unit/ucalc.hxx|2 +
 sc/source/core/data/validat.cxx |   49 +++-
 4 files changed, 78 insertions(+), 1 deletion(-)

New commits:
commit c01bcbc88522c5f86820105a45e2e5593ae01501
Author: Benjamin Ni 
Date:   Sun Jun 7 16:21:54 2015 +0100

Time wraparound validation feature

Change-Id: I49305167b1062dbe8158fdb446859138ba283da2
Reviewed-on: https://gerrit.libreoffice.org/16136
Tested-by: Jenkins 
Tested-by: jan iversen 
Reviewed-by: jan iversen 

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index d33ecc6..69f8ddd 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -154,10 +154,12 @@ public:
 class SC_DLLPUBLIC ScConditionEntry : public ScFormatEntry
 {
 // stored data:
+protected:
 ScConditionMode eOp;
 sal_uInt16  nOptions;
 double  nVal1;  // input or calculated
 double  nVal2;
+private:
 OUString  aStrVal1;   // input or calculated
 OUString  aStrVal2;
 OUString  aStrNmsp1;  // namespace to be used on 
(re)compilation, e.g. in XML import
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ccb3619..7d836b1 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -45,6 +45,7 @@
 #include "interpre.hxx"
 #include "columniterator.hxx"
 #include "types.hxx"
+#include "validat.hxx"
 #include "conditio.hxx"
 #include "colorscale.hxx"
 #include "fillinfo.hxx"
@@ -5690,6 +5691,31 @@ void Test::testCondFormatInsertRow()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testValidity()
+{
+m_pDoc->InsertTab(0, "Test");
+
+m_pDoc->SetValue( 0, 0, 0, 22.0/24.0 );
+m_pDoc->SetValue( 2, 0, 0, 23.0/24.0 );
+m_pDoc->SetValue( 4, 0, 0, 24.0/24.0 );
+
+// invalid between 2300-0100 hrs
+ScValidationData* pData0 = new ScValidationData( SC_VALID_TIME, 
SC_COND_NOTBETWEEN,
+OUString::number(23.0/24.0), OUString::number(1.0/24.0), m_pDoc, 
ScAddress(0,0,0) );
+ScValidationData* pData1 = new ScValidationData( SC_VALID_TIME, 
SC_COND_NOTBETWEEN,
+OUString::number(23.0/24.0), OUString::number(1.0/24.0), m_pDoc, 
ScAddress(2,0,0) );
+ScValidationData* pData2 = new ScValidationData( SC_VALID_TIME, 
SC_COND_NOTBETWEEN,
+OUString::number(23.0/24.0), OUString::number(1.0/24.0), m_pDoc, 
ScAddress(4,0,0) );
+
+ScRefCellValue aCell;
+aCell.assign(*m_pDoc, ScAddress(0,0,0));
+CPPUNIT_ASSERT(  pData0->IsDataValid( aCell, ScAddress(0,0,0) ) );
+aCell.assign(*m_pDoc, ScAddress(2,0,0));
+CPPUNIT_ASSERT( !pData1->IsDataValid( aCell, ScAddress(2,0,0) ) );
+aCell.assign(*m_pDoc, ScAddress(4,0,0));
+CPPUNIT_ASSERT( !pData2->IsDataValid( aCell, ScAddress(4,0,0) ) );
+}
+
 void Test::testCondFormatInsertDeleteSheets()
 {
 m_pDoc->InsertTab(0, "Test");
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index b3e5bf3..6085311 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -433,6 +433,7 @@ public:
 void testCondFormatINSDEL();
 void testCondFormatInsertRow();
 void testCondFormatInsertCol();
+void testValidity();
 void testCondFormatInsertDeleteSheets();
 void testCondCopyPaste();
 void testCondCopyPasteSingleCell(); //e.g. fdo#82503
@@ -669,6 +670,7 @@ public:
 CPPUNIT_TEST(testCondFormatINSDEL);
 CPPUNIT_TEST(testCondFormatInsertRow);
 CPPUNIT_TEST(testCondFormatInsertCol);
+CPPUNIT_TEST(testValidity);
 CPPUNIT_TEST(testCondFormatInsertDeleteSheets);
 CPPUNIT_TEST(testCondCopyPaste);
 CPPUNIT_TEST(testCondCopyPasteSingleCell);
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 437434a..c4c4ba6 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -543,7 +543,54 @@ bool ScValidationData::IsDataValid( ScRefCellValue& rCell, 
const ScAddress& rPos
 OSL_FAIL("not yet done");
 break;
 }
-
+if (eDataMode == SC_VALID_TIME) {
+// consider only time portion (i.e. decimal)
+double nComp1 = (nVal1 - floor(nVal1));
+double nComp2 = (nVal2 - floor(nVal2));
+double nInVal = (nVal  - floor(nVal ));
+switch (eOp)
+{
+case SC_COND_NONE:
+break;  // Always sal_False
+case SC_COND_EQUAL:
+bOk = ::rtl::math::approxEqual( nInVal, nComp1 );
+break;
+case SC_COND_NOTEQUAL:
+bOk = !::rtl::math::approxEqual( nInVal, nComp1 );
+break;
+case SC_COND_GREATER:
+bOk = ( nInVal > nComp1 ) && !::rtl::math::approxEqual( nInVal, 
nComp1 );
+break;
+case SC_COND_EQGREATER:
+bOk = ( nInVal >= nComp1 ) || ::rtl::math::approxEqual( nInVal, 

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

[Stephan Bergmann]

 svtools/source/control/breadcrumb.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f193b1869159377aaa28844790a098cc127b5c5e
Author: Stephan Bergmann 
Date:   Tue Jan 5 12:50:20 2016 +0100

loplugin:staticcall

Change-Id: Ic01bcf112763c386741372d939c74ed5ce3317dc

diff --git a/svtools/source/control/breadcrumb.cxx 
b/svtools/source/control/breadcrumb.cxx
index b611a42..adac26d 100644
--- a/svtools/source/control/breadcrumb.cxx
+++ b/svtools/source/control/breadcrumb.cxx
@@ -111,7 +111,7 @@ void Breadcrumb::SetURL( const OUString& rURL )
 if( aURL.HasPort() )
 {
 sHostPort += ":";
-sHostPort += sHostPort.number( aURL.GetPort() );
+sHostPort += OUString::number( aURL.GetPort() );
 }
 
 OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 94205] Use o3tl::make_unique instead of new + std::move

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=94205

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:5.1.0|target:5.1.0 target:5.2.0

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

[Bug 94205] Use o3tl::make_unique instead of new + std::move

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=94205

--- Comment #4 from Commit Notification 
 ---
Sheikha AL-Hinai committed a patch related to this issue.
It has been pushed to "master":

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

tdf#94205: Use o3tl::make_unique insted of new+std::move.

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

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

[Libreoffice-commits] core.git: chart2/source cui/source dbaccess/source sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/source xmloff/source

[Sheikha AL-Hinai]

 chart2/source/controller/accessibility/AccessibleTextHelper.cxx |5 +--
 cui/source/customize/acccfg.cxx |   11 +++-
 cui/source/options/optHeaderTabListbox.cxx  |6 +---
 dbaccess/source/ui/control/dbtreelistbox.cxx|5 +--
 dbaccess/source/ui/misc/WNameMatch.cxx  |5 +--
 sc/source/filter/html/htmlpars.cxx  |8 ++
 sc/source/filter/xml/xmlimprt.cxx   |5 +--
 sc/source/ui/Accessibility/AccessibleCell.cxx   |6 +---
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx |7 +
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx|6 +---
 sc/source/ui/Accessibility/AccessibleEditObject.cxx |6 +---
 sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx |6 +---
 sc/source/ui/Accessibility/AccessiblePreviewCell.cxx|6 +---
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx  |7 ++---
 sc/source/ui/navipi/content.cxx |5 +--
 sc/source/ui/undo/undorangename.cxx |8 ++
 sd/source/ui/dlg/sdtreelb.cxx   |5 +--
 sfx2/source/dialog/templdlg.cxx |   10 ++-
 starmath/source/accessibility.cxx   |6 +---
 svtools/source/contnr/svtabbx.cxx   |5 +--
 svtools/source/contnr/treelistbox.cxx   |   13 
+++---
 svtools/source/uno/treecontrolpeer.cxx  |6 +---
 svx/source/accessibility/AccessibleShape.cxx|8 ++
 svx/source/dialog/docrecovery.cxx   |6 +---
 svx/source/table/accessiblecell.cxx |6 ++--
 sw/source/core/doc/fmtcol.cxx   |5 +--
 sw/source/core/text/blink.cxx   |5 +--
 sw/source/core/undo/undobj.cxx  |5 +--
 sw/source/core/undo/unsort.cxx  |8 ++
 sw/source/core/undo/untbl.cxx   |7 ++---
 xmloff/source/style/impastpl.cxx|6 +---
 31 files changed, 74 insertions(+), 129 deletions(-)

New commits:
commit d75b9fd582f0aa83bd2fc99028b3f83eb7171d61
Author: Sheikha AL-Hinai 
Date:   Mon Dec 28 13:56:23 2015 +0400

tdf#94205: Use o3tl::make_unique insted of new+std::move.

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

diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx 
b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index cc88d35..e715e07 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -34,7 +34,7 @@
 #include 
 
 #include 
-
+#include 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 
@@ -90,8 +90,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const 
Sequence< uno::Any >& aArg
 SdrObject * pTextObj = m_pDrawViewWrapper->getNamedSdrObject( aCID 
);
 if( pTextObj )
 {
-std::unique_ptr pEditSource(new 
SvxTextEditSource( *pTextObj, nullptr, *pView, *pWindow ));
-m_pTextHelper = new 
::accessibility::AccessibleTextHelper(std::move(pEditSource));
+m_pTextHelper = new 
::accessibility::AccessibleTextHelper(o3tl::make_unique(*pTextObj,
 nullptr, *pView, *pWindow));
 m_pTextHelper->SetEventSource( xEventSource );
 }
 }
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ee07d7e..19cfe65 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -69,7 +69,7 @@
 #include 
 #include 
 #include 
-
+#include 
 // namespaces
 
 using namespace css;
@@ -911,13 +911,10 @@ void 
SfxAcceleratorConfigPage::CreateCustomItems(SvTreeListEntry* pEntry,
  const OUString& sCol1 ,
  const OUString& sCol2)
 {
-std::unique_ptr pStringItem1(
-new SfxAccCfgLBoxString_Impl(pEntry, 0, sCol1));
-pEntry->ReplaceItem(std::move(pStringItem1), 1);
 
-std::unique_ptr pStringItem2(
-new SfxAccCfgLBoxString_Impl(pEntry, 0, sCol2));
-pEntry->ReplaceItem(std::move(pStringItem2), 2);
+pEntry->ReplaceItem(o3tl::make_unique(pEntry, 0, 
sCol1), 1);
+
+pEntry->ReplaceItem(o3tl::make_unique(pEntry, 0, 
sCol2), 2);
 }
 
 
diff --git a/cui/source/options/optHeaderTabListbox.cxx 
b/cui/sour

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

[Popa Adrian Marius]

 connectivity/source/drivers/firebird/Connection.cxx |   83 
 connectivity/source/drivers/firebird/Connection.hxx |8 -
 2 files changed, 91 deletions(-)

New commits:
commit f961fef03906fc059a4a0c008799f68fc22727c1
Author: Popa Adrian Marius 
Date:   Mon Mar 23 17:41:28 2015 +0200

WIP tdf#72987 Use firebird backup format for .odb no need for rebuild 
indexes

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

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index be6178b..e9d453a 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -294,12 +294,6 @@ void Connection::construct(const ::rtl::OUString& url, 
const Sequence< PropertyV
 
 if (m_bIsEmbedded) // Add DocumentEventListener to save the .fdb as 
needed
 {
-// TODO: this is only needed when we change icu versions, so 
ideally
-// we somehow keep track of which icu version we have. There might
-// be something db internal that we can check, or we might have to 
store
-// it in the .odb.
-rebuildIndexes();
-
 // We need to attach as a document listener in order to be able to 
store
 // the temporary db back into the .odb when saving
 uno::Reference 
xBroadcaster(m_xParentDocument, UNO_QUERY);
@@ -822,81 +816,4 @@ uno::Reference< XTablesSupplier > 
Connection::createCatalog()
 
 }
 
-void Connection::rebuildIndexes() throw (SQLException, RuntimeException, 
std::exception)
-{
-MutexGuard aGuard(m_aMutex);
-
-try
-{
-// We only need to do this for character based columns on user-created 
tables.
-
-// Ideally we'd use a FOR SELECT ... INTO  DO ..., but that seems 
to
-// only be possible using PSQL, i.e. using a stored procedure.
-OUString sSql(
-// multiple columns possible per index, only select once
-"SELECT DISTINCT indices.RDB$INDEX_NAME "
-"FROM RDB$INDICES indices "
-"JOIN RDB$INDEX_SEGMENTS index_segments "
-"ON (indices.RDB$INDEX_NAME = index_segments.RDB$INDEX_NAME) "
-"JOIN RDB$RELATION_FIELDS relation_fields "
-"ON (index_segments.RDB$FIELD_NAME = 
relation_fields.RDB$FIELD_NAME) "
-"JOIN RDB$FIELDS fields "
-"ON (relation_fields.RDB$FIELD_SOURCE = fields.RDB$FIELD_NAME) "
-
-"WHERE (indices.RDB$SYSTEM_FLAG = 0) "
-// TODO: what about blr_text2 etc. ?
-"AND ((fields.RDB$FIELD_TYPE = " + OUString::number((int) 
blr_text) + ") "
-" OR (fields.RDB$FIELD_TYPE = " + OUString::number((int) 
blr_varying) + ")) "
-"AND (indices.RDB$INDEX_INACTIVE IS NULL OR 
indices.RDB$INDEX_INACTIVE = 0) "
-);
-
-uno::Reference< XStatement > xCharIndicesStatement = createStatement();
-uno::Reference< XResultSet > xCharIndices =
-
xCharIndicesStatement->executeQuery(sSql);
-uno::Reference< XRow > xRow(xCharIndices, UNO_QUERY_THROW);
-
-uno::Reference< XStatement > xAlterIndexStatement = createStatement();
-
-// ALTER is a DDL statement, hence using Statement will cause a commit
-// after every alter -- in this case this is inappropriate 
(xCharIndicesStatement
-// and its ResultSet become invalidated) hence we use the native api.
-while (xCharIndices->next())
-{
-OUString sIndexName(sanitizeIdentifier(xRow->getString(1)));
-SAL_INFO("connectivity.firebird", "rebuilding index " + 
sIndexName);
-OString sAlterIndex = "ALTER INDEX \""
-   + OUStringToOString(sIndexName, 
RTL_TEXTENCODING_UTF8)
-   + "\" ACTIVE";
-
-ISC_STATUS_ARRAY aStatusVector;
-ISC_STATUS aErr;
-
-aErr = isc_dsql_execute_immediate(aStatusVector,
-  &getDBHandle(),
-  &getTransaction(),
-  0, // Length: 0 for null 
terminated
-  sAlterIndex.getStr(),
-  FIREBIRD_SQL_DIALECT,
-  nullptr);
-if (aErr)
-evaluateStatusVector(aStatusVector,
- 
"rebuildIndexes:isc_dsql_execute_immediate",
- *this);
-}
-commit();
-}
-catch (const Exception&)
-{
-throw;
-}
-catch (const std::exception&)
-{
-throw;
-}
-catch (...) // const Fir

[Libreoffice-commits] core.git: svtools/source ucb/source

[Giuseppe Castagno]

 svtools/source/control/breadcrumb.cxx  |   11 ++-
 ucb/source/ucp/webdav-neon/NeonSession.cxx |1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 5c4de8f1991f1a9964e661717dc6b46f6a6a3608
Author: Giuseppe Castagno 
Date:   Sat Jan 2 16:03:20 2016 +0100

Related tdf#96833: breadcrumb: setting URL, host port gets lost.

At the same time added a log in WebDAV, useful to discover the
issue.

Change-Id: I3435f8d3da28f7d6b4c2e154cf2bb5ee33a9a690
Reviewed-on: https://gerrit.libreoffice.org/21047
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/svtools/source/control/breadcrumb.cxx 
b/svtools/source/control/breadcrumb.cxx
index 2f7766e..b611a42 100644
--- a/svtools/source/control/breadcrumb.cxx
+++ b/svtools/source/control/breadcrumb.cxx
@@ -105,13 +105,22 @@ void Breadcrumb::SetURL( const OUString& rURL )
 m_aCurrentURL = rURL;
 INetURLObject aURL( rURL );
 aURL.setFinalSlash();
+//prepare the Host port
+OUString sHostPort;
+
+if( aURL.HasPort() )
+{
+sHostPort += ":";
+sHostPort += sHostPort.number( aURL.GetPort() );
+}
 
 OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE );
 OUString sPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET);
 OUString sRootPath = INetURLObject::GetScheme( aURL.GetProtocol() )
 + sUser
 + ( sUser.isEmpty() ? OUString() : "@" )
-+ aURL.GetHost();
++ aURL.GetHost()
++ sHostPort;
 
 int nSegments = aURL.getSegmentCount();
 unsigned int nPos = 0;
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 41f9563..23f1440 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1746,6 +1746,7 @@ void NeonSession::HandleError( int nError,
 m_aProxyName, m_nProxyPort ) );
 
 case NE_CONNECT:  // Could not connect to server
+SAL_WARN( "ucb.ucp.webdav", "DAVException::DAV_HTTP_CONNECT" );
 throw DAVException( DAVException::DAV_HTTP_CONNECT,
 NeonUri::makeConnectionEndPointString(
 m_aHostName, m_nPort ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 95c125f012073ab9115b79eccce09696a845be36
Author: Stephan Bergmann 
Date:   Tue Jan 5 12:33:52 2016 +0100

loplugin:redundantcast

Change-Id: I8a5c0eddb784a23a2019c5315161b9bbb02e1e48

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index ab18d70..2995453 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1808,7 +1808,7 @@ void ImplDelData::AttachToWindow( const vcl::Window* 
pWindow )
 if( pWindow->IsDisposed() )
 mbDel = true;
 else
-const_cast(pWindow)->ImplAddDel( this );
+pWindow->ImplAddDel( this );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/uiwriter/uiwriter.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit af47b54d49355a003deda722b5d0112a7b746485
Author: Miklos Vajna 
Date:   Tue Jan 5 12:31:50 2016 +0100

CppunitTest_sw_uiwriter: tolerate lower than 276 in testTdf96536()

Seen on an OS X tinderbox from time to time, but not always.

Change-Id: Ie6796de5095a6d3b583fa849f4d662db8b12

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 03534e8..af882f1 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -2964,8 +2964,9 @@ void SwUiWriterTest::testTdf96536()
 calcLayout();
 
 // This was 552, page did not shrink after deleting the second paragraph.
-// 276 is 12pt font size + default line spacing (15%).
-CPPUNIT_ASSERT_EQUAL(static_cast(276), 
parseDump("/root/infos/bounds", "height").toInt32());
+// Expected 276, which is 12pt font size + default line spacing (15%), but
+// tolerate some difference to that.
+CPPUNIT_ASSERT(parseDump("/root/infos/bounds", "height").toInt32() <= 276);
 }
 
 void SwUiWriterTest::testTdf96479()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - xmlhelp/Library_ucpchelp1.mk xmlhelp/source

[Stephan Bergmann]

 xmlhelp/Library_ucpchelp1.mk  |4 
 xmlhelp/source/cxxhelp/provider/databases.cxx |   23 +--
 xmlhelp/source/cxxhelp/provider/provider.cxx  |  171 ++
 xmlhelp/source/cxxhelp/provider/provider.hxx  |   17 --
 4 files changed, 28 insertions(+), 187 deletions(-)

New commits:
commit e9aa3c99d2ae577d9e2fbddc95f10d6230cf1e68
Author: Stephan Bergmann 
Date:   Mon Jan 4 17:49:08 2016 +0100

Simplify code

Change-Id: I28cff254d2cc1e2abe6fc893d918bd84bfc8645c

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx 
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index c09f2d7..14e5c1c 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -316,8 +316,6 @@ const std::vector< OUString >& Databases::getModuleList( 
const OUString& Languag
 osl::DirectoryItem aDirItem;
 osl::FileStatusaStatus( osl_FileStatus_Mask_FileName );
 
-sal_Int32 idx;
-
 if( osl::FileBase::E_None != dirFile.open() )
 return m_avModules;
 
@@ -330,22 +328,17 @@ const std::vector< OUString >& Databases::getModuleList( 
const OUString& Languag
 fileName = aStatus.getFileName();
 
 // Check, whether fileName is of the form *.cfg
-idx = fileName.lastIndexOf( '.' );
-
-if( idx == -1 )
+if (!fileName.endsWithIgnoreAsciiCase(".cfg", &fileName)) {
 continue;
-
-const sal_Unicode* str = fileName.getStr();
-
-if( fileName.getLength() == idx + 4   &&
-( str[idx + 1] == 'c' || str[idx + 1] == 'C' )&&
-( str[idx + 2] == 'f' || str[idx + 2] == 'F' )&&
-( str[idx + 3] == 'g' || str[idx + 3] == 'G' )&&
-( fileName = fileName.copy(0,idx).toAsciiLowerCase() ) != 
"picture" ) {
-  if(! m_bShowBasic && fileName == "sbasic" )
+}
+fileName = fileName.toAsciiLowerCase();
+if (fileName == "picture"
+|| (!m_bShowBasic && fileName == "sbasic"))
+{
 continue;
-  m_avModules.push_back( fileName );
 }
+
+m_avModules.push_back( fileName );
 }
 }
 return m_avModules;
commit ce3dd82ca83eb9f3ec89f0e6eaae4e170febec3a
Author: Stephan Bergmann 
Date:   Mon Jan 4 17:42:02 2016 +0100

Clean up configuration access

Change-Id: I0662e8ddb24f2c6a7197b8a5f23c219484628b78

diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 8109e5e..0eb7d85 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -16,6 +16,10 @@ $(eval $(call gb_Library_set_include,ucpchelp1,\
$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,ucpchelp1, \
+officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,ucpchelp1))
 
 $(eval $(call gb_Library_use_externals,ucpchelp1,\
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx 
b/xmlhelp/source/cxxhelp/provider/provider.cxx
index ffac57d..56a14e4 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -20,16 +20,14 @@
 #include 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -259,73 +257,32 @@ void ContentProvider::init()
 osl::MutexGuard aGuard( m_aMutex );
 
 isInitialized = true;
-uno::Reference< lang::XMultiServiceFactory > sProvider(
-getConfiguration() );
-uno::Reference< container::XHierarchicalNameAccess > xHierAccess(
-getHierAccess( sProvider,
-   "org.openoffice.Office.Common" ) );
 
-OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
+OUString instPath(
+officecfg::Office::Common::Path::Current::Help::get(m_xContext));
 if( instPath.isEmpty() )
 // try to determine path from default
 instPath = "$(instpath)/" LIBO_SHARE_HELP_FOLDER;
 // replace anything like $(instpath);
 subst( instPath );
 
-OUString stylesheet( getKey( xHierAccess,"Help/HelpStyleSheet" ) );
-try
-{
-// now adding as configuration change listener for the stylesheet
-uno::Reference< container::XNameAccess> xAccess(
-xHierAccess, uno::UNO_QUERY );
-if( xAccess.is() )
-{
-uno::Any aAny =
-xAccess->getByName("Help");
-aAny >>= m_xContainer;
-if( m_xContainer.is() )
-m_xContainer->addContainerListener( this );
-}
-}
-catch( uno::Exception const & )
-{
-}
+OUString stylesheet(
+officecfg::Office::Common::Help::HelpStyleSheet::get(m_xContext));
 
-xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
+// now adding as configuration 

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

[Dennis Francis]

 vcl/unx/gtk3/gtk3gtkinst.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 97df0e601a0d76664b4207d075fa6e2a5a51625c
Author: Dennis Francis 
Date:   Fri Dec 11 09:19:22 2015 +0530

Fix memleak of strings allocated in VclGtkClipboard::makeGtkTargetEntry

This leak is produced when copy and paste of text/numbers
is done in Calc/Writer.

Following is the trace produced by valgrind (trimmed)

  malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
  g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.2)
  g_strdup (in /usr/lib64/libglib-2.0.so.0.4600.2)
  VclGtkClipboard::makeGtkTargetEntry(...) (gtk3gtkinst.cxx:467)
  VclGtkClipboard::setContents(...) (gtk3gtkinst.cxx:557)
  TransferableHelper::CopyToSelection(vcl::Window*) const 
(transfer.cxx:1019)
  ScTabView::CheckSelectionTransfer() (tabview3.cxx:319)
  ScTabView::UpdateAutoFillMark() (tabview3.cxx:144)
  ScTabView::SelectionChanged() (tabview3.cxx:365)
  ScViewFunc::PostPasteFromClip(ScRangeList const&, ScMarkData const&) 
(viewfun3.cxx:1753)
  ScViewFunc::PasteFromClip(...) (viewfun3.cxx:1415)
  ScClipUtil::PasteFromClipboard(ScViewData*, ScTabViewShell*, bool) 
(cliputil.cxx:69)
  ScCellShell::ExecuteEdit(SfxRequest&) (cellsh1.cxx:1285)
  SfxStubScCellShellExecuteEdit(SfxShell*, SfxRequest&) (scslots.hxx:7135)
  SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) 
(shell.hxx:206)
  SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) 
(dispatch.cxx:258)...
  ...

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e9210d0..f1a9ddc 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -456,7 +456,7 @@ void VclGtkClipboard::OwnerChanged(GtkClipboard* clipboard, 
GdkEvent* /*event*/)
 void VclGtkClipboard::ClipboardClear(GtkClipboard * /*clipboard*/)
 {
 for (auto &a : m_aGtkTargets)
-free(a.target);
+g_free(a.target);
 m_aGtkTargets.clear();
 }
 
@@ -518,6 +518,7 @@ VclGtkClipboard::~VclGtkClipboard()
 GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 g_signal_handler_disconnect(clipboard, m_nOwnerChangedSignalId);
 g_object_unref(m_pOwner);
+ClipboardClear(nullptr);
 }
 
 void VclGtkClipboard::setContents(
@@ -577,6 +578,8 @@ void VclGtkClipboard::setContents(
 //if there was a previous gtk_clipboard_set_with_data call then
 //ClipboardClearFunc will be called now
 GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
+if(G_OBJECT(m_pOwner) == gtk_clipboard_get_owner(clipboard))
+gtk_clipboard_clear(clipboard);
 //use with_owner with m_pOwner so we can distinguish in 
handle_owner_change
 //if we have gained or lost ownership of the clipboard
 gtk_clipboard_set_with_owner(clipboard, aGtkTargets.data(), 
aGtkTargets.size(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits