?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Update to m13
[ooovba.git] / applied_patches / 0155-vba-sc-autoshapes-hyperlinks.diff
blob34e87b351f37b4d9d40328f54b2feb1dd7cb3635
1 diff --git offapi/com/sun/star/drawing/Shape.idl offapi/com/sun/star/drawing/Shape.idl
2 index 536ab62..bc5a70f 100644
3 --- offapi/com/sun/star/drawing/Shape.idl
4 +++ offapi/com/sun/star/drawing/Shape.idl
5 @@ -195,6 +195,10 @@ published service Shape
6 the z-order.
7 */
8 [optional, property] long NavigationOrder;
9 +
10 + /** this property lets you get and set a hyperlink for this shape.
11 + */
12 + [optional, property] string Hyperlink;
13 };
14
15 //=============================================================================
16 diff --git sc/inc/sc.hrc sc/inc/sc.hrc
17 index be881a4..152289f 100644
18 --- sc/inc/sc.hrc
19 +++ sc/inc/sc.hrc
20 @@ -593,11 +593,9 @@
21 // #i59082# assign macro to shape
22 #define SID_ASSIGNMACRO (SC_VIEW_START + 95)
23
24 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
25 // #i66550# hyperlinks in shapes
26 #define SID_DRAW_HLINK_EDIT (SC_VIEW_START + 96)
27 #define SID_DRAW_HLINK_DELETE (SC_VIEW_START + 97)
28 -#endif
29
30 // "Zoom / Synchronize sheets" in options dialog
31 #define SID_SC_OPT_SYNCZOOM (SC_VIEW_START + 98)
32 diff --git sc/inc/shapeuno.hxx sc/inc/shapeuno.hxx
33 index a628d28..10833bf 100644
34 --- sc/inc/shapeuno.hxx
35 +++ sc/inc/shapeuno.hxx
36 @@ -53,6 +53,7 @@ namespace com { namespace sun { namespace star {
37 class SdrObject;
38 struct SvEventDescription;
39 class ShapeUnoEventAccessImpl;
40 +class ScMacroInfo;
41
42 //------------------------------------------------------------------------
43
44 @@ -68,6 +69,7 @@ class ScShapeObj : public ::cppu::OWeakObject,
45 public ::com::sun::star::document::XEventsSupplier
46 {
47 private:
48 +friend ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, BOOL bCreate );
49 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg;
50 // cached pointers to avoid repeated queryAggregation calls:
51 ::com::sun::star::beans::XPropertySet* pShapePropertySet;
52 diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
53 index 7d331e1..b2c45ac 100644
54 --- sc/inc/unonames.hxx
55 +++ sc/inc/unonames.hxx
56 @@ -182,6 +182,8 @@
57 #define SC_UNONAME_ANCHOR "Anchor"
58 #define SC_UNONAME_HORIPOS "HoriOrientPosition"
59 #define SC_UNONAME_VERTPOS "VertOrientPosition"
60 +// #i66550 HLINK_FOR_SHAPES
61 +#define SC_UNONAME_HYPERLINK "Hyperlink"
62
63 // other cell properties
64 #define SC_UNONAME_CHCOLHDR "ChartColumnAsLabel"
65 diff --git sc/inc/userdat.hxx sc/inc/userdat.hxx
66 index cba05d0..3099b87 100644
67 --- sc/inc/userdat.hxx
68 +++ sc/inc/userdat.hxx
69 @@ -101,16 +101,12 @@ public:
70 void SetMacro( const rtl::OUString& rMacro ) { maMacro = rMacro; }
71 const rtl::OUString& GetMacro() const { return maMacro; }
72
73 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
74 void SetHlink( const rtl::OUString& rHlink ) { maHlink = rHlink; }
75 const rtl::OUString& GetHlink() const { return maHlink; }
76 -#endif
77
78 private:
79 rtl::OUString maMacro;
80 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
81 rtl::OUString maHlink;
82 -#endif
83 };
84
85 //-------------------------------------------------------------------------
86 diff --git sc/sdi/drawsh.sdi sc/sdi/drawsh.sdi
87 index b52250e..3c860f9 100644
88 --- sc/sdi/drawsh.sdi
89 +++ sc/sdi/drawsh.sdi
90 @@ -229,9 +229,9 @@ interface TableDraw
91 SID_FONTWORK_CHARACTER_SPACING_DIALOG [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ]
92
93 // ISSUE66550_HLINK_FOR_SHAPES
94 -// SID_DRAW_HLINK_EDIT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
95 -// SID_DRAW_HLINK_DELETE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
96 -// SID_OPEN_HYPERLINK [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
97 + SID_DRAW_HLINK_EDIT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
98 + SID_DRAW_HLINK_DELETE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
99 + SID_OPEN_HYPERLINK [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
100 }
101
102
103 diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
104 index cca4416..9bf0630 100644
105 --- sc/sdi/scalc.sdi
106 +++ sc/sdi/scalc.sdi
107 @@ -6397,55 +6397,55 @@ SfxVoidItem StandardFonts SID_STANDARD_FONTS
108
109 //--------------------------------------------------------------------------
110 // ISSUE66550_HLINK_FOR_SHAPES
111 -//SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT
112 -//()
113 -//[
114 -// /* flags: */
115 -// AutoUpdate = FALSE,
116 -// Cachable = Cachable,
117 -// FastCall = TRUE,
118 -// HasCoreId = FALSE,
119 -// HasDialog = TRUE,
120 -// ReadOnlyDoc = TRUE,
121 -// Toggle = FALSE,
122 -// Container = FALSE,
123 -// RecordAbsolute = FALSE,
124 -// RecordPerSet;
125 -// Synchron;
126 -//
127 +SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT
128 +()
129 +[
130 + /* flags: */
131 + AutoUpdate = FALSE,
132 + Cachable = Cachable,
133 + FastCall = TRUE,
134 + HasCoreId = FALSE,
135 + HasDialog = TRUE,
136 + ReadOnlyDoc = TRUE,
137 + Toggle = FALSE,
138 + Container = FALSE,
139 + RecordAbsolute = FALSE,
140 + RecordPerSet;
141 + Synchron;
142 +
143 // /* config: */
144 -// AccelConfig = TRUE,
145 -// MenuConfig = FALSE,
146 -// StatusBarConfig = FALSE,
147 -// ToolBoxConfig = FALSE,
148 -// GroupId = GID_DRAWING;
149 -//]
150 + AccelConfig = TRUE,
151 + MenuConfig = FALSE,
152 + StatusBarConfig = FALSE,
153 + ToolBoxConfig = FALSE,
154 + GroupId = GID_DRAWING;
155 +]
156
157 //--------------------------------------------------------------------------
158 // ISSUE66550_HLINK_FOR_SHAPES
159 -//SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE
160 -//()
161 -//[
162 -// /* flags: */
163 -// AutoUpdate = TRUE,
164 -// Cachable = Cachable,
165 -// FastCall = TRUE,
166 -// HasCoreId = FALSE,
167 -// HasDialog = FALSE,
168 -// ReadOnlyDoc = TRUE,
169 -// Toggle = FALSE,
170 -// Container = FALSE,
171 -// RecordAbsolute = FALSE,
172 -// RecordPerSet;
173 -// Synchron;
174 -//
175 -// /* config: */
176 -// AccelConfig = TRUE,
177 -// MenuConfig = FALSE,
178 -// StatusBarConfig = FALSE,
179 -// ToolBoxConfig = FALSE,
180 -// GroupId = GID_DRAWING;
181 -//]
182 +SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE
183 +()
184 +[
185 + /* flags: */
186 + AutoUpdate = TRUE,
187 + Cachable = Cachable,
188 + FastCall = TRUE,
189 + HasCoreId = FALSE,
190 + HasDialog = FALSE,
191 + ReadOnlyDoc = TRUE,
192 + Toggle = FALSE,
193 + Container = FALSE,
194 + RecordAbsolute = FALSE,
195 + RecordPerSet;
196 + Synchron;
197 +
198 + /* config: */
199 + AccelConfig = TRUE,
200 + MenuConfig = FALSE,
201 + StatusBarConfig = FALSE,
202 + ToolBoxConfig = FALSE,
203 + GroupId = GID_DRAWING;
204 +]
205
206 //--------------------------------------------------------------------------
207 SfxVoidItem StandardTextAttributes SID_TEXT_STANDARD
208 diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
209 index 4d6fddf..7b8f936 100644
210 --- sc/source/filter/excel/xiescher.cxx.old 2009-04-03 20:33:34.000000000 +0200
211 +++ sc/source/filter/excel/xiescher.cxx 2009-04-03 20:40:50.000000000 +0200
212 @@ -483,8 +483,8 @@ void XclImpDrawObjBase::ProcessSdrObject
213 }
214
215 // macro and hyperlink
216 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
217 - if( mbSimpleMacro && ((maMacroName.Len() > 0) || (maHyperlink.getLength() > 0)) )
218 + if( mbSimpleMacro && ((maMacroName.Len() > 0) ||
219 + (maHyperlink.Len() > 0)) )
220 {
221 if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
222 {
223 @@ -492,11 +492,6 @@ void XclImpDrawObjBase::ProcessSdrObject
224 pInfo->SetHlink( maHyperlink );
225 }
226 }
227 -#else
228 - if( mbSimpleMacro && (maMacroName.Len() > 0) )
229 - if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
230 - pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName ) );
231 -#endif
232
233 // call virtual function for object type specific processing
234 DoProcessSdrObj( rSdrObj );
235 diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
236 index 495b35a..b06fbdd 100644
237 --- sc/source/filter/xml/xmlexprt.cxx
238 +++ sc/source/filter/xml/xmlexprt.cxx
239 @@ -2514,7 +2514,34 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
240 }
241 }
242 if (!bIsChart)
243 + {
244 + // #i66550 HLINK_FOR_SHAPES
245 + rtl::OUString sHlink;
246 + uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
247 + if ( xProps.is() )
248 + xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink;
249 +
250 + std::auto_ptr< SvXMLElementExport > pDrawA;
251 + // enlose shapes with <draw:a> element only if sHlink contains something
252 + if ( sHlink.getLength() > 0 )
253 + {
254 + // need to get delete the attributes that are pre-loaded
255 + // for the shape export ( otherwise they will become
256 + // attributes of the draw:a element ) This *shouldn't*
257 + // affect performance adversely as there are only a
258 + // couple of attributes involved
259 + uno::Reference< xml::sax::XAttributeList > xSaveAttribs( new SvXMLAttributeList( GetAttrList() ) );
260 + ClearAttrList();
261 + // Add Hlink
262 + AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
263 + AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sHlink);
264 + pDrawA.reset( new SvXMLElementExport( *this, XML_NAMESPACE_DRAW, XML_A, sal_False, sal_False ) );
265 + // Attribute list has been cleared by previous operation
266 + // re-add pre-loaded attributes
267 + AddAttributeList( xSaveAttribs );
268 + }
269 GetShapeExport()->exportShape(xShape, SEF_DEFAULT, pPoint);
270 + }
271 IncrementProgressBar(sal_False);
272 }
273
274 diff --git sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh.cxx
275 index 39c3d76..c657abf 100644
276 --- sc/source/ui/drawfunc/drawsh.cxx
277 +++ sc/source/ui/drawfunc/drawsh.cxx
278 @@ -210,7 +210,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
279 ExecuteTextAttrDlg( rReq );
280 break;
281
282 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
283 case SID_DRAW_HLINK_EDIT:
284 if ( pSingleSelectedObj )
285 pViewData->GetDispatcher().Execute( SID_HYPERLINK_DIALOG );
286 @@ -238,7 +237,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
287 ScGlobal::OpenURL( pInfo->GetHlink(), String::EmptyString() );
288 }
289 break;
290 -#endif
291
292 case SID_ATTR_TRANSFORM:
293 {
294 @@ -490,7 +488,6 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ )
295 delete( pDlg );
296 }
297
298 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
299 void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk )
300 {
301 if ( pObj )
302 @@ -500,5 +497,4 @@ void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk
303 lcl_setModified( GetObjectShell() );
304 }
305 }
306 -#endif
307
308 diff --git sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh2.cxx
309 index bd6f2a1..27bfc44 100644
310 --- sc/source/ui/drawfunc/drawsh2.cxx
311 +++ sc/source/ui/drawfunc/drawsh2.cxx
312 @@ -199,24 +199,20 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disablen
313 BOOL bCanRename = FALSE;
314 if ( nMarkCount > 1 )
315 {
316 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
317 // no hypelink options for a selected group
318 rSet.DisableItem( SID_DRAW_HLINK_EDIT );
319 rSet.DisableItem( SID_DRAW_HLINK_DELETE );
320 rSet.DisableItem( SID_OPEN_HYPERLINK );
321 -#endif
322 }
323 else if ( nMarkCount == 1 )
324 {
325 SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
326 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
327 ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
328 if ( !pInfo || (pInfo->GetHlink().getLength() == 0) )
329 {
330 rSet.DisableItem( SID_DRAW_HLINK_DELETE );
331 rSet.DisableItem( SID_OPEN_HYPERLINK );
332 }
333 -#endif
334 SdrLayerID nLayerID = pObj->GetLayer();
335 if ( nLayerID != SC_LAYER_INTERN )
336 bCanRename = TRUE; // #i51351# anything except internal objects can be renamed
337 diff --git sc/source/ui/drawfunc/drawsh5.cxx sc/source/ui/drawfunc/drawsh5.cxx
338 index 16e20a9..4fd06bf 100644
339 --- sc/source/ui/drawfunc/drawsh5.cxx
340 +++ sc/source/ui/drawfunc/drawsh5.cxx
341 @@ -95,14 +95,12 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink
342 if ( nMarkCount == 1 ) // URL-Button markiert ?
343 {
344 SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
345 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
346 ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
347 if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
348 {
349 aHLinkItem.SetURL( pInfo->GetHlink() );
350 aHLinkItem.SetInsertMode(HLINK_FIELD);
351 }
352 -#endif
353 SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj);
354 if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
355 {
356 @@ -245,13 +243,11 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
357 bDone = TRUE;
358 }
359 }
360 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
361 else
362 {
363 SetHlinkForObject( pObj, rURL );
364 bDone = TRUE;
365 }
366 -#endif
367 }
368 }
369
370 diff --git sc/source/ui/drawfunc/fudraw.cxx sc/source/ui/drawfunc/fudraw.cxx
371 index 5c0460f..d060c2f 100644
372 --- sc/source/ui/drawfunc/fudraw.cxx
373 +++ sc/source/ui/drawfunc/fudraw.cxx
374 @@ -891,11 +891,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
375 SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ????
376 pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) );
377 }
378 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
379 else if ( !bAlt && pInfo && ((pInfo->GetMacro().getLength() > 0) || (pInfo->GetHlink().getLength() > 0)) )
380 -#else
381 - else if ( !bAlt && pInfo && (pInfo->GetMacro().getLength() > 0) )
382 -#endif
383 pWindow->SetPointer( Pointer( POINTER_REFHAND ) );
384 else if ( IsDetectiveHit( aPnt ) )
385 pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) );
386 diff --git sc/source/ui/drawfunc/fusel.cxx sc/source/ui/drawfunc/fusel.cxx
387 index 41c3e60..57bb6ba 100644
388 --- sc/source/ui/drawfunc/fusel.cxx
389 +++ sc/source/ui/drawfunc/fusel.cxx
390 @@ -205,7 +205,6 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
391 }
392
393 ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE );
394 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
395 // For interoperability favour links over macros if both are defined
396 if ( pInfo->GetHlink().getLength() > 0 )
397 {
398 @@ -213,9 +212,6 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
399 sURL = pInfo->GetHlink();
400 }
401 else if ( pInfo->GetMacro().getLength() > 0 )
402 -#else
403 - if ( pInfo->GetMacro().getLength() > 0 )
404 -#endif
405 {
406 SfxObjectShell* pObjSh = SfxObjectShell::Current();
407 if ( pObjSh && SfxApplication::IsXScriptURL( pInfo->GetMacro() ) )
408 diff --git sc/source/ui/drawfunc/objdraw.src sc/source/ui/drawfunc/objdraw.src
409 index 53d70c1..a1986b1 100644
410 --- sc/source/ui/drawfunc/objdraw.src
411 +++ sc/source/ui/drawfunc/objdraw.src
412 @@ -185,7 +185,6 @@
413 ITEM_FORMAT_PARA_DLG\
414 };
415
416 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
417 #define MN_EDITLNK \
418 MenuItem\
419 {\
420 @@ -201,7 +200,6 @@
421 HelpID = SID_DRAW_HLINK_DELETE ; \
422 Text [ en-US ] = "~Remove Hyperlink" ; \
423 };
424 -#endif
425
426 #define MN_DRWTXTATTR \
427 MenuItem\
428 @@ -1294,14 +1292,12 @@ Menu RID_POPUP_DRAW
429 MenuItem { Separator = TRUE ; };
430 //------------------------------
431 ITEM_GROUP_MENU
432 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
433 //------------------------------
434 MenuItem { Separator = TRUE ; };
435 //------------------------------
436 MN_EDITLNK
437 MN_DELLNK
438 MenuItem { ITEM_OPEN_HYPERLINK };
439 -#endif
440 };
441 };
442
443 @@ -1371,14 +1367,12 @@ Menu RID_POPUP_GRAPHIC
444 MenuItem { Separator = TRUE ; };
445 //------------------------------
446 ITEM_GROUP_MENU
447 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
448 //------------------------------
449 MenuItem { Separator = TRUE ; };
450 //------------------------------
451 MN_EDITLNK
452 MN_DELLNK
453 MenuItem { ITEM_OPEN_HYPERLINK };
454 -#endif
455 };
456 };
457
458 diff --git sc/source/ui/inc/drawsh.hxx sc/source/ui/inc/drawsh.hxx
459 index 20b150f..9435ec8 100644
460 --- sc/source/ui/inc/drawsh.hxx
461 +++ sc/source/ui/inc/drawsh.hxx
462 @@ -47,9 +47,7 @@ class ScDrawShell : public SfxShell
463
464 DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* );
465
466 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
467 void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk );
468 -#endif
469
470 protected:
471 ScViewData* GetViewData() { return pViewData; }
472 diff --git sc/source/ui/unoobj/shapeuno.cxx sc/source/ui/unoobj/shapeuno.cxx
473 index 151acf8..1d8a944 100644
474 --- sc/source/ui/unoobj/shapeuno.cxx
475 +++ sc/source/ui/unoobj/shapeuno.cxx
476 @@ -72,6 +72,8 @@ const SfxItemPropertyMap* lcl_GetShapeMap()
477 {MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
478 {MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
479 {MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
480 + // #i66550 HLINK_FOR_SHAPES
481 + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
482 {0,0,0,0,0,0}
483 };
484 return aShapeMap_Impl;
485 @@ -86,6 +88,14 @@ const SvEventDescription* ScShapeObj::GetSupportedMacroItems()
486 };
487 return aMacroDescriptionsImpl;
488 }
489 +// #i66550 HLINK_FOR_SHAPES
490 +ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, BOOL bCreate = FALSE )
491 +{
492 + if( pShape )
493 + if( SdrObject* pObj = pShape->GetSdrObject() )
494 + return ScDrawLayer::GetMacroInfo( pObj, bCreate );
495 + return 0;
496 +}
497
498 //------------------------------------------------------------------------
499
500 @@ -627,6 +637,13 @@ void SAL_CALL ScShapeObj::setPropertyValue(
501 }
502 }
503 }
504 + else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
505 + {
506 + rtl::OUString sHlink;
507 + ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this, TRUE);
508 + if ( ( aValue >>= sHlink ) && pInfo )
509 + pInfo->SetHlink( sHlink );
510 + }
511 else
512 {
513 GetShapePropertySet();
514 @@ -808,6 +825,13 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa
515 }
516 }
517 }
518 + else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
519 + {
520 + rtl::OUString sHlink;
521 + if ( ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this) )
522 + sHlink = pInfo->GetHlink();
523 + aAny <<= sHlink;
524 + }
525 else
526 {
527 GetShapePropertySet();
528 @@ -1320,11 +1344,6 @@ SdrObject* ScShapeObj::GetSdrObject() const throw()
529 }
530
531 #define SC_EVENTACC_ONCLICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) )
532 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
533 -#define SC_EVENTACC_ONACTION ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAction" ) )
534 -#define SC_EVENTACC_URL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) )
535 -#define SC_EVENTACC_ACTION ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) )
536 -#endif
537 #define SC_EVENTACC_SCRIPT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Script" ) )
538 #define SC_EVENTACC_EVENTTYPE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) )
539
540 @@ -1336,10 +1355,7 @@ private:
541
542 ScMacroInfo* getInfo( BOOL bCreate = FALSE )
543 {
544 - if( mpShape )
545 - if( SdrObject* pObj = mpShape->GetSdrObject() )
546 - return ScDrawLayer::GetMacroInfo( pObj, bCreate );
547 - return 0;
548 + return lcl_getShapeHyperMacroInfo( mpShape, bCreate );
549 }
550
551 public:
552 @@ -1365,11 +1381,7 @@ public:
553 isEventType = true;
554 continue;
555 }
556 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
557 - if ( isEventType && ((pProperties->Name == SC_EVENTACC_SCRIPT) || (pProperties->Name == SC_EVENTACC_URL)) )
558 -#else
559 if ( isEventType && (pProperties->Name == SC_EVENTACC_SCRIPT) )
560 -#endif
561 {
562 rtl::OUString sValue;
563 if ( pProperties->Value >>= sValue )
564 @@ -1380,10 +1392,8 @@ public:
565 break;
566 if ( pProperties->Name == SC_EVENTACC_SCRIPT )
567 pInfo->SetMacro( sValue );
568 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
569 else
570 pInfo->SetHlink( sValue );
571 -#endif
572 }
573 }
574 }
575 @@ -1406,19 +1416,6 @@ public:
576 aProperties[ 1 ].Value <<= pInfo->GetMacro();
577 }
578 }
579 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
580 - else if( aName == SC_EVENTACC_ONACTION )
581 - {
582 - if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
583 - {
584 - aProperties.realloc( 2 );
585 - aProperties[ 0 ].Name = SC_EVENTACC_EVENTTYPE;
586 - aProperties[ 0 ].Value <<= SC_EVENTACC_ACTION;
587 - aProperties[ 1 ].Name = SC_EVENTACC_URL;
588 - aProperties[ 1 ].Value <<= pInfo->GetHlink();
589 - }
590 - }
591 -#endif
592 else
593 {
594 throw container::NoSuchElementException();
595 @@ -1429,25 +1426,14 @@ public:
596
597 virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames() throw(uno::RuntimeException)
598 {
599 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
600 - uno::Sequence< rtl::OUString > aSeq( 2 );
601 -#else
602 uno::Sequence< rtl::OUString > aSeq( 1 );
603 -#endif
604 aSeq[ 0 ] = SC_EVENTACC_ONCLICK;
605 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
606 - aSeq[ 1 ] = SC_EVENTACC_ONACTION;
607 -#endif
608 return aSeq;
609 }
610
611 virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
612 {
613 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
614 - return (aName == SC_EVENTACC_ONCLICK) || (aName == SC_EVENTACC_ONACTION);
615 -#else
616 return aName == SC_EVENTACC_ONCLICK;
617 -#endif
618 }
619
620 // XElementAccess
621 diff --git sc/source/ui/view/gridwin5.cxx sc/source/ui/view/gridwin5.cxx
622 index 81ef0df..57797eb 100644
623 --- sc/source/ui/view/gridwin5.cxx
624 +++ sc/source/ui/view/gridwin5.cxx
625 @@ -345,14 +345,12 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
626 if ( pDrView->PickObj(aMDPos, pHit, pPV, SDRSEARCH_DEEP ) )
627 pObj = pHit;
628 }
629 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
630 ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
631 if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
632 {
633 aPixRect = LogicToPixel(aVEvt.pObj->GetLogicRect());
634 aHelpText = pInfo->GetHlink();
635 }
636 -#endif
637 }
638 }
639 }
640 diff --git xmloff/inc/xmloff/shapeexport.hxx xmloff/inc/xmloff/shapeexport.hxx
641 index bb3b369..bc331e8 100644
642 --- xmloff/inc/xmloff/shapeexport.hxx
643 +++ xmloff/inc/xmloff/shapeexport.hxx
644 @@ -197,11 +197,6 @@ private:
645 const rtl::OUString msStartShape;
646 const rtl::OUString msEndShape;
647 const rtl::OUString msOnClick;
648 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
649 - const rtl::OUString msOnAction;
650 - const rtl::OUString msAction;
651 - const rtl::OUString msURL;
652 -#endif
653 const rtl::OUString msEventType;
654 const rtl::OUString msPresentation;
655 const rtl::OUString msMacroName;
656 diff --git xmloff/source/draw/eventimp.cxx xmloff/source/draw/eventimp.cxx
657 index 54c0683..57c8dee 100644
658 --- xmloff/source/draw/eventimp.cxx
659 +++ xmloff/source/draw/eventimp.cxx
660 @@ -104,9 +104,6 @@ public:
661
662 sal_Bool mbValid;
663 sal_Bool mbScript;
664 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
665 - sal_Bool mbActionEvent;
666 -#endif
667 ClickAction meClickAction;
668 XMLEffect meEffect;
669 XMLEffectDirection meDirection;
670 @@ -118,9 +115,6 @@ public:
671 OUString msMacroName;
672 OUString msBookmark;
673 OUString msLanguage;
674 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
675 - OUString msHyperURL;
676 -#endif
677 };
678
679 ///////////////////////////////////////////////////////////////////////
680 @@ -179,18 +173,11 @@ TYPEINIT1( SdXMLEventContext, SvXMLImportContext );
681
682 SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
683 : SvXMLImportContext(rImp, nPrfx, rLocalName),
684 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
685 - mxShape( rxShape ), mbScript( sal_False ), mbActionEvent( sal_False ), meClickAction( ClickAction_NONE ),
686 -#else
687 mxShape( rxShape ), mbScript( sal_False ), meClickAction( ClickAction_NONE ),
688 -#endif
689 meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ),
690 meSpeed( AnimationSpeed_MEDIUM ), mnVerb(0), mbPlayFull( sal_False )
691 {
692 static const OUString sXMLClickName( RTL_CONSTASCII_USTRINGPARAM( "click" ) );
693 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
694 - static const OUString sXMLActionName( RTL_CONSTASCII_USTRINGPARAM( "action" ) );
695 -#endif
696
697 if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) )
698 {
699 @@ -261,12 +248,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons
700 sEventName = sValue;
701 sal_uInt16 nScriptPrefix =
702 GetImport().GetNamespaceMap().GetKeyByAttrName( sValue, &sEventName );
703 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
704 - mbValid = XML_NAMESPACE_DOM == nScriptPrefix && ( sEventName == sXMLClickName || sEventName == sXMLActionName );
705 - mbActionEvent = mbValid && (sEventName == sXMLActionName);
706 -#else
707 mbValid = XML_NAMESPACE_DOM == nScriptPrefix && sEventName == sXMLClickName;
708 -#endif
709 }
710 else if( IsXMLToken( aAttrLocalName, XML_LANGUAGE ) )
711 {
712 @@ -295,12 +277,6 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons
713 {
714 msMacroName = sValue;
715 }
716 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
717 - else if ( mbActionEvent )
718 - {
719 - msHyperURL = sValue;
720 - }
721 -#endif
722 else
723 {
724 const rtl::OUString &rTmp =
725 @@ -346,26 +322,6 @@ void SdXMLEventContext::EndElement()
726 OUString sAPIEventName;
727 uno::Sequence< beans::PropertyValue > aProperties;
728
729 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
730 - if( mbActionEvent )
731 - {
732 - sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAction" ) );
733 - aProperties.realloc( 2 );
734 - beans::PropertyValue* pProperty = aProperties.getArray();
735 -
736 - pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
737 - pProperty->Handle = -1;
738 - pProperty->Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) );
739 - pProperty->State = beans::PropertyState_DIRECT_VALUE;
740 - ++pProperty;
741 - pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
742 - pProperty->Handle = -1;
743 - pProperty->Value <<= msHyperURL;
744 - pProperty->State = beans::PropertyState_DIRECT_VALUE;
745 - }
746 - else
747 -#endif
748 - {
749 sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
750
751 if( mbScript )
752 @@ -550,8 +506,6 @@ void SdXMLEventContext::EndElement()
753 break;
754 }
755 }
756 - }
757 -
758 xEvents->replaceByName( sAPIEventName, uno::Any( aProperties ) );
759
760 } while(0);
761 diff --git xmloff/source/draw/shapeexport.cxx xmloff/source/draw/shapeexport.cxx
762 index 4691d72..0bfa0cb 100644
763 --- xmloff/source/draw/shapeexport.cxx
764 +++ xmloff/source/draw/shapeexport.cxx
765 @@ -87,11 +87,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
766 msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ),
767 msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ),
768 msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ),
769 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
770 - msOnAction( RTL_CONSTASCII_USTRINGPARAM("OnAction") ),
771 - msAction( RTL_CONSTASCII_USTRINGPARAM("Action") ),
772 - msURL( RTL_CONSTASCII_USTRINGPARAM("URL") ),
773 -#endif
774 msEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ),
775 msPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ),
776 msMacroName( RTL_CONSTASCII_USTRINGPARAM("MacroName") ),
777 diff --git xmloff/source/draw/shapeexport2.cxx xmloff/source/draw/shapeexport2.cxx
778 index c3594a6..d7005be 100644
779 --- xmloff/source/draw/shapeexport2.cxx
780 +++ xmloff/source/draw/shapeexport2.cxx
781 @@ -296,9 +296,6 @@ const sal_Int32 FOUND_CLICKEVENTTYPE = 0x00000080;
782 const sal_Int32 FOUND_MACRO = 0x00000100;
783 const sal_Int32 FOUND_LIBRARY = 0x00000200;
784 const sal_Int32 FOUND_ACTIONEVENTTYPE = 0x00000400;
785 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
786 -const sal_Int32 FOUND_URL = 0x00000800;
787 -#endif
788
789 } // namespace
790
791 @@ -388,33 +385,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
792 }
793 }
794
795 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
796 - // extract properties from "OnAction" event -------------------------------
797 -
798 - OUString aActionEventType;
799 - OUString aHyperURL;
800 -
801 - uno::Sequence< beans::PropertyValue > aActionProperties;
802 - if( xEvents->hasByName( msOnAction ) && (xEvents->getByName( msOnAction ) >>= aActionProperties) )
803 - {
804 - const beans::PropertyValue* pProperty = aActionProperties.getConstArray();
805 - const beans::PropertyValue* pPropertyEnd = pProperty + aActionProperties.getLength();
806 - for( ; pProperty != pPropertyEnd; ++pProperty )
807 - {
808 - if( ( ( nFound & FOUND_ACTIONEVENTTYPE ) == 0 ) && pProperty->Name == msEventType )
809 - {
810 - if( pProperty->Value >>= aActionEventType )
811 - nFound |= FOUND_ACTIONEVENTTYPE;
812 - }
813 - else if( ( ( nFound & FOUND_URL ) == 0 ) && ( pProperty->Name == msURL ) )
814 - {
815 - if( pProperty->Value >>= aHyperURL )
816 - nFound |= FOUND_URL;
817 - }
818 - }
819 - }
820 -#endif
821 -
822 // create the XML elements
823
824 if( aClickEventType == msPresentation )
825 @@ -566,15 +536,9 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
826 SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
827 }
828 }
829 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
830 - else if( aClickEventType == msScript || aActionEventType == msAction )
831 - {
832 - if( nFound & ( FOUND_MACRO | FOUND_URL ) )
833 -#else
834 else if( aClickEventType == msScript )
835 {
836 if( nFound & FOUND_MACRO )
837 -#endif
838 {
839 SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
840 if ( nFound & FOUND_MACRO )
841 @@ -589,18 +553,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
842
843 SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
844 }
845 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
846 - if ( nFound & FOUND_URL )
847 - {
848 - OUString aEventQName(
849 - mrExport.GetNamespaceMap().GetQNameByKey(
850 - XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "action" ) ) ) );
851 - mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
852 - mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aHyperURL );
853 -
854 - SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
855 - }
856 -#endif
857 }
858 }
859 }
860 diff --git xmloff/source/draw/ximpshap.cxx xmloff/source/draw/ximpshap.cxx
861 index 5d1d0da..c461d59 100644
862 --- xmloff/source/draw/ximpshap.cxx
863 +++ xmloff/source/draw/ximpshap.cxx
864 @@ -375,6 +375,11 @@ void SdXMLShapeContext::EndElement()
865
866 if( msHyperlink.getLength() != 0 ) try
867 {
868 + uno::Reference< beans::XPropertySet > xProp( mxShape, uno::UNO_QUERY );
869 +
870 + rtl::OUString sLink( RTL_CONSTASCII_USTRINGPARAM( "Hyperlink" ) );
871 + if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) )
872 + xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) );
873 Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW );
874 Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
875
876 @@ -3230,9 +3235,16 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix,
877
878 if( !mxImplContext.Is() )
879 {
880 - pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
881 +
882 + SvXMLShapeContext* pShapeContext= GetImport().GetShapeImport()->CreateFrameChildContext(
883 GetImport(), nPrefix, rLocalName, xAttrList, mxShapes, mxAttrList );
884
885 + pContext = pShapeContext;
886 +
887 + // propagate the hyperlink to child context
888 + if ( msHyperlink.getLength() > 0 )
889 + pShapeContext->setHyperlink( msHyperlink );
890 +
891 mxImplContext = pContext;
892 mbSupportsReplacement = IsXMLToken( rLocalName, XML_OBJECT ) ||
893 IsXMLToken( rLocalName, XML_OBJECT_OLE );
vba interoperability for OOo