From a80b3c06ee0457d536071d770ae4c16fcaf3ff05 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Wed, 7 Nov 2012 12:17:07 -0600 Subject: split idl with multiple class into one idl per. Change-Id: I0703a647e2dd2082cee004b0bcd0d4988997e447 --- offapi/com/sun/star/presentation/SlideShow.idl | 33 ++++++++ .../sun/star/presentation/TransitionFactory.idl | 34 +++++++++ offapi/com/sun/star/presentation/XSlideShow.idl | 88 ++++++++-------------- .../sun/star/presentation/XTransitionFactory.idl | 47 +++++------- 4 files changed, 116 insertions(+), 86 deletions(-) create mode 100644 offapi/com/sun/star/presentation/SlideShow.idl create mode 100644 offapi/com/sun/star/presentation/TransitionFactory.idl (limited to 'offapi') diff --git a/offapi/com/sun/star/presentation/SlideShow.idl b/offapi/com/sun/star/presentation/SlideShow.idl new file mode 100644 index 000000000000..acd61536b0bf --- /dev/null +++ b/offapi/com/sun/star/presentation/SlideShow.idl @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef _com_sun_star_presentation_SlideShow_idl +#define _com_sun_star_presentation_SlideShow_idl + +#include + +module com { module sun { module star { module presentation { + +service SlideShow : XSlideShow; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/presentation/TransitionFactory.idl b/offapi/com/sun/star/presentation/TransitionFactory.idl new file mode 100644 index 000000000000..a4c93c9f99db --- /dev/null +++ b/offapi/com/sun/star/presentation/TransitionFactory.idl @@ -0,0 +1,34 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef __com_sun_star_presentation_TransitionFactory_idl__ +#define __com_sun_star_presentation_TransitionFactory_idl__ + +#include + + +module com { module sun { module star { module presentation { + +service TransitionFactory : XTransitionFactory; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl index 4cd4622b0245..c99cc09bfcff 100644 --- a/offapi/com/sun/star/presentation/XSlideShow.idl +++ b/offapi/com/sun/star/presentation/XSlideShow.idl @@ -1,84 +1,56 @@ -/************************************************************** +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * http://www.apache.org/licenses/LICENSE-2.0 + * This file incorporates work covered by the following license notice: * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _com_sun_star_presentation_XSlideShow_idl #define _com_sun_star_presentation_XSlideShow_idl -#ifndef __com_sun_star_uno_XInterface_idl__ #include -#endif -#ifndef __com_sun_star_beans_PropertyValue_idl__ #include -#endif -#ifndef __com_sun_star_geometry_RealRectangle2D_idl__ #include -#endif -#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__ #include -#endif -#ifndef __com_sun_star_animations_XAnimationNode_idl__ #include -#endif -#endif -#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ #include -#ifndef __com_sun_star_drawing_XDrawPage_idl__ #include -#endif -#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__ #include -#endif -#ifndef __com_sun_star_drawing_XShape_idl__ #include -#endif -#ifndef __com_sun_star_presentation_XSlideShowView_idl__ #include -#endif -#ifndef __com_sun_star_presentation_XSlideShowListener_idl__ #include -#endif -#ifndef __com_sun_star_presentation_XShapeEventListener_idl__ #include -#endif module com { module sun { module star { module presentation { -/** Slideshow interface to perform slideshow presentations.

+/** Slide show interface to perform slide show presentations.

This interface provides the necessary methods to run and control a - slideshow from a given set of XDrawPage slides. The slideshow can + slide show from a given set of XDrawPage slides. The slide show can be displayed simultaneously on multiple targets.

- Note: To controll a running slideshow inside a presentation, please + Note: To control a running slide show inside a presentation, please use XPresentation2 and XSlideShowController. @since OOo 3.0 */ interface XSlideShow : ::com::sun::star::uno::XInterface { - /** Trigger the next effect of the slideshow.

+ /** Trigger the next effect of the slide show.

This method triggers the next effect on the currently - displayed slide. If there is currently no slideshow running, + displayed slide. If there is currently no slide show running, this method does nothing. If there are no more effects on the current slide, a possible slide transition effect is issued and the next slide is displayed.

@@ -91,7 +63,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface */ boolean nextEffect(); - /** Undo the last effect in the main sequence of the slideshow.

+ /** Undo the last effect in the main sequence of the slide show.

The current slide is displayed as if the last user-triggered effect has never been triggered. If there is no previous effect on the @@ -99,7 +71,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface XSlideShowListener objects, which can then trigger a change to the previous slide. Note that this command is executed asynchronously. Multiple calls to update() may be necessary to complete its execution. - If there is currently no slideshow running, this method does + If there is currently no slide show running, this method does nothing.

@return , if the previous effect was successfully @@ -148,7 +120,8 @@ interface XSlideShow : ::com::sun::star::uno::XInterface The slide to display. @param xDrawPages - For future use. + For future use. + This parameter can be NULL when the ENABLE_PRESENTER_EXTRA_UI feature is disabled. @param xAnimationNode The animation node determine the animations to display. @@ -161,7 +134,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface

  • name: Prefetch, value: ::com::sun::star::drawing::XDrawPage. When given, this slide is prepared in the background to be displayed next. The next call to displaySlide() with the given slide may be faster if there was - enough time for prefatching. If the next call to displaySlide() uses + enough time for prefetching. If the next call to displaySlide() uses a different slide, this will still work but will not have any performance improvements
    • @@ -170,7 +143,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface are triggered. This is typically used when going back one effect leads to the previous slide. On that slide all effects have to be shown in order to continue the backward - travelling. + traveling. When , the default, then no main sequence effect is triggered. @@ -208,7 +181,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface /** Query the currently displayed slide.

    @return the instance of the current slide. If there's no - slideshow running at the moment, this method returns an + slide show running at the moment, this method returns an empty reference. */ ::com::sun::star::drawing::XDrawPage getCurrentSlide(); @@ -221,7 +194,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface void registerUserPaintPolygons([in] ::com::sun::star::lang::XMultiServiceFactory xDocFactory); - /** Change a property of the slideshow.

    + /** Change a property of the slide show.

    @param aShowProperty Property values, which influence the way the slides are @@ -300,7 +273,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface /** Add a slide show listener.

    This method adds a listener to the slide show, which will get - notified when a registerend shape is clicked upon, or a new + notified when a registered shape is clicked upon, or a new slide is about to be displayed. Note that the listeners will not be notified, when the slide change is directly requested by one of the nextSlide(), previousSlide() or @@ -365,9 +338,8 @@ interface XSlideShow : ::com::sun::star::uno::XInterface }; -service SlideShow : XSlideShow; - }; }; }; }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl index 7a064e3119dd..1eef9672b0ce 100644 --- a/offapi/com/sun/star/presentation/XTransitionFactory.idl +++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl @@ -1,34 +1,26 @@ -/************************************************************** +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * http://www.apache.org/licenses/LICENSE-2.0 + * This file incorporates work covered by the following license notice: * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __com_sun_star_presentation_XTransitionFactory_idl__ #define __com_sun_star_presentation_XTransitionFactory_idl__ -#ifndef __com_sun_star_presentation_XTransition_idl__ #include -#endif -#ifndef __com_sun_star_geometry_RealPoint2D_idl__ #include -#endif module com { module sun { module star { @@ -40,7 +32,7 @@ module presentation { interface XTransition; interface XSlideShowView; -/** TransitionFactory interface to request optional custom Transition instances for slideshow transitions.

    +/** TransitionFactory interface to request optional custom Transition instances for slide show transitions.

    This interface provides the necessary methods to query and create optional transition effects for a SlideShow

    @@ -61,7 +53,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface Subtype for the transition (@see ::com::sun::star::animation::TransitionSubType) @param view - Slideshow view to display on + Slide show view to display on @param leavingBitmap Bitmap of the slide that's going to leave the screen @@ -71,7 +63,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface @param slideOffset Offset in pixel from the top, left edge of the view, such that the - slide displays similar to normal slideshow + slide displays similar to normal slide show */ XTransition createTransition( [in] short transitionType, [in] short transitionSubType, @@ -80,9 +72,8 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface [in] com::sun::star::rendering::XBitmap enteringBitmap ); }; -service TransitionFactory : XTransitionFactory; - }; }; }; }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit