rebase XPresentationHelper

Change-Id: Ib3c0ff5ebe0bfb56d5f3f4debf9f47b0687121ae

2 files changed, 14 insertions, 50 deletions

diff --git a/offapi/com/sun/star/drawing/CanvasFeature.idl b/offapi/com/sun/star/drawing/CanvasFeature.idl
deleted file mode 100644
index c61c7f3c2c9b..000000000000
--- a/offapi/com/sun/star/drawing/CanvasFeature.idl
+++ /dev/null
@@ -1,46 +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_CanvasFeature_idl__
-#define __com_sun_star_drawing_CanvasFeature_idl__
-
-module com { module sun { module star { module drawing {
-
-constants CanvasFeature
-{
-    const short None = 0;
-    const short SpriteCanvas = 1;
-};
-
-
-
-}; }; }; }; // ::com::sun::star::drawing
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index 003b6c1b5e75..afa5612578d7 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.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,14 +19,27 @@
 #ifndef __com_sun_star_drawing_XPresenterHelper_idl__
 #define __com_sun_star_drawing_XPresenterHelper_idl__
 
+#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
+#endif
+#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
+#endif
+#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
+#endif
+#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#include <com/sun/star/drawing/CanvasFeature.idl>
+#endif
 
 module com { module sun { module star { module drawing {
 
+constants CanvasFeature
+{
+    const short None = 0;
+    const short SpriteCanvas = 1;
+};
+
 /** This interface is a collection of functions that are necessary to
     implement larger parts of the presenter screen as extension.  The
     methods of this interface give access to services that can, at the
@@ -156,5 +168,3 @@ interface XPresenterHelper
 }; }; }; }; // ::com::sun::star::drawing
 
 #endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */