diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2014-02-17 16:01:35 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-02-18 07:29:55 +0000 |
| commit | 5060d3888edba2be753eefbd4d23e1a2abd940ff (patch) | |
| tree | 04d89f541b41121d762c3d0a1f8573aa2684e03d | |
| parent | 736b3970e7a49e0b11997602703852a7a5c0fdc3 (diff) | |
Replace GrafikArrived with GraphicArrived
Change-Id: I626e0039a01e62eeae994b1c423cc6f8aa359c06
Reviewed-on: https://gerrit.libreoffice.org/8087
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | sw/inc/ndgrf.hxx | 6 | ||||
| -rw-r--r-- | sw/source/core/docnode/swbaslnk.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index a2687d6fecd4..ba1d52806474 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode sal_Bool bTransparentFlagValid :1; sal_Bool bInSwapIn :1; - sal_Bool bGrafikArrived :1; + sal_Bool bGraphicArrived :1; sal_Bool bChgTwipSize :1; sal_Bool bChgTwipSizeFromPixel :1; sal_Bool bLoadLowResGrf :1; @@ -150,8 +150,8 @@ public: inline sal_Bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; } inline void SetChgTwipSize( sal_Bool b, sal_Bool bFromPx=sal_False ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; } - inline sal_Bool IsGrafikArrived() const { return bGrafikArrived; } - inline void SetGrafikArrived( sal_Bool b ) { bGrafikArrived = b; } + inline sal_Bool IsGraphicArrived() const { return bGraphicArrived; } + inline void SetGraphicArrived( sal_Bool b ) { bGraphicArrived = b; } inline sal_Bool IsFrameInPaint() const { return bFrameInPaint; } inline void SetFrameInPaint( sal_Bool b ) { bFrameInPaint = b; } diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 0bc76367ab12..46341cb9d528 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -140,7 +140,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem ) bGraphicArrived = GetObj()->IsDataComplete(); bGraphicPieceArrived = GetObj()->IsPending(); - pSwGrfNode->SetGrafikArrived( bGraphicArrived ); + pSwGrfNode->SetGraphicArrived( bGraphicArrived ); Graphic aGrf; if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGrf ) && @@ -248,8 +248,8 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem ) pBLink->DataChanged( rMimeType, rValue ); pBLink->bIgnoreDataChanged = sal_True; - pGrfNd->SetGrafikArrived( ((SwGrfNode*)pCntntNode)-> - IsGrafikArrived() ); + pGrfNd->SetGraphicArrived( ((SwGrfNode*)pCntntNode)-> + IsGraphicArrived() ); // Adjust the Fly's graphic if( !::SetGrfFlySize( aGrfSz, aFrmFmtSz, pGrfNd ) ) diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index e80904dda0cf..c7da2f1a2b88 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -73,7 +73,7 @@ SwGrfNode::SwGrfNode( bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False; - bGrafikArrived = sal_True; + bGraphicArrived = sal_True; // fdo#50763 inline image has already been read into memory if (rGrfName.startsWith("data:")) { @@ -99,7 +99,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, maGrfObj.SetSwapState(); bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False; - bGrafikArrived = sal_True; + bGraphicArrived = sal_True; } /** Create new SW/G reader. @@ -126,7 +126,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False; - bGrafikArrived = sal_True; + bGraphicArrived = sal_True; InsertLink( rGrfName, rFltName ); if( IsLinkedFile() ) |