From 3e82e55241ba549765381488bad61ebe45f96941 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 1 Mar 2014 18:40:45 +0100 Subject: no need to add another layer of macros Change-Id: I49992559a7d10127d55dbf0c7e257c86619fd8d6 --- sc/source/filter/oox/externallinkbuffer.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sc/source/filter/oox/externallinkbuffer.cxx') diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index e4e5d00b9732..5771cc24f6da 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -563,19 +563,16 @@ ExternalNameRef ExternalLink::getNameByIndex( sal_Int32 nIndex ) const // private -------------------------------------------------------------------- -#define OOX_TARGETTYPE_EXTLINK CREATE_OFFICEDOC_RELATION_TYPE( "externalLinkPath" ) -#define OOX_TARGETTYPE_LIBRARY CREATE_MSOFFICE_RELATION_TYPE( "xlExternalLinkPath/xlLibrary" ) - void ExternalLink::setExternalTargetUrl( const OUString& rTargetUrl, const OUString& rTargetType ) { meLinkType = LINKTYPE_UNKNOWN; - if( rTargetType == OOX_TARGETTYPE_EXTLINK ) + if( rTargetType == CREATE_OFFICEDOC_RELATION_TYPE( "externalLinkPath" ) ) { maTargetUrl = getBaseFilter().getAbsoluteUrl( rTargetUrl ); if( !maTargetUrl.isEmpty() ) meLinkType = LINKTYPE_EXTERNAL; } - else if( rTargetType == OOX_TARGETTYPE_LIBRARY ) + else if( rTargetType == CREATE_MSOFFICE_RELATION_TYPE( "xlExternalLinkPath/xlLibrary" ) ) { meLinkType = LINKTYPE_LIBRARY; meFuncLibType = getFormulaParser().getFuncLibTypeFromLibraryName( rTargetUrl ); -- cgit