diff options
author | Noel Grandin <noel@peralex.com> | 2012-10-11 15:43:08 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-23 10:26:40 +0200 |
commit | c988da288ec473a28f61ebb53aa3ff82bab11ef4 (patch) | |
tree | 284f184384dba369c40e0caff533a2d683e9d478 /offapi/com/sun/star/ui | |
parent | Apple's Clang 4.1 does not have -Wself-assign-field (diff) | |
download | core-c988da288ec473a28f61ebb53aa3ff82bab11ef4.tar.gz core-c988da288ec473a28f61ebb53aa3ff82bab11ef4.zip |
fdo#46808, Adapt ui::dialogs::FolderPicker UNO service to new style
Create a merged XFolderPicker2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Change-Id: I4a2c2a8d491a8d5633c19ddcea547f0efe75b91d
Diffstat (limited to 'offapi/com/sun/star/ui')
-rw-r--r-- | offapi/com/sun/star/ui/dialogs/FolderPicker.idl | 19 | ||||
-rw-r--r-- | offapi/com/sun/star/ui/dialogs/XFolderPicker2.idl | 62 |
2 files changed, 64 insertions, 17 deletions
diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl index 16187c3c7ee0..a283c6085113 100644 --- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl +++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl @@ -20,30 +20,15 @@ #ifndef __com_sun_star_ui_dialogs_FolderPicker_idl__ #define __com_sun_star_ui_dialogs_FolderPicker_idl__ -#include <com/sun/star/lang/XComponent.idl> -#include <com/sun/star/util/XCancellable.idl> +#include <com/sun/star/ui/dialogs/XFolderPicker2.idl> module com { module sun { module star { module ui { module dialogs { - -published interface XFolderPicker; - /** A FolderPicker service. */ -published service FolderPicker -{ - /** Provides the ability to execute a FolderPicker dialog and - browse for and select folders. - */ - interface XFolderPicker; - - /** For canceling a running dialog instance. - <p>This may be useful for automatic test tools for instance.</p> - */ - [optional] interface com::sun::star::util::XCancellable; -}; +published service FolderPicker : XFolderPicker2; }; }; }; }; }; diff --git a/offapi/com/sun/star/ui/dialogs/XFolderPicker2.idl b/offapi/com/sun/star/ui/dialogs/XFolderPicker2.idl new file mode 100644 index 000000000000..4dfec0a5a332 --- /dev/null +++ b/offapi/com/sun/star/ui/dialogs/XFolderPicker2.idl @@ -0,0 +1,62 @@ +/* -*- 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_ui_dialogs_XFolderPicker2_idl__ +#define __com_sun_star_ui_dialogs_XFolderPicker2_idl__ + +#include <com/sun/star/ui/dialogs/XFolderPicker.idl> +#include <com/sun/star/util/XCancellable.idl> + + +module com { module sun { module star { module ui { module dialogs { + + +/** + Provides a unified interface for the new-style FolderPicker service to implement. + + @since LibreOffice 3.7 +*/ +published interface XFolderPicker2 +{ + /** Provides the ability to execute a FolderPicker dialog and + browse for and select folders. + */ + interface XFolderPicker; + + /** For canceling a running dialog instance. + <p>This may be useful for automatic test tools for instance.</p> + */ + interface com::sun::star::util::XCancellable; +}; + + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |