Added a scanbutton to the scan-dialog

3 files changed, 66 insertions, 0 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 69c0926a3f2d..8ae72cb5579b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2958,6 +2958,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/scanner,\
 	ScannerContext \
 	ScannerException \
 	XScannerManager \
+	XScannerManager2 \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script,\
 	LibraryNotLoadedException \
diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl
index ad06759c89a0..c2b1b7e01d15 100644
--- a/offapi/com/sun/star/scanner/ScannerManager.idl
+++ b/offapi/com/sun/star/scanner/ScannerManager.idl
@@ -40,6 +40,9 @@ module com { module sun { module star { module scanner {
 // DOCUMENTATION CHANGED FOR ScannerManager
 /** ScannerManager provides a simple method to access scanner devices
     (or other image producing devices)
+
+    Note that implementations should actually implement
+    <type>XScannerManager2</type>.
 */
 published service ScannerManager
 {
diff --git a/offapi/com/sun/star/scanner/XScannerManager2.idl b/offapi/com/sun/star/scanner/XScannerManager2.idl
new file mode 100644
index 000000000000..df21f95af0ed
--- /dev/null
+++ b/offapi/com/sun/star/scanner/XScannerManager2.idl
@@ -0,0 +1,62 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Rob Snelders <programming@ertai.nl> (initial
+ *   developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __com_sun_star_scanner_XScannerManager2_idl__
+#define __com_sun_star_scanner_XScannerManager2_idl__
+
+#include <com/sun/star/scanner/ScannerManager.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module scanner {
+
+//=============================================================================
+
+/**
+    Extension of <type>XScannerManager</type>.
+
+    @since LibreOffice 3.5
+*/
+published interface XScannerManager2: com::sun::star::scanner::XScannerManager
+{
+    //-------------------------------------------------------------------------
+    /** produce some kind of User Interface to let the user have a preview,
+        configure the scan area, etc., it, and scan it
+        returns FALSE if user cancelled this process
+    */
+    boolean configureScannerAndScan( [inout] com::sun::star::scanner::ScannerContext scanner_context,
+             [in] com::sun::star::lang::XEventListener listener )
+            raises( com::sun::star::scanner::ScannerException );
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif