diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-05 09:15:05 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-05 09:15:05 +0200 |
commit | 719618f28e003c545c20a8fc94d348b667c8376a (patch) | |
tree | 20c122c30c2d7a8ded6da48f3d7cd7d46357da5a /sdext | |
parent | Revert "Dupe code removal in cui" (diff) | |
download | core-719618f28e003c545c20a8fc94d348b667c8376a.tar.gz core-719618f28e003c545c20a8fc94d348b667c8376a.zip |
Remove bogus dependency of extension on comphelper
Change-Id: I2a0d4bc968b9b1d285006f26603da4a98fbd870b
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/Library_minimizer.mk | 1 | ||||
-rw-r--r-- | sdext/source/minimizer/impoptimizer.cxx | 5 | ||||
-rw-r--r-- | sdext/source/minimizer/informationdialog.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk index f19b54168af5..5c918c390b51 100644 --- a/sdext/Library_minimizer.mk +++ b/sdext/Library_minimizer.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_api,SunPresentationMinimizer,\ )) $(eval $(call gb_Library_use_libraries,SunPresentationMinimizer,\ - comphelper \ cppu \ cppuhelper \ sal \ diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 699dc34e09f7..8afd16f93c75 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -69,7 +69,6 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/util/URL.hpp> -#include <comphelper/componentcontext.hxx> using namespace ::std; using namespace ::rtl; @@ -351,7 +350,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& { Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.io.TempFile"), rxMSF ), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); - Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(comphelper::ComponentContext(rxMSF).getUNOContext()) ); + Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxMSF ) ); ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, bRemoveCropArea, aGraphicCropLogic ); Reference< XInputStream > xInputStream( xTempFile->getInputStream() ); @@ -371,7 +370,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& rtl::OUString aDestMimeType( aSourceMimeType ); Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.io.TempFile"), rxMSF ), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); - Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( ::comphelper::ComponentContext(rxMSF).getUNOContext() ) ); + Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxMSF ) ); ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic ); Reference< XInputStream > xInputStream( xTempFile->getInputStream() ); Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW ); diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 7f510b657fd9..c74599f57bab 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -37,7 +37,6 @@ #include <sal/macros.h> #include "com/sun/star/util/URL.hpp" #include "com/sun/star/util/XURLTransformer.hpp" -#include <comphelper/componentcontext.hxx> #define DIALOG_WIDTH 240 #define DIALOG_HEIGHT 80 @@ -220,7 +219,7 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL ) Reference< XOutputStream > xOutputStream( mxTempFile->getOutputStream() ); if ( xOutputStream.is() && xPropSet.is() ) { - Reference< graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create( ::comphelper::ComponentContext(mxMSF).getUNOContext() ) ); + Reference< graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create( mxMSF ) ); Sequence< PropertyValue > aArgs( 1 ); aArgs[ 0 ].Name = OUString("URL"); aArgs[ 0 ].Value <<= sPrivateURL; |