diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-02 15:26:18 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-02 15:26:18 +0000 |
commit | 35e8d6de60cf91e97fe722834c294a0a9223922f (patch) | |
tree | 92c59ec6f18a49adf74678259cf5a9aef446a539 /framework/source/dispatch/dispatchprovider.cxx | |
parent | 0416c98d433be40fe2e2d0199ebaa8d029e8e338 (diff) |
CWS-TOOLING: integrate CWS vcl97
2008-12-11 20:47:52 +0100 pl r265361 : #i93173# revert change, event listeners on the toolbar can lead to crashes
2008-12-11 17:55:54 +0100 pl r265344 : #i92715# fix some border cases
2008-12-11 16:36:01 +0100 pl r265334 : remove forgotten debug printf
2008-12-11 15:54:25 +0100 pl r265323 : add missing pointer initializer
2008-12-11 14:08:44 +0100 as r265297 : #i86520# dont show start module twice
2008-12-11 12:56:34 +0100 as r265289 : #i86520# dont show start module twice
2008-12-11 12:22:18 +0100 pl r265280 : fix a snafu
2008-12-11 12:15:27 +0100 hdu r265279 : #i96549# change some dbg_assert to dbg_warn
2008-12-11 11:57:22 +0100 pl r265276 : #i86520# startcenter on dock item click for mac
2008-12-11 11:31:47 +0100 pl r265271 : #i96964# fix a wrong condition
2008-12-11 11:21:49 +0100 as r265268 : #i86520# new framework slot for ShowStartModule
2008-12-11 10:17:32 +0100 hdu r265251 : #i97127# use fontconfig fallbacks for psprinting too (thanks CMC!)
2008-12-09 10:18:41 +0100 hdu r265060 : #i96549# workaround MAC_OS_X_VERSION_* macros not defined in older SDKs
2008-12-09 09:39:47 +0100 hdu r265057 : #i89650# workaround bogus device resolutions
2008-12-09 09:14:23 +0100 hdu r265054 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040
2008-12-08 19:17:42 +0100 pl r265016 : CWS-TOOLING: rebase CWS vcl97 to trunk@264807 (milestone: DEV300:m37)
2008-12-08 16:06:58 +0100 hdu r265004 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040 only for the Aqua port
2008-12-08 12:16:26 +0100 hdu r264988 : #i96549# prepare for MAC_OS_X_VERSION_MIN_REQUIRED>=1050
2008-12-08 11:59:25 +0100 hdu r264982 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040
2008-12-04 18:19:43 +0100 pl r264866 : #i86520# install a handler to be called on dock icon clicked
2008-12-03 13:04:32 +0100 pl r264769 : #i96551# on quartz build neither gtk nor cups in psprint is needed
2008-11-26 15:07:07 +0100 hdu r264400 : #i96317# adjust to extented SAL_DISABLE_FC_SUBST semantic
2008-11-21 16:15:31 +0100 pl r264147 : #i94443# generalize focus behavior when a child window becomes invisible
2008-11-21 15:45:03 +0100 pl r264144 : #i96433# improve torn off toolbar behavior
2008-11-21 11:50:01 +0100 pl r264119 : #i90083# improve key event dispatching
2008-11-20 17:28:03 +0100 pl r264076 : #i92715# do not execute app events during document recovery
2008-11-20 15:04:32 +0100 pl r264057 : #i92224# #i93249# more aqua key codes
2008-11-20 14:03:00 +0100 pl r264052 : #i92224# #i93249# remove debug printf
2008-11-20 14:00:29 +0100 pl r264049 : #i92224# #i93249# more aqua key codes
2008-11-20 13:59:34 +0100 pl r264048 : #i92224# #i93249# more aqua key codes
2008-11-20 13:52:38 +0100 pl r264047 : #i92224# #i93249# more aqua key codes
2008-11-19 18:42:17 +0100 pl r264017 : #i93249# support some mac specifc key codes: select to line end/begin
2008-11-19 18:40:26 +0100 pl r264016 : #i93249# support some mac specifc key codes: select to line end/begin
2008-11-19 18:32:31 +0100 pl r264014 : #i92224# support some mac specifc key codes: select to line end/begin
2008-11-19 17:34:50 +0100 pl r264009 : #i92224# some more needed keycodes
2008-11-19 16:11:33 +0100 pl r264003 : #i93249# support some mac specifc key codes
2008-11-19 16:10:31 +0100 pl r264002 : #i93249# support some mac specifc key codes
2008-11-19 15:50:03 +0100 pl r264000 : #i93249# support some mac specifc key codes
2008-11-19 14:17:41 +0100 pl r263993 : #i90015# strip appended parenthese entries from menubar
2008-11-17 18:30:37 +0100 pl r263737 : #i94601# emulate menu functionality for non vcl dialogs
2008-11-17 17:31:12 +0100 pl r263731 : #i95263# set inactive tab color on mac more distinct from the active tab color
2008-11-17 17:13:38 +0100 pl r263729 : #i93173# delete toolbar window in a more stack aware manner
Diffstat (limited to 'framework/source/dispatch/dispatchprovider.cxx')
-rw-r--r-- | framework/source/dispatch/dispatchprovider.cxx | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 731273d11fd4..051640fc3724 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -42,11 +42,13 @@ #include <dispatch/closedispatcher.hxx> #include <dispatch/menudispatcher.hxx> #include <dispatch/helpagentdispatcher.hxx> +#include <dispatch/startmoduledispatcher.hxx> #include <pattern/window.hxx> #include <threadhelp/transactionguard.hxx> #include <threadhelp/readguard.hxx> -#include <threadhelp/writeguard.hxx> +#include <threadhelp/writeguard.hxx>
+#include <dispatchcommands.h> #include <protocols.h> #include <services.h> #include <targets.h> @@ -222,6 +224,24 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp return lDispatcher; } +//_________________________________________________________________________________________________________________
+
+::sal_Bool lcl_isCloseDispatch (const css::util::URL& aURL)
+{
+ return (
+ (aURL.Complete.equals(CMD_UNO_CLOSEDOC )) || + (aURL.Complete.equals(CMD_UNO_CLOSEWIN )) || + (aURL.Complete.equals(CMD_UNO_CLOSEFRAME))
+ ); +}
+ +//_________________________________________________________________________________________________________________
+
+::sal_Bool lcl_isStartModuleDispatch (const css::util::URL& aURL)
+{
+ return (aURL.Complete.equals(CMD_UNO_SHOWSTARTMODULE));
+}
+
//_________________________________________________________________________________________________________________ /** @@ -276,7 +296,10 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt if (sTargetFrameName==SPECIALTARGET_DEFAULT) { if (implts_isLoadableContent(aURL)) - xDispatcher = implts_getOrCreateDispatchHelper( E_DEFAULTDISPATCHER, xDesktop ); + xDispatcher = implts_getOrCreateDispatchHelper( E_DEFAULTDISPATCHER, xDesktop );
+
+ if (lcl_isStartModuleDispatch(aURL))
+ xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop );
} //----------------------------------------------------------------------------------------------------- @@ -466,14 +489,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame ) { // There exist a hard coded interception for special URLs. - if ( - (aURL.Complete.equalsAscii(".uno:CloseDoc" )) || - (aURL.Complete.equalsAscii(".uno:CloseWin" )) || - (aURL.Complete.equalsAscii(".uno:CloseFrame")) - ) - { + if (lcl_isCloseDispatch (aURL)) xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame ); - } if ( ! xDispatcher.is()) { @@ -737,6 +754,13 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat CloseDispatcher* pDispatcher = new CloseDispatcher( xFactory, xOwner, sTarget ); xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY ); } + break;
+ + case E_STARTMODULEDISPATCHER : + { + StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( xFactory, xOwner, sTarget ); + xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY ); + } break; } |