diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 10:27:21 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 10:27:21 +0000 |
| commit | 414f47991711b750747fa901a4bd5747fe2d653d (patch) | |
| tree | 12bf025fa282ed0aed9d49e012b2dd7bdc2202ef /framework | |
| parent | 4abe036dd1a44b6c3ac7a5d5002ee7dc996d70ca (diff) | |
CWS-TOOLING: integrate CWS mav44
2009-01-18 22:39:43 +0100 mav r266467 : #i97073# the soffice file should be a shell script, adjust the plugin
2009-01-18 22:35:15 +0100 mav r266466 : #i97073# the soffice file should be a shell script, integrate fix from hro41 cws
2009-01-16 15:32:10 +0100 mav r266426 : #i96456# fix link resolving
2009-01-16 12:21:39 +0100 mav r266413 : #i97073# the soffice file is no more a shell script
2009-01-16 09:58:05 +0100 mav r266402 : #i95409# add complex test using unicode names
2009-01-15 20:27:03 +0100 mav r266392 : #i95408# fix include list
2009-01-15 20:09:28 +0100 mav r266390 : #i95408# deliver new header
2009-01-15 16:16:33 +0100 mav r266382 : #i95408# rebase to m38
2009-01-15 16:11:16 +0100 mav r266380 : #i95408# rebase to m38
2009-01-15 15:38:16 +0100 mav r266376 : CWS-TOOLING: rebase CWS mav44 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 13:23:55 +0100 mav r266294 : #i97073# let the presentation slideshow be started in window mode in plugin
2009-01-13 17:27:52 +0100 mav r266241 : #i95409#,#i95408# support UTF8 encoding for entry names, check the validity of the entries
2009-01-13 16:35:39 +0100 mav r266236 : #i95408# function to check whether a zip entry name is acceptable
2009-01-13 12:00:18 +0100 mav r266205 : #i94003# a readonly document can not be modified
2009-01-09 13:24:49 +0100 mav r266078 : #i95951# let the title be changed
2009-01-09 11:34:49 +0100 mav r266068 : #i80862# close the link only if was closed by the container, othewise leave it open
2009-01-08 11:30:13 +0100 mav r265989 : #i97071# disable Toolbars during window-based slide show in ActiveX control
2009-01-08 08:23:23 +0100 mav r265983 : #i97071# setVisible does not trigger layout in case there is not MenuBar
2009-01-06 12:39:39 +0100 mav r265908 : #i96185# let the MediaDescriptor get the target URL
2009-01-05 08:46:45 +0100 mav r265856 : #i93473# integrate the patch
2009-01-02 17:45:17 +0100 mav r265845 : #i94468#,#i96456# try to follow links
2009-01-02 16:53:41 +0100 mav r265841 : #i94468#,#i96456# use the same parsing mechanics in sharing control file and document lock file
2009-01-02 16:51:24 +0100 mav r265839 : #i94468#,#i96456# use the same parsing mechanics in sharing control file and document lock file
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/dispatch/dispatchprovider.cxx | 20 | ||||
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 1 |
2 files changed, 20 insertions, 1 deletions
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 051640fc3724..392e5574d82d 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -489,7 +489,25 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame ) { // There exist a hard coded interception for special URLs. - if (lcl_isCloseDispatch (aURL)) + if ( + (aURL.Complete.equalsAscii(".uno:CloseDoc" )) || + (aURL.Complete.equalsAscii(".uno:CloseWin" )) + ) + { + css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); + // In case the frame is not a top one, is not based on system window and has a parent, + // the parent frame should to be queried for the correct dispatcher. + // See i93473 + if ( + !WindowHelper::isTopWindow(xFrame->getContainerWindow()) && + !VCLUnoHelper::GetWindow(xFrame->getContainerWindow())->IsSystemWindow() && + xParent.is() + ) + xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0); + else + xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame ); + } + else if (aURL.Complete.equalsAscii(".uno:CloseFrame")) xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame ); if ( ! xDispatcher.is()) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 90fbd3d2356e..932dd7fd1019 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -3278,6 +3278,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) WriteGuard aWriteLock( m_aLock ); m_aDockingArea = css::awt::Rectangle(); + m_bMustDoLayout = sal_True; aWriteLock.unlock(); } catch ( Exception& ) |