Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
Summary: | OpenOffice/vcl/unx/source/app/saldisp.cxx:1160 fails | ||
---|---|---|---|
Product: | porting | Reporter: | geki <h.mth> |
Component: | code | Assignee: | Martin Hollmichel <nesshof> |
Status: | CLOSED DUPLICATE | QA Contact: | issues@porting <issues> |
Severity: | Trivial | ||
Priority: | P3 | CC: | issues |
Version: | current | ||
Target Milestone: | --- | ||
Hardware: | All | ||
OS: | Linux, all | ||
Issue Type: | DEFECT | Latest Confirmation in: | --- |
Developer Difficulty: | --- |
Description
geki
2004-07-17 16:52:22 UTC
patch to get to version from cws_src680_ooo20040704 :) --- vcl/unx/source/app/saldisp.cxx 2004-05-10 17:56:51.000000000 +0200 +++ vcl/unx/source/app/saldisp.cxx 2004-07-03 01:30:54.000000000 +0200 @@ -2,9 +2,9 @@ * * $RCSfile: saldisp.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.54.40.3 $ * - * last change: $Author: hr $ $Date: 2004/05/10 15:56:51 $ + * last change: $Author: waratah $ $Date: 2004/07/02 23:30:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1157,7 +1157,7 @@ pIntegrator->Acquire(); #ifdef HAVE_LIBSN - m_pSnDisplay = sn_display_new( display, SnErrorTrapPush, SnErrorTrapPop ); + m_pSnDisplay = sn_display_new( pDisp_, SnErrorTrapPush, SnErrorTrapPop ); m_pSnLauncheeContext = sn_launchee_context_new_from_environment( m_pSnDisplay, nScreen_ ); # ifdef DBG_UTIL if( !m_pSnLauncheeContext ) @@ -1896,8 +1896,10 @@ if( aCur != None ) return aCur; - Pixmap aCursBitmap, aMaskBitmap; - unsigned int nXHot, nYHot; + Pixmap aCursBitmap = 0; + Pixmap aMaskBitmap = 0; + unsigned int nXHot = 0; + unsigned int nYHot = 0; switch( ePointerStyle ) { @@ -1906,42 +1908,54 @@ break; case POINTER_ARROW: aCur = XCreateFontCursor( pDisp_, XC_left_ptr ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WAIT: MAKE_CURSOR( wait_ ); break; case POINTER_TEXT: // Mouse Pointer ist ein "I" Beam aCur = XCreateFontCursor( pDisp_, XC_xterm ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_HELP: aCur = XCreateFontCursor( pDisp_, XC_question_arrow ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_CROSS: // Mouse Pointer ist ein Kreuz aCur = XCreateFontCursor( pDisp_, XC_crosshair ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_NSIZE: aCur = XCreateFontCursor( pDisp_, XC_sb_v_double_arrow ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_SSIZE: aCur = XCreateFontCursor( pDisp_, XC_sb_v_double_arrow ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WSIZE: aCur = XCreateFontCursor( pDisp_, XC_sb_h_double_arrow ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_ESIZE: aCur = XCreateFontCursor( pDisp_, XC_sb_h_double_arrow ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WINDOW_NSIZE: aCur = XCreateFontCursor( pDisp_, XC_top_side ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WINDOW_SSIZE: aCur = XCreateFontCursor( pDisp_, XC_bottom_side ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WINDOW_WSIZE: aCur = XCreateFontCursor( pDisp_, XC_left_side ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WINDOW_ESIZE: aCur = XCreateFontCursor( pDisp_, XC_right_side ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_NWSIZE: MAKE_CURSOR( nwsesize_ ); @@ -1957,15 +1971,19 @@ break; case POINTER_WINDOW_NWSIZE: aCur = XCreateFontCursor( pDisp_, XC_top_left_corner ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WINDOW_NESIZE: aCur = XCreateFontCursor( pDisp_, XC_top_right_corner ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WINDOW_SWSIZE: aCur = XCreateFontCursor( pDisp_, XC_bottom_left_corner ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_WINDOW_SESIZE: aCur = XCreateFontCursor( pDisp_, XC_bottom_right_corner ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_HSPLIT: MAKE_CURSOR( hsplit_ ); @@ -1975,12 +1993,15 @@ break; case POINTER_HSIZEBAR: aCur = XCreateFontCursor( pDisp_, XC_sb_h_double_arrow ); // ??? + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_VSIZEBAR: aCur = XCreateFontCursor( pDisp_, XC_sb_v_double_arrow ); // ??? + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_REFHAND: aCur = XCreateFontCursor( pDisp_, XC_hand1 ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_HAND: aCur = XCreateFontCursor( pDisp_, XC_hand2 ); @@ -2077,6 +2098,7 @@ break; case POINTER_PEN: // Mouse Pointer ist ein Stift aCur = XCreateFontCursor( pDisp_, XC_pencil ); + DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" ); break; case POINTER_LINKDATA: MAKE_CURSOR( linkdata_ ); @@ -2711,7 +2733,7 @@ pRootVisual_->GetVisualId() ); } -void SalDisplay::GetScreenFontResolution( long& rDPIX, long& rDPIY ) const +void SalDisplay::GetScreenFontResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) const { rDPIX = aResolution_.A(); rDPIY = aResolution_.B(); #ifdef HAVE_LIBSN - m_pSnDisplay = sn_display_new( display, SnErrorTrapPush, SnErrorTrapPop ); + m_pSnDisplay = sn_display_new( pDisp_, SnErrorTrapPush, SnErrorTrapPop ); m_pSnLauncheeContext = sn_launchee_context_new_from_environment( m_pSnDisplay, nScreen_ ); # ifdef DBG_UTIL This is the fix you needed. The issue for this patch was issue 30836 *** This issue has been marked as a duplicate of 30836 *** closing. |