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

2015-07-13 Thread Stephan Bergmann 

On 07/10/2015 01:09 PM, Varun wrote:

commit 6a0efa9873b1a5cae4ae0719a7ae1eee97838168
Author: Varun 
Date:   Thu Jul 9 23:33:24 2015 +0530

 Added Test for tdf#80663 table row/column delete undo crash

 Change-Id: Ica62926486831f126cce54d651e230cee3360074
 Reviewed-on: https://gerrit.libreoffice.org/16901
 Reviewed-by: Michael Stahl 
 Tested-by: Michael Stahl 


Looks like that new test unearthed an undo-related bug, as my asan+ubsan 
build now reproducible fails during CppunitTest_sw_uiwriter with



sw/source/core/undo/untbl.cxx:997:25: runtime error: downcast of address 
0x2b35a17ec0a8 which does not point to an object of type 'SwTableBoxFormat'
0x2b35a17ec0a8: note: object is of type 'SwTableFormat'
 00 00 00 00  90 d9 e5 58 35 2b 00 00  a0 d2 7e a1 35 2b 00 00  f8 b1 7e a1 35 
2b 00 00  00 60 6e 97
  ^~~
  vptr for 'SwTableFormat'
#0 0x2b3552aac15e in _SaveTable::CreateNew(SwTable&, bool, bool) 
sw/source/core/undo/untbl.cxx:997:25
#1 0x2b3552af07cd in SwUndoTableNdsChg::UndoImpl(sw::UndoRedoContext&) 
sw/source/core/undo/untbl.cxx:1801:5
#2 0x2b35528ca7b7 in SwUndo::UndoWithContext(SfxUndoContext&) 
sw/source/core/undo/undobj.cxx:214:5
#3 0x2b351a54712b in SfxListUndoAction::UndoWithContext(SfxUndoContext&) 
svl/source/undo/undo.cxx:1352:9
#4 0x2b351a52c2d6 in SfxUndoManager::ImplUndo(SfxUndoContext*) 
svl/source/undo/undo.cxx:810:13
#5 0x2b351a52d805 in SfxUndoManager::UndoWithContext(SfxUndoContext&) 
svl/source/undo/undo.cxx:778:12
#6 0x2b355277e92d in 
sw::UndoManager::impl_DoUndoRedo(sw::UndoManager::UndoOrRedo_t) 
sw/source/core/undo/docundo.cxx:483:16
#7 0x2b355277fdb3 in sw::UndoManager::Undo() 
sw/source/core/undo/docundo.cxx:516:16
#8 0x2b352b2e85e4 in SwUiWriterTest::testTdf80663() 
sw/qa/extras/uiwriter/uiwriter.cxx:1283:5
#9 0x2b352b46599f in CppUnit::TestCaller::runTest() 
workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:166:6
#10 0x2b34eb488a7d in CppUnit::TestCaseMethodFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5
#11 0x2b35037c47a6 in (anonymous namespace)::Protector::protect(CppUnit::Functor 
const&, CppUnit::ProtectorContext const&) 
test/source/vclbootstrapprotector.cxx:57:14
#12 0x2b34eb443fc7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() 
const workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12
#13 0x2b34fab4aa96 in (anonymous namespace)::Prot::protect(CppUnit::Functor 
const&, CppUnit::ProtectorContext const&) 
unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx:88:12
#14 0x2b34eb443fc7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() 
const workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12
#15 0x2b34f6e1cda4 in (anonymous namespace)::Prot::protect(CppUnit::Functor 
const&, CppUnit::ProtectorContext const&) 
unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx:63:16
#16 0x2b34eb443fc7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() 
const workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12
#17 0x2b34eb3cb93c in CppUnit::DefaultProtector::protect(CppUnit::Functor 
const&, CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/DefaultProtector.cpp:15:12
#18 0x2b34eb443fc7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() 
const workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12
#19 0x2b34eb43ff71 in CppUnit::ProtectorChain::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:77:18
#20 0x2b34eb50a1b5 in CppUnit::TestResult::protect(CppUnit::Functor const&, 
CppUnit::Test*, std::string const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:181:10
#21 0x2b34eb4855d6 in CppUnit::TestCase::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:91:5
#22 0x2b34eb48c013 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:5
#23 0x2b34eb48af7d in CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
#24 0x2b34eb48c013 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:5
#25 0x2b34eb48af7d in CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
#26 0x2b34eb548cf6 in 
CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:47:5
#27 0x2b34eb508039 in CppUnit::TestResult::runTest(CppUnit::Test*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:148:3
#28 0x2b34eb54a2b6 in CppUnit::TestRunner::run(CppUnit::TestResult&, 
std::

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

2015-07-13 Thread Stephan Bergmann 
 basegfx/source/range/b2drangeclipper.cxx |1 -
 vcl/source/edit/textundo.cxx |1 -
 vcl/source/window/event.cxx  |1 -
 3 files changed, 3 deletions(-)

New commits:
commit d537a439fe0bec348d6cf0e14dadee773b38bcd4
Author: Stephan Bergmann 
Date:   Mon Jul 13 18:20:48 2015 +0200

Revert "Avoid loplugin:staticmethods in non-debug build"

This reverts commit 97df2dee8ea4f33f4efb7467cfeec2d8954c006c, obsoleted by
cbce40e965acef51822b31d73da5fbc271fbcad0 "Make content of OSL_ASSERT,
DBG_ASSERT, etc. visiblie in non-debug builds."

diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index e28387b..1ba423a 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -108,7 +108,6 @@ bool TextUndoManager::Redo()
 void TextUndoManager::UndoRedoStart()
 {
 DBG_ASSERT( GetView(), "Undo/Redo: Active View?" );
-(void) this; // avoid loplugin:staticmethods
 }
 
 void TextUndoManager::UndoRedoEnd()
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index ea819cd..ec6a9b6 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -295,7 +295,6 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent )
 "Window::RemoveUserEvent(): Event doesn't send to this window 
or is already removed" );
 DBG_ASSERT( nUserEvent->mbCall,
 "Window::RemoveUserEvent(): Event is already removed" );
-(void) this; // avoid loplugin:staticmethods
 
 if ( nUserEvent->mpWindow )
 {
commit 1a945712f6d5ce0cb31c6eff5892d6d33475976b
Author: Stephan Bergmann 
Date:   Mon Jul 13 18:19:48 2015 +0200

Revert "Avoid loplugin:staticmethods in non-debug build"

This reverts commit d0ba487bae3a0f6d1fcb9af13397c85e70ad8e1b, obsoleted by
cbce40e965acef51822b31d73da5fbc271fbcad0 "Make content of OSL_ASSERT,
DBG_ASSERT, etc. visiblie in non-debug builds."

diff --git a/basegfx/source/range/b2drangeclipper.cxx 
b/basegfx/source/range/b2drangeclipper.cxx
index 0f58395..d39c33c 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -370,7 +370,6 @@ namespace basegfx
 OSL_ENSURE( isSweepLineEnteringRect ||
 mpLeadingRightEdge == &rActiveEdge,
 "ImplPolygon::intersect(): sweep initial own edge 
hit: wrong leading edge" );
-(void) this; // avoid loplugin:staticmethods
 }
 
 void handleFinalOwnRightEdge(ActiveEdge& rActiveEdge)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Marek Doležel 
 vcl/source/edit/texteng.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0bd582834b46dbbc5037310d45bac8885e6f2a07
Author: Marek Doležel 
Date:   Tue Jul 14 03:00:37 2015 +0200

tdf#92582 Revert "tdf#91544: fix freezing of Data source window"

This reverts commit 77c47fc79c1c8096c19a81a0d320e75b84857144.

This doesn't reintroduce the original problem of tdf#91544.

Change-Id: Iee4d54e584cf098be70e8c49f9050d537567cf92

diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 8355b91..5b9b0c7 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1499,8 +1499,7 @@ void TextEngine::UpdateViews( TextView* pCurView )
 aNewPos.X() -= aOutSz.Width() - 1;
 aClipRect.SetPos( aNewPos );
 
-if (pView == pCurView)
-pView->GetWindow()->Invalidate( aClipRect );
+pView->GetWindow()->Invalidate( aClipRect );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit: Reliability and fidelity of verification results

2015-07-13 Thread Norbert Thiebaud 
On Mon, Jul 13, 2015 at 6:50 PM, Thorsten Behrens
 wrote:
> Norbert Thiebaud wrote:
>> Do not get me wrong. I applaud the effort to get rid of boost if we
>> can.. that is a big and expensive dep.
>>
> There's some amount of irony here, in that for c++11 and beyond, it's
> sometimes just stuff moved out of boost into std, that makes our boost
> exposure seemingly shrink. ;)

Yes, but we already pay the price of std::  :-)
and in the end not having to unpack few dozen of MB of headers would
be a net win
on my box make on boost is 1m6 elapsed and > 500MB or I/O


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

Re: Gerrit: Reliability and fidelity of verification results

2015-07-13 Thread Thorsten Behrens 
Norbert Thiebaud wrote:
> Do not get me wrong. I applaud the effort to get rid of boost if we
> can.. that is a big and expensive dep.
> 
There's some amount of irony here, in that for c++11 and beyond, it's
sometimes just stuff moved out of boost into std, that makes our boost
exposure seemingly shrink. ;)

Cheers,

-- Thorsten


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

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

2015-07-13 Thread Kay Schenk 
 ooxml/source/framework/JavaPartManager/.classpath |   21 
 ooxml/source/framework/JavaPartManager/.project   |   21 
 ooxml/source/framework/OOXMLViewer/.classpath |   37 +++---
 ooxml/source/framework/OOXMLViewer/.project   |   55 +++---
 4 files changed, 109 insertions(+), 25 deletions(-)

New commits:
commit a36df662fb300c0209fed5f97d851dcb457e91c6
Author: Kay Schenk 
Date:   Mon Jul 13 20:55:14 2015 +

#i126401# Add ASF license headers

Patch by: Gavin McDonald

diff --git a/ooxml/source/framework/OOXMLViewer/.project 
b/ooxml/source/framework/OOXMLViewer/.project
old mode 100755
new mode 100644
index 51a9631..af7979c
--- a/ooxml/source/framework/OOXMLViewer/.project
+++ b/ooxml/source/framework/OOXMLViewer/.project
@@ -1,17 +1,38 @@
-
-
-   OOXMLViewer
-   
-   
-   
-   
-   
-   org.eclipse.jdt.core.javabuilder
-   
-   
-   
-   
-   
-   org.eclipse.jdt.core.javanature
-   
-
+
+
+
+
+   OOXMLViewer
+   
+   
+   
+   
+   
+   org.eclipse.jdt.core.javabuilder
+   
+   
+   
+   
+   
+   org.eclipse.jdt.core.javanature
+   
+
commit bed851e498f8a532fa9785e420ba26472cef6216
Author: Kay Schenk 
Date:   Mon Jul 13 20:54:59 2015 +

#i126401# Add ASF license headers

Patch by: Gavin McDonald

diff --git a/ooxml/source/framework/OOXMLViewer/.classpath 
b/ooxml/source/framework/OOXMLViewer/.classpath
old mode 100755
new mode 100644
index ecd0bc8..4f9fc83
--- a/ooxml/source/framework/OOXMLViewer/.classpath
+++ b/ooxml/source/framework/OOXMLViewer/.classpath
@@ -1,8 +1,29 @@
-
-
-   
-   
-   
-   
-   
-
+
+
+
+
+   
+   
+   
+   
+   
+
commit c63d7d7754d7e53f43275763b73f6fc6c6076eea
Author: Kay Schenk 
Date:   Mon Jul 13 20:54:36 2015 +

#i126401# Add ASF license headers

Patch by: Gavin McDonald

diff --git a/ooxml/source/framework/JavaPartManager/.project 
b/ooxml/source/framework/JavaPartManager/.project
index 08a7d0d..242bd87 100644
--- a/ooxml/source/framework/JavaPartManager/.project
+++ b/ooxml/source/framework/JavaPartManager/.project
@@ -1,4 +1,25 @@
 
++
+
 
JavaPartManager

commit 8d0c956faa72044280cd9088928cea548a7776e5
Author: Kay Schenk 
Date:   Mon Jul 13 20:53:35 2015 +

#i126401# Add ASF license headers

Patch by: Gavin McDonald

diff --git a/ooxml/source/framework/JavaPartManager/.classpath 
b/ooxml/source/framework/JavaPartManager/.classpath
index 5ec7648..f06f31b 100644
--- a/ooxml/source/framework/JavaPartManager/.classpath
+++ b/ooxml/source/framework/JavaPartManager/.classpath
@@ -1,4 +1,25 @@
 
+
+
 


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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - translations

2015-07-13 Thread Andras Timar 
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6346bb2b25594f35cad9f6d7be422d2f040530a8
Author: Andras Timar 
Date:   Tue Jul 14 00:02:15 2015 +0200

Updated core
Project: translations  21b44f6cd56cc32a1f0ed4fe37a9654594218b4f

updated Slovenian translation

Change-Id: I01a4e5ac42e0f46b75c85c8cda4ac101eae5f3e3
(cherry picked from commit c588f61d5e916021efb0e579c5ddf755385e0d13)

diff --git a/translations b/translations
index dd13bec..21b44f6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit dd13bec98f0183f217fbb04f859ddf06038e2db1
+Subproject commit 21b44f6cd56cc32a1f0ed4fe37a9654594218b4f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0-0' - source/sl

2015-07-13 Thread Andras Timar 
 source/sl/cui/source/tabpages.po  |4 ++--
 source/sl/cui/uiconfig/ui.po  |4 ++--
 source/sl/helpcontent2/source/text/scalc/guide.po |6 +++---
 source/sl/helpcontent2/source/text/shared/01.po   |6 +++---
 source/sl/officecfg/registry/data/org/openoffice/Office.po|   10 +-
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 ++--
 source/sl/reportdesign/uiconfig/dbreport/ui.po|4 ++--
 source/sl/sw/uiconfig/swriter/ui.po   |6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 21b44f6cd56cc32a1f0ed4fe37a9654594218b4f
Author: Andras Timar 
Date:   Tue Jul 14 00:02:15 2015 +0200

updated Slovenian translation

Change-Id: I01a4e5ac42e0f46b75c85c8cda4ac101eae5f3e3
(cherry picked from commit c588f61d5e916021efb0e579c5ddf755385e0d13)

diff --git a/source/sl/cui/source/tabpages.po b/source/sl/cui/source/tabpages.po
index 5595f54..fe541f9 100644
--- a/source/sl/cui/source/tabpages.po
+++ b/source/sl/cui/source/tabpages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-06-21 06:51+0200\n"
+"POT-Creation-Date: 2015-07-04 14:55+0200\n"
 "PO-Revision-Date: 2015-06-21 15:59+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index f9b646d..8267dea 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-06-21 06:51+0200\n"
+"POT-Creation-Date: 2015-07-04 14:55+0200\n"
 "PO-Revision-Date: 2015-06-21 16:01+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/scalc/guide.po 
b/source/sl/helpcontent2/source/text/scalc/guide.po
index caed65c..1ace2bf 100644
--- a/source/sl/helpcontent2/source/text/scalc/guide.po
+++ b/source/sl/helpcontent2/source/text/scalc/guide.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.5\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-05-05 13:53+0200\n"
-"PO-Revision-Date: 2015-04-22 10:23+0200\n"
+"POT-Creation-Date: 2015-07-13 14:37+0200\n"
+"PO-Revision-Date: 2015-07-12 10:39+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "MIME-Version: 1.0\n"
@@ -2352,7 +2352,7 @@ msgctxt ""
 "par_id5888241\n"
 "help.text"
 msgid "The reference to a cell of another document contains the name of the 
other document in single inverted commas, then a hash #, then the name of the 
sheet of the other document, followed by a point and the name of the cell."
-msgstr "Sklic na celico drugega dokumenta vsebuje ime drugega dokumenta v 
enojnih narekovajih, nato sledi lojtra # in ime delovnega lista drugega 
dokumenta ter pika in ime celice."
+msgstr "Sklic na celico drugega dokumenta vsebuje ime drugega dokumenta v 
enojnih narekovajih, nato sledi višaj # in ime delovnega lista drugega 
dokumenta ter pika in ime celice."
 
 #: cellreferences.xhp
 msgctxt ""
diff --git a/source/sl/helpcontent2/source/text/shared/01.po 
b/source/sl/helpcontent2/source/text/shared/01.po
index f79ddd1..28ae2a6 100644
--- a/source/sl/helpcontent2/source/text/shared/01.po
+++ b/source/sl/helpcontent2/source/text/shared/01.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-05-28 13:36+0200\n"
-"PO-Revision-Date: 2015-05-20 17:01+0200\n"
+"POT-Creation-Date: 2015-07-13 14:37+0200\n"
+"PO-Revision-Date: 2015-07-12 10:41+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "MIME-Version: 1.0\n"
@@ -34554,7 +34554,7 @@ msgctxt ""

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0' - source/sl

2015-07-13 Thread Andras Timar 
 source/sl/cui/source/tabpages.po  |4 ++--
 source/sl/cui/uiconfig/ui.po  |4 ++--
 source/sl/helpcontent2/source/text/scalc/guide.po |6 +++---
 source/sl/helpcontent2/source/text/shared/01.po   |6 +++---
 source/sl/officecfg/registry/data/org/openoffice/Office.po|   10 +-
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 ++--
 source/sl/reportdesign/uiconfig/dbreport/ui.po|4 ++--
 source/sl/sw/uiconfig/swriter/ui.po   |6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit c588f61d5e916021efb0e579c5ddf755385e0d13
Author: Andras Timar 
Date:   Tue Jul 14 00:02:15 2015 +0200

updated Slovenian translation

Change-Id: I01a4e5ac42e0f46b75c85c8cda4ac101eae5f3e3

diff --git a/source/sl/cui/source/tabpages.po b/source/sl/cui/source/tabpages.po
index 5595f54..fe541f9 100644
--- a/source/sl/cui/source/tabpages.po
+++ b/source/sl/cui/source/tabpages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-06-21 06:51+0200\n"
+"POT-Creation-Date: 2015-07-04 14:55+0200\n"
 "PO-Revision-Date: 2015-06-21 15:59+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index f9b646d..8267dea 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-06-21 06:51+0200\n"
+"POT-Creation-Date: 2015-07-04 14:55+0200\n"
 "PO-Revision-Date: 2015-06-21 16:01+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/scalc/guide.po 
b/source/sl/helpcontent2/source/text/scalc/guide.po
index caed65c..1ace2bf 100644
--- a/source/sl/helpcontent2/source/text/scalc/guide.po
+++ b/source/sl/helpcontent2/source/text/scalc/guide.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.5\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-05-05 13:53+0200\n"
-"PO-Revision-Date: 2015-04-22 10:23+0200\n"
+"POT-Creation-Date: 2015-07-13 14:37+0200\n"
+"PO-Revision-Date: 2015-07-12 10:39+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "MIME-Version: 1.0\n"
@@ -2352,7 +2352,7 @@ msgctxt ""
 "par_id5888241\n"
 "help.text"
 msgid "The reference to a cell of another document contains the name of the 
other document in single inverted commas, then a hash #, then the name of the 
sheet of the other document, followed by a point and the name of the cell."
-msgstr "Sklic na celico drugega dokumenta vsebuje ime drugega dokumenta v 
enojnih narekovajih, nato sledi lojtra # in ime delovnega lista drugega 
dokumenta ter pika in ime celice."
+msgstr "Sklic na celico drugega dokumenta vsebuje ime drugega dokumenta v 
enojnih narekovajih, nato sledi višaj # in ime delovnega lista drugega 
dokumenta ter pika in ime celice."
 
 #: cellreferences.xhp
 msgctxt ""
diff --git a/source/sl/helpcontent2/source/text/shared/01.po 
b/source/sl/helpcontent2/source/text/shared/01.po
index f79ddd1..28ae2a6 100644
--- a/source/sl/helpcontent2/source/text/shared/01.po
+++ b/source/sl/helpcontent2/source/text/shared/01.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-05-28 13:36+0200\n"
-"PO-Revision-Date: 2015-05-20 17:01+0200\n"
+"POT-Creation-Date: 2015-07-13 14:37+0200\n"
+"PO-Revision-Date: 2015-07-12 10:41+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "MIME-Version: 1.0\n"
@@ -34554,7 +34554,7 @@ msgctxt ""
 "36\n"
 "help.text"
 msgid "Automatically applies a border at the base

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - translations

2015-07-13 Thread Andras Timar 
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0153639c17d40061480a7bbde11fa0249e3051f
Author: Andras Timar 
Date:   Tue Jul 14 00:02:15 2015 +0200

Updated core
Project: translations  c588f61d5e916021efb0e579c5ddf755385e0d13

updated Slovenian translation

Change-Id: I01a4e5ac42e0f46b75c85c8cda4ac101eae5f3e3

diff --git a/translations b/translations
index 0a3dc17..c588f61 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0a3dc17706e41e232dc1e3bd497c60a50f3bf81d
+Subproject commit c588f61d5e916021efb0e579c5ddf755385e0d13
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: sl_SI/description.xml sl_SI/README_th_sl_SI.txt sl_SI/th_sl_SI_v2.dat

2015-07-13 Thread Andras Timar 
 sl_SI/README_th_sl_SI.txt |4 
 sl_SI/description.xml |4 
 sl_SI/th_sl_SI_v2.dat | 1954 +++---
 3 files changed, 1523 insertions(+), 439 deletions(-)

New commits:
commit a06da898df0371577c5c2466480f6c807e6c211f
Author: Andras Timar 
Date:   Mon Jul 13 23:55:57 2015 +0200

Updated Slovenian thesaurus

Change-Id: If822610ad6d9eca02629959cf8040fe1680f8140

diff --git a/sl_SI/README_th_sl_SI.txt b/sl_SI/README_th_sl_SI.txt
index a90862c..396fef0 100644
--- a/sl_SI/README_th_sl_SI.txt
+++ b/sl_SI/README_th_sl_SI.txt
@@ -2,7 +2,7 @@ The Slovenian thesaurus is developed as a part of project/
 Slovenski tezaver nastaja v okviru projekta:
OdprtiTezaver (www.tezaver.si)
 This dictionary pack includes version/Paket vsebuje različico:
-   1.7.17000
+   1.7.17500
 Thesaurus managed and edited by/Tezaver pripravlja in ureja:
Martin Srebotnjak (miles at filmsi net)
 Thesaurus data licensed under both/Podatki tezavra so izdani pod licencama:
@@ -18,7 +18,7 @@ Bug report/O napakah poročajte:
 http://external.openoffice.org/ form data:
 
 Product Name: Slovenian thesaurus
-Product Version: 1.7.17000
+Product Version: 1.7.17500
 Vendor or Owner Name: Martin Srebotnjak
 Vendor or Owner Contact: mi...@filmsi.net
 OpenOffice.org Contact: fil...@openoffice.org
diff --git a/sl_SI/description.xml b/sl_SI/description.xml
index 07b658b..85cab19 100644
--- a/sl_SI/description.xml
+++ b/sl_SI/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Slovenian spelling dictionary, hyphenation rules, 
and thesaurus
@@ -10,6 +10,6 @@
 
 
 
-http://sl.libreoffice.org/slovenjenje-2/jezikovne-razsiritve/"; 
lang="sl-SI">sl.libreoffice.org
+http://sl.libreoffice.org/skupnost/slovenjenje/jezikovne-razsiritve/";
 lang="sl-SI">sl.libreoffice.org
 
 
diff --git a/sl_SI/th_sl_SI_v2.dat b/sl_SI/th_sl_SI_v2.dat
index f1a6a7c..2971d0f 100644
--- a/sl_SI/th_sl_SI_v2.dat
+++ b/sl_SI/th_sl_SI_v2.dat
@@ -37,7 +37,8 @@ ISO8859-2
 (sam.)|prvenstvo
 ¹ank|1
 (sam.)|¹ank (pogovorno)|toèilna miza|toèilni pult
-¹ansa|1
+¹ansa|2
+(sam.)|¹ansa (pogovorno)|izgled|mo¾nost|mogoèost|obet|upanje
 (sam.)|¹ansa (pogovorno)|prilika|prilo¾nost
 ¹anson|1
 (sam.)|chanson|pesem|popevka
@@ -47,12 +48,14 @@ ISO8859-2
 (sam.)|¹antavost (slab¹alno)|¹epavost|kruljavost (ekspresivno)
 ¹apa|1
 (sam.)|taca
+¹ar¾a|1
+(sam.)|¹ar¾a (zastarelo)|èin
 ¹ar¾er|1
 (sam.)|okvir
 ¹ariti|1
 (gl.)|brèkati|brkljariti (ekspresivno)|brkljati (pogovorno)|brskati|stikati
 ¹arm|1
-(sam.)|dra¾|dra¾est|mik|mikavnost|oèarljivost|privlaènost
+(sam.)|dra¾|dra¾est|ljubkost|mik|mikavnost|oèarljivost|privlaènost
 ¹arnir|1
 (sam.)|zapirnica
 ¹arovit|1
@@ -65,6 +68,8 @@ ISO8859-2
 (gl.)|¹u¹njati
 ¹èavje|1
 (sam.)|¹avje
+¹èebljati|1
+(gl.)|èebljati
 ¹èegetavèek|1
 (sam.)|klitoris
 ¹èetka|1
@@ -84,7 +89,7 @@ ISO8859-2
 ¹enk|1
 (sam.)|¹enk (pogovorno)|dar|darilo|naklonilo (zastarelo)|naklonitev 
(zastarelo)|podarek (zastarelo)|poklon (zastarelo)|poklonilo 
(zastarelo)|poklonitev (zastarelo)|poklonstvo (zastarelo)|prezent 
(zastarelo)|vezilo (zastarelo)
 ¹ent|1
-(sam.)|¹ment|hudiè|hudiman|hudimar|hudir|parkelj|peklen¹èek|rogaè|satan|sku¹njavec|vrag|vragec|vranè|zlobec|zlodej
+(sam.)|¹ment|hudiè|hudiman|hudimar|hudir|hudnik|parkelj|peklen¹èek|rogaè|satan|sku¹njavec|vrag|vragec|vranè|zlobec|zlodej
 ¹entjan¾evka|1
 (sam.)|Hypericum perforatum (strokovno)|krènica|krvavec
 ¹epast|1
@@ -143,13 +148,16 @@ ISO8859-2
 (sam.)|¹pièenje (pogovorno)|ostrenje
 ¹initi|1
 (gl.)|¹vigniti|blisniti (ekspresivno)
+¹ipkova u¹ica|1
+(sam.)|Macrosiphon rosae (strokovno)
 ¹iptarski|1
 (prid.)|albanski
 ¹iren|1
 (prid.)|¹iro¹iren (ekspresivno)|obse¾en|prostran
 ¹irjava|1
 (sam.)|prostranstvo|vse¹ir
-¹irjenje|1
+¹irjenje|2
+(sam.)|dilatacija|raz¹irjanje
 (sam.)|iradiacija|raz¹irjanje
 ¹iro¹iren|1
 (prid.)|¹iren|¹iro¹iren (ekspresivno)|obse¾en|prostran
@@ -172,7 +180,7 @@ ISO8859-2
 ¹irokoustnost|1
 (sam.)|¹irokoustnost (ekspresivno)|bahavost|hvalisavost|razustnost
 ¹kandalozen|1
-(prid.)|¹kandalozen (ekspresivno)|grozen 
(ekspresivno)|nekvaliteten|neprebavljiv (ekspresivno)|neu¾iten 
(ekspresivno)|neznosen|obupen|po¹asten (ekspresivno)|slab|stra¹en (ekspresivno)
+(prid.)|¹kandalozen (ekspresivno)|grozen 
(ekspresivno)|hud|nekvaliteten|neprebavljiv (ekspresivno)|neu¾iten 
(ekspresivno)|neznosen|obupen|po¹asten (ekspresivno)|slab|srep|stra¹en 
(ekspresivno)
 ¹kant|1
 (sam.)|¹kant (zastarelo)|¹kripalo (slab¹alno)|gosli|violina
 ¹karjevec|1
@@ -187,6 +195,10 @@ ISO8859-2
 (prid.)|¹kilav|kri¾emgled|krivogled|prekogled (zastarelo)
 ¹kilav|1
 (prid.)|¹kilast|kri¾emgled|krivogled|prekogled (zastarelo)
+¹klepetati|1
+(gl.)|¹klopotati|¹krepetati
+¹klopotati|1
+(gl.)|¹klepetati|¹krepetati
 ¹kodljiv|2
 (prid.)|kvaren
 (prid.)|maligen|nevaren|poguben
@@ -195,7 +207,7 @@ IS

[Libreoffice-commits] core.git: dictionaries

2015-07-13 Thread Andras Timar 
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9be553f4c61f220ebbe212dc76cb9cce4ae1c106
Author: Andras Timar 
Date:   Mon Jul 13 23:55:57 2015 +0200

Updated core
Project: dictionaries  a06da898df0371577c5c2466480f6c807e6c211f

Updated Slovenian thesaurus

Change-Id: If822610ad6d9eca02629959cf8040fe1680f8140

diff --git a/dictionaries b/dictionaries
index bc0b610..a06da89 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit bc0b610f6989aa0c20792ae88c663c3f5d464cc6
+Subproject commit a06da898df0371577c5c2466480f6c807e6c211f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit: Reliability and fidelity of verification results

2015-07-13 Thread Norbert Thiebaud 
On Mon, Jul 13, 2015 at 1:51 PM, David Ostrovsky  wrote:
>> And your patch 8 would have failed the same way on tb58/tb59/tb60
>
> It requires a lot of efforts and time to upgrade all TBs to the newest
> baseline: 18 min. for OS + 22 min. for XCode. And we don't have time to
> do that. I understand all that.

Passive aggressive tone aside, for the record Yosemite + XCode download
is 7-8G... In the best of time that is 2-3 hours of download here...

>
> But what is the value of having conflicting tool chain versions
> verifying the Gerrit changes? So that change owners couldn't really
> trust the verification results, or if they do and submit changes that
> were approved by TB with up-to-date tool chain, they jeopardize green
> master or even stable release branch, because the same change is
> identified as breakage by a TB with stale tool chain?

The release builder have the so-called 'stale' tool chain.
Just like in real-life and like other platform there is a diversity of
platform and we usually do not drop
support for 'older' platform unless there is an imperative motivation.

Downgrading on Mac is not as trivial as you make it sound.. in fact
please explain to me how to do that
We've just put a brand new MacPro with Yosemite online, how would I go
about 'downgrading' it to maverick ?

Upgrading is 'easier' but not free.. and certainly not the 40 minutes
you say, otoh at some point we will upgrade...
But in the end your patch made a wrong assumption:
"There is no reason to use boost::bind when modern C++11 toolchain
is supported."
Apparently that support is not good enough for the supported baselines.
Do not get me wrong. I applaud the effort to get rid of boost if we
can.. that is a big and expensive dep.


>My suggestion is either to downgrade TB66 or upgrade all other Mac OS X
>TBs to the same baseline.

My suggestion is: adapt your patch to avoid the issue.
and/or bring the issue to the ESC. if dropping 10.9 is something that
people things is worth doing... I surely can upgrade my 10.9 mac...
although ti will take much more than 40 minutes to do so.

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

Re: Multiselection needs work?

2015-07-13 Thread Julien Nabet 

On 13/07/2015 15:21, Michael Meeks wrote:

On Mon, 2015-07-13 at 13:33 +0200, Julien Nabet wrote:

In this case perhaps getFiles
should use getSelectedFiles() then truncate?

Heh - actually that's a pretty good solution for the general case. Call
the more powerful method from XFilePicker2 and then just truncate it =)
Then again - these problems whereby one uses the other need unwinding of
course.
I thought about a step by step/commit by commit process to change 
getFiles, and if necessary getSelectedFiles first, then unwinding each 
use of getFiles and submit a patch for each one.

Do you think it could be a problem?



Hope I spotted them all.

It'd be nice to switch all 'getFiles' for the above, and ensure that we
are not using getFiles for the impl. of getSelectedFiles ;-) is that
possible ?

Isn't it the same as unwinding each case?

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

2015-07-13 Thread matteocam 
 editeng/source/outliner/overflowingtxt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 024ebf6859ceadd9a259b9607bdf1063516b0a29
Author: matteocam 
Date:   Mon Jul 13 16:56:13 2015 -0400

Fix juxtaposing special case in deep merge

Change-Id: Ica2e7935a4328ba05381ff44a1e5a0292b2860ea

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 7df78b0..31b3d64 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -79,7 +79,7 @@ OutlinerParaObject *impGetDeeplyMergedParaObject(Outliner 
*pOutl,
 pOutl->SetText(*pPObj1);
 return impGetJuxtaposedParaObject(
 pOutl,
-pOutl->CreateParaObject(0, nParaCount - 1),
+pOutl->CreateParaObject(0, nParaCount1 - 1),
 pPObj2);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source svx/source

2015-07-13 Thread matteocam 
 editeng/source/outliner/overflowingtxt.cxx |2 +-
 svx/source/svdraw/svdedxv.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6fc58c5c561b5f3f02a9317a470c73ce63e3fcf8
Author: matteocam 
Date:   Mon Jul 13 16:55:17 2015 -0400

Fix juxtaposing special case in deep merge

Change-Id: I67bb19b45f503abcb863f378132b58bc81b603a1

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index efaaa9b..7df78b0 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -79,7 +79,7 @@ OutlinerParaObject *impGetDeeplyMergedParaObject(Outliner 
*pOutl,
 pOutl->SetText(*pPObj1);
 return impGetJuxtaposedParaObject(
 pOutl,
-pOutl->CreateParaObject(0, nLastPara1 - 1),
+pOutl->CreateParaObject(0, nParaCount - 1),
 pPObj2);
 }
 
commit d13e5209a7e074210b8555aadd892623dc9ff086
Author: matteocam 
Date:   Mon Jul 13 16:49:18 2015 -0400

Change cursor

Change-Id: I893008684b640e90e07b3e770780a395c12267ca

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3abebed..7314e41 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -554,7 +554,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 SdrBeginTextEdit(pNextLink);
 // OutlinerView has changed, so we update the pointer
 pOLV = GetTextEditOutlinerView();
-
//pOLV->SetSelection(pTextChain->GetPostChainingSel(pTextObj)); // XXX
+pOLV->SetSelection(pTextChain->GetPostChainingSel(pTextObj)); 
// XXX
 
 break;
 case CursorChainingEvent::TO_PREV_LINK:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx   |4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ec9e5a231e3f38e58e0dcc83f5a714037dc34b38
Author: Caolán McNamara 
Date:   Mon Jul 13 20:44:16 2015 +0100

fix a third emf crash

Change-Id: I3b5d0daf05e3272d2afa0da84ff0b1f8d5c965a4
(cherry picked from commit 173fd90387e8bb7f33c2608628f12c7f772f0277)

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf
new file mode 100644
index 000..92da5f0
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index a9b6938..4d10989 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1287,7 +1287,9 @@ bool EnhWMFReader::ReadEnhWMF()
 DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) 
== 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
 Point aPos( ptlReferenceX, ptlReferenceY );
-if ( nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
+bool bLenSane = nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) );
+bool bOffStringSane = nOffString <= nEndPos - nCurPos;
+if (bLenSane && bOffStringSane)
 {
 if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= 
nNextPos ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf |binary
 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf  |binary
 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf  |binary
 vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf |binary
 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif |binary
 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif |binary
 vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf  |binary
 vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm |   12 
 vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm | 2011 +
 vcl/qa/cppunit/graphicfilter/filters-test.cxx  |4 
 vcl/source/filter/igif/decode.cxx  |5 
 vcl/source/filter/ixbm/xbmread.cxx |2 
 vcl/source/filter/wmf/enhwmf.cxx   |8 
 vcl/source/filter/wmf/winmtf.cxx   |   26 
 vcl/source/filter/wmf/winwmf.cxx   |   31 
 15 files changed, 2072 insertions(+), 27 deletions(-)

New commits:
commit 902e90c99b78e423fc18d91053f9f3039202b0e0
Author: Caolán McNamara 
Date:   Mon Jul 13 09:45:55 2015 +0100

emf: fix another hang

Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca
(cherry picked from commit fe20502c86ef6156a54bb37ba2560c8b64d129a4)
Reviewed-on: https://gerrit.libreoffice.org/16979
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 776618f628ea6302374c90722c3dbd0a6dac1c19)

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf
new file mode 100644
index 000..e3baf3b
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 12a9e44..a9b6938 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1570,9 +1570,9 @@ bool EnhWMFReader::ReadHeader()
 
 pWMF->ReadInt32(nRecordCount);
 
-if (nRecordCount == 0)
+if (nRecordCount <= 0)
 {
-SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
0! This shouldn't "
+SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
<= 0! This shouldn't "
 "be possible... indicator of possible file 
corruption?");
 return false;
 }
commit f13ce9af5d0b275c43fad1753b0acf4ff39ab041
Author: Caolán McNamara 
Date:   Mon Jul 13 08:33:50 2015 +0100

emf: test for empty polygons

Change-Id: I3c8896230e3d48a37f4b8d702b0f673e44f45ba4
(cherry picked from commit 7df4d8544c6b12e31bcb81d9389d03ae7c11bfea)
Reviewed-on: https://gerrit.libreoffice.org/16974
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit bd7b37b8fcf193e2ce20a84ac68bdb22ed8a9ade)

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf
new file mode 100644
index 000..6adabec
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf differ
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index b8994cb..a1005f5 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1286,18 +1286,22 @@ void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, 
bool bTo, bool bRecordPath )
 {
 UpdateClipRegion();
 
-ImplMap( rPolygon );
-if ( bTo )
-{
-rPolygon[ 0 ] = maActPos;
-maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
-}
-if ( bRecordPath )
-aPathObj.AddPolyLine( rPolygon );
-else
+sal_uInt16 nPoints = rPolygon.GetSize();
+if (nPoints >= 1)
 {
-UpdateLineStyle();
-mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+ImplMap( rPolygon );
+if ( bTo )
+{
+rPolygon[ 0 ] = maActPos;
+maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
+}
+if ( bRecordPath )
+aPathObj.AddPolyLine( rPolygon );
+else
+{
+UpdateLineStyle();
+mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+}
 }
 }
 
commit d047b7aaeca84b00910687744dcc9fbda43f1266
Author: Caolán McNamara 
Date:   Sun Jul 12 21:07:21 2015 +0100

emf: test for negative numbers

Change-Id: I9d9b6f3e9592ca7b85cee5422e43d4ca46b8bb36
(cherry picked from commit 4661b2dd34bd7c56b6d783d49f265e9ecde19caa)
Reviewed-on: https://gerrit.libreoffice.org/16970
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit b7bcf8ccc15f7d80a3966a340b987dfa9fd41bd0)

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf
new file mode 100644
index 000..bbc0285
Binary files

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

2015-07-13 Thread matteocam 
 editeng/source/outliner/overflowingtxt.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9890550e354a311714550fa42d1e8a6aae8ea04b
Author: matteocam 
Date:   Mon Jul 13 16:13:46 2015 -0400

More debugging output

Change-Id: I2a375ad899b8a284867251f5515b22d29834d1ee

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index ecb69d3..efaaa9b 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -219,10 +219,13 @@ OutlinerParaObject 
*OFlowChainedText::CreateOverflowingParaObject(Outliner *pOut
 if (mpOverflowingTxt == NULL || pTextToBeMerged == NULL)
 return NULL;
 
-if (mbIsDeepMerge)
+if (mbIsDeepMerge) {
+fprintf(stderr, "[TEXTCHAINFLOW - OF] Deep merging paras\n" );
 return mpOverflowingTxt->GetJuxtaposedParaObject(pOutliner, 
pTextToBeMerged );
-else
+} else {
+fprintf(stderr, "[TEXTCHAINFLOW - OF] Juxtaposing paras\n" );
 return mpOverflowingTxt->GetDeeplyMergedParaObject(pOutliner, 
pTextToBeMerged );
+}
 }
 
 
@@ -254,9 +257,11 @@ OutlinerParaObject 
*UFlowChainedText::CreateMergedUnderflowParaObject(Outliner *
 OutlinerParaObject *pCurText = mpUnderflowPObj;
 
 if (mbIsDeepMerge) {
+fprintf(stderr, "[TEXTCHAINFLOW - UF] Deep merging paras\n" );
 pNewText = impGetDeeplyMergedParaObject(pOutl, pCurText, 
pNextLinkWholeText);
 } else {
 // NewTextForCurBox = Txt(CurBox) ++ Txt(NextBox)
+fprintf(stderr, "[TEXTCHAINFLOW - UF] Juxtaposing paras\n" );
 pNewText = impGetJuxtaposedParaObject(pOutl, pCurText, 
pNextLinkWholeText);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 chart2/source/controller/main/ChartController.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8de7d44f96252e97e224d42466698114370dbaa3
Author: Caolán McNamara 
Date:   Mon Jul 13 20:59:05 2015 +0100

disable newly unused code since last disable

Change-Id: I9f0abc3963ac4687e29fc629f1b9e9bb1fffaf8a

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index d884262..26376b1 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -348,6 +348,7 @@ uno::Sequence< OUString > 
ChartController::getSupportedServiceNames_Static()
 return aSNS;
 }
 
+/*
 namespace {
 
 uno::Reference getSidebarFromModel(uno::Reference 
xModel)
@@ -362,6 +363,7 @@ uno::Reference 
getSidebarFromModel(uno::Reference x
 }
 
 }
+*/
 
 // XController
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

2015-07-13 Thread matteocam 
 svx/source/svdraw/textchainflow.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 8291a205f220a975dc2f44b6de0b06f4310fc879
Author: matteocam 
Date:   Mon Jul 13 16:02:30 2015 -0400

Add debug info for para counts

Change-Id: I0a2a6b7d783fc3c27ddaea4cc1dad6595617f948

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 57147d3..fe4f9fc 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -21,12 +21,15 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
 TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget)
 : mpTargetLink(pChainTarget)
 {
+fprintf(stderr, "[TEXTCHAINFLOW] Creating a new TextChainFlow\n");
+
 mpTextChain = mpTargetLink->GetTextChain();
 mpNextLink = mpTargetLink->GetNextLinkInChain();
 bCheckedFlowEvents = false;
@@ -196,6 +199,9 @@ void TextChainFlow::ExecuteOverflow(SdrOutliner 
*pNonOverflOutl, SdrOutliner *pO
 void TextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverflOutl)
 {
 OutlinerParaObject *pNewText = 
impGetNonOverflowingParaObject(pNonOverflOutl);
+
+fprintf(stderr, "[TEXTCHAINFLOW - OF] SOURCE box set to %d paras \n", 
pNewText->GetTextObject().GetParagraphCount());
+
 // adds it to current outliner anyway (useful in static decomposition)
 pNonOverflOutl->SetText(*pNewText);
 
@@ -214,6 +220,7 @@ void 
TextChainFlow::impMoveChainedTextToNextLink(SdrOutliner *pOverflOutl)
 }
 
 OutlinerParaObject *pNewText = impGetOverflowingParaObject(pOverflOutl);
+fprintf(stderr, "[TEXTCHAINFLOW - OF] DEST box set to %d paras \n", 
pNewText->GetTextObject().GetParagraphCount());
 if (pNewText)
 mpNextLink->NbcSetOutlinerParaObject(pNewText);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/jfreereport

2015-07-13 Thread Julien Nabet 
 external/jfreereport/UnpackedTarball_jfreereport_libformula.mk |1 
 external/jfreereport/patches/libformula-minutes_truncation.patch.1 |   17 
++
 2 files changed, 18 insertions(+)

New commits:
commit 379046962f055d26484796690c3dbc491e23b0a5
Author: Julien Nabet 
Date:   Mon Jul 13 16:03:15 2015 +0200

tdf#92693: ReportBuilder: MINUTES() rounded to nearest for fractional 
minutes

... instead of the correct truncation.

Thanks to Lionel for the idea of the fix and his patience for newbies like 
me!

Change-Id: Iae9ec9251c0beb0c1856a6573f6ff7963d216256
Reviewed-on: https://gerrit.libreoffice.org/17016
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk 
b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
index 2bc3229..bb78966 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\
 $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\
external/jfreereport/patches/common_build.patch \
external/jfreereport/patches/libformula-time-notz.patch \
+   external/jfreereport/patches/libformula-minutes_truncation.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/patches/libformula-minutes_truncation.patch.1 
b/external/jfreereport/patches/libformula-minutes_truncation.patch.1
new file mode 100644
index 000..0df98db
--- /dev/null
+++ b/external/jfreereport/patches/libformula-minutes_truncation.patch.1
@@ -0,0 +1,17 @@
+Seulement dans jfreereport_libformula: bin
+Seulement dans jfreereport_libformula: build.log
+Seulement dans jfreereport_libformula: dist
+diff -ur 
jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
 
jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
+--- 
jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
2015-07-13 15:55:31.752539618 +0200
 
jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
2015-07-13 15:56:27.084394065 +0200
+@@ -74,7 +74,7 @@
+ 
+ // Multiply the minutes with 60 to get the minutes as ints 
+ final BigDecimal minutes = minutesFraction.multiply(MINUTES);
+-final BigDecimal minutesAsInt = minutes.setScale(0, 
BigDecimal.ROUND_HALF_UP);
++final BigDecimal minutesAsInt = NumberUtil.performIntRounding(minutes);
+ return new TypeValuePair(NumberType.GENERIC_NUMBER, minutesAsInt);
+   }
+-}
+\ Pas de fin de ligne à la fin du fichier
++}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx   |4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 173fd90387e8bb7f33c2608628f12c7f772f0277
Author: Caolán McNamara 
Date:   Mon Jul 13 20:44:16 2015 +0100

fix a third emf crash

Change-Id: I3b5d0daf05e3272d2afa0da84ff0b1f8d5c965a4

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf
new file mode 100644
index 000..92da5f0
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index d8292ac..81b8b7b 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1441,7 +1441,9 @@ bool EnhWMFReader::ReadEnhWMF()
 DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) 
== 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
 Point aPos( ptlReferenceX, ptlReferenceY );
-if ( nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
+bool bLenSane = nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) );
+bool bOffStringSane = nOffString <= nEndPos - nCurPos;
+if (bLenSane && bOffStringSane)
 {
 if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= 
nNextPos ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

2015-07-13 Thread matteocam 
 editeng/source/outliner/outliner.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7aae39ef5679db0299c34095781187546cbedff2
Author: matteocam 
Date:   Mon Jul 13 15:12:48 2015 -0400

Fix wrong definition of bLastParaIsInterrupted

Change-Id: Ib0b65afa6c44e9b6b83c2acef5044d8cd3182a00

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index a8e5be0..148efa7 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2161,9 +2161,9 @@ NonOverflowingText *Outliner::GetNonOverflowingText() 
const
 }
 EditTextObject *pTObj = 
pEditEngine->CreateTextObject(aNonOverflowingTextSelection);
 
-sal_Int32 nLastLine = GetLineCount(nOverflowingPara)-1;
+//sal_Int32 nLastLine = GetLineCount(nOverflowingPara)-1;
 bool bLastParaInterrupted =
-pEditEngine->GetOverflowingLineNum() < nLastLine;
+pEditEngine->GetOverflowingLineNum() > 0;
 
 return new NonOverflowingText(pTObj, bLastParaInterrupted);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

2015-07-13 Thread matteocam 
 editeng/source/outliner/overflowingtxt.cxx |   55 ++---
 1 file changed, 50 insertions(+), 5 deletions(-)

New commits:
commit 5694e32c7cbfb9079585502fae14ba7a583db999
Author: matteocam 
Date:   Mon Jul 13 14:53:14 2015 -0400

Add rough algorithm for deep merging. Not all attrbs saved.

Change-Id: I369f0e2c9e56e0257284a038bfe707dd37a88421

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 6a73775..ecb69d3 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -54,18 +54,63 @@ OutlinerParaObject *impGetJuxtaposedParaObject(Outliner 
*pOutl,
 return pPObj;
 }
 
+// In a deep merge parts of text are not only juxtaposed but the last and 
first para become the same
 OutlinerParaObject *impGetDeeplyMergedParaObject(Outliner *pOutl,
OutlinerParaObject *pPObj1,
OutlinerParaObject *pPObj2)
-{ // XXX: For now just the same
-
+{
 assert(pOutl && pPObj1 &&  pPObj2);
 
+const EditTextObject rTObj1 = pPObj1->GetTextObject();
+const EditTextObject rTObj2 = pPObj2->GetTextObject();
+sal_Int32 nParaCount1 = rTObj1.GetParagraphCount();
+
+// If no paras in the first text, just use second text
+if (nParaCount1 == 0) {
+pOutl->SetText(*pPObj2);
+return pOutl->CreateParaObject();
+}
+
+
+sal_Int32 nLastPara1 = nParaCount1 - 1;
+
+// If last para of first text is empty, discard it and just juxtapose
+if (rTObj1.GetText(nLastPara1) == "" && nParaCount1 >= 2) {
+pOutl->SetText(*pPObj1);
+return impGetJuxtaposedParaObject(
+pOutl,
+pOutl->CreateParaObject(0, nLastPara1 - 1),
+pPObj2);
+}
+
+/* --- Standard procedure: when pPObj1 is 'fine' --- */
+
+
+// Cut first para of second object
+OUString aFirstParaTxt2 = rTObj2.GetText(0);
+
+// Prepare remainder for text 2
+OutlinerParaObject *pRemainderPObj2 = NULL;
+if (rTObj2.GetParagraphCount() > 1) {
+pOutl->SetText(*pPObj2);
+pRemainderPObj2 = pOutl->CreateParaObject(1); // from second para on
+} else { // No text to append
+pRemainderPObj2 = NULL;
+}
+
+// Set first object as text
 pOutl->SetText(*pPObj1);
-pOutl->AddText(*pPObj2);
-OutlinerParaObject *pPObj = pOutl->CreateParaObject();
 
-return pPObj;
+// Merges LastPara(pPObj1) with FirstPara(pPObj2)
+Paragraph *pLastPara1 = pOutl->GetParagraph(nLastPara1);
+OUString aLastParaTxt1 = pOutl->GetText(pLastPara1);
+pOutl->SetText(aLastParaTxt1 + aFirstParaTxt2, pLastPara1); // XXX: This 
way it screws up attributes!
+
+// add the remainder of the second text
+if (pRemainderPObj2)
+pOutl->AddText(*pRemainderPObj2);
+
+return pOutl->CreateParaObject();
 }
 
 // class OverflowingText
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit: Reliability and fidelity of verification results

2015-07-13 Thread David Ostrovsky 
On Mon, 2015-07-13 at 06:29 -0500, Norbert Thiebaud wrote:
> On Mon, Jul 13, 2015 at 1:22 AM, David Ostrovsky  wrote:
> >
> > There weren't any changes in the affected file textdoc.cxx between those
> > two patch sets.
> that is a bold thing to say when a patch change stuff like uno headers
> or rtl headers

I see how uno and rtl headers changes look suspicious, but the removal
of get_pointer() function there is completely unrelated.

> tb66 is Yosemite
> Apple LLVM version 6.1.0 (clang-602.0.49) (based on LLVM 3.6.0svn)
> Target: x86_64-apple-darwin14.3.0
> 
> tb60 is Maverick
> Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn)
> Target: x86_64-apple-darwin13.4.0
> 

This is a known compiler bug; now with access to Mavericks:

$ clang++ --version
Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
Target: x86_64-apple-darwin13.4.0

and with this reproducer: [1] it's failing in the same way as on TB 60:

__functional_03:43:11: note: candidate function not viable: 'this'
argument has type 'const std::__1::__mem_fn', but method is
not marked const
  operator() (_A0& __a0)

To rectify it:

1. Upgrade Mavericks to Yosemite
2. Upgrade Xcode to Xcode 6.3.2 (Build version 6D2105)

$ clang++ --version
Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
Target: x86_64-apple-darwin14.3.0

And now it works:

$ clang++ -Wno-c++11-extensions mem_fn_const_problem.cxx && ./a.out
42

Before new Xcode activation this diff shows the culprit:

$
diff 
/Applications/.prepare-Xcode.app/reloc/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/functional
 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/functional
1224c1224
<   operator() (_ArgTypes&&... __args) const
---
>   operator() (_ArgTypes&&... __args)


> And your patch 8 would have failed the same way on tb58/tb59/tb60

It requires a lot of efforts and time to upgrade all TBs to the newest
baseline: 18 min. for OS + 22 min. for XCode. And we don't have time to
do that. I understand all that.

But what is the value of having conflicting tool chain versions
verifying the Gerrit changes? So that change owners couldn't really
trust the verification results, or if they do and submit changes that
were approved by TB with up-to-date tool chain, they jeopardize green
master or even stable release branch, because the same change is
identified as breakage by a TB with stale tool chain?

My suggestion is either to downgrade TB66 or upgrade all other Mac OS X
TBs to the same baseline.

[1] http://paste.openstack.org/show/371884



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

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

2015-07-13 Thread Markus Mohrhard 
 chart2/source/controller/main/ChartController.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit f90307a9372579b15b837dc83d959b394c6a0537
Author: Markus Mohrhard 
Date:   Mon Jul 13 19:43:59 2015 +0200

disable that code for now

Change-Id: I9f65babd0314498145746c452180ccf4fab64720
Reviewed-on: https://gerrit.libreoffice.org/17020
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index d548ba3..d884262 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -376,9 +376,11 @@ void SAL_CALL ChartController::attachFrame(
 
 mpSelectionChangeHandler->Connect();
 
+/*
 uno::Reference xSidebar = getSidebarFromModel(getModel());
 sfx2::sidebar::SidebarController* pSidebar = 
dynamic_cast(xSidebar.get());
 sfx2::sidebar::SidebarController::registerSidebarForFrame(pSidebar, this);
+*/
 
 if(m_xFrame.is()) //what happens, if we do have a Frame already??
 {
@@ -747,12 +749,14 @@ void SAL_CALL ChartController::dispose()
 {
 mpSelectionChangeHandler->Disconnect();
 
+/*
 if (getModel().is())
 {
 uno::Reference xSidebar = 
getSidebarFromModel(getModel());
 sfx2::sidebar::SidebarController* pSidebar = 
dynamic_cast(xSidebar.get());
 sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, 
this);
 }
+*/
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng

2015-07-13 Thread matteocam 
 editeng/source/outliner/overflowingtxt.cxx |   78 +++--
 include/editeng/overflowingtxt.hxx |3 +
 2 files changed, 65 insertions(+), 16 deletions(-)

New commits:
commit d35ecc609fa55835f3942656dcd9330c24dc4521
Author: matteocam 
Date:   Mon Jul 13 14:08:00 2015 -0400

Add impGetDeeplyMergedParaObject. But with juxtaposition semantics

Change-Id: Idd8d8d39d7ddabc9bdfe416250c6611b21f74e11

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index eb6bfe5..6a73775 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -26,7 +26,7 @@
 #include 
 
 
-// Helper function for *OverflowingText classes
+/* Helper functions for *OverflowingText classes  */
 
 ESelection getLastPositionSel(const EditTextObject *pTObj)
 {
@@ -40,6 +40,34 @@ ESelection getLastPositionSel(const EditTextObject *pTObj)
 return aEndPos;
 }
 
+// Put a para next to each other in the same OutlinerParaObject
+OutlinerParaObject *impGetJuxtaposedParaObject(Outliner *pOutl,
+   OutlinerParaObject *pPObj1,
+   OutlinerParaObject *pPObj2)
+{
+assert(pOutl && pPObj1 &&  pPObj2);
+
+pOutl->SetText(*pPObj1);
+pOutl->AddText(*pPObj2);
+OutlinerParaObject *pPObj = pOutl->CreateParaObject();
+
+return pPObj;
+}
+
+OutlinerParaObject *impGetDeeplyMergedParaObject(Outliner *pOutl,
+   OutlinerParaObject *pPObj1,
+   OutlinerParaObject *pPObj2)
+{ // XXX: For now just the same
+
+assert(pOutl && pPObj1 &&  pPObj2);
+
+pOutl->SetText(*pPObj1);
+pOutl->AddText(*pPObj2);
+OutlinerParaObject *pPObj = pOutl->CreateParaObject();
+
+return pPObj;
+}
+
 // class OverflowingText
 
 OverflowingText::OverflowingText(EditTextObject *pTObj)
@@ -89,24 +117,35 @@ OutlinerParaObject 
*OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, Ou
 return NULL;
 }
 
-// Simply Juxtaposing; no within-para merging
 OutlinerParaObject *pOverflowingPObj = new 
OutlinerParaObject(*mpContentTextObj);
 // the OutlinerParaObject constr. at the prev line gives no valid outliner 
mode, so we set it
 pOverflowingPObj->SetOutlinerMode(pOutl->GetOutlinerMode());
 
-/* Actual Text Setting */
-pOutl->SetText(*pOverflowingPObj);
+// Simply Juxtaposing; no within-para merging
+return impGetJuxtaposedParaObject(pOutl, pOverflowingPObj, pNextPObj);
+}
 
-// Set selection position between new and old text
-//maInsertionPointSel = impGetEndSelection(pOutl);  // XXX: Maybe setting 
in the constructor is just right
+OutlinerParaObject *OverflowingText::impMakeOverflowingParaObject(Outliner 
*pOutliner)
+{
+if (mpContentTextObj == NULL) {
+fprintf(stderr, "[Chaining] OverflowingText's mpContentTextObj is 
NULL!\n");
+return NULL;
+}
+
+// Simply Juxtaposing; no within-para merging
+OutlinerParaObject *pOverflowingPObj = new 
OutlinerParaObject(*mpContentTextObj);
+// the OutlinerParaObject constr. at the prev line gives no valid outliner 
mode, so we set it
+pOverflowingPObj->SetOutlinerMode(pOutliner->GetOutlinerMode());
 
-pOutl->AddText(*pNextPObj);
+return pOverflowingPObj;
+}
 
-// End Text Setting
 
-OutlinerParaObject *pPObj = pOutl->CreateParaObject();
-//pPObj->SetOutlinerMode(pOutl->GetOutlinerMode());
-return pPObj;
+OutlinerParaObject *OverflowingText::GetDeeplyMergedParaObject(Outliner 
*pOutliner, OutlinerParaObject *pNextPObj)
+{
+OutlinerParaObject *pOverflowingPObj = 
impMakeOverflowingParaObject(pOutliner);
+
+return impGetDeeplyMergedParaObject(pOutliner, pOverflowingPObj, 
pNextPObj);
 }
 
 // class OFlowChainedText
@@ -135,9 +174,13 @@ OutlinerParaObject 
*OFlowChainedText::CreateOverflowingParaObject(Outliner *pOut
 if (mpOverflowingTxt == NULL || pTextToBeMerged == NULL)
 return NULL;
 
-return mpOverflowingTxt->GetJuxtaposedParaObject(pOutliner, 
pTextToBeMerged );
+if (mbIsDeepMerge)
+return mpOverflowingTxt->GetJuxtaposedParaObject(pOutliner, 
pTextToBeMerged );
+else
+return mpOverflowingTxt->GetDeeplyMergedParaObject(pOutliner, 
pTextToBeMerged );
 }
 
+
 OutlinerParaObject *OFlowChainedText::CreateNonOverflowingParaObject(Outliner 
*pOutliner)
 {
 if (mpNonOverflowingTxt == NULL)
@@ -162,12 +205,15 @@ UFlowChainedText::UFlowChainedText(Outliner *pOutl, bool 
bIsDeepMerge)
 
 OutlinerParaObject *UFlowChainedText::CreateMergedUnderflowParaObject(Outliner 
*pOutl, OutlinerParaObject *pNextLinkWholeText)
 {
+OutlinerParaObject *pNewText = NULL;
 OutlinerParaObject *pCurText = mpUnderflowPObj;
 
-// NewTextForCurBox = Txt(CurBox) ++ Txt(NextBox)
-pOutl->SetText(*pCurText);
-pOutl->AddText(*pNextLinkWholeText);
-OutlinerP

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

2015-07-13 Thread Caolán McNamara 
 vcl/source/gdi/jobset.cxx |   29 +
 1 file changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 9051d3b59cf6e5fd590506bb86bfb8929d3024c3
Author: Caolán McNamara 
Date:   Mon Jan 26 11:26:41 2015 +

coverity#1266485 Untrusted value as argument

Change-Id: I7708ecaf5412535055584ed6c71beaa9cd71c10c
(cherry picked from commit 0934ed1a40c59c169354b177d7dab4228de66171)

min legal size here is > 4

(cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3)

Change-Id: I9f68d000b32623db4d949d13284043630f5689f4
(cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab)
Reviewed-on: https://gerrit.libreoffice.org/16984
Reviewed-by: David Tardon 
Reviewed-by: Björn Michaelsen 
Reviewed-by: Eike Rathke 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index ec1f44f..c67255e 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -218,19 +218,24 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version 
not set on rOStream" );
 
 {
-sal_Size nFirstPos = rIStream.Tell();
-
 sal_uInt16 nLen = 0;
 rIStream.ReadUInt16( nLen );
-if ( !nLen )
+if (nLen <= 4)
 return rIStream;
 
 sal_uInt16 nSystem = 0;
 rIStream.ReadUInt16( nSystem );
-
-boost::scoped_array pTempBuf(new char[nLen]);
-rIStream.Read( pTempBuf.get(),  nLen - sizeof( nLen ) - sizeof( 
nSystem ) );
-if ( nLen >= sizeof(ImplOldJobSetupData)+4 )
+const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
+if (nRead > rIStream.remainingSize())
+{
+SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() <<
+ " max possible entries, but " << nRead << " claimed, 
truncating");
+return rIStream;
+}
+sal_Size nFirstPos = rIStream.Tell();
+boost::scoped_array pTempBuf(new char[nRead]);
+rIStream.Read(pTempBuf.get(),  nRead);
+if (nRead >= sizeof(ImplOldJobSetupData))
 {
 ImplOldJobSetupData* pData = (ImplOldJobSetupData*)pTempBuf.get();
 if ( rJobSetup.mpData )
@@ -255,7 +260,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
  nSystem == JOBSET_FILE605_SYSTEM )
 {
 Impl364JobSetupData* pOldJobData= 
(Impl364JobSetupData*)(pTempBuf.get() + sizeof( ImplOldJobSetupData ));
-sal_uInt16 nOldJobDataSize  = SVBT16ToShort( 
pOldJobData->nSize );
+sal_uInt16 nOldJobDataSize  = SVBT16ToShort( 
pOldJobData->nSize );
 pJobData->mnSystem  = SVBT16ToShort( 
pOldJobData->nSystem );
 pJobData->mnDriverDataLen   = SVBT32ToUInt32( 
pOldJobData->nDriverDataLen );
 pJobData->meOrientation = 
(Orientation)SVBT16ToShort( pOldJobData->nOrientation );
@@ -272,8 +277,8 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 }
 if( nSystem == JOBSET_FILE605_SYSTEM )
 {
-rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 
4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen );
-while( rIStream.Tell() < nFirstPos + nLen )
+rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 
sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen );
+while( rIStream.Tell() < nFirstPos + nRead )
 {
 OUString aKey = 
read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
 OUString aValue = 
read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
@@ -291,9 +296,9 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 else
 pJobData->maValueMap[ aKey ] = aValue;
 }
-DBG_ASSERT( rIStream.Tell() == nFirstPos+nLen, "corrupted 
job setup" );
+DBG_ASSERT( rIStream.Tell() == nFirstPos+nRead, "corrupted 
job setup" );
 // ensure correct stream position
-rIStream.Seek( nFirstPos + nLen );
+rIStream.Seek(nFirstPos + nRead);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Eike Rathke 
 sc/inc/globstr.hrc| 1123 +-
 sc/source/ui/namedlg/namemgrtable.cxx |2 
 sc/source/ui/src/globstr.src  |6 
 3 files changed, 568 insertions(+), 563 deletions(-)

New commits:
commit baffa3e3768df1d016d79349ed074ba20b34d5c1
Author: Eike Rathke 
Date:   Mon Jul 13 19:40:50 2015 +0200

renumber globstr.hrc STR_...

and move STR_HEADER_RANGE_OR_EXPR and STR_HEADER_RANGE to proper
positions.

Renumbered sc/inc/globstr.hrc consecutively using
sc/util/number-defines-consecutively.awk which closed a gap of six
strings.

Change-Id: Ibf643ad5b243caf7b01226af399e60bbe0433a15

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 6ca1fd7..f37110f 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -89,620 +89,619 @@
 #define STR_MSSG_INSERTCELLS_0  50
 #define STR_MSSG_DELETECELLS_0  51
 #define STR_MSSG_MERGECELLS_0   52
-#define STR_MSSG_SOLVE_054
-#define STR_MSSG_SOLVE_155
-#define STR_MSSG_SOLVE_256
-#define STR_MSSG_SOLVE_357
-#define STR_MSSG_SOLVE_458
-
-#define STR_TABLE_GESAMTERGEBNIS59
-#define STR_TABLE_ERGEBNIS  60
-#define STR_UNDO_SPELLING   61
-#define STR_TABLE_UND   62
-#define STR_TABLE_ODER  63
-#define STR_UNDO_INSERTCELLS64
-#define STR_TABLE_DEF   65
-#define STR_MOVE_TO_END 66
-#define STR_BOX_YNI 67
-#define STR_NO_REF_TABLE68
-
-#define STR_PIVOTFUNC_SUM   69  // pivot.cxx
-#define STR_PIVOTFUNC_COUNT 70
-#define STR_PIVOTFUNC_AVG   71
-#define STR_PIVOTFUNC_MAX   72
-#define STR_PIVOTFUNC_MIN   73
-#define STR_PIVOTFUNC_PROD  74
-#define STR_PIVOTFUNC_COUNT275
-#define STR_PIVOTFUNC_STDDEV76
-#define STR_PIVOTFUNC_STDDEV2   77
-#define STR_PIVOTFUNC_VAR   78
-#define STR_PIVOTFUNC_VAR2  79
-#define STR_PIVOT_TOTAL 80
-#define STR_PIVOT_DATA  81
-
-#define STR_PIVOT_INVALID_DBAREA82 // tabvwsh3.cxx
-
-#define STR_TABLE   83
-#define STR_COLUMN  84
-#define STR_ROW 85
-#define STR_LOAD_DOC86
-#define STR_SAVE_DOC87
-
-#define STR_ERR_INVALID_TABREF  88
-#define STR_AREA_ALREADY_INSERTED   89
-#define STR_INVALID_TABREF  90
-#define STR_INVALID_QUERYAREA   91
-
-#define STR_REIMPORT_EMPTY  92
-#define STR_NOMULTISELECT   93
-#define STR_FILL_SERIES_PROGRESS94 // documen3.cxx
-
-#define STR_UNKNOWN_FILTER  95
-
-#define STR_DATABASE_NOTFOUND   96
-#define STR_DATABASE_ABORTED97
-
-#define STR_UNDO_PRINTRANGES98
-
-#define STR_UNDO_DEC_INDENT 99
-#define STR_UNDO_INC_INDENT 100
-#define STR_UNDO_THESAURUS  101
-
-#define STR_FILL_TAB102
-#define STR_NO_VALUE103 /* moved to compiler.src, keep 
define! */
-#define STR_UPDATE_SCENARIO 104
-#define STR_ERR_NEWSCENARIO 105
-#define STR_SCENARIO106
-#define STR_PIVOT_TABLE 107
-#define STR_NEWTABNAMENOTUNIQUE 108
-
-#define STR_FUN_TEXT_SUM109
-#define STR_FUN_TEXT_COUNT  110
-#define STR_FUN_TEXT_AVG111
-#define STR_FUN_TEXT_MAX112
-#define STR_FUN_TEXT_MIN113
-#define STR_FUN_TEXT_PRODUCT114
-#define STR_FUN_TEXT_STDDEV 115
-#define STR_FUN_TEXT_VAR116
-#define STR_DOC_STAT117
-
-#define STR_DBNAME_IMPORT   118
-
-#define STR_NOCHARTATCURSOR 119
-#define STR_NOAREASELECTED  120
-#define STR_INVALIDTABNAME  121
-
-#define STR_PIVOT_NOTFOUND  122
-#define STR_ERROR_STR   123
-#define STR_NV_STR  124 /* moved to compiler.src, keep 
define! */
-#define STR_EMPTYDATA   125
-#define STR_PIVOT_NODATA126
-#define STR_PIVOT_MOVENOTALLOWED127
-
-#define STR_PRINT_INVALID_AREA  128
-
-#define STR_PAGESTYLE   129
-#define STR_HEADER  130
-#define STR_FOOTER  131
-
-#define STR_TEXTATTRS   132
-
-#define STR_HFCMD_DELIMITER 133
-#define STR_HFCMD_PAGE  134
-#define STR_HFCMD_PAGES 135
-#define STR_HFCMD_DATE  136
-#define STR_HFCMD_TIME  137
-#define STR_HFCMD_FILE  138
-#define STR_HFCMD_TABLE 139
-
-#define STR_PROTECTIONERR   140
-
-#define STR_PAGEHEADER  141
-#define STR_PAGEFOOTER  142
-#define STR_PAGE143
-#define STR_LONG_ERR_ILL_ARG144
-#define STR_LONG_ERR_ILL_PAR145
-#define STR_LONG_ERR_ILL_FPO146
-#define STR_LONG_ERR_ILL_CHAR   147
-#define STR_LONG_ERR_ILL_SEP148
-#define STR_

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

2015-07-13 Thread Maxim Monastirsky 
 sc/source/ui/view/tabvwsh2.cxx   |   12 
 sw/source/uibase/uiview/viewstat.cxx |5 -
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 107a4740f63860f0901f51217b16cefa62a827ac
Author: Maxim Monastirsky 
Date:   Mon Jul 13 20:23:39 2015 +0300

tdf#39478 Fix custom shapes status update

In sw it was still returning a string item, although the
slot type was changed to boolean back in 2005 with
4cce2a2f08238e1e03055877aa89bc755ec06f59.

In sc the status update was simply missing.

Change-Id: I8a6dd157d1e401754b3a9a93dc83458dcdd4f089

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 1efe8d6..fefe124 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -434,6 +434,18 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
 case SID_OBJECT_SELECT: // wichtig fuer den ollen 
Control-Controller
 rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == SID_OBJECT_SELECT 
&& IsDrawSelMode() ) );
 break;
+
+case SID_DRAWTBX_CS_BASIC:
+case SID_DRAWTBX_CS_SYMBOL:
+case SID_DRAWTBX_CS_ARROW:
+case SID_DRAWTBX_CS_FLOWCHART:
+case SID_DRAWTBX_CS_CALLOUT:
+case SID_DRAWTBX_CS_STAR:
+{
+bool bCurrentActive = (nDrawSfxId == nWhich) && 
(aCurrShapeEnumCommand[ nWhich - SID_DRAWTBX_CS_BASIC ] == sDrawCustom);
+rSet.Put( SfxBoolItem( nWhich, bCurrentActive ) );
+}
+break;
 }
 nWhich = aIter.NextWhich();
 }
diff --git a/sw/source/uibase/uiview/viewstat.cxx 
b/sw/source/uibase/uiview/viewstat.cxx
index cfc2f02..aabd463 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -550,7 +550,10 @@ void SwView::GetDrawState(SfxItemSet &rSet)
 if ( bWeb )
 rSet.DisableItem( nWhich );
 else
-rSet.Put(SfxStringItem(nWhich, m_aCurrShapeEnumCommand[ nWhich 
- SID_DRAWTBX_CS_BASIC ] ));
+{
+bool bCurrentActive = (m_nDrawSfxId == nWhich) && 
(m_aCurrShapeEnumCommand[ nWhich - SID_DRAWTBX_CS_BASIC ] == m_sDrawCustom);
+rSet.Put( SfxBoolItem( nWhich, bCurrentActive ) );
+}
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/trac#12015' - 0 commits -

2015-07-13 Thread Unknown 
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/libreoffice-4-2+kde4' - 0 commits -

2015-07-13 Thread Unknown 
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Mihai Varga 
 loleaflet/src/layer/tile/GridLayer.js |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 449c0a387f59ad075cb880d1cb688ec9586120a9
Author: Mihai Varga 
Date:   Mon Jul 13 20:06:30 2015 +0300

loleaflet: check already visited tiles when prefetching

In order to avoid duplicate tiles

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index fc67031..7a59ae4 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -546,8 +546,8 @@ L.GridLayer = L.Layer.extend({
if (coords.x < 0 || coords.y < 0) {
return false;
}
-   if (coords.x * this._tileWidthTwips > this._docWidthTwips ||
-   coords.y * this._tileHeightTwips > 
this._docHeightTwips) {
+   if (coords.x * this._tileWidthTwips >= this._docWidthTwips ||
+   coords.y * this._tileHeightTwips >= 
this._docHeightTwips) {
return false;
}
return true;
@@ -806,6 +806,7 @@ L.GridLayer = L.Layer.extend({
}
var queue = [],
finalQueue = [],
+   visitedTiles = {},
tilesToFetch = 10,
borderWidth = 0;
// don't search on a border wider than 5 tiles because 
it will freeze the UI
@@ -845,10 +846,12 @@ L.GridLayer = L.Layer.extend({
 
if (!this._isValidTile(coords) ||
this._tiles[key] ||
-   this._tileCache[key]) {
+   this._tileCache[key] ||
+   visitedTiles[key]) {
continue;
}
 
+   visitedTiles[key] = true;
finalQueue.push(coords);
tilesToFetch -= 1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/kde4-vcl-5-0-fix' - 0 commits -

2015-07-13 Thread Unknown 
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Stephan Bergmann 
 shell/source/win32/ooofilereader/basereader.cxx |2 +-
 shell/source/win32/ooofilereader/contentreader.cxx  |4 ++--
 shell/source/win32/ooofilereader/metainforeader.cxx |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 18f3cefd507461784003a10ab9699f7cf5b678c0
Author: Stephan Bergmann 
Date:   Mon Jul 13 18:57:35 2015 +0200

warning C4101: unreferenced local variable

Change-Id: I3d2d46c7b722557f3dbfd95eb2b8649f8078d4df

diff --git a/shell/source/win32/ooofilereader/basereader.cxx 
b/shell/source/win32/ooofilereader/basereader.cxx
index f4568aa..7035c8d 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -74,7 +74,7 @@ void CBaseReader::Initialize( const std::string& ContentName)
 parser.parse(&m_ZipContent[0], m_ZipContent.size());
 }
 }
-catch(std::exception& ex)
+catch(std::exception&)
 {
 // OSL_ENSURE( false, ex.what() );
 }
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx 
b/shell/source/win32/ooofilereader/contentreader.cxx
index 8157abb..24c420a 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -34,7 +34,7 @@ CBaseReader( DocumentName )
 m_DefaultLocale = DocumentLocale;
 Initialize( DOC_CONTENT_NAME );
 }
-catch(xml_parser_exception& ex)
+catch(xml_parser_exception&)
 {
 // OSL_ENSURE(false, ex.what());
 }
@@ -52,7 +52,7 @@ try
 m_DefaultLocale = DocumentLocale;
 Initialize( DOC_CONTENT_NAME );
 }
-catch(xml_parser_exception& ex)
+catch(xml_parser_exception&)
 {
 // OSL_ENSURE(false, ex.what());
 }
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx 
b/shell/source/win32/ooofilereader/metainforeader.cxx
index d9c08c7..b45b850 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -53,7 +53,7 @@ CBaseReader( DocumentName )
 
 Initialize( META_CONTENT_NAME );
 }
-catch(xml_parser_exception& ex)
+catch(xml_parser_exception&)
 {
 // OSL_ENSURE(false, ex.what());
 }
@@ -90,7 +90,7 @@ try
 
 Initialize( META_CONTENT_NAME );
 }
-catch(xml_parser_exception& ex)
+catch(xml_parser_exception&)
 {
 // OSL_ENSURE(false, ex.what());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Stephan Bergmann 
 shell/source/win32/ooofilereader/basereader.cxx |9 ++---
 shell/source/win32/ooofilereader/contentreader.cxx  |   13 -
 shell/source/win32/ooofilereader/metainforeader.cxx |   13 -
 shell/source/win32/shlxthandler/util/utilities.cxx  |7 +--
 4 files changed, 11 insertions(+), 31 deletions(-)

New commits:
commit 67badfc9da5254d7c9fba2101157c6f6230611de
Author: Stephan Bergmann 
Date:   Mon Jul 13 18:39:42 2015 +0200

Code deliberately not linking against sal just can't use OSL_ENSURE

Change-Id: I20820ea382ac9933bf2c6118d466625120b49d67

diff --git a/shell/source/win32/ooofilereader/basereader.cxx 
b/shell/source/win32/ooofilereader/basereader.cxx
index 503aed0..f4568aa 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include 
-
 #include "internal/basereader.hxx"
 
 #include "internal/xml_parser.hxx"
@@ -81,11 +76,11 @@ void CBaseReader::Initialize( const std::string& 
ContentName)
 }
 catch(std::exception& ex)
 {
-OSL_ENSURE( false, ex.what() );
+// OSL_ENSURE( false, ex.what() );
 }
 catch(...)
 {
-OSL_ENSURE(false, "Unknown error");
+// OSL_ENSURE(false, "Unknown error");
 }
 }
 
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx 
b/shell/source/win32/ooofilereader/contentreader.cxx
index 0b9ef84..8157abb 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include 
-
 #include "internal/contentreader.hxx"
 #include "dummytag.hxx"
 #include "simpletag.hxx"
@@ -41,11 +36,11 @@ CBaseReader( DocumentName )
 }
 catch(xml_parser_exception& ex)
 {
-OSL_ENSURE(false, ex.what());
+// OSL_ENSURE(false, ex.what());
 }
 catch(...)
 {
-OSL_ENSURE(false, "Unknown error");
+// OSL_ENSURE(false, "Unknown error");
 }
 }
 
@@ -59,11 +54,11 @@ try
 }
 catch(xml_parser_exception& ex)
 {
-OSL_ENSURE(false, ex.what());
+// OSL_ENSURE(false, ex.what());
 }
 catch(...)
 {
-OSL_ENSURE(false, "Unknown error");
+// OSL_ENSURE(false, "Unknown error");
 }
 }
 
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx 
b/shell/source/win32/ooofilereader/metainforeader.cxx
index 442c12a..d9c08c7 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include 
-
 #include "internal/metainforeader.hxx"
 #include "dummytag.hxx"
 #include "simpletag.hxx"
@@ -60,11 +55,11 @@ CBaseReader( DocumentName )
 }
 catch(xml_parser_exception& ex)
 {
-OSL_ENSURE(false, ex.what());
+// OSL_ENSURE(false, ex.what());
 }
 catch(...)
 {
-OSL_ENSURE(false, "Unknown error");
+// OSL_ENSURE(false, "Unknown error");
 }
 }
 
@@ -97,11 +92,11 @@ try
 }
 catch(xml_parser_exception& ex)
 {
-OSL_ENSURE(false, ex.what());
+// OSL_ENSURE(false, ex.what());
 }
 catch(...)
 {
-OSL_ENSURE(false, "Unknown error");
+// OSL_ENSURE(false, "Unknown error");
 }
 
 }
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx 
b/shell/source/win32/shlxthandler/util/utilities.cxx
index 8712aa2..18ccdb0 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include 
-
 #include "internal/config.hxx"
 #include "internal/utilities.hxx"
 
@@ -97,7 +92,7 @@ std::wstring GetResString(int ResId)
 int rc = LoadStringW( GetModuleHandleW(MODULE_NAME), ResId, szResStr, 
sizeof(szResStr) );
 
 OutputDebugStringFormat( "GetResString: read %d chars\n", rc );
-OSL_ENSURE(rc, "String resource not found");
+// OSL_ENSURE(rc, "String resource not found");
 
 return std::wstring(szResStr);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - 3 commits - loleaflet/Makefile loleaflet/src

2015-07-13 Thread Mihai Varga 
 loleaflet/Makefile |2 +-
 loleaflet/src/control/Control.Parts.js |2 +-
 loleaflet/src/control/Parts.js |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 22aa555c4ede160f9761f97c80c46f906e398bbc
Author: Mihai Varga 
Date:   Mon Jul 13 19:19:07 2015 +0300

loleaflet: bump version to 1.1.15 after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 3fefab7..2794cc0 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.1.14
+VERSION=1.1.15
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit d561fa5c7700393524947492dc57d348d4ceb130
Author: Mihai Varga 
Date:   Mon Jul 13 19:18:37 2015 +0300

loleaflet: bump version to 1.1.14 for tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index cad875b..3fefab7 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.1.13
+VERSION=1.1.14
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit e008192d476d8684b182cea8ab56118b2b7aa179
Author: Mihai Varga 
Date:   Mon Jul 13 19:16:46 2015 +0300

loleaflet: renamed 'previous' to 'prev'

diff --git a/loleaflet/src/control/Control.Parts.js 
b/loleaflet/src/control/Control.Parts.js
index 07f67f1..cc36f80 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -26,7 +26,7 @@ L.Control.Parts = L.Control.extend({
},
 
_prevPart: function () {
-   this._map.setPart('previous');
+   this._map.setPart('prev');
},
 
_nextPart: function () {
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 69d9e83..84e9014 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -4,7 +4,7 @@
 L.Map.include({
setPart: function (part) {
var docLayer = this._docLayer
-   if (part === 'previous') {
+   if (part === 'prev') {
if (docLayer._currentPart > 0) {
docLayer._currentPart -= 1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng include/svx svx/source

2015-07-13 Thread matteocam 
 editeng/source/outliner/overflowingtxt.cxx |9 +--
 include/editeng/overflowingtxt.hxx |8 +-
 include/svx/textchainflow.hxx  |2 -
 svx/source/svdraw/textchainflow.cxx|   34 +
 4 files changed, 33 insertions(+), 20 deletions(-)

New commits:
commit 0c01a319097cc79e3860d1ac3d760de912bbe887
Author: matteocam 
Date:   Mon Jul 13 12:32:43 2015 -0400

Move logic for para merging to editeng

Change-Id: I10ed532d8a42dbcb2f4c5aaa52f1848dde6745e6

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 45e8f51..eb6bfe5 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -111,10 +111,12 @@ OutlinerParaObject 
*OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, Ou
 
 // class OFlowChainedText
 
-OFlowChainedText::OFlowChainedText(Outliner *pOutl)
+OFlowChainedText::OFlowChainedText(Outliner *pOutl, bool bIsDeepMerge)
 {
 mpOverflowingTxt = pOutl->GetOverflowingText();
 mpNonOverflowingTxt = pOutl->GetNonOverflowingText();
+
+mbIsDeepMerge = bIsDeepMerge;
 }
 
 ESelection OFlowChainedText::GetInsertionPointSel() const
@@ -129,7 +131,7 @@ ESelection OFlowChainedText::GetOverflowPointSel() const
 
 OutlinerParaObject *OFlowChainedText::CreateOverflowingParaObject(Outliner 
*pOutliner, OutlinerParaObject *pTextToBeMerged)
 {
-// Just return the roughly merged paras fpr now
+// Just return the roughly merged paras for now
 if (mpOverflowingTxt == NULL || pTextToBeMerged == NULL)
 return NULL;
 
@@ -152,9 +154,10 @@ bool OFlowChainedText::IsLastParaInterrupted() const
 
 // classes UFlowChainedText
 
-UFlowChainedText::UFlowChainedText(Outliner *pOutl)
+UFlowChainedText::UFlowChainedText(Outliner *pOutl, bool bIsDeepMerge)
 {
 mpUnderflowPObj = pOutl->CreateParaObject();
+mbIsDeepMerge = bIsDeepMerge;
 }
 
 OutlinerParaObject *UFlowChainedText::CreateMergedUnderflowParaObject(Outliner 
*pOutl, OutlinerParaObject *pNextLinkWholeText)
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 2f63cea..345daa8 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -81,7 +81,7 @@ private:
 
 class EDITENG_DLLPUBLIC OFlowChainedText {
 public:
-OFlowChainedText(Outliner *);
+OFlowChainedText(Outliner *, bool );
 
 OutlinerParaObject *CreateOverflowingParaObject(Outliner *, 
OutlinerParaObject *);
 OutlinerParaObject *CreateNonOverflowingParaObject(Outliner *);
@@ -99,18 +99,22 @@ class EDITENG_DLLPUBLIC OFlowChainedText {
 NonOverflowingText *mpNonOverflowingTxt;
 OverflowingText *mpOverflowingTxt;
 
+bool mbIsDeepMerge;
+
 };
 
 // UFlowChainedText is a simpler class than OFlowChainedText: it almost only 
joins para-objects
 class EDITENG_DLLPUBLIC UFlowChainedText {
 public:
-UFlowChainedText(Outliner *);
+UFlowChainedText(Outliner *, bool);
 
 OutlinerParaObject *CreateMergedUnderflowParaObject(Outliner *, 
OutlinerParaObject *);
 protected:
 
 private:
 OutlinerParaObject *mpUnderflowPObj;
+
+bool mbIsDeepMerge;
 };
 
 #endif
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index 8e8ad62..f96ce59 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -104,8 +104,6 @@ class TextChainFlow {
 OFlowChainedText *mpOverflChText;
 UFlowChainedText *mpUnderflChText;
 
-bool mbMustMergeParaAmongLinks;
-
 };
 
 
diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 50bddb5..57147d3 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -41,7 +41,6 @@ TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget)
 maCursorEvent = CursorChainingEvent::NULL_EVENT;
 mbPossiblyCursorOut = false;
 
-mbMustMergeParaAmongLinks = false;
 }
 
 
@@ -90,11 +89,26 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 pFlowOutl->SetUpdateMode(bOldUpdateMode);
 }
 
+// Get old state on whether to merge para-s or not
+// NOTE: We handle UF/OF using the _old_ state. The new one is simply saved
+bool bMustMergeParaAmongLinks = 
GetTextChain()->GetIsPartOfLastParaInNextLink(mpTargetLink);
+
 // Set (Non)OverflowingTxt here (if any)
-mpOverflChText = bOverflow ? new OFlowChainedText(pFlowOutl) : NULL;
+mpOverflChText = bOverflow ? new OFlowChainedText(pFlowOutl, 
bMustMergeParaAmongLinks) : NULL;
 
 // Set current underflowing text (if any)
-mpUnderflChText = bUnderflow ? new UFlowChainedText(pFlowOutl) : NULL;
+mpUnderflChText = bUnderflow ? new UFlowChainedText(pFlowOutl, 
bMustMergeParaAmongLinks) : NULL;
+
+// update new state on paragraph merging
+if (bOverflow) {
+GetTextChain()->SetIsPartOfL

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

2015-07-13 Thread Mihai Varga 
 loleaflet/src/control/Control.Parts.js |2 +-
 loleaflet/src/control/Parts.js |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 786432b9848e22c81a6f2f4c7e8178d83e1166b8
Author: Mihai Varga 
Date:   Mon Jul 13 19:16:46 2015 +0300

loleaflet: renamed 'previous' to 'prev'

diff --git a/loleaflet/src/control/Control.Parts.js 
b/loleaflet/src/control/Control.Parts.js
index 07f67f1..cc36f80 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -26,7 +26,7 @@ L.Control.Parts = L.Control.extend({
},
 
_prevPart: function () {
-   this._map.setPart('previous');
+   this._map.setPart('prev');
},
 
_nextPart: function () {
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 69d9e83..84e9014 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -4,7 +4,7 @@
 L.Map.include({
setPart: function (part) {
var docLayer = this._docLayer
-   if (part === 'previous') {
+   if (part === 'prev') {
if (docLayer._currentPart > 0) {
docLayer._currentPart -= 1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source cli_ure/source connectivity/source cppu/source cui/source dbaccess/source dtrans/source editeng/source extensions/source filter/source forms/source fpicker

2015-07-13 Thread Stephan Bergmann 
 UnoControls/source/controls/progressmonitor.cxx|3 --
 UnoControls/source/inc/progressmonitor.hxx |4 --
 basic/source/basmgr/basicmanagerrepository.cxx |   10 +-
 basic/source/basmgr/basmgr.cxx |   14 ++---
 cli_ure/source/uno_bridge/cli_environment.cxx  |2 +
 connectivity/source/manager/mdrivermanager.cxx |5 ---
 cppu/source/uno/lbenv.cxx  |2 -
 cui/source/dialogs/cuifmsearch.cxx |5 ---
 cui/source/tabpages/chardlg.cxx|2 -
 dbaccess/source/core/api/RowSetBase.cxx|2 -
 dbaccess/source/core/misc/dsntypes.cxx |2 +
 dbaccess/source/ext/macromigration/progressmixer.cxx   |3 --
 dbaccess/source/ui/browser/unodatbr.cxx|   12 +---
 dbaccess/source/ui/dlg/DbAdminImpl.cxx |3 --
 dbaccess/source/ui/dlg/DbAdminImpl.hxx |2 -
 dbaccess/source/ui/inc/unodatbr.hxx|2 -
 dbaccess/source/ui/misc/TokenWriter.cxx|2 +
 dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx |2 -
 dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx |3 --
 dtrans/source/win32/clipb/MtaOleClipb.cxx  |5 ---
 dtrans/source/win32/dtobj/APNDataObject.cxx|2 -
 editeng/source/editeng/textconv.cxx|2 +
 editeng/source/misc/hangulhanja.cxx|5 ---
 extensions/source/abpilot/fieldmappingimpl.cxx |6 +---
 extensions/source/logging/filehandler.cxx  |9 +-
 extensions/source/propctrlr/cellbindinghandler.cxx |   10 +-
 filter/source/config/cache/filtercache.cxx |2 +
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx|8 -
 filter/source/xsltfilter/XSLTFilter.cxx|4 --
 forms/source/component/Columns.cxx |2 -
 forms/source/runtime/formoperations.cxx|4 ++
 forms/source/xforms/propertysetbase.cxx|4 --
 fpicker/source/office/commonpicker.cxx |4 --
 fpicker/source/office/iodlgimp.cxx |5 ---
 fpicker/source/win32/filepicker/dibpreview.cxx |6 
 include/osl/diagnose.h |6 
 include/tools/debug.hxx|   22 ++
 reportdesign/source/filter/xml/xmlControlProperty.cxx  |   10 --
 reportdesign/source/ui/report/dlgedclip.cxx|9 +-
 sal/osl/w32/security.c |6 +---
 sax/source/tools/converter.cxx |5 ---
 sc/source/core/tool/interpr3.cxx   |2 -
 sd/source/core/drawdoc3.cxx|5 ---
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |2 -
 sd/source/ui/view/drviews2.cxx |5 ---
 sd/source/ui/view/sdview2.cxx  |5 ---
 sfx2/source/doc/objstor.cxx|6 
 shell/source/win32/ooofilereader/basereader.cxx|6 
 shell/source/win32/ooofilereader/contentreader.cxx |   12 +---
 shell/source/win32/ooofilereader/metainforeader.cxx|   12 +---
 shell/source/win32/simplemail/senddoc.cxx  |6 
 sot/source/sdstor/stg.cxx  |6 
 svl/source/items/poolitem.cxx  |6 
 svl/source/misc/urihelper.cxx  |2 -
 svtools/source/brwbox/editbrowsebox2.cxx   |6 
 svtools/source/contnr/svimpbox.cxx |5 ---
 svtools/source/contnr/treelist.cxx |2 -
 svtools/source/contnr/treelistbox.cxx  |9 --
 svtools/source/control/asynclink.cxx   |6 
 svtools/source/dialogs/addresstemplate.cxx |4 --
 svtools/source/svrtf/parrtf.cxx|5 ---
 svtools/source/uno/addrtempuno.cxx |   15 ++
 svx/source/fmcomp/dbaexchange.cxx  |   22 +++---
 svx/source/fmcomp/dbaobjectex.cxx  |9 +-
 svx/source/fmcomp/gridctrl.cxx |2 -
 svx/source/form/fmpgeimp.cxx   |6 
 svx/source/form/navigatortree.cxx  |8 +++--
 svx/source/svdraw/svdundo.cxx  |   25 +++--
 svx/source/unodraw/unoshape.cxx|2 -
 sw/source/filter/xml/XMLRedlineImportHelper.cxx|   10 +-
 toolkit/source/controls/accessiblecontrolcontext.cxx   |6 
 tools/source/ref/pstm.cxx  |2 +
 tools/source/stream/stream.cxx |2 +
 unotools/source/config/bootstrap.cxx

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng include/svx svx/source

2015-07-13 Thread matteocam 
 editeng/source/outliner/overflowingtxt.cxx |6 ++
 include/editeng/overflowingtxt.hxx |2 ++
 include/svx/textchainflow.hxx  |2 ++
 svx/source/svdraw/textchainflow.cxx|   10 ++
 4 files changed, 20 insertions(+)

New commits:
commit 92a56f1fb97e3a095fa2702ba6970b056fef7bf6
Author: matteocam 
Date:   Mon Jul 13 12:01:16 2015 -0400

Add TextChainFlow info for merging paras

Change-Id: Ieb1f951e083c11b9c18a9a15180e8aff7ef02db7

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 9b6da0a..45e8f51 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -144,6 +144,12 @@ OutlinerParaObject 
*OFlowChainedText::CreateNonOverflowingParaObject(Outliner *p
 return mpNonOverflowingTxt->ToParaObject(pOutliner);
 }
 
+bool OFlowChainedText::IsLastParaInterrupted() const
+{
+return mpNonOverflowingTxt->IsLastParaInterrupted();
+}
+
+
 // classes UFlowChainedText
 
 UFlowChainedText::UFlowChainedText(Outliner *pOutl)
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 449ca5a..2f63cea 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -89,6 +89,8 @@ class EDITENG_DLLPUBLIC OFlowChainedText {
 ESelection GetInsertionPointSel() const;
 ESelection GetOverflowPointSel() const;
 
+bool IsLastParaInterrupted() const;
+
 protected:
 void impSetOutlinerToEmptyTxt(Outliner *);
 
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index f96ce59..8e8ad62 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -104,6 +104,8 @@ class TextChainFlow {
 OFlowChainedText *mpOverflChText;
 UFlowChainedText *mpUnderflChText;
 
+bool mbMustMergeParaAmongLinks;
+
 };
 
 
diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 4c48266..50bddb5 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -40,6 +40,8 @@ TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget)
 
 maCursorEvent = CursorChainingEvent::NULL_EVENT;
 mbPossiblyCursorOut = false;
+
+mbMustMergeParaAmongLinks = false;
 }
 
 
@@ -100,6 +102,14 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 // To check whether an overflow is underflow induced or not (useful in 
cursor checking)
 mbOFisUFinduced = bUnderflow;
 
+// Save old state and update new
+mbMustMergeParaAmongLinks = 
GetTextChain()->GetIsPartOfLastParaInNextLink(mpTargetLink);
+
+if (bOverflow)
+GetTextChain()->SetIsPartOfLastParaInNextLink(mpTargetLink, 
mpOverflChText->IsLastParaInterrupted());
+else // Overflows determine merging or not. If no OF, just merge 
everything next time.
+GetTextChain()->SetIsPartOfLastParaInNextLink(mpTargetLink, true);
+
 }
 
 void TextChainFlow::impUpdateCursorInfo()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/jfreereport

2015-07-13 Thread Julien Nabet 
 external/jfreereport/UnpackedTarball_jfreereport_libformula.mk |1 
 external/jfreereport/patches/libformula-minutes_truncation.patch.1 |   17 
++
 2 files changed, 18 insertions(+)

New commits:
commit 429280541ff1fbbbf3f0482211a659c96c3347d2
Author: Julien Nabet 
Date:   Mon Jul 13 16:03:15 2015 +0200

tdf#92693: ReportBuilder: MINUTES() rounded to nearest for fractional 
minutes

... instead of the correct truncation.

Thanks to Lionel for the idea of the fix and his patience for newbies like 
me!

Change-Id: Iae9ec9251c0beb0c1856a6573f6ff7963d216256
Reviewed-on: https://gerrit.libreoffice.org/17012
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk 
b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
index 2bc3229..bb78966 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\
 $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\
external/jfreereport/patches/common_build.patch \
external/jfreereport/patches/libformula-time-notz.patch \
+   external/jfreereport/patches/libformula-minutes_truncation.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/patches/libformula-minutes_truncation.patch.1 
b/external/jfreereport/patches/libformula-minutes_truncation.patch.1
new file mode 100644
index 000..0df98db
--- /dev/null
+++ b/external/jfreereport/patches/libformula-minutes_truncation.patch.1
@@ -0,0 +1,17 @@
+Seulement dans jfreereport_libformula: bin
+Seulement dans jfreereport_libformula: build.log
+Seulement dans jfreereport_libformula: dist
+diff -ur 
jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
 
jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
+--- 
jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
2015-07-13 15:55:31.752539618 +0200
 
jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
2015-07-13 15:56:27.084394065 +0200
+@@ -74,7 +74,7 @@
+ 
+ // Multiply the minutes with 60 to get the minutes as ints 
+ final BigDecimal minutes = minutesFraction.multiply(MINUTES);
+-final BigDecimal minutesAsInt = minutes.setScale(0, 
BigDecimal.ROUND_HALF_UP);
++final BigDecimal minutesAsInt = NumberUtil.performIntRounding(minutes);
+ return new TypeValuePair(NumberType.GENERIC_NUMBER, minutesAsInt);
+   }
+-}
+\ Pas de fin de ligne à la fin du fichier
++}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng

2015-07-13 Thread matteocam 
 editeng/source/outliner/outliner.cxx   |   10 --
 editeng/source/outliner/overflowingtxt.cxx |   10 --
 include/editeng/overflowingtxt.hxx |4 +++-
 3 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 1f71d4b088f43611094ae95d53c6bea44bf7a9ad
Author: matteocam 
Date:   Mon Jul 13 11:29:58 2015 -0400

Add bLastParaInterrupted to NonOverflowingText

Change-Id: Ie6864bfbce088fabd3fba65c3e1313bc2fafcbac

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 2b03d26..a8e5be0 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2131,7 +2131,8 @@ NonOverflowingText *Outliner::GetNonOverflowingText() 
const
 {
 ESelection aEmptySel(0,0,0,0);
 EditTextObject *pTObj = pEditEngine->CreateTextObject(aEmptySel);
-return new NonOverflowingText(pTObj);
+bool bLastParaInterrupted = true; // Last Para was interrupted since 
everything overflew
+return new NonOverflowingText(pTObj, bLastParaInterrupted);
 } else { // Get the lines that of the overflowing para fit in the box
 
 sal_Int32 nOverflowingPara = nCount;
@@ -2159,7 +2160,12 @@ NonOverflowingText *Outliner::GetNonOverflowingText() 
const
 ESelection(nStartPara, nStartPos, nOverflowingPara, nLen);
 }
 EditTextObject *pTObj = 
pEditEngine->CreateTextObject(aNonOverflowingTextSelection);
-return new NonOverflowingText(pTObj);
+
+sal_Int32 nLastLine = GetLineCount(nOverflowingPara)-1;
+bool bLastParaInterrupted =
+pEditEngine->GetOverflowingLineNum() < nLastLine;
+
+return new NonOverflowingText(pTObj, bLastParaInterrupted);
 }
 }
 
diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 339a335..9b6da0a 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -55,12 +55,18 @@ ESelection OverflowingText::GetInsertionPointSel() const
 
 // class NonOverflowingText
 
-NonOverflowingText::NonOverflowingText(const EditTextObject *pTObj)
-: mpContentTextObj(pTObj->Clone())
+NonOverflowingText::NonOverflowingText(const EditTextObject *pTObj,  bool 
bLastParaInterrupted)
+: mpContentTextObj(pTObj->Clone()),
+  mbLastParaInterrupted(bLastParaInterrupted)
 {
  // XXX: may have to delete pTObj
 }
 
+bool NonOverflowingText::IsLastParaInterrupted() const
+{
+return mbLastParaInterrupted;
+}
+
 
 OutlinerParaObject *NonOverflowingText::ToParaObject(Outliner *pOutliner) const
 {
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 72d2355..449ca5a 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -60,13 +60,15 @@ class NonOverflowingText {
 public:
 OutlinerParaObject *ToParaObject(Outliner *) const;
 ESelection GetOverflowPointSel() const;
+bool IsLastParaInterrupted() const;
 
 private:
 // Constructor
-NonOverflowingText(const EditTextObject *pTObj);
+NonOverflowingText(const EditTextObject *pTObj, bool 
bLastParaInterrupted);
 
 friend class Outliner;
 const EditTextObject *mpContentTextObj;
+const bool mbLastParaInterrupted;
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - sc/source

2015-07-13 Thread Winfried Donkers 
 sc/source/ui/app/inputhdl.cxx |   51 +++---
 sc/source/ui/inc/inputhdl.hxx |3 --
 2 files changed, 20 insertions(+), 34 deletions(-)

New commits:
commit 0d83531e915cf5dda33c41025d4d6afba4d6908d
Author: Winfried Donkers 
Date:   Thu Jun 25 17:26:20 2015 +0200

tdf#89031 remove agressiveness from Calc function suggestions

Change-Id: I7751a038f8482addc0e45c0461666bbd1c959d12
Reviewed-on: https://gerrit.libreoffice.org/16478
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit f3d748937a177cbbc0033bcf54d0d0fd57a1b409)
Reviewed-on: https://gerrit.libreoffice.org/17009
(cherry picked from commit 579f5cbfc4636ae28e545b0d2e456e100b08b4ad)
Reviewed-on: https://gerrit.libreoffice.org/17014
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2b6be65..fe9ef00 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -804,8 +804,7 @@ void ScInputHandler::HideTipBelow()
 aManualTip.clear();
 }
 
-void ScInputHandler::ShowArgumentsTip( const OUString& rParagraph, OUString& 
rSelText, const ESelection& rSel,
-bool bTryFirstSel )
+void ScInputHandler::ShowArgumentsTip( OUString& rSelText )
 {
 ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
 const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
@@ -932,34 +931,6 @@ void ScInputHandler::ShowArgumentsTip( const OUString& 
rParagraph, OUString& rSe
 }
 }
 }
-else if (bTryFirstSel)
-{
-sal_Int32 nPosition = 0;
-OUString aText = pEngine->GetWord( 0, rSel.nEndPos-1 );
-/* XXX: dubious, what is this condition supposed to exactly match? 
*/
-if (rSel.nEndPos <= aText.getLength() && aText[ rSel.nEndPos-1 ] 
== '=')
-{
-break;
-}
-OUString aNew;
-nPosition = aText.getLength()+1;
-ScTypedCaseStrSet::const_iterator it =
-findText(*pFormulaDataPara, pFormulaDataPara->end(), aText, 
aNew, false);
-if (it != pFormulaDataPara->end())
-{
-if( nPosition < rParagraph.getLength() && rParagraph[ 
nPosition ] =='(' )
-{
-ShowTipBelow( aNew );
-bFound = true;
-}
-else
-break;
-}
-else
-{
-break;
-}
-}
 else
 {
 break;
@@ -986,7 +957,7 @@ void ScInputHandler::ShowTipCursor()
 {
 OUString aSelText( aParagraph.copy( 0, aSel.nEndPos ));
 
-ShowArgumentsTip( aParagraph, aSelText, aSel, true);
+ShowArgumentsTip( aSelText );
 }
 }
 }
@@ -1087,6 +1058,12 @@ void ScInputHandler::UseFormulaData()
 if ( aSel.nEndPos > aParagraph.getLength() )
 return;
 
+if ( aParagraph.getLength() > aSel.nEndPos &&
+ ( ScGlobal::pCharClass->isLetterNumeric( aParagraph, aSel.nEndPos 
) ||
+   aParagraph[ aSel.nEndPos ] == '_' ||
+   aParagraph[ aSel.nEndPos ] == '.'   ) )
+return;
+
 //  Is the cursor at the end of a word?
 if ( aSel.nEndPos > 0 )
 {
@@ -1102,6 +1079,16 @@ void ScInputHandler::UseFormulaData()
 miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, 
aText, aNew, false);
 if (miAutoPosFormula != pFormulaData->end())
 {
+// check if partial function name is not Between quotes
+bool bBetweenQuotes = false;
+for ( int n = 0; n < aSelText.getLength(); n++ )
+{
+if ( aSelText[ n ] == '"' )
+bBetweenQuotes = !bBetweenQuotes;
+}
+if ( bBetweenQuotes )
+return;  // we're between quotes
+
 if (aNew[aNew.getLength()-1] == cParenthesesReplacement)
 aNew = aNew.copy( 0, aNew.getLength()-1) + "()";
 ShowTip( aNew );
@@ -1112,7 +1099,7 @@ void ScInputHandler::UseFormulaData()
 
 // function name is complete:
 // show tip below the cell with function name and arguments of 
function
-ShowArgumentsTip( aParagraph, aSelText, aSel, false);
+ShowArgumentsTip( aSelText );
 }
 }
 }
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 5b0e837..bfb8e62 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -157,8 +157,7 @@ private:
 boolCursorAtClosingPar();
 voidSkipClosingPar();
 bool

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - postprocess/qa sc/source sd/source sw/source

2015-07-13 Thread Stephan Bergmann 
 postprocess/qa/services.cxx   |   11 +++
 sc/source/ui/unoobj/docuno.cxx|5 -
 sd/source/ui/unoidl/unomodel.cxx  |9 ++---
 sw/source/uibase/uno/unotxdoc.cxx |   13 -
 4 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit 24d0bf5bc012abf6c1cb480c173055d61352d5b0
Author: Stephan Bergmann 
Date:   Mon Jul 13 13:44:06 2015 +0200

tdf#92668: Revert some implementation names, for backwards compatibility

These implementation names of Calc, Draw, Impress, and Writer documents are 
the
most likely to be checked by existing third-party code, so revert the
corresponding parts of 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 "Fix various
XServiceInfo implementations" (and instead add fixups in 
CppunitTest_serives).

Change-Id: I1a760adbf4c89a1b4477d6e628abba8d2028ccfe
(cherry picked from commit 61a3be76c221c822b189d20e9269ec5caf1aadcc)
Reviewed-on: https://gerrit.libreoffice.org/17011
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index ec26474..35e5b10 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -365,6 +365,17 @@ void Test::createInstance(
 expImpl = "com.sun.star.svtools.OfficeFolderPicker";
 expServs = {"com.sun.star.ui.dialogs.OfficeFolderPicker"};
 #endif
+} else if (expImpl == "com.sun.star.comp.Calc.SpreadsheetDocument") {
+expImpl = "ScModelObj";
+} else if (expImpl == "com.sun.star.comp.Draw.DrawingDocument"
+   || expImpl == "com.sun.star.comp.Draw.PresentationDocument")
+{
+expImpl = "SdXImpressDocument";
+} else if (expImpl == "com.sun.star.comp.Writer.GlobalDocument"
+   || expImpl == "com.sun.star.comp.Writer.TextDocument"
+   || expImpl == "com.sun.star.comp.Writer.WebDocument")
+{
+expImpl = "SwXTextDocument";
 }
 CPPUNIT_ASSERT_EQUAL_MESSAGE(
 (OString(
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 5375176..6d148da 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2435,7 +2435,10 @@ uno::Sequence SAL_CALL 
ScModelObj::getAvailableServiceNames()
 // XServiceInfo
 OUString SAL_CALL ScModelObj::getImplementationName() 
throw(uno::RuntimeException, std::exception)
 {
-return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+return OUString( "ScModelObj" );
+/* // Matching the .component information:
+   return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+*/
 }
 
 sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName )
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ff4bb93..7a9bf2a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1184,9 +1184,12 @@ uno::Sequence< OUString > SAL_CALL 
SdXImpressDocument::getAvailableServiceNames(
 OUString SAL_CALL SdXImpressDocument::getImplementationName()
 throw(uno::RuntimeException, std::exception)
 {
-return mbImpressDoc
-? OUString("com.sun.star.comp.Draw.PresentationDocument")
-: OUString("com.sun.star.comp.Draw.DrawingDocument");
+return OUString( "SdXImpressDocument" );
+/* // Matching the .component information:
+   return mbImpressDoc
+   ? OUString("com.sun.star.comp.Draw.PresentationDocument")
+   : OUString("com.sun.star.comp.Draw.DrawingDocument");
+*/
 }
 
 sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& 
ServiceName )
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index b7cdf1d..c19976c 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1768,11 +1768,14 @@ Sequence< OUString > 
SwXTextDocument::getAvailableServiceNames()
 
 OUString SwXTextDocument::getImplementationName() throw( RuntimeException, 
std::exception )
 {
-return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr
-? OUString("com.sun.star.comp.Writer.GlobalDocument")
-: PTR_CAST(SwWebDocShell, pDocShell) != nullptr
-? OUString("com.sun.star.comp.Writer.WebDocument")
-: OUString("com.sun.star.comp.Writer.TextDocument");
+return OUString("SwXTextDocument");
+/* // Matching the .component information:
+   return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr
+   ? OUString("com.sun.star.comp.Writer.GlobalDocument")
+   : PTR_CAST(SwWebDocShell, pDocShell) != nullptr
+   ? OUString("com.sun.star.comp.Writer.WebDocument")
+   : OUString("com.sun.star.comp.Writer.TextDocument");
+*/
 }
 
 sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( 
RuntimeException, std::exception )
___
Libreoffice-c

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

2015-07-13 Thread Caolán McNamara 
 vcl/unx/gtk/window/gtksalframe.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 74f9d9808fce14f015d56a2aaa4ec5616ed7aa3e
Author: Caolán McNamara 
Date:   Mon Jul 13 16:18:41 2015 +0100

Resolves: tdf#92671 union each monitor workarea to find best screen workarea

Change-Id: Ia77063f7008f960373861b8b59710abe9918865c

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 5496bf6..3bedf78 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2157,10 +2157,16 @@ void GtkSalFrame::GetWorkArea( Rectangle& rRect )
 rRect = GetGtkSalData()->GetGtkDisplay()->getWMAdaptor()->getWorkArea( 0 );
 #else
 GdkScreen  *pScreen = gtk_window_get_screen(GTK_WINDOW(m_pWindow));
-gint nMonitor = gdk_screen_get_monitor_at_window(pScreen, 
widget_get_window(m_pWindow));
-GdkRectangle aRect;
-gdk_screen_get_monitor_workarea(pScreen, nMonitor, &aRect);
-rRect = Rectangle(aRect.x, aRect.y, aRect.width, aRect.height);
+Rectangle aRetRect;
+int max = gdk_screen_get_n_monitors (pScreen);
+for (int i = 0; i < max; ++i)
+{
+GdkRectangle aRect;
+gdk_screen_get_monitor_workarea(pScreen, i, &aRect);
+Rectangle aMonitorRect(aRect.x, aRect.y, aRect.x+aRect.width, 
aRect.y+aRect.height);
+aRetRect.Union(aMonitorRect);
+}
+rRect = aRetRect;
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

2015-07-13 Thread matteocam 
 include/svx/textchain.hxx   |7 +--
 svx/source/svdraw/textchain.cxx |9 +
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit afe335ac3bf0bcd79ee58699f132cf4ad7e5aefe
Author: matteocam 
Date:   Mon Jul 13 11:12:05 2015 -0400

Add IsPartOfLastParaInNextLink Property

Change-Id: I0410c4417bebb7ffb9cd162a1ecf3d5028f513fa

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 6a70c8b..8d0ae47 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -117,6 +117,7 @@ class ImpChainLinkProperties
 INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::NULL_EVENT)
 INIT_CHAIN_PROP(PreChainingSel, ESelection(0,0,0,0));
 INIT_CHAIN_PROP(PostChainingSel, ESelection(0,0,0,0));
+INIT_CHAIN_PROP(IsPartOfLastParaInNextLink, false)
 }
 
 private:
@@ -125,6 +126,7 @@ class ImpChainLinkProperties
 DECL_CHAIN_PROP(CursorEvent, CursorChainingEvent)
 DECL_CHAIN_PROP(PreChainingSel, ESelection)
 DECL_CHAIN_PROP(PostChainingSel, ESelection)
+DECL_CHAIN_PROP(IsPartOfLastParaInNextLink, bool)
 
 };
 
@@ -147,9 +149,10 @@ class TextChain {
 DECL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
 DECL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
 DECL_CHAIN_PROP_INTERFACE(PostChainingSel, ESelection)
+// return whether a paragraph is split between this box and the next
+DECL_CHAIN_PROP_INTERFACE(IsPartOfLastParaInNextLink, bool)
+
 
-// return whether a paragraph is split between the two links in the 
argument
-bool GetLinksHaveMergeableFirstPara(SdrTextObj *, SdrTextObj *);
 
 protected:
 LinkPropertiesMap maLinkPropertiesMap;
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 36966bb..25b75ae 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -28,6 +28,7 @@ IMPL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
 IMPL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
 IMPL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
 IMPL_CHAIN_PROP_INTERFACE(PostChainingSel, ESelection)
+IMPL_CHAIN_PROP_INTERFACE(IsPartOfLastParaInNextLink, bool)
 
 /* End Definition of Properties Interface */
 
@@ -59,14 +60,6 @@ SdrTextObj *TextChain::GetNextLink(SdrTextObj *) const
 return NULL; // XXX: To be changed. It'd be a mess to implement now
 }
 
-
-bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj* /* pPrevLink */, 
SdrTextObj* /* pNextLink */)
-{
-// XXX
-return false;
-}
-
-
 ImpChainLinkProperties *TextChain::GetLinkProperties(const SdrTextObj *pLink)
 {
 // if the guy does not already have properties in the map make them
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 sw/source/filter/ww8/ww8scan.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit fae8b7dfeb081c050867fb891d9acf0fdd2a6d36
Author: Caolán McNamara 
Date:   Mon Jul 13 10:31:30 2015 +0100

ww8: make sure we don't wrap around

Change-Id: I667bb264f92024b72f230c2ddbba3887471345f2
(cherry picked from commit 755b9320c81948358a1d4104c8875594b5700d39)
Reviewed-on: https://gerrit.libreoffice.org/16982
Reviewed-by: David Tardon 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 449bef4..8c3d979 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1540,7 +1540,11 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 if( 2 == clxt ) // PLCFfpcd ?
 break;  // PLCFfpcd gefunden
 if( 1 == clxt ) // clxtGrpprl ?
+{
+if (nGrpprl == SHRT_MAX)
+return NULL;
 nGrpprl++;
+}
 sal_uInt16 nLen(0);
 pStr->ReadUInt16( nLen );
 nLeft -= 2 + nLen;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Mihai Varga 
 loleaflet/src/control/Buttons.js |6 --
 loleaflet/src/control/Control.Buttons.js |   10 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit c23aa66e54b5cfbd2dd049853e62ab4f72a92579
Author: Mihai Varga 
Date:   Mon Jul 13 18:01:42 2015 +0300

loleaflet: don't toggle buttons on click

diff --git a/loleaflet/src/control/Control.Buttons.js 
b/loleaflet/src/control/Control.Buttons.js
index 1115004..1663f3c 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -51,14 +51,6 @@ L.Control.Buttons = L.Control.extend({
_onButtonClick: function (e) {
var id = e.target.id;
var button = this._buttons[id];
-   if (button.active) {
-   L.DomUtil.removeClass(e.target, 
'leaflet-control-buttons-active');
-   button.active = false;
-   }
-   else {
-   L.DomUtil.addClass(e.target, 
'leaflet-control-buttons-active');
-   button.active = true;
-   }
this._map.toggleCommandState(button.uno);
},
 
commit 3bd2e8f778e04c36401b8a95ed88f2d1e230c20f
Author: Mihai Varga 
Date:   Mon Jul 13 17:08:48 2015 +0300

loleaflet: renamed toggleState to toggleCommandState

diff --git a/loleaflet/src/control/Buttons.js b/loleaflet/src/control/Buttons.js
index 2d7e806..07a37e2 100644
--- a/loleaflet/src/control/Buttons.js
+++ b/loleaflet/src/control/Buttons.js
@@ -2,7 +2,9 @@
  * Toolbar buttons handler
  */
 L.Map.include({
-   toggleState: function (unoState) {
-   this.socket.send('uno .uno:' + unoState);
+   toggleCommandState: function (unoState) {
+   if (this._docLayer._permission === 'edit') {
+   this.socket.send('uno .uno:' + unoState);
+   }
}
 });
diff --git a/loleaflet/src/control/Control.Buttons.js 
b/loleaflet/src/control/Control.Buttons.js
index d4a08c2..1115004 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -59,7 +59,7 @@ L.Control.Buttons = L.Control.extend({
L.DomUtil.addClass(e.target, 
'leaflet-control-buttons-active');
button.active = true;
}
-   this._map.toggleState(button.uno);
+   this._map.toggleCommandState(button.uno);
},
 
_onStateChange: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 5 commits - fpicker/Library_fps_office.mk fpicker/source include/svtools officecfg/registry svtools/Library_svt.mk sv

2015-07-13 Thread Szymon Kłos 
 fpicker/Library_fps_office.mk|1 
 fpicker/source/office/OfficeFilePicker.cxx   |2 
 fpicker/source/office/RemoteFilesDialog.cxx  |  959 +
 fpicker/source/office/RemoteFilesDialog.hxx  |  170 ++
 fpicker/source/office/iodlg.hxx  |3 
 include/svtools/PlaceEditDialog.hxx  |2 
 include/svtools/RemoteFilesDialog.hxx|  182 --
 include/svtools/foldertree.hxx   |   56 
 officecfg/registry/data/org/openoffice/Office/Common.xcu |4 
 svtools/Library_svt.mk   |2 
 svtools/source/contnr/foldertree.cxx |  116 +
 svtools/source/dialogs/PlaceEditDialog.cxx   |   12 
 svtools/source/dialogs/RemoteFilesDialog.cxx | 1062 ---
 13 files changed, 1323 insertions(+), 1248 deletions(-)

New commits:
commit 0c5f7163fdf0306d46573974a2f279b659ed66b2
Author: Szymon Kłos 
Date:   Mon Jul 13 16:32:07 2015 +0200

Separators between services types

Change-Id: Ibd26abdb83b86256197311bc7a120b4b025ae814

diff --git a/include/svtools/PlaceEditDialog.hxx 
b/include/svtools/PlaceEditDialog.hxx
index de321a2..9cba4d5 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -51,6 +51,8 @@ private :
   */
 std::vector< std::shared_ptr< DetailsContainer > > m_aDetailsContainers;
 
+unsigned int m_nCurrentType;
+
 public :
 
  PlaceEditDialog( vcl::Window* pParent);
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index a9b1bf7..6394722 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -573,6 +573,7 @@
 https://www.googleapis.com/drive/v2
 https://apis.live.net/v5.0
 https://api.alfresco.com/cmis/versions/1.0/atom/
+
 http:///alfresco/cmisatom
 http:///p8cmis/wsdl
 https://apps.lotuslive.com/files/basic/cmis/my/servicedoc
@@ -583,6 +584,7 @@
 http:///_vti_bin/CMISSoapwsdl.aspx
 http:///_api/Web
 http:///
+
   
 
 
@@ -590,6 +592,7 @@
 Google Drive
 OneDrive
 Alfresco Cloud
+
 Alfresco 4
 IBM FileNet P8
 Lotus Live Files
@@ -600,6 +603,7 @@
 SharePoint 2010
 SharePoint 2013
 Other CMIS
+
   
 
   
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx 
b/svtools/source/dialogs/PlaceEditDialog.cxx
index 0d1dced..482b763 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -20,6 +20,7 @@ using namespace com::sun::star::uno;
 PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent)
 : ModalDialog(pParent, "PlaceEditDialog", "svt/ui/placeedit.ui")
 , m_xCurrentDetails()
+, m_nCurrentType( 0 )
 {
 get( m_pEDServerName, "name" );
 get( m_pLBServerType, "type" );
@@ -249,11 +250,22 @@ IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl )
 
 IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl )
 {
+if ( m_pLBServerType->GetSelectEntry() == "" )
+{
+if( !m_pLBServerType->IsTravelSelect() )
+m_pLBServerType->SelectEntryPos( m_nCurrentType );
+else
+m_pLBServerType->SetNoSelection();
+
+return 0;
+}
+
 if (m_xCurrentDetails.get())
 m_xCurrentDetails->show(false);
 
 sal_uInt16 nPos = m_pLBServerType->GetSelectEntryPos( );
 m_xCurrentDetails = m_aDetailsContainers[nPos];
+m_nCurrentType = nPos;
 
 m_xCurrentDetails->show(true);
 
commit 2e2b107a4251e7c08c7c9f39a26d00c1f6b65ae3
Author: Szymon Kłos 
Date:   Mon Jul 13 14:31:15 2015 +0200

removed comment

Change-Id: Ia74226be5f7d0776d60f04945c23a5b94cdc11b6

diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 2312a0a..80febee 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -57,8 +57,7 @@ class SvtFileDialogFilter_Impl;
 class SvtExpFileDlg_Impl;
 class CustomContainer;
 
-class SvtFileDialog : //public ModalDialog, public 
::svt::IFilePickerController,
-public SvtFileDialog_Base
+class SvtFileDialog : public SvtFileDialog_Base
 {
 private:
 VclPtr   _pCbReadOnly;
commit 0103a14020057fa118d97e3a0a50a06efcc5c08b
Author: Szymon Kłos 
Date:   Mon Jul 13 14:29:09 2015 +0200

RemoteFilesDialog moved to fpicker

Change-Id: I8e978d40ee022d15f482aec4567c3171b75b9720

diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index c109dce..6c484a0 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -49,6 +49,7 @@ $(eval $(c

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

2015-07-13 Thread Winfried Donkers 
 sc/source/ui/app/inputhdl.cxx |   51 +++---
 sc/source/ui/inc/inputhdl.hxx |3 --
 2 files changed, 20 insertions(+), 34 deletions(-)

New commits:
commit 865afb6ed25891129efb6907595c892e417a191a
Author: Winfried Donkers 
Date:   Thu Jun 25 17:26:20 2015 +0200

tdf#89031 remove agressiveness from Calc function suggestions

Change-Id: I7751a038f8482addc0e45c0461666bbd1c959d12
Reviewed-on: https://gerrit.libreoffice.org/16478
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit f3d748937a177cbbc0033bcf54d0d0fd57a1b409)
Reviewed-on: https://gerrit.libreoffice.org/17009
Reviewed-on: https://gerrit.libreoffice.org/17013

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c44257b..3b7dddb 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -799,8 +799,7 @@ void ScInputHandler::HideTipBelow()
 aManualTip.clear();
 }
 
-void ScInputHandler::ShowArgumentsTip( const OUString& rParagraph, OUString& 
rSelText, const ESelection& rSel,
-bool bTryFirstSel )
+void ScInputHandler::ShowArgumentsTip( OUString& rSelText )
 {
 ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
 const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
@@ -927,34 +926,6 @@ void ScInputHandler::ShowArgumentsTip( const OUString& 
rParagraph, OUString& rSe
 }
 }
 }
-else if (bTryFirstSel)
-{
-sal_Int32 nPosition = 0;
-OUString aText = pEngine->GetWord( 0, rSel.nEndPos-1 );
-/* XXX: dubious, what is this condition supposed to exactly match? 
*/
-if (rSel.nEndPos <= aText.getLength() && aText[ rSel.nEndPos-1 ] 
== '=')
-{
-break;
-}
-OUString aNew;
-nPosition = aText.getLength()+1;
-ScTypedCaseStrSet::const_iterator it =
-findText(*pFormulaDataPara, pFormulaDataPara->end(), aText, 
aNew, false);
-if (it != pFormulaDataPara->end())
-{
-if( nPosition < rParagraph.getLength() && rParagraph[ 
nPosition ] =='(' )
-{
-ShowTipBelow( aNew );
-bFound = true;
-}
-else
-break;
-}
-else
-{
-break;
-}
-}
 else
 {
 break;
@@ -981,7 +952,7 @@ void ScInputHandler::ShowTipCursor()
 {
 OUString aSelText( aParagraph.copy( 0, aSel.nEndPos ));
 
-ShowArgumentsTip( aParagraph, aSelText, aSel, true);
+ShowArgumentsTip( aSelText );
 }
 }
 }
@@ -1077,6 +1048,12 @@ void ScInputHandler::UseFormulaData()
 if ( aSel.nEndPos > aParagraph.getLength() )
 return;
 
+if ( aParagraph.getLength() > aSel.nEndPos &&
+ ( ScGlobal::pCharClass->isLetterNumeric( aParagraph, aSel.nEndPos 
) ||
+   aParagraph[ aSel.nEndPos ] == '_' ||
+   aParagraph[ aSel.nEndPos ] == '.'   ) )
+return;
+
 //  Is the cursor at the end of a word?
 if ( aSel.nEndPos > 0 )
 {
@@ -1092,6 +1069,16 @@ void ScInputHandler::UseFormulaData()
 miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, 
aText, aNew, false);
 if (miAutoPosFormula != pFormulaData->end())
 {
+// check if partial function name is not Between quotes
+bool bBetweenQuotes = false;
+for ( int n = 0; n < aSelText.getLength(); n++ )
+{
+if ( aSelText[ n ] == '"' )
+bBetweenQuotes = !bBetweenQuotes;
+}
+if ( bBetweenQuotes )
+return;  // we're between quotes
+
 if (aNew[aNew.getLength()-1] == cParenthesesReplacement)
 aNew = aNew.copy( 0, aNew.getLength()-1) + "()";
 ShowTip( aNew );
@@ -1102,7 +1089,7 @@ void ScInputHandler::UseFormulaData()
 
 // function name is complete:
 // show tip below the cell with function name and arguments of 
function
-ShowArgumentsTip( aParagraph, aSelText, aSel, false);
+ShowArgumentsTip( aSelText );
 }
 }
 }
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 65ea47c..b03be18 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -156,8 +156,7 @@ private:
 boolCursorAtClosingPar();
 voidSkipClosingPar();
 boolGetFuncName( OUString& aStart, OUString& aResult );  // 
fdo75264
-voidShowArgumentsTip( const OUString& rParagraph, OUStr

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

2015-07-13 Thread Henry Castro 
 loolwsd/LOOLSession.cpp |  245 +++---
 loolwsd/LOOLSession.hpp |7 
 loolwsd/LOOLWSD.cpp |  528 
 loolwsd/LOOLWSD.hpp |   14 +
 4 files changed, 454 insertions(+), 340 deletions(-)

New commits:
commit bb3611399be37ba545421198ae0d7a2016fb45ea
Author: Henry Castro 
Date:   Mon Jul 13 10:13:06 2015 -0400

loolwsd: Use fork but no execve

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 982a95f..0fdf4d8 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -43,6 +43,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include "LOKitHelper.hpp"
 #include "LOOLProtocol.hpp"
@@ -70,6 +73,9 @@ using Poco::URI;
 using Poco::URIStreamOpener;
 using Poco::Util::Application;
 using Poco::Exception;
+using Poco::Net::DialogSocket;
+using Poco::Net::SocketAddress;
+using Poco::Net::WebSocketException;
 
 const std::string LOOLSession::jailDocumentURL = "/user/thedocument";
 
@@ -215,13 +221,22 @@ bool MasterProcessSession::handleInput(const char 
*buffer, int length)
 sendTextFrame("error: cmd=child kind=syntax");
 return false;
 }
+
 UInt64 childId = std::stoull(tokens[1]);
-if (_pendingPreSpawnedChildren.find(childId) == 
_pendingPreSpawnedChildren.end())
+// TODO. rework, the desktop and its childrem is jail root same folder
+/*if (_pendingPreSpawnedChildren.find(childId) == 
_pendingPreSpawnedChildren.end())
 {
+std::cout << Util::logPrefix() << "Error 
_pendingPreSpawnedChildren.find(childId)" << this << " id=" << childId << 
std::endl;
+
 sendTextFrame("error: cmd=child kind=notfound");
 return false;
+}*/
+
+if (_pendingPreSpawnedChildren.size() > 0)
+{
+std::set::iterator it = _pendingPreSpawnedChildren.begin();
+_pendingPreSpawnedChildren.erase(it);
 }
-_pendingPreSpawnedChildren.erase(childId);
 std::unique_lock lock(_availableChildSessionMutex);
 _availableChildSessions.insert(shared_from_this());
 std::cout << Util::logPrefix() << "Inserted " << this << " id=" << 
childId << " into _availableChildSessions, size=" << 
_availableChildSessions.size() << std::endl;
@@ -306,176 +321,22 @@ Path MasterProcessSession::getJailPath(UInt64 childId)
 return Path::forDirectory(LOOLWSD::childRoot + Path::separator() + 
std::to_string(childId));
 }
 
-namespace
+void MasterProcessSession::addPendingChildrem(UInt64 childId)
 {
-ThreadLocal sourceForLinkOrCopy;
-ThreadLocal destinationForLinkOrCopy;
-
-int linkOrCopyFunction(const char *fpath,
-   const struct stat *sb,
-   int typeflag,
-   struct FTW *ftwbuf)
-{
-if (strcmp(fpath, sourceForLinkOrCopy->c_str()) == 0)
-return 0;
-
-assert(fpath[strlen(sourceForLinkOrCopy->c_str())] == '/');
-const char *relativeOldPath = fpath + 
strlen(sourceForLinkOrCopy->c_str()) + 1;
-
-#ifdef __APPLE__
-if (strcmp(relativeOldPath, "PkgInfo") == 0)
-return 0;
-#endif
-
-Path newPath(*destinationForLinkOrCopy, Path(relativeOldPath));
-
-switch (typeflag)
-{
-case FTW_F:
-File(newPath.parent()).createDirectories();
-if (link(fpath, newPath.toString().c_str()) == -1)
-{
-Application::instance().logger().error(Util::logPrefix() +
-   "link(\"" + fpath + 
"\",\"" + newPath.toString() + "\") failed: " +
-   strerror(errno));
-exit(1);
-}
-break;
-case FTW_DP:
-{
-struct stat st;
-if (stat(fpath, &st) == -1)
-{
-Application::instance().logger().error(Util::logPrefix() +
-   "stat(\"" + fpath + 
"\") failed: " +
-   strerror(errno));
-return 1;
-}
-File(newPath).createDirectories();
-struct utimbuf ut;
-ut.actime = st.st_atime;
-ut.modtime = st.st_mtime;
-if (utime(newPath.toString().c_str(), &ut) == -1)
-{
-Application::instance().logger().error(Util::logPrefix() +
-   "utime(\"" + 
newPath.toString() + "\", &ut) failed: " +
-   strerror(errno));
-return 1;
-}
-}
-break;
-case FTW_DNR:
-Application::instance().logger().error(Util::logPrefix() +
-

[GSoC15] Chained Text Boxes - Report Week 7

2015-07-13 Thread Matteo Campanelli 
Hi,

Last week focus was on cursor motion and fixing some odd behavior.
What we got is that cursor can move from one box to another after an
Overflow and most of the code for positioning correctly exists.

What does not work and/or should be done next:
- the odd behavior I mentioned above is probably due, or at least includes,
the mysterious creation of empty paragraphs by the dozens after text
transfer. This is still an open issue.
- cursor transfer for pasting has not been handled yet.
- after transferring to the next box we are repositioned to the beginning
of the box after setting it to the right index.
- Backspace and arrow keys should be handled for cursor motion too.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - postprocess/qa sc/source sd/source sw/source

2015-07-13 Thread Stephan Bergmann 
 postprocess/qa/services.cxx   |   11 +++
 sc/source/ui/unoobj/docuno.cxx|5 -
 sd/source/ui/unoidl/unomodel.cxx  |9 ++---
 sw/source/uibase/uno/unotxdoc.cxx |   13 -
 4 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit 3b3dbb84cd0d80af230e6751303408750a7f4815
Author: Stephan Bergmann 
Date:   Mon Jul 13 13:44:06 2015 +0200

tdf#92668: Revert some implementation names, for backwards compatibility

These implementation names of Calc, Draw, Impress, and Writer documents are 
the
most likely to be checked by existing third-party code, so revert the
corresponding parts of 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 "Fix various
XServiceInfo implementations" (and instead add fixups in 
CppunitTest_serives).

Change-Id: I1a760adbf4c89a1b4477d6e628abba8d2028ccfe
(cherry picked from commit 61a3be76c221c822b189d20e9269ec5caf1aadcc)
Reviewed-on: https://gerrit.libreoffice.org/17010
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index ec26474..35e5b10 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -365,6 +365,17 @@ void Test::createInstance(
 expImpl = "com.sun.star.svtools.OfficeFolderPicker";
 expServs = {"com.sun.star.ui.dialogs.OfficeFolderPicker"};
 #endif
+} else if (expImpl == "com.sun.star.comp.Calc.SpreadsheetDocument") {
+expImpl = "ScModelObj";
+} else if (expImpl == "com.sun.star.comp.Draw.DrawingDocument"
+   || expImpl == "com.sun.star.comp.Draw.PresentationDocument")
+{
+expImpl = "SdXImpressDocument";
+} else if (expImpl == "com.sun.star.comp.Writer.GlobalDocument"
+   || expImpl == "com.sun.star.comp.Writer.TextDocument"
+   || expImpl == "com.sun.star.comp.Writer.WebDocument")
+{
+expImpl = "SwXTextDocument";
 }
 CPPUNIT_ASSERT_EQUAL_MESSAGE(
 (OString(
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 5375176..6d148da 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2435,7 +2435,10 @@ uno::Sequence SAL_CALL 
ScModelObj::getAvailableServiceNames()
 // XServiceInfo
 OUString SAL_CALL ScModelObj::getImplementationName() 
throw(uno::RuntimeException, std::exception)
 {
-return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+return OUString( "ScModelObj" );
+/* // Matching the .component information:
+   return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+*/
 }
 
 sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName )
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ff4bb93..7a9bf2a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1184,9 +1184,12 @@ uno::Sequence< OUString > SAL_CALL 
SdXImpressDocument::getAvailableServiceNames(
 OUString SAL_CALL SdXImpressDocument::getImplementationName()
 throw(uno::RuntimeException, std::exception)
 {
-return mbImpressDoc
-? OUString("com.sun.star.comp.Draw.PresentationDocument")
-: OUString("com.sun.star.comp.Draw.DrawingDocument");
+return OUString( "SdXImpressDocument" );
+/* // Matching the .component information:
+   return mbImpressDoc
+   ? OUString("com.sun.star.comp.Draw.PresentationDocument")
+   : OUString("com.sun.star.comp.Draw.DrawingDocument");
+*/
 }
 
 sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& 
ServiceName )
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index b7cdf1d..c19976c 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1768,11 +1768,14 @@ Sequence< OUString > 
SwXTextDocument::getAvailableServiceNames()
 
 OUString SwXTextDocument::getImplementationName() throw( RuntimeException, 
std::exception )
 {
-return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr
-? OUString("com.sun.star.comp.Writer.GlobalDocument")
-: PTR_CAST(SwWebDocShell, pDocShell) != nullptr
-? OUString("com.sun.star.comp.Writer.WebDocument")
-: OUString("com.sun.star.comp.Writer.TextDocument");
+return OUString("SwXTextDocument");
+/* // Matching the .component information:
+   return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr
+   ? OUString("com.sun.star.comp.Writer.GlobalDocument")
+   : PTR_CAST(SwWebDocShell, pDocShell) != nullptr
+   ? OUString("com.sun.star.comp.Writer.WebDocument")
+   : OUString("com.sun.star.comp.Writer.TextDocument");
+*/
 }
 
 sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( 
RuntimeException, std::exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http:/

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

2015-07-13 Thread Caolán McNamara 
 sw/source/filter/ww8/ww8scan.cxx |4 
 vcl/source/gdi/jobset.cxx|   29 +
 2 files changed, 21 insertions(+), 12 deletions(-)

New commits:
commit d4f07cdd244a6aa69de1fde0df4163b27a65556c
Author: Caolán McNamara 
Date:   Mon Jan 26 11:26:41 2015 +

coverity#1266485 Untrusted value as argument

Change-Id: I7708ecaf5412535055584ed6c71beaa9cd71c10c
(cherry picked from commit 0934ed1a40c59c169354b177d7dab4228de66171)

min legal size here is > 4

(cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3)

Change-Id: I9f68d000b32623db4d949d13284043630f5689f4
(cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab)

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index ec1f44f..c67255e 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -218,19 +218,24 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version 
not set on rOStream" );
 
 {
-sal_Size nFirstPos = rIStream.Tell();
-
 sal_uInt16 nLen = 0;
 rIStream.ReadUInt16( nLen );
-if ( !nLen )
+if (nLen <= 4)
 return rIStream;
 
 sal_uInt16 nSystem = 0;
 rIStream.ReadUInt16( nSystem );
-
-boost::scoped_array pTempBuf(new char[nLen]);
-rIStream.Read( pTempBuf.get(),  nLen - sizeof( nLen ) - sizeof( 
nSystem ) );
-if ( nLen >= sizeof(ImplOldJobSetupData)+4 )
+const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
+if (nRead > rIStream.remainingSize())
+{
+SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() <<
+ " max possible entries, but " << nRead << " claimed, 
truncating");
+return rIStream;
+}
+sal_Size nFirstPos = rIStream.Tell();
+boost::scoped_array pTempBuf(new char[nRead]);
+rIStream.Read(pTempBuf.get(),  nRead);
+if (nRead >= sizeof(ImplOldJobSetupData))
 {
 ImplOldJobSetupData* pData = (ImplOldJobSetupData*)pTempBuf.get();
 if ( rJobSetup.mpData )
@@ -255,7 +260,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
  nSystem == JOBSET_FILE605_SYSTEM )
 {
 Impl364JobSetupData* pOldJobData= 
(Impl364JobSetupData*)(pTempBuf.get() + sizeof( ImplOldJobSetupData ));
-sal_uInt16 nOldJobDataSize  = SVBT16ToShort( 
pOldJobData->nSize );
+sal_uInt16 nOldJobDataSize  = SVBT16ToShort( 
pOldJobData->nSize );
 pJobData->mnSystem  = SVBT16ToShort( 
pOldJobData->nSystem );
 pJobData->mnDriverDataLen   = SVBT32ToUInt32( 
pOldJobData->nDriverDataLen );
 pJobData->meOrientation = 
(Orientation)SVBT16ToShort( pOldJobData->nOrientation );
@@ -272,8 +277,8 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 }
 if( nSystem == JOBSET_FILE605_SYSTEM )
 {
-rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 
4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen );
-while( rIStream.Tell() < nFirstPos + nLen )
+rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 
sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen );
+while( rIStream.Tell() < nFirstPos + nRead )
 {
 OUString aKey = 
read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
 OUString aValue = 
read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
@@ -291,9 +296,9 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 else
 pJobData->maValueMap[ aKey ] = aValue;
 }
-DBG_ASSERT( rIStream.Tell() == nFirstPos+nLen, "corrupted 
job setup" );
+DBG_ASSERT( rIStream.Tell() == nFirstPos+nRead, "corrupted 
job setup" );
 // ensure correct stream position
-rIStream.Seek( nFirstPos + nLen );
+rIStream.Seek(nFirstPos + nRead);
 }
 }
 }
commit 1877e2a1d0092fea5cc0ea4676f6eca578521911
Author: Caolán McNamara 
Date:   Mon Jul 13 10:31:30 2015 +0100

ww8: make sure we don't wrap around

Change-Id: I667bb264f92024b72f230c2ddbba3887471345f2
(cherry picked from commit 755b9320c81948358a1d4104c8875594b5700d39)

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 3491b5d..4562ffc 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1540,7 +1540,11 @@ WW8PLCFpcd* WW8Scan

Re: Multiselection needs work?

2015-07-13 Thread Michael Meeks 

On Mon, 2015-07-13 at 13:33 +0200, Julien Nabet wrote:
> In this case perhaps getFiles 
> should use getSelectedFiles() then truncate?

Heh - actually that's a pretty good solution for the general case. Call
the more powerful method from XFilePicker2 and then just truncate it =)
Then again - these problems whereby one uses the other need unwinding of
course.

> Hope I spotted them all.

It'd be nice to switch all 'getFiles' for the above, and ensure that we
are not using getFiles for the impl. of getSelectedFiles ;-) is that
possible ?

> Here's the patch waiting for review:
> https://gerrit.libreoffice.org/16985

Will grok; currently off-line =)

Thanks !

Michael.

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

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

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

2015-07-13 Thread Maxim Monastirsky 
 chart2/uiconfig/ui/sidebarelements.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e82951a858530a05f3ceb66157baf60bbc2d09eb
Author: Maxim Monastirsky 
Date:   Mon Jul 13 16:27:26 2015 +0300

chart2: Fix .ui widget names

warn:vcl.layout:13283:1:include/vcl/builder.hxx:413:
widget "checkbutton_x_axis_title" not found in .ui

warn:vcl.layout:14352:1:include/vcl/builder.hxx:413:
widget "checkbutton_y_axis_title" not found in .ui

Change-Id: I5a6e29b24706df0925038e869be94b0f6a8d232f

diff --git a/chart2/uiconfig/ui/sidebarelements.ui 
b/chart2/uiconfig/ui/sidebarelements.ui
index 0f92814..2432c6e2 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -90,7 +90,7 @@
   
 
 
-  
+  
 X-axis 
title
 True
 True
@@ -131,7 +131,7 @@
   
 
 
-  
+  
 Y-axis 
title
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

2015-07-13 Thread Winfried Donkers 
 sc/source/ui/app/inputhdl.cxx |   51 +++---
 sc/source/ui/inc/inputhdl.hxx |3 --
 2 files changed, 20 insertions(+), 34 deletions(-)

New commits:
commit 579f5cbfc4636ae28e545b0d2e456e100b08b4ad
Author: Winfried Donkers 
Date:   Thu Jun 25 17:26:20 2015 +0200

tdf#89031 remove agressiveness from Calc function suggestions

Change-Id: I7751a038f8482addc0e45c0461666bbd1c959d12
Reviewed-on: https://gerrit.libreoffice.org/16478
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit f3d748937a177cbbc0033bcf54d0d0fd57a1b409)
Reviewed-on: https://gerrit.libreoffice.org/17009

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2b6be65..fe9ef00 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -804,8 +804,7 @@ void ScInputHandler::HideTipBelow()
 aManualTip.clear();
 }
 
-void ScInputHandler::ShowArgumentsTip( const OUString& rParagraph, OUString& 
rSelText, const ESelection& rSel,
-bool bTryFirstSel )
+void ScInputHandler::ShowArgumentsTip( OUString& rSelText )
 {
 ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
 const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
@@ -932,34 +931,6 @@ void ScInputHandler::ShowArgumentsTip( const OUString& 
rParagraph, OUString& rSe
 }
 }
 }
-else if (bTryFirstSel)
-{
-sal_Int32 nPosition = 0;
-OUString aText = pEngine->GetWord( 0, rSel.nEndPos-1 );
-/* XXX: dubious, what is this condition supposed to exactly match? 
*/
-if (rSel.nEndPos <= aText.getLength() && aText[ rSel.nEndPos-1 ] 
== '=')
-{
-break;
-}
-OUString aNew;
-nPosition = aText.getLength()+1;
-ScTypedCaseStrSet::const_iterator it =
-findText(*pFormulaDataPara, pFormulaDataPara->end(), aText, 
aNew, false);
-if (it != pFormulaDataPara->end())
-{
-if( nPosition < rParagraph.getLength() && rParagraph[ 
nPosition ] =='(' )
-{
-ShowTipBelow( aNew );
-bFound = true;
-}
-else
-break;
-}
-else
-{
-break;
-}
-}
 else
 {
 break;
@@ -986,7 +957,7 @@ void ScInputHandler::ShowTipCursor()
 {
 OUString aSelText( aParagraph.copy( 0, aSel.nEndPos ));
 
-ShowArgumentsTip( aParagraph, aSelText, aSel, true);
+ShowArgumentsTip( aSelText );
 }
 }
 }
@@ -1087,6 +1058,12 @@ void ScInputHandler::UseFormulaData()
 if ( aSel.nEndPos > aParagraph.getLength() )
 return;
 
+if ( aParagraph.getLength() > aSel.nEndPos &&
+ ( ScGlobal::pCharClass->isLetterNumeric( aParagraph, aSel.nEndPos 
) ||
+   aParagraph[ aSel.nEndPos ] == '_' ||
+   aParagraph[ aSel.nEndPos ] == '.'   ) )
+return;
+
 //  Is the cursor at the end of a word?
 if ( aSel.nEndPos > 0 )
 {
@@ -1102,6 +1079,16 @@ void ScInputHandler::UseFormulaData()
 miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, 
aText, aNew, false);
 if (miAutoPosFormula != pFormulaData->end())
 {
+// check if partial function name is not Between quotes
+bool bBetweenQuotes = false;
+for ( int n = 0; n < aSelText.getLength(); n++ )
+{
+if ( aSelText[ n ] == '"' )
+bBetweenQuotes = !bBetweenQuotes;
+}
+if ( bBetweenQuotes )
+return;  // we're between quotes
+
 if (aNew[aNew.getLength()-1] == cParenthesesReplacement)
 aNew = aNew.copy( 0, aNew.getLength()-1) + "()";
 ShowTip( aNew );
@@ -1112,7 +1099,7 @@ void ScInputHandler::UseFormulaData()
 
 // function name is complete:
 // show tip below the cell with function name and arguments of 
function
-ShowArgumentsTip( aParagraph, aSelText, aSel, false);
+ShowArgumentsTip( aSelText );
 }
 }
 }
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 5b0e837..bfb8e62 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -157,8 +157,7 @@ private:
 boolCursorAtClosingPar();
 voidSkipClosingPar();
 boolGetFuncName( OUString& aStart, OUString& aResult );  // 
fdo75264
-voidShowArgumentsTip( const OUString& rParagraph, OUString& 
rSelText, const ESelection& rSel,
-

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 776618f628ea6302374c90722c3dbd0a6dac1c19
Author: Caolán McNamara 
Date:   Mon Jul 13 09:45:55 2015 +0100

emf: fix another hang

Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca
(cherry picked from commit fe20502c86ef6156a54bb37ba2560c8b64d129a4)
Reviewed-on: https://gerrit.libreoffice.org/16979
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf
new file mode 100644
index 000..e3baf3b
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index bd48610..553f871 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1712,9 +1712,9 @@ bool EnhWMFReader::ReadHeader()
 
 pWMF->ReadInt32(nRecordCount);
 
-if (nRecordCount == 0)
+if (nRecordCount <= 0)
 {
-SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
0! This shouldn't "
+SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
<= 0! This shouldn't "
 "be possible... indicator of possible file 
corruption?");
 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-4-4' - vcl/qa vcl/source

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf |binary
 vcl/source/filter/wmf/winmtf.cxx   |   26 +
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit bd7b37b8fcf193e2ce20a84ac68bdb22ed8a9ade
Author: Caolán McNamara 
Date:   Mon Jul 13 08:33:50 2015 +0100

emf: test for empty polygons

Change-Id: I3c8896230e3d48a37f4b8d702b0f673e44f45ba4
(cherry picked from commit 7df4d8544c6b12e31bcb81d9389d03ae7c11bfea)
Reviewed-on: https://gerrit.libreoffice.org/16974
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf
new file mode 100644
index 000..6adabec
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf differ
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index e15f2e0..afa11a0 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1283,18 +1283,22 @@ void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, 
bool bTo, bool bRecordPath )
 {
 UpdateClipRegion();
 
-ImplMap( rPolygon );
-if ( bTo )
-{
-rPolygon[ 0 ] = maActPos;
-maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
-}
-if ( bRecordPath )
-aPathObj.AddPolyLine( rPolygon );
-else
+sal_uInt16 nPoints = rPolygon.GetSize();
+if (nPoints >= 1)
 {
-UpdateLineStyle();
-mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+ImplMap( rPolygon );
+if ( bTo )
+{
+rPolygon[ 0 ] = maActPos;
+maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
+}
+if ( bRecordPath )
+aPathObj.AddPolyLine( rPolygon );
+else
+{
+UpdateLineStyle();
+mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx   |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7bcf8ccc15f7d80a3966a340b987dfa9fd41bd0
Author: Caolán McNamara 
Date:   Sun Jul 12 21:07:21 2015 +0100

emf: test for negative numbers

Change-Id: I9d9b6f3e9592ca7b85cee5422e43d4ca46b8bb36
(cherry picked from commit 4661b2dd34bd7c56b6d783d49f265e9ecde19caa)
Reviewed-on: https://gerrit.libreoffice.org/16970
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf
new file mode 100644
index 000..bbc0285
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 62ba08b..bd48610 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1425,7 +1425,7 @@ bool EnhWMFReader::ReadEnhWMF()
 DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) 
== 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
 Point aPos( ptlReferenceX, ptlReferenceY );
-if ( nLen && nLen < static_cast( SAL_MAX_UINT32 
/ sizeof(sal_Int32) ) )
+if ( nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
 {
 if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= 
nNextPos ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Winfried Donkers 
 sc/source/ui/app/inputhdl.cxx |   51 +++---
 sc/source/ui/inc/inputhdl.hxx |3 --
 2 files changed, 20 insertions(+), 34 deletions(-)

New commits:
commit f3d748937a177cbbc0033bcf54d0d0fd57a1b409
Author: Winfried Donkers 
Date:   Thu Jun 25 17:26:20 2015 +0200

tdf#89031 remove agressiveness from Calc function suggestions

Change-Id: I7751a038f8482addc0e45c0461666bbd1c959d12
Reviewed-on: https://gerrit.libreoffice.org/16478
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 001aa27..09308b8 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -804,8 +804,7 @@ void ScInputHandler::HideTipBelow()
 aManualTip.clear();
 }
 
-void ScInputHandler::ShowArgumentsTip( const OUString& rParagraph, OUString& 
rSelText, const ESelection& rSel,
-bool bTryFirstSel )
+void ScInputHandler::ShowArgumentsTip( OUString& rSelText )
 {
 ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
 const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
@@ -932,34 +931,6 @@ void ScInputHandler::ShowArgumentsTip( const OUString& 
rParagraph, OUString& rSe
 }
 }
 }
-else if (bTryFirstSel)
-{
-sal_Int32 nPosition = 0;
-OUString aText = pEngine->GetWord( 0, rSel.nEndPos-1 );
-/* XXX: dubious, what is this condition supposed to exactly match? 
*/
-if (rSel.nEndPos <= aText.getLength() && aText[ rSel.nEndPos-1 ] 
== '=')
-{
-break;
-}
-OUString aNew;
-nPosition = aText.getLength()+1;
-ScTypedCaseStrSet::const_iterator it =
-findText(*pFormulaDataPara, pFormulaDataPara->end(), aText, 
aNew, false);
-if (it != pFormulaDataPara->end())
-{
-if( nPosition < rParagraph.getLength() && rParagraph[ 
nPosition ] =='(' )
-{
-ShowTipBelow( aNew );
-bFound = true;
-}
-else
-break;
-}
-else
-{
-break;
-}
-}
 else
 {
 break;
@@ -986,7 +957,7 @@ void ScInputHandler::ShowTipCursor()
 {
 OUString aSelText( aParagraph.copy( 0, aSel.nEndPos ));
 
-ShowArgumentsTip( aParagraph, aSelText, aSel, true);
+ShowArgumentsTip( aSelText );
 }
 }
 }
@@ -1087,6 +1058,12 @@ void ScInputHandler::UseFormulaData()
 if ( aSel.nEndPos > aParagraph.getLength() )
 return;
 
+if ( aParagraph.getLength() > aSel.nEndPos &&
+ ( ScGlobal::pCharClass->isLetterNumeric( aParagraph, aSel.nEndPos 
) ||
+   aParagraph[ aSel.nEndPos ] == '_' ||
+   aParagraph[ aSel.nEndPos ] == '.'   ) )
+return;
+
 //  Is the cursor at the end of a word?
 if ( aSel.nEndPos > 0 )
 {
@@ -1102,6 +1079,16 @@ void ScInputHandler::UseFormulaData()
 miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, 
aText, aNew, false);
 if (miAutoPosFormula != pFormulaData->end())
 {
+// check if partial function name is not Between quotes
+bool bBetweenQuotes = false;
+for ( int n = 0; n < aSelText.getLength(); n++ )
+{
+if ( aSelText[ n ] == '"' )
+bBetweenQuotes = !bBetweenQuotes;
+}
+if ( bBetweenQuotes )
+return;  // we're between quotes
+
 if (aNew[aNew.getLength()-1] == cParenthesesReplacement)
 aNew = aNew.copy( 0, aNew.getLength()-1) + "()";
 ShowTip( aNew );
@@ -1112,7 +1099,7 @@ void ScInputHandler::UseFormulaData()
 
 // function name is complete:
 // show tip below the cell with function name and arguments of 
function
-ShowArgumentsTip( aParagraph, aSelText, aSel, false);
+ShowArgumentsTip( aSelText );
 }
 }
 }
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 9cdf44c..e53d7de 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -157,8 +157,7 @@ private:
 boolCursorAtClosingPar();
 voidSkipClosingPar();
 boolGetFuncName( OUString& aStart, OUString& aResult );  // 
fdo75264
-voidShowArgumentsTip( const OUString& rParagraph, OUString& 
rSelText, const ESelection& rSel,
-  bool bTryFirstSel );
+voidShowArgumentsTip( OUString& rSelText );
 DECL_LINK( Modi

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif |binary
 vcl/source/filter/igif/decode.cxx  |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit 86247d7236cd38a8ae29c66c13e06356fb170b34
Author: Caolán McNamara 
Date:   Sun Jul 12 10:56:48 2015 +0100

fix another gif import crash

Change-Id: I0ffa569e0c4240e11184df7dd56b95d87a12425d
(cherry picked from commit ee35b72064d8d1333709b102b051360018f8044b)
Reviewed-on: https://gerrit.libreoffice.org/16962
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif
new file mode 100644
index 000..b7265f8
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif differ
diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 4d278d9..24b25ac 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -193,6 +193,9 @@ bool GIFLZWDecompressor::ProcessOneCode()
 
 nOldCode = nCode;
 
+if (nCode > 4096)
+return false;
+
 // write character(/-sequence) of code nCode in the output buffer:
 pE = pTable + nCode;
 do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif |binary
 vcl/source/filter/igif/decode.cxx  |2 ++
 2 files changed, 2 insertions(+)

New commits:
commit 6bdca73d186ab1c01129c094acaa8b261e092fcc
Author: Caolán McNamara 
Date:   Sat Jul 11 15:31:19 2015 +0100

fix gif import crash

Change-Id: I3a5e0efef6843fb8f8b485fa2369ac5b99513c31
(cherry picked from commit 839e051c658a638a259be6a6bb091b654fac405f)
Reviewed-on: https://gerrit.libreoffice.org/16954
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif
new file mode 100644
index 000..860f9e1
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif differ
diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index d50ac7c..4d278d9 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -197,6 +197,8 @@ bool GIFLZWDecompressor::ProcessOneCode()
 pE = pTable + nCode;
 do
 {
+if (pOutBufData == pOutBuf) //can't go back past start
+return false;
 nOutBufDataLen++;
 *(--pOutBufData) = pE->nData;
 pE = pE->pPrev;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm |   12 
 vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm | 2011 +
 vcl/qa/cppunit/graphicfilter/filters-test.cxx  |4 
 vcl/source/filter/ixbm/xbmread.cxx |2 
 4 files changed, 2028 insertions(+), 1 deletion(-)

New commits:
commit 16ba215eb912043cd3a400ed17c1a68e2f70f7f2
Author: Caolán McNamara 
Date:   Sat Jul 11 17:23:06 2015 +0100

fix and test for xbm import crash

Change-Id: I47e7cb259908ffc6a00475369af1a841acda1da7
(cherry picked from commit 7eb693f87b6a01044999564cce0a18fefca11c99)
Reviewed-on: https://gerrit.libreoffice.org/16955
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/fail/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm 
b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm
new file mode 100644
index 000..9d2a434
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm
@@ -0,0 +1,12 @@
+#define?te_width 31
+#define te_height = {
+   0x0e, 0x20, 0x02, 0x38, 0x11, 0x70, 0x07, 0x 0x44,
+   0x11, 1x2e, 0x3a, 0x44, 0x8e, 0x24, 0x92, 0x38, 0xdf, 0x25, 0xd2,0x7d,
+   0x91, 0x24 0x92, 0x44, 0x95: 0x24, 0x92, 0x54, 0xf5, 0x7f, 0xff, 0x57,
+   0x95, 0x24, 0x92, 0x54, 0x95, 0x 4,54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24,x54, 0x95, 0x24, 0x92, 0x54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24, 0x92, 0x54, 0x95, 0x24, 0x92,0x54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24,ÏÏÏ 0x92, 0x54, 0x95, 0x24, 0x92, 0x54, 0xf5, 0x7f, 0xff, 
0x57,
+   0x95,0x24, 0x92, 0x54, 0x95, 0x24, 0x92, 0x54, 0, 0x54, 0xf5, 0xd= {
+ 25, 0xd2, 0x7d,
+0x00, 0x7c };
\ No newline at end of file
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/indeterminate/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/pass/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm 
b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm
new file mode 100755
index 000..aad9f03
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm
@@ -0,0 +1,2011 @@
+#define Grafix1_width 485
+#define Grafix1_height 395
+static char Grafix1_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 
+   0x07, 0x00, 0x1c, 0xfc, 0x80, 0x81, 0x03, 0x30, 0x7

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

2015-07-13 Thread Caolán McNamara 
 vcl/source/filter/wmf/winwmf.cxx |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit f202ff6ba07a75e0423fa8e5be2e0f41dc7f056d
Author: Caolán McNamara 
Date:   Fri Jul 10 11:34:03 2015 +0100

fix potential hang here

Change-Id: Id62cdb90420b9ccf4e98fc1af46c70db6ed60ee0
(cherry picked from commit 7eef63bb2a4d14cb35201f84f38855910f468e20)
Reviewed-on: https://gerrit.libreoffice.org/16923
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index bee19b6..4667844 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1713,14 +1713,19 @@ bool WMFReader::GetPlaceableBound( Rectangle& 
rPlaceableBound, SvStream* pStm )
 }
 break;
 }
-nPos += nRSize * 2;
- if ( nPos <= nEnd )
- pStm->Seek( nPos );
- else
- {
- pStm->SetError( SVSTREAM_FILEFORMAT_ERROR );
- bRet = false;
- }
+
+const sal_uInt32 nAvailableBytes = nEnd - nPos;
+const sal_uInt32 nMaxPossibleRecordSize = nAvailableBytes/2;
+if (nRSize <= nMaxPossibleRecordSize)
+{
+nPos += nRSize * 2;
+pStm->Seek( nPos );
+}
+else
+{
+pStm->SetError( SVSTREAM_FILEFORMAT_ERROR );
+bRet = false;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/source/filter/wmf/winwmf.cxx |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit e0d7f9a7ca24f06b393f37a34c099cd10b9d2da0
Author: Caolán McNamara 
Date:   Fri Jul 10 11:34:03 2015 +0100

fix potential hang here

Change-Id: Id62cdb90420b9ccf4e98fc1af46c70db6ed60ee0
(cherry picked from commit 7eef63bb2a4d14cb35201f84f38855910f468e20)
Reviewed-on: https://gerrit.libreoffice.org/16922
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 5e25949..7c153c7 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1735,14 +1735,19 @@ bool WMFReader::GetPlaceableBound( Rectangle& 
rPlaceableBound, SvStream* pStm )
 }
 break;
 }
-nPos += nRSize * 2;
- if ( nPos <= nEnd )
- pStm->Seek( nPos );
- else
- {
- pStm->SetError( SVSTREAM_FILEFORMAT_ERROR );
- bRet = false;
- }
+
+const sal_uInt32 nAvailableBytes = nEnd - nPos;
+const sal_uInt32 nMaxPossibleRecordSize = nAvailableBytes/2;
+if (nRSize <= nMaxPossibleRecordSize)
+{
+nPos += nRSize * 2;
+pStm->Seek( nPos );
+}
+else
+{
+pStm->SetError( SVSTREAM_FILEFORMAT_ERROR );
+bRet = false;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl

2015-07-13 Thread Caolán McNamara 
 include/vcl/printerinfomanager.hxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b78b90732b3089c865773efab362038bd913dac5
Author: Caolán McNamara 
Date:   Sun Jul 12 15:56:40 2015 +0100

coverity#1311653 Uninitialized scalar field

Change-Id: Ib1cc81ce30752a3794a009ee8cae826abdb9fc03
(cherry picked from commit ca1a5ebf49d377d93c6c8c57a14d64460babf176)
Reviewed-on: https://gerrit.libreoffice.org/16966
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/include/vcl/printerinfomanager.hxx 
b/include/vcl/printerinfomanager.hxx
index 52245c4..3f1debf 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -52,8 +52,9 @@ struct PrinterInfo : JobData
 OUString m_aFeatures;
 bool m_bPapersizeFromSetup;
 
-PrinterInfo() :
-JobData()
+PrinterInfo()
+: JobData()
+, m_bPapersizeFromSetup(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-0' - vcl/qa vcl/source

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm |   12 
 vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm | 2011 +
 vcl/qa/cppunit/graphicfilter/filters-test.cxx  |4 
 vcl/source/filter/ixbm/xbmread.cxx |2 
 4 files changed, 2028 insertions(+), 1 deletion(-)

New commits:
commit 2799db6d3ee548cce639d6c717ed80387852fec0
Author: Caolán McNamara 
Date:   Sat Jul 11 17:23:06 2015 +0100

fix and test for xbm import crash

Change-Id: I47e7cb259908ffc6a00475369af1a841acda1da7
(cherry picked from commit 7eb693f87b6a01044999564cce0a18fefca11c99)
Reviewed-on: https://gerrit.libreoffice.org/16953
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/fail/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm 
b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm
new file mode 100644
index 000..9d2a434
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm
@@ -0,0 +1,12 @@
+#define?te_width 31
+#define te_height = {
+   0x0e, 0x20, 0x02, 0x38, 0x11, 0x70, 0x07, 0x 0x44,
+   0x11, 1x2e, 0x3a, 0x44, 0x8e, 0x24, 0x92, 0x38, 0xdf, 0x25, 0xd2,0x7d,
+   0x91, 0x24 0x92, 0x44, 0x95: 0x24, 0x92, 0x54, 0xf5, 0x7f, 0xff, 0x57,
+   0x95, 0x24, 0x92, 0x54, 0x95, 0x 4,54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24,x54, 0x95, 0x24, 0x92, 0x54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24, 0x92, 0x54, 0x95, 0x24, 0x92,0x54, 0x95, 0x24, 0x92, 0x54,
+   0x95, 0x24,ÏÏÏ 0x92, 0x54, 0x95, 0x24, 0x92, 0x54, 0xf5, 0x7f, 0xff, 
0x57,
+   0x95,0x24, 0x92, 0x54, 0x95, 0x24, 0x92, 0x54, 0, 0x54, 0xf5, 0xd= {
+ 25, 0xd2, 0x7d,
+0x00, 0x7c };
\ No newline at end of file
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/indeterminate/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/pass/.gitignore 
b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm 
b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm
new file mode 100755
index 000..aad9f03
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm
@@ -0,0 +1,2011 @@
+#define Grafix1_width 485
+#define Grafix1_height 395
+static char Grafix1_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 
+   0x07, 0x00, 0x1c, 0xfc, 0x80, 0x81, 0x03, 0x30, 0x7

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - 2 commits - loleaflet/build loleaflet/debug loleaflet/src

2015-07-13 Thread Mihai Varga 
 loleaflet/build/deps.js   |7 ++
 loleaflet/debug/document/document_simple_example.html |1 
 loleaflet/src/control/Control.Selection.js|   49 +++
 loleaflet/src/control/Permission.js   |   18 +
 loleaflet/src/layer/tile/TileLayer.js |   58 --
 5 files changed, 101 insertions(+), 32 deletions(-)

New commits:
commit d605b501df466801517b70c24afecd0d93a4548e
Author: Mihai Varga 
Date:   Mon Jul 13 15:50:02 2015 +0300

loleaflet: enabled mouse selection in viewing mode

Mouse selection is enabled by by calling
map.enableSelection() which disables dragging and selection
can be disabled to re-enable dragging by calling
map.disableSelection()
The above only work for 'view' and 'readonly' mode

Conflicts:
loleaflet/build/deps.js

diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index 65d5452..b3ce61c 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -228,6 +228,13 @@ var deps = {
desc: 'Switches edit, view and readOnly modes'
},
 
+   ControlSelection: {
+   src: ['control/Control.js',
+ 'control/Control.Selection.js'],
+   heading: 'Controls',
+   desc: 'Enables selection in view mode'
+   },
+
ControlStatusIndicator: {
src: ['control/Control.js',
  'control/Control.StatusIndicator.js'],
diff --git a/loleaflet/debug/document/document_simple_example.html 
b/loleaflet/debug/document/document_simple_example.html
index 7d90824..d259531 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -70,6 +70,7 @@
 // Controls /
 map.addControl(L.control.search());
 map.addControl(L.control.permissionSwitch());
+map.addControl(L.control.selection());
 map.addControl(L.control.zoom());
 map.addControl(L.control.parts());
 map.addControl(L.control.statusIndicator());
diff --git a/loleaflet/src/control/Control.Selection.js 
b/loleaflet/src/control/Control.Selection.js
new file mode 100644
index 000..abe3237
--- /dev/null
+++ b/loleaflet/src/control/Control.Selection.js
@@ -0,0 +1,49 @@
+/*
+ * L.Control.Selection enables by mouse drag selection in viewing mode
+ */
+
+L.Control.Selection = L.Control.extend({
+   options: {
+   position: 'topleft'
+   },
+
+   onAdd: function (map) {
+   var partName = 'leaflet-control-editviewswitch',
+   container = L.DomUtil.create('label', partName + ' 
leaflet-bar');
+
+   this._checkBox = L.DomUtil.create('input', 'editview-cb', 
container);
+   this._checkBox.type = 'checkbox';
+   L.DomEvent.on(this._checkBox, 'change', this._onChange, this);
+   map.on('updatepermission', this._onUpdatePermission, this);
+   container.appendChild(document.createTextNode('Enable 
Selection'));
+   return container;
+   },
+
+   _onChange: function () {
+   if (this._checkBox.checked) {
+   this._map.enableSelection();
+   }
+   else {
+   this._map.disableSelection();
+   }
+   },
+
+   _onUpdatePermission: function (e) {
+   if (e.perm === 'edit') {
+   this._checkBox.checked = false;
+   this._checkBox.disabled = true;
+   }
+   else if (e.perm === 'view') {
+   this._checkBox.checked = false;
+   this._checkBox.disabled = false;
+   }
+   else if (e.perm === 'readonly') {
+   this._checkBox.checked = false;
+   this._checkBox.disabled = false;
+   }
+   }
+});
+
+L.control.selection = function (options) {
+   return new L.Control.Selection(options);
+};
diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index 6933f64..f48d2e4 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -18,6 +18,24 @@ L.Map.include({
L.DomUtil.removeClass(this._container, className);
}
this.fire('updatepermission', {perm : perm});
+   },
+
+   enableSelection: function () {
+   if (this._docLayer._permission === 'edit') {
+   return;
+   }
+   var className = 'leaflet-editmode';
+   this.dragging.disable();
+   L.DomUtil.addClass(this._container, className);
+   },
+
+   disableSelection: function () {
+   if (this._docLayer._permission === 'edit') {
+   return;
+   }
+   var className = 'leafle

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

2015-07-13 Thread Mihai Varga 
 loleaflet/src/control/Control.Selection.js |   49 +
 1 file changed, 49 insertions(+)

New commits:
commit f6a9a8ce0435927bf4dc6f2001675870829eb275
Author: Mihai Varga 
Date:   Mon Jul 13 16:01:18 2015 +0300

loleaflet: selection control for viewing modes

diff --git a/loleaflet/src/control/Control.Selection.js 
b/loleaflet/src/control/Control.Selection.js
new file mode 100644
index 000..abe3237
--- /dev/null
+++ b/loleaflet/src/control/Control.Selection.js
@@ -0,0 +1,49 @@
+/*
+ * L.Control.Selection enables by mouse drag selection in viewing mode
+ */
+
+L.Control.Selection = L.Control.extend({
+   options: {
+   position: 'topleft'
+   },
+
+   onAdd: function (map) {
+   var partName = 'leaflet-control-editviewswitch',
+   container = L.DomUtil.create('label', partName + ' 
leaflet-bar');
+
+   this._checkBox = L.DomUtil.create('input', 'editview-cb', 
container);
+   this._checkBox.type = 'checkbox';
+   L.DomEvent.on(this._checkBox, 'change', this._onChange, this);
+   map.on('updatepermission', this._onUpdatePermission, this);
+   container.appendChild(document.createTextNode('Enable 
Selection'));
+   return container;
+   },
+
+   _onChange: function () {
+   if (this._checkBox.checked) {
+   this._map.enableSelection();
+   }
+   else {
+   this._map.disableSelection();
+   }
+   },
+
+   _onUpdatePermission: function (e) {
+   if (e.perm === 'edit') {
+   this._checkBox.checked = false;
+   this._checkBox.disabled = true;
+   }
+   else if (e.perm === 'view') {
+   this._checkBox.checked = false;
+   this._checkBox.disabled = false;
+   }
+   else if (e.perm === 'readonly') {
+   this._checkBox.checked = false;
+   this._checkBox.disabled = false;
+   }
+   }
+});
+
+L.control.selection = function (options) {
+   return new L.Control.Selection(options);
+};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif |binary
 vcl/source/filter/igif/decode.cxx  |2 ++
 2 files changed, 2 insertions(+)

New commits:
commit bca56c8bc261cd52969fc7e05d6bd2ed9ef72ea6
Author: Caolán McNamara 
Date:   Sat Jul 11 15:31:19 2015 +0100

fix gif import crash

Change-Id: I3a5e0efef6843fb8f8b485fa2369ac5b99513c31
(cherry picked from commit 839e051c658a638a259be6a6bb091b654fac405f)
Reviewed-on: https://gerrit.libreoffice.org/16952
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif
new file mode 100644
index 000..860f9e1
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif differ
diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 105eab9..2b445e9 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -200,6 +200,8 @@ bool GIFLZWDecompressor::ProcessOneCode()
 pE = pTable + nCode;
 do
 {
+if (pOutBufData == pOutBuf) //can't go back past start
+return false;
 nOutBufDataLen++;
 *(--pOutBufData) = pE->nData;
 pE = pE->pPrev;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif |binary
 vcl/source/filter/igif/decode.cxx  |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit b657d6c484ed75f7db4497c720caaffcc519b88c
Author: Caolán McNamara 
Date:   Sun Jul 12 10:56:48 2015 +0100

fix another gif import crash

Change-Id: I0ffa569e0c4240e11184df7dd56b95d87a12425d
(cherry picked from commit ee35b72064d8d1333709b102b051360018f8044b)
Reviewed-on: https://gerrit.libreoffice.org/16961
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif
new file mode 100644
index 000..b7265f8
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif differ
diff --git a/vcl/source/filter/igif/decode.cxx 
b/vcl/source/filter/igif/decode.cxx
index 46a666f..105eab9 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -193,6 +193,9 @@ bool GIFLZWDecompressor::ProcessOneCode()
 
 nOldCode = nCode;
 
+if (nCode > 4096)
+return false;
+
 // write character(/-sequence) of code nCode in the output buffer:
 pE = pTable + nCode;
 do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Mihai Varga 
 loleaflet/build/deps.js   |7 ++
 loleaflet/debug/document/document_simple_example.html |1 
 loleaflet/src/control/Permission.js   |   18 +
 loleaflet/src/layer/tile/TileLayer.js |   58 --
 4 files changed, 52 insertions(+), 32 deletions(-)

New commits:
commit 0d41a804eb7d696b7ebca1f0ed34fcb85ce4aeca
Author: Mihai Varga 
Date:   Mon Jul 13 15:50:02 2015 +0300

loleaflet: enabled mouse selection in viewing mode

Mouse selection is enabled by by calling
map.enableSelection() which disables dragging and selection
can be disabled to re-enable dragging by calling
map.disableSelection()
The above only work for 'view' and 'readonly' mode

diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index d656c7a..7f22db1 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -228,6 +228,13 @@ var deps = {
desc: 'Switches edit, view and readOnly modes'
},
 
+   ControlSelection: {
+   src: ['control/Control.js',
+ 'control/Control.Selection.js'],
+   heading: 'Controls',
+   desc: 'Enables selection in view mode'
+   },
+
ControlButtons: {
src: ['control/Control.js',
  'control/Control.Buttons.js'],
diff --git a/loleaflet/debug/document/document_simple_example.html 
b/loleaflet/debug/document/document_simple_example.html
index bb00203..446bb00 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -71,6 +71,7 @@
 map.addControl(L.control.buttons());
 map.addControl(L.control.search());
 map.addControl(L.control.permissionSwitch());
+map.addControl(L.control.selection());
 map.addControl(L.control.zoom());
 map.addControl(L.control.parts());
 map.addControl(L.control.statusIndicator());
diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index 6933f64..f48d2e4 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -18,6 +18,24 @@ L.Map.include({
L.DomUtil.removeClass(this._container, className);
}
this.fire('updatepermission', {perm : perm});
+   },
+
+   enableSelection: function () {
+   if (this._docLayer._permission === 'edit') {
+   return;
+   }
+   var className = 'leaflet-editmode';
+   this.dragging.disable();
+   L.DomUtil.addClass(this._container, className);
+   },
+
+   disableSelection: function () {
+   if (this._docLayer._permission === 'edit') {
+   return;
+   }
+   var className = 'leaflet-editmode';
+   this.dragging.enable();
+   L.DomUtil.removeClass(this._container, className);
}
 });
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index fb69720..8c88a36 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -738,10 +738,6 @@ L.TileLayer = L.GridLayer.extend({
return;
}
 
-   if (this._permission === 'readonly') {
-   return;
-   }
-
if (e.type === 'mousedown') {
this._mouseDown = true;
if (this._holdMouseEvent) {
@@ -754,7 +750,7 @@ L.TileLayer = L.GridLayer.extend({
}
else if (e.type === 'mouseup') {
this._mouseDown = false;
-   if (this._permission !== 'edit') {
+   if (this._map.dragging.enabled()) {
if (this._mouseEventsQueue.length === 0) {
// mouse up after panning
return;
@@ -779,7 +775,7 @@ L.TileLayer = L.GridLayer.extend({
if (this._mouseEventsQueue.length > 1) {
// it's a click, fire mousedown
this._mouseEventsQueue[0]();
-   if (this._permission !== 
'edit') {
+   if (this._permission === 
'view') {

this._map.setPermission('edit');
}
}
@@ -801,7 +797,7 @@ L.TileLayer = L.GridLayer.extend({
if (this._holdMouseEvent) {
clearTimeout(this._holdMouseEvent);
this._holdMouseEvent = null;
-   if (this._pe

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf |binary
 vcl/source/filter/wmf/winmtf.cxx   |   26 +
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 1eb5b896c366e270d5a09918b9f857ee90b37ad7
Author: Caolán McNamara 
Date:   Mon Jul 13 08:33:50 2015 +0100

emf: test for empty polygons

Change-Id: I3c8896230e3d48a37f4b8d702b0f673e44f45ba4
(cherry picked from commit 7df4d8544c6b12e31bcb81d9389d03ae7c11bfea)
Reviewed-on: https://gerrit.libreoffice.org/16973
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf
new file mode 100644
index 000..6adabec
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf differ
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index f14f934..20e2b5c 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1294,18 +1294,22 @@ void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, 
bool bTo, bool bRecordPath )
 {
 UpdateClipRegion();
 
-ImplMap( rPolygon );
-if ( bTo )
-{
-rPolygon[ 0 ] = maActPos;
-maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
-}
-if ( bRecordPath )
-aPathObj.AddPolyLine( rPolygon );
-else
+sal_uInt16 nPoints = rPolygon.GetSize();
+if (nPoints >= 1)
 {
-UpdateLineStyle();
-mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+ImplMap( rPolygon );
+if ( bTo )
+{
+rPolygon[ 0 ] = maActPos;
+maActPos = rPolygon[ rPolygon.GetSize() - 1 ];
+}
+if ( bRecordPath )
+aPathObj.AddPolyLine( rPolygon );
+else
+{
+UpdateLineStyle();
+mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, 
maLineStyle.aLineInfo ) );
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx   |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31880a0c0123f2062bd39a2d0aa928561fa1fc05
Author: Caolán McNamara 
Date:   Sun Jul 12 21:07:21 2015 +0100

emf: test for negative numbers

Change-Id: I9d9b6f3e9592ca7b85cee5422e43d4ca46b8bb36
(cherry picked from commit 4661b2dd34bd7c56b6d783d49f265e9ecde19caa)
Reviewed-on: https://gerrit.libreoffice.org/16969
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf
new file mode 100644
index 000..bbc0285
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 840f958..dcd802c 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1441,7 +1441,7 @@ bool EnhWMFReader::ReadEnhWMF()
 DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) 
== 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
 Point aPos( ptlReferenceX, ptlReferenceY );
-if ( nLen && nLen < static_cast( SAL_MAX_UINT32 
/ sizeof(sal_Int32) ) )
+if ( nLen > 0 && nLen < static_cast( 
SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
 {
 if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= 
nNextPos ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5966b7cc69123da2c267917f5e82a5b1c6985aaf
Author: Caolán McNamara 
Date:   Mon Jul 13 09:45:55 2015 +0100

emf: fix another hang

Change-Id: I971ba5f422827f3b8fcdb86c447fc48415225eca
(cherry picked from commit fe20502c86ef6156a54bb37ba2560c8b64d129a4)
Reviewed-on: https://gerrit.libreoffice.org/16978
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf
new file mode 100644
index 000..e3baf3b
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index de78559..840f958 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1728,9 +1728,9 @@ bool EnhWMFReader::ReadHeader()
 
 pWMF->ReadInt32(nRecordCount);
 
-if (nRecordCount == 0)
+if (nRecordCount <= 0)
 {
-SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
0! This shouldn't "
+SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 
<= 0! This shouldn't "
 "be possible... indicator of possible file 
corruption?");
 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-0-0' - include/xmloff xmloff/source

2015-07-13 Thread Laurent Balland-Poirier 
 include/xmloff/xmltoken.hxx  |4 ++--
 xmloff/source/core/xmltoken.cxx  |4 ++--
 xmloff/source/style/xmlnumfe.cxx |8 
 xmloff/source/style/xmlnumfi.cxx |   12 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 818d9bb2d1c7db06402a8a1cb5ab378b81ddeecb
Author: Laurent Balland-Poirier 
Date:   Fri Jul 10 08:21:23 2015 +0200

tdf#90133 Comply attributes name with OASIS#3860

See https://issues.oasis-open.org/browse/OFFICE-3860

Change-Id: I707b2e86633bc66df03dba8c43879aa6d5153062
Reviewed-on: https://gerrit.libreoffice.org/16905
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 9c2a8065add0da1e649633efa0795beddfa68eed)
Reviewed-on: https://gerrit.libreoffice.org/17005
(cherry picked from commit 0149261bd1cf5df9907022e04cabc275fc9422f7)
Reviewed-on: https://gerrit.libreoffice.org/17006
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Stahl 

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index bf6ad20..1eea8c1 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3250,8 +3250,8 @@ namespace xmloff { namespace token {
 XML_EXTERNALDATA,
 
 XML_EXPONENT_INTERVAL,
-XML_EXPONENT_SIGN,
-XML_MIN_DECIMAL_DIGITS,
+XML_FORCED_EXPONENT_SIGN,
+XML_MIN_DECIMAL_PLACES,
 
 XML_TOKEN_END
 };
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5e1dd51..63e4aff 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3248,8 +3248,8 @@ namespace xmloff { namespace token {
 TOKEN( "external-data", XML_EXTERNALDATA),
 
 TOKEN( "exponent-interval",   XML_EXPONENT_INTERVAL ),
-TOKEN( "exponent-sign",   XML_EXPONENT_SIGN ),
-TOKEN( "min-decimal-digits",  XML_MIN_DECIMAL_DIGITS ),
+TOKEN( "forced-exponent-sign",XML_FORCED_EXPONENT_SIGN ),
+TOKEN( "min-decimal-places",  XML_MIN_DECIMAL_PLACES ),
 
 #if OSL_DEBUG_LEVEL > 0
 { 0, NULL, NULL,   XML_TOKEN_END }
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 6b7142f..6c9d360 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -572,7 +572,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
 
 if ( nMinDecimals >= 0 )   // negative = automatic
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,
   OUString::number( nMinDecimals ) );
 }
 
@@ -653,7 +653,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 
 if ( nMinDecimals >= 0 )   // negative = automatic
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,
   OUString::number( nMinDecimals ) );
 }
 
@@ -694,11 +694,11 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 //  exponent sign
 if ( bExpSign )
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_TRUE );
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, 
XML_TRUE );
 }
 else
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_FALSE );
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, 
XML_FALSE );
 }
 
 SvXMLElementExport aElem( rExport,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index a422b25..cbafde7 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -274,7 +274,7 @@ enum SvXMLStyleAttrTokens
 enum SvXMLStyleElemAttrTokens
 {
 XML_TOK_ELEM_ATTR_DECIMAL_PLACES,
-XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS,
+XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES,
 XML_TOK_ELEM_ATTR_MIN_INTEGER_DIGITS,
 XML_TOK_ELEM_ATTR_GROUPING,
 XML_TOK_ELEM_ATTR_DISPLAY_FACTOR,
@@ -282,7 +282,7 @@ enum SvXMLStyleElemAttrTokens
 XML_TOK_ELEM_ATTR_DENOMINATOR_VALUE,
 XML_TOK_ELEM_ATTR_MIN_EXPONENT_DIGITS,
 XML_TOK_ELEM_ATTR_EXPONENT_INTERVAL,
-XML_TOK_ELEM_ATTR_EXPONENT_SIGN,
+XML_TOK_ELEM_ATTR_FORCED_EXPONENT_SIGN,
 XML_TOK_ELEM_ATTR_MIN_NUMERATOR_DIGITS,
 XML_TOK_ELEM_ATTR_MIN_DENOMINATOR_DIGITS,
 XML_TOK_ELEM_ATTR_RFC_LANGUAGE_TAG,
@@ -572,7 +572,7 @@ const SvXMLTokenMap& 
SvXMLNumImpData::GetStyleElemAttrTokenMap()
 {
 //  attributes for an element within a style
 { XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,  
XML_TOK_ELEM_ATTR_DECIMAL_PLACES   },
-{ XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,  
XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS   },
+

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

2015-07-13 Thread Jorenz Paragas 
 connectivity/source/drivers/ado/AColumn.cxx|   14 --
 connectivity/source/drivers/ado/AColumns.cxx   |   14 --
 connectivity/source/drivers/ado/AConnection.cxx|   14 +-
 connectivity/source/drivers/hsqldb/HDriver.cxx |   16 ++--
 connectivity/source/drivers/hsqldb/HStorageMap.cxx |   18 ++
 connectivity/source/drivers/odbc/OResultSet.cxx|4 +++-
 6 files changed, 36 insertions(+), 44 deletions(-)

New commits:
commit 6e7c923d632c757c9a38a724cad2d55a84755570
Author: Jorenz Paragas 
Date:   Fri Jul 10 21:07:51 2015 -0700

tdf#91112 replace o3tl::compose1 with lambdas in connectivity

Change-Id: I8f61471e08fe7f620d76bdcd72eb7f5c35931388
Reviewed-on: https://gerrit.libreoffice.org/16940
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/connectivity/source/drivers/ado/AColumn.cxx 
b/connectivity/source/drivers/ado/AColumn.cxx
index 7a9769f..81e18c5 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -215,16 +215,10 @@ void OAdoColumn::fillPropertyValues()
 else if ( eType == adVarBinary && 
ADOS::isJetEngine(m_pConnection->getEngineType()) )
 {
 ::comphelper::UStringMixEqual aCase(sal_False);
-OTypeInfoMap::const_iterator aFind = 
::std::find_if(pTypeInfoMap->begin(),
-
pTypeInfoMap->end(),
-::o3tl::compose1(
-
::std::bind2nd(aCase, OUString("VarBinary")),
-
::o3tl::compose1(
-
::std::mem_fun(&OExtendedTypeInfo::getDBName),
-
::o3tl::select2nd())
-)
-
-);
+OTypeInfoMap::const_iterator aFind = 
::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(),
+[&aCase] (OTypeInfoMap::value_type typeInfo) {
+return aCase(typeInfo.second->getDBName(), 
OUString("VarBinary"));
+});
 
 if ( aFind != pTypeInfoMap->end() ) // change column type if 
necessary
 {
diff --git a/connectivity/source/drivers/ado/AColumns.cxx 
b/connectivity/source/drivers/ado/AColumns.cxx
index 936510f1..66af0bc 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -88,16 +88,10 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, 
const Reference< XPro
 const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo();
 ::comphelper::UStringMixEqual aCase(sal_False);
 // search for typeinfo where the typename is equal sTypeName
-OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(),
-pTypeInfoMap->end(),
-::o3tl::compose1(
-
::std::bind2nd(aCase, sTypeName),
-::o3tl::compose1(
-
::std::mem_fun(&OExtendedTypeInfo::getDBName),
-
::o3tl::select2nd())
-)
-
-);
+OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), 
pTypeInfoMap->end(),
+[&aCase, &sTypeName] (OTypeInfoMap::value_type typeInfo) {
+return aCase(typeInfo.second->getDBName(), sTypeName);
+});
 
 if ( aFind != pTypeInfoMap->end() ) // change column type if necessary
 aColumn.put_Type(aFind->first);
diff --git a/connectivity/source/drivers/ado/AConnection.cxx 
b/connectivity/source/drivers/ado/AConnection.cxx
index 319bc68..463db7f 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -598,15 +598,11 @@ const OExtendedTypeInfo* 
OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
 {
 ::comphelper::UStringMixEqual aCase(sal_False);
 // search for typeinfo where the typename is equal _sTypeName
-OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(),
-_rTypeInfo.end(),
-::o3tl::compose1(
-
::std::bind2nd(aCase, _sTypeName),
-

[Bug 91112] replace use of o3tl::compose1 by lambdas

2015-07-13 Thread bugzilla-daemon 
https://bugs.documentfoundation.org/show_bug.cgi?id=91112

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

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

tdf#91112 replace o3tl::compose1 with lambdas in connectivity

It will be available in 5.1.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: vcl/inc

2015-07-13 Thread Stephan Bergmann 
 vcl/inc/printdlg.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit a5db487caaf026e648b34d0fab58376230c1cc47
Author: Stephan Bergmann 
Date:   Mon Jul 13 14:22:51 2015 +0200

-Werror,-Wunused-private-field

Change-Id: I35749d468d126084a518bcd423f8a081c7382d80

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index a82dcdc..1f4f555 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -219,9 +219,6 @@ namespace vcl
 OUString   maPrintText;
 OUString   maDefPrtText;
 
-SizemaDetailsCollapsedSize;
-SizemaDetailsExpandedSize;
-
 boolmbShowLayoutPage;
 
 Size getJobPageSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/xmloff xmloff/source

2015-07-13 Thread Laurent Balland-Poirier 
 include/xmloff/xmltoken.hxx  |4 ++--
 xmloff/source/core/xmltoken.cxx  |4 ++--
 xmloff/source/style/xmlnumfe.cxx |8 
 xmloff/source/style/xmlnumfi.cxx |   12 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 0149261bd1cf5df9907022e04cabc275fc9422f7
Author: Laurent Balland-Poirier 
Date:   Fri Jul 10 08:21:23 2015 +0200

tdf#90133 Comply attributes name with OASIS#3860

See https://issues.oasis-open.org/browse/OFFICE-3860

Change-Id: I707b2e86633bc66df03dba8c43879aa6d5153062
Reviewed-on: https://gerrit.libreoffice.org/16905
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 9c2a8065add0da1e649633efa0795beddfa68eed)
Reviewed-on: https://gerrit.libreoffice.org/17005

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index bf6ad20..1eea8c1 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3250,8 +3250,8 @@ namespace xmloff { namespace token {
 XML_EXTERNALDATA,
 
 XML_EXPONENT_INTERVAL,
-XML_EXPONENT_SIGN,
-XML_MIN_DECIMAL_DIGITS,
+XML_FORCED_EXPONENT_SIGN,
+XML_MIN_DECIMAL_PLACES,
 
 XML_TOKEN_END
 };
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5e1dd51..63e4aff 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3248,8 +3248,8 @@ namespace xmloff { namespace token {
 TOKEN( "external-data", XML_EXTERNALDATA),
 
 TOKEN( "exponent-interval",   XML_EXPONENT_INTERVAL ),
-TOKEN( "exponent-sign",   XML_EXPONENT_SIGN ),
-TOKEN( "min-decimal-digits",  XML_MIN_DECIMAL_DIGITS ),
+TOKEN( "forced-exponent-sign",XML_FORCED_EXPONENT_SIGN ),
+TOKEN( "min-decimal-places",  XML_MIN_DECIMAL_PLACES ),
 
 #if OSL_DEBUG_LEVEL > 0
 { 0, NULL, NULL,   XML_TOKEN_END }
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 6b7142f..6c9d360 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -572,7 +572,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
 
 if ( nMinDecimals >= 0 )   // negative = automatic
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,
   OUString::number( nMinDecimals ) );
 }
 
@@ -653,7 +653,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 
 if ( nMinDecimals >= 0 )   // negative = automatic
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,
   OUString::number( nMinDecimals ) );
 }
 
@@ -694,11 +694,11 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 //  exponent sign
 if ( bExpSign )
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_TRUE );
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, 
XML_TRUE );
 }
 else
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_FALSE );
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, 
XML_FALSE );
 }
 
 SvXMLElementExport aElem( rExport,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 5b8ad3f..e9e25f4 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -274,7 +274,7 @@ enum SvXMLStyleAttrTokens
 enum SvXMLStyleElemAttrTokens
 {
 XML_TOK_ELEM_ATTR_DECIMAL_PLACES,
-XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS,
+XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES,
 XML_TOK_ELEM_ATTR_MIN_INTEGER_DIGITS,
 XML_TOK_ELEM_ATTR_GROUPING,
 XML_TOK_ELEM_ATTR_DISPLAY_FACTOR,
@@ -282,7 +282,7 @@ enum SvXMLStyleElemAttrTokens
 XML_TOK_ELEM_ATTR_DENOMINATOR_VALUE,
 XML_TOK_ELEM_ATTR_MIN_EXPONENT_DIGITS,
 XML_TOK_ELEM_ATTR_EXPONENT_INTERVAL,
-XML_TOK_ELEM_ATTR_EXPONENT_SIGN,
+XML_TOK_ELEM_ATTR_FORCED_EXPONENT_SIGN,
 XML_TOK_ELEM_ATTR_MIN_NUMERATOR_DIGITS,
 XML_TOK_ELEM_ATTR_MIN_DENOMINATOR_DIGITS,
 XML_TOK_ELEM_ATTR_RFC_LANGUAGE_TAG,
@@ -572,7 +572,7 @@ const SvXMLTokenMap& 
SvXMLNumImpData::GetStyleElemAttrTokenMap()
 {
 //  attributes for an element within a style
 { XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,  
XML_TOK_ELEM_ATTR_DECIMAL_PLACES   },
-{ XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,  
XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS   },
+{ XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,  
XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES   },
 { XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,  
XML_TOK_ELEM_ATTR_MIN_INTE

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

2015-07-13 Thread Arnaud Versini 
 sw/source/uibase/docvw/srcedtw.cxx |   23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 59f58350e49068b78f8a7426bfc08ee4d722b4b4
Author: Arnaud Versini 
Date:   Sat Jul 11 15:26:41 2015 +0200

swui: avoid name conflict with SwTextPortion for LTO optimisation

Change-Id: Iaf6fec2e19af2cf393bc547c3ba439010819238f
Reviewed-on: https://gerrit.libreoffice.org/16949
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/uibase/docvw/srcedtw.cxx 
b/sw/source/uibase/docvw/srcedtw.cxx
index 98bea25..b67fb36 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -47,19 +47,24 @@
 #include 
 #include 
 
-struct SwTextPortion
+namespace
+{
+
+struct TextPortion
 {
 sal_uInt16 nLine;
 sal_uInt16 nStart, nEnd;
 svtools::ColorConfigEntry eType;
 };
 
+}
+
 #define MAX_SYNTAX_HIGHLIGHT 20
 #define MAX_HIGHLIGHTTIME 200
 
-typedef std::deque SwTextPortions;
+typedef std::deque TextPortions;
 
-static void lcl_Highlight(const OUString& rSource, SwTextPortions& 
aPortionList)
+static void lcl_Highlight(const OUString& rSource, TextPortions& aPortionList)
 {
 const sal_Unicode cOpenBracket = '<';
 const sal_Unicode cCloseBracket= '>';
@@ -77,7 +82,7 @@ static void lcl_Highlight(const OUString& rSource, 
SwTextPortions& aPortionList)
 sal_uInt16 nOffset = 0; // Offset of nActPos to '<'
 sal_uInt16 nPortStart = USHRT_MAX;  // for the TextPortion
 sal_uInt16 nPortEnd  =  0;
-SwTextPortion aText;
+TextPortion aText;
 while(nActPos < nStrLen)
 {
 svtools::ColorConfigEntry eFoundType = svtools::HTMLUNKNOWN;
@@ -179,7 +184,7 @@ static void lcl_Highlight(const OUString& rSource, 
SwTextPortions& aPortionList)
 
 if(bFound ||(eFoundType == svtools::HTMLCOMMENT))
 {
-SwTextPortion aTextPortion;
+TextPortion aTextPortion;
 aTextPortion.nLine = 0;
 aTextPortion.nStart = nPortStart + 1;
 aTextPortion.nEnd = nPortEnd;
@@ -679,14 +684,14 @@ void SwSrcEditWindow::DoDelayedSyntaxHighlight( 
sal_uInt16 nPara )
 
 void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 
nLineOff )
 {
-SwTextPortions aPortionList;
+TextPortions aPortionList;
 lcl_Highlight(rSource, aPortionList);
 
 size_t nCount = aPortionList.size();
 if ( !nCount )
 return;
 
-SwTextPortion& rLast = aPortionList[nCount-1];
+TextPortion& rLast = aPortionList[nCount-1];
 if ( rLast.nStart > rLast.nEnd )// Only until Bug from MD is resolved
 {
 nCount--;
@@ -703,7 +708,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& 
rSource, sal_uInt16 nLineO
 
 for ( size_t i = 0; i < nCount; i++ )
 {
-SwTextPortion& r = aPortionList[i];
+TextPortion& r = aPortionList[i];
 SAL_WARN_IF(
 r.nLine != aPortionList[0].nLine, "sw.level2",
 "multiple lines after all?");
@@ -724,7 +729,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& 
rSource, sal_uInt16 nLineO
 
 for ( size_t i = 0; i < aPortionList.size(); i++ )
 {
-SwTextPortion& r = aPortionList[i];
+TextPortion& r = aPortionList[i];
 if ( r.nStart > r.nEnd )// only until Bug from MD is resolved
 continue;
 if(r.eType !=  svtools::HTMLSGML&&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/inc chart2/Library_chartcontroller.mk chart2/source framework/inc framework/Library_fwk.mk framework/source framework/util include/svx officecfg/registry reportd

2015-07-13 Thread Maxim Monastirsky 
 chart2/Library_chartcontroller.mk   |1 
 chart2/inc/pch/precompiled_chartcontroller.hxx  |1 
 chart2/source/controller/chartcontroller.component  |4 
 chart2/source/controller/main/ShapeToolbarController.cxx|  290 --
 chart2/source/controller/main/ShapeToolbarController.hxx|   94 --
 framework/Library_fwk.mk|1 
 framework/inc/uifactory/factoryconfiguration.hxx|4 
 framework/source/uielement/subtoolbarcontroller.cxx |  458 
++
 framework/source/uifactory/factoryconfiguration.cxx |8 
 framework/source/uifactory/uicontrollerfactory.cxx  |   18 
 framework/util/fwk.component|4 
 include/svx/tbxcustomshapes.hxx |   59 -
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |  120 --
 reportdesign/inc/pch/precompiled_rptui.hxx  |1 
 reportdesign/source/ui/misc/toolboxcontroller.cxx   |   62 -
 sc/inc/pch/precompiled_sc.hxx   |1 
 sc/source/ui/app/scdll.cxx  |7 
 sd/inc/pch/precompiled_sd.hxx   |1 
 sd/source/ui/app/sddll.cxx  |8 
 sd/source/ui/func/fuconcs.cxx   |1 
 sd/source/ui/view/drviews6.cxx  |1 
 sd/source/ui/view/drvwshrg.cxx  |1 
 svx/Library_svx.mk  |1 
 svx/source/customshapes/tbxcustomshapes.cxx |  157 ---
 sw/inc/pch/precompiled_sw.hxx   |1 
 sw/source/uibase/app/swmodule.cxx   |8 
 sw/source/uibase/shells/drawsh.cxx  |1 
 27 files changed, 512 insertions(+), 801 deletions(-)

New commits:
commit 2aea9e37d697ce51efc5fb37ba50f1bf177e0445
Author: Maxim Monastirsky 
Date:   Sun Jul 12 21:11:17 2015 +0300

Introduce generic sub toolbar controller

Currently many toolbar controllers are basically doing the
same thing - show some docked toolbar. So the idea here is
to have one generic controller that will handle all these
cases in a unified way. It will get the name of the toolbar
that it's supposed to show from the configuration, based on
the command it was registered for.

Right now it can handle both simple (i.e. with DROPDOWNONLY
bits) and split (i.e. with DROPDOWN bits) scenarios, where
for split kind it replaces the function (and the image) of
the main part of the button, with the last selected function,
for easy reusing. A button is considered to be a split one,
if the name of the initial default command was passed along
with the sub toolbar name, otherwise it will be a simple
button.

The core change is in framework/. Other parts are a usage
example, in form of converting the custom shapes buttons
to this new controller.

Change-Id: I087cc58c3db1889ca69a26546d4f00fe07e2a58d
Reviewed-on: https://gerrit.libreoffice.org/16967
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/chart2/Library_chartcontroller.mk 
b/chart2/Library_chartcontroller.mk
index 884404e..1b2b46d 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -183,7 +183,6 @@ $(eval $(call 
gb_Library_add_exception_objects,chartcontroller,\
 chart2/source/controller/main/PositionAndSizeHelper \
 chart2/source/controller/main/SelectionHelper \
 chart2/source/controller/main/ShapeController \
-chart2/source/controller/main/ShapeToolbarController \
 chart2/source/controller/main/StatusBarCommandDispatch \
 chart2/source/controller/main/UndoActions \
 chart2/source/controller/main/UndoCommandDispatch \
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx 
b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 12b3613..f6ebf36 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -270,7 +270,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/controller/chartcontroller.component 
b/chart2/source/controller/chartcontroller.component
index 045d61f..23269ba 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -43,10 +43,6 @@
   
constructor="com_sun_star_comp_chart2_ChartTypeDialog_get_implementation">
 
   
-  
-
-  
   
 
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx 
b/chart2/source/controller/main/ShapeToolbarController.cxx
deleted file mode 100644
index 999c9ba..000
--- a/chart2/source/contro

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

2015-07-13 Thread Laurent Balland-Poirier 
 include/xmloff/xmltoken.hxx  |4 ++--
 xmloff/source/core/xmltoken.cxx  |4 ++--
 xmloff/source/style/xmlnumfe.cxx |8 
 xmloff/source/style/xmlnumfi.cxx |   12 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 9c2a8065add0da1e649633efa0795beddfa68eed
Author: Laurent Balland-Poirier 
Date:   Fri Jul 10 08:21:23 2015 +0200

tdf#90133 Comply attributes name with OASIS#3860

See https://issues.oasis-open.org/browse/OFFICE-3860

Change-Id: I707b2e86633bc66df03dba8c43879aa6d5153062
Reviewed-on: https://gerrit.libreoffice.org/16905
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index bf6ad20..1eea8c1 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3250,8 +3250,8 @@ namespace xmloff { namespace token {
 XML_EXTERNALDATA,
 
 XML_EXPONENT_INTERVAL,
-XML_EXPONENT_SIGN,
-XML_MIN_DECIMAL_DIGITS,
+XML_FORCED_EXPONENT_SIGN,
+XML_MIN_DECIMAL_PLACES,
 
 XML_TOKEN_END
 };
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5e1dd51..63e4aff 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3248,8 +3248,8 @@ namespace xmloff { namespace token {
 TOKEN( "external-data", XML_EXTERNALDATA),
 
 TOKEN( "exponent-interval",   XML_EXPONENT_INTERVAL ),
-TOKEN( "exponent-sign",   XML_EXPONENT_SIGN ),
-TOKEN( "min-decimal-digits",  XML_MIN_DECIMAL_DIGITS ),
+TOKEN( "forced-exponent-sign",XML_FORCED_EXPONENT_SIGN ),
+TOKEN( "min-decimal-places",  XML_MIN_DECIMAL_PLACES ),
 
 #if OSL_DEBUG_LEVEL > 0
 { 0, NULL, NULL,   XML_TOKEN_END }
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 700113e..535d136 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -570,7 +570,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
 
 if ( nMinDecimals >= 0 )   // negative = automatic
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,
   OUString::number( nMinDecimals ) );
 }
 
@@ -651,7 +651,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 
 if ( nMinDecimals >= 0 )   // negative = automatic
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,
   OUString::number( nMinDecimals ) );
 }
 
@@ -692,11 +692,11 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 //  exponent sign
 if ( bExpSign )
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_TRUE );
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, 
XML_TRUE );
 }
 else
 {
-rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_FALSE );
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, 
XML_FALSE );
 }
 
 SvXMLElementExport aElem( rExport,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index b1a59ae..700cbae 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -274,7 +274,7 @@ enum SvXMLStyleAttrTokens
 enum SvXMLStyleElemAttrTokens
 {
 XML_TOK_ELEM_ATTR_DECIMAL_PLACES,
-XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS,
+XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES,
 XML_TOK_ELEM_ATTR_MIN_INTEGER_DIGITS,
 XML_TOK_ELEM_ATTR_GROUPING,
 XML_TOK_ELEM_ATTR_DISPLAY_FACTOR,
@@ -282,7 +282,7 @@ enum SvXMLStyleElemAttrTokens
 XML_TOK_ELEM_ATTR_DENOMINATOR_VALUE,
 XML_TOK_ELEM_ATTR_MIN_EXPONENT_DIGITS,
 XML_TOK_ELEM_ATTR_EXPONENT_INTERVAL,
-XML_TOK_ELEM_ATTR_EXPONENT_SIGN,
+XML_TOK_ELEM_ATTR_FORCED_EXPONENT_SIGN,
 XML_TOK_ELEM_ATTR_MIN_NUMERATOR_DIGITS,
 XML_TOK_ELEM_ATTR_MIN_DENOMINATOR_DIGITS,
 XML_TOK_ELEM_ATTR_RFC_LANGUAGE_TAG,
@@ -572,7 +572,7 @@ const SvXMLTokenMap& 
SvXMLNumImpData::GetStyleElemAttrTokenMap()
 {
 //  attributes for an element within a style
 { XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,  
XML_TOK_ELEM_ATTR_DECIMAL_PLACES   },
-{ XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,  
XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS   },
+{ XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES,  
XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES   },
 { XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,  
XML_TOK_ELEM_ATTR_MIN_INTEGER_DIGITS   },
 { XML_NAMESPACE_NUMBER, XML_GROUPING,
XML_TOK_ELEM_ATTR_GROUPING },

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

2015-07-13 Thread Stephan Bergmann 
 configmgr/qa/unit/test.cxx  |5 +++--
 configmgr/source/access.cxx |   12 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit e80df0d58ba32e3041ff9c8cdea9c617ea7e633b
Author: Stephan Bergmann 
Date:   Mon Jul 13 14:07:38 2015 +0200

tdf#92639: Slashes are allowed in set member names, of course

Change-Id: I30944fe9611e83566c891a7d1461ad02979daddd

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 544a808..a9f609b 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -315,8 +315,9 @@ void Test::testInsertSetMember() {
 } catch (css::lang::IllegalArgumentException &) {}
 try {
 access->insertByName("a/b", css::uno::makeAny(member));
-CPPUNIT_FAIL("expected IllegalArgumentException");
-} catch (css::lang::IllegalArgumentException &) {}
+} catch (css::lang::IllegalArgumentException &) {
+CPPUNIT_FAIL("unexpected IllegalArgumentException");
+}
 css::uno::Reference(
 access, css::uno::UNO_QUERY_THROW)->commitChanges();
 css::uno::Reference(
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index b8fadbc..fa2930a 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -109,12 +109,12 @@ namespace {
 // Conservatively forbid what is either not an XML Char (including lone
 // surrogates, even though they should not appear in well-formed UNO OUString
 // instances anyway), or is a slash (as it causes problems in path syntax):
-bool isValidName(OUString const & name) {
+bool isValidName(OUString const & name, bool setMember) {
 for (sal_Int32 i = 0; i != name.getLength();) {
 sal_uInt32 c = name.iterateCodePoints(&i);
 if ((c < 0x20 && !(c == 0x09 || c == 0x0A || c == 0x0D))
 || rtl::isHighSurrogate(c) || rtl::isLowSurrogate(c) || c == 0xFFFE
-|| c == 0x || c == '/')
+|| c == 0x || (!setMember && c == '/'))
 {
 return false;
 }
@@ -669,7 +669,7 @@ void Access::setName(OUString const & aName)
 if (node->getMandatory() == Data::NO_LAYER &&
 !(other.is() && other->isFinalized()))
 {
-if (!isValidName(aName)) {
+if (!isValidName(aName, true)) {
 throw css::uno::RuntimeException(
 "invalid element name " + aName);
 }
@@ -1188,7 +1188,7 @@ void Access::insertByName(
 Modifications localMods;
 switch (getNode()->kind()) {
 case Node::KIND_LOCALIZED_PROPERTY:
-if (!isValidName(aName)) {
+if (!isValidName(aName, false)) {
 throw css::lang::IllegalArgumentException(
 aName, static_cast(this), 0);
 }
@@ -1196,7 +1196,7 @@ void Access::insertByName(
 break;
 case Node::KIND_GROUP:
 {
-if (!isValidName(aName)) {
+if (!isValidName(aName, false)) {
 throw css::lang::IllegalArgumentException(
 aName, static_cast(this), 0);
 }
@@ -1212,7 +1212,7 @@ void Access::insertByName(
 break;
 case Node::KIND_SET:
 {
-if (!isValidName(aName)) {
+if (!isValidName(aName, true)) {
 throw css::lang::IllegalArgumentException(
 aName, static_cast(this), 0);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/source/gdi/jobset.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 481240f4ba80c794bc86e1fec7795712f2b08650
Author: Caolán McNamara 
Date:   Mon Jul 13 11:02:56 2015 +0100

min legal size here is > 4

(cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3)

Change-Id: I9f68d000b32623db4d949d13284043630f5689f4
(cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab)
Reviewed-on: https://gerrit.libreoffice.org/16995
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index ab6d0cd..67109134 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -222,7 +222,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 {
 sal_uInt16 nLen = 0;
 rIStream.ReadUInt16( nLen );
-if ( !nLen )
+if (nLen <= 4)
 return rIStream;
 
 sal_uInt16 nSystem = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 sw/source/filter/ww8/ww8scan.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit b59f8b33f44d834ac6c946f4524a106f09eb8364
Author: Caolán McNamara 
Date:   Mon Jul 13 10:31:30 2015 +0100

ww8: make sure we don't wrap around

Change-Id: I667bb264f92024b72f230c2ddbba3887471345f2
(cherry picked from commit 755b9320c81948358a1d4104c8875594b5700d39)
(cherry picked from commit cd3e5ddeb4100bab2a39cf9913e14eb371edbbcc)
Reviewed-on: https://gerrit.libreoffice.org/16994
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 0446bfc..c97db22 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1542,7 +1542,11 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 if( 2 == clxt ) // PLCFfpcd ?
 break;  // PLCFfpcd gefunden
 if( 1 == clxt ) // clxtGrpprl ?
+{
+if (nGrpprl == SHRT_MAX)
+return NULL;
 nGrpprl++;
+}
 sal_uInt16 nLen(0);
 pStr->ReadUInt16( nLen );
 nLeft -= 2 + nLen;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - avmedia/Library_avmediavlc.mk avmedia/source

2015-07-13 Thread Michael Stahl 
 avmedia/Library_avmediavlc.mk  |1 -
 avmedia/source/vlc/vlcframegrabber.cxx |   18 ++
 avmedia/source/vlc/vlcframegrabber.hxx |2 ++
 avmedia/source/vlc/vlcplayer.cxx   |   19 +++
 avmedia/source/vlc/vlcwindow.cxx   |   18 ++
 avmedia/source/vlc/vlcwindow.hxx   |2 ++
 avmedia/source/vlc/wrapper/Common.cxx  |4 +++-
 avmedia/source/vlc/wrapper/ThreadsafeQueue.cxx |5 -
 avmedia/source/vlc/wrapper/Types.hxx   |7 +++
 9 files changed, 69 insertions(+), 7 deletions(-)

New commits:
commit 888f51c749bc504f12295433a747dd507723bb56
Author: Michael Stahl 
Date:   Mon Jul 13 12:10:08 2015 +0200

avmedia: add some missing license headers to vlc files

Change-Id: Ice9440bec7b0b5a4de2dca1392805130b1048303

diff --git a/avmedia/source/vlc/vlcframegrabber.cxx 
b/avmedia/source/vlc/vlcframegrabber.cxx
index 05a27c2..bc5d03d 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -1,4 +1,22 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
 #include 
 #include 
 #include 
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx 
b/avmedia/source/vlc/vlcframegrabber.hxx
index 6a34fe3..493a695 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -56,3 +56,5 @@ public:
 }
 
 #endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 60d7b87..a8437b2 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -1,3 +1,22 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
 #include 
 #include 
 #include 
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index b7b63a8..ffac437 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -1,4 +1,22 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
 #include 
 #include 
 #include "vlcwindow.hxx"
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 6ce10c4..35f2b1f 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -73,3 +73,5 @@ public:
 }
 
 #endif // INCLUDED_AVMEDIA_SOURCE

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - xmloff/source

2015-07-13 Thread Eike Rathke 
 xmloff/source/style/xmlnumfi.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9d23401109f93fcff37f35f708af7ec33e690ed4
Author: Eike Rathke 
Date:   Fri Jul 10 23:20:28 2015 +0200

the last condition is "all other numbers", not the third, tdf#92457 related

(cherry picked from commit b3c11e2b3ef4bad8c2b5f92ba00ac805fb68786f)

So we'll properly strip the "value()<=1.79769313486232E+308"
condition that 5.1 will write.

This will not enable the handling of the style, but at least it is fed
correctly as intended to the number formatter.

Change-Id: Ic9571d938c4a8837c5712bafbfb2ebf9f32011df
Reviewed-on: https://gerrit.libreoffice.org/16988
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index a422b25..5b8ad3f 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -2129,10 +2129,10 @@ void SvXMLNumFormatContext::AddCondition( const 
sal_Int32 nIndex )
 if ( aConditions.isEmpty() && aMyConditions.size() == 1 && sRealCond 
== ">=0" )
 bDefaultCond = true;
 
-if ( nType == XML_TOK_STYLES_TEXT_STYLE && nIndex == 2 )
+if ( nType == XML_TOK_STYLES_TEXT_STYLE && static_cast(nIndex) 
== aMyConditions.size() - 1 )
 {
-//  The third condition in a number format with a text part can 
only be
-//  "all other numbers", the condition string must be empty.
+//  The last condition in a number format with a text part can only
+//  be "all other numbers", the condition string must be empty.
 bDefaultCond = true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Eike Rathke 
 xmloff/source/style/xmlnumfi.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cdb2d6aa33a409994c3033cf621847d1552ce8cd
Author: Eike Rathke 
Date:   Fri Jul 10 23:20:28 2015 +0200

the last condition is "all other numbers", not the third, tdf#92457 related

(cherry picked from commit b3c11e2b3ef4bad8c2b5f92ba00ac805fb68786f)

So we'll properly strip the "value()<=1.79769313486232E+308"
condition that 5.1 will write.

This will not enable the handling of the style, but at least it is fed
correctly as intended to the number formatter.

Change-Id: Ic9571d938c4a8837c5712bafbfb2ebf9f32011df
Reviewed-on: https://gerrit.libreoffice.org/16990
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 6c84c5a..99b030d 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -2060,10 +2060,10 @@ void SvXMLNumFormatContext::AddCondition( const 
sal_Int32 nIndex )
 if ( aConditions.isEmpty() && aMyConditions.size() == 1 && 
sRealCond.equalsAscii( ">=0" ) )
 bDefaultCond = true;
 
-if ( nType == XML_TOK_STYLES_TEXT_STYLE && nIndex == 2 )
+if ( nType == XML_TOK_STYLES_TEXT_STYLE && static_cast(nIndex) 
== aMyConditions.size() - 1 )
 {
-//  The third condition in a number format with a text part can 
only be
-//  "all other numbers", the condition string must be empty.
+//  The last condition in a number format with a text part can only
+//  be "all other numbers", the condition string must be empty.
 bDefaultCond = true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Stephan Bergmann 
 postprocess/qa/services.cxx   |   11 +++
 sc/source/ui/unoobj/docuno.cxx|5 -
 sd/source/ui/unoidl/unomodel.cxx  |9 ++---
 sw/source/uibase/uno/unotxdoc.cxx |   13 -
 4 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit 61a3be76c221c822b189d20e9269ec5caf1aadcc
Author: Stephan Bergmann 
Date:   Mon Jul 13 13:44:06 2015 +0200

tdf#92668: Revert some implementation names, for backwards compatibility

These implementation names of Calc, Draw, Impress, and Writer documents are 
the
most likely to be checked by existing third-party code, so revert the
corresponding parts of 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 "Fix various
XServiceInfo implementations" (and instead add fixups in 
CppunitTest_serives).

Change-Id: I1a760adbf4c89a1b4477d6e628abba8d2028ccfe

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index ec26474..35e5b10 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -365,6 +365,17 @@ void Test::createInstance(
 expImpl = "com.sun.star.svtools.OfficeFolderPicker";
 expServs = {"com.sun.star.ui.dialogs.OfficeFolderPicker"};
 #endif
+} else if (expImpl == "com.sun.star.comp.Calc.SpreadsheetDocument") {
+expImpl = "ScModelObj";
+} else if (expImpl == "com.sun.star.comp.Draw.DrawingDocument"
+   || expImpl == "com.sun.star.comp.Draw.PresentationDocument")
+{
+expImpl = "SdXImpressDocument";
+} else if (expImpl == "com.sun.star.comp.Writer.GlobalDocument"
+   || expImpl == "com.sun.star.comp.Writer.TextDocument"
+   || expImpl == "com.sun.star.comp.Writer.WebDocument")
+{
+expImpl = "SwXTextDocument";
 }
 CPPUNIT_ASSERT_EQUAL_MESSAGE(
 (OString(
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 27b72ee..a1bf527 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2435,7 +2435,10 @@ uno::Sequence SAL_CALL 
ScModelObj::getAvailableServiceNames()
 // XServiceInfo
 OUString SAL_CALL ScModelObj::getImplementationName() 
throw(uno::RuntimeException, std::exception)
 {
-return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+return OUString( "ScModelObj" );
+/* // Matching the .component information:
+   return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+*/
 }
 
 sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName )
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 04c61c1..b67c321 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1184,9 +1184,12 @@ uno::Sequence< OUString > SAL_CALL 
SdXImpressDocument::getAvailableServiceNames(
 OUString SAL_CALL SdXImpressDocument::getImplementationName()
 throw(uno::RuntimeException, std::exception)
 {
-return mbImpressDoc
-? OUString("com.sun.star.comp.Draw.PresentationDocument")
-: OUString("com.sun.star.comp.Draw.DrawingDocument");
+return OUString( "SdXImpressDocument" );
+/* // Matching the .component information:
+   return mbImpressDoc
+   ? OUString("com.sun.star.comp.Draw.PresentationDocument")
+   : OUString("com.sun.star.comp.Draw.DrawingDocument");
+*/
 }
 
 sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& 
ServiceName )
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 9a31a3b..d453ad8 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1766,11 +1766,14 @@ Sequence< OUString > 
SwXTextDocument::getAvailableServiceNames()
 
 OUString SwXTextDocument::getImplementationName() throw( RuntimeException, 
std::exception )
 {
-return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr
-? OUString("com.sun.star.comp.Writer.GlobalDocument")
-: PTR_CAST(SwWebDocShell, pDocShell) != nullptr
-? OUString("com.sun.star.comp.Writer.WebDocument")
-: OUString("com.sun.star.comp.Writer.TextDocument");
+return OUString("SwXTextDocument");
+/* // Matching the .component information:
+   return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr
+   ? OUString("com.sun.star.comp.Writer.GlobalDocument")
+   : PTR_CAST(SwWebDocShell, pDocShell) != nullptr
+   ? OUString("com.sun.star.comp.Writer.WebDocument")
+   : OUString("com.sun.star.comp.Writer.TextDocument");
+*/
 }
 
 sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( 
RuntimeException, std::exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 sw/source/core/access/accnotextframe.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7de992bcc66c973bb6b247184cac38f01cd1104a
Author: Caolán McNamara 
Date:   Mon Jul 13 12:38:18 2015 +0100

fix a11y crash seen on close of tdf#92573

its not the reported crash, which has "gone away" which might
be a duplicate of tdf#90502

the switch only handled RES_TITLE_CHANGED and RES_DESCRIPTION_CHANGED so if 
its
anything else, e.g. OBJ_DYING, then don't attempt GetNoTextNode

Change-Id: I642beb66613481cbc7ee18647f0204a67d670a84

diff --git a/sw/source/core/access/accnotextframe.cxx 
b/sw/source/core/access/accnotextframe.cxx
index 7647b35..58fb53f 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -102,6 +102,9 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* 
pOld, const SfxPoolItem
 return; // probably was deleted - avoid doing anything
 }
 
+if (nWhich != RES_TITLE_CHANGED || nWhich != RES_DESCRIPTION_CHANGED)
+return;
+
 const SwNoTextNode *pNd = GetNoTextNode();
 OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
 switch( nWhich )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Multiselection needs work?

2015-07-13 Thread Julien Nabet 

On 13/07/2015 10:44, Michael Meeks wrote:

Hi Julien,

On Sun, 2015-07-12 at 01:02 +0200, Julien Nabet wrote:

Here's a patch: https://gerrit.libreoffice.org/#/c/16959/
I truncated to 1 file in KDE part + Vista part.

Heh =) I worry though that the implementation of the KDE & Vista bits
is doing this over-complicated foo - wrt. storing the directory URL in
the first item, and then relative file-names in the next items, so by
truncating it to 1x long we end up with just the directory-URL not the
first file that was selected =)

I'd hope we could rip some complexity out of the implementations there.
For kde4, it seems ok, see 
http://opengrok.libreoffice.org/xref/core/vcl/unx/kde4/KDE4FilePicker.cxx#337
but KDE4FilePicker::getSelectedFiles(), some lines bellow, uses 
getFiles! So it'll quickly need some fix, I thought about a copy paste 
of the original version of getFiles. In this case perhaps getFiles 
should use getSelectedFiles() then truncate?


For kde, it seems there are 2 implementations:
- 
http://opengrok.libreoffice.org/xref/core/vcl/unx/kde/fpicker/kdefilepicker.cxx#322
- 
http://opengrok.libreoffice.org/xref/core/vcl/unx/kde/UnxCommandThread.cxx#103

a bit confused here, should I blindly the same logic?

aqua: it seems you were right yo be worried
http://opengrok.libreoffice.org/xref/core/fpicker/source/aqua/SalAquaFilePicker.mm#304
I submitted a patch to review (blindly because building on Mac still 
fails for me, see 
https://bugs.documentfoundation.org/show_bug.cgi?id=90502 ), see 
fpicker/source/aqua/SalAquaFilePicker.mm


Windows world:
CNonExecuteFilePickerState::getFiles 
(http://opengrok.libreoffice.org/xref/core/fpicker/source/win32/filepicker/filepickerstate.cxx#226)
CExecuteFilePickerState::getFiles 
(http://opengrok.libreoffice.org/xref/core/fpicker/source/win32/filepicker/filepickerstate.cxx#510)

I could apply the same logic.

+ already indicated 
http://opengrok.libreoffice.org/xref/core/fpicker/source/win32/filepicker/VistaFilePicker.cxx#255 
and already dealt with this patch

http://cgit.freedesktop.org/libreoffice/core/diff/fpicker/source/win32/filepicker/VistaFilePicker.cxx?id=d11b244bf9b9115f5384d6ff43bdffc7f1289d71

There are also "wrappers like":
http://opengrok.libreoffice.org/xref/core/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx#172
http://opengrok.libreoffice.org/xref/core/fpicker/source/win32/filepicker/FilePicker.cxx#365
Perhaps just a comment there should be sufficient.

Others:
http://opengrok.libreoffice.org/xref/core/desktop/source/migration/services/basicmigration.cxx#73
http://opengrok.libreoffice.org/xref/core/desktop/source/migration/services/wordbookmigration.cxx#93
officefilepicker: 
http://opengrok.libreoffice.org/xref/core/fpicker/source/office/OfficeFilePicker.cxx#589

what's this? If it's really used, it should be indeed patched.

Hope I spotted them all.

May we suppose too that one of them is used for macro Basic language 
since it seems public API?


I'd also suggest killing the comment about multi-selection in the UNO
IDL and saying something of the form: "This always, only ever returns
the first selected file URL" or somesuch (?) =)

Here's the patch waiting for review:
https://gerrit.libreoffice.org/16985

Julien

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

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

2015-07-13 Thread Eike Rathke 
 xmloff/source/style/xmlnumfe.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5af8cf2e94a07821e9058ed7541b80dd6693
Author: Eike Rathke 
Date:   Mon Jul 13 13:28:15 2015 +0200

use the DBL_MAX constant that we also use elsewhere, tdf#92457

Change-Id: Ibc48d12ca6b8eb33b2be29f485aa906c513f0591

diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index d0da09b..700113e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1664,8 +1664,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 case NUMBERFORMAT_OP_LE: eOp3 = NUMBERFORMAT_OP_GT; break;
 case NUMBERFORMAT_OP_GT: eOp3 = NUMBERFORMAT_OP_LE; break;
 case NUMBERFORMAT_OP_GE: eOp3 = NUMBERFORMAT_OP_LT; break;
-case NUMBERFORMAT_OP_NO: eOp3 = NUMBERFORMAT_OP_LE;
- fLimit3 = 
::std::numeric_limits::max(); break;
+case NUMBERFORMAT_OP_NO: eOp3 = NUMBERFORMAT_OP_LE; fLimit3 = 
DBL_MAX; break;
 }
 
 if ( fLimit1 == fLimit2 &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit: Reliability and fidelity of verification results

2015-07-13 Thread Norbert Thiebaud 
On Mon, Jul 13, 2015 at 1:22 AM, David Ostrovsky  wrote:
>
> I'd like to rise a question about reliability and fidelity of Jenkins
> Gerrit change verification results. Consider this change: 16877.

It is so much easier to blame the tools indeed.

>
> * On patch set 8: [1] TB 66 voted VRFY+1 [2].
> * On patch set 9: [3] TB 60 voted VRFY1-1 [4].
>
> There weren't any changes in the affected file textdoc.cxx between those
> two patch sets.
that is a bold thing to say when a patch change stuff like uno headers
or rtl headers

> Moreover, while I don't have access to Mac OS X, I
> verified that the patch set 9 works as expected on Linux, with most
> recent clang version available.

MacOSX rarely use the 'most recent clang version available'


tb66 is Yosemite
Apple LLVM version 6.1.0 (clang-602.0.49) (based on LLVM 3.6.0svn)
Target: x86_64-apple-darwin14.3.0

tb60 is Maverick
Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn)
Target: x86_64-apple-darwin13.4.0

And your patch 8 would have failed the same way on tb58/tb59/tb60

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

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ef9b838791ebb7c4d5695dce5e5fd12eddcab96
Author: Caolán McNamara 
Date:   Mon Jul 13 09:10:12 2015 +0100

emf: fix hang

Change-Id: I2410308ecccb8c5318a718bafadc7b40a98cb82b
(cherry picked from commit 8695633023cc321a095753db98bdc69d2aeee058)
Reviewed-on: https://gerrit.libreoffice.org/16977
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf
new file mode 100644
index 000..634fccd
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index d55349f..62ba08b 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -663,7 +663,7 @@ bool EnhWMFReader::ReadEnhWMF()
 
 SAL_INFO("vcl.emf", "\tGDI comment, length: " << length);
 
-if( pWMF->good() && length >= 4 ) {
+if( pWMF->good() && length >= 4 && length <= pWMF->remainingSize() 
) {
 sal_uInt32 id;
 
 pWMF->ReadUInt32( id );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Caolán McNamara 
 vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcf9f7c7e06ee97106b5a555a97599e6b0ed1c13
Author: Caolán McNamara 
Date:   Mon Jul 13 09:10:12 2015 +0100

emf: fix hang

Change-Id: I2410308ecccb8c5318a718bafadc7b40a98cb82b
(cherry picked from commit 8695633023cc321a095753db98bdc69d2aeee058)
Reviewed-on: https://gerrit.libreoffice.org/16976
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf
new file mode 100644
index 000..634fccd
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f02871d..de78559 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -663,7 +663,7 @@ bool EnhWMFReader::ReadEnhWMF()
 
 SAL_INFO("vcl.emf", "\tGDI comment, length: " << length);
 
-if( pWMF->good() && length >= 4 ) {
+if( pWMF->good() && length >= 4 && length <= pWMF->remainingSize() 
) {
 sal_uInt32 id;
 
 pWMF->ReadUInt32( id );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-13 Thread Tor Lillqvist 
 include/svx/grfflt.hxx |   18 --
 1 file changed, 18 deletions(-)

New commits:
commit 1c263b70cad4ec168279857a0e00d9eea14dd741
Author: Tor Lillqvist 
Date:   Mon Jul 13 13:57:41 2015 +0300

Bin pointless comments

Change-Id: Ifebb44ce61b920488af52c7ab377c188bd4f9015

diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx
index 6a0ded0..278e093 100644
--- a/include/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
@@ -23,18 +23,10 @@
 #include 
 #include 
 
-
-// - Error codes -
-
-
 #define SVX_GRAPHICFILTER_ERRCODE_NONE  0x
 #define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE   0x0001
 #define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT  0x0002
 
-
-// - SvxGraphicFilter -
-
-
 class SfxRequest;
 class SfxItemSet;
 
commit c50f962215e9b09dc37fc319bb821c057a5e349c
Author: Tor Lillqvist 
Date:   Mon Jul 13 13:55:41 2015 +0300

Bin unneeded includes

Change-Id: Id0e63897c9840ef412cf575de0485f2b685aaebc

diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx
index ecc5b3a..6a0ded0 100644
--- a/include/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
@@ -20,17 +20,7 @@
 #ifndef INCLUDED_SVX_GRFFLT_HXX
 #define INCLUDED_SVX_GRFFLT_HXX
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
 #include 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

  1   2   >