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:
Rüdiger Timm 2008-07-11 06:08:56 +00:00
parent 3e4ede0b35
commit ad0a460b9e

View file

@ -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 );
}