[Libreoffice-commits] .: vcl/inc vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 16 02:58:41 PST 2012
vcl/inc/unx/saldisp.hxx | 2 +-
vcl/unx/generic/app/saldisp.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b0f254fa1e1cb916fa21234603578de701f75e83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 16 10:30:36 2012 +0000
WaE: getXScreen is an unsigned int now
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 984726d..ea7dfa7 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -375,7 +375,7 @@ public:
virtual ScreenData *initScreen( SalX11Screen nXScreen ) const;
const ScreenData& getDataForScreen( SalX11Screen nXScreen ) const
{
- if( nXScreen.getXScreen() >= static_cast<int>(m_aScreens.size()) )
+ if( nXScreen.getXScreen() >= static_cast<unsigned int>(m_aScreens.size()) )
return m_aInvalidScreenData;
if( ! m_aScreens[nXScreen.getXScreen()].m_bInit )
initScreen( nXScreen );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index c3d5f79..f361961 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -525,7 +525,7 @@ void SalX11Display::PostUserEvent()
SalDisplay::ScreenData *
SalDisplay::initScreen( SalX11Screen nXScreen ) const
{
- if( nXScreen.getXScreen() >= static_cast<int>(m_aScreens.size()) )
+ if( nXScreen.getXScreen() >= static_cast<unsigned int>(m_aScreens.size()) )
nXScreen = m_nXDefaultScreen;
ScreenData* pSD = const_cast<ScreenData *>(&m_aScreens[nXScreen.getXScreen()]);
if( pSD->m_bInit )
More information about the Libreoffice-commits
mailing list