INTEGRATION: CWS thb30fixes (1.4.10); FILE MERGED
2008/06/20 15:27:55 thb 1.4.10.1: #i72828# Make hyperlinks work with animated shapes
This commit is contained in:
parent
3e4ede0b35
commit
ad0a460b9e
1 changed files with 13 additions and 2 deletions
|
@ -7,7 +7,7 @@
|
|||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: drawshape.cxx,v $
|
||||
* $Revision: 1.6 $
|
||||
* $Revision: 1.7 $
|
||||
*
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
|
@ -1056,8 +1056,14 @@ namespace slideshow
|
|||
}
|
||||
|
||||
// hyperlink support
|
||||
void DrawShape::prepareHyperlinkIndices()
|
||||
void DrawShape::prepareHyperlinkIndices() const
|
||||
{
|
||||
if ( !maHyperlinkIndices.empty())
|
||||
{
|
||||
maHyperlinkIndices.clear();
|
||||
maHyperlinkRegions.clear();
|
||||
}
|
||||
|
||||
sal_Int32 nIndex = 0;
|
||||
for ( MetaAction * pCurrAct = mpCurrMtf->FirstAction();
|
||||
pCurrAct != 0; pCurrAct = mpCurrMtf->NextAction() )
|
||||
|
@ -1424,6 +1430,11 @@ namespace slideshow
|
|||
{
|
||||
ensureVerboseMtfComments();
|
||||
|
||||
if ( hasHyperlinks())
|
||||
{
|
||||
prepareHyperlinkIndices();
|
||||
}
|
||||
|
||||
return maSubsetting.getTreeNode( nNodeIndex, eNodeType );
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue