From 256427a28d4ba3de573c81d64b5fbbe1cb354b01 Mon Sep 17 00:00:00 2001
From: Armin Le Grand <Armin.Le.Grand@Sun.COM>
Date: Tue, 22 Sep 2009 18:14:05 +0200
Subject: #i97509# continued matrix tooling and adapting the usages now to all
 the ooo code

---
 svx/source/unodraw/unoshape.cxx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'svx/source/unodraw')

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 3f7f58a1e9ad..b83253968601 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -98,6 +98,7 @@
 #include "unomaster.hxx"
 #include <svx/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 #include <vector>
 
@@ -2516,10 +2517,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                         if( mpModel->IsWriter() )
                         {
                             Point aPoint( mpObj->GetAnchorPos() );
-
-                            basegfx::B2DHomMatrix aMatrix;
-                            aMatrix.translate( aPoint.X(), aPoint.Y() );
-                            aNewPolyPolygon.transform( aMatrix );
+                            aNewPolyPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(aPoint.X(), aPoint.Y()));
                         }
                         pEdgeObj->SetEdgeTrackPath( aNewPolyPolygon );
                         return true;
@@ -2952,10 +2950,7 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     if( mpModel->IsWriter() )
                     {
                         Point aPoint( mpObj->GetAnchorPos() );
-
-                        basegfx::B2DHomMatrix aMatrix;
-                        aMatrix.translate( -aPoint.X(), -aPoint.Y() );
-                        aPolyPoly.transform( aMatrix );
+                        aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y()));
                     }
                     drawing::PolyPolygonBezierCoords aRetval;
                     SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval);
-- 
cgit 


From 8da0b34d6ee5201d3601e16673f78e9ad3638d31 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Mon, 2 Nov 2009 19:08:00 +0100
Subject: #i105745#: tools/stream.hxx: API change:  make
 SvMemoryStream::GetSize() private  introduce new public
 SvMemoryStream::GetEndOfData()

---
 svx/source/unodraw/unoshap2.cxx | 4 +++-
 svx/source/unodraw/unoshap4.cxx | 4 +++-
 svx/source/unodraw/unoshape.cxx | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'svx/source/unodraw')

diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index d6d0913c4070..b15d49ecff57 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1820,7 +1820,9 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
             SvMemoryStream aDestStrm( 65535, 65535 );
 
             ConvertGDIMetaFileToWMF( rGraphic.GetGDIMetaFile(), aDestStrm, NULL, sal_False );
-            uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+            const uno::Sequence<sal_Int8> aSeq(
+                static_cast< const sal_Int8* >(aDestStrm.GetData()),
+                aDestStrm.GetEndOfData());
             rValue <<= aSeq;
         }
         break;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 674cb8fdb24d..7130a2d2f960 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -315,7 +315,9 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
                     }
                     SvMemoryStream aDestStrm( 65535, 65535 );
                     ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
-                    uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+                    const uno::Sequence<sal_Int8> aSeq(
+                        static_cast< const sal_Int8* >(aDestStrm.GetData()),
+                        aDestStrm.GetEndOfData());
                     rValue <<= aSeq;
                 }
             }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 3f7f58a1e9ad..c2ebf4642fe8 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -680,7 +680,9 @@ uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw
     {
         SvMemoryStream aDestStrm( 65535, 65535 );
         ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
-        uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+        const uno::Sequence<sal_Int8> aSeq(
+            static_cast< const sal_Int8* >(aDestStrm.GetData()),
+            aDestStrm.GetEndOfData());
         aAny.setValue( &aSeq, ::getCppuType((const uno::Sequence< sal_Int8 >*)0) );
     }
     else
@@ -3127,7 +3129,9 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     }
                     SvMemoryStream aDestStrm( 65535, 65535 );
                     ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
-                    uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+                    const uno::Sequence<sal_Int8> aSeq(
+                        static_cast< const sal_Int8* >(aDestStrm.GetData()),
+                        aDestStrm.GetEndOfData());
                     rValue <<= aSeq;
                 }
             }
-- 
cgit