Commits

Anonymous committed a81683d Merge

CWS-TOOLING: integrate CWS sw33bf12

  • Participants
  • Parent commits ef063af, 811ad0b

Comments (0)

Files changed (2)

File vcl/source/gdi/outdev.cxx

     const bool bDashUsed(LINE_DASH == aInfo.GetStyle());
     const bool bLineWidthUsed(aInfo.GetWidth() > 1);
 
+    if ( mbInitLineColor )
+        ImplInitLineColor();
+
     if(bDashUsed || bLineWidthUsed)
     {
         basegfx::B2DPolygon aLinePolygon;
     }
 	else
 	{
-		if ( mbInitLineColor )
-			ImplInitLineColor();
-
 		mpGraphics->DrawLine( aStartPt.X(), aStartPt.Y(), aEndPt.X(), aEndPt.Y(), this );
 	}
 

File xmloff/source/draw/ximpshap.cxx

 			SetLayer();
 
 			if ( maPath.hasValue() )
-				xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier") ), maPath );
+            {
+                // --> OD #i115492#
+                // Ignore svg:d attribute for text documents created by OpenOffice.org 
+                // versions before OOo 3.3, because these OOo versions are storing
+                // svg:d values not using the correct unit.
+                bool bApplySVGD( true );
+                if ( uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() )
+                {
+                    sal_Int32 nUPD( 0 );
+                    sal_Int32 nBuild( 0 );
+                    const bool bBuildIdFound = GetImport().getBuildIds( nUPD, nBuild );
+                    if ( GetImport().IsTextDocInOOoFileFormat() ||
+                         ( bBuildIdFound &&
+                           ( ( nUPD == 641 ) || ( nUPD == 645 ) ||  // prior OOo 2.0
+                             ( nUPD == 680 ) ||                     // OOo 2.x
+                             ( nUPD == 300 ) ||                     // OOo 3.0 - OOo 3.0.1
+                             ( nUPD == 310 ) ||                     // OOo 3.1 - OOo 3.1.1
+                             ( nUPD == 320 ) ) ) )                  // OOo 3.2 - OOo 3.2.1
+                    {
+                        bApplySVGD = false;
+                    }    
+                }            
+
+                if ( bApplySVGD )
+                {
+                    xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier") ), maPath );
+                }                                                                                        
+                // <--
+            }
 
 			SdXMLShapeContext::StartElement(xAttrList);
 		}