diff options
Diffstat (limited to 'framework/source/dispatch')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 2 | ||||
| -rw-r--r-- | framework/source/dispatch/interaction.cxx | 209 | ||||
| -rw-r--r-- | framework/source/dispatch/makefile.mk | 63 | ||||
| -rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 4 | ||||
| -rw-r--r-- | framework/source/dispatch/popupmenudispatcher.cxx | 4 | ||||
| -rw-r--r-- | framework/source/dispatch/startmoduledispatcher.cxx | 2 |
6 files changed, 6 insertions, 278 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index ee84de9d7dd4..57355eaa6398 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -34,7 +34,7 @@ #include <pattern/frame.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#include <classes/framelistanalyzer.hxx> +#include <framework/framelistanalyzer.hxx> #include <services.h> #include <general.h> diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/dispatch/interaction.cxx deleted file mode 100644 index d1d14740956b..000000000000 --- a/framework/source/dispatch/interaction.cxx +++ /dev/null @@ -1,209 +0,0 @@ -/************************************************************************* - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ -#include <dispatch/interaction.hxx> -#include <general.h> - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -namespace framework{ - -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -//--------------------------------------------------------------------------------------------------------- -// initialize continuation with right start values -//--------------------------------------------------------------------------------------------------------- -ContinuationFilterSelect::ContinuationFilterSelect() - : m_sFilter( ::rtl::OUString() ) -{ -} - -//--------------------------------------------------------------------------------------------------------- -// handler should use it after selection to set user specified filter for transport -//--------------------------------------------------------------------------------------------------------- -void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilter ) throw( css::uno::RuntimeException ) -{ - m_sFilter = sFilter; -} - -//--------------------------------------------------------------------------------------------------------- -// read access to transported filter -//--------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException ) -{ - return m_sFilter; -} - -//--------------------------------------------------------------------------------------------------------- -// initialize instance with all neccessary informations -// We use it without any further checks on our member then ...! -//--------------------------------------------------------------------------------------------------------- -RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) -{ - ::rtl::OUString temp; - css::uno::Reference< css::uno::XInterface > temp2; - css::document::NoSuchFilterRequest aFilterRequest( temp , - temp2 , - sURL ); - m_aRequest <<= aFilterRequest; - - m_pAbort = new ContinuationAbort ; - m_pFilter = new ContinuationFilterSelect; - - m_lContinuations.realloc( 2 ); - m_lContinuations[0] = css::uno::Reference< css::task::XInteractionContinuation >( m_pAbort ); - m_lContinuations[1] = css::uno::Reference< css::task::XInteractionContinuation >( m_pFilter ); -} - -//--------------------------------------------------------------------------------------------------------- -// return abort state of interaction -// If it is true, return value of method "getFilter()" will be unspecified then! -//--------------------------------------------------------------------------------------------------------- -sal_Bool RequestFilterSelect::isAbort() const -{ - return m_pAbort->isSelected(); -} - -//--------------------------------------------------------------------------------------------------------- -// return user selected filter -// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestFilterSelect::getFilter() const -{ - return m_pFilter->getFilter(); -} - -//--------------------------------------------------------------------------------------------------------- -// handler call it to get type of request -// Is hard coded to "please select filter" here. see ctor for further informations. -//--------------------------------------------------------------------------------------------------------- -css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::RuntimeException ) -{ - return m_aRequest; -} - -//--------------------------------------------------------------------------------------------------------- -// handler call it to get possible continuations -// We support "abort/select_filter" only here. -// After interaction we support read access on these continuations on our c++ interface to -// return user decision. -//--------------------------------------------------------------------------------------------------------- -css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect::getContinuations() throw( css::uno::RuntimeException ) -{ - return m_lContinuations; -} - -//--------------------------------------------------------------------------------------------------------- -// initialize instance with all neccessary informations -// We use it without any further checks on our member then ...! -//--------------------------------------------------------------------------------------------------------- -RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL , - const ::rtl::OUString& sSelectedFilter , - const ::rtl::OUString& sDetectedFilter ) -{ - ::rtl::OUString temp; - css::uno::Reference< css::uno::XInterface > temp2; - css::document::AmbigousFilterRequest aFilterRequest( temp , - temp2 , - sURL , - sSelectedFilter , - sDetectedFilter ); - m_aRequest <<= aFilterRequest; - - m_pAbort = new ContinuationAbort ; - m_pFilter = new ContinuationFilterSelect; - - m_lContinuations.realloc( 2 ); - m_lContinuations[0] = css::uno::Reference< css::task::XInteractionContinuation >( m_pAbort ); - m_lContinuations[1] = css::uno::Reference< css::task::XInteractionContinuation >( m_pFilter ); -} - -//--------------------------------------------------------------------------------------------------------- -// return abort state of interaction -// If it is true, return value of method "getFilter()" will be unspecified then! -//--------------------------------------------------------------------------------------------------------- -sal_Bool RequestAmbigousFilter::isAbort() const -{ - return m_pAbort->isSelected(); -} - -//--------------------------------------------------------------------------------------------------------- -// return user selected filter -// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestAmbigousFilter::getFilter() const -{ - return m_pFilter->getFilter(); -} - -//--------------------------------------------------------------------------------------------------------- -// handler call it to get type of request -// Is hard coded to "please select filter" here. see ctor for further informations. -//--------------------------------------------------------------------------------------------------------- -css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::RuntimeException ) -{ - return m_aRequest; -} - -//--------------------------------------------------------------------------------------------------------- -// handler call it to get possible continuations -// We support "abort/select_filter" only here. -// After interaction we support read access on these continuations on our c++ interface to -// return user decision. -//--------------------------------------------------------------------------------------------------------- -css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter::getContinuations() throw( css::uno::RuntimeException ) -{ - return m_lContinuations; -} - -} // namespace framework diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk deleted file mode 100644 index b969d71ea9fc..000000000000 --- a/framework/source/dispatch/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_dispatch -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework - -# --- Generate ----------------------------------------------------- - -SLOFILES=\ - $(SLO)$/closedispatcher.obj \ - $(SLO)$/dispatchinformationprovider.obj \ - $(SLO)$/dispatchprovider.obj \ - $(SLO)$/helpagentdispatcher.obj \ - $(SLO)$/interaction.obj \ - $(SLO)$/interceptionhelper.obj \ - $(SLO)$/loaddispatcher.obj \ - $(SLO)$/mailtodispatcher.obj \ - $(SLO)$/menudispatcher.obj \ - $(SLO)$/oxt_handler.obj \ - $(SLO)$/popupmenudispatcher.obj \ - $(SLO)$/servicehandler.obj \ - $(SLO)$/systemexec.obj \ - $(SLO)$/windowcommanddispatch.obj \ - $(SLO)$/startmoduledispatcher.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 718830545db2..d55556b23f65 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -33,8 +33,8 @@ //_________________________________________________________________________________________________________________ #include <dispatch/menudispatcher.hxx> #include <general.h> -#include <xml/menuconfiguration.hxx> -#include <classes/addonmenu.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/addonmenu.hxx> #include <services.h> //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 834d11017ec8..8437b82961ea 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -34,8 +34,8 @@ #include <dispatch/popupmenudispatcher.hxx> #include <general.h> -#include <xml/menuconfiguration.hxx> -#include <classes/addonmenu.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/addonmenu.hxx> #include <services.h> #include <properties.h> diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 40def3f98488..0e49b2818e56 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -36,7 +36,7 @@ #include <pattern/frame.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#include <classes/framelistanalyzer.hxx> +#include <framework/framelistanalyzer.hxx> #include <dispatchcommands.h> #include <targets.h> #include <services.h> |