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

sw: fix obscure crash in SwXTextDocument::getSomething()

Browse Source 
xNumFmtAgg may be null if you directly call global ServiceManager's
createInstanceWithContext("com.sun.star.text.TextDocument")

Change-Id: Id619a3f5c9e3f8281f9ef72db132c64287e027c4
This commit is contained in:
Michael Stahl
2015-03-31 15:35:36 +02:00
parent deec9bd9b0
commit d360477d87
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sw/source/uibase/uno/unotxdoc.cxx
View File

@@ -266,19 +266,16 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
} }
sal_Int64 nRet = SfxBaseModel::getSomething( rId ); sal_Int64 nRet = SfxBaseModel::getSomething( rId );
if ( nRet ) if (nRet)
return nRet; return nRet;
else
{
GetNumberFormatter();
Any aNumTunnel = xNumFmtAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
Reference<XUnoTunnel> xNumTunnel;
aNumTunnel >>= xNumTunnel;
if(xNumTunnel.is())
return xNumTunnel->getSomething(rId);
}
return SfxBaseModel::getSomething( rId ); GetNumberFormatter();
if (!xNumFmtAgg.is()) // may happen if not valid or no SwDoc
return 0;
Any aNumTunnel = xNumFmtAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
Reference<XUnoTunnel> xNumTunnel;
aNumTunnel >>= xNumTunnel;
return (xNumTunnel.is()) ? xNumTunnel->getSomething(rId) : 0;
} }
Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(RuntimeException, std::exception) Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(RuntimeException, std::exception)