[Libreoffice-commits] core.git: sw/inc sw/source

[Chr. Rossmanith]

 sw/inc/ndgrf.hxx                    |    6 +++---
 sw/source/core/docnode/swbaslnk.cxx |    6 +++---
 sw/source/core/graphic/ndgrf.cxx    |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 5060d3888edba2be753eefbd4d23e1a2abd940ff
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Mon Feb 17 16:01:35 2014 +0100

    Replace GrafikArrived with GraphicArrived
    
    Change-Id: I626e0039a01e62eeae994b1c423cc6f8aa359c06
    Reviewed-on: https://gerrit.libreoffice.org/8087
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index a2687d6..ba1d528 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 0bc7636..46341cb 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 e80904d..c7da2f1 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() )