diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-03-05 09:42:12 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-03-05 10:09:25 +0100 |
| commit | 85887d554141c33d4a9803ab2fd7765dadf7e64d (patch) | |
| tree | bb5e9204a8514d05760e5cf180c4cd8293231cca | |
| parent | e0b0fe240e8110790e6f00a41e0482481027ff1c (diff) | |
this can be just a pointer as well
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 10 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.hxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 0dd4f108cf8f..3443ec1b0feb 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1538,7 +1538,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi } if ( pGrfNode ) - FlyFrameGraphic( dynamic_cast<const SwFlyFrmFmt*>( &rFrame.GetFrmFmt() ), *pGrfNode ); + FlyFrameGraphic( dynamic_cast<const SwFlyFrmFmt*>( &rFrame.GetFrmFmt() ), pGrfNode ); break; case sw::Frame::eDrawing: { @@ -3363,7 +3363,7 @@ void RtfAttributeOutput::FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& m_aRunText.append("}}}}"); } -void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode& rGrfNode) +void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); @@ -3371,7 +3371,7 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const S const sal_uInt8* pGraphicAry = 0; sal_uInt32 nSize = 0; - Graphic aGraphic(rGrfNode.GetGrf()); + Graphic aGraphic(pGrfNode->GetGrf()); // If there is no graphic there is not much point in parsing it if(aGraphic.GetType()==GRAPHIC_NONE) @@ -3417,10 +3417,10 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const S Size aMapped(eGraphicType == GRAPHIC_BITMAP ? aGraphic.GetSizePixel() : aGraphic.GetPrefSize()); - const SwCropGrf &rCr = (const SwCropGrf &)rGrfNode.GetAttr(RES_GRFATR_CROPGRF); + const SwCropGrf &rCr = (const SwCropGrf &)pGrfNode->GetAttr(RES_GRFATR_CROPGRF); //Get original size in twips - Size aSize(sw::util::GetSwappedInSize(rGrfNode)); + Size aSize(sw::util::GetSwappedInSize(*pGrfNode)); Size aRendered(aSize); if (pFlyFrmFmt) { diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index eea4b8c70d59..c08cfb9d2439 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -412,7 +412,7 @@ protected: private: /// Output graphic fly frames. - void FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode& rGrfNode ); + void FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode ); void FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize ); void FlyFrameOLEData( SwOLENode& rOLENode ); |