summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-05-20 10:03:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-05-20 15:23:07 +0100
commit5db4a85ab19c7e9284dc36ebdee4fd97797999e8 (patch)
tree5ea1ef34735590586ca24077a54689f50c5a986b /desktop/source
parent47c6885ae75200d165bdaed2d1d3db93fb35fc91 (diff)
resolve merge conflicts
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/dispatchwatcher.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index aff73d0984e3..a04a1605db1f 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -96,6 +96,7 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
String aFilter;
SfxMedium* pMedium = new SfxMedium( aUrl,
STREAM_STD_READ, sal_False );
+
const SfxFilter *pSfxFilter = NULL;
if( nFlags == SFX_FILTER_EXPORT )
{
@@ -105,6 +106,7 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
{
SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pSfxFilter, nFlags, 0 );
}
+
if( pSfxFilter )
aFilter = ( nFlags == SFX_FILTER_EXPORT ) ? pSfxFilter->GetFilterName() :
pSfxFilter->GetServiceName();