diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-05-19 23:19:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 15:21:51 +0100 |
| commit | b1e22fb2b16a50869e74f7e1b7b08ea4eefa6a36 (patch) | |
| tree | b96b7d7b97e111c1a7ae8794c22b1e22354b200f /sc/source/filter/html | |
| parent | c917d67a892d14fa6590b8a19aa009c5e83c3fd4 (diff) | |
adjust for return by ref instead of pointer
Diffstat (limited to 'sc/source/filter/html')
| -rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 7af88be0b100..0c3531af7e51 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -82,9 +82,9 @@ ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ) : ScEEParser( pEditEngine ), mpDoc( pDoc ) { - SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get(); + SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); for( sal_uInt16 nIndex = 0; nIndex < SC_HTML_FONTSIZES; ++nIndex ) - maFontHeights[ nIndex ] = pHtmlOptions->GetFontSize( nIndex ) * 20; + maFontHeights[ nIndex ] = rHtmlOptions.GetFontSize( nIndex ) * 20; } ScHTMLParser::~ScHTMLParser() @@ -1285,9 +1285,9 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) sal_uInt16 nFormat; Graphic* pGraphic = new Graphic; - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); if ( GRFILTER_OK != GraphicFilter::LoadGraphic( pImage->aURL, pImage->aFilterName, - *pGraphic, pFilter, &nFormat ) ) + *pGraphic, &rFilter, &nFormat ) ) { delete pGraphic; return ; // dumm gelaufen @@ -1297,7 +1297,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) pActEntry->bHasGraphic = sal_True; pActEntry->aAltText.Erase(); } - pImage->aFilterName = pFilter->GetImportFormatName( nFormat ); + pImage->aFilterName = rFilter.GetImportFormatName( nFormat ); pImage->pGraphic = pGraphic; if ( !(pImage->aSize.Width() && pImage->aSize.Height()) ) { |