sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx | 1 sot/source/base/formats.cxx | 12 ---------- vcl/qa/cppunit/BitmapTest.cxx | 2 - vcl/unx/gtk/window/gtkobject.cxx | 17 ++++++++++----- vcl/unx/gtk/window/gtksalframe.cxx | 6 +++-- 5 files changed, 18 insertions(+), 20 deletions(-)
New commits: commit be8395d4209a4f72fc067abf13314672a07903fb Author: Caolán McNamara <caol...@redhat.com> Date: Sun Mar 29 13:34:00 2015 +0100 coverity#1292227 Missing break in switch Change-Id: Ib1df249b85f7c8996babde7836f43d3fa0e586c8 diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index 8781ece..0d24e70 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -94,6 +94,7 @@ void ScAccessibleFilterTopWindow::setAccessibleChild( { case EDIT_SEARCH_BOX: mxAccEditSearchBox = rAccessible; + break; case LISTBOX: mxAccListBox = rAccessible; break; commit c54d7a83bcd742dedc3b04fe1ac0161d65e82f90 Author: Caolán McNamara <caol...@redhat.com> Date: Sun Mar 29 13:33:06 2015 +0100 coverity#1292225 variable guards dead code Change-Id: Ie00be7806b5bce3599c47654585246edf6f8cc90 diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index 74e7e89..98b2e44 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -75,7 +75,7 @@ void BitmapTest::testConvert() void BitmapTest::testScale() { - bool bExportBitmap(false); + const bool bExportBitmap(false); Bitmap aBitmap24Bit(Size(10, 10), 24); CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(24), aBitmap24Bit.GetBitCount()); commit 5be7dd66f9642c5b91fb8c2d320e71a951c2b5e3 Author: Caolán McNamara <caol...@redhat.com> Date: Sun Mar 29 13:30:27 2015 +0100 drop rather awkward debugging hunk Change-Id: Ia0441caec222227f173a9508530d7c4cefd7892e diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 64aad2e..7b2f897 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1395,18 +1395,6 @@ static sal_uInt16 GetTransferableAction_Impl( const SotAction_Impl* pArrayStart = pArray; SotClipboardFormatId nId = pArray->nFormatId; -#if OSL_DEBUG_LEVEL > 1 -// used for testing a specific format - change in the debugger the value - static sal_uLong nChkFormat = 0; - if( nChkFormat ) - { - for( ; static_cast<SotClipboardFormatId>(0xffff) != pArray->nFormatId && - nChkFormat != pArray->nFormatId; ++pArray ) - ; - nId = pArray->nFormatId; - } -#endif - while( nId != static_cast<SotClipboardFormatId>(0xffff) ) { rFormat = nId; commit cdcee232ce21d8f7b73ed84ea5dbc00ff1a3d8b0 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Mar 27 16:14:52 2015 +0000 don't attempt X internals for gtk3 plug window used by avmedia Change-Id: I3694decc417627fe8ea95642b7e1444e5140304f diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index 2690513..3de060b 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -50,18 +50,25 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) gtk_widget_set_app_paintable( m_pSocket, TRUE ); // system data - SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericData()); m_aSystemData.nSize = sizeof( SystemEnvData ); +#if !GTK_CHECK_VERSION(3,0,0) + SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericData()); m_aSystemData.pDisplay = pDisp->GetDisplay(); + m_aSystemData.pVisual = pDisp->GetVisual(pParent->getXScreenNumber()).GetVisual(); + m_aSystemData.nDepth = pDisp->GetVisual(pParent->getXScreenNumber()).GetDepth(); + m_aSystemData.aColormap = pDisp->GetColormap(pParent->getXScreenNumber()).GetXColormap(); m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(widget_get_window(m_pSocket)); + m_aSystemData.aShellWindow = GDK_WINDOW_XWINDOW(widget_get_window(GTK_WIDGET(pParent->getWindow()))); +#else + static int nWindow = 0; + m_aSystemData.aWindow = nWindow; + m_aSystemData.aShellWindow = pParent->GetSystemData()->aWindow; + ++nWindow; +#endif m_aSystemData.pSalFrame = NULL; m_aSystemData.pWidget = m_pSocket; - m_aSystemData.pVisual = pDisp->GetVisual(pParent->getXScreenNumber()).GetVisual(); m_aSystemData.nScreen = pParent->getXScreenNumber().getXScreen(); - m_aSystemData.nDepth = pDisp->GetVisual(pParent->getXScreenNumber()).GetDepth(); - m_aSystemData.aColormap = pDisp->GetColormap(pParent->getXScreenNumber()).GetXColormap(); m_aSystemData.pAppContext = NULL; - m_aSystemData.aShellWindow = GDK_WINDOW_XWINDOW(widget_get_window(GTK_WIDGET(pParent->getWindow()))); m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow()); g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index f56bbad..9ca17bd 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1075,15 +1075,17 @@ void GtkSalFrame::InitCommon() m_aSystemData.nDepth = pDisp->GetVisual( m_nXScreen ).GetDepth(); m_aSystemData.aColormap = pDisp->GetColormap( m_nXScreen ).GetXColormap(); m_aSystemData.aWindow = widget_get_xid(m_pWindow); + m_aSystemData.aShellWindow = m_aSystemData.aWindow; #else static int nWindow = 0; - m_aSystemData.aWindow = nWindow++; + m_aSystemData.aWindow = nWindow; + m_aSystemData.aShellWindow = nWindow; + ++nWindow; #endif m_aSystemData.pSalFrame = this; m_aSystemData.pWidget = m_pWindow; m_aSystemData.nScreen = m_nXScreen.getXScreen(); m_aSystemData.pAppContext = NULL; - m_aSystemData.aShellWindow = m_aSystemData.aWindow; m_aSystemData.pShellWidget = m_aSystemData.pWidget; // fake an initial geometry, gets updated via configure event or SetPosSize
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits