diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-19 13:57:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-20 07:32:52 +0200 |
| commit | 23a16f5d3856d6eb61d599af9e47add4c456bfb2 (patch) | |
| tree | 023648c6747837a37be5f9ec5fed1bae5d023ec4 /svtools | |
| parent | b4b0b400071a0fd12587334e3b9d615f35be671b (diff) | |
fdo#46808, convert graphic::PrimitiveFactory2D to new style
The service already existed, it just needed an IDL file
Change-Id: I40fb28d94253c3c577655bb888ff0d0ee3ba3822
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter/exportdialog.cxx | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index b3b81b4bbb49..384057d10e7b 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp> +#include <com/sun/star/graphic/PrimitiveFactory2D.hpp> #include <com/sun/star/geometry/AffineMatrix2D.hpp> #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/document/XFilter.hpp> @@ -45,6 +45,7 @@ #include <vcl/graph.hxx> #include <rtl/ustrbuf.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <comphelper/processfactory.hxx> #include "exportdialog.hxx" #define FORMAT_UNKNOWN 0 @@ -357,35 +358,32 @@ awt::Size ExportDialog::GetOriginalSize() } else { - uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory( - mxMgr->createInstance(OUString("com.sun.star.comp.graphic.PrimitiveFactory2D")), uno::UNO_QUERY); - if ( xPrimitiveFactory.is() ) + uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory = graphic::PrimitiveFactory2D::create( comphelper::getComponentContext(mxMgr) ); + + basegfx::B2DHomMatrix aViewTransformation( Application::GetDefaultDevice()->GetViewTransformation() ); + com::sun::star::geometry::AffineMatrix2D aTransformation; + aTransformation.m00 = aViewTransformation.get(0,0); + aTransformation.m01 = aViewTransformation.get(0,1); + aTransformation.m02 = aViewTransformation.get(0,2); + aTransformation.m10 = aViewTransformation.get(1,0); + aTransformation.m11 = aViewTransformation.get(1,1); + aTransformation.m12 = aViewTransformation.get(1,2); + + const OUString sViewTransformation( "ViewTransformation" ); + uno::Sequence< beans::PropertyValue > aViewInformation( 1 ); + aViewInformation[ 0 ].Value <<= aTransformation; + aViewInformation[ 0 ].Name = sViewTransformation; + + if ( mxShape.is() ) + aShapesRange = GetShapeRangeForXShape( mxShape, xPrimitiveFactory, aViewInformation ); + else if ( mxShapes.is() ) { - basegfx::B2DHomMatrix aViewTransformation( Application::GetDefaultDevice()->GetViewTransformation() ); - com::sun::star::geometry::AffineMatrix2D aTransformation; - aTransformation.m00 = aViewTransformation.get(0,0); - aTransformation.m01 = aViewTransformation.get(0,1); - aTransformation.m02 = aViewTransformation.get(0,2); - aTransformation.m10 = aViewTransformation.get(1,0); - aTransformation.m11 = aViewTransformation.get(1,1); - aTransformation.m12 = aViewTransformation.get(1,2); - - const OUString sViewTransformation( "ViewTransformation" ); - uno::Sequence< beans::PropertyValue > aViewInformation( 1 ); - aViewInformation[ 0 ].Value <<= aTransformation; - aViewInformation[ 0 ].Name = sViewTransformation; - - if ( mxShape.is() ) - aShapesRange = GetShapeRangeForXShape( mxShape, xPrimitiveFactory, aViewInformation ); - else if ( mxShapes.is() ) + const sal_Int32 nCount = mxShapes->getCount(); + for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { - const sal_Int32 nCount = mxShapes->getCount(); - for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) - { - uno::Reference< drawing::XShape > xShape; - mxShapes->getByIndex( nIndex ) >>= xShape; - aShapesRange.expand( GetShapeRangeForXShape( xShape, xPrimitiveFactory, aViewInformation ) ); - } + uno::Reference< drawing::XShape > xShape; + mxShapes->getByIndex( nIndex ) >>= xShape; + aShapesRange.expand( GetShapeRangeForXShape( xShape, xPrimitiveFactory, aViewInformation ) ); } } } |