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

Andrea Gelmini (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 1 06:45:12 UTC 2020


 dbaccess/source/ui/inc/TableCopyHelper.hxx  |    2 +-
 dbaccess/source/ui/misc/TableCopyHelper.cxx |    4 ++--
 svx/source/dialog/svxruler.cxx              |   12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit bbeb4b91a56a1fd6db8ae1beb1a59007fb25de37
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 31 15:11:00 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Sep 1 08:44:30 2020 +0200

    Fix typo in code
    
    It passed "make check" on Linux
    
    Change-Id: Idf44d88678de415e38ddb542c198c0eac642aaae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101785
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index b3f03e2a7ff2..e8db559c4c02 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -88,7 +88,7 @@ namespace dbaui
                 { }
         };
 
-        OTableCopyHelper(OGenericUnoController* _pControler);
+        OTableCopyHelper(OGenericUnoController* _pController);
 
         /** pastes a table into the data source
             @param  _rPasteData
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 596aa7335771..36d7ab70fa14 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -56,8 +56,8 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::ucb;
 
-OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler)
-    :m_pController(_pControler)
+OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pController)
+    :m_pController(_pController)
 {
 }
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 3efa537af181..16ee08d4413e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -68,7 +68,7 @@ struct SvxRuler_Impl {
     long   lLastRMargin;
     std::unique_ptr<SvxProtectItem> aProtectItem;
     std::unique_ptr<SfxBoolItem> pTextRTLItem;
-    sal_uInt16 nControlerItems;
+    sal_uInt16 nControllerItems;
     sal_uInt16 nIdx;
     sal_uInt16 nColLeftPix;
     sal_uInt16 nColRightPix;    // Pixel values for left / right edge
@@ -85,7 +85,7 @@ struct SvxRuler_Impl {
         lOldWinPos(0), lMaxLeftLogic(0), lMaxRightLogic(0),
         lLastLMargin(0), lLastRMargin(0),
         aProtectItem(std::make_unique<SvxProtectItem>(SID_RULER_PROTECT)),
-        nControlerItems(0), nIdx(0),
+        nControllerItems(0), nIdx(0),
         nColLeftPix(0), nColRightPix(0),
         bIsTableRows(false),
         bIsTabsRelativeToIndent(true)
@@ -263,7 +263,7 @@ SvxRuler::SvxRuler(
 
     pCtrlItems[i++].reset(new SvxRulerItem(SID_RULER_PROTECT, *this, rBindings));
     pCtrlItems[i++].reset(new SvxRulerItem(SID_RULER_BORDER_DISTANCE, *this, rBindings));
-    mxRulerImpl->nControlerItems=i;
+    mxRulerImpl->nControllerItems=i;
 
     if( (nFlags & SvxRulerSupportFlags::SET_NULLOFFSET) == SvxRulerSupportFlags::SET_NULLOFFSET )
         SetExtraType(RulerExtra::NullOffset);
@@ -1627,10 +1627,10 @@ void SvxRuler::SetActive(bool bOn)
     {
         pBindings->EnterRegistrations();
         if(bOn)
-            for(sal_uInt16 i=0;i<mxRulerImpl->nControlerItems;i++)
+            for(sal_uInt16 i=0;i<mxRulerImpl->nControllerItems;i++)
                 pCtrlItems[i]->ReBind();
         else
-            for(sal_uInt16 j=0;j<mxRulerImpl->nControlerItems;j++)
+            for(sal_uInt16 j=0;j<mxRulerImpl->nControllerItems;j++)
                 pCtrlItems[j]->UnBind();
         pBindings->LeaveRegistrations();
     }
@@ -3210,7 +3210,7 @@ void SvxRuler::EndDrag()
     Ruler::EndDrag();
     if(bUndo)
     {
-        for(sal_uInt16 i = 0; i < mxRulerImpl->nControlerItems; i++)
+        for(sal_uInt16 i = 0; i < mxRulerImpl->nControllerItems; i++)
         {
             pCtrlItems[i]->ClearCache();
             pCtrlItems[i]->GetBindings().Invalidate(pCtrlItems[i]->GetId());


More information about the Libreoffice-commits mailing list