diff --git a/main/vcl/aqua/source/app/saldata.cxx b/main/vcl/aqua/source/app/saldata.cxx index 95db94022be..158e114da4a 100644 --- a/main/vcl/aqua/source/app/saldata.cxx +++ b/main/vcl/aqua/source/app/saldata.cxx @@ -19,8 +19,6 @@ * *************************************************************/ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" @@ -34,257 +32,258 @@ oslThreadKey SalData::s_aAutoReleaseKey = 0; static void SAL_CALL releasePool( void* pPool ) { - if( pPool ) - [(NSAutoreleasePool*)pPool release]; + if( pPool ) + [(NSAutoreleasePool*)pPool release]; } SalData::SalData() : - mpTimerProc( NULL ), - mpFirstInstance( NULL ), - mpFirstObject( NULL ), - mpFirstVD( NULL ), - mpFirstPrinter( NULL ), - mpFontList( NULL ), - mpStatusItem( nil ), - mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ), - mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ), - mxP50Space( NULL ), - mxP50Pattern( NULL ), - maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), - mbIsScrollbarDoubleMax( false ), - mnSystemVersion( OSX_VER_LION ), - mpAppleRemoteMainController( NULL ), - mpDockIconClickHandler( nil ), - mnDPIX( 0 ), - mnDPIY( 0 ) + mpTimerProc( NULL ), + mpFirstInstance( NULL ), + mpFirstObject( NULL ), + mpFirstVD( NULL ), + mpFirstPrinter( NULL ), + mpFontList( NULL ), + mpStatusItem( nil ), + mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ), + mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ), + mxP50Space( NULL ), + mxP50Pattern( NULL ), + maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), + mbIsScrollbarDoubleMax( false ), + mnSystemVersion( OSX_VER_LION ), + mpAppleRemoteMainController( NULL ), + mpDockIconClickHandler( nil ), + mnDPIX( 0 ), + mnDPIY( 0 ) { - if( s_aAutoReleaseKey == 0 ) - s_aAutoReleaseKey = osl_createThreadKey( releasePool ); + if( s_aAutoReleaseKey == 0 ) + s_aAutoReleaseKey = osl_createThreadKey( releasePool ); } SalData::~SalData() { - CGPatternRelease( mxP50Pattern ); - CGColorSpaceRelease( mxP50Space ); - CGColorSpaceRelease( mxRGBSpace ); - CGColorSpaceRelease( mxGraySpace ); - for( unsigned int i = 0; i < maCursors.size(); i++ ) - { - NSCursor* pCurs = maCursors[i]; - if( pCurs && pCurs != INVALID_CURSOR_PTR ) - [pCurs release]; - } - if( s_aAutoReleaseKey ) - { - // release the last pool - NSAutoreleasePool* pPool = nil; - pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); - if( pPool ) - { - osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); - [pPool release]; - } + CGPatternRelease( mxP50Pattern ); + CGColorSpaceRelease( mxP50Space ); + CGColorSpaceRelease( mxRGBSpace ); + CGColorSpaceRelease( mxGraySpace ); + for( unsigned int i = 0; i < maCursors.size(); i++ ) + { + NSCursor* pCurs = maCursors[i]; + if( pCurs && pCurs != INVALID_CURSOR_PTR ) + [pCurs release]; + } + if( s_aAutoReleaseKey ) + { + // release the last pool + NSAutoreleasePool* pPool = nil; + pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); + if( pPool ) + { + osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); + [pPool release]; + } - osl_destroyThreadKey( s_aAutoReleaseKey ); - s_aAutoReleaseKey = 0; - } - if ( mpAppleRemoteMainController ) - [mpAppleRemoteMainController release]; + osl_destroyThreadKey( s_aAutoReleaseKey ); + s_aAutoReleaseKey = 0; + } + if ( mpAppleRemoteMainController ) + [mpAppleRemoteMainController release]; } void SalData::ensureThreadAutoreleasePool() { - NSAutoreleasePool* pPool = nil; - if( s_aAutoReleaseKey ) - { - pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); - if( ! pPool ) - { - pPool = [[NSAutoreleasePool alloc] init]; - osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); - } - } - else - { - DBG_ERROR( "no autorelease key" ); - } + NSAutoreleasePool* pPool = nil; + if( s_aAutoReleaseKey ) + { + pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); + if( ! pPool ) + { + pPool = [[NSAutoreleasePool alloc] init]; + osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); + } + } + else + { + DBG_ERROR( "no autorelease key" ); + } } void SalData::drainThreadAutoreleasePool() { - NSAutoreleasePool* pPool = nil; - if( s_aAutoReleaseKey ) - { - pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); - if( pPool ) - { - // osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); - // [pPool release]; - [pPool drain]; - } - else - { - pPool = [[NSAutoreleasePool alloc] init]; - osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); - } - } - else - { - DBG_ERROR( "no autorelease key" ); - } + NSAutoreleasePool* pPool = nil; + if( s_aAutoReleaseKey ) + { + pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); + if( pPool ) + { + // osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); + // [pPool release]; + [pPool drain]; + } + else + { + pPool = [[NSAutoreleasePool alloc] init]; + osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); + } + } + else + { + DBG_ERROR( "no autorelease key" ); + } } - struct curs_ent { - const char* pBaseName; - const NSPoint aHotSpot; + const char* pBaseName; + const NSPoint aHotSpot; } const aCursorTab[ POINTER_COUNT ] = { -{ NULL, { 0, 0 } }, //POINTER_ARROW -{ "nullptr", { 16, 16 } }, //POINTER_NULL -{ "hourglass", { 15, 15 } }, //POINTER_WAIT -{ NULL, { 0, 0 } }, //POINTER_TEXT -{ "help", { 0, 0 } }, //POINTER_HELP -{ NULL, { 0, 0 } }, //POINTER_CROSS -{ NULL, { 0, 0 } }, //POINTER_MOVE -{ NULL, { 0, 0 } }, //POINTER_NSIZE -{ NULL, { 0, 0 } }, //POINTER_SSIZE -{ NULL, { 0, 0 } }, //POINTER_WSIZE -{ NULL, { 0, 0 } }, //POINTER_ESIZE -{ "nwsesize", { 15, 15 } }, //POINTER_NWSIZE -{ "neswsize", { 15, 15 } }, //POINTER_NESIZE -{ "neswsize", { 15, 15 } }, //POINTER_SWSIZE -{ "nwsesize", { 15, 15 } }, //POINTER_SESIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_NSIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_SSIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_WSIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_ESIZE -{ "nwsesize", { 15, 15 } }, //POINTER_WINDOW_NWSIZE -{ "neswsize", { 15, 15 } }, //POINTER_WINDOW_NESIZE -{ "neswsize", { 15, 15 } }, //POINTER_WINDOW_SWSIZE -{ "nwsesize", { 15, 15 } }, //POINTER_WINDOW_SESIZE -{ NULL, { 0, 0 } }, //POINTER_HSPLIT -{ NULL, { 0, 0 } }, //POINTER_VSPLIT -{ NULL, { 0, 0 } }, //POINTER_HSIZEBAR -{ NULL, { 0, 0 } }, //POINTER_VSIZEBAR -{ NULL, { 0, 0 } }, //POINTER_HAND -{ NULL, { 0, 0 } }, //POINTER_REFHAND -{ "pen", { 3, 27 } }, //POINTER_PEN -{ "magnify", { 12, 13 } }, //POINTER_MAGNIFY -{ "fill", { 10, 22 } }, //POINTER_FILL -{ "rotate", { 15, 15 } }, //POINTER_ROTATE -{ "hshear", { 15, 15 } }, //POINTER_HSHEAR -{ "vshear", { 15, 15 } }, //POINTER_VSHEAR -{ "mirror", { 14, 12 } }, //POINTER_MIRROR -{ "crook", { 15, 14 } }, //POINTER_CROOK -{ "crop", { 9, 9 } }, //POINTER_CROP -{ "movept", { 0, 0 } }, //POINTER_MOVEPOINT -{ "movebw", { 0, 0 } }, //POINTER_MOVEBEZIERWEIGHT -{ "movedata", { 0, 0 } }, //POINTER_MOVEDATA -{ "copydata", { 0, 0 } }, //POINTER_COPYDATA -{ "linkdata", { 0, 0 } }, //POINTER_LINKDATA -{ "movedlnk", { 0, 0 } }, //POINTER_MOVEDATALINK -{ "copydlnk", { 0, 0 } }, //POINTER_COPYDATALINK -{ "movef", { 8, 8 } }, //POINTER_MOVEFILE -{ "copyf", { 8, 8 } }, //POINTER_COPYFILE -{ "linkf", { 8, 8 } }, //POINTER_LINKFILE -{ "moveflnk", { 8, 8 } }, //POINTER_MOVEFILELINK -{ "copyflnk", { 8, 8 } }, //POINTER_COPYFILELINK -{ "movef2", { 7, 8 } }, //POINTER_MOVEFILES -{ "copyf2", { 7, 8 } }, //POINTER_COPYFILES -{ "notallow", { 15, 15 } }, //POINTER_NOTALLOWED -{ "dline", { 8, 8 } }, //POINTER_DRAW_LINE -{ "drect", { 8, 8 } }, //POINTER_DRAW_RECT -{ "dpolygon", { 8, 8 } }, //POINTER_DRAW_POLYGON -{ "dbezier", { 8, 8 } }, //POINTER_DRAW_BEZIER -{ "darc", { 8, 8 } }, //POINTER_DRAW_ARC -{ "dpie", { 8, 8 } }, //POINTER_DRAW_PIE -{ "dcirccut", { 8, 8 } }, //POINTER_DRAW_CIRCLECUT -{ "dellipse", { 8, 8 } }, //POINTER_DRAW_ELLIPSE -{ "dfree", { 8, 8 } }, //POINTER_DRAW_FREEHAND -{ "dconnect", { 8, 8 } }, //POINTER_DRAW_CONNECT -{ "dtext", { 8, 8 } }, //POINTER_DRAW_TEXT -{ "dcapt", { 8, 8 } }, //POINTER_DRAW_CAPTION -{ "chart", { 15, 16 } }, //POINTER_CHART -{ "detectiv", { 12, 13 } }, //POINTER_DETECTIVE -{ "pivotcol", { 7, 5 } }, //POINTER_PIVOT_COL -{ "pivotrow", { 8, 7 } }, //POINTER_PIVOT_ROW -{ "pivotfld", { 8, 7 } }, //POINTER_PIVOT_FIELD -{ "chain", { 0, 2 } }, //POINTER_CHAIN -{ "chainnot", { 2, 2 } }, //POINTER_CHAIN_NOTALLOWED -{ "timemove", { 16, 16 } }, //POINTER_TIMEEVENT_MOVE -{ "timesize", { 16, 17 } }, //POINTER_TIMEEVENT_SIZE -{ "asn", { 16, 12 } }, //POINTER_AUTOSCROLL_N -{ "ass", { 15, 19 } }, //POINTER_AUTOSCROLL_S -{ "asw", { 12, 15 } }, //POINTER_AUTOSCROLL_W -{ "ase", { 19, 16 } }, //POINTER_AUTOSCROLL_E -{ "asnw", { 10, 10 } }, //POINTER_AUTOSCROLL_NW -{ "asne", { 21, 10 } }, //POINTER_AUTOSCROLL_NE -{ "assw", { 21, 21 } }, //POINTER_AUTOSCROLL_SW -{ "asse", { 21, 21 } }, //POINTER_AUTOSCROLL_SE -{ "asns", { 15, 15 } }, //POINTER_AUTOSCROLL_NS -{ "aswe", { 15, 15 } }, //POINTER_AUTOSCROLL_WE -{ "asnswe", { 15, 15 } }, //POINTER_AUTOSCROLL_NSWE -{ "airbrush", { 5, 22 } }, //POINTER_AIRBRUSH -{ "vtext", { 15, 15 } }, //POINTER_TEXT_VERTICAL -{ "pivotdel", { 18, 15 } }, //POINTER_PIVOT_DELETE -{ "tblsels", { 15, 30 } }, //POINTER_TAB_SELECT_S -{ "tblsele", { 30, 16 } }, //POINTER_TAB_SELECT_E -{ "tblselse", { 30, 30 } }, //POINTER_TAB_SELECT_SE -{ "tblselw", { 1, 16 } }, //POINTER_TAB_SELECT_W -{ "tblselsw", { 1, 30 } }, //POINTER_TAB_SELECT_SW -{ "pntbrsh", { 9, 16 } } //POINTER_PAINTBRUSH +{ NULL, { 0, 0 } }, // POINTER_ARROW +{ "nullptr", { 16, 16 } }, // POINTER_NULL +{ "hourglass", { 15, 15 } }, // POINTER_WAIT +{ NULL, { 0, 0 } }, // POINTER_TEXT +{ "help", { 0, 0 } }, // POINTER_HELP +{ NULL, { 0, 0 } }, // POINTER_CROSS +{ NULL, { 0, 0 } }, // POINTER_MOVE +{ NULL, { 0, 0 } }, // POINTER_NSIZE +{ NULL, { 0, 0 } }, // POINTER_SSIZE +{ NULL, { 0, 0 } }, // POINTER_WSIZE +{ NULL, { 0, 0 } }, // POINTER_ESIZE +{ "nwsesize", { 15, 15 } }, // POINTER_NWSIZE +{ "neswsize", { 15, 15 } }, // POINTER_NESIZE +{ "neswsize", { 15, 15 } }, // POINTER_SWSIZE +{ "nwsesize", { 15, 15 } }, // POINTER_SESIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_NSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_SSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_WSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_ESIZE +{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_NWSIZE +{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_NESIZE +{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_SWSIZE +{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_SESIZE +{ NULL, { 0, 0 } }, // POINTER_HSPLIT +{ NULL, { 0, 0 } }, // POINTER_VSPLIT +{ NULL, { 0, 0 } }, // POINTER_HSIZEBAR +{ NULL, { 0, 0 } }, // POINTER_VSIZEBAR +{ NULL, { 0, 0 } }, // POINTER_HAND +{ NULL, { 0, 0 } }, // POINTER_REFHAND +{ "pen", { 3, 27 } }, // POINTER_PEN +{ "magnify", { 12, 13 } }, // POINTER_MAGNIFY +{ "fill", { 10, 22 } }, // POINTER_FILL +{ "rotate", { 15, 15 } }, // POINTER_ROTATE +{ "hshear", { 15, 15 } }, // POINTER_HSHEAR +{ "vshear", { 15, 15 } }, // POINTER_VSHEAR +{ "mirror", { 14, 12 } }, // POINTER_MIRROR +{ "crook", { 15, 14 } }, // POINTER_CROOK +{ "crop", { 9, 9 } }, // POINTER_CROP +{ "movept", { 0, 0 } }, // POINTER_MOVEPOINT +{ "movebw", { 0, 0 } }, // POINTER_MOVEBEZIERWEIGHT +{ "movedata", { 0, 0 } }, // POINTER_MOVEDATA +{ "copydata", { 0, 0 } }, // POINTER_COPYDATA +{ "linkdata", { 0, 0 } }, // POINTER_LINKDATA +{ "movedlnk", { 0, 0 } }, // POINTER_MOVEDATALINK +{ "copydlnk", { 0, 0 } }, // POINTER_COPYDATALINK +{ "movef", { 8, 8 } }, // POINTER_MOVEFILE +{ "copyf", { 8, 8 } }, // POINTER_COPYFILE +{ "linkf", { 8, 8 } }, // POINTER_LINKFILE +{ "moveflnk", { 8, 8 } }, // POINTER_MOVEFILELINK +{ "copyflnk", { 8, 8 } }, // POINTER_COPYFILELINK +{ "movef2", { 7, 8 } }, // POINTER_MOVEFILES +{ "copyf2", { 7, 8 } }, // POINTER_COPYFILES +{ "notallow", { 15, 15 } }, // POINTER_NOTALLOWED +{ "dline", { 8, 8 } }, // POINTER_DRAW_LINE +{ "drect", { 8, 8 } }, // POINTER_DRAW_RECT +{ "dpolygon", { 8, 8 } }, // POINTER_DRAW_POLYGON +{ "dbezier", { 8, 8 } }, // POINTER_DRAW_BEZIER +{ "darc", { 8, 8 } }, // POINTER_DRAW_ARC +{ "dpie", { 8, 8 } }, // POINTER_DRAW_PIE +{ "dcirccut", { 8, 8 } }, // POINTER_DRAW_CIRCLECUT +{ "dellipse", { 8, 8 } }, // POINTER_DRAW_ELLIPSE +{ "dfree", { 8, 8 } }, // POINTER_DRAW_FREEHAND +{ "dconnect", { 8, 8 } }, // POINTER_DRAW_CONNECT +{ "dtext", { 8, 8 } }, // POINTER_DRAW_TEXT +{ "dcapt", { 8, 8 } }, // POINTER_DRAW_CAPTION +{ "chart", { 15, 16 } }, // POINTER_CHART +{ "detectiv", { 12, 13 } }, // POINTER_DETECTIVE +{ "pivotcol", { 7, 5 } }, // POINTER_PIVOT_COL +{ "pivotrow", { 8, 7 } }, // POINTER_PIVOT_ROW +{ "pivotfld", { 8, 7 } }, // POINTER_PIVOT_FIELD +{ "chain", { 0, 2 } }, // POINTER_CHAIN +{ "chainnot", { 2, 2 } }, // POINTER_CHAIN_NOTALLOWED +{ "timemove", { 16, 16 } }, // POINTER_TIMEEVENT_MOVE +{ "timesize", { 16, 17 } }, // POINTER_TIMEEVENT_SIZE +{ "asn", { 16, 12 } }, // POINTER_AUTOSCROLL_N +{ "ass", { 15, 19 } }, // POINTER_AUTOSCROLL_S +{ "asw", { 12, 15 } }, // POINTER_AUTOSCROLL_W +{ "ase", { 19, 16 } }, // POINTER_AUTOSCROLL_E +{ "asnw", { 10, 10 } }, // POINTER_AUTOSCROLL_NW +{ "asne", { 21, 10 } }, // POINTER_AUTOSCROLL_NE +{ "assw", { 21, 21 } }, // POINTER_AUTOSCROLL_SW +{ "asse", { 21, 21 } }, // POINTER_AUTOSCROLL_SE +{ "asns", { 15, 15 } }, // POINTER_AUTOSCROLL_NS +{ "aswe", { 15, 15 } }, // POINTER_AUTOSCROLL_WE +{ "asnswe", { 15, 15 } }, // POINTER_AUTOSCROLL_NSWE +{ "airbrush", { 5, 22 } }, // POINTER_AIRBRUSH +{ "vtext", { 15, 15 } }, // POINTER_TEXT_VERTICAL +{ "pivotdel", { 18, 15 } }, // POINTER_PIVOT_DELETE +{ "tblsels", { 15, 30 } }, // POINTER_TAB_SELECT_S +{ "tblsele", { 30, 16 } }, // POINTER_TAB_SELECT_E +{ "tblselse", { 30, 30 } }, // POINTER_TAB_SELECT_SE +{ "tblselw", { 1, 16 } }, // POINTER_TAB_SELECT_W +{ "tblselsw", { 1, 30 } }, // POINTER_TAB_SELECT_SW +{ "pntbrsh", { 9, 16 } } // POINTER_PAINTBRUSH }; NSCursor* SalData::getCursor( PointerStyle i_eStyle ) { - if( i_eStyle >= POINTER_COUNT ) - return nil; + if( i_eStyle >= POINTER_COUNT ) + return nil; - NSCursor* pCurs = maCursors[ i_eStyle ]; - if( pCurs == INVALID_CURSOR_PTR ) - { - pCurs = nil; - if( aCursorTab[ i_eStyle ].pBaseName ) - { - NSPoint aHotSpot = aCursorTab[ i_eStyle ].aHotSpot; - CFStringRef pCursorName = - CFStringCreateWithCStringNoCopy( - kCFAllocatorDefault, - aCursorTab[ i_eStyle ].pBaseName, - kCFStringEncodingASCII, - kCFAllocatorNull ); - CFBundleRef hMain = CFBundleGetMainBundle(); - CFURLRef hURL = CFBundleCopyResourceURL( hMain, pCursorName, CFSTR("png"), CFSTR("cursors") ); - if( hURL ) - { - pCurs = [[NSCursor alloc] initWithImage: [[NSImage alloc] initWithContentsOfURL: (NSURL*)hURL] hotSpot: aHotSpot]; - CFRelease( hURL ); - } - CFRelease( pCursorName ); - } - maCursors[ i_eStyle ] = pCurs; - } - return pCurs; + NSCursor* pCurs = maCursors[ i_eStyle ]; + if( pCurs == INVALID_CURSOR_PTR ) + { + pCurs = nil; + if( aCursorTab[ i_eStyle ].pBaseName ) + { + NSPoint aHotSpot = aCursorTab[ i_eStyle ].aHotSpot; + CFStringRef pCursorName = + CFStringCreateWithCStringNoCopy( + kCFAllocatorDefault, + aCursorTab[ i_eStyle ].pBaseName, + kCFStringEncodingASCII, + kCFAllocatorNull ); + CFBundleRef hMain = CFBundleGetMainBundle(); + CFURLRef hURL = CFBundleCopyResourceURL( hMain, pCursorName, CFSTR("png"), CFSTR("cursors") ); + if( hURL ) + { + pCurs = [[NSCursor alloc] initWithImage: [[NSImage alloc] initWithContentsOfURL: (NSURL*)hURL] hotSpot: aHotSpot]; + CFRelease( hURL ); + } + CFRelease( pCursorName ); + } + maCursors[ i_eStyle ] = pCurs; + } + return pCurs; } NSStatusItem* SalData::getStatusItem() { - SalData* pData = GetSalData(); - if( ! pData->mpStatusItem ) - { - NSStatusBar* pStatBar =[NSStatusBar systemStatusBar]; - if( pStatBar ) - { - pData->mpStatusItem = [pStatBar statusItemWithLength: NSVariableStatusItemLength]; - [pData->mpStatusItem retain]; - OOStatusItemView* pView = [[OOStatusItemView alloc] init]; - [pData->mpStatusItem setView: pView ]; - [pView display]; - } - } - return pData->mpStatusItem; + SalData* pData = GetSalData(); + if( ! pData->mpStatusItem ) + { + NSStatusBar* pStatBar =[NSStatusBar systemStatusBar]; + if( pStatBar ) + { + pData->mpStatusItem = [pStatBar statusItemWithLength: NSVariableStatusItemLength]; + [pData->mpStatusItem retain]; + OOStatusItemView* pView = [[OOStatusItemView alloc] init]; + [pData->mpStatusItem setView: pView ]; + [pView display]; + } + } + return pData->mpStatusItem; } + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/vcl/aqua/source/res/cursors/tblsele.png b/main/vcl/aqua/source/res/cursors/tblsele.png index a2da05e009d..1ae84680370 100644 Binary files a/main/vcl/aqua/source/res/cursors/tblsele.png and b/main/vcl/aqua/source/res/cursors/tblsele.png differ diff --git a/main/vcl/aqua/source/res/cursors/tblsels.png b/main/vcl/aqua/source/res/cursors/tblsels.png index ba20589c794..cc217322e66 100644 Binary files a/main/vcl/aqua/source/res/cursors/tblsels.png and b/main/vcl/aqua/source/res/cursors/tblsels.png differ diff --git a/main/vcl/aqua/source/res/cursors/tblselse.png b/main/vcl/aqua/source/res/cursors/tblselse.png index 4ee7f62b304..6abc356d0c9 100644 Binary files a/main/vcl/aqua/source/res/cursors/tblselse.png and b/main/vcl/aqua/source/res/cursors/tblselse.png differ diff --git a/main/vcl/aqua/source/res/cursors/tblselsw.png b/main/vcl/aqua/source/res/cursors/tblselsw.png index 11d7cb34d64..f997dfb2d64 100644 Binary files a/main/vcl/aqua/source/res/cursors/tblselsw.png and b/main/vcl/aqua/source/res/cursors/tblselsw.png differ diff --git a/main/vcl/aqua/source/res/cursors/tblselw.png b/main/vcl/aqua/source/res/cursors/tblselw.png index 62813a97585..745aabf8a16 100644 Binary files a/main/vcl/aqua/source/res/cursors/tblselw.png and b/main/vcl/aqua/source/res/cursors/tblselw.png differ diff --git a/main/vcl/inc/unx/x11_cursors/tblsele_curs.h b/main/vcl/inc/unx/x11_cursors/tblsele_curs.h index 8df7c07cc92..49f12b184f7 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsele_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblsele_curs.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsele_curs_width 16 -#define tblsele_curs_height 16 -#define tblsele_curs_x_hot 14 -#define tblsele_curs_y_hot 8 +#define tblsele_curs_width 24 +#define tblsele_curs_height 24 +#define tblsele_curs_x_hot 22 +#define tblsele_curs_y_hot 11 static const unsigned char tblsele_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x04, - 0x00,0x0c, - 0x00,0x1c, - 0xfc,0x3f, - 0xfc,0x7f, - 0xfc,0x3f, - 0x00,0x1c, - 0x00,0x0c, - 0x00,0x04, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x40,0x00, + 0x00,0xC0,0x00, + 0x00,0xC0,0x01, + 0x00,0xC0,0x03, + 0x00,0xC0,0x07, + 0x00,0xC0,0x0F, + 0x00,0xC0,0x1F, + 0x00,0xC0,0x3F, + 0x00,0xC0,0x1F, + 0x00,0xC0,0x0F, + 0x00,0xC0,0x07, + 0x00,0xC0,0x03, + 0x00,0xC0,0x01, + 0x00,0xC0,0x00, + 0x00,0x40,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblsele_mask.h b/main/vcl/inc/unx/x11_cursors/tblsele_mask.h index 0bb5cbfdf82..e9f9512e713 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsele_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsele_mask.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsele_mask_width 16 -#define tblsele_mask_height 16 -#define tblsele_mask_x_hot 14 -#define tblsele_mask_y_hot 8 +#define tblsele_mask_width 24 +#define tblsele_mask_height 24 +#define tblsele_mask_x_hot 22 +#define tblsele_mask_y_hot 11 static const unsigned char tblsele_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x06, - 0x00,0x0e, - 0x00,0x1e, - 0xfe,0x3f, - 0xfe,0x7f, - 0xfe,0xff, - 0xfe,0x7f, - 0xfe,0x3f, - 0x00,0x1e, - 0x00,0x0e, - 0x00,0x06, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x20,0x00, + 0x00,0x60,0x00, + 0x00,0xE0,0x00, + 0x00,0xE0,0x01, + 0x00,0xE0,0x03, + 0x00,0xE0,0x07, + 0x00,0xE0,0x0F, + 0x00,0xE0,0x1F, + 0x00,0xE0,0x3F, + 0x00,0xE0,0x7F, + 0x00,0xE0,0x3F, + 0x00,0xE0,0x1F, + 0x00,0xE0,0x0F, + 0x00,0xE0,0x07, + 0x00,0xE0,0x03, + 0x00,0xE0,0x01, + 0x00,0xE0,0x00, + 0x00,0x60,0x00, + 0x00,0x20,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h index a617c1ea30c..cdfbb5e4958 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsels_curs_width 16 -#define tblsels_curs_height 16 -#define tblsels_curs_x_hot 7 -#define tblsels_curs_y_hot 14 +#define tblsels_curs_width 24 +#define tblsels_curs_height 24 +#define tblsels_curs_x_hot 11 +#define tblsels_curs_y_hot 22 static const unsigned char tblsels_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xf8,0x0f, - 0xf0,0x07, - 0xe0,0x03, - 0xc0,0x01, - 0x80,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0xF0,0xFF,0x07, + 0xE0,0xFF,0x03, + 0xC0,0xFF,0x01, + 0x80,0xFF,0x00, + 0x00,0x7F,0x00, + 0x00,0x3E,0x00, + 0x00,0x1C,0x00, + 0x00,0x08,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h index 78e9be0bb9e..2f35ad9faec 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsels_mask_width 16 -#define tblsels_mask_height 16 -#define tblsels_curs_x_hot 7 -#define tblsels_curs_y_hot 14 +#define tblsels_mask_width 24 +#define tblsels_mask_height 24 +#define tblsels_mask_x_hot 11 +#define tblsels_mask_y_hot 22 static const unsigned char tblsels_mask_bits[] = { - 0x00,0x00, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xfc,0x1f, - 0xfc,0x1f, - 0xf8,0x0f, - 0xf0,0x07, - 0xe0,0x03, - 0xc0,0x01, - 0x80,0x00}; + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0xFC,0xFF,0x1F, + 0xF8,0xFF,0x0F, + 0xF0,0xFF,0x07, + 0xE0,0xFF,0x03, + 0xC0,0xFF,0x01, + 0x80,0xFF,0x00, + 0x00,0x7F,0x00, + 0x00,0x3E,0x00, + 0x00,0x1C,0x00, + 0x00,0x08,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h index 4ac5722dfd3..da41dab54cf 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h @@ -19,26 +19,25 @@ * *************************************************************/ - #define tblselse_curs_width 16 #define tblselse_curs_height 16 #define tblselse_curs_x_hot 14 #define tblselse_curs_y_hot 14 static const unsigned char tblselse_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x60,0x00, - 0xf0,0x00, - 0xf0,0x01, - 0xe0,0x03, - 0xc0,0x47, - 0x80,0x6f, - 0x00,0x7f, - 0x00,0x7e, - 0x00,0x7c, - 0x00,0x7e, - 0x00,0x7f, - 0x00,0x00}; + 0x00,0x00, + 0x00,0x00, + 0x00,0x00, + 0x00,0x20, + 0x00,0x30, + 0x00,0x38, + 0x00,0x3C, + 0x00,0x3E, + 0x00,0x3F, + 0x80,0x3F, + 0xC0,0x3F, + 0xE0,0x3F, + 0xF0,0x3F, + 0xF8,0x3F, + 0x00,0x00, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h index 83bf5ee858a..394376a6d3a 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h @@ -19,26 +19,25 @@ * *************************************************************/ - #define tblselse_mask_width 16 #define tblselse_mask_height 16 #define tblselse_mask_x_hot 14 #define tblselse_mask_y_hot 14 static const unsigned char tblselse_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x60,0x00, - 0xf0,0x00, - 0xf8,0x01, - 0xf8,0x03, - 0xf0,0xc7, - 0xe0,0xef, - 0xc0,0xff, - 0x80,0xff, - 0x00,0xff, - 0x00,0xfe, - 0x00,0xff, - 0x80,0xff, - 0x80,0xff}; + 0x00,0x00, + 0x00,0x40, + 0x00,0x60, + 0x00,0x70, + 0x00,0x78, + 0x00,0x7C, + 0x00,0x7E, + 0x00,0x7F, + 0x80,0x7F, + 0xC0,0x7F, + 0xE0,0x7F, + 0xF0,0x7F, + 0xF8,0x7F, + 0xFC,0x7F, + 0xFE,0x7F, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h b/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h index f9f71a4ddcf..36256682ece 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h @@ -4,7 +4,7 @@ * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License,Version 2.0 (the + * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * @@ -12,33 +12,32 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND,either express or implied. See the License for the + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. * *************************************************************/ - #define tblselsw_curs_width 16 #define tblselsw_curs_height 16 #define tblselsw_curs_x_hot 1 #define tblselsw_curs_y_hot 14 static const unsigned char tblselsw_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x06, - 0x00,0x0f, - 0x80,0x0f, - 0xc0,0x07, - 0xe2,0x03, - 0xf6,0x01, - 0xfe,0x00, - 0x7e,0x00, - 0x3e,0x00, - 0x7e,0x00, - 0xfe,0x00, - 0x00,0x00}; + 0x00,0x00, + 0x00,0x00, + 0x00,0x00, + 0x04,0x00, + 0x0C,0x00, + 0x1C,0x00, + 0x3C,0x00, + 0x7C,0x00, + 0xFC,0x00, + 0xFC,0x01, + 0xFC,0x03, + 0xFC,0x07, + 0xFC,0x0F, + 0xFC,0x1F, + 0x00,0x00, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h index aee71d9a628..24243452d53 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h @@ -19,26 +19,25 @@ * *************************************************************/ - #define tblselsw_mask_width 16 #define tblselsw_mask_height 16 #define tblselsw_mask_x_hot 1 #define tblselsw_mask_y_hot 14 static const unsigned char tblselsw_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x06, - 0x00,0x0f, - 0x80,0x1f, - 0xc0,0x1f, - 0xe3,0x0f, - 0xf7,0x07, - 0xff,0x03, - 0xff,0x01, - 0xff,0x00, - 0x7f,0x00, - 0xff,0x00, - 0xff,0x01, - 0xff,0x01}; + 0x00,0x00, + 0x02,0x00, + 0x06,0x00, + 0x0E,0x00, + 0x1E,0x00, + 0x3E,0x00, + 0x7E,0x00, + 0xFE,0x00, + 0xFE,0x01, + 0xFE,0x03, + 0xFE,0x07, + 0xFE,0x0F, + 0xFE,0x1F, + 0xFE,0x3F, + 0xFE,0x7F, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselw_curs.h b/main/vcl/inc/unx/x11_cursors/tblselw_curs.h index 489912bf52e..3b2656c7fe9 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselw_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselw_curs.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblselw_curs_width 16 -#define tblselw_curs_height 16 +#define tblselw_curs_width 24 +#define tblselw_curs_height 24 #define tblselw_curs_x_hot 1 -#define tblselw_curs_y_hot 8 +#define tblselw_curs_y_hot 11 static const unsigned char tblselw_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x20,0x00, - 0x30,0x00, - 0x38,0x00, - 0xfc,0x3f, - 0xfe,0x3f, - 0xfc,0x3f, - 0x38,0x00, - 0x30,0x00, - 0x20,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x02,0x00, + 0x00,0x03,0x00, + 0x80,0x03,0x00, + 0xC0,0x03,0x00, + 0xE0,0x03,0x00, + 0xF0,0x03,0x00, + 0xF8,0x03,0x00, + 0xFC,0x03,0x00, + 0xF8,0x03,0x00, + 0xF0,0x03,0x00, + 0xE0,0x03,0x00, + 0xC0,0x03,0x00, + 0x80,0x03,0x00, + 0x00,0x03,0x00, + 0x00,0x02,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselw_mask.h index f5c52c6fdc4..583ac3e3193 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselw_mask.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblselw_mask_width 16 -#define tblselw_mask_height 16 +#define tblselw_mask_width 24 +#define tblselw_mask_height 24 #define tblselw_mask_x_hot 1 -#define tblselw_mask_y_hot 8 +#define tblselw_mask_y_hot 11 static const unsigned char tblselw_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x60,0x00, - 0x70,0x00, - 0x78,0x00, - 0xfc,0x7f, - 0xfe,0x7f, - 0xff,0x7f, - 0xfe,0x7f, - 0xfc,0x7f, - 0x78,0x00, - 0x70,0x00, - 0x60,0x00, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x04,0x00, + 0x00,0x06,0x00, + 0x00,0x07,0x00, + 0x80,0x07,0x00, + 0xC0,0x07,0x00, + 0xE0,0x07,0x00, + 0xF0,0x07,0x00, + 0xF8,0x07,0x00, + 0xFC,0x07,0x00, + 0xFE,0x07,0x00, + 0xFC,0x07,0x00, + 0xF8,0x07,0x00, + 0xF0,0x07,0x00, + 0xE0,0x07,0x00, + 0xC0,0x07,0x00, + 0x80,0x07,0x00, + 0x00,0x07,0x00, + 0x00,0x06,0x00, + 0x00,0x04,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/os2/source/src/tblsele.ptr b/main/vcl/os2/source/src/tblsele.ptr index ddff735278b..3fc148a36a1 100644 Binary files a/main/vcl/os2/source/src/tblsele.ptr and b/main/vcl/os2/source/src/tblsele.ptr differ diff --git a/main/vcl/os2/source/src/tblsels.ptr b/main/vcl/os2/source/src/tblsels.ptr index 1cb0f74e58e..6b841af496c 100644 Binary files a/main/vcl/os2/source/src/tblsels.ptr and b/main/vcl/os2/source/src/tblsels.ptr differ diff --git a/main/vcl/os2/source/src/tblselse.ptr b/main/vcl/os2/source/src/tblselse.ptr index a23ddfda3cc..bead9c51ed4 100644 Binary files a/main/vcl/os2/source/src/tblselse.ptr and b/main/vcl/os2/source/src/tblselse.ptr differ diff --git a/main/vcl/os2/source/src/tblselsw.ptr b/main/vcl/os2/source/src/tblselsw.ptr index 2abb28db22e..353030087f2 100644 Binary files a/main/vcl/os2/source/src/tblselsw.ptr and b/main/vcl/os2/source/src/tblselsw.ptr differ diff --git a/main/vcl/os2/source/src/tblselw.ptr b/main/vcl/os2/source/src/tblselw.ptr index 59fce46f13c..78b4da5acb7 100644 Binary files a/main/vcl/os2/source/src/tblselw.ptr and b/main/vcl/os2/source/src/tblselw.ptr differ diff --git a/main/vcl/win/source/src/tblsele.cur b/main/vcl/win/source/src/tblsele.cur index 8314841c253..f6cd4f7bd79 100644 Binary files a/main/vcl/win/source/src/tblsele.cur and b/main/vcl/win/source/src/tblsele.cur differ diff --git a/main/vcl/win/source/src/tblsels.cur b/main/vcl/win/source/src/tblsels.cur index cb92ea198ad..246f38ac895 100644 Binary files a/main/vcl/win/source/src/tblsels.cur and b/main/vcl/win/source/src/tblsels.cur differ diff --git a/main/vcl/win/source/src/tblselse.cur b/main/vcl/win/source/src/tblselse.cur index 5a0d7bd2503..43436e33ebe 100644 Binary files a/main/vcl/win/source/src/tblselse.cur and b/main/vcl/win/source/src/tblselse.cur differ diff --git a/main/vcl/win/source/src/tblselsw.cur b/main/vcl/win/source/src/tblselsw.cur index 940b372ff62..3e21bf86781 100644 Binary files a/main/vcl/win/source/src/tblselsw.cur and b/main/vcl/win/source/src/tblselsw.cur differ diff --git a/main/vcl/win/source/src/tblselw.cur b/main/vcl/win/source/src/tblselw.cur index 5c60eecbf89..c6d1796f00c 100644 Binary files a/main/vcl/win/source/src/tblselw.cur and b/main/vcl/win/source/src/tblselw.cur differ