diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-17 14:28:41 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-17 14:30:59 -0500 |
| commit | 1fb5ecdd7442247e0ed8154928b66fab0bcbe3ad (patch) | |
| tree | b3fb2f85d285f2080a65b0d0526a3f82d7790bec /svtools/source | |
| parent | 3f390be5a7f3dd0108e2257fa57cfcca6d0859e3 (diff) | |
Const correct-ness in one place...
And an avalanche of changes that ensued.
Change-Id: I7f882b621ba5af4cd01b2ac7f482ee3eed24e3d5
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/misc/embedhlp.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/embedtransfer.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index c405e387412a..07b90d4f9b01 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -431,13 +431,13 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate ) { GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); if( mpImpl->pGraphic ) - rGF.ImportGraphic( *mpImpl->pGraphic, String(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ); + rGF.ImportGraphic( *mpImpl->pGraphic, OUString(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ); mpImpl->mnGraphicVersion++; delete pGraphicStream; } } -Graphic* EmbeddedObjectRef::GetGraphic( ::rtl::OUString* pMediaType ) const +const Graphic* EmbeddedObjectRef::GetGraphic( OUString* pMediaType ) const { if ( mpImpl->bNeedUpdate ) // bNeedUpdate will be set to false while retrieving new replacement @@ -457,7 +457,7 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const if ( mpImpl->nViewAspect == embed::Aspects::MSOLE_ICON ) { - Graphic* pGraphic = GetGraphic(); + const Graphic* pGraphic = GetGraphic(); if ( pGraphic ) { aSourceMapMode = pGraphic->GetPrefMapMode(); diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index af115a04c01e..4caf4fb0f663 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; SvEmbedTransferHelper::SvEmbedTransferHelper( const uno::Reference< embed::XEmbeddedObject >& xObj, - Graphic* pGraphic, + const Graphic* pGraphic, sal_Int64 nAspect ) : m_xObj( xObj ) , m_pGraphic( pGraphic ? new Graphic( *pGraphic ) : NULL ) @@ -190,7 +190,7 @@ void SvEmbedTransferHelper::ObjectReleased() void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, - Graphic* pGraphic, + const Graphic* pGraphic, sal_Int64 nAspect ) { //TODO/LATER: need TypeName to fill it into the Descriptor (will be shown in listbox) |