date:20150602

[Libreoffice-commits] core.git: bean/com

2015-06-02 Thread Noel Grandin

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 83f25d3c6e0918a1d29aa3a923b7f35f0b8a55e2
Author: Noel Grandin 
Date:   Tue Jun 2 09:48:08 2015 +0200

reduce sleep when connecting to soffice from Java

500ms is an eternity on modern machines

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

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index c6f6fa3..117ff39 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -318,22 +318,21 @@ public class LocalOfficeConnection
 aSOffice.startupService();
 
 // wait until soffice is started
-long nMaxMillis = System.currentTimeMillis() + 
1000L*aSOffice.getStartupTime();
+long nGiveUpTimeMillis = System.currentTimeMillis() + 
1000L*aSOffice.getStartupTime();
 while ( aInitialObject == null )
 {
 try
 {
 Thread.currentThread();
 // try to connect to soffice
-Thread.sleep( 500 );
+Thread.sleep( 100 );
 aInitialObject = resolve(xLocalContext, mURL);
 }
 catch( com.sun.star.connection.NoConnectException aEx )
 {
 // soffice did not start in time
-if ( System.currentTimeMillis() > nMaxMillis )
+if ( System.currentTimeMillis() > nGiveUpTimeMillis )
 throw aEx;
-
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Tor Lillqvist

 loolwsd/LOKitClient.cpp |3 ++-
 loolwsd/loolwsd.spec.in |3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f1732ba96d64c74bd2be35611e33a9c92a3e32e5
Author: Tor Lillqvist 
Date:   Wed Jun 3 01:02:10 2015 +0300

Avoid global dtors, just _Exit()

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 7ca4dd7..8e0e747 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -151,7 +151,8 @@ protected:
 }
 }
 
-return Application::EXIT_OK;
+// Safest to just bluntly exit
+_Exit(Application::EXIT_OK);
 }
 };
 
commit 2312d9a962f793cfae1019a8f84b64d09cb318e0
Author: Tor Lillqvist 
Date:   Tue Jun 2 10:25:57 2015 +0300

Just use Requires instead of PreReq

They mean the same.

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 303912a..f3a857a 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -28,8 +28,7 @@ BuildRequires:  libcap-progs libcap-devel libpng-devel 
poco-devel >= 1.6.0 syste
 # This works for now only with the TDF nightly builds of 5.0 or 5.1, I
 # think. But the TDF packages include the version number in their
 # names. How clever is that? So we need to specify one.
-Requires:   libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0 
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US 
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer 
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US 
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc 
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data 
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer 
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1 
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16 
libuuid1 libxml2-2 %{?systemd_requires}
-PreReq: %{fillup_prereq}
+Requires:   libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0 
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US 
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer 
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US 
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc 
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data 
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer 
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1 
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16 
libuuid1 libxml2-2 %{?systemd_requires} %{fillup_prereq}
 
 %define owner lool
 %define group lool
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Stephan Bergmann

 svx/source/svdraw/svdotext.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit bf93b3d1a4b624c3b58e6429899c47fa7cad6ede
Author: Stephan Bergmann 
Date:   Wed Jun 3 08:11:06 2015 +0200

-fsanitize=float-divide-by-zero

...happens at least during CppunitTest_sd_tiledrendering that
aCurrTextSize.Height() is zero:

 SdrTextObj::ImpAutoFitText(SdrOutliner&, Size const&, bool) 
svx/source/svdraw/svdotext.cxx:1312:49
 SdrTextObj::ImpAutoFitText(SdrOutliner&) const 
svx/source/svdraw/svdotext.cxx:1290:5
 SdrTextObj::BegTextEdit(SdrOutliner&) svx/source/svdraw/svdotxed.cxx:103:9
 SdrObjEditView::SdrBeginTextEdit(SdrObject*, SdrPageView*, vcl::Window*, 
bool, SdrOutliner*, OutlinerView*, bool, bool, bool) 
svx/source/svdraw/svdedxv.cxx:635:12
 sd::View::SdrBeginTextEdit(SdrObject*, SdrPageView*, vcl::Window*, bool, 
SdrOutliner*, OutlinerView*, bool, bool, bool) 
sd/source/ui/view/sdview.cxx:704:20
 sd::Outliner::EnterEditMode(bool) sd/source/ui/view/Outliner.cxx:1299:9
 sd::Outliner::PrepareSearchAndReplace() 
sd/source/ui/view/Outliner.cxx:1181:9
 sd::Outliner::ProvideNextTextObject() sd/source/ui/view/Outliner.cxx:973:29
 sd::Outliner::SearchAndReplaceOnce() sd/source/ui/view/Outliner.cxx:674:17
 sd::Outliner::StartSearchAndReplace(SvxSearchItem const*) 
sd/source/ui/view/Outliner.cxx:496:28
 sd::FuSearch::SearchAndReplace(SvxSearchItem const*) 
sd/source/ui/func/fusearch.cxx:132:33
 sd::DrawDocShell::Execute(SfxRequest&) 
sd/source/ui/docshell/docshel3.cxx:222:21
 SfxStubDrawDocShellExecute(SfxShell*, SfxRequest&) 
workdir/SdiTarget/sd/sdi/sdslots.hxx:17034:1
 SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) 
include/sfx2/shell.hxx:210:35
 SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) 
sfx2/source/control/dispatch.cxx:257:13
 SfxDispatcher::_Execute(SfxShell&, SfxSlot const&, SfxRequest&, 
SfxCallMode) sfx2/source/control/dispatch.cxx:847:9
 SfxDispatcher::Execute(unsigned short, SfxCallMode, SfxItemSet*, 
SfxItemSet*, unsigned short) sfx2/source/control/dispatch.cxx:916:9
 SfxDispatchController_Impl::dispatch(com::sun::star::util::URL const&, 
com::sun::star::uno::Sequence const&, 
com::sun::star::uno::Reference 
const&) sfx2/source/control/unoctitm.cxx:823:37
 SfxOfficeDispatch::dispatch(com::sun::star::util::URL const&, 
com::sun::star::uno::Sequence const&) 
sfx2/source/control/unoctitm.cxx:359:9
 non-virtual thunk to SfxOfficeDispatch::dispatch(com::sun::star::util::URL 
const&, com::sun::star::uno::Sequence 
const&) sfx2/source/control/unoctitm.cxx:343:34
 comphelper::dispatchCommand(rtl::OUString const&, 
com::sun::star::uno::Sequence const&) 
comphelper/source/misc/dispatchcommand.cxx:57:5
 lcl_search(rtl::OUString const&) 
sd/qa/unit/tiledrendering/tiledrendering.cxx:338:5
 SdTiledRenderingTest::testSearch() 
sd/qa/unit/tiledrendering/tiledrendering.cxx:361:5
 ...

Change-Id: I38ab71c5f4024b2d7270a4f6c2aeb4ef502d08f5

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 47696fd..104f48b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1307,9 +1307,16 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, 
const Size& rTextSize,
 const Size aCurrTextSize = rOutliner.CalcTextSizeNTP();
 double fFactor(1.0);
 if( bIsVerticalWriting )
-fFactor = double(rTextSize.Width())/aCurrTextSize.Width();
-else
+{
+if (aCurrTextSize.Width() != 0)
+{
+fFactor = double(rTextSize.Width())/aCurrTextSize.Width();
+}
+}
+else if (aCurrTextSize.Height() != 0)
+{
 fFactor = double(rTextSize.Height())/aCurrTextSize.Height();
+}
 // fFactor scales in both x and y directions
 // - this is fine for bulleted words
 // - but it scales too much for a long paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2015-06-03

2015-06-02 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ tdf#91634: Image hyperlink is not export after roundtrip.
  in https://gerrit.libreoffice.org/15919 from Yogesh Bharate
  about module oox, sc
+ tdf#61908:XLSX formula cell range is not exported for MMULT.
  in https://gerrit.libreoffice.org/16033 from Yogesh Bharate
  about module sc
+ tdf#91641 avoid an assert by adding a solar mutex guard
  in https://gerrit.libreoffice.org/15960 from Justin Luth
  about module vcl
+ Time wraparound validation feature
  in https://gerrit.libreoffice.org/16013 from Benjamin Ni
  about module sc
 End of freshness 

+ update to liborcus 0.9.1
  in https://gerrit.libreoffice.org/15822 from Markus Mohrhard
  about module build, external, sc
+ tdf#87539 map MSO washout filter to LO's watermark colormode
  in https://gerrit.libreoffice.org/16048 from Joren De Cuyper
  about module oox, sw, writerfilter
+ Cleanup crossplatform cairo
  in https://gerrit.libreoffice.org/16049 from Mox Soini
  about module canvas, include, vcl
+ reduce sleep when connecting to soffice from Java
  in https://gerrit.libreoffice.org/16038 from Noel Grandin
  about module bean
+ Build time option --disable-extension-update
  in https://gerrit.libreoffice.org/16027 from Katarina Behrens
  about module build, config_host, desktop, scp2
+ Skeletal SfxControllerItem / bindings unit test.
  in https://gerrit.libreoffice.org/16040 from Michael Meeks
  about module sfx2
+ loplugin:unnecessaryvirtuals
  in https://gerrit.libreoffice.org/16035 from Noel Grandin
  about module basegfx, compilerplugins, connectivity, dbaccess, extensions, 
include, lotuswordpro, svx, vcl, writerfilter


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

+ tdf#91781 Fix some entry headings
  in https://gerrit.libreoffice.org/16020 from Yousuf Philips
+ tdf#91228 Fix Writer crash
  in https://gerrit.libreoffice.org/16041 from Philippe Jung
+ A small hint on how to specify the database URL should be helpful to user
  in https://gerrit.libreoffice.org/15978 from Umair Shahid
+ loplugin:loopvartoosmall
  in https://gerrit.libreoffice.org/15969 from Noel Grandin
+ TANGO: Minor fixes to font outline icons
  in https://gerrit.libreoffice.org/16029 from Yousuf Philips
+ Fix indent button icons in impress/draw sidebar
  in https://gerrit.libreoffice.org/16028 from Yousuf Philips
+ inline simple Java method
  in https://gerrit.libreoffice.org/16039 from Noel Grandin
+ tdf#90888:Shrink the properties sidebar sections in Calc
  in https://gerrit.libreoffice.org/15935 from Rishabh Kumar
+ Replaced boost::tuple with std::tuple
  in https://gerrit.libreoffice.org/15816 from Zsolt Bölöny
+ loplugin: loopvartoosmall
  in https://gerrit.libreoffice.org/15988 from Katarina Behrens
+ loplugin:loopvartoosmall
  in https://gerrit.libreoffice.org/15968 from Noel Grandin
+ tdf#91783 - Reverse the toggle behaviour of .uno:Graphic Change
  in https://gerrit.libreoffice.org/16010 from Philippe Jung
+ GL3D Bar chart -> experimental
  in https://gerrit.libreoffice.org/16022 from Andras Timar
+ Time based charting -> experimental
  in https://gerrit.libreoffice.org/16023 from Andras Timar
+ tdf#91592 WRITER crashes when navigating through comments
  in https://gerrit.libreoffice.org/15952 from Philippe Jung
+ fdo#39468 Translate German Comments - sc/source/core/tool/ #1
  in https://gerrit.libreoffice.org/16003 from Christian M. Heller
+ tdf#91641 EditLine should have focus on accessibleText init.
  in https://gerrit.libreoffice.org/15962 from Justin Luth
+ Fix a wrong bit mask for StreamMode
  in https://gerrit.libreoffice.org/16015 from Takeshi Abe


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

+ common code cleanup
  in https://gerrit.libreoffice.org/16043 from Mox Soini
+ cairo win32 cleanup
  in https://gerrit.libreoffice.org/16047 from Mox Soini
+ tweak
  in https://gerrit.libreoffice.org/16045 from Mox Soini
+ Cairo Quartz cleanup
  in https://gerrit.libreoffice.org/16044 from Mox Soini
+ remove obsolete IOS include
  in https://gerrit.libreoffice.org/16046 from Mox Soini


* Open changes needing tweaks, but being untouched for more than a week:

+ writefilter: removed #includes
  in https://gerrit.libreoffice.org/15850 from Andrea Gelmini
+ Removed getNormal() from polygontools, it just calls B3DPolygon::getNorma
  in https://gerrit.libreoffice.org/15809 from Zsolt Bölöny
+ fdo#58194 - export DOCX Automatic indent as firstLine indent
  in https://gerrit.libreoffice.org/15768 from Joren De Cuyper
+ tdf#76334 push viewbox properties to the CustomShapeProperties
  in https://gerrit.libreoffice.org/15753 from Joren De Cuyper
+ Add very initial support for Visual Studio 2015
  in https://gerrit.libreoffice.org/15644 from Jesús Corrius
+ tdf#90494: Change gradient angle diagonally by choosing option.
  in https://gerrit.libreoffice.org/15180 from Heena Gupta
+

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

2015-06-02 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |9 
+--
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   12 
+-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 -
 3 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 21a6b99748db8a970ef7dc90d40e07901135b89a
Author: Yousuf Philips 
Date:   Mon Jun 1 19:08:59 2015 +0400

tdf#91781 Fix some entry headings

Change-Id: I69b07eef540d862ea684b1d51d64509f59a5cb3e
Reviewed-on: https://gerrit.libreoffice.org/16020
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 3dbd8a0..d53847d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3163,7 +3163,7 @@
   
   
 
-  Frame and OLE-Ob~ject
+  Frame and OLE Ob~ject
 
 
   1
@@ -5500,12 +5500,17 @@
   
   
 
-  Ali~gn
+  Alig~n
 
 
   1
 
   
+  
+
+  Alig~n
+
+  
   
 
   ~Shapes
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 501409e..34ab217 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -112,7 +112,7 @@
   
   
 
-  Tables of Contents and ~Indexes...
+  ~Indexes and Tables...
 
 
   1
@@ -231,7 +231,7 @@
   
   
 
-  Got~o Page
+  Go t~o Page
 
   
   
@@ -339,7 +339,7 @@
   
   
 
-  Footnote and Endnote~...
+  F~ootnote and Endnote...
 
   
   
@@ -373,7 +373,7 @@
   Insert Page Break
 
 
-  Pa~ge Break
+  ~Page Break
 
 
   1
@@ -932,7 +932,7 @@
   Frame Properties
 
 
-  Fra~me and OLE-Object...
+  Fra~me and OLE Object...
 
 
   1
@@ -1114,7 +1114,7 @@
   
   
 
-  Repeat heading rows
+  Repeat Heading Rows
 
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 8794c97..ed92ccb 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -315,7 +315,7 @@
   
 
   
-  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Henry Castro

 loleaflet/src/map/Map.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 43425c406db4f54d9a2b6e174e0630937d0d6e2d
Author: Henry Castro 
Date:   Tue Jun 2 23:49:51 2015 -0400

The keycode RETURN it is converted to click.

The keypress and keycode = 13 are converted to click event,
so Calc Application does not receive keypress RETURN, It is needed
to commit changes into cell.

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 9076ca0..72a9c49 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -600,7 +600,8 @@ L.Map = L.Evented.extend({
 
// find the layer the event is propagating from
var target = this._targets[L.stamp(e.target || e.srcElement)],
-   type = e.type === 'keypress' && e.keyCode === 13 ? 
'click' : e.type;
+   //type = e.type === 'keypress' && e.keyCode === 13 ? 
'click' : e.type;
+   type = e.type;
 
// special case for map mouseover/mouseout events so that 
they're actually mouseenter/mouseleave
if (!target && (type === 'mouseover' || type === 'mouseout') &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Henry Castro

 loleaflet/src/layer/tile/TileLayer.js |  134 +-
 1 file changed, 133 insertions(+), 1 deletion(-)

New commits:
commit 87ea6741774fdd2e547eeb14283af65aaa519ceb
Author: Henry Castro 
Date:   Tue Jun 2 23:43:18 2015 -0400

Convert Javascript keycode to UNO keycode

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 79324bb..890e209 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -564,9 +564,141 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   // TODO. This should be optimized to an index array
+   _toUNOKeyCode: function ( keyCode ) {
+   var unoKeyCode = keyCode;
+
+   if (keyCode == 8) // backspace
+   unoKeyCode = 1283; // BACKSPACE
+   else if (keyCode == 9) // tab
+   unoKeyCode = 1282; // TAB
+   else if (keyCode == 13) // enter
+   unoKeyCode = 1280; // RETURN
+   else if (keyCode == 16) // shift
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 17) // ctrl
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 18) // alt
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 19) // pause/break
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 20) // caps lock
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 27) // escape
+   unoKeyCode = 1281; // ESCAPE
+   else if (keyCode == 32) // space
+   unoKeyCode = 1284; // SPACE
+   else if (keyCode == 33) // page up
+   unoKeyCode = 1030; // PAGEUP
+   else if (keyCode == 34) // page down
+   unoKeyCode = 1031; // PAGEDOWN
+   else if (keyCode == 35) // end
+   unoKeyCode = 1029; // END
+   else if (keyCode == 36) // home
+   unoKeyCode = 1028; // HOME
+   else if (keyCode == 37) // left arrow
+   unoKeyCode = 1026; // LEFT
+   else if (keyCode == 38) // up arrow
+   unoKeyCode = 1025; // UP
+   else if (keyCode == 39) // right arrow
+   unoKeyCode = 1027; // UP
+   else if (keyCode == 40) // down arrow
+   unoKeyCode = 1024; // DOWN
+   else if (keyCode == 45) // insert
+   unoKeyCode = 1285; // INSERT
+   else if (keyCode == 46) // delete
+   unoKeyCode = 1286; // DELETE
+   else if (keyCode == 91) // left window key
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 92) // right window key
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 93) // select key
+   unoKeyCode = keyCode; // UNKOWN
+   else if (keyCode == 96) // numpad 0
+   unoKeyCode = 256; // NUM0
+   else if (keyCode == 97) // numpad 1
+   unoKeyCode = 257; // NUM1
+   else if (keyCode == 98) // numpad 2
+   unoKeyCode = 258; // NUM2
+   else if (keyCode == 99) // numpad 3
+   unoKeyCode = 259; // NUM3
+   else if (keyCode == 100) // numpad 4
+   unoKeyCode = 260; // NUM4
+   else if (keyCode == 101) // numpad 5
+   unoKeyCode = 261; // NUM5
+   else if (keyCode == 102) // numpad 6
+   unoKeyCode = 262; // NUM6
+   else if (keyCode == 103) // numpad 7
+   unoKeyCode = 263; // NUM7
+   else if (keyCode == 104) // numpad 8
+   unoKeyCode = 264; // NUM8
+   else if (keyCode == 105) // numpad 9
+   unoKeyCode = 265; // NUM9
+   else if (keyCode == 106) // multiply
+   unoKeyCode = 1289; // MULTIPLY
+   else if (keyCode == 107) // add
+   unoKeyCode = 1287; // ADD
+   else if (keyCode == 109) // subtract
+   unoKeyCode = 1288; // SUBTRACT
+   else if (keyCode == 110) // decimal point
+   unoKeyCode = 1309; // DECIMAL
+   else if (keyCode == 111) // divide
+   unoKeyCode = 1290; // DIVIDE
+   else if (keyCode == 112) // f1
+   unoKeyCode = 768; // F1
+   else if (keyCode == 113) // f2
+   unoKeyCode = 769; // F2
+   else if (keyCode == 114) // f3
+   unoKeyCode = 770; // F3
+

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

2015-06-02 Thread Henry Castro

 loleaflet/build/deps.js   |3 
 loleaflet/dist/leaflet.css|   56 
 loleaflet/src/layer/marker/Cursor.js  |  115 ++
 loleaflet/src/layer/tile/TileLayer.js |3 
 4 files changed, 174 insertions(+), 3 deletions(-)

New commits:
commit 78764623d81257f4511aeffd7461522f2d4fbb3d
Author: Henry Castro 
Date:   Tue Jun 2 23:38:00 2015 -0400

Added blinking cursor

diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index e1fd636..ec73c3e 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -57,7 +57,8 @@ var deps = {
Marker: {
src: ['layer/marker/Icon.js',
  'layer/marker/Icon.Default.js',
- 'layer/marker/Marker.js'],
+ 'layer/marker/Marker.js',
+ 'layer/marker/Cursor.js'],
desc: 'Markers to put on the map.'
},
 
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index 8aa8aed..dbf8e53 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -554,3 +554,59 @@
transition: background-color 0.8s linear;
 
 }
+
+.blinking-cursor {
+  font-weight: 100;
+  font-size: 20px;
+  color: #2E3D48;
+  -webkit-animation: 1s blink step-end infinite;
+  -moz-animation: 1s blink step-end infinite;
+  -ms-animation: 1s blink step-end infinite;
+  -o-animation: 1s blink step-end infinite;
+  animation: 1s blink step-end infinite;
+}
+
+@keyframes "blink" {
+  from, to {
+color: transparent;
+  }
+  50% {
+color: black;
+  }
+}
+
+@-moz-keyframes blink {
+  from, to {
+color: transparent;
+  }
+  50% {
+color: black;
+  }
+}
+
+@-webkit-keyframes "blink" {
+  from, to {
+color: transparent;
+  }
+  50% {
+color: black;
+  }
+}
+
+@-ms-keyframes "blink" {
+  from, to {
+color: transparent;
+  }
+  50% {
+color: black;
+  }
+}
+
+@-o-keyframes "blink" {
+  from, to {
+color: transparent;
+  }
+  50% {
+color: black;
+  }
+}
diff --git a/loleaflet/src/layer/marker/Cursor.js 
b/loleaflet/src/layer/marker/Cursor.js
new file mode 100644
index 000..3ffce81
--- /dev/null
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -0,0 +1,115 @@
+/*
+ * L.Cursor blinking cursor.
+ */
+
+L.Cursor = L.Layer.extend({
+
+   options: {
+   zIndexOffset: 0,
+   opacity: 1
+   },
+
+   initialize: function (latlng, options) {
+   L.setOptions(this, options);
+   this._latlng = L.latLng(latlng);
+   },
+
+   onAdd: function (map) {
+   this._initLayout();
+   this.update();
+   },
+
+   onRemove: function () {
+   L.DomUtil.remove(this._container);
+   },
+
+   getEvents: function () {
+   var events = {viewreset: this.update};
+
+   return events;
+   },
+
+   getLatLng: function () {
+   return this._latlng;
+   },
+
+   setLatLng: function (latlng) {
+   var oldLatLng = this._latlng;
+   this._latlng = L.latLng(latlng);
+   this.update();
+   return this.fire('move', {oldLatLng: oldLatLng, latlng: 
this._latlng});
+   },
+
+   setZIndexOffset: function (offset) {
+   this.options.zIndexOffset = offset;
+   return this.update();
+   },
+
+   update: function () {
+   if (this._container) {
+   var pos = 
this._map.latLngToLayerPoint(this._latlng).round();
+   this._setPos(pos);
+   }
+   return this;
+   },
+
+   _initLayout: function () {
+   this._container = L.DomUtil.create('div', 'leaflet-popup');
+
+   //|
+   var span = L.DomUtil.create('span', 'blinking-cursor', 
this._container);
+   span.innerHTML = '|';
+
+   L.DomEvent
+   .disableClickPropagation(span)
+   .disableScrollPropagation(this._container);
+
+   if (this._container) {
+   this.getPane().appendChild(this._container);
+   }
+   },
+
+   _setPos: function (pos) {
+   L.DomUtil.setPosition(this._container, pos);
+
+   this._zIndex = pos.y + this.options.zIndexOffset;
+
+   this._resetZIndex();
+   },
+
+   _updateZIndex: function (offset) {
+   this._icon.style.zIndex = this._zIndex + offset;
+   },
+
+   _animateZoom: function (opt) {
+   var pos = this._map._latLngToNewLayerPoint(this._latlng, 
opt.zoom, opt.center).round();
+
+   this._setPos(pos);
+   },
+
+   setOpacity: function (opacity) {
+   this.options.opacity = opacity;
+   if (this._map) {
+   this._updateOpacity();
+   }
+
+   return this;
+   },
+
+

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

2015-06-02 Thread Henry Castro

 loleaflet/src/layer/tile/TileLayer.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit afa848cf7948b0990e3d2b1a944c56d8d4b196b1
Author: Henry Castro 
Date:   Tue Jun 2 23:13:01 2015 -0400

Disable fade animation, it does not work Calc.

When tile invalidation the fade animation set opacity to 0
so the tile is gray out.

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 23a36bd..1fe5013 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -160,6 +160,8 @@ L.TileLayer = L.GridLayer.extend({
var offset = new L.Point(parseInt(strTwips[2]), 
parseInt(strTwips[3]));
var bottomRightTwips = topLeftTwips.add(offset);
 
+   this._map._fadeAnimated = false;
+
for (var key in this._tiles) {
var coords = this._tiles[key].coords;
var point1 = this._coordsToTwips(coords);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-06-02 Thread bugzilla-daemon

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

arlyns_mer...@msn.com changed:

   What|Removed |Added

   Keywords||have-backtrace
  Component|LibreOffice |Calc
   Hardware|All |x86-64 (AMD64)
Version|unspecified |4.4.3.2 rc
 OS|All |Linux (All)

--- Comment #113 from arlyns_mer...@msn.com ---
Insert Image how headers

If an image is inserted into the header by the command: Ctrl + Shift + O>
Format page-> Encabezamiento-> Activate (Mas) -> Como (picture), it does well,
but to save and close the file this image disappears, no matter the format in
which it is stored, always disappears. (Sorry for my English is not my
language)

-- 
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: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng include/svx svx/source

2015-06-02 Thread matteocam

 editeng/source/outliner/outliner.cxx|   38 +++-
 include/editeng/outliner.hxx|3 +-
 include/editeng/overflowingtxt.hxx  |   21 ++-
 include/svx/svdotext.hxx|3 --
 svx/source/svdraw/svdotext.cxx  |5 +++
 svx/source/svdraw/svdotextdecomposition.cxx |   30 +++---
 svx/source/svdraw/svdotxed.cxx  |   12 +++-
 7 files changed, 96 insertions(+), 16 deletions(-)

New commits:
commit 598dc8b516d313da6a0b1d13d48139b7b041ae8f
Author: matteocam 
Date:   Tue Jun 2 19:34:22 2015 -0400

Added NonOverflowingText and logic to leave it in editing text

Change-Id: I2cf4ad519917c80c51f9f693f9e27d5e3e655ffc

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index d289e78..9e3e8f6 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2089,7 +2089,7 @@ bool Outliner::HasParaFlag( const Paragraph* pPara, 
sal_uInt16 nFlag ) const
 return pPara && pPara->HasFlag( nFlag );
 }
 
-OutlinerParaObject *Outliner::GetNonOverflowingParaObject() const
+NonOverflowingText *Outliner::GetNonOverflowingText() const
 {
 /* XXX:
  * nCount should be the number of paragraphs of the non overflowing text
@@ -2101,7 +2101,8 @@ OutlinerParaObject 
*Outliner::GetNonOverflowingParaObject() const
 
 // last non-overflowing paragraph is before the first overflowing one
 sal_Int32 nCount = pEditEngine->GetOverflowingParaNum();
-//sal_Int32 nCount = 1;
+sal_Int32 nOverflowLine = pEditEngine->GetOverflowingLineNum();
+OUString aPreOverflowingTxt("");
 
 // Defensive check: oveflowing para index beyond actual # of paragraphs?
 if ( nCount > GetParagraphCount()-1) {
@@ -2112,19 +2113,44 @@ OutlinerParaObject 
*Outliner::GetNonOverflowingParaObject() const
 return NULL;
 }
 
-if ( nCount == 0 ) // Only overflowing text, i.e. 1st paragraph overflowing
+// Only overflowing text, i.e. 1st line of 1st paragraph overflowing
+if ( nCount == 0 && nOverflowLine == 0)
 {
 EditTextObject *pEmptyText = pEditEngine->GetEmptyTextObject();
 OutlinerParaObject* pPObj = new OutlinerParaObject( *pEmptyText );
 pPObj->SetOutlinerMode(GetMode());
 
 delete pEmptyText;
-return pPObj;
+return new NonOverflowingText(pPObj, "");
 
-} else if (nCount < 0) // No overflowing Text
+} else if (nCount < 0) { // No overflowing Text: all para-s included
 nCount = GetParagraphCount();
+// aPreOverflowingText == ""
+} else { // Get the lines that of the overflowing para fit in the box
 
-return CreateParaObject(0, nCount);
+// XXX: Is there a proper method to join lines in a single string?
+sal_Int32 nOverflowingPara = nCount;
+OUString aWholeTxtHeadPara = GetText(GetParagraph(nOverflowingPara));
+sal_uInt32 nLen = 0;
+
+for ( sal_Int32 nLine = 0;
+  nLine < pEditEngine->GetOverflowingLineNum();
+  nLine++)
+{
+nLen += GetLineLen(nOverflowingPara, nLine);
+}
+
+// XXX: Any separator to be included?
+aPreOverflowingTxt = aWholeTxtHeadPara.copy(0, nLen);
+}
+
+OutlinerParaObject *pHeadParas;
+if (nCount == 0) // No text to save expect for the one in the overflowing 
para (i.e. aPreOverflowingTxt)
+pHeadParas = NULL;
+else
+pHeadParas = CreateParaObject(0, nCount);
+
+return new NonOverflowingText(pHeadParas, aPreOverflowingTxt);
 }
 
 OverflowingText *Outliner::GetOverflowingText() const
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index c493a7c..7093835 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -45,6 +45,7 @@ class EditUndo;
 class ParagraphList;
 class OutlinerParaObject;
 class OverflowingText;
+class NonOverflowingText;
 class SvStream;
 class SvxBulletItem;
 class SvxFont;
@@ -759,7 +760,7 @@ public:
 voidSetParaRemovingHdl(const Link& 
rLink){aParaRemovingHdl=rLink;}
 LinkGetParaRemovingHdl() const { return aParaRemovingHdl; }
 
-OutlinerParaObject *GetNonOverflowingParaObject() const;
+NonOverflowingText *GetNonOverflowingText() const;
 OverflowingText *GetOverflowingText() const;
 void ClearOverflowingParaNum();
 
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 287d237..98aa612 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -34,14 +34,31 @@ class OverflowingText {
 // Constructor
 OverflowingText(
 const OUString &headTxt,
-const OutlinerParaObject *pMidParas = NULL,
-const OUString &tailTxt = "")
+const OutlinerParaObject *pMidParas,
+const OUString &tailTxt)
 : mHeadTxt(he

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

2015-06-02 Thread Philippe Jung

 sw/source/core/txtnode/thints.cxx |   40 +-
 1 file changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 7ea3a2b5747f148cbdc9a065728cefff1a660bd7
Author: Philippe Jung 
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if "LockModify"ed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 9f01951b858453684f2622541af0eb85d4544fc6)
Signed-off-by: Michael Stahl 

Conflicts:
sw/source/core/txtnode/thints.cxx

Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..37b0c26 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1277,19 +1277,44 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTxtFlyCnt *pFly = (SwTxtFlyCnt *)pAttr;
 SwFrmFmt* pFmt = pAttr->GetFlyCnt().GetFrmFmt();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFmtAnchor* pAnchor = 0;
+pFmt->GetItemState( RES_ANCHOR, false,
+reinterpret_cast(&pAnchor) );
+
+SwIndex aIdx( this, pAttr->GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor &&
+pAnchor->GetAnchorId() == FLY_AS_CHAR &&
+pAnchor->GetCntntAnchor() &&
+pAnchor->GetCntntAnchor()->nNode != *this)
+{
+
assert(pAnchor->GetCntntAnchor()->nNode.GetNode().IsTxtNode());
+SwTxtNode* textNode = 
pAnchor->GetCntntAnchor()->nNode.GetNode().GetTxtNode();
+
+if ( textNode->IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode->RemoveAnchoredFly( pFmt );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(nsSetAttrMode::SETATTR_NOTXTATRCHR & nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFmtAnchor* pAnchor = 0;
-pFmt->GetItemState( RES_ANCHOR, false,
-(const SfxPoolItem**)&pAnchor );
-
-SwIndex aIdx( this, pAttr->GetStart() );
 const OUString c(GetCharOfTxtAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1353,6 +1378,11 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFmt );
+
 break;
 }
 
___
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' - sw/source

2015-06-02 Thread Philippe Jung

 sw/source/core/txtnode/thints.cxx |   39 ++
 1 file changed, 35 insertions(+), 4 deletions(-)

New commits:
commit f25e4aff17aa88b0620b9067f3f4f490f36ca9f6
Author: Philippe Jung 
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if "LockModify"ed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2
Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 9f01951b858453684f2622541af0eb85d4544fc6)
Signed-off-by: Michael Stahl 

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index 452ae53..2fb71d2 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1276,19 +1276,45 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTextFlyCnt *pFly = static_cast(pAttr);
 SwFrameFormat* pFormat = pAttr->GetFlyCnt().GetFrameFormat();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFormatAnchor* pAnchor = 0;
+pFormat->GetItemState( RES_ANCHOR, false,
+reinterpret_cast(&pAnchor) );
+
+SwIndex aIdx( this, pAttr->GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor &&
+pAnchor->GetAnchorId() == FLY_AS_CHAR &&
+pAnchor->GetContentAnchor() &&
+pAnchor->GetContentAnchor()->nNode != *this)
+{
+
assert(pAnchor->GetContentAnchor()->nNode.GetNode().IsTextNode());
+SwTextNode* textNode = 
pAnchor->GetContentAnchor()->nNode.GetNode().GetTextNode();
+
+if ( textNode->IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode->RemoveAnchoredFly( pFormat );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(SetAttrMode::NOTXTATRCHR & nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFormatAnchor* pAnchor = 0;
-pFormat->GetItemState( RES_ANCHOR, false,
-reinterpret_cast(&pAnchor) );
 
-SwIndex aIdx( this, pAttr->GetStart() );
 const OUString c(GetCharOfTextAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1352,6 +1378,11 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFormat );
+
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Philippe Jung

 sw/source/core/txtnode/thints.cxx |   39 ++
 1 file changed, 35 insertions(+), 4 deletions(-)

New commits:
commit 9f01951b858453684f2622541af0eb85d4544fc6
Author: Philippe Jung 
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if "LockModify"ed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

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

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index 40b71a1..277a4d5 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1276,19 +1276,45 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTextFlyCnt *pFly = static_cast(pAttr);
 SwFrameFormat* pFormat = pAttr->GetFlyCnt().GetFrameFormat();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFormatAnchor* pAnchor = 0;
+pFormat->GetItemState( RES_ANCHOR, false,
+reinterpret_cast(&pAnchor) );
+
+SwIndex aIdx( this, pAttr->GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor &&
+pAnchor->GetAnchorId() == FLY_AS_CHAR &&
+pAnchor->GetContentAnchor() &&
+pAnchor->GetContentAnchor()->nNode != *this)
+{
+
assert(pAnchor->GetContentAnchor()->nNode.GetNode().IsTextNode());
+SwTextNode* textNode = 
pAnchor->GetContentAnchor()->nNode.GetNode().GetTextNode();
+
+if ( textNode->IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode->RemoveAnchoredFly( pFormat );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(SetAttrMode::NOTXTATRCHR & nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFormatAnchor* pAnchor = 0;
-pFormat->GetItemState( RES_ANCHOR, false,
-reinterpret_cast(&pAnchor) );
 
-SwIndex aIdx( this, pAttr->GetStart() );
 const OUString c(GetCharOfTextAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1352,6 +1378,11 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFormat );
+
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Robert Antoni Buj i Gelonch

Thanks Markus,

I saw that n=9223372036854755805 before to fail. Now, I'm going to examine
where it comes from.

* thread #1: tid = 0x2c7680, 0x0001064bb54a
libvcllo.dylib`ImplLogicToPixel(n=9223372036854755805, nDPI=72, nMapNum=1,
nMapDenom=1600, nThres=64051194700380381) + 170 at map.cxx:382, queue =
'com.apple.main-thread', stop reason = breakpoint 2.1
frame #0: 0x0001064bb54a
libvcllo.dylib`ImplLogicToPixel(n=9223372036854755805, nDPI=72, nMapNum=1,
nMapDenom=1600, nThres=64051194700380381) + 170 at map.cxx:382
   379 #else
   380 assert(nMapNum >= 0);
   381 assert(nDPI > 0);
-> 382 assert(nMapNum == 0 || std::abs(n) <
std::numeric_limits::max() / nMapNum / nDPI); //detect overflows
   383 #endif
   384 {
   385sal_Int64 n64 = n;
(lldb)
Process 13744 resuming
Assertion failed: (nMapNum == 0 || std::abs(n) <
std::numeric_limits::max() / nMapNum / nDPI), function
ImplLogicToPixel, file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx,
line 382.
Process 13744 stopped
* thread #1: tid = 0x2c7680, 0x7fff88a53286
libsystem_kernel.dylib`__pthread_kill + 10, queue =
'com.apple.main-thread', stop reason = signal SIGABRT
frame #0: 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill + 10
libsystem_kernel.dylib`__pthread_kill:
->  0x7fff88a53286 <+10>: jae0x7fff88a53290; <+20>
0x7fff88a53288 <+12>: movq   %rax, %rdi
0x7fff88a5328b <+15>: jmp0x7fff88a4ec53; cerror_nocancel
0x7fff88a53290 <+20>: retq


2015-06-02 22:53 GMT+02:00 Markus Mohrhard :

> Hey,
>
> On Tue, Jun 2, 2015 at 10:46 PM, Robert Antoni Buj i Gelonch <
> robert@gmail.com> wrote:
>
>> Hi, I can move forward until aEnv.startLoading()
>>
>> Process 13147 stopped
>> * thread #1: tid = 0x2c50ef, 0x0001173583dc
>> libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758,
>> xContext=0x0001087913d0, sURL=0x7fff5fbf4b00,
>> sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at
>> loadenv.cxx:164, queue = 'com.apple.main-thread', stop reason = step over
>> frame #0: 0x0001173583dc
>> libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758,
>> xContext=0x0001087913d0, sURL=0x7fff5fbf4b00,
>> sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at
>> loadenv.cxx:164
>>161sTarget,
>>162nFlags,
>>163LoadEnv::E_NO_FEATURE);
>> -> 164 aEnv.startLoading();
>>165 aEnv.waitWhileLoading(); // wait for ever!
>>166
>>167 xComponent = aEnv.getTargetComponent();
>> (lldb) n
>> warn:legacy.osl:13147:1:oox/source/helper/graphichelper.cxx:117:
>> GraphicHelper::GraphicHelper - cannot get target frame
>> warn:vcl.window:13147:1:vcl/source/window/window.cxx:3353: ignoring
>> DeploymentException "component context fails to supply service
>> 'com.sun.star.datatransfer.clipboard.SystemClipboard' of type
>> 'com.sun.star.datatransfer.clipboard.XSystemClipboard'"
>> warn:sfx.sidebar:13147:1:sfx2/source/sidebar/SidebarController.cxx:743:
>> Cannot create panel:
>> Assertion failed: (nMapNum == 0 || std::abs(n) <
>> std::numeric_limits::max() / nMapNum / nDPI), function
>> ImplLogicToPixel, file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx,
>> line 382.
>> Process 13147 stopped
>> * thread #1: tid = 0x2c50ef, 0x7fff88a53286
>> libsystem_kernel.dylib`__pthread_kill + 10, queue =
>> 'com.apple.main-thread', stop reason = signal SIGABRT
>> frame #0: 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill +
>> 10
>> libsystem_kernel.dylib`__pthread_kill:
>> ->  0x7fff88a53286 <+10>: jae0x7fff88a53290; <+20>
>> 0x7fff88a53288 <+12>: movq   %rax, %rdi
>> 0x7fff88a5328b <+15>: jmp0x7fff88a4ec53;
>> cerror_nocancel
>> 0x7fff88a53290 <+20>: retq
>>
>>
>> 2015-06-02 20:16 GMT+02:00 Robert Antoni Buj i Gelonch <
>> robert@gmail.com>:
>>
>>>
>>> so this smells like the issue discussed in <
 https://bugs.documentfoundation.org/show_bug.cgi?id=90502> "CRASH -
 failed assertion in unittest sw_globalfilter in master build OSX," and the
 working hypothesis would be that your tb's failure symptoms are the
 non-debug manifestation of the same underlying problem that manifests as
 tdf#90502 in some people's debug/dbgutil builds
>>>
>>>
>>> (lldb)  breakpoint set --file
>>> /Volumes/Master/lo/core/sw/qa/extras/globalfilter/globalfilter.cxx --line
>>> 663
>>> Breakpoint 1: no locations (pending).
>>> WARNING:  Unable to resolve breakpoint to any actual locations.
>>> (lldb) run
>>> Process 11213 launched:
>>> '/Volumes/Master/lo/core/workdir/LinkTarget/Executable/cppunittester'
>>> (x86_64)
>>> 1 location added to breakpoint 1
>>> ...
>>> Process 11213 stopped* thread #1: tid = 0x2be3ac, 0x00010b9e83e6
>>> libtest_sw_globalfilter.dylib`Test::testSkipImages() at strin

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

2015-06-02 Thread Markus Mohrhard

 chart2/qa/extras/chart2export.cxx   |   11 +++
 chart2/qa/extras/data/xlsx/axis_title_rotation.xlsx |binary
 oox/source/export/chartexport.cxx   |2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 365896fe45286c6545915e0fe8be0378f900ebad
Author: Markus Mohrhard 
Date:   Tue Jun 2 14:07:16 2015 +0200

add test for tdf#91685

Change-Id: I9a08a11038e3e0f873abc4513c0cbda97f0e4795

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 5b40560..9540ed5 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -98,6 +98,7 @@ public:
 void testPlotVisOnlyXLSX();
 void testBarChartVaryColorsXLSX();
 void testMultipleAxisXLSX();
+void testAxisTitleRotationXLSX();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
@@ -160,6 +161,7 @@ public:
 CPPUNIT_TEST(testPlotVisOnlyXLSX);
 CPPUNIT_TEST(testBarChartVaryColorsXLSX);
 CPPUNIT_TEST(testMultipleAxisXLSX);
+CPPUNIT_TEST(testAxisTitleRotationXLSX);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1462,6 +1464,15 @@ void Chart2ExportTest::testMultipleAxisXLSX()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='r']", 1);
 }
 
+void Chart2ExportTest::testAxisTitleRotationXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr", "rot", 
"0");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/axis_title_rotation.xlsx 
b/chart2/qa/extras/data/xlsx/axis_title_rotation.xlsx
new file mode 100644
index 000..fc90e2b
Binary files /dev/null and 
b/chart2/qa/extras/data/xlsx/axis_title_rotation.xlsx differ
commit fa0e5e2928547398fdb53cafcefcd9c3ba9c6a7e
Author: Markus Mohrhard 
Date:   Tue Jun 2 13:47:25 2015 +0200

that special case was a really stupid idea, tdf#91685

The default value is context depending and not 0. So always export the
rotation value.

Change-Id: I36162459757c58846f3ecea7dcbcb58b6ef3d1f6

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 2f0853b..f091126 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1110,7 +1110,7 @@ void ChartExport::exportTitle( Reference< XShape > xShape 
)
 
 pFS->singleElement( FSNS( XML_a, XML_bodyPr ),
 XML_vert, sWritingMode,
-XML_rot, nRotation == 0 ? NULL : 
calcRotationValue(nRotation).getStr(),
+XML_rot, calcRotationValue(nRotation).getStr(),
 FSEND );
 // TODO: lstStyle
 pFS->singleElement( FSNS( XML_a, XML_lstStyle ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - connectivity/source fpicker/source lingucomponent/source sfx2/source vcl/osx

2015-06-02 Thread Stephan Bergmann

 connectivity/source/drivers/macab/macaborder.cxx|9 -
 fpicker/source/aqua/SalAquaFilePicker.mm|2 +-
 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |2 +-
 sfx2/source/appl/shutdowniconaqua.mm|2 +-
 vcl/osx/salmenu.cxx |2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 1754c4d2abaf4360f973973035e51ba1685847bb
Author: Stephan Bergmann 
Date:   Tue Jun 2 22:57:22 2015 +0200

loplugin:loopvartoosmall

Change-Id: I08c484c54e27c55157836d68a28d2a0e580499d9

diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 63fb8ef..0abc5fe 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -439,7 +439,7 @@ void AquaSalMenu::setMainMenu()
 {
 unsetMainMenu();
 // insert our items
-for( unsigned int i = 0; i < maItems.size(); i++ )
+for( std::vector::size_type i = 0; i < 
maItems.size(); i++ )
 {
 NSMenuItem* pItem = maItems[i]->mpMenuItem;
 [mpMenu insertItem: pItem atIndex: i+1];
commit 7a65f6c524a224c26bf6f4c065fdc5aab81724d9
Author: Stephan Bergmann 
Date:   Tue Jun 2 22:57:18 2015 +0200

loplugin:loopvartoosmall

Change-Id: I721a9da1f277ce641375411f302557372331e6a2

diff --git a/sfx2/source/appl/shutdowniconaqua.mm 
b/sfx2/source/appl/shutdowniconaqua.mm
index 7d5a37f..234329f 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -216,7 +216,7 @@ class RecentFilesStringLength : public 
::cppu::WeakImplHelper1< ::com::sun::star
 }
 
 // insert new recent items
-for ( sal_uInt32 i = 0; i < m_pRecentFilesItems->size(); i++ )
+for ( std::vector::size_type i = 0; i < 
m_pRecentFilesItems->size(); i++ )
 {
 rtl::OUString   aMenuTitle;
 INetURLObject   aURL( (*m_pRecentFilesItems)[i].aURL );
commit c984b76efc71c106ad480ea29b5effd24a806a34
Author: Stephan Bergmann 
Date:   Tue Jun 2 22:57:13 2015 +0200

loplugin:loopvartoosmall

Change-Id: I33f4e74f97ba52b9240e6304d53eb256bd822060

diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm 
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 609e315..4104641 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -118,7 +118,7 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
 NSArray *aLocales = [NSLocale availableLocaleIdentifiers];
 
 //Test for existence of the dictionaries
-for (unsigned int i = 0; i < [aLocales count]; i++)
+for (NSUInteger i = 0; i < [aLocales count]; i++)
 {
 NSString* pLangStr = (NSString*)[aLocales objectAtIndex:i];
 if( [macSpell setLanguage:pLangStr ] )
commit 1d25c7102137a4b7eda069fe9dc0d7ba13604ac2
Author: Stephan Bergmann 
Date:   Tue Jun 2 22:57:07 2015 +0200

loplugin:loopvartoosmall

Change-Id: Icdaba21efeb8a910617642b7cb4e082f03f7a0ef

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm 
b/fpicker/source/aqua/SalAquaFilePicker.mm
index a760f84..97bc5ed 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -337,7 +337,7 @@ uno::Sequence SAL_CALL 
SalAquaFilePicker::getFiles() throw( uno::
 
 uno::Sequence< rtl::OUString > aSelectedFiles(nFiles > 1 ? nFiles + 1 : 
nFiles);
 
-for(int nIndex = 0; nIndex < nFiles; nIndex += 1)
+for(long nIndex = 0; nIndex < nFiles; nIndex += 1)
 {
 NSURL *url = [files objectAtIndex:nIndex];
 
commit 8b9be6fd5ffcc37363efb4228dec9126a8e179a6
Author: Stephan Bergmann 
Date:   Tue Jun 2 22:57:02 2015 +0200

loplugin:loopvartoosmall

Change-Id: I63917d68b05d6e2f1248bcf88e27952df201d2c5

diff --git a/connectivity/source/drivers/macab/macaborder.cxx 
b/connectivity/source/drivers/macab/macaborder.cxx
index 399e179..1a5a8f1 100644
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
@@ -54,8 +54,8 @@ MacabComplexOrder::MacabComplexOrder()
 
 MacabComplexOrder::~MacabComplexOrder()
 {
-for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
-delete m_aOrders[i];
+for (auto p: m_aOrders)
+delete p;
 }
 
 void MacabComplexOrder::addOrder(MacabOrder *pOrder)
@@ -65,10 +65,9 @@ void MacabComplexOrder::addOrder(MacabOrder *pOrder)
 
 sal_Int32 MacabComplexOrder::compare(const MacabRecord *record1, const 
MacabRecord *record2) const
 {
-for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
+for (auto p: m_aOrders)
 {
-const MacabOrder *pOrder = m_aOrders[i];
-sal_Int32 result = pOrder->compare(record1, record2);
+sal_Int32 result = p->compare(record1, record2);
 
 if (result) return result;
 }
___

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Markus Mohrhard

Hey,

On Tue, Jun 2, 2015 at 10:46 PM, Robert Antoni Buj i Gelonch <
robert@gmail.com> wrote:

> Hi, I can move forward until aEnv.startLoading()
>
> Process 13147 stopped
> * thread #1: tid = 0x2c50ef, 0x0001173583dc
> libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758,
> xContext=0x0001087913d0, sURL=0x7fff5fbf4b00,
> sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at
> loadenv.cxx:164, queue = 'com.apple.main-thread', stop reason = step over
> frame #0: 0x0001173583dc
> libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758,
> xContext=0x0001087913d0, sURL=0x7fff5fbf4b00,
> sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at
> loadenv.cxx:164
>161sTarget,
>162nFlags,
>163LoadEnv::E_NO_FEATURE);
> -> 164 aEnv.startLoading();
>165 aEnv.waitWhileLoading(); // wait for ever!
>166
>167 xComponent = aEnv.getTargetComponent();
> (lldb) n
> warn:legacy.osl:13147:1:oox/source/helper/graphichelper.cxx:117:
> GraphicHelper::GraphicHelper - cannot get target frame
> warn:vcl.window:13147:1:vcl/source/window/window.cxx:3353: ignoring
> DeploymentException "component context fails to supply service
> 'com.sun.star.datatransfer.clipboard.SystemClipboard' of type
> 'com.sun.star.datatransfer.clipboard.XSystemClipboard'"
> warn:sfx.sidebar:13147:1:sfx2/source/sidebar/SidebarController.cxx:743:
> Cannot create panel:
> Assertion failed: (nMapNum == 0 || std::abs(n) <
> std::numeric_limits::max() / nMapNum / nDPI), function
> ImplLogicToPixel, file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx,
> line 382.
> Process 13147 stopped
> * thread #1: tid = 0x2c50ef, 0x7fff88a53286
> libsystem_kernel.dylib`__pthread_kill + 10, queue =
> 'com.apple.main-thread', stop reason = signal SIGABRT
> frame #0: 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill + 10
> libsystem_kernel.dylib`__pthread_kill:
> ->  0x7fff88a53286 <+10>: jae0x7fff88a53290; <+20>
> 0x7fff88a53288 <+12>: movq   %rax, %rdi
> 0x7fff88a5328b <+15>: jmp0x7fff88a4ec53;
> cerror_nocancel
> 0x7fff88a53290 <+20>: retq
>
>
> 2015-06-02 20:16 GMT+02:00 Robert Antoni Buj i Gelonch <
> robert@gmail.com>:
>
>>
>> so this smells like the issue discussed in <
>>> https://bugs.documentfoundation.org/show_bug.cgi?id=90502> "CRASH -
>>> failed assertion in unittest sw_globalfilter in master build OSX," and the
>>> working hypothesis would be that your tb's failure symptoms are the
>>> non-debug manifestation of the same underlying problem that manifests as
>>> tdf#90502 in some people's debug/dbgutil builds
>>
>>
>> (lldb)  breakpoint set --file
>> /Volumes/Master/lo/core/sw/qa/extras/globalfilter/globalfilter.cxx --line
>> 663
>> Breakpoint 1: no locations (pending).
>> WARNING:  Unable to resolve breakpoint to any actual locations.
>> (lldb) run
>> Process 11213 launched:
>> '/Volumes/Master/lo/core/workdir/LinkTarget/Executable/cppunittester'
>> (x86_64)
>> 1 location added to breakpoint 1
>> ...
>> Process 11213 stopped* thread #1: tid = 0x2be3ac, 0x00010b9e83e6
>> libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053, queue
>> = 'com.apple.main-thread', stop reason = breakpoint 1.1
>> frame #0: 0x00010b9e83e6
>> libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053
>>2050 basic_string<_CharT, _Traits, _Allocator>::basic_string(const
>> value_type* __s)
>>2051 {
>>2052_LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*)
>> detected nullptr");
>> -> 2053__init(__s, traits_type::length(__s));
>>2054 #if _LIBCPP_DEBUG_LEVEL >= 2
>>2055__get_db()->__insert_c(this);
>>2056 #endif
>> (lldb) n
>> Process 11213 stopped
>> * thread #1: tid = 0x2be3ac, 0x00010b9e83fb
>> libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
>> + 75 at globalfilter.cxx:668, queue = 'com.apple.main-thread', stop reason
>> = step over
>> frame #0: 0x00010b9e83fb
>> libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
>> + 75 at globalfilter.cxx:668
>>665 // Check how LO skips image loading (but not texts of
>> textboxes and custom shapes)
>>666 // during DOC and DOCX import, using the "SkipImages"
>> FilterOptions.
>>667
>> -> 668 const char* aFilterNames[][2] = {
>>669 { "/sw/qa/extras/globalfilter/data/skipimages.doc", NULL
>> },
>>670 { "/sw/qa/extras/globalfilter/data/skipimages.doc",
>> "SkipImages" },
>>671 { "/sw/qa/extras/globalfilter/data/skipimages.docx", NULL
>> },
>> (lldb) n
>> Process 11213 stopped
>> * thread #1: tid = 0x2be3ac, 0x00010b9e844f
>> libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
>> + 159 at globalfilter.cxx:675,

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Robert Antoni Buj i Gelonch

Hi, I can move forward until aEnv.startLoading()

Process 13147 stopped
* thread #1: tid = 0x2c50ef, 0x0001173583dc
libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758,
xContext=0x0001087913d0, sURL=0x7fff5fbf4b00,
sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at
loadenv.cxx:164, queue = 'com.apple.main-thread', stop reason = step over
frame #0: 0x0001173583dc
libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758,
xContext=0x0001087913d0, sURL=0x7fff5fbf4b00,
sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at
loadenv.cxx:164
   161sTarget,
   162nFlags,
   163LoadEnv::E_NO_FEATURE);
-> 164 aEnv.startLoading();
   165 aEnv.waitWhileLoading(); // wait for ever!
   166
   167 xComponent = aEnv.getTargetComponent();
(lldb) n
warn:legacy.osl:13147:1:oox/source/helper/graphichelper.cxx:117:
GraphicHelper::GraphicHelper - cannot get target frame
warn:vcl.window:13147:1:vcl/source/window/window.cxx:3353: ignoring
DeploymentException "component context fails to supply service
'com.sun.star.datatransfer.clipboard.SystemClipboard' of type
'com.sun.star.datatransfer.clipboard.XSystemClipboard'"
warn:sfx.sidebar:13147:1:sfx2/source/sidebar/SidebarController.cxx:743:
Cannot create panel:
Assertion failed: (nMapNum == 0 || std::abs(n) <
std::numeric_limits::max() / nMapNum / nDPI), function
ImplLogicToPixel, file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx,
line 382.
Process 13147 stopped
* thread #1: tid = 0x2c50ef, 0x7fff88a53286
libsystem_kernel.dylib`__pthread_kill + 10, queue =
'com.apple.main-thread', stop reason = signal SIGABRT
frame #0: 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill + 10
libsystem_kernel.dylib`__pthread_kill:
->  0x7fff88a53286 <+10>: jae0x7fff88a53290; <+20>
0x7fff88a53288 <+12>: movq   %rax, %rdi
0x7fff88a5328b <+15>: jmp0x7fff88a4ec53; cerror_nocancel
0x7fff88a53290 <+20>: retq


2015-06-02 20:16 GMT+02:00 Robert Antoni Buj i Gelonch :

>
> so this smells like the issue discussed in <
>> https://bugs.documentfoundation.org/show_bug.cgi?id=90502> "CRASH -
>> failed assertion in unittest sw_globalfilter in master build OSX," and the
>> working hypothesis would be that your tb's failure symptoms are the
>> non-debug manifestation of the same underlying problem that manifests as
>> tdf#90502 in some people's debug/dbgutil builds
>
>
> (lldb)  breakpoint set --file
> /Volumes/Master/lo/core/sw/qa/extras/globalfilter/globalfilter.cxx --line
> 663
> Breakpoint 1: no locations (pending).
> WARNING:  Unable to resolve breakpoint to any actual locations.
> (lldb) run
> Process 11213 launched:
> '/Volumes/Master/lo/core/workdir/LinkTarget/Executable/cppunittester'
> (x86_64)
> 1 location added to breakpoint 1
> ...
> Process 11213 stopped* thread #1: tid = 0x2be3ac, 0x00010b9e83e6
> libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053, queue
> = 'com.apple.main-thread', stop reason = breakpoint 1.1
> frame #0: 0x00010b9e83e6
> libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053
>2050 basic_string<_CharT, _Traits, _Allocator>::basic_string(const
> value_type* __s)
>2051 {
>2052_LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*)
> detected nullptr");
> -> 2053__init(__s, traits_type::length(__s));
>2054 #if _LIBCPP_DEBUG_LEVEL >= 2
>2055__get_db()->__insert_c(this);
>2056 #endif
> (lldb) n
> Process 11213 stopped
> * thread #1: tid = 0x2be3ac, 0x00010b9e83fb
> libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
> + 75 at globalfilter.cxx:668, queue = 'com.apple.main-thread', stop reason
> = step over
> frame #0: 0x00010b9e83fb
> libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
> + 75 at globalfilter.cxx:668
>665 // Check how LO skips image loading (but not texts of
> textboxes and custom shapes)
>666 // during DOC and DOCX import, using the "SkipImages"
> FilterOptions.
>667
> -> 668 const char* aFilterNames[][2] = {
>669 { "/sw/qa/extras/globalfilter/data/skipimages.doc", NULL },
>670 { "/sw/qa/extras/globalfilter/data/skipimages.doc",
> "SkipImages" },
>671 { "/sw/qa/extras/globalfilter/data/skipimages.docx", NULL
> },
> (lldb) n
> Process 11213 stopped
> * thread #1: tid = 0x2be3ac, 0x00010b9e844f
> libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
> + 159 at globalfilter.cxx:675, queue = 'com.apple.main-thread', stop reason
> = step over
> frame #0: 0x00010b9e844f
> libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
> + 159 at globalfilter.cxx:675
>672 { "/sw/qa/extras/globalfilter/data/skipimages.docx",
> "

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

2015-06-02 Thread matteocam

 include/editeng/overflowingtxt.hxx |   47 +
 1 file changed, 47 insertions(+)

New commits:
commit a7ea2f7df0de69ff8c71f39fdaf0519848e21e57
Author: matteocam 
Date:   Tue Jun 2 16:10:47 2015 -0400

Added overflowingtxt.hxx

Change-Id: I555d83f6dee7f189648f8ac6b5844add4701af86

diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
new file mode 100644
index 000..287d237
--- /dev/null
+++ b/include/editeng/overflowingtxt.hxx
@@ -0,0 +1,47 @@
+/* -*- 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 .
+ */
+
+#ifndef INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
+#define INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
+
+class OUString;
+class OutlinerParaObject;
+
+
+class OverflowingText {
+public:
+OUString mHeadTxt;
+const OutlinerParaObject *mpMidParas;
+OUString mTailTxt;
+// NOTE: mpMidParas and mTailTxt might be empty
+
+// Constructor
+OverflowingText(
+const OUString &headTxt,
+const OutlinerParaObject *pMidParas = NULL,
+const OUString &tailTxt = "")
+: mHeadTxt(headTxt),
+  mpMidParas(pMidParas),
+  mTailTxt(tailTxt)
+{ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Mox Soini license statement

2015-06-02 Thread Mox Soini

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

BR,

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

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

2015-06-02 Thread Tor Lillqvist

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

New commits:
commit 5ad704ac9b885df71f634716a10b625e4473005f
Author: Tor Lillqvist 
Date:   Tue Jun 2 17:43:44 2015 +0300

There is no use of vcl::Window here

Change-Id: Idf36c08205a8a3a36ae05040e1c1fd28d5e2f13f

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index ad7d1e2..cd8f46f 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -70,8 +70,6 @@ public:
 
 }; }; // namespace detail, namespace vcl
 
-namespace vcl { class Window; }
-
 /**
  * A thin wrapper around rtl::Reference to implement the acquire and dispose 
semantics we want for references to vcl::Window subclasses.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 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 'libreoffice-5-0' - sd/source sd/uiconfig

2015-06-02 Thread Rishabh Kumar

 sd/source/ui/animations/SlideTransitionPane.cxx  |9 -
 sd/source/ui/animations/SlideTransitionPane.hxx  |2 
 sd/uiconfig/simpress/ui/slidetransitionspanel.ui |  155 ++-
 3 files changed, 69 insertions(+), 97 deletions(-)

New commits:
commit 31407dc23c41fb7f07ed62e049a35b0da7ec9564
Author: Rishabh Kumar 
Date:   Wed May 27 19:26:43 2015 +0530

tdf#87862: Rearranging the lower half of slide transition tab

Follow up commit for the minor tweaks

Change-Id: I9f274e38c7d0adfc431dc9a11000c3ce9fad3a3e
Reviewed-on: https://gerrit.libreoffice.org/15929
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit a7b926243b300daf195467111e10a7bd481828a0)
Reviewed-on: https://gerrit.libreoffice.org/15999
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index 0c41e09..86f2afd 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -436,7 +436,6 @@ SlideTransitionPane::SlideTransitionPane(
 get(mpMF_ADVANCE_AUTO_AFTER, "auto_after_value");
 get(mpPB_APPLY_TO_ALL, "apply_to_all");
 get(mpPB_PLAY, "play");
-get(mpPB_SLIDE_SHOW, "slide_show");
 get(mpCB_AUTO_PREVIEW, "auto_preview");
 
 
mpLB_SLIDE_TRANSITIONS->set_width_request(mpLB_SLIDE_TRANSITIONS->approximate_char_width()
 * 16);
@@ -460,7 +459,6 @@ SlideTransitionPane::SlideTransitionPane(
 // set handlers
 mpPB_APPLY_TO_ALL->SetClickHdl( LINK( this, SlideTransitionPane, 
ApplyToAllButtonClicked ));
 mpPB_PLAY->SetClickHdl( LINK( this, SlideTransitionPane, PlayButtonClicked 
));
-mpPB_SLIDE_SHOW->SetClickHdl( LINK( this, SlideTransitionPane, 
SlideShowButtonClicked ));
 
 mpLB_SLIDE_TRANSITIONS->SetSelectHdl( LINK( this, SlideTransitionPane, 
TransitionSelected ));
 
@@ -501,7 +499,6 @@ void SlideTransitionPane::dispose()
 mpMF_ADVANCE_AUTO_AFTER.clear();
 mpPB_APPLY_TO_ALL.clear();
 mpPB_PLAY.clear();
-mpPB_SLIDE_SHOW.clear();
 mpCB_AUTO_PREVIEW.clear();
 PanelLayout::dispose();
 }
@@ -1007,12 +1004,6 @@ IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked)
 return 0;
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, SlideShowButtonClicked)
-{
-mrBase.StartPresentation();
-return 0;
-}
-
 IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected)
 {
 applyToSelectedPages();
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx 
b/sd/source/ui/animations/SlideTransitionPane.hxx
index 654ce2e..fbfc3cf 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -89,7 +89,6 @@ private:
 
 DECL_LINK( ApplyToAllButtonClicked, void * );
 DECL_LINK( PlayButtonClicked, void * );
-DECL_LINK( SlideShowButtonClicked, void * );
 DECL_LINK( AutoPreviewClicked, void * );
 
 DECL_LINK( TransitionSelected, void * );
@@ -116,7 +115,6 @@ private:
 VclPtr  mpMF_ADVANCE_AUTO_AFTER;
 VclPtr   mpPB_APPLY_TO_ALL;
 VclPtr   mpPB_PLAY;
-VclPtr   mpPB_SLIDE_SHOW;
 VclPtr mpCB_AUTO_PREVIEW;
 
 ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView >   
  mxView;
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui 
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 13a300c..9e046fe 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -2,6 +2,11 @@
 
 
   
+  
+True
+False
+sd/res/playblue_16.png
+  
   
 True
 False
@@ -26,8 +31,6 @@
 True
 False
 True
-6
-12
 
   
 True
@@ -40,15 +43,8 @@
 
   
 
-
-  
-True
-False
-Apply to Selected 
Slides
-
-  
-
-  
+
+  
 
   
   
@@ -67,8 +63,8 @@
   
 True
 False
-6
-12
+3
+20
 
   
 True
@@ -248,113 +244,100 @@
   
 False
 True
-3
+2
   
 
 
-  
+  
 True
 False
-0
-none
+vertical
 
-  
+  
 True
 False
-6
-12
+center
 
-  
+  
+Apply Transition 
to All Slides
 True
-False
-

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/svtools officecfg/registry svtools/source svtools/uiconfig

2015-06-02 Thread Szymon Kłos

 include/svtools/ServerDetailsControls.hxx|4 
 officecfg/registry/data/org/openoffice/Office/Common.xcu |   14 
 svtools/source/dialogs/PlaceEditDialog.cxx   |   39 
 svtools/source/dialogs/ServerDetailsControls.cxx |   35 
 svtools/uiconfig/ui/placeedit.ui |  788 ++-
 5 files changed, 393 insertions(+), 487 deletions(-)

New commits:
commit e1f99c6542371b05100f13d71f9c34781696f288
Author: Szymon KÅos 
Date:   Tue Jun 2 20:20:47 2015 +0200

services reordering, changed PlaceEditDialog UI

Change-Id: I261986286f036816b9b6f05d521c560b0247791d

diff --git a/include/svtools/ServerDetailsControls.hxx 
b/include/svtools/ServerDetailsControls.hxx
index 2c7f1b2..e56f3e7 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -25,7 +25,7 @@ class DetailsContainer
 {
 private:
 Link<> m_aChangeHdl;
-VclPtr   m_pFrame;
+VclPtr   m_pFrame;
 
 public:
 DetailsContainer( VclBuilderContainer* pBuilder, const OString& rFrame 
);
@@ -123,7 +123,7 @@ class CmisDetailsContainer : public DetailsContainer
 VclPtr   m_pEDBinding;
 VclPtrm_pLBRepository;
 VclPtr m_pBTRepoRefresh;
-VclPtr   m_pEDPath;
+VclPtr   m_pEDRoot;
 
 public:
 CmisDetailsContainer( VclBuilderContainer* pBuilder, OUString sBinding 
);
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index ffca153..a9b1bf7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -570,8 +570,10 @@
 
 
   
-http:///alfresco/cmisatom
+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
 http:///servlet/cmis/repository/_P_RMain.nsf/servicedoc
@@ -579,15 +581,16 @@
 https:///cmis/atom
 
http://ec2-184-72-233-127.compute-1.amazonaws.com/ot-cmis/services/RepositoryService?wsdl
 http:///_vti_bin/CMISSoapwsdl.aspx
-https://www.googleapis.com/drive/v2
-https://apis.live.net/v5.0
 http:///_api/Web
+http:///
   
 
 
   
-Alfresco 4
+Google Drive
+OneDrive
 Alfresco Cloud
+Alfresco 4
 IBM FileNet P8
 Lotus Live Files
 Lotus Quickr Domino
@@ -595,9 +598,8 @@
 OpenDataSpace
 OpenText ELS 10.2.0
 SharePoint 2010
-Google Drive
-OneDrive
 SharePoint 2013
+Other CMIS
   
 
   
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx 
b/svtools/source/dialogs/PlaceEditDialog.cxx
index 886aefd..d23fe0e 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -121,24 +121,6 @@ std::shared_ptr PlaceEditDialog::GetPlace()
 
 void PlaceEditDialog::InitDetails( )
 {
-// Create WebDAV / FTP / SSH details control
-std::shared_ptr 
xDavDetails(std::make_shared(this));
-xDavDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
-m_aDetailsContainers.push_back(xDavDetails);
-
-std::shared_ptr 
xFtpDetails(std::make_shared(this, 21, "ftp"));
-xFtpDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
-m_aDetailsContainers.push_back(xFtpDetails);
-
-std::shared_ptr 
xSshDetails(std::make_shared(this, 22, "ssh"));
-xSshDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
-m_aDetailsContainers.push_back(xSshDetails);
-
-// Create Windows Share control
-std::shared_ptr 
xSmbDetails(std::make_shared(this));
-xSmbDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
-m_aDetailsContainers.push_back(xSmbDetails);
-
 // Create CMIS controls for each server type
 
 Reference< XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
@@ -163,7 +145,7 @@ void PlaceEditDialog::InitDetails( )
  !( sUrl.startsWith( ALFRESCO_CLOUD_BASE_URL ) && bSkipAlfresco ) 
&&
  !( sUrl == ONEDRIVE_BASE_URL && bSkipOneDrive ) )
 {
-m_pLBServerType->InsertEntry( aTypesNamesList[i]);
+m_pLBServerType->InsertEntry( aTypesNamesList[i], i );
 
 std::shared_ptr 
xCmisDetails(std::make_shared(this, sUrl));
 xCmisDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) 
);
@@ -173,6 +155,24 @@ void PlaceEditDialog::InitDetails( )
 }
 }
 
+// Create WebDAV / FTP / SSH details control
+std::shared_ptr 
xDavDetails(std::make_shared(this));
+xD

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Robert Antoni Buj i Gelonch

> so this smells like the issue discussed in <
> https://bugs.documentfoundation.org/show_bug.cgi?id=90502> "CRASH -
> failed assertion in unittest sw_globalfilter in master build OSX," and the
> working hypothesis would be that your tb's failure symptoms are the
> non-debug manifestation of the same underlying problem that manifests as
> tdf#90502 in some people's debug/dbgutil builds


(lldb)  breakpoint set --file
/Volumes/Master/lo/core/sw/qa/extras/globalfilter/globalfilter.cxx --line
663
Breakpoint 1: no locations (pending).
WARNING:  Unable to resolve breakpoint to any actual locations.
(lldb) run
Process 11213 launched:
'/Volumes/Master/lo/core/workdir/LinkTarget/Executable/cppunittester'
(x86_64)
1 location added to breakpoint 1
...
Process 11213 stopped* thread #1: tid = 0x2be3ac, 0x00010b9e83e6
libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053, queue
= 'com.apple.main-thread', stop reason = breakpoint 1.1
frame #0: 0x00010b9e83e6
libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053
   2050 basic_string<_CharT, _Traits, _Allocator>::basic_string(const
value_type* __s)
   2051 {
   2052_LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*)
detected nullptr");
-> 2053__init(__s, traits_type::length(__s));
   2054 #if _LIBCPP_DEBUG_LEVEL >= 2
   2055__get_db()->__insert_c(this);
   2056 #endif
(lldb) n
Process 11213 stopped
* thread #1: tid = 0x2be3ac, 0x00010b9e83fb
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 75 at globalfilter.cxx:668, queue = 'com.apple.main-thread', stop reason
= step over
frame #0: 0x00010b9e83fb
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 75 at globalfilter.cxx:668
   665 // Check how LO skips image loading (but not texts of textboxes
and custom shapes)
   666 // during DOC and DOCX import, using the "SkipImages"
FilterOptions.
   667
-> 668 const char* aFilterNames[][2] = {
   669 { "/sw/qa/extras/globalfilter/data/skipimages.doc", NULL },
   670 { "/sw/qa/extras/globalfilter/data/skipimages.doc",
"SkipImages" },
   671 { "/sw/qa/extras/globalfilter/data/skipimages.docx", NULL },
(lldb) n
Process 11213 stopped
* thread #1: tid = 0x2be3ac, 0x00010b9e844f
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 159 at globalfilter.cxx:675, queue = 'com.apple.main-thread', stop reason
= step over
frame #0: 0x00010b9e844f
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 159 at globalfilter.cxx:675
   672 { "/sw/qa/extras/globalfilter/data/skipimages.docx",
"SkipImages" }
   673 };
   674
-> 675 for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames);
++nFilter )
   676 {
   677 bool bSkipImages = aFilterNames[nFilter][1] != NULL;
   678 OString sFailedMessage = OString("Failed on filter: ") +
aFilterNames[nFilter][0];
(lldb) n
Process 11213 stopped
* thread #1: tid = 0x2be3ac, 0x00010b9e846b
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 187 at globalfilter.cxx:677, queue = 'com.apple.main-thread', stop reason
= step over
frame #0: 0x00010b9e846b
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 187 at globalfilter.cxx:677
   674
   675 for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames);
++nFilter )
   676 {
-> 677 bool bSkipImages = aFilterNames[nFilter][1] != NULL;
   678 OString sFailedMessage = OString("Failed on filter: ") +
aFilterNames[nFilter][0];
   679
   680 if (mxComponent.is())
(lldb) n
Process 11213 stopped
* thread #1: tid = 0x2be3ac, 0x00010b9e8485
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 213 at globalfilter.cxx:678, queue = 'com.apple.main-thread', stop reason
= step over
frame #0: 0x00010b9e8485
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 213 at globalfilter.cxx:678
   675 for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames);
++nFilter )
   676 {
   677 bool bSkipImages = aFilterNames[nFilter][1] != NULL;
-> 678 OString sFailedMessage = OString("Failed on filter: ") +
aFilterNames[nFilter][0];
   679
   680 if (mxComponent.is())
   681 mxComponent->dispose();
(lldb) n
Process 11213 stopped
* thread #1: tid = 0x2be3ac, 0x00010b9e84ff
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 335 at globalfilter.cxx:680, queue = 'com.apple.main-thread', stop reason
= step over
frame #0: 0x00010b9e84ff
libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0)
+ 335 at globalfilter.cxx:680
   677 bool bSkipImages = aFilterNames[nFilter][1] != NULL;
   678 OString sFailedMessage = OString("Failed on filter: ") +
aFilterNames[nFilter][0];
   679
-> 680 if (mxComponent.is

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

2015-06-02 Thread Caolán McNamara

 sw/source/filter/ww8/docxattributeoutput.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 6d50c6ccdf85e7d01f16d3edb957eed2a4ad5e47
Author: CaolÃ¡n McNamara 
Date:   Tue Jun 2 16:00:59 2015 +0100

move ++m_nFieldsInHyperlink from StartField_Impl to callers

no logic change at all, justs makes it clear the dubiousness
of this unconditional increment

Change-Id: I32e3cb2c45b1b45826a59642c33ab850d698c206

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8d7632a..16068b0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1058,6 +1058,9 @@ void DocxAttributeOutput::EndRun()
 {
 StartField_Impl( *pIt );
 
+if (m_startedHyperlink)
+++m_nFieldsInHyperlink;
+
 // Remove the field from the stack if only the start has to be 
written
 // Unknown fields should be removed too
 if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
@@ -1123,6 +1126,9 @@ void DocxAttributeOutput::EndRun()
 {
 StartField_Impl( *pIt, true );
 
+if (m_startedHyperlink)
+++m_nFieldsInHyperlink;
+
 // Remove the field if no end needs to be written
 if ( !pIt->bClose ) {
 pIt = m_Fields.erase( pIt );
@@ -1412,8 +1418,6 @@ void DocxAttributeOutput::WriteFFData(  const FieldInfos& 
rInfos )
 
 void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun )
 {
-if ( m_startedHyperlink )
-++m_nFieldsInHyperlink;
 if ( rInfos.pField && rInfos.eType == ww::eUNKNOWN )
 {
 // Expand unsupported fields
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Stephan Bergmann

 connectivity/source/drivers/kab/korder.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 2dd0c65cb20ed42b31e854b7da1afd6fc03b4325
Author: Stephan Bergmann 
Date:   Tue Jun 2 18:28:15 2015 +0200

Use range-based for

Change-Id: Ie10317f3ffcaa8032417584cb056007c5f67ea91

diff --git a/connectivity/source/drivers/kab/korder.cxx 
b/connectivity/source/drivers/kab/korder.cxx
index 9418a56..6ff1f0c 100644
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
@@ -56,8 +56,8 @@ KabComplexOrder::KabComplexOrder()
 
 KabComplexOrder::~KabComplexOrder()
 {
-for (std::vector::size_type i = 0; i < m_aOrders.size(); i++)
-delete m_aOrders[i];
+for (auto p: m_aOrders)
+delete p;
 }
 
 void KabComplexOrder::addOrder(KabOrder *pOrder)
@@ -67,10 +67,9 @@ void KabComplexOrder::addOrder(KabOrder *pOrder)
 
 sal_Int32 KabComplexOrder::compare(const ::KABC::Addressee &aAddressee1, const 
::KABC::Addressee &aAddressee2) const
 {
-for (std::vector::size_type i = 0; i < m_aOrders.size(); i++)
+for (auto p: m_aOrders)
 {
-const KabOrder *pOrder = m_aOrders[i];
-sal_Int32 result = pOrder->compare(aAddressee1, aAddressee2);
+sal_Int32 result = p->compare(aAddressee1, aAddressee2);
 
 if (result) return result;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Stephan Bergmann

 external/poppler/ubsan.patch.0 |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 8890e3f44d786b48deeec42288da58149f0c9703
Author: Stephan Bergmann 
Date:   Tue Jun 2 18:22:56 2015 +0200

external/poppler: -fsanitize=nonnull-attribute

Change-Id: I17c825a0e24e8993503eeaf0d1136c143d990a12

diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index 2b0b334..623858da9 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -1,3 +1,14 @@
+--- goo/GooString.cc
 goo/GooString.cc
+@@ -161,7 +161,7 @@
+   // assert(s != s1) the roundedSize condition ensures this
+   if (newLength < length) {
+   memcpy(s1, s, newLength);
+-  } else {
++  } else if (length != 0) {
+   memcpy(s1, s, length);
+   }
+   if (s != sStatic)
 --- poppler/Stream.cc
 +++ poppler/Stream.cc
 @@ -2966,12 +2966,12 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang connectivity/source vcl/unx

2015-06-02 Thread Stephan Bergmann

 compilerplugins/clang/loopvartoosmall.cxx |8 
 connectivity/source/drivers/evoab2/EApi.cxx   |2 +-
 connectivity/source/drivers/evoab2/NStatement.cxx |2 +-
 connectivity/source/drivers/kab/korder.cxx|4 ++--
 vcl/unx/kde4/KDESalGraphics.cxx   |2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b4f9145fb4cfa8cee6fb52c647adb45712453eca
Author: Stephan Bergmann 
Date:   Tue Jun 2 18:21:58 2015 +0200

Enable loplugin:loopvartoosmall

Change-Id: I114320ebaab9223b82b4fd9710c3cc221a836645

diff --git a/compilerplugins/clang/loopvartoosmall.cxx 
b/compilerplugins/clang/loopvartoosmall.cxx
index 78fc47e..c7fa0d3 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -103,17 +103,17 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
 if (qt1BitWidth < qt2BitWidth) {
 report(
 DiagnosticsEngine::Warning,
-"loop index type is narrower than length type. " + 
qt.getAsString() + " < " + qt2.getAsString(),
+"loop index type %0 is narrower than length type %1",
 stmt->getInit()->getLocStart())
-  << stmt->getInit()->getSourceRange();
+<< qt << qt2 << stmt->getInit()->getSourceRange();
 //stmt->getCond()->dump();
 }
 return true;
 }
 
 
-loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", false);
+loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall");
 
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7b6b8131f6ace6334e20e85cd96dddc6213bec0b
Author: Stephan Bergmann 
Date:   Tue Jun 2 18:21:44 2015 +0200

loplugin:loopvartoosmall

Change-Id: Iaa82f5e3180024db747a52d699aa77c16781afa0

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index b77aa0c..ed6b130 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -206,7 +206,7 @@ namespace
 static QRegion XRegionToQRegion( Region xr )
 {
 QRegion qr;
-for( int i = 0;
+for( long i = 0;
  i < xr->numRects;
  ++i )
 {
commit d58d9402e8b33fdfb83899aba80ea5b4ab145ff9
Author: Stephan Bergmann 
Date:   Tue Jun 2 18:21:39 2015 +0200

loplugin:loopvartoosmall

Change-Id: Id5501599969fab5c6944a31b1fb629a3fc5f85b2

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index ff1fd4f..ac77d56 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -111,7 +111,7 @@ static const ApiMap aClientApiMap38[] =
 template static bool
 tryLink( oslModule &aModule, const char *pName, const ApiMap (&pMap)[N])
 {
-for (guint i = 0; i < N; ++i)
+for (size_t i = 0; i < N; ++i)
 {
 SymbolFunc aMethod = reinterpret_cast(osl_getFunctionSymbol
 (aModule, OUString::createFromAscii ( pMap[ i ].sym_name ).pData));
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx 
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 9b8a101..637d166 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -215,7 +215,7 @@ void OCommonStatement::orderByAnalysis( const 
OSQLParseNode* _pOrderByClause, So
 const OSQLParseNode* pOrderList = _pOrderByClause->getByRule( 
OSQLParseNode::ordering_spec_commalist );
 ENSURE_OR_THROW( pOrderList, "unexpected parse tree structure" );
 
-for ( sal_uInt32 i=0; icount(); ++i )
+for ( size_t i=0; icount(); ++i )
 {
 const OSQLParseNode* pOrderBy = pOrderList->getChild(i);
 if ( !pOrderBy || !SQL_ISRULE( pOrderBy, ordering_spec ) )
diff --git a/connectivity/source/drivers/kab/korder.cxx 
b/connectivity/source/drivers/kab/korder.cxx
index 3948d5ee..9418a56 100644
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
@@ -56,7 +56,7 @@ KabComplexOrder::KabComplexOrder()
 
 KabComplexOrder::~KabComplexOrder()
 {
-for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
+for (std::vector::size_type i = 0; i < m_aOrders.size(); i++)
 delete m_aOrders[i];
 }
 
@@ -67,7 +67,7 @@ void KabComplexOrder::addOrder(KabOrder *pOrder)
 
 sal_Int32 KabComplexOrder::compare(const ::KABC::Addressee &aAddressee1, const 
::KABC::Addressee &aAddressee2) const
 {
-for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
+for (std::vector::size_type i = 0; i < m_aOrders.size(); i++)
 {
 const KabOrder *pOrder = m_aOrders[i];
 sal_Int32 result = pOrder->compare(aAddressee1, aAddressee2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread László Németh

 vcl/source/window/toolbox.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 751d697db61341a481178b86c6b28efa7d3c7d64
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Tue Jun 2 18:08:36 2015 +0200

fix rendercontext rendering of toolbox

Change-Id: I927a7ffdac278384ef102e6619f217daf24879a2

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 18f4f83..34637a2 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3095,7 +3095,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& 
rRenderContext, sal_uInt16 nPos,
 mpData->m_pLayoutData->m_aLineItemIds.push_back( pItem->mnId );
 mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos );
 }
-DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength(), 
DrawTextFlags::Mnemonic, pVector, pDisplayText );
+rRenderContext.DrawCtrlText( aPos, pItem->maText, 0, 
pItem->maText.getLength(), DrawTextFlags::Mnemonic, pVector, pDisplayText );
 if (bClip)
 rRenderContext.SetClipRegion();
 rRenderContext.SetFont(aOldFont);
@@ -3258,7 +3258,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& 
rRenderContext, sal_uInt16 nPos,
 mpData->m_pLayoutData->m_aLineItemIds.push_back( pItem->mnId );
 mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos );
 }
-DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText,
+rRenderContext.DrawCtrlText( Point( nTextOffX, nTextOffY ), 
pItem->maText,
   0, pItem->maText.getLength(), nTextStyle, pVector, 
pDisplayText );
 if ( bRotate )
 SetFont( aOldFont );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

2015-06-02 Thread Stephan Bergmann

 sal/rtl/byteseq.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3a71742e5092b012921ad80d3375b231a75f8c2
Author: Stephan Bergmann 
Date:   Tue Jun 2 18:07:20 2015 +0200

-fsanitize=nonnull-attribute in memcpy call

Change-Id: If1f852ce4ef3419d663d4e2f4bdb4a57cc61e799

diff --git a/sal/rtl/byteseq.cxx b/sal/rtl/byteseq.cxx
index a374486..024719a 100644
--- a/sal/rtl/byteseq.cxx
+++ b/sal/rtl/byteseq.cxx
@@ -192,7 +192,7 @@ void SAL_CALL rtl_byte_sequence_constructFromArray(
 SAL_THROW_EXTERN_C()
 {
 rtl_byte_sequence_constructNoDefault( ppSequence , nLength );
-if ( *ppSequence != 0 )
+if ( *ppSequence != 0 && nLength != 0 )
 memcpy( (*ppSequence)->elements, pData, nLength );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/libetonyek external/python3

2015-06-02 Thread Stephan Bergmann

 external/libetonyek/ubsan.patch |   11 +++
 external/python3/ubsan.patch.0  |   11 +++
 2 files changed, 22 insertions(+)

New commits:
commit 1c989f8eff440fc47588b77cc73969a8c789a5ae
Author: Stephan Bergmann 
Date:   Tue Jun 2 17:50:17 2015 +0200

external/python3: -fsanitize=nonnull-attribute

Change-Id: Ib589b638a81bfb77fd74da8b15ae7b11cfd2b58b

diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0
index 020f4bf..32a079e 100644
--- a/external/python3/ubsan.patch.0
+++ b/external/python3/ubsan.patch.0
@@ -20,6 +20,17 @@
  
/* Set the carry bit iff the function uses any sse registers.
   This is clc or stc, together with the first byte of the jmp.  */
+--- Objects/bytearrayobject.c
 Objects/bytearrayobject.c
+@@ -294,7 +294,7 @@
+ PyBuffer_Release(&vo);
+ return NULL;
+ }
+-memcpy(self->ob_bytes + mysize, vo.buf, vo.len);
++if (vo.len != 0) memcpy(self->ob_bytes + mysize, vo.buf, vo.len);
+ PyBuffer_Release(&vo);
+ Py_INCREF(self);
+ return (PyObject *)self;
 --- Objects/listobject.c
 +++ Objects/listobject.c
 @@ -641,7 +641,7 @@
commit c710b435f1443b5a5d8a0679943bc8a71755d866
Author: Stephan Bergmann 
Date:   Tue Jun 2 17:49:48 2015 +0200

external/libetonyek: -fsanitize=nonnull-attribute

Change-Id: Ib7e6722d772a135325ebd1e33ed7b17f214fea47

diff --git a/external/libetonyek/ubsan.patch b/external/libetonyek/ubsan.patch
index f0ab147..3b5e64e 100644
--- a/external/libetonyek/ubsan.patch
+++ b/external/libetonyek/ubsan.patch
@@ -9,3 +9,14 @@
  
if (m_value)
{
+--- src/lib/libetonyek_xml.cpp
 src/lib/libetonyek_xml.cpp
+@@ -33,7 +33,7 @@
+ unsigned long bytesRead = 0;
+ const unsigned char *const bytes = input->read(len, bytesRead);
+ 
+-std::memcpy(buffer, bytes, static_cast(bytesRead));
++if (bytesRead != 0) std::memcpy(buffer, bytes, 
static_cast(bytesRead));
+ return static_cast(bytesRead);
+   }
+   catch (...)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Improved Error Checking - Weekly Report 1

2015-06-02 Thread Ben Ni

Learning points- Attended hackfest@Cambridge, picked up lots of useful coding 
tips and familiarised with Calc's data structure
Progress:- Implemented formula group iterator- Display formula group count 
statistic- Fixed time wraparound validity check
Goals:- Implement formula group check mode- Implement "any" for data field 
under validity criteria___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Writer problem with a dangling SwModify pointer

2015-06-02 Thread Németh László

Hi Stephan,

_ImplAdjustVertRelPos( ) function was for only limiting a numerical
value (vertical position of text frames) without any modification of
its arguments, but I extended it with a direct modification of a frame
attribute using this SetFlyFrmAttr call. I am afraid, this was a bad
idea, when _ImplAdjustVertRelPos() is called during a similar
modification of an attribute set. Perhaps moving the
SetFlyFrmAttr/modification to the calling code part will solve this
problem, I will check it. Thanks for your mail!

Best regards,
Laszlo



2015-06-01 17:39 GMT+02:00 Stephan Bergmann :
> I'm chasing a problem that my UBSan build originally pointed me at, but
> where I fail to make good progress.  Maybe some Writer expert has a clue.
>
> I have broken it down to two pieces of information:
>
> For one, valgrind reports a dangling SwModify pointer toward the end of
> CppunitTest_sw_ooxmlexport,
>
>> Invalid read of size 1
>>at 0x20FD6659: SwModify::SetInCache(bool) (in
>> /home/sbergman/lo/core/instdir/program/libswlo.so)
>>by 0x215FECD7: SwBorderAttrs::~SwBorderAttrs()
>> (/sw/source/core/layout/frmtool.cxx:1872)
>>by 0x215FED48: SwBorderAttrs::~SwBorderAttrs()
>> (/sw/source/core/layout/frmtool.cxx:1871)
>>by 0x20FFE78B: SwCache::~SwCache()
>> (/sw/source/core/bastyp/swcache.cxx:123)
>>by 0x21640B21: _FrmFinit() (/sw/source/core/layout/newfrm.cxx:369)
>>by 0x20FF86CF: _FinitCore() (/sw/source/core/bastyp/init.cxx:750)
>>by 0x21EDEBC8: SwDLL::~SwDLL() (/sw/source/uibase/app/swdll.cxx:158)
>>by 0x21EE045A: std::default_delete::operator()(SwDLL*) const
>> (/usr/lib/gcc/x86_64-redhat-linux/4.9.2/../../../../include/c++/4.9.2/bits/unique_ptr.h:76)
>>by 0x21EE0598: std::unique_ptr
>> >::reset(SwDLL*)
>> (/usr/lib/gcc/x86_64-redhat-linux/4.9.2/../../../../include/c++/4.9.2/bits/unique_ptr.h:344)
>>by 0x21EDF5EB: comphelper::unique_disposing_ptr::reset(SwDLL*)
>> (/include/comphelper/unique_disposing_ptr.hxx:41)
>>by 0x21EDF02D:
>> comphelper::unique_disposing_solar_mutex_reset_ptr::reset(SwDLL*)
>> (/include/comphelper/unique_disposing_ptr.hxx:152)
>>by 0x21EDFFA1:
>> comphelper::unique_disposing_ptr::TerminateListener::disposing(com::sun::star::lang::EventObject
>> const&) (/include/comphelper/unique_disposing_ptr.hxx:118)
>>by 0x21EE01BB: non-virtual thunk to
>> comphelper::unique_disposing_ptr::TerminateListener::disposing(com::sun::star::lang::EventObject
>> const&) (/include/comphelper/unique_disposing_ptr.hxx:102)
>>by 0xD4A4561:
>> cppu::OInterfaceContainerHelper::disposeAndClear(com::sun::star::lang::EventObject
>> const&) (/cppuhelper/source/interfacecontainer.cxx:312)
>>by 0xD4A54C3:
>> cppu::OMultiTypeInterfaceContainerHelper::disposeAndClear(com::sun::star::lang::EventObject
>> const&) (/cppuhelper/source/interfacecontainer.cxx:485)
>>by 0x2BB8A540: framework::Desktop::disposing()
>> (/framework/source/services/desktop.cxx:1051)
>>by 0xD49EB2E: cppu::WeakComponentImplHelperBase::dispose()
>> (/cppuhelper/source/implbase.cxx:109)
>>by 0x2BB8E710:
>> cppu::WeakComponentImplHelper6> com::sun::star::frame::XDesktop2, com::sun::star::frame::XTasksSupplier,
>> com::sun::star::frame::XDispatchResultListener,
>> com::sun::star::task::XInteractionHandler,
>> com::sun::star::frame::XUntitledNumbers>::dispose() (in
>> /home/sbergman/lo/core/instdir/program/libfwklo.so)
>>by 0x2BB8E988: non-virtual thunk to
>> cppu::WeakComponentImplHelper6> com::sun::star::frame::XDesktop2, com::sun::star::frame::XTasksSupplier,
>> com::sun::star::frame::XDispatchResultListener,
>> com::sun::star::task::XInteractionHandler,
>> com::sun::star::frame::XUntitledNumbers>::dispose()
>> (/include/cppuhelper/compbase6.hxx:59)
>>by 0xD4F3BAD: cppuhelper::ServiceManager::disposing()
>> (/cppuhelper/source/servicemanager.cxx:925)
>>by 0xD49EB2E: cppu::WeakComponentImplHelperBase::dispose()
>> (/cppuhelper/source/implbase.cxx:109)
>>by 0xD484A70:
>> cppu::WeakComponentImplHelper8> com::sun::star::lang::XMultiServiceFactory,
>> com::sun::star::lang::XMultiComponentFactory,
>> com::sun::star::container::XSet,
>> com::sun::star::container::XContentEnumerationAccess,
>> com::sun::star::beans::XPropertySet,
>> com::sun::star::beans::XPropertySetInfo,
>> com::sun::star::lang::XEventListener>::dispose() (in
>> /home/sbergman/lo/core/instdir/program/libuno_cppuhelpergcc3.so.3)
>>by 0xD484C78: non-virtual thunk to
>> cppu::WeakComponentImplHelper8> com::sun::star::lang::XMultiServiceFactory,
>> com::sun::star::lang::XMultiComponentFactory,
>> com::sun::star::container::XSet,
>> com::sun::star::container::XContentEnumerationAccess,
>> com::sun::star::beans::XPropertySet,
>> com::sun::star::beans::XPropertySetInfo,
>> com::sun::star::lang::XEventListener>::dispose()
>> (/include/cppuhelper/compbase8.hxx:59)
>>by 0xD468F85:
>> cppu::try_dispose(com::sun::star::uno::Reference
>> const&) (/cppuhelper/source/component_context.cxx:276)
>>by 0xD469A2E: cppu::C

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

2015-06-02 Thread Stephan Bergmann

 external/coinmp/UnpackedTarball_coinmp.mk |1 +
 external/coinmp/ubsan.patch.0 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit c8346d77e73bdbe82a1eb73dd83c34ada8c68b17
Author: Stephan Bergmann 
Date:   Tue Jun 2 17:35:20 2015 +0200

external/coinmp: -fsanitize=nonnull-attribute

Change-Id: I487e772395defa9aae2ce3eb040b8c7d92720cb2

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 635deff..aad0cd3 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
) \
$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
external/coinmp/werror-format-pedantic.patch.0 \
+   external/coinmp/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/ubsan.patch.0 b/external/coinmp/ubsan.patch.0
new file mode 100644
index 000..1573329
--- /dev/null
+++ b/external/coinmp/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- Clp/src/ClpParameters.hpp
 Clp/src/ClpParameters.hpp
+@@ -81,7 +81,7 @@
+ template  inline void
+ ClpDisjointCopyN( const T * array, const int size, T * newArray)
+ {
+- memcpy(reinterpret_cast (newArray), array, size * sizeof(T));
++ if (size != 0) memcpy(reinterpret_cast (newArray), array, size * 
sizeof(T));
+ }
+ /// And set
+ template  inline void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - rsc/source sal/osl tools/source

2015-06-02 Thread Stephan Bergmann

 rsc/source/tools/rsctools.cxx  |6 +-
 sal/osl/unx/file.cxx   |2 +-
 tools/source/stream/stream.cxx |5 -
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 42c178bef78efeaa3ab2e31ca5d466105966e5f3
Author: Stephan Bergmann 
Date:   Tue Jun 2 16:56:19 2015 +0200

-fsanitize=nonnull-attribute in memcpy call

Change-Id: I0ed38aa54e1b403f015c27b27edb4710e935d961

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 2e98799..b96da82 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1771,7 +1771,10 @@ sal_Size SvMemoryStream::GetData( void* pData, sal_Size 
nCount )
 sal_Size nMaxCount = nEndOfData-nPos;
 if( nCount > nMaxCount )
 nCount = nMaxCount;
-memcpy( pData, pBuf+nPos, (size_t)nCount );
+if (nCount != 0)
+{
+memcpy( pData, pBuf+nPos, (size_t)nCount );
+}
 nPos += nCount;
 return nCount;
 }
commit eee25979d16e2a53f31311774812cb5866d020bc
Author: Stephan Bergmann 
Date:   Tue Jun 2 16:56:13 2015 +0200

-fsanitize=nonnull-attribute in memcpy call

Change-Id: Ic2fc0752f2bce2d565ca58b1c804bfd601b80875

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 73612a3..aa918c8 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -678,7 +678,7 @@ oslFileError FileHandle_Impl::writeSequence_Impl (
 /* resize sequence */
 rtl_byte_sequence_realloc(ppSequence, nElements);
 }
-if (*ppSequence != 0)
+if (*ppSequence != 0 && nBytes != 0)
 {
 /* fill sequence */
 memcpy(&((*ppSequence)->elements[*pnOffset]), pBuffer, nBytes), 
*pnOffset += nBytes;
commit 2bc0a808392cff87342bf9377c4066169c7150e7
Author: Stephan Bergmann 
Date:   Tue Jun 2 16:56:08 2015 +0200

-fsanitize=nonnull-attribute in memcpy call

Change-Id: I4fc491906311781b9941c8f02d99d254542027ae

diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 5a486e0..8352683 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -305,7 +305,11 @@ void RscWriteRc :: PutUTF8( char * pStr )
 n++;
 
 sal_uInt32  nOldLen = IncSize( n );
-memcpy( GetPointer( nOldLen ), pStr, nStrLen );
+char * p = GetPointer( nOldLen );
+if (nStrLen != 0)
+{
+memcpy( p, pStr, nStrLen );
+}
 // 0 terminated
 pMem[ nOldLen + nStrLen ] = '\0';
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Rishabh Kumar

 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx  |   55 -
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx  |3 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx |   28 --
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx |2 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx   |6 
 sc/uiconfig/scalc/ui/sidebaralignment.ui |  179 +-
 sc/uiconfig/scalc/ui/sidebarcellappearance.ui|   47 
 sc/uiconfig/scalc/ui/sidebarnumberformat.ui  |  187 +++
 8 files changed, 167 insertions(+), 340 deletions(-)

New commits:
commit 1c18deee371ae21088383b2a2ddc55c7a7fd41b7
Author: Rishabh Kumar 
Date:   Thu May 28 01:37:00 2015 +0530

tdf#90888:Shrink the properties sidebar sections in Calc

Removal of less used controls

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

diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx 
b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index c27d0e9..d572ffd 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -45,7 +45,6 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
   maMergeCellControl(FID_MERGE_TOGGLE, *pBindings, *this),
   maWrapTextControl(SID_ATTR_ALIGN_LINEBREAK, *pBindings, *this),
   maAngleControl(SID_ATTR_ALIGN_DEGREES, *pBindings, *this),
-  maStackControl(SID_ATTR_ALIGN_STACKED, *pBindings, *this),
   mbMultiDisable(false),
   mxFrame(rxFrame),
   maContext(),
@@ -56,9 +55,7 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
 get(mpCBXWrapText, "wraptext");
 get(mpCBXMergeCell, "mergecells");
 get(mpFtRotate, "orientationlabel");
-get(mpCtrlDial, "orientationcontrol");
 get(mpMtrAngle, "orientationdegrees");
-get(mpCbStacked, "verticallystacked");
 
 Initialize();
 
@@ -78,16 +75,13 @@ void AlignmentPropertyPanel::dispose()
 mpCBXWrapText.clear();
 mpCBXMergeCell.clear();
 mpFtRotate.clear();
-mpCtrlDial.clear();
 mpMtrAngle.clear();
-mpCbStacked.clear();
 
 maAlignHorControl.dispose();
 maLeftIndentControl.dispose();
 maMergeCellControl.dispose();
 maWrapTextControl.dispose();
 maAngleControl.dispose();
-maStackControl.dispose();
 
 PanelLayout::dispose();
 }
@@ -107,8 +101,6 @@ void AlignmentPropertyPanel::Initialize()
 mpCBXWrapText->SetClickHdl ( aLink );
 
 //rotation control
-mpCtrlDial->SetAccessibleName(OUString( "Text Orientation"));   //wj acc
-mpCtrlDial->SetModifyHdl(LINK( this, AlignmentPropertyPanel, RotationHdl));
 
 //rotation
 mpMtrAngle->SetAccessibleName(OUString( "Text Orientation"));   //wj acc
@@ -116,7 +108,6 @@ void AlignmentPropertyPanel::Initialize()
 mpMtrAngle->EnableAutocomplete( false );
 
 //Vertical stacked
-mpCbStacked->SetClickHdl( LINK( this, AlignmentPropertyPanel, 
ClickStackHdl ) );
 
 mpMtrAngle->InsertValue(0, FUNIT_CUSTOM);
 mpMtrAngle->InsertValue(45, FUNIT_CUSTOM);
@@ -170,27 +161,6 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl )
 SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L );
 return 0;
 }
-
-IMPL_LINK_NOARG( AlignmentPropertyPanel, RotationHdl )
-{
-sal_Int32 nTmp = mpCtrlDial->GetRotation();
-SfxInt32Item aAngleItem( SID_ATTR_ALIGN_DEGREES,(sal_uInt32) nTmp);
-
-GetBindings()->GetDispatcher()->Execute(
-SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L );
-
-return 0;
-}
-
-IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl )
-{
-bool bVertical = mpCbStacked->IsChecked();
-SfxBoolItem  aStackItem( SID_ATTR_ALIGN_STACKED, bVertical );
-GetBindings()->GetDispatcher()->Execute(
-SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, &aStackItem, 0L );
-return 0;
-}
-
 IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl)
 {
 mpCBXWrapText->EnableTriState(false);
@@ -282,17 +252,14 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
 if( meHorAlignState == SVX_HOR_JUSTIFY_REPEAT )
 {
 mpFtRotate->Disable();
-mpCtrlDial->Disable();
 mpMtrAngle->Disable();
 }
 else
 {
 mpFtRotate->Enable(!mbMultiDisable);
-mpCtrlDial->Enable(!mbMultiDisable);
 mpMtrAngle->Enable(!mbMultiDisable);
 }
 
-mpCbStacked->Enable( meHorAlignState != SVX_HOR_JUSTIFY_REPEAT );
 mpFTLeftIndent->Enable( meHorAlignState == SVX_HOR_JUSTIFY_LEFT );
 mpMFLeftIndent->Enable( meHorAlignState == SVX_HOR_JUSTIFY_LEFT );
 }
@@ -352,7 +319,6 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
 {
 long nTmp = static_cast(pState)->GetValue();
 mpMtrAngle->SetValue( nTmp /

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

2015-06-02 Thread Noel Grandin

 dbaccess/qa/complex/dbaccess/CopyTableWizard.java |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit c2d73acad34f43b7c48ef9a4e492ab5b48bb4852
Author: Noel Grandin 
Date:   Tue Jun 2 10:04:20 2015 +0200

inline simple Java method

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

diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java 
b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
index 03727fe..97c63d2 100644
--- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
@@ -167,7 +167,7 @@ public class CopyTableWizard extends CRMBasedTestCase
 copyWizard.setCreatePrimaryKey(auto);
 Thread thread = new Thread(new CopyThread(copyWizard));
 thread.start();
-sleep();
+util.utils.shortWait();
 
 try
 {
@@ -195,14 +195,9 @@ public class CopyTableWizard extends CRMBasedTestCase
 catch (com.sun.star.lang.IndexOutOfBoundsException 
indexOutOfBoundsException)
 {
 }
-sleep();
+util.utils.shortWait();
 
 thread.join();
 }
 
-private void sleep()
-{
-util.utils.shortWait();
-}
-
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Stephan Bergmann


On 06/02/2015 03:01 PM, Robert Antoni Buj i Gelonch wrote:

Assertion failed: (nMapNum == 0 || std::abs(n) <
std::numeric_limits::max() / nMapNum / nDPI), function
ImplLogicToPixel, file
/Volumes/Master/lo/core/vcl/source/outdev/map.cxx, line 382.


so this smells like the issue discussed in 
 "CRASH - 
failed assertion in unittest sw_globalfilter in master build OSX," and 
the working hypothesis would be that your tb's failure symptoms are the 
non-debug manifestation of the same underlying problem that manifests as 
tdf#90502 in some people's debug/dbgutil builds

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

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

2015-06-02 Thread Michael Stahl

 external/curl/ExternalProject_curl.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit df2e19ffa8840bc2fef5d56de5d6058f2b3c5ffb
Author: Michael Stahl 
Date:   Tue Jun 2 15:30:28 2015 +0200

curl: disable rtmp support

configure will add a dependency on librtmp.so.0 if the development
package happens to be installed.

(cherry picked from commit f4844a9abebcb0451161625c42a1e2b48796102d)

curl: sigh... *actually* disable rtmp support

(cherry picked from commit 805f12dd51ea72deda8f5be5839a205640ba968d)

curl: disable loads more random stuff we don't need

(cherry picked from commit 0b8b96ed515eec0a560812be73d4c9742f26e23b)
Change-Id: I0f4bcd73f9e0e7307ca0556a5f6990631eb9f2c5

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 8f94771..4222419 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -46,9 +46,12 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter IOS,$(OS)),--with-darwinssl) \
$(if $(filter MACOSX,$(OS)),\
--with-darwinssl) \
-   --without-ssl \
+   --without-ssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
+   --without-librtmp --disable-ldaps --disable-tftp 
--disable-pop3 \
+   --disable-imap --disable-smtp --disable-manual 
--without-metalink \
+   --without-nghttp2 \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/curl

2015-06-02 Thread Michael Stahl

 external/curl/ExternalProject_curl.mk |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 9a9b116a1fd438f265ff8b6de59f2b2c6bdb0d48
Author: Michael Stahl 
Date:   Tue Jun 2 15:48:13 2015 +0200

curl: simplify SSL conditional

Change-Id: I210774ef7432257a3154e8981c0d53e9e63b2110

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 4222419..e31f5d6 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -42,10 +42,9 @@ $(call gb_ExternalProject_get_state_target,curl,build):
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if 
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
-   $(if $(filter IOS,$(OS)),--with-darwinssl) \
-   $(if $(filter MACOSX,$(OS)),\
-   --with-darwinssl) \
+   $(if $(filter IOS MACOSX,$(OS)),\
+   --with-darwinssl,\
+   --with-nss$(if $(SYSTEM_NSS),,="$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out")) \
--without-ssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
commit 0b8b96ed515eec0a560812be73d4c9742f26e23b
Author: Michael Stahl 
Date:   Tue Jun 2 15:45:59 2015 +0200

curl: disable loads more random stuff we don't need

Change-Id: I0f4bcd73f9e0e7307ca0556a5f6990631eb9f2c5

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index c0ba892..4222419 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -46,10 +46,12 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter IOS,$(OS)),--with-darwinssl) \
$(if $(filter MACOSX,$(OS)),\
--with-darwinssl) \
-   --without-ssl \
+   --without-ssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
-   --without-librtmp \
+   --without-librtmp --disable-ldaps --disable-tftp 
--disable-pop3 \
+   --disable-imap --disable-smtp --disable-manual 
--without-metalink \
+   --without-nghttp2 \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Miklos Vajna

 sw/qa/extras/tiledrendering/data/search.odt|binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   24 
 2 files changed, 24 insertions(+)

New commits:
commit 3f3ea9fadd6dc643fbd12e99075a23d59ff73207
Author: Miklos Vajna 
Date:   Tue Jun 2 15:26:56 2015 +0200

CppunitTest_sw_tiledrendering: add TextFrame search testcase

Fails without commit 2d17cd6b03a214393755ddfed5ba50a18f0cd774 (sw:
LOK_CALLBACK_TEXT_SELECTION should be the union of all selections,
2015-06-02).

Change-Id: I1d45eabf53dadd24051ff46acbf4bbfb85fb60a9

diff --git a/sw/qa/extras/tiledrendering/data/search.odt 
b/sw/qa/extras/tiledrendering/data/search.odt
index 9d98145..76ab2e1 100644
Binary files a/sw/qa/extras/tiledrendering/data/search.odt and 
b/sw/qa/extras/tiledrendering/data/search.odt differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index c8d4b92..ba8237e 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -34,6 +34,7 @@ public:
 void testResetSelection();
 void testSearch();
 void testSearchViewArea();
+void testSearchTextFrame();
 void testDocumentSizeChanged();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
@@ -45,6 +46,7 @@ public:
 CPPUNIT_TEST(testResetSelection);
 CPPUNIT_TEST(testSearch);
 CPPUNIT_TEST(testSearchViewArea);
+CPPUNIT_TEST(testSearchTextFrame);
 CPPUNIT_TEST(testDocumentSizeChanged);
 CPPUNIT_TEST_SUITE_END();
 
@@ -54,6 +56,7 @@ private:
 void callbackImpl(int nType, const char* pPayload);
 Rectangle m_aInvalidation;
 Size m_aDocumentSize;
+OString m_aTextSelection;
 };
 
 SwXTextDocument* SwTiledRenderingTest::createDoc(const char* pName)
@@ -98,6 +101,11 @@ void SwTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 m_aDocumentSize.setHeight(aSeq[1].toInt32());
 }
 break;
+case LOK_CALLBACK_TEXT_SELECTION:
+{
+m_aTextSelection = pPayload;
+}
+break;
 }
 }
 
@@ -318,6 +326,22 @@ void SwTiledRenderingTest::testSearchViewArea()
 #endif
 }
 
+void SwTiledRenderingTest::testSearchTextFrame()
+{
+#if !defined(WNT) && !defined(MACOSX)
+SwXTextDocument* pXTextDocument = createDoc("search.odt");
+pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
+uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence(
+{
+{"SearchItem.SearchString", uno::makeAny(OUString("TextFrame"))},
+{"SearchItem.Backward", uno::makeAny(false)},
+}));
+comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
+// This was empty: nothing was highlighted after searching for 'TextFrame'.
+CPPUNIT_ASSERT(!m_aTextSelection.isEmpty());
+#endif
+}
+
 void SwTiledRenderingTest::testDocumentSizeChanged()
 {
 #if !defined(WNT) && !defined(MACOSX)
___
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' - sw/inc sw/source

2015-06-02 Thread Miklos Vajna

 sw/inc/viscrs.hxx  |2 +-
 sw/source/core/crsr/viscrs.cxx |   29 ++---
 2 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 69d68246ea505bb89cfb5fe453a4bb7c618afc77
Author: Miklos Vajna 
Date:   Tue Jun 2 14:47:21 2015 +0200

sw: LOK_CALLBACK_TEXT_SELECTION should be the union of all selections

E.g. if searching for a keyword and it's inside a text frame, then we
have two cursors: one is an empty selection at the anchor point, and the
other is the real selection. What happened is that we emitted two events
for the two cursors, instead of merging them together.

Fix the problem by not emitting the events in SwSelPaintRects::Show(),
instead do it at once in SwShellCrsr::Show().

Change-Id: Ie2c7691aaaea7ba8a32b5cfa718a45cba571f791

diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index a15dbd3..159fb2f 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -96,7 +96,7 @@ public:
 // make a complete swap access to m_pCursorOverlay is needed there
 void swapContent(SwSelPaintRects& rSwap);
 
-void Show();
+void Show(std::vector* pSelectionRectangles = 0);
 void Hide();
 void Invalidate( const SwRect& rRect );
 
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 38e6ef8..c3d591c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -280,7 +280,7 @@ void SwShellCrsr::FillStartEnd(SwRect& rStart, SwRect& 
rEnd) const
 rEnd = lcl_getLayoutRect(pCursor->GetEndPos(), *pCursor->End());
 }
 
-void SwSelPaintRects::Show()
+void SwSelPaintRects::Show(std::vector* pSelectionRectangles)
 {
 SdrView *const pView = const_cast(m_pCursorShell->GetDrawView());
 
@@ -379,7 +379,10 @@ void SwSelPaintRects::Show()
 ss << rRect.SVRect().toString().getStr();
 }
 OString sRect = ss.str().c_str();
-GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
sRect.getStr());
+if (!pSelectionRectangles)
+
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, sRect.getStr());
+else
+pSelectionRectangles->push_back(sRect);
 }
 }
 }
@@ -566,11 +569,31 @@ void SwShellCrsr::FillRects()
 
 void SwShellCrsr::Show()
 {
+std::vector aSelectionRectangles;
 for(SwPaM& rPaM : GetRingContainer())
 {
 SwShellCrsr* pShCrsr = dynamic_cast(&rPaM);
 if(pShCrsr)
-pShCrsr->SwSelPaintRects::Show();
+pShCrsr->SwSelPaintRects::Show(&aSelectionRectangles);
+}
+
+if (GetShell()->isTiledRendering())
+{
+std::stringstream ss;
+bool bFirst = true;
+for (size_t i = 0; i < aSelectionRectangles.size(); ++i)
+{
+const OString& rSelectionRectangle = aSelectionRectangles[i];
+if (rSelectionRectangle.isEmpty())
+continue;
+if (bFirst)
+bFirst = false;
+else
+ss << "; ";
+ss << rSelectionRectangle.getStr();
+}
+OString sRect = ss.str().c_str();
+GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
sRect.getStr());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Michael Stahl

 external/curl/ExternalProject_curl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 805f12dd51ea72deda8f5be5839a205640ba968d
Author: Michael Stahl 
Date:   Tue Jun 2 15:36:00 2015 +0200

curl: sigh... *actually* disable rtmp support

Change-Id: I07ffe3a9ad6556fb5da3149a3cbe12ffcc5f56b4

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 5a80e26..c0ba892 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
-   --without-rtmp \
+   --without-librtmp \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Michael Stahl

 external/curl/ExternalProject_curl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f4844a9abebcb0451161625c42a1e2b48796102d
Author: Michael Stahl 
Date:   Tue Jun 2 15:30:28 2015 +0200

curl: disable rtmp support

configure will add a dependency on librtmp.so.0 if the development
package happens to be installed.

Change-Id: I8500cc166d70763118e5054680f1f8c70942ba3f

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 8f94771..5a80e26 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
+   --without-rtmp \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
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-5.0' - sw/inc sw/source

2015-06-02 Thread Miklos Vajna

 sw/inc/viscrs.hxx  |2 +-
 sw/source/core/crsr/viscrs.cxx |   29 ++---
 2 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 1465731928f6bd5fcd84a14baa9599dc3db3bc34
Author: Miklos Vajna 
Date:   Tue Jun 2 14:47:21 2015 +0200

sw: LOK_CALLBACK_TEXT_SELECTION should be the union of all selections

E.g. if searching for a keyword and it's inside a text frame, then we
have two cursors: one is an empty selection at the anchor point, and the
other is the real selection. What happened is that we emitted two events
for the two cursors, instead of merging them together.

Fix the problem by not emitting the events in SwSelPaintRects::Show(),
instead do it at once in SwShellCrsr::Show().

Change-Id: Ie2c7691aaaea7ba8a32b5cfa718a45cba571f791

diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index a15dbd3..159fb2f 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -96,7 +96,7 @@ public:
 // make a complete swap access to m_pCursorOverlay is needed there
 void swapContent(SwSelPaintRects& rSwap);
 
-void Show();
+void Show(std::vector* pSelectionRectangles = 0);
 void Hide();
 void Invalidate( const SwRect& rRect );
 
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 38e6ef8..c3d591c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -280,7 +280,7 @@ void SwShellCrsr::FillStartEnd(SwRect& rStart, SwRect& 
rEnd) const
 rEnd = lcl_getLayoutRect(pCursor->GetEndPos(), *pCursor->End());
 }
 
-void SwSelPaintRects::Show()
+void SwSelPaintRects::Show(std::vector* pSelectionRectangles)
 {
 SdrView *const pView = const_cast(m_pCursorShell->GetDrawView());
 
@@ -379,7 +379,10 @@ void SwSelPaintRects::Show()
 ss << rRect.SVRect().toString().getStr();
 }
 OString sRect = ss.str().c_str();
-GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
sRect.getStr());
+if (!pSelectionRectangles)
+
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, sRect.getStr());
+else
+pSelectionRectangles->push_back(sRect);
 }
 }
 }
@@ -566,11 +569,31 @@ void SwShellCrsr::FillRects()
 
 void SwShellCrsr::Show()
 {
+std::vector aSelectionRectangles;
 for(SwPaM& rPaM : GetRingContainer())
 {
 SwShellCrsr* pShCrsr = dynamic_cast(&rPaM);
 if(pShCrsr)
-pShCrsr->SwSelPaintRects::Show();
+pShCrsr->SwSelPaintRects::Show(&aSelectionRectangles);
+}
+
+if (GetShell()->isTiledRendering())
+{
+std::stringstream ss;
+bool bFirst = true;
+for (size_t i = 0; i < aSelectionRectangles.size(); ++i)
+{
+const OString& rSelectionRectangle = aSelectionRectangles[i];
+if (rSelectionRectangle.isEmpty())
+continue;
+if (bFirst)
+bFirst = false;
+else
+ss << "; ";
+ss << rSelectionRectangle.getStr();
+}
+OString sRect = ss.str().c_str();
+GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
sRect.getStr());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-02 Thread Lionel Elie Mamane

Hi,

FWIW, the libreoffice-5-0 reproducibly fails the
libreofficekit_tiledrendering unittest with a segfault for me, while
master passes it. I use the same autogen.input for both.

[ CUT ] libreofficekit_tiledrendering
Bootstrapping exception 'missing whitespace before attribute in
file:///home/master/src/libreoffice/workdirs/libreoffice-5-0/workdir/unittest/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/common_.rdb'
Segmentation fault

No core file identified in directory
/home/master/src/libreoffice/workdirs/libreoffice-5-0/workdir/CppunitTest/libreofficekit_tiledrendering.test.core
To show backtraces for crashes during test execution,
enable core files with:

   ulimit -c unlimited


Error: a unit test failed, please do one of:

export DEBUGCPPUNIT=TRUE# for exception catching
export CPPUNITTRACE="gdb --args"# for interactive debugging on
Linux
export VALGRIND=memcheck# for memory checking

and retry using: make CppunitTest_libreofficekit_tiledrendering

/home/master/src/libreoffice/workdirs/libreoffice-5-0/solenv/gbuild/CppunitTest.mk:87:
recipe for target
'/home/master/src/libreoffice/workdirs/libreoffice-5-0/workdir/CppunitTest/libreofficekit_tiledrendering.test'
failed
make[1]: ***
[/home/master/src/libreoffice/workdirs/libreoffice-5-0/workdir/CppunitTest/libreofficekit_tiledrendering.test]
Error 1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-06-02 Thread Stephan Bergmann

 external/python3/ubsan.patch.0 |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 6d46d37685e845ae1bf26016bcb447f9ec7803ae
Author: Stephan Bergmann 
Date:   Tue Jun 2 15:21:41 2015 +0200

external/python3: -fsanitize=nonnull-attribute

Change-Id: I447d1f01c24a934e643077dc271872e850b204bc

diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0
index 39717d2..020f4bf 100644
--- a/external/python3/ubsan.patch.0
+++ b/external/python3/ubsan.patch.0
@@ -22,6 +22,15 @@
   This is clc or stc, together with the first byte of the jmp.  */
 --- Objects/listobject.c
 +++ Objects/listobject.c
+@@ -641,7 +641,7 @@
+ goto Error;
+ }
+ }
+-memcpy(recycle, &item[ilow], s);
++if (s != 0) memcpy(recycle, &item[ilow], s);
+ 
+ if (d < 0) { /* Delete -d items */
+ memmove(&item[ihigh+d], &item[ihigh],
 @@ -2036,7 +2036,7 @@
  if (keys != NULL) {
  for (i = 0; i < saved_ob_size; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Yousuf Philips

 svx/uiconfig/ui/sidebarparagraph.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed6b7d972bf1aee323947f22c6b5de430db4a9a5
Author: Yousuf Philips 
Date:   Tue Jun 2 13:40:45 2015 +0400

Fix indent button icons in impress/draw sidebar

Change-Id: Ib21c2489e1ff420e651e50a2731dfd3f16c9cef8
Reviewed-on: https://gerrit.libreoffice.org/16028
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index df0acc3..1338e9b 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -535,7 +535,7 @@
 False
 True
 Increase Indent
-.uno:Promote
+.uno:IncrementIndent
 True
   
   
@@ -549,7 +549,7 @@
 False
 True
 Decrease Indent
-.uno:Demote
+.uno:DecrementIndent
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Zsolt Bölöny

 basegfx/source/range/b2dpolyrange.cxx  |4 +---
 basegfx/test/basegfx2d.cxx |4 ++--
 basegfx/test/boxclipper.cxx|5 ++---
 include/basegfx/range/b2dpolyrange.hxx |4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit d0f6f00c1af07e744b4302ed9f33ca6c025a1434
Author: Zsolt BÃ¶lÃ¶ny 
Date:   Tue May 19 17:36:54 2015 +0200

Replaced boost::tuple with std::tuple

Change-Id: Ia001c8e1e00df85d2be93e330811a1081179785d
Reviewed-on: https://gerrit.libreoffice.org/15816
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/basegfx/source/range/b2dpolyrange.cxx 
b/basegfx/source/range/b2dpolyrange.cxx
index 3aec84d..95982a6 100644
--- a/basegfx/source/range/b2dpolyrange.cxx
+++ b/basegfx/source/range/b2dpolyrange.cxx
@@ -25,7 +25,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
@@ -52,8 +51,7 @@ namespace basegfx
 
 B2DPolyRange::ElementType getElement(sal_uInt32 nIndex) const
 {
-return boost::make_tuple(maRanges[nIndex],
- maOrient[nIndex]);
+return std::make_tuple(maRanges[nIndex], maOrient[nIndex]);
 }
 
 void appendElement(const B2DRange& rRange, B2VectorOrientation 
eOrient, sal_uInt32 nCount)
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index f6afc96..8f06c6f 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -294,9 +294,9 @@ public:
 CPPUNIT_ASSERT_MESSAGE("simple poly range - count",
aRange.count() == 2);
 CPPUNIT_ASSERT_MESSAGE("simple poly range - first element",
-   aRange.getElement(0).head == B2DRange(0,0,1,1));
+   std::get<0>(aRange.getElement(0)) == 
B2DRange(0,0,1,1));
 CPPUNIT_ASSERT_MESSAGE("simple poly range - second element",
-   aRange.getElement(1).head == B2DRange(2,2,3,3));
+   std::get<0>(aRange.getElement(1)) == 
B2DRange(2,2,3,3));
 
 // B2DPolyRange relies on correctly orientated rects
 const B2DRange aRect(0,0,1,1);
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 696e86c..c7ff411 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -352,9 +352,8 @@ public:
 const sal_uInt32 nCount=rRange.count();
 for( sal_uInt32 i=0; i(rRange.getElement(i)));
+if( std::get<1>(rRange.getElement(i)) == ORIENTATION_NEGATIVE )
 aRect.flip();
 
 genericClip.append(aRect);
diff --git a/include/basegfx/range/b2dpolyrange.hxx 
b/include/basegfx/range/b2dpolyrange.hxx
index f33b354..f3494c1 100644
--- a/include/basegfx/range/b2dpolyrange.hxx
+++ b/include/basegfx/range/b2dpolyrange.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_BASEGFX_RANGE_B2DPOLYRANGE_HXX
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -51,7 +51,7 @@ namespace basegfx
 class BASEGFX_DLLPUBLIC B2DPolyRange
 {
 public:
-typedef boost::tuple ElementType ;
+typedef std::tuple ElementType;
 
 B2DPolyRange();
 ~B2DPolyRange();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: help needed: hsqldb shutdown race condition, how to fix without deadlock

2015-06-02 Thread Lionel Elie Mamane

On Tue, Jun 02, 2015 at 03:12:51PM +0200, Noel Grandin wrote:
> On 2015-06-02 03:07 PM, Lionel Elie Mamane wrote:
>> I found a race condition between

>> 1) connectivity::hsqldb::ODriverDelegator::flushConnections()
>> (in file connectivity/source/drivers/hsqldb/HDriver.cxx around line 620)
>> walking over m_aConnections

>> 2) connectivity::hsqldb::ODriverDelegator::disposing()
>> (same file around line 565)
>> calling

>>  m_aConnections.clear();
>>  TWeakPairVector().swap(m_aConnections);

>> which invalidates the iterators used by flushConnection()

>> Plus also probably, race condition between flushConnections() calling
>> flush() and disposing() disposing the underlying connection (although
>> this is probably handled correctly by the exception catching...).

> I would suggest something like this in ODriverDelegator::flushConnections():

> take_mutex();
> std::vector tmp = m_aConnections;
> release_mutex();
> for (Connection conn : tmp)
> conn.flush();

> so that the mutex is not held during the problematic phase

That makes sense. Will try that. Thanks!

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

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

2015-06-02 Thread umairshahid

 dbaccess/source/ui/dlg/AutoControls.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6e7dcb34322de4701c1cac4e87dc3b681c1dac4
Author: umairshahid 
Date:   Fri May 29 18:13:41 2015 +0500

A small hint on how to specify the database URL should be helpful to users

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

diff --git a/dbaccess/source/ui/dlg/AutoControls.src 
b/dbaccess/source/ui/dlg/AutoControls.src
index 7e56864..5b0b968 100644
--- a/dbaccess/source/ui/dlg/AutoControls.src
+++ b/dbaccess/source/ui/dlg/AutoControls.src
@@ -61,7 +61,7 @@ String STR_NO_ADDITIONAL_SETTINGS
 
 String STR_COMMONURL
 {
-Text [ en-US ] = "Datasource URL" ;
+Text [ en-US ] = "Datasource URL (e.g. postgresql://host:port/database)" ;
 };
 
 String STR_HOSTNAME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Lionel Elie Mamane

 connectivity/source/drivers/hsqldb/HDriver.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f4fc81b0b3f90523e485946546bdd83f85e249f7
Author: Lionel Elie Mamane 
Date:   Tue Jun 2 13:27:15 2015 +0200

hsqldb flush: protect against weak ref having expired

Change-Id: I5967271c1c154ab4cfd30d3812183ea2a6b7

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 4728f85..87eb271 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -619,7 +619,8 @@ namespace connectivity
 try
 {
 Reference 
xCon(i->second.second.first.get(),UNO_QUERY);
-xCon->flush();
+if (xCon.is())
+xCon->flush();
 }
 catch(Exception&)
 {
commit 63314e5114ecd32246e0dbcd3054d37f612fb407
Author: Lionel Elie Mamane 
Date:   Tue Jun 2 13:30:19 2015 +0200

more debugging information

Change-Id: I9bb95b80e0e85573a09b8ad7233c6543fccae032

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index e52f95c..4728f85 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -53,6 +53,7 @@
 #include "resource/hsqldb_res.hrc"
 #include "resource/sharedresources.hxx"
 #include 
+#include 
 
 #include 
 
@@ -622,6 +623,7 @@ namespace connectivity
 }
 catch(Exception&)
 {
+DBG_UNHANDLED_EXCEPTION();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: help needed: hsqldb shutdown race condition, how to fix without deadlock

2015-06-02 Thread Noel Grandin




On 2015-06-02 03:07 PM, Lionel Elie Mamane wrote:

Hi,

I found a race condition between

1) connectivity::hsqldb::ODriverDelegator::flushConnections()
(in file connectivity/source/drivers/hsqldb/HDriver.cxx around line 620)
walking over m_aConnections

2) connectivity::hsqldb::ODriverDelegator::disposing()
(same file around line 565)
calling

 m_aConnections.clear();
 TWeakPairVector().swap(m_aConnections);

which invalidates the iterators used by flushConnection()

Plus also probably, race condition between flushConnections() calling
flush() and disposing() disposing the underlying connection (although
this is probably handled correctly by the exception catching...).



I would suggest something like this in ODriverDelegator::flushConnections():

take_mutex();
std::vector tmp = m_aConnections;
release_mutex();
for (Connection conn : tmp)
conn.flush();

so that the mutex is not held during the problematic phase
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-06-02 Thread Noel Grandin

 sw/source/core/doc/DocumentRedlineManager.cxx |6 +++---
 sw/source/core/doc/dbgoutsw.cxx   |2 +-
 sw/source/core/doc/tblrwcl.cxx|2 +-
 sw/source/core/txtnode/ndhints.cxx|2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5b87ff40857147bee697a9bf420aae89e8cd9e93
Author: Noel Grandin 
Date:   Tue Jun 2 15:07:05 2015 +0200

loplugin:loopvartoosmall

Change-Id: Ieac705a950237ad52a3768f7b7fff5807c6dbb47

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 02dcdf8..1bd8776 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -72,10 +72,10 @@ using namespace com::sun::star;
 const SwRedlineTable& rTable = redlineAccess.GetRedlineTable();
 
 // verify valid redline positions
-for( sal_uInt16 i = 0; i < rTable.size(); ++i )
+for( size_t i = 0; i < rTable.size(); ++i )
 lcl_CheckPam( rTable[ i ] );
 
-for( sal_uInt16 j = 0; j < rTable.size(); ++j )
+for( size_t j = 0; j < rTable.size(); ++j )
 {
 // check for empty redlines
 OSL_ENSURE( ( *(rTable[j]->GetPoint()) != 
*(rTable[j]->GetMark()) ) ||
@@ -84,7 +84,7 @@ using namespace com::sun::star;
  }
 
 // verify proper redline sorting
-for( sal_uInt16 n = 1; n < rTable.size(); ++n )
+for( size_t n = 1; n < rTable.size(); ++n )
 {
 const SwRangeRedline* pPrev = rTable[ n-1 ];
 const SwRangeRedline* pCurrent = rTable[ n ];
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 50afa2e..d88be7b 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -797,7 +797,7 @@ static OUString lcl_dbg_out(SwOutlineNodes & rNodes)
 {
 OUString aStr("[\n");
 
-for (sal_uInt16 i = 0; i < rNodes.size(); i++)
+for (size_t i = 0; i < rNodes.size(); i++)
 {
 aStr += lcl_dbg_out(*rNodes[i]);
 aStr += "\n";
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index cfec58e..9419d27 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -173,7 +173,7 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, 
CR_SetBoxWidth&, SwTwips, bool
 
 #define CHECKTABLELAYOUT\
 {   \
-for ( sal_uInt16 i = 0; i < GetTabLines().size(); ++i )\
+for ( size_t i = 0; i < GetTabLines().size(); ++i )\
 {   \
 SwFrameFormat* pFormat = GetTabLines()[i]->GetFrameFormat();  \
 SwIterator aIter( *pFormat );  \
diff --git a/sw/source/core/txtnode/ndhints.cxx 
b/sw/source/core/txtnode/ndhints.cxx
index cb31243..24f52d8 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -359,7 +359,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
 // 10) dummy char check (unfortunately cannot check SwTextNode::m_Text)
 if (pHtThis->HasDummyChar())
 {
-for ( sal_uInt16 j = 0; j < i; ++j )
+for ( size_t j = 0; j < i; ++j )
 {
 SwTextAttr const * const pOther( m_HintStarts[j] );
 if (pOther->HasDummyChar())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Miklos Vajna

 sw/inc/viscrs.hxx  |2 +-
 sw/source/core/crsr/viscrs.cxx |   29 ++---
 2 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 2d17cd6b03a214393755ddfed5ba50a18f0cd774
Author: Miklos Vajna 
Date:   Tue Jun 2 14:47:21 2015 +0200

sw: LOK_CALLBACK_TEXT_SELECTION should be the union of all selections

E.g. if searching for a keyword and it's inside a text frame, then we
have two cursors: one is an empty selection at the anchor point, and the
other is the real selection. What happened is that we emitted two events
for the two cursors, instead of merging them together.

Fix the problem by not emitting the events in SwSelPaintRects::Show(),
instead do it at once in SwShellCrsr::Show().

Change-Id: Ie2c7691aaaea7ba8a32b5cfa718a45cba571f791

diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index a15dbd3..159fb2f 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -96,7 +96,7 @@ public:
 // make a complete swap access to m_pCursorOverlay is needed there
 void swapContent(SwSelPaintRects& rSwap);
 
-void Show();
+void Show(std::vector* pSelectionRectangles = 0);
 void Hide();
 void Invalidate( const SwRect& rRect );
 
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 38e6ef8..c3d591c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -280,7 +280,7 @@ void SwShellCrsr::FillStartEnd(SwRect& rStart, SwRect& 
rEnd) const
 rEnd = lcl_getLayoutRect(pCursor->GetEndPos(), *pCursor->End());
 }
 
-void SwSelPaintRects::Show()
+void SwSelPaintRects::Show(std::vector* pSelectionRectangles)
 {
 SdrView *const pView = const_cast(m_pCursorShell->GetDrawView());
 
@@ -379,7 +379,10 @@ void SwSelPaintRects::Show()
 ss << rRect.SVRect().toString().getStr();
 }
 OString sRect = ss.str().c_str();
-GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
sRect.getStr());
+if (!pSelectionRectangles)
+
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, sRect.getStr());
+else
+pSelectionRectangles->push_back(sRect);
 }
 }
 }
@@ -566,11 +569,31 @@ void SwShellCrsr::FillRects()
 
 void SwShellCrsr::Show()
 {
+std::vector aSelectionRectangles;
 for(SwPaM& rPaM : GetRingContainer())
 {
 SwShellCrsr* pShCrsr = dynamic_cast(&rPaM);
 if(pShCrsr)
-pShCrsr->SwSelPaintRects::Show();
+pShCrsr->SwSelPaintRects::Show(&aSelectionRectangles);
+}
+
+if (GetShell()->isTiledRendering())
+{
+std::stringstream ss;
+bool bFirst = true;
+for (size_t i = 0; i < aSelectionRectangles.size(); ++i)
+{
+const OString& rSelectionRectangle = aSelectionRectangles[i];
+if (rSelectionRectangle.isEmpty())
+continue;
+if (bFirst)
+bFirst = false;
+else
+ss << "; ";
+ss << rSelectionRectangle.getStr();
+}
+OString sRect = ss.str().c_str();
+GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
sRect.getStr());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/unitver' - config_host.mk.in configure.ac external/udunits2 RepositoryExternal.mk sc/CppunitTest_sc_ucalc.mk sc/CppunitTest_sc_units.mk sc/Library_sc.mk

2015-06-02 Thread Andrzej Hunt

 RepositoryExternal.mk |   11 +++---
 config_host.mk.in |3 +
 configure.ac  |   46 ++
 external/udunits2/ExternalProject_udunits2.mk |5 ++
 sc/CppunitTest_sc_ucalc.mk|2 -
 sc/CppunitTest_sc_units.mk|2 -
 sc/Library_sc.mk  |2 -
 sc/source/core/units/unitsimpl.cxx|2 -
 sc/source/core/units/unitsimpl.hxx|2 -
 sc/source/core/units/util.cxx |2 -
 sc/source/core/units/utunit.hxx   |2 -
 11 files changed, 33 insertions(+), 46 deletions(-)

New commits:
commit d54cb9df9c81a0cc0d66b34eeb24ca163b1b0da6
Author: Andrzej Hunt 
Date:   Tue Jun 2 13:53:55 2015 +0100

Enable --with-system-udunits2

We also have to move udunits2 headers to match the default system
installation location of ududnits2/udunits2.h (whereas udunits2 bundled
build puts the headers in lib/udunits2.h by default).

Change-Id: I1d314f6b3e016f90cfb8e19a143bb77ae98e7734

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0bfc8bb..2f633bd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -151,18 +151,21 @@ ifeq ($(ENABLE_CALC_UNITVERIFICATION),TRUE)
 
 ifneq ($(SYSTEM_UDUNITS2),)
 
-define gb_LinkTarget__use_libudunits2
+define gb_LinkTarget__use_udunits2
+$(call gb_LinkTarget_add_defs,$(1),\
+   -DSYSTEM_UDUNITS2 \
+)
 $(call gb_LinkTarget_set_include,$(1),\
$(UDUNITS2_CFLAGS) \
$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),$(UDUNIT2_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),$(UDUNITS2_LIBS))
 
 endef
 
 else # !SYSTEM_UDUNITS2
 
-define gb_LinkTarget__use_libudunits2
+define gb_LinkTarget__use_udunits2
 $(call gb_LinkTarget_use_package,$(1),udunits2)
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
@@ -184,7 +187,7 @@ endif # !SYSTEM_UDUNITS2
 
 else # !ENABLE_CALC_UNITVERIFICATION
 
-gb_LinkTarget__use_libudunits2 :=
+gb_LinkTarget__use_udunits2 :=
 
 endif # ENABLE_CALC_UNITVERIFICATION
 
diff --git a/config_host.mk.in b/config_host.mk.in
index 3e129c9..6f18d07 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -179,6 +179,9 @@ export ENABLE_TDE=@ENABLE_TDE@
 export ENABLE_TDEAB=@ENABLE_TDEAB@
 export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
 export ENABLE_CALC_UNITVERIFICATION=@ENABLE_CALC_UNITVERIFICATION@
+export SYSTEM_UDUNITS2=@SYSTEM_UDUNITS2@
+export UDUNITS2_CFLAGS=@UDUNITS2_CFLAGS@
+export UDUNITS2_LIBS=@UDUNITS2_LIBS@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export ENABLE_VLC=@ENABLE_VLC@
 export ENABLE_WERROR=@ENABLE_WERROR@
diff --git a/configure.ac b/configure.ac
index d363ac5..e273f0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1693,7 +1693,7 @@ AC_ARG_WITH(system-firebird,
 
 AC_ARG_WITH(system-udunits2,
 AS_HELP_STRING([--with-system-udunits2],
-[Use udunits libraries already on system, for building calc 
unit-verification it.]),,
+[Use udunits libraries already on system, for building calc 
unit-verification with it.]),,
 [with_system_udunits2="$with_system_libs"])
 
 AC_ARG_WITH(system-hsqldb,
@@ -8643,48 +8643,26 @@ if test "x$enable_calc_unitverification" = "xyes"; then
 if test "$with_system_udunits2" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_UDUNITS2=TRUE
-AC_PATH_PROG(FIREBIRDCONFIG, [fb_config])
-if test -z "$FIREBIRDCONFIG"; then
-AC_MSG_NOTICE([No fb_config -- using pkg-config])
-PKG_CHECK_MODULES(FIREBIRD, fbembed)
-FIREBIRD_VERSION=`pkg-config --modversion fbembed`
-else
-AC_MSG_NOTICE([fb_config found])
-FIREBIRD_VERSION=`$FIREBIRDCONFIG --version`
-AC_MSG_CHECKING([for Firebird Client library])
-FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags`
-FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs`
-fi
-AC_MSG_RESULT([includes `$FIREBIRD_CFLAGS', libraries 
`$FIREBIRD_LIBS'])
-AC_MSG_CHECKING([Firebird version])
-if test -n "${FIREBIRD_VERSION}"; then
-FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
-FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
-if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; 
then
-AC_MSG_RESULT([OK])
-else
-AC_MSG_ERROR([Ensure firebird 2.5.x is installed])
-fi
-else
-__save_CFLAGS="${CFLAGS}"
-CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include 
-#if defined(FB_API_VER) && FB_API_VER == 25
-#else
-#error "Wrong Firebird API version"
-#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x is 
installed]))
-CFLAGS="${__save_CFLAGS}"
+
+PKG_CHECK_MODULES(UDUNITS2, udunits >= 2.2.1, UDUNITS2_PKGCONFIG=yes, 
UDUNITS2_PKGCONFIG

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

2015-06-02 Thread Caolán McNamara

 vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2015-0848-1.wmf |binary
 1 file changed

New commits:
commit d524f3a895af04b7b359468f1e743409b2e553b5
Author: CaolÃ¡n McNamara 
Date:   Tue Jun 2 12:00:24 2015 +0100

add testcase for CVE-2015-0848

Change-Id: Id49cbc139a39a18cd3965413fc06cc14961747e7

diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2015-0848-1.wmf 
b/vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2015-0848-1.wmf
new file mode 100644
index 000..1512a22
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2015-0848-1.wmf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: URP: queryInterface request message with unknown OID received

2015-06-02 Thread Lionel Elie Mamane

On Mon, Jun 01, 2015 at 11:54:05AM +0200, Lionel Elie Mamane wrote:
> On Mon, Jun 01, 2015 at 09:55:19AM +0200, Stephan Bergmann wrote:
> > On 06/01/2015 09:48 AM, Lionel Elie Mamane wrote:

>>> Interesting... I got that error on my machine, I made some changes,
>>> and then didn't get it on three consecutive "make 
>>> JunitTest_dbaccess_complex"
>>> so I thought it gone. The operative part is

>>>Caught UNO exception 'URP: queryInterface request message with unknown 
>>> OID received'

>>> Anybody has a clue what this is about?

>> The UNO remote protocol represents each UNO object with a unique OID string.
>> The error means that one end of a remote connection sent a queryInterface
>> request with a OID representing an object that the other end claims it does
>> not know about.  Which sounds like a scary bug somewhere.  Any way to
>> reproduce that?

> It seems to be linked to the *number* *of* *tests* in
> dbaccess/qa/complex/dbaccess/RowSet.java

> I never got it when I commented out any one of the "@Test" there.

Well, I ran it many other times (on another machine), and it is
definitely happens with some (even several) "@Test" commented out, and
even in the absence of the "uncaught exception from other thread"
phenomenon. The magic mix seems to be having at least both
testRowSet() and testRowSetEvents() active.

The exact moment where it happens varies. With the attached patch, I
get it about one out of two times. It seems to happen more often if
you uncomment more "@Test".

So, if you would like to work on that (which would make me happier),
then apply the attached patch, then:
 make JunitTest_dbaccess_complex
several times in a row, and you should get the problem. If not, try
uncommenting more "@Test" instances.

It is *not* related per se to the multithreaded test, it happens even
if that test is disabled.

Thanks in advance!

-- 
Lionel Mamane
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index e3f2c00..913d7aa 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -25,8 +25,7 @@ $(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
 ))
 
 $(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\
-complex.dbaccess.Beamer \
-complex.dbaccess.PropertyBag \
+	complex.dbaccess.RowSet \
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index 2763ac3..33c69c7 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -208,23 +208,31 @@ public class RowSet extends TestCase
 System.out.println("testing testRowSet");
 createTestCase(true);
 
+System.out.println("testing testRowSet sequential");
 // sequential positioning
 m_resultSet.beforeFirst();
 testSequentialPositining(m_resultSet, m_row);
 
+System.out.println("testing testRowSet absolute");
 // absolute positioning
 testAbsolutePositioning(m_resultSet, m_row);
 
+System.out.println("testing testRowSet modify");
 // position during modify
 testModifyPosition(m_resultSet, m_row);
 
+System.out.println("testing testRowSet 3rd");
 // 3rd test
 test3(createClone(), m_resultSet);
+System.out.println("testing testRowSet 4th");
 // 4th test
 test4(m_resultSet);
+System.out.println("finished testing testRowSet 4th");
 
+// System.out.println("testing testRowSet concurrent");
 // concurrent (multi threaded) access to the row set and its clones
-testConcurrentAccess(m_resultSet);
+// testConcurrentAccess(m_resultSet);
+// System.out.println("finished testRowSet concurrent");
 }
 
 
@@ -623,7 +631,7 @@ public class RowSet extends TestCase
 }
 
 
-@Test
+// @Test
 public void testDeleteBehavior() throws Exception
 {
 createTestCase(true);
@@ -757,7 +765,7 @@ public class RowSet extends TestCase
 /** checks whether deletions on the main RowSet properly interfere (or don't interfere) with the movement
  *  on a clone of the RowSet
  */
-@Test
+// @Test
 public void testCloneMovesPlusDeletions() throws SQLException, UnknownPropertyException, WrappedTargetException
 {
 createTestCase(true);
@@ -826,7 +834,7 @@ public class RowSet extends TestCase
 /** checks whether insertions on the main RowSet properly interfere (or don't interfere) with the movement
  *  on a clone of the RowSet
  */
-@Test
+// @Test
 public void testCloneMovesPlusInsertions() throws SQLException, UnknownPropertyException, WrappedTargetException, PropertyVetoException, com.sun.star.lang.IllegalArgumentException
 {
 createTestCase(true);
@@ -1012,7 +1020,7 @@ public class RowSet extends TestCase
 
 /** checks the XParametersSupplier function

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Robert Antoni Buj i Gelonch

Ok, thanks for the info.

2015-06-02 14:06 GMT+02:00 julien2412 :

> Robert Antoni wrote
> > OK, I'm going to build a debug build from scratch.
>
> Just for information, you may encounter
> https://bugs.documentfoundation.org/show_bug.cgi?id=90502 which has
> prevented me to build a full "enable-dbg-util build" on MacOs since weeks.
> However, if it's the case, you may also disable this test temporarily
>
> Julien
>
>
>
>
> --
> View this message in context:
> http://nabble.documentfoundation.org/About-skip-SkipImages-unit-test-on-MacOs-tp4149788p4150306.html
> Sent from the Dev mailing list archive at Nabble.com.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>



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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/uiconfig

2015-06-02 Thread Adolfo Jayme Barrientos

 sfx2/uiconfig/ui/documentinfopage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 665da4646f1f58a663710e2a250904b42b5cff03
Author: Adolfo Jayme Barrientos 
Date:   Tue Jun 2 07:21:56 2015 -0500

tdf#88178 Avoid naming two distinct buttons the sameâ¦

â¦ when these are in the same screen.

Change-Id: I4e162a485f4511ae3e008446d5712562562ed64f
(cherry picked from commit e96adee1feadb2ba6a6e4aba22cab34aeccc7a31)

diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index 7d75d8a..4697207 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -217,7 +217,7 @@
 
 
   
-Reset
+Reset Properties
 False
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Adolfo Jayme Barrientos

 sfx2/uiconfig/ui/documentinfopage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e96adee1feadb2ba6a6e4aba22cab34aeccc7a31
Author: Adolfo Jayme Barrientos 
Date:   Tue Jun 2 07:21:56 2015 -0500

tdf#88178 Avoid naming two distinct buttons the sameâ¦

â¦ when these are in the same screen.

Change-Id: I4e162a485f4511ae3e008446d5712562562ed64f

diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index 7d75d8a..4697207 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -217,7 +217,7 @@
 
 
   
-Reset
+Reset Properties
 False
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread julien2412

Robert Antoni wrote
> OK, I'm going to build a debug build from scratch.

Just for information, you may encounter
https://bugs.documentfoundation.org/show_bug.cgi?id=90502 which has
prevented me to build a full "enable-dbg-util build" on MacOs since weeks.
However, if it's the case, you may also disable this test temporarily

Julien




--
View this message in context: 
http://nabble.documentfoundation.org/About-skip-SkipImages-unit-test-on-MacOs-tp4149788p4150306.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/unitver' - 3 commits - external/udunits2 sc/inc sc/qa sc/source

2015-06-02 Thread Andrzej Hunt

 external/udunits2/ExternalPackage_udunits2.mk |2 -
 sc/inc/units.hxx  |2 -
 sc/qa/unit/units.cxx  |   24 ++--
 sc/source/core/units/unitsimpl.cxx|   50 +-
 sc/source/core/units/unitsimpl.hxx|9 
 sc/source/ui/view/viewfunc.cxx|2 -
 6 files changed, 41 insertions(+), 48 deletions(-)

New commits:
commit 5e1cd739dc61755cce62655a38a46004ba5192c7
Author: Andrzej Hunt 
Date:   Tue Jun 2 12:34:16 2015 +0100

Enable udunits2 on OSX

My original guess of library was wrong, other than that no special
treatment is needed for the OSX build.

Change-Id: I2a697c65a6e272bfa3f8070a85b4bbd8b01b5e23

diff --git a/external/udunits2/ExternalPackage_udunits2.mk 
b/external/udunits2/ExternalPackage_udunits2.mk
index 4073463..3ac5920 100644
--- a/external/udunits2/ExternalPackage_udunits2.mk
+++ b/external/udunits2/ExternalPackage_udunits2.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,udunits2,udunits2))
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call 
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/iudunits2.dll,lib/.libs/iudunits2.dll))
 else ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.dylib,lib/.libs/libudunits2.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.0.dylib,lib/.libs/libudunits2.0.dylib))
 else
 $(eval $(call 
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.so,lib/.libs/libudunits2.so))
 $(eval $(call 
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.so.0,lib/.libs/libudunits2.so.0))
commit 17f1869709f1ae8a7cfce11ec5b55f585ddab5b7
Author: Andrzej Hunt 
Date:   Mon Jun 1 22:12:54 2015 +0100

Rename VERIFIED->VALID for formula status.

Change-Id: I93a07e11546ebecf912449c72e57404731c346e9

diff --git a/sc/inc/units.hxx b/sc/inc/units.hxx
index 411fb84..1e0c5ea 100644
--- a/sc/inc/units.hxx
+++ b/sc/inc/units.hxx
@@ -45,7 +45,7 @@ struct RangeUnits {
  * is used).
  */
 enum class FormulaStatus {
-VERIFIED,
+VALID,
 UNKNOWN,
 ERROR_INPUT_SCALING,
 ERROR_INPUT_INCOMPATIBLE,
diff --git a/sc/qa/unit/units.cxx b/sc/qa/unit/units.cxx
index e2ad7cc..1dbf74f 100644
--- a/sc/qa/unit/units.cxx
+++ b/sc/qa/unit/units.cxx
@@ -221,7 +221,7 @@ void UnitsTest::testUnitVerification() {
 mpDoc->SetFormula(address, "=A1+A2");
 pCell = mpDoc->GetFormulaCell(address);
 pTokens = pCell->GetCode();
-CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VERIFIED);
+CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VALID);
 
 // Test that addition of different units fails - incompatible types
 address = ScAddress(0, 6, 0);
@@ -235,14 +235,14 @@ void UnitsTest::testUnitVerification() {
 mpDoc->SetFormula(address, "=A1*B1+A2*B2");
 pCell = mpDoc->GetFormulaCell(address);
 pTokens = pCell->GetCode();
-CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VERIFIED);
+CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VALID);
 
 // Test another combination (i.e. cm/s+'cm/s')
 address = ScAddress(0, 8, 0);
 mpDoc->SetFormula(address, "=A1/C1+D1");
 pCell = mpDoc->GetFormulaCell(address);
 pTokens = pCell->GetCode();
-CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VERIFIED);
+CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VALID);
 
 // Test that another combination fails (cm*kg/s+'cm/s')
 address = ScAddress(0, 9, 0);
@@ -256,7 +256,7 @@ void UnitsTest::testUnitVerification() {
 mpDoc->SetFormula(address, "=A1+100*E1");
 pCell = mpDoc->GetFormulaCell(address);
 pTokens = pCell->GetCode();
-CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VERIFIED);
+CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VALID);
 // 10cm + 100*1m = 110cm
 CPPUNIT_ASSERT_EQUAL(mpDoc->GetValue(address), 110.0);
 
@@ -287,7 +287,7 @@ void UnitsTest::testUnitVerification() {
 mpDoc->SetFormula(address, "=SUM(B1:B3)");
 pCell = mpDoc->GetFormulaCell(address);
 pTokens = pCell->GetCode();
-CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VERIFIED);
+CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, mpDoc) == 
FormulaStatus::VALID);
 
 // SUM("cm"&"kg")
 address.IncRow();
@@ -315,14 +315,14 @@ void UnitsTest::testUnitVerification() {
 mpDoc->SetFormula(address, "=SUM(A1:A3)/SUM(C1:C3)+SUM(D1:D3)");
 pCell = mpDoc->GetFormulaCell(address);
 pTokens = pCell->GetCode();
-CPPUNIT_ASSERT(mpUnitsImpl->verifyFormula(pTokens, address, m

[Libreoffice-commits] core.git: icon-themes/tango

2015-06-02 Thread Yousuf Philips

 icon-themes/tango/cmd/lc_outlinefont.png |binary
 icon-themes/tango/cmd/sc_outlinefont.png |binary
 2 files changed

New commits:
commit 614759eac67865b41e893711b4d1d3d108aefad0
Author: Yousuf Philips 
Date:   Tue Jun 2 13:49:48 2015 +0400

TANGO: Minor fixes to font outline icons

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

diff --git a/icon-themes/tango/cmd/lc_outlinefont.png 
b/icon-themes/tango/cmd/lc_outlinefont.png
index 0280fd6..e25584b 100644
Binary files a/icon-themes/tango/cmd/lc_outlinefont.png and 
b/icon-themes/tango/cmd/lc_outlinefont.png differ
diff --git a/icon-themes/tango/cmd/sc_outlinefont.png 
b/icon-themes/tango/cmd/sc_outlinefont.png
index 332255e..92b2307 100644
Binary files a/icon-themes/tango/cmd/sc_outlinefont.png and 
b/icon-themes/tango/cmd/sc_outlinefont.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Stephan Bergmann

 include/sal/detail/log.h |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f749a970e2927ed703a5b7c70e393b5ba6c35e22
Author: Stephan Bergmann 
Date:   Tue Jun 2 12:53:36 2015 +0200

Remove obsolete comment

...that should have been removed as part of
7196df7ac616be39689f21d8784fd78030868586 "tdf#43157: Enable format check in
sal_detail_logFormat"

Change-Id: I331359bfa0e7c678f662f3de63257ccc0b528484

diff --git a/include/sal/detail/log.h b/include/sal/detail/log.h
index 8dee501..3a1dce7 100644
--- a/include/sal/detail/log.h
+++ b/include/sal/detail/log.h
@@ -59,7 +59,6 @@ enum sal_detail_LogLevel {
 SAL_DLLPUBLIC void SAL_CALL sal_detail_logFormat(
 enum sal_detail_LogLevel level, char const * area, char const * where,
 char const * format, ...)
-/* TODO: enabling this will produce a huge amount of -Werror=format errors: */
 #if defined __GNUC__
 __attribute__((format(printf, 4, 5)))
 #endif
___
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' - sw/source

2015-06-02 Thread Philippe Jung

 sw/source/uibase/uiview/viewmdi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 260a4a63d16a01842b50a15e51e08590dbbb75a4
Author: Philippe Jung 
Date:   Thu May 28 17:44:03 2015 +0200

tdf#91592 WRITER crashes when navigating through comments

without rSh.EnterStdMode, the image is selected and it has no GetTextNode.

Change-Id: I91ed5a1ed002a04919042f4df22c49d3189daccd
Reviewed-on: https://gerrit.libreoffice.org/15952
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 4826007f0e09160ffdb592d10b65eb262ada18c8)
Reviewed-on: https://gerrit.libreoffice.org/16031

diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index e875d56..03925bb 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -423,6 +423,7 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
 
 case NID_POSTIT:
 {
+rSh.EnterStdMode();
 sw::sidebarwindows::SwSidebarWin* pPostIt = 
GetPostItMgr()->GetActiveSidebarWin();
 if (pPostIt)
 GetPostItMgr()->SetActiveSidebarWin(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' - include/tools

2015-06-02 Thread Takeshi Abe

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

New commits:
commit 250bc8fbd089d2f02d45bc2e4e5784de38f640c6
Author: Takeshi Abe 
Date:   Mon Jun 1 20:18:36 2015 +0900

Fix a wrong bit mask for StreamMode

... introduced at 7f8f277b94704a289fbbd1b836e4e5d66311580d

Change-Id: Ic9e2f6f5e01652744011a7e8a5f69f386efd6b52
Reviewed-on: https://gerrit.libreoffice.org/16015
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit 8d46bc15e93687f93d7c85064acc71231e2f08b1)
Reviewed-on: https://gerrit.libreoffice.org/16024
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 4e022cad..75d7445c 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -58,7 +58,7 @@ enum class StreamMode {
 };
 namespace o3tl
 {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
 }
 
 #define STREAM_READWRITEBITS(StreamMode::READ | StreamMode::WRITE 
| \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Stephan Bergmann

 sc/source/core/tool/callform.cxx |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit f8421bdef4ec4a02b62a3afc00d59dd11b801b51
Author: Stephan Bergmann 
Date:   Tue Jun 2 12:33:30 2015 +0200

No need for an intermediate FARPROC here

Change-Id: I601040a142d7a1d946a7141ae48981790eb3f305

diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 2b941ac..bc0bcb3 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -63,8 +63,6 @@ typedef void (CALLTYPE* Advice)  ( sal_uInt16&  nNo,
AdvData& pfCallback );
 typedef void (CALLTYPE* Unadvice)( double&  nHandle );
 
-typedef void (CALLTYPE* FARPROC) ( void );
-
 }
 
 #ifndef DISABLE_DYNLOADING
@@ -176,13 +174,13 @@ bool InitExternalFunc(const OUString& rModuleName)
 osl::Module* pLib = new osl::Module( aNP );
 if (pLib->is())
 {
-FARPROC fpGetCount = 
reinterpret_cast(pLib->getFunctionSymbol(GETFUNCTIONCOUNT));
-FARPROC fpGetData = 
reinterpret_cast(pLib->getFunctionSymbol(GETFUNCTIONDATA));
+oslGenericFunction fpGetCount = 
pLib->getFunctionSymbol(GETFUNCTIONCOUNT);
+oslGenericFunction fpGetData = 
pLib->getFunctionSymbol(GETFUNCTIONDATA);
 if ((fpGetCount != NULL) && (fpGetData != NULL))
 {
-FARPROC fpIsAsync = 
reinterpret_cast(pLib->getFunctionSymbol(ISASYNC));
-FARPROC fpAdvice = 
reinterpret_cast(pLib->getFunctionSymbol(ADVICE));
-FARPROC fpSetLanguage = 
reinterpret_cast(pLib->getFunctionSymbol(SETLANGUAGE));
+oslGenericFunction fpIsAsync = pLib->getFunctionSymbol(ISASYNC);
+oslGenericFunction fpAdvice = pLib->getFunctionSymbol(ADVICE);
+oslGenericFunction fpSetLanguage = 
pLib->getFunctionSymbol(SETLANGUAGE);
 if ( fpSetLanguage )
 {
 LanguageType eLanguage = 
Application::GetSettings().GetUILanguageTag().getLanguageType();
@@ -257,7 +255,7 @@ bool FuncData::Call(void** ppParam) const
 #else
 bool bRet = false;
 osl::Module* pLib = pModuleData->GetInstance();
-FARPROC fProc = 
reinterpret_cast(pLib->getFunctionSymbol(aFuncName));
+oslGenericFunction fProc = pLib->getFunctionSymbol(aFuncName);
 if (fProc != NULL)
 {
 switch (nParamCount)
@@ -355,7 +353,7 @@ bool FuncData::Unadvice( double nHandle )
 #else
 bool bRet = false;
 osl::Module* pLib = pModuleData->GetInstance();
-FARPROC fProc = 
reinterpret_cast(pLib->getFunctionSymbol(UNADVICE));
+oslGenericFunction fProc = pLib->getFunctionSymbol(UNADVICE);
 if (fProc != NULL)
 {
 reinterpret_cast< ::Unadvice>(fProc)(nHandle);
@@ -382,7 +380,7 @@ bool FuncData::getParamDesc( OUString& aName, OUString& 
aDesc, sal_uInt16 nParam
 if ( nParam <= nParamCount )
 {
 osl::Module* pLib = pModuleData->GetInstance();
-FARPROC fProc = 
reinterpret_cast(pLib->getFunctionSymbol(GETPARAMDESC));
+oslGenericFunction fProc = pLib->getFunctionSymbol(GETPARAMDESC);
 if ( fProc != NULL )
 {
 sal_Char pcName[256];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang pyuno/source reportdesign/source sc/source sdext/source sd/source vcl/unx vcl/workben xmlhelp/source

2015-06-02 Thread Noel Grandin

 compilerplugins/clang/loopvartoosmall.cxx  |2 +-
 pyuno/source/module/pyuno_runtime.cxx  |2 +-
 reportdesign/source/ui/misc/FunctionHelper.cxx |2 +-
 sc/source/ui/dbgui/pvfundlg.cxx|2 +-
 sc/source/ui/optdlg/opredlin.cxx   |2 +-
 sc/source/ui/optdlg/tpusrlst.cxx   |2 +-
 sc/source/ui/optdlg/tpview.cxx |2 +-
 sd/source/ui/dlg/PhotoAlbumDialog.cxx  |2 +-
 sdext/source/pdfimport/tree/style.cxx  |4 ++--
 sdext/source/pdfimport/tree/style.hxx  |4 ++--
 vcl/unx/generic/app/saldisp.cxx|6 +++---
 vcl/unx/generic/app/wmadaptor.cxx  |8 
 vcl/unx/generic/dtrans/X11_selection.cxx   |2 +-
 vcl/unx/generic/dtrans/bmp.cxx |2 +-
 vcl/unx/generic/window/salframe.cxx|4 ++--
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx   |4 ++--
 vcl/unx/gtk/window/gtksalmenu.cxx  |4 ++--
 vcl/workben/vcldemo.cxx|4 ++--
 xmlhelp/source/treeview/tvread.cxx |   10 +-
 19 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 6ef9f7e2025a2334034e9c8f7b340add4742
Author: Noel Grandin 
Date:   Fri May 29 14:12:20 2015 +0200

loplugin:loopvartoosmall

Change-Id: Ib4def3435eab4625645c5afe3b151f9f430564ac

diff --git a/compilerplugins/clang/loopvartoosmall.cxx 
b/compilerplugins/clang/loopvartoosmall.cxx
index adcc2c5..78fc47e 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -116,4 +116,4 @@ loplugin::Plugin::Registration< LoopVarTooSmall > 
X("loopvartoosmall", false);
 
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/pyuno/source/module/pyuno_runtime.cxx 
b/pyuno/source/module/pyuno_runtime.cxx
index 96bc9ae..4d31de1 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -723,7 +723,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum 
ConversionMode mode ) con
 else if (PyTuple_Check (o))
 {
 Sequence s (PyTuple_Size (o));
-for (int i = 0; i < PyTuple_Size (o); i++)
+for (Py_ssize_t i = 0; i < PyTuple_Size (o); i++)
 {
 s[i] = pyObject2Any (PyTuple_GetItem (o, i), mode );
 }
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx 
b/reportdesign/source/ui/misc/FunctionHelper.cxx
index ca7b5a2..2ce316a 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -191,7 +191,7 @@ OUString FunctionDescription::getFormula(const 
::std::vector< OUString >& _aArgu
 void 
FunctionDescription::fillVisibleArgumentMapping(::std::vector& 
_rArguments) const
 {
 const sal_Int32 nCount = m_aParameter.getLength();
-for(sal_uInt16 i = 0;i < nCount; ++i)
+for(sal_Int32 i = 0;i < nCount; ++i)
 {
 _rArguments.push_back(i);
 }
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 292a07e..d728f83 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -652,7 +652,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& 
rLabelData ) const
 
 rLabelData.maMembers = maLabelData.maMembers;
 sal_uLong nVisCount = m_pLbHide->GetEntryCount();
-for( sal_uInt16 nPos = 0; nPos < nVisCount; ++nPos )
+for( sal_uLong nPos = 0; nPos < nVisCount; ++nPos )
 rLabelData.maMembers[nPos].mbVisible = !m_pLbHide->IsChecked(nPos);
 
 // *** HIERARCHY ***
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 360836e..e2bea02 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -144,7 +144,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* 
rSet */ )
 m_pRemoveColorLB->SetUpdateMode( false);
 
 XColorListRef xColorLst = XColorList::GetStdColorList();
-for( sal_uInt16 i = 0; i < xColorLst->Count(); ++i )
+for( long i = 0; i < xColorLst->Count(); ++i )
 {
 XColorEntry* pEntry = xColorLst->GetColor( i );
 Color aColor = pEntry->GetColor();
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 0815c13..d1fab49 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -284,7 +284,7 @@ void ScTpUserLists::UpdateEntries( size_t nList )
 std::size_t nSubCount = pList->GetSubCount();
 OUString  aEntryListStr;
 
-for ( sal_uInt16 i=0; iSetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl));
 
-for ( sal_uInt16 i = 0; i < aUnitArr.Count(); ++i )
+for ( sal_uInt32 i = 0; i < aUnitArr.Count(); ++i )
 {
 OUString sMetric = aUnitArr.GetStringByPos( i );
 FieldUnit eFUnit = (FieldUnit)aUnitArr.GetValue( i );
diff --

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Robert Antoni Buj i Gelonch

OK, I'm going to build a debug build from scratch.

make distclean

./autogen.sh --enable-debug \
--with-vendor="Robert Buj Gelonch" \
--with-macosx-sdk=10.10 \
--with-macosx-version-min-required=10.10 \
--disable-gtk \
--enable-firebird-sdbc \
--enable-extension-integration \
--enable-ext-nlpsolver \
--enable-ext-wiki-publisher \
--with-help \
--with-myspell-dicts \
--enable-python=internal \
--enable-epm \
--with-package-format=dmg \
--with-external-tar=/Volumes/Data/Users/tb/external_tar \
--srcdir=/Volumes/Master/lo/core \
--enable-verbose \
--enable-dependency-tracking \
--disable-ccache \
--with-parallelism=2 \
--enable-bogus-pkg-config \
--disable-cve-tests \
--enable-odk \
--disable-online-update \
--without-system-odbc

make

2015-06-02 11:44 GMT+02:00 Stephan Bergmann :

> On 06/02/2015 11:36 AM, Robert Antoni Buj i Gelonch wrote:
>
>> (lldb) run
>>
>
> Just doing "run" in the debugger is not helpful here; rather, you need to
> break where the loadComponentFromURL call is made and step into that and
> hope you find the reason why it returns null before you get lost. (Or,
> alternatively, use a debug or dbgutil build and hope that there are some
> enlightening SAL_WARNs emitted along the way.)
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>



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

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Stephan Bergmann


On 06/02/2015 11:36 AM, Robert Antoni Buj i Gelonch wrote:

(lldb) run


Just doing "run" in the debugger is not helpful here; rather, you need 
to break where the loadComponentFromURL call is made and step into that 
and hope you find the reason why it returns null before you get lost. 
(Or, alternatively, use a debug or dbgutil build and hope that there are 
some enlightening SAL_WARNs emitted along the way.)

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

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Alexander Thurgood

Le 02/06/2015 10:04, Stephan Bergmann a écrit :

> 
> And right, on closer inspection of the CppunitTest output, the
> DisposedException (during tearDown) might be a red herring, and the
> truly relevant part is why loading
> sw/qa/extras/globalfilter/data/skipimages.docx fails in the first place.
> 
> * What happens if you try to load that skipimages.docx manually in LO?


Everything appears to load, apart from the EMF+ image, which displays a
blank frame.


I don't know how to do the steps mentioned in your second question.


Alex

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

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Robert Antoni Buj i Gelonch

By running
"/Volumes/Master/lo/core/instdir/LibreOfficeDev.app/Contents/MacOS/soffice
/Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx",
EMF+ image is not displayed, however LO is able to open skipimages.docx.


make CppunitTest_sw_globalfilter

/Applications/Xcode.app/Contents/Developer/usr/bin/make -j 2 -r -f
/Volumes/Master/lo/core/Makefile.gbuild CppunitTest_sw_globalfilter

[build CXX] unotest/source/cpp/macros_test.cxx

S=/Volumes/Master/lo/core && I=$S/instdir && W=$S/workdir &&  mkdir -p
$W/CxxObject/unotest/source/cpp/ $W/Dep/CxxObject/unotest/source/cpp/ && cd
/Volumes/Master/lo/core &&
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-m64  -stdlib=libc++ -mmacosx-version-min=10.10 -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
-DCPPU_ENV=gcc3 -DMACOSX -DMACOSX_SDK_VERSION=101000
-DMAC_OS_X_VERSION_MAX_ALLOWED=101000
-DMAC_OS_X_VERSION_MIN_REQUIRED=101000 -DNDEBUG -DNO_PTHREAD_PRIORITY
-DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DUNIX -DUNX -DX86_64 -D_PTHREADS
-D_REENTRANT   -DOOO_DLLIMPLEMENTATION_UNOTEST
-DHAVE_GCC_VISIBILITY_FEATURE -fvisibility=hidden   -Wall
-Wno-missing-braces -Wnon-virtual-dtor -Wendif-labels -Wextra -Wundef
-Wunused-macros -fmessage-length=0 -fno-common -pipe
-fvisibility-inlines-hidden -fstack-protector-strong -fPIC
-Woverloaded-virtual -Wshadow -Wno-ctor-dtor-privacy -fno-strict-aliasing
-fsigned-char -std=gnu++11  -DEXCEPTIONS_ON -fexceptions -O2
-DLIBO_INTERNAL_ONLY  -c $S/unotest/source/cpp/macros_test.cxx -o
$W/CxxObject/unotest/source/cpp/macros_test.o -MMD -MT
$W/CxxObject/unotest/source/cpp/macros_test.o -MP -MF
$W/Dep/CxxObject/unotest/source/cpp/macros_test.d_ -I$S/unotest/source/cpp/
-I$W/UnpackedTarball/cppunit/include -I$W/UnpackedTarball/boost
-I$S/include
-I/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/include
-I/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/include/darwin
-I$S/config_host  -I$W/UnoApiHeadersTarget/udkapi/normal
-I$W/UnoApiHeadersTarget/offapi/normal&& mv
$W/Dep/CxxObject/unotest/source/cpp/macros_test.d_
$W/Dep/CxxObject/unotest/source/cpp/macros_test.d

[build DEP] LNK:Library/libunotest.dylib

[build LNK] Library/libunotest.dylib

S=/Volumes/Master/lo/core && I=$S/instdir && W=$S/workdir &&  mkdir -p
$W/Dep/LinkTarget/Library/ &&
RESPONSEFILE=/var/folders/ln/gk5trbq569981lsbt6t3lgq4gr/T/gbuild..GsoBj3fu
&&
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"$I/LibreOfficeDev.app/Contents/Frameworks:$I/LibreOfficeDev.app/Contents/Frameworks"
  $W/LinkTarget/Executable/concat-deps ${RESPONSEFILE} >
$W/Dep/LinkTarget/Library/libunotest.dylib.d.tmp && rm -f ${RESPONSEFILE}

mv
/Volumes/Master/lo/core/workdir/Dep/LinkTarget/Library/libunotest.dylib.d.tmp
/Volumes/Master/lo/core/workdir/Dep/LinkTarget/Library/libunotest.dylib.d

S=/Volumes/Master/lo/core && I=$S/instdir && W=$S/workdir &&
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-m64  -stdlib=libc++ -mmacosx-version-min=10.10 -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
  -dynamiclib -single_module -install_name
'@__NONE/libunotest.dylib'
-fstack-protector-strong -L$W/LinkTarget/StaticLibrary
-L$W/LinkTarget/Library  -L$I/LibreOfficeDev.app/Contents/Frameworks
-L$I/LibreOfficeDev.app/Contents/Frameworks  -L$W/LinkTarget/Library
-lcomphelper -luno_cppor-strong -L$W/LinkTarget/StaticLibrary
-L$W/LinkTarget/Library  -L$I/LibreOfficeDev.app/Contents/Frameworks
-L$I/LibreOfficeDev.app/Contents/Frameworks  -L$W/LinkTarget/Library
-lcomphelper -luno_cpprotector-strong -L$W/LinkTarget/StaticLibrary
-L$W/LinkTarget/Library  -L$I/LibreOfficeDev.app/Contents/Frameworks
-L$I/LibreOfficeDev.app/Contents/Frameworks  -L$W/LinkTarget/Library
-lcomphelper -luno_cppu -luno_cppuhelpergcc3 -luno_sal -lsblo
$W/CxxObject/unotest/source/cpp/bootstrapfixturebase.o
$W/CxxObject/unotest/source/cpp/filters-test.o
$W/CxxObject/unotest/source/cpp/getargument.o
$W/CxxObject/unotest/source/cpp/gettestargument.o
$W/CxxObject/unotest/source/cpp/macros_test.o
$W/CxxObject/unotest/source/cpp/officeconnection.o
$W/CxxObject/unotest/source/cpp/toabsolutefileurl.o
$W/CxxObject/unotest/source/cpp/uniquepipename.o
-L$W/UnpackedTarball/cppunit/src/cppunit/.libs -lcppunit   -o
$W/LinkTarget/Library/libunotest.dylib && : &&   /usr/bin/perl
$S/solenv/bin/macosx-change-install-names.pl shl NONE
$W/LinkTarget/Library/libunotest.dylib &&   otool -l
$W/LinkTarget/Library/libunotest.dylib | grep -A 5 LC_ID_DYLIB >
$W/LinkTarget/Library/libunotest.dylib.exports.tmp &&
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm
-g -P $W/LinkTarget/Library/libunotest.dylib | cut -d' ' -f1-2 | grep -v U$
>> $W/LinkTarget/Library/libunotest.dylib.exports.tmp && if cmp -s
$W/LinkTarge

[Libreoffice-commits] core.git: 39 commits - basctl/source basic/source bridges/source chart2/source comphelper/source compilerplugins/clang connectivity/source cppu/source desktop/source extensions/s

2015-06-02 Thread Stephan Bergmann

 basctl/source/dlged/dlgedobj.cxx |2 
 basic/source/runtime/methods1.cxx|4 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx |2 
 bridges/source/jni_uno/jni_helper.h  |4 
 chart2/source/view/main/3DChartObjects.cxx   |2 
 comphelper/source/property/propertysethelper.cxx |   12 -
 compilerplugins/clang/cstylecast.cxx |  117 
--
 connectivity/source/drivers/dbase/DTable.cxx |4 
 connectivity/source/drivers/evoab2/NResultSet.cxx|2 
 connectivity/source/drivers/hsqldb/HStorageAccess.cxx|4 
 connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx  |2 
 connectivity/source/drivers/kab/KDatabaseMetaData.cxx|6 
 connectivity/source/drivers/kab/KResultSet.cxx   |6 
 connectivity/source/drivers/kab/KResultSetMetaData.cxx   |2 
 connectivity/source/drivers/kab/kcondition.cxx   |6 
 connectivity/source/drivers/kab/kfields.cxx  |4 
 connectivity/source/drivers/macab/MacabRecords.cxx   |6 
 connectivity/source/drivers/odbc/OResultSet.cxx  |2 
 connectivity/source/drivers/odbc/OStatement.cxx  |2 
 cppu/source/typelib/typelib.cxx  |6 
 desktop/source/lib/init.cxx  |8 
 extensions/source/bibliography/toolbar.cxx   |4 
 extensions/source/plugin/base/xplugin.cxx|4 
 extensions/source/propctrlr/taborder.cxx |2 
 extensions/source/scanner/sane.cxx   |4 
 filter/source/graphicfilter/eos2met/eos2met.cxx  |2 
 filter/source/graphicfilter/ios2met/ios2met.cxx  |4 
 filter/source/t602/t602filter.cxx|2 
 formula/source/core/api/token.cxx|2 
 hwpfilter/source/mzstring.h  |2 
 i18npool/qa/cppunit/test_textsearch.cxx  |8 
 i18npool/source/breakiterator/gendict.cxx|2 
 i18npool/source/collator/gencoll_rule.cxx|2 
 i18npool/source/indexentry/genindex_data.cxx |2 
 i18npool/source/search/textsearch.cxx|6 
 i18npool/source/textconversion/genconv_dict.cxx  |6 
 include/editeng/svxrtf.hxx   |2 
 include/sfx2/styfitem.hxx|2 
 include/svx/svdlayer.hxx |2 
 io/source/stm/odata.cxx  |2 
 jvmfwk/source/framework.cxx  |2 
 lingucomponent/source/languageguessing/guesslang.cxx |2 
 lingucomponent/source/spellcheck/spell/sspellimp.cxx |2 
 oox/source/export/drawingml.cxx  |2 
 opencl/source/openclwrapper.cxx  |2 
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java |   10 
 rsc/source/parser/rscdb.cxx  |2 
 sal/osl/unx/module.cxx   |4 
 sal/osl/unx/mutex.cxx|2 
 sal/osl/unx/process.cxx  |2 
 sal/osl/unx/socket.cxx   |4 
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx  |8 
 sal/qa/rtl/strings/test_ostring_concat.cxx   |4 
 sal/qa/rtl/strings/test_ostring_stringliterals.cxx   |   32 +-
 sal/qa/rtl/strings/test_oustring_concat.cxx  |4 
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx  |2 
 sal/textenc/tencinfo.cxx |6 
 sal/textenc/textcvt.cxx  |4 
 sc/source/core/tool/addinlis.cxx |2 
 sc/source/core/tool/callform.cxx |   16 -
 sc/source/ui/condformat/condformatdlg.cxx|4 
 sc/source/ui/unoobj/cellsuno.cxx |2 
 sd/source/filter/eppt/epptso.cxx |2 
 sd/source/filter/html/htmlex.cxx |2 
 sd/source/ui/remotecontrol/BluetoothServer.cxx   |2 
 sd/source/ui/view/drviews2.cxx   |   28 +-
 sd/source/ui/view/drviews9.cxx   |2 
 sd/source/ui/view/drvie

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

2015-06-02 Thread Andras Timar

 chart2/source/controller/dialogs/tp_RangeChooser.cxx |   18 ++
 chart2/source/controller/dialogs/tp_RangeChooser.hxx |3 +++
 2 files changed, 21 insertions(+)

New commits:
commit c9f19f9194025b1af17ca03752cfa2f5b9a49905
Author: Andras Timar 
Date:   Tue Jun 2 09:02:35 2015 +0200

Time based charting -> experimental

Change-Id: I1c190be0ef226d1f14d083f292cf2ea15a6d1645
Reviewed-on: https://gerrit.libreoffice.org/16023
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 7e5c1101cb200f95128ad7dc7d2a5e6bb4489306)
Reviewed-on: https://gerrit.libreoffice.org/16025
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 8118925..2c9cd5d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -88,8 +89,11 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* 
pParent
 get(m_pCB_FirstRowAsLabel, "CB_FIRST_ROW_ASLABELS");
 get(m_pCB_FirstColumnAsLabel, "CB_FIRST_COLUMN_ASLABELS");
 get(m_pFTTitle, "STR_PAGE_DATA_RANGE");// OH:remove later with dialog title
+get(m_pFL_TimeBased, "separator1");
 get(m_pCB_TimeBased, "CB_TIME_BASED");
+get(m_pFT_TimeStart, "label1");
 get(m_pEd_TimeStart, "ED_TIME_BASED_START");
+get(m_pFT_TimeEnd, "label2");
 get(m_pEd_TimeEnd, "ED_TIME_BASED_END");
 
 m_pFT_Caption->Show(!bHideDescription);
@@ -120,6 +124,17 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* 
pParent
 m_pCB_TimeBased->SetToggleHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
 m_pEd_TimeStart->SetModifyHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
 m_pEd_TimeEnd->SetModifyHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
+
+SvtMiscOptions aOpts;
+if ( !aOpts.IsExperimentalMode() )
+{
+m_pFL_TimeBased->Hide();
+m_pCB_TimeBased->Hide();
+m_pFT_TimeStart->Hide();
+m_pEd_TimeStart->Hide();
+m_pFT_TimeEnd->Hide();
+m_pEd_TimeEnd->Hide();
+}
 }
 
 RangeChooserTabPage::~RangeChooserTabPage()
@@ -138,8 +153,11 @@ void RangeChooserTabPage::dispose()
 m_pCB_FirstRowAsLabel.clear();
 m_pCB_FirstColumnAsLabel.clear();
 m_pFTTitle.clear();
+m_pFL_TimeBased.clear();
 m_pCB_TimeBased.clear();
+m_pFT_TimeStart.clear();
 m_pEd_TimeStart.clear();
+m_pFT_TimeEnd.clear();
 m_pEd_TimeEnd.clear();
 m_pParentDialog.clear();
 OWizardPage::dispose();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 5bcda35..8d6ad51 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -89,8 +89,11 @@ protected: //member
 VclPtrm_pCB_FirstColumnAsLabel;
 VclPtr   m_pFTTitle;
 
+VclPtr   m_pFL_TimeBased;
 VclPtrm_pCB_TimeBased;
+VclPtr   m_pFT_TimeStart;
 VclPtrm_pEd_TimeStart;
+VclPtr   m_pFT_TimeEnd;
 VclPtrm_pEd_TimeEnd;
 
 sal_Int32   m_nChangingControlCalls;
___
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' - chart2/source

2015-06-02 Thread Andras Timar

 chart2/source/controller/dialogs/tp_ChartType.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 66220d9e1b1a2980f80ebc51b80a3f2e2eb12e85
Author: Andras Timar 
Date:   Tue Jun 2 09:01:58 2015 +0200

GL3D Bar chart -> experimental

Change-Id: I2d5948651e5c31a6ce3cadcc9ff09683a60d49bd
Reviewed-on: https://gerrit.libreoffice.org/16022
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 20bb2e707481135440b2c905fb234c5ba54d5041)
Reviewed-on: https://gerrit.libreoffice.org/16026
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 5a13c68..75e872c 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -29,6 +29,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -765,7 +766,9 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
 }
 m_aChartTypeDialogControllerList.push_back(new 
CombiColumnLineChartDialogController() );
 #if ENABLE_GL3D_BARCHART
-m_aChartTypeDialogControllerList.push_back(new 
GL3DBarChartDialogController());
+SvtMiscOptions aOpts;
+if ( aOpts.IsExperimentalMode() )
+m_aChartTypeDialogControllerList.push_back(new 
GL3DBarChartDialogController());
 #endif
 
 ::std::vector< ChartTypeDialogController* >::const_iterator   aIter = 
m_aChartTypeDialogControllerList.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Katarina Behrens

 sw/source/core/doc/DocumentRedlineManager.cxx   |6 +++---
 sw/source/core/doc/DocumentStylePoolManager.cxx |2 +-
 sw/source/core/doc/docnum.cxx   |8 
 sw/source/core/doc/docsort.cxx  |2 +-
 sw/source/core/doc/doctxm.cxx   |2 +-
 sw/source/core/doc/tblrwcl.cxx  |6 +++---
 sw/source/core/fields/reffld.cxx|2 +-
 sw/source/core/frmedt/feshview.cxx  |2 +-
 sw/source/core/swg/swblocks.cxx |4 ++--
 sw/source/core/unocore/unostyle.cxx |2 +-
 sw/source/filter/basflt/fltshell.cxx|2 +-
 sw/source/filter/html/htmltab.cxx   |2 +-
 sw/source/filter/html/swhtml.cxx|4 ++--
 sw/source/filter/writer/wrtswtbl.cxx|2 +-
 sw/source/filter/ww8/WW8TableInfo.cxx   |2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx|2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx |4 ++--
 sw/source/filter/ww8/rtfexport.cxx  |4 ++--
 sw/source/filter/ww8/wrtw8nds.cxx   |4 ++--
 sw/source/filter/ww8/wrtw8sty.cxx   |8 
 sw/source/filter/ww8/wrtww8.cxx |8 
 sw/source/filter/ww8/ww8atr.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx |4 ++--
 sw/source/filter/ww8/ww8par3.cxx|8 
 sw/source/filter/ww8/ww8par5.cxx|2 +-
 sw/source/ui/config/optpage.cxx |4 ++--
 sw/source/ui/frmdlg/cption.cxx  |2 +-
 sw/source/uibase/app/applab.cxx |4 ++--
 sw/source/uibase/app/docsh2.cxx |2 +-
 sw/source/uibase/app/docstyle.cxx   |2 +-
 sw/source/uibase/app/mainwn.cxx |2 +-
 sw/source/uibase/dbui/dbmgr.cxx |8 
 sw/source/uibase/dbui/mmconfigitem.cxx  |6 +++---
 sw/source/uibase/dochdl/gloshdl.cxx |2 +-
 sw/source/uibase/docvw/edtwin.cxx   |2 +-
 sw/source/uibase/docvw/romenu.cxx   |4 ++--
 sw/source/uibase/lingu/olmenu.cxx   |4 ++--
 sw/source/uibase/misc/numberingtypelistbox.cxx  |2 +-
 sw/source/uibase/shells/basesh.cxx  |2 +-
 sw/source/uibase/shells/tabsh.cxx   |2 +-
 sw/source/uibase/uiview/view.cxx|2 +-
 sw/source/uibase/uno/unodispatch.cxx|2 +-
 sw/source/uibase/uno/unotxdoc.cxx   |2 +-
 sw/source/uibase/utlui/content.cxx  |2 +-
 44 files changed, 75 insertions(+), 75 deletions(-)

New commits:
commit 263b4b99856c81c12707a5e9823d693a594ee305
Author: Katarina Behrens 
Date:   Fri May 29 23:34:09 2015 +0200

loplugin: loopvartoosmall

Change-Id: Icb30dac9cdcba493752623ccafff5f06ccafc31f

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 99892d6..02dcdf8 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1782,7 +1782,7 @@ void DocumentRedlineManager::CompressRedlines()
 }
 
 // Try to merge identical ones
-for( sal_uInt16 n = 1; n < mpRedlineTable->size(); ++n )
+for( size_t n = 1; n < mpRedlineTable->size(); ++n )
 {
 SwRangeRedline* pPrev = (*mpRedlineTable)[ n-1 ],
 * pCur = (*mpRedlineTable)[ n ];
@@ -2003,7 +2003,7 @@ bool DocumentRedlineManager::DeleteRedline( const 
SwStartNode& rNode, bool bSave
 sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, 
sal_uInt16 nType ) const
 {
 const sal_uLong nNdIdx = rNd.GetIndex();
-for( sal_uInt16 n = 0; n < mpRedlineTable->size() ; ++n )
+for( size_t n = 0; n < mpRedlineTable->size() ; ++n )
 {
 const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
 sal_uLong nPt = pTmp->GetPoint()->nNode.GetIndex(),
@@ -2606,7 +2606,7 @@ sal_uInt16 DocumentRedlineManager::InsertRedlineAuthor( 
const OUString& rNew )
 void DocumentRedlineManager::UpdateRedlineAttr()
 {
 const SwRedlineTable& rTable = GetRedlineTable();
-for( sal_uInt16 n = 0; n < rTable.size(); ++n )
+for( size_t n = 0; n < rTable.size(); ++n )
 {
 SwRangeRedline* pRedl = rTable[ n ];
 if( pRedl->IsVisible() )
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index f652f56..e8d4b64 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -287,7 +287,7 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 
 SwTextFormatColl* pNewColl;
 sal_uInt16 nOutLvlBits = 0;
-for( sal_uInt16 n = 0; n < m_rDoc.GetTextFormatColls()->size(); ++n )
+for( size_t n = 0; n < m_rDoc.GetTextFormatColls()->size(); ++n )

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

2015-06-02 Thread Andras Timar

 chart2/source/controller/dialogs/tp_RangeChooser.cxx |   18 ++
 chart2/source/controller/dialogs/tp_RangeChooser.hxx |3 +++
 2 files changed, 21 insertions(+)

New commits:
commit 7e5c1101cb200f95128ad7dc7d2a5e6bb4489306
Author: Andras Timar 
Date:   Tue Jun 2 09:02:35 2015 +0200

Time based charting -> experimental

Change-Id: I1c190be0ef226d1f14d083f292cf2ea15a6d1645
Reviewed-on: https://gerrit.libreoffice.org/16023
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 8118925..2c9cd5d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -88,8 +89,11 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* 
pParent
 get(m_pCB_FirstRowAsLabel, "CB_FIRST_ROW_ASLABELS");
 get(m_pCB_FirstColumnAsLabel, "CB_FIRST_COLUMN_ASLABELS");
 get(m_pFTTitle, "STR_PAGE_DATA_RANGE");// OH:remove later with dialog title
+get(m_pFL_TimeBased, "separator1");
 get(m_pCB_TimeBased, "CB_TIME_BASED");
+get(m_pFT_TimeStart, "label1");
 get(m_pEd_TimeStart, "ED_TIME_BASED_START");
+get(m_pFT_TimeEnd, "label2");
 get(m_pEd_TimeEnd, "ED_TIME_BASED_END");
 
 m_pFT_Caption->Show(!bHideDescription);
@@ -120,6 +124,17 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* 
pParent
 m_pCB_TimeBased->SetToggleHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
 m_pEd_TimeStart->SetModifyHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
 m_pEd_TimeEnd->SetModifyHdl( LINK( this, RangeChooserTabPage, 
ControlChangedHdl ) );
+
+SvtMiscOptions aOpts;
+if ( !aOpts.IsExperimentalMode() )
+{
+m_pFL_TimeBased->Hide();
+m_pCB_TimeBased->Hide();
+m_pFT_TimeStart->Hide();
+m_pEd_TimeStart->Hide();
+m_pFT_TimeEnd->Hide();
+m_pEd_TimeEnd->Hide();
+}
 }
 
 RangeChooserTabPage::~RangeChooserTabPage()
@@ -138,8 +153,11 @@ void RangeChooserTabPage::dispose()
 m_pCB_FirstRowAsLabel.clear();
 m_pCB_FirstColumnAsLabel.clear();
 m_pFTTitle.clear();
+m_pFL_TimeBased.clear();
 m_pCB_TimeBased.clear();
+m_pFT_TimeStart.clear();
 m_pEd_TimeStart.clear();
+m_pFT_TimeEnd.clear();
 m_pEd_TimeEnd.clear();
 m_pParentDialog.clear();
 OWizardPage::dispose();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 5bcda35..8d6ad51 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -89,8 +89,11 @@ protected: //member
 VclPtrm_pCB_FirstColumnAsLabel;
 VclPtr   m_pFTTitle;
 
+VclPtr   m_pFL_TimeBased;
 VclPtrm_pCB_TimeBased;
+VclPtr   m_pFT_TimeStart;
 VclPtrm_pEd_TimeStart;
+VclPtr   m_pFT_TimeEnd;
 VclPtrm_pEd_TimeEnd;
 
 sal_Int32   m_nChangingControlCalls;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Andras Timar

 chart2/source/controller/dialogs/tp_ChartType.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 20bb2e707481135440b2c905fb234c5ba54d5041
Author: Andras Timar 
Date:   Tue Jun 2 09:01:58 2015 +0200

GL3D Bar chart -> experimental

Change-Id: I2d5948651e5c31a6ce3cadcc9ff09683a60d49bd
Reviewed-on: https://gerrit.libreoffice.org/16022
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 5a13c68..75e872c 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -29,6 +29,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -765,7 +766,9 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
 }
 m_aChartTypeDialogControllerList.push_back(new 
CombiColumnLineChartDialogController() );
 #if ENABLE_GL3D_BARCHART
-m_aChartTypeDialogControllerList.push_back(new 
GL3DBarChartDialogController());
+SvtMiscOptions aOpts;
+if ( aOpts.IsExperimentalMode() )
+m_aChartTypeDialogControllerList.push_back(new 
GL3DBarChartDialogController());
 #endif
 
 ::std::vector< ChartTypeDialogController* >::const_iterator   aIter = 
m_aChartTypeDialogControllerList.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-06-02 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 67712, which changed state.

Bug 67712 Summary: form controls and draw objects anchored to cell but changes 
position after reopening
https://bugs.documentfoundation.org/show_bug.cgi?id=67712

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-06-02 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 67712, which changed state.

Bug 67712 Summary: form controls and draw objects anchored to cell but changes 
position after reopening
https://bugs.documentfoundation.org/show_bug.cgi?id=67712

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

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

2015-06-02 Thread Miklos Vajna

 sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf |3 -
 sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf   |2 +
 sw/qa/extras/rtfimport/data/tdf90260-par.rtf |2 +
 sw/qa/extras/rtfimport/rtfimport.cxx |   18 ++
 sw/source/filter/rtf/swparrtf.cxx|   25 ++-
 writerfilter/inc/rtftok/RTFDocument.hxx  |3 +
 writerfilter/source/dmapper/DomainMapper.cxx |3 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|4 +-
 writerfilter/source/filter/RtfFilter.cxx |2 -
 writerfilter/source/rtftok/rtfdocumentfactory.cxx|5 +--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   13 ---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |6 +++
 12 files changed, 71 insertions(+), 15 deletions(-)

New commits:
commit f44ff6044e4ea20a3a40f65b3762fa0171b20e6e
Author: Miklos Vajna 
Date:   Mon May 11 23:24:22 2015 +0200

tdf#70318 tdf#90260 writerfilter: pasted RTF documents may contain no \par

This is a squash of 3 commits, as the first doesn't build without the
second one.

First commit:

sw core is not yet adapted, will be done in the next commit.

(cherry picked from commit e702c78843e387d83fd9c8fbd1597cbe27e3e656)

Second commit:

Author: Mike Kaganski 
tdf#70318: don't forget to clean up second fake paragraph

RTF insert is made into an empty paragraph. To do that, two splits
are made before the insert, but only one is reverted afterwards.
This patch removes the second.

Also fixes a memory leak from unreleased heap object

The corresponding unit test is corrected. It was incorrect
because \par doesn't begin new paragraph; it only ends paragraph.
If a RTF is ended with \par } then no newline is added to its end.
The old unit test only worked because of the bug fixed by this
patch. Correct way of inserting new paragraph in the end of a RTF
is \par \par}

(cherry picked from commit 0ddd9f9ff45f61013ea18763eca4c68aedce6caa)

Third commit:

tdf#90260 testcase

(cherry picked from commit 8931abc0b9fded1ee78eca6bf28e8d2438a76add)

Conflicts:
writerfilter/source/filter/RtfFilter.cxx
writerfilter/source/rtftok/rtfdocumentfactory.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
sw/source/filter/rtf/swparrtf.cxx

Change-Id: If8da12427e0cdaced4c1c1776b9f0b8cbde5c57c
63d50a940d7960beb35f7d774c833ed8499acbef
06a5ff604e6782863c4a2d6e002c9d67d42912fb
Reviewed-on: https://gerrit.libreoffice.org/15963
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf 
b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
index 1f4a75e..a7c6bb2 100644
--- a/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
+++ b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
@@ -1,3 +1,2 @@
 {\rtf1
-bbb
-\par }
+bbb}
diff --git a/sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf 
b/sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf
new file mode 100644
index 000..c54eedd
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf
@@ -0,0 +1,2 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1035{\fonttbl{\f0\fnil\fcharset0 
Calibri;}}
+\uc1\pard\sa200\sl276\slmult1\lang11\f0\fs22 simple}
diff --git a/sw/qa/extras/rtfimport/data/tdf90260-par.rtf 
b/sw/qa/extras/rtfimport/data/tdf90260-par.rtf
new file mode 100644
index 000..e2115b6
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf90260-par.rtf
@@ -0,0 +1,2 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1035{\fonttbl{\f0\fnil\fcharset0 
Calibri;}}
+\uc1\pard\sa200\sl276\slmult1\lang11\f0\fs22 simple\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 535687f..0a57d66 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2272,6 +2272,24 @@ DECLARE_RTFIMPORT_TEST(testTdf91074, "tdf91074.rtf")
 CPPUNIT_ASSERT_EQUAL(static_cast(COL_LIGHTRED), 
getProperty(xShape, "TopBorder").Color);
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf90260Nopar, "hello.rtf")
+{
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xText(xTextDocument->getText(), 
uno::UNO_QUERY);
+uno::Reference xEnd = xText->getEnd();
+paste("tdf90260-nopar.rtf", xEnd);
+CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+}
+
+DECLARE_RTFIMPORT_TEST(testTdf90260Par, "hello.rtf")
+{
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xText(xTextDocument->getText(), 
uno::UNO_QUERY);
+uno::Reference xEnd = xText->getEnd();
+paste("tdf90260-par.rtf", xEnd);
+CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a

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

2015-06-02 Thread Philippe Jung

 sw/source/uibase/uiview/viewmdi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4826007f0e09160ffdb592d10b65eb262ada18c8
Author: Philippe Jung 
Date:   Thu May 28 17:44:03 2015 +0200

tdf#91592 WRITER crashes when navigating through comments

without rSh.EnterStdMode, the image is selected and it has no GetTextNode.

Change-Id: I91ed5a1ed002a04919042f4df22c49d3189daccd
Reviewed-on: https://gerrit.libreoffice.org/15952
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index e875d56..03925bb 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -423,6 +423,7 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
 
 case NID_POSTIT:
 {
+rSh.EnterStdMode();
 sw::sidebarwindows::SwSidebarWin* pPostIt = 
GetPostItMgr()->GetActiveSidebarWin();
 if (pPostIt)
 GetPostItMgr()->SetActiveSidebarWin(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39468] translate German comments, removing redundant ones

2015-06-02 Thread bugzilla-daemon

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

--- Comment #178 from Commit Notification 
 ---
Christian M. Heller committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39468 Translate German Comments - sc/source/core/tool/ #1

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: sc/source

2015-06-02 Thread Christian M . Heller

 sc/source/core/tool/cellform.cxx |   10 -
 sc/source/core/tool/compiler.cxx |   42 +++---
 sc/source/core/tool/consoli.cxx  |   43 +++
 3 files changed, 47 insertions(+), 48 deletions(-)

New commits:
commit 04b32cc8254d7489f3e5be35f9fb6352863aac3e
Author: Christian M. Heller 
Date:   Sun May 31 10:43:24 2015 -0400

fdo#39468 Translate German Comments - sc/source/core/tool/ #1

Change-Id: I95c6669cfbdcbc81c5a173a6687fca14bed255fb
Reviewed-on: https://gerrit.libreoffice.org/16003
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index dfc0ffe..36529c6 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -267,8 +267,8 @@ OUString ScCellFormat::GetOutputString( ScDocument& rDoc, 
const ScAddress& rPos,
 
 if (rCell.meType == CELLTYPE_EDIT)
 {
-//  GetString an der EditCell macht Leerzeichen aus Umbruechen,
-//  hier werden die Umbrueche aber gebraucht
+//  GetString converts line breaks into spaces in EditCell,
+//  but here we need the line breaks
 const EditTextObject* pData = rCell.mpEditText;
 if (pData)
 {
@@ -276,12 +276,12 @@ OUString ScCellFormat::GetOutputString( ScDocument& rDoc, 
const ScAddress& rPos,
 rEngine.SetText(*pData);
 aVal = rEngine.GetText(LINEEND_LF);
 }
-//  Edit-Zellen auch nicht per NumberFormatter formatieren
-//  (passend zur Ausgabe)
+//  also do not format EditCells as numbers
+//  (fitting to output)
 }
 else
 {
-//  wie in GetString am Dokument (column)
+//  like in GetString for document (column)
 Color* pColor;
 sal_uLong nNumFmt = rDoc.GetNumberFormat(rPos);
 aVal = GetString(rDoc, rPos, nNumFmt, &pColor, *rDoc.GetFormatTable());
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1253f59..1d5b36b 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1817,42 +1817,42 @@ static sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* 
pDst, const sal_Unicode* pS
 
 // NextSymbol
 
-// Zerlegt die Formel in einzelne Symbole fuer die weitere
-// Verarbeitung (Turing-Maschine).
+// Parses the formula into separate symbols for further
+// processing (Turing-Machine).
 
-// Ausgangs Zustand = GetChar
+// initial state = GetChar
 
-// Alter Zustand | gelesenes Zeichen | Aktion| Neuer Zustand
+// old state | read character| action| new state
 //---+---+---+---
-// GetChar   | ;()+-*/^=&| Symbol=Zeichen| Stop
-//   | <>| Symbol=Zeichen| GetBool
-//   | $ Buchstabe   | Symbol=Zeichen| GetWord
-//   | Ziffer| Symbol=Zeichen| GetValue
-//   | " | Keine | GetString
-//   | Sonst | Keine | GetChar
+// GetChar   | ;()+-*/^=&| Symbol=char   | Stop
+//   | <>| Symbol=char   | GetBool
+//   | $ letter  | Symbol=char   | GetWord
+//   | number| Symbol=char   | GetValue
+//   | " | none  | GetString
+//   | other | none  | GetChar
 //---+---+---+---
-// GetBool   | =>| Symbol=Symbol+Zeichen | Stop
-//   | Sonst | Dec(CharPos)  | Stop
+// GetBool   | =>| Symbol=Symbol+char| Stop
+//   | other | Dec(CharPos)  | Stop
 //---+---+---+---
 // GetWord   | SepSymbol | Dec(CharPos)  | Stop
 //   | ()+-*/^=<>&~  |   |
-//   | Leerzeichen   | Dec(CharPos)  | Stop
+//   | space | Dec(CharPos)  | Stop
 //   | $_:.  |   |
-//   | Buchstabe,Ziffer  | Symbol=Symbol+Zeichen | GetWord
-//   | Sonst | Fehler| Stop
+//   | letter, number| Symbol=Symbol+char| GetWord
+//   | other | error | Stop
 //---+---+---+---
 // GetValue  | ;()*/^=<>&|   |
-//   | Leerzeichen   | Dec(CharPos)  | Stop
-//   | Ziffer E+-%,. | Symbol=Symbol+Zei

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

2015-06-02 Thread László Németh

 extras/source/autocorr/emoji/emoji.ulf | 4661 +
 l10ntools/source/lngmerge.cxx  |3 
 2 files changed, 4663 insertions(+), 1 deletion(-)

New commits:
commit 483390d66b1e1bd899410906f53f3124cacfe73d
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Mon Jun 1 11:19:09 2015 +0200

Add translation support for short names of Emoji and other symbols

Cherry picked from 4a91d5ee95c9b6ee22053f466e2483035885a032
(Add translation support for short names of Emoji and other symbols)

and 851b3afb28a87934b933184af2ebb8f8144815ab.
(l10ntools: support x-comments in ulf format).

See also https://wiki.documentfoundation.org/Emoji

Change-Id: I3d7ec13d381160d63d535ccbdcd0b3209799d3d5
Reviewed-on: https://gerrit.libreoffice.org/16014
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/extras/source/autocorr/emoji/emoji.ulf 
b/extras/source/autocorr/emoji/emoji.ulf
new file mode 100644
index 000..c549c5d
--- /dev/null
+++ b/extras/source/autocorr/emoji/emoji.ulf
@@ -0,0 +1,4661 @@
+/* -*- 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/.
+ */
+
+[CENT_SIGN]
+x-comment = "Â¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji";
+en-US = "cent"
+
+[POUND_SIGN]
+x-comment = "Â£ (U+000A3), see http://wiki.documentfoundation.org/Emoji";
+en-US = "pound"
+
+[YEN_SIGN]
+x-comment = "Â¥ (U+000A5), see http://wiki.documentfoundation.org/Emoji";
+en-US = "yen"
+
+[SECTION_SIGN]
+x-comment = "Â§ (U+000A7), see http://wiki.documentfoundation.org/Emoji";
+en-US = "section"
+
+[COPYRIGHT_SIGN]
+x-comment = "Â© (U+000A9), see http://wiki.documentfoundation.org/Emoji";
+en-US = "copyright"
+
+[NOT_SIGN]
+x-comment = "Â¬ (U+000AC), see http://wiki.documentfoundation.org/Emoji";
+en-US = "not"
+
+[REGISTERED_SIGN]
+x-comment = "Â® (U+000AE), see http://wiki.documentfoundation.org/Emoji";
+en-US = "registered"
+
+[DEGREE_SIGN]
+x-comment = "Â° (U+000B0), see http://wiki.documentfoundation.org/Emoji";
+en-US = "degree"
+
+[PLUS-MINUS_SIGN]
+x-comment = "Â± (U+000B1), see http://wiki.documentfoundation.org/Emoji";
+en-US = "+-"
+
+[MIDDLE_DOT]
+x-comment = "Â· (U+000B7), see http://wiki.documentfoundation.org/Emoji";
+en-US = "middle dot"
+
+[MULTIPLICATION_SIGN]
+x-comment = "Ã (U+000D7), see http://wiki.documentfoundation.org/Emoji";
+en-US = "x"
+
+[GREEK_CAPITAL_LETTER_ALPHA]
+x-comment = "Î (U+00391), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Alpha"
+
+[GREEK_CAPITAL_LETTER_BETA]
+x-comment = "Î (U+00392), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Beta"
+
+[GREEK_CAPITAL_LETTER_GAMMA]
+x-comment = "Î (U+00393), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Gamma"
+
+[GREEK_CAPITAL_LETTER_DELTA]
+x-comment = "Î (U+00394), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Delta"
+
+[GREEK_CAPITAL_LETTER_EPSILON]
+x-comment = "Î (U+00395), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Epsilon"
+
+[GREEK_CAPITAL_LETTER_ZETA]
+x-comment = "Î (U+00396), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Zeta"
+
+[GREEK_CAPITAL_LETTER_ETA]
+x-comment = "Î (U+00397), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Eta"
+
+[GREEK_CAPITAL_LETTER_THETA]
+x-comment = "Î (U+00398), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Theta"
+
+[GREEK_CAPITAL_LETTER_IOTA]
+x-comment = "Î (U+00399), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Iota"
+
+[GREEK_CAPITAL_LETTER_KAPPA]
+x-comment = "Î (U+0039A), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Kappa"
+
+[GREEK_CAPITAL_LETTER_LAMDA]
+x-comment = "Î (U+0039B), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Lambda"
+
+[GREEK_CAPITAL_LETTER_MU]
+x-comment = "Î (U+0039C), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Mu"
+
+[GREEK_CAPITAL_LETTER_NU]
+x-comment = "Î (U+0039D), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Nu"
+
+[GREEK_CAPITAL_LETTER_XI]
+x-comment = "Î (U+0039E), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Xi"
+
+[GREEK_CAPITAL_LETTER_OMICRON]
+x-comment = "Î (U+0039F), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Omicron"
+
+[GREEK_CAPITAL_LETTER_PI]
+x-comment = "Î  (U+003A0), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Pi"
+
+[GREEK_CAPITAL_LETTER_RHO]
+x-comment = "Î¡ (U+003A1), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Rho"
+
+[GREEK_CAPITAL_LETTER_SIGMA]
+x-comment = "Î£ (U+003A3), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Sigma"
+
+[GREEK_CAPITAL_LETTER_TAU]
+x-comment = "Î¤ (U+003A4), see http://wiki.documentfoundation.org/Emoji";
+en-US = "Tau"
+
+[GREEK_CAPITAL_LETTER_

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

2015-06-02 Thread Eike Rathke

 svl/source/numbers/zforfind.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit bd4f115484e9955045a50131c84685823a5af078
Author: Eike Rathke 
Date:   Mon Jun 1 16:25:06 2015 +0200

Resolves: tdf#91420 "Jan1, 2015" is a valid date

Regression introduced with 43624d9370c4384f71c6b13fed900eaec222cf64 that
fixed tdf#34724

Change-Id: I44b5eac6e4ce5a38855148efecea5f2a987ed213
(cherry picked from commit fe2c7b25152df4c89e44c6516081d43d68075736)
Reviewed-on: https://gerrit.libreoffice.org/16018
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index fab73b4..ce6d0e0 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2101,7 +2101,9 @@ bool ImpSvNumberInputScan::ScanStartString( const 
OUString& rString,
 short nTempMonth = GetMonth(rString, nPos);
 if ( nTempMonth )// month (Jan 1)?
 {
-if (nPos < rString.getLength()) // Jan1 without separator 
is not a date
+// Jan1 without separator is not a date, unless it is followed by a
+// separator and a (year) number.
+if (nPos < rString.getLength() || (nAnzStrings >= 4 && nAnzNums >= 
2))
 {
 eScannedType = NUMBERFORMAT_DATE;   // !!! it IS a date !!!
 nMonth = nTempMonth;
@@ -2144,7 +2146,9 @@ bool ImpSvNumberInputScan::ScanStartString( const 
OUString& rString,
 nTempMonth = GetMonth(rString, nPos);
 if ( nTempMonth ) // month (Jan 1)?
 {
-if (nPos < rString.getLength()) // Jan1 
without separator is not a date
+// Jan1 without separator is not a date, unless it is 
followed by a
+// separator and a (year) number.
+if (nPos < rString.getLength() || (nAnzStrings >= 4 && 
nAnzNums >= 2))
 {
 nMonth = nTempMonth;
 nMonthPos = 1; // month a the beginning
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Stephan Bergmann


On 06/02/2015 09:48 AM, Alex Thurgood wrote:

Le 02/06/2015 08:39, Stephan Bergmann a écrit :

Robert, please monitor the health of your tb, and if it starts to
systematically fail, do something about it.  In this particular case,
please debug into the cause of that DisposedException.


Nothing to do with :

https://bugs.documentfoundation.org/show_bug.cgi?id=90502#c13

by any chance ?


Yes, the CppunitTest output in 
 (which 
in turn looks unrelated to the original topic of 
) looks the 
same as the tb's.


And right, on closer inspection of the CppunitTest output, the 
DisposedException (during tearDown) might be a red herring, and the 
truly relevant part is why loading 
sw/qa/extras/globalfilter/data/skipimages.docx fails in the first place.


* What happens if you try to load that skipimages.docx manually in LO?

* What do you see if you debug into the xLoader->loadComponentFromURL 
call at macros_test.cxx:50 during that CppunitTest_sw_globalfilter?


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

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

2015-06-02 Thread Justin Luth

 sc/source/ui/Accessibility/AccessibleEditObject.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8bf66416a834a503309d4d0f3298d65f321f360e
Author: Justin Luth 
Date:   Sat May 30 07:17:32 2015 +0300

tdf#91641 EditLine should have focus on accessibleText init.

The first time an accessibleEdit is created, it didnt recognize any
focused text when editing in the "Input Line".

Change-Id: I5aff199c10313d9c51ea15541a825cfbfd7ad374
Reviewed-on: https://gerrit.libreoffice.org/15962
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx 
b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index e975bd5..c688165 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -372,13 +372,21 @@ void ScAccessibleEditObject::CreateTextHelper()
 ::std::unique_ptr< SvxEditSource > pEditSource (new 
ScAccessibilityEditSource(std::move(pAccessibleTextData)));
 mpTextHelper = new 
::accessibility::AccessibleTextHelper(std::move(pEditSource));
 mpTextHelper->SetEventSource(this);
-mpTextHelper->SetFocus(mbHasFocus);
+
+const ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
+if ( pInputHdl && pInputHdl->IsEditMode() )
+{
+mpTextHelper->SetFocus(true);
+}
+else
+{
+mpTextHelper->SetFocus(mbHasFocus);
+}
 
 // #i54814# activate cell in edit mode
 if( meObjectType == CellInEditMode )
 {
 // do not activate cell object, if top edit line is active
-const ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
 if( pInputHdl && !pInputHdl->IsTopMode() )
 {
 SdrHint aHint( HINT_BEGEDIT );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - basic/source sfx2/source svtools/source sw/source unoidl/source uui/source vcl/generic xmlhelp/source xmloff/source

2015-06-02 Thread Caolán McNamara

 basic/source/basmgr/basmgr.cxx|8 
 basic/source/basmgr/vbahelper.cxx |2 +-
 basic/source/classes/sb.cxx   |2 +-
 basic/source/classes/sbunoobj.cxx |6 +++---
 basic/source/classes/sbxmod.cxx   |2 +-
 basic/source/runtime/comenumwrapper.hxx   |2 +-
 basic/source/runtime/iosys.cxx|4 ++--
 basic/source/sbx/sbxdec.hxx   |2 +-
 basic/source/sbx/sbxres.hxx   |2 +-
 basic/source/sbx/sbxscan.cxx  |2 +-
 sfx2/source/dialog/templdlg.cxx   |3 +--
 sfx2/source/doc/ownsubfilterservice.cxx   |2 +-
 sfx2/source/doc/plugin.cxx|2 +-
 sfx2/source/doc/printhelper.cxx   |   14 +++---
 sfx2/source/doc/sfxbasemodel.cxx  |6 +++---
 sfx2/source/explorer/nochaos.cxx  |2 +-
 sfx2/source/notify/globalevents.cxx   |2 +-
 sfx2/source/sidebar/Accessible.hxx|2 +-
 sfx2/source/sidebar/AccessibleTitleBar.hxx|2 +-
 svtools/source/brwbox/datwin.hxx  |2 +-
 svtools/source/config/colorcfg.cxx|2 +-
 svtools/source/config/extcolorcfg.cxx |2 +-
 svtools/source/config/printoptions.cxx|2 +-
 svtools/source/contnr/contentenumeration.hxx  |4 ++--
 svtools/source/contnr/imivctl.hxx |6 +++---
 svtools/source/contnr/treelist.cxx|4 ++--
 svtools/source/contnr/treelistbox.cxx |2 +-
 svtools/source/contnr/treelistentry.cxx   |2 +-
 svtools/source/control/calendar.cxx   |2 +-
 svtools/source/control/ctrlbox.cxx|4 ++--
 svtools/source/control/roadmap.cxx|2 +-
 svtools/source/control/toolbarmenuimp.hxx |4 ++--
 svtools/source/control/valueimp.hxx   |2 +-
 svtools/source/filter/SvFilterOptionsDialog.cxx   |2 +-
 svtools/source/graphic/graphicunofactory.cxx  |2 +-
 svtools/source/graphic/grfcache.cxx   |4 ++--
 svtools/source/hatchwindow/documentcloser.cxx |4 ++--
 svtools/source/misc/ehdl.cxx  |2 +-
 svtools/source/misc/embedhlp.cxx  |2 +-
 svtools/source/misc/templatefoldercache.cxx   |8 
 svtools/source/table/cellvalueconversion.cxx  |   12 ++--
 svtools/source/table/gridtablerenderer.cxx|2 +-
 svtools/source/table/tablecontrol_impl.cxx|2 +-
 svtools/source/table/tablecontrol_impl.hxx|   18 +-
 svtools/source/table/tabledatawindow.hxx  |2 +-
 svtools/source/toolpanel/paneltabbar.cxx  |8 
 svtools/source/toolpanel/paneltabbarpeer.hxx  |2 +-
 svtools/source/toolpanel/tabbargeometry.hxx   |2 +-
 svtools/source/toolpanel/toolpaneldeck.cxx|2 +-
 svtools/source/toolpanel/toolpaneldeckpeer.hxx|2 +-
 svtools/source/toolpanel/toolpaneldrawer.hxx  |2 +-
 svtools/source/toolpanel/toolpaneldrawerpeer.cxx  |2 +-
 svtools/source/uno/addrtempuno.cxx|2 +-
 svtools/source/uno/treecontrolpeer.cxx|6 +++---
 svtools/source/uno/unogridcolumnfacade.cxx|2 +-
 svtools/source/uno/unoimap.cxx|2 +-
 sw/source/core/layout/flycnt.cxx  |   12 ++--
 sw/source/ui/dialog/swdlgfact.hxx |8 
 unoidl/source/sourceprovider-scanner.hxx  |2 +-
 uui/source/passwordcontainer.hxx  |2 +-
 vcl/generic/fontmanager/parseAFM.cxx  |2 +-
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx |2 +-
 xmloff/source/text/XMLRedlineExport.hxx   |2 +-
 63 files changed, 118 insertions(+), 111 deletions(-)

New commits:
commit 32fc5f1605dc2ce224074e88bea6aa548d450287
Author: CaolÃ¡n McNamara 
Date:   Tue Jun 2 08:46:29 2015 +0100

cppcheck: redundantAssignment

Change-Id: Icca51c730aa361e6a886358c396d4804501139ad

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e7952ca..8da0870 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1806,12 +1806,11 @@ static OUString getModuleIdentifier( const Reference< 
XModuleManager2 >& i_xModM
 sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( 
SfxObjectShell* i_pObjSh )
 {
 OSL_ENSURE( i_pObjSh, 
"SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" );
-sal_Int32 nFilter = -1;
 
 ::comphelper::SequenceAsHashMap aFactoryProps(
 xModuleManager->getByName( getModuleIdentifier( xModuleManager, 
i_pObjSh ) ) );
 sal_Int32 nDefault = -1;
-nFilter = aFactoryProps.getUnpackedValueOrDefault( 
"ooSetupFactoryStyleFil

Re: About skip SkipImages unit test on MacOs

2015-06-02 Thread Alex Thurgood

Le 02/06/2015 08:39, Stephan Bergmann a écrit :

Hi Stephan,

> 
> Robert, please monitor the health of your tb, and if it starts to
> systematically fail, do something about it.  In this particular case,
> please debug into the cause of that DisposedException.


Nothing to do with :

https://bugs.documentfoundation.org/show_bug.cgi?id=90502#c13

by any chance ?


Alex


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

[Libreoffice-commits] core.git: 2 commits - icon-themes/breeze icon-themes/galaxy icon-themes/tango officecfg/registry scaddins/source sc/source sdext/source sd/source starmath/source svl/source sw/sd

2015-06-02 Thread Philippe Jung

 icon-themes/breeze/links.txt|3 +
 icon-themes/galaxy/links.txt|3 +
 icon-themes/tango/links.txt |6 +-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 -
 sc/source/core/opencl/op_statistical.cxx|   24 
+-
 sc/source/filter/excel/excform.cxx  |2 
 sc/source/filter/excel/xetable.cxx  |2 
 sc/source/filter/excel/xihelper.cxx |2 
 sc/source/filter/html/htmlpars.cxx  |2 
 sc/source/filter/rtf/eeimpars.cxx   |4 -
 scaddins/source/analysis/analysishelper.cxx |2 
 scaddins/source/datefunc/datefunc.cxx   |2 
 scaddins/source/pricing/pricing.cxx |2 
 sd/source/core/EffectMigration.cxx  |2 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx   |2 
 sd/source/ui/framework/configuration/Configuration.cxx  |2 
 sd/source/ui/sidebar/LayoutMenu.cxx |2 
 sd/source/ui/sidebar/MasterPagesSelector.cxx|6 +-
 sd/source/ui/slideshow/slideshowimpl.cxx|2 
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx|2 
 sd/source/ui/slidesorter/view/SlideSorterView.cxx   |4 -
 sd/source/ui/slidesorter/view/SlsFramePainter.cxx   |4 -
 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx  |4 -
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx  |4 -
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx  |4 -
 sd/source/ui/tools/ConfigurationAccess.cxx  |2 
 sd/source/ui/unoidl/DrawController.cxx  |2 
 sd/source/ui/view/ViewTabBar.cxx|4 -
 sd/source/ui/view/drviews5.cxx  |2 
 sd/source/ui/view/frmview.cxx   |2 
 sd/source/ui/view/outlview.cxx  |2 
 sd/source/ui/view/sdview3.cxx   |2 
 sdext/source/minimizer/pppoptimizer.cxx |2 
 sdext/source/minimizer/pppoptimizerdialog.cxx   |2 
 sdext/source/presenter/PresenterConfigurationAccess.cxx |2 
 starmath/source/ElementsDockingWindow.cxx   |6 +-
 starmath/source/dialog.cxx  |2 
 starmath/source/mathtype.cxx|4 -
 starmath/source/ooxmlexport.cxx |2 
 starmath/source/parse.cxx   |2 
 starmath/source/rtfexport.cxx   |2 
 starmath/source/utility.cxx |6 +-
 svl/source/passwordcontainer/passwordcontainer.cxx  |4 -
 sw/sdi/swriter.sdi  |2 
 sw/source/core/access/accselectionhelper.cxx|4 -
 sw/source/uibase/uiview/view0.cxx   |2 
 sw/uiconfig/sglobal/toolbar/toolbar.xml |2 
 sw/uiconfig/sweb/toolbar/toolbar.xml|2 
 sw/uiconfig/swform/toolbar/toolbar.xml  |2 
 sw/uiconfig/swreport/toolbar/toolbar.xml|2 
 sw/uiconfig/swriter/menubar/menubar.xml |2 
 sw/uiconfig/swriter/toolbar/toolbar.xml |2 
 sw/uiconfig/swxform/toolbar/toolbar.xml |2 
 ucb/source/ucp/ftp/ftpcontentprovider.cxx   |4 -
 ucb/source/ucp/ftp/ftpresultsetI.cxx|4 -
 ucb/source/ucp/ftp/ftpurl.cxx   |8 +--
 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx   |2 
 xmlhelp/source/cxxhelp/provider/databases.cxx   |4 -
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx   |2 
 xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx|2 
 60 files changed, 101 insertions(+), 93 deletions(-)

New commits:
commit c7309a4822633423b0969757c494077fdc27b724
Author: Philippe Jung 
Date:   Mon Jun 1 01:11:37 2015 +0200

tdf#91783 - Reverse the toggle behaviour of .uno:Graphic Change

Rename:
- .uno:Graphic to .uno:ShowGraphics
- View->Hide Images to View->Image

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

2015-06-02 Thread Noel Grandin

 vcl/qa/complex/memCheck/CheckMemoryUsage.java |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 44cab3c9db5aef97fde57baec205a34fc794f64b
Author: Noel Grandin 
Date:   Tue Jun 2 09:42:21 2015 +0200

Fix CheckMemoryUsage java class

looks like I accidentally broke this with
commit a405184aa972ca375f04205fd22f83d54952648d
"java: inline CheckMemoryUsage test properties"

Change-Id: I321ce16bcd7da0f74525cd5041e3ce36cdd12d23

diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java 
b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index be221e0..4d9d56a 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -37,7 +37,6 @@ import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 
 import util.DesktopTools;
-import util.OSName;
 import util.PropertyName;
 
 import com.sun.star.beans.PropertyValue;
@@ -104,10 +103,9 @@ public class CheckMemoryUsage
 
 // some Tests need the qadevOOo TestParameters, it is like a Hashmap 
for Properties.
 TestParameters param = new TestParameters();
-param.put(PropertyName.SERVICE_FACTORY, xMsf); // some qadevOOo 
functions need the ServiceFactory
 
 // test does definitely not run on Windows.
-if (param.get(PropertyName.OPERATING_SYSTEM).equals(OSName.WNTMSCI))
+if 
(param.get(PropertyName.OPERATING_SYSTEM).equals(PropertyName.WNTMSCI))
 {
 System.out.println("Test can only reasonably be executed with a 
tool that "
 + "displays the memory usage of StarOffice.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Matteo Casalin

 cui/source/dialogs/hyphen.cxx  |   18 +++--
 cui/source/inc/hyphen.hxx  |4 +--
 sw/source/filter/html/htmlgrin.cxx |   27 ++
 sw/source/filter/html/htmlsect.cxx |4 +--
 sw/source/filter/html/htmltabw.cxx |   38 -
 sw/source/filter/html/svxcss1.cxx  |   23 ++
 6 files changed, 51 insertions(+), 63 deletions(-)

New commits:
commit 038a6835d10c2f45d3aaa6df45ef331265a44c57
Author: Matteo Casalin 
Date:   Tue Jun 2 00:46:52 2015 +0200

Use more proper integer types

Change-Id: I66223e76ba886219f4e458f53a3c9db81a43ddb2

diff --git a/sw/source/filter/html/svxcss1.cxx 
b/sw/source/filter/html/svxcss1.cxx
index 3f5ec0c..6576adf 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -342,7 +342,7 @@ void SvxCSS1BorderInfo::SetBorderLine( SvxBoxItemLine 
nLine, SvxBoxItem &rBoxIte
 
 SvxCSS1PropertyInfo::SvxCSS1PropertyInfo()
 {
-for( sal_uInt16 i=0; i<4; i++ )
+for( size_t i=0; iSetBorderLine( SvxBoxItemLine::RIGHT, aBoxItem );
 
-for( i=0; i<4; i++ )
+for( size_t i=0; iGetType() || CSS1_STRING==pExpr->GetType()) &&
@@ -2254,7 +2253,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
 long nMargins[4] = { 0, 0, 0, 0 };
 bool bSetMargins[4] = { false, false, false, false };
 
-for( sal_uInt16 i=0; pExpr && i<4 && !pExpr->GetOp(); i++ )
+for( int i=0; pExpr && i<4 && !pExpr->GetOp(); ++i )
 {
 bool bSetThis = false;
 long nMargin = 0;
@@ -2481,7 +2480,7 @@ static void ParseCSS1_padding( const CSS1Expression 
*pExpr,
SvxCSS1PropertyInfo& rPropInfo,
const SvxCSS1Parser& rParser )
 {
-sal_uInt16 n=0;
+int n=0;
 while( n<4 && pExpr && !pExpr->GetOp() )
 {
 SvxBoxItemLine nLine = n==0 || n==2 ? SvxBoxItemLine::BOTTOM : 
SvxBoxItemLine::LEFT;
@@ -2574,7 +2573,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression 
*pExpr,
 pExpr = pExpr->GetNext();
 }
 
-for( sal_uInt16 i=0; i<4; i++ )
+for( int i=0; i<4; ++i )
 {
 SvxBoxItemLine nLine = SvxBoxItemLine::TOP;
 switch( i )
@@ -2897,7 +2896,7 @@ static void ParseCSS1_size( const CSS1Expression *pExpr,
 SvxCSS1PropertyInfo& rPropInfo,
 const SvxCSS1Parser& /*rParser*/ )
 {
-sal_uInt16 n=0;
+int n=0;
 while( n<2 && pExpr && !pExpr->GetOp() )
 {
 switch( pExpr->GetType() )
commit 029b2d512752893f96114c6b2318339d8c581f33
Author: Matteo Casalin 
Date:   Tue Jun 2 00:31:40 2015 +0200

Use more proper integer types and range-based for loops

Change-Id: I48555d58af6c2cc814f9ac1cc39e221b31cce2f2

diff --git a/sw/source/filter/html/htmlsect.cxx 
b/sw/source/filter/html/htmlsect.cxx
index 6cddcd9..a3789be 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -603,10 +603,10 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss 
)
 
 // Calculate width.
 sal_uInt8 nPrcWidth = bPrcWidth ? (sal_uInt8)nWidth : 0;
-sal_uInt16 nTwipWidth = 0;
+SwTwips nTwipWidth = 0;
 if( !bPrcWidth && nWidth && Application::GetDefaultDevice() )
 {
-nTwipWidth = (sal_uInt16)Application::GetDefaultDevice()
+nTwipWidth = Application::GetDefaultDevice()
  ->PixelToLogic( Size(nWidth, 0),
  MapMode(MAP_TWIP) ).Width();
 }
diff --git a/sw/source/filter/html/htmltabw.cxx 
b/sw/source/filter/html/htmltabw.cxx
index fbd39e2..4447505 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -151,9 +151,9 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& 
rBox,
 else
 {
 const SwTableLines& rLines = rBox.GetTabLines();
-sal_uInt16 nCount = rLines.size();
+const SwTableLines::size_type nCount = rLines.size();
 bool bLeftRight = bLeft || bRight;
-for( sal_uInt16 i=0; !bRet && i(nPrcWidth)).append('%');
 }
@@ -513,7 +513,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
 sal_Int16 eRowVertOri = text::VertOrientation::NONE;
 if( rCells.size() > 1 )
 {
-for( sal_uInt16 nCell = 0; nCell... einruecken
 
-for( sal_uInt16 nCell = 0; nCell... einruecken
 
@@ -567,8 +567,6 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 
eAlign,
 const OUString *pCaption, bool bTopCaption,
 sal_uInt16 nHSpace, sal_uInt16 nVSpace ) const
 {
-sal_uInt16 nRow;
-
 // Wert fuer FRAME bestimmen
 sal_uInt16 nFrameMask = 15;
 if( !(aRows.front())->bTopBorder )
@@ -584,7 +582,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 
eAlign,
 bool bRowsHaveBorder = false;
 bool bRowsHaveBorderOnly = true;
 SwWriteTableRow *p

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

2015-06-02 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/tdf79639.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   11 +--
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 3cf789a15450efcdcf8dd95eeb71bfc746591f1c
Author: Miklos Vajna 
Date:   Mon Jun 1 09:03:05 2015 +0200

tdf#79639 DOCX import: don't delay text frame conversion of in-header tables

Floating tables may or may not be converted to table-in-textframes
during import, depending on if we guess that it'll be a multi-page table
with minimal wrapping or a real wrapped table.

If the floating table is in a header or footer, then it won't be a
multi-page one, so can do the conversion right away.

Change-Id: I8d5ff8c5fe00037d5cef92dea6b54de6806214bc
(cherry picked from commit 81ef96a2417c7843dfed0558c920ad3064e58921)

diff --git a/sw/qa/extras/ooxmlexport/data/tdf79639.docx 
b/sw/qa/extras/ooxmlexport/data/tdf79639.docx
new file mode 100644
index 000..b84aaea
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf79639.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ba7715b..fc05887 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -695,6 +695,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf91261, "tdf91261.docx")
 
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf79639, "tdf79639.docx")
+{
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+// This was 0, floating table in header wasn't converted to a TextFrame.
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xDrawPage->getCount());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 809429d..b08e52a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1113,12 +1113,19 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 // Also, when the anchor is within a table, then do it here as 
well,
 // as xStart/xEnd would not point to the start/end at conversion
 // time anyway.
+// Next exception: it's pointless to delay the conversion if the
+// table is not in the body text.
 sal_Int32 nTableWidth = 0;
 m_aTableProperties->getValue(TablePropertyMap::TABLE_WIDTH, 
nTableWidth);
-if (m_rDMapper_Impl.GetSectionContext() && nestedTableLevel <= 1)
+if (m_rDMapper_Impl.GetSectionContext() && nestedTableLevel <= 1 
&& !m_rDMapper_Impl.IsInHeaderFooter())
 
m_rDMapper_Impl.m_aPendingFloatingTables.push_back(FloatingTableInfo(xStart, 
xEnd, comphelper::containerToSequence(aFrameProperties), nTableWidth));
 else
-m_xText->convertToTextFrame(xStart, xEnd, 
comphelper::containerToSequence(aFrameProperties));
+{
+// m_xText points to the body text, get to current xText from 
m_rDMapper_Impl, in case e.g. we would be in a header.
+uno::Reference 
xTextAppendAndConvert(m_rDMapper_Impl.GetTopTextAppend(), uno::UNO_QUERY);
+if (xTextAppendAndConvert.is())
+xTextAppendAndConvert->convertToTextFrame(xStart, xEnd, 
comphelper::containerToSequence(aFrameProperties));
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Miklos Vajna

 sw/source/core/doc/doc.cxx  |8 +++-
 sw/source/uibase/dbui/dbmgr.cxx |6 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 290cc96e98c8d66396402f9be51739646b1eafa7
Author: Miklos Vajna 
Date:   Tue Jun 2 08:55:03 2015 +0200

SwDBManager: refer embedded data source from doc settings

So that next time the document is loaded, we can find it.

With this, the MM wizard can create embedded data source definitions
which can be saved / loaded back from/to ODF properly.

Change-Id: I5d012ce7fe878bb23ef6dac4526254cbee2683fb

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index c65309f..b427c93 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -495,7 +495,13 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
 if( rNewData != maDBData )
 {
 if (maDBData.sEmbeddedName != rNewData.sEmbeddedName && GetDocShell())
-SwDBManager::LoadAndRegisterEmbeddedDataSource(rNewData, 
*GetDocShell());
+{
+uno::Reference xStorage = 
GetDocShell()->GetStorage();
+// It's OK that we don't have the named sub-storage yet, in case
+// we're in the process of creating it.
+if (xStorage->hasByName(rNewData.sEmbeddedName))
+SwDBManager::LoadAndRegisterEmbeddedDataSource(rNewData, 
*GetDocShell());
+}
 
 maDBData = rNewData;
 getIDocumentState().SetModified();
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 5f5c703..38996db 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2642,6 +2642,12 @@ OUString SwDBManager::LoadAndRegisterDataSource(const 
DBConnURITypes type, const
 {"TargetStorage", uno::makeAny(xStorage)},
 {"StreamRelPath", uno::makeAny(aStreamRelPath)}
 });
+
+// Refer to the sub-storage name in the document settings, so
+// we can load it again next time the file is imported.
+uno::Reference 
xFactory(pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference 
xPropertySet(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);
+xPropertySet->setPropertyValue("EmbeddedDatabaseName", 
uno::makeAny(aStreamRelPath));
 }
 xStore->storeAsURL(sTmpName, aSequence);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

98 matches

Mail list logo