[Libreoffice-commits] core.git: compilerplugins/clang sc/source sot/source sw/source

[Andrea Gelmini]

 compilerplugins/clang/constantparam.py |    2 +-
 sc/source/filter/inc/xlstring.hxx      |    4 ++--
 sc/source/ui/optdlg/opredlin.cxx       |    2 +-
 sc/source/ui/view/gridwin2.cxx         |    2 +-
 sc/source/ui/view/tabvwsh5.cxx         |    2 +-
 sot/source/sdstor/stg.cxx              |    2 +-
 sw/source/uibase/app/docsh.cxx         |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit caf388959576da4f480b8c97443cb052f6201a33
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date:   Thu Apr 6 22:32:05 2017 +0200

    Fix typos
    
    Change-Id: Ibad3f8e9f55af5e652b6be198bebace2b1bfb35b
    Reviewed-on: https://gerrit.libreoffice.org/36235
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/compilerplugins/clang/constantparam.py b/compilerplugins/clang/constantparam.py
index 5550c51c34f3..2dede4f1ad8d 100755
--- a/compilerplugins/clang/constantparam.py
+++ b/compilerplugins/clang/constantparam.py
@@ -72,7 +72,7 @@ with open("loplugin.constantparam.report", "wt") as f:
 # take bitmask parameters where one or more of the bits in the
 # bitmask is always one or always zero
 
-# integer to hext str
+# integer to hex str
 def hex(i):
     return "0x%x" % i
 # I can't use python's ~ operator, because that produces negative numbers
diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx
index 6f45c5bdbfc0..e7e68a611812 100644
--- a/sc/source/filter/inc/xlstring.hxx
+++ b/sc/source/filter/inc/xlstring.hxx
@@ -45,8 +45,8 @@ const sal_uInt8 EXC_STRF_UNKNOWN            = 0xF2;
 // Fixed-size characters
 const sal_uInt8 EXC_LF_C                    = '\x0A';       /// LF character (used for line break).
 const sal_uInt16 EXC_LF                     = EXC_LF_C;     /// LF character (unicode).
-const sal_uInt8 EXC_NUL_C                   = '\x00';       /// NUL chararcter.
-const sal_uInt16 EXC_NUL                    = EXC_NUL_C;    /// NUL chararcter (unicode).
+const sal_uInt8 EXC_NUL_C                   = '\x00';       /// NUL character.
+const sal_uInt16 EXC_NUL                    = EXC_NUL_C;    /// NUL character (unicode).
 
 // Rich-string formatting runs ================================================
 
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index baece1764e20..9c0aafd62aad 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -90,7 +90,7 @@ bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ )
 
     SC_MOD()->SetAppOptions(aAppOptions);
 
-    //  repaint (if everything would be done by Items (how it sould be),
+    //  repaint (if everything would be done by Items (how it should be),
     //  this wouldn't be neccessary)
     ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() );
     if (pDocSh)
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index cc8e6d89d7b8..c55ce677e730 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -903,7 +903,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp )
         else
         {
             if ( nPosY > aPagebreakSource.aStart.Row() &&
-                 nPosY <= aPagebreakSource.aEnd.Row() + 1 )     //  to the end is also allowe
+                 nPosY <= aPagebreakSource.aEnd.Row() + 1 )     //  to the end is also allowed
             {
                 bToEnd = ( nPosY == aPagebreakSource.aEnd.Row() + 1 );
                 aDrawRange.aStart.SetRow( nPosY );
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 4ff85c818642..478a49b01bae 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -264,7 +264,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 {
                     //  "Save as" can make a write-protected document writable,
                     //  therefore the Layer-Locks anew (#39884#)
-                    //  (Invalidate etc. is happing already from Sfx)
+                    //  (Invalidate etc. is happening already from Sfx)
                     //  by SID_EDITDOC no SfxHintId::TitleChanged will occur, that
                     //  is why the own hint from DoSaveCompleted
                     //! what is with SfxHintId::SAVECOMPLETED ?
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 0ce16d4900e5..eb87ed99f1e3 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -90,7 +90,7 @@ OLEStorageBase::~OLEStorageBase()
 {
     if( pEntry )
     {
-        DBG_ASSERT( pEntry->m_nRefCnt, "RefCount unter 0" );
+        DBG_ASSERT( pEntry->m_nRefCnt, "RefCount under 0" );
         if( !--pEntry->m_nRefCnt )
         {
             if( pEntry->m_bZombie )
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 2ae8a2992b2e..6e45da59dc54 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1129,7 +1129,7 @@ void SwDocShell::LoadingFinished()
     // interface <SfxObjectShell::EnableSetModified(..)> no longer works, because
     // <SfxObjectShell::FinishedLoading(..)> doesn't care about its status and
     // enables the document modification again.
-    // Thus, manuell modify the document, if its modified and its links are updated
+    // Thus, manual modify the document, if it's modified and its links are updated
     // before <FinishedLoading(..)> is called.
     const bool bHasDocToStayModified( m_pDoc->getIDocumentState().IsModified() && m_pDoc->getIDocumentLinksAdministration().LinksUpdated() );