animations/source/animcore/animcore.cxx | 18 ++++-- dbaccess/source/ui/browser/sbagrid.cxx | 20 +----- extensions/source/propctrlr/controlfontdialog.cxx | 16 +++++ extensions/source/propctrlr/controlfontdialog.hxx | 5 + offapi/UnoApi_offapi.mk | 3 + offapi/com/sun/star/animations/ParallelTimeContainer.idl | 37 ++++++++++++ offapi/com/sun/star/animations/XParallelTimeContainer.idl | 42 ++++++++++++++ offapi/com/sun/star/form/ControlFontDialog.idl | 42 ++++++++++++++ sd/CppunitTest_sd_filters_test.mk | 1 sd/CppunitTest_sd_regression_test.mk | 1 sd/source/core/CustomAnimationEffect.cxx | 14 +++- sd/source/core/sdpage_animations.cxx | 16 ++--- sd/source/ui/animations/CustomAnimationPane.cxx | 22 +++---- sd/source/ui/unoidl/randomnode.cxx | 10 +-- sd/source/ui/view/ViewShellBase.cxx | 1 15 files changed, 191 insertions(+), 57 deletions(-)
New commits: commit 378c038918ca6c7adecf73f49e627c75ebd0e43a Author: Noel Grandin <n...@peralex.com> Date: Tue Apr 23 16:04:30 2013 +0200 fdo#46808 Convert animations::ParallelTimeContainer to new style Change-Id: Iac6337828c807a132e561b5e9017a708be2e9729 diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index a503097..5b83bc0 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/animations/XAnimateSet.hpp> #include <com/sun/star/animations/XAnimateMotion.hpp> #include <com/sun/star/animations/XAnimateTransform.hpp> +#include <com/sun/star/animations/XParallelTimeContainer.hpp> #include <com/sun/star/animations/XTransitionFilter.hpp> #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/animations/XIterateContainer.hpp> @@ -108,8 +109,8 @@ class AnimationNodeBase : public XAnimateMotion, public XTransitionFilter, public XAnimateSet, public XAnimateTransform, + public XParallelTimeContainer, public XIterateContainer, - public XEnumerationAccess, public XServiceInfo, public XTypeProvider, public XAudio, @@ -547,9 +548,9 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeEx aType, static_cast< XServiceInfo * >( this ), static_cast< XTypeProvider * >( this ), - static_cast< XChild * >( static_cast< XTimeContainer * >(this) ), + static_cast< XChild * >( static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ) ), static_cast< XCloneable* >( this ), - static_cast< XAnimationNode* >( static_cast< XTimeContainer * >(this) ), + static_cast< XAnimationNode* >( static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ) ), static_cast< XInterface* >(static_cast< OWeakObject * >(this)), static_cast< XWeak* >(static_cast< OWeakObject * >(this)), static_cast< XChangesNotifier* >( this ), @@ -560,17 +561,24 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeEx switch( mnNodeType ) { case AnimationNodeType::PAR: + aRet = ::cppu::queryInterface( + aType, + static_cast< XParallelTimeContainer * >( this ), + static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ), + static_cast< XEnumerationAccess * >( this ), + static_cast< XElementAccess * >( this ) ); + break; case AnimationNodeType::SEQ: aRet = ::cppu::queryInterface( aType, - static_cast< XTimeContainer * >( this ), + static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ), static_cast< XEnumerationAccess * >( this ), static_cast< XElementAccess * >( this ) ); break; case AnimationNodeType::ITERATE: aRet = ::cppu::queryInterface( aType, - static_cast< XTimeContainer * >( this ), + static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ), static_cast< XIterateContainer * >( this ), static_cast< XEnumerationAccess * >( this ), static_cast< XElementAccess * >( this ) ); diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 2099eba..ed72206 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -36,6 +36,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibil AccessBridge \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ + ParallelTimeContainer \ SequenceTimeContainer \ TargetPropertiesCreator \ )) @@ -1647,6 +1648,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\ XAudio \ XCommand \ XIterateContainer \ + XParallelTimeContainer \ XTargetPropertiesCreator \ XTimeContainer \ XTransitionFilter \ diff --git a/offapi/com/sun/star/animations/ParallelTimeContainer.idl b/offapi/com/sun/star/animations/ParallelTimeContainer.idl new file mode 100644 index 0000000..a74b77c --- /dev/null +++ b/offapi/com/sun/star/animations/ParallelTimeContainer.idl @@ -0,0 +1,37 @@ +/* -*- 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_animations_ParallelTimeContainer_idl__ +#define __com_sun_star_animations_ParallelTimeContainer_idl__ + +#include <com/sun/star/animations/XParallelTimeContainer.idl> + +module com { module sun { module star { module animations { + + +/** + @since LibreOffice 4.1 +*/ +service ParallelTimeContainer : com::sun::star::animations::XParallelTimeContainer; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/animations/XParallelTimeContainer.idl b/offapi/com/sun/star/animations/XParallelTimeContainer.idl new file mode 100644 index 0000000..42c3864 --- /dev/null +++ b/offapi/com/sun/star/animations/XParallelTimeContainer.idl @@ -0,0 +1,42 @@ +/* -*- 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_animations_XParallelTimeContainer_idl__ +#define __com_sun_star_animations_XParallelTimeContainer_idl__ + +#include <com/sun/star/animations/XTimeContainer.idl> +#include <com/sun/star/container/XEnumerationAccess.idl> + +module com { module sun { module star { module animations { + + +/** + @since LibreOffice 4.1 +*/ +interface XParallelTimeContainer +{ + interface com::sun::star::animations::XTimeContainer; + interface com::sun::star::container::XEnumerationAccess; +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 5ec6134..23c9709 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_filters_test,\ $(eval $(call gb_CppunitTest_use_ure,sd_filters_test)) $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ + animations/source/animcore/animcore \ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 4c616efa..9121af4 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_regression_test,\ $(eval $(call gb_CppunitTest_use_ure,sd_regression_test)) $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\ + animations/source/animcore/animcore \ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index c24b3c9..9b397be 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -20,6 +20,7 @@ #include <tools/debug.hxx> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/animations/AnimationFill.hpp> +#include <com/sun/star/animations/ParallelTimeContainer.hpp> #include <com/sun/star/animations/SequenceTimeContainer.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/presentation/EffectNodeType.hpp> @@ -1036,11 +1037,14 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) { sal_Int16 nTargetSubItem = mnTargetSubItem; - Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); - const char * pServiceName = - nIterateType ? "com.sun.star.animations.IterateContainer" : "com.sun.star.animations.ParallelTimeContainer"; - Reference< XTimeContainer > xNewContainer( - xMsf->createInstance( OUString::createFromAscii(pServiceName) ), UNO_QUERY_THROW ); + Reference< XTimeContainer > xNewContainer; + if(nIterateType) + { + Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); + xNewContainer.set( xMsf->createInstance( OUString::createFromAscii("com.sun.star.animations.IterateContainer") ), UNO_QUERY_THROW ); + } + else + xNewContainer.set( ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW ); Reference< XTimeContainer > xOldContainer( mxNode, UNO_QUERY_THROW ); Reference< XEnumerationAccess > xEnumerationAccess( mxNode, UNO_QUERY_THROW ); diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index e14bba4..0c322d1 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/presentation/ParagraphTarget.hpp> +#include <com/sun/star/animations/ParallelTimeContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/presentation/EffectNodeType.hpp> +#include <com/sun/star/presentation/ParagraphTarget.hpp> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> #include <editeng/outliner.hxx> @@ -52,14 +53,11 @@ Reference< XAnimationNode > SdPage::getAnimationNode() throw (RuntimeException) { if( !mxAnimationNode.is() ) { - mxAnimationNode = Reference< XAnimationNode >::query(::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.ParallelTimeContainer")); - if( mxAnimationNode.is() ) - { - Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 ); - aUserData[0].Name = "node-type"; - aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; - mxAnimationNode->setUserData( aUserData ); - } + mxAnimationNode.set( ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW ); + Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 ); + aUserData[0].Name = "node-type"; + aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; + mxAnimationNode->setUserData( aUserData ); } return mxAnimationNode; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 4dc8ef9..e686b3e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/presentation/EffectPresetClass.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> +#include <com/sun/star/animations/ParallelTimeContainer.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/drawing/XShape.hpp> @@ -2364,18 +2365,15 @@ void CustomAnimationPane::onPreview( bool bForcePreview ) void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimationNode ) { - Reference< XTimeContainer > xRoot(::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.ParallelTimeContainer"), UNO_QUERY); - if( xRoot.is() ) - { - Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 ); - aUserData[0].Name = "node-type"; - aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; - xRoot->setUserData( aUserData ); - xRoot->appendChild( xAnimationNode ); - - Reference< XAnimationNode > xNode( xRoot, UNO_QUERY ); - SlideShow::StartPreview( mrBase, mxCurrentPage, xNode ); - } + Reference< XParallelTimeContainer > xRoot = ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ); + Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 ); + aUserData[0].Name = "node-type"; + aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; + xRoot->setUserData( aUserData ); + xRoot->appendChild( xAnimationNode ); + + Reference< XAnimationNode > xNode( xRoot, UNO_QUERY ); + SlideShow::StartPreview( mrBase, mxCurrentPage, xNode ); } diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index ee3c74b..a18fd1c 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/animations/AnimationFill.hpp> #include <com/sun/star/animations/XAnimate.hpp> #include <com/sun/star/animations/AnimationRestart.hpp> +#include <com/sun/star/animations/ParallelTimeContainer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -597,13 +598,8 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() else { // no presets? give empty node! - Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); - Reference< XEnumerationAccess > aEmptyEnumAccess( - xServiceFactory->createInstance( "com.sun.star.animations.ParallelTimeContainer" ), - UNO_QUERY ); - - if( aEmptyEnumAccess.is() ) - xEnum = aEmptyEnumAccess->createEnumeration(); + Reference< XParallelTimeContainer > xTimeContainer = ParallelTimeContainer::create( comphelper::getProcessComponentContext() ); + xEnum = xTimeContainer->createEnumeration(); } return xEnum; commit 3086d847d9ac8dbb228c10047fd7ecaa32a45263 Author: Noel Grandin <n...@peralex.com> Date: Tue Apr 23 14:01:12 2013 +0200 fdo#46808 Remove unnecessary getProcessServiceFactory() call Change-Id: Ic3219a615ae568d4d3e8aed83297ff6a39e6983b diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 37c39be..09006ed 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1121,7 +1121,6 @@ OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const if ( !aCmdURL.isEmpty() ) try { - Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext(), UNO_QUERY_THROW ); Reference< XModuleManager2 > xModuleManager( ModuleManager::create(xContext) ); commit 73adc9b6e29a3e005d7c2e98795045e7025325c2 Author: Noel Grandin <n...@peralex.com> Date: Tue Apr 23 13:55:25 2013 +0200 fdo#46808, Convert form::ControlFontDialog to new style Change-Id: I83487cddbd6b3fce1fdcdfa48623b63a0e026d90 diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 973aeca..745d243 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -30,6 +30,7 @@ #include "dlgattr.hxx" #include "dlgsize.hxx" #include <com/sun/star/form/XLoadable.hpp> +#include <com/sun/star/form/ControlFontDialog.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> @@ -952,24 +953,9 @@ void SbaGridControl::SetBrowserAttrs() try { - PropertyValue aArg; - aArg.Name = OUString("IntrospectedObject"); - aArg.Value <<= xGridModel; - Sequence< Any > aDialogArgs(1); - aDialogArgs[0] <<= aArg; - Reference< XComponentContext > xContext = getContext(); - Reference< XInterface > xDialog = xContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.form.ControlFontDialog", aDialogArgs, xContext); - if (!xDialog.is()) - { - ShowServiceNotAvailableError(this, OUString("com.sun.star.form.ControlFontDialog"), sal_True); - return; - } - - Reference< XExecutableDialog > xExecute(xDialog, UNO_QUERY); - OSL_ENSURE(xExecute.is(), "SbaGridControl::SetBrowserAttrs: missing an interface on the dialog!"); - if (xExecute.is()) - xExecute->execute(); + Reference< XExecutableDialog > xExecute = ControlFontDialog::createWithGridModel( xContext, xGridModel); + xExecute->execute(); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 861583f..87246f7 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -103,6 +103,22 @@ namespace pcr return aSupported; } + void OControlFontDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) + { + Reference<XPropertySet> xGridModel; + if (aArguments.getLength() == 1 && (aArguments[0] >>= xGridModel)) + { + PropertyValue aArg; + aArg.Name = OUString("IntrospectedObject"); + aArg.Value <<= xGridModel; + Sequence< Any > aNewArguments(1); + aNewArguments[0] <<= aArg; + OControlFontDialog_DBase::initialize(aNewArguments); + } + else + OControlFontDialog_DBase::initialize(aArguments); + } + //--------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL OControlFontDialog::getPropertySetInfo() throw(RuntimeException) { diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index c0db06a..50080e0 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -70,7 +70,10 @@ namespace pcr static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); - // XPropertySet + // XInitialization + virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + + // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index ef5781a..2099eba 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -145,6 +145,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ StorageFactory \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form,\ + ControlFontDialog \ Forms \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/control,\ diff --git a/offapi/com/sun/star/form/ControlFontDialog.idl b/offapi/com/sun/star/form/ControlFontDialog.idl new file mode 100644 index 0000000..7936f61 --- /dev/null +++ b/offapi/com/sun/star/form/ControlFontDialog.idl @@ -0,0 +1,42 @@ +/* -*- 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_form_ControlFontDialog_idl__ +#define __com_sun_star_form_ControlFontDialog_idl__ + +#include <com/sun/star/beans/XPropertySet.idl> +#include <com/sun/star/ui/dialogs/XExecutableDialog.idl> + + + +module com { module sun { module star { module form { + + +/** + @since LibreOffice 4.1 + */ +published service ControlFontDialog : com::sun::star::ui::dialogs::XExecutableDialog +{ + createWithGridModel([in] com::sun::star::beans::XPropertySet GridModel); +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits