[Libreoffice-commits] core.git: vcl/source vcl/unx
Andrea Gelmini
andrea.gelmini at gelma.net
Wed Sep 30 03:40:13 PDT 2015
vcl/source/window/accel.cxx | 2 +-
vcl/source/window/accmgr.cxx | 2 +-
vcl/source/window/dlgctrl.cxx | 4 ++--
vcl/source/window/dockmgr.cxx | 2 +-
vcl/source/window/floatwin.cxx | 2 +-
vcl/source/window/paint.cxx | 2 +-
vcl/source/window/splitwin.cxx | 2 +-
vcl/source/window/syswin.cxx | 2 +-
vcl/source/window/toolbox.cxx | 2 +-
vcl/source/window/window.cxx | 2 +-
vcl/source/window/winproc.cxx | 4 ++--
vcl/unx/generic/app/i18n_cb.cxx | 2 +-
vcl/unx/generic/printer/ppdparser.cxx | 2 +-
vcl/unx/gtk/a11y/atkaction.cxx | 2 +-
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 835d7774e78df95d0c59243b6c1b8ed1b51b2311
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 18:13:24 2015 +0200
Fix typos
Change-Id: I2cf36eb80068adcf57238a286f09bdc96b4e01f8
Reviewed-on: https://gerrit.libreoffice.org/18994
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 75ea7bc..a8ce0a4 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -56,7 +56,7 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
return ACCELENTRY_NOTFOUND;
}
- // Binairy search
+ // Binary search
nLow = 0;
nHigh = nCount-1;
do
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index e855193..b94e8c0 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -167,7 +167,7 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRep
}
else
{
- // stop sequence as the accelerator was disbled
+ // stop sequence as the accelerator was disabled
// transfer the key (to the system)
FlushAccel();
return false;
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index cf8ac99..105ba5a 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
static bool ImplHasIndirectTabParent( vcl::Window* pWindow )
{
- // The window has inderect tab parent if it is included in tab hierarchy
+ // The window has indirect tab parent if it is included in tab hierarchy
// of the indirect parent window
vcl::Window* pNonLayoutParent = getNonLayoutParent(pWindow);
@@ -313,7 +313,7 @@ vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pParent, vcl::Window* pWindow,
&& pSWindow->ImplGetWindow()->IsDialogControlStart() )
nFormStart = i;
- // SecondWindow for composit controls like ComboBoxes and arrays
+ // SecondWindow for composite controls like ComboBoxes and arrays
if ( pSWindow->ImplIsWindowOrChild( pWindow ) )
{
pSecondWindow = pSWindow;
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 0de1c43..4eba036 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -1125,7 +1125,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
GetWindow()->mpWindowImpl->mnRightBorder = 0;
GetWindow()->mpWindowImpl->mnBottomBorder = 0;
- // position toolbox below dragrect
+ // position toolbox below DragRect
GetWindow()->SetPosPixel( pWin->GetToolboxPosition() );
// reparent borderwindow and window
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 80c8f0c..c470f75 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -72,7 +72,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
DBG_ASSERT(pParent, "FloatWindow::FloatingWindow(): - pParent == NULL and no AppWindow exists");
- // no Border, then we dont need a border window
+ // no Border, then we don't need a border window
if (!nStyle)
{
mpWindowImpl->mbOverlapWin = true;
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index af14227..ade79ba 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -504,7 +504,7 @@ void Window::PushPaintHelper(PaintHelper *pHelper, vcl::RenderContext& rRenderCo
Erase(rRenderContext);
}
- // #98943# trigger drawing of toolbox selection after all childern are painted
+ // #98943# trigger drawing of toolbox selection after all children are painted
if (mpWindowImpl->mbDrawSelectionBackground)
pHelper->SetSelectionRect(aPaintRect);
pHelper->SetPaintRect(aPaintRect);
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index edbd24f..8e643d1 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1411,7 +1411,7 @@ void SplitWindow::dispose()
// delete Sets
if (mpMainSet) {
delete mpMainSet ;
- mpMainSet = NULL; //NULL for base-class callbacks during dtoring
+ mpMainSet = NULL; //NULL for base-class callbacks during destruction
}
DockingWindow::dispose();
}
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index cac6542..1403918 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -670,7 +670,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
if( rData.GetMask() & (WINDOWSTATE_MASK_WIDTH|WINDOWSTATE_MASK_HEIGHT) )
{
- // #i43799# adjust window state sizes if a minimial output size was set
+ // #i43799# adjust window state sizes if a minimal output size was set
// otherwise the frame and the client might get different sizes
if( maMinOutSize.Width() > aState.mnWidth )
aState.mnWidth = maMinOutSize.Width();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index f6cf525..84a28c8 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -209,7 +209,7 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop,
ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis );
- // reserve dragarea only for dockable toolbars
+ // reserve DragArea only for dockable toolbars
int dragwidth = ( pWrapper && !pWrapper->IsLocked() ) ? ImplGetDragWidth( const_cast<ToolBox*>(pThis) ) : 0;
// no shadow border for dockable toolbars
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5a51cfc..c1212c0 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -611,7 +611,7 @@ WindowImpl::WindowImpl( WindowType nType )
maZoom = Fraction( 1, 1 );
maWinRegion = vcl::Region(true);
maWinClipRegion = vcl::Region(true);
- mpWinData = NULL; // Extra Window Data, that we dont need for all windows
+ mpWinData = NULL; // Extra Window Data, that we don't need for all windows
mpOverlapData = NULL; // Overlap Data
mpFrameData = NULL; // Frame Data
mpFrame = NULL; // Pointer to frame window
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 033389d..ef92f61 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -374,7 +374,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
// return false;
// no mouse messages to disabled windows
- // #106845# if the window was disabed during capturing we have to pass the mouse events to release capturing
+ // #106845# if the window was disabled during capturing we have to pass the mouse events to release capturing
if ( pSVData->maWinData.mpCaptureWin.get() != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalMode() ) )
{
ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent, bMouseLeave );
@@ -1108,7 +1108,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
bRet = false;
}
- // #105591# send keyinput to parent if we are a floating window and the key was not pocessed yet
+ // #105591# send keyinput to parent if we are a floating window and the key was not processed yet
if( !bRet && pWindow->ImplGetWindowImpl()->mbFloatWin && pWindow->GetParent() && (pWindow->ImplGetWindowImpl()->mpFrame != pWindow->GetParent()->ImplGetWindowImpl()->mpFrame) )
{
pChild = pWindow->GetParent();
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 8de3dc8..1d6be55 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -151,7 +151,7 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where)
if (pInsertText->encoding_is_wchar)
{
wchar_t *pWCString = pInsertText->string.wide_char;
- size_t nBytes = wcstombs ( NULL, pWCString, 1024 /* dont care */);
+ size_t nBytes = wcstombs ( NULL, pWCString, 1024 /* don't care */);
pMBString = static_cast<char*>(alloca( nBytes + 1 ));
nMBLength = wcstombs ( pMBString, pWCString, nBytes + 1);
}
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index d3eb8a9..5b8aec7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1211,7 +1211,7 @@ void PPDParser::parseOrderDependency(const OString& rLine)
OString aSetup = GetCommandLineToken( 1, aLine );
OUString aKey(OStringToOUString(GetCommandLineToken(2, aLine), RTL_TEXTENCODING_MS_1252));
if( aKey[ 0 ] != '*' )
- return; // invalid order depency
+ return; // invalid order dependecy
aKey = aKey.replaceAt( 0, 1, "" );
PPDKey* pKey;
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 71ada32..71f072f 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -158,7 +158,7 @@ action_wrapper_get_name (AtkAction *action,
/*
* GNOME Expects a string in the format:
*
-* <nmemonic>;<full-path>;<accelerator>
+* <mnemonic>;<full-path>;<accelerator>
*
* The keybindings in <full-path> should be separated by ":"
*/
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index fab6301..9a30ed6 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1261,7 +1261,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
const ImplControlValue& rValue, const OUString&,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
{
- /* TODO: all this funcions needs improvements */
+ /* TODO: all this functions needs improvements */
Rectangle aEditRect = rControlRegion;
gint indicator_size, indicator_spacing, point;
More information about the Libreoffice-commits
mailing list