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

[Noel (via logerrit)]

 sw/source/filter/ww8/ww8graf.cxx  |   10 +++++-----
 sw/source/filter/ww8/ww8graf2.cxx |    2 +-
 sw/source/filter/ww8/ww8par.cxx   |    4 ++--
 sw/source/filter/ww8/ww8par.hxx   |    4 ++--
 sw/source/filter/ww8/ww8par4.cxx  |    4 ++--
 sw/source/filter/ww8/ww8par6.cxx  |    2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 0374d5fe08050062394038ffe863c037d95ffac1
Author:     Noel <noel.grandin at collabora.co.uk>
AuthorDate: Wed Mar 10 14:46:59 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 11 14:09:56 2021 +0100

    rename GrafikCtor to GraphicCtor
    
    Change-Id: Ib9f4665a9b77e0d90070060f635466a046058431
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112266
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 674ca5649dca..89a3e8ac14f2 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1111,7 +1111,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
                                     static_cast<SdrGrafObj*>(pNew)->SetGraphic(aGraph);
                                 }
 
-                                GrafikCtor();
+                                GraphicCtor();
 
                                 pNew->SetLogicRect( pTextObj->GetCurrentBoundRect() );
                                 pNew->SetLayer( pTextObj->GetLayer() );
@@ -1661,7 +1661,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject const * pSdrObj,
     */
 
     // 1. GraphicObject of documents?
-    GrafikCtor();
+    GraphicCtor();
 
     const SfxItemSet& rOldSet = pSdrObj->GetMergedItemSet();
 
@@ -2512,7 +2512,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( tools::Long nGrafAnchorCp )
     m_nDrawCpO = 0;
     m_bDrawCpOValid = m_xWwFib->GetBaseCp(m_xPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX, &m_nDrawCpO);
 
-    GrafikCtor();
+    GraphicCtor();
 
     WW8PLCFspecial* pPF = m_xPlcxMan->GetFdoa();
     if( !pPF )
@@ -3186,7 +3186,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj
     return pRetFrameFormat;
 }
 
-void SwWW8ImplReader::GrafikCtor()  // For SVDraw and VCControls and Escher
+void SwWW8ImplReader::GraphicCtor()  // For SVDraw and VCControls and Escher
 {
     if (m_pDrawModel)
         return;
@@ -3208,7 +3208,7 @@ void SwWW8ImplReader::GrafikCtor()  // For SVDraw and VCControls and Escher
         m_xMSDffManager->GetShapeOrders()));
 }
 
-void SwWW8ImplReader::GrafikDtor()
+void SwWW8ImplReader::GraphicDtor()
 {
     m_pDrawEditEngine.reset(); // maybe created by graphic
     m_xWWZOrder.reset();       // same
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 3cb16f6422b8..08ef81f6e397 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -467,7 +467,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj,
 
     ::SetProgressState(m_nProgress, m_pDocShell);         // Update
 
-    GrafikCtor();
+    GraphicCtor();
 
     /*
      * Little joke from Microsoft: sometimes a stream named DATA exists. This
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 68069d83a7a1..b95e5e2795af 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4396,7 +4396,7 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
     SwFrameFormat &rFormat = rPage.GetMaster();
 
     if(mrReader.m_xWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized
-        mrReader.GrafikCtor();
+        mrReader.GraphicCtor();
 
     if (mrReader.m_xWDop->fUseBackGroundInAllmodes && mrReader.m_xMSDffManager)
     {
@@ -5357,7 +5357,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
     m_xStyles.reset();
 
     m_xFormImpl.reset();
-    GrafikDtor();
+    GraphicDtor();
     m_xMSDffManager.reset();
     m_xHdFt.reset();
     m_xSBase.reset();
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 21975f20fac8..bb05228159fd 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1608,8 +1608,8 @@ private:
     SwFrameFormat* MungeTextIntoDrawBox(SvxMSDffImportRec *pRecord,
         tools::Long nGrafAnchorCp, SwFrameFormat *pRetFrameFormat);
 
-    void GrafikCtor();
-    void GrafikDtor();
+    void GraphicCtor();
+    void GraphicDtor();
 
 // other stuff
     OUString GetFieldResult( WW8FieldDesc const * pF );
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 1c5bc2a09b6c..2f0a87cc4849 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -243,7 +243,7 @@ SwFrameFormat* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
     ::SetProgressState(m_nProgress, m_pDocShell);     // Update
     SwFrameFormat* pFormat = nullptr;
 
-    GrafikCtor();
+    GraphicCtor();
 
     Graphic aGraph;
     SdrObject* pRet = ImportOleBase(aGraph, pGrf, pFlySet, aVisArea );
@@ -428,7 +428,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
             }
 
             ErrCode nError = ERRCODE_NONE;
-            GrafikCtor();
+            GraphicCtor();
 
             pRet = SvxMSDffManager::CreateSdrOLEFromStorage(
                 *m_pDrawModel,
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9cffb20357fe..453f7f5aa7d3 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2474,7 +2474,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo, const WW8_TablePos *p
         if (m_xSFlyPara->pFlyFormat)
         {
             if (!m_pDrawModel)
-                GrafikCtor();
+                GraphicCtor();
 
             SdrObject* pOurNewObject = CreateContactObject(m_xSFlyPara->pFlyFormat);
             m_xWWZOrder->InsertTextLayerObject(pOurNewObject);