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

[Andrea Gelmini (via logerrit)]

 svx/source/inc/cell.hxx              |    2 +-
 svx/source/table/cell.cxx            |    4 ++--
 svx/source/table/tablecontroller.cxx |    2 +-
 svx/source/table/tablemodel.cxx      |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7808b624d16b0af5d8ae3897a6b2012ed4ee1076
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Oct 23 17:31:38 2020 +0200
Commit:     Andrea Gelmini <andrea.gelmini at gelma.net>
CommitDate: Wed Nov 4 22:19:11 2020 +0100

    Fix typo in code
    
    It passed "make check" on Linux
    
    Change-Id: Id868397185ab487882a95a298e33a967df810a9c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104737
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Andrea Gelmini <andrea.gelmini at gelma.net>
    Tested-by: Jenkins

diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index f1bc145675e4..688eebf94cca 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -91,7 +91,7 @@ public:
 
     SVX_DLLPRIVATE void merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan );
     SVX_DLLPRIVATE void mergeContent( const CellRef& xSourceCell );
-    SVX_DLLPRIVATE void replaceContentAndFormating( const CellRef& xSourceCell );
+    SVX_DLLPRIVATE void replaceContentAndFormatting( const CellRef& xSourceCell );
 
     SVX_DLLPRIVATE void setMerged();
 
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 20b725491cf8..cc4e292ce60a 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -499,7 +499,7 @@ void Cell::cloneFrom( const CellRef& xCell )
 {
     if( xCell.is() )
     {
-        replaceContentAndFormating( xCell );
+        replaceContentAndFormatting( xCell );
 
         mnCellContentType = xCell->mnCellContentType;
 
@@ -515,7 +515,7 @@ void Cell::cloneFrom( const CellRef& xCell )
     notifyModified();
 }
 
-void Cell::replaceContentAndFormating( const CellRef& xSourceCell )
+void Cell::replaceContentAndFormatting( const CellRef& xSourceCell )
 {
     if( !(xSourceCell.is() && mpProperties) )
         return;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 2dbd99266eac..c30f71201277 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2830,7 +2830,7 @@ bool SvxTableController::PasteObject( SdrTableObj const * pPasteTableObj )
                     xTargetCell->AddUndo();
                     // Prevent cell span exceeding the pasting range.
                     if (nColumns < nTargetCol + xSourceCell->getColumnSpan())
-                        xTargetCell->replaceContentAndFormating(xSourceCell);
+                        xTargetCell->replaceContentAndFormatting(xSourceCell);
                     else
                         xTargetCell->cloneFrom(xSourceCell);
 
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 3a50e8b1c194..d7d04191163c 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -743,7 +743,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
                             if( bUndo )
                                 xTargetCell->AddUndo();
                             xTargetCell->merge( nColSpan - nRemove, xCell->getRowSpan() );
-                            xTargetCell->replaceContentAndFormating( xCell );
+                            xTargetCell->replaceContentAndFormatting( xCell );
                         }
                     }
                 }
@@ -901,7 +901,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount )
                             if( bUndo )
                                 xTargetCell->AddUndo();
                             xTargetCell->merge( xCell->getColumnSpan(), nRowSpan - nRemove );
-                            xTargetCell->replaceContentAndFormating( xCell );
+                            xTargetCell->replaceContentAndFormatting( xCell );
                         }
                     }
                 }