[Libreoffice-commits] core.git: cui/source desktop/unx include/svx vcl/source xmlscript/source

Julien Nabet serval2412 at yahoo.fr
Fri Feb 3 21:11:28 UTC 2017


 cui/source/dialogs/cuigaldlg.cxx                   |    8 ++++----
 cui/source/inc/cuigaldlg.hxx                       |    4 ++--
 desktop/unx/source/splashx.h                       |    2 +-
 include/svx/gallery.hxx                            |    4 ++--
 vcl/source/window/status.cxx                       |    6 +++---
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |    2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit b4fe924e179bd04073f530713db3da792163a7ca
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Feb 3 21:52:39 2017 +0100

    Typo: progess->progress
    
    Change-Id: Ic13529f4bc9ac49059a59067c50d5f2c0f569822
    Reviewed-on: https://gerrit.libreoffice.org/33902
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a8ec9ef..8a545b1 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -59,11 +59,11 @@ using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
 
-SearchThread::SearchThread( SearchProgress* pProgess,
+SearchThread::SearchThread( SearchProgress* pProgress,
                             TPGalleryThemeProperties* pBrowser,
                             const INetURLObject& rStartURL ) :
         Thread      ( "cuiSearchThread" ),
-        mpProgress  ( pProgess ),
+        mpProgress  ( pProgress ),
         mpBrowser   ( pBrowser ),
         maStartURL  ( rStartURL )
 {
@@ -255,12 +255,12 @@ void SearchProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl
 
 
 TakeThread::TakeThread(
-    TakeProgress* pProgess,
+    TakeProgress* pProgress,
     TPGalleryThemeProperties* pBrowser,
     TokenList_impl& rTakenList
 ) :
     Thread      ( "cuiTakeThread" ),
-    mpProgress  ( pProgess ),
+    mpProgress  ( pProgress ),
     mpBrowser   ( pBrowser ),
     mrTakenList ( rTakenList )
 {
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 07f26fd..dcef86d 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -73,7 +73,7 @@ private:
 
 public:
 
-                                SearchThread( SearchProgress* pProgess,
+                                SearchThread( SearchProgress* pProgress,
                                               TPGalleryThemeProperties* pBrowser,
                                               const INetURLObject& rStartURL );
 };
@@ -117,7 +117,7 @@ private:
 public:
 
                                 TakeThread(
-                                    TakeProgress* pProgess,
+                                    TakeProgress* pProgress,
                                     TPGalleryThemeProperties* pBrowser,
                                     TokenList_impl& rTakenList
                                 );
diff --git a/desktop/unx/source/splashx.h b/desktop/unx/source/splashx.h
index 4e9c72c..55c1281 100644
--- a/desktop/unx/source/splashx.h
+++ b/desktop/unx/source/splashx.h
@@ -21,7 +21,7 @@ struct splash* splash_create(rtl_uString* pAppPath, int argc, char** argv);
 
 void splash_destroy(struct splash* splash);
 
-void splash_draw_progress(struct splash* splash, int progess);
+void splash_draw_progress(struct splash* splash, int progress);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index fe62383..27429fb 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -63,10 +63,10 @@ public:
 
     static bool                 GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos,
                                                Graphic* pGraphic, BitmapEx* pThumb = nullptr,
-                                               bool bProgess = false );
+                                               bool bProgress = false );
     static bool                 GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
                                                Graphic* pGraphic, BitmapEx* pThumb = nullptr,
-                                               bool bProgess = false );
+                                               bool bProgress = false );
 
     static sal_uInt32           GetSdrObjCount( const OUString& rThemeName );
     static sal_uInt32           GetSdrObjCount( sal_uInt32 nThemeId );
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 3739068..c4f5415 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -77,7 +77,7 @@ struct ImplStatusItem
     OUString            maCommand;
 };
 
-inline long ImplCalcProgessWidth( sal_uInt16 nMax, long nSize )
+inline long ImplCalcProgressWidth( sal_uInt16 nMax, long nSize )
 {
     return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2));
 }
@@ -600,13 +600,13 @@ void StatusBar::ImplCalcProgressRect()
     long nMaxWidth = mnDX-STATUSBAR_OFFSET-1;
 
     // make smaller if there are too many rects
-    while ( maPrgsFrameRect.Left()+ImplCalcProgessWidth( nMaxPercent, mnPrgsSize ) > nMaxWidth )
+    while ( maPrgsFrameRect.Left()+ImplCalcProgressWidth( nMaxPercent, mnPrgsSize ) > nMaxWidth )
     {
         nMaxPercent--;
         if ( nMaxPercent <= STATUSBAR_PRGS_MIN )
             break;
     }
-    maPrgsFrameRect.Right() = maPrgsFrameRect.Left() + ImplCalcProgessWidth( nMaxPercent, mnPrgsSize );
+    maPrgsFrameRect.Right() = maPrgsFrameRect.Left() + ImplCalcProgressWidth( nMaxPercent, mnPrgsSize );
 
     // save the divisor for later
     mnPercentCount = 10000 / nMaxPercent;
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 49878a0..8dc7f9e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -211,7 +211,7 @@ void Page::endElement()
     ctx.finish();
 }
 
-// progessmeter
+// progressmeter
 Reference< xml::input::XElement > ProgressBarElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )


More information about the Libreoffice-commits mailing list