mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "remove unused code oox::core::Relations::getRelationsFromType"

Browse Source 
we need it again now

This reverts commit 77c45eb25eb462bacdf7d658d6cb485f755beaa5.

Change-Id: I3e171d95e4f50c8e26824da2f6e6817d3b597d4d
This commit is contained in:
Caolán McNamara 2014-03-05 09:42:06 +00:00
parent 19a28edc63
commit d2c0856937
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/oox/core/relations.hxx
View File

@ -82,6 +82,7 @@ public:
/** Returns the first relation with the passed type. */
const Relation* getRelationFromFirstTypeFromOfficeDoc( const OUString& rType ) const;
/** Finds all relations associated with the passed type. */
RelationsRef getRelationsFromType( const OUString& rType ) const;
RelationsRef getRelationsFromTypeFromOfficeDoc( const OUString& rType ) const;
/** Returns the external target of the relation with the passed relation identifier. */

9
oox/source/core/relations.cxx
View File

@ -71,6 +71,15 @@ const Relation* Relations::getRelationFromFirstType( const OUString& rType ) con
return 0;
}
RelationsRef Relations::getRelationsFromType( const OUString& rType ) const
{
RelationsRef xRelations( new Relations( maFragmentPath ) );
for( const_iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt )
if( aIt->second.maType.equalsIgnoreAsciiCase( rType ) )
(*xRelations)[ aIt->first ] = aIt->second;
return xRelations;
}
RelationsRef Relations::getRelationsFromTypeFromOfficeDoc( const OUString& rType ) const
{
RelationsRef xRelations( new Relations( maFragmentPath ) );

2
oox/source/drawingml/shape.cxx
View File

@ -1208,7 +1208,7 @@ uno::Sequence< uno::Sequence< uno::Any > > Shape::resolveRelationshipsOfType(co
core::RelationsRef xRels = rFilter.importRelations( sFragment );
if ( xRels )
{
core::RelationsRef xImageRels = xRels->getRelationsFromTypeFromOfficeDoc( sType );
core::RelationsRef xImageRels = xRels->getRelationsFromType( sType );
if ( xImageRels )
{
xRelListTemp.realloc( xImageRels->size() );