diff options
| author | danielt998 <daniel@fearnley.net> | 2016-02-11 22:07:09 +0000 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:59 -0400 |
| commit | 953ebe9618074d6a11022d7a94bd1909d20da003 (patch) | |
| tree | 3f9a58a2eea8d384f8684cefc1970cf68394325f /vcl | |
| parent | ef5c4957959d7c0ad9b7bf8cedfae85e7fd77cde (diff) | |
tdf#95857 Sort out German plurals ...
Made a start in removing the incorrect 'Infos' German plural
Reviewed-on: https://gerrit.libreoffice.org/22301
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 2b31daf74e33b988c849cb26e88fa7657a4015af)
Change-Id: Ie989351a7473fc35b563e63ce6a4fb229093af60
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salobj.cxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index e8995d52ad95..0dbb48f66138 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1304,10 +1304,10 @@ void OpenGLContext::initGLWindow(Visual* pVisual) XVisualInfo aTemplate; aTemplate.visualid = XVisualIDFromVisual( pVisual ); int nVisuals = 0; - XVisualInfo* pInfos = XGetVisualInfo( m_aGLWin.dpy, VisualIDMask, &aTemplate, &nVisuals ); + XVisualInfo* pInfo = XGetVisualInfo( m_aGLWin.dpy, VisualIDMask, &aTemplate, &nVisuals ); if( nVisuals != 1 ) SAL_WARN( "vcl.opengl", "match count for visual id is not 1" ); - m_aGLWin.vi = pInfos; + m_aGLWin.vi = pInfo; } // Check multisample support diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index be82b331e502..80ad5423962f 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -136,16 +136,16 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) { int nInfos; XVisualInfo aTemplate; - XVisualInfo*pInfos; + XVisualInfo*pInfo; aTemplate.visualid = nVID; - pInfos = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos ); - if( !pInfos ) + pInfo = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos ); + if( !pInfo ) return false; - rVI = *pInfos; - XFree( pInfos ); + rVI = *pInfo; + XFree( pInfo ); DBG_ASSERT( rVI.visualid == nVID, "sal_GetVisualInfo: could not get correct visual by visualId" ); diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 3622aae2f144..d2809f11d466 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -77,11 +77,11 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p XVisualInfo aTemplate; aTemplate.visualid = aVisID; int nVisuals = 0; - XVisualInfo* pInfos = XGetVisualInfo( pDisp, VisualIDMask, &aTemplate, &nVisuals ); + XVisualInfo* pInfo = XGetVisualInfo( pDisp, VisualIDMask, &aTemplate, &nVisuals ); // only one VisualInfo structure can match the visual id DBG_ASSERT( nVisuals == 1, "match count for visual id is not 1" ); - unsigned int nDepth = pInfos->depth; - XFree( pInfos ); + unsigned int nDepth = pInfo->depth; + XFree( pInfo ); XSetWindowAttributes aAttribs; aAttribs.event_mask = StructureNotifyMask | ButtonPressMask |