rebase XSlidePreviewCache

Change-Id: I102c63d92611b69dc6a6cdc1c38555627c7ce2c3

2 files changed, 30 insertions, 64 deletions

diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index 32823d48e2d6..8a43752bf31a 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -20,16 +19,43 @@
 #ifndef __com_sun_star_drawing_XSlidePreviewCache_idl__
 #define __com_sun_star_drawing_XSlidePreviewCache_idl__
 
+#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
+#endif
+#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
+#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
+#endif
+#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#include <com/sun/star/drawing/XSlidePreviewCacheListener.idl>
-
+#endif
 
 module com { module sun { module star { module drawing {
 
+/** Listener for asynchronous preview creations.  Called when a slide
+    preview has been created that was previously requested via a call to
+    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
+    implementor may then call <method>getSlidePreview()</method> a second
+    time to get the up-to-date version of the preview.
+*/
+published interface XSlidePreviewCacheListener
+{
+    /** Called by a <interface>XSlidePreviewCache</interface> object when a
+        preview has been created for the slide with the given index.
+        @param nSlideIndex
+            The index of the slide for which a new preview has been created.
+    */
+    void notifyPreviewCreation ([in] long nSlideIndex);
+};
+
+
+
+
 /** A cache of preview bitmaps for the slides of one Impress or Draw
     document in one size.  There may be more than one cache for one
     document.  These are internally connected and for missing previews one
@@ -41,7 +67,7 @@ module com { module sun { module star { module drawing {
     order to allow multiple references to a single slide (custom
     presentations).
 */
-interface XSlidePreviewCache
+published interface XSlidePreviewCache
 {
     /** Set the set of slides for which the cache will provide the
         previews.  All slides in the given XIndexAccess are required to come
@@ -105,5 +131,3 @@ interface XSlidePreviewCache
 }; }; }; }; // ::com::sun::star::drawing
 
 #endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
deleted file mode 100644
index bff5c1ee3e5c..000000000000
--- a/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
-#define __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-module com { module sun { module star { module drawing {
-
-/** Listener for asynchronous preview creations.  Called when a slide
-    preview has been created that was previously requested via a call to
-    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
-    implementor may then call <method>getSlidePreview()</method> a second
-    time to get the up-to-date version of the preview.
-*/
-interface XSlidePreviewCacheListener
-{
-    /** Called by a <interface>XSlidePreviewCache</interface> object when a
-        preview has been created for the slide with the given index.
-        @param nSlideIndex
-            The index of the slide for which a new preview has been created.
-    */
-    void notifyPreviewCreation ([in] long nSlideIndex);
-};
-
-}; }; }; }; // ::com::sun::star::drawing
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */