diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-17 08:30:09 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-17 08:30:09 +0000 |
| commit | c82c3e12f84673c323ce331885841e5b45b8d96e (patch) | |
| tree | 8b40f62a47fc3baa817edefc1ee23868f5151b9c /sd | |
| parent | b41884a6ba4c8565d6e1ad6949fce26f479a8fef (diff) | |
CWS-TOOLING: integrate CWS mav48_DEV300
2009-03-09 12:55:54 +0100 mav r269080 : #i99918# provide decoded version of the name
2009-03-09 10:14:59 +0100 mav r269064 : #99967# let readonly files be correctly recognized
2009-03-09 07:04:09 +0100 mav r269056 : #i99922# fix the typo
2009-03-06 14:10:29 +0100 mav r269005 : #i99922# convert system path correctly
2009-03-06 13:53:45 +0100 mav r269001 : #i99922# Prevent the problem for the case that the configuration contains wrong URL
2009-03-06 13:16:56 +0100 mav r268999 : #i99919# handle SID_OPENHYPERLINK correctly in slide-show
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/sdi/app.sdi | 7 | ||||
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 9 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi index cd3959258cfb..69df9f364234 100644 --- a/sd/sdi/app.sdi +++ b/sd/sdi/app.sdi @@ -35,6 +35,13 @@ interface StarImpress StateMethod = GetState ; ] + SID_OPENHYPERLINK // ole() api() + [ + + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_AUTOSPELL_CHECK // ole() api() [ diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 44fd6337ca09..f87c9a11c0bd 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -230,6 +230,7 @@ void SdModule::Execute(SfxRequest& rReq) break; + case SID_OPENHYPERLINK: case SID_OPENDOC: { BOOL bIntercept = FALSE; @@ -405,6 +406,14 @@ void SdModule::GetState(SfxItemSet& rItemSet) rItemSet.Put(*pItem); } + // der Status von SID_OPENHYPERLINK wird von der Basisklasse bestimmt + if (rItemSet.GetItemState(SID_OPENHYPERLINK) != SFX_ITEM_UNKNOWN) + { + const SfxPoolItem* pItem = SFX_APP()->GetSlotState(SID_OPENHYPERLINK, SFX_APP()->GetInterface()); + if (pItem) + rItemSet.Put(*pItem); + } + if( SFX_ITEM_AVAILABLE == rItemSet.GetItemState( SID_AUTOSPELL_CHECK ) ) { ::sd::DrawDocShell* pDocSh = diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index a0c6a2cf5672..4128a0d9a93f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -133,6 +133,7 @@ static USHORT __READONLY_DATA pAllowed[] = SID_JUMPTOMARK , // 5598 // SID_SHOWPOPUPS , // 5929 // SID_GALLERY , // 5960 + SID_OPENHYPERLINK , // 6676 // SID_GALLERY_FORMATS , // 10280 SID_NAVIGATOR , // 10366 // SID_FM_DESIGN_MODE , // 10629 |