CLs regarding Multi-Stop Gradient Fill
Hi, I am working toward supporting multi-stop grad fill in LO. I have also submitted a few CLs for it. They support import and rendering, specifically for OOXML-Rect, OOXML-Linear, OOXML-Radial. I would like to extend this to ODF format, and provide UI functionality for the same. Please Find CLs here: 1. OOXML-Linear https://gerrit.libreoffice.org/#/c/12056/9 2. OOXML-Radial https://gerrit.libreoffice.org/#/c/13130/2 3. OOXML-Rect https://gerrit.libreoffice.org/#/c/13166/1 Can someone review these changes ? Regards, Vinaya Mandke -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/7335/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/7335/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/8540/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/80/10180/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/8653/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/80/10180/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/9214/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/9214/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/50/6350/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/10803/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/8653/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/10441/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/9764/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/46/8846/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/7632/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/10441/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/50/6350/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/10803/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/9764/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/10441/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/36/10536/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/61/11161/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/08/6608/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/08/6608/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/8767/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/7632/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7007/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/46/8846/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/9764/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/18/8618/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/6502/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/80/11380/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7007/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/8444/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/6502/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/9097/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/6953/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/7792/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/8362/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/9252/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/7792/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/9421/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/80/11380/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/9421/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/8362/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/9252/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/18/8618/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/6383/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/5976/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/9097/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/9421/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/5976/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/8444/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/8104/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/8104/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/7792/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/7540/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/61/9361/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/61/9361/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/6953/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/7540/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/7540/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/7540/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/9'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/7739/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/7739/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/8047/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/8047/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/8047/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/7739/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/8'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/8047/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/9668/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/9668/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/9668/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/7739/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/8047/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/7739/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/9897/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/49/6349/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/49/6349/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/8047/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/8047/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/49/6349/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/9897/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/7207/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/chartexport.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3383fd7b229a9d78044231bfb5ccca256fe400a2
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Wed Sep 10 18:23:06 2014 +0530
Clean-up
Change-Id: I66255e8bc37191e859c134eab7d7f8117cd9181a
Reviewed-on: https://gerrit.libreoffice.org/11380
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index d074fe2..8fe0a87 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1187,14 +1187,14 @@ void ChartExport::exportBitmapFill( Reference
XPropertySet xPropSet )
{
if( xPropSet.is() )
{
-OUString sFillGradientName;
-xPropSet-getPropertyValue(FillBitmapName) = sFillGradientName;
+OUString sFillBitmapName;
+xPropSet-getPropertyValue(FillBitmapName) = sFillBitmapName;
uno::Reference lang::XMultiServiceFactory xFact( getModel(),
uno::UNO_QUERY );
try
{
-uno::Reference container::XNameAccess xGradient(
xFact-createInstance(com.sun.star.drawing.BitmapTable), uno::UNO_QUERY );
-uno::Any rValue = xGradient-getByName( sFillGradientName );
+uno::Reference container::XNameAccess xBitmap(
xFact-createInstance(com.sun.star.drawing.BitmapTable), uno::UNO_QUERY );
+uno::Any rValue = xBitmap-getByName( sFillBitmapName );
OUString sBitmapURL;
if( (rValue = sBitmapURL) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo83057.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx| 16
sw/source/filter/ww8/attributeoutputbase.hxx |2 ++
sw/source/filter/ww8/docxattributeoutput.cxx |8 +++-
sw/source/filter/ww8/docxattributeoutput.hxx |3 +++
sw/source/filter/ww8/wrtw8nds.cxx|1 +
6 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit e6b295e55d82f236206c24f5cf1dcc314c34b20f
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Thu Aug 28 11:29:06 2014 +0530
fdo#83057 File corrupts on save, as SDT is added incorrectly
A fly frame was attached to a para which started within a hint (run)
containing an SDT.
This SDT was handled while exporting the FLYFRAME and also the text of the
run.
So, eventhough the original file had only one sdt in the header, the RT
file had two;
one for a seperate run as expected, and one incorrectly exported in the
alternateContent (FLYFRAME)
So don't collect SDTPr from grabbag if the FLY is not processed.
As, the SDT will be handled when the run is exported.
Change-Id: I7b3c94208c171afbec54467fd6b756a6e30c816b
Reviewed-on: https://gerrit.libreoffice.org/11161
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/fdo83057.docx
b/sw/qa/extras/ooxmlexport/data/fdo83057.docx
new file mode 100644
index 000..d4d4232
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo83057.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 27de7ee..21b8976 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -684,6 +684,22 @@ DECLARE_OOXMLEXPORT_TEST(testSdt2Run, sdt-2-run.docx)
assertXPathContent(pXmlDoc, /w:document/w:body/w:p[1]/w:r/w:t, third);
}
+DECLARE_OOXMLEXPORT_TEST(testFD083057, fdo83057.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
+if (!pXmlDoc)
+return;
+
+// A fly frame was attached to a para which started with a hint (run)
containing an SDT.
+// This SDT was handled while exporting the FLYFRAME and also the text of
the run.
+// So, eventhough the original file had only one sdt in the header, the RT
file had two;
+// one for a seperate run as expected, and one incorrectly exported in the
alternateContent (FLYFRAME)
+
+// Assert that the file has only one sdt, in a seperate run
+assertXPath(pXmlDoc, //w:sdt, 1);
+assertXPath(pXmlDoc, //mc:AlternateContent//w:sdt, 0);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index a32a4ba..93b6aaa 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -309,6 +309,8 @@ public:
/// Has different headers/footers for the title page.
virtual void SectionTitlePage() = 0;
+/// Set the state of the Fly at current position
+virtual void SetStateOfFlyFrame( sal_Int16 /*nStateOfFlyFrame*/ ){};
/// If the node has an anchor linked.
virtual void SetAnchorIsLinkedToNode( bool /*bAnchorLinkedToNode*/){};
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b4587e8..518ce24 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -969,6 +969,11 @@ void DocxAttributeOutput::EndParagraphProperties( const
SfxItemSet* pParagraphMa
m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND );
}
+void DocxAttributeOutput::SetStateOfFlyFrame( sal_Int16 nStateOfFlyFrame )
+{
+m_nStateOfFlyFrame = nStateOfFlyFrame;
+}
+
void DocxAttributeOutput::SetAnchorIsLinkedToNode( bool bAnchorLinkedToNode )
{
m_bAnchorLinkedToNode = bAnchorLinkedToNode ;
@@ -8145,7 +8150,7 @@ void DocxAttributeOutput::CharGrabBag( const
SfxGrabBagItem rItem )
if (m_bStartedCharSdt)
m_bEndCharSdt = true;
}
-else if (i-first == SdtPr)
+else if (i-first == SdtPr FLY_NOT_PROCESSED !=
m_nStateOfFlyFrame )
{
uno::Sequencebeans::PropertyValue aGrabBagSdt =
i-second.get uno::Sequencebeans::PropertyValue ();
@@ -8286,6 +8291,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
, m_pParagraphSdtPrTokenAttributes(NULL)
, m_pParagraphSdtPrDataBindingAttrs(NULL)
, m_nRunSdtPrToken(0)
+, m_nStateOfFlyFrame( FLY_NOT_PROCESSED )
, m_pRunSdtPrTokenChildren(NULL)
, m_pRunSdtPrDataBindingAttrs(NULL)
, m_bParagraphSdtHasId(false)
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 1277203
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - officecfg/registry sfx2/source sw/qa writerfilter/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +
sfx2/source/dialog/backingwindow.cxx |5
sw/qa/extras/ooxmlexport/data/fdo75431.docx|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 ++
writerfilter/source/dmapper/DomainMapper.cxx | 22 +++
writerfilter/source/dmapper/DomainMapperTableManager.hxx |5
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 74 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx |8 +
writerfilter/source/dmapper/PropertyMap.hxx|2
9 files changed, 131 insertions(+), 4 deletions(-)
New commits:
commit 2ba645fee8ea7e4c5e1ad9a81774a33e899cf18d
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Fri Apr 18 15:50:51 2014 +0530
fdo#39056 fdo#75431 Section Properties if section starts with table
Section properties are not imported if the section starts with a table for
DOCX,
and also for a few RTF files with combination of tables and section breaks.
SwXBodyText::createTextCursorByRange is not able to find the start of
section and hence
section properties are not applied.
As a workaround added an empty paragraph at the beginning of every section
which has the the first element as a table. And then removed it when the
section ends ( DomainMapper::lcl_endSectionGroup is called).
Also handled to add the paragraph earlier, if there is a bookmark
so that the bookmark is not attached to the dummy paragraph.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9097
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I717ba40e22b055d974bc83d4414aeb2945e16d26
diff --git a/sw/qa/extras/ooxmlexport/data/fdo75431.docx
b/sw/qa/extras/ooxmlexport/data/fdo75431.docx
new file mode 100644
index 000..4922784
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo75431.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 37fb1b5..fb00ef3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2098,6 +2098,18 @@ DECLARE_OOXMLEXPORT_TEST(testTestTitlePage,
testTitlePage.docx)
//assertXPathChildren(pXmlDoc, /w:document/w:body/w:sectPr/w:titlePg, 0);
}
+
+DECLARE_OOXMLEXPORT_TEST(testFDO75431, fdo75431.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc, //w:tbl, 2);
+assertXPath(pXmlDoc, //w:p/w:pPr/w:sectPr/w:type, val, nextPage);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c2336c0..76d61e1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3552,7 +3552,20 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
}
break;
case NS_ooxml::LN_tblStart:
+
+/*
+ * Hack for Importing Section Properties
+ * LO is not able to import section properties if first element in the
+ * section is a table. So in case first element is a table add a dummy
para
+ * and remove it again when lcl_endSectionGroup is called
+ */
+if(m_pImpl-m_nTableDepth == 0
m_pImpl-GetIsFirstParagraphInSection()
+ !m_pImpl-GetIsDummyParaAddedForTableInSection()
!m_pImpl-GetIsTextFrameInserted())
+{
+m_pImpl-AddDummyParaForTableInSection();
+}
m_pImpl-m_nTableDepth++;
+
break;
case NS_ooxml::LN_tblEnd:
m_pImpl-m_nTableDepth--;
@@ -3649,6 +3662,7 @@ void DomainMapper::data(const sal_uInt8* /*buf*/, size_t
/*len*/,
void DomainMapper::lcl_startSectionGroup()
{
m_pImpl-PushProperties(CONTEXT_SECTION);
+m_pImpl-SetIsFirstParagraphInSection(true);
}
void DomainMapper::lcl_endSectionGroup()
@@ -3673,7 +3687,13 @@ void DomainMapper::lcl_endSectionGroup()
SectionPropertyMap* pSectionContext = dynamic_cast SectionPropertyMap* (
pContext.get() );
OSL_ENSURE(pSectionContext, SectionContext unavailable!);
if(pSectionContext)
+{
pSectionContext-CloseSectionGroup( *m_pImpl );
+// Remove the dummy paragraph if added for
+// handling the section properties if section starts with a table
+if (m_pImpl-GetIsDummyParaAddedForTableInSection())
+m_pImpl-RemoveDummyParaForTableInSection();
+}
m_pImpl-PopProperties(CONTEXT_SECTION);
}
@@ -3932,7 +3952,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
bool bRemove = !m_pImpl-GetParaChanged()
m_pImpl-GetParaSectpr
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo81945.docx |binary
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |9 +
sw/source/filter/ww8/docxattributeoutput.cxx | 18 +-
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 60fad3fabb26a50ea238bed2f046670c6e5678f7
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Wed Aug 6 19:38:40 2014 +0530
fdo#81945 [DOCX] Round Tripped file corrupted due to nested SDTs
Original File contains two separate SDTs which are getting
nested during RT as follows:-
sdtStart [MARK] rPr [MARK] sdtEND RunSTART
==PREPEND== sdtStart [MARK] sdtEND RunSTART rPr RunEND
Now Another SDT starts
sdtStart [MARK] sdtEND RunSTART rPr RunEND [MARK] sdtStart
==PREPEND== sdtStart [MARK] sdtStart sdtEND RunSTART rPr RunEND
So, in such cases wait before closing the earlier sdt, to avoid nesting.
Thus the [MARK]
can be retained in the corrrect position, to start the new SDT and end the
earlier SDT.
Reviewed on:
https://gerrit.libreoffice.org/10803
Change-Id: Ia86f94c0587a5d44ab23391ea9ac38f86b5dd250
diff --git a/sw/qa/extras/ooxmlexport/data/fdo81945.docx
b/sw/qa/extras/ooxmlexport/data/fdo81945.docx
new file mode 100644
index 000..51dee9c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo81945.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 36ae02b..9867cce 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -582,6 +582,15 @@ DECLARE_OOXMLEXPORT_TEST(testEditTime, fdo81341.docx)
}
}
+DECLARE_OOXMLEXPORT_TEST(testFdo81945, fdo81945.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, //w:sdt//w:sdt, 0);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index cfd3ef4..5888d32 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1004,11 +1004,18 @@ void DocxAttributeOutput::EndRun()
// level down, to be able to prepend the actual run start attribute (just
// before postponed run start)
m_pSerializer-mark(); // let's call it actual run start
+bool bCloseEarlierSDT = false;
if (m_bEndCharSdt)
{
// This is the common case: close sdt before the current run was
requrested by the next run.
-EndSdtBlock();
+
+// if another sdt starts in this run, then wait
+// as closing the sdt now, might cause nesting of sdts
+if (m_nRunSdtPrToken 0)
+bCloseEarlierSDT = true;
+else
+EndSdtBlock();
m_bEndCharSdt = false;
m_bStartedCharSdt = false;
}
@@ -1131,6 +1138,15 @@ void DocxAttributeOutput::EndRun()
m_nRunSdtPrToken = 0;
lcl_deleteAndResetTheLists( m_pRunSdtPrTokenChildren,
m_pRunSdtPrDataBindingAttrs, m_aRunSdtPrAlias );
}
+
+if (bCloseEarlierSDT)
+{
+m_pSerializer-mark();
+EndSdtBlock();
+m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND );
+bCloseEarlierSDT = false;
+}
+
m_pSerializer-mergeTopMarks();
WritePostponedMath();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo81492.docx |binary
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |6 ++
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |8
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |1 +
writerfilter/source/ooxml/factoryimpl_ns.py |2 ++
writerfilter/source/ooxml/model.xml | 10 --
6 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit 981e2dcd44d3b33b5af791645f77b6c7f2da831c
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Fri Jul 18 17:32:26 2014 +0530
FILESAVE [DOCX] Hyperlink text is getting lost after RT fdo#81492
The fldData was getting added as instrText. It was handled as CT_Text and
hence appended to the fieldCommand in DomainMapper_Impl::AppendFieldCommand.
So in RT file the w:instrText has both the instrText and the fldData,
from the
original file. This causes the hyperlink visual loss in RT file.
WordprocessingML Page# 5011 [ ISO/IEC 29500-1:2012 ]
WordprocessingML Page# 5552 [ ECMA-376 Part 1 ]
fldData has been removed. So ignore it while importing
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/10441
Change-Id: Ic2c06f1eb66639d36f3a27ae79181cdbde21b43c
diff --git a/sw/qa/extras/ooxmlexport/data/fdo81492.docx
b/sw/qa/extras/ooxmlexport/data/fdo81492.docx
new file mode 100644
index 000..be3353b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo81492.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 2e5844a..0df24fb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -559,6 +559,12 @@ DECLARE_OOXMLEXPORT_TEST(testSdtDateDuplicate,
sdt-date-duplicate.docx)
}
}
+DECLARE_OOXMLEXPORT_TEST(testFdo81492, fdo81492.docx)
+{
+if (xmlDocPtr pXmlDoc = parseExport())
+assertXPathContent(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[5]/w:instrText, ADDIN EN.CITE.DATA);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 4e85d64..6b31599 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -745,6 +745,14 @@ void OOXMLFastContextHandler::positionOffset(const
OUString sText)
::writerfilter::dmapper::PositionHandler::setPositionOffset( sText,
inPositionV );
}
+void OOXMLFastContextHandler::fldData(const OUString /* sText */)
+{
+// ignore --- As per ECMA fldData has been removed.
+// WordprocessingML Page# 5011 [ ISO/IEC 29500-1:2012 ]
+// WordprocessingML Page# 5552 [ ECMA-376 Part 1 ]
+// Hack, so that fldData is not interpreted as field Command
+}
+
void OOXMLFastContextHandler::alignH(const OUString sText)
{
if (isForwardEvents())
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 6f07c33..221c222b 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -195,6 +195,7 @@ public:
void endOfParagraph();
void text(const OUString sText);
void positionOffset(const OUString sText);
+void fldData(const OUString sText);
void alignH(const OUString sText);
void alignV(const OUString sText);
void positivePercentage(const OUString rText);
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py
b/writerfilter/source/ooxml/factoryimpl_ns.py
index 687814d..bc59480 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -400,6 +400,8 @@ def factoryChooseAction(actionNode):
ret.append(pHandler-alignH(sText);)
elif actionNode.getAttribute(action) == alignV:
ret.append(pHandler-alignV(sText);)
+elif actionNode.getAttribute(action) == fldData:
+ret.append(pHandler-fldData(sText);)
elif actionNode.getAttribute(action) == tokenproperty:
ret.append(
OOXMLFastHelperOOXMLIntegerValue::newProperty(pHandler, %s,
pHandler-getToken()); % idToLabel(ooxml:token))
else:
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 52993a9..ea9fc78 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17243,7 +17243,7 @@
group
optional
element name=fldData
- ref name=CT_Text/
+ ref name=CT_FLDData/
/element
/optional
zeroOrMore
@@ -17340,7 +17340,7 @@
choice
optional
element name=fldData
- ref name=CT_Text/
+ ref name=CT_FLDData
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/ooxml/pass/fdo81491.docx |binary
sw/source/core/doc/docbm.cxx |3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9a733398516b7ee08ad5b3887c75f11f0f6bbc27
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Fri Jul 25 15:05:50 2014 +0530
fdo#81491 FILEOPEN DOCX Assert Fails while Deleting Para (FramePr)
SwXText::convertToTextFrame is called for a Para with FramePr.
convertToTextFrame in turn calls DelFullPara which throws an assert
as a few Bookmarks are still registered to the paragraph.
In MarkManager::correctMarksAbsolute, pMark-GetMarkPos().nNode.GetNode()
is checked if it is pOldNode, and then the Mark Position is shifted to
aNewPos.
In the following condition pMark-GetOtherMarkPos().nNode.GetNode()
if it is the pOldNode, and still the Mark Position is changed.
However the Other Mark Position must be changed as now the Othe Mark is in
pOldNode.
Change-Id: I4507f6b2906d33bc65c922fffe12db2110de651b
Reviewed-on: https://gerrit.libreoffice.org/10536
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/core/data/ooxml/pass/fdo81491.docx
b/sw/qa/core/data/ooxml/pass/fdo81491.docx
new file mode 100644
index 000..0da6215
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo81491.docx differ
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index db2358c..233637c 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -584,7 +584,8 @@ namespace sw { namespace mark
if (pMark-IsExpanded()
pMark-GetOtherMarkPos().nNode.GetNode() == pOldNode)
{
-pMark-SetMarkPos(aNewPos);
+// shift the OtherMark to aNewPos
+pMark-SetOtherMarkPos(aNewPos);
bChangedOPos= true;
}
// illegal selection? collapse the mark and restore sorting later
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/shape/ShapeContextHandler.cxx| 14 +-
sw/qa/extras/ooxmlexport/data/fdo81031.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 16
3 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 0d5b053436eebac00948e95d64a87e150d195c07
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Tue Jul 8 15:32:29 2014 +0530
DOCX FILEOPEN VML Shape (image) is lost on import fdo#81031
ShapeContextHandler::getDrawingShapeContext mxDrawingShapeContext is set
once and never reset.
So in a file which has numPicBullets and vml shapes in document.xml there
is a problem.
First the fragment path is set as word/numbering.xml.
But when msRelationFragmentPath changes to word/document.xml,
mxDrawingShapeContext is not reset and hence the relationships are not
resolved.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/10180
Change-Id: I4a1401103797972731257145430f2048b94a04bc
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index 53a6927..4ed6298 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -205,7 +205,19 @@ ShapeContextHandler::getDrawingShapeContext()
(new oox::vml::DrawingFragment
( *mxFilterBase, msRelationFragmentPath, *mpDrawing )));
}
-
+else
+{
+// Reset the handler if fragment path has changed
+OUString sHandlerFragmentPath = dynamic_castContextHandler
*(mxDrawingFragmentHandler.get())-getFragmentPath();
+if ( !msRelationFragmentPath.equals(sHandlerFragmentPath) )
+{
+mxDrawingFragmentHandler.clear();
+mxDrawingFragmentHandler.set
+ (dynamic_castContextHandler *
+ (new oox::vml::DrawingFragment
+( *mxFilterBase, msRelationFragmentPath, *mpDrawing )));
+}
+}
return mxDrawingFragmentHandler;
}
diff --git a/sw/qa/extras/ooxmlexport/data/fdo81031.docx
b/sw/qa/extras/ooxmlexport/data/fdo81031.docx
new file mode 100644
index 000..d80111d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo81031.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0c530fb..7dd37a2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -9,6 +9,8 @@
#include swmodeltestbase.hxx
+#include com/sun/star/awt/XBitmap.hpp
+#include com/sun/star/graphic/XGraphic.hpp
#include com/sun/star/frame/XStorable.hpp
#include com/sun/star/drawing/FillStyle.hpp
#include com/sun/star/drawing/LineJoint.hpp
@@ -3783,6 +3785,20 @@ DECLARE_OOXMLEXPORT_TEST(testFooterBodyDistance,
footer-body-distance.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/w:br, 1);
}
+DECLARE_OOXMLEXPORT_TEST(testfdo81031, fdo81031.docx)
+{
+// vml image was not rendered
+// As there are also numPicBullets in the file,
+// the fragmentPath was not changed hence relationships were not resolved.
+
+uno::Referencedrawing::XShape image = getShape(1);
+uno::Referencebeans::XPropertySet xImage(image, 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(381),
xBitmap-getSize().Width );
+CPPUNIT_ASSERT_EQUAL( static_castsal_Int32(148),
xBitmap-getSize().Height );
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
