diff options
| author | Rob Snelders <programming@ertai.nl> | 2011-10-20 21:25:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-20 23:04:13 +0200 |
| commit | 638804f7e2c26047da15af26dfb8eb35b9ee0feb (patch) | |
| tree | eb4f9723e24b263ceb9a62e1175e0542d0f6efd6 /sd | |
| parent | Undo basis/brand split: moved Python from basis to brand. (diff) | |
| download | core-638804f7e2c26047da15af26dfb8eb35b9ee0feb.tar.gz core-638804f7e2c26047da15af26dfb8eb35b9ee0feb.zip | |
Added a scanbutton to the scan-dialog
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews8.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 51524bf49a73..6a501d86d677 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -293,7 +293,7 @@ #include "com/sun/star/presentation/XPresentationSupplier.hpp" #include "com/sun/star/registry/XRegistryKey.hpp" #include "com/sun/star/rendering/XSpriteCanvas.hpp" -#include "com/sun/star/scanner/XScannerManager.hpp" +#include "com/sun/star/scanner/XScannerManager2.hpp" #include "com/sun/star/sdbc/XResultSet.hpp" #include "com/sun/star/sdbc/XRow.hpp" #include "com/sun/star/style/LineSpacing.hpp" diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 5e7a345e9114..57b32386ada5 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -36,7 +36,7 @@ #include "TabControl.hxx" #include "pres.hxx" #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/scanner/XScannerManager.hpp> +#include <com/sun/star/scanner/XScannerManager2.hpp> #include <unotools/caserotate.hxx> class SdPage; @@ -451,7 +451,7 @@ private: SdPage* pPage, const sal_Int32 nInsertPosition = -1); - ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager > mxScannerManager; + ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 > mxScannerManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; sal_Bool mbPastePossible; diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index b12c10e276e7..726e9be7746d 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -360,7 +360,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) if( aContexts.getLength() ) { ::com::sun::star::scanner::ScannerContext aContext( aContexts.getConstArray()[ 0 ] ); - mxScannerManager->configureScanner( aContext ); + mxScannerManager->configureScannerAndScan( aContext, mxScannerListener ); } } catch(...) diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 5f7c07ef70a1..43ab2dad852d 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -393,7 +393,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if( xMgr.is() ) { - mxScannerManager = ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager >( + mxScannerManager = ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 >( xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" )) ), ::com::sun::star::uno::UNO_QUERY ); |