diff options
| author | Oliver Specht <os@openoffice.org> | 2001-03-29 07:47:41 +0000 |
|---|---|---|
| committer | Oliver Specht <os@openoffice.org> | 2001-03-29 07:47:41 +0000 |
| commit | c96855e889ed9f07f09d8c8d1505e187256d9edb (patch) | |
| tree | 02c35ef4f6bfe47678270c656e5e8397a2f3cac6 | |
| parent | bf25886e2b6219c8d477c49aa85eb2d7a8fe7c09 (diff) | |
SwFmtURL: return empty ImageMap
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 84d1cedff548..88069f3ce1c8 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: atrfrm.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: os $ $Date: 2001-03-28 10:05:14 $ + * last change: $Author: os $ $Date: 2001-03-29 08:47:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1849,7 +1849,7 @@ void SwFmtURL::SetMap( const ImageMap *pM ) delete pMap; pMap = pM ? new ImageMap( *pM ) : 0; } - +extern const SvEventDescription* lcl_GetSupportedMacroItems(); BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { @@ -1875,18 +1875,18 @@ BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_URL_CLIENTMAP: { + Reference< XInterface > xInt; if(pMap) { - static const SvEventDescription aMacroDescriptionsImpl[] = - { - { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" }, - { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" }, - { 0, NULL } - }; - Reference< XInterface > xInt = SvUnoImageMap_createInstance( *pMap, aMacroDescriptionsImpl ); - Reference< XIndexContainer > xCont(xInt, UNO_QUERY); - rVal <<= xCont; + xInt = SvUnoImageMap_createInstance( *pMap, lcl_GetSupportedMacroItems() ); + } + else + { + ImageMap aEmptyMap; + xInt = SvUnoImageMap_createInstance( aEmptyMap, lcl_GetSupportedMacroItems() ); } + Reference< XIndexContainer > xCont(xInt, UNO_QUERY); + rVal <<= xCont; } break; case MID_URL_SERVERMAP: |