mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a9373a3fec4f1bd9b51c40666a12ffd9eb7357a2
libreoffice/scripting/source/dlgprov/dlgprov.hxx

173 lines
9.1 KiB
C++
Raw Normal View History

add modelines to .hxx files as well
2010-10-27 13:11:31 +01:00
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
re-base on ALv2 code. Includes: remove onlineregistration with dependencies Patch contributed by Juergen Schmidt http://svn.apache.org/viewvc?view=revision&revision=1249245
2012-07-06 17:28:37 +01:00
/*
* 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 .
*/
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
fixincludeguards.sh: some smaller dirs Change-Id: Ic25bd678dc299627299b22145efd7bebcf2b39d0
2014-04-18 22:47:44 +02:00
#ifndef INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGPROV_HXX
#define INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGPROV_HXX
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XDialog.hpp>
INTEGRATION: CWS ab28 (1.4.28); FILE MERGED 2006/07/12 08:39:25 ab 1.4.28.1: #i66948# XDialogProvider2 support
2006-07-14 06:10:17 +00:00
#include <com/sun/star/awt/XDialogProvider2.hpp>
Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
2013-05-24 22:44:30 +02:00
#include <com/sun/star/awt/XContainerWindowProvider.hpp>
fdo#46808, Convert awt::UnoControlDialog to new style Change-Id: I9a5256c8dbacda60167403b4e26900588943a9b2
2013-05-27 11:24:12 +02:00
#include <com/sun/star/awt/XUnoControlDialog.hpp>
#include <com/sun/star/beans/XIntrospectionAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
2013-05-24 22:44:30 +02:00
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/resource/XStringResourceManager.hpp>
fdo#46808, Convert awt::UnoControlDialog to new style Change-Id: I9a5256c8dbacda60167403b4e26900588943a9b2
2013-05-27 11:24:12 +02:00
#include <com/sun/star/script/XScriptEventsAttacher.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
#include <cppuhelper/implbase4.hxx>
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
#include <osl/mutex.hxx>
INTEGRATION: CWS npower9 (1.6.22); FILE MERGED 2008/04/22 09:17:11 npower 1.6.22.3: RESYNC: (1.6-1.7); FILE MERGED 2008/01/15 12:57:32 npower 1.6.22.2: #i84808# 2007/12/20 21:20:04 npower 1.6.22.1: #i84808#
2008-05-05 14:56:31 +00:00
#include <memory>
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
Remove visual noise from scripting Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 20:05:49 +01:00
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
namespace dlgprov
{
Remove visual noise from scripting Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 20:05:49 +01:00
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
// mutex
Remove visual noise from scripting Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 20:05:49 +01:00
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
::osl::Mutex& getMutex();
Remove visual noise from scripting Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 20:05:49 +01:00
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
// class DialogProviderImpl
Remove visual noise from scripting Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 20:05:49 +01:00
Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
2013-05-24 22:44:30 +02:00
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext);
::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const OUString& i_sURL);
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createDialogModel(
tabcontrol: #i113362# impl tabcontrol in awt
2010-08-27 12:13:59 +02:00
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput,
Fix build in scripting
2011-03-15 11:52:49 +01:00
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
tabcontrol: #i113362# impl tabcontrol in awt
2010-08-27 12:13:59 +02:00
const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager,
Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
2013-05-24 22:44:30 +02:00
const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception );
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
typedef ::cppu::WeakImplHelper4<
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XInitialization,
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
::com::sun::star::awt::XDialogProvider2,
::com::sun::star::awt::XContainerWindowProvider > DialogProviderImpl_BASE;
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
class DialogProviderImpl : public DialogProviderImpl_BASE
{
private:
INTEGRATION: CWS npower9 (1.6.22); FILE MERGED 2008/04/22 09:17:11 npower 1.6.22.3: RESYNC: (1.6-1.7); FILE MERGED 2008/01/15 12:57:32 npower 1.6.22.2: #i84808# 2007/12/20 21:20:04 npower 1.6.22.1: #i84808#
2008-05-05 14:56:31 +00:00
struct BasicRTLParams
{
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxInput;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxDlgLib;
::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > mxBasicRTLListener;
};
scripting: std::auto_ptr -> std::unique_ptr Change-Id: I91f4a037dfcfbea83cb1ea546ea73880f0480961
2014-10-01 11:50:04 +02:00
std::unique_ptr< BasicRTLParams > m_BasicInfo;
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
2013-05-24 22:44:30 +02:00
OUString msDialogLibName;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const OUString& sURL );
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
fdo#46808, Convert awt::UnoControlDialog to new style Change-Id: I9a5256c8dbacda60167403b4e26900588943a9b2
2013-05-27 11:24:12 +02:00
::com::sun::star::uno::Reference< ::com::sun::star::awt::XUnoControlDialog > createDialogControl(
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxDialogModel,
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent );
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
void attachControlEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxControlContainer,
INTEGRATION: CWS ab28 (1.4.28); FILE MERGED 2006/07/12 08:39:25 ab 1.4.28.1: #i66948# XDialogProvider2 support
2006-07-14 06:10:17 +00:00
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler,
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& rxIntrospectionAccess,
WaE, remove unused parameter
2010-11-26 11:43:49 +00:00
bool bDialogProviderMode );
INTEGRATION: CWS ab28 (1.4.28); FILE MERGED 2006/07/12 08:39:25 ab 1.4.28.1: #i66948# XDialogProvider2 support
2006-07-14 06:10:17 +00:00
::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler );
INTEGRATION: CWS npower9 (1.6.22); FILE MERGED 2008/04/22 09:17:11 npower 1.6.22.3: RESYNC: (1.6-1.7); FILE MERGED 2008/01/15 12:57:32 npower 1.6.22.2: #i84808# 2007/12/20 21:20:04 npower 1.6.22.1: #i84808#
2008-05-05 14:56:31 +00:00
// helper methods
Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
2013-05-24 22:44:30 +02:00
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createDialogModel(
INTEGRATION: CWS tkr14 (1.8.6); FILE MERGED 2008/05/21 12:16:21 tkr 1.8.6.1: #157929# lost base url property after refactoring
2008-07-11 06:46:13 +00:00
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput,
const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager,
Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
2013-05-24 22:44:30 +02:00
const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModelForBasic() throw ( ::com::sun::star::uno::Exception );
INTEGRATION: CWS ab28 (1.4.28); FILE MERGED 2006/07/12 08:39:25 ab 1.4.28.1: #i66948# XDialogProvider2 support
2006-07-14 06:10:17 +00:00
// XDialogProvider / XDialogProvider2 impl method
new loplugin: change virtual methods to non-virtual Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
2015-01-20 12:38:10 +02:00
::com::sun::star::uno::Reference < ::com::sun::star::awt::XControl > SAL_CALL createDialogImpl(
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
const OUString& URL,
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler,
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
bool bDialogProviderMode )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
public:
DialogProviderImpl(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~DialogProviderImpl();
// XServiceInfo
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
virtual OUString SAL_CALL getImplementationName( )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
// XDialogProvider
virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialog(
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
const OUString& URL )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
INTEGRATION: CWS ab28 (1.4.28); FILE MERGED 2006/07/12 08:39:25 ab 1.4.28.1: #i66948# XDialogProvider2 support
2006-07-14 06:10:17 +00:00
// XDialogProvider2
virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithHandler(
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
const OUString& URL,
INTEGRATION: CWS ab28 (1.4.28); FILE MERGED 2006/07/12 08:39:25 ab 1.4.28.1: #i66948# XDialogProvider2 support
2006-07-14 06:10:17 +00:00
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
unoawt2: allow creating dialogs with a parent window
2010-06-17 18:28:42 +02:00
virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithArguments(
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
const OUString& URL,
unoawt2: createDialogWithArguments: use NamedValues instead of PropertyValues
2010-06-22 01:36:43 +02:00
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
unoawt2: allow creating dialogs with a parent window
2010-06-17 18:28:42 +02:00
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createContainerWindow(
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
const OUString& URL, const OUString& WindowType,
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler )
Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
INTEGRATION: CWS jl61 (1.5.42); FILE MERGED 2007/06/13 08:18:47 ab 1.5.42.1: #i76438# Support (X)ContainerWindowProvider / XContainerWindowEventHandler
2007-06-20 09:28:40 +00:00
};
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
Remove visual noise from scripting Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 20:05:49 +01:00
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
} // namespace dlgprov
Remove visual noise from scripting Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 20:05:49 +01:00
INTEGRATION: CWS scriptingf3 (1.1.2); FILE ADDED 2004/01/08 11:38:44 tbe 1.1.2.2: #i22565# creation of dialogs via a UNO service 2004/01/07 16:15:18 tbe 1.1.2.1: #i22565# creation of dialogs via a UNO service
2004-02-10 15:13:42 +00:00
new loplugin: externalandnotdefined Find "missing headers," where a function is declared directly in the .cxx (as extern) and not defined, and should arguably instead be declared in an include file. Change-Id: I6d83ee432b2ab0cd050aec2b27c3658d32ac02a2
2014-06-25 14:57:44 +02:00
// component helper namespace
namespace comp_DialogModelProvider {
// component and service helper functions:
OUString SAL_CALL _getImplementationName();
css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
} // namespace comp_DialogModelProvider
fixincludeguards.sh: some smaller dirs Change-Id: Ic25bd678dc299627299b22145efd7bebcf2b39d0
2014-04-18 22:47:44 +02:00
#endif // INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGPROV_HXX
add modelines to .hxx files as well
2010-10-27 13:11:31 +01:00
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue Copy Permalink