date:20140212

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||37960

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|37960   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||38619

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|38619   |

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|38635   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||38635

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|40788   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||40788

-- 
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: 4 commits - editeng/source filter/source sw/source

2014-02-12 Thread Noel Grandin

 editeng/source/items/paraitem.cxx |2 ++
 filter/source/svg/svgexport.cxx   |   10 +-
 sw/source/ui/app/apphdl.cxx   |1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 257c82d924e9c6621c5e631aff29daacc8c4b8cd
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 09:55:56 2014 +0200

cid#982633 missing break in switch

Change-Id: I20a5a0bd859b0df40a051dbb1894a9d8adfa521d

diff --git a/editeng/source/items/paraitem.cxx 
b/editeng/source/items/paraitem.cxx
index 383f805..9bf4746 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -653,6 +653,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
 case SFX_ITEM_PRESENTATION_COMPLETE:
 {
 rText = EE_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE) +   + 
EE_RESSTR(RID_SVXITEMS_LINES);
+break;
 }
 
 default:
commit c60e1800d69ca416da4bb44990a5585fd0aa9439
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 09:54:23 2014 +0200

cid#982362 missing break in switch

Change-Id: I132527f5e403721988ae8e1d60f181f3d3241810

diff --git a/editeng/source/items/paraitem.cxx 
b/editeng/source/items/paraitem.cxx
index 94c5c9e..383f805 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -582,6 +582,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
 case SFX_ITEM_PRESENTATION_COMPLETE:
 {
 rText = EE_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE) +   + 
EE_RESSTR(RID_SVXITEMS_LINES);
+break;
 }
 
 default:
commit 9d65f6c7ea859b9e72b7a6886413cbb07b1d35c2
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 09:46:47 2014 +0200

cid#736071 missing break in switch

Change-Id: I5a15a1410426ad0941dbb2b73aaf31f78db19362

diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 42ef39b..42ff670 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -667,6 +667,7 @@ void SwModule::Notify( SfxBroadcaster /*rBC*/, const 
SfxHint rHint )
 pDocSh-GetDoc()-SetFixFields(false, 0);
 }
 }
+break;
 case SFX_EVENT_CREATEDOC:
 // Update all FIX-Date/Time fields
 if( pWrtSh )
commit 6bfb8f45710b10003852ac08cc2ac755208bea04
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 09:10:34 2014 +0200

cid#736039 missing break in switch

Change-Id: Icb3379a0f1019f7dea7eeda68a1987486d9b6456

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 3aa17b3..d867370 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -244,12 +244,12 @@ public:
 case SVXDATEFORMAT_E:   // Tue, 13.February 1996
 sDateFormat = ;
 break;
-case SVXDATEFORMAT_STDBIG: ;
+case SVXDATEFORMAT_STDBIG:
 case SVXDATEFORMAT_F:   // Tuesday, 13.February 1996
 sDateFormat = ;
 break;
 // default case
-case SVXDATEFORMAT_B: ;// 13.02.1996
+case SVXDATEFORMAT_B:  // 13.02.1996
 default:
 sDateFormat = ;
 break;
@@ -264,16 +264,16 @@ public:
 case SVXTIMEFORMAT_24_HMS:  // 13:49:38
 sTimeFormat = ;
 break;
-case SVXTIMEFORMAT_AM_HM: ; // 01:49 PM
+case SVXTIMEFORMAT_AM_HM:  // 01:49 PM
 case SVXTIMEFORMAT_12_HM:
 sTimeFormat = ;
 break;
-case SVXTIMEFORMAT_AM_HMS: ;// 01:49:38 PM
+case SVXTIMEFORMAT_AM_HMS: // 01:49:38 PM
 case SVXTIMEFORMAT_12_HMS:
 sTimeFormat = ;
 break;
 // default case
-case SVXTIMEFORMAT_24_HM: ;  // 13:49
+case SVXTIMEFORMAT_24_HM: // 13:49
 default:
 sTimeFormat = ;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||44725

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|44725   |

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|47355   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||47355

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|48409   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||48409

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|49102   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||49102

-- 
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 'distro/collabora/cp-4.1' - sd/source

2014-02-12 Thread Michael Stahl

 sd/source/ui/unoidl/sddetect.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 2714ebedcbd3648cb220e4f667a337563a2fd95d
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 10 16:45:27 2014 +0100

fdo#73363: sd: fix mis-detection of Visio files as PPT

SdFilterDetect::detect() erroneously detects all binary MSO files, and
because the Visio types would be checked after PPT, Visio is pre-empted.

Change-Id: I6ec3647a508dc8d79b47bfff6de35ccae39416ee
(cherry picked from commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3)

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 9e98a7b..66fab30 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -371,6 +371,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 else
 pFilter = SfxFilter::GetFilterByName( 
pFilterPowerPoint97);
 }
+else
+{
+pFilter = 0;
+}
 }
 else
 {
@@ -423,6 +427,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 }
 }
 }
+else
+{
+pFilter = 0;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Michael Stahl

 sd/source/ui/unoidl/sddetect.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 3bb16f0eeb7fc8fe0331e0aa11f65e2114928d09
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 10 16:45:27 2014 +0100

fdo#73363: sd: fix mis-detection of Visio files as PPT

SdFilterDetect::detect() erroneously detects all binary MSO files, and
because the Visio types would be checked after PPT, Visio is pre-empted.

Change-Id: I6ec3647a508dc8d79b47bfff6de35ccae39416ee
(cherry picked from commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3)
Reviewed-on: https://gerrit.libreoffice.org/7977
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 9e98a7b..66fab30 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -371,6 +371,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 else
 pFilter = SfxFilter::GetFilterByName( 
pFilterPowerPoint97);
 }
+else
+{
+pFilter = 0;
+}
 }
 else
 {
@@ -423,6 +427,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 }
 }
 }
+else
+{
+pFilter = 0;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||49853

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|49853   |

-- 
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 65675] LibreOffice 4.2 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=65675

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|49853   |

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|50057   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||50057

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

Re: can't use with-gcc-home

2014-02-12 Thread Stephan Bergmann


On 02/11/2014 12:10 PM, Ahmad Hussein Al-Harthi wrote:

configure: error: unrecognized options: --with-gcc-home


As the message says, our autogen.sh does not support a --with-gcc-home 
switch.  It does work though to add


  CC=/my/favorite/gcc
  CXX=/my/favorite/g++

to the autogen.sh command line or to autogen.input.

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|50279   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||50279

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|50430   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||50430

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|52433   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||52433

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||54398

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|54398   |

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|54933   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||54933

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|56048   |

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||56048

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on||56847

-- 
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 65675] LibreOffice 4.2 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=65675

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|56847   |

-- 
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 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Depends on|56847   |

-- 
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: sw/inc sw/source writerfilter/source

2014-02-12 Thread Adam Co

 sw/inc/unocrsrhelper.hxx   |4 
 sw/source/core/unocore/unocrsrhelper.cxx   |   57 +
 sw/source/core/unocore/unotbl.cxx  |  100 ++---
 writerfilter/source/dmapper/TablePropertiesHandler.cxx |   35 +
 4 files changed, 157 insertions(+), 39 deletions(-)

New commits:
commit 50eb0490e328e6d0ceb9b0550d97d5fc4220a82f
Author: Adam Co rattles2...@gmail.com
Date:   Mon Feb 3 18:00:23 2014 +0200

DOCX import sends 'table row redline' to SW core, and core stores it

This patch adds support in the DOCX importer for the 'table row redline'
to be sent from the DOCX importer, using UNO (as a property of the
table row) to the SW core. Once it reaches the 'table row' - the
'set property' detects this property - and creates an
'SwTableRowRedline' object for it, and adds it to the 'SwExtraRedlineTbl'
object.

Change-Id: Ifd9ba680a722b54116b07dca54841dcba599c517
Reviewed-on: https://gerrit.libreoffice.org/7822
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index ae5ffd9..b50e372 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -121,6 +121,10 @@ namespace SwUnoCursorHelper
 const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  RedlineProperties )
 throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
 
+voidmakeTableRedline( SwTableLine rTableLine, const OUString 
RedlineType,
+const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  RedlineProperties )
+throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
+
 
 /// @param bTableMode: attributes should be applied to a table selection
 void SetCrsrAttr(SwPaM  rPam, const SfxItemSet  rSet,
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index f08021c8..116b8b4 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1292,6 +1292,63 @@ void makeRedline( SwPaM rPaM,
 throw lang::IllegalArgumentException();
 }
 
+void makeTableRedline( SwTableLine rTableLine,
+const OUString rRedlineType,
+const uno::Sequence beans::PropertyValue  rRedlineProperties )
+throw (lang::IllegalArgumentException, uno::RuntimeException)
+{
+IDocumentRedlineAccess* pRedlineAccess = rTableLine.GetFrmFmt()-GetDoc();
+
+RedlineType_t eType;
+if ( rRedlineType == TableRowInsert )
+{
+eType = nsRedlineType_t::REDLINE_TABLE_ROW_INSERT;
+}
+else if ( rRedlineType == TableRowDelete )
+{
+eType = nsRedlineType_t::REDLINE_TABLE_ROW_DELETE;
+}
+else
+{
+throw lang::IllegalArgumentException();
+}
+
+comphelper::SequenceAsHashMap aPropMap( rRedlineProperties );
+uno::Any aAuthorValue;
+aAuthorValue = aPropMap.getUnpackedValueOrDefault(RedlineAuthor, 
aAuthorValue);
+sal_uInt16 nAuthor = 0;
+OUString sAuthor;
+if( aAuthorValue = sAuthor )
+nAuthor = pRedlineAccess-InsertRedlineAuthor(sAuthor);
+
+OUString sComment;
+uno::Any aCommentValue;
+aCommentValue = aPropMap.getUnpackedValueOrDefault(RedlineComment, 
aCommentValue);
+
+SwRedlineData aRedlineData( eType, nAuthor );
+if( aCommentValue = sComment )
+aRedlineData.SetComment( sComment );
+
+::util::DateTime aStamp;
+uno::Any aDateTimeValue;
+aDateTimeValue = aPropMap.getUnpackedValueOrDefault(RedlineDateTime, 
aDateTimeValue);
+if( aDateTimeValue = aStamp )
+{
+   aRedlineData.SetTimeStamp(
+DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( 
aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) );
+}
+
+SwTableRowRedline* pRedline = new SwTableRowRedline( aRedlineData, 
rTableLine );
+RedlineMode_t nPrevMode = pRedlineAccess-GetRedlineMode( );
+pRedline-SetExtraData( NULL );
+
+pRedlineAccess-SetRedlineMode_intern(nsRedlineMode_t::REDLINE_ON);
+bool bRet = pRedlineAccess-AppendTableRowRedline( pRedline, false );
+pRedlineAccess-SetRedlineMode_intern( nPrevMode );
+if( !bRet )
+throw lang::IllegalArgumentException();
+}
+
 SwAnyMapHelper::~SwAnyMapHelper()
 {
 AnyMapHelper_t::iterator aIt = begin();
diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index ac05c38..e177150 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -95,6 +95,7 @@
 #include comphelper/servicehelper.hxx
 #include comphelper/string.hxx
 #include cppuhelper/supportsservice.hxx
+#include comphelper/sequenceashashmap.hxx
 
 using namespace ::com::sun::star;
 using ::editeng::SvxBorderLine;
@@ -1353,51 +1354,74 @@ void

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

2014-02-12 Thread Adam Co

 sw/source/core/doc/doc.cxx|3 +++
 sw/source/core/doc/doccorr.cxx|4 
 sw/source/core/doc/docredln.cxx   |   28 
 sw/source/core/doc/docsort.cxx|1 +
 sw/source/core/docnode/ndsect.cxx |1 +
 sw/source/core/docnode/ndtbl.cxx  |1 +
 6 files changed, 38 insertions(+)

New commits:
commit 198733f7efbd552e6c0b7fde480474cd1020c250
Author: Adam Co rattles2...@gmail.com
Date:   Mon Feb 3 18:25:57 2014 +0200

Added some 'To-Do' notes regarding the new 'SwExtraRedlineTbl'

These notes are to make sure if logic needs to be added for the
'SwExtraRedlineTbl' in these functions, in addition to the
'SwRedlineTbl' that is already there.

Change-Id: I7778b4e20f5323a925d05a7df0c727f44352
Reviewed-on: https://gerrit.libreoffice.org/7823
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 5155eeb..97c06db 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -868,6 +868,7 @@ bool SwDoc::SplitNode( const SwPosition rPos, bool 
bChkTableStart )
 if( !aBkmkArr.empty() )
 _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, true 
);
 
+// To-Do - add 'SwExtraRedlineTbl' also ?
 if( IsRedlineOn() || (!IsIgnoreRedline()  !mpRedlineTbl-empty() ))
 {
 SwPaM aPam( rPos );
@@ -906,6 +907,7 @@ bool SwDoc::AppendTxtNode( SwPosition rPos )
 GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) );
 }
 
+// To-Do - add 'SwExtraRedlineTbl' also ?
 if( IsRedlineOn() || (!IsIgnoreRedline()  !mpRedlineTbl-empty() ))
 {
 SwPaM aPam( rPos );
@@ -997,6 +999,7 @@ bool SwDoc::InsertString( const SwPaM rRg, const OUString 
rStr,
 }
 }
 
+// To-Do - add 'SwExtraRedlineTbl' also ?
 if( IsRedlineOn() || (!IsIgnoreRedline()  !mpRedlineTbl-empty() ))
 {
 SwPaM aPam( rPos.nNode, aTmp.GetCntnt(),
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index c40205d..997aad9 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -206,6 +206,8 @@ void SwDoc::CorrAbs(const SwNodeIndex rOldNode,
 ++n;
 }
 }
+
+// To-Do - need to add here 'SwExtraRedlineTbl' also ?
 }
 
 if(bMoveCrsr)
@@ -311,6 +313,8 @@ void SwDoc::CorrRel(const SwNodeIndex rOldNode,
 // lies on the position ??
 lcl_PaMCorrRel1( rTbl[ n ], rOldNode.GetNode(), aNewPos, 
aNewPos.nContent.GetIndex() + nOffset );
 }
+
+// To-Do - need to add here 'SwExtraRedlineTbl' also ?
 }
 
 if(bMoveCrsr)
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 7bfef2c..ca12ab2 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -188,6 +188,8 @@ void SwDoc::SetRedlineMode( RedlineMode_t eMode )
 meRedlineMode = eMode;
 SetModified();
 }
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 bool SwDoc::IsRedlineOn() const
@@ -1277,6 +1279,8 @@ void SwDoc::CompressRedlines()
 }
 }
 _CHECK_REDLINE( this )
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 bool SwDoc::SplitRedline( const SwPaM rRange )
@@ -1339,6 +1343,8 @@ bool SwDoc::SplitRedline( const SwPaM rRange )
 break;
 }
 return bChg;
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 bool SwDoc::DeleteRedline( const SwPaM rRange, bool bSaveInUndo,
@@ -1454,6 +1460,8 @@ bool SwDoc::DeleteRedline( const SwPaM rRange, bool 
bSaveInUndo,
 SetModified();
 
 return bChg;
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 bool SwDoc::DeleteRedline( const SwStartNode rNode, bool bSaveInUndo,
@@ -1481,6 +1489,8 @@ sal_uInt16 SwDoc::GetRedlinePos( const SwNode rNd, 
sal_uInt16 nType ) const
 break;
 }
 return USHRT_MAX;
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 const SwRangeRedline* SwDoc::GetRedline( const SwPosition rPos,
@@ -1549,6 +1559,8 @@ const SwRangeRedline* SwDoc::GetRedline( const 
SwPosition rPos,
 if( pFndPos )
 *pFndPos = nU;
 return 0;
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 typedef sal_Bool (*Fn_AcceptReject)( SwRedlineTbl rArr, sal_uInt16 rPos,
@@ -2093,6 +2105,8 @@ bool SwDoc::AcceptRedline( sal_uInt16 nPos, bool 
bCallDelete )
 }
 }
 return bRet;
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 bool SwDoc::AcceptRedline( const SwPaM rPam, bool bCallDelete )
@@ -2137,6 +2151,8 @@ bool SwDoc::AcceptRedline( const SwPaM rPam, bool 
bCallDelete )
 GetIDocumentUndoRedo().EndUndo( UNDO_ACCEPT_REDLINE, aRewriter );
 }
 return nRet != 0;
+
+// To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
 bool SwDoc::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2203,6 +2219,8 @@

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

2014-02-12 Thread Adam Co

 sw/source/filter/ww8/attributeoutputbase.hxx |2 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   48 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |1 
 sw/source/filter/ww8/rtfattributeoutput.cxx  |4 ++
 sw/source/filter/ww8/rtfattributeoutput.hxx  |1 
 sw/source/filter/ww8/wrtww8.cxx  |4 ++
 sw/source/filter/ww8/ww8attributeoutput.hxx  |1 
 7 files changed, 61 insertions(+)

New commits:
commit b62f5c2a22d968d06ea9e638126278bbd1158bf6
Author: Adam Co rattles2...@gmail.com
Date:   Mon Feb 3 18:33:15 2014 +0200

DOCX Export of 'Table Row Redline' (like insert row or delete row)

This patch adds support in the DOCX exporter for exporting the
'table row redlines', such as 'inserted a table row',
or 'removed a table row'.

Change-Id: If07e3496d8cab8b93b10c6ae3bcaec49369a8c2d
Reviewed-on: https://gerrit.libreoffice.org/7825
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index e5b461a..b4b8764 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -238,6 +238,8 @@ public:
 
 virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
 
+virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
+
 virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
 
 virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7066d9b..f46997f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -106,6 +106,7 @@
 #include txtinet.hxx
 #include fmtautofmt.hxx
 #include docsh.hxx
+#include docary.hxx
 
 #include osl/file.hxx
 #include vcl/embeddedfontshelper.hxx
@@ -2152,6 +2153,7 @@ void DocxAttributeOutput::StartTableRow( 
ww8::WW8TableNodeInfoInner::Pointer_t p
FSNS( XML_w, XML_val ), true,
FSEND );
 
+TableRowRedline( pTableTextNodeInfoInner );
 TableHeight( pTableTextNodeInfoInner );
 TableCanSplit( pTableTextNodeInfoInner );
 
@@ -2358,6 +2360,52 @@ void DocxAttributeOutput::TableBackgrounds( 
ww8::WW8TableNodeInfoInner::Pointer_
 FSEND );
 }
 
+void DocxAttributeOutput::TableRowRedline( 
ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
+const SwTableBox * pTabBox = pTableTextNodeInfoInner-getTableBox();
+const SwTableLine * pTabLine = pTabBox-GetUpper();
+
+// search next Redline
+const SwExtraRedlineTbl aExtraRedlineTbl = 
m_rExport.pDoc-GetExtraRedlineTbl();
+for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos  
aExtraRedlineTbl.GetSize(); ++nCurRedlinePos )
+{
+SwExtraRedline* pExtraRedline = 
aExtraRedlineTbl.GetRedline(nCurRedlinePos);
+const SwTableRowRedline* pTableRowRedline = dynamic_castconst 
SwTableRowRedline*(pExtraRedline);
+if (pTableRowRedline  pTableRowRedline-GetTableLine() == pTabLine)
+{
+// Redline for this table row
+const SwRedlineData aRedlineData = 
pTableRowRedline-GetRedlineData();
+sal_uInt16 nRedlineType = aRedlineData.GetType();
+switch (nRedlineType)
+{
+case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT:
+case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE:
+{
+OString aId( OString::number( m_nRedlineId++ ) );
+const OUString rAuthor( SW_MOD()-GetRedlineAuthor( 
aRedlineData.GetAuthor() ) );
+OString aAuthor( OUStringToOString( rAuthor, 
RTL_TEXTENCODING_UTF8 ) );
+
+OString aDate( DateTimeToOString( 
aRedlineData.GetTimeStamp() ) );
+
+if (nRedlineType == 
nsRedlineType_t::REDLINE_TABLE_ROW_INSERT)
+m_pSerializer-singleElementNS( XML_w, XML_ins,
+FSNS( XML_w, XML_id ), aId.getStr(),
+FSNS( XML_w, XML_author ), aAuthor.getStr(),
+FSNS( XML_w, XML_date ), aDate.getStr(),
+FSEND );
+else if (nRedlineType == 
nsRedlineType_t::REDLINE_TABLE_ROW_DELETE)
+m_pSerializer-singleElementNS( XML_w, XML_del,
+FSNS( XML_w, XML_id ), aId.getStr(),
+FSNS( XML_w, XML_author ), aAuthor.getStr(),
+FSNS( XML_w, XML_date ), aDate.getStr(),
+FSEND );
+}
+break;
+};
+}
+}
+}
+
 void

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

2014-02-12 Thread Adam Co

 sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableRow.docx  |binary
 sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableRow.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   16 
++
 3 files changed, 16 insertions(+)

New commits:
commit 89959563022ff2385d80ff481bbeed21b86f9c2c
Author: Adam Co rattles2...@gmail.com
Date:   Tue Feb 4 15:02:08 2014 +0200

Add unit-tests for DOCX preservation of 'table row redline'

Added unit-tests to make sure that 'table row redlines'
(e.g. - table row was inserted \ removed) are being round
tripped correctly from a DOCX file.

Change-Id: I369dd32e7372d0cf0add19197f07d0ad604e9ef0
Reviewed-on: https://gerrit.libreoffice.org/7849
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableRow.docx 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableRow.docx
new file mode 100644
index 000..71c4998
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableRow.docx differ
diff --git 
a/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableRow.docx 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableRow.docx
new file mode 100644
index 000..a7c0f56
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableRow.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 232c6e8..a41f204 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2293,6 +2293,22 @@ 
DECLARE_OOXMLEXPORT_TEST(testTrackChangesInsertedParagraphMark, testTrackChange
 assertXPath(pXmlDoc, /w:document/w:body/w:p[1]/w:pPr/w:rPr/w:ins);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedTableRow, 
testTrackChangesDeletedTableRow.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tr[2]/w:trPr/w:del);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesInsertedTableRow, 
testTrackChangesInsertedTableRow.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tr[2]/w:trPr/w:ins);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testFdo69649, fdo69649.docx)
 {
 // The DOCX containing the Table of Contents was not exported with correct 
page nos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Adam Co

 oox/source/token/tokens.txt |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5a99f7cf6ae3e509da60f9ff7a7cf0ceebde6b2f
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:22:28 2014 +0200

Add tokens for 'table cell' redlines (future patch)

This patch adds 2 tokens for future patche's use of table cell
redline preservation.

Change-Id: Ic0ec4122eeaf66c6f0ebff9251fbc38596877541
Reviewed-on: https://gerrit.libreoffice.org/7869
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index e9667b7..d8fbb54 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5003,6 +5003,8 @@ tablePart
 tableParts
 tableRowInsert
 tableRowDelete
+tableCellInsert
+tableCellDelete
 tableStyle
 tableStyleElement
 tableStyleId
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Adam Co

 writerfilter/source/dmapper/PropertyIds.cxx |2 ++
 writerfilter/source/dmapper/PropertyIds.hxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 6429d3f5eee8ca1f069be5828b99fa40a6dd4c51
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:27:06 2014 +0200

Add some property IDs in the DOCX importer (for future table redline patch)

Change-Id: I54cfe0faac1fd3d75fb6931863008b9db86191d1
Reviewed-on: https://gerrit.libreoffice.org/7870
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index e2ad140..9ae0d50 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -155,6 +155,8 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case PROP_TABLE_BORDER :sName = TableBorder;break;
 case PROP_TABLE_ROW_DELETE  :sName = TableRowDelete; 
break;
 case PROP_TABLE_ROW_INSERT  :sName = TableRowInsert; 
break;
+case PROP_TABLE_CELL_DELETE :sName = TableCellDelete; 
break;
+case PROP_TABLE_CELL_INSERT :sName = TableCellInsert; 
break;
 case PROP_LEFT_BORDER_DISTANCE  :sName = LeftBorderDistance; 
break;
 case PROP_RIGHT_BORDER_DISTANCE :sName = 
RightBorderDistance; break;
 case PROP_TOP_BORDER_DISTANCE   :sName = 
TopBorderDistance;break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index d60e48d..ce2459c 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -280,6 +280,8 @@ enum PropertyIds
 ,PROP_TABLE_REDLINE_TOKEN
 ,PROP_TABLE_ROW_DELETE
 ,PROP_TABLE_ROW_INSERT
+,PROP_TABLE_CELL_DELETE
+,PROP_TABLE_CELL_INSERT
 ,PROP_TABS_RELATIVE_TO_INDENT
 ,PROP_TAB_STOP_DISTANCE
 ,PROP_TEXT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Adam Co

 writerfilter/source/ooxml/model.xml |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8805a3b77bd6777154d5ce3826f211c53b4f7603
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:28:23 2014 +0200

Add tokens for 'table cell insert  delete' in DOCX's model.xml

Add appropriate tokens for importing the 'table cell insert'
and 'table cell delete' token in the DOCX's model.xml file.

Change-Id: I328dfde1cef42f1c61ea0c481552f07ea7683def
Reviewed-on: https://gerrit.libreoffice.org/7871
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 92b27b5..8b8b2bf 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23171,6 +23171,8 @@
   element name=tcFitText tokenid=ooxml:CT_TcPrBase_tcFitText/
   element name=vAlign tokenid=ooxml:CT_TcPrBase_vAlign/
   element name=hideMark tokenid=ooxml:CT_TcPrBase_hideMark/
+  element name=cellDel tokenid=ooxml:CT_TcPrBase_cellDel/
+  element name=cellIns tokenid=ooxml:CT_TcPrBase_cellIns/
 /resource
 resource name=CT_TcPr resource=Properties tag=table
   element name=tcPrChange tokenid=ooxml:CT_TcPr_tcPrChange/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: can't use with-gcc-home

2014-02-12 Thread Christian Lohmaier

Hi Ahmad, *,

On Tuesday, February 11, 2014, Ahmad Hussein Al-Harthi 
aalhar...@kacst.edu.sa wrote:

 Hi,

 I've this error message with autogen:

 
 configure: error: unrecognized options: --with-gcc-home
 

 any ideas?


Why do you want to specify it in the first place?

Looking at configure, you can also set with_gcc_home if it is really
needed...

If there really is need to overriding the gcc home however, it would be
interesting to know why.
As configure states there is no AC_ARG_WITH defined for the gcc-home switch.

So if the autodetection won't work, then add something like
AC_ARG_WITH(gcc-home,
AS_HELP_STRING([--with-gcc-home=/path/to/gcchome],
[manually override gcc's homedirectory.]),
,)

to configure.ac - but really it shouldn't be necessary.

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

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

2014-02-12 Thread Adam Co

 sw/inc/IDocumentRedlineAccess.hxx |4 ++
 sw/inc/doc.hxx|1 
 sw/inc/redline.hxx|   23 +
 sw/source/core/doc/docredln.cxx   |   64 ++
 4 files changed, 92 insertions(+)

New commits:
commit 06a887ca92f35b4e44dfc638a9a444fc636bc9d0
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:37:45 2014 +0200

Add support for 'Table Cell Redlines' in SW core

This patch adds support for 'Table Cell Redlines' (such as 'table cell 
inserted'
or 'table cell deleted' in SW core).
It adds the 'SwTableCellRedline' object, and adds a function for adding
objects of that type to the 'SwExtraRedlineTbl', which is the object
that holds all the redlines which are not 'Ranged' redlines.

Change-Id: Ic2e410be58683f171ea07d430b7544600780711e
Reviewed-on: https://gerrit.libreoffice.org/7873
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/inc/IDocumentRedlineAccess.hxx 
b/sw/inc/IDocumentRedlineAccess.hxx
index 144eb4a..48320be 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -29,6 +29,7 @@
 
  class SwRangeRedline;
  class SwTableRowRedline;
+ class SwTableCellRedline;
  class SwRedlineTbl;
  class SwExtraRedlineTbl;
  class SwPaM;
@@ -69,6 +70,8 @@ namespace nsRedlineType_t
 const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes 
have been changed.
 const RedlineType_t REDLINE_TABLE_ROW_INSERT = 0x6;// Table row has been 
inserted.
 const RedlineType_t REDLINE_TABLE_ROW_DELETE = 0x7;// Table row has been 
deleted.
+const RedlineType_t REDLINE_TABLE_CELL_INSERT = 0x8;// Table cell has been 
inserted.
+const RedlineType_t REDLINE_TABLE_CELL_DELETE = 0x9;// Table cell has been 
deleted.
 
 // When larger than 128, flags can be inserted.
 const RedlineType_t REDLINE_NO_FLAG_MASK = 0x7F;
@@ -149,6 +152,7 @@ public:
 virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool 
bCallDelete) = 0;
 
 virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, 
/*[in]*/bool bCallDelete) = 0;
+virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, 
/*[in]*/bool bCallDelete) = 0;
 
 virtual bool SplitRedline(/*[in]*/const SwPaM rPam) = 0;
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 10159a1..e0eec09 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -772,6 +772,7 @@ public:
 virtual const SwExtraRedlineTbl GetExtraRedlineTbl() const;
 virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool 
bCallDelete);
 virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, 
/*[in]*/bool bCallDelete);
+virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, 
/*[in]*/bool bCallDelete);
 virtual bool SplitRedline(const SwPaM rPam);
 virtual bool DeleteRedline(/*[in]*/const SwPaM rPam, /*[in]*/bool 
bSaveInUndo, /*[in]*/sal_uInt16 nDelType);
 virtual bool DeleteRedline(/*[in]*/const SwStartNode rSection, 
/*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType);
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index a4e0a29..02ff2e0 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -333,6 +333,29 @@ public:
 { return *pRedlineData; }
 };
 
+/// Redline that holds information about a table-cell that had some change
+class SW_DLLPUBLIC SwTableCellRedline : public SwExtraRedline
+{
+private:
+SwRedlineData* pRedlineData;
+const SwTableBox* pTableBox;
+
+public:
+SwTableCellRedline( const SwRedlineData rData, SwTableBox aTableBox );
+SwTableCellRedline( const SwTableCellRedline );
+virtual ~SwTableCellRedline();
+
+/** ExtraData gets copied, the pointer is therefor not taken over by
+ *  the RedLineObject.*/
+void SetExtraData( const SwRedlineExtraData* pData )
+{ pRedlineData-SetExtraData( pData ); }
+const SwRedlineExtraData* GetExtraData() const
+{ return pRedlineData-GetExtraData(); }
+const SwTableBox* GetTableBox() const
+{ return pTableBox; }
+const SwRedlineData GetRedlineData() const
+{ return *pRedlineData; }
+};
 
 class SW_DLLPUBLIC SwRedlineHint : public SfxHint
 {
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index ca12ab2..15cc351 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -4058,4 +4058,68 @@ bool SwDoc::AppendTableRowRedline( SwTableRowRedline* 
pNewRedl, bool bCallDelete
 return ( 0 != pNewRedl ) || bMerged;
 }
 
+SwTableCellRedline::SwTableCellRedline( const SwRedlineData rData, 
SwTableBox aTableBox )
+: pRedlineData( new SwRedlineData( rData ))
+{
+pTableBox = aTableBox;
+}
+
+SwTableCellRedline::SwTableCellRedline( const SwTableCellRedline rCpy )
+: SwExtraRedline( rCpy )
+{
+pTableBox = rCpy.pTableBox;
+}
+

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

2014-02-12 Thread Adam Co

 sw/inc/unocrsrhelper.hxx |2 +-
 sw/source/core/unocore/unocrsrhelper.cxx |2 +-
 sw/source/core/unocore/unotbl.cxx|4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c90bc80feee6283ed6d5d3eb5edbbb3f7199ccb4
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:43:56 2014 +0200

Rename 'makeTableRedline' to 'makeTableRowRedline'

Change-Id: I257ef3cc360c74fb83c65e4be9967e9f84ba9af3
Reviewed-on: https://gerrit.libreoffice.org/7874
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index b50e372..4515e7d 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -121,7 +121,7 @@ namespace SwUnoCursorHelper
 const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  RedlineProperties )
 throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
 
-voidmakeTableRedline( SwTableLine rTableLine, const OUString 
RedlineType,
+voidmakeTableRowRedline( SwTableLine rTableLine, const OUString 
RedlineType,
 const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  RedlineProperties )
 throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
 
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index 116b8b4..640 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1292,7 +1292,7 @@ void makeRedline( SwPaM rPaM,
 throw lang::IllegalArgumentException();
 }
 
-void makeTableRedline( SwTableLine rTableLine,
+void makeTableRowRedline( SwTableLine rTableLine,
 const OUString rRedlineType,
 const uno::Sequence beans::PropertyValue  rRedlineProperties )
 throw (lang::IllegalArgumentException, uno::RuntimeException)
diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index e177150..b265dd6 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1366,8 +1366,8 @@ void SwXTextTableRow::setPropertyValue(const OUString 
rPropertyName,
 sRedlineTypeValue = 
aPropMap.getUnpackedValueOrDefault(RedlineType, sRedlineTypeValue);
 if( sRedlineTypeValue = sRedlineType )
 {
-// Create a 'Table Redline' object
-SwUnoCursorHelper::makeTableRedline( *pLn, sRedlineType, 
tableRowProperties);
+// Create a 'Table Row Redline' object
+SwUnoCursorHelper::makeTableRowRedline( *pLn, 
sRedlineType, tableRowProperties);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Adam Co

 writerfilter/source/dmapper/DomainMapper.cxx|   10 ++
 writerfilter/source/dmapper/TrackChangesHandler.cxx |6 ++
 2 files changed, 16 insertions(+)

New commits:
commit 9010336d0eab3cd0d4f1ac17126900e12ffa846c
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:31:50 2014 +0200

Add code in DOCX importer to handle 'table cell redline'

Change-Id: Ic1e2cb1873dc696311382108868abc4aee00baef
Reviewed-on: https://gerrit.libreoffice.org/7872
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 8c5ace6..4151d89 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3156,6 +3156,14 @@ void DomainMapper::HandleRedline( Sprm rSprm )
 {
 m_pImpl-SetCurrentRedlineToken( ooxml::OOXML_tableRowDelete );
 }
+else if (nSprmId == NS_ooxml::LN_CT_TcPrBase_cellIns)
+{
+m_pImpl-SetCurrentRedlineToken( ooxml::OOXML_tableCellInsert );
+}
+else if (nSprmId == NS_ooxml::LN_CT_TcPrBase_cellDel)
+{
+m_pImpl-SetCurrentRedlineToken( ooxml::OOXML_tableCellDelete );
+}
 
 resolveSprmProps(*this, rSprm );
 // now the properties author, date and id should be available
@@ -3168,6 +3176,8 @@ void DomainMapper::HandleRedline( Sprm rSprm )
 case ooxml::OOXML_ParagraphFormat :
 case ooxml::OOXML_tableRowInsert:
 case ooxml::OOXML_tableRowDelete:
+case ooxml::OOXML_tableCellInsert:
+case ooxml::OOXML_tableCellDelete:
 break;
 default: OSL_FAIL( redline token other than mod, ins, del or table 
row ); break;
 }
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx 
b/writerfilter/source/dmapper/TrackChangesHandler.cxx
index d34dca3..0773fdc 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.cxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx
@@ -75,6 +75,12 @@ uno::Sequencebeans::PropertyValue 
TrackChangesHandler::getRedlineProperties()
 case ooxml::OOXML_tableRowDelete:
 sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_DELETE );
 break;
+case ooxml::OOXML_tableCellInsert:
+sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_INSERT );
+break;
+case ooxml::OOXML_tableCellDelete:
+sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_DELETE );
+break;
 }
 
 pRedlineProperties[0].Name = rPropNameSupplier.GetName( PROP_REDLINE_TYPE 
);
___
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 writerfilter/source

2014-02-12 Thread Adam Co

 sw/inc/unocrsrhelper.hxx   |4 +
 sw/source/core/unocore/unocrsrhelper.cxx   |   57 +
 sw/source/core/unocore/unotbl.cxx  |   19 +
 writerfilter/source/dmapper/TablePropertiesHandler.cxx |   31 +
 4 files changed, 111 insertions(+)

New commits:
commit a8db386ad206029ab8c769856f8c452db8712c2b
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:46:08 2014 +0200

DOCX import sends 'table cell redline' to SW core, and core stores it

This patch adds support in the DOCX importer for the 'table cell redline'
to be sent from the DOCX importer, using UNO (as a property of the
table cell) to the SW core. Once it reaches the 'table cell' - the
'set property' detects this property - and creates an
'SwTableCellRedline' object for it, and adds it to the
'SwExtraRedlineTbl' object.

Change-Id: Iba038f4109d5505b94cea548e73c614b5cc1b637
Reviewed-on: https://gerrit.libreoffice.org/7875
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 4515e7d..deb31f1 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -125,6 +125,10 @@ namespace SwUnoCursorHelper
 const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  RedlineProperties )
 throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
 
+voidmakeTableCellRedline( SwTableBox rTableBox, const OUString 
RedlineType,
+const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  RedlineProperties )
+throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
+
 
 /// @param bTableMode: attributes should be applied to a table selection
 void SetCrsrAttr(SwPaM  rPam, const SfxItemSet  rSet,
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index 640..ad11ac1 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1349,6 +1349,63 @@ void makeTableRowRedline( SwTableLine rTableLine,
 throw lang::IllegalArgumentException();
 }
 
+void makeTableCellRedline( SwTableBox rTableBox,
+const OUString rRedlineType,
+const uno::Sequence beans::PropertyValue  rRedlineProperties )
+throw (lang::IllegalArgumentException, uno::RuntimeException)
+{
+IDocumentRedlineAccess* pRedlineAccess = rTableBox.GetFrmFmt()-GetDoc();
+
+RedlineType_t eType;
+if ( rRedlineType == TableCellInsert )
+{
+eType = nsRedlineType_t::REDLINE_TABLE_CELL_INSERT;
+}
+else if ( rRedlineType == TableCellDelete )
+{
+eType = nsRedlineType_t::REDLINE_TABLE_CELL_DELETE;
+}
+else
+{
+throw lang::IllegalArgumentException();
+}
+
+comphelper::SequenceAsHashMap aPropMap( rRedlineProperties );
+uno::Any aAuthorValue;
+aAuthorValue = aPropMap.getUnpackedValueOrDefault(RedlineAuthor, 
aAuthorValue);
+sal_uInt16 nAuthor = 0;
+OUString sAuthor;
+if( aAuthorValue = sAuthor )
+nAuthor = pRedlineAccess-InsertRedlineAuthor(sAuthor);
+
+OUString sComment;
+uno::Any aCommentValue;
+aCommentValue = aPropMap.getUnpackedValueOrDefault(RedlineComment, 
aCommentValue);
+
+SwRedlineData aRedlineData( eType, nAuthor );
+if( aCommentValue = sComment )
+aRedlineData.SetComment( sComment );
+
+::util::DateTime aStamp;
+uno::Any aDateTimeValue;
+aDateTimeValue = aPropMap.getUnpackedValueOrDefault(RedlineDateTime, 
aDateTimeValue);
+if( aDateTimeValue = aStamp )
+{
+   aRedlineData.SetTimeStamp(
+DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( 
aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) );
+}
+
+SwTableCellRedline* pRedline = new SwTableCellRedline( aRedlineData, 
rTableBox );
+RedlineMode_t nPrevMode = pRedlineAccess-GetRedlineMode( );
+pRedline-SetExtraData( NULL );
+
+pRedlineAccess-SetRedlineMode_intern(nsRedlineMode_t::REDLINE_ON);
+bool bRet = pRedlineAccess-AppendTableCellRedline( pRedline, false );
+pRedlineAccess-SetRedlineMode_intern( nPrevMode );
+if( !bRet )
+throw lang::IllegalArgumentException();
+}
+
 SwAnyMapHelper::~SwAnyMapHelper()
 {
 AnyMapHelper_t::iterator aIt = begin();
diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index b265dd6..da659fd 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1087,6 +1087,25 @@ void SwXCell::setPropertyValue(const OUString 
rPropertyName, const uno::Any aV
 SvxFrameDirectionItem aItem( eDir, RES_FRAMEDIR);
 pBox-GetFrmFmt()-SetFmtAttr(aItem);
 }
+else if  (

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

2014-02-12 Thread Adam Co

 sw/source/core/docnode/nodedump.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c4c1fa13989c8bd4f7a4ba8f57be4c7a40522b8f
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:47:40 2014 +0200

Add XML dumping of the new 'SwTableCellRedline'

Change-Id: I4072130ff0ce712f02d1dd8f12003170116216a2
Reviewed-on: https://gerrit.libreoffice.org/7876
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index c15ba59..b4d455b 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -618,8 +618,11 @@ void SwExtraRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
 writer.startElement( swextraredline );
 {
 const SwTableRowRedline*   pTableRowRedline   = 
dynamic_castconst SwTableRowRedline*(pExtraRedline);
+const SwTableCellRedline*  pTableCellRedline  = 
dynamic_castconst SwTableCellRedline*(pExtraRedline);
 if (pTableRowRedline)
 writer.writeFormatAttribute( extra_redline_type, %s, 
BAD_CAST( table row ) );
+else if (pTableCellRedline)
+writer.writeFormatAttribute( extra_redline_type, %s, 
BAD_CAST( table cell ) );
 else
 writer.writeFormatAttribute( extra_redline_type, %s, 
BAD_CAST( UNKNOWN ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 43318, which changed state.

Bug 43318 Summary: PRINTING standard shapes with bitmap area: filling exceeds 
shape area (regression since 3.3.4)
https://bugs.freedesktop.org/show_bug.cgi?id=43318

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

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

2014-02-12 Thread Adam Co

 sw/source/filter/ww8/attributeoutputbase.hxx |2 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   48 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |1 
 sw/source/filter/ww8/rtfattributeoutput.cxx  |4 ++
 sw/source/filter/ww8/rtfattributeoutput.hxx  |1 
 sw/source/filter/ww8/wrtww8.cxx  |4 ++
 sw/source/filter/ww8/ww8attributeoutput.hxx  |1 
 7 files changed, 61 insertions(+)

New commits:
commit 795e71626e2feeadef64e0535a14acf60ccb3b89
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 13:50:22 2014 +0200

DOCX Export of 'Table Cell Redline' (like insert cell or delete cell)

This patch adds support in the DOCX exporter for exporting the
'table cell redlines', such as 'inserted a table cell',
or 'removed a table cell'.

Change-Id: Ic37d2550691f1090a580dae57d597c8fd09c7ad9
Reviewed-on: https://gerrit.libreoffice.org/7877
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index b4b8764..2557d21 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -240,6 +240,8 @@ public:
 
 virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
 
+virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
+
 virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
 
 virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfo ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f46997f..78b01dc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2006,6 +2006,9 @@ void DocxAttributeOutput::TableCellProperties( 
ww8::WW8TableNodeInfoInner::Point
 
 bool bEcma = GetExport().GetFilter().getVersion( ) == 
oox::core::ECMA_DIALECT;
 
+// Output any table cell redlines if there are any attached to this 
specific cell
+TableCellRedline( pTableTextNodeInfoInner );
+
 // Cell preferred width
 SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )-at( 
pTableTextNodeInfoInner-getCell() );
 if ( pTableTextNodeInfoInner-getCell() )
@@ -2406,6 +2409,51 @@ void DocxAttributeOutput::TableRowRedline( 
ww8::WW8TableNodeInfoInner::Pointer_t
 }
 }
 
+void DocxAttributeOutput::TableCellRedline( 
ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
+const SwTableBox * pTabBox = pTableTextNodeInfoInner-getTableBox();
+
+// search next Redline
+const SwExtraRedlineTbl aExtraRedlineTbl = 
m_rExport.pDoc-GetExtraRedlineTbl();
+for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos  
aExtraRedlineTbl.GetSize(); ++nCurRedlinePos )
+{
+SwExtraRedline* pExtraRedline = 
aExtraRedlineTbl.GetRedline(nCurRedlinePos);
+const SwTableCellRedline* pTableCellRedline = dynamic_castconst 
SwTableCellRedline*(pExtraRedline);
+if (pTableCellRedline  pTableCellRedline-GetTableBox() == pTabBox)
+{
+// Redline for this table cell
+const SwRedlineData aRedlineData = 
pTableCellRedline-GetRedlineData();
+sal_uInt16 nRedlineType = aRedlineData.GetType();
+switch (nRedlineType)
+{
+case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT:
+case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE:
+{
+OString aId( OString::number( m_nRedlineId++ ) );
+const OUString rAuthor( SW_MOD()-GetRedlineAuthor( 
aRedlineData.GetAuthor() ) );
+OString aAuthor( OUStringToOString( rAuthor, 
RTL_TEXTENCODING_UTF8 ) );
+
+OString aDate( DateTimeToOString( 
aRedlineData.GetTimeStamp() ) );
+
+if (nRedlineType == 
nsRedlineType_t::REDLINE_TABLE_CELL_INSERT)
+m_pSerializer-singleElementNS( XML_w, XML_cellIns,
+FSNS( XML_w, XML_id ), aId.getStr(),
+FSNS( XML_w, XML_author ), aAuthor.getStr(),
+FSNS( XML_w, XML_date ), aDate.getStr(),
+FSEND );
+else if (nRedlineType == 
nsRedlineType_t::REDLINE_TABLE_CELL_DELETE)
+m_pSerializer-singleElementNS( XML_w, XML_cellDel,
+FSNS( XML_w, XML_id ), aId.getStr(),
+FSNS( XML_w, XML_author ), aAuthor.getStr(),
+FSNS( XML_w, XML_date ), aDate.getStr(),
+FSEND );
+}
+break;
+};
+}
+}
+}
+
 void DocxAttributeOutput::TableHeight(

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

2014-02-12 Thread Adam Co

 sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableCell.docx  |binary
 sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableCell.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   16 
++
 3 files changed, 16 insertions(+)

New commits:
commit 2eb142f4207f921dfeb6f9d5cd34cb0fb288bdd1
Author: Adam Co rattles2...@gmail.com
Date:   Wed Feb 5 14:57:19 2014 +0200

Add unit-tests for DOCX preservation of 'table cell redline'

Added unit-tests to make sure that 'table cell redlines'
(e.g. - table cell was inserted \ removed) are being round
tripped correctly from a DOCX file.

Change-Id: I773cb51a39654d2640200489d5199361b56396c7
Reviewed-on: https://gerrit.libreoffice.org/7878
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git 
a/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableCell.docx 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableCell.docx
new file mode 100644
index 000..c4d8394
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedTableCell.docx differ
diff --git 
a/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableCell.docx 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableCell.docx
new file mode 100644
index 000..d1450be
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedTableCell.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a41f204..2a4ee6e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2309,6 +2309,22 @@ 
DECLARE_OOXMLEXPORT_TEST(testTrackChangesInsertedTableRow, testTrackChangesInse
 assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tr[2]/w:trPr/w:ins);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedTableCell, 
testTrackChangesDeletedTableCell.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:tcPr/w:cellDel);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesInsertedTableCell, 
testTrackChangesInsertedTableCell.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:tcPr/w:cellIns);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testFdo69649, fdo69649.docx)
 {
 // The DOCX containing the Table of Contents was not exported with correct 
page nos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Jan-Marek Glogowski

 offapi/com/sun/star/text/MailMerge.idl |7 +++
 sw/inc/dbmgr.hxx   |4 ++--
 sw/source/ui/dbui/dbmgr.cxx|7 ++-
 sw/source/ui/inc/unomailmerge.hxx  |   15 +--
 sw/source/ui/uno/unomailmerge.cxx  |   33 -
 5 files changed, 60 insertions(+), 6 deletions(-)

New commits:
commit 1a12777f46954045afbe8fffa6dd199b4b338762
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Dec 22 17:42:20 2013 +0100

Export MailMerge cancel functionality via UNO.

If you start a mail merge jobs via UNO, there is no way to cancel
it. But the functionality is already implemented and used by the
LO internal mail merge dialogs.

This patch adds an optional XCancellable interface to the MailMerge
service and implements it in the SwXMailMerge class.

As the XJob::execute function already uses the SolarMutex to
prevent parallel runs, XCancellable::cancel can be implemented by
storing the SwNewDBMgr in the private variable m_pMgr, protected by
a mutex.

The bCancel member has to be converted from a bitfield value to a
real boolean, because otherwise all bitfield values would have to
be protected by a mutex. Bitfield assignments aren't atomic as you
always have to replace at least a byte.

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

diff --git a/offapi/com/sun/star/text/MailMerge.idl 
b/offapi/com/sun/star/text/MailMerge.idl
index f669d71..9741182 100644
--- a/offapi/com/sun/star/text/MailMerge.idl
+++ b/offapi/com/sun/star/text/MailMerge.idl
@@ -26,6 +26,7 @@
 #include com/sun/star/beans/XPropertySet.idl
 #include com/sun/star/text/XMailMergeBroadcaster.idl
 #include com/sun/star/sdb/DataAccessDescriptor.idl
+#include com/sun/star/util/XCancellable.idl
 
 
  module com {  module sun {  module star {  module text {
@@ -51,6 +52,12 @@ published service MailMerge
  */
 interface com::sun::star::task::XJob;
 
+/** interface to cancel the current mail merge job.
+
+@since LibreOffice 4.3
+ */
+[optional] interface com::sun::star::util::XCancellable;
+
 /** interface to access the services properties.
  */
 interface com::sun::star::beans::XPropertySet;
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 009584f..e5ab96e 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -190,10 +190,9 @@ friend class SwConnectionDisposedListener_Impl;
 OUStringsEMailAddrFld;  /// Mailing: Column name of email 
address.
 OUStringsSubject;   /// Mailing: Subject
 OUStringsAttached;  /// Mailing: Attached Files.
+sal_BoolbCancel;/// Mail merge canceled.
 sal_BoolbInitDBFields : 1;
 sal_BoolbSingleJobs : 1;/// Printing job when called from 
Basic.
-sal_BoolbCancel : 1;/// Mail merge save canceled.
-
 sal_BoolbInMerge: 1;/// merge process active
 sal_BoolbMergeSilent : 1;   /// suppress display of 
dialogs/boxes (used when called over API)
 sal_BoolbMergeLock : 1; /** prevent update of database 
fields while document is
@@ -233,6 +232,7 @@ public:
 /// Merging of data records into fields.
 sal_BoolMergeNew( const SwMergeDescriptor rMergeDesc );
 sal_BoolMerge(SwWrtShell* pSh);
+voidMergeCancel();
 
 /// Initialize data fields that lack name of database.
 inline sal_Bool IsInitDBFields() const  { return bInitDBFields; }
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 63d70d1..192d29e 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1355,10 +1355,15 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* 
pSourceShell,
 return bNoError;
 }
 
+void SwNewDBMgr::MergeCancel()
+{
+bCancel = sal_True;
+}
+
 IMPL_LINK_INLINE_START( SwNewDBMgr, PrtCancelHdl, Button *, pButton )
 {
 pButton-GetParent()-Hide();
-bCancel = sal_True;
+MergeCancel();
 return 0;
 }
 IMPL_LINK_INLINE_END( SwNewDBMgr, PrtCancelHdl, Button *, pButton )
diff --git a/sw/source/ui/inc/unomailmerge.hxx 
b/sw/source/ui/inc/unomailmerge.hxx
index 2be74c6..09d4beb 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/ui/inc/unomailmerge.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_UNOMAILMERGE_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_UNOMAILMERGE_HXX
 
-#include cppuhelper/implbase5.hxx
+#include cppuhelper/implbase6.hxx
 #include cppuhelper/interfacecontainer.hxx
 #include unotools/configitem.hxx
 
@@ -31,6 +31,7 @@
 #include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/beans/PropertyChangeEvent.hpp
 #include

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

2014-02-12 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/dml-zorder.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
 sw/source/filter/ww8/docxsdrexport.cxx   |3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 9e3e7f89a0f1faf67b438098281ed6f659eac91e
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Feb 12 11:17:36 2014 +0100

DOCX export: avoid 0 or 1 relativeHeight when it's a real value

The z-order can be any number, Word uses kind of random 32bit integers,
we count from 0. It turns out 0 and 1 may have some special meaning, as
counting from 2 (instead of 0) fixes the visibility the problems in the
bugdoc.

Change-Id: I695a625fc0ab8206cc09896bcf02ff7689f1defc

diff --git a/sw/qa/extras/ooxmlexport/data/dml-zorder.odt 
b/sw/qa/extras/ooxmlexport/data/dml-zorder.odt
new file mode 100644
index 000..ba799a5
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/dml-zorder.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2a4ee6e..9bdbe36 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2277,6 +2277,15 @@ DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle, 
dml-shape-title.docx)
 CPPUNIT_ASSERT_EQUAL(OUString(Description), 
getPropertyOUString(getShape(1), Description));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDmlZorder, dml-zorder.odt)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+// This was 0: causing that in Word, the second shape was on top, while 
in the original odt the first shape is on top.
+assertXPath(pXmlDoc, 
/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Choice/w:drawing/wp:anchor,
 relativeHeight, 2);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, 
testTrackChangesDeletedParagraphMark.docx)
 {
 xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 205751b..a99f5ea 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -203,7 +203,8 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* 
pFrmFmt, const Size rS
 attrList-add(XML_layoutInCell, 1);
 attrList-add(XML_allowOverlap, 1);   // TODO
 if (const SdrObject* pObj = pFrmFmt-FindRealSdrObject())
-attrList-add(XML_relativeHeight, 
OString::number(pObj-GetOrdNum()));
+// It seems 0 and 1 have special meaning: just start counting from 
2 to avoid issues with that.
+attrList-add(XML_relativeHeight, 
OString::number(pObj-GetOrdNum() + 2));
 else
 // relativeHeight is mandatory attribute, if value is not present, 
we must write default value
 attrList-add(XML_relativeHeight, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - dictionaries

2014-02-12 Thread Olivier R

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

New commits:
commit 8b6b62e9639cbae97a1ec0859d189d1f7d44bc7b
Author: Olivier R olivier.nore...@gmail.com
Date:   Tue Dec 10 17:46:53 2013 +0100

Updated core
Project: dictionaries  676c158920ab055e7532116a2491be76b5871e56

diff --git a/dictionaries b/dictionaries
index 6a2ce1e..676c158 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 6a2ce1ed9e1760d4e0b05b1ec7560df345b4c54d
+Subproject commit 676c158920ab055e7532116a2491be76b5871e56
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations

2014-02-12 Thread Christian Lohmaier

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

New commits:
commit 3052cfd954ba16a01e4cf2e97ee493d6bf0a4a43
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Feb 11 17:31:48 2014 +0100

Updated core
Project: translations  44e8f81735ce29b81fc6593d29c0e0f5e21f4f02

diff --git a/translations b/translations
index cbf6769..44e8f81 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit cbf6769da4f56dd9df0624895673a40f70878c5a
+Subproject commit 44e8f81735ce29b81fc6593d29c0e0f5e21f4f02
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Vort

 i18npool/source/localedata/data/et_EE.xml|4 +-
 sdext/source/pdfimport/tree/drawtreevisiting.cxx |   32 +++
 2 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 9616b786adb9491f7c26fc0f1053e7b3d1b35f27
Author: Vort vv...@yandex.ru
Date:   Wed Feb 12 12:35:26 2014 +0200

fdo#45003 PDF import: Implementing linejoin and linecap properties

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

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx 
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index e3b0135..bd44686 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -35,6 +35,8 @@
 #include comphelper/processfactory.hxx
 #include com/sun/star/i18n/ScriptType.hpp
 #include com/sun/star/i18n/DirectionProperty.hpp
+#include com/sun/star/rendering/PathCapType.hpp
+#include com/sun/star/rendering/PathJoinType.hpp
 
 #include string.h
 
@@ -793,6 +795,36 @@ void DrawXmlFinalizer::visit( PolyPolyElement elem, const 
std::list Element* 
 
 aGCProps[ svg:stroke-width ] = OUString::number( 
aVec.getLength() );
 }
+OUString strokeLinejoinValue;
+OUString strokeLinecapValue;
+switch (rGC.LineJoin)
+{
+default:
+case rendering::PathJoinType::MITER:
+strokeLinejoinValue = miter;
+break;
+case rendering::PathJoinType::ROUND:
+strokeLinejoinValue = round;
+break;
+case rendering::PathJoinType::BEVEL:
+strokeLinejoinValue = bevel;
+break;
+}
+switch (rGC.LineCap)
+{
+default:
+case rendering::PathCapType::BUTT:
+strokeLinecapValue = butt;
+break;
+case rendering::PathCapType::ROUND:
+strokeLinecapValue = round;
+break;
+case rendering::PathCapType::SQUARE:
+strokeLinecapValue = square;
+break;
+}
+aGCProps[ draw:stroke-linejoin ] = strokeLinejoinValue;
+aGCProps[ svg:stroke-linecap ] = strokeLinecapValue;
 }
 else
 {
commit 51fc602184ab8d1afbfb183a3d25b1122c8b1e29
Author: Mihkel TÃµnnov mihh...@gmail.com
Date:   Tue Feb 11 23:34:57 2014 +0200

corrected Estonian [et-EE] quote characters

Namely: Estonian has several sets of correct quote mark glyphs for double
quotes (ââ, ââ, Â«Â» are all common), however the Institute of 
Estonian
Language [1] recommends using the first of these, i.e. ââ (99 low, 99
high) [2]. As for single quotes, Estonian texts rarely use them, except in
a few fields such as linguistics and biology -- and both ââ (9-9) and 
ââ
(6-9) are considered correct [2, 3]. However, apostrophe in the beginning
of a word (which is effectively the same as a starting single quote) can
also be used to indicate omitted character(s) -- but there, only â (9) is
correct [3].

[1] Eesti Keele Instituut, the main official body which maintains and
studies the usage of Estonian language; http://en.eki.ee/index.php
[2] The last page of
https://docs.google.com/viewer?url=http://keeleabi.eki.ee/pdf/164.pdf (in
Estonian)
[3] Handbook of Estonian Language,
http://www.eki.ee/books/ekk09/index.php?p=2p1=11id=86 (in Estonian)

Change-Id: If88e6e03e3e4aa1919a25dbe2fa2ffc8c9a04f4a

diff --git a/i18npool/source/localedata/data/et_EE.xml 
b/i18npool/source/localedata/data/et_EE.xml
index 687b093..3bee9cc 100644
--- a/i18npool/source/localedata/data/et_EE.xml
+++ b/i18npool/source/localedata/data/et_EE.xml
@@ -42,10 +42,10 @@
   LongDateYearSeparator /LongDateYearSeparator
 /Separators
 Markers
-  QuotationStartâ/QuotationStart
+  QuotationStartâ/QuotationStart
   QuotationEndâ/QuotationEnd
   DoubleQuotationStartâ/DoubleQuotationStart
-  DoubleQuotationEndâ/DoubleQuotationEnd
+  DoubleQuotationEndâ/DoubleQuotationEnd
 /Markers
 TimeAMAM/TimeAM
 TimePMPM/TimePM
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Stephan Bergmann

 sw/source/core/unocore/unostyle.cxx |   14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 7885d938cb425df7b759c0a42871870921394eb6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Feb 11 16:31:47 2014 +0100

nPDescPos is never read

...since b48f4e99e1d2935f84bc2fac1e6670dd83939673 #86296# use page 
descriptor
only if necessary, and this nicely removes the odd

  for(i = 0; i  nPDescCount + 1; i++)

loop that read past the end of the maPageDescs vector.

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

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index a1bc926..8ab87c1 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1588,14 +1588,12 @@ struct SwStyleBase_Impl
 SfxItemSet* pItemSet;
 
 const OUString rStyleName;
-sal_uInt16  nPDescPos;
 
 SwStyleBase_Impl(SwDoc rSwDoc, const OUString rName) :
 rDoc(rSwDoc),
 pOldPageDesc(0),
 pItemSet(0),
-rStyleName(rName),
-nPDescPos(0x)
+rStyleName(rName)
 {}
 
 ~SwStyleBase_Impl(){ delete pItemSet; }
@@ -1624,7 +1622,6 @@ const SwPageDesc SwStyleBase_Impl::GetOldPageDesc()
 if(rDesc.GetName() == rStyleName)
 {
 pOldPageDesc =  rDesc;
-nPDescPos = i;
 break;
 }
 }
@@ -1639,15 +1636,6 @@ const SwPageDesc SwStyleBase_Impl::GetOldPageDesc()
 break;
 }
 }
-for(i = 0; i  nPDescCount + 1; i++)
-{
-const SwPageDesc rDesc = rDoc.GetPageDesc( i );
-if(rDesc.GetName() == rStyleName)
-{
-nPDescPos = i;
-break;
-}
-}
 }
 }
 return *pOldPageDesc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - jvmfwk/plugins

2014-02-12 Thread Stephan Bergmann

 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09749c7751e4c12a898f0c2f98b0c71ebe67ba6d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Feb 11 18:36:42 2014 +0100

Don't set JAVA_HOME on Mac OS X

...for one, it doesn't appear necessary there (needed for awt), and for
another setting it according to Oracle's JRE 7 would prevent a subsequent
visit to the Advanced preferences pane from listing Apple's JRE 6, as 
launching
that java and reading its system properties would be fooled by the 
JAVA_HOME and
report the Oracle system properties instead.

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

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 981b827..a3449c3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -588,7 +588,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
  return JFW_PLUGIN_E_VM_CREATION_FAILED;
  }
 
-#ifdef UNX
+#if defined UNX  !defined MACOSX
 //Setting the JAVA_HOME is needed for awt
 OUString javaHome(JAVA_HOME=);
 OUString sPathLocation;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Stephan Bergmann

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

New commits:
commit 95ed6a2c6d7b7f7dc5cebb25d1c5defabf8a21c0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Feb 11 17:28:43 2014 +0100

Do not reference a dangling OUString

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

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 8ab87c1..f94adc6 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1587,7 +1587,7 @@ struct SwStyleBase_Impl
 rtl::Reference SwDocStyleSheet  mxNewBase;
 SfxItemSet* pItemSet;
 
-const OUString rStyleName;
+OUString rStyleName;
 
 SwStyleBase_Impl(SwDoc rSwDoc, const OUString rName) :
 rDoc(rSwDoc),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenGL on Linux

2014-02-12 Thread Philipp Weissenbacher

Hallo Markus,

Op 10 feb. 2014 00:11 schreef Markus Mohrhard 
markus.mohrh...@googlemail.com:

 Do you by chance run it in Vmware? You are only the third one reporting a
2.1 OpenGL version. Ignoring the base line we are at just yours and
Krunoslav Šebetic's. Actually these two are also the ones that don't
support anti-aliasing which even if we manage to support these old versions
results in ugly output.


No, I'm not running it in VMware. The hardware is almost 7 years old now.
The graphics card itself only supports OpenGL 2.0 (according to Intel; see
[1]).

Please don't bother supporting it. I'll replace it soon enough. I was just
generally curious whether it'd be realistic to have LO support such old
hardware. :)

Cheers/Gruß,
Philipp

[1] http://www.intel.com/support/graphics/sb/CS-033757.htm?wapkw=opengl+2.0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-12 Thread Stephan Bergmann

 sw/source/core/unocore/unostyle.cxx |   14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 3e17c731cbe11c79c3283ffefecf4401bd8cb08e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Feb 11 16:31:47 2014 +0100

nPDescPos is never read

...since b48f4e99e1d2935f84bc2fac1e6670dd83939673 #86296# use page 
descriptor
only if necessary, and this nicely removes the odd

  for(i = 0; i  nPDescCount + 1; i++)

loop that read past the end of the maPageDescs vector.

(cherry picked from commit 7fb6ae28ae7bebd67c2b9bf2cf517f1f7bb2777e)
Conflicts:
sw/source/core/unocore/unostyle.cxx

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

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 0e090be..1631a49 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1589,14 +1589,12 @@ struct SwStyleBase_Impl
 SfxItemSet* pItemSet;
 
 const String   rStyleName;
-sal_uInt16  nPDescPos;
 
 SwStyleBase_Impl(SwDoc rSwDoc, const String rName) :
 rDoc(rSwDoc),
 pOldPageDesc(0),
 pItemSet(0),
-rStyleName(rName),
-nPDescPos(0x)
+rStyleName(rName)
 {}
 
 ~SwStyleBase_Impl(){ delete pItemSet; }
@@ -1625,7 +1623,6 @@ const SwPageDesc SwStyleBase_Impl::GetOldPageDesc()
 if(rDesc.GetName() == rStyleName)
 {
 pOldPageDesc =  rDesc;
-nPDescPos = i;
 break;
 }
 }
@@ -1640,15 +1637,6 @@ const SwPageDesc SwStyleBase_Impl::GetOldPageDesc()
 break;
 }
 }
-for(i = 0; i  nPDescCount + 1; i++)
-{
-const SwPageDesc rDesc = rDoc.GetPageDesc( i );
-if(rDesc.GetName() == rStyleName)
-{
-nPDescPos = i;
-break;
-}
-}
 }
 }
 return *pOldPageDesc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Stephan Bergmann

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

New commits:
commit a682fd572a2056eaaed9443bad70303879c4eec4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Feb 11 17:28:43 2014 +0100

Do not reference a dangling OUString

(cherry picked from commit 151f3d665581d887cda1e36b817afb124c5c789e)
Conflicts:
sw/source/core/unocore/unostyle.cxx

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

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 1631a49..47b1acb 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1588,7 +1588,7 @@ struct SwStyleBase_Impl
 rtl::Reference SwDocStyleSheet  mxNewBase;
 SfxItemSet* pItemSet;
 
-const String   rStyleName;
+String   rStyleName;
 
 SwStyleBase_Impl(SwDoc rSwDoc, const String rName) :
 rDoc(rSwDoc),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - swext/mediawiki

2014-02-12 Thread Julien Nabet

 swext/mediawiki/src/filter/odt2mediawiki.xsl |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 708200d8532c5c3372978e5fb63c65d259a65394
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Feb 11 22:39:00 2014 +0100

Resolves: fdo#74820 Failed to recognized Heading 6-Export to MediaWiki

See http://www.mediawiki.org/wiki/Help:Formatting

Change-Id: I6cf50e957d3aef6bff6e86a031da175d5544e98c
Reviewed-on: https://gerrit.libreoffice.org/7998
Reviewed-by: Joren De Cuyper jore...@libreoffice.org
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 6a44ecd..6992249 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -296,14 +296,14 @@
Function generating a wiki heading prefix.

@param level
-   The heading level. The value must be between 1 and 5.
+   The heading level. The value must be between 1 and 6.
--
template name=mk-heading-prefix
param name=level/
choose
-   when test=$level gt; 5
+   when test=$level gt; 6
call-template name=mk-heading-prefix
-   with-param name=level select=5/
+   with-param name=level select=6/
/call-template
/when
when test=$level gt; 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Michael Stahl

 sd/source/ui/unoidl/sddetect.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 6a6e61368f252c24bb761417b78dceb9b7dea210
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 10 16:45:27 2014 +0100

fdo#73363: sd: fix mis-detection of Visio files as PPT

SdFilterDetect::detect() erroneously detects all binary MSO files, and
because the Visio types would be checked after PPT, Visio is pre-empted.

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

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 0fddd1b..e8ee02e 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -371,6 +371,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 else
 pFilter = SfxFilter::GetFilterByName( 
pFilterPowerPoint97);
 }
+else
+{
+pFilter = 0;
+}
 }
 else
 {
@@ -423,6 +427,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 }
 }
 }
+else
+{
+pFilter = 0;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Stephan Bergmann

 comphelper/source/property/propertycontainer.cxx |4 -
 include/comphelper/propertycontainer.hxx |8 ---
 include/svtools/toolboxcontroller.hxx|   34 +---
 svtools/source/uno/toolboxcontroller.cxx |   47 +--
 4 files changed, 43 insertions(+), 50 deletions(-)

New commits:
commit 307684b2c735947e81aa061b8e16fa197fc15857
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Feb 12 12:02:17 2014 +0100

Clean-up svt::ToolboxController inheritance

...and fix its XTypeProvider::getTypes

Change-Id: Ic36b17b14da21a29ca5530dd5e2ad03ee3da0782

diff --git a/include/svtools/toolboxcontroller.hxx 
b/include/svtools/toolboxcontroller.hxx
index 021fe41..1717821 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -30,7 +30,7 @@
 #include com/sun/star/uno/XComponentContext.hpp
 #include com/sun/star/util/XUpdatable.hpp
 #include com/sun/star/util/XURLTransformer.hpp
-#include cppuhelper/weak.hxx
+#include cppuhelper/implbase5.hxx
 #include cppuhelper/interfacecontainer.hxx
 #include comphelper/broadcasthelper.hxx
 #include comphelper/proparrhlp.hxx
@@ -46,15 +46,17 @@ class ToolBox;
 namespace svt
 {
 
-class SVT_DLLPUBLIC ToolboxController : public 
::com::sun::star::frame::XStatusListener,
-  public ::com::sun::star::frame::XToolbarController,
-  public ::com::sun::star::lang::XInitialization,
-  public ::com::sun::star::util::XUpdatable,
-  public ::com::sun::star::lang::XComponent,
+typedef cppu::WeakImplHelper5
+css::frame::XStatusListener, css::frame::XToolbarController,
+css::lang::XInitialization, css::util::XUpdatable,
+css::lang::XComponent 
+ToolboxController_Base;
+
+class SVT_DLLPUBLIC ToolboxController :
+  public ToolboxController_Base,
   public ::comphelper::OMutexAndBroadcastHelper,
   public ::comphelper::OPropertyContainer,
-  public ::comphelper::OPropertyArrayUsageHelper 
ToolboxController ,
-  public ::cppu::OWeakObject
+  public ::comphelper::OPropertyArrayUsageHelper 
ToolboxController 
 {
 private:
 sal_Bool  m_bSupportVisible;
@@ -76,6 +78,8 @@ class SVT_DLLPUBLIC ToolboxController : public 
::com::sun::star::frame::XStatusL
 virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const 
::com::sun::star::uno::Type aType ) throw 
(::com::sun::star::uno::RuntimeException);
 virtual void SAL_CALL acquire() throw ();
 virtual void SAL_CALL release() throw ();
+virtual css::uno::Sequencecss::uno::Type SAL_CALL getTypes()
+throw (css::uno::RuntimeException);
 
 // XInitialization
 virtual void SAL_CALL initialize( const 
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any  aArguments ) 
throw (::com::sun::star::uno::Exception, 
::com::sun::star::uno::RuntimeException);
diff --git a/svtools/source/uno/toolboxcontroller.cxx 
b/svtools/source/uno/toolboxcontroller.cxx
index e66d7c5..7b8f9af 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -54,7 +54,6 @@ ToolboxController::ToolboxController(
 const Reference XFrame  xFrame,
 const OUString aCommandURL ) :
 OPropertyContainer(GetBroadcastHelper())
-,   OWeakObject()
 ,   m_bSupportVisible(sal_False)
 ,   m_bInitialized( sal_False )
 ,   m_bDisposed( sal_False )
@@ -81,7 +80,6 @@ ToolboxController::ToolboxController(
 
 ToolboxController::ToolboxController() :
 OPropertyContainer(GetBroadcastHelper())
-,   OWeakObject()
 ,   m_bSupportVisible(sal_False)
 ,   m_bInitialized( sal_False )
 ,   m_bDisposed( sal_False )
@@ -137,34 +135,31 @@ Reference XLayoutManager  
ToolboxController::getLayoutManager() const
 Any SAL_CALL ToolboxController::queryInterface( const Type rType )
 throw ( RuntimeException )
 {
-Any a = ::cppu::queryInterface(
-rType ,
-static_cast XToolbarController* ( this ),
-static_cast XStatusListener* ( this ),
-static_cast XEventListener* ( this ),
-static_cast XInitialization* ( this ),
-static_cast XComponent* ( this ),
-static_cast XUpdatable* ( this ));
-if ( !a.hasValue())
-{
-a = ::cppu::queryInterface(rType
-,static_castXPropertySet*(this)
-,static_castXMultiPropertySet*(this)
-,static_castXFastPropertySet*(this));
-if (!a.hasValue())
-return OWeakObject::queryInterface( rType );
-}
-return a;
+css::uno::Any a(ToolboxController_Base::queryInterface(rType));
+return a.hasValue() ? a : OPropertyContainer::queryInterface(rType);
 }
 
 void SAL_CALL

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

2014-02-12 Thread Andrzej Hunt

 sot/source/base/formats.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c47db038f98aaf7aec3cbe57c4e5683591afa23e
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Fri Feb 7 18:18:42 2014 +

fdo#52547 SOT: Prefer embedding image data to embedding linked image.

When copying an image from e.g. Firefox or Chromium the clipboard
will contain both the image itself, and the url of the image --
presumably it makes more sense to store the image data itself if
it is available -- the order of the items in the *_FREE_AREA_Copy
defines the order of preference for which data in the clipboard
should be used.

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

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 46d43c2..c31304c 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -857,9 +857,6 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
-{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
-{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },   \
 { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },  \
 { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },  \
@@ -871,6 +868,9 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
+{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
+{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
+{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_LINK, EXCHG_OUT_ACTION_INSERT_DDE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_SVIM, EXCHG_OUT_ACTION_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
 { 0x, 0, 0 }   
   \
@@ -1036,9 +1036,6 @@ static SotAction_Impl const 
aEXCHG_DEST_SCDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_BIFF_5, EXCHG_IN_ACTION_COPY | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },  \
 { SOT_FORMATSTR_ID_BIFF__5,EXCHG_IN_ACTION_COPY | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },  \
-{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
-{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
-{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },  \
 { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
 {

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

2014-02-12 Thread Maxim Monastirsky

 sc/source/ui/drawfunc/drtxtob.cxx |  295 +++---
 1 file changed, 118 insertions(+), 177 deletions(-)

New commits:
commit a90b2b20fb15a9187ec43bb9c448cbedaeb30633
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Mon Feb 10 23:44:36 2014 +0200

sc: refactor ScDrawTextObjectBar::ExecuteAttr

Avoid code duplication, and make some actions to not depend
on args.

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

diff --git a/sc/source/ui/drawfunc/drtxtob.cxx 
b/sc/source/ui/drawfunc/drtxtob.cxx
index 6271824..5f71ce6 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -668,16 +668,113 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest rReq )
 {
 SdrView*pView = pViewData-GetScDrawView();
 const SfxItemSet*   pArgs = rReq.GetArgs();
-sal_uInt16  nSlot = rReq.GetSlot();
+sal_uInt16  nSlot = rReq.GetSlot();
 
-sal_Bool bArgsInReq = ( pArgs != NULL );
-if ( !bArgsInReq )
+SfxItemSet aEditAttr( pView-GetModel()-GetItemPool() );
+pView-GetAttributes( aEditAttr );
+SfxItemSet  aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
+
+bool bSet = true;
+switch ( nSlot )
 {
-SfxItemSet aEditAttr(pView-GetModel()-GetItemPool());
-pView-GetAttributes(aEditAttr);
-SfxItemSet  aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
-sal_BoolbDone = sal_True;
+case SID_ALIGNLEFT:
+case SID_ALIGN_ANY_LEFT:
+case SID_ATTR_PARA_ADJUST_LEFT:
+aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) );
+break;
+
+case SID_ALIGNCENTERHOR:
+case SID_ALIGN_ANY_HCENTER:
+case SID_ATTR_PARA_ADJUST_CENTER:
+aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
+break;
+
+case SID_ALIGNRIGHT:
+case SID_ALIGN_ANY_RIGHT:
+case SID_ATTR_PARA_ADJUST_RIGHT:
+aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
+break;
+
+case SID_ALIGNBLOCK:
+case SID_ALIGN_ANY_JUSTIFIED:
+case SID_ATTR_PARA_ADJUST_BLOCK:
+aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST ) );
+break;
+
+case SID_ATTR_PARA_LINESPACE_10:
+{
+SvxLineSpacingItem aItem( SVX_LINESPACE_ONE_LINE, EE_PARA_SBL 
);
+aItem.SetPropLineSpace( 100 );
+aNewAttr.Put( aItem );
+}
+break;
 
+case SID_ATTR_PARA_LINESPACE_15:
+{
+SvxLineSpacingItem aItem( SVX_LINESPACE_ONE_POINT_FIVE_LINES, 
EE_PARA_SBL );
+aItem.SetPropLineSpace( 150 );
+aNewAttr.Put( aItem );
+}
+break;
+
+case SID_ATTR_PARA_LINESPACE_20:
+{
+SvxLineSpacingItem aItem( SVX_LINESPACE_TWO_LINES, EE_PARA_SBL 
);
+aItem.SetPropLineSpace( 200 );
+aNewAttr.Put( aItem );
+}
+break;
+
+case SID_SET_SUPER_SCRIPT:
+{
+SvxEscapementItem aItem(EE_CHAR_ESCAPEMENT);
+SvxEscapement eEsc = (SvxEscapement) ( (const 
SvxEscapementItem)
+aEditAttr.Get( EE_CHAR_ESCAPEMENT ) 
).GetEnumValue();
+
+if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT )
+aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+else
+aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT );
+aNewAttr.Put( aItem );
+}
+break;
+
+case SID_SET_SUB_SCRIPT:
+{
+SvxEscapementItem aItem(EE_CHAR_ESCAPEMENT);
+SvxEscapement eEsc = (SvxEscapement) ( (const 
SvxEscapementItem)
+aEditAttr.Get( EE_CHAR_ESCAPEMENT ) 
).GetEnumValue();
+
+if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT )
+aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+else
+aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT );
+aNewAttr.Put( aItem );
+}
+break;
+
+case SID_TABLE_VERT_NONE:
+case SID_TABLE_VERT_CENTER:
+case SID_TABLE_VERT_BOTTOM:
+{
+SdrTextVertAdjust eTVA = SDRTEXTVERTADJUST_TOP;
+if (nSlot == SID_TABLE_VERT_CENTER)
+eTVA = SDRTEXTVERTADJUST_CENTER;
+else if (nSlot == SID_TABLE_VERT_BOTTOM)
+eTVA = SDRTEXTVERTADJUST_BOTTOM;
+aNewAttr.Put(SdrTextVertAdjustItem(eTVA));
+}
+break;
+
+default:
+bSet = false;
+

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

2014-02-12 Thread Maxim Monastirsky

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   24 
++
 1 file changed, 24 insertions(+)

New commits:
commit 729b386ee0f33d8d5e4c96f5bd2894d51b1c7476
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Tue Feb 11 10:05:07 2014 +0200

Add some missing commands

This will load icons for the relevant sidebar buttons (in
paragraph panel, used with a drawing object).

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 7d3525e..5c75e98 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1698,6 +1698,30 @@
   value1/value
 /prop
   /node
+  node oor:name=.uno:CellVertTop oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USTop/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:CellVertCenter oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USCenter ( vertical )/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:CellVertBottom oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USBottom/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
 /node
 node oor:name=Popups
   node oor:name=.uno:AuditMenu oor:op=replace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Maxim Monastirsky

 sc/source/ui/drawfunc/futext.cxx |3 +++
 sc/source/ui/view/drawview.cxx   |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 501a0142ec67460e60b23cae8127b3c8aa5874e9
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Tue Feb 11 12:06:53 2014 +0200

Invalidate SID_TABLE_VERT_

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

diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 2016c26..e20aac8 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -79,6 +79,9 @@ static void lcl_InvalidateAttribs( SfxBindings rBindings )
 rBindings.Invalidate( SID_TEXTDIRECTION_TOP_TO_BOTTOM );
 rBindings.Invalidate( SID_ATTR_PARA_LEFT_TO_RIGHT );
 rBindings.Invalidate( SID_ATTR_PARA_RIGHT_TO_LEFT );
+rBindings.Invalidate( SID_TABLE_VERT_NONE );
+rBindings.Invalidate( SID_TABLE_VERT_CENTER );
+rBindings.Invalidate( SID_TABLE_VERT_BOTTOM );
 // pseudo slots for Format menu
 rBindings.Invalidate( SID_ALIGN_ANY_LEFT );
 rBindings.Invalidate( SID_ALIGN_ANY_HCENTER );
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index fde4f9c..7f6a756 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -199,6 +199,9 @@ void ScDrawView::InvalidateDrawTextAttrs()
 rBindings.Invalidate( SID_TEXTDIRECTION_TOP_TO_BOTTOM );
 rBindings.Invalidate( SID_ATTR_PARA_LEFT_TO_RIGHT );
 rBindings.Invalidate( SID_ATTR_PARA_RIGHT_TO_LEFT );
+rBindings.Invalidate( SID_TABLE_VERT_NONE );
+rBindings.Invalidate( SID_TABLE_VERT_CENTER );
+rBindings.Invalidate( SID_TABLE_VERT_BOTTOM );
 // pseudo slots for Format menu
 rBindings.Invalidate( SID_ALIGN_ANY_LEFT );
 rBindings.Invalidate( SID_ALIGN_ANY_HCENTER );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Noel Grandin

 svtools/source/svhtml/parhtml.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit b16f90f33143e6c8c9e8e2fa9cc55797b5bbff12
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 10:08:43 2014 +0200

remove code in dead HTML_BEHAVIOUR #define

git grep found nowhere in the codebase that this define is being
set.

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

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index b892cc4..5b45f94 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1600,17 +1600,10 @@ int HTMLParser::FilterPRE( int nToken )
 {
 switch( nToken )
 {
-#ifdef HTML_BEHAVIOUR
-// These become LFs according to the definition
-case HTML_PARABREAK_ON:
-case HTML_LINEBREAK:
-nToken = HTML_NEWPARA;
-#else
 // in Netscape they only have impact in not empty paragraphs
 case HTML_PARABREAK_ON:
 nToken = HTML_LINEBREAK;
 case HTML_LINEBREAK:
-#endif
 case HTML_NEWPARA:
 nPre_LinePos = 0;
 if( bPre_IgnoreNewPara )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo73148 Add new Excel 2010 function AGGREGATE to calc

2014-02-12 Thread Winfried Donkers

Hi Eike,

As you know I am working on the function AGGREGATE.
This function seems to be an expansion of SUBTOTAL and I have a working version 
of AGGREGATE which can handle all 19 functions.

However, the second argument of AGGREGATE (options) is somewhat problematic.
There are 7 different combinations of values to be ignored in the evaluation 
range, essentially combinations of ignore hidden rows (not hidden columns or 
hidden cells), ignore error values and ignore nested SUBTOTAL/AGGREGATE 
functions.
I cannot use the Auto Filter as used by calc for SUBTOTAL.
I don't want to reinvent wheels, nor do I want to rewrite all 19 functions to 
accomodate the options of AGGREGATE unless really neccessary.

Do you have any suggestions for an efficient implementation of these options?

To make a little clearer what I'm rambling about, the attached code snippet 
shows my current version of AGGREGATE.



Winfried




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

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54938

--- Comment #57 from Stephan Bergmann sberg...@redhat.com ---
(In reply to comment #55)
 I'm trying to adjust PopupMenuToolbarController
 (framework/source/uielement/popuptoolbarcontroller.cxx), but I'm getting
 some errors.

There's two potential approaches.

First, check whether all derivatives of svt::ToolboxController are
implementations of UNO services, so should all implement
css::uno::XServiceInfo, so include that directly in svt::ToolboxController_Base
(cf.
http://cgit.freedesktop.org/libreoffice/core/commit/?id=307684b2c735947e81aa061b8e16fa197fc15857
Clean-up svt::ToolboxController inheritance).

Or, if that's not feasible, use cppu::ImplInheritanceHelper1
(cppuhelper/implbase1.hxx) to derive framework::PopupMenuToolbarController from
both svt::ToolboxController and css::uno::XServiceInfo.

-- 
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 67350] sanity check utility for help ids

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=67350

--- Comment #6 from Caolán McNamara caol...@redhat.com ---
yeah the : is the only hack on names

-- 
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 54938] Adapt supportsService implementations to cppu::supportsService

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54938

--- Comment #58 from Stephan Bergmann sberg...@redhat.com ---
(In reply to comment #56)
 I tried to convert dbaccess/source/inc/apitools.hxx, but I get this:
 
 In member function ‘virtual sal_Bool dbaccess::OQuery::supportsService(const
 rtl::OUString)’:
 ./dbaccess/source/inc/apitools.hxx:81:57: error:
 ‘com::sun::star::lang::XServiceInfo’ is an ambiguous base of
 ‘dbaccess::OQuery’
  return cppu::supportsService(this, _rServiceName);
 
 Do you have any idea? In this case supportsService is a macro.

Multiple inheritance of the same UNO interface does happen, and you then need
to help the compiler by static_casting this to one of the branches through
which it is inherited.  (Though multiple inheritance of XServiceInfo rather
smells like a design bug that should be cleaned up.)

Unwind the use of IMPLEMENT_SERVICE_INFO3 in
dbaccess/source/core/api/query.cxx, find out through which branches
XServiceInfo is inherited, and use a static_cast around the this pointer in the
implementation of OQuery::supportsService.

-- 
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-2' - sw/source

2014-02-12 Thread Oliver-Rainer Wittmann

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

New commits:
commit e46392bbe25028528086a43a4c414dcb0acde401
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Feb 11 10:15:45 2014 +

Resolves: fdo#74780 #i124178# correct export of User Variable Input Fields

(cherry picked from commit b95fa33a4d2827adb8e16de5bae4e535d8c826c9)

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

(cherry picked from commit 91f509fda9a04670e0752a214188be87bce1f2ac)

Change-Id: If645dd2f02ef0e511e44615339d6403cc469c784

diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
index 8d5377d..b745582 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -748,7 +748,7 @@ lcl_ExportHints(
 {
 
 pUnoCrsr-Right(
-
pAttr-GetFmtFld().GetField()-GetPar1().getLength() + 2,
+pAttr-GetFmtFld().GetField()-ExpandField( true 
).getLength() + 2,
 CRSR_SKIP_CHARS,
 sal_False,
 sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Oliver-Rainer Wittmann

 sw/inc/expfld.hxx |3 +++
 sw/inc/txtfld.hxx |4 
 sw/source/core/fields/expfld.cxx  |   32 +++-
 sw/source/core/fields/usrfld.cxx  |8 +++-
 sw/source/core/txtnode/atrfld.cxx |   24 ++--
 5 files changed, 67 insertions(+), 4 deletions(-)

New commits:
commit 4cf1ab04f7fb0ccd546240f40e024872827c997f
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Feb 11 13:25:08 2014 +

Resolves: #i124179# trigger update User Fields...

and related Input Fields when user directly edits a User Field Input Field

- assure that no recursive updates occur

(cherry picked from commit 3c2b5242e81575ec4b6c110afd88894670bd2283)

Conflicts:
sw/inc/txtfld.hxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/usrfld.cxx

Change-Id: I36af4d5e8008f16737e3ec14c1ec737a5f43d3b1
(cherry picked from commit 50f0bb85b7e18001886fdf8bb03eb1d138838b90)

diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 2944589..076569a 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -308,6 +308,9 @@ class SW_DLLPUBLIC SwInputField : public SwField
 // Accessing Input Field's content
 const OUString getContent() const;
 
+void LockNotifyContentChange();
+void UnlockNotifyContentChange();
+
 public:
 /// Direct input via dialog; delete old value.
 SwInputField(
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index cfab932..b973aaa 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -83,6 +83,8 @@ public:
 
 virtual sal_Int32* GetEnd();
 
+void LockNotifyContentChange();
+void UnlockNotifyContentChange();
 virtual void NotifyContentChange( SwFmtFld rFmtFld );
 
 void UpdateTextNodeContent( const OUString rNewContent );
@@ -92,6 +94,8 @@ public:
 
 private:
 sal_Int32 m_nEnd;
+
+bool m_bLockNotifyContentChange;
 };
 
 #endif
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index e25dd31..6cdd6e7 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -1145,12 +1145,35 @@ SwFmtFld* SwInputField::GetFmtFld()
 return mpFmtFld;
 }
 
-
 const OUString SwInputField::getContent() const
 {
 return aContent;
 }
 
+void SwInputField::LockNotifyContentChange()
+{
+if ( GetFmtFld() != NULL )
+{
+SwTxtInputFld* pTxtInputFld = dynamic_cast SwTxtInputFld* 
(GetFmtFld()-GetTxtFld());
+if ( pTxtInputFld != NULL )
+{
+pTxtInputFld-LockNotifyContentChange();
+}
+}
+}
+
+void SwInputField::UnlockNotifyContentChange()
+{
+if ( GetFmtFld() != NULL )
+{
+SwTxtInputFld* pTxtInputFld = dynamic_cast SwTxtInputFld* 
(GetFmtFld()-GetTxtFld());
+if ( pTxtInputFld != NULL )
+{
+pTxtInputFld-UnlockNotifyContentChange();
+}
+}
+}
+
 void SwInputField::applyFieldContent( const OUString rNewFieldContent )
 {
 if ( (nSubType  0x00ff) == INP_TXT )
@@ -1164,6 +1187,13 @@ void SwInputField::applyFieldContent( const OUString 
rNewFieldContent )
 if( pUserTyp )
 {
 pUserTyp-SetContent( rNewFieldContent );
+
+// trigger update of the corresponding User Fields and other 
related Input Fields
+{
+LockNotifyContentChange();
+pUserTyp-UpdateFlds();
+UnlockNotifyContentChange();
+}
 }
 }
 }
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index 35b7261..9cd6baa 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -202,8 +202,14 @@ void SwUserFieldType::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew )
 ChgValid( sal_False );
 
 NotifyClients( pOld, pNew );
+
 // update input fields that might be connected to the user field
-GetDoc()-GetSysFldType( RES_INPUTFLD )-UpdateFlds();
+if ( !IsModifyLocked() )
+{
+LockModify();
+GetDoc()-GetSysFldType( RES_INPUTFLD )-UpdateFlds();
+UnlockModify();
+}
 }
 
 double SwUserFieldType::GetValue( SwCalc rCalc )
diff --git a/sw/source/core/txtnode/atrfld.cxx 
b/sw/source/core/txtnode/atrfld.cxx
index 5810067..1107c1c 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -440,6 +440,7 @@ SwTxtInputFld::SwTxtInputFld(
 
 : SwTxtFld( rAttr, nStart, bInClipboard )
 , m_nEnd( nEnd )
+, m_bLockNotifyContentChange( false )
 {
 SetHasDummyChar( false );
 SetHasContent( true );
@@ -460,11 +461,30 @@ sal_Int32* SwTxtInputFld::GetEnd()
 return m_nEnd;
 }
 
+
+void SwTxtInputFld::LockNotifyContentChange()
+{
+m_bLockNotifyContentChange = true;
+}
+
+
+void SwTxtInputFld::UnlockNotifyContentChange()
+{
+m_bLockNotifyContentChange = false;
+}
+
+
 void SwTxtInputFld::NotifyContentChange( SwFmtFld rFmtFld )
 {
-

[RESOLVED] Re: Need help on Bug#52461

2014-02-12 Thread Caolán McNamara

On Fri, 2014-01-03 at 00:29 +0530, Rachit Gupta wrote:
 I am new to LibreOffice and this is my first attempt at solving a bug.
 I am working on bug https://bugs.freedesktop.org/show_bug.cgi?id=52461
 
 
 I need to traverse through the maEntries vector, however the Count()
 function, which returns maEntries.size() is returning 0. Any help on
 how this might be happening and how to resolve this?

I see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5ff8e1d8e31f23492ee1ccc3af0b73791cd5101b
 now so I'll assume that this is all fixed now.

C.


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

[Libreoffice-commits] core.git: 2 commits - include/oox include/svx offapi/com oox/source sw/qa

2014-02-12 Thread Zolnai Tamás

 include/oox/export/drawingml.hxx|4 -
 include/svx/unoshprp.hxx|3 
 offapi/com/sun/star/drawing/FillProperties.idl  |   10 ++
 oox/source/drawingml/fillproperties.cxx |   18 
 oox/source/export/drawingml.cxx |   36 +++--
 oox/source/export/shapes.cxx|2 
 oox/source/shape/ShapeContextHandler.cxx|2 
 sw/qa/extras/ooxmlexport/data/dml-shape-fillbitmapcrop.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   26 ++
 sw/qa/extras/ooxmlimport/data/dml-shape-fillbitmapcrop.docx |binary
 sw/qa/extras/ooxmlimport/data/picture-with-schemecolor.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   47 
 12 files changed, 136 insertions(+), 12 deletions(-)

New commits:
commit 2efd433478cf4820b308b20cf42595345e023af2
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Tue Feb 11 18:35:38 2014 +0100

drawingML import: picture with scheme color

Theme fragment must be loaded for pictures too.

Change-Id: If4c412926319df2beaecfc120065bd011fc3eb57

diff --git a/oox/source/shape/ShapeContextHandler.cxx 
b/oox/source/shape/ShapeContextHandler.cxx
index 34ddd3d..eeb70ae 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -272,7 +272,7 @@ void SAL_CALL ShapeContextHandler::startFastElement
 
 mpThemePtr.reset(new Theme());
 
-if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) || 
Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp) || Element == 
WPG_TOKEN(wgp))
+if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) || 
Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp) || Element == 
WPG_TOKEN(wgp) || PPT_TOKEN( pic ))
 {
 // Parse the theme relation, if available; the diagram won't have 
colors without it.
 if (!msRelationFragmentPath.isEmpty())
diff --git a/sw/qa/extras/ooxmlimport/data/picture-with-schemecolor.docx 
b/sw/qa/extras/ooxmlimport/data/picture-with-schemecolor.docx
new file mode 100644
index 000..bfee0e1
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/picture-with-schemecolor.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8195558..15c3fdf 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1813,6 +1813,29 @@ DECLARE_OOXMLIMPORT_TEST(testDMLShapeFillBitmapCrop, 
dml-shape-fillbitmapcrop.d
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Bottom );
 
 }
+
+DECLARE_OOXMLIMPORT_TEST(testPictureWithSchemeColor, 
picture-with-schemecolor.docx)
+{
+// At the start of the document, a picture which has a color specified 
with a color scheme, lost
+// it's color during import.
+uno::Referencebeans::XPropertySet xImage(getShape(1), uno::UNO_QUERY);
+uno::Referencegraphic::XGraphic xGraphic = 
getPropertyuno::Referencegraphic::XGraphic (xImage, Graphic);
+uno::Referenceawt::XBitmap xBitmap(xGraphic, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int32(341), 
xBitmap-getSize().Width );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int32(181), 
xBitmap-getSize().Height );
+
+// Check some bits of the bitmap which change when color is imported.
+const uno::Sequence sal_Int8  aDIB = xBitmap-getDIB();
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(-91), aDIB[54] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(110), aDIB[55] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(49), aDIB[56] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(-36), aDIB[96] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(-57), aDIB[97] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(-80), aDIB[98] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(-91), aDIB[135] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(110), aDIB[136] );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int8(49), aDIB[137] );
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 682ab832522b1349f1714bcb16f6e83468ea2920
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Feb 12 12:06:10 2014 +0100

drawingML export\import: cropping of shape's fill texture

In Writer shapes had no cropping property so far. With this
commit this is introduced as a FillProperty and has the same
type as the cropping used for pictures
(Picture context menu  Picture  Crop).

Layout and UI will be an other step. On the UI it would be placed
on the Shape context menu - Area, when Bitmap is selected as fill type.

Note: In case of picture/graphic, cropping property is imported from
and exported to a:srcRect instead of a:fillRect.

Change-Id: Idc1ed2d40cb20b6992e94f14e7e4d853e1f55d02

diff --git a/include/oox/export/drawingml.hxx

[Bug 31609] Support different smart quote settings by language.

2014-02-12 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=31609

Mihkel Tõnnov mihh...@gmail.com changed:

   What|Removed |Added

 CC||mihh...@gmail.com

--- Comment #12 from Mihkel Tõnnov mihh...@gmail.com ---
*** Bug 70443 has been marked as a duplicate of this bug. ***

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

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

2014-02-12 Thread Mihkel Tõnnov

 i18npool/source/localedata/data/et_EE.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 58df669ac734f4740cf1112867edb808789aae43
Author: Mihkel TÃµnnov mihh...@gmail.com
Date:   Tue Feb 11 23:34:57 2014 +0200

corrected Estonian [et-EE] quote characters

Namely: Estonian has several sets of correct quote mark glyphs for double
quotes (ââ, ââ, Â«Â» are all common), however the Institute of 
Estonian
Language [1] recommends using the first of these, i.e. ââ (99 low, 99
high) [2]. As for single quotes, Estonian texts rarely use them, except in
a few fields such as linguistics and biology -- and both ââ (9-9) and 
ââ
(6-9) are considered correct [2, 3]. However, apostrophe in the beginning
of a word (which is effectively the same as a starting single quote) can
also be used to indicate omitted character(s) -- but there, only â (9) is
correct [3].

[1] Eesti Keele Instituut, the main official body which maintains and
studies the usage of Estonian language; http://en.eki.ee/index.php
[2] The last page of
https://docs.google.com/viewer?url=http://keeleabi.eki.ee/pdf/164.pdf (in
Estonian)
[3] Handbook of Estonian Language,
http://www.eki.ee/books/ekk09/index.php?p=2p1=11id=86 (in Estonian)

Change-Id: If88e6e03e3e4aa1919a25dbe2fa2ffc8c9a04f4a
(cherry picked from commit 51fc602184ab8d1afbfb183a3d25b1122c8b1e29)
Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/i18npool/source/localedata/data/et_EE.xml 
b/i18npool/source/localedata/data/et_EE.xml
index 687b093..3bee9cc 100644
--- a/i18npool/source/localedata/data/et_EE.xml
+++ b/i18npool/source/localedata/data/et_EE.xml
@@ -42,10 +42,10 @@
   LongDateYearSeparator /LongDateYearSeparator
 /Separators
 Markers
-  QuotationStartâ/QuotationStart
+  QuotationStartâ/QuotationStart
   QuotationEndâ/QuotationEnd
   DoubleQuotationStartâ/DoubleQuotationStart
-  DoubleQuotationEndâ/DoubleQuotationEnd
+  DoubleQuotationEndâ/DoubleQuotationEnd
 /Markers
 TimeAMAM/TimeAM
 TimePMPM/TimePM
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED][PATCH] fdo#66822: refactor HTML export of image bullet list

2014-02-12 Thread Caolán McNamara

On Sat, 2014-02-08 at 20:47 +0100, Tim Markle wrote:
 Fixed HTML export of image bullet list. Removed width, height, align
 attributes in ul.

Seems ok, so pushed now, thanks for this.

C.


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

[Libreoffice-commits] core.git: bin/gbuild-to-ide Makefile.in

2014-02-12 Thread Adam Mróz

 Makefile.in   |2 +-
 bin/gbuild-to-ide |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cc24e7ebd9cf536bad6ae5a9f4983ac9e4e87686
Author: Adam MrÃ³z sada...@gmail.com
Date:   Mon Feb 10 19:41:50 2014 +0100

Fixes for kdevelop IDE integration

Script bin/gbuild-to-ide is parsing messages basing on regular
expressions.

First problem appears when used language is not English - that's why
setting LC_MESSAGES variable in Makefile.

Second problem appears with quote symbol. For me (Archlinux) script was
not working. After some investigation I found out that reason was that
my output from make included ' symbol when regular expression assumed
that it should be `. That's why using [\'`].

Example:

recipe to execute (from 
'/home/sadam/libreoffice/core/idlc/Executable_idlc.mk', line 28):

Conflicts:
bin/gbuild-to-ide

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

diff --git a/Makefile.in b/Makefile.in
index 29d76e1..503f74a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,7 +330,7 @@ dump-deps-png:
 
 define gb_Top_GbuildToIdeIntegration
 $(1)-ide-integration:
-   cd $(SRCDIR)  ($(GNUMAKE) cmd=$(GNUMAKE) -npf Makefile.gbuild all 
cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
+   cd $(SRCDIR)  (LC_MESSAGES=C $(GNUMAKE) cmd=$(GNUMAKE) -npf 
Makefile.gbuild all cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
 
 endef
 
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 4fa6bd7..0f08d71 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -70,8 +70,8 @@ class GbuildParser:
 builddirpattern = re.compile('^BUILDDIR = (.*)')
 instdirpattern = re.compile('^INSTDIR = (.*)')
 binpathpattern = re.compile('LS = (.*)ls(.exe)?')
-libpattern = re.compile('#  [a-z]+ to execute \(from 
`(.*)/Library_(.*)\.mk\', line [0-9]*\):')
-exepattern = re.compile('#  [a-z]+ to execute \(from 
`(.*)/Executable_(.*)\.mk\', line [0-9]*\):')
+libpattern = re.compile('#  [a-z]+ to execute \(from 
[\'`](.*)/Library_(.*)\.mk\', line [0-9]*\):')
+exepattern = re.compile('#  [a-z]+ to execute \(from 
[\'`](.*)/Executable_(.*)\.mk\', line [0-9]*\):')
 includepattern = re.compile('# INCLUDE := (.*)')
 defspattern = re.compile('# DEFS := (.*)')
 cxxpattern = re.compile('# CXXOBJECTS := (.*)')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenGL on Linux

2014-02-12 Thread Rodolfo

The only bad thing I see is not support the OpenGL-ES 2.x subset: LO
won't be fully supported on tablets...

Regards,
Rodolfo

2014-02-11 19:10 GMT-02:00 Markus Mohrhard markus.mohrh...@googlemail.com:
 Hey,



 On Mon, Feb 10, 2014 at 7:57 PM, Anthonys Lists antli...@youngman.org.uk
 wrote:

 On 10/02/2014 13:32, Ruslan Kabatsayev wrote:

 I'd like to note that there're still lots of video cards which are not
 even 2.0 capable - e.g. intel video in my EEE PC 1015PN only supports
 OpenGL 1.4 with ARB assembly shaders. Another example would be
 (although quite old, but still working and actively supported by intel
 in Mesa) i915G chipset, which has similar characteristics.
 Also, if you try using Mesa 9.1+ with these, you'll get (exactly, not
 higher than) OpenGL 2.1 advertised, but really giving you software
 fallbacks every now and then.
 So, I'd not like to have an office suite require OpenGL higher than
 1.4 (it may use higher versions if they are available, but still not
 require).

 I'll add that I have literally just retired my old No 2 workstation which
 had a Matrox Millenium or similar graphics card - and have also re-purposed
 a Matrox G440. I don't know what OpenGL these are, but the hardware is all
 Y2K era, and still working fine. I suspect that's older than i915 (the
 processors are Socket A).



 I'm sorry but there is no chance that I will support OpenGL 1.x with this
 feature. Even if there is still hardware out there it amkes no sense to work
 with a standard that is so old that it has been deprecated by Khronos
 several years ago. We will simply not support this feature on such hardware.
 Luckily glew allows us to make this a runtime check so it will just not be
 available.

 It is a bit more complicated with OpenGL 2.x and 3.x as they are much
 closer. As it seems most people already have support for 3.x on Linux +
 everyone on Windows and modern Macs. In general every recommendation is to
 avoid using the compatibility context and use the new core context that was
 introduced with 3.0. Targeting OpenGl 1.x with the fixed pipeline is just
 stupid while writing new code.

 In general we are making the OpenGL stuff right now runtime optional by
 using glew while it was compile time optional before. In general I'm one of
 the persons who is more in favor of dropping support for older versions but
 I had some discussions with other developers who disagree. We will see how
 this plays out.

 Regards,
 Markus

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

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

[Libreoffice-commits] core.git: 8 commits - binaryurp/source chart2/source connectivity/source editeng/source svtools/source

2014-02-12 Thread Noel Grandin

 binaryurp/source/binaryany.cxx   |
3 +++
 chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx |
1 +
 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx|
3 ++-
 connectivity/source/drivers/odbc/OConnection.cxx |
1 +
 editeng/source/editeng/impedit2.cxx  |
2 +-
 svtools/source/svhtml/parhtml.cxx|
4 +++-
 6 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 025a77f794c87b602921bc583f1133268980b761
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 13:43:46 2014 +0200

cid#705996 unintended sign extension

Change-Id: I07f357b069bd8ae31049f049163c0e20e7361f79

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index eab034b..854c6ed 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3601,7 +3601,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* 
pPortion )
 ( rLSItem.GetPropLineSpace()  100 ) )
 {
 const EditLine* pL = pPortion-GetLines()[nFirstInvalid];
-long n = pL-GetTxtHeight() * ( 100 - 
rLSItem.GetPropLineSpace() );
+long n = pL-GetTxtHeight() * ( 100L - 
rLSItem.GetPropLineSpace() );
 n /= 100;
 aRange.Min() -= n;
 aRange.Max() += n;
commit 639f35e22f5b61920fdd2662b230467fad39c123
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 13:27:16 2014 +0200

cid#707705 uninitialized pointer field

Change-Id: I80679a2cb99cdc912ed021cf993adeb3478355c4

diff --git a/connectivity/source/drivers/odbc/OConnection.cxx 
b/connectivity/source/drivers/odbc/OConnection.cxx
index 0a35a58..03942e5 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -48,6 +48,7 @@ using namespace com::sun::star::sdbc;
 OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver)
  : OSubComponentOConnection, 
OConnection_BASE((::cppu::OWeakObject*)_pDriver, this)
  ,m_pDriver(_pDriver)
+ ,m_aConnectionHandle(NULL)
  ,m_pDriverHandleCopy(_pDriverHandle)
  ,m_nStatementCount(0)
  ,m_bClosed(sal_True)
commit 326f1ccb17ec2c1466d029545fd0d9000458339f
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 12:40:24 2014 +0200

cid#707669 uninitialized pointer field

Change-Id: I11cc753d83d97a5e1d9373cc5a1fe504b5abe0dd

diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index b9c4629..d97e4a6 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -47,7 +47,8 @@ extern C SAL_DLLPUBLIC_EXPORT void*  SAL_CALL 
OMozillaBootstrap_CreateInstance
 
 MozillaBootstrap::MozillaBootstrap(
 const ::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory  _rxFactory)
-: OMozillaBootstrap_BASE(m_aMutex), m_xMSFactory( _rxFactory )
+: OMozillaBootstrap_BASE(m_aMutex), m_xMSFactory( _rxFactory ),
+  m_ProfileAccess(NULL), m_ProfileManager(NULL)
 {
 }
 // 
-
commit a1b1625cfdf5cd86de72f60915f0874a93e96240
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 12:38:18 2014 +0200

cid#707669 uninitialized pointer value

Change-Id: I252f88ba76d9b927d472655d2bee71cc85b22452

diff --git 
a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index a4010a8..ce73ee3 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -32,6 +32,7 @@ namespace wrapper
 WrappedNumberFormatProperty::WrappedNumberFormatProperty( ::boost::shared_ptr 
Chart2ModelContact  spChart2ModelContact )
 : WrappedDirectStateProperty( NumberFormat, NumberFormat )
 , m_spChart2ModelContact(spChart2ModelContact)
+, m_pWrappedLinkNumberFormatProperty(NULL)
 {
 m_aOuterValue = getPropertyDefault( 0 );
 }
commit 571d116d2805827bdef7d32983697bcdc5f9c78e
Author: Noel Grandin n...@peralex.com
Date:   Wed Feb 12 12:35:38 2014 +0200

cid#707663 uninitialized pointer field

Change-Id: I4864042da995e70fd050584341960e58c4cddec2

diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx
index 6540fc3..66a1a38 100644
--- a/binaryurp/source/binaryany.cxx
+++ b/binaryurp/source/binaryany.cxx
@@ -31,6 +31,7 @@ namespace binaryurp {

Re: OpenGL on Linux

2014-02-12 Thread Wols Lists

On 11/02/14 21:10, Markus Mohrhard wrote:
 I'm sorry but there is no chance that I will support OpenGL 1.x with
 this feature. Even if there is still hardware out there it amkes no
 sense to work with a standard that is so old that it has been deprecated
 by Khronos several years ago. We will simply not support this feature on
 such hardware. Luckily glew allows us to make this a runtime check so it
 will just not be available.

No worries. The thread was wondering what GLs were out there so I
thought I ought to mention it. Don't forget, though, XP still is out
there, and is more than enough for a lot of people. MS want to force
them off it ... I can't move on because I haven't got developer keys for
anything newer ... that old hardware runs XP fine.

As for supporting old standards, well, I'd go for graceful degradation
- if the card doesn't support newer features, either use a compatibility
library or tell the user sorry your hardware is too old to support this
feature. But DON'T allow the user to upgrade LO only to discover that
stuff has stopped working because the requirements have been upgraded.

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

sdremote not in android?

2014-02-12 Thread Faisal M. Alotaibi

Hi,

I notice that the sdremote folder has been remove from the android module
can anyone help me how to find it?



Regards,

Faisal M. Al-Otaibi.
Programmer, KACST
Warning: This message and its attachment, if any, are confidential and may 
contain information protected by law. If you are not the intended recipient, 
please contact the sender immediately and delete the message and its 
attachment, if any. You should not copy the message and its attachment, if any, 
or disclose its contents to any other person or use it for any purpose. 
Statements and opinions expressed in this e-mail and its attachment, if any, 
are those of the sender, and do not necessarily reflect those of King Abdulaziz 
city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST 
accepts no liability for any damage caused by this email.

?: ??? ??? ??? ? ?? ?? (?? )  ?  ?? ? ??? 
??? ? ? ???. ??? ?? ??? ? ??  ???   
? ???  ?? ?  ??? ? (?? )? ???  ?? 
??? ?? ? ??? ??? ??  (?? ) ?? ?? ??? ? ?? ? 
?? ? ?? ? ??? ???. ? ???  ??? ??? ? (?? 
)  ?? ??? ???   ??? ? ? ? ?? 
  ??? ? ??? ? ??? ?? ??? ?? ??? 
??? ?? ?? ?? ?? ??? ??.

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

Re: sdremote not in android?

2014-02-12 Thread Samuel Mehrbrodt


https://gerrit.libreoffice.org/gitweb?p=impress_remote.git;a=summary

Found here: https://gerrit.libreoffice.org/#/admin/projects/

Am 12.02.2014 06:55, schrieb Faisal M. Alotaibi:

Hi,

I notice that the sdremote folder has been remove from the android module
can anyone help me how to find it?



Regards,
Faisal M. Al-Otaibi.
Programmer, KACST

*Warning: *This message and its attachment, if any, are confidential 
and may contain information protected by law. If you are not the 
intended recipient, please contact the sender immediately and delete 
the message and its attachment, if any. You should not copy the 
message and its attachment, if any, or disclose its contents to any 
other person or use it for any purpose. Statements and opinions 
expressed in this e-mail and its attachment, if any, are those of the 
sender, and do not necessarily reflect those of King Abdulaziz city 
for Science and Technology (KACST) in the Kingdom of Saudi Arabia. 
KACST accepts no liability for any damage caused by this email.




*?:*??? ??? ??? ? ?? ?? (?? )  ?  ?? 
? ??? ??? ? ? ???. ??? ?? ??? ? ??  
???   ? ???  ?? ?  ??? 
? (?? )? ???  ?? ??? ?? ? ??? ??? ??  
(?? ) ?? ?? ??? ? ?? ? ?? ? ?? ? ??? 
???. ? ???  ??? ??? ? (?? )  ?? ??? 
???   ??? ? ? ? ??  
 ??? ? ??? ? ??? ?? ??? ?? ??? 
??? ?? ?? ?? ?? ??? ??.




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


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

Re: sdremote not in android?

2014-02-12 Thread David Tardon

Hi

On Wed, Feb 12, 2014 at 05:55:24AM +, Faisal M. Alotaibi wrote:
 Hi,
 
 I notice that the sdremote folder has been remove from the android module
 can anyone help me how to find it?

http://lists.freedesktop.org/archives/libreoffice/2014-January/059101.html

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

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

2014-02-12 Thread Miklos Vajna

 sw/source/core/text/xmldump.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit b12d37d701773d194efdfc1fcceee05ab2d0b26b
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Feb 12 12:36:39 2014 +0100

SwAnchoredObject::dumpAsXml: show bound rect

Change-Id: I1754850d7674efb53c95886c3c3cdcde8ca6ee4d

diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 127206b..7400d8d 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -418,6 +418,14 @@ void SwAnchoredObject::dumpAsXml( xmlTextWriterPtr writer )
 
 xmlTextWriterStartElement( writer, BAD_CAST( getElementName() ) );
 xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( ptr ), %p, this );
+
+xmlTextWriterStartElement( writer, BAD_CAST( bounds ) );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( left ), %ld, 
GetObjBoundRect().Left() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( top ), %ld, 
GetObjBoundRect().Top() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( width ), %ld, 
GetObjBoundRect().Width() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( height ), %ld, 
GetObjBoundRect().Height() );
+xmlTextWriterEndElement( writer );
+
 xmlTextWriterEndElement( writer );
 
 if ( bCreateWriter )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Andrzej Hunt

 oox/source/shape/ShapeContextHandler.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit de7b3820d3f8de380401fe435a83301561d17384
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Wed Feb 12 14:15:54 2014 +

loplugin:implicitboolconversion

Presumably we need to specifically check whether Element is a
PPT pic token here too?

Change-Id: Id5c90099c8762042f9a2a886631faa72737704fb

diff --git a/oox/source/shape/ShapeContextHandler.cxx 
b/oox/source/shape/ShapeContextHandler.cxx
index bd983e3..9a0d727 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -272,7 +272,8 @@ void SAL_CALL ShapeContextHandler::startFastElement
 
 mpThemePtr.reset(new Theme());
 
-if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) || 
Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp) || Element == 
WPG_TOKEN(wgp) || PPT_TOKEN( pic ))
+if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) || 
Element == C_TOKEN(chart) ||
+Element == WPS_TOKEN(wsp) || Element == WPG_TOKEN(wgp) || Element == 
PPT_TOKEN(pic))
 {
 // Parse the theme relation, if available; the diagram won't have 
colors without it.
 if (!msRelationFragmentPath.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-12 Thread Winfried Donkers

 sc/source/core/inc/interpre.hxx  |3 +--
 sc/source/core/tool/interpr3.cxx |   25 +
 sc/source/core/tool/interpr4.cxx |6 +++---
 sc/source/core/tool/parclass.cxx |2 +-
 sc/source/ui/src/scfuncs.src |   10 +-
 5 files changed, 15 insertions(+), 31 deletions(-)

New commits:
commit 6744d1d8f9b73375483ae04d4530f151cce40957
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Thu Jan 30 17:13:56 2014 +0100

make Calc function PERCENTRANK comply with ODF1.2


http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2-part2.html#PERCENTRANK
defines an optional 3rd argument. This hss now been added to the function.

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

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index e340a9e..5d361bf 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -789,8 +789,7 @@ void ScFTest();
 void ScChiTest();
 void ScRank( bool bAverage );
 void ScPercentile( bool bInclusive );
-void ScPercentrank();
-void ScPercentrank_MS( bool bInclusive );
+void ScPercentrank( bool bInclusive );
 double GetPercentrank( ::std::vectordouble  rArray, double fVal, bool 
bInclusive );
 void ScLarge();
 void ScSmall();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index df6f990..9945140 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3509,30 +3509,7 @@ void ScInterpreter::ScSmall()
 CalculateSmallLarge(true);
 }
 
-void ScInterpreter::ScPercentrank()
-{
-sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCount( nParamCount, 2 ) )
-return;
-
-double fNum = GetDouble();
-vectordouble aSortArray;
-GetSortArray(1, aSortArray);
-SCSIZE nSize = aSortArray.size();
-if (aSortArray.empty() || nSize == 0 || nGlobalError)
-PushNoValue();
-else
-{
-if (fNum  aSortArray[0] || fNum  aSortArray[nSize-1])
-PushNoValue();
-else if ( nSize == 1 )
-PushDouble(1.0);// fNum == pSortArray[0], see test 
above
-else
-PushDouble( GetPercentrank( aSortArray, fNum, true ) );
-}
-}
-
-void ScInterpreter::ScPercentrank_MS( bool bInclusive )
+void ScInterpreter::ScPercentrank( bool bInclusive )
 {
 sal_uInt8 nParamCount = GetByte();
 if ( !MustHaveParamCount( nParamCount, 2, 3 ) )
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 1fa293e..205d61f 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4154,9 +4154,9 @@ StackVar ScInterpreter::Interpret()
 case ocPercentile   :
 case ocPercentile_Inc   : ScPercentile( true ); break;
 case ocPercentile_Exc   : ScPercentile( false );break;
-case ocPercentrank  : ScPercentrank();  break;
-case ocPercentrank_Inc  : ScPercentrank_MS( true ); break;
-case ocPercentrank_Exc  : ScPercentrank_MS( false );break;
+case ocPercentrank  :
+case ocPercentrank_Inc  : ScPercentrank( true );break;
+case ocPercentrank_Exc  : ScPercentrank( false );   break;
 case ocLarge: ScLarge();break;
 case ocSmall: ScSmall();break;
 case ocFrequency: ScFrequency();break;
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index db42e46..3da2a9d 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -150,7 +150,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocOr,  {{ Reference  
  }, 1 }},
 { ocPearson, {{ ForceArray, ForceArray 
  }, 0 }},
 { ocPercentile,  {{ Reference, Value   
  }, 0 }},
-{ ocPercentrank, {{ Reference, Value   
  }, 0 }},
+{ ocPercentrank, {{ Reference, Value, Value
  }, 0 }},
 { ocPow, {{ Array, Array   
  }, 0 }},
 { ocPower,   {{ Array, Array   
  }, 0 }},
 { ocProb,{{ ForceArray, ForceArray, Value, Value   
  }, 0 }},
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 45fe3d2..209 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5883,7 +5883,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2

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

2014-02-12 Thread Caolán McNamara

 sfx2/source/control/bindings.cxx  |2 +-
 svtools/source/brwbox/brwbox2.cxx |2 +-
 svtools/source/misc/itemdel.cxx   |   22 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 9cbc25dd6e31fc5fd2a25067fe924626451f9376
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 12 14:24:48 2014 +

Revert coverity#736486 try and make coverity see through this better

This reverts commit a0bae848d42b675e4638420d632d710ed3cf76c3.

diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index d6f7d65..ad56240 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -38,13 +38,12 @@ class SfxItemDesruptor_Impl
 Link aLink;
 
 private:
-DECL_LINK( Delete, SfxItemDesruptor_Impl * );
-SfxItemDesruptor_Impl( const SfxItemDesruptor_Impl ); // n.i.
+ DECL_LINK( Delete, void * );
+ SfxItemDesruptor_Impl( const SfxItemDesruptor_Impl ); // n.i.
 
 public:
-SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt );
-void LaunchDeleteOnIdle();
-~SfxItemDesruptor_Impl();
+ SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt );
+ ~SfxItemDesruptor_Impl();
 };
 
 // 
@@ -56,10 +55,7 @@ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem 
*pItemToDesrupt ):
 
 DBG_ASSERT( 0 == pItem-GetRefCount(), disrupting pooled item );
 pItem-SetKind( SFX_ITEMS_DELETEONIDLE );
-}
 
-void SfxItemDesruptor_Impl::LaunchDeleteOnIdle()
-{
 // process in Idle
 GetpApp()-InsertIdleHdl( aLink, 1 );
 }
@@ -79,18 +75,18 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
 }
 
 // 
-IMPL_LINK(SfxItemDesruptor_Impl, Delete, SfxItemDesruptor_Impl*, pImpl)
+IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete)
 {
 {DBG_CHKTHIS(SfxItemDesruptor_Impl, 0);}
-delete pImpl;
+delete this;
 return 0;
 }
 
-void DeleteItemOnIdle(SfxPoolItem* pItem)
+// 
+void DeleteItemOnIdle( SfxPoolItem* pItem )
 {
 DBG_ASSERT( 0 == pItem-GetRefCount(), deleting item in use );
-SfxItemDesruptor_Impl *pDesruptor = new SfxItemDesruptor_Impl(pItem);
-pDesruptor-LaunchDeleteOnIdle();
+new SfxItemDesruptor_Impl( pItem );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 27fae00bf28def2c23228101dac7cf8280c498b5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 12 13:10:20 2014 +

coverity#441136 Dereference after null check

Change-Id: I81a1a70094ae6b4ed685ae3fe88c645b160955bf

diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 1760056e..26438c0 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -829,7 +829,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point 
rPos, const Size rSize,
 pBar-Draw(pDev, aHeaderPos, aHeaderSize, nFlags);
 
 // draw the upper left cell (the intersection between the header bar 
and the handle column)
-if (( pFirstCol-GetId() == 0 )  ( pFirstCol-Width()  4 ))
+if (pFirstCol  (pFirstCol-GetId() == 0)  (pFirstCol-Width()  4))
 {
 ButtonFrame aButtonFrame( aRealPos,
 Size( pFirstCol-Width()-1, nTitleHeight-1 ),
commit 2842e32490ad23602065e29d2cfe38adfeb483cb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 12 13:09:09 2014 +

coverity#441125 Dereference after null check

Change-Id: Ia8046dc20ff46612ad3ffeba098bee079858e8da

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 905fcfe..a441dfa 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1609,7 +1609,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 pDispatcher-Update_Impl();
 
 // modifying the SfxObjectInterface-stack without SfxBindings = nothing 
to do
-SfxViewFrame* pFrame = pDispatcher-GetFrame();
+SfxViewFrame* pFrame = pDispatcher ? pDispatcher-GetFrame() : NULL;
 if ( (pFrame  !pFrame-GetObjectShell()-AcceptStateUpdate()) || 
pSfxApp-IsDowning() || pImp-pCaches-empty() )
 {
 DBG_PROFSTOP(SfxBindingsNextJob_Impl0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 40/b2568f81c3a7bbcd5864122332aefe345f3ec5

2014-02-12 Thread Caolán McNamara

 40/b2568f81c3a7bbcd5864122332aefe345f3ec5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 944cae6a668f48cffba5f9ddf4941212525d626d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 12 14:38:39 2014 +

Notes added by 'git notes add'

diff --git a/40/b2568f81c3a7bbcd5864122332aefe345f3ec5 
b/40/b2568f81c3a7bbcd5864122332aefe345f3ec5
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/40/b2568f81c3a7bbcd5864122332aefe345f3ec5
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6c/68ec977289b381a1407c9025ee40d689f75aaa

2014-02-12 Thread Caolán McNamara

 6c/68ec977289b381a1407c9025ee40d689f75aaa |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 828661d9f60075fc96de329c405007a42e331c41
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 12 14:39:11 2014 +

Notes added by 'git notes add'

diff --git a/6c/68ec977289b381a1407c9025ee40d689f75aaa 
b/6c/68ec977289b381a1407c9025ee40d689f75aaa
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/6c/68ec977289b381a1407c9025ee40d689f75aaa
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst

2014-02-12 Thread Kohei Yoshida

 configure.ac |2 +-
 download.lst |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 07e2c31831ad265b018e5fdf59bdde048fbb4d35
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Feb 12 09:43:48 2014 -0500

fdo#74824: Update mdds to 0.10.2 which fixes one crasher bug.

Change-Id: If05c7573530c892dc063dfb7accec1c24a322ddd

diff --git a/configure.ac b/configure.ac
index e21d49e..87b0d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8777,7 +8777,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.1])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.2])
 
 dnl ===
 dnl Determine which hash container mdds shall use
diff --git a/download.lst b/download.lst
index cea2517..41a74c6 100644
--- a/download.lst
+++ b/download.lst
@@ -84,7 +84,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
+export MDDS_TARBALL := 47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 4 5 >

1 - 100 of 467 matches

Mail list logo